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>

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);
   };
@@ -686,7 +722,6 @@ export async function runAutopilot(engine: BrainEngine, args: string[]) {
       try {
         const { MinionQueue } = await import('../core/minions/queue.ts');
         const { computeRecommendations, embeddingProviderConfigured, HOSTED_EMBED_KEY_CONFIG } = await import('../core/brain-score-recommendations.ts');
-        const { countExtractionLag } = await import('../core/remediation/context.ts');
         const queue = new MinionQueue(engine);
         const slotMs = Math.floor(Date.now() / (baseInterval * 1000)) * baseInterval * 1000;
         const slot = new Date(slotMs).toISOString();
@@ -878,9 +913,6 @@ export async function runAutopilot(engine: BrainEngine, args: string[]) {
             return !!(process.env[envVar] || (cfgField ? embedKeyCfg[cfgField] : undefined));
           }),
           hasChatApiKey: !!(process.env.ANTHROPIC_API_KEY || await engine.getConfig('anthropic_api_key')),
-          // Real extraction-lag gate for sync.repo/extract.all — same counter
-          // loadRecommendationContext uses (replaces the health.stale_pages proxy).
-          extractionLagPages: await countExtractionLag(engine),
         };
         // v0.41.18.0 (A5 + A19 + A22, T15): consult onboard recommendations
         // ALONGSIDE doctor's brain-score recommendations. Onboard's 4 new
@@ -1012,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/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/core/brain-score-recommendations.ts

@@ -146,16 +146,6 @@ export interface RecommendationContext {
   chatModel?: string;
   /** Whether the chat provider has a usable API key. */
   hasChatApiKey?: boolean;
-  /**
-   * Count of pages needing link/timeline extraction — the SAME staleness the
-   * `gbrain extract --stale` walk and doctor's `links_extraction_lag` check use
-   * (`engine.countStalePagesForExtraction`). Gates the sync→extract pipeline
-   * (sync.repo / extract.all). Replaces the old `health.stale_pages` gate, which
-   * counted "pages whose updated_at predates their newest timeline entry" — a
-   * proxy that broke when the updated_at-on-timeline-insert trigger was dropped
-   * (migration v10) and never reflected real extraction work.
-   */
-  extractionLagPages?: number;
 }
 
 /** Triage result for one check. */
