@mastra/ai-sdk 1.4.0 → 1.4.1-alpha.0

package/dist/index.js

@@ -11595,6 +11595,7 @@ var isWorkflowExecutionDataChunkType = (chunk) => {
 };
 
 // src/helpers.ts
+var APPROVAL_ID_SEPARATOR = "::";
 function toAISDKFinishReason(reason) {
   if (reason === "tripwire" || reason === "retry") {
     return "other";
@@ -11931,6 +11932,27 @@ function convertMastraChunkToAISDKv6({
   chunk,
   mode = "stream"
 }) {
+  if (chunk.type === "tool-call-approval") {
+    return [
+      {
+        type: "tool-approval-request",
+        approvalId: `${chunk.runId}${APPROVAL_ID_SEPARATOR}${chunk.payload.toolCallId}`,
+        toolCallId: chunk.payload.toolCallId
+      },
+      {
+        type: "data-tool-call-approval",
+        id: chunk.payload.toolCallId,
+        data: {
+          state: "data-tool-call-approval",
+          runId: chunk.runId,
+          toolCallId: chunk.payload.toolCallId,
+          toolName: chunk.payload.toolName,
+          args: chunk.payload.args,
+          resumeSchema: chunk.payload.resumeSchema
+        }
+      }
+    ];
+  }
   return convertMastraChunkToAISDKBase({
     chunk,
     mode,
@@ -12061,6 +12083,13 @@ function convertFullStreamChunkToUIMessageStream({
         ...part.dynamic != null ? { dynamic: part.dynamic } : {}
       };
     }
+    case "tool-approval-request": {
+      return {
+        type: "tool-approval-request",
+        approvalId: part.approvalId,
+        toolCallId: part.toolCallId
+      };
+    }
     case "tool-result": {
       return {
         type: "tool-output-available",
@@ -12198,7 +12227,13 @@ function createWorkflowStreamToAISDKTransformer(convertMastraChunkToAISDK, {
         },
         convertMastraChunkToAISDK
       );
-      if (transformed) controller.enqueue(transformed);
+      if (Array.isArray(transformed)) {
+        for (const c of transformed) {
+          if (c) controller.enqueue(c);
+        }
+      } else if (transformed) {
+        controller.enqueue(transformed);
+      }
     }
   });
 }
@@ -12286,41 +12321,62 @@ function createAgentStreamToAISDKTransformer(convertMastraChunkToAISDK, {
         });
       }
       const part = convertMastraChunkToAISDK({ chunk, mode: "stream" });
-      const transformedChunk = convertFullStreamChunkToUIMessageStream({
-        part,
-        sendReasoning,
-        sendSources,
-        messageMetadataValue: part ? messageMetadata?.({ part }) : void 0,
-        sendStart,
-        sendFinish,
-        responseMessageId: lastMessageId,
-        onError(error) {
-          return onError ? onError(error) : safeParseErrorObject(error);
+      const enqueueTransformedPart = (p) => {
+        const transformedChunk = convertFullStreamChunkToUIMessageStream({
+          part: p,
+          sendReasoning,
+          sendSources,
+          messageMetadataValue: p ? messageMetadata?.({ part: p }) : void 0,
+          sendStart,
+          sendFinish,
+          responseMessageId: lastMessageId,
+          onError(error) {
+            return onError ? onError(error) : safeParseErrorObject(error);
+          }
+        });
+        if (transformedChunk) {
+          if (transformedChunk.type === "tool-agent") {
+            const payload = transformedChunk.payload;
+            const agentTransformed = transformAgent(payload, bufferedSteps);
+            if (agentTransformed) controller.enqueue(agentTransformed);
+          } else if (transformedChunk.type === "tool-workflow") {
+            const payload = transformedChunk.payload;
+            const workflowChunk = transformWorkflow(
+              payload,
+              bufferedSteps,
+              true,
+              void 0,
+              void 0,
+              convertMastraChunkToAISDK
+            );
+            if (Array.isArray(workflowChunk)) {
+              for (const c of workflowChunk) {
+                if (c) controller.enqueue(c);
+              }
+            } else if (workflowChunk) {
+              controller.enqueue(workflowChunk);
+            }
+          } else if (transformedChunk.type === "tool-network") {
+            const payload = transformedChunk.payload;
+            const networkChunk = transformNetwork(payload, bufferedSteps, true);
+            if (Array.isArray(networkChunk)) {
+              for (const c of networkChunk) {
+                if (c) controller.enqueue(c);
+              }
+            } else if (networkChunk) {
+              controller.enqueue(networkChunk);
+            }
+          } else {
+            controller.enqueue(transformedChunk);
+          }
         }
-      });
-      if (transformedChunk) {
-        if (transformedChunk.type === "tool-agent") {
-          const payload = transformedChunk.payload;
-          const agentTransformed = transformAgent(payload, bufferedSteps);
-          if (agentTransformed) controller.enqueue(agentTransformed);
-        } else if (transformedChunk.type === "tool-workflow") {
-          const payload = transformedChunk.payload;
-          const workflowChunk = transformWorkflow(
-            payload,
-            bufferedSteps,
-            true,
-            void 0,
-            void 0,
-            convertMastraChunkToAISDK
-          );
-          if (workflowChunk) controller.enqueue(workflowChunk);
-        } else if (transformedChunk.type === "tool-network") {
-          const payload = transformedChunk.payload;
-          const networkChunk = transformNetwork(payload, bufferedSteps, true);
-          if (networkChunk) controller.enqueue(networkChunk);
-        } else {
-          controller.enqueue(transformedChunk);
+      };
+      if (Array.isArray(part)) {
+        for (const p of part) {
+          enqueueTransformedPart(p);
         }
+      } else {
+        enqueueTransformedPart(part);
       }
     },
     flush(controller) {
@@ -12663,6 +12719,18 @@ function transformWorkflow(payload, bufferedWorkflows, isNested, includeTextStre
       const output = payload.payload.output;
       if (includeTextStreamParts && output && isMastraTextStreamChunk(output)) {
         const part = convertMastraChunkToAISDK({ chunk: output, mode: "stream" });
+        if (Array.isArray(part)) {
+          return part.map(
+            (p) => convertFullStreamChunkToUIMessageStream({
+              part: p,
+              sendReasoning: streamOptions?.sendReasoning,
+              sendSources: streamOptions?.sendSources,
+              onError(error) {
+                return safeParseErrorObject(error);
+              }
+            })
+          ).filter(Boolean);
+        }
         const transformedChunk = convertFullStreamChunkToUIMessageStream({
           part,
           sendReasoning: streamOptions?.sendReasoning,
@@ -13160,6 +13228,32 @@ function toAISdkStream(stream, options = {
 }
 
 // src/chat-route.ts
+function extractV6NativeApproval(messages) {
+  let lastAssistantMsg;
+  for (let i = messages.length - 1; i >= 0; i--) {
+    const message = messages[i];
+    if (message.role === "assistant") {
+      lastAssistantMsg = message;
+      break;
+    }
+  }
+  if (!lastAssistantMsg) return null;
+  for (const part of lastAssistantMsg.parts ?? []) {
+    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);
+    if (!runId) continue;
+    return {
+      resumeData: {
+        approved: part.approval.approved,
+        ...part.approval.reason != null ? { reason: part.approval.reason } : {}
+      },
+      runId
+    };
+  }
+  return null;
+}
 async function handleChatStream({
   mastra,
   agentId,
@@ -13185,6 +13279,9 @@ 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) {
@@ -13206,11 +13303,11 @@ async function handleChatStream({
   const baseOptions = {
     ...defaultOptionsRest,
     ...restOptions,
-    ...runId && { runId },
+    ...effectiveRunId && { runId: effectiveRunId },
     requestContext: requestContext || defaultOptions3?.requestContext,
     ...Object.keys(mergedProviderOptions).length > 0 && { providerOptions: mergedProviderOptions }
   };
-  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);
+  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") {
     return createUIMessageStream2({
       originalMessages: messages,