@invergent/agent-chat-react 1.6.5 → 1.6.6

package/dist/index.cjs

@@ -8421,10 +8421,16 @@ function applyLlmResponse(state, event) {
   const responseContent = stringValue2(message?.content) || stringValue2(event.data.content);
   const toolCalls = Array.isArray(message?.tool_calls) ? message?.tool_calls : [];
   const hasToolCalls = toolCalls.length > 0;
+  const responseToolCallIds = toolCallIdsFromResponse(toolCalls);
   const idx = findLastAssistantIndex(messages);
   const prevAssistant = idx >= 0 ? messages[idx] : void 0;
   const prevHasTools = Boolean(prevAssistant?.toolCalls?.length);
   const hasUserAfter = idx >= 0 && hasUserAfterIndex(messages, idx);
+  const matchesExistingToolTurn = Boolean(
+    hasToolCalls && prevAssistant?.toolCalls?.length && responseToolCallIds.length > 0 && !hasUserAfter && responseToolCallIds.every(
+      (id) => prevAssistant.toolCalls?.some((tc) => tc.id === id)
+    )
+  );
   if (state.hadDeltas && idx >= 0 && !hasUserAfter) {
     const current = messages[idx];
     if (hasToolCalls) {
@@ -8437,6 +8443,13 @@ function applyLlmResponse(state, event) {
     } else {
       messages[idx] = { ...current, status: "complete" };
     }
+  } else if (matchesExistingToolTurn && idx >= 0) {
+    const current = messages[idx];
+    messages[idx] = {
+      ...current,
+      reasoning: responseContent ? appendText(current.reasoning, responseContent) : current.reasoning,
+      status: "streaming"
+    };
   } else if (prevHasTools || !prevAssistant || hasUserAfter) {
     messages.push({
       id: `evt-${event.eventId}`,
@@ -8480,6 +8493,15 @@ function applyLlmResponse(state, event) {
     }
   };
 }
+function toolCallIdsFromResponse(toolCalls) {
+  return toolCalls.map((toolCall) => stringValue2(objectValue(toolCall)?.id)).filter((id) => id.length > 0);
+}
+function appendText(existing, addition) {
+  if (!existing) return addition;
+  if (existing.includes(addition)) return existing;
+  return `${existing}
+${addition}`;
+}
 function applyLlmThinking(state, event) {
   const reasoningText = stringValue2(event.data.reasoning) || stringValue2(event.data.content);
   const messages = [...state.messages];
@@ -8773,9 +8795,13 @@ function useAgentChatRuntime({
   const streamRef = react.useRef(null);
   const reconnectTimerRef = react.useRef(null);
   const previousSessionIdRef = react.useRef(sessionId);
+  const sessionIdRef = react.useRef(sessionId);
   react.useEffect(() => {
     stateRef.current = state;
   }, [state]);
+  react.useEffect(() => {
+    sessionIdRef.current = sessionId;
+  }, [sessionId]);
   const clearReconnectTimer = react.useCallback(() => {
     if (reconnectTimerRef.current) {
       clearTimeout(reconnectTimerRef.current);
@@ -8787,21 +8813,10 @@ function useAgentChatRuntime({
     streamRef.current = null;
     stream?.close();
   }, []);
-  react.useEffect(() => {
-    const previousSessionId = previousSessionIdRef.current;
-    previousSessionIdRef.current = sessionId;
-    clearReconnectTimer();
-    closeStream();
-    if (!sessionId) {
-      setSession(null);
-      setState(createInitialAgentChatState());
-      return;
-    }
-    let cancelled = false;
-    const connect = (after) => {
-      if (cancelled) return;
+  const openStream = react.useCallback(
+    (targetSessionId, after) => {
       const stream = adapter.openEventStream({
-        sessionId,
+        sessionId: targetSessionId,
         after: after ?? stateRef.current.lastEventId
       });
       streamRef.current = stream;
@@ -8824,11 +8839,41 @@ function useAgentChatRuntime({
         if (streamRef.current === stream) {
           streamRef.current = null;
         }
-        if (!stateRef.current.sessionDone && !cancelled) {
-          reconnectTimerRef.current = setTimeout(() => connect(), 3e3);
+        if (!stateRef.current.sessionDone && sessionIdRef.current === targetSessionId) {
+          reconnectTimerRef.current = setTimeout(
+            () => openStream(targetSessionId),
+            3e3
+          );
         }
       };
-    };
+    },
+    [adapter]
+  );
+  const ensureStreamForNewTurn = react.useCallback(
+    (targetSessionId) => {
+      if (streamRef.current && !stateRef.current.sessionDone) return;
+      const after = stateRef.current.lastEventId;
+      clearReconnectTimer();
+      closeStream();
+      stateRef.current = {
+        ...stateRef.current,
+        sessionDone: false,
+        terminal: false
+      };
+      openStream(targetSessionId, after);
+    },
+    [clearReconnectTimer, closeStream, openStream]
+  );
+  react.useEffect(() => {
+    const previousSessionId = previousSessionIdRef.current;
+    previousSessionIdRef.current = sessionId;
+    clearReconnectTimer();
+    closeStream();
+    if (!sessionId) {
+      setSession(null);
+      setState(createInitialAgentChatState());
+      return;
+    }
     const currentState = stateRef.current;
     const preservePendingFirstMessage = previousSessionId === null && currentState.isRunning && currentState.messages.some(
       (message) => message.role === "user" && message.id.startsWith("local-")
@@ -8843,9 +8888,9 @@ function useAgentChatRuntime({
     stateRef.current = initialState;
     setSession(null);
     setState(initialState);
-    connect(0);
+    openStream(sessionId, 0);
     adapter.getSession({ sessionId }).then((loadedSession) => {
-      if (cancelled) return;
+      if (sessionIdRef.current !== sessionId) return;
       setSession(loadedSession);
       if (loadedSession.messageCount === 0) {
         setState((prev) => ({
@@ -8862,16 +8907,16 @@ function useAgentChatRuntime({
       }
     }).catch(() => void 0);
     return () => {
-      cancelled = true;
       clearReconnectTimer();
       closeStream();
     };
-  }, [adapter, clearReconnectTimer, closeStream, sessionId]);
+  }, [adapter, clearReconnectTimer, closeStream, openStream, sessionId]);
   const markSending = react.useCallback(
     (content, images) => {
       setState((prev) => ({
         ...prev,
         terminal: false,
+        sessionDone: false,
         isRunning: true,
         messages: [
           ...prev.messages,
@@ -8952,13 +8997,22 @@ function useAgentChatRuntime({
         return;
       }
       try {
+        ensureStreamForNewTurn(sessionId);
         await adapter.sendMessage({ sessionId, content, images });
       } catch (error) {
         markSendError(error instanceof Error ? error.message : "send failed");
         throw error;
       }
     },
-    [adapter, agentId, markSendError, markSending, onSessionChange, sessionId]
+    [
+      adapter,
+      agentId,
+      ensureStreamForNewTurn,
+      markSendError,
+      markSending,
+      onSessionChange,
+      sessionId
+    ]
   );
   const stop = react.useCallback(async () => {
     if (!sessionId) return;