From 8af7f5ac273226dfaa51d08b6591458b8fe1bfa5 Mon Sep 17 00:00:00 2001
From: Fernando Celmer <email@fernandocelmer.com>
Date: Sat, 15 Aug 2026 13:30:39 -0300
Subject: [PATCH] =?UTF-8?q?=F0=9F=AA=B2=20BUG:=20Wire=20chat/turnEnd=20so?=
 =?UTF-8?q?=20text=20before/after=20a=20tool=20call=20don't=20merge=20into?=
 =?UTF-8?q?=20one=20bubble?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 media/app.js                    | 7 ++++++-
 media/composer.js               | 1 +
 media/dom.js                    | 1 +
 src/features/chat/chat.types.ts | 1 +
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/media/app.js b/media/app.js
index f35e410..9d01911 100644
--- a/media/app.js
+++ b/media/app.js
@@ -37,6 +37,10 @@ window.addEventListener("message", (event) => {
     case "textDelta":
       appendAssistantDelta(message.delta);
       break;
+    case "turnEnd":
+      turnEndSeen = true;
+      finishAssistantTurn();
+      break;
     case "toolCall":
       renderToolCall(message.name, message.arguments);
       break;
@@ -73,7 +77,8 @@ window.addEventListener("message", (event) => {
       addSystemNote("Retrying (" + message.attempt + "/3) — " + message.error, true);
       break;
     case "done":
-      finishAssistantTurn(message.text);
+      finishAssistantTurn(turnEndSeen ? undefined : message.text);
+      turnEndSeen = false;
       setBusy(false);
       break;
     case "error":
diff --git a/media/composer.js b/media/composer.js
index a416710..c3e15ea 100644
--- a/media/composer.js
+++ b/media/composer.js
@@ -66,6 +66,7 @@ function send() {
   pendingImages = [];
   renderAttachmentsPreview();
   assistantTurn = null;
+  turnEndSeen = false;
   setBusy(true);
   showThinkingIndicator();
   vscode.postMessage({ type: "sendPrompt", prompt, images });
diff --git a/media/dom.js b/media/dom.js
index 191ab05..b07ba02 100644
--- a/media/dom.js
+++ b/media/dom.js
@@ -53,6 +53,7 @@ const sessionGalleryNew = document.getElementById("session-gallery-new");
 
 let assistantTurn = null;
 let pendingAssistantText = "";
+let turnEndSeen = false;
 let isBusy = false;
 const pendingToolCards = new Map();
 let currentModel = "";
diff --git a/src/features/chat/chat.types.ts b/src/features/chat/chat.types.ts
index 2610316..1fe24e5 100644
--- a/src/features/chat/chat.types.ts
+++ b/src/features/chat/chat.types.ts
@@ -1,6 +1,7 @@
 export const FORWARDED_NOTIFICATIONS = [
   "ready",
   "chat/textDelta",
+  "chat/turnEnd",
   "chat/toolCall",
   "chat/toolResult",
   "chat/usage",