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.

chore(core): compose trunk for mechanical recovery [B3]

Corey Olson608f42152b51
diff --cc src/land.js
index 9b7b65cd,e500a1e0..e9b796b6
--- a/src/land.js
+++ b/src/land.js
@@@ -276,15 -273,12 +274,16 @@@ async function mergeGroup(state, items
if (result.status !== 0) {
const files = tryGit(batch.root, ['diff', '--name-only', '--diff-filter=U']).stdout.split('\n').filter(Boolean);
if (!files.length) throw new Refused('LAND_MERGE', `merge of #${item.item_id} failed outside a conflict: ${result.stderr || result.stdout}; inspect ${batch.root} and its hooks before adopting`);
- const resolved = resolveMechanicalMerge(batch.root, files);
- if (resolved) {
+ const resolution = resolveMechanicalIndex(batch.root, files);
+ if (resolution.failed) {
+ git(batch.root, ['merge', '--abort']);
+ throw new Refused('LAND_MERGE', `item #${item.item_id}: generator ${resolution.failed.generator} failed for ${resolution.failed.path} (exit ${resolution.failed.status ?? 'unavailable'}); repair the generator before adopting this landing`);
+ }
+ if (!resolution.files.length) {
git(batch.root, ['add', '--', ...files]);
- git(batch.root, ['commit', '--no-edit']);
+ // The message is written again, so Git's conflict notes can never follow the trailers.
+ git(batch.root, ['commit', '-m', message.header, '-m', message.trailers]);
- resolutions.push({ id: item.item_id, files, entries: resolved });
+ resolutions.push({ id: item.item_id, files, entries: resolution.entries });
state.say(`mechanical merge #${item.item_id}: ${files.join(', ')}`);
} else {
git(batch.root, ['merge', '--abort']);