Repository navigation
fix: keep candidate-owned conflicts off feature heads - #673
Merged
krasnoperov-coding-agent[bot] merged 2 commits intoSep 14, 2026
Merged
krasnoperov-coding-agent[bot] merged 2 commits into
krasnoperov-coding-agent[bot] merged 2 commits into
Conversation
![review-quill[bot]](https://avatars.githubusercontent.com/u/4581825?s=60&v=4){kind=small}
| return; | ||
| } | ||
| if (issue.delegatedToPatchRelay && reactiveIntent?.runType === "queue_repair" && mergeConflictDetected) { | ||
| const candidate = pr.headRefOid && project.github?.repoFullName |
There was a problem hiding this comment.
🚨 This adds candidate-ownership policy and another GitHub phase directly to a 1,048-line reconciler that already mixes routing, persistence, API calls, and operator events. The architecture guardrail requires extracting by responsibility before adding behavior here; move this gate into a focused collaborator and leave the reconciler to sequence its result.
review-quill
Bot
dismissed
their stale review
September 14, 2026 20:00
Superseded by newer head ebc27f8; review-quill will re-review the latest commit separately.
krasnoperov-coding-agent
Bot
added
queue:testing
krasnoperov-coding-agent
Bot
deleted the
feature/defer-dirty-pr-to-integration-candidate
branch
September 14, 2026 20:09
krasnoperov-coding-agent
Bot
removed
the
queue:merging
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
Idle reconciliation can observe an approved feature PR as
DIRTYwhile Merge Steward already owns its conflict through a published integration candidate. It then starts legacyqueue_repair, rewrites the frozen feature head, invalidates approval, and supersedes the candidate being validated.Fix
merge-steward/<base>/pr-<number>candidate before dispatching legacy branch repair.404.Verification
pnpm typecheckpnpm lintpnpm test(1069 passed)pnpm build