@mastra/react 0.2.30-alpha.1 → 0.2.30-alpha.3

package/dist/index.js

@@ -310,22 +310,6 @@ var toUIMessage = ({ chunk, conversation, metadata }) => {
         }
       ];
     }
-    case "background-task-failed":
-    case "background-task-completed": {
-      const lastMessage = result[result.length - 1];
-      if (!lastMessage || lastMessage.role !== "assistant") return result;
-      return [
-        ...result.slice(0, -1),
-        {
-          ...lastMessage,
-          metadata: {
-            mode: metadata.mode,
-            ...lastMessage.metadata,
-            runningBackgroundTasksCount: void 0
-          }
-        }
-      ];
-    }
     case "text-delta": {
       const lastMessage = result[result.length - 1];
       if (!lastMessage || lastMessage.role !== "assistant") return result;
@@ -449,113 +433,140 @@ var toUIMessage = ({ chunk, conversation, metadata }) => {
       ];
     }
     case "tool-error":
-    case "tool-result": {
-      const lastMessage = result[result.length - 1];
-      if (!lastMessage || lastMessage.role !== "assistant") return result;
-      const parts = [...lastMessage.parts];
-      const toolPartIndex = parts.findIndex(
-        (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" || 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,
-              toolCallId,
-              state: "output-error",
-              input: toolPart.input,
-              errorText: typeof error === "string" ? error : error instanceof Error ? error.message : error?.message ?? String(error),
-              callProviderMetadata: chunk.payload.providerMetadata
-            };
+    case "tool-result":
+    case "background-task-completed":
+    case "background-task-failed": {
+      const isBgTaskEvent = chunk.type === "background-task-completed" || chunk.type === "background-task-failed";
+      const location = locateToolPart(result, chunk.payload.toolCallId, isBgTaskEvent);
+      if (!location) return result;
+      const { messageIndex, toolPartIndex } = location;
+      const targetMessage = result[messageIndex];
+      if (!targetMessage || targetMessage.role !== "assistant") return result;
+      const parts = [...targetMessage.parts];
+      const toolPart = toolPartIndex >= 0 ? parts[toolPartIndex] : void 0;
+      if (toolPart && (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;
+        if ((chunk.type === "tool-result" || chunk.type === "background-task-completed") && chunk.payload.isError || chunk.type === "tool-error" || chunk.type === "background-task-failed") {
+          const error = chunk.type === "tool-error" || chunk.type === "background-task-failed" ? chunk.payload.error : chunk.payload.result;
+          parts[toolPartIndex] = {
+            type: "dynamic-tool",
+            toolName,
+            toolCallId,
+            state: "output-error",
+            input: toolPart.input,
+            errorText: typeof error === "string" ? error : error instanceof Error ? error.message : error?.message ?? String(error),
+            callProviderMetadata: chunk.payload.providerMetadata
+          };
+        } else {
+          const isWorkflow = Boolean(chunk.payload.result?.result?.steps);
+          const isAgent = chunk?.from === "AGENT";
+          let output;
+          if (isWorkflow) {
+            output = chunk.payload.result?.result;
+          } else if (isAgent) {
+            const existingOutput = parts[toolPartIndex].output;
+            output = existingOutput ? {
+              ...chunk.payload.result,
+              childMessages: existingOutput.childMessages?.length ? existingOutput.childMessages : chunk.payload.result?.childMessages
+            } : chunk.payload.result;
           } else {
-            const isWorkflow = Boolean(chunk.payload.result?.result?.steps);
-            const isAgent = chunk?.from === "AGENT";
-            let output;
-            if (isWorkflow) {
-              output = chunk.payload.result?.result;
-            } else if (isAgent) {
-              const existingOutput = parts[toolPartIndex].output;
-              output = existingOutput ? {
-                ...chunk.payload.result,
-                childMessages: existingOutput.childMessages?.length ? existingOutput.childMessages : chunk.payload.result?.childMessages
-              } : chunk.payload.result;
-            } else {
-              output = chunk.payload.result;
-            }
-            parts[toolPartIndex] = {
-              type: "dynamic-tool",
-              toolName,
-              toolCallId,
-              state: "output-available",
-              input: toolPart.input,
-              output,
-              callProviderMetadata: chunk.payload.providerMetadata
-            };
+            output = chunk.payload.result;
           }
+          parts[toolPartIndex] = {
+            type: "dynamic-tool",
+            toolName,
+            toolCallId,
+            state: "output-available",
+            input: toolPart.input,
+            output,
+            callProviderMetadata: chunk.payload.providerMetadata
+          };
         }
       }
+      const nextMessage = {
+        ...targetMessage,
+        parts,
+        metadata: mergeBgTaskMetadata(targetMessage.metadata, metadata.mode, {
+          resetRunningCount: isBgTaskEvent,
+          perTaskEntry: isBgTaskEvent ? {
+            toolCallId: chunk.payload.toolCallId,
+            completedAt: chunk.payload.completedAt,
+            taskId: chunk.payload.taskId
+          } : void 0
+        })
+      };
+      return [...result.slice(0, messageIndex), nextMessage, ...result.slice(messageIndex + 1)];
+    }
+    case "background-task-running": {
+      const location = locateToolPart(result, chunk.payload.toolCallId, true);
+      if (!location) return result;
+      const { messageIndex } = location;
+      const targetMessage = result[messageIndex];
+      if (!targetMessage || targetMessage.role !== "assistant") return result;
       return [
-        ...result.slice(0, -1),
+        ...result.slice(0, messageIndex),
         {
-          ...lastMessage,
-          parts
-        }
+          ...targetMessage,
+          metadata: mergeBgTaskMetadata(targetMessage.metadata, metadata.mode, {
+            perTaskEntry: {
+              toolCallId: chunk.payload.toolCallId,
+              startedAt: chunk.payload.startedAt,
+              taskId: chunk.payload.taskId
+            }
+          })
+        },
+        ...result.slice(messageIndex + 1)
       ];
     }
-    case "tool-output": {
-      const lastMessage = result[result.length - 1];
-      if (!lastMessage || lastMessage.role !== "assistant") return result;
-      const parts = [...lastMessage.parts];
-      const toolPartIndex = parts.findIndex(
-        (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" || 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(
-              existingWorkflowState,
-              chunk.payload.output
-            );
-            parts[toolPartIndex] = {
-              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-")) {
-            return toUIMessageFromAgent(chunk.payload.output, conversation, metadata, toolCallId, toolName);
-          } else {
-            const currentOutput = toolPart.output || [];
-            const existingOutput = Array.isArray(currentOutput) ? currentOutput : [];
-            parts[toolPartIndex] = {
-              type: "dynamic-tool",
-              toolName,
-              toolCallId,
-              state: "input-streaming",
-              input,
-              output: [...existingOutput, chunk.payload.output]
-            };
-          }
+    case "tool-output":
+    case "background-task-output": {
+      const isBgTaskOutput = chunk.type === "background-task-output";
+      const location = locateToolPart(result, chunk.payload.toolCallId, isBgTaskOutput);
+      if (!location || location.toolPartIndex < 0) return result;
+      const { messageIndex, toolPartIndex } = location;
+      const targetMessage = result[messageIndex];
+      if (!targetMessage || targetMessage.role !== "assistant") return result;
+      const parts = [...targetMessage.parts];
+      const toolPart = parts[toolPartIndex];
+      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;
+        const payloadOutput = chunk.type === "background-task-output" ? chunk.payload.payload.payload.output : chunk.payload.output;
+        if (payloadOutput?.type?.startsWith("workflow-")) {
+          const existingWorkflowState = toolPart.output || {};
+          const updatedWorkflowState = mapWorkflowStreamChunkToWatchResult(existingWorkflowState, payloadOutput);
+          parts[toolPartIndex] = {
+            type: "dynamic-tool",
+            toolName,
+            toolCallId,
+            state: "input-streaming",
+            input,
+            output: updatedWorkflowState
+          };
+        } else if (payloadOutput?.from === "AGENT" || payloadOutput?.from === "USER" && payloadOutput?.payload?.output?.type?.startsWith("workflow-")) {
+          return toUIMessageFromAgent(payloadOutput, conversation, metadata, toolCallId, toolName);
+        } else {
+          const currentOutput = toolPart.output || [];
+          const existingOutput = Array.isArray(currentOutput) ? currentOutput : [];
+          parts[toolPartIndex] = {
+            type: "dynamic-tool",
+            toolName,
+            toolCallId,
+            state: "input-streaming",
+            input,
+            output: [...existingOutput, payloadOutput]
+          };
         }
       }
       return [
-        ...result.slice(0, -1),
+        ...result.slice(0, messageIndex),
         {
-          ...lastMessage,
+          ...targetMessage,
           parts
-        }
+        },
+        ...result.slice(messageIndex + 1)
       ];
     }
     case "is-task-complete": {
@@ -836,6 +847,69 @@ var toUIMessageFromAgent = (chunk, conversation, metadata, parentToolCallId, par
     }
   ];
 };
+var findMessageIndexByToolCallId = (messages, toolCallId) => {
+  let count = 0;
+  for (let i = messages.length - 1; i >= 0; i--) {
+    const maxMessagesBack = 10;
+    if (count > maxMessagesBack) {
+      return -1;
+    }
+    const message = messages[i];
+    if (message.role !== "assistant") {
+      continue;
+    }
+    for (const part of message.parts) {
+      if (part.type === "dynamic-tool" && part.toolCallId === toolCallId) {
+        return i;
+      }
+    }
+    count++;
+  }
+  return -1;
+};
+var locateToolPart = (messages, toolCallId, allowMetadataOnlyMatch) => {
+  const lastMessage = messages[messages.length - 1];
+  if (lastMessage && lastMessage.role === "assistant") {
+    const toolPartIndex2 = lastMessage.parts.findIndex(
+      (part) => (part.type === "dynamic-tool" || typeof part.type === "string" && part.type.startsWith("tool-")) && "toolCallId" in part && part.toolCallId === toolCallId
+    );
+    if (toolPartIndex2 !== -1) {
+      return { messageIndex: messages.length - 1, toolPartIndex: toolPartIndex2 };
+    }
+  }
+  const messageIndex = findMessageIndexByToolCallId(messages, toolCallId);
+  if (messageIndex === -1) return null;
+  const message = messages[messageIndex];
+  if (!message || message.role !== "assistant") return null;
+  const toolPartIndex = message.parts.findIndex(
+    (part) => (part.type === "dynamic-tool" || typeof part.type === "string" && part.type.startsWith("tool-")) && "toolCallId" in part && part.toolCallId === toolCallId
+  );
+  if (toolPartIndex === -1) {
+    return allowMetadataOnlyMatch ? { messageIndex, toolPartIndex: -1 } : null;
+  }
+  return { messageIndex, toolPartIndex };
+};
+var mergeBgTaskMetadata = (existing, mode, args) => {
+  const existingAny = existing ?? {};
+  const existingBgTasks = existingAny.backgroundTasks ?? {};
+  const nextBgTasks = { ...existingBgTasks };
+  if (args.perTaskEntry) {
+    const { toolCallId, startedAt, completedAt, taskId } = args.perTaskEntry;
+    const prev = existingBgTasks[toolCallId] ?? { taskId };
+    nextBgTasks[toolCallId] = {
+      ...prev,
+      taskId,
+      ...startedAt !== void 0 ? { startedAt } : {},
+      ...completedAt !== void 0 ? { completedAt } : {}
+    };
+  }
+  return {
+    ...existingAny,
+    mode,
+    ...args.resetRunningCount ? { runningBackgroundTasksCount: void 0 } : {},
+    backgroundTasks: nextBgTasks
+  };
+};
 
 // src/lib/ai-sdk/utils/toAssistantUIMessage.ts
 var toAssistantUIMessage = (message) => {
@@ -1743,6 +1817,7 @@ var useChat = ({
   const _networkRunId = useRef(void 0);
   const _onNetworkChunk = useRef(void 0);
   const _requestContext = useRef(propsRequestContext);
+  const _streamAbortRef = useRef(null);
   const [messages, setMessages] = useState([]);
   const [toolCallApprovals, setToolCallApprovals] = useState({});
   const [networkToolCallApprovals, setNetworkToolCallApprovals] = useState({});
@@ -1865,13 +1940,20 @@ var useChat = ({
     const resolvedRequestContext = requestContext ?? propsRequestContext;
     _requestContext.current = resolvedRequestContext;
     setIsRunning(true);
+    _streamAbortRef.current?.abort();
+    const internalAbort = new AbortController();
+    _streamAbortRef.current = internalAbort;
+    if (signal) {
+      if (signal.aborted) internalAbort.abort();
+      else signal.addEventListener("abort", () => internalAbort.abort(), { once: true });
+    }
     const clientWithAbort = new MastraClient({
       ...baseClient.options,
-      abortSignal: signal
+      abortSignal: internalAbort.signal
     });
     const agent = clientWithAbort.getAgent(agentId);
     const runId = v4();
-    const response = await agent.stream(coreUserMessages, {
+    const response = await agent.streamUntilIdle(coreUserMessages, {
       runId,
       maxSteps,
       modelSettings: {
@@ -1898,6 +1980,9 @@ var useChat = ({
         void onChunk?.(chunk);
       }
     });
+    if (_streamAbortRef.current === internalAbort) {
+      _streamAbortRef.current = null;
+    }
     setIsRunning(false);
   };
   const network = async ({