Skip to content

fix: extend message_complete guard to cover thinking phase #23145

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
siddseethepalli merged 1 commit into from
Apr 2, 2026
Merged

fix: extend message_complete guard to cover thinking phase #23145

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
10 changes: 5 additions & 5 deletions clients/shared/Features/Chat/ChatActionHandler.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,11 +348,11 @@ final class ChatActionHandler {
guard belongsToConversation(complete.conversationId) else { return }
// Auxiliary message_complete events (watch notifiers, call notifications)
// that lack a messageId should not reset the main agent turn state.
// Only filter when a main agent turn is actively streaming
// (currentAssistantMessageId is set). This allows slash commands and other
// non-auxiliary completions (which don't set currentAssistantMessageId)
// to process normally.
if complete.messageId == nil && vm.currentAssistantMessageId != nil {
// Filter when a main agent turn is actively streaming (currentAssistantMessageId
// is set) OR still in the thinking phase (isThinking is true but
// currentAssistantMessageId hasn't been set yet by the first streaming flush).
// This allows slash commands and other non-auxiliary completions to process normally.
if complete.messageId == nil && (vm.currentAssistantMessageId != nil || vm.isThinking) {
return
}
// Flush any buffered streaming text before finalizing the message.
Expand Down