test(dream): conform dream-dir-source-stamp to canonical PGLite isolation pattern

check:test-isolation R3/R4 flagged the new test file: engine was created
in beforeEach (outside beforeAll) and never disconnected in afterAll.
Switch to the canonical shared-engine pattern (beforeAll create,
beforeEach resetPgliteState, afterAll disconnect) per
test/helpers/reset-pglite.ts.

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

@@ -38,6 +38,7 @@ import { logSelfUpgrade } from '../core/audit/self-upgrade-audit.ts';
 import { detectInstallMethod } from './upgrade.ts';
 import { evaluateQuietHours } from '../core/minions/quiet-hours.ts';
 import { inspectLock } from '../core/db-lock.ts';
+import { registerCleanup } from '../core/process-cleanup.ts';
 
 /**
  * v0.37.7.0 #1162 — classify autopilot reconnect-loop errors.
@@ -433,6 +434,37 @@ export async function runAutopilot(engine: BrainEngine, args: string[]) {
   let stopping = false;
   let childSupervisor: ChildWorkerSupervisor | null = null;
 
+  // #1872: graceful engine shutdown. On PGLite the cycle steps run INLINE in
+  // this process, so a hard `process.exit` mid-write (systemctl stop →
+  // SIGTERM) kills WASM Postgres with the WAL dirty and can corrupt the
+  // brain. Two exit paths must both close the engine:
+  //   - autopilot's own shutdown() below (owns SIGINT + internal stops like
+  //     max_crashes / cycle-failure-cap), and
+  //   - process-cleanup's SIGTERM handler (installed at cli.ts module load;
+  //     it runs the cleanup registry with a 3s deadline and then exits) —
+  //     which is why closeEngine is ALSO registered there.
+  // closeEngine aborts the in-flight inline cycle (runCycle checks the
+  // signal between phases and threads it into phase sub-work), gives it a
+  // short bounded window to wind down, then disconnects. PGLite's
+  // disconnect() drains the pending query and checkpoints before closing;
+  // a second call is a no-op (disconnect snapshots + nulls the handle), so
+  // both paths firing is safe.
+  const shutdownAbort = new AbortController();
+  let inflightInlineCycle: Promise<unknown> | null = null;
+  const closeEngine = async () => {
+    shutdownAbort.abort(new Error('autopilot shutdown'));
+    if (inflightInlineCycle) {
+      // ponytail: 2s cap keeps us inside process-cleanup's 3s deadline; a
+      // between-phase abort resolves instantly, a mid-phase one may not.
+      await Promise.race([
+        inflightInlineCycle.catch(() => { /* cycle errors already logged by the loop */ }),
+        new Promise((r) => setTimeout(r, 2_000)),
+      ]);
+    }
+    try { await engine.disconnect(); } catch { /* best-effort */ }
+  };
+  const deregisterEngineClose = registerCleanup('autopilot-engine-close', closeEngine);
+
   if (spawnManagedWorker) {
     const cliPath = resolveGbrainCliPath();
     // Cgroup-aware auto-sized RSS watchdog cap (issue #1678). The old flat
@@ -520,6 +552,10 @@ export async function runAutopilot(engine: BrainEngine, args: string[]) {
         childSupervisor.killChild('SIGKILL');
       }
     }
+    // #1872: abort the in-flight inline cycle and close the engine BEFORE
+    // process.exit — a hard exit mid-write corrupts PGLite's WASM Postgres.
+    await closeEngine();
+    deregisterEngineClose();
     try { unlinkSync(lockPath); } catch { /* already gone */ }
     process.exit(0);
   };
