Skip to content

fix: repair stale PRs on every supervision pass #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lemarier merged 2 commits into from
Sep 27, 2026
Merged

fix: repair stale PRs on every supervision pass #36

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
269b2e3
fix: repair stale PRs on every supervision pass
lemarier Sep 27, 2026
f05133e
fix: bound UNKNOWN repairs and repeated hand-overs
lemarier Sep 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 25 additions & 12 deletions skills/origin89-orca/references/unattended-run.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,9 +190,12 @@ precheck continues only when:
`gh api repos/owner/repo/issues`), so a dependency wait does not start a run
every tick;

or when one of the user's open, non-draft PRs conflicts with its base and no
agent in its worktree is `working`. That condition starts a run even when the
issue limit is reached; see [Repair conflicting PRs](#repair-conflicting-prs).
or when one of the user's open, non-draft PRs needs repair as
[Repair conflicting PRs](#repair-conflicting-prs) defines it. That condition
starts a run even when the issue limit is reached. GitHub computes mergeability
lazily, so `mergeable` is `UNKNOWN` right after the base moves; do not treat it
as clean. Read each such PR with `gh api repos/owner/repo/pulls/<number>` to
start the computation, then list again after a short wait.

Recheck those conditions, then pick one issue: first an issue that open issues
are blocked by, then milestone order, then the oldest. Skip issues blocked by an
Expand Down Expand Up @@ -269,11 +272,16 @@ sibling PR editing the same file merges first. Its author's
conflicts only while it runs, and the merge gate skips a conflicting PR for its
first 24 hours, so without this step the PR waits for a person.

Before claiming new issues, list the user's open, non-draft PRs whose
`mergeable` is `CONFLICTING`. Take each one whose worktree has no `working`
agent and whose branch no live Dispatch in any Run owns; never add a second
writer. If its worktree is dirty or its HEAD differs from the pushed head, do
not touch it: comment on the PR and report it.
The coordinator owns repair of its repositories' open, non-draft PRs whose
worker has settled. Check at the start of every supervision pass, not only
before pickup: a sibling can merge while workers are still running. A PR needs
repair when its `mergeable` is `CONFLICTING`, or still `UNKNOWN` after the
recheck above, it lacks `needs-human-review` and `human-only`, and no live
agent holds its worktree and no live Dispatch in any Run owns its branch; never
add a second writer. If its worktree is dirty or its HEAD differs from the
pushed head, do not touch it: hand it over. A hand-over adds
`needs-human-review`, which keeps later passes from repeating it, comments on
the PR, lists it in the report, and asks through Roger when set up.

Start one supervised repair worker in the PR's existing worktree with
`worker-start --worktree path:<worktree>`. Its spec applies the Wait for merge
Expand All @@ -282,8 +290,12 @@ or force-push; resolve only conflicts whose intent is clear on both sides; for
a generated file, take either side and regenerate it with the repository's
generator; run the repository's checks, push, and confirm the PR is `MERGEABLE`
with CI started; then follow the review follow-up to its cap and send one
`worker_done`. A resolution that would choose between behaviours is a blocker:
the worker comments it on the PR and the coordinator adds `needs-human-review`.
`worker_done`. For a PR that is still `UNKNOWN`, the worker first test-merges
the base locally; when that is clean, it pushes nothing and reports, and the
coordinator hands the PR over if a later pass still sees `UNKNOWN`, because an
unneeded update restarts reviews. A resolution that would choose between
behaviours is a blocker: the worker comments it on the PR and the coordinator
hands the PR over.

A repair does not use the issue limit and does not claim or relabel the PR's
issue. Run at most two repairs at once across the job's repositories, and start
Expand Down Expand Up @@ -374,8 +386,9 @@ Every run ends each PR in exactly one of four states:
an agent in the branch's worktree is `working`, or the PR conflicts with its
base and its head is less than 24 hours old. The author's
[review follow-up](../../origin89-commits/references/pr-review-follow-up.md)
owns that phase and resolves conflicts; after it ends, idle pickup's
[repair](#repair-conflicting-prs) does, until the PR merges. A PR still pending 24 hours after its head commit is
resolves conflicts only while it runs, and it is often bounded; once it has
ended, idle pickup's [repair](#repair-conflicting-prs) owns them until the PR
merges. A PR still pending 24 hours after its head commit is
stalled; hand it over.
- **Merge** when all rules hold.
- **Ask for fixes** when fix requests are granted, only rules 3–5 fail, and
Expand Down
Loading