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

@@ -466,11 +466,6 @@ async function main() {
     const result = JSON.parse(JSON.stringify(rawResult, bigintToStringReplacer));
     const output = formatResult(op.name, result);
     if (output) process.stdout.write(output);
-    // #1484 — invisible-miss hint: a bare query/search that hit zero results
-    // on a multi-source brain tells the user (stderr) which source it
-    // actually searched and how to widen the scope.
-    const hint = await sourceScopeHint(op.name, params, ctx.sourceId, engine, result);
-    if (hint) console.error(hint);
   } catch (e: unknown) {
     // v0.42.20.0 (codex D4): on error, set exitCode + return so the `finally`
     // STILL runs (drains every background-work sink + disconnects). A bare
@@ -842,44 +837,6 @@ async function makeContext(engine: BrainEngine, params: Record<string, unknown>)
   };
 }
 
-/**
- * #1484 — a bare `gbrain query`/`search` silently scopes to the resolved
- * source (usually 'default'); on a multi-source brain a zero-hit run looks
- * identical to "the brain doesn't know this" even when the answer lives in
- * another source. Returns a stderr hint when (a) the op is query/search,
- * (b) it returned zero results, (c) the caller did NOT scope explicitly
- * (--source / --source-id / --all-sources), and (d) the brain has >1
- * registered source. Best-effort: any lookup failure returns null.
- *
- * Exported for tests (same import-safety contract as formatResult).
- */
-export async function sourceScopeHint(
-  opName: string,
-  params: Record<string, unknown>,
-  sourceId: string,
-  engine: BrainEngine,
-  result: unknown,
-): Promise<string | null> {
-  if (opName !== 'query' && opName !== 'search') return null;
-  if (!Array.isArray(result) || result.length > 0) return null;
-  // Explicit scoping (flag tier) = user intent; don't second-guess it.
-  if (params.source || params.source_id || params.all_sources) return null;
-  if (sourceId === '__all__') return null;
-  try {
-    const rows = await engine.executeRaw<{ n: number }>(
-      `SELECT count(*)::int AS n FROM sources`,
-    );
-    const n = Number(rows[0]?.n ?? 0);
-    if (n <= 1) return null;
-    return (
-      `Hint: this brain has ${n} sources; you searched only "${sourceId}". ` +
-      `Retry with --source-id __all__ (all sources) or --source-id <id>.`
-    );
-  } catch {
-    return null; // hint is best-effort; never fail the query over it
-  }
-}
-
 // Exported for tests (same import-safety contract as cliAliases/printOpHelp).
 export function formatResult(opName: string, result: unknown): string {
   switch (opName) {

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/ai/gateway.ts

@@ -1000,24 +1000,9 @@ const voyageCompatFetch = (async (input: RequestInfo | URL, init?: RequestInit)
   // Voyage diverges from OpenAI in two places that break the parser:
   //   - `embedding` is a base64 string (SDK schema expects `number[]`)
   //   - `usage` lacks `prompt_tokens` (SDK schema requires it when usage present)
-  //
-  // #1610: read the body ONCE via text() and JSON.parse it. The pre-fix
-  // `await resp.clone().json()` truncated large bodies on bun < 1.1.27
-  // (oven-sh/bun#6348) — the parse threw, the catch fell back to the raw
-  // response, and multi-chunk pages died with "Invalid JSON response".
-  // Every JSON return path below rebuilds the Response so a stale
-  // Content-Length/Content-Encoding header from the original can't lie
-  // about the rewritten body.
-  const bodyText = await resp.text();
-  const rebuild = (body: string) => {
-    const headers = new Headers(resp.headers);
-    headers.delete('content-length');
-    headers.delete('content-encoding');
-    return new Response(body, { status: resp.status, statusText: resp.statusText, headers });
-  };
   try {
-    const json: any = JSON.parse(bodyText);
-    if (!json || typeof json !== 'object') return rebuild(bodyText);
+    const json: any = await resp.clone().json();
+    if (!json || typeof json !== 'object') return resp;
     let modified = false;
     if (Array.isArray(json.data)) {
       for (const item of json.data) {
@@ -1052,19 +1037,22 @@ const voyageCompatFetch = (async (input: RequestInfo | URL, init?: RequestInit)
         : 0;
       modified = true;
     }
-    if (!modified) return rebuild(bodyText);
-    return rebuild(JSON.stringify(json));
+    if (!modified) return resp;
+    return new Response(JSON.stringify(json), {
+      status: resp.status,
+      statusText: resp.statusText,
+      headers: resp.headers,
+    });
   } catch (err) {
     // OOM-cap throws MUST propagate. The catch is here for "Voyage returned
     // JSON I can't reshape" (parse error, unexpected schema) — falling back
-    // to the original body is correct in that case. Letting the
+    // to the original response is correct in that case. Letting the
     // too-large response through here would defeat the entire purpose of
     // Layer 2 (the per-embedding cap that fires when Content-Length wasn't
     // available to Layer 1).
     if (err instanceof VoyageResponseTooLargeError) throw err;
-    // If parsing/transformation fails, pass the original body through
-    // (rebuilt — resp's body stream is already consumed by text()).
-    return rebuild(bodyText);
+    // If parsing/transformation fails, fall back to the original response.
+    return resp;
   }
 }) as unknown as typeof fetch;
 
@@ -1204,21 +1192,9 @@ const zeroEntropyCompatFetch = (async (input: RequestInfo | URL, init?: RequestI
   // validates. Also map usage.total_tokens → prompt_tokens (SDK requires
   // prompt_tokens when `usage` is present — same divergence Voyage hit at
   // gateway.ts:655).
-  //
-  // #1610: read the body ONCE via text() + JSON.parse — `resp.clone().json()`
-  // truncated large bodies on bun < 1.1.27 (oven-sh/bun#6348), so the parse
-  // threw and the catch fell back to the RAW ZE `{results: ...}` shape, which
-  // the AI SDK schema rejects → "Invalid JSON response" on multi-chunk pages.
-  const bodyText = await resp.text();
-  const rebuild = (body: string) => {
-    const headers = new Headers(resp.headers);
-    headers.delete('content-length');
-    headers.delete('content-encoding');
-    return new Response(body, { status: resp.status, statusText: resp.statusText, headers });
-  };
   try {
-    const json: any = JSON.parse(bodyText);
-    if (!json || typeof json !== 'object') return rebuild(bodyText);
+    const json: any = await resp.clone().json();
+    if (!json || typeof json !== 'object') return resp;
     let modified = false;
     if (Array.isArray(json.results) && !Array.isArray(json.data)) {
       // Layer 2 OOM cap — per-embedding size. ZE returns float[] arrays,
@@ -1252,25 +1228,20 @@ const zeroEntropyCompatFetch = (async (input: RequestInfo | URL, init?: RequestI
       // SDK also expects total_tokens; ZE provides it directly.
       modified = true;
     }
-    if (!modified) return rebuild(bodyText);
-    return rebuild(JSON.stringify(json));
+    if (!modified) return resp;
+    return new Response(JSON.stringify(json), {
+      status: resp.status,
+      statusText: resp.statusText,
+      headers: resp.headers,
+    });
   } catch (err) {
     // OOM-cap throws MUST propagate. Voyage's pattern: instanceof check on
     // its own tagged class. Same here — only rethrow our own cap class.
     if (err instanceof ZeroEntropyResponseTooLargeError) throw err;
-    return rebuild(bodyText);
+    return resp;
   }
 }) as unknown as typeof fetch;
 
-/**
- * Test-only seams (#1610): the compat shims are module-private closures;
- * exporting them lets tests drive the response-rewrite paths behaviorally
- * (truncating clone(), stale Content-Length) without a live provider.
- * Same pattern as __getShrinkStateForTests.
- */
-export const __voyageCompatFetchForTests = voyageCompatFetch;
-export const __zeroEntropyCompatFetchForTests = zeroEntropyCompatFetch;
-
 /**
  * Generic asymmetric-embedding shim for openai-compatible recipes that
  * ship no compat fetch of their own (llama-server, litellm, ollama, ...).

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

@@ -499,7 +499,7 @@ export function linkReadScopeOpts(ctx: OperationContext): { sourceId?: string; s
  * FAIL-CLOSED: anything not strictly `ctx.remote === false` is untrusted.
  *
  * This is the SINGLE resolver for every read op that accepts a per-call
- * `source_id` / `all_sources` parameter (query, search, code_callers, code_callees,
+ * `source_id` / `all_sources` parameter (query, code_callers, code_callees,
  * get_page, search_by_image, code_blast, code_flow). Inlining the `__all__`
  * branch per handler is the bug class that leaked cross-source reads (#1924,
  * #1371): a remote client could pass `source_id: '__all__'` to opt out of its
@@ -1442,24 +1442,13 @@ const search: Operation = {
     limit: { type: 'number', description: 'Max results (default 20)' },
     offset: { type: 'number', description: 'Skip first N results (for pagination)' },
     mode: { type: 'string', description: 'Search mode (conservative|balanced|tokenmax). Local callers only.' },
-    source_id: {
-      type: 'string',
-      description:
-        "Scope search to a single source. Defaults to OperationContext.sourceId. Pass '__all__' to span every source for trusted local callers; for remote callers '__all__' spans only your granted sources.",
-    },
-    all_sources: { type: 'boolean', description: "Span sources (equivalent to source_id=__all__): every source locally, your grant remotely." },
   },
   handler: async (ctx, p) => {
     const startedAt = Date.now();
     const queryText = p.query as string;
     const limit = (p.limit as number) || 20;
     const offset = (p.offset as number) || 0;
-    // #1484 follow-up: route through the canonical fail-closed resolver so
-    // `--source-id __all__` / `all_sources` behave the same as on `query`
-    // (the zero-hit CLI hint advises exactly that retry). Without a per-call
-    // param, `search` silently ignored --source-id — the retry looked like
-    // a genuine miss.
-    const scope = resolveRequestedScope(ctx, p.source_id as string | undefined, p.all_sources === true);
+    const scope = sourceScopeOpts(ctx);
 
     // T4/D5 — per-call mode honored ONLY for trusted/local callers so a remote
     // OAuth client can't escalate to the costly tokenmax bundle. Local + unknown
@@ -4573,7 +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');
-    const bundled = ['gbrain-base', 'gbrain-recommended'];
+    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/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.
@@ -92,28 +93,7 @@ export function _resetPackLocatorForTests(): void {
  * throwing UnknownPackError with a paste-ready install hint.
  */
 function defaultPackLocator(name: string): string | null {
-  // 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)) {
+  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. */

src/core/search/hybrid.ts

@@ -1323,18 +1323,8 @@ export async function hybridSearch(
       if (effectiveModality === 'both' && imageVectorList !== null) {
         vectorLists = [...vectorLists, imageVectorList];
       }
-    } catch (err) {
-      // Embedding/vector failure is non-fatal — fall back to keyword-only —
-      // but say WHY (#1626): this arm only runs when the embedding provider
-      // probed available, so a throw here is a real failure (embed timeout,
-      // transient pooler error on the searchVector fan-out). Pre-fix the bare
-      // catch made a cross-source `--source __all__` run silently collapse to
-      // keyword-only/"No results" with zero diagnostics.
-      warnOncePerProcess(
-        'hybrid-vector-arm-failed',
-        `[gbrain] vector arm failed (fail-open, keyword-only fallback): ` +
-          `${err instanceof Error ? err.message : String(err)}`,
-      );
+    } catch {
+      // Embedding failure is non-fatal, fall back to keyword-only
     }
   }
 

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/ai/compat-fetch-body-read.serial.test.ts

@@ -1,115 +0,0 @@
-/**
- * #1610 — Voyage/ZeroEntropy compat shims must read the response body ONCE
- * via text() instead of `resp.clone().json()`.
- *
- * On bun < 1.1.27, Response.clone() truncates large bodies (oven-sh/bun#6348):
- * the clone().json() parse threw, the shim's catch fell back to the ORIGINAL
- * response — whose wire shape (ZE `{results: ...}`, Voyage base64 embeddings)
- * the AI SDK's openai-compatible Zod schema rejects — and multi-chunk pages
- * failed with "Invalid JSON response".
- *
- * These tests simulate the truncating clone() and assert the shims still
- * return the fully rewritten body. They also pin that the rewritten Response
- * does NOT carry the original (now stale) Content-Length header, which lied
- * about the rewritten body's size (gateway.ts previously copied
- * `headers: resp.headers` verbatim).
- */
-
-import { afterEach, describe, expect, test } from 'bun:test';
-import {
-  __voyageCompatFetchForTests,
-  __zeroEntropyCompatFetchForTests,
-} from '../../src/core/ai/gateway.ts';
-
-const origFetch = globalThis.fetch;
-afterEach(() => {
-  globalThis.fetch = origFetch;
-});
-
-/** Build a Response whose clone() truncates the body (bun < 1.1.27 behavior). */
-function truncatingCloneResponse(body: string): Response {
-  const headers = {
-    'content-type': 'application/json',
-    // Deliberately stale after any rewrite: the original wire body's length.
-    'content-length': String(Buffer.byteLength(body)),
-  };
-  const resp = new Response(body, { status: 200, headers });
-  (resp as any).clone = () =>
-    new Response(body.slice(0, 32), { status: 200, headers });
-  return resp;
-}
-
-describe('voyageCompatFetch — single body read (#1610)', () => {
-  test('rewrites base64 embeddings even when clone() truncates the body', async () => {
-    const floats = new Float32Array([0.5, 0.25, -1]);
-    const b64 = Buffer.from(floats.buffer).toString('base64');
-    const wireBody = JSON.stringify({
-      object: 'list',
-      data: [{ object: 'embedding', embedding: b64, index: 0 }],
-      model: 'voyage-3',
-      usage: { total_tokens: 7 },
-    });
-    globalThis.fetch = (async () => truncatingCloneResponse(wireBody)) as unknown as typeof fetch;
-
-    const out = await __voyageCompatFetchForTests('https://api.voyageai.com/v1/embeddings', {
-      method: 'POST',
-      body: JSON.stringify({ input: ['hello'], model: 'voyage-3' }),
-      headers: { 'content-type': 'application/json' },
-    });
-
-    const json: any = await out.json();
-    expect(Array.from(json.data[0].embedding)).toEqual([0.5, 0.25, -1]);
-    expect(json.usage.prompt_tokens).toBe(7);
-    // Stale Content-Length from the wire body must not survive the rewrite.
-    expect(out.headers.get('content-length')).toBeNull();
-    expect(out.headers.get('content-encoding')).toBeNull();
-  });
-});
-
-describe('zeroEntropyCompatFetch — single body read (#1610)', () => {
-  test('rewrites {results} → {data} even when clone() truncates the body', async () => {
-    const wireBody = JSON.stringify({
-      results: [{ embedding: [0.1, 0.2] }, { embedding: [0.3, 0.4] }],
-      usage: { total_bytes: 42, total_tokens: 9 },
-    });
-    let fetchedUrl = '';
-    globalThis.fetch = (async (url: string | URL | Request) => {
-      fetchedUrl = String(url);
-      return truncatingCloneResponse(wireBody);
-    }) as unknown as typeof fetch;
-
-    const out = await __zeroEntropyCompatFetchForTests('https://api.zeroentropy.dev/v1/embeddings', {
-      method: 'POST',
-      body: JSON.stringify({ input: ['hello'], model: 'zembed-1' }),
-      headers: { 'content-type': 'application/json' },
-    });
-
-    expect(fetchedUrl.endsWith('/v1/models/embed')).toBe(true);
-    const json: any = await out.json();
-    // The AI SDK schema requires {data: [{embedding, index}]} — the raw ZE
-    // {results} fallback is exactly the pre-fix "Invalid JSON response".
-    expect(json.results).toBeUndefined();
-    expect(json.data).toHaveLength(2);
-    expect(json.data[0]).toEqual({ object: 'embedding', embedding: [0.1, 0.2], index: 0 });
-    expect(json.data[1].index).toBe(1);
-    expect(json.usage.prompt_tokens).toBe(9);
-    expect(out.headers.get('content-length')).toBeNull();
-  });
-
-  test('non-JSON body falls back to the original bytes (rebuilt, still readable)', async () => {
-    const wireBody = 'plain text, not json';
-    globalThis.fetch = (async () =>
-      new Response(wireBody, {
-        status: 200,
-        headers: { 'content-type': 'application/json' },
-      })) as unknown as typeof fetch;
-
-    const out = await __zeroEntropyCompatFetchForTests('https://api.zeroentropy.dev/v1/embeddings', {
-      method: 'POST',
-      body: JSON.stringify({ input: ['hello'] }),
-    });
-    // Body was consumed by the shim's single read; the fallback must
-    // rebuild a readable Response rather than return the drained original.
-    expect(await out.text()).toBe(wireBody);
-  });
-});

test/ai/zeroentropy-compat-fetch.test.ts

@@ -98,18 +98,16 @@ describe('zeroEntropyCompatFetch — OOM caps', () => {
     expect(src).toMatch(/MAX_ZEROENTROPY_RESPONSE_BYTES\s*=\s*256\s*\*\s*1024\s*\*\s*1024/);
   });
 
-  test('Layer 1: Content-Length pre-check before the body is read', async () => {
+  test('Layer 1: Content-Length pre-check before resp.clone().json()', async () => {
     const src = await Bun.file(GATEWAY_PATH).text();
     // Find the zeroEntropyCompatFetch block bounds, then assert ordering
-    // within it (mirroring the voyage cap test pattern). #1610 moved the
-    // body read from `resp.clone().json()` to a single `resp.text()` (bun
-    // < 1.1.27 truncates clone()d bodies, oven-sh/bun#6348).
+    // within it (mirroring the voyage cap test pattern).
     const zeFetchStart = src.indexOf('const zeroEntropyCompatFetch');
     expect(zeFetchStart).toBeGreaterThan(0);
-    const block = src.slice(zeFetchStart, zeFetchStart + 9000);
+    const block = src.slice(zeFetchStart, zeFetchStart + 8000);
 
     const preCheckIdx = block.indexOf("resp.headers.get('content-length')");
-    const jsonParseIdx = block.indexOf('const bodyText = await resp.text()');
+    const jsonParseIdx = block.indexOf('await resp.clone().json()');
     expect(preCheckIdx).toBeGreaterThan(0);
     expect(jsonParseIdx).toBeGreaterThan(0);
     // The pre-check MUST appear before the JSON parse — Voyage's lesson

test/cli-source-scope-hint.test.ts

@@ -1,61 +0,0 @@
-/**
- * #1484 — invisible-miss hint. A bare `gbrain query` resolves to a single
- * source (usually 'default'); on a multi-source brain a zero-hit run gave no
- * signal that the answer might live in another source. sourceScopeHint
- * returns the stderr hint exactly when: query/search op + zero results +
- * no explicit scoping param + >1 registered source.
- */
-
-import { describe, expect, test } from 'bun:test';
-import { sourceScopeHint } from '../src/cli.ts';
-import type { BrainEngine } from '../src/core/engine.ts';
-
-function fakeEngine(sourceCount: number, fail = false): BrainEngine {
-  return {
-    executeRaw: async () => {
-      if (fail) throw new Error('sources table missing');
-      return [{ n: sourceCount }];
-    },
-  } as unknown as BrainEngine;
-}
-
-describe('sourceScopeHint (#1484)', () => {
-  test('fires on a bare zero-hit query against a multi-source brain', async () => {
-    const hint = await sourceScopeHint('query', {}, 'default', fakeEngine(3), []);
-    expect(hint).toContain('3 sources');
-    expect(hint).toContain('"default"');
-    expect(hint).toContain('--source-id __all__');
-  });
-
-  test('fires for search too', async () => {
-    const hint = await sourceScopeHint('search', {}, 'wiki', fakeEngine(2), []);
-    expect(hint).toContain('"wiki"');
-  });
-
-  test('silent when results were found', async () => {
-    expect(await sourceScopeHint('query', {}, 'default', fakeEngine(3), [{ slug: 'a' }])).toBeNull();
-  });
-
-  test('silent when the caller scoped explicitly', async () => {
-    expect(await sourceScopeHint('query', { source_id: 'wiki' }, 'wiki', fakeEngine(3), [])).toBeNull();
-    expect(await sourceScopeHint('query', { source: 'wiki' }, 'wiki', fakeEngine(3), [])).toBeNull();
-    expect(await sourceScopeHint('query', { all_sources: true }, '__all__', fakeEngine(3), [])).toBeNull();
-  });
-
-  test('silent when the resolved scope is already __all__', async () => {
-    expect(await sourceScopeHint('query', {}, '__all__', fakeEngine(3), [])).toBeNull();
-  });
-
-  test('silent on a single-source brain', async () => {
-    expect(await sourceScopeHint('query', {}, 'default', fakeEngine(1), [])).toBeNull();
-  });
-
-  test('silent for non-search ops and non-array results', async () => {
-    expect(await sourceScopeHint('get_stats', {}, 'default', fakeEngine(3), [])).toBeNull();
-    expect(await sourceScopeHint('query', {}, 'default', fakeEngine(3), { rows: [] })).toBeNull();
-  });
-
-  test('best-effort: sources lookup failure returns null, never throws', async () => {
-    expect(await sourceScopeHint('query', {}, 'default', fakeEngine(3, true), [])).toBeNull();
-  });
-});

test/hybrid-vector-arm-warn.serial.test.ts

@@ -1,77 +0,0 @@
-/**
- * #1626 — hybridSearch's text-vector arm must not fail DARK.
- *
- * The arm only runs when the embedding provider probed available, so a throw
- * inside it (embed timeout, transient pooler error on searchVector) is a real
- * failure. Pre-fix, a bare `catch {}` swallowed it and the run silently
- * collapsed to keyword-only — under `--source __all__` on a strained pooler
- * that read as a non-deterministic "No results". The fix logs the swallowed
- * reason via warnOncePerProcess while keeping the keyword fallback.
- */
-
-import { afterAll, beforeAll, describe, expect, test } from 'bun:test';
-import { PGLiteEngine } from '../src/core/pglite-engine.ts';
-import { hybridSearch } from '../src/core/search/hybrid.ts';
-import {
-  __setEmbedTransportForTests,
-  configureGateway,
-  resetGateway,
-} from '../src/core/ai/gateway.ts';
-import { _resetWarnOnceForTests } from '../src/core/utils.ts';
-
-let engine: PGLiteEngine;
-const origWarn = console.warn;
-
-beforeAll(async () => {
-  // Pin the gateway to OpenAI with a stub key (put-page-provenance pattern):
-  // embed() runs instantiateEmbedding — which requires OPENAI_API_KEY — BEFORE
-  // the stubbed transport is reached. Without this, a keyless CI environment
-  // throws the config error instead of the transport's, and the assertion on
-  // the swallowed reason fails. The key never leaves the process.
-  configureGateway({
-    embedding_model: 'openai:text-embedding-3-large',
-    embedding_dimensions: 1536,
-    env: { ...process.env, OPENAI_API_KEY: process.env.OPENAI_API_KEY || 'sk-test-stub' },
-  });
-  engine = new PGLiteEngine();
-  await engine.connect({});
-  await engine.initSchema();
-  await engine.putPage('people/alice-example', {
-    type: 'person',
-    title: 'Alice Example',
-    compiled_truth: 'Alice Example is a test person for the vector-arm warn test.',
-  });
-});
-
-afterAll(async () => {
-  console.warn = origWarn;
-  __setEmbedTransportForTests(null);
-  resetGateway();
-  await engine.disconnect();
-});
-
-describe('hybridSearch vector-arm failure telemetry (#1626)', () => {
-  test('embed failure logs the swallowed reason and falls back to keyword', async () => {
-    _resetWarnOnceForTests();
-    // Installing a transport makes isAvailable('embedding') true (test-seam
-    // fast path), so the vector arm RUNS — and then throws.
-    __setEmbedTransportForTests(() => {
-      throw new Error('pooler exploded mid-fanout');
-    });
-    const warnings: string[] = [];
-    console.warn = (...args: unknown[]) => {
-      warnings.push(args.map(String).join(' '));
-    };
-    try {
-      const results = await hybridSearch(engine, 'alice');
-      // Keyword fallback still returns results — fail-open preserved.
-      expect(results.some((r) => r.slug === 'people/alice-example')).toBe(true);
-    } finally {
-      console.warn = origWarn;
-      __setEmbedTransportForTests(null);
-    }
-    const armWarnings = warnings.filter((w) => w.includes('vector arm failed'));
-    expect(armWarnings).toHaveLength(1);
-    expect(armWarnings[0]).toContain('pooler exploded mid-fanout');
-  });
-});

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,6 +149,9 @@ 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,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-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)', () => {

test/search-op-source-scope.test.ts

@@ -1,87 +0,0 @@
-/**
- * #1484 follow-up — the `search` op must honor per-call `source_id` /
- * `all_sources` through the canonical fail-closed resolver
- * (resolveRequestedScope), exactly like `query` does.
- *
- * Pre-fix, `search` had no source_id param at all: the zero-hit CLI hint
- * advised "retry with --source-id __all__", the flag parsed into params,
- * NOTHING consumed it, and the retry silently re-ran the same single-source
- * search — an invisible false negative (and the retry's params.source_id
- * suppressed the hint, so the user got no second warning).
- */
-
-import { describe, expect, test } from 'bun:test';
-import { operationsByName } from '../src/core/operations.ts';
-import type { OperationContext } from '../src/core/operations.ts';
-import type { BrainEngine } from '../src/core/engine.ts';
-
-const searchOp = operationsByName['search'];
-
-/** Fake engine: keyword-only config so the handler's scope goes straight to
- *  searchKeyword, where we capture the opts it was called with. */
-function makeCtx(remote: boolean, allowedSources?: string[]) {
-  const captured: { opts?: Record<string, unknown> } = {};
-  const engine = {
-    getConfig: async (key: string) => (key === 'search.mcp_keyword_only' ? 'true' : null),
-    searchKeyword: async (_q: string, opts: Record<string, unknown>) => {
-      captured.opts = opts;
-      return [];
-    },
-  } as unknown as BrainEngine;
-  const ctx = {
-    engine,
-    config: { engine: 'pglite' },
-    logger: { info: () => {}, warn: () => {}, error: () => {} },
-    dryRun: false,
-    remote,
-    sourceId: 'default',
-    ...(allowedSources ? { auth: { allowedSources } } : {}),
-  } as unknown as OperationContext;
-  return { ctx, captured };
-}
-
-describe('search op per-call source scope (#1484 follow-up)', () => {
-  test('op declares source_id + all_sources params (the CLI hint advises them)', () => {
-    expect(searchOp.params.source_id).toBeDefined();
-    expect(searchOp.params.all_sources).toBeDefined();
-  });
-
-  test('default: scopes to ctx.sourceId', async () => {
-    const { ctx, captured } = makeCtx(false);
-    await searchOp.handler(ctx, { query: 'x' });
-    expect(captured.opts?.sourceId).toBe('default');
-  });
-
-  test("local + source_id '__all__' spans the whole brain (no source filter)", async () => {
-    const { ctx, captured } = makeCtx(false);
-    await searchOp.handler(ctx, { query: 'x', source_id: '__all__' });
-    expect(captured.opts?.sourceId).toBeUndefined();
-    expect(captured.opts?.sourceIds).toBeUndefined();
-  });
-
-  test('local + all_sources=true spans the whole brain', async () => {
-    const { ctx, captured } = makeCtx(false);
-    await searchOp.handler(ctx, { query: 'x', all_sources: true });
-    expect(captured.opts?.sourceId).toBeUndefined();
-    expect(captured.opts?.sourceIds).toBeUndefined();
-  });
-
-  test('explicit source_id wins over ctx.sourceId', async () => {
-    const { ctx, captured } = makeCtx(false);
-    await searchOp.handler(ctx, { query: 'x', source_id: 'wiki' });
-    expect(captured.opts?.sourceId).toBe('wiki');
-  });
-
-  test("remote + '__all__' collapses to the caller's grant (fail-closed)", async () => {
-    const { ctx, captured } = makeCtx(true, ['wiki', 'essays']);
-    await searchOp.handler(ctx, { query: 'x', source_id: '__all__' });
-    expect(captured.opts?.sourceIds).toEqual(['wiki', 'essays']);
-  });
-
-  test('remote + out-of-grant source_id is denied', async () => {
-    const { ctx } = makeCtx(true, ['wiki']);
-    await expect(searchOp.handler(ctx, { query: 'x', source_id: 'secrets' })).rejects.toThrow(
-      /outside your granted sources/,
-    );
-  });
-});

test/voyage-response-cap.test.ts

@@ -34,7 +34,7 @@ describe('v0.31.8 — voyage Content-Length pre-check + per-item cap', () => {
     expect(source).toMatch(/MAX_VOYAGE_RESPONSE_BYTES\s*=\s*256\s*\*\s*1024\s*\*\s*1024/);
   });
 
-  test('Layer 1: Content-Length pre-check fires BEFORE the body is read (D10 OOM defense)', async () => {
+  test('Layer 1: Content-Length pre-check fires BEFORE resp.clone().json() (D10 OOM defense)', async () => {
     const source = await Bun.file(new URL('../src/core/ai/gateway.ts', import.meta.url)).text();
     // Anchor relative to the post-fetch handler block. The function declaration
     // contains an OUTBOUND request body section earlier; we want to verify
@@ -47,10 +47,8 @@ describe('v0.31.8 — voyage Content-Length pre-check + per-item cap', () => {
     // doesn't pin to comment text.
     const preCheckIdx = inboundBlock.indexOf("resp.headers.get('content-length')");
     // Use the full lvalue assignment so the match doesn't accidentally hit
-    // comment text that mentions the body read for context. (#1610 moved the
-    // read from `resp.clone().json()` to a single `resp.text()` — bun <
-    // 1.1.27 truncates clone()d bodies, oven-sh/bun#6348.)
-    const jsonParseIdx = inboundBlock.indexOf('const bodyText = await resp.text()');
+    // comment text that mentions `await resp.clone().json()` for context.
+    const jsonParseIdx = inboundBlock.indexOf('const json: any = await resp.clone().json()');
     expect(preCheckIdx).toBeGreaterThan(0);
     expect(jsonParseIdx).toBeGreaterThan(0);
     // The pre-check MUST appear before the JSON parse — otherwise the OOM