@runtypelabs/persona 3.21.0 → 3.21.2

package/dist/theme-editor.cjs

@@ -4644,6 +4644,7 @@ var AgentWidgetClient = class {
       });
     };
     let assistantMessage = null;
+    let lastAssistantInTurn = null;
     const assistantMessageRef = { current: null };
     const partIdState = { current: null };
     let didSplitByPartId = false;
@@ -5640,6 +5641,7 @@ var AgentWidgetClient = class {
             }
           }
         } else if (payloadType === "agent_turn_start") {
+          lastAssistantInTurn = null;
         } else if (payloadType === "agent_turn_delta") {
           if (payload.contentType === "text") {
             const assistant = ensureAssistantMessage();
@@ -5650,6 +5652,7 @@ var AgentWidgetClient = class {
               turnId: payload.turnId,
               agentName: agentExecution == null ? void 0 : agentExecution.agentName
             };
+            lastAssistantInTurn = assistant;
             emitMessage(assistant);
           } else if (payload.contentType === "thinking") {
             const reasoningId = (_Ha = payload.turnId) != null ? _Ha : `agent-think-${payload.iteration}`;
@@ -5694,15 +5697,21 @@ var AgentWidgetClient = class {
             }
           }
           const turnStopReason = payload.stopReason;
-          if (turnStopReason && assistantMessage !== null) {
+          const stopReasonTarget = assistantMessage != null ? assistantMessage : lastAssistantInTurn;
+          if (turnStopReason && stopReasonTarget !== null) {
             const turnId = payload.turnId;
-            const matchesTurn = !turnId || ((_Pa = assistantMessage.agentMetadata) == null ? void 0 : _Pa.turnId) === turnId;
+            const matchesTurn = !turnId || ((_Pa = stopReasonTarget.agentMetadata) == null ? void 0 : _Pa.turnId) === turnId;
             if (matchesTurn) {
-              assistantMessage.stopReason = turnStopReason;
-              emitMessage(assistantMessage);
+              stopReasonTarget.stopReason = turnStopReason;
+              emitMessage(stopReasonTarget);
             }
           }
         } else if (payloadType === "agent_tool_start") {
+          if (assistantMessage) {
+            assistantMessage.streaming = false;
+            emitMessage(assistantMessage);
+            assistantMessage = null;
+          }
           const toolId = (_Qa = payload.toolCallId) != null ? _Qa : `agent-tool-${nextSequence()}`;
           trackToolId(getToolCallKey(payload), toolId);
           const toolMessage = ensureToolMessage(toolId);
@@ -7871,8 +7880,10 @@ var AgentWidgetSession = class _AgentWidgetSession {
    */
   async connectStream(stream, options) {
     var _a, _b, _c;
-    if (this.streaming) return;
-    (_a = this.abortController) == null ? void 0 : _a.abort();
+    if (this.streaming && !(options == null ? void 0 : options.allowReentry)) return;
+    if (!(options == null ? void 0 : options.allowReentry)) {
+      (_a = this.abortController) == null ? void 0 : _a.abort();
+    }
     let hasStale = false;
     for (const msg of this.messages) {
       if (msg.streaming) {
@@ -7906,7 +7917,7 @@ var AgentWidgetSession = class _AgentWidgetSession {
    * and pipes the response stream through connectStream().
    */
   async resolveApproval(approval, decision) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     const approvalMessageId = `approval-${approval.id}`;
     const updatedApproval = {
       ...approval,
@@ -7923,6 +7934,9 @@ var AgentWidgetSession = class _AgentWidgetSession {
       approval: updatedApproval
     };
     this.upsertMessage(updatedMessage);
+    (_a = this.abortController) == null ? void 0 : _a.abort();
+    this.abortController = new AbortController();
+    this.setStreaming(true);
     const approvalConfig = this.config.approval;
     const onDecision = approvalConfig && typeof approvalConfig === "object" ? approvalConfig.onDecision : void 0;
     try {
@@ -7953,7 +7967,7 @@ var AgentWidgetSession = class _AgentWidgetSession {
           if (!response.ok) {
             const errorData = await response.json().catch(() => null);
             throw new Error(
-              (_a = errorData == null ? void 0 : errorData.error) != null ? _a : `Approval request failed: ${response.status}`
+              (_b = errorData == null ? void 0 : errorData.error) != null ? _b : `Approval request failed: ${response.status}`
             );
           }
           stream = response.body;
@@ -7961,23 +7975,35 @@ var AgentWidgetSession = class _AgentWidgetSession {
           stream = response;
         }
         if (stream) {
-          await this.connectStream(stream);
-        } else if (decision === "denied") {
-          this.appendMessage({
-            id: `denial-${approval.id}`,
-            role: "assistant",
-            content: "Tool execution was denied by user.",
-            createdAt: (/* @__PURE__ */ new Date()).toISOString(),
-            streaming: false,
-            sequence: this.nextSequence()
-          });
+          await this.connectStream(stream, { allowReentry: true });
+        } else {
+          if (decision === "denied") {
+            this.appendMessage({
+              id: `denial-${approval.id}`,
+              role: "assistant",
+              content: "Tool execution was denied by user.",
+              createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+              streaming: false,
+              sequence: this.nextSequence()
+            });
+          }
+          this.setStreaming(false);
+          this.abortController = null;
         }
+      } else {
+        this.setStreaming(false);
+        this.abortController = null;
       }
     } catch (error) {
-      (_c = (_b = this.callbacks).onError) == null ? void 0 : _c.call(
-        _b,
-        error instanceof Error ? error : new Error(String(error))
-      );
+      const isAbortError = error instanceof Error && (error.name === "AbortError" || error.message.includes("aborted") || error.message.includes("abort"));
+      this.setStreaming(false);
+      this.abortController = null;
+      if (!isAbortError) {
+        (_d = (_c = this.callbacks).onError) == null ? void 0 : _d.call(
+          _c,
+          error instanceof Error ? error : new Error(String(error))
+        );
+      }
     }
   }
   /**
@@ -8031,7 +8057,7 @@ var AgentWidgetSession = class _AgentWidgetSession {
     });
   }
   async resolveAskUserQuestion(toolMessage, answer) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
     const live = this.messages.find((m) => m.id === toolMessage.id);
     if (((_a = live == null ? void 0 : live.agentMetadata) == null ? void 0 : _a.askUserQuestionAnswered) === true) return;
     const executionId = (_b = toolMessage.agentMetadata) == null ? void 0 : _b.executionId;
@@ -8055,8 +8081,11 @@ var AgentWidgetSession = class _AgentWidgetSession {
       }
     }
     this.markAskUserQuestionResolved(toolMessage, structuredAnswers);
+    (_h = this.abortController) == null ? void 0 : _h.abort();
+    this.abortController = new AbortController();
+    this.setStreaming(true);
     const toolCallId = toolMessage.toolCall.id;
-    const args = (_h = toolMessage.toolCall) == null ? void 0 : _h.args;
+    const args = (_i = toolMessage.toolCall) == null ? void 0 : _i.args;
     const questions = Array.isArray(args == null ? void 0 : args.questions) ? args.questions : [];
     if (questions.length === 0) {
       const fallback = typeof answer === "string" ? answer : Object.entries(answer).map(
@@ -8102,17 +8131,25 @@ var AgentWidgetSession = class _AgentWidgetSession {
       if (!response.ok) {
         const errorData = await response.json().catch(() => null);
         throw new Error(
-          (_i = errorData == null ? void 0 : errorData.error) != null ? _i : `Resume failed: ${response.status}`
+          (_j = errorData == null ? void 0 : errorData.error) != null ? _j : `Resume failed: ${response.status}`
         );
       }
       if (response.body) {
-        await this.connectStream(response.body);
+        await this.connectStream(response.body, { allowReentry: true });
+      } else {
+        this.setStreaming(false);
+        this.abortController = null;
       }
     } catch (error) {
-      (_k = (_j = this.callbacks).onError) == null ? void 0 : _k.call(
-        _j,
-        error instanceof Error ? error : new Error(String(error))
-      );
+      const isAbortError = error instanceof Error && (error.name === "AbortError" || error.message.includes("aborted") || error.message.includes("abort"));
+      this.setStreaming(false);
+      this.abortController = null;
+      if (!isAbortError) {
+        (_l = (_k = this.callbacks).onError) == null ? void 0 : _l.call(
+          _k,
+          error instanceof Error ? error : new Error(String(error))
+        );
+      }
     }
   }
   cancel() {

package/dist/theme-editor.js

@@ -4533,6 +4533,7 @@ var AgentWidgetClient = class {
       });
     };
     let assistantMessage = null;
+    let lastAssistantInTurn = null;
     const assistantMessageRef = { current: null };
     const partIdState = { current: null };
     let didSplitByPartId = false;
@@ -5529,6 +5530,7 @@ var AgentWidgetClient = class {
             }
           }
         } else if (payloadType === "agent_turn_start") {
+          lastAssistantInTurn = null;
         } else if (payloadType === "agent_turn_delta") {
           if (payload.contentType === "text") {
             const assistant = ensureAssistantMessage();
@@ -5539,6 +5541,7 @@ var AgentWidgetClient = class {
               turnId: payload.turnId,
               agentName: agentExecution == null ? void 0 : agentExecution.agentName
             };
+            lastAssistantInTurn = assistant;
             emitMessage(assistant);
           } else if (payload.contentType === "thinking") {
             const reasoningId = (_Ha = payload.turnId) != null ? _Ha : `agent-think-${payload.iteration}`;
@@ -5583,15 +5586,21 @@ var AgentWidgetClient = class {
             }
           }
           const turnStopReason = payload.stopReason;
-          if (turnStopReason && assistantMessage !== null) {
+          const stopReasonTarget = assistantMessage != null ? assistantMessage : lastAssistantInTurn;
+          if (turnStopReason && stopReasonTarget !== null) {
             const turnId = payload.turnId;
-            const matchesTurn = !turnId || ((_Pa = assistantMessage.agentMetadata) == null ? void 0 : _Pa.turnId) === turnId;
+            const matchesTurn = !turnId || ((_Pa = stopReasonTarget.agentMetadata) == null ? void 0 : _Pa.turnId) === turnId;
             if (matchesTurn) {
-              assistantMessage.stopReason = turnStopReason;
-              emitMessage(assistantMessage);
+              stopReasonTarget.stopReason = turnStopReason;
+              emitMessage(stopReasonTarget);
             }
           }
         } else if (payloadType === "agent_tool_start") {
+          if (assistantMessage) {
+            assistantMessage.streaming = false;
+            emitMessage(assistantMessage);
+            assistantMessage = null;
+          }
           const toolId = (_Qa = payload.toolCallId) != null ? _Qa : `agent-tool-${nextSequence()}`;
           trackToolId(getToolCallKey(payload), toolId);
           const toolMessage = ensureToolMessage(toolId);
@@ -7760,8 +7769,10 @@ var AgentWidgetSession = class _AgentWidgetSession {
    */
   async connectStream(stream, options) {
     var _a, _b, _c;
-    if (this.streaming) return;
-    (_a = this.abortController) == null ? void 0 : _a.abort();
+    if (this.streaming && !(options == null ? void 0 : options.allowReentry)) return;
+    if (!(options == null ? void 0 : options.allowReentry)) {
+      (_a = this.abortController) == null ? void 0 : _a.abort();
+    }
     let hasStale = false;
     for (const msg of this.messages) {
       if (msg.streaming) {
@@ -7795,7 +7806,7 @@ var AgentWidgetSession = class _AgentWidgetSession {
    * and pipes the response stream through connectStream().
    */
   async resolveApproval(approval, decision) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     const approvalMessageId = `approval-${approval.id}`;
     const updatedApproval = {
       ...approval,
@@ -7812,6 +7823,9 @@ var AgentWidgetSession = class _AgentWidgetSession {
       approval: updatedApproval
     };
     this.upsertMessage(updatedMessage);
+    (_a = this.abortController) == null ? void 0 : _a.abort();
+    this.abortController = new AbortController();
+    this.setStreaming(true);
     const approvalConfig = this.config.approval;
     const onDecision = approvalConfig && typeof approvalConfig === "object" ? approvalConfig.onDecision : void 0;
     try {
@@ -7842,7 +7856,7 @@ var AgentWidgetSession = class _AgentWidgetSession {
           if (!response.ok) {
             const errorData = await response.json().catch(() => null);
             throw new Error(
-              (_a = errorData == null ? void 0 : errorData.error) != null ? _a : `Approval request failed: ${response.status}`
+              (_b = errorData == null ? void 0 : errorData.error) != null ? _b : `Approval request failed: ${response.status}`
             );
           }
           stream = response.body;
@@ -7850,23 +7864,35 @@ var AgentWidgetSession = class _AgentWidgetSession {
           stream = response;
         }
         if (stream) {
-          await this.connectStream(stream);
-        } else if (decision === "denied") {
-          this.appendMessage({
-            id: `denial-${approval.id}`,
-            role: "assistant",
-            content: "Tool execution was denied by user.",
-            createdAt: (/* @__PURE__ */ new Date()).toISOString(),
-            streaming: false,
-            sequence: this.nextSequence()
-          });
+          await this.connectStream(stream, { allowReentry: true });
+        } else {
+          if (decision === "denied") {
+            this.appendMessage({
+              id: `denial-${approval.id}`,
+              role: "assistant",
+              content: "Tool execution was denied by user.",
+              createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+              streaming: false,
+              sequence: this.nextSequence()
+            });
+          }
+          this.setStreaming(false);
+          this.abortController = null;
         }
+      } else {
+        this.setStreaming(false);
+        this.abortController = null;
       }
     } catch (error) {
-      (_c = (_b = this.callbacks).onError) == null ? void 0 : _c.call(
-        _b,
-        error instanceof Error ? error : new Error(String(error))
-      );
+      const isAbortError = error instanceof Error && (error.name === "AbortError" || error.message.includes("aborted") || error.message.includes("abort"));
+      this.setStreaming(false);
+      this.abortController = null;
+      if (!isAbortError) {
+        (_d = (_c = this.callbacks).onError) == null ? void 0 : _d.call(
+          _c,
+          error instanceof Error ? error : new Error(String(error))
+        );
+      }
     }
   }
   /**
@@ -7920,7 +7946,7 @@ var AgentWidgetSession = class _AgentWidgetSession {
     });
   }
   async resolveAskUserQuestion(toolMessage, answer) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
     const live = this.messages.find((m) => m.id === toolMessage.id);
     if (((_a = live == null ? void 0 : live.agentMetadata) == null ? void 0 : _a.askUserQuestionAnswered) === true) return;
     const executionId = (_b = toolMessage.agentMetadata) == null ? void 0 : _b.executionId;
@@ -7944,8 +7970,11 @@ var AgentWidgetSession = class _AgentWidgetSession {
       }
     }
     this.markAskUserQuestionResolved(toolMessage, structuredAnswers);
+    (_h = this.abortController) == null ? void 0 : _h.abort();
+    this.abortController = new AbortController();
+    this.setStreaming(true);
     const toolCallId = toolMessage.toolCall.id;
-    const args = (_h = toolMessage.toolCall) == null ? void 0 : _h.args;
+    const args = (_i = toolMessage.toolCall) == null ? void 0 : _i.args;
     const questions = Array.isArray(args == null ? void 0 : args.questions) ? args.questions : [];
     if (questions.length === 0) {
       const fallback = typeof answer === "string" ? answer : Object.entries(answer).map(
@@ -7991,17 +8020,25 @@ var AgentWidgetSession = class _AgentWidgetSession {
       if (!response.ok) {
         const errorData = await response.json().catch(() => null);
         throw new Error(
-          (_i = errorData == null ? void 0 : errorData.error) != null ? _i : `Resume failed: ${response.status}`
+          (_j = errorData == null ? void 0 : errorData.error) != null ? _j : `Resume failed: ${response.status}`
         );
       }
       if (response.body) {
-        await this.connectStream(response.body);
+        await this.connectStream(response.body, { allowReentry: true });
+      } else {
+        this.setStreaming(false);
+        this.abortController = null;
       }
     } catch (error) {
-      (_k = (_j = this.callbacks).onError) == null ? void 0 : _k.call(
-        _j,
-        error instanceof Error ? error : new Error(String(error))
-      );
+      const isAbortError = error instanceof Error && (error.name === "AbortError" || error.message.includes("aborted") || error.message.includes("abort"));
+      this.setStreaming(false);
+      this.abortController = null;
+      if (!isAbortError) {
+        (_l = (_k = this.callbacks).onError) == null ? void 0 : _l.call(
+          _k,
+          error instanceof Error ? error : new Error(String(error))
+        );
+      }
     }
   }
   cancel() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@runtypelabs/persona",
-  "version": "3.21.0",
+  "version": "3.21.2",
   "description": "Themeable, pluggable streaming agent widget for websites, in plain JS with support for voice input and reasoning / tool output.",
   "type": "module",
   "main": "dist/index.cjs",

package/src/client.test.ts

@@ -2717,6 +2717,240 @@ describe('AgentWidgetClient - stopReason propagation', () => {
   });
 });
 
+// ============================================================================
+// Within-turn text/tool interleaving — assistant text bubbles must seal at
+// each agent_tool_start so the chronological text→tool→text→tool sequence
+// renders as distinct timeline entries instead of one merged bubble that
+// appears below all the tool cards.
+// ============================================================================
+
+describe('AgentWidgetClient - agent_turn text/tool interleaving', () => {
+  const collectMessages = (events: AgentWidgetEvent[]): AgentWidgetMessage[] => {
+    const byId = new Map<string, AgentWidgetMessage>();
+    const order: string[] = [];
+    for (const e of events) {
+      if (e.type !== 'message') continue;
+      if (!byId.has(e.message.id)) order.push(e.message.id);
+      byId.set(e.message.id, e.message);
+    }
+    return order.map((id) => byId.get(id)!);
+  };
+
+  it('seals the assistant text bubble at each agent_tool_start so subsequent text creates a new bubble', async () => {
+    const execId = 'exec_interleave';
+    global.fetch = createAgentStreamFetch([
+      sseEvent('agent_start', {
+        executionId: execId, agentId: 'virtual', agentName: 'Test',
+        maxTurns: 1, startedAt: new Date().toISOString(), seq: 1,
+      }),
+      sseEvent('agent_iteration_start', {
+        executionId: execId, iteration: 1, maxTurns: 1,
+        startedAt: new Date().toISOString(), seq: 2,
+      }),
+      sseEvent('agent_turn_start', {
+        executionId: execId, iteration: 1, turnIndex: 0,
+        role: 'assistant', turnId: 'turn_1', seq: 3,
+      }),
+      sseEvent('agent_turn_delta', {
+        executionId: execId, iteration: 1, delta: 'before tool 1',
+        contentType: 'text', turnId: 'turn_1', seq: 4,
+      }),
+      sseEvent('agent_tool_start', {
+        executionId: execId, iteration: 1,
+        toolCallId: 'call_1', toolName: 'search', toolType: 'builtin', seq: 5,
+      }),
+      sseEvent('agent_tool_complete', {
+        executionId: execId, iteration: 1,
+        toolCallId: 'call_1', toolName: 'search', success: true,
+        executionTime: 10, seq: 6,
+      }),
+      sseEvent('agent_turn_delta', {
+        executionId: execId, iteration: 1, delta: 'between tools',
+        contentType: 'text', turnId: 'turn_1', seq: 7,
+      }),
+      sseEvent('agent_tool_start', {
+        executionId: execId, iteration: 1,
+        toolCallId: 'call_2', toolName: 'fetch', toolType: 'builtin', seq: 8,
+      }),
+      sseEvent('agent_tool_complete', {
+        executionId: execId, iteration: 1,
+        toolCallId: 'call_2', toolName: 'fetch', success: true,
+        executionTime: 10, seq: 9,
+      }),
+      sseEvent('agent_turn_delta', {
+        executionId: execId, iteration: 1, delta: 'after tool 2',
+        contentType: 'text', turnId: 'turn_1', seq: 10,
+      }),
+      sseEvent('agent_turn_complete', {
+        executionId: execId, iteration: 1, role: 'assistant',
+        turnId: 'turn_1', completedAt: new Date().toISOString(),
+        stopReason: 'end_turn', seq: 11,
+      }),
+      sseEvent('agent_iteration_complete', {
+        executionId: execId, iteration: 1, toolCallsMade: 2,
+        stopConditionMet: true, completedAt: new Date().toISOString(), seq: 12,
+      }),
+      sseEvent('agent_complete', {
+        executionId: execId, agentId: 'virtual', success: true,
+        iterations: 1, stopReason: 'complete',
+        completedAt: new Date().toISOString(), seq: 13,
+      }),
+    ]);
+
+    const client = new AgentWidgetClient({
+      apiUrl: 'http://localhost:8000',
+      agent: { name: 'Test', model: 'openai:gpt-4o-mini', systemPrompt: 'test' },
+    });
+    const events: AgentWidgetEvent[] = [];
+    await client.dispatch(
+      { messages: [{ id: 'usr_1', role: 'user', content: 'Hi', createdAt: new Date().toISOString() }] },
+      (e) => events.push(e)
+    );
+
+    const messages = collectMessages(events);
+    const assistants = messages.filter((m) => m.role === 'assistant' && m.variant !== 'tool');
+    const tools = messages.filter((m) => m.variant === 'tool');
+
+    expect(assistants.map((m) => m.content)).toEqual([
+      'before tool 1',
+      'between tools',
+      'after tool 2',
+    ]);
+    expect(tools.map((m) => m.toolCall?.name)).toEqual(['search', 'fetch']);
+    expect(new Set(assistants.map((m) => m.id)).size).toBe(3);
+  });
+
+  it('attaches agent_turn_complete.stopReason to the final assistant text segment when the turn ends with text', async () => {
+    const execId = 'exec_stopreason_tail_text';
+    global.fetch = createAgentStreamFetch([
+      sseEvent('agent_start', {
+        executionId: execId, agentId: 'virtual', agentName: 'Test',
+        maxTurns: 1, startedAt: new Date().toISOString(), seq: 1,
+      }),
+      sseEvent('agent_iteration_start', {
+        executionId: execId, iteration: 1, maxTurns: 1,
+        startedAt: new Date().toISOString(), seq: 2,
+      }),
+      sseEvent('agent_turn_start', {
+        executionId: execId, iteration: 1, turnIndex: 0,
+        role: 'assistant', turnId: 'turn_1', seq: 3,
+      }),
+      sseEvent('agent_turn_delta', {
+        executionId: execId, iteration: 1, delta: 'first segment',
+        contentType: 'text', turnId: 'turn_1', seq: 4,
+      }),
+      sseEvent('agent_tool_start', {
+        executionId: execId, iteration: 1,
+        toolCallId: 'call_1', toolName: 'search', toolType: 'builtin', seq: 5,
+      }),
+      sseEvent('agent_tool_complete', {
+        executionId: execId, iteration: 1,
+        toolCallId: 'call_1', toolName: 'search', success: true,
+        executionTime: 10, seq: 6,
+      }),
+      sseEvent('agent_turn_delta', {
+        executionId: execId, iteration: 1, delta: 'final segment',
+        contentType: 'text', turnId: 'turn_1', seq: 7,
+      }),
+      sseEvent('agent_turn_complete', {
+        executionId: execId, iteration: 1, role: 'assistant',
+        turnId: 'turn_1', completedAt: new Date().toISOString(),
+        stopReason: 'length', seq: 8,
+      }),
+      sseEvent('agent_iteration_complete', {
+        executionId: execId, iteration: 1, toolCallsMade: 1,
+        stopConditionMet: true, completedAt: new Date().toISOString(), seq: 9,
+      }),
+      sseEvent('agent_complete', {
+        executionId: execId, agentId: 'virtual', success: true,
+        iterations: 1, stopReason: 'complete',
+        completedAt: new Date().toISOString(), seq: 10,
+      }),
+    ]);
+
+    const client = new AgentWidgetClient({
+      apiUrl: 'http://localhost:8000',
+      agent: { name: 'Test', model: 'openai:gpt-4o-mini', systemPrompt: 'test' },
+    });
+    const events: AgentWidgetEvent[] = [];
+    await client.dispatch(
+      { messages: [{ id: 'usr_1', role: 'user', content: 'Hi', createdAt: new Date().toISOString() }] },
+      (e) => events.push(e)
+    );
+
+    const assistants = collectMessages(events).filter(
+      (m) => m.role === 'assistant' && m.variant !== 'tool'
+    );
+    expect(assistants).toHaveLength(2);
+    expect(assistants[0].content).toBe('first segment');
+    expect(assistants[0].stopReason).toBeUndefined();
+    expect(assistants[1].content).toBe('final segment');
+    expect(assistants[1].stopReason).toBe('length');
+  });
+
+  it('attaches agent_turn_complete.stopReason to the preceding text segment when the turn ends with a tool call', async () => {
+    const execId = 'exec_stopreason_tail_tool';
+    global.fetch = createAgentStreamFetch([
+      sseEvent('agent_start', {
+        executionId: execId, agentId: 'virtual', agentName: 'Test',
+        maxTurns: 1, startedAt: new Date().toISOString(), seq: 1,
+      }),
+      sseEvent('agent_iteration_start', {
+        executionId: execId, iteration: 1, maxTurns: 1,
+        startedAt: new Date().toISOString(), seq: 2,
+      }),
+      sseEvent('agent_turn_start', {
+        executionId: execId, iteration: 1, turnIndex: 0,
+        role: 'assistant', turnId: 'turn_1', seq: 3,
+      }),
+      sseEvent('agent_turn_delta', {
+        executionId: execId, iteration: 1, delta: 'about to call tool',
+        contentType: 'text', turnId: 'turn_1', seq: 4,
+      }),
+      sseEvent('agent_tool_start', {
+        executionId: execId, iteration: 1,
+        toolCallId: 'call_1', toolName: 'search', toolType: 'builtin', seq: 5,
+      }),
+      sseEvent('agent_tool_complete', {
+        executionId: execId, iteration: 1,
+        toolCallId: 'call_1', toolName: 'search', success: true,
+        executionTime: 10, seq: 6,
+      }),
+      sseEvent('agent_turn_complete', {
+        executionId: execId, iteration: 1, role: 'assistant',
+        turnId: 'turn_1', completedAt: new Date().toISOString(),
+        stopReason: 'max_tool_calls', seq: 7,
+      }),
+      sseEvent('agent_iteration_complete', {
+        executionId: execId, iteration: 1, toolCallsMade: 1,
+        stopConditionMet: true, completedAt: new Date().toISOString(), seq: 8,
+      }),
+      sseEvent('agent_complete', {
+        executionId: execId, agentId: 'virtual', success: true,
+        iterations: 1, stopReason: 'max_tool_calls',
+        completedAt: new Date().toISOString(), seq: 9,
+      }),
+    ]);
+
+    const client = new AgentWidgetClient({
+      apiUrl: 'http://localhost:8000',
+      agent: { name: 'Test', model: 'openai:gpt-4o-mini', systemPrompt: 'test' },
+    });
+    const events: AgentWidgetEvent[] = [];
+    await client.dispatch(
+      { messages: [{ id: 'usr_1', role: 'user', content: 'Hi', createdAt: new Date().toISOString() }] },
+      (e) => events.push(e)
+    );
+
+    const assistants = collectMessages(events).filter(
+      (m) => m.role === 'assistant' && m.variant !== 'tool'
+    );
+    expect(assistants).toHaveLength(1);
+    expect(assistants[0].content).toBe('about to call tool');
+    expect(assistants[0].stopReason).toBe('max_tool_calls');
+  });
+});
+
 // ============================================================================
 // step_await (LOCAL tool pause) + resumeFlow
 // ============================================================================