@@ -202,28 +192,20 @@ export function computeRecommendations(
   const source = ctx.sourceId ?? 'default';
 
   // ---------------------------------------------------------------------
-  // sync.repo + extract.all — the materialization pipeline, gated on the REAL
-  // extraction lag (pages whose link/timeline edges are stale), NOT on the
-  // legacy `health.stale_pages` proxy. `extractionLagPages` comes from the same
-  // counter the `extract --stale` walk + doctor's `links_extraction_lag` use, so
-  // the recommendation can only fire when running extract will actually reduce
-  // it (and clear the rec). See RecommendationContext.extractionLagPages.
-  // sync.repo is the prerequisite: re-sync so pages are current before extract
-  // materializes their edges.
+  // sync.repo — fires when sync hasn't run recently OR pages are stale
   // ---------------------------------------------------------------------
-  const extractionLag = ctx.extractionLagPages ?? 0;
-  if (ctx.repoPath && extractionLag > 0) {
+  if (ctx.repoPath && health.stale_pages > 0) {
     const params = { repoPath: ctx.repoPath, sourceId: ctx.sourceId, noEmbed: true };
     out.push({
       id: 'sync.repo',
       job: 'sync',
       params,
       idempotency_key: idemKey(source, 'sync', params),
-      severity: extractionLag > 50 ? 'high' : 'medium',
-      est_seconds: Math.min(600, 30 + extractionLag * 0.5),
+      severity: health.stale_pages > 50 ? 'high' : 'medium',
+      est_seconds: Math.min(600, 30 + health.stale_pages * 0.5),
       est_usd_cost: 0,  // sync is fs+DB only
       depends_on: [],
-      rationale: `Sync before extracting ${extractionLag} page${extractionLag === 1 ? '' : 's'} with stale link/timeline edges`,
+      rationale: `${health.stale_pages} stale page${health.stale_pages === 1 ? '' : 's'} on disk`,
       status: 'remediable',
     });
   }
@@ -255,7 +237,7 @@ export function computeRecommendations(
       est_seconds: Math.min(3600, 5 + health.missing_embeddings * 0.05),
       est_usd_cost,
       // sync should run first so embed sees fresh pages.
-      depends_on: ctx.repoPath && extractionLag > 0 ? ['sync.repo'] : [],
+      depends_on: ctx.repoPath && health.stale_pages > 0 ? ['sync.repo'] : [],
       rationale: `${health.missing_embeddings} chunk${health.missing_embeddings === 1 ? '' : 's'} invisible to vector search`,
       status: 'remediable',
     });
@@ -285,7 +267,7 @@ export function computeRecommendations(
   // Triggered when sync.repo fires (because sync was set to noEmbed:true,
   // and noExtract:true after T5 lands → extract job is the materializer).
   // ---------------------------------------------------------------------
-  if (ctx.repoPath && extractionLag > 0) {
+  if (ctx.repoPath && health.stale_pages > 0) {
     const params = { mode: 'all', dir: ctx.repoPath };
     out.push({
       id: 'extract.all',
@@ -296,7 +278,7 @@ export function computeRecommendations(
       est_seconds: Math.min(600, 30 + health.page_count * 0.01),
       est_usd_cost: 0,
       depends_on: ['sync.repo'],
-      rationale: `Materialize link + timeline edges for ${extractionLag} page${extractionLag === 1 ? '' : 's'} with stale extraction`,
+      rationale: 'Materialize link + timeline edges from fresh pages',
       status: 'remediable',
     });
   }

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

@@ -8,7 +8,6 @@
 
 import type { BrainEngine } from '../engine.ts';
 import type { RecommendationContext } from '../brain-score-recommendations.ts';
-import { LINK_EXTRACTOR_VERSION_TS } from '../link-extraction.ts';
 
 // Re-export so consumers can `import { RecommendationContext } from '../remediation'`
 // — the canonical RecommendationContext type still lives in
@@ -69,29 +68,5 @@ export async function loadRecommendationContext(
     embeddingDimensions,
     embeddingProviderConfigured: embeddingConfigured,
     hasChatApiKey: !!(process.env.ANTHROPIC_API_KEY || fileCfg?.anthropic_api_key),
-    extractionLagPages: await countExtractionLag(engine),
   };
 }
-
-/**
- * Real extraction-lag count — the SAME staleness `gbrain extract --stale`
- * processes (engine.countStalePagesForExtraction with
- * versionTs=LINK_EXTRACTOR_VERSION_TS, matching doctor's links_extraction_lag
- * check — without versionTs, pages stamped before an extractor version bump
- * would lag for doctor/extract but never trip this gate). Drives the
- * sync→extract recommendation pipeline; replaces the legacy
- * `health.stale_pages` proxy that no longer reflected real extraction work
- * after the v10 trigger drop.
- *
- * Shared by loadRecommendationContext AND the D7 per-step recheck in
- * runRemediation — the recheck MUST refresh this gate alongside getHealth,
- * or a completed extract step keeps re-firing off the frozen initial count.
- */
-export async function countExtractionLag(engine: BrainEngine): Promise<number> {
-  try {
-    return await engine.countStalePagesForExtraction({ versionTs: LINK_EXTRACTOR_VERSION_TS });
-  } catch {
-    /* counter unavailable (very old brain / mid-migration) — treat as 0 */
-    return 0;
-  }
-}

src/core/remediation/run.ts

@@ -16,7 +16,7 @@ import {
   computeRecommendations,
 } from '../brain-score-recommendations.ts';
 import type { RemediationStep } from '../remediation-step.ts';
-import { countExtractionLag, loadRecommendationContext } from './context.ts';
+import { loadRecommendationContext } from './context.ts';
 import { computeRemediationPlan } from './plan.ts';
 import type {
   RemediationHooks,
@@ -65,7 +65,7 @@ export async function runRemediation(
     clearRemediationCheckpoint,
   } = await import('../remediation-checkpoint.ts');
 
-  let ctx = await loadRecommendationContext(engine);
+  const ctx = await loadRecommendationContext(engine);
 
   // Pre-flight ceiling check via the shared plan computation.
   const initialPlan = await computeRemediationPlan(engine, { targetScore });
@@ -305,11 +305,6 @@ export async function runRemediation(
       // steps with bumped retry suffix (D1).
       if (recs.length === 0 || stepCount >= maxJobs) break;
       const freshHealth = await engine.getHealth();
-      // Refresh the extraction-lag gate alongside health: ctx was loaded once
-      // before the loop, and a completed sync/extract step is exactly what
-      // drives the count down. Reusing the frozen initial count would re-fire
-      // sync.repo/extract.all every recheck until maxJobs.
-      ctx = { ...ctx, extractionLagPages: await countExtractionLag(engine) };
       recs = computeRecommendations(freshHealth, ctx).filter((r) => r.status === 'remediable');
     }
   };

src/core/types.ts

@@ -1423,15 +1423,6 @@ export interface BrainStats {
 export interface BrainHealth {
   page_count: number;
   embed_coverage: number;
-  /**
-   * LEGACY proxy: count of pages whose `updated_at` predates their newest
-   * timeline entry. This bumped meaningfully only while a trigger updated
-   * `pages.updated_at` on timeline insert; that trigger was dropped in
-   * migration v10, so the metric no longer reflects real "needs work" state.
-   * NO LONGER gates remediations — the sync→extract pipeline now gates on
-   * `RecommendationContext.extractionLagPages` (the real extraction-lag from
-   * `countStalePagesForExtraction`). Retained for the CLI health line + back-compat.
-   */
   stale_pages: number;
   /**
    * Islanded pages — zero inbound AND zero outbound links. A hub page

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/brain-score-recommendations.test.ts

@@ -119,12 +119,13 @@ describe('computeRecommendations', () => {
     expect(recs.find((r) => r.id === 'embed.stale')).toBeUndefined();
   });
 
-  test('extraction lag + dead links produce sync + backlinks + extract', () => {
+  test('stale pages + dead links produce sync + backlinks + extract', () => {
     const health = makeHealth({
+      stale_pages: 25,
       dead_links: 8,
       brain_score: 70,
     });
-    const recs = computeRecommendations(health, { repoPath: '/brain', embeddingProviderConfigured: true, extractionLagPages: 25 });
+    const recs = computeRecommendations(health, { repoPath: '/brain', embeddingProviderConfigured: true });
     const ids = recs.map((r) => r.id);
     expect(ids).toContain('sync.repo');
     expect(ids).toContain('backlinks.fix');
@@ -132,17 +133,18 @@ describe('computeRecommendations', () => {
   });
 
   test('extract.all depends on sync.repo (D14: stable ids)', () => {
-    const health = makeHealth();
-    const recs = computeRecommendations(health, { repoPath: '/brain', embeddingProviderConfigured: true, extractionLagPages: 10 });
+    const health = makeHealth({ stale_pages: 10 });
+    const recs = computeRecommendations(health, { repoPath: '/brain', embeddingProviderConfigured: true });
     const extract = recs.find((r) => r.id === 'extract.all');
     expect(extract?.depends_on).toContain('sync.repo');
   });
 
-  test('embed.stale depends on sync.repo when extraction also needed', () => {
+  test('embed.stale depends on sync.repo when sync also needed', () => {
     const health = makeHealth({
+      stale_pages: 10,
       missing_embeddings: 100,
     });
-    const recs = computeRecommendations(health, { repoPath: '/brain', embeddingProviderConfigured: true, extractionLagPages: 10 });
+    const recs = computeRecommendations(health, { repoPath: '/brain', embeddingProviderConfigured: true });
     const embed = recs.find((r) => r.id === 'embed.stale');
     expect(embed?.depends_on).toContain('sync.repo');
   });
@@ -157,9 +159,9 @@ describe('computeRecommendations', () => {
   test('severity ordering: critical before high before medium', () => {
     const health = makeHealth({
       missing_embeddings: 100,  // critical
+      stale_pages: 80,          // high
     });
-    // extractionLagPages > 50 → sync.repo fires at 'high' severity.
-    const recs = computeRecommendations(health, { repoPath: '/brain', embeddingProviderConfigured: true, extractionLagPages: 80 });
+    const recs = computeRecommendations(health, { repoPath: '/brain', embeddingProviderConfigured: true });
     const critIdx = recs.findIndex((r) => r.severity === 'critical');
     const highIdx = recs.findIndex((r) => r.severity === 'high');
     expect(critIdx).toBeLessThan(highIdx);
@@ -168,10 +170,11 @@ describe('computeRecommendations', () => {
   // D6 #5 — THE critical regression test for the agent contract.
   test('D6 #5: determinism — same input twice produces identical output', () => {
     const health = makeHealth({
+      stale_pages: 10,
       missing_embeddings: 50,
       dead_links: 3,
     });
-    const ctx = { repoPath: '/brain', embeddingProviderConfigured: true, sourceId: 'default', extractionLagPages: 10 };
+    const ctx = { repoPath: '/brain', embeddingProviderConfigured: true, sourceId: 'default' };
     const run1 = computeRecommendations(health, ctx);
     const run2 = computeRecommendations(health, ctx);
     expect(JSON.stringify(run1)).toBe(JSON.stringify(run2));

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/remediation-context-extraction-lag.test.ts

@@ -1,62 +0,0 @@
-// test/remediation-context-extraction-lag.test.ts
-//
-// Pins the v-next fix: the sync→extract remediation pipeline gates on REAL
-// extraction lag, not the legacy `health.stale_pages` proxy (which counted
-// "updated_at predates newest timeline entry" — meaningless after the v10
-// trigger drop). loadRecommendationContext now populates `extractionLagPages`
-// from `engine.countStalePagesForExtraction` — the SAME counter the
-// `gbrain extract --stale` walk and doctor's `links_extraction_lag` use — so a
-// recommendation can only fire when running extract will actually reduce it.
-
-import { afterAll, beforeAll, describe, expect, it } from 'bun:test';
-import { PGLiteEngine } from '../src/core/pglite-engine.ts';
-import { loadRecommendationContext } from '../src/core/remediation/context.ts';
-
-let engine: PGLiteEngine;
-
-beforeAll(async () => {
-  engine = new PGLiteEngine();
-  await engine.connect({});
-  await engine.initSchema();
-});
-
-afterAll(async () => {
-  await engine.disconnect();
-});
-
-describe('loadRecommendationContext — extractionLagPages wiring', () => {
-  it('is 0 on an empty brain (nothing to extract)', async () => {
-    const ctx = await loadRecommendationContext(engine);
-    expect(ctx.extractionLagPages).toBe(0);
-  });
-
-  it('reflects the real extraction-lag count once a page needs extraction', async () => {
-    // A freshly-imported page has links_extracted_at = NULL, which the canonical
-    // countStalePagesForExtraction predicate counts as stale-for-extraction.
-    await engine.putPage('p0', {
-      title: 'p0',
-      type: 'note' as never,
-      compiled_truth: 'body that is long enough to pass any minimum-length guards in the codebase',
-      timeline: '',
-      frontmatter: {},
-      source_path: 'p0.md',
-    });
-    const ctx = await loadRecommendationContext(engine);
-    expect(ctx.extractionLagPages).toBeGreaterThan(0);
-  });
-
-  it('counts pages stamped before LINK_EXTRACTOR_VERSION_TS (version-bump arm)', async () => {
-    // Backdate p0 so BOTH the NULL arm and the updated_at arm are quiet:
-    // updated_at < links_extracted_at, but links_extracted_at predates the
-    // extractor version stamp. doctor's links_extraction_lag and
-    // `extract --stale` both count this page; the remediation gate must too.
-    await engine.executeRaw(
-      `UPDATE pages SET updated_at = '2020-01-01T00:00:00Z'::timestamptz,
-                        links_extracted_at = '2020-01-02T00:00:00Z'::timestamptz
-        WHERE slug = 'p0'`,
-      [],
-    );
-    const ctx = await loadRecommendationContext(engine);
-    expect(ctx.extractionLagPages).toBeGreaterThan(0);
-  });
-});

test/remediation-run-d7-refresh.serial.test.ts

@@ -1,81 +0,0 @@
-// test/remediation-run-d7-refresh.serial.test.ts
-//
-// Pins the D7-recheck half of the extraction-lag gate fix: runRemediation
-// loads RecommendationContext ONCE before the step loop, and the per-step
-// recheck (D7) must REFRESH ctx.extractionLagPages alongside getHealth.
-// Without the refresh, a completed sync/extract step keeps re-firing off
-// the frozen initial count — the plan never converges and the loop burns
-// steps until maxJobs.
-//
-// SERIAL (R2): uses top-level mock.module for the minion queue +
-// wait-for-completion so no real worker is needed — mocks leak across
-// files in a shard process, so this file must run in its own process.
-
-import { describe, expect, mock, test } from 'bun:test';
-
-// The fake brain: sync.repo clears the extraction lag when it "runs"
-// (today's sync materializes link/timeline edges; extract.all is the
-// explicit re-materializer). The frozen-ctx bug makes runRemediation
-// ignore that and resubmit sync.repo on every D7 recheck.
-let extractionLag = 25;
-const submittedJobs: string[] = [];
-
-mock.module('../src/core/minions/queue.ts', () => ({
-  MinionQueue: class {
-    constructor(_engine: unknown) {}
-    async add(job: string): Promise<{ id: number }> {
-      submittedJobs.push(job);
-      if (job === 'sync' || job === 'extract') extractionLag = 0;
-      return { id: submittedJobs.length };
-    }
-  },
-}));
-
-mock.module('../src/core/minions/wait-for-completion.ts', () => ({
-  waitForCompletion: async () => ({ status: 'completed' }),
-}));
-
-const health = () => ({
-  page_count: 100,
-  embed_coverage: 1.0,
-  stale_pages: 0, // legacy proxy stays 0 — the real counter drives the gate
-  orphan_pages: 0,
-  missing_embeddings: 0,
-  brain_score: 70,
-  dead_links: 0,
-  link_coverage: 1.0,
-  timeline_coverage: 1.0,
-  most_connected: [],
-  embed_coverage_score: 35,
-  link_density_score: 25,
-  timeline_coverage_score: 15,
-  no_orphans_score: 15,
-  no_dead_links_score: 10,
-});
-
-const fakeEngine = {
-  kind: 'pglite' as const,
-  getHealth: async () => health(),
-  getConfig: async (key: string) =>
-    key === 'sync.repo_path' ? '/tmp/brain-example' : null,
-  countStalePagesForExtraction: async () => extractionLag,
-};
-
-describe('runRemediation D7 recheck — extraction-lag gate refresh', () => {
-  test('a completed materializer step clears the gate; the pipeline is not resubmitted', async () => {
-    const { runRemediation } = await import('../src/core/remediation/run.ts');
-    const result = await runRemediation(
-      // Only the methods the orchestrator touches are needed.
-      fakeEngine as never,
-      { targetScore: 0, maxJobs: 6 },
-    );
-    // Frozen-ctx bug: extractionLagPages stays 25 forever, so every D7
-    // recheck re-introduces the sync/extract pipeline and the loop burns
-    // all 6 maxJobs. With the refresh, the plan converges after the first
-    // completed step: no step id is ever submitted twice.
-    const ids = result.submitted.map((s) => s.id);
-    expect(new Set(ids).size).toBe(ids.length);
-    expect(submittedJobs.length).toBeLessThan(3);
-    expect(extractionLag).toBe(0);
-  });
-});