Skip to content

Autonomous development for real products. Governed agents build from specs you approve, follow the rules you set, and nothing merges until another agent proves it. Your decisions, judgement and taste are the bar that work must clear. Declare your vision and let agents build it.

fix(grants): validate fresh conflict against current trunk [V4,H16]

Corey Olsoncdcc7dfaeb32
diff --git a/src/computed-conflict-receipt.js b/src/computed-conflict-receipt.js
index 999c6727..bb250327 100644
--- a/src/computed-conflict-receipt.js
+++ b/src/computed-conflict-receipt.js
@@ -3,6 +3,7 @@ import { createHash } from 'node:crypto';
import { existsSync } from 'node:fs';
import { repoInfo } from './git.js';
import { recordedTrunkMerge } from './trunk-merge.js';
+import { trunkMerge } from './trunk-merge.js';
import { refuseRecordedHistoryOverrides } from './trunk-merge.js';
import { dirname } from 'node:path';
import { join } from 'node:path';
@@ -59,6 +60,16 @@ export function requireComputedConflict(board, receipt) {
return fields;
}
+/** Fresh authoring must use the current trunk; recorded acknowledgments return before this mutation path. */
+function requireCurrentConflict(board, fields) {
+ const root = board.db.prepare("SELECT agent_path FROM agent WHERE agent_id='coordinator'").get()?.agent_path;
+ if (!root) throw new Refused('COORDINATOR_ONLY', 'fresh automatic return needs the registered native trunk');
+ const current = trunkMerge(root, fields.head);
+ if (current.commit !== fields.trunk || JSON.stringify(current.files) !== JSON.stringify(fields.files)) {
+ throw new Refused('COORDINATOR_ONLY', 'fresh automatic return must use the current trunk; compute a new return before sending it');
+ }
+}
+
/** Bind recorded evidence to this board's current submitted item and actual actor, on every replica. */
function bindingProblem(board, item, actor, receipt) {
const fields = computedConflictFields(receipt);
@@ -80,7 +91,7 @@ export function preflightComputedConflict(board, id, actor, receipt) {
export function computedConflictProblem(board, item, actor, receipt) {
const problem = bindingProblem(board, item, actor, receipt);
if (problem) return problem;
- requireComputedConflict(board, receipt);
+ requireCurrentConflict(board, requireComputedConflict(board, receipt));
return null;
}
@@ -96,5 +107,7 @@ export function requirePreparedComputedConflict(board, id, actor, receipt) {
const item = board.db.prepare('SELECT * FROM item WHERE item_id=?').get(id);
const problem = item ? bindingProblem(board, item, actor, receipt) : new Refused('COORDINATOR_ONLY', 'automatic conflict evidence needs the current submitted item');
if (problem) throw problem;
- return requireComputedConflict(board, receipt);
+ const fields = requireComputedConflict(board, receipt);
+ requireCurrentConflict(board, fields);
+ return fields;
}
diff --git a/test/review-queue.test.js b/test/review-queue.test.js
index 28d84176..24479864 100644
--- a/test/review-queue.test.js
+++ b/test/review-queue.test.js
@@ -445,6 +445,13 @@ test('fresh conflict requests refuse an older trunk after main advances [V4,H16]
assert.throws(() => store.reopen(board, conflicted, { agentId: actor, computedConflict: stale }),
error => error.code === 'COORDINATOR_ONLY', 'the direct mutation independently enforces the current trunk');
assert.deepEqual(exportBoard(board), original, 'both fresh refusals leave the submission and event prefix unchanged');
+ const replica = store.openBoard(join(box.dir, 'fresh-stale-replica.sqlite'));
+ t.after(() => store.closeBoard(replica));
+ importBoard(replica, original);
+ const result = applyEngineMove(replica, { ...prepared, id: 'fresh-stale-request',
+ args: [conflicted, { agentId: actor, computedConflict: stale }] }, { sequence: 1, at: stale.at });
+ assert.equal(result.error?.code, 'COORDINATOR_ONLY', 'an unrecorded wire object is also a fresh request');
+ assert.equal(store.getItem(replica, conflicted).item_status, 'submitted');
});