fix(autopilot): add --target to value-flag set so install targets survive positional translation

Review finding on #3103: --target is installDaemon's value flag
(macos | linux-systemd | ephemeral-container | linux-cron). The
translator only knew --repo/--interval, so `gbrain autopilot
--install --target linux-cron` misread the target value as an
unknown positional subcommand and exited 2 before installDaemon ran.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

src/commands/autopilot.ts

@@ -151,6 +151,100 @@ export function shouldSpawnAutopilotWorker(args: string[]): boolean {
   return !args.includes('--no-worker');
 }
 
+/**
+ * #1525 — positional subcommand translation.
+ *
+ * Pre-fix, `gbrain autopilot status` silently fell through to "start daemon"
+ * because `runAutopilot()` only branched on flag forms (`--status`, etc.).
+ * `status` was treated as a stray positional and ignored.
+ *
+ * This translator maps known positional subcommands to their flag form so
+ * `autopilot status` is equivalent to `autopilot --status`, then rejects
+ * any unrecognized positional with a fail-loud error before any side
+ * effect (lockfile, daemon spawn, sync dispatch) runs.
+ *
+ * Scope decisions:
+ *   - Known aliases: `status` → `--status`, `install` → `--install`,
+ *     `uninstall` → `--uninstall`, `start` → (drop; default daemon launch).
+ *   - `stop` is intentionally NOT aliased here. Stopping a running daemon
+ *     is a new behavior (read PID from lock, SIGTERM, drain) that deserves
+ *     its own design and PR. Users typing `gbrain autopilot stop` today get
+ *     the unknown-positional error with the canonical alternatives.
+ *   - At most one positional allowed; multiple positionals fail loud.
+ */
+// Every flag that consumes the NEXT argv token. Missing one here makes the
+// translator misread the flag's value as a positional subcommand and exit 2
+// (e.g. `--install --target linux-cron`). Keep in sync with parseArg call sites.
+const AUTOPILOT_VALUE_FLAGS = new Set(['--repo', '--interval', '--target']);
+const AUTOPILOT_POSITIONAL_ALIASES: Record<string, string | null> = {
+  status: '--status',
+  install: '--install',
+  uninstall: '--uninstall',
+  start: null, // drop the positional; default behavior is daemon launch
+};
+
+export type PositionalTranslation =
+  | { ok: true; args: string[] }
+  | {
+      ok: false;
+      reason: 'unknown_subcommand' | 'multiple_subcommands';
+      message: string;
+    };
+
+export function translatePositionalSubcommands(args: string[]): PositionalTranslation {
+  const out: string[] = [];
+  let positionalSeen = false;
+  let i = 0;
+  while (i < args.length) {
+    const a = args[i];
+    if (AUTOPILOT_VALUE_FLAGS.has(a)) {
+      // Pass through the flag and its value untouched. If the value is
+      // missing at end-of-argv, fall through so the existing parseArg
+      // path can report the broken usage.
+      out.push(a);
+      if (i + 1 < args.length) {
+        out.push(args[i + 1]);
+        i += 2;
+      } else {
+        i += 1;
+      }
+      continue;
+    }
+    if (a.startsWith('-')) {
+      out.push(a);
+      i += 1;
+      continue;
+    }
+    // Positional subcommand.
+    if (positionalSeen) {
+      const known = Object.keys(AUTOPILOT_POSITIONAL_ALIASES).join(', ');
+      return {
+        ok: false,
+        reason: 'multiple_subcommands',
+        message: `Multiple subcommands given. Use only one of: ${known}.`,
+      };
+    }
+    positionalSeen = true;
+    if (a in AUTOPILOT_POSITIONAL_ALIASES) {
+      const alias = AUTOPILOT_POSITIONAL_ALIASES[a];
+      if (alias) out.push(alias);
+      i += 1;
+      continue;
+    }
+    const known = Object.keys(AUTOPILOT_POSITIONAL_ALIASES).join(', ');
+    return {
+      ok: false,
+      reason: 'unknown_subcommand',
+      message:
+        `Unknown subcommand: \`${a}\`.\n` +
+        `Allowed subcommands: ${known}.\n` +
+        `Or use the flag form: --status, --install, --uninstall.\n` +
+        `Run \`gbrain autopilot --help\` for full usage.`,
+    };
+  }
+  return { ok: true, args: out };
+}
+
 export function isPidAlive(pid: number): boolean {
   if (!Number.isFinite(pid) || pid <= 0) return false;
   try {
@@ -363,6 +457,11 @@ export async function runAutopilot(engine: BrainEngine, args: string[]) {
       '       gbrain autopilot --install [--repo <path>]\n' +
       '       gbrain autopilot --uninstall\n' +
       '       gbrain autopilot --status [--json]\n\n' +
+      'Subcommand aliases:\n' +
+      '       gbrain autopilot status     → --status\n' +
+      '       gbrain autopilot install    → --install\n' +
+      '       gbrain autopilot uninstall  → --uninstall\n' +
+      '       gbrain autopilot start      → (default daemon launch)\n\n' +
       'Self-maintaining brain daemon. Runs the full maintenance cycle\n' +
       '(lint + backlinks + sync + extract + embed + orphans) on an interval.\n\n' +
       'For a one-shot cron-triggered cycle, see `gbrain dream`.',
@@ -370,6 +469,16 @@ export async function runAutopilot(engine: BrainEngine, args: string[]) {
     return;
   }
 
+  // #1525: translate positional subcommands to their flag form BEFORE any
+  // side effect (lockfile, daemon spawn, sync dispatch). Unknown positionals
+  // fail loud here rather than silently starting the daemon.
+  const translated = translatePositionalSubcommands(args);
+  if (!translated.ok) {
+    console.error(translated.message);
+    process.exit(2);
+  }
+  args = translated.args;
+
   if (args.includes('--install')) {
     await installDaemon(engine, args);
     return;

src/core/ai/anthropic-key.ts

@@ -18,22 +18,12 @@
 import { loadConfig } from '../config.ts';
 
 export function hasAnthropicKey(): boolean {
-  return resolveAnthropicKey() !== undefined;
-}
-
-/**
- * Resolve the actual key value: env first, then the gbrain config file.
- * Callers constructing an Anthropic client directly (e.g. the legacy
- * subagent path) must pass this as `apiKey` — a bare `new Anthropic()`
- * only sees env, so launchd/MCP workers with config-stored keys fail.
- */
-export function resolveAnthropicKey(): string | undefined {
-  if (process.env.ANTHROPIC_API_KEY) return process.env.ANTHROPIC_API_KEY;
+  if (process.env.ANTHROPIC_API_KEY) return true;
   try {
     const cfg = loadConfig();
-    if (cfg?.anthropic_api_key) return cfg.anthropic_api_key;
+    if (cfg?.anthropic_api_key) return true;
   } catch {
     // loadConfig may throw on first-run installs; treat as no key available.
   }
-  return undefined;
+  return false;
 }

src/core/minions/handlers/subagent.ts

@@ -48,7 +48,6 @@ import {
   logSubagentHeartbeat,
 } from './subagent-audit.ts';
 import { resolveModel, isAnthropicProvider, TIER_DEFAULTS } from '../../model-config.ts';
-import { resolveAnthropicKey } from '../../ai/anthropic-key.ts';
 import { buildSystemPrompt, DEFAULT_SUBAGENT_SYSTEM } from '../system-prompt.ts';
 import { toolLoop as gatewayToolLoop } from '../../ai/gateway.ts';
 import type { ChatToolDef, ChatMessage, ChatBlock, ChatResult, ToolHandler } from '../../ai/gateway.ts';
@@ -187,10 +186,7 @@ export function makeSubagentHandler(deps: SubagentDeps) {
   // lives at sdk.messages.create. Assigning sdk.messages directly gets the
   // right object; JS method-call semantics preserve `this` at the call
   // site (subagent.ts invokes client.create(...) with client === sdk.messages).
-  // Resolve the key env-first, then config (anthropic_api_key) — a bare
-  // new Anthropic() only reads env, so launchd/MCP workers whose key lives
-  // in the gbrain config file would fail auth (#2048).
-  const makeAnthropic = deps.makeAnthropic ?? (() => new Anthropic({ apiKey: resolveAnthropicKey() }));
+  const makeAnthropic = deps.makeAnthropic ?? (() => new Anthropic());
   const client: MessagesClient = deps.client ?? makeAnthropic().messages;
   const config = deps.config ?? loadConfig() ?? ({ engine: 'postgres' } as GBrainConfig);
   const rateLeaseKey = deps.rateLeaseKey ?? DEFAULT_RATE_KEY;

src/core/operations.ts

@@ -4562,8 +4562,7 @@ const list_schema_packs: Operation = {
     const { existsSync, readdirSync } = await import('node:fs');
     const { join } = await import('node:path');
     const { gbrainPath } = await import('./config.ts');
-    const { BUNDLED_PACK_NAMES } = await import('./schema-pack/bundled.ts');
-    const bundled = [...BUNDLED_PACK_NAMES];
+    const bundled = ['gbrain-base', 'gbrain-recommended'];
     const installedDir = gbrainPath('schema-packs');
     const installed: string[] = [];
     if (existsSync(installedDir)) {

src/core/schema-pack/bundled.ts

@@ -1,24 +0,0 @@
-// Bundled schema-pack registry — single source of truth for the packs that
-// ship in src/core/schema-pack/base/. Keep every bundled-pack consumer
-// (CLI/MCP inspection, active-pack loading, mutation guards, upgrade
-// discovery) on this one list so they cannot drift.
-//
-// v0.39 T8 — gbrain-base + gbrain-recommended.
-// v0.41 T4 — lens packs: creator, investor, engineer, everything (meta-pack).
-// v0.42 type-unification — gbrain-base-v2, the 15-type canonical successor.
-
-export const BUNDLED_PACK_NAMES = [
-  'gbrain-base',
-  'gbrain-recommended',
-  'gbrain-creator',
-  'gbrain-investor',
-  'gbrain-engineer',
-  'gbrain-everything',
-  'gbrain-base-v2',
-] as const;
-
-export type BundledPackName = typeof BUNDLED_PACK_NAMES[number];
-
-export function isBundledPackName(name: string): name is BundledPackName {
-  return (BUNDLED_PACK_NAMES as readonly string[]).includes(name);
-}

src/core/schema-pack/load-active.ts

@@ -37,7 +37,6 @@ import {
   type ResolutionInput,
   type ResolutionResult,
 } from './registry.ts';
-import { isBundledPackName } from './bundled.ts';
 
 /**
  * Inputs the caller (operations.ts handler / engine query path) provides.
@@ -93,7 +92,28 @@ export function _resetPackLocatorForTests(): void {
  * throwing UnknownPackError with a paste-ready install hint.
  */
 function defaultPackLocator(name: string): string | null {
-  if (isBundledPackName(name)) {
+  // v0.39 T8 — bundled packs registry. gbrain-base + gbrain-recommended
+  // ship in src/core/schema-pack/base/. Add a new entry here to bundle
+  // additional canonical packs.
+  //
+  // v0.41 T4 — lens packs join the bundle: creator (atoms + concepts +
+  // extract_atoms/synthesize_concepts phases), investor (theses + bet
+  // resolution + 3 calibration domains), engineer (gstack-learnings bridge
+  // + 3 calibration domains), everything (meta-pack stacking all three
+  // via extends + borrow_from). Each ships as a real YAML at base/<name>.yaml.
+  const BUNDLED: ReadonlyArray<string> = [
+    'gbrain-base',
+    'gbrain-recommended',
+    'gbrain-creator',
+    'gbrain-investor',
+    'gbrain-engineer',
+    'gbrain-everything',
+    // v0.42 type-unification: 15-type canonical successor to gbrain-base.
+    // Ships as install default (Lane E T17) + via gbrain onboard pack
+    // upgrade flow (the unify-types Minion handler).
+    'gbrain-base-v2',
+  ];
+  if (BUNDLED.includes(name)) {
     // Resolve bundled YAML relative to this source file. Works in both
     // direct-bun execution and bun --compile binaries.
     const here = dirname(fileURLToPath(import.meta.url));

src/core/schema-pack/loader.ts

@@ -159,29 +159,6 @@ export function parseYamlMini(content: string): unknown {
     return parseMapping(baseIndent);
   }
 
-  function parseBlockScalar(parentIndent: number, folded: boolean): string {
-    const contentIndent = parentIndent + 2;
-    const out: string[] = [];
-    while (i < lines.length) {
-      const raw = lines[i];
-      // Inside a block scalar everything is literal content — '#' is NOT a
-      // comment here, so use the raw line (no stripComment / isBlank).
-      if (raw.trim() === '') {
-        out.push('');
-        i++;
-        continue;
-      }
-      const indent = indentOf(raw);
-      if (indent <= parentIndent) break;
-      out.push(raw.slice(Math.min(contentIndent, indent)));
-      i++;
-    }
-    if (folded) {
-      return out.join(' ').replace(/\s+$/u, '');
-    }
-    return out.join('\n').replace(/\n+$/u, '');
-  }
-
   function parseSequence(baseIndent: number): unknown[] {
     const result: unknown[] = [];
     while (i < lines.length) {
@@ -250,10 +227,6 @@ export function parseYamlMini(content: string): unknown {
           i++;
           if (rest2 === '') {
             map[key2] = parseBlock(nextIndent + 2);
-          } else if (rest2 === '|' || rest2 === '|-' || rest2 === '|+') {
-            map[key2] = parseBlockScalar(nextIndent, false);
-          } else if (rest2 === '>' || rest2 === '>-' || rest2 === '>+') {
-            map[key2] = parseBlockScalar(nextIndent, true);
           } else {
             map[key2] = parseScalar(rest2);
           }
@@ -284,10 +257,6 @@ export function parseYamlMini(content: string): unknown {
       i++;
       if (rest === '') {
         result[key] = parseBlock(indent + 2);
-      } else if (rest === '|' || rest === '|-' || rest === '|+') {
-        result[key] = parseBlockScalar(indent, false);
-      } else if (rest === '>' || rest === '>-' || rest === '>+') {
-        result[key] = parseBlockScalar(indent, true);
       } else {
         result[key] = parseScalar(rest);
       }

src/core/schema-pack/mutate.ts

@@ -65,7 +65,6 @@ import { invalidateQueryCache } from './query-cache-invalidator.ts';
 import { logMutationFailure, logMutationSuccess, type MutationActor, type MutationOp } from './mutate-audit.ts';
 import { runFilePlaneLintRules } from './lint-rules.ts';
 import { withPackLock, type PackLockOpts } from './pack-lock.ts';
-import { BUNDLED_PACK_NAMES as BUNDLED_PACK_NAME_LIST } from './bundled.ts';
 import type { BrainEngine } from '../engine.ts';
 
 export type PackFileFormat = 'json' | 'yaml';
@@ -94,7 +93,7 @@ export class SchemaPackMutationError extends Error {
   }
 }
 
-export const BUNDLED_PACK_NAMES = new Set<string>(BUNDLED_PACK_NAME_LIST);
+export const BUNDLED_PACK_NAMES = new Set(['gbrain-base', 'gbrain-recommended', 'gbrain-base-v2']);
 
 export interface MutateResult {
   /** Pack name that was mutated. */

test/ai/anthropic-key.test.ts

@@ -10,7 +10,7 @@ import { mkdtempSync, mkdirSync, writeFileSync, rmSync } from 'node:fs';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
 import { withEnv } from '../helpers/with-env.ts';
-import { hasAnthropicKey, resolveAnthropicKey } from '../../src/core/ai/anthropic-key.ts';
+import { hasAnthropicKey } from '../../src/core/ai/anthropic-key.ts';
 
 const tmpDirs: string[] = [];
 function freshHome(withConfig?: Record<string, unknown>): string {
@@ -62,35 +62,3 @@ describe('hasAnthropicKey', () => {
     );
   });
 });
-
-describe('resolveAnthropicKey (#2048 — subagent config-key auth)', () => {
-  test('env wins over config', async () => {
-    const home = freshHome({ anthropic_api_key: 'sk-from-config' });
-    await withEnv(
-      { ANTHROPIC_API_KEY: 'sk-from-env', GBRAIN_HOME: home, DATABASE_URL: undefined, GBRAIN_DATABASE_URL: undefined },
-      async () => {
-        expect(resolveAnthropicKey()).toBe('sk-from-env');
-      },
-    );
-  });
-
-  test('config key returned when env unset', async () => {
-    const home = freshHome({ anthropic_api_key: 'sk-from-config' });
-    await withEnv(
-      { ANTHROPIC_API_KEY: undefined, GBRAIN_HOME: home, DATABASE_URL: undefined, GBRAIN_DATABASE_URL: undefined },
-      async () => {
-        expect(resolveAnthropicKey()).toBe('sk-from-config');
-      },
-    );
-  });
-
-  test('neither → undefined', async () => {
-    const home = freshHome();
-    await withEnv(
-      { ANTHROPIC_API_KEY: undefined, GBRAIN_HOME: home, DATABASE_URL: undefined, GBRAIN_DATABASE_URL: undefined },
-      async () => {
-        expect(resolveAnthropicKey()).toBeUndefined();
-      },
-    );
-  });
-});

test/autopilot-positional-subcommands.test.ts

@@ -0,0 +1,197 @@
+/**
+ * Tests for translatePositionalSubcommands() — the v0.41.x #1525 fix that
+ * prevents `gbrain autopilot status` from silently starting the daemon.
+ *
+ * IRON RULE regression guard: the exact ticket repro (`gbrain autopilot
+ * status`) MUST translate to `--status`, not fall through to the default
+ * daemon launch. Verified by the "ticket-exact repro" case below.
+ */
+
+import { describe, test, expect } from 'bun:test';
+import { translatePositionalSubcommands } from '../src/commands/autopilot.ts';
+
+describe('translatePositionalSubcommands — known aliases', () => {
+  test('IRON RULE — `autopilot status` translates to `--status` (ticket #1525 repro)', () => {
+    const r = translatePositionalSubcommands(['status']);
+    expect(r.ok).toBe(true);
+    if (r.ok) expect(r.args).toEqual(['--status']);
+  });
+
+  test('`install` translates to `--install`', () => {
+    const r = translatePositionalSubcommands(['install']);
+    expect(r.ok).toBe(true);
+    if (r.ok) expect(r.args).toEqual(['--install']);
+  });
+
+  test('`uninstall` translates to `--uninstall`', () => {
+    const r = translatePositionalSubcommands(['uninstall']);
+    expect(r.ok).toBe(true);
+    if (r.ok) expect(r.args).toEqual(['--uninstall']);
+  });
+
+  test('`start` drops the positional (default daemon launch)', () => {
+    const r = translatePositionalSubcommands(['start']);
+    expect(r.ok).toBe(true);
+    if (r.ok) expect(r.args).toEqual([]);
+  });
+
+  test('`start --json` drops only the positional, keeps the flag', () => {
+    const r = translatePositionalSubcommands(['start', '--json']);
+    expect(r.ok).toBe(true);
+    if (r.ok) expect(r.args).toEqual(['--json']);
+  });
+});
+
+describe('translatePositionalSubcommands — flag/positional interleaving', () => {
+  test('`status --json` preserves the trailing flag', () => {
+    const r = translatePositionalSubcommands(['status', '--json']);
+    expect(r.ok).toBe(true);
+    if (r.ok) expect(r.args).toEqual(['--status', '--json']);
+  });
+
+  test('`--json status` preserves the leading flag', () => {
+    const r = translatePositionalSubcommands(['--json', 'status']);
+    expect(r.ok).toBe(true);
+    if (r.ok) expect(r.args).toEqual(['--json', '--status']);
+  });
+
+  test('`--repo /foo status` does not mis-classify the path as positional', () => {
+    const r = translatePositionalSubcommands(['--repo', '/foo', 'status']);
+    expect(r.ok).toBe(true);
+    if (r.ok) expect(r.args).toEqual(['--repo', '/foo', '--status']);
+  });
+
+  test('`--interval 300 install` does not mis-classify the number as positional', () => {
+    const r = translatePositionalSubcommands(['--interval', '300', 'install']);
+    expect(r.ok).toBe(true);
+    if (r.ok) expect(r.args).toEqual(['--interval', '300', '--install']);
+  });
+
+  test('`--install --target linux-cron` does not mis-classify the target as positional', () => {
+    // --target is installDaemon's value flag; its value must never be read
+    // as a positional subcommand (regression guard for the review fix).
+    const r = translatePositionalSubcommands(['--install', '--target', 'linux-cron']);
+    expect(r.ok).toBe(true);
+    if (r.ok) expect(r.args).toEqual(['--install', '--target', 'linux-cron']);
+  });
+
+  test('`install --target macos` keeps the alias translation and the target value', () => {
+    const r = translatePositionalSubcommands(['install', '--target', 'macos']);
+    expect(r.ok).toBe(true);
+    if (r.ok) expect(r.args).toEqual(['--install', '--target', 'macos']);
+  });
+
+  test('value-flag at end of argv with missing value passes through (so parseArg can report it)', () => {
+    const r = translatePositionalSubcommands(['--repo']);
+    expect(r.ok).toBe(true);
+    if (r.ok) expect(r.args).toEqual(['--repo']);
+  });
+
+  test('value-flag whose value looks like an alias is NOT translated', () => {
+    // `--repo status` means "use repo path 'status'", not "show status".
+    // Translator must not destructure the value of --repo.
+    const r = translatePositionalSubcommands(['--repo', 'status']);
+    expect(r.ok).toBe(true);
+    if (r.ok) expect(r.args).toEqual(['--repo', 'status']);
+  });
+});
+
+describe('translatePositionalSubcommands — pass-through cases', () => {
+  test('empty args returns empty args', () => {
+    const r = translatePositionalSubcommands([]);
+    expect(r.ok).toBe(true);
+    if (r.ok) expect(r.args).toEqual([]);
+  });
+
+  test('flag-only invocation passes through unchanged', () => {
+    const r = translatePositionalSubcommands(['--status', '--json']);
+    expect(r.ok).toBe(true);
+    if (r.ok) expect(r.args).toEqual(['--status', '--json']);
+  });
+
+  test('short flag `-h` passes through unchanged', () => {
+    const r = translatePositionalSubcommands(['-h']);
+    expect(r.ok).toBe(true);
+    if (r.ok) expect(r.args).toEqual(['-h']);
+  });
+
+  test('all known bare flags pass through unchanged', () => {
+    const flags = ['--help', '--install', '--uninstall', '--status', '--json', '--inline', '--no-worker'];
+    const r = translatePositionalSubcommands(flags);
+    expect(r.ok).toBe(true);
+    if (r.ok) expect(r.args).toEqual(flags);
+  });
+});
+
+describe('translatePositionalSubcommands — rejection of unknown positionals', () => {
+  test('unknown positional `foo` fails with reason=unknown_subcommand + structured message', () => {
+    const r = translatePositionalSubcommands(['foo']);
+    expect(r.ok).toBe(false);
+    if (!r.ok) {
+      expect(r.reason).toBe('unknown_subcommand');
+      expect(r.message).toContain('Unknown subcommand: `foo`');
+      expect(r.message).toContain('status');
+      expect(r.message).toContain('install');
+      expect(r.message).toContain('uninstall');
+      expect(r.message).toContain('--help');
+    }
+  });
+
+  test('unknown positional `stop` fails with reason=unknown_subcommand (NOT silently aliased)', () => {
+    // Stop is mentioned in the ticket but deliberately NOT aliased in this
+    // PR — stopping a running daemon is a new behavior, not just an alias.
+    // Until that feature lands separately, `stop` must fail loud rather
+    // than starting the daemon (the bug we're fixing).
+    const r = translatePositionalSubcommands(['stop']);
+    expect(r.ok).toBe(false);
+    if (!r.ok) {
+      expect(r.reason).toBe('unknown_subcommand');
+      expect(r.message).toContain('Unknown subcommand: `stop`');
+    }
+  });
+
+  test('unknown positional `status-detail` (close-but-not-matching) fails', () => {
+    const r = translatePositionalSubcommands(['status-detail']);
+    expect(r.ok).toBe(false);
+    if (!r.ok) {
+      expect(r.reason).toBe('unknown_subcommand');
+      expect(r.message).toContain('Unknown subcommand: `status-detail`');
+    }
+  });
+
+  test('multiple positionals fail with reason=multiple_subcommands (`start install`)', () => {
+    const r = translatePositionalSubcommands(['start', 'install']);
+    expect(r.ok).toBe(false);
+    if (!r.ok) {
+      expect(r.reason).toBe('multiple_subcommands');
+      expect(r.message).toContain('Multiple subcommands');
+    }
+  });
+
+  test('multiple positionals fail even when both are known aliases (`status install`)', () => {
+    const r = translatePositionalSubcommands(['status', 'install']);
+    expect(r.ok).toBe(false);
+    if (!r.ok) {
+      expect(r.reason).toBe('multiple_subcommands');
+      expect(r.message).toContain('Multiple subcommands');
+    }
+  });
+
+  test('known-then-unknown rejects with multiple_subcommands (first-positional-wins)', () => {
+    // First positional is known, second is not. Rejection comes from the
+    // multiple-positional rule, which fires before the unknown check; the
+    // intent is "only one subcommand allowed."
+    const r = translatePositionalSubcommands(['status', 'garbage']);
+    expect(r.ok).toBe(false);
+    if (!r.ok) expect(r.reason).toBe('multiple_subcommands');
+  });
+
+  test('unknown-then-known rejects on the unknown (unknown fires before second-positional check)', () => {
+    const r = translatePositionalSubcommands(['garbage', 'status']);
+    expect(r.ok).toBe(false);
+    if (!r.ok) {
+      expect(r.reason).toBe('unknown_subcommand');
+      expect(r.message).toContain('garbage');
+    }
+  });
+});

test/lens-pack-manifests.test.ts

@@ -55,13 +55,13 @@ describe('v0.41 T4: all 4 bundled lens packs parse cleanly', () => {
 });
 
 describe('v0.41 T4: bundled registry includes lens packs', () => {
-  test('BUNDLED_PACK_NAMES includes the 4 lens pack names', async () => {
-    // The bundled list moved from load-active.ts to bundled.ts (the
-    // single source of truth); assert the array directly instead of
-    // grepping source text.
-    const { BUNDLED_PACK_NAMES } = await import('../src/core/schema-pack/bundled.ts');
+  test('load-active.ts BUNDLED array source includes the 4 lens pack names', () => {
+    const loadActiveSrc = readFileSync(
+      join(here, '..', 'src', 'core', 'schema-pack', 'load-active.ts'),
+      'utf-8',
+    );
     for (const name of PACK_NAMES) {
-      expect(BUNDLED_PACK_NAMES).toContain(name);
+      expect(loadActiveSrc).toContain(`'${name}'`);
     }
   });
 });

test/operations-schema-pack.test.ts

@@ -149,9 +149,6 @@ describe('list_schema_packs', () => {
       seedPack('mine');
       const result = await operationsByName.list_schema_packs!.handler(ctxOf(), {}) as { bundled: string[]; installed: string[] };
       expect(result.bundled).toContain('gbrain-base');
-      expect(result.bundled).toContain('gbrain-recommended');
-      expect(result.bundled).toContain('gbrain-base-v2');
-      expect(result.bundled).toContain('gbrain-investor');
       expect(result.installed).toContain('mine');
     });
   });

test/schema-cli.test.ts

@@ -64,14 +64,11 @@ describe('gbrain schema CLI (Phase C)', () => {
     expect(r.stdout + r.stderr).toMatch(/schema|active|list|show|validate|use/i);
   });
 
-  test('schema list shows all bundled packs', () => {
+  test('schema list shows gbrain-base bundled', () => {
     const r = gbrain(['schema', 'list']);
     expect(r.code).toBe(0);
     expect(r.stdout).toContain('Bundled packs:');
     expect(r.stdout).toContain('gbrain-base');
-    expect(r.stdout).toContain('gbrain-recommended');
-    expect(r.stdout).toContain('gbrain-base-v2');
-    expect(r.stdout).toContain('gbrain-investor');
   });
 
   test('schema show gbrain-base prints manifest details', () => {
@@ -100,40 +97,6 @@ describe('gbrain schema CLI (Phase C)', () => {
     expect(r.stdout).toContain('valid manifest');
   });
 
-  test('schema show/validate exposes bundled gbrain-recommended', () => {
-    const show = gbrain(['schema', 'show', 'gbrain-recommended']);
-    expect(show.code).toBe(0);
-    expect(show.stdout).toContain('gbrain-recommended v1.0.0');
-    expect(show.stdout).toContain('Page types (');
-    expect(show.stdout).toContain('meeting :: temporal');
-
-    const validate = gbrain(['schema', 'validate', 'gbrain-recommended']);
-    expect(validate.code).toBe(0);
-    expect(validate.stdout).toContain('valid manifest');
-  });
-
-  test('schema show exposes bundled gbrain-base-v2 successor pack', () => {
-    const r = gbrain(['schema', 'show', 'gbrain-base-v2']);
-    expect(r.code).toBe(0);
-    expect(r.stdout).toContain('gbrain-base-v2 v1.0.0');
-    expect(r.stdout).toContain('Page types (');
-    expect(r.stdout).toContain('Link verbs (14)');
-  });
-
-  test('schema active loads configured gbrain-recommended with real types', () => {
-    const home = mkdtempSync(join(tmpdir(), 'gbrain-schema-active-recommended-'));
-    try {
-      mkdirSync(join(home, '.gbrain'), { recursive: true });
-      writeFileSync(join(home, '.gbrain', 'config.json'), JSON.stringify({ schema_pack: 'gbrain-recommended' }), 'utf-8');
-      const r = gbrain(['schema', 'active'], { GBRAIN_HOME: home });
-      expect(r.code).toBe(0);
-      expect(r.stdout).toContain('Active pack: gbrain-recommended');
-      expect(r.stdout).not.toContain('Page types: 0');
-    } finally {
-      rmSync(home, { recursive: true, force: true });
-    }
-  });
-
   test('schema active reports default resolution', () => {
     const r = gbrain(['schema', 'active']);
     expect(r.code).toBe(0);

test/schema-pack-loader.test.ts

@@ -345,34 +345,6 @@ describe('YAML mini-parser', () => {
     expect(result.types[1].weight).toBe(2);
   });
 
-  test('parses block scalar without swallowing following keys', () => {
-    const yaml = `name: blocky
-description: |
-  First line.
-  Second line.
-page_types:
-  - name: meeting
-    primitive: temporal
-    path_prefixes:
-      - meetings/
-    aliases: []
-    extractable: true
-    expert_routing: false`;
-    const result = parseYamlMini(yaml) as { description: string; page_types: Array<Record<string, unknown>> };
-    expect(result.description).toBe('First line.\nSecond line.');
-    expect(result.page_types).toHaveLength(1);
-    expect(result.page_types[0].name).toBe('meeting');
-  });
-
-  test('block scalar keeps # as literal content, not a comment', () => {
-    const yaml = `description: |
-  See issue #2029 for context.
-name: hashy`;
-    const result = parseYamlMini(yaml) as Record<string, unknown>;
-    expect(result.description).toBe('See issue #2029 for context.');
-    expect(result.name).toBe('hashy');
-  });
-
   test('strips comments', () => {
     const result = parseYamlMini('# top comment\nname: value # inline comment') as Record<string, unknown>;
     expect(result.name).toBe('value');
@@ -402,27 +374,6 @@ extends: null`;
     const pack = loadPackFromString(json, 'fixture.json');
     expect(pack.name).toBe('json-pack');
   });
-
-  test('loads block-scalar pack descriptions without losing page types', () => {
-    const pack = loadPackFromString(`api_version: gbrain-schema-pack-v1
-name: recommended-fixture
-version: 1.0.0
-extends: gbrain-base
-description: |
-  Operational starter pack.
-page_types:
-  - name: meeting
-    primitive: temporal
-    path_prefixes:
-      - meetings/
-    aliases: []
-    extractable: true
-    expert_routing: false
-link_types: []`, 'fixture.yaml');
-    expect(pack.name).toBe('recommended-fixture');
-    expect(pack.extends).toBe('gbrain-base');
-    expect(pack.page_types.map((t) => t.name)).toContain('meeting');
-  });
 });
 
 describe('ReDoS guard', () => {

test/schema-pack-mutate.test.ts

@@ -103,10 +103,7 @@ describe('locateMutablePackFile — bundled guard', () => {
     expect(BUNDLED_PACK_NAMES.has('gbrain-recommended')).toBe(true);
     // v0.42 (T22): gbrain-base-v2 joins the bundled set.
     expect(BUNDLED_PACK_NAMES.has('gbrain-base-v2')).toBe(true);
-    // Derived from the single bundled registry — the lens packs (creator,
-    // investor, engineer, everything) are read-only too.
-    expect(BUNDLED_PACK_NAMES.has('gbrain-investor')).toBe(true);
-    expect(BUNDLED_PACK_NAMES.size).toBe(7);
+    expect(BUNDLED_PACK_NAMES.size).toBe(3);
   });
 
   it('rejects gbrain-base-v2 with PACK_READONLY (bundled guard)', () => {