@meetsmore-oss/use-ai-client 1.9.4 → 1.9.5

package/dist/index.js

@@ -276,6 +276,54 @@ function getTextFromContent(content) {
   return content.filter((part) => part.type === "text").map((part) => part.text).join("\n");
 }
 
+// src/utils/mergeAssistantMessages.ts
+function mergeAssistantMessagesForDisplay(messages) {
+  const result = [];
+  let pendingTexts = [];
+  let pendingIds = [];
+  for (const msg of messages) {
+    if (msg.role === "tool") {
+      continue;
+    }
+    if (msg.role === "assistant") {
+      const text = getTextFromContent(msg.content);
+      if (msg.toolCalls && msg.toolCalls.length > 0) {
+        pendingIds.push(msg.id);
+        if (text) {
+          pendingTexts.push(text);
+        }
+      } else {
+        const allTexts = text ? [...pendingTexts, text] : pendingTexts;
+        const combined = allTexts.join("\n\n");
+        result.push({ ...msg, content: combined || "" });
+        pendingTexts = [];
+        pendingIds = [];
+      }
+    } else {
+      if (pendingTexts.length > 0) {
+        result.push({
+          id: `merged-${pendingIds.join("-")}`,
+          role: "assistant",
+          content: pendingTexts.join("\n\n"),
+          createdAt: /* @__PURE__ */ new Date()
+        });
+        pendingTexts = [];
+        pendingIds = [];
+      }
+      result.push(msg);
+    }
+  }
+  if (pendingTexts.length > 0) {
+    result.push({
+      id: `merged-${pendingIds.join("-")}`,
+      role: "assistant",
+      content: pendingTexts.join("\n\n"),
+      createdAt: /* @__PURE__ */ new Date()
+    });
+  }
+  return result;
+}
+
 // src/components/MarkdownContent.tsx
 import ReactMarkdown from "react-markdown";
 import remarkGfm from "remark-gfm";
@@ -1949,11 +1997,7 @@ function UseAIChatPanel({
 }) {
   const strings = useStrings();
   const theme = useTheme();
-  const displayMessages = messages.filter((m) => {
-    if (m.role === "tool") return false;
-    if (m.role === "assistant" && m.toolCalls && m.toolCalls.length > 0 && !getTextFromContent(m.content)) return false;
-    return true;
-  });
+  const displayMessages = mergeAssistantMessagesForDisplay(messages);
   const [input, setInput] = useState5("");
   const chatHistoryDropdown = useDropdownState();
   const agentDropdown = useDropdownState();
@@ -3226,6 +3270,20 @@ var UseAIClient = class {
           toolCallId: e.toolCallId
         });
       }
