fix(facts): seed phase B backfill row_nums past the DB max (#2044 class)

phaseBFenceFacts appended at fence-max+1 with no DB seeding, so on a
diverged page (stamped DB rows + missing fence at the resolved path —
the same divergence class the writeFactsToFence fix handles) the
post-rename UPDATE hit idx_facts_fence_key, the page failed, and the
already-renamed fence disagreed with the DB while the row_num-NULL
backlog persisted. Seed appended row_nums from MAX(fence max, DB max)
per (source_id, slug), mirroring the fence-write fix. Repro test added.

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

src/cli.ts

@@ -54,7 +54,7 @@ export function bigintToStringReplacer(_key: string, value: unknown): unknown {
 }
 
 // CLI-only commands that bypass the operation layer
-export const CLI_ONLY = new Set(['init', 'reinit-pglite', 'upgrade', 'post-upgrade', 'check-update', 'integrations', 'publish', 'check-backlinks', 'lint', 'report', 'import', 'export', 'files', 'embed', 'serve', 'call', 'config', 'doctor', 'migrate', 'eval', 'sync', 'extract', 'extract-conversation-facts', 'enrich', 'features', 'autopilot', 'graph-query', 'jobs', 'agent', 'apply-migrations', 'skillpack-check', 'skillpack', 'resolvers', 'integrity', 'repair-jsonb', 'orphans', 'sources', 'mounts', 'dream', 'check-resolvable', 'routing-eval', 'skillify', 'smoke-test', 'providers', 'storage', 'repos', 'code-def', 'code-refs', 'reindex', 'reindex-code', 'reindex-frontmatter', 'code-callers', 'code-callees', 'reconcile-links', 'frontmatter', 'auth', 'friction', 'claw-test', 'book-mirror', 'takes', 'think', 'salience', 'anomalies', 'calibration', 'transcripts', 'models', 'remote', 'recall', 'forget', 'edges-backfill', 'cache', 'ze-switch', 'founder', 'brainstorm', 'lsd', 'schema', 'capture', 'onboard', 'conversation-parser', 'status', 'connect', 'skillopt', 'quarantine', 'self-upgrade', 'advisor', 'watch', 'reindex-search-vector']);
+export const CLI_ONLY = new Set(['init', 'reinit-pglite', 'upgrade', 'post-upgrade', 'check-update', 'integrations', 'publish', 'check-backlinks', 'lint', 'report', 'import', 'export', 'files', 'embed', 'serve', 'call', 'config', 'doctor', 'migrate', 'eval', 'sync', 'extract', 'extract-conversation-facts', 'enrich', 'features', 'autopilot', 'graph-query', 'jobs', 'agent', 'apply-migrations', 'skillpack-check', 'skillpack', 'resolvers', 'integrity', 'repair-jsonb', 'orphans', 'sources', 'mounts', 'dream', 'check-resolvable', 'routing-eval', 'skillify', 'smoke-test', 'providers', 'storage', 'repos', 'code-def', 'code-refs', 'reindex', 'reindex-code', 'reindex-frontmatter', 'code-callers', 'code-callees', 'reconcile-links', 'frontmatter', 'auth', 'friction', 'claw-test', 'book-mirror', 'takes', 'think', 'salience', 'anomalies', 'calibration', 'transcripts', 'models', 'remote', 'recall', 'forget', 'edges-backfill', 'facts', 'cache', 'ze-switch', 'founder', 'brainstorm', 'lsd', 'schema', 'capture', 'onboard', 'conversation-parser', 'status', 'connect', 'skillopt', 'quarantine', 'self-upgrade', 'advisor', 'watch', 'reindex-search-vector']);
 // CLI-only commands whose handlers print their own --help text. These are
 // excluded from the generic short-circuit so detailed per-command and
 // per-subcommand usage stays reachable.
@@ -991,6 +991,8 @@ const THIN_CLIENT_REFUSED_COMMANDS = new Set([
   // hint pointing at the routable MCP tools; per-subcommand splits are
   // a v0.31.x follow-up TODO.
   'takes', 'sources',
+  // #1867: fence-backfill edits local .md fences + stamps the local DB.
+  'facts',
   // v0.32 thin-client routing audit (Codex round 2 findings #2, #4):
   // - `pages` purge-deleted is admin+localOnly (operations.ts:856-864)
   // - `files` list / file_url MCP ops are localOnly (operations.ts:1769-1879)
@@ -1026,6 +1028,7 @@ const THIN_CLIENT_REFUSE_HINTS: Record<string, string> = {
   migrate: "migrate runs on the host's local engine. Run on the host machine.",
   'apply-migrations': 'schema migrations run on the host. SSH and run there.',
   'repair-jsonb': 'repair-jsonb operates on the local DB only.',
+  facts: 'facts fence-backfill edits local entity-page fences. Run on the host machine.',
   integrity: 'integrity scans local files. Run on the host machine.',
   serve: 'serve starts a server. Run on the host, not the thin client.',
   dream: 'dream runs the autopilot cycle on the host. `gbrain remote ping` queues one. (Native `gbrain dream` thin-client routing planned for v0.31.2.)',
@@ -1855,6 +1858,13 @@ async function handleCliOnly(command: string, args: string[]) {
         await runEdgesBackfill(engine, args);
         break;
       }
+      case 'facts': {
+        // #1867 — re-runnable fence-backfill for row_num-NULL legacy fact
+        // rows (idempotent v0_32_2 phase B, exposed as an operator command).
+        const { runFactsCommand } = await import('./commands/facts.ts');
+        await runFactsCommand(engine, args);
+        break;
+      }
       case 'whoknows': {
         // v0.33 (Issue #?): expertise + relationship-proximity routing.
         // MCP op `find_experts` (read-scoped) backs the same code path; CLI
@@ -2335,6 +2345,7 @@ TOOLS
   check-backlinks <check|fix> [dir]  Find/fix missing back-links across brain
   lint <dir|file> [--fix]            Catch LLM artifacts, placeholder dates, bad frontmatter
   orphans [--json] [--count]         Find pages with no inbound wikilinks
+  facts fence-backfill [--dry-run]   Fence legacy fact rows (row_num NULL) onto entity pages
   salience [--days N] [--kind P]     v0.29: pages ranked by emotional + activity salience
   anomalies [--since D] [--sigma N]  v0.29: cohort-based statistical anomalies (tag, type)
   transcripts recent [--days N]      v0.29: recent raw .txt transcripts (local-only)

src/commands/facts.ts

@@ -0,0 +1,48 @@
+/**
+ * gbrain facts — fact-store maintenance surface (#1867).
+ *
+ * `fence-backfill` re-runs the v0_32_2 fence-backfill phase on demand.
+ * Remote `extract_facts` deposits that predate the fence-write backstop
+ * (and any legacy DB-only insert) leave `row_num IS NULL` rows that the
+ * cycle extract_facts guard refuses to reconcile past — previously the
+ * only remedy was the one-shot v0_32_2 migration, which the ledger marks
+ * complete and never re-runs. The phase is idempotent (only touches
+ * `row_num IS NULL` rows), so exposing it as a command is safe to re-run
+ * any time the backlog reappears.
+ */
+import type { BrainEngine } from '../core/engine.ts';
+import { setCliExitVerdict } from '../core/cli-force-exit.ts';
+import { phaseBFenceFacts } from './migrations/v0_32_2.ts';
+
+function printHelp(): void {
+  process.stderr.write(
+    `Usage: gbrain facts fence-backfill [--dry-run]\n\n` +
+      `Fence-backfill: appends every legacy fact row (row_num IS NULL) to its\n` +
+      `entity page's \`## Facts\` fence and stamps row_num + source_markdown_slug\n` +
+      `back onto the DB row. Idempotent — re-runs only pick up rows still\n` +
+      `missing a fence assignment. Clears the backlog that makes the cycle's\n` +
+      `extract_facts phase skip fence→DB reconciliation.\n\n` +
+      `  --dry-run   report what would be fenced; no FS or DB writes\n`,
+  );
+}
+
+export async function runFactsCommand(engine: BrainEngine, args: string[]): Promise<void> {
+  const sub = args[0];
+  if (!sub || sub === '--help' || sub === '-h') {
+    printHelp();
+    return;
+  }
+  if (sub !== 'fence-backfill') {
+    process.stderr.write(`Unknown facts subcommand: ${sub}\n`);
+    printHelp();
+    setCliExitVerdict(1);
+    return;
+  }
+
+  const dryRun = args.includes('--dry-run');
+  const result = await phaseBFenceFacts(engine, { dryRun });
+  process.stderr.write(
+    `fence-backfill: ${result.status}${result.detail ? ` — ${result.detail}` : ''}\n`,
+  );
+  if (result.status === 'failed') setCliExitVerdict(1);
+}

src/commands/migrations/v0_32_2.ts

@@ -39,6 +39,7 @@ import type { BrainEngine } from '../../core/engine.ts';
 import { loadConfig, toEngineConfig } from '../../core/config.ts';
 import { createEngine } from '../../core/engine-factory.ts';
 import { upsertFactRow, parseFactsFence } from '../../core/facts-fence.ts';
+import { resolvePageFilePath } from '../../core/markdown.ts';
 
 let testEngineOverride: BrainEngine | null = null;
 export function __setTestEngineOverride(engine: BrainEngine | null): void {
@@ -148,9 +149,16 @@ function isLocalPathDirty(localPath: string): boolean {
   }
 }
 
-async function phaseBFenceFacts(
+/**
+ * Exported (not just via `__testing`) because `gbrain facts fence-backfill`
+ * (#1867) re-runs this phase on demand: remote `extract_facts` deposits that
+ * predate the fence-write backstop leave row_num-NULL rows the cycle guard
+ * refuses to reconcile past. The phase is idempotent (only touches
+ * `row_num IS NULL` rows), so re-running is always safe.
+ */
+export async function phaseBFenceFacts(
   engine: BrainEngine | null,
-  opts: OrchestratorOpts,
+  opts: Pick<OrchestratorOpts, 'dryRun'>,
 ): Promise<OrchestratorPhaseResult> {
   if (opts.dryRun) {
     // Dry-run: report what WOULD happen without touching FS or DB.
@@ -238,7 +246,11 @@ async function phaseBFenceFacts(
     for (const [key, group] of groups) {
       const [sourceId, entitySlug] = key.split('\0');
       const localPath = localPathById.get(sourceId)!;
-      const filePath = join(localPath, `${entitySlug}.md`);
+      // resolvePageFilePath, NOT a bare join — non-default sources fence
+      // into `<local_path>/.sources/<id>/<slug>.md`, the same path the
+      // fence-write backstop and put_page write-through compute. A bare
+      // join here diverges fence and DB for non-default sources (#2044).
+      const filePath = resolvePageFilePath(localPath, entitySlug, sourceId);
       const tmpPath = `${filePath}.tmp`;
 
       try {
@@ -269,6 +281,21 @@ async function phaseBFenceFacts(
         const existingFence = parseFactsFence(body);
         const existingKeySet = new Set(existingFence.facts.map(f => `${f.claim}\0${f.source ?? ''}`));
 
+        // Seed appended row_nums from MAX(fence max, DB max) — same #2044
+        // divergence guard as writeFactsToFence. When the fence at the
+        // resolved path is missing/behind but the DB already holds stamped
+        // rows for this slug (legacy wrong-path fence writes), fence-max+1
+        // collides with idx_facts_fence_key on the post-rename UPDATE,
+        // failing the page and leaving fence and DB disagreeing.
+        const dbMaxRows = await engine.executeRaw<{ max: number | string | null }>(
+          `SELECT MAX(row_num) AS max FROM facts
+            WHERE source_id = $1 AND source_markdown_slug = $2`,
+          [sourceId, entitySlug],
+        );
+        const dbMaxRowNum = Number(dbMaxRows[0]?.max ?? 0) || 0;
+        const fenceMaxRowNum = existingFence.facts.reduce((m, f) => Math.max(m, f.rowNum), 0);
+        let nextRowNum = Math.max(fenceMaxRowNum, dbMaxRowNum) + 1;
+
         const assignments: Array<{ id: string; row_num: number }> = [];
         for (const row of group) {
           const key = `${row.fact}\0${row.source ?? ''}`;
@@ -291,6 +318,7 @@ async function phaseBFenceFacts(
                 .toISOString().slice(0, 10)
             : undefined;
           const { body: updated, rowNum } = upsertFactRow(body, {
+            rowNum:     nextRowNum++,
             claim:      row.fact,
             kind:       row.kind,
             confidence: row.confidence,
@@ -381,7 +409,7 @@ async function phaseCVerify(
     for (const g of groups) {
       const localPath = localPathById.get(g.source_id);
       if (!localPath) continue;
-      const filePath = join(localPath, `${g.source_markdown_slug}.md`);
+      const filePath = resolvePageFilePath(localPath, g.source_markdown_slug, g.source_id);
       if (!existsSync(filePath)) {
         mismatches.push(`${g.source_markdown_slug} (file missing)`);
         continue;

src/commands/models.ts

@@ -50,10 +50,6 @@ const PER_TASK_KEYS: Array<{ key: string; tier: ModelTier; description: string }
   { key: 'models.eval.contradictions_judge', tier: 'utility',  description: 'Contradiction probe judge (v0.34 temporal-aware)' },
   { key: 'models.expansion',                tier: 'utility',   description: 'Query expansion for hybrid search' },
   { key: 'models.chat',                     tier: 'reasoning', description: 'Default `gateway.chat()` model' },
-  { key: 'models.propose_takes',            tier: 'reasoning', description: 'propose_takes claim extractor' },
-  { key: 'models.grade_takes',              tier: 'reasoning', description: 'grade_takes verdict judge' },
-  { key: 'models.calibration_profile',      tier: 'reasoning', description: 'Calibration profile generator' },
-  { key: 'models.brainstorm',               tier: 'reasoning', description: '`gbrain brainstorm` orchestrator' },
 ];
 
 interface ModelEntry {

src/core/brainstorm/judges.ts

@@ -61,10 +61,7 @@ export const MAX_OUTPUT_TOKENS_CEIL = 32_000;
  * (with a readable error) instead of the provider's opaque HTTP 400.
  */
 export const ANTHROPIC_OUTPUT_CAPS: Record<string, number> = {
-  'claude-fable-5': 64_000,
-  'claude-opus-4-8': 32_000,
   'claude-opus-4-7': 32_000,
-  'claude-sonnet-5': 64_000,
   'claude-sonnet-4-6': 64_000,
   'claude-haiku-4-5': 64_000,
   'claude-haiku-4-5-20251001': 64_000,

src/core/brainstorm/orchestrator.ts

@@ -32,7 +32,6 @@
  */
 
 import type { BrainEngine } from '../engine.ts';
-import { resolveModel } from '../model-config.ts';
 import { chat as defaultChat, embedQuery, type ChatResult, type ChatOpts } from '../ai/gateway.ts';
 import { hybridSearch, hybridSearchCached } from '../search/hybrid.ts';
 import { fetchFar, type CloseRef, type FarPage } from './domain-bank.ts';
@@ -539,14 +538,7 @@ async function _runBrainstormInner(
   const embedFn = opts.embedQueryFn ?? embedQuery;
 
   // ---- Phase 0: cost preview + TTY grace ----
-  // Tier-resolved (mirrors the cycle phases): honors models.brainstorm >
-  // models.default > models.tier.reasoning; the fallback keeps stock
-  // behavior identical (reasoning tier default IS claude-sonnet-4-6).
-  const modelStr = opts.modelOverride ?? await resolveModel(engine, {
-    configKey: 'models.brainstorm',
-    tier: 'reasoning',
-    fallback: 'anthropic:claude-sonnet-4-6',
-  });
+  const modelStr = opts.modelOverride ?? 'anthropic:claude-sonnet-4-6';
   const { aborted, estimate } = await previewCostAndWait({
     profile,
     model: modelStr,

src/core/cycle/calibration-profile.ts

@@ -26,8 +26,8 @@
  */
 
 import { BaseCyclePhase, type ScopedReadOpts, type BasePhaseOpts } from './base-phase.ts';
-import { chat as gatewayChat, getChatModel } from '../ai/gateway.ts';
-import { resolveModel } from '../model-config.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';
 import { patternStatementTemplate, type PatternStatementSlots } from '../calibration/templates.ts';
 // v0.41 T10 — domain widening. The aggregator module resolves the active
@@ -229,16 +229,7 @@ class CalibrationProfilePhase extends BaseCyclePhase {
   ): Promise<{ summary: string; details: Record<string, unknown>; status?: PhaseStatus }> {
     const holder = opts.holder ?? 'garry';
     const promptVersion = opts.promptVersion ?? CALIBRATION_PROFILE_PROMPT_VERSION;
-    // Resolved once (see propose-takes.ts for the chain): models.calibration_profile
-    // > models.default > env > the gateway's chat model (itself resolved
-    // through models.chat + the reasoning tier). Provider-prefixed per #2451
-    // — a bare id would make gateway.chat() throw "missing a provider
-    // prefix". Drives the generator's chat call, the budget label, and the
-    // persisted model_id, so the three can never disagree.
-    const modelId = opts.model ?? await resolveModel(engine, {
-      configKey: 'models.calibration_profile',
-      fallback: getChatModel(),
-    });
+    const modelId = opts.model ?? TIER_DEFAULTS.reasoning;
     const gradeCompletion = opts.gradeCompletion ?? 1.0;
     const patternsGenerator = opts.patternsGenerator ?? defaultPatternsGenerator;
     const biasTagsGenerator = opts.biasTagsGenerator ?? defaultBiasTagsGenerator;
@@ -274,7 +265,6 @@ class CalibrationProfilePhase extends BaseCyclePhase {
         scorecard,
         holder,
         attempt,
-        modelHint: modelId,
         ...(feedback !== undefined ? { feedback } : {}),
       });
       return lines.join('\n');

src/core/cycle/extract-facts.ts

@@ -176,9 +176,11 @@ export async function runExtractFacts(
   if (legacyCount > 0) {
     result.guardTriggered = true;
     result.warnings.push(
-      `extract_facts: ${legacyCount} legacy v0.31 fact rows pending fence backfill. ` +
-      `Run \`gbrain apply-migrations --yes\` to complete v0_32_2 before this phase ` +
-      `can safely reconcile fence → DB.`,
+      `extract_facts: ${legacyCount} legacy fact rows pending fence backfill ` +
+      `(row_num IS NULL — v0.31 rows or remote extract_facts deposits that ` +
+      `predate the fence backstop). Run \`gbrain facts fence-backfill\` ` +
+      `(idempotent, re-runnable) before this phase can safely reconcile ` +
+      `fence → DB.`,
     );
     return result;
   }

src/core/cycle/grade-takes.ts

@@ -36,9 +36,7 @@
 
 import { createHash } from 'node:crypto';
 import { BaseCyclePhase, type ScopedReadOpts, type BasePhaseOpts } from './base-phase.ts';
-import { chat as gatewayChat, getChatModel } from '../ai/gateway.ts';
-import { resolveModel } from '../model-config.ts';
-import { splitProviderModelId } from '../model-id.ts';
+import { chat as gatewayChat } from '../ai/gateway.ts';
 import { GBrainError } from '../types.ts';
 import type { OperationContext } from '../operations.ts';
 import type { BrainEngine, Take, TakeResolution } from '../engine.ts';
@@ -397,24 +395,7 @@ class GradeTakesPhase extends BaseCyclePhase {
     const autoResolve = opts.autoResolve ?? false; // D17 default OFF
     const autoResolveThreshold = opts.autoResolveThreshold ?? 0.95; // D12 conservative
     const resolvedByLabel = opts.resolvedByLabel ?? 'gbrain:grade_takes';
-    // Resolve the judge model ONCE (see propose-takes.ts for the chain —
-    // same label-vs-actual split fixed here: the judge call rode the
-    // gateway's chat_model while the grade cache key, evidence signature,
-    // and budget label recorded a hardcoded 4.6).
-    // NOTE: changing the resolved judge model invalidates the grade cache
-    // (judge_model_id is part of its key) — a one-time, budget-capped
-    // re-grade wave that is CORRECT, since the actual judge did change.
-    const judgeModelFull = opts.model ?? await resolveModel(engine, {
-      configKey: 'models.grade_takes',
-      fallback: getChatModel(),
-    });
-    // Bare tail for cache keys / evidence signatures / stored ids — the
-    // grade cache has always been keyed on bare ids; the gateway default
-    // resolves provider-prefixed, and normalizing preserves cache continuity
-    // on stock installs (no spurious re-judge wave from a prefix change). A
-    // genuinely different configured judge still invalidates, which is
-    // correct. The FULL string drives the actual judge call.
-    const judgeModelId = splitProviderModelId(judgeModelFull).model || judgeModelFull;
+    const judgeModelId = opts.model ?? 'claude-sonnet-4-6';
 
     const useEnsemble = opts.useEnsemble ?? false;
     const ensembleThreshold = opts.ensembleThreshold ?? 0.85;
@@ -487,7 +468,7 @@ class GradeTakesPhase extends BaseCyclePhase {
       // Call the single-model judge. Errors on a single take log warning + continue.
       let verdict: JudgeVerdict;
       try {
-        verdict = await judge({ take, evidence, modelHint: judgeModelFull });
+        verdict = await judge({ take, evidence, modelHint: opts.model });
       } catch (err) {
         const msg = err instanceof Error ? err.message : String(err);
         result.warnings.push(`judge failed on take ${take.id}: ${msg}`);

src/core/cycle/propose-takes.ts

@@ -5,16 +5,11 @@
  * a tuned LLM extractor, writes the extracted gradeable claims to the
  * `take_proposals` queue. User accepts/rejects via `gbrain takes propose`.
  *
- * Idempotency contract (D17 schema spec; per-claim rows since migration v125):
- *   Every scan of a (source_id, page_slug, content_hash, prompt_version)
- *   tuple leaves at least one row — one per extracted claim, or a single
- *   status='empty' sentinel when extraction yields nothing — so an unchanged
- *   page never re-spends LLM tokens. Pre-v125 only proposal rows were
- *   written: a zero-claim page never entered the cache and was re-extracted
- *   on EVERY cycle (observed live: ~60 such pages × every cycle ≈ 1,400
- *   wasted extractor calls / ~$15 per day — ~90% of total autopilot spend).
- *   Bumping PROPOSE_TAKES_PROMPT_VERSION cleanly invalidates the cache so a
- *   tuned prompt re-runs proposals on every page.
+ * Idempotency contract (D17 schema spec):
+ *   The unique index on (source_id, page_slug, content_hash, prompt_version)
+ *   means an unchanged page never re-spends LLM tokens. Bumping
+ *   PROPOSE_TAKES_PROMPT_VERSION cleanly invalidates the cache so a tuned
+ *   prompt re-runs proposals on every page.
  *
  * F2 fence dedup:
  *   The phase reads the page's existing `<!-- gbrain:takes:begin -->` fence
@@ -45,7 +40,6 @@
 import { randomUUID, createHash } from 'node:crypto';
 import { BaseCyclePhase, type ScopedReadOpts, type BasePhaseOpts } from './base-phase.ts';
 import { chat as gatewayChat, getChatModel } from '../ai/gateway.ts';
-import { resolveModel } from '../model-config.ts';
 import { writeReceipt } from '../extract/receipt-writer.ts';
 import { upsertExtractRollup } from '../extract/rollup-writer.ts';
 import { GBrainError } from '../types.ts';
@@ -313,18 +307,6 @@ class ProposeTakesPhase extends BaseCyclePhase {
     const promptVersion = opts.promptVersion ?? PROPOSE_TAKES_PROMPT_VERSION;
     const pageLimit = opts.pageLimit ?? 100;
     const skipPagesWithFence = opts.skipPagesWithFence ?? false;
-    // Resolve the extractor model ONCE: models.propose_takes >
-    // models.default > GBRAIN_MODEL env > the gateway's chat model (which
-    // reconfigureGatewayWithEngine already resolved through models.chat +
-    // the reasoning tier). One resolved provider-prefixed string drives the
-    // actual chat call, the budget estimate, AND the stored model_id — so
-    // the recorded model can never disagree with the model that ran (#2451
-    // convention: stored ids are provider-prefixed, nested prefixes like
-    // openrouter:anthropic/... stay intact).
-    const extractorModelId = opts.model ?? await resolveModel(engine, {
-      configKey: 'models.propose_takes',
-      fallback: getChatModel(),
-    });
     const proposalRunId = `propose-${new Date().toISOString().slice(0, 19).replace(/[-:T]/g, '')}-${randomUUID().slice(0, 8)}`;
 
     const result: ProposeTakesResult = {
@@ -348,6 +330,8 @@ class ProposeTakesPhase extends BaseCyclePhase {
       opts.reporter.start('propose_takes.pages' as never, pages.length);
     }
 
+    const modelId = opts.model ?? getChatModel();
+
     for (const page of pages) {
       result.pages_scanned += 1;
       this.tick(opts);
@@ -377,7 +361,7 @@ class ProposeTakesPhase extends BaseCyclePhase {
 
       // Budget pre-check before the LLM call. Estimate: ~1500 input tokens + 500 output.
       const budget = this.checkBudget({
-        modelId: extractorModelId,
+        modelId,
         estimatedInputTokens: 1500,
         maxOutputTokens: 500,
       });
@@ -396,7 +380,7 @@ class ProposeTakesPhase extends BaseCyclePhase {
           pagePath: page.slug,
           pageBody: body,
           existingTakes,
-          modelHint: extractorModelId,
+          modelHint: opts.model,
         });
       } catch (err) {
         const msg = err instanceof Error ? err.message : String(err);
@@ -404,42 +388,16 @@ class ProposeTakesPhase extends BaseCyclePhase {
         continue;
       }
 
-      // Zero-claim scans MUST still enter the idempotency cache. Pre-v125
-      // only proposal rows were written, so a page whose extraction yielded
-      // no gradeable claims never got a row for its (page, content_hash) —
-      // the cache check above missed on every subsequent cycle and the LLM
-      // call was re-spent on the same unchanged page, forever. The sentinel
-      // row (status='empty', empty claim_text) is invisible to the review
-      // queue (pending_idx is partial on status='pending'); it exists only
-      // so the cache check hits.
-      if (proposals.length === 0) {
-        await engine.executeRaw(
-          `INSERT INTO take_proposals
-             (source_id, page_slug, content_hash, prompt_version, proposal_run_id,
-              status, claim_text, kind, holder, weight, domain, dedup_against_fence_rows, model_id)
-           VALUES ($1, $2, $3, $4, $5, 'empty', '', 'none', 'brain', 0, NULL, NULL, $6)
-           ON CONFLICT (source_id, page_slug, content_hash, prompt_version, md5(claim_text)) DO NOTHING`,
-          [sourceId, page.slug, ch, promptVersion, proposalRunId, extractorModelId],
-        );
-        continue;
-      }
-
-      // Write proposals to take_proposals, one row per claim. The v125
-      // idempotency index includes md5(claim_text), so a same-page
-      // multi-claim run keeps EVERY claim — the pre-v125 four-column unique
-      // index made claims 2..N conflict with claim 1 and ON CONFLICT DO
-      // NOTHING silently dropped them (the review queue only ever saw the
-      // first claim of each page version). RETURNING id keeps
-      // proposals_inserted honest: it counts rows that actually landed,
-      // not insert attempts.
+      // Write proposals to take_proposals. Each row is a separate INSERT
+      // because the composite idempotency key is on the per-page tuple — a
+      // bulk UPSERT would collapse a same-page-multi-claim run into one row.
       for (const p of proposals) {
-        const landed = await engine.executeRaw<{ id: number }>(
+        await engine.executeRaw(
           `INSERT INTO take_proposals
              (source_id, page_slug, content_hash, prompt_version, proposal_run_id,
               claim_text, kind, holder, weight, domain, dedup_against_fence_rows, model_id)
            VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12)
-           ON CONFLICT (source_id, page_slug, content_hash, prompt_version, md5(claim_text)) DO NOTHING
-           RETURNING id`,
+           ON CONFLICT (source_id, page_slug, content_hash, prompt_version) DO NOTHING`,
           [
             sourceId,
             page.slug,
@@ -452,10 +410,10 @@ class ProposeTakesPhase extends BaseCyclePhase {
             p.weight,
             p.domain ?? null,
             JSON.stringify(existingTakes),
-            extractorModelId,
+            modelId,
           ],
         );
-        if (landed.length > 0) result.proposals_inserted += 1;
+        result.proposals_inserted += 1;
       }
     }
 

src/core/cycle/synthesize.ts

@@ -58,11 +58,8 @@ const SUMMARY_SLUG_RE = /^[a-z0-9][a-z0-9\-]*(\/[a-z0-9][a-z0-9\-]*)*$/;
  * resolver returns for known Anthropic aliases.
  */
 const MODEL_CONTEXT_TOKENS: Record<string, number> = {
-  'claude-fable-5': 1_000_000,
-  'claude-opus-4-8': 1_000_000,
   'claude-opus-4-7': 1_000_000,
   'claude-opus-4-6': 1_000_000,
-  'claude-sonnet-5': 1_000_000,
   'claude-sonnet-4-6': 200_000,
   'claude-sonnet-4-5': 200_000,
   'claude-haiku-4-5-20251001': 200_000,

src/core/engine.ts

@@ -1739,13 +1739,14 @@ export interface BrainEngine {
    * single-row supersede flow because fence reconciliation is the canonical
    * source-of-truth direction, not the consolidator path.
    *
-   * Insertion is atomic per call: all rows commit in a single transaction
-   * or none commit (the transaction rolls back on any constraint
-   * violation, e.g. the v51 partial UNIQUE index on
-   * `(source_id, source_markdown_slug, row_num)`).
+   * Insertion runs in a single transaction. A collision on the v51
+   * partial UNIQUE index `(source_id, source_markdown_slug, row_num)`
+   * skips ONLY that row (ON CONFLICT DO NOTHING, #2044) — the rest of
+   * the batch still commits, so a redundant deposit against an
+   * already-indexed fence row is idempotent instead of a hard failure.
    *
-   * Returns the inserted ids in input-order so callers can correlate
-   * fence-row → DB-id without a separate lookup.
+   * Returns the inserted ids in input-order (colliding rows omitted) so
+   * callers can correlate fence-row → DB-id without a separate lookup.
    */
   insertFacts(
     rows: Array<NewFact & { row_num: number; source_markdown_slug: string }>,

src/core/facts/fence-write.ts

@@ -218,11 +218,27 @@ export async function writeFactsToFence(
       }
 
       // 2. Upsert each fact onto the fence in input order. row_num
-      //    monotonically increases (max-existing + 1 per call, append-only).
+      //    monotonically increases, append-only, seeded from the MAX of
+      //    the fence and the DB index (#2044): when fence and DB have
+      //    diverged (e.g. legacy writes that stamped DB rows against a
+      //    fence at a path this code no longer reads), fence-max+1 can
+      //    collide with an existing DB row_num, tripping
+      //    idx_facts_fence_key and rolling back the whole batch.
+      const dbMaxRows = await engine.executeRaw<{ max: number | string | null }>(
+        `SELECT MAX(row_num) AS max FROM facts
+          WHERE source_id = $1 AND source_markdown_slug = $2`,
+        [target.sourceId, target.slug],
+      );
+      const dbMaxRowNum = Number(dbMaxRows[0]?.max ?? 0) || 0;
+      const fenceMaxRowNum = parseFactsFence(body).facts
+        .reduce((m, f) => Math.max(m, f.rowNum), 0);
+      let nextRowNum = Math.max(fenceMaxRowNum, dbMaxRowNum) + 1;
+
       const assignedRowNums: number[] = [];
       for (const f of facts) {
         const validFromStr = (f.validFrom ?? new Date()).toISOString().slice(0, 10);
         const { body: updated, rowNum } = upsertFactRow(body, {
+          rowNum:      nextRowNum++,
           claim:       f.fact,
           kind:        (f.kind ?? 'fact') as 'fact' | 'event' | 'preference' | 'commitment' | 'belief',
           confidence:  f.confidence ?? 1.0,

src/core/migrate.ts

@@ -5671,41 +5671,6 @@ export const MIGRATIONS: Migration[] = [
 `);
     },
   },
-  {
-    version: 125,
-    name: 'take_proposals_empty_scan_sentinels_and_per_claim_rows',
-    // v0.42.x — kill the propose_takes rescan loop + stop dropping claims.
-    //
-    // Two defects, one schema touch:
-    //   1. Zero-claim scans never entered the idempotency cache (only
-    //      proposal rows were written), so pages whose extraction yielded
-    //      nothing were re-extracted on EVERY cycle. Observed live: ~60
-    //      such pages per run ≈ 1,400 wasted extractor calls / ~$15 per
-    //      day — ~90% of total autopilot LLM spend. Fix: the phase now
-    //      writes a status='empty' sentinel row per zero-claim scan; the
-    //      status CHECK gains the 'empty' value. Sentinels are excluded
-    //      from the partial pending index, so the review queue never sees
-    //      them.
-    //   2. The 4-column unique index collapsed a same-page multi-claim run
-    //      to its FIRST claim: rows 2..N conflicted and ON CONFLICT DO
-    //      NOTHING silently dropped them (verified live: exactly one row
-    //      per (page, hash) across 3 days of runs). Fix: the idempotency
-    //      index gains md5(claim_text) — per-claim rows, while the
-    //      4-column prefix still serves the per-scan cache lookup.
-    //
-    // Existing data is index-safe by construction: the old index guaranteed
-    // at most one row per 4-tuple, so the widened index has no duplicates
-    // to trip on. The DROP+ADD CONSTRAINT pair is idempotent as a unit.
-    idempotent: true,
-    sql: `
-      ALTER TABLE take_proposals DROP CONSTRAINT IF EXISTS take_proposals_status_check;
-      ALTER TABLE take_proposals ADD CONSTRAINT take_proposals_status_check
-        CHECK (status IN ('pending','accepted','rejected','superseded','empty'));
-      DROP INDEX IF EXISTS take_proposals_idempotency_idx;
-      CREATE UNIQUE INDEX IF NOT EXISTS take_proposals_idempotency_idx
-        ON take_proposals (source_id, page_slug, content_hash, prompt_version, md5(claim_text));
-    `,
-  },
 ];
 
 export const LATEST_VERSION = MIGRATIONS.length > 0

src/core/pglite-engine.ts

@@ -4102,11 +4102,13 @@ export class PGLiteEngine implements BrainEngine {
   ): Promise<{ inserted: number; ids: number[] }> {
     if (rows.length === 0) return { inserted: 0, ids: [] };
 
-    // Single transaction so the v51 partial UNIQUE index can roll back the
-    // whole batch on constraint violation. Per-row INSERTs (not multi-row
-    // VALUES) keep the embedding-vs-no-embedding branching readable; batch
-    // sizes are small (5-30 rows per page in practice) so the loop overhead
-    // is negligible vs the embedding compute cost.
+    // Single transaction; per-row INSERTs (not multi-row VALUES) keep the
+    // embedding-vs-no-embedding branching readable; batch sizes are small
+    // (5-30 rows per page in practice) so the loop overhead is negligible
+    // vs the embedding compute cost. #2044: ON CONFLICT DO NOTHING on the
+    // v51 partial UNIQUE index makes a residual fence/DB row_num collision
+    // skip that row instead of rolling back the whole batch (parity with
+    // postgres-engine.ts).
     const ids = await this.db.transaction(async (tx) => {
       const out: number[] = [];
       for (const input of rows) {
@@ -4149,7 +4151,11 @@ export class PGLiteEngine implements BrainEngine {
                  $14, $15,
                  $16, $17, $18, $19,
                  $20
-               ) RETURNING id`
+               )
+               ON CONFLICT (source_id, source_markdown_slug, row_num)
+                 WHERE row_num IS NOT NULL
+                 DO NOTHING
+               RETURNING id`
             : `INSERT INTO facts (
                  source_id, entity_slug, fact, kind, visibility, notability, context,
                  valid_from, valid_until, source, source_session, confidence,
@@ -4163,12 +4169,16 @@ export class PGLiteEngine implements BrainEngine {
                  $15, $16,
                  $17, $18, $19, $20,
                  $21
-               ) RETURNING id`,
+               )
+               ON CONFLICT (source_id, source_markdown_slug, row_num)
+                 WHERE row_num IS NOT NULL
+                 DO NOTHING
+               RETURNING id`,
           embedStr === null
             ? [ctx.source_id, entitySlug, input.fact, kind, visibility, notability, context, validFrom, validUntil, input.source, sourceSession, confidence, embeddedAt, input.row_num, input.source_markdown_slug, claimMetric, claimValue, claimUnit, claimPeriod, eventType]
             : [ctx.source_id, entitySlug, input.fact, kind, visibility, notability, context, validFrom, validUntil, input.source, sourceSession, confidence, embedStr, embeddedAt, input.row_num, input.source_markdown_slug, claimMetric, claimValue, claimUnit, claimPeriod, eventType],
         );
-        out.push(ins.rows[0].id);
+        if (ins.rows[0]) out.push(ins.rows[0].id);
       }
       return out;
     });

src/core/pglite-schema.ts

@@ -762,7 +762,7 @@ CREATE TABLE IF NOT EXISTS take_proposals (
   proposed_at                 TIMESTAMPTZ  NOT NULL DEFAULT now(),
   proposal_run_id             TEXT         NOT NULL,
   status                      TEXT         NOT NULL DEFAULT 'pending'
-                                           CHECK (status IN ('pending','accepted','rejected','superseded','empty')),
+                                           CHECK (status IN ('pending','accepted','rejected','superseded')),
   claim_text                  TEXT         NOT NULL,
   kind                        TEXT         NOT NULL,
   holder                      TEXT         NOT NULL,
@@ -777,7 +777,7 @@ CREATE TABLE IF NOT EXISTS take_proposals (
   predicted_brier_bucket_n    INTEGER
 );
 CREATE UNIQUE INDEX IF NOT EXISTS take_proposals_idempotency_idx
-  ON take_proposals (source_id, page_slug, content_hash, prompt_version, md5(claim_text));
+  ON take_proposals (source_id, page_slug, content_hash, prompt_version);
 CREATE INDEX IF NOT EXISTS take_proposals_pending_idx
   ON take_proposals (source_id, status, proposed_at DESC)
   WHERE status = 'pending';

src/core/postgres-engine.ts

@@ -4302,10 +4302,12 @@ export class PostgresEngine implements BrainEngine {
     // ONCE per process so the cast matches the actual column type
     // (halfvec vs vector). The probe is cached after first call.
     const castSuffix = await this.resolveFactsEmbeddingCast();
-    // Single transaction so the v51 partial UNIQUE index can roll back
-    // the whole batch on constraint violation. Per-row INSERTs (not
-    // multi-row VALUES) keep the embedding-vs-no-embedding branching
-    // readable; batch sizes are small (5-30 rows per page in practice).
+    // Single transaction; per-row INSERTs (not multi-row VALUES) keep the
+    // embedding-vs-no-embedding branching readable; batch sizes are small
+    // (5-30 rows per page in practice). #2044: ON CONFLICT DO NOTHING on
+    // the v51 partial UNIQUE index makes a residual fence/DB row_num
+    // collision skip that row instead of rolling back the whole batch —
+    // the fence stays system-of-record and reconciliation catches up.
     // No supersede flow in this path — fence reconciliation is the
     // canonical source-of-truth direction, not the consolidator path.
     const ids = await sql.begin(async (tx) => {
@@ -4346,9 +4348,13 @@ export class PostgresEngine implements BrainEngine {
             ${input.row_num}, ${input.source_markdown_slug},
             ${claimMetric}, ${claimValue}, ${claimUnit}, ${claimPeriod},
             ${eventType}
-          ) RETURNING id
+          )
+          ON CONFLICT (source_id, source_markdown_slug, row_num)
+            WHERE row_num IS NOT NULL
+            DO NOTHING
+          RETURNING id
         `;
-        out.push(Number(ins[0].id));
+        if (ins[0]) out.push(Number(ins[0].id));
       }
       return out;
     });

src/core/schema-embedded.ts

@@ -1274,14 +1274,8 @@ CREATE INDEX IF NOT EXISTS calibration_profiles_published_idx
   WHERE published = true;
 
 -- take_proposals: propose_takes phase queue. Idempotency cache via the
--- composite unique index (source_id, page_slug, content_hash, prompt_version,
--- md5(claim_text)) — the 4-column prefix is the per-scan cache key (mirrors
--- v0.23 dream_verdicts); md5(claim_text) makes rows per-claim so multi-claim
--- pages keep every claim (v125). status='empty' rows are zero-claim scan
--- sentinels: they hold the cache slot for a page version whose extraction
--- yielded nothing — the phase never re-spends the LLM call on that page
--- version. Excluded from the partial pending index. proposal_run_id supports
--- --rollback by run.
+-- composite unique index (source_id, page_slug, content_hash, prompt_version)
+-- mirrors v0.23 dream_verdicts. proposal_run_id supports --rollback by run.
 CREATE TABLE IF NOT EXISTS take_proposals (
   id                          BIGSERIAL PRIMARY KEY,
   source_id                   TEXT         NOT NULL REFERENCES sources(id) ON DELETE CASCADE,
@@ -1292,7 +1286,7 @@ CREATE TABLE IF NOT EXISTS take_proposals (
   proposed_at                 TIMESTAMPTZ  NOT NULL DEFAULT now(),
   proposal_run_id             TEXT         NOT NULL,
   status                      TEXT         NOT NULL DEFAULT 'pending'
-                                           CHECK (status IN ('pending','accepted','rejected','superseded','empty')),
+                                           CHECK (status IN ('pending','accepted','rejected','superseded')),
   claim_text                  TEXT         NOT NULL,
   kind                        TEXT         NOT NULL,
   holder                      TEXT         NOT NULL,
@@ -1307,7 +1301,7 @@ CREATE TABLE IF NOT EXISTS take_proposals (
   predicted_brier_bucket_n    INTEGER
 );
 CREATE UNIQUE INDEX IF NOT EXISTS take_proposals_idempotency_idx
-  ON take_proposals (source_id, page_slug, content_hash, prompt_version, md5(claim_text));
+  ON take_proposals (source_id, page_slug, content_hash, prompt_version);
 CREATE INDEX IF NOT EXISTS take_proposals_pending_idx
   ON take_proposals (source_id, status, proposed_at DESC)
   WHERE status = 'pending';

src/schema.sql

@@ -1270,14 +1270,8 @@ CREATE INDEX IF NOT EXISTS calibration_profiles_published_idx
   WHERE published = true;
 
 -- take_proposals: propose_takes phase queue. Idempotency cache via the
--- composite unique index (source_id, page_slug, content_hash, prompt_version,
--- md5(claim_text)) — the 4-column prefix is the per-scan cache key (mirrors
--- v0.23 dream_verdicts); md5(claim_text) makes rows per-claim so multi-claim
--- pages keep every claim (v125). status='empty' rows are zero-claim scan
--- sentinels: they hold the cache slot for a page version whose extraction
--- yielded nothing — the phase never re-spends the LLM call on that page
--- version. Excluded from the partial pending index. proposal_run_id supports
--- --rollback by run.
+-- composite unique index (source_id, page_slug, content_hash, prompt_version)
+-- mirrors v0.23 dream_verdicts. proposal_run_id supports --rollback by run.
 CREATE TABLE IF NOT EXISTS take_proposals (
   id                          BIGSERIAL PRIMARY KEY,
   source_id                   TEXT         NOT NULL REFERENCES sources(id) ON DELETE CASCADE,
@@ -1288,7 +1282,7 @@ CREATE TABLE IF NOT EXISTS take_proposals (
   proposed_at                 TIMESTAMPTZ  NOT NULL DEFAULT now(),
   proposal_run_id             TEXT         NOT NULL,
   status                      TEXT         NOT NULL DEFAULT 'pending'
-                                           CHECK (status IN ('pending','accepted','rejected','superseded','empty')),
+                                           CHECK (status IN ('pending','accepted','rejected','superseded')),
   claim_text                  TEXT         NOT NULL,
   kind                        TEXT         NOT NULL,
   holder                      TEXT         NOT NULL,
@@ -1303,7 +1297,7 @@ CREATE TABLE IF NOT EXISTS take_proposals (
   predicted_brier_bucket_n    INTEGER
 );
 CREATE UNIQUE INDEX IF NOT EXISTS take_proposals_idempotency_idx
-  ON take_proposals (source_id, page_slug, content_hash, prompt_version, md5(claim_text));
+  ON take_proposals (source_id, page_slug, content_hash, prompt_version);
 CREATE INDEX IF NOT EXISTS take_proposals_pending_idx
   ON take_proposals (source_id, status, proposed_at DESC)
   WHERE status = 'pending';

test/calibration-profile.test.ts

@@ -38,7 +38,6 @@ function buildMockEngine(opts: { scorecard: TakesScorecard }): {
 } {
   const captured: CapturedSql[] = [];
   const engine = {
-    async getConfig() { return null; },
     kind: 'pglite',
     async getScorecard() {
       return opts.scorecard;

test/extract-facts-phase.test.ts

@@ -304,7 +304,9 @@ describe('runExtractFacts — empty-fence guard (Codex R2-#7)', () => {
     expect(r.legacyRowsPending).toBe(1);
     expect(r.factsInserted).toBe(0);
     expect(r.factsDeleted).toBe(0);
-    expect(r.warnings.some(w => w.includes('apply-migrations'))).toBe(true);
+    // #1867: the remedy hint points at the re-runnable backfill command,
+    // not the one-shot v0_32_2 migration (which the ledger never re-runs).
+    expect(r.warnings.some(w => w.includes('gbrain facts fence-backfill'))).toBe(true);
 
     // Legacy row was NOT touched.
     // eslint-disable-next-line @typescript-eslint/no-explicit-any

test/facts-fence-backfill-command.test.ts

@@ -0,0 +1,133 @@
+/**
+ * #1867 — `gbrain facts fence-backfill` command tests.
+ *
+ * The command re-runs the (idempotent) v0_32_2 phase B on demand so
+ * row_num-NULL backlogs — remote extract_facts deposits that predate
+ * the fence-write backstop — can be cleared without re-running the
+ * one-shot migration. Real PGLite + real tempdir filesystem.
+ */
+
+import { describe, test, expect, beforeAll, afterAll, beforeEach } from 'bun:test';
+import { mkdtempSync, rmSync, existsSync, readFileSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+
+import { PGLiteEngine } from '../src/core/pglite-engine.ts';
+import { runFactsCommand } from '../src/commands/facts.ts';
+import { phaseBFenceFacts } from '../src/commands/migrations/v0_32_2.ts';
+
+let engine: PGLiteEngine;
+let brainDir: string;
+
+beforeAll(async () => {
+  engine = new PGLiteEngine();
+  await engine.connect({});
+  await engine.initSchema();
+});
+
+afterAll(async () => {
+  await engine.disconnect();
+  try {
+    if (brainDir) rmSync(brainDir, { recursive: true, force: true });
+  } catch { /* best-effort */ }
+});
+
+beforeEach(async () => {
+  brainDir = mkdtempSync(join(tmpdir(), 'facts-backfill-cmd-test-'));
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  await (engine as any).db.query('DELETE FROM facts');
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  await (engine as any).db.query(
+    `UPDATE sources SET local_path = $1 WHERE id = 'default'`,
+    [brainDir],
+  );
+});
+
+async function seedLegacyFact(fact: string): Promise<void> {
+  // The row_num-NULL shape a remote extract_facts deposit leaves behind
+  // when it lands via the legacy DB-only path.
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  await (engine as any).db.query(
+    `INSERT INTO facts (source_id, entity_slug, fact, kind, visibility, notability,
+                        valid_from, source, confidence)
+     VALUES ('default', 'people/alice', $1, 'fact', 'private', 'medium',
+             now(), 'mcp:extract_facts', 1.0)`,
+    [fact],
+  );
+}
+
+describe('gbrain facts fence-backfill', () => {
+  test('fences row_num-NULL rows and stamps the DB', async () => {
+    await seedLegacyFact('Deposited remotely');
+
+    await runFactsCommand(engine, ['fence-backfill']);
+
+    // The fence exists on disk with the claim.
+    const filePath = join(brainDir, 'people/alice.md');
+    expect(existsSync(filePath)).toBe(true);
+    expect(readFileSync(filePath, 'utf-8')).toContain('Deposited remotely');
+
+    // The backlog is cleared: no row_num-NULL rows remain.
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const rows = await (engine as any).db.query(
+      'SELECT row_num, source_markdown_slug FROM facts',
+    );
+    expect(rows.rows).toHaveLength(1);
+    expect(rows.rows[0].row_num).toBe(1);
+    expect(rows.rows[0].source_markdown_slug).toBe('people/alice');
+  });
+
+  test('re-run is a no-op (idempotent)', async () => {
+    await seedLegacyFact('Deposited remotely');
+    await runFactsCommand(engine, ['fence-backfill']);
+    await runFactsCommand(engine, ['fence-backfill']);
+
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const rows = await (engine as any).db.query('SELECT id FROM facts');
+    expect(rows.rows).toHaveLength(1);
+    const body = readFileSync(join(brainDir, 'people/alice.md'), 'utf-8');
+    expect(body.match(/Deposited remotely/g)).toHaveLength(1);
+  });
+
+  test('--dry-run reports without writing', async () => {
+    await seedLegacyFact('Deposited remotely');
+    await runFactsCommand(engine, ['fence-backfill', '--dry-run']);
+
+    expect(existsSync(join(brainDir, 'people/alice.md'))).toBe(false);
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const rows = await (engine as any).db.query(
+      'SELECT row_num FROM facts',
+    );
+    expect(rows.rows[0].row_num).toBeNull();
+  });
+
+  test('diverged page: appends past the DB row_num max instead of colliding (#2044 class)', async () => {
+    // The #2044 divergence shape the backfill must survive: the DB already
+    // holds stamped rows 1..3 for the slug (legacy wrong-path fence write),
+    // but the fence at the resolved path is missing. Fence-max+1 (= 1) would
+    // collide with the stamped rows on the post-rename UPDATE, failing the
+    // page and leaving the renamed fence disagreeing with the DB.
+    for (let n = 1; n <= 3; n++) {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      await (engine as any).db.query(
+        `INSERT INTO facts (source_id, entity_slug, fact, kind, visibility, notability,
+                            valid_from, source, confidence, row_num, source_markdown_slug)
+         VALUES ('default', 'people/alice', $1, 'fact', 'private', 'medium',
+                 now(), 'mcp:extract_facts', 1.0, $2, 'people/alice')`,
+        [`stamped ${n}`, n],
+      );
+    }
+    await seedLegacyFact('Deposited remotely');
+
+    const result = await phaseBFenceFacts(engine, { dryRun: false });
+    expect(result.status).toBe('complete');
+
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const rows = await (engine as any).db.query(
+      `SELECT row_num FROM facts WHERE fact = 'Deposited remotely'`,
+    );
+    expect(rows.rows[0].row_num).toBe(4);
+    const body = readFileSync(join(brainDir, 'people/alice.md'), 'utf-8');
+    expect(body).toContain('| 4 | Deposited remotely |');
+  });
+});

test/fence-write.test.ts

@@ -292,6 +292,49 @@ describe('lookupSourceLocalPath', () => {
   });
 });
 
+describe('writeFactsToFence — fence/DB divergence (#2044)', () => {
+  test('seeds row_num past the DB max when the fence lags the DB', async () => {
+    // Simulate the divergence class from #2044: DB rows were stamped with
+    // row_nums against a fence written at a path this code no longer reads
+    // (e.g. the pre-"Local patch 2026-06-11" wrong-path writes). The page
+    // on disk has NO fence, but the DB already holds row_num 1..3 for the
+    // slug. Pre-fix, the next deposit re-assigned row_num=1 from fence
+    // text alone and the whole insertFacts batch failed on
+    // idx_facts_fence_key.
+    for (let n = 1; n <= 3; n++) {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      await (engine as any).db.query(
+        `INSERT INTO facts (source_id, entity_slug, fact, kind, visibility, notability,
+                            valid_from, source, confidence, row_num, source_markdown_slug)
+         VALUES ('default', 'people/dana', $1, 'fact', 'private', 'medium',
+                 now(), 'mcp:extract_facts', 1.0, $2, 'people/dana')`,
+        [`old claim ${n}`, n],
+      );
+    }
+
+    const result = await writeFactsToFence(
+      engine,
+      { sourceId: 'default', localPath: brainDir, slug: 'people/dana' },
+      [baseInput({ fact: 'second deposit' })],
+    );
+
+    expect(result.fenceWriteFailed).toBeUndefined();
+    expect(result.inserted).toBe(1);
+
+    // The new row landed PAST the DB max, not at fence-max+1 (= 1).
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const rows = await (engine as any).db.query(
+      'SELECT row_num FROM facts WHERE id = $1',
+      [result.ids[0]],
+    );
+    expect(rows.rows[0].row_num).toBe(4);
+
+    // And the on-disk fence carries the same row_num — fence and DB agree.
+    const body = readFileSync(join(brainDir, 'people/dana.md'), 'utf-8');
+    expect(body).toContain('| 4 | second deposit |');
+  });
+});
+
 // Cleanup any leftover tempdirs after the whole suite.
 afterAll(() => {
   // No-op: each test cleaned up via the beforeEach; this is a safety net.

test/grade-takes-ensemble.test.ts

@@ -47,7 +47,6 @@ function buildMockEngine(opts: { takes: Take[] }): {
   const captured: CapturedSql[] = [];
   const resolves: CapturedResolve[] = [];
   const engine = {
-    async getConfig() { return null; },
     kind: 'pglite',
     async listTakes() {
       return opts.takes;

test/grade-takes.test.ts

@@ -46,14 +46,12 @@ interface CapturedResolve {
 function buildMockEngine(opts: {
   takes: Take[];
   cachedGrades?: Set<string>; // composite-key strings already in take_grade_cache
-  config?: Record<string, string>; // engine.getConfig plane (models.grade_takes etc.)
 }): { engine: BrainEngine; captured: CapturedSql[]; resolves: CapturedResolve[] } {
   const captured: CapturedSql[] = [];
   const resolves: CapturedResolve[] = [];
   const cached = opts.cachedGrades ?? new Set<string>();
 
   const engine = {
-    async getConfig(key: string) { return opts.config?.[key] ?? null; },
     kind: 'pglite',
     async listTakes() {
       return opts.takes;
@@ -226,28 +224,6 @@ describe('runPhaseGradeTakes — phase integration', () => {
     expect(resolves).toHaveLength(0); // no canonical mutation
   });
 
-  test('models.grade_takes config drives the judge call; cache key stays bare-tailed', async () => {
-    // Pre-fix the judge call rode the gateway's chat_model while the cache
-    // key / budget label recorded a hardcoded 'claude-sonnet-4-6'. The phase
-    // now resolves models.grade_takes; the judge gets the FULL string and
-    // the cache row keys on the bare tail (continuity with historical rows).
-    const takes = [buildTake({ id: 1, sinceDate: '2023-01-01' })];
-    const { engine, captured } = buildMockEngine({
-      takes,
-      config: { 'models.grade_takes': 'anthropic:claude-sonnet-5' },
-    });
-    const hints: Array<string | undefined> = [];
-    const judge: JudgeFn = async ({ modelHint }) => {
-      hints.push(modelHint);
-      return { verdict: 'correct', confidence: 0.9, reasoning: 'held' };
-    };
-    const result = await runPhaseGradeTakes(buildCtx(engine), { judge });
-    expect(result.status).toBe('ok');
-    expect(hints).toEqual(['anthropic:claude-sonnet-5']); // actual call gets the FULL string
-    const inserts = captured.filter(c => c.sql.includes('INSERT INTO take_grade_cache'));
-    expect(inserts[0]!.params[2]).toBe('claude-sonnet-5'); // judge_model_id is the bare tail
-  });
-
   test('D17: auto-resolve OFF by default — even high-confidence verdict does NOT mutate takes', async () => {
     const takes = [buildTake({ id: 1, sinceDate: '2023-01-01' })];
     const { engine, resolves } = buildMockEngine({ takes });

test/insert-facts-batch.test.ts

@@ -5,7 +5,7 @@
  *   - Batch insert N rows persists row_num + source_markdown_slug
  *   - Empty batch is a no-op
  *   - Returns ids in input-order
- *   - v51 partial UNIQUE index rolls back the whole batch on a collision
+ *   - v51 partial UNIQUE collision skips only the colliding row (#2044)
  *   - deleteFactsForPage scopes by (source_id, source_markdown_slug);
  *     never touches other pages or pre-v51 NULL-source_markdown_slug rows
  *   - deleteFactsForPage on an empty page returns deleted:0 (idempotent)
@@ -135,30 +135,29 @@ describe('engine.insertFacts — batch insert', () => {
     });
   });
 
-  test('v51 partial UNIQUE index rolls back the whole batch on collision', async () => {
+  test('v51 partial UNIQUE collision skips ONLY the colliding row (#2044)', async () => {
     // Seed row #1 first.
     await engine.insertFacts([fixtureFact(1, { fact: 'seeded' })], { source_id: 'default' });
 
-    // Now try to batch-insert rows that include a colliding row_num=1.
-    let threw = false;
-    try {
-      await engine.insertFacts(
-        [
-          fixtureFact(2, { fact: 'second' }),
-          fixtureFact(1, { fact: 'collides' }),  // row_num=1 on same (source_id, source_markdown_slug)
-          fixtureFact(3, { fact: 'third' }),
-        ],
-        { source_id: 'default' },
-      );
-    } catch {
-      threw = true;
-    }
-    expect(threw).toBe(true);
+    // Batch-insert rows that include a colliding row_num=1. Pre-#2044 this
+    // threw and rolled back the whole batch, making a second remote
+    // extract_facts deposit to an already-fenced page a hard failure. Now
+    // ON CONFLICT DO NOTHING skips the colliding row and keeps the rest.
+    const result = await engine.insertFacts(
+      [
+        fixtureFact(2, { fact: 'second' }),
+        fixtureFact(1, { fact: 'collides' }),  // row_num=1 on same (source_id, source_markdown_slug)
+        fixtureFact(3, { fact: 'third' }),
+      ],
+      { source_id: 'default' },
+    );
+    expect(result.inserted).toBe(2);
+    expect(result.ids).toHaveLength(2);
 
-    // Verify the transaction rolled back — only the seeded row should remain.
+    // The seeded row survives untouched; the colliding claim is skipped.
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const rows = await (engine as any).db.query('SELECT fact FROM facts ORDER BY id');
-    expect(rows.rows.map((r: { fact: string }) => r.fact)).toEqual(['seeded']);
+    expect(rows.rows.map((r: { fact: string }) => r.fact)).toEqual(['seeded', 'second', 'third']);
   });
 
   test('different source_markdown_slug values DO NOT collide on the same row_num', async () => {

test/propose-takes-rescan.test.ts

@@ -1,160 +0,0 @@
-/**
- * propose_takes rescan-loop + dropped-claims regression tests (migration v125).
- *
- * Two live-observed defects, both fixed by the v125 schema + phase change:
- *
- *   1. RESCAN LOOP — a page whose extraction yielded zero claims never
- *      entered the idempotency cache (only proposal rows were written), so
- *      every cycle re-spent the extractor call on the same unchanged page.
- *      Live impact: ~60 such pages × every cycle ≈ 1,400 wasted LLM calls
- *      (~$15) per day — ~90% of total autopilot spend. Fix: status='empty'
- *      sentinel row per zero-claim scan.
- *
- *   2. DROPPED CLAIMS — the 4-column unique index collapsed a same-page
- *      multi-claim run to its first claim (rows 2..N conflicted, ON CONFLICT
- *      DO NOTHING dropped them silently; verified live: exactly 1 row per
- *      (page, hash) over 3 days). Fix: idempotency index gains
- *      md5(claim_text).
- *
- * Hermetic: PGLite engine + injected extractor; no gateway, no LLM.
- */
-import { describe, test, expect, beforeAll, afterAll } from 'bun:test';
-import { PGLiteEngine } from '../src/core/pglite-engine.ts';
-import { runPhaseProposeTakes, type ProposeTakesExtractor, type ProposedTake } from '../src/core/cycle/propose-takes.ts';
-import type { OperationContext } from '../src/core/operations.ts';
-
-let engine: PGLiteEngine;
-
-function ctx(): OperationContext {
-  return {
-    engine,
-    remote: false,
-    config: {} as OperationContext['config'],
-    logger: { info() {}, warn() {}, error() {}, debug() {} } as unknown as OperationContext['logger'],
-  } as unknown as OperationContext;
-}
-
-/** Extractor stub that counts invocations per page slug. */
-function countingExtractor(
-  claimsBySlug: Record<string, ProposedTake[]>,
-): { extractor: ProposeTakesExtractor; calls: string[] } {
-  const calls: string[] = [];
-  const extractor: ProposeTakesExtractor = async ({ pagePath }) => {
-    calls.push(pagePath);
-    return claimsBySlug[pagePath] ?? [];
-  };
-  return { extractor, calls };
-}
-
-beforeAll(async () => {
-  engine = new PGLiteEngine();
-  await engine.connect({});
-  await engine.initSchema();
-  await engine.putPage('notes/zero-claims', {
-    type: 'note',
-    title: 'pure narrative',
-    compiled_truth: 'A quiet walk in the park. Nothing opinionated happened at all today.',
-  });
-  await engine.putPage('notes/three-claims', {
-    type: 'note',
-    title: 'opinionated',
-    compiled_truth: 'I bet acme-example wins the market. widget-co will struggle. fund-a is overexposed.',
-  });
-});
-
-afterAll(async () => {
-  await engine.disconnect();
-});
-
-describe('rescan loop — zero-claim scans enter the cache', () => {
-  test('second run cache-hits: extractor is NOT called again on unchanged pages', async () => {
-    const claims = {
-      'notes/three-claims': [
-        { claim_text: 'acme-example wins the market', kind: 'bet' as const, holder: 'brain', weight: 0.7 },
-        { claim_text: 'widget-co will struggle', kind: 'take' as const, holder: 'brain', weight: 0.6 },
-        { claim_text: 'fund-a is overexposed', kind: 'take' as const, holder: 'brain', weight: 0.55 },
-      ],
-    };
-
-    const first = countingExtractor(claims);
-    const r1 = await runPhaseProposeTakes(ctx(), { extractor: first.extractor });
-    expect(r1.status).toBe('ok');
-    // Both pages extracted on the first pass.
-    expect(first.calls).toContain('notes/zero-claims');
-    expect(first.calls).toContain('notes/three-claims');
-
-    const second = countingExtractor(claims);
-    const r2 = await runPhaseProposeTakes(ctx(), { extractor: second.extractor });
-    expect(r2.status).toBe('ok');
-    // THE regression: pre-fix the zero-claim page missed the cache every
-    // run and was re-extracted here. (Run 1's receipt page legitimately
-    // appears once — it's a new page — and its zero-claim scan now caches
-    // too; pre-fix, receipts re-scanned forever as well.)
-    expect(second.calls).not.toContain('notes/zero-claims');
-    expect(second.calls).not.toContain('notes/three-claims');
-
-    // Run 2 inserted nothing, so no new receipt page exists: run 3 must be
-    // fully quiescent — zero extractor calls, zero cache misses.
-    const third = countingExtractor(claims);
-    const r3 = await runPhaseProposeTakes(ctx(), { extractor: third.extractor });
-    expect(r3.status).toBe('ok');
-    expect(third.calls).toEqual([]);
-    expect((r3.details as Record<string, unknown>).cache_misses).toBe(0);
-  });
-
-  test('zero-claim scan wrote an "empty" sentinel invisible to the pending queue', async () => {
-    const sentinel = await engine.executeRaw<{ status: string; claim_text: string }>(
-      `SELECT status, claim_text FROM take_proposals WHERE page_slug = 'notes/zero-claims'`,
-      [],
-    );
-    expect(sentinel.length).toBe(1);
-    expect(sentinel[0].status).toBe('empty');
-    expect(sentinel[0].claim_text).toBe('');
-    const pending = await engine.executeRaw<{ n: number }>(
-      `SELECT COUNT(*)::int AS n FROM take_proposals WHERE page_slug = 'notes/zero-claims' AND status = 'pending'`,
-      [],
-    );
-    expect(Number(pending[0].n)).toBe(0);
-  });
-});
-
-describe('dropped claims — per-claim rows survive the idempotency index', () => {
-  test('a 3-claim page stores 3 rows and reports an honest inserted count', async () => {
-    const rows = await engine.executeRaw<{ claim_text: string }>(
-      `SELECT claim_text FROM take_proposals WHERE page_slug = 'notes/three-claims' AND status = 'pending' ORDER BY id`,
-      [],
-    );
-    // Pre-fix the 4-column unique index kept only the FIRST claim.
-    expect(rows.length).toBe(3);
-    expect(rows.map(r => r.claim_text)).toEqual([
-      'acme-example wins the market',
-      'widget-co will struggle',
-      'fund-a is overexposed',
-    ]);
-  });
-
-  test('content change re-extracts and stores the new version separately', async () => {
-    await engine.putPage('notes/zero-claims', {
-      type: 'note',
-      title: 'pure narrative',
-      compiled_truth: 'Updated: I now believe acme-example is undervalued and will re-rate within a year.',
-    });
-    const claims = {
-      'notes/zero-claims': [
-        { claim_text: 'acme-example is undervalued', kind: 'take' as const, holder: 'brain', weight: 0.6 },
-      ],
-    };
-    const run = countingExtractor(claims);
-    const r = await runPhaseProposeTakes(ctx(), { extractor: run.extractor });
-    expect(r.status).toBe('ok');
-    // Changed page re-extracts; the unchanged 3-claim page stays cached.
-    expect(run.calls).toEqual(['notes/zero-claims']);
-    expect((r.details as Record<string, unknown>).proposals_inserted).toBe(1);
-    const all = await engine.executeRaw<{ status: string }>(
-      `SELECT status FROM take_proposals WHERE page_slug = 'notes/zero-claims' ORDER BY id`,
-      [],
-    );
-    // Old hash's sentinel + new hash's pending claim coexist.
-    expect(all.map(r2 => r2.status).sort()).toEqual(['empty', 'pending']);
-  });
-});

test/propose-takes.test.ts

@@ -41,16 +41,12 @@ interface CapturedSql {
 function buildMockEngine(opts: {
   pages: Page[];
   existingProposals?: Set<string>; // composite-key strings already in take_proposals
-  config?: Record<string, string>; // engine.getConfig plane (models.tier.* etc.)
 }): { engine: BrainEngine; captured: CapturedSql[] } {
   const captured: CapturedSql[] = [];
   const existing = opts.existingProposals ?? new Set<string>();
 
   const engine = {
     kind: 'pglite',
-    async getConfig(key: string) {
-      return opts.config?.[key] ?? null;
-    },
     async listPages() {
       return opts.pages;
     },
@@ -63,12 +59,7 @@ function buildMockEngine(opts: {
         if (existing.has(key)) return [{ id: 1 } as unknown as T];
         return [];
       }
-      // INSERT ... RETURNING id — emulate a successful insert so the
-      // honest proposals_inserted counter (counts RETURNING rows, not
-      // attempts) sees the row land. Conflicted inserts would return [].
-      if (sql.includes('INSERT INTO take_proposals') && sql.includes('RETURNING id')) {
-        return [{ id: 1 } as unknown as T];
-      }
+      // INSERT — return nothing
       return [];
     },
   } as unknown as BrainEngine;
@@ -276,29 +267,6 @@ describe('runPhaseProposeTakes — phase integration', () => {
     expect(inserts[0]!.params[9]).toBe('market'); // domain
   });
 
-  test('extractor model resolves through models.propose_takes config', async () => {
-    // Pre-fix the phase's only model knob was the gateway chat model — there
-    // was no per-phase config key. The phase now resolves once via
-    // resolveModel(models.propose_takes > models.default > env > gateway
-    // chat model); the extractor hint and the stored model_id must both
-    // reflect the configured override (full provider-prefixed string, #2451).
-    const pages = [buildPage({ slug: 'wiki/concepts/tier-routing', body: 'Tier-routed models will win.' })];
-    const { engine, captured } = buildMockEngine({
-      pages,
-      config: { 'models.propose_takes': 'anthropic:claude-sonnet-5' },
-    });
-    const seen: Array<string | undefined> = [];
-    const extractor: ProposeTakesExtractor = async ({ modelHint }) => {
-      seen.push(modelHint);
-      return [{ claim_text: 'tier-routed models win', kind: 'bet', holder: 'brain', weight: 0.7 }];
-    };
-    const result = await runPhaseProposeTakes(buildCtx(engine), { extractor });
-    expect(result.status).toBe('ok');
-    expect(seen).toEqual(['anthropic:claude-sonnet-5']); // chat call gets the FULL string
-    const inserts = captured.filter(c => c.sql.includes('INSERT INTO take_proposals'));
-    expect(inserts[0]!.params[11]).toBe('anthropic:claude-sonnet-5'); // stored model_id matches the call
-  });
-
   test('cache hit: page already in take_proposals is skipped', async () => {
     const body = 'A page that was already processed.';
     const pages = [buildPage({ slug: 'wiki/old-page', body })];