Skip to content

Fix freebuff grace-period hang where UI looks stuck streaming #518

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
jahooma merged 2 commits into from
Apr 20, 2026
+16 −8
Merged

Fix freebuff grace-period hang where UI looks stuck streaming #518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43d1559
Fix freebuff grace-period hang where UI looks stuck streaming
jahooma Apr 19, 2026
81c6c51
Merge remote-tracking branch 'origin/main' into jahooma/grace-period-fix
jahooma Apr 20, 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: 6 additions & 4 deletions cli/src/chat.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1473,15 +1473,17 @@ export const Chat = ({
)}

{reviewMode ? (
// Review takes precedence over the session-ended banner: during the
// grace window the agent may still be asking to run tools, and
// those approvals must be reachable for the run to finish.
// Review and ask_user take precedence over the session-ended banner:
// during the grace window the agent may still be asking to run tools
// or asking the user a question, and those approvals/answers must be
// reachable for the run to finish — otherwise the agent hangs
// waiting for input that can never be given.
<ReviewScreen
onSelectOption={handleReviewOptionSelect}
onCustom={handleReviewCustom}
onCancel={handleCloseReviewScreen}
/>
) : isFreebuffSessionOver ? (
) : isFreebuffSessionOver && !askUserState ? (
<SessionEndedBanner
isStreaming={isStreaming || isWaitingForResponse}
/>
Expand Down
14 changes: 10 additions & 4 deletions cli/src/hooks/helpers/send-message.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,10 +510,16 @@ function handleFreebuffGateError(
switch (kind) {
case 'session_expired':
case 'waiting_room_required':
// Our seat is gone mid-chat. Flip to `ended` instead of auto re-queuing:
// the Chat surface stays mounted so any in-flight agent work can finish
// under the server-side grace period, and the session-ended banner
// prompts the user to press Enter when they're ready to rejoin.
// Our seat is gone mid-chat. Finalize the AI message so its streaming
// indicator stops — otherwise `isComplete` stays false and the message
// keeps rendering a blinking cursor forever, making the user think the
// agent is still working even though the SessionEndedBanner is visible
// and actionable. Also disposes the batched-updater flush interval.
updater.markComplete()
// Flip to `ended` instead of auto re-queuing: the Chat surface stays
// mounted so any in-flight agent work can finish under the server-side
// grace period, and the session-ended banner prompts the user to press
// Enter when they're ready to rejoin.
markFreebuffSessionEnded()
return
case 'waiting_room_queued':
Expand Down
Loading