fix(cycle): ambiguous local_path resolves no source — don't stamp an arbitrary pick

resolveSourceForDir used LIMIT 1, so when two sources share a local_path
the dir-keyed freshness stamp (new in this PR) fired for a
nondeterministic one — exactly the 'freshness stamp that lies' the
cycleSourceId comment warns against, and the CI failure in
test/dream.test.ts ('gbrain dream (no --source) leaves all sources
untouched'). Require exactly one match; ambiguous or no match falls back
to the pre-v0.18 behavior (undefined), same as before this PR for the
no-match case.

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

src/commands/autopilot-fanout.ts

@@ -186,6 +186,18 @@ export function isSourceStale(src: SourceRow, now = Date.now(), floorMin = FULL_
   return ageMin >= floorMin;
 }
 
+/**
+ * #2060: count sources past the per-source cycle freshness floor. Consumed
+ * by autopilot's dispatch decision — a stale source forces the fanout path
+ * even when the doctor plan is small (score 70–94, plan ≤ 3, est < 300s),
+ * so targeted mode can't leave cycle_freshness stale indefinitely.
+ * dispatchPerSource's own throttles (skipped_fresh / fanoutMax / failure
+ * cooldown) bound the resulting work.
+ */
+export function countStaleSources(sources: SourceRow[], now = Date.now(), floorMin = FULL_CYCLE_FLOOR_MIN): number {
+  return sources.filter((s) => isSourceStale(s, now, floorMin)).length;
+}
+
 /**
  * Most recent SUCCESSFUL cycle for a source. Prefers `last_source_cycle_at`
  * (per-source phases, written by the split cycle) and falls back to the legacy

src/commands/autopilot.ts

@@ -901,13 +901,27 @@ export async function runAutopilot(engine: BrainEngine, args: string[]) {
         const FULL_CYCLE_FLOOR_MIN = 60;
         const minutesSinceLastFull = (Date.now() - lastFullCycleAt) / 60000;
 
+        // #2060: stale per-source cycle freshness is a dispatch input. Without
+        // it, a brain sitting at score 70–94 with a small targeted plan (≤3
+        // steps, <300s) stays in targeted mode indefinitely and no per-source
+        // cycle is ever dispatched — cycle_freshness never advances. A stale
+        // source forces the fanout path; dispatchPerSource's throttles
+        // (skipped_fresh / fanoutMax / failure cooldown) bound the work.
+        // Fail-open to 0: a read failure must not block dispatch.
+        let staleCycleSources = 0;
+        try {
+          const { countStaleSources } = await import('./autopilot-fanout.ts');
+          staleCycleSources = countStaleSources(await engine.listAllSources({ localPathOnly: true }));
+        } catch { /* fail-open: freshness is a dispatch hint, not a gate */ }
+
         const shouldFullCycle =
           (score >= 95 && plan.length === 0 && minutesSinceLastFull >= FULL_CYCLE_FLOOR_MIN) ||
           plan.length > 3 ||
           estTotal >= 300 ||
-          score < 70;
+          score < 70 ||
+          staleCycleSources > 0;
 
