@mastra/react 0.0.0-refactor-agent-information-for-recomposable-ui-20251112151814 → 0.0.0-safe-stringify-telemetry-20251205024938

package/dist/index.js

@@ -1,6 +1,7 @@
 import { jsx, jsxs } from 'react/jsx-runtime';
 import { createContext, useContext, useRef, useState, Fragment, useLayoutEffect, useEffect } from 'react';
 import { MastraClient } from '@mastra/client-js';
+import { v4 } from '@lukeed/uuid';
 import { ChevronDownIcon, CheckIcon, CopyIcon } from 'lucide-react';
 import { twMerge } from 'tailwind-merge';
 import { toJsxRuntime } from 'hast-util-to-jsx-runtime';
@@ -255,17 +256,19 @@ const toUIMessage = ({ chunk, conversation, metadata }) => {
       if (!lastMessage || lastMessage.role !== "assistant") return result;
       const parts = [...lastMessage.parts];
       const toolPartIndex = parts.findIndex(
-        (part) => part.type === "dynamic-tool" && "toolCallId" in part && part.toolCallId === chunk.payload.toolCallId
+        (part) => (part.type === "dynamic-tool" || typeof part.type === "string" && part.type.startsWith("tool-")) && "toolCallId" in part && part.toolCallId === chunk.payload.toolCallId
       );
       if (toolPartIndex !== -1) {
         const toolPart = parts[toolPartIndex];
-        if (toolPart.type === "dynamic-tool") {
+        if (toolPart.type === "dynamic-tool" || typeof toolPart.type === "string" && toolPart.type.startsWith("tool-")) {
+          const toolName = "toolName" in toolPart && typeof toolPart.toolName === "string" ? toolPart.toolName : toolPart.type.startsWith("tool-") ? toolPart.type.substring(5) : "";
+          const toolCallId = toolPart.toolCallId;
           if (chunk.type === "tool-result" && chunk.payload.isError || chunk.type === "tool-error") {
             const error = chunk.type === "tool-error" ? chunk.payload.error : chunk.payload.result;
             parts[toolPartIndex] = {
               type: "dynamic-tool",
-              toolName: toolPart.toolName,
-              toolCallId: toolPart.toolCallId,
+              toolName,
+              toolCallId,
               state: "output-error",
               input: toolPart.input,
               errorText: String(error),
@@ -284,8 +287,8 @@ const toUIMessage = ({ chunk, conversation, metadata }) => {
             }
             parts[toolPartIndex] = {
               type: "dynamic-tool",
-              toolName: toolPart.toolName,
-              toolCallId: toolPart.toolCallId,
+              toolName,
+              toolCallId,
               state: "output-available",
               input: toolPart.input,
               output,
@@ -307,11 +310,14 @@ const toUIMessage = ({ chunk, conversation, metadata }) => {
       if (!lastMessage || lastMessage.role !== "assistant") return result;
       const parts = [...lastMessage.parts];
       const toolPartIndex = parts.findIndex(
-        (part) => part.type === "dynamic-tool" && "toolCallId" in part && part.toolCallId === chunk.payload.toolCallId
+        (part) => (part.type === "dynamic-tool" || typeof part.type === "string" && part.type.startsWith("tool-")) && "toolCallId" in part && part.toolCallId === chunk.payload.toolCallId
       );
       if (toolPartIndex !== -1) {
         const toolPart = parts[toolPartIndex];
-        if (toolPart.type === "dynamic-tool") {
+        if (toolPart.type === "dynamic-tool" || typeof toolPart.type === "string" && toolPart.type.startsWith("tool-")) {
+          const toolName = "toolName" in toolPart && typeof toolPart.toolName === "string" ? toolPart.toolName : typeof toolPart.type === "string" && toolPart.type.startsWith("tool-") ? toolPart.type.substring(5) : "";
+          const toolCallId = toolPart.toolCallId;
+          const input = toolPart.input;
           if (chunk.payload.output?.type?.startsWith("workflow-")) {
             const existingWorkflowState = toolPart.output || {};
             const updatedWorkflowState = mapWorkflowStreamChunkToWatchResult(
@@ -319,7 +325,11 @@ const toUIMessage = ({ chunk, conversation, metadata }) => {
               chunk.payload.output
             );
             parts[toolPartIndex] = {
-              ...toolPart,
+              type: "dynamic-tool",
+              toolName,
+              toolCallId,
+              state: "input-streaming",
+              input,
               output: updatedWorkflowState
             };
           } else if (chunk.payload.output?.from === "AGENT" || chunk.payload.output?.from === "USER" && chunk.payload.output?.payload?.output?.type?.startsWith("workflow-")) {
@@ -328,7 +338,11 @@ const toUIMessage = ({ chunk, conversation, metadata }) => {
             const currentOutput = toolPart.output || [];
             const existingOutput = Array.isArray(currentOutput) ? currentOutput : [];
             parts[toolPartIndex] = {
-              ...toolPart,
+              type: "dynamic-tool",
+              toolName,
+              toolCallId,
+              state: "input-streaming",
+              input,
               output: [...existingOutput, chunk.payload.output]
             };
           }
@@ -424,10 +438,11 @@ const toUIMessage = ({ chunk, conversation, metadata }) => {
       const lastMessage = result[result.length - 1];
       if (!lastMessage || lastMessage.role !== "assistant") return result;
       const parts = lastMessage.parts.map((part) => {
-        if (typeof part === "object" && part !== null && "type" in part && "state" in part && part.state === "streaming") {
-          if (part.type === "text" || part.type === "reasoning") {
-            return { ...part, state: "done" };
-          }
+        if (part.type === "text" && part.state === "streaming") {
+          return { ...part, state: "done" };
+        }
+        if (part.type === "reasoning" && part.state === "streaming") {
+          return { ...part, state: "done" };
         }
         return part;
       });
@@ -599,23 +614,13 @@ const toAssistantUIMessage = (message) => {
       };
     }
     if (part.type === "file") {
-      const type = part.mediaType.includes("image/") ? "image" : "file";
-      if (type === "file") {
-        return {
-          type,
-          mimeType: part.mediaType,
-          data: part.url,
-          // Use URL as data source
-          metadata: message.metadata
-        };
-      }
-      if (type === "image") {
-        return {
-          type,
-          image: part.url,
-          metadata: message.metadata
-        };
-      }
+      return {
+        type: "file",
+        mimeType: part.mediaType,
+        data: part.url,
+        // Use URL as data source
+        metadata: message.metadata
+      };
     }
     if (part.type === "dynamic-tool") {
       const baseToolCall = {
@@ -651,6 +656,20 @@ const toAssistantUIMessage = (message) => {
       }
       return baseToolCall;
     }
+    const requireApprovalMetadata = extendedMessage.metadata?.requireApprovalMetadata;
+    const partToolCallId = "toolCallId" in part && typeof part.toolCallId === "string" ? part.toolCallId : void 0;
+    const suspensionData = partToolCallId ? requireApprovalMetadata?.[partToolCallId] : void 0;
+    if (suspensionData) {
+      const toolName = "toolName" in part && typeof part.toolName === "string" ? part.toolName : part.type.startsWith("tool-") ? part.type.substring(5) : "";
+      return {
+        type: "tool-call",
+        toolCallId: partToolCallId,
+        toolName,
+        argsText: "input" in part ? JSON.stringify(part.input) : "{}",
+        args: "input" in part ? part.input : {},
+        metadata: extendedMessage.metadata
+      };
+    }
     return {
       type: "text",
       text: "",
@@ -692,9 +711,7 @@ const toAssistantUIMessage = (message) => {
 
 const resolveInitialMessages = (messages) => {
   return messages.map((message) => {
-    const networkPart = message.parts.find(
-      (part) => typeof part === "object" && part !== null && "type" in part && part.type === "text" && "text" in part && typeof part.text === "string" && part.text.includes('"isNetwork":true')
-    );
+    const networkPart = message.parts.find((part) => part.type === "text" && part.text.includes('"isNetwork":true'));
     if (networkPart && networkPart.type === "text") {
       try {
         const json = JSON.parse(networkPart.text);
@@ -737,7 +754,6 @@ const resolveInitialMessages = (messages) => {
             childMessages,
             result: finalResult?.text || ""
           };
-          console.log("json", json);
           const nextMessage = {
             role: "assistant",
             parts: [
@@ -765,6 +781,18 @@ const resolveInitialMessages = (messages) => {
         return message;
       }
     }
+    const extendedMessage = message;
+    const pendingToolApprovals = extendedMessage.metadata?.pendingToolApprovals;
+    if (pendingToolApprovals && typeof pendingToolApprovals === "object") {
+      return {
+        ...message,
+        metadata: {
+          ...message.metadata,
+          mode: "stream",
+          requireApprovalMetadata: pendingToolApprovals
+        }
+      };
+    }
     return message;
   });
 };
@@ -1168,63 +1196,30 @@ class AISdkNetworkTransformer {
   };
 }
 
-const fromCoreUserMessageToUIMessage = (coreUserMessage) => {
-  const id = `user-${Date.now()}-${Math.random().toString(36).substring(2, 9)}`;
-  const parts = typeof coreUserMessage.content === "string" ? [
-    {
-      type: "text",
-      text: coreUserMessage.content
-    }
-  ] : coreUserMessage.content.map((part) => {
-    switch (part.type) {
-      case "text": {
-        return {
-          type: "text",
-          text: part.text
-        };
-      }
-      case "image": {
-        const url = typeof part.image === "string" ? part.image : part.image instanceof URL ? part.image.toString() : "";
-        return {
-          type: "file",
-          mediaType: part.mimeType ?? "image/*",
-          url
-        };
-      }
-      case "file": {
-        const url = typeof part.data === "string" ? part.data : part.data instanceof URL ? part.data.toString() : "";
-        return {
-          type: "file",
-          mediaType: part.mimeType,
-          url,
-          ...part.filename !== void 0 ? { filename: part.filename } : {}
-        };
-      }
-      default: {
-        const exhaustiveCheck = part;
-        throw new Error(`Unhandled content part type: ${exhaustiveCheck.type}`);
+const useChat = ({ agentId, resourceId, initializeMessages }) => {
+  const extractRunIdFromMessages = (messages2) => {
+    for (const message of messages2) {
+      const pendingToolApprovals = message.metadata?.pendingToolApprovals;
+      if (pendingToolApprovals && typeof pendingToolApprovals === "object") {
+        const suspensionData = Object.values(pendingToolApprovals)[0];
+        if (suspensionData?.runId) {
+          return suspensionData.runId;
+        }
       }
     }
-  });
-  return {
-    id,
-    role: "user",
-    parts
+    return void 0;
   };
-};
-
-const useChat = ({ agentId, initializeMessages }) => {
-  const _currentRunId = useRef(void 0);
+  const initialMessages = initializeMessages?.() || [];
+  const initialRunId = extractRunIdFromMessages(initialMessages);
+  const _currentRunId = useRef(initialRunId);
   const _onChunk = useRef(void 0);
-  const [messages, setMessages] = useState(
-    () => resolveInitialMessages(initializeMessages?.() || [])
-  );
+  const [messages, setMessages] = useState(() => resolveInitialMessages(initialMessages));
   const [toolCallApprovals, setToolCallApprovals] = useState({});
   const baseClient = useMastraClient();
   const [isRunning, setIsRunning] = useState(false);
   const generate = async ({
     coreUserMessages,
-    requestContext,
+    runtimeContext,
     threadId,
     modelSettings,
     signal,
@@ -1250,7 +1245,7 @@ const useChat = ({ agentId, initializeMessages }) => {
     const agent = clientWithAbort.getAgent(agentId);
     const response = await agent.generate({
       messages: coreUserMessages,
-      runId: agentId,
+      runId: v4(),
       maxSteps,
       modelSettings: {
         frequencyPenalty,
@@ -1262,8 +1257,8 @@ const useChat = ({ agentId, initializeMessages }) => {
         topP
       },
       instructions,
-      requestContext,
-      ...threadId ? { threadId, resourceId: agentId } : {},
+      runtimeContext,
+      ...threadId ? { threadId, resourceId: resourceId || agentId } : {},
       providerOptions
     });
     setIsRunning(false);
@@ -1278,7 +1273,7 @@ const useChat = ({ agentId, initializeMessages }) => {
       setMessages((prev) => [...prev, ...mastraUIMessages]);
     }
   };
-  const stream = async ({ coreUserMessages, requestContext, threadId, onChunk, modelSettings, signal }) => {
+  const stream = async ({ coreUserMessages, runtimeContext, threadId, onChunk, modelSettings, signal }) => {
     const {
       frequencyPenalty,
       presencePenalty,
@@ -1298,7 +1293,7 @@ const useChat = ({ agentId, initializeMessages }) => {
       abortSignal: signal
     });
     const agent = clientWithAbort.getAgent(agentId);
-    const runId = agentId;
+    const runId = v4();
     const response = await agent.stream({
       messages: coreUserMessages,
       runId,
@@ -1313,8 +1308,8 @@ const useChat = ({ agentId, initializeMessages }) => {
         topP
       },
       instructions,
-      requestContext,
-      ...threadId ? { threadId, resourceId: agentId } : {},
+      runtimeContext,
+      ...threadId ? { threadId, resourceId: resourceId || agentId } : {},
       providerOptions,
       requireToolApproval
     });
@@ -1330,7 +1325,7 @@ const useChat = ({ agentId, initializeMessages }) => {
   };
   const network = async ({
     coreUserMessages,
-    requestContext,
+    runtimeContext,
     threadId,
     onNetworkChunk,
     modelSettings,
@@ -1343,6 +1338,7 @@ const useChat = ({ agentId, initializeMessages }) => {
       abortSignal: signal
     });
     const agent = clientWithAbort.getAgent(agentId);
+    const runId = v4();
     const response = await agent.network({
       messages: coreUserMessages,
       maxSteps,
@@ -1355,9 +1351,9 @@ const useChat = ({ agentId, initializeMessages }) => {
         topK,
         topP
       },
-      runId: agentId,
-      requestContext,
-      ...threadId ? { thread: threadId, resourceId: agentId } : {}
+      runId,
+      runtimeContext,
+      ...threadId ? { thread: threadId, resourceId: resourceId || agentId } : {}
     });
     const transformer = new AISdkNetworkTransformer();
     await response.processDataStream({
@@ -1409,18 +1405,14 @@ const useChat = ({ agentId, initializeMessages }) => {
   };
   const sendMessage = async ({ mode = "stream", ...args }) => {
     const nextMessage = { role: "user", content: [{ type: "text", text: args.message }] };
-    const coreUserMessages = [nextMessage];
-    if (args.coreUserMessages) {
-      coreUserMessages.push(...args.coreUserMessages);
-    }
-    const uiMessages = coreUserMessages.map(fromCoreUserMessageToUIMessage);
-    setMessages((s) => [...s, ...uiMessages]);
+    const messages2 = args.coreUserMessages ? [nextMessage, ...args.coreUserMessages] : [nextMessage];
+    setMessages((s) => [...s, { role: "user", parts: [{ type: "text", text: args.message }] }]);
     if (mode === "generate") {
-      await generate({ ...args, coreUserMessages });
+      await generate({ ...args, coreUserMessages: messages2 });
     } else if (mode === "stream") {
-      await stream({ ...args, coreUserMessages });
+      await stream({ ...args, coreUserMessages: messages2 });
     } else if (mode === "network") {
-      await network({ ...args, coreUserMessages });
+      await network({ ...args, coreUserMessages: messages2 });
     }
   };
   return {