Skip to content

Garry's Opinionated OpenClaw/Hermes Agent Brain

TypeScript

Keep the origins a purge preview left out as held out of the consented run too

garrytane7ff05f6101c
diff --git a/src/commands/pages.ts b/src/commands/pages.ts
index 50f069d2de..c1c1299fbb 100644
--- a/src/commands/pages.ts
+++ b/src/commands/pages.ts
@@ -10,7 +10,7 @@
* page_links, chunk_relations via existing FKs.
*/
import type { BrainEngine } from '../core/engine.ts';
-import { purgeConsentRequest, purgeDeletedPagesCoordinated, selectPurgeCandidates } from '../core/persistence/purge-deleted.ts';
+import { notHeld, purgeConsentRequest, purgeDeletedPagesCoordinated, selectPurgeCandidates } from '../core/persistence/purge-deleted.ts';
import { PURGE_PARK_LIMIT } from '../core/persistence/purge-parks.ts';
import { setCliExitVerdict } from '../core/cli-force-exit.ts';
import { consentGate } from '../core/consent-cli.ts';
@@ -86,7 +86,7 @@ async function runPurgeDeleted(engine: BrainEngine, args: string[]): Promise<voi
const authorized = await consentGate(purgeConsentRequest(selection.count, olderThanHours, json, args, retryParked, retried, selection.sync_unreviewed), { json });
if (!authorized) return;
- const result = await purgeDeletedPagesCoordinated(engine, olderThanHours, { retryParked, release: forecast.release.map(origin => origin.id) });
+ const result = await purgeDeletedPagesCoordinated(engine, olderThanHours, { retryParked, release: forecast.release.map(origin => origin.id), only: notHeld(forecast) });
if (json) {
console.log(JSON.stringify({ older_than_hours: olderThanHours, count: result.count, slugs: result.slugs,
...(result.capacity_deferred ? { capacity_deferred: result.capacity_deferred } : {}), ...(result.blocked.length ? { blocked: result.blocked } : {}) }, null, 2));
diff --git a/src/core/persistence/purge-deleted.ts b/src/core/persistence/purge-deleted.ts
index fa3da414c3..b37d1ab4b3 100644
--- a/src/core/persistence/purge-deleted.ts
+++ b/src/core/persistence/purge-deleted.ts
@@ -96,10 +96,16 @@ export async function consentedPurgeDeletedPages(engine: BrainEngine, olderThanH
const preview = await selectPurgeCandidates(engine, olderThanHours, { forecast });
if (preview.count === 0) return { status: 'purged', count: 0, slugs: [] };
await requireConsent(purgeConsentRequest(preview.count, olderThanHours, false, yes ? ['--yes'] : [], false, 0, preview.sync_unreviewed));
- const result = await purgeDeletedPagesCoordinated(engine, olderThanHours, { release: forecast.release.map(origin => origin.id) });
+ const result = await purgeDeletedPagesCoordinated(engine, olderThanHours, { release: forecast.release.map(origin => origin.id), only: notHeld(forecast) });
return { status: result.failed ? 'partial' : 'purged', count: result.count, slugs: result.slugs, ...(result.blocked.length ? { blocked: result.blocked } : {}) };
}
+/** GST-2689: the run purges no origin its preview left out as held, even when the blocker clears in between. */
+export function notHeld(forecast: CarryForecast): PurgeFilter {
+ const held = new Set(forecast.hold.map(origin => `${origin.source_id}/${origin.slug}`));
+ return page => !held.has(`${page.source_id}/${page.slug}`);
+}
+
/** An expired tombstone of a source the belief ledger records (unmanaged brain), in scan order, with its live failure record. */
interface RecordedTombstone { id: number; source_id: string; slug: string; deleted_us: string; key: string; park?: PurgePark }
diff --git a/test/derived-origin-carry-private.test.ts b/test/derived-origin-carry-private.test.ts
index b03556af2a..b76a44a16f 100644
--- a/test/derived-origin-carry-private.test.ts
+++ b/test/derived-origin-carry-private.test.ts
@@ -466,6 +466,35 @@ for (const kind of testBackends()) {
await expectCarriedHidden(k);
}, 240_000);
+ test('a consented purge keeps an origin its preview held, even when the blocker clears between the preview and the run', async () => {
+ const k = 'heldrun';
+ await seed(k);
+ const origin = slugOf(k, 'origin'), digest = slugOf(k, 'digest'), plain = slugOf(k, 'plain');
+ await softDelete(origin);
+ await backdate(origin);
+ await softDelete(digest);
+ await softDelete(plain);
+ await backdate(plain);
+ const originCarry = await import('../src/core/repair/origin-carry.ts');
+ const real = originCarry.forecastCarry;
+ const forecast = spyOn(originCarry, 'forecastCarry').mockImplementation(async (...args: Parameters<typeof real>) => {
+ const read = await real(...args);
+ expect(read.hold.map(o => o.slug)).toContain(origin);
+ const restored = await localCall('restore_page', { slug: digest, request_id: randomUUID(), expected_revision: await revision(digest) });
+ expect(restored.isError ? restored.text : '').toBe('');
+ return read;
+ });
+ let result: Awaited<ReturnType<typeof consentedPurgeDeletedPages>>;
+ try { result = await consentedPurgeDeletedPages(engine, 72, true); } finally { forecast.mockRestore(); }
+ expect(result.slugs).toContain(plain);
+ expect(result.slugs).not.toContain(origin);
+ expect((await row(origin))?.deleted_at).not.toBeNull();
+ expect((await fm(digest)).visibility).toBe('private');
+ expect((await purgeDeletedPagesCoordinated(engine, 72, { automatic: true })).slugs).toContain(origin);
+ await nothingKept(origin);
+ await expectCarriedHidden(k);
+ }, 240_000);
+
test('a held owner purge names gbrain delete <slug> --purge in its receipt and in doctor; finished through it as a new request, it writes the purge tombstones', async () => {
const k = 'finish';
await seed(k);