Garry's Opinionated OpenClaw/Hermes Agent Brain
TypeScript
Recheck mid-purge derived pages even when the purged page was parked by an earlier failed label
garrytan9c4e49ccefde
diff --git a/src/core/repair/origin-carry.ts b/src/core/repair/origin-carry.tsindex cf70a3360f..1977b6218a 100644--- a/src/core/repair/origin-carry.ts+++ b/src/core/repair/origin-carry.ts@@ -149,6 +149,7 @@ export async function deletePageCarryingPrivate(ctx: OperationContext, p: Record}const block = origin ? (await carryPrivate(ctx.engine, [origin], batch)).get(origin.id) : undefined;if (!origin || !block) {+ if (origin) await clearDerivedOriginParks(ctx.engine, [origin.id]);await faultPoint('purge:after_carry', { sourceId, slug: origin?.slug });const result = await finishPagePurge(ctx, await submitPageMutation(ctx, { operation: 'delete_page', params: p }));if (origin && result.status === 'purged') await clearDerivedOriginParks(ctx.engine, [origin.id]);diff --git a/test/derived-origin-carry-private.test.ts b/test/derived-origin-carry-private.test.tsindex 800a7b187a..e8f3942a9d 100644--- a/test/derived-origin-carry-private.test.ts+++ b/test/derived-origin-carry-private.test.ts@@ -17,7 +17,7 @@* 3. Real seams: tokens minted by the token service and verified as serve --http does, dispatched through MCP dispatch* (remote: true), on a repo-less brain without managed persistence; PGLite always, Postgres with DATABASE_URL.*/-import { afterAll, beforeAll, describe, expect, test } from 'bun:test';+import { afterAll, beforeAll, describe, expect, spyOn, test } from 'bun:test';import { randomUUID } from 'node:crypto';import { mkdtempSync, rmSync } from 'node:fs';import { tmpdir } from 'node:os';@@ -36,6 +36,7 @@ import { bindCredential } from '../src/core/access/members.ts';import { consentedPurgeDeletedPages, purgeDeletedPagesCoordinated, selectPurgeCandidates } from '../src/core/persistence/purge-deleted.ts';import { checkDerivedOriginParked } from '../src/commands/doctor/checks/purge-parks.ts';import { installFaultHook } from '../src/core/persistence/fault-points.ts';+import * as labelWrite from '../src/core/repair/label-write.ts';import type { AuthInfo } from '../src/core/ops/contract.ts';import { testBackends } from './helpers/test-backends.ts';import { isolatedPersistencePostgres } from './helpers/persistence-postgres.ts';@@ -415,6 +416,31 @@ for (const kind of testBackends()) {await expectLateHidden(k, late);}, 240_000);+ test('an explicit purge of an origin parked by an earlier failed label still rechecks inside its transaction once the label retry succeeds', async () => {+ const k = 'reparked';+ await seed(k);+ const origin = slugOf(k, 'origin');+ const failing = spyOn(labelWrite, 'importAtRevision').mockImplementation(async () => { throw new Error('forced label failure'); });+ try {+ const first = JSON.parse((await localCall('delete_page', { slug: origin, purge: true, request_id: randomUUID(), expected_revision: await revision(origin) })).text);+ expect(first.purge_held?.code).toBe('derived_origin_parked');+ } finally { failing.mockRestore(); }+ expect((await checkDerivedOriginParked(engine)).status).toBe('warn');+ const late = lateDerivedPage(k);+ let out: { isError: boolean; text: string };+ try { out = await localCall('delete_page', { slug: origin, purge: true, request_id: randomUUID(), expected_revision: await revision(origin) }); }+ finally { installFaultHook(undefined); }+ expect(out.isError ? out.text : '').toBe('');+ expect(JSON.parse(out.text).purge_held?.code).toBe('derived_origin_parked');+ expect((await row(origin))?.deleted_at).not.toBeNull();+ await expectLateHidden(k, late);+ for (const shape of CARRIED) expect({ shape, visibility: (await fm(slugOf(k, shape))).visibility }).toEqual({ shape, visibility: 'private' });+ await backdate(origin);+ expect((await purgeDeletedPagesCoordinated(engine, 72, { automatic: true })).slugs).not.toContain(origin);+ expect((await purgeDeletedPagesCoordinated(engine, 72, { automatic: true })).slugs).toContain(origin);+ await expectLateHidden(k, late);+ }, 240_000);+test('a stamp that fails parks the origin: never purged, named by doctor with the page that blocks it, the derived page stays hidden; fixed, the next purge stamps and unparks and the one after purges', async () => {const k = 'park';await seed(k);