@@ -1008,16 +1044,21 @@ export async function runAutopilot(engine: BrainEngine, args: string[]) {
       // path's phase set). Now both converge on the same primitive.
       try {
         const { runCycle } = await import('../core/cycle.ts');
-        const report = await runCycle(engine, {
+        // #1872: track the promise so closeEngine can drain it on shutdown,
+        // and pass the abort signal so the cycle winds down between phases.
+        const cyclePromise = runCycle(engine, {
           brainDir: repoPath,
           // Autopilot daemon path: pulls by default (matches
           // pre-v0.17 autopilot behavior). CLI dream defaults false
           // for cron safety; that choice is scoped to dream only.
           pull: true,
+          signal: shutdownAbort.signal,
           yieldBetweenPhases: async () => {
             await new Promise(r => setImmediate(r));
           },
         });
+        inflightInlineCycle = cyclePromise;
+        const report = await cyclePromise.finally(() => { inflightInlineCycle = null; });
         // Only 'failed' (every attempted phase failed) trips the autopilot
         // circuit breaker. 'partial' means at least one phase warned or
         // failed while others ran — that's a soft signal, not a fatal

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';
@@ -1288,19 +1287,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) {

src/commands/dream.ts

@@ -26,6 +26,7 @@
 import type { BrainEngine } from '../core/engine.ts';
 import {
   runCycle,
+  resolveSourceForDir,
   ALL_PHASES,
   type CyclePhase,
   type CycleReport,
@@ -380,9 +381,9 @@ Options:
 
   --source <id>       Scope the cycle to one source so doctor's
                       cycle_freshness check sees a fresh stamp on
-                      completion. Without this, gbrain dream's
-                      timestamp never lands and federated brains
-                      see "stale cycle" forever.
+                      completion. When omitted, gbrain derives the
+                      source from --dir / the configured checkout
+                      when it matches a source's local_path (#1869).
   --source-id <id>    Alias for --source. Matches the v0.37.7.0+
                       naming used by import/extract/graph-query.
 
@@ -634,6 +635,25 @@ export async function runDream(engine: BrainEngine | null, args: string[]): Prom
     );
     process.exit(1);
   }
+
+  // #1869: a path-scoped run (--dir, or the configured sync.repo_path) whose
+  // directory matches a registered source's local_path IS that source's cycle
+  // — derive the source id so runCycle writes last_source_cycle_at /
+  // last_full_cycle_at on success and doctor's cycle_freshness check stops
+  // reading perpetually stale. Explicit --source still wins (resolved above).
+  // Fixed here at the command level, NOT in runCycle's stamp gate, so legacy
+  // global callers (autopilot-global-maintenance runs GLOBAL_PHASES with a
+  // brainDir and no sourceId) can't falsely stamp per-source freshness.
+  // A derived match on an archived source is skipped silently (falls back to
+  // legacy unscoped behavior) — stamping it would mask staleness on restore,
+  // mirroring the explicit --source archived guard above.
+  if (resolvedSourceId === undefined && engine !== null && brainDir !== null) {
+    const derived = await resolveSourceForDir(engine, brainDir);
+    if (derived !== undefined) {
+      const src = await fetchSource(engine, derived);
+      if (src?.archived !== true) resolvedSourceId = derived;
+    }
+  }
   // ─── issue #1678: bounded single-hold extract_atoms drain ──────────
   if (opts.drain) {
     if (engine === null) {

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

@@ -855,8 +855,16 @@ interface SyncPhaseResult extends PhaseResult {
  * Resolve the source id for a brain directory by looking up the sources
  * table. Returns undefined when no registered source matches (falls back
  * to pre-v0.18 global config.sync.* keys).
+ *
+ * Exported for dream.ts (#1869): a `gbrain dream --dir <path>` run whose
+ * path matches a registered source's local_path is a per-source cycle in
+ * everything but name, so dream derives the source id up front and passes
+ * it as opts.sourceId — landing the freshness stamp without changing
+ * runCycle's stamp/lock semantics for legacy global callers (the
+ * autopilot-global-maintenance handler runs GLOBAL_PHASES with a brainDir
+ * and MUST NOT stamp per-source freshness; see rejected PR #2549).
  */
-async function resolveSourceForDir(
+export async function resolveSourceForDir(
   engine: BrainEngine,
   brainDir: string | null,
 ): Promise<string | undefined> {

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/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/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/autopilot-shutdown-engine-close.test.ts

@@ -0,0 +1,63 @@
+/**
+ * #1872 — autopilot SIGTERM/SIGINT must close the engine before exit.
+ *
+ * On PGLite the cycle steps run INLINE in the autopilot process, so a hard
+ * `process.exit` mid-write (systemctl stop → SIGTERM) kills WASM Postgres
+ * with the WAL dirty and can corrupt the brain. Two exit paths must both
+ * close the engine:
+ *
+ *   - autopilot's own shutdown() (owns SIGINT + internal stops like
+ *     max_crashes / cycle-failure-cap), and
+ *   - process-cleanup's SIGTERM handler (installed at cli.ts module load,
+ *     which exits within its 3s cleanup deadline) — reached via the
+ *     registered 'autopilot-engine-close' cleanup callback.
+ *
+ * Because the shutdown path is deep inside `runAutopilot()` (a long-running
+ * daemon loop that ends in process.exit), a behavioral test would have to
+ * spawn + signal a real daemon. Following the established precedent
+ * (test/autopilot-supervisor-wiring.test.ts, test/autopilot-fanout-wiring.test.ts),
+ * these static-shape regressions pin the load-bearing wiring instead.
+ */
+import { describe, expect, it } from 'bun:test';
+import { readFileSync } from 'fs';
+import { join } from 'path';
+
+const AUTOPILOT_SRC = readFileSync(
+  join(import.meta.dir, '..', 'src', 'commands', 'autopilot.ts'),
+  'utf8',
+);
+
+describe('autopilot.ts graceful engine shutdown (#1872)', () => {
+  it('registers an engine-close callback in the process-cleanup registry (SIGTERM path)', () => {
+    // process-cleanup owns SIGTERM (installed at cli.ts:10) and hard-exits
+    // after its cleanup pass; without this registration the engine is never
+    // closed on `systemctl stop`.
+    expect(AUTOPILOT_SRC).toContain(
+      "import { registerCleanup } from '../core/process-cleanup.ts';",
+    );
+    expect(AUTOPILOT_SRC).toContain(
+      "registerCleanup('autopilot-engine-close', closeEngine)",
+    );
+  });
+
+  it('closeEngine aborts the in-flight inline cycle then disconnects the engine', () => {
+    // Abort first (runCycle checks the signal between phases and threads it
+    // into phase sub-work), bounded drain, then disconnect.
+    expect(AUTOPILOT_SRC).toMatch(
+      /const closeEngine = async \(\) => \{[\s\S]{0,900}shutdownAbort\.abort\([\s\S]{0,900}engine\.disconnect\(\)/,
+    );
+  });
+
+  it('the inline runCycle call carries the shutdown abort signal and is tracked as in-flight', () => {
+    // PGLite / --inline path: the cycle runs in-process, so shutdown must be
+    // able to (a) signal it to wind down and (b) await it before closing.
+    expect(AUTOPILOT_SRC).toMatch(/signal:\s*shutdownAbort\.signal/);
+    expect(AUTOPILOT_SRC).toMatch(/inflightInlineCycle\s*=\s*cyclePromise/);
+  });
+
+  it('shutdown() awaits closeEngine() before process.exit(0) (SIGINT + internal-stop path)', () => {
+    expect(AUTOPILOT_SRC).toMatch(
+      /await closeEngine\(\);[\s\S]{0,400}process\.exit\(0\)/,
+    );
+  });
+});

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/dream-dir-source-stamp.test.ts

@@ -0,0 +1,99 @@
+/**
+ * #1869 — `gbrain dream --dir <path>` stamps cycle freshness when the path
+ * matches a registered source's local_path.
+ *
+ * Pre-fix, only `--source <id>` runs wrote last_source_cycle_at /
+ * last_full_cycle_at (runCycle's stamp gate reads opts.sourceId, and dream
+ * never derived one from --dir), so a path-scoped brain showed doctor's
+ * cycle_freshness as perpetually stale.
+ *
+ * The fix lives in dream.ts (derive the source id from the resolved brain
+ * dir via resolveSourceForDir), NOT in runCycle's stamp gate — a runCycle-
+ * wide change would make the autopilot-global-maintenance handler (global
+ * phases, brainDir set, no sourceId) falsely stamp per-source freshness
+ * (the #2194 poisoning class; see rejected PR #2549).
+ *
+ * Same real-PGLite/no-mocks discipline as test/dream.test.ts; same
+ * GBRAIN_HOME isolation as test/cycle-last-full-cycle-at.test.ts (the
+ * cycle's PGLite file lock lives under ~/.gbrain).
+ */
+import { describe, test, expect, beforeAll, afterAll, beforeEach, afterEach } from 'bun:test';
+import { mkdtempSync, rmSync } from 'fs';
+import { join } from 'path';
+import { tmpdir } from 'os';
+import { PGLiteEngine } from '../src/core/pglite-engine.ts';
+import { resetPgliteState } from './helpers/reset-pglite.ts';
+import { runDream } from '../src/commands/dream.ts';
+import { withEnv } from './helpers/with-env.ts';
+
+let engine: PGLiteEngine;
+let brainDir: string;
+let gbrainHome: string;
+
+beforeAll(async () => {
+  engine = new PGLiteEngine();
+  await engine.connect({});
+  await engine.initSchema();
+}, 60_000);
+
+afterAll(async () => {
+  await engine.disconnect();
+});
+
+beforeEach(async () => {
+  await resetPgliteState(engine);
+  brainDir = mkdtempSync(join(tmpdir(), 'gbrain-dream-stamp-'));
+  gbrainHome = mkdtempSync(join(tmpdir(), 'gbrain-dream-stamp-home-'));
+}, 60_000);
+
+afterEach(() => {
+  rmSync(brainDir, { recursive: true, force: true });
+  rmSync(gbrainHome, { recursive: true, force: true });
+});
+
+async function seedSource(id: string, archived = false): Promise<void> {
+  await engine.executeRaw(
+    `INSERT INTO sources (id, name, local_path, config, archived, created_at)
+     VALUES ($1, $2, $3, '{}'::jsonb, $4, NOW())`,
+    [id, id, brainDir, archived],
+  );
+}
+
+async function readLastFullCycleAt(sourceId: string): Promise<string | null> {
+  const rows = await engine.executeRaw<{ config: Record<string, unknown> | null }>(
+    `SELECT config FROM sources WHERE id = $1`,
+    [sourceId],
+  );
+  const raw = rows[0]?.config?.last_full_cycle_at;
+  return typeof raw === 'string' ? raw : null;
+}
+
+describe('gbrain dream --dir <path> freshness stamp (#1869)', () => {
+  test('--dir matching a source local_path stamps last_full_cycle_at', async () => {
+    await withEnv({ GBRAIN_HOME: gbrainHome }, async () => {
+      await seedSource('path-scoped');
+      expect(await readLastFullCycleAt('path-scoped')).toBeNull();
+
+      const report = await runDream(engine, ['--dir', brainDir, '--phase', 'lint', '--json']);
+      expect(report).toBeTruthy();
+      if (report) expect(['ok', 'clean']).toContain(report.status);
+
+      // Pre-fix this stays null forever: dream never passed a sourceId, so
+      // runCycle's stamp gate skipped the write.
+      expect(await readLastFullCycleAt('path-scoped')).not.toBeNull();
+    });
+  }, 60_000);
+
+  test('--dir matching an ARCHIVED source does not stamp it', async () => {
+    await withEnv({ GBRAIN_HOME: gbrainHome }, async () => {
+      await seedSource('mothballed', true);
+
+      const report = await runDream(engine, ['--dir', brainDir, '--phase', 'lint', '--json']);
+      expect(report).toBeTruthy();
+
+      // Stamping an archived source would mask data staleness when it is
+      // later restored (mirrors the explicit --source archived guard).
+      expect(await readLastFullCycleAt('mothballed')).toBeNull();
+    });
+  }, 60_000);
+});

test/dream.test.ts

@@ -562,12 +562,22 @@ describe('runDream — --source / --source-id (v0.41.13)', () => {
 
   // ─── Back-compat: bare `gbrain dream` does NOT write per-source stamp ─
 
-  test('gbrain dream (no --source) leaves all sources untouched (back-compat regression)', async () => {
-    await seedSource('alpha');
-    await seedSource('beta');
+  test('gbrain dream (no --source) stamps only the source whose local_path matches --dir (#1869)', async () => {
+    // Pre-#1869 this asserted NO source was ever stamped without an explicit
+    // --source — which is exactly the bug: a path-scoped `gbrain dream --dir`
+    // run never landed a freshness stamp and doctor's cycle_freshness stayed
+    // stale forever. New truth: the source whose local_path matches the
+    // resolved brain dir is derived and stamped; unrelated sources stay
+    // untouched (cross-source isolation).
+    await seedSource('alpha'); // local_path = repo → derived + stamped
+    await engine.executeRaw(
+      `INSERT INTO sources (id, name, local_path, config, archived, created_at)
+       VALUES ($1, $2, $3, '{}'::jsonb, false, NOW())`,
+      ['beta', 'beta', '/somewhere/else'],
+    );
     const report = await runDream(engine, ['--dir', repo, '--phase', 'lint', '--json']);
     expect(report).toBeTruthy();
-    expect(await readLastFullCycleAt('alpha')).toBeNull();
+    expect(await readLastFullCycleAt('alpha')).not.toBeNull();
     expect(await readLastFullCycleAt('beta')).toBeNull();
   }, 60_000);
 

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');
-  });
-});