fix(search): match both slash-split and literal slash forms in FTS queries (#2380 review)

Review finding on the normalize-only approach: Postgres' text-search
parser emits the joined file-alias lexeme on the INDEX side too
(to_tsvector('english','acme/widget') -> 'acme/widget'), so replacing
'/' with whitespace in the query made documents containing the literal
slash form (file paths, URLs, pasted titles) unreachable — the split-word
AND pass can't match the joined lexeme and the OR fallback can't either.
Pre-fix, those exact-form queries DID match.

Replace the TS-side normalizeKeywordQuery with buildWebsearchQueryExpr
in sql-ranking.ts (shared by both engines, keeping them in lockstep): a
slash-bearing query now binds the raw text once and matches
(websearch_to_tsquery(translate($1,'/',' ')) || websearch_to_tsquery($1))
— split-word prose AND literal slash forms alike. Slash-free queries keep
the byte-identical single-parse SQL and identical ts_rank.

New regression test pins the literal-slash arm (verified failing under
the normalize-only expression); the two AND-vs-OR slash tests still pass.

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

docs/architecture/KEY_FILES.md

@@ -457,7 +457,6 @@ 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,18 +91,3 @@ 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/commands/calibration.ts

@@ -23,7 +23,6 @@ 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
@@ -168,10 +167,7 @@ export async function runCalibration(
   config: GBrainConfig,
 ): Promise<void> {
   const { opts } = parseArgs(args);
-  const holder = resolveOwnerHolder({
-    override: opts.holder,
-    configValue: await engine.getConfig('emotional_weight.user_holder'),
-  });
+  const holder = opts.holder ?? 'garry';
   // Resolve --source / GBRAIN_SOURCE / .gbrain-source so the (now reachable, #2035)
   // calibration command targets the right source in a multi-source brain instead
   // of always reading `default`. No signal → 'default' (prior behavior).
@@ -257,15 +253,12 @@ export async function getCalibrationProfileOp(
   ctx: OperationContext,
   params: { holder?: string },
 ): Promise<CalibrationProfileRow | null> {
-  const holder = resolveOwnerHolder({
-    override: params.holder,
-    configValue: await ctx.engine.getConfig('emotional_weight.user_holder'),
-  });
+  const holder = params.holder ?? 'garry';
   if (typeof holder !== 'string' || holder.length === 0) {
     throw new GBrainError(
       'INVALID_HOLDER',
       'get_calibration_profile.holder must be a non-empty string',
-      'pass holder="<slug>" or omit to default to the owner holder (config emotional_weight.user_holder, else "self")',
+      'pass holder="<slug>" or omit to default to "garry"',
     );
   }
   const scope = sourceScopeOpts(ctx);

src/commands/doctor.ts

@@ -28,7 +28,6 @@ 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';
@@ -821,6 +820,10 @@ export async function doctorReportRemote(engine: BrainEngine): Promise<DoctorRep
   // v0.42.x (#1794, 4A): pool-budget nudge when GBRAIN_MAX_CONNECTIONS is set.
   checks.push(await checkPoolBudget(engine));
 
+  // #2552: warn when an explicit embed-concurrency override fans out against
+  // a local single-slot embedding endpoint (silent backfill starvation).
+  checks.push(await checkEmbedConcurrency());
+
   // v0.42.7 (#1696): link-extraction lag. Strictly SQL (single indexed COUNT),
   // safe on the thin-client/remote path — remote operators on checkout-less
   // Postgres brains are exactly who can't otherwise see the extraction backlog.
@@ -1288,19 +1291,14 @@ export async function checkAbandonedThreads(engine: BrainEngine): Promise<Check>
 
 /**
  * calibration_freshness: warns when the active calibration profile is
- * older than 7 days (configurable). Default holder resolves via resolveOwnerHolder
- * (config emotional_weight.user_holder, else 'self'). Multi-source
+ * older than 7 days (configurable). Default holder 'garry'. 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 = $1`,
-      [ownerHolder],
+      `SELECT MAX(generated_at) AS generated_at FROM calibration_profiles WHERE holder = 'garry'`,
     );
     const generated = rows[0]?.generated_at;
     if (!generated) {
@@ -3821,6 +3819,61 @@ export function computePoolBudgetCheck(
   };
 }
 
+/**
+ * #2552: warn when an explicit GBRAIN_EMBED_CONCURRENCY override fans out
+ * against a local single-slot embedding endpoint (Ollama / llama-server /
+ * localhost base URL). Requests serialize on the one loaded model, so N
+ * parallel pages multiply latency xN and can exceed the fetch timeout with
+ * no surfaced error — the backfill silently starves. (When the env var is
+ * unset, embed auto-caps at LOCAL_EMBED_CONCURRENCY_CAP and this check
+ * reports ok.) Pure; exported for tests.
+ */
+export function computeEmbedConcurrencyCheck(
+  isLocalEndpoint: boolean,
+  envValue: string | undefined,
+  localCap: number,
+): Check {
+  const name = 'embed_concurrency';
+  if (!isLocalEndpoint) {
+    return { name, status: 'ok', message: 'Embedding endpoint is not a local inference server — cloud concurrency defaults apply.' };
+  }
+  const parsed = envValue ? parseInt(envValue, 10) : NaN;
+  if (envValue && Number.isFinite(parsed) && parsed > localCap) {
+    return {
+      name,
+      status: 'warn',
+      message:
+        `GBRAIN_EMBED_CONCURRENCY=${parsed} against a local embedding endpoint. ` +
+        `Local inference servers serialize requests, so ${parsed} parallel pages multiply ` +
+        `latency x${parsed} and can exceed the fetch timeout — the embed backfill stalls ` +
+        `with no error. Unset GBRAIN_EMBED_CONCURRENCY (auto-caps at ${localCap}) or set it <= ${localCap}.`,
+    };
+  }
+  return {
+    name,
+    status: 'ok',
+    message: `Local embedding endpoint detected; embed concurrency capped at ${envValue ? parsed : localCap}.`,
+  };
+}
+
+/** Thin gateway/env wrapper over `computeEmbedConcurrencyCheck`. */
+export async function checkEmbedConcurrency(): Promise<Check> {
+  try {
+    const { isLocalEmbeddingEndpoint, LOCAL_EMBED_CONCURRENCY_CAP } = await import('../core/ai/gateway.ts');
+    return computeEmbedConcurrencyCheck(
+      isLocalEmbeddingEndpoint(),
+      process.env.GBRAIN_EMBED_CONCURRENCY,
+      LOCAL_EMBED_CONCURRENCY_CAP,
+    );
+  } catch (err) {
+    return {
+      name: 'embed_concurrency',
+      status: 'ok',
+      message: `Skipped (${err instanceof Error ? err.message : String(err)})`,
+    };
+  }
+}
+
 /** Thin env/engine wrapper over `computePoolBudgetCheck`. */
 export async function checkPoolBudget(_engine: BrainEngine): Promise<Check> {
   try {

src/commands/embed.ts

@@ -1,5 +1,6 @@
 import type { BrainEngine } from '../core/engine.ts';
 import { embedBatch, currentEmbeddingSignature } from '../core/embedding.ts';
+import { isLocalEmbeddingEndpoint, LOCAL_EMBED_CONCURRENCY_CAP } from '../core/ai/gateway.ts';
 import type { ChunkInput } from '../core/types.ts';
 import { chunkText } from '../core/chunkers/recursive.ts';
 import { createProgress, type ProgressReporter } from '../core/progress.ts';
@@ -176,6 +177,31 @@ export class EmbeddingDimMismatchError extends Error {
   }
 }
 
+/**
+ * #2552: resolve the bulk-embed worker count. Env override or the
+ * cloud-tuned default of 20 — but when the operator did NOT set
+ * GBRAIN_EMBED_CONCURRENCY and the embedding endpoint is a local inference
+ * server (Ollama / llama-server / localhost base URL), cap at
+ * LOCAL_EMBED_CONCURRENCY_CAP: 20 parallel pages against a single-slot
+ * server serialize on the one loaded model, multiply latency x20 past the
+ * fetch timeout, and starve the backfill with no surfaced error. An
+ * explicit env value always wins (`gbrain doctor` warns instead).
+ * Pacing only ever LOWERS concurrency (Codex P2).
+ */
+export function resolveEmbedConcurrency(paceMaxConcurrency?: number): number {
+  const envSet = !!process.env.GBRAIN_EMBED_CONCURRENCY;
+  const base = parseInt(process.env.GBRAIN_EMBED_CONCURRENCY || '20', 10);
+  let resolved = base;
+  if (!envSet && isLocalEmbeddingEndpoint() && base > LOCAL_EMBED_CONCURRENCY_CAP) {
+    resolved = LOCAL_EMBED_CONCURRENCY_CAP;
+    serr(
+      `[embed] local embedding endpoint detected — capping concurrency at ` +
+      `${LOCAL_EMBED_CONCURRENCY_CAP} (set GBRAIN_EMBED_CONCURRENCY to override)`,
+    );
+  }
+  return paceMaxConcurrency ? Math.min(resolved, paceMaxConcurrency) : resolved;
+}
+
 /**
  * Pre-flight check: read the actual schema column dim and compare to the
  * gateway's resolved dim. Throws `EmbeddingDimMismatchError` on mismatch
@@ -677,10 +703,8 @@ async function embedAll(
   // Paced runs lower this to the resolved cap (the real lever vs pooler-slot
   // starvation); unpaced keeps the env/default 20. Codex P2: only ever LOWER —
   // never raise above an operator's existing env cap.
-  const BASE_CONCURRENCY = parseInt(process.env.GBRAIN_EMBED_CONCURRENCY || '20', 10);
-  const CONCURRENCY = staleOpts?.paceMaxConcurrency
-    ? Math.min(BASE_CONCURRENCY, staleOpts.paceMaxConcurrency)
-    : BASE_CONCURRENCY;
+  // #2552: local endpoints auto-cap — see resolveEmbedConcurrency.
+  const CONCURRENCY = resolveEmbedConcurrency(staleOpts?.paceMaxConcurrency);
 
   async function embedOnePage(page: typeof pages[number]) {
     // #1737: bail before doing any work for this page if the run was aborted.
@@ -855,10 +879,8 @@ async function embedAllStale(
   // Paced runs lower concurrency to the resolved cap (E-1: worker count IS the
   // lever on this single pool, no separate permit). Codex P2: pacing only ever
   // LOWERS concurrency — never raise above an operator's existing env cap.
-  const BASE_CONCURRENCY = parseInt(process.env.GBRAIN_EMBED_CONCURRENCY || '20', 10);
-  const CONCURRENCY = staleOpts?.paceMaxConcurrency
-    ? Math.min(BASE_CONCURRENCY, staleOpts.paceMaxConcurrency)
-    : BASE_CONCURRENCY;
+  // #2552: local endpoints auto-cap — see resolveEmbedConcurrency.
+  const CONCURRENCY = resolveEmbedConcurrency(staleOpts?.paceMaxConcurrency);
   const pacer = staleOpts?.pacer ?? createNoopPacer();
 
   // D3 + D3a + D8: wall-clock budget. 30 min default; env override.

src/commands/serve-http.ts

@@ -45,7 +45,6 @@ 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
@@ -1191,7 +1190,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 = resolveOwnerHolder({ override: (req.query.holder as string) || undefined, configValue: await engine.getConfig('emotional_weight.user_holder') });
+      const holder = (req.query.holder as string) || 'garry';
       const profile = await getLatestProfile(engine, { holder });
       if (!profile) {
         res.status(404).json({ error: 'no_profile' });
@@ -1241,7 +1240,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 = resolveOwnerHolder({ override: (req.query.holder as string) || undefined, configValue: await engine.getConfig('emotional_weight.user_holder') });
+      const holder = (req.query.holder as string) || 'garry';
       const profile = await getLatestProfile(engine, { holder });
       res.json(profile);
     } catch (err) {
@@ -1258,7 +1257,7 @@ export async function runServeHttp(engine: BrainEngine, options: ServeHttpOption
         renderAbandonedThreadsCard,
         renderPatternStatementsCard,
       } = await import('../core/calibration/svg-renderer.ts');
-      const holder = resolveOwnerHolder({ override: (req.query.holder as string) || undefined, configValue: await engine.getConfig('emotional_weight.user_holder') });
+      const holder = (req.query.holder as string) || 'garry';
       const type = req.params.type;
       const profile = await getLatestProfile(engine, { holder });
 

src/commands/takes.ts

@@ -29,7 +29,6 @@ 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 ---
 
@@ -365,7 +364,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') ?? resolveOwnerHolder({ configValue: await engine.getConfig('emotional_weight.user_holder') });
+  const resolvedBy = flagValue(args, '--by') ?? 'garry';
   const dirArg = flagValue(args, '--dir');
 
   const pageId = await getPageId(engine, slug, sourceId);

src/core/ai/gateway.ts

@@ -683,6 +683,33 @@ export function getEmbeddingDimensions(): number {
   return requireConfig().embedding_dimensions ?? DEFAULT_EMBEDDING_DIMENSIONS;
 }
 
+/**
+ * #2552: cap for parallel bulk-embed workers against a local inference
+ * server. A single-slot Ollama/llama-server serializes requests, so the
+ * cloud-tuned 20-worker fan-out multiplies latency x20 and blows past the
+ * fetch timeout with no surfaced error (the backfill silently starves).
+ */
+export const LOCAL_EMBED_CONCURRENCY_CAP = 2;
+
+/**
+ * #2552: true when the configured embedding model routes to a local
+ * inference server — the `ollama` / `llama-server` recipes, or any recipe
+ * whose base URL was explicitly pointed at localhost. Bulk callers use this
+ * to pick CPU-safe concurrency defaults; `gbrain doctor` uses it to warn
+ * about an explicit cloud-sized override. Fail-open: unconfigured or
+ * unresolvable gateway → false (cloud behavior, the historical default).
+ */
+export function isLocalEmbeddingEndpoint(): boolean {
+  try {
+    const { recipe } = resolveRecipe(getEmbeddingModel());
+    if (recipe.id === 'ollama' || recipe.id === 'llama-server') return true;
+    const base = requireConfig().base_urls?.[recipe.id] ?? '';
+    return /\/\/(localhost|127\.0\.0\.1|\[::1\])(:|\/|$)/i.test(base);
+  } catch {
+    return false;
+  }
+}
+
 /**
  * v0.28.11: returns the configured multimodal embedding model when set,
  * or undefined if the brain falls back to `embedding_model` for multimodal

src/core/ai/recipes/ollama.ts

@@ -29,9 +29,17 @@ export const ollama: Recipe = {
       trust_custom_dims: true, // #2271: local models carry varied native dims
       cost_per_1m_tokens_usd: 0,
       price_last_verified: '2026-04-20',
-      // Ollama's batch capacity depends on the locally loaded model + the
-      // OLLAMA_NUM_PARALLEL config; no static cap to declare. v0.32 (#779).
-      no_batch_cap: true,
+      // #2552: Ollama's true batch capacity depends on the locally loaded
+      // model + OLLAMA_NUM_PARALLEL, but the previous `no_batch_cap: true`
+      // meant a whole page went out in ONE request — on a CPU-only box that
+      // multiplies latency past the fetch timeout and the backfill starves
+      // with no surfaced error. Ollama doesn't return a recognizable
+      // token-limit error either, so the recursive-halving safety net never
+      // fires; a conservative static pre-split cap is the only guard.
+      // 4096 tokens x 2 chars/token ~= 8K chars per request (code-dense
+      // pages run ~2 chars/token, not the tiktoken-ish 4).
+      max_batch_tokens: 4096,
+      chars_per_token: 2,
     },
   },
   setup_hint: 'Install Ollama from https://ollama.ai, then `ollama pull nomic-embed-text` and `ollama serve`.',

src/core/brainstorm/orchestrator.ts

@@ -68,7 +68,6 @@ import {
   type BrainstormCheckpoint,
   type CheckpointCross,
 } from './checkpoint.ts';
-import { resolveOwnerHolder } from '../owner-holder.ts';
 
 export { BudgetExhausted };
 
@@ -140,7 +139,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 `'self'`. */
+  /** When set, force the user holder for calibration profile lookup. Falls back to config (`emotional_weight.user_holder`) then `'garry'`. */
   holderOverride?: string;
   /** Source scope. */
   sourceId?: string;
@@ -624,7 +623,7 @@ async function _runBrainstormInner(
   }
 
   // ---- Phase 3: calibration context (cold-start fallback) ----
-  const holder = resolveOwnerHolder({ override: opts.holderOverride, configValue: config.emotional_weight?.user_holder });
+  const holder = opts.holderOverride ?? config.emotional_weight?.user_holder ?? 'garry';
   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. Resolves via resolveOwnerHolder (config emotional_weight.user_holder, else 'self'). */
+  /** Holder context for calibration. Default 'garry'. */
   holder?: string;
   /** Engine for DB write. */
   engine: BrainEngine;

src/core/cycle/calibration-profile.ts

@@ -26,7 +26,6 @@
  */
 
 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';
@@ -97,7 +96,7 @@ export type PatternStatementsGenerator = (input: {
 export type BiasTagsGenerator = (patterns: string[]) => Promise<string[]>;
 
 export interface CalibrationProfileOpts extends BasePhaseOpts {
-  /** Holder to generate the profile for. Default resolves via resolveOwnerHolder (config emotional_weight.user_holder, else 'self'). */
+  /** Holder to generate the profile for. Default 'garry'. */
   holder?: string;
   /** Inject the patterns generator (tests). */
   patternsGenerator?: PatternStatementsGenerator;
@@ -228,10 +227,7 @@ class CalibrationProfilePhase extends BaseCyclePhase {
     _ctx: OperationContext,
     opts: CalibrationProfileOpts,
   ): Promise<{ summary: string; details: Record<string, unknown>; status?: PhaseStatus }> {
-    const holder = resolveOwnerHolder({
-      override: opts.holder,
-      configValue: await engine.getConfig('emotional_weight.user_holder'),
-    });
+    const holder = opts.holder ?? 'garry';
     const promptVersion = opts.promptVersion ?? CALIBRATION_PROFILE_PROMPT_VERSION;
     const modelId = opts.model ?? TIER_DEFAULTS.reasoning;
     const gradeCompletion = opts.gradeCompletion ?? 1.0;

src/core/cycle/emotional-weight.ts

@@ -14,8 +14,6 @@
  * 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
@@ -45,12 +43,11 @@ export const HIGH_EMOTION_TAGS: ReadonlySet<string> = new Set([
 ]);
 
 /**
- * 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.
+ * 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).
  */
-export const DEFAULT_USER_HOLDER = DEFAULT_OWNER_HOLDER;
+export const DEFAULT_USER_HOLDER = 'garry';
 
 export interface EmotionalWeightTake {
   holder: string;

src/core/doctor-categories.ts

@@ -141,6 +141,7 @@ export const OPS_CHECK_NAMES: ReadonlySet<string> = new Set([
   'pgbouncer_prepare',
   'pgvector',
   'pool_budget',
+  'embed_concurrency',
   'progressive_batch_audit_health',
   'queue_health',
   'reranker_health',

src/core/operations.ts

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

src/core/owner-holder.ts

@@ -1,24 +0,0 @@
-/**
- * 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/pglite-engine.ts

@@ -56,7 +56,7 @@ import { GBrainError, PAGE_SORT_SQL, ENRICH_ORDER_SQL } from './types.ts';
 import { finalizeLastSeen } from './chronicle/last-seen.ts';
 import { computeAnomaliesFromBuckets } from './cycle/anomaly.ts';
 import { resolveBoostMap, resolveHardExcludes } from './search/source-boost.ts';
-import { buildSourceFactorCase, buildHardExcludeClause, buildVisibilityClause, buildRecencyComponentSql, buildBestPerPagePoolCte, buildOrFallbackWebsearchQuery } from './search/sql-ranking.ts';
+import { buildSourceFactorCase, buildHardExcludeClause, buildVisibilityClause, buildRecencyComponentSql, buildBestPerPagePoolCte, buildOrFallbackWebsearchQuery, buildWebsearchQueryExpr } from './search/sql-ranking.ts';
 import {
   normalizeEngineColumn,
   buildVectorCastFragment,
@@ -1591,6 +1591,8 @@ export class PGLiteEngine implements BrainEngine {
     }
 
     // v0.20.0 Cathedral II Layer 10 C1/C2: language + symbol-kind filters.
+    // #2380: slash-bearing queries match both the split-word and literal
+    // slash forms — see buildWebsearchQueryExpr in ./search/sql-ranking.ts.
     const params: unknown[] = [query, innerLimit, limit, offset];
     let extraFilter = '';
     if (opts?.language) {
@@ -1630,6 +1632,7 @@ export class PGLiteEngine implements BrainEngine {
     // FTS config name (e.g. 'english', 'pt_br'). Validated by getFtsLanguage()
     // — safe to interpolate into raw SQL.
     const ftsLang = getFtsLanguage();
+    const ftsQueryExpr = buildWebsearchQueryExpr(ftsLang, '$1', query);
 
     const keywordSql =
       `WITH ranked AS (
@@ -1637,14 +1640,14 @@ export class PGLiteEngine implements BrainEngine {
            p.slug, p.id as page_id, p.title, p.type, p.source_id,
            p.effective_date, p.effective_date_source,
            cc.id as chunk_id, cc.chunk_index, cc.chunk_text, cc.chunk_source,
-           ts_rank(cc.search_vector, websearch_to_tsquery('${ftsLang}', $1)) * ${sourceFactorCase} AS score,
+           ts_rank(cc.search_vector, ${ftsQueryExpr}) * ${sourceFactorCase} AS score,
            CASE WHEN p.updated_at < (
              SELECT MAX(te.created_at) FROM timeline_entries te WHERE te.page_id = p.id
            ) THEN true ELSE false END AS stale
          FROM content_chunks cc
          JOIN pages p ON p.id = cc.page_id
          JOIN sources s ON s.id = p.source_id
-         WHERE cc.search_vector @@ websearch_to_tsquery('${ftsLang}', $1) ${detailFilter}${extraFilter} ${hardExcludeClause} ${visibilityClause}
+         WHERE cc.search_vector @@ ${ftsQueryExpr} ${detailFilter}${extraFilter} ${hardExcludeClause} ${visibilityClause}
            -- v0.27.1: hide image rows from default text-keyword search so
            -- OCR text doesn't drown text-page hits. Image-similarity queries
            -- run a separate vector path on embedding_image.
@@ -1712,7 +1715,10 @@ export class PGLiteEngine implements BrainEngine {
     // FTS config name (e.g. 'english', 'pt_br'). Validated by getFtsLanguage()
     // — safe to interpolate into raw SQL.
     const ftsLang = getFtsLanguage();
+    const ftsQueryExpr = buildWebsearchQueryExpr(ftsLang, '$1', query);
 
+    // #2380: slash-bearing queries match both the split-word and literal
+    // slash forms — see buildWebsearchQueryExpr in ./search/sql-ranking.ts.
     const params: unknown[] = [query, limit, offset];
     let extraFilter = '';
     if (opts?.type) {
@@ -1760,7 +1766,7 @@ export class PGLiteEngine implements BrainEngine {
          COALESCE(rep.chunk_index, 0) as chunk_index,
          COALESCE(rep.chunk_text, '') as chunk_text,
          COALESCE(rep.chunk_source, 'compiled_truth') as chunk_source,
-         ts_rank_cd(p.search_vector, websearch_to_tsquery('${ftsLang}', $1)) * ${sourceFactorCase} AS score,
+         ts_rank_cd(p.search_vector, ${ftsQueryExpr}) * ${sourceFactorCase} AS score,
          CASE WHEN p.updated_at < (
            SELECT MAX(te.created_at) FROM timeline_entries te WHERE te.page_id = p.id
          ) THEN true ELSE false END AS stale
@@ -1775,7 +1781,7 @@ export class PGLiteEngine implements BrainEngine {
          ORDER BY (cc.chunk_source = 'compiled_truth') DESC, cc.chunk_index ASC
          LIMIT 1
        ) rep ON true
-       WHERE p.search_vector @@ websearch_to_tsquery('${ftsLang}', $1)
+       WHERE p.search_vector @@ ${ftsQueryExpr}
          ${extraFilter} ${hardExcludeClause} ${visibilityClause}
        ORDER BY score DESC, p.id ASC
        LIMIT $2 OFFSET $3`;
@@ -1962,6 +1968,8 @@ export class PGLiteEngine implements BrainEngine {
       });
     }
 
+    // #2380: slash-bearing queries match both the split-word and literal
+    // slash forms — see buildWebsearchQueryExpr in ./search/sql-ranking.ts.
     const params: unknown[] = [query, limit, offset];
     let extraFilter = '';
     if (opts?.language) {
@@ -1996,20 +2004,21 @@ export class PGLiteEngine implements BrainEngine {
     // FTS config name (e.g. 'english', 'pt_br'). Validated by getFtsLanguage()
     // — safe to interpolate into raw SQL.
     const ftsLang = getFtsLanguage();
+    const ftsQueryExpr = buildWebsearchQueryExpr(ftsLang, '$1', query);
 
     const { rows } = await this.db.query(
       `SELECT
          p.slug, p.id as page_id, p.title, p.type, p.source_id,
          p.effective_date, p.effective_date_source,
          cc.id as chunk_id, cc.chunk_index, cc.chunk_text, cc.chunk_source,
-         ts_rank(cc.search_vector, websearch_to_tsquery('${ftsLang}', $1)) * ${sourceFactorCase} AS score,
+         ts_rank(cc.search_vector, ${ftsQueryExpr}) * ${sourceFactorCase} AS score,
          CASE WHEN p.updated_at < (
            SELECT MAX(te.created_at) FROM timeline_entries te WHERE te.page_id = p.id
          ) THEN true ELSE false END AS stale
        FROM content_chunks cc
        JOIN pages p ON p.id = cc.page_id
        JOIN sources s ON s.id = p.source_id
-       WHERE cc.search_vector @@ websearch_to_tsquery('${ftsLang}', $1) ${detailFilter}${extraFilter} ${hardExcludeClause} ${visibilityClause}
+       WHERE cc.search_vector @@ ${ftsQueryExpr} ${detailFilter}${extraFilter} ${hardExcludeClause} ${visibilityClause}
        ORDER BY score DESC
        LIMIT $2 OFFSET $3`,
       params

src/core/postgres-engine.ts

@@ -64,7 +64,7 @@ import { ConnectionManager } from './connection-manager.ts';
 import { logConnectionEvent } from './connection-audit.ts';
 import { validateSlug, contentHash, rowToPage, rowToStalePage, rowToChunk, rowToSearchResult, parseEmbedding, tryParseEmbedding, takeRowToTake, takeHitRowToHit, isUndefinedTableError, warnOncePerProcess } from './utils.ts';
 import { resolveBoostMap, resolveHardExcludes } from './search/source-boost.ts';
-import { buildSourceFactorCase, buildHardExcludeClause, buildVisibilityClause, buildRecencyComponentSql, buildBestPerPagePoolCte, buildOrFallbackWebsearchQuery } from './search/sql-ranking.ts';
+import { buildSourceFactorCase, buildHardExcludeClause, buildVisibilityClause, buildRecencyComponentSql, buildBestPerPagePoolCte, buildOrFallbackWebsearchQuery, buildWebsearchQueryExpr } from './search/sql-ranking.ts';
 import { DEFAULT_EMBEDDING_MODEL, DEFAULT_EMBEDDING_DIMENSIONS } from './ai/defaults.ts';
 import { DELETE_BATCH_SIZE } from './engine-constants.ts';
 
@@ -1691,6 +1691,8 @@ export class PostgresEngine implements BrainEngine {
     const hardExcludePrefixes = resolveHardExcludes(opts?.exclude_slug_prefixes, opts?.include_slug_prefixes);
     const hardExcludeClause = buildHardExcludeClause('p.slug', hardExcludePrefixes);
 
+    // #2380: slash-bearing queries match both the split-word and literal
+    // slash forms — see buildWebsearchQueryExpr in ./search/sql-ranking.ts.
     const params: unknown[] = [query];
     let typeClause = '';
     if (type) {
@@ -1761,6 +1763,7 @@ export class PostgresEngine implements BrainEngine {
     // FTS config name (e.g. 'english', 'pt_br'). Validated by getFtsLanguage()
     // — safe to interpolate into raw SQL.
     const ftsLang = getFtsLanguage();
+    const ftsQueryExpr = buildWebsearchQueryExpr(ftsLang, '$1', query);
 
     const rawQuery = `
       WITH ranked_chunks AS (
@@ -1768,11 +1771,11 @@ export class PostgresEngine implements BrainEngine {
           p.slug, p.id as page_id, p.title, p.type, p.source_id,
           p.effective_date, p.effective_date_source,
           cc.id as chunk_id, cc.chunk_index, cc.chunk_text, cc.chunk_source,
-          ts_rank(cc.search_vector, websearch_to_tsquery('${ftsLang}', $1)) * ${sourceFactorCase} AS score
+          ts_rank(cc.search_vector, ${ftsQueryExpr}) * ${sourceFactorCase} AS score
         FROM content_chunks cc
         JOIN pages p ON p.id = cc.page_id
         JOIN sources s ON s.id = p.source_id
-        WHERE cc.search_vector @@ websearch_to_tsquery('${ftsLang}', $1)
+        WHERE cc.search_vector @@ ${ftsQueryExpr}
           ${typeClause}
           ${typesClause}
           ${excludeSlugsClause}
@@ -1863,7 +1866,10 @@ export class PostgresEngine implements BrainEngine {
     // FTS config name (e.g. 'english', 'pt_br'). Validated by getFtsLanguage()
     // — safe to interpolate into raw SQL.
     const ftsLang = getFtsLanguage();
+    const ftsQueryExpr = buildWebsearchQueryExpr(ftsLang, '$1', query);
 
+    // #2380: slash-bearing queries match both the split-word and literal
+    // slash forms — see buildWebsearchQueryExpr in ./search/sql-ranking.ts.
     const params: unknown[] = [query];
     let typeClause = '';
     if (opts?.type) {
@@ -1923,7 +1929,7 @@ export class PostgresEngine implements BrainEngine {
         COALESCE(rep.chunk_index, 0) as chunk_index,
         COALESCE(rep.chunk_text, '') as chunk_text,
         COALESCE(rep.chunk_source, 'compiled_truth') as chunk_source,
-        ts_rank_cd(p.search_vector, websearch_to_tsquery('${ftsLang}', $1)) * ${sourceFactorCase} AS score,
+        ts_rank_cd(p.search_vector, ${ftsQueryExpr}) * ${sourceFactorCase} AS score,
         false AS stale
       FROM pages p
       JOIN sources s ON s.id = p.source_id
@@ -1936,7 +1942,7 @@ export class PostgresEngine implements BrainEngine {
         ORDER BY (cc.chunk_source = 'compiled_truth') DESC, cc.chunk_index ASC
         LIMIT 1
       ) rep ON true
-      WHERE p.search_vector @@ websearch_to_tsquery('${ftsLang}', $1)
+      WHERE p.search_vector @@ ${ftsQueryExpr}
         ${typeClause}
         ${typesClause}
         ${excludeSlugsClause}
@@ -2000,6 +2006,8 @@ export class PostgresEngine implements BrainEngine {
     const hardExcludePrefixes = resolveHardExcludes(opts?.exclude_slug_prefixes, opts?.include_slug_prefixes);
     const hardExcludeClause = buildHardExcludeClause('p.slug', hardExcludePrefixes);
 
+    // #2380: slash-bearing queries match both the split-word and literal
+    // slash forms — see buildWebsearchQueryExpr in ./search/sql-ranking.ts.
     const params: unknown[] = [query];
     let typeClause = '';
     if (type) {
@@ -2060,18 +2068,19 @@ export class PostgresEngine implements BrainEngine {
     // FTS config name (e.g. 'english', 'pt_br'). Validated by getFtsLanguage()
     // — safe to interpolate into raw SQL.
     const ftsLang = getFtsLanguage();
+    const ftsQueryExpr = buildWebsearchQueryExpr(ftsLang, '$1', query);
 
     const rawQuery = `
       SELECT
         p.slug, p.id as page_id, p.title, p.type, p.source_id,
         p.effective_date, p.effective_date_source,
         cc.id as chunk_id, cc.chunk_index, cc.chunk_text, cc.chunk_source,
-        ts_rank(cc.search_vector, websearch_to_tsquery('${ftsLang}', $1)) * ${sourceFactorCase} AS score,
+        ts_rank(cc.search_vector, ${ftsQueryExpr}) * ${sourceFactorCase} AS score,
         false AS stale
       FROM content_chunks cc
       JOIN pages p ON p.id = cc.page_id
       JOIN sources s ON s.id = p.source_id
-      WHERE cc.search_vector @@ websearch_to_tsquery('${ftsLang}', $1)
+      WHERE cc.search_vector @@ ${ftsQueryExpr}
         ${typeClause}
         ${typesClause}
         ${excludeSlugsClause}

src/core/search/sql-ranking.ts

@@ -251,6 +251,28 @@ export function buildOrFallbackWebsearchQuery(query: string): string | null {
   return tokens.join(' OR ');
 }
 
+/**
+ * #2380: FTS query expression for slash-bearing queries. Postgres' default
+ * text-search parser classifies `foo/bar` as a single `file`-alias lexeme —
+ * on BOTH the query side and the index side. So a raw `foo/bar` query only
+ * matched documents carrying the identical joined lexeme (literal paths),
+ * and a slash-split query only matches documents whose text had the words
+ * separated. Neither form alone covers both document shapes; OR the two
+ * parses so a slash query matches prose ("foo and bar", stemmed, AND
+ * semantics) AND literal slash forms ("src/core/x.ts") alike.
+ *
+ * Slash-free queries return the plain single-parse expression — byte-
+ * identical SQL and identical ts_rank to the historical behavior.
+ *
+ * `ftsLang` is validated by getFtsLanguage() (safe to interpolate);
+ * `param` is a `$N` placeholder, never user text.
+ */
+export function buildWebsearchQueryExpr(ftsLang: string, param: string, query: string): string {
+  const plain = `websearch_to_tsquery('${ftsLang}', ${param})`;
+  if (!query.includes('/')) return plain;
+  return `(websearch_to_tsquery('${ftsLang}', translate(${param}, '/', ' ')) || ${plain})`;
+}
+
 // ============================================================
 // v0.29.1 — Recency component SQL builder
 // ============================================================

src/core/think/index.ts

@@ -23,7 +23,6 @@ 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';
@@ -77,8 +76,8 @@ export interface RunThinkOpts {
    */
   withCalibration?: boolean;
   /**
-   * Holder to retrieve the calibration profile for. Resolves via resolveOwnerHolder
-   * (config emotional_weight.user_holder, else 'self'). Only consulted when withCalibration=true.
+   * Holder to retrieve the calibration profile for. Default 'garry'. Only
+   * consulted when withCalibration=true.
    */
   calibrationHolder?: string;
   /**
@@ -309,10 +308,7 @@ export async function runThink(
     try {
       const { getLatestProfile } = await import('../../commands/calibration.ts');
       const profile = await getLatestProfile(engine, {
-        holder: resolveOwnerHolder({
-          override: opts.calibrationHolder,
-          configValue: await engine.getConfig('emotional_weight.user_holder'),
-        }),
+        holder: opts.calibrationHolder ?? 'garry',
       });
       if (profile) {
         calibrationBlockOpts = {

test/ai/no-batch-cap-suppression.serial.test.ts

@@ -28,8 +28,8 @@ describe('v0.32 #779: no_batch_cap suppresses the missing-max_batch_tokens warni
     resetGateway();
   });
 
-  test('Ollama, LiteLLM, llama-server all declare no_batch_cap: true', () => {
-    for (const id of ['ollama', 'litellm', 'llama-server']) {
+  test('LiteLLM and llama-server declare no_batch_cap: true', () => {
+    for (const id of ['litellm', 'llama-server']) {
       const r = getRecipe(id);
       expect(r, `${id} not registered`).toBeDefined();
       expect(
@@ -39,6 +39,18 @@ describe('v0.32 #779: no_batch_cap suppresses the missing-max_batch_tokens warni
     }
   });
 
+  test('#2552: Ollama declares a conservative static batch cap, not no_batch_cap', () => {
+    // A CPU-only Ollama box wedges when a whole page ships in one request;
+    // Ollama never returns a token-limit error so the recursive-halving
+    // safety net can't fire. The pre-split cap is the only guard.
+    const r = getRecipe('ollama');
+    expect(r).toBeDefined();
+    const e = r!.touchpoints.embedding!;
+    expect(e.no_batch_cap).toBeUndefined();
+    expect(e.max_batch_tokens).toBe(4096);
+    expect(e.chars_per_token).toBe(2);
+  });
+
   test('configureGateway does NOT warn for ollama/litellm/llama-server', () => {
     warnSpy.mockClear();
     resetGateway();

test/calibration-cli.test.ts

@@ -27,12 +27,6 @@ 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 ?? []);
@@ -217,17 +211,17 @@ describe('formatProfileText', () => {
 // ─── getCalibrationProfileOp ────────────────────────────────────────
 
 describe('getCalibrationProfileOp (MCP)', () => {
-  test('defaults holder to "self" when omitted (config emotional_weight.user_holder unset)', async () => {
-    const { engine } = buildMockEngine({ rows: [buildProfile({ holder: 'self' })] });
+  test('defaults holder to "garry" when omitted', async () => {
+    const { engine } = buildMockEngine({ rows: [buildProfile({ holder: 'garry' })] });
     const ctx = buildCtx(engine);
     const result = await getCalibrationProfileOp(ctx, {});
-    expect(result?.holder).toBe('self');
+    expect(result?.holder).toBe('garry');
   });
 
   test('routes through sourceScopeOpts: scalar source-bound client gets source-scoped result', async () => {
     const rows = [
-      buildProfile({ holder: 'self', source_id: 'default' }),
-      buildProfile({ holder: 'self', source_id: 'tenant-b' }),
+      buildProfile({ holder: 'garry', source_id: 'default' }),
+      buildProfile({ holder: 'garry', source_id: 'tenant-b' }),
     ];
     const { engine } = buildMockEngine({ rows });
     const ctx = buildCtx(engine, { sourceId: 'tenant-b' });
@@ -237,8 +231,8 @@ describe('getCalibrationProfileOp (MCP)', () => {
 
   test('federated read scope sees the union of allowed sources', async () => {
     const rows = [
-      buildProfile({ holder: 'self', source_id: 'tenant-a' }),
-      buildProfile({ holder: 'self', source_id: 'tenant-z' }),
+      buildProfile({ holder: 'garry', source_id: 'tenant-a' }),
+      buildProfile({ holder: 'garry', 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; userHolder?: string | null }): {
+function buildMockEngine(opts: { scorecard: TakesScorecard }): {
   engine: BrainEngine;
   captured: CapturedSql[];
 } {
@@ -42,10 +42,6 @@ function buildMockEngine(opts: { scorecard: TakesScorecard; userHolder?: string
     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 [];
@@ -238,7 +234,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('self'); // holder (resolved via resolveOwnerHolder, no override)
+    expect(insert!.params[1]).toBe('garry'); // holder
     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
@@ -334,24 +330,4 @@ 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/doctor-calibration-checks.test.ts

@@ -32,12 +32,6 @@ 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/embed-local-endpoint.serial.test.ts

@@ -0,0 +1,118 @@
+/**
+ * #2552: cloud-tuned embedding defaults silently wedge CPU-only local
+ * endpoints (Ollama). Three-part fix under test:
+ *
+ *  1. `isLocalEmbeddingEndpoint()` — gateway helper detecting local
+ *     inference servers (ollama / llama-server recipes, localhost base URL).
+ *  2. `resolveEmbedConcurrency()` — embed auto-caps the 20-worker fan-out
+ *     at LOCAL_EMBED_CONCURRENCY_CAP for local endpoints unless the
+ *     operator set GBRAIN_EMBED_CONCURRENCY explicitly.
+ *  3. `computeEmbedConcurrencyCheck()` — doctor warns when an explicit env
+ *     override fans out against a local endpoint.
+ *
+ * Serial: mutates process.env and the module-global gateway config.
+ */
+
+import { afterAll, afterEach, describe, expect, test } from 'bun:test';
+import {
+  configureGateway,
+  resetGateway,
+  isLocalEmbeddingEndpoint,
+  LOCAL_EMBED_CONCURRENCY_CAP,
+} from '../src/core/ai/gateway.ts';
+import { resolveEmbedConcurrency } from '../src/commands/embed.ts';
+import { computeEmbedConcurrencyCheck } from '../src/commands/doctor.ts';
+
+const SAVED_ENV = process.env.GBRAIN_EMBED_CONCURRENCY;
+
+afterEach(() => {
+  resetGateway();
+  if (SAVED_ENV === undefined) delete process.env.GBRAIN_EMBED_CONCURRENCY;
+  else process.env.GBRAIN_EMBED_CONCURRENCY = SAVED_ENV;
+});
+
+afterAll(() => {
+  resetGateway();
+});
+
+describe('#2552 isLocalEmbeddingEndpoint', () => {
+  test('false when the gateway is not configured (fail-open to cloud behavior)', () => {
+    resetGateway();
+    expect(isLocalEmbeddingEndpoint()).toBe(false);
+  });
+
+  test('true for the ollama recipe', () => {
+    configureGateway({ embedding_model: 'ollama:nomic-embed-text', env: {} });
+    expect(isLocalEmbeddingEndpoint()).toBe(true);
+  });
+
+  test('true for the llama-server recipe', () => {
+    configureGateway({ embedding_model: 'llama-server:my-gguf', env: {} });
+    expect(isLocalEmbeddingEndpoint()).toBe(true);
+  });
+
+  test('false for a cloud recipe', () => {
+    configureGateway({
+      embedding_model: 'openai:text-embedding-3-small',
+      env: { OPENAI_API_KEY: 'fake' },
+    });
+    expect(isLocalEmbeddingEndpoint()).toBe(false);
+  });
+
+  test('true when a cloud recipe base URL is explicitly pointed at localhost', () => {
+    configureGateway({
+      embedding_model: 'openai:text-embedding-3-small',
+      env: { OPENAI_API_KEY: 'fake' },
+      base_urls: { openai: 'http://localhost:8080/v1' },
+    });
+    expect(isLocalEmbeddingEndpoint()).toBe(true);
+  });
+});
+
+describe('#2552 resolveEmbedConcurrency', () => {
+  test('caps at LOCAL_EMBED_CONCURRENCY_CAP for a local endpoint when env is unset', () => {
+    delete process.env.GBRAIN_EMBED_CONCURRENCY;
+    configureGateway({ embedding_model: 'ollama:nomic-embed-text', env: {} });
+    expect(resolveEmbedConcurrency()).toBe(LOCAL_EMBED_CONCURRENCY_CAP);
+  });
+
+  test('explicit env override always wins, even against a local endpoint', () => {
+    process.env.GBRAIN_EMBED_CONCURRENCY = '10';
+    configureGateway({ embedding_model: 'ollama:nomic-embed-text', env: {} });
+    expect(resolveEmbedConcurrency()).toBe(10);
+  });
+
+  test('cloud endpoints keep the historical default of 20', () => {
+    delete process.env.GBRAIN_EMBED_CONCURRENCY;
+    configureGateway({ env: { OPENAI_API_KEY: 'fake' } });
+    expect(resolveEmbedConcurrency()).toBe(20);
+  });
+
+  test('pacing only ever lowers concurrency', () => {
+    delete process.env.GBRAIN_EMBED_CONCURRENCY;
+    configureGateway({ embedding_model: 'ollama:nomic-embed-text', env: {} });
+    expect(resolveEmbedConcurrency(1)).toBe(1);
+    expect(resolveEmbedConcurrency(16)).toBe(LOCAL_EMBED_CONCURRENCY_CAP);
+  });
+});
+
+describe('#2552 computeEmbedConcurrencyCheck (doctor)', () => {
+  test('ok for non-local endpoints', () => {
+    expect(computeEmbedConcurrencyCheck(false, '20', 2).status).toBe('ok');
+  });
+
+  test('warn when an explicit override exceeds the local cap', () => {
+    const check = computeEmbedConcurrencyCheck(true, '20', 2);
+    expect(check.status).toBe('warn');
+    expect(check.message).toContain('GBRAIN_EMBED_CONCURRENCY=20');
+  });
+
+  test('ok when env is unset against a local endpoint (auto-cap applies)', () => {
+    expect(computeEmbedConcurrencyCheck(true, undefined, 2).status).toBe('ok');
+  });
+
+  test('ok when the override is at or under the cap', () => {
+    expect(computeEmbedConcurrencyCheck(true, '2', 2).status).toBe('ok');
+    expect(computeEmbedConcurrencyCheck(true, '1', 2).status).toBe('ok');
+  });
+});

test/emotional-weight.test.ts

@@ -112,7 +112,3 @@ 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/owner-holder.test.ts

@@ -1,27 +0,0 @@
-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/pglite-engine.test.ts

@@ -216,6 +216,67 @@ describe('PGLiteEngine: Search', () => {
     expect(results.length).toBe(0);
   });
 
+  // Regression (#2380): queries containing `/` used to bypass FTS AND
+  // semantics. Postgres' default text-search parser classifies `foo/bar` as
+  // a `file`-alias token mapped to the `simple` dictionary, so it became a
+  // single un-stemmed lexeme `'foo/bar'` that never matches indexed text —
+  // the primary FTS pass returned 0 and the OR fallback took over, matching
+  // pages that contain EITHER term. searchKeyword/searchTitles now normalize
+  // `/` to whitespace before websearch_to_tsquery parses, so the primary
+  // AND pass matches directly.
+  test('searchKeyword: slash query matches with AND semantics, not OR fallback', async () => {
+    // Decoy shares only ONE of the two query terms ('enterprise').
+    await engine.putPage('concepts/enterprise-pricing', {
+      type: 'concept', title: 'Widget Pricing',
+      compiled_truth: 'Enterprise pricing for widgets.',
+    });
+    await engine.upsertChunks('concepts/enterprise-pricing', [
+      { chunk_index: 0, chunk_text: 'Enterprise pricing for widgets', chunk_source: 'compiled_truth' },
+    ]);
+
+    // Both terms co-occur only in the novamind chunk. Pre-fix this returned
+    // BOTH pages (primary pass zero-hit → OR fallback); post-fix the primary
+    // AND pass returns exactly the co-occurrence page.
+    const results = await engine.searchKeyword('NovaMind/enterprise');
+    expect(results.length).toBe(1);
+    expect(results[0].slug).toBe('companies/novamind');
+  });
+
+  test('searchTitles: slash query matches with AND semantics, not OR fallback', async () => {
+    await engine.putPage('companies/novamind-enterprise', {
+      type: 'company', title: 'NovaMind Enterprise Platform',
+      compiled_truth: 'Placeholder body.',
+    });
+    await engine.putPage('guides/enterprise-sales', {
+      type: 'concept', title: 'Enterprise Sales Guide',
+      compiled_truth: 'Placeholder body.',
+    });
+
+    // Pre-fix: `NovaMind/Enterprise` parsed as one file-alias lexeme → the
+    // primary title pass returned 0 and the OR fallback matched BOTH titles.
+    const results = await engine.searchTitles('NovaMind/Enterprise');
+    expect(results.length).toBe(1);
+    expect(results[0].slug).toBe('companies/novamind-enterprise');
+  });
+
+  test('searchKeyword: slash query still matches the literal slash form (file paths)', async () => {
+    // The INDEX side also emits the joined file-alias lexeme for literal
+    // `foo/bar` text, so a query normalized to split words alone would go
+    // blind to documents containing the literal slash form (paths, URLs).
+    // buildWebsearchQueryExpr ORs both parses; this pins the raw arm.
+    await engine.putPage('runbooks/widget-deploy', {
+      type: 'concept', title: 'Widget Deploy Runbook',
+      compiled_truth: 'Runbook for the acme/widget deployment pipeline.',
+    });
+    await engine.upsertChunks('runbooks/widget-deploy', [
+      { chunk_index: 0, chunk_text: 'Runbook for the acme/widget deployment pipeline', chunk_source: 'compiled_truth' },
+    ]);
+
+    const results = await engine.searchKeyword('acme/widget');
+    expect(results.length).toBe(1);
+    expect(results[0].slug).toBe('runbooks/widget-deploy');
+  });
+
   test('tsvector trigger populates search_vector on insert', async () => {
     // Verify the PL/pgSQL trigger fires and content_chunks.search_vector is
     // populated from chunk_text. v0.20.0 Cathedral II Layer 3 moved FTS from