From 6aa08b2c94967372ee1d7d33d18ddc1915ef3a14 Mon Sep 17 00:00:00 2001 From: ParthSareen Date: Thu, 25 Jun 2026 17:04:25 -0700 Subject: [PATCH] cmd/tui/chat: guard chatRunDoneMsg send against context cancellation --- cmd/tui/chat/chat.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmd/tui/chat/chat.go b/cmd/tui/chat/chat.go index d443535ee..bd85c19dc 100644 --- a/cmd/tui/chat/chat.go +++ b/cmd/tui/chat/chat.go @@ -1091,7 +1091,10 @@ func (m *chatModel) startRunWithMessages(displayInput, historyInput string, newM go func() { defer close(events) result, err := session.Run(runCtx, opts) - events <- chatRunDoneMsg{result: result, err: err, newMessagesPersisted: newMessagesPersisted, persistedMessages: persistedMessages} + select { + case events <- chatRunDoneMsg{result: result, err: err, newMessagesPersisted: newMessagesPersisted, persistedMessages: persistedMessages}: + case <-runCtx.Done(): + } }() tickCmd := m.scheduleTick()