backport: upstream #2392 — keep terminated status with open PR#27
Merged
polymath-orchestrator merged 1 commit intoJul 6, 2026
Merged
Conversation
deriveStatus's terminated branch short-circuited to `merged` whenever any
owned PR was merged, even if the session still owned an open PR. That
contradicts the function's documented invariant ("Merged/closed PRs only
matter once no open PR remains") and is inconsistent with the
non-terminated branch, which gates on openPRs before falling back to
anyMerged.
The mismatch is a regression from the single-PR -> multi-PR change: the
old branch tested `pr != nil && pr.Merged`, which in the single-PR world
implied no open PR remained. Generalizing to `anyMerged(prs)` dropped that
implicit condition. A session killed while it still owns an open PR (for
example, only the bottom of a stack merged, or one of two independent PRs
merged) was reported as cleanly "merged", hiding the abandoned open PR.
Gate the merged short-circuit on there being no open PR, mirroring the
non-terminated branch. Existing behavior is preserved (a terminated
session whose only PR is merged still reports merged); only the
merged+open combination changes to terminated. Add a table case covering it.
polymath-orchestrator
deleted the
ao/agent-orchestrator-4/issue-12-backport-2392
branch
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
2 participants
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.
Summary
Backports upstream AgentWrapper#2392 as the canonical change.
This keeps a terminated session from being reported as
mergedwhile it still owns an open PR, preserving the documented invariant that merged/closed PRs only matter once no open PR remains.Closes #12.
Verification
cd backend && env -u AO_PROJECT_ID -u AO_SESSION_ID go build ./...cd backend && env -u AO_PROJECT_ID -u AO_SESSION_ID go vet ./...cd backend && env -u AO_PROJECT_ID -u AO_SESSION_ID go test ./...timeout 420s codex-fugu exec review --base origin/main --dangerously-bypass-approvals-and-sandboxNeed help on this PR? Tag
/codesmithwith what you need. Autofix is disabled.