Skip to content

fix: guard against auxiliary message_complete clearing turn state #23049

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: guard against auxiliary message_complete clearing turn state #23049

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 clients/shared/Features/Chat/ChatActionHandler.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,15 @@ final class ChatActionHandler {

private func handleMessageComplete(_ complete: MessageCompleteMessage, vm: ChatViewModel) {
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.
// Without this guard, a watch commentary/summary message_complete arriving
// mid-stream clears currentAssistantMessageId, causing the main agent
// loop's subsequent message_complete to set daemonMessageId on the wrong
// (newly created) message — breaking the LLM Context Inspector until restart.
if complete.messageId == nil && vm.isSending {
return
Comment thread
siddseethepalli marked this conversation as resolved.
}
Comment thread
siddseethepalli marked this conversation as resolved.
Comment thread
siddseethepalli marked this conversation as resolved.
// Flush any buffered streaming text before finalizing the message.
vm.flushStreamingBuffer()
vm.flushPartialOutputBuffer()
Expand Down