Garry's Opinionated OpenClaw/Hermes Agent Brain
TypeScript
Clear the held takes section once a takes write puts it back
garrytanda1ab1ef435b
diff --git a/src/core/generations/fence.ts b/src/core/generations/fence.tsindex d8da29ae70..e65adb12a3 100644--- a/src/core/generations/fence.ts+++ b/src/core/generations/fence.ts@@ -165,7 +165,7 @@ export async function publishFenceGeneration(tx: BrainEngine, request: FenceGene}/** A readable fence answers a held `fence_absent` (or `no_proof`) row: it is the proof the hold waited for. */-async function clearFenceHold(tx: BrainEngine, key: GenerationKey): Promise<void> {+export async function clearFenceHold(tx: BrainEngine, key: GenerationKey): Promise<void> {await tx.executeRaw(`DELETE FROM derived_generations WHERE source_id=$1 AND kind=$2 AND owner_key=$3 AND state='held' AND held_reason IN ('fence_absent','no_proof')`,[key.sourceId, key.kind, key.ownerKey]);}diff --git a/src/core/persistence/takes-prepare.ts b/src/core/persistence/takes-prepare.tsindex 65a18e4629..b71b29470d 100644--- a/src/core/persistence/takes-prepare.ts+++ b/src/core/persistence/takes-prepare.ts@@ -30,7 +30,7 @@ import { withWriteAttribution } from './context.ts';import { decideTakeWrite, recordFlaggedRow, recordWriteGateHold } from '../write-gate-store.ts';import { writeGateRejectedError } from '../write-gate.ts';import { beliefTransaction } from '../belief/writers.ts';-import { fenceOwnerKey, readFenceBlocks, TAKE_FENCE_KIND } from '../generations/fence.ts';+import { clearFenceHold, fenceOwnerKey, readFenceBlocks, TAKE_FENCE_KIND } from '../generations/fence.ts';/** Server-derived values are frozen after replay lookup, before admission. */export async function normalizeTakesIntent(ctx: OperationContext, params: Record<string, unknown>): Promise<Record<string, unknown>> {@@ -134,7 +134,8 @@ async function prepare(engine: BrainEngine, row: WriteRequest, config: GBrainConconst rendered = serializePageToMarkdown(target ? { ...snapshot.page, ...target.page } : snapshot.page,snapshot.tags);// A rewrite that dropped the takes fence left the page's takes stored (held fence_absent): a takes write that creates// the fence again renders them into it first, or the next projected write would read the new fence as their removal.- const held = readFenceBlocks(target?.page ?? snapshot.page,'takes').state==='absent' ? await heldTakeRows(engine,row.source_id,row.slug,snapshot.page.id) : [];+ const recreated = readFenceBlocks(target?.page ?? snapshot.page,'takes').state==='absent';+ const held = recreated ? await heldTakeRows(engine,row.source_id,row.slug,snapshot.page.id) : [];const body = held.length ? edit.replaceFence(upsertTakeRow(rendered,held[0]!).body,held) : rendered;const parsed = parseTakesFence(body);edit.assertFenceRoundTrips(parsed);@@ -283,6 +284,7 @@ async function prepare(engine: BrainEngine, row: WriteRequest, config: GBrainConif (written && contestedOld) result.contested=await recordContestedTake(tx,{sourceId:row.source_id,oldId:contestedOld.id,oldTier:storedTrustTier(contestedOld.tier),newId:Number(written.id),newTier:storedTrustTier(written.trust_tier),guard:'takes_supersede'});if (acceptedProposal) await finishOwnerAcceptedTake(tx,acceptedProposal);+ if (recreated && readFenceBlocks({compiled_truth:next},'takes').state==='parsed') await clearFenceHold(tx,{kind:TAKE_FENCE_KIND,sourceId:row.source_id,ownerKey:fenceOwnerKey(row.slug)});const flagged=written && gate ? gateField(gate.assessment,`t${written.id}`,await recordFlaggedRow(tx,gate,{table:'takes',id:Number(written.id),sourceId:row.source_id})) : undefined;if (flagged) result.gate=flagged;}diff --git a/test/fence-absent-append-keeps-rows.test.ts b/test/fence-absent-append-keeps-rows.test.tsindex e8e57a20a1..2f8b037f8d 100644--- a/test/fence-absent-append-keeps-rows.test.ts+++ b/test/fence-absent-append-keeps-rows.test.ts@@ -157,6 +157,7 @@ for (const backend of testBackends()) {expect((await takes(engine, slug)).map(t => t.claim)).toEqual([TAKE_A]);await op(ctx, 'takes_add', { slug, claim: TAKE_B, kind: 'bet', holder: 'world' });expect(await fenceTakes(engine, slug)).toEqual([TAKE_A, TAKE_B].sort());+ expect(await held(engine, slug)).toEqual([]);await op(ctx, 'add_tag', { slug, tag: 'example' });expect(await takes(engine, slug)).toEqual([{ row_num: 1, claim: TAKE_A, active: true }, { row_num: 2, claim: TAKE_B, active: true }]);expect(await fenceTakes(engine, slug)).toEqual([TAKE_A, TAKE_B].sort());