fix(migrations): scope v0.32.2 dirty-check to targeted sources; surface failed phase detail

- phaseBFenceFacts now queries legacy rows FIRST and dirty-checks only
  the source_ids it will actually write into. Zero fenceable rows (or
  rows scoped to clean sources) no longer fail on an unrelated dirty
  source. Targeted-dirty-source refusal unchanged. Fixes #927.
- apply-migrations now prints each failed phase's name + detail to
  stderr alongside 'reported status=failed', instead of burying the
  actionable message in the ledger. Fixes #921.

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

docs/guides/live-sync.md

@@ -21,17 +21,14 @@ GBrain is tuned for the Supabase **Transaction pooler** (port 6543): it
 auto-disables prepared statements there and routes `engine.transaction()`
 (migrations, DDL, sync imports) to a derived **direct** connection
 (`db.<ref>.supabase.co:5432`). That direct host is IPv6-only, so on an
-IPv4-only host it is unreachable. When that happens gbrain now falls back to
-the pooler automatically (one stderr warning, then single-pool mode for the
-rest of the process) — but the pooler's ~2-min statement timeout can truncate
-very long migrations or bulk imports.
+IPv4-only host, reads work but sync **silently skips most pages**. This is the
+number one cause of "sync ran but nothing happened."
 
 Fix: make the direct connection reachable over IPv4. Either set
 `GBRAIN_DIRECT_DATABASE_URL` to the **Session pooler** string (port 5432 on the
-`pooler.supabase.com` host, IPv4), or enable Supabase's IPv4 add-on.
-`GBRAIN_DISABLE_DIRECT_POOL=1` skips the direct pool (and the fallback warning)
-entirely. Verify by running `gbrain sync` and checking that the page count in
-`gbrain stats` matches the syncable file count in the repo.
+`pooler.supabase.com` host, IPv4), or enable Supabase's IPv4 add-on. Verify by
+running `gbrain sync` and checking that the page count in `gbrain stats` matches
+the syncable file count in the repo.
 
 ### The Primitives
 

llms-full.txt

@@ -2720,17 +2720,14 @@ GBrain is tuned for the Supabase **Transaction pooler** (port 6543): it
 auto-disables prepared statements there and routes `engine.transaction()`
 (migrations, DDL, sync imports) to a derived **direct** connection
 (`db.<ref>.supabase.co:5432`). That direct host is IPv6-only, so on an
-IPv4-only host it is unreachable. When that happens gbrain now falls back to
-the pooler automatically (one stderr warning, then single-pool mode for the
-rest of the process) — but the pooler's ~2-min statement timeout can truncate
-very long migrations or bulk imports.
+IPv4-only host, reads work but sync **silently skips most pages**. This is the
+number one cause of "sync ran but nothing happened."
 
 Fix: make the direct connection reachable over IPv4. Either set
 `GBRAIN_DIRECT_DATABASE_URL` to the **Session pooler** string (port 5432 on the
-`pooler.supabase.com` host, IPv4), or enable Supabase's IPv4 add-on.
-`GBRAIN_DISABLE_DIRECT_POOL=1` skips the direct pool (and the fallback warning)
-entirely. Verify by running `gbrain sync` and checking that the page count in
-`gbrain stats` matches the syncable file count in the repo.
+`pooler.supabase.com` host, IPv4), or enable Supabase's IPv4 add-on. Verify by
+running `gbrain sync` and checking that the page count in `gbrain stats` matches
+the syncable file count in the repo.
 
 ### The Primitives
 

src/commands/apply-migrations.ts

