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.

test: retain deferred landing priority after reaccept [B3,R3,R1,H16]

Corey Olson249555ea35fc
diff --git a/test/land-board-fixture.js b/test/land-board-fixture.js
index 162262df..845912ae 100644
--- a/test/land-board-fixture.js
+++ b/test/land-board-fixture.js
@@ -31,3 +31,12 @@ export function mergeSubjects(box, base, tip) {
return box.git(box.repo, 'log', '--reverse', '--first-parent', '--format=%s', `${base}..${tip}`).split('\n').filter(Boolean);
}
+
+/** Resolve when an owned fixture child closes or fails to spawn. */
+export function childOutcome(child) {
+ return new Promise((resolveOutcome) => {
+ let spawnError = null;
+ child.once('error', (error) => { spawnError = error; });
+ child.once('close', (code, signal) => resolveOutcome({ code, signal, error: spawnError }));
+ });
+}
diff --git a/test/land-collision-fixture.js b/test/land-collision-fixture.js
index 7a60323c..11721de9 100644
--- a/test/land-collision-fixture.js
+++ b/test/land-collision-fixture.js
@@ -55,3 +55,39 @@ export function assertCollisionFreeLanding({ landProject, itemWorktree, submitIt
assert.equal(box.git(box.remote, 'rev-parse', 'main'), box.git(box.repo, 'rev-parse', 'main'), 'the actual gated tip was pushed');
}
}
+
+/** A fresh re-accept must not let newly accepted disjoint work jump a deferred item. */
+export function assertDeferredLandingPriority({ landProject, itemWorktree, submitItem, acceptItem, json, onBoard }) {
+ const box = landProject();
+ const shared = 'web/land-1.test.js';
+ mkdirSync(join(box.repo, 'web'), { recursive: true });
+ writeFileSync(join(box.repo, shared), 'BASE first\nunchanged middle\nBASE last\n');
+ box.git(box.repo, 'add', shared);
+ box.git(box.repo, 'commit', '-q', '-m', 'test: deferred landing base [G1]');
+ const entries = [itemWorktree(box, 1, shared), itemWorktree(box, 2, shared), itemWorktree(box, 3)];
+ submitItem(box, entries[0], 'A first\nunchanged middle\nBASE last\n');
+ submitItem(box, entries[1], 'BASE first\nunchanged middle\nB last\n');
+ submitItem(box, entries[2]);
+ for (const entry of entries) acceptItem(box, entry);
+ onBoard(box, board => store.setLineSetting(board, { agentId: 'coordinator', key: 'collisionFreeBatch', value: true,
+ reason: 'private deferred item retains its queue place', window: { accepted: 3 } }));
+ const first = json(box, box.repo, 'land', '--max', '3');
+ assert.deepEqual(first.landed, [entries[0].item, entries[2].item]);
+ const arrival = itemWorktree(box, 4);
+ submitItem(box, arrival);
+ acceptItem(box, arrival);
+ box.git(box.repo, 'switch', '-q', '--detach', entries[1].commit);
+ box.git(box.repo, 'merge', '--no-edit', 'main');
+ const reviewed = { ...entries[1], commit: box.git(box.repo, 'rev-parse', 'HEAD') };
+ box.git(box.repo, 'switch', '-q', 'main');
+ acceptItem(box, reviewed);
+ const next = json(box, box.repo, 'land', '--max', '1');
+ assert.deepEqual(next.landed, [entries[1].item], 'merge-only reaccept retains the deferred item ahead of the newer acceptance');
+ const last = json(box, box.repo, 'land', '--max', '1');
+ assert.deepEqual(last.landed, [arrival.item]);
+ for (const entry of [...entries, arrival]) {
+ const item = json(box, box.repo, 'show', String(entry.item));
+ assert.equal(item.item_status, 'verified');
+ assert.ok(item.item_merged_commit);
+ }
+}
diff --git a/test/land.test.js b/test/land.test.js
index b9450f67..50f865d1 100644
--- a/test/land.test.js
+++ b/test/land.test.js
@@ -19,11 +19,15 @@ import {
calls,
json,
mergeSubjects,
+ childOutcome,
} from './land-board-fixture.js';
import { landingTimeoutFixture } from './landing-timeout-fixture.js';
import { assertParallelLanding, assertParallelCliLease, assertParallelNestedGate } from './land-parallel-fixture.js';
import { landEnginesInOrder } from './land-engine-fixture.js';
-import { assertCollisionFreeLanding } from './land-collision-fixture.js';
+import {
+ assertCollisionFreeLanding,
+ assertDeferredLandingPriority,
+} from './land-collision-fixture.js';
const e2e = createE2eHelpers();
after(e2e.cleanup);
const { sandbox, project, commitFile, waitFor, BIN } = e2e;
@@ -64,14 +68,6 @@ function startExclusiveBoardWriter(box, boardFile, name) {
});
return { child, closed: childOutcome(child), ready, release, released };
}
-/** Resolve when an owned fixture child closes or fails to spawn. */
-function childOutcome(child) {
- return new Promise((resolveOutcome) => {
- let spawnError = null;
- child.once('error', (error) => { spawnError = error; });
- child.once('close', (code, signal) => resolveOutcome({ code, signal, error: spawnError }));
- });
-}
/** Run the real pre-commit hook with a preload observing its agentAt SQLite read. */
function startHookRead(box, probe, marker) {
const env = { ...box.env, HOOK_READ_ATTEMPT: marker };
@@ -1496,3 +1492,6 @@ test('the landing merge assigns engine numbers in landing order, either order, a
test('a landing batch leaves out an item that touches a file already in the batch [B3,R3,R1,H16]',
() => assertCollisionFreeLanding({ landProject, itemWorktree, submitItem, acceptItem, json, onBoard }));
+
+test('a deferred landing item keeps its place ahead of newer acceptances after merge-only reaccept [B3,R3,R1,H16]',
+() => assertDeferredLandingPriority({ landProject, itemWorktree, submitItem, acceptItem, json, onBoard }));