Skip to content

fix(session): keep terminated status when an open PR remains #2392

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

Open
abhay-codes07 wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −1
Open

fix(session): keep terminated status when an open PR remains #2392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 5 additions & 1 deletion backend/internal/service/session/status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,11 @@ const noSignalGrace = 90 * time.Second
// until the parent does. Merged/closed PRs only matter once no open PR remains.
func deriveStatus(rec domain.SessionRecord, prs []domain.PRFacts, now time.Time, signalCapable bool) domain.SessionStatus {
if rec.IsTerminated {
if anyMerged(prs) {
// Merged only wins once no open PR remains: a session killed while it
// still owns an open PR (e.g. only the bottom of a stack merged) did not
// complete, and reporting it as merged would hide the abandoned open PR.
// The non-terminated branch below enforces the same ordering.
if len(openPRs(prs)) == 0 && anyMerged(prs) {
return domain.StatusMerged
}
return domain.StatusTerminated
Expand Down
11 changes: 11 additions & 0 deletions backend/internal/service/session/status_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,17 @@ func TestServiceDerivesStatusFromSessionFactsAndPR(t *testing.T) {
}{
{"terminated", statusRec(domain.ActivityExited, true), nil, false, domain.StatusTerminated},
{"merged-pr", statusRec(domain.ActivityIdle, true), statusPR(domain.PRFacts{Merged: true}), false, domain.StatusMerged},
// A terminated session that still owns an open PR did not complete: the
// merged short-circuit must not fire while an open PR remains, matching
// the invariant that merged only wins once no open PR is left (the
// non-terminated branch already enforces this).
{
"terminated-with-open-pr-stays-terminated",
statusRec(domain.ActivityIdle, true),
[]domain.PRFacts{{URL: "merged", Merged: true}, {URL: "open", SourceBranch: "ao/x", TargetBranch: "main"}},
false,
domain.StatusTerminated,
},
{"needs-input", statusRec(domain.ActivityWaitingInput, false), statusPR(domain.PRFacts{CI: domain.CIFailing}), false, domain.StatusNeedsInput},
{"ci-failed", statusRec(domain.ActivityIdle, false), statusPR(domain.PRFacts{CI: domain.CIFailing}), false, domain.StatusCIFailed},
{"draft", statusRec(domain.ActivityIdle, false), statusPR(domain.PRFacts{Draft: true}), false, domain.StatusDraft},
Expand Down
Loading