@mastra/playground-ui 5.0.3-alpha.0 → 5.0.3

package/dist/index.cjs.js

@@ -4067,13 +4067,16 @@ function MastraRuntimeProvider({
           if (message?.toolInvocations?.length > 0) {
             return {
               ...message,
-              content: message.toolInvocations.map((toolInvocation) => ({
-                type: "tool-call",
-                toolCallId: toolInvocation?.toolCallId,
-                toolName: toolInvocation?.toolName,
-                args: toolInvocation?.args,
-                result: toolInvocation?.result
-              }))
+              content: [
+                ...typeof message.content === "string" ? [{ type: "text", text: message.content }] : [],
+                ...message.toolInvocations.map((toolInvocation) => ({
+                  type: "tool-call",
+                  toolCallId: toolInvocation?.toolCallId,
+                  toolName: toolInvocation?.toolName,
+                  args: toolInvocation?.args,
+                  result: toolInvocation?.result
+                }))
+              ]
             };
           }
           return message;
@@ -4188,6 +4191,13 @@ function MastraRuntimeProvider({
             };
             if (!assistantMessageAdded) {
               assistantMessageAdded = true;
+              if (assistantToolCallAddedForUpdater) {
+                assistantToolCallAddedForUpdater = false;
+              }
+              return [...currentConversation, message2];
+            }
+            if (assistantToolCallAddedForUpdater) {
+              assistantToolCallAddedForUpdater = false;
               return [...currentConversation, message2];
             }
             return [...currentConversation.slice(0, -1), message2];
@@ -4215,22 +4225,18 @@ function MastraRuntimeProvider({
         if (!response.body) {
           throw new Error("No response body");
         }
-        const parts = [];
         let content = "";
-        let currentTextPart = null;
         let assistantMessageAdded = false;
+        let assistantToolCallAddedForUpdater = false;
+        let assistantToolCallAddedForContent = false;
         await response.processDataStream({
           onTextPart(value) {
-            if (currentTextPart == null) {
-              currentTextPart = {
-                type: "text",
-                text: value
-              };
-              parts.push(currentTextPart);
+            if (assistantToolCallAddedForContent) {
+              assistantToolCallAddedForContent = false;
+              content = value;
             } else {
-              currentTextPart.text += value;
+              content += value;
             }
-            content += value;
             updater();
           },
           async onToolCallPart(value) {
@@ -4257,6 +4263,8 @@ function MastraRuntimeProvider({
                     }
                   ]
                 };
+                assistantToolCallAddedForUpdater = true;
+                assistantToolCallAddedForContent = true;
                 return [...currentConversation.slice(0, -1), updatedMessage];
               }
               const newMessage = {
@@ -4271,6 +4279,8 @@ function MastraRuntimeProvider({
                   }
                 ]
               };
+              assistantToolCallAddedForUpdater = true;
+              assistantToolCallAddedForContent = true;
               return [...currentConversation, newMessage];
             });
           },