+    } else if (event.type === EventType.STEP_FINISHED) {
+      if (this._currentAssistantToolCalls.length > 0 && this._currentAssistantMessage) {
+        const assistantMsg = {
+          id: this._currentAssistantMessage.id || uuidv42(),
+          role: "assistant",
+          content: this._currentAssistantMessage.content || "",
+          toolCalls: [...this._currentAssistantToolCalls]
+        };
+        this._messages.push(assistantMsg);
+        this._messages.push(...this._pendingToolResults);
+        this._currentAssistantMessage = { id: uuidv42(), role: "assistant", content: "" };
+        this._currentAssistantToolCalls = [];
+        this._pendingToolResults = [];
+      }
     } else if (event.type === EventType.RUN_FINISHED) {
       if (this._currentAssistantMessage) {
         if (this._currentAssistantToolCalls.length > 0) {
@@ -3885,13 +3943,8 @@ var LocalStorageChatRepository = class {
 
 // src/hooks/useChatManagement.ts
 import { useState as useState6, useCallback as useCallback4, useRef as useRef5, useEffect as useEffect5 } from "react";
-var CHAT_TITLE_MAX_LENGTH = 50;
-function deepEquals(a, b) {
-  return JSON.stringify(a) === JSON.stringify(b);
-}
-function generateChatTitle(message) {
-  return message.length > CHAT_TITLE_MAX_LENGTH ? message.substring(0, CHAT_TITLE_MAX_LENGTH) + "..." : message;
-}
+
+// src/utils/messageConversion.ts
 function transformMessagesToClientFormat(persistedMessages) {
   return persistedMessages.map((msg) => {
     const textContent = getTextFromContent(msg.content);
@@ -3919,6 +3972,39 @@ function transformMessagesToClientFormat(persistedMessages) {
     }
   });
 }
+function extractTurnMessages(messages, startIndex) {
+  const turnSlice = messages.slice(startIndex);
+  const result = [];
+  for (const msg of turnSlice) {
+    if (msg.role === "assistant" && "toolCalls" in msg && msg.toolCalls) {
+      result.push({
+        id: msg.id,
+        role: "assistant",
+        content: typeof msg.content === "string" ? msg.content : "",
+        createdAt: /* @__PURE__ */ new Date(),
+        toolCalls: msg.toolCalls
+      });
+    } else if (msg.role === "tool") {
+      result.push({
+        id: msg.id,
+        role: "tool",
+        content: typeof msg.content === "string" ? msg.content : JSON.stringify(msg.content),
+        createdAt: /* @__PURE__ */ new Date(),
+        toolCallId: "toolCallId" in msg && msg.toolCallId ? msg.toolCallId : void 0
+      });
+    }
+  }
+  return result;
+}
+
+// src/hooks/useChatManagement.ts
+var CHAT_TITLE_MAX_LENGTH = 50;
+function deepEquals(a, b) {
+  return JSON.stringify(a) === JSON.stringify(b);
+}
+function generateChatTitle(message) {
+  return message.length > CHAT_TITLE_MAX_LENGTH ? message.substring(0, CHAT_TITLE_MAX_LENGTH) + "..." : message;
+}
 function useChatManagement({
   repository,
   clientRef,
@@ -4809,30 +4895,6 @@ import { useState as useState12, useCallback as useCallback10, useRef as useRef1
 import { EventType as EventType2, ErrorCode, TOOL_APPROVAL_REQUEST } from "@meetsmore-oss/use-ai-core";
 
 // src/hooks/useServerEvents.ts
-function extractTurnMessages(messages, startIndex) {
-  const turnSlice = messages.slice(startIndex);
-  const result = [];
-  for (const msg of turnSlice) {
-    if (msg.role === "assistant" && "toolCalls" in msg && msg.toolCalls) {
-      result.push({
-        id: msg.id,
-        role: "assistant",
-        content: "",
-        createdAt: /* @__PURE__ */ new Date(),
-        toolCalls: msg.toolCalls
-      });
-    } else if (msg.role === "tool") {
-      result.push({
-        id: msg.id,
-        role: "tool",
-        content: typeof msg.content === "string" ? msg.content : JSON.stringify(msg.content),
-        createdAt: /* @__PURE__ */ new Date(),
-        toolCallId: "toolCallId" in msg && msg.toolCallId ? msg.toolCallId : void 0
-      });
-    }
-  }
-  return result;
-}
 function useServerEvents({
   toolSystem,
   saveAIResponse,
@@ -4842,6 +4904,7 @@ function useServerEvents({
   const [streamingText, setStreamingText] = useState12("");
   const streamingChatIdRef = useRef10(null);
   const messageCountAtRunStartRef = useRef10(0);
+  const hasTextFromPriorStepRef = useRef10(false);
   const [executingToolRaw, setExecutingTool] = useState12(null);
   const executingToolFallbackRef = useRef10(null);
   const clearStreamingText = useCallback10(() => {
@@ -4858,6 +4921,11 @@ function useServerEvents({
     const strs = stringsRef.current;
     if (event.type === EventType2.RUN_STARTED) {
       messageCountAtRunStartRef.current = client.messages.length;
+      hasTextFromPriorStepRef.current = false;
+    } else if (event.type === EventType2.TEXT_MESSAGE_START) {
+      if (hasTextFromPriorStepRef.current) {
+        setStreamingText((prev) => prev + "\n\n");
+      }
     } else if (event.type === EventType2.TOOL_CALL_START) {
       const e = event;
       const tool = ts.aggregatedToolsRef.current[e.toolCallName];
@@ -4894,10 +4962,9 @@ function useServerEvents({
       ts.handleApprovalRequest(e);
     } else if (event.type === EventType2.TEXT_MESSAGE_CONTENT) {
       const contentEvent = event;
+      hasTextFromPriorStepRef.current = true;
       setStreamingText((prev) => prev + contentEvent.delta);
     } else if (event.type === EventType2.TEXT_MESSAGE_END) {
-      setStreamingText("");
-      streamingChatIdRef.current = null;
     } else if (event.type === EventType2.RUN_FINISHED) {
       const content = client.currentMessageContent;
       if (content) {
@@ -4906,6 +4973,9 @@ function useServerEvents({
         const turnMessages = extractTurnMessages(client.messages, messageCountAtRunStartRef.current);
         saveAIResponseRef.current(content, void 0, traceId, turnMessages);
       }
+      setStreamingText("");
+      streamingChatIdRef.current = null;
+      setExecutingTool(null);
       setLoading(false);
     } else if (event.type === EventType2.RUN_ERROR) {
       const errorEvent = event;
@@ -4915,6 +4985,7 @@ function useServerEvents({
       saveAIResponseRef.current(userMessage, "error");
       setStreamingText("");
       streamingChatIdRef.current = null;
+      setExecutingTool(null);
       setLoading(false);
     }
   }, []);