Repository navigation
Branch-reconcile finishes a review branch whose run died before opening a PR - #14449
Merged
Merged
Conversation
…opening a PR A claim run configured for review-then-merge that was cut off after committing but before pushing left a local branch with real commits, no PR, and a `pr-completion-review-required` hold. The classifier's completion-policy rule turned that hold into WIP, so the branch never reached the coordinator, and the retirement pass found no merged PR to retire it against. The work sat stranded on every reconcile cycle. The review obligation gates the merge, not the work. When no PR was ever recorded for it, none is open, and the commits are not on the default branch, the hold now falls through to the ordinary rules: a clean branch becomes NEEDS_PR and the coordinator opens its PR through `/do:pr --no-merge` and the reviewer loop. A merged pointer, an open or recorded PR, a leave-open handoff and a live owner keep their holds unchanged, and the merge gate still enforces the review policy.
atomantic
added
bug
atomantic
enabled auto-merge (rebase)
October 31, 2026 15:24
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
A
claim-issuerun with review-then-merge completion (claim/issue-14241) was cut off after committing and before pushing. It left a clean local branch with 2 commits, no remote ref, and no PR. Every branch-reconcile cycle parked with "no coordinator task eligible" and never mentioned the branch:readBranchCompletionHoldreturnedpr-completion-review-required.completion-policyrule, which runs second, made the branch WIP, so it never reachedNEEDS_PR.The branch was shipped by hand in #14447.
Fix
The review obligation gates the merge, not the work.
readBranchCompletionHoldDetailnow also reportsunshipped: a review-then-merge obligation with no recorded PR, no open PR, and no leave-open handoff. When the commits are also not on the default branch, thecompletion-policyrule lets the branch fall through to the ordinary rules. A clean branch with commits becomesNEEDS_PR, and the coordinator opens its PR through/do:pr --no-mergeand the reviewer loop.These cases are unchanged:
completion-policyhold (the retirement proof is still required).cosMergeHandoff) still enforces the review policy once the PR exists.Tests
branchCompletionPolicy.test.js: throughgatherBranchStateandclassifyBranches, an unshipped review branch isNEEDS_PR, and it goes back under thecompletion-policyhold once a PR is recorded.branchReconcile.test.js: the rule matrix covers unshipped →NEEDS_PR, plus merged, open-PR, and live-owner staying held.npm run pregatepasses.