fix(schema): block scalars keep '#' as literal content

Inside a YAML block scalar '#' is content, not a comment; parseBlockScalar
was routing lines through stripComment/isBlank, truncating descriptions
like 'see issue #2029' and blanking comment-looking lines. Use the raw
line inside the scalar. Adds a pinning test.

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

src/commands/calibration.ts

@@ -19,7 +19,7 @@
  */
 
 import type { BrainEngine } from '../core/engine.ts';
-import { resolveCalibrationHolder, runPhaseCalibrationProfile } from '../core/cycle/calibration-profile.ts';
+import { runPhaseCalibrationProfile } from '../core/cycle/calibration-profile.ts';
 import { sourceScopeOpts, type OperationContext } from '../core/operations.ts';
 import type { GBrainConfig } from '../core/config.ts';
 import { GBrainError } from '../core/types.ts';
@@ -167,7 +167,7 @@ export async function runCalibration(
   config: GBrainConfig,
 ): Promise<void> {
   const { opts } = parseArgs(args);
-  const holder = await resolveCalibrationHolder(engine, opts.holder);
+  const holder = opts.holder ?? 'garry';
   // Resolve --source / GBRAIN_SOURCE / .gbrain-source so the (now reachable, #2035)
   // calibration command targets the right source in a multi-source brain instead
   // of always reading `default`. No signal → 'default' (prior behavior).
@@ -253,14 +253,14 @@ export async function getCalibrationProfileOp(
   ctx: OperationContext,
   params: { holder?: string },
 ): Promise<CalibrationProfileRow | null> {
-  if (params.holder !== undefined && (typeof params.holder !== 'string' || params.holder.length === 0)) {
+  const holder = params.holder ?? 'garry';
+  if (typeof holder !== 'string' || holder.length === 0) {
     throw new GBrainError(
       'INVALID_HOLDER',
       'get_calibration_profile.holder must be a non-empty string',
-      'pass holder="<slug>" or omit to default to the calibration.user_holder config (then "garry")',
+      'pass holder="<slug>" or omit to default to "garry"',
     );
   }
-  const holder = await resolveCalibrationHolder(ctx.engine, params.holder);
   const scope = sourceScopeOpts(ctx);
   return getLatestProfile(ctx.engine, { holder, ...scope });
 }

src/core/ai/anthropic-key.ts

@@ -18,12 +18,22 @@
 import { loadConfig } from '../config.ts';
 
 export function hasAnthropicKey(): boolean {
-  if (process.env.ANTHROPIC_API_KEY) return true;
+  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;
   try {
     const cfg = loadConfig();
-    if (cfg?.anthropic_api_key) return true;
+    if (cfg?.anthropic_api_key) return cfg.anthropic_api_key;
   } catch {
     // loadConfig may throw on first-run installs; treat as no key available.
   }
-  return false;
+  return undefined;
 }

src/core/config.ts

@@ -928,10 +928,6 @@ export const KNOWN_CONFIG_KEYS: readonly string[] = [
   // Emotional weight (v0.29)
   'emotional_weight.high_tags',
   'emotional_weight.user_holder',
-  // Calibration holder (#1726): persistent default for the nightly
-  // calibration_profile phase + `gbrain calibration`, symmetric with
-  // emotional_weight.user_holder. Falls back to 'garry' when unset.
-  'calibration.user_holder',
   // Cycle phase config
   'cycle.grade_takes.write_gstack_learnings',
   // Content sanity (v0.41)

src/core/cycle/calibration-profile.ts

@@ -96,7 +96,7 @@ export type PatternStatementsGenerator = (input: {
 export type BiasTagsGenerator = (patterns: string[]) => Promise<string[]>;
 
 export interface CalibrationProfileOpts extends BasePhaseOpts {
-  /** Holder to generate the profile for. Default: `calibration.user_holder` config, then 'garry'. */
+  /** Holder to generate the profile for. Default 'garry'. */
   holder?: string;
   /** Inject the patterns generator (tests). */
   patternsGenerator?: PatternStatementsGenerator;
@@ -194,26 +194,6 @@ export function parseBiasTagsOutput(raw: string): string[] {
     .slice(0, 4);
 }
 
-/**
- * #1726: resolve the calibration holder. Explicit param wins, then the
- * persistent `calibration.user_holder` config key (symmetric with
- * emotional_weight.user_holder), then the legacy 'garry' default. Fail-open:
- * a missing config table / mock engine without getConfig falls through.
- */
-export async function resolveCalibrationHolder(
-  engine: BrainEngine,
-  explicit?: string,
-): Promise<string> {
-  if (explicit) return explicit;
-  try {
-    const configured = await engine.getConfig('calibration.user_holder');
-    if (configured && configured.trim().length > 0) return configured.trim();
-  } catch {
-    // Config unavailable — use the legacy default.
-  }
-  return 'garry';
-}
-
 /** Pick the "loudest" pattern slot for the template fallback. */
 function pickFallbackSlots(scorecard: TakesScorecard): PatternStatementSlots {
   if (!scorecard || scorecard.resolved === 0) {
@@ -247,7 +227,7 @@ class CalibrationProfilePhase extends BaseCyclePhase {
     _ctx: OperationContext,
     opts: CalibrationProfileOpts,
   ): Promise<{ summary: string; details: Record<string, unknown>; status?: PhaseStatus }> {
-    const holder = await resolveCalibrationHolder(engine, opts.holder);
+    const holder = opts.holder ?? 'garry';
     const promptVersion = opts.promptVersion ?? CALIBRATION_PROFILE_PROMPT_VERSION;
     const modelId = opts.model ?? TIER_DEFAULTS.reasoning;
     const gradeCompletion = opts.gradeCompletion ?? 1.0;

src/core/extract-timeline-from-meetings.ts

@@ -68,14 +68,11 @@ export async function extractTimelineFromMeetings(
   // 1. Fetch all meeting pages (one round-trip).
   const sourceFilter = opts.sourceIdFilter ? `AND source_id = $1` : '';
   const meetingParams = opts.sourceIdFilter ? [opts.sourceIdFilter] : [];
-  // #2109: gbrain-base-v2's unify-types catch-all retypes meeting pages to
-  // `note` with frontmatter.legacy_type = 'meeting'. Match both spellings so
-  // the extractor keeps working on migrated (v2) brains, not just v1 ones.
   const meetings = await engine.executeRaw<MeetingRow>(
     `SELECT slug, source_id, title, effective_date, updated_at,
             compiled_truth, COALESCE(timeline, '') AS timeline
        FROM pages
-      WHERE (type = 'meeting' OR frontmatter ->> 'legacy_type' = 'meeting')
+      WHERE type = 'meeting'
         AND deleted_at IS NULL
         ${sourceFilter}
       ORDER BY effective_date DESC NULLS LAST, slug`,
@@ -97,7 +94,7 @@ export async function extractTimelineFromMeetings(
        JOIN pages pf ON pf.id = l.from_page_id
        JOIN pages pt ON pt.id = l.to_page_id
       WHERE l.link_type = 'attended'
-        AND (pf.type = 'meeting' OR pf.frontmatter ->> 'legacy_type' = 'meeting')
+        AND pf.type = 'meeting'
         AND pf.deleted_at IS NULL
         AND pt.deleted_at IS NULL`,
   );

src/core/minions/handlers/subagent.ts

@@ -48,6 +48,7 @@ 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';
@@ -186,7 +187,10 @@ 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).
-  const makeAnthropic = deps.makeAnthropic ?? (() => new Anthropic());
+  // 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 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,10 +4562,8 @@ const list_schema_packs: Operation = {
     const { existsSync, readdirSync } = await import('node:fs');
     const { join } = await import('node:path');
     const { gbrainPath } = await import('./config.ts');
-    // #1726: derive from the locator's registry instead of a hand-copied
-    // subset (which had frozen at 2 of 7 bundled packs).
-    const { BUNDLED_PACKS } = await import('./schema-pack/load-active.ts');
-    const bundled = [...BUNDLED_PACKS];
+    const { BUNDLED_PACK_NAMES } = await import('./schema-pack/bundled.ts');
+    const bundled = [...BUNDLED_PACK_NAMES];
     const installedDir = gbrainPath('schema-packs');
     const installed: string[] = [];
     if (existsSync(installedDir)) {

src/core/schema-pack/base/gbrain-base-v2.yaml

@@ -41,12 +41,6 @@ migration_from:
   pack: gbrain-base
   version: "1.x"
 
-# #2117 — cycle-phase participation. `phases:` is additive and pack-gated;
-# without this key extract_atoms is silently off on v2 brains even though
-# onboard + doctor recommend it (v2 declares the `atom` type it writes).
-phases:
-  - extract_atoms
-
 page_types:
   - name: person
     primitive: entity
@@ -325,10 +319,6 @@ page_types:
     extractable: false
     expert_routing: false
 
-# #2117 — inference rules ported from gbrain-base v1 so extract-ner keeps
-# working on v2 brains (it hard-skips with pack_unavailable when no
-# link_type declares an inference.regex). Same ReDoS-guarded sketch
-# regexes v1 ships; production matchers in link-extraction.ts still apply.
 link_types:
   - name: partner_of
     inverse: partner_of
@@ -338,24 +328,14 @@ link_types:
   - name: discusses
   - name: founded
     inverse: founded_by
-    inference:
-      regex: \b(founded|founder of|co-?founded|started)\b
   - name: works_at
     inverse: employs
-    inference:
-      regex: \b(works? at|employed by|works? for|joined|hired by|ceo of|cto of|cmo of)\b
   - name: invested_in
     inverse: investor_of
-    inference:
-      regex: \b(invested in|backed|seeded|funded|wrote a check)\b
   - name: sourced_from
   - name: derived_from
   - name: supersedes
   - name: redirects_to
-  # NOTE: v1's `attended` inference is page_type-bound to `meeting`, which
-  # v2 does not declare (lint: link_types_undeclared_page_type). Meeting
-  # pages retyped by unify-types are matched via frontmatter.legacy_type
-  # in extract-timeline-from-meetings (#2109) instead.
   - name: attended
     inverse: attended_by
   - name: authored

src/core/schema-pack/bundled.ts

@@ -0,0 +1,24 @@
+// 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,6 +37,7 @@ import {
   type ResolutionInput,
   type ResolutionResult,
 } from './registry.ts';
+import { isBundledPackName } from './bundled.ts';
 
 /**
  * Inputs the caller (operations.ts handler / engine query path) provides.
@@ -91,33 +92,8 @@ export function _resetPackLocatorForTests(): void {
  * Returns null when the pack is not found. Callers handle null by
  * throwing UnknownPackError with a paste-ready install hint.
  */
-// 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.
-//
-// #1726: exported so reporting surfaces (list_schema_packs) derive from the
-// same list the locator resolves — no more hand-copied 2-of-7 subsets.
-export const BUNDLED_PACKS: 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',
-];
-
 function defaultPackLocator(name: string): string | null {
-  if (BUNDLED_PACKS.includes(name)) {
+  if (isBundledPackName(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,6 +159,29 @@ 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) {
@@ -227,6 +250,10 @@ 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);
           }
@@ -257,6 +284,10 @@ 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,6 +65,7 @@ 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';
@@ -93,7 +94,7 @@ export class SchemaPackMutationError extends Error {
   }
 }
 
-export const BUNDLED_PACK_NAMES = new Set(['gbrain-base', 'gbrain-recommended', 'gbrain-base-v2']);
+export const BUNDLED_PACK_NAMES = new Set<string>(BUNDLED_PACK_NAME_LIST);
 
 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 } from '../../src/core/ai/anthropic-key.ts';
+import { hasAnthropicKey, resolveAnthropicKey } from '../../src/core/ai/anthropic-key.ts';
 
 const tmpDirs: string[] = [];
 function freshHome(withConfig?: Record<string, unknown>): string {
@@ -62,3 +62,35 @@ 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/calibration-profile.test.ts

@@ -32,7 +32,7 @@ interface CapturedSql {
   params: unknown[];
 }
 
-function buildMockEngine(opts: { scorecard: TakesScorecard; config?: Record<string, string> }): {
+function buildMockEngine(opts: { scorecard: TakesScorecard }): {
   engine: BrainEngine;
   captured: CapturedSql[];
 } {
@@ -42,9 +42,6 @@ function buildMockEngine(opts: { scorecard: TakesScorecard; config?: Record<stri
     async getScorecard() {
       return opts.scorecard;
     },
-    async getConfig(key: string) {
-      return opts.config?.[key] ?? null;
-    },
     async executeRaw<T>(sql: string, params?: unknown[]): Promise<T[]> {
       captured.push({ sql, params: params ?? [] });
       return [];
@@ -244,36 +241,6 @@ describe('runPhaseCalibrationProfile — phase integration', () => {
     expect(insert!.params[11]).toEqual(['over-confident-geography']); // active_bias_tags
   });
 
-  test('#1726: calibration.user_holder config drives the holder when no explicit opt', async () => {
-    const { engine, captured } = buildMockEngine({
-      scorecard: ENOUGH_RESOLVED_SCORECARD,
-      config: { 'calibration.user_holder': 'alice-example' },
-    });
-    await runPhaseCalibrationProfile(buildCtx(engine), {
-      patternsGenerator: async () => ['You call early-stage tactics well — 8 of 10 held up.'],
-      biasTagsGenerator: async () => [],
-      voiceGateJudge: passJudge,
-    });
-    const insert = captured.find(c => c.sql.includes('INSERT INTO calibration_profiles'));
-    expect(insert).toBeDefined();
-    expect(insert!.params[1]).toBe('alice-example'); // holder from config
-  });
-
-  test('#1726: explicit holder opt wins over calibration.user_holder config', async () => {
-    const { engine, captured } = buildMockEngine({
-      scorecard: ENOUGH_RESOLVED_SCORECARD,
-      config: { 'calibration.user_holder': 'alice-example' },
-    });
-    await runPhaseCalibrationProfile(buildCtx(engine), {
-      holder: 'charlie-example',
-      patternsGenerator: async () => ['You call early-stage tactics well — 8 of 10 held up.'],
-      biasTagsGenerator: async () => [],
-      voiceGateJudge: passJudge,
-    });
-    const insert = captured.find(c => c.sql.includes('INSERT INTO calibration_profiles'));
-    expect(insert!.params[1]).toBe('charlie-example');
-  });
-
   test('default model is a provider-prefixed id, persisted to model_id (#2451)', async () => {
     const { engine, captured } = buildMockEngine({ scorecard: ENOUGH_RESOLVED_SCORECARD });
     const patternsGenerator: PatternStatementsGenerator = async () => [

test/extract-timeline-legacy-type.test.ts

@@ -1,106 +0,0 @@
-// #2109 — gbrain-base-v2's unify-types retypes meeting pages to `note`
-// with frontmatter.legacy_type='meeting'. extract-timeline-from-meetings
-// used to hardcode type='meeting' and silently scan 0 meetings on migrated
-// brains. These tests fail without the legacy_type fallback in both SQL
-// sites (meeting walk + attended-edge join).
-
-import { afterAll, beforeAll, beforeEach, describe, expect, it } from 'bun:test';
-import { PGLiteEngine } from '../src/core/pglite-engine.ts';
-import { resetPgliteState } from './helpers/reset-pglite.ts';
-import { extractTimelineFromMeetings } from '../src/core/extract-timeline-from-meetings.ts';
-
-let engine: PGLiteEngine;
-
-beforeAll(async () => {
-  engine = new PGLiteEngine();
-  await engine.connect({});
-  await engine.initSchema();
-});
-
-afterAll(async () => {
-  await engine.disconnect();
-});
-
-beforeEach(async () => {
-  await resetPgliteState(engine);
-});
-
-async function insertPage(opts: {
-  slug: string;
-  type: string;
-  title: string;
-  effectiveDate?: string;
-  legacyType?: string;
-}): Promise<number> {
-  const frontmatterLiteral = opts.legacyType
-    ? `'{"legacy_type": "${opts.legacyType}"}'::jsonb`
-    : `'{}'::jsonb`;
-  const rows = await engine.executeRaw<{ id: number }>(
-    `INSERT INTO pages (slug, source_id, type, title, compiled_truth, timeline, effective_date, frontmatter)
-     VALUES ($1, 'default', $2, $3, '', '', $4, ${frontmatterLiteral})
-     RETURNING id`,
-    [opts.slug, opts.type, opts.title, opts.effectiveDate ?? null],
-  );
-  return rows[0]!.id;
-}
-
-describe('extractTimelineFromMeetings — legacy_type fallback (#2109)', () => {
-  it('scans pages retyped to note with legacy_type=meeting and walks their attended edges', async () => {
-    const meetingId = await insertPage({
-      slug: 'meetings/2026-01-05',
-      type: 'note', // post-unify-types shape on a gbrain-base-v2 brain
-      legacyType: 'meeting',
-      title: 'Weekly sync',
-      effectiveDate: '2026-01-05',
-    });
-    const personId = await insertPage({
-      slug: 'people/alice-example',
-      type: 'person',
-      title: 'Alice Example',
-    });
-    await engine.executeRaw(
-      `INSERT INTO links (from_page_id, to_page_id, link_type) VALUES ($1, $2, 'attended')`,
-      [meetingId, personId],
-    );
-
-    const result = await extractTimelineFromMeetings(engine);
-    expect(result.meetings_scanned).toBe(1);
-    expect(result.entries_created).toBe(1);
-    expect(result.entities_touched).toBe(1);
-    expect(result.batch_errors).toBe(0);
-  });
-
-  it('still scans pre-unify pages with type=meeting (v1 behavior preserved)', async () => {
-    const meetingId = await insertPage({
-      slug: 'meetings/2026-02-01',
-      type: 'meeting',
-      title: 'Board prep',
-      effectiveDate: '2026-02-01',
-    });
-    const personId = await insertPage({
-      slug: 'people/charlie-example',
-      type: 'person',
-      title: 'Charlie Example',
-    });
-    await engine.executeRaw(
-      `INSERT INTO links (from_page_id, to_page_id, link_type) VALUES ($1, $2, 'attended')`,
-      [meetingId, personId],
-    );
-
-    const result = await extractTimelineFromMeetings(engine);
-    expect(result.meetings_scanned).toBe(1);
-    expect(result.entries_created).toBe(1);
-  });
-
-  it('does not scan unrelated note pages without legacy_type=meeting', async () => {
-    await insertPage({
-      slug: 'notes/random',
-      type: 'note',
-      title: 'Random note',
-      effectiveDate: '2026-03-01',
-    });
-    const result = await extractTimelineFromMeetings(engine);
-    expect(result.meetings_scanned).toBe(0);
-    expect(result.entries_created).toBe(0);
-  });
-});

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('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',
-    );
+  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');
     for (const name of PACK_NAMES) {
-      expect(loadActiveSrc).toContain(`'${name}'`);
+      expect(BUNDLED_PACK_NAMES).toContain(name);
     }
   });
 });

test/operations-schema-pack.test.ts

@@ -149,22 +149,12 @@ 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');
     });
   });
-
-  it('reports the full bundled registry, not a hand-copied subset (#1726)', async () => {
-    await withEnv({ GBRAIN_HOME: tmpDir }, async () => {
-      const { BUNDLED_PACKS } = await import('../src/core/schema-pack/load-active.ts');
-      const result = await operationsByName.list_schema_packs!.handler(ctxOf(), {}) as { bundled: string[] };
-      expect(result.bundled.slice().sort()).toEqual([...BUNDLED_PACKS].sort());
-      // The lens packs that declare extract_atoms/synthesize_concepts phases
-      // were the ones dropped by the frozen 2-pack literal.
-      for (const name of ['gbrain-creator', 'gbrain-everything', 'gbrain-base-v2']) {
-        expect(result.bundled).toContain(name);
-      }
-    });
-  });
 });
 
 // ── schema_stats ───────────────────────────────────────────────────────

test/schema-cli.test.ts

@@ -64,11 +64,14 @@ describe('gbrain schema CLI (Phase C)', () => {
     expect(r.stdout + r.stderr).toMatch(/schema|active|list|show|validate|use/i);
   });
 
-  test('schema list shows gbrain-base bundled', () => {
+  test('schema list shows all bundled packs', () => {
     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', () => {
@@ -97,6 +100,40 @@ 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-base-v2-capabilities.test.ts

@@ -1,40 +0,0 @@
-// #2117 — gbrain-base-v2 shipped with no `phases:` declaration and zero
-// link_types[].inference regexes, so extract_atoms was silently pack-gated
-// off and extract-ner returned pack_unavailable on the bundled default pack.
-// These assertions fail against the pre-fix yaml.
-
-import { describe, expect, it } from 'bun:test';
-import { join } from 'node:path';
-import { loadPackFromFile } from '../src/core/schema-pack/loader.ts';
-import { linkTypesUndeclared } from '../src/core/schema-pack/lint-rules.ts';
-
-const V2_PATH = join(import.meta.dir, '..', 'src', 'core', 'schema-pack', 'base', 'gbrain-base-v2.yaml');
-
-describe('gbrain-base-v2 capability parity (#2117)', () => {
-  const manifest = loadPackFromFile(V2_PATH);
-
-  it('declares the extract_atoms cycle phase', () => {
-    expect(manifest.phases ?? []).toContain('extract_atoms');
-  });
-
-  it('ships at least one link_type inference regex so extract-ner is not pack_unavailable', () => {
-    // Mirrors the extract-ner hasRegex predicate exactly.
-    const hasRegex = manifest.link_types.some(
-      (lt) => lt.inference && typeof lt.inference === 'object' && 'regex' in lt.inference,
-    );
-    expect(hasRegex).toBe(true);
-  });
-
-  it('ports the v1 inference verbs it declares link types for', () => {
-    const withRegex = manifest.link_types
-      .filter((lt) => lt.inference?.regex)
-      .map((lt) => lt.name)
-      .sort();
-    expect(withRegex).toEqual(['founded', 'invested_in', 'works_at']);
-  });
-
-  it('inference rules pass the undeclared-page-type lint (no meeting-bound inference)', async () => {
-    const issues = await linkTypesUndeclared(manifest);
-    expect(issues).toEqual([]);
-  });
-});

test/schema-pack-loader.test.ts

@@ -345,6 +345,34 @@ 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');
@@ -374,6 +402,27 @@ 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,7 +103,10 @@ 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);
-    expect(BUNDLED_PACK_NAMES.size).toBe(3);
+    // 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);
   });
 
   it('rejects gbrain-base-v2 with PACK_READONLY (bundled guard)', () => {