test(calibration): replace real-name holder fixture with charlie-example placeholder

Privacy iron rule: no real people's names in checked-in code. The sanctioned
placeholder mapping uses people/charlie-example.

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

docs/architecture/KEY_FILES.md

@@ -457,6 +457,7 @@ unresolvable+true|false, pre-v80 NULL/NULL rows survive).
 - `src/core/think/prompt.ts` extension — anti-bias rewrite. `withCalibration` option on `buildThinkSystemPrompt` adds anti-bias rules. `buildCalibrationBlock()` emits the `<calibration>` XML. `buildThinkUserMessage` has TWO shapes: default (question first), and with-calibration (retrieval → calibration → question) when opt-in. Wired into `runThink` via `opts.withCalibration` + `opts.calibrationHolder`.
 - `src/commands/calibration.ts` — CLI: `gbrain calibration` (read + print), `--regenerate`, `--undo-wave <ver>`, `ab-report`. MCP op `get_calibration_profile` (scope: read) backs the same data path. Source-scoped via `sourceScopeOpts(ctx)`.
 - `src/commands/serve-http.ts` extension — three admin routes: `/admin/api/calibration/profile`, `/admin/api/calibration/charts/:type` (image/svg+xml; type in {brier-trend, domain-bars, pattern-statements, abandoned-threads}), `/admin/api/calibration/pattern/:id` (drill-down).
+- `src/core/owner-holder.ts` — single source of truth for "the brain owner" holder string. `DEFAULT_OWNER_HOLDER = 'self'` (matches the consolidate facts→takes writer + `docs/takes-vs-facts.md`); `resolveOwnerHolder({override, configValue})` returns override > `emotional_weight.user_holder` config > `'self'`. Consumed by the calibration_profile cycle phase, `gbrain calibration` CLI, the `get_calibration_profile` op, `think`'s calibration block, `emotional-weight`'s `DEFAULT_USER_HOLDER`, and doctor's `calibration_freshness`. Pure; unit-tested in `test/owner-holder.test.ts`. Does NOT unify owner-identity fragmentation (`self`/`brain`/`people-<owner>`) — tracked separately.
 - `src/commands/takes.ts` extension — `gbrain takes revisit <slug>` opens $EDITOR on the source page with a `<!-- gbrain:revisit -->` cursor marker.
 - `src/commands/doctor.ts` extension — 4 checks: `abandoned_threads`, `calibration_freshness`, `grade_confidence_drift` (mitigation surface; math ships later), `voice_gate_health`.
 - `admin/src/pages/Calibration.tsx` — Calibration tab. Single-column layout. `<TrustedSVG>` wrapper handles `dangerouslySetInnerHTML` for the server-rendered SVG.

docs/takes-vs-facts.md

@@ -91,3 +91,18 @@ First full takes extraction run on a ~100K-page brain:
 4. **Self-reported ≠ verified.** "Reports 7 figures" → holder=person, weight=0.75, NOT world/1.0
 5. **No false precision.** Use 0.05 increments (0.35, 0.55, 0.75), not 0.74 or 0.82
 6. **"So what" test.** Skip Twitter handles, follower counts, obvious metadata
