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

package/dist/index.d.ts

@@ -2,7 +2,7 @@ export { chatRoute, handleChatStream } from './chat-route.js';
 export type { chatRouteOptions, ChatStreamHandlerParams, ChatStreamHandlerOptions, AgentVersionOptions, } from './chat-route.js';
 export { workflowRoute, handleWorkflowStream } from './workflow-route.js';
 export type { WorkflowRouteOptions, WorkflowStreamHandlerParams, WorkflowStreamHandlerOptions } from './workflow-route.js';
-export type { WorkflowDataPart } from './transformers.js';
+export type { WorkflowDataPart, WorkflowStepDataPart } from './transformers.js';
 export { networkRoute, handleNetworkStream } from './network-route.js';
 export type { NetworkRouteOptions, NetworkStreamHandlerParams, NetworkStreamHandlerOptions } from './network-route.js';
 export type { NetworkDataPart } from './transformers.js';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAC3D,YAAY,EACV,gBAAgB,EAChB,uBAAuB,EACvB,wBAAwB,EACxB,mBAAmB,GACpB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACvE,YAAY,EAAE,oBAAoB,EAAE,2BAA2B,EAAE,4BAA4B,EAAE,MAAM,kBAAkB,CAAC;AACxH,YAAY,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACpE,YAAY,EAAE,mBAAmB,EAAE,0BAA0B,EAAE,2BAA2B,EAAE,MAAM,iBAAiB,CAAC;AACpH,YAAY,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACtD,YAAY,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAEpD,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAGnE,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,YAAY,EAAE,iBAAiB,EAAE,uBAAuB,EAAE,+BAA+B,EAAE,MAAM,cAAc,CAAC;AAGhH,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAC3D,YAAY,EACV,gBAAgB,EAChB,uBAAuB,EACvB,wBAAwB,EACxB,mBAAmB,GACpB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,aAAa,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACvE,YAAY,EAAE,oBAAoB,EAAE,2BAA2B,EAAE,4BAA4B,EAAE,MAAM,kBAAkB,CAAC;AACxH,YAAY,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACpE,YAAY,EAAE,mBAAmB,EAAE,0BAA0B,EAAE,2BAA2B,EAAE,MAAM,iBAAiB,CAAC;AACpH,YAAY,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACtD,YAAY,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAEpD,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAGnE,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,YAAY,EAAE,iBAAiB,EAAE,uBAAuB,EAAE,+BAA+B,EAAE,MAAM,cAAc,CAAC;AAGhH,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC"}

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",
@@ -12169,6 +12198,45 @@ function convertFullStreamChunkToUIMessageStream({
 
 // src/transformers.ts
 var PRIMITIVE_CACHE_SYMBOL = /* @__PURE__ */ Symbol("primitive-cache");
+function cloneWorkflowStep(step, includeOutput) {
+  return {
+    name: step.name,
+    status: step.status,
+    input: step.input,
+    output: includeOutput ? step.output : null,
+    suspendPayload: step.suspendPayload,
+    resumePayload: step.resumePayload
+  };
+}
+function serializeWorkflowSteps(steps, { includeOutputs }) {
+  return Object.fromEntries(Object.entries(steps).map(([id, step]) => [id, cloneWorkflowStep(step, includeOutputs)]));
+}
+function createWorkflowDataPart(args) {
+  const { current, isNested, runId, status, includeOutputs = false, output = null } = args;
+  return {
+    type: isNested ? "data-tool-workflow" : "data-workflow",
+    id: runId,
+    data: {
+      name: current.name,
+      status,
+      steps: serializeWorkflowSteps(current.steps, { includeOutputs }),
+      output
+    }
+  };
+}
+function createWorkflowStepDataPart(args) {
+  const { current, isNested, runId, status, stepId } = args;
+  return {
+    type: isNested ? "data-tool-workflow-step" : "data-workflow-step",
+    id: `${runId}:${stepId}`,
+    data: {
+      name: current.name,
+      status,
+      stepId,
+      step: cloneWorkflowStep(current.steps[stepId], true)
+    }
+  };
+}
 function createWorkflowStreamToAISDKTransformer(convertMastraChunkToAISDK, {
   includeTextStreamParts,
   sendReasoning,
@@ -12198,7 +12266,15 @@ function createWorkflowStreamToAISDKTransformer(convertMastraChunkToAISDK, {
         },
         convertMastraChunkToAISDK
       );
-      if (transformed) controller.enqueue(transformed);
+      if (transformed) {
+        if (Array.isArray(transformed)) {
+          for (const item of transformed) {
+            controller.enqueue(item);
+          }
+        } else {
+          controller.enqueue(transformed);
+        }
+      }
     }
   });
 }