@@ -438,6 +438,13 @@ export async function runApplyMigrations(args: string[]): Promise<void> {
       const result = await m.orchestrator(orchestratorOptsFrom(cli));
       if (result.status === 'failed') {
         console.error(`Migration v${m.version} reported status=failed.`);
+        // Surface each failed phase's detail — the ledger records it, but
+        // the operator needs it on stderr to act (#921).
+        for (const p of result.phases) {
+          if (p.status === 'failed') {
+            console.error(`  phase ${p.name}: ${p.detail ?? '(no detail)'}`);
+          }
+        }
         // Record the attempt as 'partial' (not 'complete') so the cap counts
         // it. Don't let a failed orchestrator look like it never ran.
         try {

src/commands/init.ts

@@ -1078,9 +1078,6 @@ async function initPostgres(opts: {
     console.warn('  Direct connections are IPv6 only and fail in many environments.');
     console.warn('  Use the Transaction pooler connection string instead (port 6543):');
     console.warn('  Supabase Dashboard > Connect (top bar) > Connection String > Transaction pooler');
-    console.warn('  (With a pooler URL, gbrain derives a direct connection for DDL and falls back');
-    console.warn('  to the pooler automatically if that host is unreachable. Power users:');
-    console.warn('  GBRAIN_DIRECT_DATABASE_URL overrides the derived URL; GBRAIN_DISABLE_DIRECT_POOL=1 disables it.)');
     console.warn('');
   }
 
@@ -1094,9 +1091,6 @@ async function initPostgres(opts: {
       if (databaseUrl.includes('supabase.co') && (msg.includes('ECONNREFUSED') || msg.includes('ETIMEDOUT'))) {
         console.error('Connection failed. Supabase direct connections (db.*.supabase.co:5432) are IPv6 only.');
         console.error('Use the Transaction pooler connection string instead (port 6543).');
-        console.error('(gbrain derives its own direct connection from pooler URLs for DDL; if that host is');
-        console.error('unreachable it falls back to the pooler. GBRAIN_DIRECT_DATABASE_URL overrides the');
-        console.error('derived URL; GBRAIN_DISABLE_DIRECT_POOL=1 disables the direct pool entirely.)');
       }
       throw e;
     }

src/commands/migrations/v0_32_2.ts

@@ -186,17 +186,6 @@ async function phaseBFenceFacts(
     const localPathById = new Map<string, string | null>();
     for (const s of sources) localPathById.set(s.id, s.local_path);
 
-    // Dirty-tree refusal: check every source's local_path before writing.
-    for (const [id, localPath] of localPathById) {
-      if (localPath && isLocalPathDirty(localPath)) {
-        return {
-          name: 'fence_facts',
-          status: 'failed',
-          detail: `source "${id}" has uncommitted changes in ${localPath}. Commit or stash, then re-run.`,
-        };
-      }
-    }
-
     // Walk legacy rows in (source_id, entity_slug) groups for per-page
     // atomic writes.
     const legacy = await engine.executeRaw<LegacyFactRow>(
@@ -235,6 +224,21 @@ async function phaseBFenceFacts(
       groups.set(key, list);
     }
 
+    // Dirty-tree refusal: check ONLY the sources we are about to write
+    // into. A dirty tree in an unrelated source (or zero fenceable rows
+    // at all) must not block a no-op or a targeted backfill (#927).
+    const targetSourceIds = new Set([...groups.keys()].map(k => k.split('\0')[0]));
+    for (const id of targetSourceIds) {
+      const localPath = localPathById.get(id);
+      if (localPath && isLocalPathDirty(localPath)) {
+        return {
+          name: 'fence_facts',
+          status: 'failed',
+          detail: `source "${id}" has uncommitted changes in ${localPath}. Commit or stash, then re-run.`,
+        };
+      }
+    }
+
     for (const [key, group] of groups) {
       const [sourceId, entitySlug] = key.split('\0');
       const localPath = localPathById.get(sourceId)!;

src/core/connection-manager.ts

@@ -167,25 +167,6 @@ export function deriveDirectUrl(url: string): string | null {
   }
 }
 
-/**
- * Error codes that mean "the direct host is unreachable from this network"
- * (#1641). The auto-derived db.<ref>.supabase.co host is IPv6-only without
- * the paid IPv4 add-on, so ENOTFOUND/ECONNREFUSED here is expected on
- * IPv4-only networks — we fall back to the pooler instead of failing init.
- */
-const NETWORK_UNREACHABLE_CODES = [
-  'ENOTFOUND', 'ECONNREFUSED', 'ENETUNREACH', 'EHOSTUNREACH',
-  'ETIMEDOUT', 'CONNECT_TIMEOUT',
-];
-
-/** True when err looks like a network-unreachable failure (not auth/SQL). */
-export function isNetworkUnreachableError(err: unknown): boolean {
-  const code = (err as { code?: unknown } | null)?.code;
-  if (typeof code === 'string' && NETWORK_UNREACHABLE_CODES.includes(code)) return true;
-  const msg = err instanceof Error ? err.message : String(err);
-  return NETWORK_UNREACHABLE_CODES.some(c => msg.includes(c));
-}
-
 /**
  * Read kill-switch state from env. Subordinate to parent manager's state
  * when present (A2 inheritance).
@@ -338,30 +319,7 @@ export class ConnectionManager {
         throw err;
       });
     }
-    let pool: Sql | null;
-    try {
-      pool = await this._directInit;
-    } catch (err) {
-      // #1641: the derived direct host (db.<ref>.supabase.co) is IPv6-only
-      // without Supabase's IPv4 add-on. On IPv4-only networks the direct
-      // pool can never connect — permanently fall back to the read pool
-      // (self-activating kill-switch) instead of failing init/migrations.
-      // Non-network errors (auth, SQL) still throw: they mean misconfig,
-      // not unreachability.
-      if (isNetworkUnreachableError(err)) {
-        const alreadyWarned = this._killSwitch;
-        this._killSwitch = true;
-        const msg = err instanceof Error ? err.message : String(err);
-        if (!alreadyWarned) console.error(
-          `gbrain: direct connection to ${this._directUrl ? this.hostOnly(this._directUrl) : 'unknown host'} unreachable (${msg}); ` +
-          'falling back to the pooler for DDL/bulk (long migrations may hit the pooler statement timeout). ' +
-          'Set GBRAIN_DIRECT_DATABASE_URL to a reachable direct URL (e.g. the Session pooler, port 5432) or enable the Supabase IPv4 add-on; ' +
-          'GBRAIN_DISABLE_DIRECT_POOL=1 silences this.',
-        );
-        return this.getReadPool();
-      }
-      throw err;
-    }
+    const pool = await this._directInit;
     if (!pool) {
       // Defensive — initDirectPool should have thrown.
       throw new Error('connection-manager: direct pool init returned null');
@@ -392,9 +350,8 @@ export class ConnectionManager {
       },
     };
     const t0 = Date.now();
-    let pool: Sql | null = null;
     try {
-      pool = postgres(this._directUrl, opts);
+      const pool = postgres(this._directUrl, opts);
       // Probe to validate connectivity early.
       await pool`SELECT 1`;
       logConnectionEvent({
@@ -405,9 +362,6 @@ export class ConnectionManager {
       });
       return pool;
     } catch (err) {
-      // Don't leak the failed pool's sockets/timers (#1641 fallback keeps
-      // the process running afterward).
-      if (pool) await endPoolBounded(pool);
       logConnectionEvent({
         pool: 'ddl',
         op: 'error',

test/apply-migrations.test.ts

@@ -180,3 +180,16 @@ describe('runApplyMigrations exit codes (v0.36.1.x #1062)', () => {
     expect(src).toMatch(/All migrations up to date[\s\S]{0,80}process\.exit\(0\)/);
   });
 });
+
+// #921: a failed orchestrator must print each failed phase's detail to
+// stderr — not just "reported status=failed" — so the operator can act
+// without digging through the ledger.
+describe('failed migration prints phase detail (#921)', () => {
+  test('runner loops result.phases and console.errors failed phase details', async () => {
+    const { readFileSync } = await import('fs');
+    const src = readFileSync('src/commands/apply-migrations.ts', 'utf8');
+    expect(src).toMatch(
+      /reported status=failed[\s\S]{0,400}for \(const p of result\.phases\)[\s\S]{0,200}p\.status === 'failed'[\s\S]{0,200}console\.error\([\s\S]{0,80}p\.name[\s\S]{0,80}p\.detail/,
+    );
+  });
+});

test/connection-manager.serial.test.ts

@@ -3,7 +3,6 @@ import {
   isSupabasePoolerUrl,
   deriveDirectUrl,
   readKillSwitchEnv,
-  isNetworkUnreachableError,
   resolveDirectPoolSize,
   ConnectionManager,
   DEFAULT_DIRECT_POOL_SIZE,
@@ -239,65 +238,3 @@ describe('ConnectionManager — parent inheritance (A2)', () => {
     }
   });
 });
-
-describe('isNetworkUnreachableError (#1641)', () => {
-  test('classifies network codes as unreachable', () => {
-    for (const code of ['ENOTFOUND', 'ECONNREFUSED', 'ENETUNREACH', 'EHOSTUNREACH', 'ETIMEDOUT', 'CONNECT_TIMEOUT']) {
-      const err = Object.assign(new Error('connect failed'), { code });
-      expect(isNetworkUnreachableError(err)).toBe(true);
-    }
-  });
-
-  test('classifies by message when code absent', () => {
-    expect(isNetworkUnreachableError(new Error('getaddrinfo ENOTFOUND db.abc.supabase.co'))).toBe(true);
-  });
-
-  test('auth/SQL errors are NOT unreachable', () => {
-    expect(isNetworkUnreachableError(new Error('password authentication failed for user "postgres"'))).toBe(false);
-    expect(isNetworkUnreachableError(new Error('syntax error at or near "SELEC"'))).toBe(false);
-    expect(isNetworkUnreachableError(null)).toBe(false);
-  });
-});
-
-describe('ConnectionManager — direct-pool fallback on unreachable host (#1641)', () => {
-  let originalKillSwitch: string | undefined;
-  let originalError: typeof console.error;
-  let errLines: string[];
-  beforeEach(() => {
-    originalKillSwitch = process.env.GBRAIN_DISABLE_DIRECT_POOL;
-    delete process.env.GBRAIN_DISABLE_DIRECT_POOL;
-    originalError = console.error;
-    errLines = [];
-    console.error = (...args: unknown[]) => { errLines.push(args.join(' ')); };
-  });
-  afterEach(() => {
-    console.error = originalError;
-    if (originalKillSwitch === undefined) delete process.env.GBRAIN_DISABLE_DIRECT_POOL;
-    else process.env.GBRAIN_DISABLE_DIRECT_POOL = originalKillSwitch;
-  });
-
-  test('ddl() falls back to the read pool when the direct host is unreachable', async () => {
-    const cm = new ConnectionManager({
-      url: 'postgresql://postgres.abc:p@aws.pooler.supabase.com:6543/db',
-      // 127.0.0.1:9 (discard) → instant ECONNREFUSED, the IPv4-only-network shape.
-      directUrl: 'postgresql://postgres:p@127.0.0.1:9/db',
-    });
-    const fakeReadPool = {} as ReturnType<typeof ConnectionManager.prototype.read>;
-    cm.setReadPool(fakeReadPool);
-    expect(cm.isDualPoolActive()).toBe(true);
-
-    const pool = await cm.ddl(); // without the fix this throws ECONNREFUSED
-    expect(pool).toBe(fakeReadPool);
-    // Self-activating kill-switch: subsequent calls skip the direct pool.
-    expect(cm.isKillSwitchActive()).toBe(true);
-    expect(cm.isDualPoolActive()).toBe(false);
-    expect(cm.describeMode().mode).toBe('single (kill-switch)');
-    // One stderr line mentioning the power-user override.
-    const warning = errLines.filter(l => l.includes('GBRAIN_DIRECT_DATABASE_URL'));
-    expect(warning.length).toBe(1);
-
-    const again = await cm.ddl();
-    expect(again).toBe(fakeReadPool);
-    expect(errLines.filter(l => l.includes('GBRAIN_DIRECT_DATABASE_URL')).length).toBe(1);
-  }, 20000);
-});

test/migrations-v0_32_2.test.ts

@@ -10,10 +10,11 @@
  * __setTestEngineOverride so we don't need a configured brain.
  */
 
-import { describe, test, expect, beforeAll, afterAll, beforeEach } from 'bun:test';
+import { describe, test, expect, beforeAll, afterAll, beforeEach, afterEach } from 'bun:test';
 import { mkdtempSync, rmSync, existsSync, readFileSync, writeFileSync, mkdirSync } from 'node:fs';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
+import { execFileSync } from 'node:child_process';
 
 import { PGLiteEngine } from '../src/core/pglite-engine.ts';
 import { v0_32_2, __setTestEngineOverride, __testing } from '../src/commands/migrations/v0_32_2.ts';
@@ -238,6 +239,52 @@ describe('phaseBFenceFacts — happy path backfill', () => {
   });
 });
 
+describe('phaseBFenceFacts — dirty-tree refusal scoping (#927)', () => {
+  let dirtyDir: string;
+
+  beforeEach(async () => {
+    // A second source whose local_path is a git repo with uncommitted changes.
+    dirtyDir = mkdtempSync(join(tmpdir(), 'mig-v0_32_2-dirty-'));
+    execFileSync('git', ['-C', dirtyDir, 'init', '-q']);
+    writeFileSync(join(dirtyDir, 'uncommitted.md'), 'dirty', 'utf-8');
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    await (engine as any).db.query(
+      `INSERT INTO sources (id, name, local_path) VALUES ('other', 'other', $1)`,
+      [dirtyDir],
+    );
+  });
+
+  afterEach(async () => {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    await (engine as any).db.query(`DELETE FROM sources WHERE id = 'other'`);
+    rmSync(dirtyDir, { recursive: true, force: true });
+  });
+
+  test('no legacy facts at all → complete, dirty unrelated source ignored', async () => {
+    const r = await __testing.phaseBFenceFacts(engine, OPTS);
+    expect(r.status).toBe('complete');
+    expect(r.detail).toContain('scanned=0');
+  });
+
+  test('facts scoped to a clean source fence despite dirty unrelated source', async () => {
+    await seedLegacyFact({ entity_slug: 'people/alice', fact: 'Founded Acme' });
+
+    const r = await __testing.phaseBFenceFacts(engine, OPTS);
+    expect(r.status).toBe('complete');
+    expect(r.detail).toContain('fenced=1');
+    expect(existsSync(join(brainDir, 'people/alice.md'))).toBe(true);
+  });
+
+  test('still refuses when the TARGETED source is dirty', async () => {
+    await seedLegacyFact({ entity_slug: 'people/alice', fact: 'F1', source_id: 'other' });
+
+    const r = await __testing.phaseBFenceFacts(engine, OPTS);
+    expect(r.status).toBe('failed');
+    expect(r.detail).toContain('"other"');
+    expect(r.detail).toContain('uncommitted changes');
+  });
+});
+
 describe('phaseCVerify', () => {
   test('returns complete when fence + DB row counts match', async () => {
     await seedLegacyFact({ entity_slug: 'people/alice', fact: 'F1' });