Skip to content

fix(desktop): prevent composer busy stuck on session resume #41907

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

Closed
jarv1s-csn wants to merge 1 commit into from
Closed

fix(desktop): prevent composer busy stuck on session resume #41907

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
9 changes: 9 additions & 0 deletions apps/desktop/src/app/session/hooks/use-session-actions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,6 +495,14 @@ export function useSessionActions({
activeSessionIdRef.current = null
busyRef.current = true
setBusy(true)
// Safety kill switch: reset busy after 30s if resume stalls or navigated away.
// Without this, a gateway session.resume that hangs, or an isCurrentResume()
// guard that blocks the finally-reset, leaves the composer send button stuck
// in "running" state permanently.
const resumeBusyTimer = setTimeout(() => {
busyRef.current = false
setBusy(false)
}, 30_000)
setAwaitingResponse(false)
clearNotifications()
setSelectedStoredSessionId(storedSessionId)
Expand Down Expand Up @@ -607,6 +615,7 @@ export function useSessionActions({
setMessages(preserveLocalAssistantErrors(toChatMessages(fallback.messages), $messages.get()))
notifyError(err, copy.resumeFailed)
} finally {
clearTimeout(resumeBusyTimer)
if (isCurrentResume()) {
busyRef.current = false
setBusy(false)
Expand Down