From a648afaff0128fcf729b1ce739d3707fb6ea4e2c Mon Sep 17 00:00:00 2001
From: rcourtman <courtmanr@gmail.com>
Date: Fri, 5 Jun 2026 19:29:07 +0100
Subject: [PATCH] Avoid duplicate Assistant stream errors

---
 internal/api/ai_handler.go      |  9 +++++++--
 internal/api/ai_handler_test.go | 26 ++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/internal/api/ai_handler.go b/internal/api/ai_handler.go
index 898da36c8..b744d9c4d 100644
--- a/internal/api/ai_handler.go
+++ b/internal/api/ai_handler.go
@@ -2545,6 +2545,7 @@ func (h *AIHandler) HandleChat(w http.ResponseWriter, r *http.Request) {
 
 	// Stream from AI chat service
 	serviceSentDone := false
+	serviceSentError := false
 	err := svc.ExecuteStream(ctx, chat.ExecuteRequest{
 		Prompt:           req.Prompt,
 		SessionID:        req.SessionID,
@@ -2559,14 +2560,18 @@ func (h *AIHandler) HandleChat(w http.ResponseWriter, r *http.Request) {
 	}, func(event chat.StreamEvent) {
 		if event.Type == "done" {
 			serviceSentDone = true
+		} else if event.Type == "error" {
+			serviceSentError = true
 		}
 		writeEvent(event)
 	})
 
 	if err != nil {
 		log.Error().Err(err).Msg("Chat stream error")
-		errData, _ := json.Marshal(chat.ErrorData{Message: "An error occurred while processing your request"})
-		writeEvent(chat.StreamEvent{Type: "error", Data: errData})
+		if !serviceSentError {
+			errData, _ := json.Marshal(chat.ErrorData{Message: "An error occurred while processing your request"})
+			writeEvent(chat.StreamEvent{Type: "error", Data: errData})
+		}
 	}
 
 	// Send done
diff --git a/internal/api/ai_handler_test.go b/internal/api/ai_handler_test.go
index d0de657cd..ab7540f27 100644
--- a/internal/api/ai_handler_test.go
+++ b/internal/api/ai_handler_test.go
@@ -1883,6 +1883,32 @@ func TestHandleChat_Error(t *testing.T) {
 	// ExecuteStream error happens after headers are sent, so w.Code might be 200
 	// but the error is returned.
 	assert.Equal(t, http.StatusOK, w.Code)
+	assert.Contains(t, w.Body.String(), "An error occurred while processing your request")
+	assert.Equal(t, 1, strings.Count(w.Body.String(), `"type":"error"`))
+}
+
+func TestHandleChat_DoesNotDuplicateServiceError(t *testing.T) {
+	cfg := &config.Config{}
+	h := newTestAIHandler(cfg, nil, nil)
+	mockSvc := new(MockAIService)
+	h.defaultService = mockSvc
+	mockSvc.On("IsRunning").Return(true)
+	mockSvc.On("ExecuteStream", mock.Anything, mock.Anything, mock.Anything).Return(assert.AnError).Run(func(args mock.Arguments) {
+		callback := args.Get(2).(chat.StreamCallback)
+		errData, _ := json.Marshal(chat.ErrorData{Message: "The AI provider rejected the credentials. Check your AI provider API key in Settings."})
+		callback(chat.StreamEvent{Type: "error", Data: errData})
+	})
+
+	body := `{"prompt": "hi"}`
+	req := httptest.NewRequest("POST", "/api/ai/chat", strings.NewReader(body))
+	w := httptest.NewRecorder()
+	h.HandleChat(w, req)
+
+	assert.Equal(t, http.StatusOK, w.Code)
+	response := w.Body.String()
+	assert.Contains(t, response, "The AI provider rejected the credentials")
+	assert.NotContains(t, response, "An error occurred while processing your request")
+	assert.Equal(t, 1, strings.Count(response, `"type":"error"`))
 }
 
 func TestHandleChat_BindsExecutionToRequestContext(t *testing.T) {