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.
JavaScript agentic-codingai-agentsai-governanceautonomous-agentsclaude-codeclicode-reviewcodexcoding-agentsdeveloper-toolsgit-hooksllmlocal-firstmulti-agentsoftware-factoryspec-driven-developmentverificationvibe-coding
test(land): extract sibling conflict fixture within file cap [B3,R3,E8]
Corey Olsone88e33a7d29e
diff --git a/test/land-collision-fixture.js b/test/land-collision-fixture.jsindex 11721de9..1f705d39 100644--- a/test/land-collision-fixture.js+++ b/test/land-collision-fixture.js@@ -91,3 +91,30 @@ export function assertDeferredLandingPriority({ landProject, itemWorktree, submiassert.ok(item.item_merged_commit);}}++/** Bind a fresh sibling collision to its exact pre-badge Git composition and reviewed commit. */+export function assertSiblingConflictLanding({ landProject, itemWorktree, submitItem, acceptItem, json, file }) {+ const box = landProject();+ const entries = [1, 2].map(number => itemWorktree(box, number, file));+ submitItem(box, entries[0], 'PASS\nfirst sibling\n');+ submitItem(box, entries[1], 'PASS\nsecond sibling\n');+ for (const entry of entries) acceptItem(box, entry);+ const dry = json(box, box.repo, 'land', '--dry-run');+ assert.deepEqual(dry.blocked, [], 'neither acceptance is stale against unchanged main');+ assert.deepEqual(dry.conflicts, [], 'each sibling merges with the current main considered individually');+ assert.deepEqual(dry.items, entries.map(entry => entry.item));+ const base = box.git(box.repo, 'rev-parse', 'main');+ const firstCommit = box.git(entries[0].path, 'rev-parse', 'HEAD');+ const reviewedCommit = box.git(entries[1].path, 'rev-parse', 'HEAD');+ const result = json(box, box.repo, 'land');+ assert.deepEqual(result.landed, [entries[0].item]);+ const trunk = result.conflicts[0]?.trunk;+ assert.match(trunk, /^[a-f0-9]{40}$/u, 'the collision records an exact Git composition');+ assert.deepEqual(box.git(box.repo, 'show', '-s', '--format=%P', trunk).split(' '), [base, firstCommit],+ 'the conflicting trunk contains the base and only the first reviewed sibling');+ const expectedTree = box.git(box.repo, 'merge-tree', '--write-tree', base, firstCommit).split('\n')[0];+ assert.equal(box.git(box.repo, 'rev-parse', `${trunk}^{tree}`), expectedTree,+ 'the recorded conflict-time tree is the independent Git composition before landing badges change');+ assert.deepEqual(result.conflicts, [{ id: entries[1].item, files: [file], trunk,+ commit: reviewedCommit, reviewedCommit }], 'the actual batch binds the sibling collision to its exact composition and reviewed commit');+}diff --git a/test/land.test.js b/test/land.test.jsindex b836bd52..9b6d9f24 100644--- a/test/land.test.js+++ b/test/land.test.js@@ -26,6 +26,7 @@ import { assertParallelLanding, assertParallelCliLease, assertParallelNestedGateimport { landEnginesInOrder } from './land-engine-fixture.js';import {assertCollisionFreeLanding,+ assertSiblingConflictLanding,assertDeferredLandingPriority,} from './land-collision-fixture.js';const e2e = createE2eHelpers();@@ -555,29 +556,7 @@ test('land bisects a real red, blocks stale proof and refuses an unverified stac});test('land names sibling conflicts whose reviews share the unchanged main [B3,R3,E8]', () => {- const box = landProject();- const entries = [1, 2].map(number => itemWorktree(box, number, FILES[0]));- submitItem(box, entries[0], 'PASS\nfirst sibling\n');- submitItem(box, entries[1], 'PASS\nsecond sibling\n');- for (const entry of entries) acceptItem(box, entry);- const dry = json(box, box.repo, 'land', '--dry-run');- assert.deepEqual(dry.blocked, [], 'neither acceptance is stale against unchanged main');- assert.deepEqual(dry.conflicts, [], 'each sibling merges with the current main considered individually');- assert.deepEqual(dry.items, entries.map(entry => entry.item));- const base = box.git(box.repo, 'rev-parse', 'main');- const firstCommit = box.git(entries[0].path, 'rev-parse', 'HEAD');- const reviewedCommit = box.git(entries[1].path, 'rev-parse', 'HEAD');- const result = json(box, box.repo, 'land');- assert.deepEqual(result.landed, [entries[0].item]);- const trunk = result.conflicts[0]?.trunk;- assert.match(trunk, /^[a-f0-9]{40}$/u, 'the collision records an exact Git composition');- assert.deepEqual(box.git(box.repo, 'show', '-s', '--format=%P', trunk).split(' '), [base, firstCommit],- 'the conflicting trunk contains the base and only the first reviewed sibling');- const expectedTree = box.git(box.repo, 'merge-tree', '--write-tree', base, firstCommit).split('\n')[0];- assert.equal(box.git(box.repo, 'rev-parse', `${trunk}^{tree}`), expectedTree,- 'the recorded conflict-time tree is the independent Git composition before landing badges change');- assert.deepEqual(result.conflicts, [{ id: entries[1].item, files: [FILES[0]], trunk,- commit: reviewedCommit, reviewedCommit }], 'the actual batch binds the sibling collision to its exact composition and reviewed commit');+ assertSiblingConflictLanding({ landProject, itemWorktree, submitItem, acceptItem, json, file: FILES[0] });});/** Keep the complete private diagnostic refusal in a failing assertion before fixture cleanup deletes its logs. */