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
fix(train): bind conflict return to its composition [B3,R3,C7]
Corey Olson885969e28a14
diff --git a/src/land.js b/src/land.jsindex 5b3a25b8..3c1ff427 100644--- a/src/land.js+++ b/src/land.js@@ -268,6 +268,7 @@ async function mergeGroup(state, items) {if (stale) throw staleVerdictRefusal(item, stale);// The body is the item trailer alone: the subject carries the title, and no lane branch is named [B3,R3].// merge.log is switched off on this call, so a local Git config cannot append a shortlog to the body.+ const trunk = headCommit(batch.root);const result = tryGit(batch.root, ['-c', 'merge.log=false', 'merge', '--no-ff', '--no-log', checked, '-m', landingSubject(item), '-m', `Pullboard-Item: #${item.item_id}`]);if (result.status !== 0) {const files = tryGit(batch.root, ['diff', '--name-only', '--diff-filter=U']).stdout.split('\n').filter(Boolean);@@ -280,7 +281,7 @@ async function mergeGroup(state, items) {state.say(`mechanical merge #${item.item_id}: ${files.join(', ')}`);} else {git(batch.root, ['merge', '--abort']);- conflicts.push({ id: item.item_id, files, commit: item.item_commit, reviewedCommit: checked });+ conflicts.push({ id: item.item_id, files, trunk, commit: item.item_commit, reviewedCommit: checked });state.say(`conflict #${item.item_id}: ${files.join(', ')}`);continue;}@@ -919,7 +920,7 @@ async function returnMergeConflicts(state) {if (item.item_status !== 'verified' || item.item_merged_commit || item.item_commit !== conflict.commit|| store.checkedLandingCommit(state.board, item) !== conflict.reviewedCommit) continue;await state.write('reopen', [item.item_id, { agentId: 'coordinator',- note: `landing conflict: ${conflict.files.join(', ')}; merge current main and resubmit`, conflict: conflict.files }]);+ note: `landing conflict: ${conflict.files.join(', ')}; merge current main and resubmit`, conflict: { files: conflict.files, trunk: conflict.trunk } }]);}}diff --git a/test/train-mechanical-merge.test.js b/test/train-mechanical-merge.test.jsindex 3a39a267..d6e41c52 100644--- a/test/train-mechanical-merge.test.js+++ b/test/train-mechanical-merge.test.js@@ -104,7 +104,7 @@ test('mechanical resolution refuses changed context, duplicate disagreements andconst alpha = BASE.replace(' base:', ' alpha: { item: true },\n base:');const beta = BASE.replace(' base:', ' beta: { item: true },\n base:');assert.ok(mergeMechanicalSources(FILE, BASE, alpha, beta));- for (const changed of [beta.replace('item: true', 'item: false'), beta + '// changed context\n',+ for (const changed of [beta.replace('base: { item: true', 'base: { item: false'), beta + '// changed context\n',BASE.replace(' base:', ' alpha: { item: false },\n base:'),BASE.replace(' base:', ' beta: { item: true }; steal(); { item: true },\n base:')]) {assert.equal(mergeMechanicalSources(FILE, BASE, alpha, changed), null);