@mastra/react 0.1.0-beta.11 → 0.1.0-beta.14

package/dist/index.js

@@ -152,7 +152,7 @@ const toUIMessage = ({ chunk, conversation, metadata }) => {
     }
     case "start": {
       const newMessage = {
-        id: `start-${chunk.runId + Date.now()}`,
+        id: typeof chunk.payload.messageId === "string" ? chunk.payload.messageId : `start-${chunk.runId + Date.now()}`,
         role: "assistant",
         parts: [],
         metadata
@@ -457,7 +457,7 @@ const toUIMessage = ({ chunk, conversation, metadata }) => {
             mode: "stream",
             requireApprovalMetadata: {
               ...lastRequireApprovalMetadata,
-              [chunk.payload.toolCallId]: {
+              [chunk.payload.toolName]: {
                 toolCallId: chunk.payload.toolCallId,
                 toolName: chunk.payload.toolName,
                 args: chunk.payload.args
@@ -467,6 +467,30 @@ const toUIMessage = ({ chunk, conversation, metadata }) => {
         }
       ];
     }
+    case "tool-call-suspended": {
+      const lastMessage = result[result.length - 1];
+      if (!lastMessage || lastMessage.role !== "assistant") return result;
+      const lastSuspendedTools = lastMessage.metadata?.mode === "stream" ? lastMessage.metadata?.suspendedTools : {};
+      return [
+        ...result.slice(0, -1),
+        {
+          ...lastMessage,
+          metadata: {
+            ...lastMessage.metadata,
+            mode: "stream",
+            suspendedTools: {
+              ...lastSuspendedTools,
+              [chunk.payload.toolName]: {
+                toolCallId: chunk.payload.toolCallId,
+                toolName: chunk.payload.toolName,
+                args: chunk.payload.args,
+                suspendPayload: chunk.payload.suspendPayload
+              }
+            }
+          }
+        }
+      ];
+    }
     case "finish": {
       const lastMessage = result[result.length - 1];
       if (!lastMessage || lastMessage.role !== "assistant") return result;
@@ -682,13 +706,14 @@ const toAssistantUIMessage = (message) => {
       return baseToolCall;
     }
     if (part.type.startsWith("tool-") && part.state !== "input-available") {
-      const toolName = "toolName" in part && typeof part.toolName === "string" ? part.toolName : part.type.substring(5);
+      const toolName2 = "toolName" in part && typeof part.toolName === "string" ? part.toolName : part.type.substring(5);
+      const { suspendedToolRunId, ...cleanInput } = "input" in part ? part.input : {};
       const baseToolCall = {
         type: "tool-call",
         toolCallId: "toolCallId" in part && typeof part.toolCallId === "string" ? part.toolCallId : "",
-        toolName,
-        argsText: "input" in part ? JSON.stringify(part.input) : "{}",
-        args: "input" in part ? part.input : {},
+        toolName: toolName2,
+        argsText: JSON.stringify(cleanInput ?? {}),
+        args: cleanInput ?? {},
         metadata: message.metadata
       };
       if ("output" in part) {
@@ -698,17 +723,19 @@ const toAssistantUIMessage = (message) => {
       }
       return baseToolCall;
     }
+    const toolName = "toolName" in part && typeof part.toolName === "string" ? part.toolName : part.type.startsWith("tool-") ? part.type.substring(5) : "";
     const requireApprovalMetadata = extendedMessage.metadata?.requireApprovalMetadata;
+    const suspendedTools = extendedMessage.metadata?.suspendedTools;
     const partToolCallId = "toolCallId" in part && typeof part.toolCallId === "string" ? part.toolCallId : void 0;
-    const suspensionData = partToolCallId ? requireApprovalMetadata?.[partToolCallId] : void 0;
+    const suspensionData = toolName ? requireApprovalMetadata?.[toolName] ?? suspendedTools?.[toolName] : void 0;
     if (suspensionData) {
-      const toolName = "toolName" in part && typeof part.toolName === "string" ? part.toolName : part.type.startsWith("tool-") ? part.type.substring(5) : "";
+      const { suspendedToolRunId, ...cleanInput } = "input" in part ? part.input : {};
       return {
         type: "tool-call",
         toolCallId: partToolCallId,
         toolName,
-        argsText: "input" in part ? JSON.stringify(part.input) : "{}",
-        args: "input" in part ? part.input : {},
+        argsText: JSON.stringify(cleanInput ?? {}),
+        args: cleanInput,
         metadata: extendedMessage.metadata
       };
     }
@@ -773,28 +800,34 @@ const resolveInitialMessages = (messages) => {
           const primitiveType = json.primitiveType || "";
           const primitiveId = json.primitiveId || "";
           const finalResult = json.finalResult;
-          const toolCalls = finalResult?.toolCalls || [];
+          const messages2 = finalResult?.messages || [];
           const childMessages = [];
-          for (const toolCall of toolCalls) {
-            if (toolCall.type === "tool-call" && toolCall.payload) {
-              const toolCallId = toolCall.payload.toolCallId;
-              let toolResult;
-              for (const message2 of finalResult?.messages || []) {
-                for (const part of message2.content || []) {
-                  if (typeof part === "object" && part.type === "tool-result" && part.toolCallId === toolCallId) {
-                    toolResult = part;
-                    break;
-                  }
+          const toolResultMap = /* @__PURE__ */ new Map();
+          for (const msg of messages2) {
+            if (Array.isArray(msg.content)) {
+              for (const part of msg.content) {
+                if (typeof part === "object" && part.type === "tool-result") {
+                  toolResultMap.set(part.toolCallId, part);
+                }
+              }
+            }
+          }
+          for (const msg of messages2) {
+            if (msg.type === "tool-call" && Array.isArray(msg.content)) {
+              for (const part of msg.content) {
+                if (typeof part === "object" && part.type === "tool-call") {
+                  const toolCallContent = part;
+                  const toolResult = toolResultMap.get(toolCallContent.toolCallId);
+                  const isWorkflow = Boolean(toolResult?.result?.result?.steps);
+                  childMessages.push({
+                    type: "tool",
+                    toolCallId: toolCallContent.toolCallId,
+                    toolName: toolCallContent.toolName,
+                    args: toolCallContent.args,
+                    toolOutput: isWorkflow ? toolResult?.result?.result : toolResult?.result
+                  });
                 }
               }
-              const isWorkflow = Boolean(toolResult?.result?.result?.steps);
-              childMessages.push({
-                type: "tool",
-                toolCallId: toolCall.payload.toolCallId,
-                toolName: toolCall.payload.toolName,
-                args: toolCall.payload.args,
-                toolOutput: isWorkflow ? toolResult?.result?.result : toolResult?.result
-              });
             }
           }
           if (finalResult && finalResult.text) {
@@ -846,6 +879,17 @@ const resolveInitialMessages = (messages) => {
         }
       };
     }
+    const suspendedTools = extendedMessage.metadata?.suspendedTools;
+    if (suspendedTools && typeof suspendedTools === "object") {
+      return {
+        ...message,
+        metadata: {
+          ...message.metadata,
+          mode: "stream",
+          suspendedTools
+        }
+      };
+    }
     return message;
   });
 };