@mastra/ai-sdk 1.6.2 → 1.6.3-alpha.0

package/dist/index.js

@@ -10,7 +10,7 @@ import { TripWire, MessageList, aiV5ModelMessageToV2PromptMessage } from '@mastr
 import { RequestContext } from '@mastra/core/di';
 import { WorkingMemory, MessageHistory, SemanticRecall } from '@mastra/core/processors';
 
-// ../../packages/_vendored/ai_v5/dist/chunk-ZMFCHGXT.js
+// ../../packages/_vendored/ai_v5/dist/chunk-G6L5YOWM.js
 var marker = "vercel.ai.error";
 var symbol = Symbol.for(marker);
 var _a;
@@ -11589,28 +11589,95 @@ function toAISdkStream(stream, options = {
 }
 
 // src/chat-route.ts
-function extractV6NativeApproval(messages) {
-  const lastAssistantMsg = messages.at(-1);
-  if (!lastAssistantMsg || lastAssistantMsg.role !== "assistant") return null;
-  const parts = lastAssistantMsg.parts ?? [];
-  for (let i = parts.length - 1; i >= 0; i--) {
-    const part = parts[i];
-    if (!isToolUIPart2(part) || part.state !== "approval-responded") continue;
-    const lastSep = part.approval.id.lastIndexOf(APPROVAL_ID_SEPARATOR);
-    if (lastSep === -1) continue;
-    const runId = part.approval.id.slice(0, lastSep);
-    const toolCallId = part.approval.id.slice(lastSep + APPROVAL_ID_SEPARATOR.length);
-    if (!runId || !toolCallId) continue;
-    return {
-      resumeData: {
-        approved: part.approval.approved,
-        ...part.approval.reason != null ? { reason: part.approval.reason } : {}
-      },
-      runId,
-      toolCallId
-    };
+function extractV6NativeApprovals(messages) {
+  const byTarget = /* @__PURE__ */ new Map();
+  const separator = APPROVAL_ID_SEPARATOR;
+  for (const message of messages) {
+    if (message.role !== "assistant") continue;
+    for (const part of message.parts ?? []) {
+      if (!isToolUIPart2(part) || part.state !== "approval-responded") continue;
+      const lastSep = part.approval.id.lastIndexOf(separator);
+      if (lastSep === -1) continue;
+      const runId = part.approval.id.slice(0, lastSep);
+      const toolCallId = part.approval.id.slice(lastSep + separator.length);
+      if (!runId || !toolCallId) continue;
+      if (toolCallId !== part.toolCallId) continue;
+      byTarget.set(`${runId}${separator}${toolCallId}`, {
+        resumeData: {
+          approved: part.approval.approved,
+          ...part.approval.reason != null ? { reason: part.approval.reason } : {}
+        },
+        runId,
+        toolCallId
+      });
+    }
   }
-  return null;
+  return [...byTarget.values()];
+}
+function streamV6ApprovalResumes(args) {
+  const { agent, approvals, baseOptions, structuredOutput, messages, lastMessageId } = args;
+  const { sendStart, sendFinish, sendReasoning, sendSources, onError, messageMetadata } = args;
+  return createUIMessageStream2({
+    originalMessages: messages,
+    onError,
+    execute: async ({ writer }) => {
+      let startWritten = false;
+      let successfulLegs = 0;
+      let firstResolvedTargetError;
+      let finalFinish;
+      for (const approval of approvals) {
+        try {
+          const result = await agent.resumeStream(approval.resumeData, {
+            ...baseOptions,
+            runId: approval.runId,
+            toolCallId: approval.toolCallId,
+            ...structuredOutput ? { structuredOutput } : {}
+          });
+          for await (const part of toAISdkStream(result, {
+            from: "agent",
+            version: "v6",
+            lastMessageId,
+            sendStart,
+            sendFinish,
+            sendReasoning,
+            sendSources,
+            onError,
+            messageMetadata
+          })) {
+            if (part.type === "start") {
+              if (startWritten) continue;
+              startWritten = true;
+              writer.write(part);
+              continue;
+            }
+            if (!startWritten && sendStart) {
+              writer.write({ type: "start", ...lastMessageId ? { messageId: lastMessageId } : {} });
+              startWritten = true;
+            }
+            if (part.type === "finish") {
+              finalFinish = part;
+              continue;
+            }
+            writer.write(part);
+          }
+          successfulLegs++;
+        } catch (error) {
+          const id = error?.id;
+          if (id !== "AGENT_RESUME_TOOL_CALL_NOT_SUSPENDED" && id !== "AGENT_RESUME_NO_SNAPSHOT_FOUND") {
+            throw error;
+          }
+          firstResolvedTargetError ??= error;
+        }
+      }
+      if (successfulLegs === 0 && firstResolvedTargetError) throw firstResolvedTargetError;
+      if (!startWritten && sendStart) {
+        writer.write({ type: "start", ...lastMessageId ? { messageId: lastMessageId } : {} });
+      }
+      if (sendFinish) {
+        writer.write(finalFinish ?? { type: "finish" });
+      }
+    }
+  });
 }
 async function handleChatStream({
   mastra,
@@ -11648,9 +11715,6 @@ async function handleChatStream({
   if (!Array.isArray(messages)) {
     throw new Error("Messages must be an array of UIMessage objects");
   }
-  const nativeApproval = version === "v6" && !resumeData ? extractV6NativeApproval(messages) : null;
-  const effectiveResumeData = nativeApproval?.resumeData ?? resumeData;
-  const effectiveRunId = nativeApproval?.runId ?? runId;
   let lastMessageId;
   let messagesToSend = messages;
   if (messages.length > 0) {
@@ -11672,12 +11736,30 @@ async function handleChatStream({
   const baseOptions = {
     ...defaultOptionsRest,
     ...restOptions,
-    ...effectiveRunId && { runId: effectiveRunId },
-    ...nativeApproval?.toolCallId && { toolCallId: nativeApproval.toolCallId },
+    ...runId && { runId },
     requestContext: requestContext || defaultOptions3?.requestContext,
     ...Object.keys(mergedProviderOptions).length > 0 && { providerOptions: mergedProviderOptions }
   };
-  const result = effectiveResumeData ? structuredOutput ? await agentObj.resumeStream(effectiveResumeData, { ...baseOptions, structuredOutput }) : await agentObj.resumeStream(effectiveResumeData, baseOptions) : structuredOutput ? await agentObj.stream(messagesToSend, { ...baseOptions, structuredOutput }) : await agentObj.stream(messagesToSend, baseOptions);
+  if (version === "v6" && !resumeData && trigger !== "regenerate-message" && messages.at(-1)?.role === "assistant") {
+    const approvals = extractV6NativeApprovals(messages);
+    if (approvals.length > 0) {
+      return streamV6ApprovalResumes({
+        agent: agentObj,
+        approvals,
+        baseOptions,
+        structuredOutput,
+        messages,
+        lastMessageId,
+        sendStart,
+        sendFinish,
+        sendReasoning,
+        sendSources,
+        onError,
+        messageMetadata
+      });
+    }
+  }
+  const result = resumeData ? structuredOutput ? await agentObj.resumeStream(resumeData, { ...baseOptions, structuredOutput }) : await agentObj.resumeStream(resumeData, baseOptions) : structuredOutput ? await agentObj.stream(messagesToSend, { ...baseOptions, structuredOutput }) : await agentObj.stream(messagesToSend, baseOptions);
   if (version === "v6") {
     return createUIMessageStream2({
       originalMessages: messages,