Skip to content

fix(cloud): stop false-positive agent-exited 410 on resumed terminals #5477

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
Pritom14 wants to merge 4 commits into
base: main
Choose a base branch
from
+40 −4
Open

fix(cloud): stop false-positive agent-exited 410 on resumed terminals #5477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
07d055c
fix(cloud): stop false-positive agent-exited 410 on resumed sessions
Pritom14 Sep 16, 2026
f7cb509
fix: harden terminal exit detection
mohakchakraborty2004 Sep 16, 2026
a4d4c3f
merge: bring main into fix/cloud-terminal-exit-false-positive
Sep 17, 2026
adab9bf
fix(test): tolerate absent installer scratch dir on cancel cleanup
Sep 17, 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
10 changes: 8 additions & 2 deletions backend/internal/adapters/systemexec/remote_script_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,15 @@ func TestRunInstallScriptCancellationCleansUp(t *testing.T) {
if err == nil {
t.Fatal("expected cancellation")
}
// Cancellation can land while the download is still in flight, before the
// scratch directory is ever created, so an absent directory is also a clean
// outcome: nothing leaked. Only surviving entries indicate a leftover script.
entries, readErr := os.ReadDir(filepath.Join(dataDir, "installers", "tmp"))
if readErr != nil || len(entries) != 0 {
t.Fatalf("temporary scripts remain after cancellation: %v, %v", entries, readErr)
if readErr != nil && !os.IsNotExist(readErr) {
t.Fatalf("read installer scratch dir: %v", readErr)
}
if len(entries) != 0 {
t.Fatalf("temporary scripts remain after cancellation: %v", entries)
}
}

Expand Down
34 changes: 32 additions & 2 deletions cloud/internal/postgres/worker_transport_store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,12 +355,27 @@ func (s *Store) IssueTerminalTicket(
var exited bool
err := s.withSessionAccess(ctx, principal, orgID, sessionID, func(tx pgx.Tx, _ sessionAccess) error {
return tx.QueryRow(ctx,
`SELECT session.is_terminated OR session.activity_state = 'exited' OR EXISTS (
`SELECT session.is_terminated OR session.activity_state = 'exited' OR (
EXISTS (
SELECT 1 FROM ao_terminal_sessions terminal
WHERE terminal.org_id = session.org_id
AND terminal.session_id = session.id
AND terminal.kind = 'agent'
AND terminal.state IN ('closed', 'failed')
)
AND NOT EXISTS (
SELECT 1 FROM ao_terminal_sessions terminal
JOIN ao_worker_connections worker
ON worker.org_id = terminal.org_id
AND worker.session_id = terminal.session_id
AND worker.epoch = terminal.worker_epoch
AND worker.disconnected_at IS NULL
WHERE terminal.org_id = session.org_id
AND terminal.session_id = session.id
AND terminal.kind = 'agent'
AND terminal.state IN ('opening', 'open')
AND terminal.expires_at > now()
)
)
FROM ao_sessions session
WHERE session.org_id = $1 AND session.id = $2`,
Expand Down Expand Up @@ -472,12 +487,27 @@ func (s *Store) IssueTerminalTicket(
if kind == "agent" {
var exited bool
lookupErr := tx.QueryRow(ctx,
`SELECT session.is_terminated OR session.activity_state = 'exited' OR EXISTS (
`SELECT session.is_terminated OR session.activity_state = 'exited' OR (
EXISTS (
SELECT 1 FROM ao_terminal_sessions terminal
WHERE terminal.org_id = session.org_id
AND terminal.session_id = session.id
AND terminal.kind = 'agent'
AND terminal.state IN ('closed', 'failed')
)
AND NOT EXISTS (
SELECT 1 FROM ao_terminal_sessions terminal
JOIN ao_worker_connections worker
ON worker.org_id = terminal.org_id
AND worker.session_id = terminal.session_id
AND worker.epoch = terminal.worker_epoch
AND worker.disconnected_at IS NULL
WHERE terminal.org_id = session.org_id
AND terminal.session_id = session.id
AND terminal.kind = 'agent'
AND terminal.state IN ('opening', 'open')
AND terminal.expires_at > now()
)
)
FROM ao_sessions session
WHERE session.org_id = $1 AND session.id = $2`,
Expand Down
Loading