@runtypelabs/persona 3.21.1 → 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);

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);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@runtypelabs/persona",
-  "version": "3.21.1",
+  "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
 // ============================================================================

package/src/client.ts

@@ -1125,6 +1125,11 @@ export class AgentWidgetClient {
     };
 
     let assistantMessage: AgentWidgetMessage | null = null;
+    // Tracks the most recently touched assistant text message for the
+    // current agent turn so `agent_turn_complete.stopReason` can attach
+    // to the final visible text segment even after `assistantMessage`
+    // has been finalized at a tool-call boundary within the turn.
+    let lastAssistantInTurn: AgentWidgetMessage | null = null;
     // Reference to track assistant message for custom event handler
     const assistantMessageRef = { current: null as AgentWidgetMessage | null };
     // Track current partId for message segmentation at tool boundaries
@@ -2464,7 +2469,11 @@ export class AgentWidgetClient {
             }
           }
         } else if (payloadType === "agent_turn_start") {
-          // Nothing to do - turn tracking is handled by deltas
+          // Reset the per-turn assistant tracker. lastAssistantInTurn is
+          // used by agent_turn_complete to attach stopReason to the final
+          // text segment of the turn even if that segment was sealed by an
+          // intervening tool-call boundary.
+          lastAssistantInTurn = null;
         } else if (payloadType === "agent_turn_delta") {
           if (payload.contentType === 'text') {
             // Stream text to assistant message
@@ -2476,6 +2485,7 @@ export class AgentWidgetClient {
               turnId: payload.turnId,
               agentName: agentExecution?.agentName
             };
+            lastAssistantInTurn = assistant;
             emitMessage(assistant);
           } else if (payload.contentType === 'thinking') {
             // Stream thinking content to a reasoning message
@@ -2526,19 +2536,33 @@ export class AgentWidgetClient {
           // Attach the turn-level stopReason to the assistant message
           // produced by this turn. Only overwrite the current message —
           // prior turns already sealed their own stopReason via step_complete.
+          // Falls back to lastAssistantInTurn when the current bubble was
+          // sealed at a tool-call boundary mid-turn, so the notice still
+          // attaches to the final visible text segment.
           const turnStopReason = (payload as any).stopReason as
             | StopReasonKind
             | undefined;
-          if (turnStopReason && assistantMessage !== null) {
+          const stopReasonTarget = assistantMessage ?? lastAssistantInTurn;
+          if (turnStopReason && stopReasonTarget !== null) {
             const turnId = payload.turnId;
             const matchesTurn =
-              !turnId || assistantMessage.agentMetadata?.turnId === turnId;
+              !turnId || stopReasonTarget.agentMetadata?.turnId === turnId;
             if (matchesTurn) {
-              assistantMessage.stopReason = turnStopReason;
-              emitMessage(assistantMessage);
+              stopReasonTarget.stopReason = turnStopReason;
+              emitMessage(stopReasonTarget);
             }
           }
         } else if (payloadType === "agent_tool_start") {
+          // Finalize any in-flight assistant text bubble so subsequent text
+          // deltas in this turn create a NEW bubble. Without this, text
+          // emitted before AND after a tool call accumulates into one
+          // message that renders below all the tool bubbles, losing the
+          // chronological text→tool→text→tool interleaving.
+          if (assistantMessage) {
+            assistantMessage.streaming = false;
+            emitMessage(assistantMessage);
+            assistantMessage = null;
+          }
           const toolId = payload.toolCallId ?? `agent-tool-${nextSequence()}`;
           trackToolId(getToolCallKey(payload), toolId);
           const toolMessage = ensureToolMessage(toolId);