-        const shouldSleep = score >= 95 && plan.length === 0 && minutesSinceLastFull < FULL_CYCLE_FLOOR_MIN;
+        const shouldSleep = score >= 95 && plan.length === 0 && minutesSinceLastFull < FULL_CYCLE_FLOOR_MIN && staleCycleSources === 0;
 
         if (shouldSleep) {
           if (jsonMode) {

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/cycle.ts

@@ -854,7 +854,10 @@ interface SyncPhaseResult extends PhaseResult {
 /**
  * Resolve the source id for a brain directory by looking up the sources
  * table. Returns undefined when no registered source matches (falls back
- * to pre-v0.18 global config.sync.* keys).
+ * to pre-v0.18 global config.sync.* keys) OR when MORE than one source
+ * claims the path — an ambiguous match must not scope phases or stamp
+ * last_full_cycle_at for an arbitrarily-picked source (the "freshness
+ * stamp that lies" this resolution exists to prevent).
  */
 async function resolveSourceForDir(
   engine: BrainEngine,
@@ -865,10 +868,10 @@ async function resolveSourceForDir(
   if (brainDir === null) return undefined;
   try {
     const rows = await engine.executeRaw<{ id: string }>(
-      `SELECT id FROM sources WHERE local_path = $1 LIMIT 1`,
+      `SELECT id FROM sources WHERE local_path = $1 LIMIT 2`,
       [brainDir],
     );
-    return rows[0]?.id;
+    return rows.length === 1 ? rows[0]!.id : undefined;
   } catch {
     // sources table might not exist on very old brains — fall through.
     return undefined;
@@ -2365,17 +2368,23 @@ export async function runCycle(
   }
 
   // v0.38 (codex r1 P0-5): persist per-source cycle completion timestamp
-  // when the cycle ran successfully against an explicit source. Read by
-  // autopilot's per-source freshness gate next tick. Skipped when:
-  //   - opts.sourceId is unset (legacy callers — autopilot still here)
-  //   - engine is null (no-DB path)
+  // when the cycle ran successfully against a resolvable source. Read by
+  // autopilot's per-source freshness gate next tick.
+  //
+  // #1993: keyed off `cycleSourceId` (opts.sourceId ?? the source resolved
+  // from brainDir) — the SAME id the cycle locked + scoped its phases to —
+  // NOT raw opts.sourceId. The autopilot's inline cycle sets brainDir but
+  // passes no explicit sourceId, so keying off opts.sourceId alone never
+  // advanced last_full_cycle_at and cycle_freshness stayed stale even while
+  // the autopilot cycled every interval. Skipped when:
+  //   - no source resolves (engine null, or no checkout AND no opts.sourceId)
   //   - status is 'failed' or 'skipped' (don't mark a non-run as fresh)
   //   - dryRun (writes are out of scope)
   //
   // Best-effort: a write failure does NOT change the CycleReport status.
   // The cost of writing the wrong timestamp post-failure is higher than
   // the cost of missing a successful write (next cycle will redo work).
-  if (opts.sourceId && engine && !dryRun && !aborted && (status === 'ok' || status === 'clean' || status === 'partial')) {
+  if (cycleSourceId && engine && !dryRun && !aborted && (status === 'ok' || status === 'clean' || status === 'partial')) {
     try {
       const nowIso = new Date().toISOString();
       // #2194 fix #3 (the cycle split): `last_source_cycle_at` is the NEW gate
@@ -2385,13 +2394,13 @@ export async function runCycle(
       // phases (those gate on autopilot.last_global_at), so writing it on a
       // source-only cycle does not re-introduce the freshness poisoning codex
       // flagged in the rejected skip-based design.
-      await engine.updateSourceConfig(opts.sourceId, {
+      await engine.updateSourceConfig(cycleSourceId, {
         last_source_cycle_at: nowIso,
         last_full_cycle_at: nowIso,
       });
     } catch (e) {
       // Best-effort; cycle already succeeded by the time we get here.
-      console.warn(`[cycle] failed to write last_source_cycle_at for source ${opts.sourceId}: ${e instanceof Error ? e.message : String(e)}`);
+      console.warn(`[cycle] failed to write last_source_cycle_at for source ${cycleSourceId}: ${e instanceof Error ? e.message : String(e)}`);
     }
   }
 

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-fanout-wiring.test.ts

@@ -54,6 +54,20 @@ describe('autopilot.ts ↔ dispatchPerSource wiring', () => {
     expect(AUTOPILOT_SRC).toMatch(/lastFullCycleAt\s*=\s*Date\.now\(\)/);
   });
 
+  test('stale per-source cycle freshness is a shouldFullCycle input (#2060)', () => {
+    // Targeted mode (score 70–94, plan ≤3, est <300s) must not be able to
+    // starve per-source cycle dispatch: a stale source (per countStaleSources
+    // over listAllSources) forces the fanout path, and the sleep gate must
+    // not fire while stale sources exist. Without these terms, cycle
+    // freshness never advances for a brain that always lands in targeted mode.
+    expect(AUTOPILOT_SRC).toMatch(/countStaleSources/);
+    const fullCycleDeclIdx = AUTOPILOT_SRC.indexOf('const shouldFullCycle');
+    expect(fullCycleDeclIdx).toBeGreaterThan(-1);
+    const decl = AUTOPILOT_SRC.slice(fullCycleDeclIdx, fullCycleDeclIdx + 700);
+    expect(decl).toMatch(/staleCycleSources\s*>\s*0/);
+    expect(decl).toMatch(/const shouldSleep[^;]*staleCycleSources\s*===\s*0/);
+  });
+
   test('does NOT regress to the single-job dispatch on the full-cycle path', () => {
     // Pre-PR: the shouldFullCycle branch did:
     //   const job = await queue.add('autopilot-cycle', { repoPath }, {

test/autopilot-fanout.test.ts

@@ -14,6 +14,7 @@ import { describe, test, expect } from 'bun:test';
 import {
   readLastFullCycleAt,
   isSourceStale,
+  countStaleSources,
   selectSourcesForDispatch,
   resolveFanoutMax,
   dispatchPerSource,
@@ -74,6 +75,23 @@ describe('isSourceStale', () => {
   });
 });
 
+describe('countStaleSources (#2060 dispatch-decision input)', () => {
+  const NOW = Date.parse('2026-05-22T12:00:00.000Z');
+  test('counts never-cycled + past-floor sources, ignores fresh', () => {
+    const sources = [
+      src('never-cycled'), // stale (null)
+      src('old', new Date(NOW - 2 * 60 * 60_000).toISOString()), // stale (2h)
+      src('fresh', new Date(NOW - 30 * 60_000).toISOString()), // fresh (30min)
+    ];
+    expect(countStaleSources(sources, NOW)).toBe(2);
+  });
+  test('returns 0 for all-fresh and for empty list', () => {
+    const fresh = src('a', new Date(NOW - 10 * 60_000).toISOString());
+    expect(countStaleSources([fresh], NOW)).toBe(0);
+    expect(countStaleSources([], NOW)).toBe(0);
+  });
+});
+
 describe('selectSourcesForDispatch', () => {
   const NOW = Date.parse('2026-05-22T12:00:00.000Z');
   const fresh = (id: string, agoMin: number) =>

test/cycle-last-full-cycle-at.test.ts

@@ -3,8 +3,10 @@
  * cycles. Closes codex round-1 P0-5 (write site for last_full_cycle_at
  * was unspecified pre-PR).
  *
- * Conditions for write:
- *   - opts.sourceId is set (legacy callers without sourceId skip the write)
+ * Conditions for write (keyed off `cycleSourceId` = opts.sourceId ?? the
+ * source resolved from brainDir, so the autopilot's inline cycle — brainDir
+ * set, no explicit sourceId — also advances the timestamp, #1993):
+ *   - a source resolves (explicit sourceId, or brainDir matches a source)
  *   - engine is non-null (no-DB path skips)
  *   - status is 'ok' | 'clean' | 'partial' (failed/skipped don't mark fresh)
  *   - dryRun is false
@@ -90,17 +92,45 @@ describe('runCycle last_full_cycle_at exit hook', () => {
     });
   });
 
-  test('legacy caller (no sourceId) does NOT write any source timestamp', async () => {
+  test('no explicit sourceId but brainDir resolves a source → writes the resolved source timestamp', async () => {
     await withEnv({ GBRAIN_HOME: gbrainHome }, async () => {
-      await seedSource('default-like');
-      // No sourceId passed; should remain untouched.
+      // The autopilot's inline cycle sets brainDir but passes no sourceId.
+      // runCycle resolves the source from brainDir (local_path match) into
+      // cycleSourceId and stamps last_full_cycle_at for it — otherwise
+      // cycle_freshness reports the brain stale even while the autopilot
+      // cycles every interval (#1993).
+      await seedSource('resolved-from-dir'); // local_path = brainDir
+      expect(await readLastFullCycleAt('resolved-from-dir')).toBeNull();
+
+      const t0 = Date.now();
+      const report = await runCycle(engine, {
+        brainDir,
+        phases: ['lint'],
+      });
+      expect(['ok', 'clean']).toContain(report.status);
+
+      const after = await readLastFullCycleAt('resolved-from-dir');
+      expect(after).not.toBeNull();
+      expect(new Date(after!).getTime()).toBeGreaterThanOrEqual(t0);
+    });
+  });
+
+  test('no sourceId and brainDir matches no source → does not write', async () => {
+    await withEnv({ GBRAIN_HOME: gbrainHome }, async () => {
+      // A source exists but its local_path does NOT match brainDir, so
+      // resolveSourceForDir returns undefined, cycleSourceId is undefined,
+      // and no per-source timestamp is written.
+      await engine.executeRaw(
+        `INSERT INTO sources (id, name, local_path, config, archived, created_at)
+         VALUES ('unmatched', 'unmatched', '/no/such/repo', '{}'::jsonb, false, NOW())
+         ON CONFLICT (id) DO UPDATE SET local_path = EXCLUDED.local_path`,
+        [],
+      );
       await runCycle(engine, {
         brainDir,
         phases: ['lint'],
       });
-      // No per-source write happens; default source's config stays empty.
-      const after = await readLastFullCycleAt('default-like');
-      expect(after).toBeNull();
+      expect(await readLastFullCycleAt('unmatched')).toBeNull();
     });
   });
 

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)', () => {