@@ -12286,41 +12362,64 @@ 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 (workflowChunk) {
+              if (Array.isArray(workflowChunk)) {
+                for (const item of workflowChunk) {
+                  controller.enqueue(item);
+                }
+              } else {
+                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) {
@@ -12573,16 +12672,12 @@ function transformWorkflow(payload, bufferedWorkflows, isNested, includeTextStre
         name: payload.payload.workflowId,
         steps: {}
       });
-      return {
-        type: isNested ? "data-tool-workflow" : "data-workflow",
-        id: payload.runId,
-        data: {
-          name: bufferedWorkflows.get(payload.runId).name,
-          status: "running",
-          steps: bufferedWorkflows.get(payload.runId).steps,
-          output: null
-        }
-      };
+      return createWorkflowDataPart({
+        current: bufferedWorkflows.get(payload.runId),
+        isNested,
+        runId: payload.runId,
+        status: "running"
+      });
     case "workflow-step-start": {
       const current = bufferedWorkflows.get(payload.runId) || { name: "", steps: {} };
       current.steps[payload.payload.id] = {
@@ -12594,16 +12689,12 @@ function transformWorkflow(payload, bufferedWorkflows, isNested, includeTextStre
         resumePayload: null
       };
       bufferedWorkflows.set(payload.runId, current);
-      return {
-        type: isNested ? "data-tool-workflow" : "data-workflow",
-        id: payload.runId,
-        data: {
-          name: current.name,
-          status: "running",
-          steps: current.steps,
-          output: null
-        }
-      };
+      return createWorkflowDataPart({
+        current,
+        isNested,
+        runId: payload.runId,
+        status: "running"
+      });
     }
     case "workflow-step-result": {
       const current = bufferedWorkflows.get(payload.runId);
@@ -12613,16 +12704,21 @@ function transformWorkflow(payload, bufferedWorkflows, isNested, includeTextStre
         status: payload.payload.status,
         output: payload.payload.output ?? null
       };
-      return {
-        type: isNested ? "data-tool-workflow" : "data-workflow",
-        id: payload.runId,
-        data: {
-          name: current.name,
+      return [
+        createWorkflowDataPart({
+          current,
+          isNested,
+          runId: payload.runId,
+          status: "running"
+        }),
+        createWorkflowStepDataPart({
+          current,
+          isNested,
+          runId: payload.runId,
           status: "running",
-          steps: current.steps,
-          output: null
-        }
-      };
+          stepId: payload.payload.id
+        })
+      ];
     }
     case "workflow-step-suspended": {
       const current = bufferedWorkflows.get(payload.runId);
@@ -12634,35 +12730,50 @@ function transformWorkflow(payload, bufferedWorkflows, isNested, includeTextStre
         resumePayload: payload.payload.resumePayload ?? null,
         output: null
       };
-      return {
-        type: isNested ? "data-tool-workflow" : "data-workflow",
-        id: payload.runId,
-        data: {
-          name: current.name,
+      return [
+        createWorkflowDataPart({
+          current,
+          isNested,
+          runId: payload.runId,
+          status: "suspended"
+        }),
+        createWorkflowStepDataPart({
+          current,
+          isNested,
+          runId: payload.runId,
           status: "suspended",
-          steps: current.steps,
-          output: null
-        }
-      };
+          stepId: payload.payload.id
+        })
+      ];
     }
     case "workflow-finish": {
       const current = bufferedWorkflows.get(payload.runId);
       if (!current) return null;
-      return {
-        type: isNested ? "data-tool-workflow" : "data-workflow",
-        id: payload.runId,
-        data: {
-          name: current.name,
-          steps: current.steps,
-          output: payload.payload.output ?? null,
-          status: payload.payload.workflowStatus
-        }
-      };
+      return createWorkflowDataPart({
+        current,
+        isNested,
+        runId: payload.runId,
+        status: payload.payload.workflowStatus,
+        includeOutputs: true,
+        output: payload.payload.output ?? null
+      });
     }
     case "workflow-step-output": {
       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,
@@ -13030,15 +13141,16 @@ function transformNetwork(payload, bufferedNetworks, isNested) {
         }
         step[PRIMITIVE_CACHE_SYMBOL] = step[PRIMITIVE_CACHE_SYMBOL] || /* @__PURE__ */ new Map();
         const result = transformWorkflow(payload.payload, step[PRIMITIVE_CACHE_SYMBOL]);
-        if (result && "data" in result) {
-          const data = result.data;
+        const workflowResult = Array.isArray(result) ? result.find((item) => item?.type === "data-workflow" || item?.type === "data-tool-workflow") : result;
+        if (workflowResult && "data" in workflowResult) {
+          const data = workflowResult.data;
           step.task = data;
           if (data.name && step.task) {
             step.task.id = data.name;
           }
         }
         bufferedNetworks.set(payload.runId, current);
-        return {
+        const networkChunk = {
           type: isNested ? "data-tool-network" : "data-network",
           id: payload.runId,
           data: {
@@ -13046,6 +13158,10 @@ function transformNetwork(payload, bufferedNetworks, isNested) {
             status: "running"
           }
         };
+        if (Array.isArray(result)) {
+          return [networkChunk, ...result.filter((r) => r != null)];
+        }
+        return networkChunk;
       }
       if (isDataChunkType(payload)) {
         if (!("data" in payload)) {
@@ -13160,6 +13276,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 +13327,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 +13351,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,