+
+## Owner-holder canonicalization
+
+"The brain owner" is, by convention, the holder string **`self`** — the value the
+dream `consolidate` phase stamps when it promotes the owner's hot facts into cold
+takes. Calibration, `think`, and the `doctor` calibration check resolve the owner
+holder through `resolveOwnerHolder` (`src/core/owner-holder.ts`): explicit override
+> `emotional_weight.user_holder` config > `self`.
+
+Known limitation (tracked in garrytan/gbrain#2465): the owner can also
+appear under `brain` (a take the owner asserts, via `propose_takes`) and
+`people/<owner>` (extraction that names the owner). The resolver selects the
+*default* canonical owner string for reads; it does not merge those other
+strings. Per-take attribution for other people (e.g. `people/george`) is
+unaffected and correct.

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/commands/calibration.ts

@@ -23,6 +23,7 @@ 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';
+import { resolveOwnerHolder } from '../core/owner-holder.ts';
 
 export interface CalibrationProfileRow {
   /** BIGSERIAL → string (postgres.js int8 wire shape; never Number() — int8
@@ -167,7 +168,10 @@ export async function runCalibration(
   config: GBrainConfig,
 ): Promise<void> {
   const { opts } = parseArgs(args);
-  const holder = opts.holder ?? 'garry';
+  const holder = resolveOwnerHolder({
+    override: opts.holder,
+    configValue: await engine.getConfig('emotional_weight.user_holder'),
+  });
   // 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,12 +257,15 @@ export async function getCalibrationProfileOp(
   ctx: OperationContext,
   params: { holder?: string },
 ): Promise<CalibrationProfileRow | null> {
-  const holder = params.holder ?? 'garry';
+  const holder = resolveOwnerHolder({
+    override: params.holder,
+    configValue: await ctx.engine.getConfig('emotional_weight.user_holder'),
+  });
   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 "garry"',
+      'pass holder="<slug>" or omit to default to the owner holder (config emotional_weight.user_holder, else "self")',
     );
   }
   const scope = sourceScopeOpts(ctx);

src/commands/doctor.ts

@@ -28,6 +28,7 @@ import type { DbUrlSource } from '../core/config.ts';
 import { gbrainPath, loadConfig } from '../core/config.ts';
 import { reflexEnabled } from '../core/context/reflex.ts';
 import { resolveSocketPath } from '../core/context/resolve-ipc.ts';
+import { resolveOwnerHolder } from '../core/owner-holder.ts';
 import { homedir } from 'os';
 import { dirname, isAbsolute, join, resolve as resolvePath } from 'path';
 import { fileURLToPath } from 'url';
@@ -1287,14 +1288,19 @@ export async function checkAbandonedThreads(engine: BrainEngine): Promise<Check>
 
 /**
  * calibration_freshness: warns when the active calibration profile is
- * older than 7 days (configurable). Default holder 'garry'. Multi-source
+ * older than 7 days (configurable). Default holder resolves via resolveOwnerHolder
+ * (config emotional_weight.user_holder, else 'self'). Multi-source
  * brains see one row per source; this check uses the most recent across
  * all sources.
  */
 export async function checkCalibrationFreshness(engine: BrainEngine): Promise<Check> {
   try {
+    const ownerHolder = resolveOwnerHolder({
+      configValue: await engine.getConfig('emotional_weight.user_holder'),
+    });
     const rows = await engine.executeRaw<{ generated_at: Date | null }>(
-      `SELECT MAX(generated_at) AS generated_at FROM calibration_profiles WHERE holder = 'garry'`,
+      `SELECT MAX(generated_at) AS generated_at FROM calibration_profiles WHERE holder = $1`,
+      [ownerHolder],
     );
     const generated = rows[0]?.generated_at;
     if (!generated) {

src/commands/serve-http.ts

@@ -45,6 +45,7 @@ import {
   type IngestionContentType,
   type IngestionEvent,
 } from '../core/ingestion/types.ts';
+import { resolveOwnerHolder } from '../core/owner-holder.ts';
 
 /**
  * /health endpoint timeout. 3s rather than 5s: Fly.io's default
@@ -1190,7 +1191,7 @@ export async function runServeHttp(engine: BrainEngine, options: ServeHttpOption
   app.get('/admin/api/calibration/pattern/:id', requireAdmin, async (req: Request, res: Response) => {
     try {
       const { getLatestProfile } = await import('./calibration.ts');
-      const holder = (req.query.holder as string) || 'garry';
+      const holder = resolveOwnerHolder({ override: (req.query.holder as string) || undefined, configValue: await engine.getConfig('emotional_weight.user_holder') });
       const profile = await getLatestProfile(engine, { holder });
       if (!profile) {
         res.status(404).json({ error: 'no_profile' });
@@ -1240,7 +1241,7 @@ export async function runServeHttp(engine: BrainEngine, options: ServeHttpOption
   app.get('/admin/api/calibration/profile', requireAdmin, async (req: Request, res: Response) => {
     try {
       const { getLatestProfile } = await import('./calibration.ts');
-      const holder = (req.query.holder as string) || 'garry';
+      const holder = resolveOwnerHolder({ override: (req.query.holder as string) || undefined, configValue: await engine.getConfig('emotional_weight.user_holder') });
       const profile = await getLatestProfile(engine, { holder });
       res.json(profile);
     } catch (err) {
@@ -1257,7 +1258,7 @@ export async function runServeHttp(engine: BrainEngine, options: ServeHttpOption
         renderAbandonedThreadsCard,
         renderPatternStatementsCard,
       } = await import('../core/calibration/svg-renderer.ts');
-      const holder = (req.query.holder as string) || 'garry';
+      const holder = resolveOwnerHolder({ override: (req.query.holder as string) || undefined, configValue: await engine.getConfig('emotional_weight.user_holder') });
       const type = req.params.type;
       const profile = await getLatestProfile(engine, { holder });
 

src/commands/takes.ts

@@ -29,6 +29,7 @@ import {
 } from '../core/takes-fence.ts';
 import { withPageLock } from '../core/page-lock.ts';
 import { resolveSourceId } from '../core/source-resolver.ts';
+import { resolveOwnerHolder } from '../core/owner-holder.ts';
 
 // --- Helpers ---
 
@@ -364,7 +365,7 @@ async function cmdResolve(engine: BrainEngine, args: string[], sourceId?: string
   // --evidence is the v0.30.0 alias for --source on the resolve subcommand
   // (semantic clarity: "what evidence resolved this bet?").
   const source = flagValue(args, '--evidence') ?? flagValue(args, '--source');
-  const resolvedBy = flagValue(args, '--by') ?? 'garry';
+  const resolvedBy = flagValue(args, '--by') ?? resolveOwnerHolder({ configValue: await engine.getConfig('emotional_weight.user_holder') });
   const dirArg = flagValue(args, '--dir');
 
   const pageId = await getPageId(engine, slug, sourceId);

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/brainstorm/orchestrator.ts

@@ -68,6 +68,7 @@ import {
   type BrainstormCheckpoint,
   type CheckpointCross,
 } from './checkpoint.ts';
+import { resolveOwnerHolder } from '../owner-holder.ts';
 
 export { BudgetExhausted };
 
@@ -139,7 +140,7 @@ export interface BrainstormOptions {
   modelOverride?: string;
   /** Skip the cost-preview TTY grace window. Required for non-interactive callers. */
   skipCostPreview?: boolean;
-  /** When set, force the user holder for calibration profile lookup. Falls back to config (`emotional_weight.user_holder`) then `'garry'`. */
+  /** When set, force the user holder for calibration profile lookup. Falls back to config (`emotional_weight.user_holder`) then `'self'`. */
   holderOverride?: string;
   /** Source scope. */
   sourceId?: string;
@@ -623,7 +624,7 @@ async function _runBrainstormInner(
   }
 
   // ---- Phase 3: calibration context (cold-start fallback) ----
-  const holder = opts.holderOverride ?? config.emotional_weight?.user_holder ?? 'garry';
+  const holder = resolveOwnerHolder({ override: opts.holderOverride, configValue: config.emotional_weight?.user_holder });
   const calibContext = await loadCalibrationContext(engine, {
     holder,
     sourceId: opts.sourceId,

src/core/calibration/think-ab.ts

@@ -25,7 +25,7 @@ import type { BrainEngine } from '../engine.ts';
 
 export interface ABRunInput {
   question: string;
-  /** Holder context for calibration. Default 'garry'. */
+  /** Holder context for calibration. Resolves via resolveOwnerHolder (config emotional_weight.user_holder, else 'self'). */
   holder?: string;
   /** Engine for DB write. */
   engine: BrainEngine;

src/core/cycle/calibration-profile.ts

@@ -26,6 +26,7 @@
  */
 
 import { BaseCyclePhase, type ScopedReadOpts, type BasePhaseOpts } from './base-phase.ts';
+import { resolveOwnerHolder } from '../owner-holder.ts';
 import { chat as gatewayChat } from '../ai/gateway.ts';
 import { TIER_DEFAULTS } from '../model-config.ts';
 import { gateVoice, type VoiceGateGenerator, type VoiceGateJudge } from '../calibration/voice-gate.ts';
@@ -96,7 +97,7 @@ export type PatternStatementsGenerator = (input: {
 export type BiasTagsGenerator = (patterns: string[]) => Promise<string[]>;
 
 export interface CalibrationProfileOpts extends BasePhaseOpts {
-  /** Holder to generate the profile for. Default 'garry'. */
+  /** Holder to generate the profile for. Default resolves via resolveOwnerHolder (config emotional_weight.user_holder, else 'self'). */
   holder?: string;
   /** Inject the patterns generator (tests). */
   patternsGenerator?: PatternStatementsGenerator;
@@ -227,7 +228,10 @@ class CalibrationProfilePhase extends BaseCyclePhase {
     _ctx: OperationContext,
     opts: CalibrationProfileOpts,
   ): Promise<{ summary: string; details: Record<string, unknown>; status?: PhaseStatus }> {
-    const holder = opts.holder ?? 'garry';
+    const holder = resolveOwnerHolder({
+      override: opts.holder,
+      configValue: await engine.getConfig('emotional_weight.user_holder'),
+    });
     const promptVersion = opts.promptVersion ?? CALIBRATION_PROFILE_PROMPT_VERSION;
     const modelId = opts.model ?? TIER_DEFAULTS.reasoning;
     const gradeCompletion = opts.gradeCompletion ?? 1.0;

src/core/cycle/emotional-weight.ts

@@ -14,6 +14,8 @@
  * See `loadHighEmotionTags` for the resolution path.
  */
 
+import { DEFAULT_OWNER_HOLDER } from '../owner-holder.ts';
+
 /**
  * Default high-emotion tag seed list. Pages with any tag in this set get the
  * tag-emotion boost in the formula below. Override via config key
@@ -43,11 +45,12 @@ export const HIGH_EMOTION_TAGS: ReadonlySet<string> = new Set([
 ]);
 
 /**
- * Holder name treated as "the user" for the Garry-as-holder ratio. Configurable
- * via the `emotional_weight.user_holder` config key (defaults to 'garry' to
- * match the v0.28 schema's takes table convention).
+ * Holder name treated as "the user" for the user-as-holder ratio. Configurable
+ * via the `emotional_weight.user_holder` config key; defaults to the canonical
+ * owner holder ('self', DEFAULT_OWNER_HOLDER) so it matches the consolidate
+ * facts→takes writer instead of a hardcoded name.
  */
-export const DEFAULT_USER_HOLDER = 'garry';
+export const DEFAULT_USER_HOLDER = DEFAULT_OWNER_HOLDER;
 
 export interface EmotionalWeightTake {
   holder: string;

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
@@ -3300,7 +3289,7 @@ const get_calibration_profile: Operation = {
     holder: {
       type: 'string',
       description:
-        "Holder slug, e.g. 'garry' or 'people/charlie-example'. Defaults to 'garry' when omitted.",
+        "Holder slug, e.g. 'self' or 'people/charlie-example'. Defaults to config emotional_weight.user_holder, else 'self', when omitted.",
     },
   },
   handler: async (ctx, p) => {

src/core/owner-holder.ts

@@ -0,0 +1,24 @@
+/**
+ * Canonical holder string for "the brain owner," resolved in ONE place so the
+ * calibration / think / doctor / emotional-weight defaults stop disagreeing.
+ *
+ * The default matches the consolidate facts→takes writer
+ * (src/core/cycle/phases/consolidate.ts: holder:'self') and docs/takes-vs-facts.md.
+ * Do NOT introduce a fourth literal — three already exist historically
+ * ('garry', 'system', 'self'); this is the source of truth.
+ *
+ * NORMALIZATION NOTE: the brain owner may also appear under other holder
+ * strings — 'brain' (propose_takes when the author asserts a claim) and
+ * people/<owner> (extraction that names the owner). This resolver only selects
+ * the *default* canonical owner string for reads; it does NOT merge those other
+ * strings. Unifying them is owner-identity entity-resolution, tracked separately
+ * (see garrytan/gbrain#2465). Until then, historical owner takes
+ * under 'brain'/people-<owner> are not folded into the default profile.
+ */
+export const DEFAULT_OWNER_HOLDER = 'self';
+
+export function resolveOwnerHolder(
+  opts: { override?: string | null; configValue?: string | null },
+): string {
+  return opts.override ?? opts.configValue ?? DEFAULT_OWNER_HOLDER;
+}

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
     }
   }
 

src/core/think/index.ts

@@ -23,6 +23,7 @@ import { runGather, renderPagesBlock, takesHitToTakeForPrompt } from './gather.t
 import { renderTakesBlock } from './sanitize.ts';
 import { buildThinkSystemPrompt, buildThinkUserMessage } from './prompt.ts';
 import { resolveCitations, type ParsedCitation } from './cite-render.ts';
+import { resolveOwnerHolder } from '../owner-holder.ts';
 import { resolveModel } from '../model-config.ts';
 import { chat as gatewayChat, probeChatModel, type ChatResult } from '../ai/gateway.ts';
 import { AIConfigError } from '../ai/errors.ts';
@@ -76,8 +77,8 @@ export interface RunThinkOpts {
    */
   withCalibration?: boolean;
   /**
-   * Holder to retrieve the calibration profile for. Default 'garry'. Only
-   * consulted when withCalibration=true.
+   * Holder to retrieve the calibration profile for. Resolves via resolveOwnerHolder
+   * (config emotional_weight.user_holder, else 'self'). Only consulted when withCalibration=true.
    */
   calibrationHolder?: string;
   /**
@@ -308,7 +309,10 @@ export async function runThink(
     try {
       const { getLatestProfile } = await import('../../commands/calibration.ts');
       const profile = await getLatestProfile(engine, {
-        holder: opts.calibrationHolder ?? 'garry',
+        holder: resolveOwnerHolder({
+          override: opts.calibrationHolder,
+          configValue: await engine.getConfig('emotional_weight.user_holder'),
+        }),
       });
       if (profile) {
         calibrationBlockOpts = {

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

@@ -27,6 +27,12 @@ function buildMockEngine(opts: { rows: CalibrationProfileRow[] }): {
   const capturedParams: unknown[][] = [];
   const engine = {
     kind: 'pglite',
+    // #2464: getCalibrationProfileOp resolves the owner holder via
+    // resolveOwnerHolder(config emotional_weight.user_holder, else 'self'), so the
+    // mock must implement getConfig. null = key unset → resolver falls back to 'self'.
+    async getConfig(): Promise<string | null> {
+      return null;
+    },
     async executeRaw<T>(sql: string, params?: unknown[]): Promise<T[]> {
       capturedSql.push(sql);
       capturedParams.push(params ?? []);
@@ -211,17 +217,17 @@ describe('formatProfileText', () => {
 // ─── getCalibrationProfileOp ────────────────────────────────────────
 
 describe('getCalibrationProfileOp (MCP)', () => {
-  test('defaults holder to "garry" when omitted', async () => {
-    const { engine } = buildMockEngine({ rows: [buildProfile({ holder: 'garry' })] });
+  test('defaults holder to "self" when omitted (config emotional_weight.user_holder unset)', async () => {
+    const { engine } = buildMockEngine({ rows: [buildProfile({ holder: 'self' })] });
     const ctx = buildCtx(engine);
     const result = await getCalibrationProfileOp(ctx, {});
-    expect(result?.holder).toBe('garry');
+    expect(result?.holder).toBe('self');
   });
 
   test('routes through sourceScopeOpts: scalar source-bound client gets source-scoped result', async () => {
     const rows = [
-      buildProfile({ holder: 'garry', source_id: 'default' }),
-      buildProfile({ holder: 'garry', source_id: 'tenant-b' }),
+      buildProfile({ holder: 'self', source_id: 'default' }),
+      buildProfile({ holder: 'self', source_id: 'tenant-b' }),
     ];
     const { engine } = buildMockEngine({ rows });
     const ctx = buildCtx(engine, { sourceId: 'tenant-b' });
@@ -231,8 +237,8 @@ describe('getCalibrationProfileOp (MCP)', () => {
 
   test('federated read scope sees the union of allowed sources', async () => {
     const rows = [
-      buildProfile({ holder: 'garry', source_id: 'tenant-a' }),
-      buildProfile({ holder: 'garry', source_id: 'tenant-z' }),
+      buildProfile({ holder: 'self', source_id: 'tenant-a' }),
+      buildProfile({ holder: 'self', source_id: 'tenant-z' }),
     ];
     const { engine } = buildMockEngine({ rows });
     const ctx = buildCtx(engine, { allowedSources: ['tenant-a', 'tenant-b'] });

test/calibration-profile.test.ts

@@ -32,7 +32,7 @@ interface CapturedSql {
   params: unknown[];
 }
 
-function buildMockEngine(opts: { scorecard: TakesScorecard }): {
+function buildMockEngine(opts: { scorecard: TakesScorecard; userHolder?: string | null }): {
   engine: BrainEngine;
   captured: CapturedSql[];
 } {
@@ -42,6 +42,10 @@ function buildMockEngine(opts: { scorecard: TakesScorecard }): {
     async getScorecard() {
       return opts.scorecard;
     },
+    async getConfig(key: string): Promise<string | null> {
+      if (key === 'emotional_weight.user_holder') return opts.userHolder ?? null;
+      return null;
+    },
     async executeRaw<T>(sql: string, params?: unknown[]): Promise<T[]> {
       captured.push({ sql, params: params ?? [] });
       return [];
@@ -234,7 +238,7 @@ describe('runPhaseCalibrationProfile — phase integration', () => {
     // grade_completion, domain_scorecards_json, patterns[], voice_passed, voice_attempts,
     // bias_tags[], model_id
     expect(insert!.params[0]).toBe('default'); // source_id
-    expect(insert!.params[1]).toBe('garry'); // holder
+    expect(insert!.params[1]).toBe('self'); // holder (resolved via resolveOwnerHolder, no override)
     expect(insert!.params[2]).toBe(12); // total_resolved
     expect(insert!.params[9]).toBe(true); // voice_gate_passed
     expect(insert!.params[10]).toBe(1); // voice_gate_attempts
@@ -330,4 +334,24 @@ describe('runPhaseCalibrationProfile — phase integration', () => {
     const insert = captured.find(c => c.sql.includes('INSERT INTO calibration_profiles'));
     expect(insert!.params[0]).toBe('tenant-b');
   });
+
+  test('cold-brain summary uses resolved owner holder self when user_holder unset', async () => {
+    const { engine } = buildMockEngine({
+      scorecard: { total_bets: 0, resolved: 0, correct: 0, incorrect: 0, partial: 0,
+        accuracy: null, brier: null, partial_rate: null, unresolvable_count: 0, unresolvable_rate: null },
+    });
+    const result = await runPhaseCalibrationProfile(buildCtx(engine), {});
+    expect(result.summary).toContain('holder=self');
+    expect(result.summary).not.toContain('holder=garry');
+  });
+
+  test('configured user_holder overrides the default in the cold-brain summary', async () => {
+    const { engine } = buildMockEngine({
+      scorecard: { total_bets: 0, resolved: 0, correct: 0, incorrect: 0, partial: 0,
+        accuracy: null, brier: null, partial_rate: null, unresolvable_count: 0, unresolvable_rate: null },
+      userHolder: 'people/charlie-example',
+    });
+    const result = await runPhaseCalibrationProfile(buildCtx(engine), {});
+    expect(result.summary).toContain('holder=people/charlie-example');
+  });
 });

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/doctor-calibration-checks.test.ts

@@ -32,6 +32,12 @@ function buildMockEngine(opts: {
 }): BrainEngine {
   return {
     kind: 'pglite',
+    // #2464: checkCalibrationFreshness resolves the owner holder via
+    // resolveOwnerHolder(config emotional_weight.user_holder, else 'self'), so the
+    // mock must implement getConfig. null = key unset → resolver falls back to 'self'.
+    async getConfig(): Promise<string | null> {
+      return null;
+    },
     async executeRaw<T>(sql: string): Promise<T[]> {
       if (opts.throwOn && opts.throwOn.test(sql)) {
         throw new Error('mock engine error: ' + sql.slice(0, 50));

test/emotional-weight.test.ts

@@ -112,3 +112,7 @@ describe('computeEmotionalWeight', () => {
     expect(HIGH_EMOTION_TAGS.has('mental-health')).toBe(true);
   });
 });
+
+test('DEFAULT_USER_HOLDER is the canonical owner holder self', () => {
+  expect(DEFAULT_USER_HOLDER).toBe('self');
+});

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/owner-holder.test.ts

@@ -0,0 +1,27 @@
+import { describe, test, expect } from 'bun:test';
+import { resolveOwnerHolder, DEFAULT_OWNER_HOLDER } from '../src/core/owner-holder.ts';
+
+describe('owner-holder', () => {
+  test('DEFAULT_OWNER_HOLDER is self', () => {
+    expect(DEFAULT_OWNER_HOLDER).toBe('self');
+  });
+
+  test('defaults to self when nothing provided', () => {
+    expect(resolveOwnerHolder({})).toBe('self');
+  });
+
+  test('null/undefined config falls back to self', () => {
+    expect(resolveOwnerHolder({ configValue: null })).toBe('self');
+    expect(resolveOwnerHolder({ configValue: undefined })).toBe('self');
+  });
+
+  test('uses config value when set and no override', () => {
+    expect(resolveOwnerHolder({ configValue: 'people/charlie-example' }))
+      .toBe('people/charlie-example');
+  });
+
+  test('override beats config and default', () => {
+    expect(resolveOwnerHolder({ override: 'world', configValue: 'people/charlie-example' }))
+      .toBe('world');
+  });
+});

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