Summary
Merge-conflicting PRs are invisible to the current worker system. Workers handle CI failures and review feedback via the PR review-fix queue, but PRs with mergeable=CONFLICTING / mergeStateStatus=DIRTY sit rotting until a human notices them.
As of right now there are 6 conflicting PRs across misospace repos that nobody has acted on because no automated path surfaces them.
Current behavior
- Dispatch syncs issues and PRs from GitHub
- Workers consume from the PR review-fix queue (explicit review/CI feedback) and the assignment queue (new issue work)
- Merge conflicts are not ingested into the PR review-fix queue
Proposed behavior
Add a sync/ingestion step that detects open PRs with merge conflicts and creates pr-review-fix items for them. Priority ordering for the review-fix queue should be:
- Merge conflicts —
mergeable=CONFLICTING, needs rebase
- CI failures — checks/status failing
- Requested changes — explicit review feedback
- New work — normal assignment queue
This ensures conflicts surface first and workers rebased branches before retrying CI or applying review feedback on a dirty base.
Acceptance criteria
Context
Discovered during workspace cleanup audit on 2026-06-11. Six PRs were sitting with merge conflicts across miso-chat and windowstead with no automated path to surface them:
| Repo |
PR |
State |
| miso-chat |
#571 |
CONFLICTING/DIRTY |
| miso-chat |
#570 |
CONFLICTING/DIRTY |
| miso-chat |
#567 |
CONFLICTING/DIRTY |
| windowstead |
#198 |
CONFLICTING/DIRTY |
| windowstead |
#196 |
CONFLICTING/DIRTY |
| windowstead |
#194 |
CONFLICTING/DIRTY |
Also KubeTix #101 is BLOCKED (not conflicting, just blocked by policy/CI).
Summary
Merge-conflicting PRs are invisible to the current worker system. Workers handle CI failures and review feedback via the PR review-fix queue, but PRs with
mergeable=CONFLICTING/mergeStateStatus=DIRTYsit rotting until a human notices them.As of right now there are 6 conflicting PRs across misospace repos that nobody has acted on because no automated path surfaces them.
Current behavior
Proposed behavior
Add a sync/ingestion step that detects open PRs with merge conflicts and creates
pr-review-fixitems for them. Priority ordering for the review-fix queue should be:mergeable=CONFLICTING, needs rebaseThis ensures conflicts surface first and workers rebased branches before retrying CI or applying review feedback on a dirty base.
Acceptance criteria
mergeable=CONFLICTINGand createspr-review-fixitems withtype: "merge-conflict"(or similar)Context
Discovered during workspace cleanup audit on 2026-06-11. Six PRs were sitting with merge conflicts across miso-chat and windowstead with no automated path to surface them:
Also KubeTix #101 is BLOCKED (not conflicting, just blocked by policy/CI).