Skip to content

Garry's Opinionated OpenClaw/Hermes Agent Brain

TypeScript

fix: pre-landing review fixes

garrytan833fb4a14a98
diff --git a/docs/designs/REFRESH_WRITE_BARRIER.md b/docs/designs/REFRESH_WRITE_BARRIER.md
index 21636b9b1e..e642707ade 100644
--- a/docs/designs/REFRESH_WRITE_BARRIER.md
+++ b/docs/designs/REFRESH_WRITE_BARRIER.md
@@ -91,8 +91,10 @@ ALTER TABLE persistence_requests
ADD COLUMN IF NOT EXISTS deferred_refresh_id uuid REFERENCES persistence_worktree_refreshes(id);
-- the state CHECK gains 'deferred': drop the old constraint, ADD the new one NOT VALID, then VALIDATE
-- in a separate statement (no long ACCESS EXCLUSIVE scan; #7636's no-table-lock rule)
-CREATE INDEX IF NOT EXISTS persistence_requests_deferred
- ON persistence_requests(deferred_refresh_id, sequence) WHERE state='deferred';
+-- every open-state predicate gains 'deferred', so one index covers all four open states: a receipt poll
+-- (state IN ('queued','deferred','running','recovering')) stays index-served on a permanent receipt history
+CREATE INDEX IF NOT EXISTS persistence_requests_open
+ ON persistence_requests(worktree_id, sequence) WHERE state IN ('queued','deferred','running','recovering');
ALTER TABLE persistence_consumers ADD COLUMN IF NOT EXISTS capabilities text[] NOT NULL DEFAULT '{}';
```
diff --git a/src/commands/doctor/checks/foreign-writers.ts b/src/commands/doctor/checks/foreign-writers.ts
index bc3e620388..a1b6114044 100644
--- a/src/commands/doctor/checks/foreign-writers.ts
+++ b/src/commands/doctor/checks/foreign-writers.ts
@@ -19,6 +19,7 @@
import { existsSync, lstatSync, readdirSync, readFileSync, realpathSync, statSync } from 'node:fs';
import { join, relative, resolve, sep } from 'node:path';
import { execFileSync } from '../../../core/spawn.ts';
+import { GIT_READ_ENV, gitChildEnv } from '../../../core/git-env.ts';
import type { Check } from '../../doctor.ts';
import { readLedger, messageDigest } from '../../../core/git/commit-ledger.ts';
import { readPendingWriteThrough } from '../../../core/git/commit-push.ts';
@@ -49,7 +50,7 @@ interface Reflog { file: string; ref: string; gitDir: string | null }
interface Entry { old: string; next: string; time: number; message: string }
function git(root: string, args: string[], input?: string): string | null {
- try { return execFileSync('git', ['-C', root, ...args], { stdio: [input === undefined ? 'ignore' : 'pipe', 'pipe', 'ignore'], input, timeout: GIT_TIMEOUT_MS, maxBuffer: 32 * 1024 * 1024 }).toString(); }
+ try { return execFileSync('git', ['-C', root, ...args], { stdio: [input === undefined ? 'ignore' : 'pipe', 'pipe', 'ignore'], input, timeout: GIT_TIMEOUT_MS, maxBuffer: 32 * 1024 * 1024, env: gitChildEnv(GIT_READ_ENV) }).toString(); }
catch { return null; }
}
const canonical = (path: string) => { try { return realpathSync(path); } catch { return resolve(path); } };
diff --git a/src/core/schema-migrations/v292-refresh-write-barrier.ts b/src/core/schema-migrations/v292-refresh-write-barrier.ts
index dfb1dfdf64..2b398b758e 100644
--- a/src/core/schema-migrations/v292-refresh-write-barrier.ts
+++ b/src/core/schema-migrations/v292-refresh-write-barrier.ts
@@ -1,8 +1,8 @@
import type { Migration } from './types.ts';
import { buildIndexOnline, migrationNotice, runMigrationStatement } from './helpers.ts';
-const PERSISTENCE_DEFERRED_INDEX = { name: 'persistence_requests_deferred', table: 'persistence_requests',
- sql: `CREATE INDEX IF NOT EXISTS persistence_requests_deferred ON persistence_requests(worktree_id, sequence) WHERE state='deferred'` } as const;
+const PERSISTENCE_OPEN_INDEX = { name: 'persistence_requests_open', table: 'persistence_requests',
+ sql: `CREATE INDEX IF NOT EXISTS persistence_requests_open ON persistence_requests(worktree_id, sequence) WHERE state IN ('queued','deferred','running','recovering')` } as const;
// Applied by src/core/migrate.ts on the next initSchema(); see docs/ENGINES.md
// ("Canonical schema sources") for when schema.sql or a TS fragment also changes.
@@ -23,7 +23,9 @@ const PERSISTENCE_DEFERRED_INDEX = { name: 'persistence_requests_deferred', tabl
// VALID in the SQL batch, then validates each in its own statement from the handler
// (SHARE UPDATE EXCLUSIVE, after the batch's ACCESS EXCLUSIVE is released, so the
// scan of the permanent receipts blocks no reader or writer), and builds the
-// deferred index CONCURRENTLY like v223; PGLite does each in one shot.
+// open-request index CONCURRENTLY like v223; PGLite does each in one shot. The open index covers the four open states
+// together, so the predicates that list 'deferred' beside queued/running/recovering (receipt polls, drains, doctor) stay
+// index-served on a permanent receipt history; persistence_requests_pending keeps serving the three-state ones.
export const v292: Migration = {
version: 292,
name: 'refresh_write_barrier',
@@ -116,6 +118,6 @@ export const v292: Migration = {
await runMigrationStatement(engine, 292, `ALTER TABLE persistence_requests VALIDATE CONSTRAINT ${name}`);
}
}
- await buildIndexOnline(engine, 292, PERSISTENCE_DEFERRED_INDEX, { notice: migrationNotice });
+ await buildIndexOnline(engine, 292, PERSISTENCE_OPEN_INDEX, { notice: migrationNotice });
},
};
diff --git a/test/doctor-foreign-writers.test.ts b/test/doctor-foreign-writers.test.ts
index 832a52ad23..98b6c28cc9 100644
--- a/test/doctor-foreign-writers.test.ts
+++ b/test/doctor-foreign-writers.test.ts
@@ -316,3 +316,14 @@ test('repo-less: no source checkout is a Git repository, so the check is not app
const check = await run();
expect(check).toMatchObject({ status: 'ok', severity: 'info', readiness_state: 'not_applicable' });
});
+
+test('the scan reads git without optional locks: a stat-dirty index is left as it was, so a concurrent commit never meets index.lock', async () => {
+ const { work } = checkout();
+ await register('locks', work);
+ const future = new Date(Date.now() + 3_600_000);
+ utimesSync(join(work, 'notes/seed.md'), future, future);
+ const before = readFileSync(join(work, '.git/index'));
+ await run();
+ expect(readFileSync(join(work, '.git/index')).equals(before)).toBe(true);
+});
+
diff --git a/test/fixtures/goldens/catalog/pglite-engine-init-default.json b/test/fixtures/goldens/catalog/pglite-engine-init-default.json
index 906d1cd40c..4b72e53c96 100644
--- a/test/fixtures/goldens/catalog/pglite-engine-init-default.json
+++ b/test/fixtures/goldens/catalog/pglite-engine-init-default.json
@@ -1532,8 +1532,8 @@
"persistence_local_writers_pkey": "CREATE UNIQUE INDEX persistence_local_writers_pkey ON public.persistence_local_writers USING btree (id)",
"persistence_requests_compactable": "CREATE INDEX persistence_requests_compactable ON public.persistence_requests USING btree (completed_at) WHERE ((recovery IS NULL) AND (NOT compacted) AND (state = ANY (ARRAY['committed'::text, 'conflict'::text, 'failed'::text, 'cancelled'::text])))",
"persistence_requests_database_pending": "CREATE INDEX persistence_requests_database_pending ON public.persistence_requests USING btree (source_incarnation, sequence) WHERE ((worktree_id IS NULL) AND (state = ANY (ARRAY['queued'::text, 'running'::text, 'recovering'::text])))",
- "persistence_requests_deferred": "CREATE INDEX persistence_requests_deferred ON public.persistence_requests USING btree (worktree_id, sequence) WHERE (state = 'deferred'::text)",
"persistence_requests_foreground_committed": "CREATE INDEX persistence_requests_foreground_committed ON public.persistence_requests USING btree (worktree_id, sequence) WHERE ((state = 'committed'::text) AND (NOT (COALESCE((intent ->> 'kind'::text), ''::text) ~~ 'managed_sync_%'::text)))",
+ "persistence_requests_open": "CREATE INDEX persistence_requests_open ON public.persistence_requests USING btree (worktree_id, sequence) WHERE (state = ANY (ARRAY['queued'::text, 'deferred'::text, 'running'::text, 'recovering'::text]))",
"persistence_requests_pending": "CREATE INDEX persistence_requests_pending ON public.persistence_requests USING btree (worktree_id, sequence) WHERE (state = ANY (ARRAY['queued'::text, 'running'::text, 'recovering'::text]))",
"persistence_requests_pkey": "CREATE UNIQUE INDEX persistence_requests_pkey ON public.persistence_requests USING btree (id)",
"persistence_requests_principal": "CREATE INDEX persistence_requests_principal ON public.persistence_requests USING btree (principal_kind, principal_id, sequence DESC)",
diff --git a/test/fixtures/goldens/catalog/pglite-engine-init-fts-portuguese.json b/test/fixtures/goldens/catalog/pglite-engine-init-fts-portuguese.json
index 042c36ffc4..2179135baf 100644
--- a/test/fixtures/goldens/catalog/pglite-engine-init-fts-portuguese.json
+++ b/test/fixtures/goldens/catalog/pglite-engine-init-fts-portuguese.json
@@ -1532,8 +1532,8 @@
"persistence_local_writers_pkey": "CREATE UNIQUE INDEX persistence_local_writers_pkey ON public.persistence_local_writers USING btree (id)",
"persistence_requests_compactable": "CREATE INDEX persistence_requests_compactable ON public.persistence_requests USING btree (completed_at) WHERE ((recovery IS NULL) AND (NOT compacted) AND (state = ANY (ARRAY['committed'::text, 'conflict'::text, 'failed'::text, 'cancelled'::text])))",
"persistence_requests_database_pending": "CREATE INDEX persistence_requests_database_pending ON public.persistence_requests USING btree (source_incarnation, sequence) WHERE ((worktree_id IS NULL) AND (state = ANY (ARRAY['queued'::text, 'running'::text, 'recovering'::text])))",
- "persistence_requests_deferred": "CREATE INDEX persistence_requests_deferred ON public.persistence_requests USING btree (worktree_id, sequence) WHERE (state = 'deferred'::text)",
"persistence_requests_foreground_committed": "CREATE INDEX persistence_requests_foreground_committed ON public.persistence_requests USING btree (worktree_id, sequence) WHERE ((state = 'committed'::text) AND (NOT (COALESCE((intent ->> 'kind'::text), ''::text) ~~ 'managed_sync_%'::text)))",
+ "persistence_requests_open": "CREATE INDEX persistence_requests_open ON public.persistence_requests USING btree (worktree_id, sequence) WHERE (state = ANY (ARRAY['queued'::text, 'deferred'::text, 'running'::text, 'recovering'::text]))",
"persistence_requests_pending": "CREATE INDEX persistence_requests_pending ON public.persistence_requests USING btree (worktree_id, sequence) WHERE (state = ANY (ARRAY['queued'::text, 'running'::text, 'recovering'::text]))",
"persistence_requests_pkey": "CREATE UNIQUE INDEX persistence_requests_pkey ON public.persistence_requests USING btree (id)",
"persistence_requests_principal": "CREATE INDEX persistence_requests_principal ON public.persistence_requests USING btree (principal_kind, principal_id, sequence DESC)",
diff --git a/test/fixtures/goldens/catalog/pglite-engine-init-high-dims.json b/test/fixtures/goldens/catalog/pglite-engine-init-high-dims.json
index 55ca32cafc..235c9e6aca 100644
--- a/test/fixtures/goldens/catalog/pglite-engine-init-high-dims.json
+++ b/test/fixtures/goldens/catalog/pglite-engine-init-high-dims.json
@@ -1528,8 +1528,8 @@
"persistence_local_writers_pkey": "CREATE UNIQUE INDEX persistence_local_writers_pkey ON public.persistence_local_writers USING btree (id)",
"persistence_requests_compactable": "CREATE INDEX persistence_requests_compactable ON public.persistence_requests USING btree (completed_at) WHERE ((recovery IS NULL) AND (NOT compacted) AND (state = ANY (ARRAY['committed'::text, 'conflict'::text, 'failed'::text, 'cancelled'::text])))",
"persistence_requests_database_pending": "CREATE INDEX persistence_requests_database_pending ON public.persistence_requests USING btree (source_incarnation, sequence) WHERE ((worktree_id IS NULL) AND (state = ANY (ARRAY['queued'::text, 'running'::text, 'recovering'::text])))",
- "persistence_requests_deferred": "CREATE INDEX persistence_requests_deferred ON public.persistence_requests USING btree (worktree_id, sequence) WHERE (state = 'deferred'::text)",
"persistence_requests_foreground_committed": "CREATE INDEX persistence_requests_foreground_committed ON public.persistence_requests USING btree (worktree_id, sequence) WHERE ((state = 'committed'::text) AND (NOT (COALESCE((intent ->> 'kind'::text), ''::text) ~~ 'managed_sync_%'::text)))",
+ "persistence_requests_open": "CREATE INDEX persistence_requests_open ON public.persistence_requests USING btree (worktree_id, sequence) WHERE (state = ANY (ARRAY['queued'::text, 'deferred'::text, 'running'::text, 'recovering'::text]))",
"persistence_requests_pending": "CREATE INDEX persistence_requests_pending ON public.persistence_requests USING btree (worktree_id, sequence) WHERE (state = ANY (ARRAY['queued'::text, 'running'::text, 'recovering'::text]))",
"persistence_requests_pkey": "CREATE UNIQUE INDEX persistence_requests_pkey ON public.persistence_requests USING btree (id)",
"persistence_requests_principal": "CREATE INDEX persistence_requests_principal ON public.persistence_requests USING btree (principal_kind, principal_id, sequence DESC)",
diff --git a/test/fixtures/goldens/catalog/postgres-engine-init-default.json b/test/fixtures/goldens/catalog/postgres-engine-init-default.json
index a24132c3a5..6cfc2959d1 100644
--- a/test/fixtures/goldens/catalog/postgres-engine-init-default.json
+++ b/test/fixtures/goldens/catalog/postgres-engine-init-default.json
@@ -1536,8 +1536,8 @@
"persistence_local_writers_pkey": "CREATE UNIQUE INDEX persistence_local_writers_pkey ON public.persistence_local_writers USING btree (id)",
"persistence_requests_compactable": "CREATE INDEX persistence_requests_compactable ON public.persistence_requests USING btree (completed_at) WHERE ((recovery IS NULL) AND (NOT compacted) AND (state = ANY (ARRAY['committed'::text, 'conflict'::text, 'failed'::text, 'cancelled'::text])))",
"persistence_requests_database_pending": "CREATE INDEX persistence_requests_database_pending ON public.persistence_requests USING btree (source_incarnation, sequence) WHERE ((worktree_id IS NULL) AND (state = ANY (ARRAY['queued'::text, 'running'::text, 'recovering'::text])))",
- "persistence_requests_deferred": "CREATE INDEX persistence_requests_deferred ON public.persistence_requests USING btree (worktree_id, sequence) WHERE (state = 'deferred'::text)",
"persistence_requests_foreground_committed": "CREATE INDEX persistence_requests_foreground_committed ON public.persistence_requests USING btree (worktree_id, sequence) WHERE ((state = 'committed'::text) AND (NOT (COALESCE((intent ->> 'kind'::text), ''::text) ~~ 'managed_sync_%'::text)))",
+ "persistence_requests_open": "CREATE INDEX persistence_requests_open ON public.persistence_requests USING btree (worktree_id, sequence) WHERE (state = ANY (ARRAY['queued'::text, 'deferred'::text, 'running'::text, 'recovering'::text]))",
"persistence_requests_pending": "CREATE INDEX persistence_requests_pending ON public.persistence_requests USING btree (worktree_id, sequence) WHERE (state = ANY (ARRAY['queued'::text, 'running'::text, 'recovering'::text]))",
"persistence_requests_pkey": "CREATE UNIQUE INDEX persistence_requests_pkey ON public.persistence_requests USING btree (id)",
"persistence_requests_principal": "CREATE INDEX persistence_requests_principal ON public.persistence_requests USING btree (principal_kind, principal_id, sequence DESC)",
diff --git a/test/fixtures/goldens/catalog/postgres-engine-init-fts-portuguese.json b/test/fixtures/goldens/catalog/postgres-engine-init-fts-portuguese.json
index 7332b25a93..8dc7e8e4ab 100644
--- a/test/fixtures/goldens/catalog/postgres-engine-init-fts-portuguese.json
+++ b/test/fixtures/goldens/catalog/postgres-engine-init-fts-portuguese.json
@@ -1536,8 +1536,8 @@
"persistence_local_writers_pkey": "CREATE UNIQUE INDEX persistence_local_writers_pkey ON public.persistence_local_writers USING btree (id)",
"persistence_requests_compactable": "CREATE INDEX persistence_requests_compactable ON public.persistence_requests USING btree (completed_at) WHERE ((recovery IS NULL) AND (NOT compacted) AND (state = ANY (ARRAY['committed'::text, 'conflict'::text, 'failed'::text, 'cancelled'::text])))",
"persistence_requests_database_pending": "CREATE INDEX persistence_requests_database_pending ON public.persistence_requests USING btree (source_incarnation, sequence) WHERE ((worktree_id IS NULL) AND (state = ANY (ARRAY['queued'::text, 'running'::text, 'recovering'::text])))",
- "persistence_requests_deferred": "CREATE INDEX persistence_requests_deferred ON public.persistence_requests USING btree (worktree_id, sequence) WHERE (state = 'deferred'::text)",
"persistence_requests_foreground_committed": "CREATE INDEX persistence_requests_foreground_committed ON public.persistence_requests USING btree (worktree_id, sequence) WHERE ((state = 'committed'::text) AND (NOT (COALESCE((intent ->> 'kind'::text), ''::text) ~~ 'managed_sync_%'::text)))",
+ "persistence_requests_open": "CREATE INDEX persistence_requests_open ON public.persistence_requests USING btree (worktree_id, sequence) WHERE (state = ANY (ARRAY['queued'::text, 'deferred'::text, 'running'::text, 'recovering'::text]))",
"persistence_requests_pending": "CREATE INDEX persistence_requests_pending ON public.persistence_requests USING btree (worktree_id, sequence) WHERE (state = ANY (ARRAY['queued'::text, 'running'::text, 'recovering'::text]))",
"persistence_requests_pkey": "CREATE UNIQUE INDEX persistence_requests_pkey ON public.persistence_requests USING btree (id)",
"persistence_requests_principal": "CREATE INDEX persistence_requests_principal ON public.persistence_requests USING btree (principal_kind, principal_id, sequence DESC)",
diff --git a/test/fixtures/goldens/catalog/postgres-engine-init-high-dims.json b/test/fixtures/goldens/catalog/postgres-engine-init-high-dims.json
index b79c17f71d..0fccd6c030 100644
--- a/test/fixtures/goldens/catalog/postgres-engine-init-high-dims.json
+++ b/test/fixtures/goldens/catalog/postgres-engine-init-high-dims.json
@@ -1532,8 +1532,8 @@
"persistence_local_writers_pkey": "CREATE UNIQUE INDEX persistence_local_writers_pkey ON public.persistence_local_writers USING btree (id)",
"persistence_requests_compactable": "CREATE INDEX persistence_requests_compactable ON public.persistence_requests USING btree (completed_at) WHERE ((recovery IS NULL) AND (NOT compacted) AND (state = ANY (ARRAY['committed'::text, 'conflict'::text, 'failed'::text, 'cancelled'::text])))",
"persistence_requests_database_pending": "CREATE INDEX persistence_requests_database_pending ON public.persistence_requests USING btree (source_incarnation, sequence) WHERE ((worktree_id IS NULL) AND (state = ANY (ARRAY['queued'::text, 'running'::text, 'recovering'::text])))",
- "persistence_requests_deferred": "CREATE INDEX persistence_requests_deferred ON public.persistence_requests USING btree (worktree_id, sequence) WHERE (state = 'deferred'::text)",
"persistence_requests_foreground_committed": "CREATE INDEX persistence_requests_foreground_committed ON public.persistence_requests USING btree (worktree_id, sequence) WHERE ((state = 'committed'::text) AND (NOT (COALESCE((intent ->> 'kind'::text), ''::text) ~~ 'managed_sync_%'::text)))",
+ "persistence_requests_open": "CREATE INDEX persistence_requests_open ON public.persistence_requests USING btree (worktree_id, sequence) WHERE (state = ANY (ARRAY['queued'::text, 'deferred'::text, 'running'::text, 'recovering'::text]))",
"persistence_requests_pending": "CREATE INDEX persistence_requests_pending ON public.persistence_requests USING btree (worktree_id, sequence) WHERE (state = ANY (ARRAY['queued'::text, 'running'::text, 'recovering'::text]))",
"persistence_requests_pkey": "CREATE UNIQUE INDEX persistence_requests_pkey ON public.persistence_requests USING btree (id)",
"persistence_requests_principal": "CREATE INDEX persistence_requests_principal ON public.persistence_requests USING btree (principal_kind, principal_id, sequence DESC)",
diff --git a/test/fixtures/goldens/migrations/records.json b/test/fixtures/goldens/migrations/records.json
index f4acbc59fc..890c3bd3a5 100644
--- a/test/fixtures/goldens/migrations/records.json
+++ b/test/fixtures/goldens/migrations/records.json
@@ -41,9 +41,9 @@
"PERSISTENCE_COMMITTED_WATERMARK_INDEX": "f472fa0acb542c1caebaaa3bc69fb2da1647e5e201239429fc02ccef0d669533",
"PERSISTENCE_COMPACTABLE_INDEX": "25ee657878efb41ba9ea3a7624464ddcf66407d861659456c230366e57f230a0",
"PERSISTENCE_DATABASE_PENDING_INDEX_SQL": "6e0f618be33d037454933ea4dea11438413d45aef35d3bd4f33e89624d6e199e",
- "PERSISTENCE_DEFERRED_INDEX": "197c708370699aa5e8362b329abc47135ad6fc9c78ab751bd82bdb39d020c3c7",
"PERSISTENCE_EFFECT_PARKED_INDEX_SQL": "0107863883415378d7c0dce7a0cbd5311c2c5a59fc0f81917cc8b767fd235cf2",
"PERSISTENCE_FOREGROUND_COMMITTED_INDEX": "cb6bb9f8e9bcfd2524a04d05e5da865e92c69442bbcd438d8191d311f76d0663",
+ "PERSISTENCE_OPEN_INDEX": "7760f2e16960b587e041b19e2eb0b2688831f4a7ca509968a1acc0ca710fcc9c",
"PERSISTENCE_REQUEST_ID_INDEX": "2c5325e86cf395f617d93a39a45593931639cd8b14fd513b6d9e7d125f16c78f",
"PERSISTENCE_REQUEST_REPLAY_ID_INDEX": "b9ee7e914c0a8370a9aee053c68d78cdd83a20ffe30c5513d81acf04a3a91761",
"PERSISTENCE_REQUEST_SLUG_INTENT_INDEX": "5f2e4a3dde452e610fe7eaae949642c00d7c61a363b1cd344d7f0917db233aa5",
@@ -4738,7 +4738,7 @@
"handler": {
"form": "arrow",
"helpers": [
- "PERSISTENCE_DEFERRED_INDEX",
+ "PERSISTENCE_OPEN_INDEX",
"PLANNER_REPAIR_TABLES",
"analyzeAfterIndexBuild",
"analyzeDeferred",
@@ -4753,7 +4753,7 @@
"tableRows",
"withSchemaLockTimeout"
],
- "sha256": "b0d2c0b581e9b2038b2fdc4b3ec26b73a9a748dfdcdd8a0c334701672a5a9750"
+ "sha256": "3d7a66d6651b2f2309a1c52b0cc76cdc79ce9553bdda2b8096c8aea1a96d934b"
},
"idempotent": true,
"name": "refresh_write_barrier",
diff --git a/test/fixtures/goldens/pglite-upgrade-replay/catalog-after-boot.json b/test/fixtures/goldens/pglite-upgrade-replay/catalog-after-boot.json
index 7fd01c2dac..0e1ee9e8be 100644
--- a/test/fixtures/goldens/pglite-upgrade-replay/catalog-after-boot.json
+++ b/test/fixtures/goldens/pglite-upgrade-replay/catalog-after-boot.json
@@ -1532,8 +1532,8 @@
"persistence_local_writers_pkey": "CREATE UNIQUE INDEX persistence_local_writers_pkey ON public.persistence_local_writers USING btree (id)",
"persistence_requests_compactable": "CREATE INDEX persistence_requests_compactable ON public.persistence_requests USING btree (completed_at) WHERE ((recovery IS NULL) AND (NOT compacted) AND (state = ANY (ARRAY['committed'::text, 'conflict'::text, 'failed'::text, 'cancelled'::text])))",
"persistence_requests_database_pending": "CREATE INDEX persistence_requests_database_pending ON public.persistence_requests USING btree (source_incarnation, sequence) WHERE ((worktree_id IS NULL) AND (state = ANY (ARRAY['queued'::text, 'running'::text, 'recovering'::text])))",
- "persistence_requests_deferred": "CREATE INDEX persistence_requests_deferred ON public.persistence_requests USING btree (worktree_id, sequence) WHERE (state = 'deferred'::text)",
"persistence_requests_foreground_committed": "CREATE INDEX persistence_requests_foreground_committed ON public.persistence_requests USING btree (worktree_id, sequence) WHERE ((state = 'committed'::text) AND (NOT (COALESCE((intent ->> 'kind'::text), ''::text) ~~ 'managed_sync_%'::text)))",
+ "persistence_requests_open": "CREATE INDEX persistence_requests_open ON public.persistence_requests USING btree (worktree_id, sequence) WHERE (state = ANY (ARRAY['queued'::text, 'deferred'::text, 'running'::text, 'recovering'::text]))",
"persistence_requests_pending": "CREATE INDEX persistence_requests_pending ON public.persistence_requests USING btree (worktree_id, sequence) WHERE (state = ANY (ARRAY['queued'::text, 'running'::text, 'recovering'::text]))",
"persistence_requests_pkey": "CREATE UNIQUE INDEX persistence_requests_pkey ON public.persistence_requests USING btree (id)",
"persistence_requests_principal": "CREATE INDEX persistence_requests_principal ON public.persistence_requests USING btree (principal_kind, principal_id, sequence DESC)",
diff --git a/test/refresh-write-barrier.test.ts b/test/refresh-write-barrier.test.ts
index 0f7fb7e901..301fc1a520 100644
--- a/test/refresh-write-barrier.test.ts
+++ b/test/refresh-write-barrier.test.ts
@@ -28,6 +28,7 @@ import { PENDING_WRITE_EXIT_CODE } from '../src/core/exit-codes.ts';
import { OperationError } from '../src/core/ops/contract.ts';
import { refreshWorktree } from '../src/core/persistence/worktree-refresh.ts';
import { getWriteRequestById } from '../src/core/persistence/journal.ts';
+import { readWriteWatermark } from '../src/core/persistence/applied-watermark.ts';
import { resetWriteSwitches } from '../src/core/persistence/switches.ts';
import { _setRefreshFenceWaitForTests } from '../src/core/persistence/admission-retry.ts';
import { _resetRefreshBarrierCacheForTests, deferredBacklog, expireDeferredWrites } from '../src/core/persistence/refresh-barrier.ts';
@@ -504,3 +505,27 @@ test('a source lifecycle change while a deferred write waits ends it source_chan
});
expect((await refresh).status).toBe('completed');
}), 180_000);
+
+test('a receipt poll reads the open-request index, never the permanent receipt history', () => each(async f => {
+ const [source] = await f.engine.executeRaw<{ incarnation: string }>('SELECT incarnation::text AS incarnation FROM sources WHERE id=$1', [f.alpha]);
+ await f.engine.executeRaw(`INSERT INTO persistence_requests(principal_kind,principal_id,request_id,operation,source_id,source_incarnation,slug,worktree_id,
+ digest,intent,authority,intent_bytes,terminal_reservation,state)
+ SELECT 'local_cli','history',gen_random_uuid(),'put_page',$1,$2::uuid,'history-'||g,$3::uuid,'d','{}'::jsonb,'{}'::jsonb,1,16384,'committed'
+ FROM generate_series(1,20000) g`, [f.alpha, source!.incarnation, f.worktreeId]);
+ try {
+ await f.engine.executeRaw('ANALYZE persistence_requests');
+ const scans: string[] = [];
+ const nodes = (plan: Record<string, any>): Array<Record<string, any>> => [plan, ...(plan.Plans ?? []).flatMap(nodes)];
+ const explaining = { executeRaw: async (sql: string, params?: unknown[]) => {
+ const [row] = await f.engine.executeRaw<Record<string, unknown>>(`EXPLAIN (FORMAT JSON) ${sql}`, params);
+ const raw = row!['QUERY PLAN'];
+ const [explained] = (typeof raw === 'string' ? JSON.parse(raw) : raw) as Array<{ Plan: Record<string, any> }>;
+ for (const node of nodes(explained!.Plan)) if (node['Node Type'] === 'Seq Scan' && node['Relation Name'] === 'persistence_requests') scans.push(sql);
+ return f.engine.executeRaw(sql, params);
+ } } as Pick<BrainEngine, 'executeRaw'>;
+ expect((await readWriteWatermark(explaining, f.alpha)).requests_pending.count).toBe(0);
+ expect(scans).toEqual([]);
+ } finally {
+ await f.engine.executeRaw("DELETE FROM persistence_requests WHERE principal_id='history'");
+ }
+}), 180_000);