Garry's Opinionated OpenClaw/Hermes Agent Brain
TypeScript
fix: per-member failure isolation in failRefusedClaims; wedge test on the shared engine (#8368)
garrytan404898560e94
diff --git a/scripts/structural-suites.tsv b/scripts/structural-suites.tsvindex 971aa4ada4..0f4f5eb70a 100644--- a/scripts/structural-suites.tsv+++ b/scripts/structural-suites.tsv@@ -438,7 +438,7 @@ test/v0_37_gap_fill.serial.test.ts reinit-pglite — backup + reinit 8 source-sutest/w13-small-hardening.test.ts P1.14 paid-consent lint wording 1 exec-scantest/worker-supervised-db-probe.test.ts issue #1801 fix #2 — supervised DB self-defense 5 readFileSynctest/write-attribution-legacy.test.ts write attribution inventory 1 readFileSync-test/write-cap-wedge-8368.test.ts #8368 write-cap wedge (${kind}) 3 readFileSync+test/write-cap-wedge-8368.test.ts #8368 write-cap wedge (${kind}) 4 readFileSynctest/yaml-load-bounded-only.test.ts js-yaml load is imported only by data-frontmatter.ts 2 readFileSync# unknown (detectors present, no attributable suite):# unknown test/e2e/postgres-driver-install.test.tsdiff --git a/src/core/persistence/consumer.ts b/src/core/persistence/consumer.tsindex ecf4ac02ce..bcebc00152 100644--- a/src/core/persistence/consumer.ts+++ b/src/core/persistence/consumer.ts@@ -1225,24 +1225,28 @@ export class PersistenceConsumer implements PersistenceConsumerLike {* #8368: a claimed group refused before it published by a deterministic ownership refusal (the checkout identity check* of the group's worktree lock) is finished the way the single path finishes one request: each member still running* under this claim, unpublished and without a recovery record, ends failed with the refusal's code, which releases its- * outstanding-request slot. Left running, every lease lapse re-claimed it into the same refusal, forever. A member whose- * claim moved meanwhile is left to its new claimant; a connection loss gives the unfinished members back at once.+ * outstanding-request slot. Left running, every lease lapse re-claimed it into the same refusal, forever. One member+ * that cannot be finished (its claim moved to another claimant, for one) is logged and left to its claim, and the rest+ * still end; a connection loss gives the unfinished members back at once and is reported like the group path's.*/private async failRefusedClaims(rows: WriteRequest[], error: OperationError): Promise<boolean> {let progressed = false;for (const [index, row] of rows.entries()) {+ let done: WriteRequest;try {const current = await getWriteRequestById(this.engine, row.id);if (!current || current.state !== 'running' || current.execution_token !== row.execution_token || current.recovery || current.publication_started) continue;- const done = await finishUnpublishedFailure(this.engine, current, error, 'publication');- if (done.state === 'failed') this.log('publication', done.error_code ?? error.code, failureLogText(done), '', row);- if (this.settled(done)) progressed = true;+ done = await finishUnpublishedFailure(this.engine, current, error, 'publication');} catch (failure) {- if (failure instanceof OperationError && failure.code === 'write_claim_lost') continue;- if (!transientDatabaseFailure(failure)) throw failure;- await this.releaseAfterConnectionLoss(rows.slice(index));- return progressed;+ if (transientDatabaseFailure(failure)) {+ await this.releaseAfterConnectionLoss(rows.slice(index));+ throw failure;+ }+ this.log('publication', failure instanceof OperationError ? failure.code : 'internal', failure instanceof Error ? failure.message : String(failure), '', row);+ continue;}+ if (done.state === 'failed') this.log('publication', done.error_code ?? error.code, failureLogText(done), '', row);+ if (this.settled(done)) progressed = true;}return progressed;}diff --git a/test/write-cap-wedge-8368.test.ts b/test/write-cap-wedge-8368.test.tsindex 10359b05bb..7f711f7c9b 100644--- a/test/write-cap-wedge-8368.test.ts+++ b/test/write-cap-wedge-8368.test.ts@@ -149,6 +149,34 @@ for (const kind of testBackends()) describe(`#8368 write-cap wedge (${kind})`, (expect(verdict!.action.verify?.argv).toBeDefined();}), 150_000);+ test('a refused group member whose claim moved is left to its claimant and the rest still end failed', () => withEnv(env(), async () => {+ await engine.executeRaw('UPDATE persistence_brain SET enabled=false WHERE singleton=1');+ const fixture = await requestFixture(engine);+ await engine.executeRaw('UPDATE persistence_brain SET enabled=true WHERE singleton=1');+ // A claimed group: three members running under one claim.+ const claimed: WriteRequest[] = [];+ for (const slug of ['notes/one', 'notes/two', 'notes/three']) {+ const admitted = await fixture.admit(slug);+ await editRequest(engine, admitted.id, "state='running',execution_token=$2::uuid,claim_expires_at=now()+interval '1 hour'", [randomUUID()]);+ claimed.push((await getWriteRequestById(engine, admitted.id))!);+ }+ const consumer = new PersistenceConsumer(engine, { engine: engine.kind }, async () => { throw new Error('unused'); }, { hostId: localHostId() });+ // The first member's lease lapses and another claimant takes it between the consumer's read and its completion.+ const transaction = engine.transaction.bind(engine);+ let moved = false;+ engine.transaction = (async (fn: Parameters<BrainEngine['transaction']>[0]) => {+ if (!moved) { moved = true; await editRequest(engine, claimed[0]!.id, 'execution_token=$2::uuid', [randomUUID()]); }+ return transaction(fn);+ }) as BrainEngine['transaction'];+ try {+ await (consumer as unknown as { failRefusedClaims(rows: unknown[], error: OperationError): Promise<boolean> })+ .failRefusedClaims(claimed, new OperationError('owner_marker_missing', 'The ownership marker is missing.'));+ } finally { engine.transaction = transaction; }+ const states = await engine.executeRaw<{ state: string; error_code: string | null }>(+ 'SELECT state,error_code FROM persistence_requests WHERE source_id=$1 ORDER BY sequence', [fixture.sourceId]);+ expect(states.map(row => [row.state, row.error_code])).toEqual([['running', null], ['failed', 'owner_marker_missing'], ['failed', 'owner_marker_missing']]);+ }), 60_000);+describe('(b, d) one source cannot starve another on the shared local principal', () => {async function dbSource() {const id = `fair-${randomUUID().replace(/-/g, '').slice(0, 16)}`;@@ -226,34 +254,6 @@ for (const kind of testBackends()) describe(`#8368 write-cap wedge (${kind})`, (});});-test('#8368: a refused group member whose claim moved is left to its claimant and the rest still end failed', async () => {- const engine = new PGLiteEngine(); await engine.connect({}); await engine.initSchema();- try {- const fixture = await requestFixture(engine);- // A claimed group: three members running under one claim.- const claimed: WriteRequest[] = [];- for (const slug of ['notes/one', 'notes/two', 'notes/three']) {- const admitted = await fixture.admit(slug);- await editRequest(engine, admitted.id, "state='running',execution_token=$2::uuid,claim_expires_at=now()+interval '1 hour'", [randomUUID()]);- claimed.push((await getWriteRequestById(engine, admitted.id))!);- }- const consumer = new PersistenceConsumer(engine, { engine: 'pglite' }, async () => { throw new Error('unused'); }, { hostId: localHostId() });- // The first member's lease lapses and another claimant takes it between the consumer's read and its completion.- const transaction = engine.transaction.bind(engine);- let moved = false;- engine.transaction = (async (fn: Parameters<BrainEngine['transaction']>[0]) => {- if (!moved) { moved = true; await editRequest(engine, claimed[0]!.id, 'execution_token=$2::uuid', [randomUUID()]); }- return transaction(fn);- }) as BrainEngine['transaction'];- await (consumer as unknown as { failRefusedClaims(rows: unknown[], error: OperationError): Promise<boolean> })- .failRefusedClaims(claimed, new OperationError('owner_marker_missing', 'The ownership marker is missing.'));- engine.transaction = transaction;- const states = await engine.executeRaw<{ id: string; state: string; error_code: string | null }>(- 'SELECT id::text AS id,state,error_code FROM persistence_requests WHERE source_id=$1 ORDER BY sequence', [fixture.sourceId]);- expect(states.map(row => [row.state, row.error_code])).toEqual([['running', null], ['failed', 'owner_marker_missing'], ['failed', 'owner_marker_missing']]);- } finally { await engine.disconnect(); }-}, 60_000);-test('#8368: owner_marker_missing stops a sync or connector run for the source instead of counting against one item', () => {const refusal = new OperationError('owner_marker_missing', 'The ownership marker is missing.');expect(classifyItemFailure(refusal).scope).not.toBe('item');