Repository navigation
Foreign commits in a Merge run: merge them in, review them with a review Repair, then merge #94
Description
Parent
What to build
A Merge run merges the branch that resolves the issue, including commits someone else pushed to the Issue branch during the Run (Foreign commits), but only once an agent has reviewed them.
In a Merge run, each round of the Repair loop starts with a fetch:
- Merging them in: Foreign commits on
origin's Issue branch are merged into the local branch (fast-forward or merge, never rebase) and logged on stderr asmerging new commit <sha> from origin/<branch>. A conflict in that merge is handed to a conflict Repair. - Review Repair: a new kind of Repair. Its prompt runs
/thirdshift:code-reviewwith the head thirdshift last knew as the Run's own as the fixed point. The agent fixes the findings it agrees with, adds the rest to the PR body's "Unaddressed findings" section marked as coming from the Foreign commit, and pushes. - Budgets: the review Repair counts against the Repair budget, and picking up Foreign commits counts as a round, like a Base branch move.
Then the loop goes on as usual to the merge. Foreign commits are handled only in Merge runs; a normal Run is unchanged.
Acceptance criteria
- A Foreign commit pushed during CI is merged into the Run's branch, logged on stderr, handed to a review Repair whose prompt runs
/thirdshift:code-reviewfrom the right fixed point, and then merged with the rest. - A Foreign commit that conflicts with the Run's local work leads to a conflict Repair.
- Review Repairs are logged as
repair-<i>, numbered with the other Repairs, and get a Resume like any session. - Review Repairs and Foreign-commit rounds count against the Run's budgets, and the Run fails once they're spent.
- A normal Run's handling of someone else's push is unchanged.
- The Prompts and skills page is regenerated with the review Repair prompt, and its test passes.
- README documents Foreign commits in a Merge run.
Activity