@mastra/ai-sdk 1.0.0-beta.3 → 1.0.0-beta.5

package/dist/index.js

@@ -8,6 +8,31 @@ import { DefaultGeneratedFile, DefaultGeneratedFileWithType } from '@mastra/core
 var isDataChunkType = (chunk) => {
   return chunk && typeof chunk === "object" && "type" in chunk && chunk.type?.startsWith("data-");
 };
+var isMastraTextStreamChunk = (chunk) => {
+  return chunk && typeof chunk === "object" && "type" in chunk && typeof chunk.type === "string" && [
+    "text-start",
+    "text-delta",
+    "text-end",
+    "reasoning-start",
+    "reasoning-delta",
+    "reasoning-end",
+    "file",
+    "source",
+    "tool-input-start",
+    "tool-input-delta",
+    "tool-call",
+    "tool-result",
+    "tool-error",
+    "error",
+    "start-step",
+    "finish-step",
+    "start",
+    "finish",
+    "abort",
+    "tool-input-end",
+    "raw"
+  ].includes(chunk.type);
+};
 function safeParseErrorObject(obj) {
   if (typeof obj !== "object" || obj === null) {
     return String(obj);
@@ -138,6 +163,28 @@ function convertMastraChunkToAISDKv5({
         toolName: chunk.payload.toolName,
         input: chunk.payload.args
       };
+    case "tool-call-approval":
+      return {
+        type: "data-tool-call-approval",
+        id: chunk.payload.toolCallId,
+        data: {
+          runId: chunk.runId,
+          toolCallId: chunk.payload.toolCallId,
+          toolName: chunk.payload.toolName,
+          args: chunk.payload.args
+        }
+      };
+    case "tool-call-suspended":
+      return {
+        type: "data-tool-call-suspended",
+        id: chunk.payload.toolCallId,
+        data: {
+          runId: chunk.runId,
+          toolCallId: chunk.payload.toolCallId,
+          toolName: chunk.payload.toolName,
+          suspendPayload: chunk.payload.suspendPayload
+        }
+      };
     case "tool-call-input-streaming-start":
       return {
         type: "tool-input-start",
@@ -467,7 +514,10 @@ function convertFullStreamChunkToUIMessageStream({
 }
 
 // src/transformers.ts
-function WorkflowStreamToAISDKTransformer() {
+var PRIMITIVE_CACHE_SYMBOL = Symbol("primitive-cache");
+function WorkflowStreamToAISDKTransformer({
+  includeTextStreamParts
+} = {}) {
   const bufferedWorkflows = /* @__PURE__ */ new Map();
   return new TransformStream({
     start(controller) {
@@ -481,7 +531,7 @@ function WorkflowStreamToAISDKTransformer() {
       });
     },
     transform(chunk, controller) {
-      const transformed = transformWorkflow(chunk, bufferedWorkflows);
+      const transformed = transformWorkflow(chunk, bufferedWorkflows, false, includeTextStreamParts);
       if (transformed) controller.enqueue(transformed);
     }
   });
@@ -510,7 +560,9 @@ function AgentStreamToAISDKTransformer({
   sendStart,
   sendFinish,
   sendReasoning,
-  sendSources
+  sendSources,
+  messageMetadata,
+  onError
 }) {
   let bufferedSteps = /* @__PURE__ */ new Map();
   let tripwireOccurred = false;
@@ -528,11 +580,12 @@ function AgentStreamToAISDKTransformer({
         part,
         sendReasoning,
         sendSources,
+        messageMetadataValue: messageMetadata?.({ part }),
         sendStart,
         sendFinish,
         responseMessageId: lastMessageId,
         onError(error) {
-          return safeParseErrorObject(error);
+          return onError ? onError(error) : safeParseErrorObject(error);
         }
       });
       if (transformedChunk) {
@@ -699,7 +752,7 @@ function transformAgent(payload, bufferedSteps) {
   }
   return null;
 }
-function transformWorkflow(payload, bufferedWorkflows, isNested) {
+function transformWorkflow(payload, bufferedWorkflows, isNested, includeTextStreamParts) {
   switch (payload.type) {
     case "workflow-start":
       bufferedWorkflows.set(payload.runId, {
@@ -792,6 +845,29 @@ function transformWorkflow(payload, bufferedWorkflows, isNested) {
         }
       };
     }
+    case "workflow-step-output": {
+      const output = payload.payload.output;
+      if (includeTextStreamParts && output && isMastraTextStreamChunk(output)) {
+        const part = convertMastraChunkToAISDKv5({ chunk: output, mode: "stream" });
+        const transformedChunk = convertFullStreamChunkToUIMessageStream({
+          part,
+          onError(error) {
+            return safeParseErrorObject(error);
+          }
+        });
+        return transformedChunk;
+      }
+      if (output && isDataChunkType(output)) {
+        if (!("data" in output)) {
+          throw new Error(
+            `UI Messages require a data property when using data- prefixed chunks 
+ ${JSON.stringify(output)}`
+          );
+        }
+        return output;
+      }
+      return null;
+    }
     default: {
       if (isDataChunkType(payload)) {
         if (!("data" in payload)) {
@@ -811,12 +887,29 @@ function transformNetwork(payload, bufferedNetworks, isNested) {
     case "routing-agent-start": {
       if (!bufferedNetworks.has(payload.runId)) {
         bufferedNetworks.set(payload.runId, {
-          name: payload.payload.agentId,
+          name: payload.payload.networkId,
           steps: [],
           usage: null,
           output: null
         });
       }
+      const current = bufferedNetworks.get(payload.runId);
+      current.steps.push({
+        id: payload.payload.runId,
+        name: payload.payload.agentId,
+        status: "running",
+        iteration: payload.payload.inputData.iteration,
+        input: {
+          task: payload.payload.inputData.task,
+          threadId: payload.payload.inputData.threadId,
+          threadResourceId: payload.payload.inputData.threadResourceId
+        },
+        output: "",
+        task: null,
+        suspendPayload: null,
+        resumePayload: null,
+        [PRIMITIVE_CACHE_SYMBOL]: /* @__PURE__ */ new Map()
+      });
       return {
         type: isNested ? "data-tool-network" : "data-network",
         id: payload.runId,
@@ -847,14 +940,19 @@ function transformNetwork(payload, bufferedNetworks, isNested) {
       };
     }
     case "agent-execution-start": {
-      const current = bufferedNetworks.get(payload.runId) || { name: "", steps: [], usage: null, output: null };
+      const current = bufferedNetworks.get(payload.runId);
+      if (!current) return null;
       current.steps.push({
+        id: payload.payload.runId,
         name: payload.payload.agentId,
         status: "running",
-        input: payload.payload.args || null,
+        iteration: payload.payload.args?.iteration ?? 0,
+        input: { prompt: payload.payload.args?.prompt ?? "" },
         output: null,
+        task: null,
         suspendPayload: null,
-        resumePayload: null
+        resumePayload: null,
+        [PRIMITIVE_CACHE_SYMBOL]: /* @__PURE__ */ new Map()
       });
       bufferedNetworks.set(payload.runId, current);
       return {
@@ -867,14 +965,19 @@ function transformNetwork(payload, bufferedNetworks, isNested) {
       };
     }
     case "workflow-execution-start": {
-      const current = bufferedNetworks.get(payload.runId) || { name: "", steps: [], usage: null, output: null };
+      const current = bufferedNetworks.get(payload.runId);
+      if (!current) return null;
       current.steps.push({
-        name: payload.payload.name,
+        id: payload.payload.runId,
+        name: payload.payload.workflowId,
         status: "running",
-        input: payload.payload.args || null,
+        iteration: payload.payload.args?.iteration ?? 0,
+        input: { prompt: payload.payload.args?.prompt ?? "" },
         output: null,
+        task: null,
         suspendPayload: null,
-        resumePayload: null
+        resumePayload: null,
+        [PRIMITIVE_CACHE_SYMBOL]: /* @__PURE__ */ new Map()
       });
       bufferedNetworks.set(payload.runId, current);
       return {
@@ -887,14 +990,21 @@ function transformNetwork(payload, bufferedNetworks, isNested) {
       };
     }
     case "tool-execution-start": {
-      const current = bufferedNetworks.get(payload.runId) || { name: "", steps: [], usage: null, output: null };
+      const current = bufferedNetworks.get(payload.runId);
+      if (!current) return null;
       current.steps.push({
+        id: payload.payload.args.toolCallId,
         name: payload.payload.args?.toolName,
         status: "running",
+        iteration: payload.payload.args?.iteration ? Number(payload.payload.args.iteration) : 0,
+        task: {
+          id: payload.payload.args?.toolName
+        },
         input: payload.payload.args?.args || null,
         output: null,
         suspendPayload: null,
-        resumePayload: null
+        resumePayload: null,
+        [PRIMITIVE_CACHE_SYMBOL]: /* @__PURE__ */ new Map()
       });
       bufferedNetworks.set(payload.runId, current);
       return {
@@ -909,14 +1019,13 @@ function transformNetwork(payload, bufferedNetworks, isNested) {
     case "agent-execution-end": {
       const current = bufferedNetworks.get(payload.runId);
       if (!current) return null;
-      current.steps.push({
-        name: payload.payload.agentId,
-        status: "success",
-        input: null,
-        output: payload.payload.result,
-        suspendPayload: null,
-        resumePayload: null
-      });
+      const stepId = payload.payload.runId;
+      const step = current.steps.find((step2) => step2.id === stepId);
+      if (!step) {
+        return null;
+      }
+      step.status = "success";
+      step.output = payload.payload.result;
       return {
         type: isNested ? "data-tool-network" : "data-network",
         id: payload.runId,
@@ -931,14 +1040,13 @@ function transformNetwork(payload, bufferedNetworks, isNested) {
     case "tool-execution-end": {
       const current = bufferedNetworks.get(payload.runId);
       if (!current) return null;
-      current.steps.push({
-        name: payload.payload.toolName,
-        status: "success",
-        input: null,
-        output: payload.payload.result,
-        suspendPayload: null,
-        resumePayload: null
-      });
+      const stepId = payload.payload.toolCallId;
+      const step = current.steps.find((step2) => step2.id === stepId);
+      if (!step) {
+        return null;
+      }
+      step.status = "success";
+      step.output = payload.payload.result;
       return {
         type: isNested ? "data-tool-network" : "data-network",
         id: payload.runId,
@@ -952,14 +1060,13 @@ function transformNetwork(payload, bufferedNetworks, isNested) {
     case "workflow-execution-end": {
       const current = bufferedNetworks.get(payload.runId);
       if (!current) return null;
-      current.steps.push({
-        name: payload.payload.name,
-        status: "success",
-        input: null,
-        output: payload.payload.result,
-        suspendPayload: null,
-        resumePayload: null
-      });
+      const stepId = payload.payload.runId;
+      const step = current.steps.find((step2) => step2.id === stepId);
+      if (!step) {
+        return null;
+      }
+      step.status = "success";
+      step.output = payload.payload.result;
       return {
         type: isNested ? "data-tool-network" : "data-network",
         id: payload.runId,
@@ -974,12 +1081,24 @@ function transformNetwork(payload, bufferedNetworks, isNested) {
     case "routing-agent-end": {
       const current = bufferedNetworks.get(payload.runId);
       if (!current) return null;
+      const stepId = payload.payload.runId;
+      const step = current.steps.find((step2) => step2.id === stepId);
+      if (!step) {
+        return null;
+      }
+      step.status = "success";
+      step.task = {
+        id: payload.payload.primitiveId,
+        type: payload.payload.primitiveType,
+        name: payload.payload.task,
+        reason: payload.payload.selectionReason
+      };
+      step.output = payload.payload.result;
       return {
         type: isNested ? "data-tool-network" : "data-network",
         id: payload.runId,
         data: {
           ...current,
-          status: "finished",
           usage: payload.payload?.usage ?? current.usage,
           output: payload.payload?.result ?? current.output
         }
@@ -1013,6 +1132,39 @@ function transformNetwork(payload, bufferedNetworks, isNested) {
       };
     }
     default: {
+      if (payload.type.startsWith("agent-execution-event-")) {
+        const stepId = payload.payload.runId;
+        const current = bufferedNetworks.get(payload.runId);
+        if (!current) return null;
+        const step = current.steps.find((step2) => step2.id === stepId);
+        if (!step) {
+          return null;
+        }
+        step[PRIMITIVE_CACHE_SYMBOL] = step[PRIMITIVE_CACHE_SYMBOL] || /* @__PURE__ */ new Map();
+        const result = transformAgent(payload.payload, step[PRIMITIVE_CACHE_SYMBOL]);
+        if (result) {
+          const { request, response, ...data } = result.data;
+          step.task = data;
+        }
+      }
+      if (payload.type.startsWith("workflow-execution-event-")) {
+        const stepId = payload.payload.runId;
+        const current = bufferedNetworks.get(payload.runId);
+        if (!current) return null;
+        const step = current.steps.find((step2) => step2.id === stepId);
+        if (!step) {
+          return null;
+        }
+        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;
+          step.task = data;
+          if (data.name && step.task) {
+            step.task.id = data.name;
+          }
+        }
+      }
       if (isDataChunkType(payload)) {
         if (!("data" in payload)) {
           throw new Error(
@@ -1020,7 +1172,8 @@ function transformNetwork(payload, bufferedNetworks, isNested) {
  ${JSON.stringify(payload)}`
           );
         }
-        return payload;
+        const { type, data } = payload;
+        return { type, data };
       }
       if (isAgentExecutionDataChunkType(payload)) {
         if (!("data" in payload.payload)) {
@@ -1029,7 +1182,8 @@ function transformNetwork(payload, bufferedNetworks, isNested) {
  ${JSON.stringify(payload)}`
           );
         }
-        return payload.payload;
+        const { type, data } = payload.payload;
+        return { type, data };
       }
       if (isWorkflowExecutionDataChunkType(payload)) {
         if (!("data" in payload.payload)) {
@@ -1038,7 +1192,8 @@ function transformNetwork(payload, bufferedNetworks, isNested) {
  ${JSON.stringify(payload)}`
           );
         }
-        return payload.payload;
+        const { type, data } = payload.payload;
+        return { type, data };
       }
       return null;
     }
@@ -1053,7 +1208,10 @@ function toAISdkV5Stream(stream, options = {
 }) {
   const from = options?.from;
   if (from === "workflow") {
-    return stream.pipeThrough(WorkflowStreamToAISDKTransformer());
+    const includeTextStreamParts = options?.includeTextStreamParts ?? true;
+    return stream.pipeThrough(
+      WorkflowStreamToAISDKTransformer({ includeTextStreamParts })
+    );
   }
   if (from === "network") {
     return stream.pipeThrough(AgentNetworkToAISDKTransformer());
@@ -1065,12 +1223,65 @@ function toAISdkV5Stream(stream, options = {
       sendStart: options?.sendStart,
       sendFinish: options?.sendFinish,
       sendReasoning: options?.sendReasoning,
-      sendSources: options?.sendSources
+      sendSources: options?.sendSources,
+      messageMetadata: options?.messageMetadata,
+      onError: options?.onError
     })
   );
 }
 
 // src/chat-route.ts
+async function handleChatStream({
+  mastra,
+  agentId,
+  params,
+  defaultOptions,
+  sendStart = true,
+  sendFinish = true,
+  sendReasoning = false,
+  sendSources = false
+}) {
+  const { messages, resumeData, runId, requestContext, ...rest } = params;
+  if (resumeData && !runId) {
+    throw new Error("runId is required when resumeData is provided");
+  }
+  const agentObj = mastra.getAgentById(agentId);
+  if (!agentObj) {
+    throw new Error(`Agent ${agentId} not found`);
+  }
+  if (!Array.isArray(messages)) {
+    throw new Error("Messages must be an array of UIMessage objects");
+  }
+  const mergedOptions = {
+    ...defaultOptions,
+    ...rest,
+    ...runId && { runId },
+    requestContext: requestContext || defaultOptions?.requestContext
+  };
+  const result = resumeData ? await agentObj.resumeStream(resumeData, mergedOptions) : await agentObj.stream(messages, mergedOptions);
+  let lastMessageId;
+  if (messages.length) {
+    const lastMessage = messages[messages.length - 1];
+    if (lastMessage?.role === "assistant") {
+      lastMessageId = lastMessage.id;
+    }
+  }
+  return createUIMessageStream({
+    originalMessages: messages,
+    execute: async ({ writer }) => {
+      for await (const part of toAISdkV5Stream(result, {
+        from: "agent",
+        lastMessageId,
+        sendStart,
+        sendFinish,
+        sendReasoning,
+        sendSources
+      })) {
+        writer.write(part);
+      }
+    }
+  });
+}
 function chatRoute({
   path = "/chat/:agentId",
   agent,
@@ -1107,6 +1318,14 @@ function chatRoute({
             schema: {
               type: "object",
               properties: {
+                resumeData: {
+                  type: "object",
+                  description: "Resume data for the agent"
+                },
+                runId: {
+                  type: "string",
+                  description: "The run ID required when resuming an agent execution"
+                },
                 messages: {
                   type: "array",
                   description: "Array of messages in the conversation",
@@ -1177,9 +1396,9 @@ function chatRoute({
       }
     },
     handler: async (c) => {
-      const { messages, ...rest } = await c.req.json();
+      const params = await c.req.json();
       const mastra = c.get("mastra");
-      const requestContext = c.get("requestContext");
+      const contextRequestContext = c.get("requestContext");
       let agentToUse = agent;
       if (!agent) {
         const agentId = c.req.param("agentId");
@@ -1190,39 +1409,24 @@ function chatRoute({
           `Fixed agent ID was set together with an agentId path parameter. This can lead to unexpected behavior.`
         );
       }
-      if (requestContext && defaultOptions?.requestContext) {
+      if (contextRequestContext && defaultOptions?.requestContext) {
         mastra.getLogger()?.warn(`"requestContext" set in the route options will be overridden by the request's "requestContext".`);
       }
       if (!agentToUse) {
         throw new Error("Agent ID is required");
       }
-      const agentObj = mastra.getAgent(agentToUse);
-      if (!agentObj) {
-        throw new Error(`Agent ${agentToUse} not found`);
-      }
-      const result = await agentObj.stream(messages, {
-        ...defaultOptions,
-        ...rest,
-        requestContext: requestContext || defaultOptions?.requestContext
-      });
-      let lastMessageId;
-      if (messages.length > 0 && messages[messages.length - 1].role === "assistant") {
-        lastMessageId = messages[messages.length - 1].id;
-      }
-      const uiMessageStream = createUIMessageStream({
-        originalMessages: messages,
-        execute: async ({ writer }) => {
-          for await (const part of toAISdkV5Stream(result, {
-            from: "agent",
-            lastMessageId,
-            sendStart,
-            sendFinish,
-            sendReasoning,
-            sendSources
-          })) {
-            writer.write(part);
-          }
-        }
+      const uiMessageStream = await handleChatStream({
+        mastra,
+        agentId: agentToUse,
+        params: {
+          ...params,
+          requestContext: contextRequestContext || params.requestContext
+        },
+        defaultOptions,
+        sendStart,
+        sendFinish,
+        sendReasoning,
+        sendSources
       });
       return createUIMessageStreamResponse({
         stream: uiMessageStream
@@ -1230,9 +1434,31 @@ function chatRoute({
     }
   });
 }
+async function handleWorkflowStream({
+  mastra,
+  workflowId,
+  params,
+  includeTextStreamParts = true
+}) {
+  const { runId, resourceId, inputData, resumeData, requestContext, ...rest } = params;
+  const workflowObj = mastra.getWorkflowById(workflowId);
+  if (!workflowObj) {
+    throw new Error(`Workflow ${workflowId} not found`);
+  }
+  const run = await workflowObj.createRun({ runId, resourceId, ...rest });
+  const stream = resumeData ? run.resumeStream({ resumeData, ...rest, requestContext }) : run.stream({ inputData, ...rest, requestContext });
+  return createUIMessageStream({
+    execute: async ({ writer }) => {
+      for await (const part of toAISdkV5Stream(stream, { from: "workflow", includeTextStreamParts })) {
+        writer.write(part);
+      }
+    }
+  });
+}
 function workflowRoute({
   path = "/api/workflows/:workflowId/stream",
-  workflow
+  workflow,
+  includeTextStreamParts = true
 }) {
   if (!workflow && !path.includes("/:workflowId")) {
     throw new Error("Path must include :workflowId to route to the correct workflow or pass the workflow explicitly");
@@ -1283,8 +1509,9 @@ function workflowRoute({
       }
     },
     handler: async (c) => {
-      const { runId, resourceId, inputData, resumeData, ...rest } = await c.req.json();
+      const params = await c.req.json();
       const mastra = c.get("mastra");
+      const contextRequestContext = c.get("requestContext");
       let workflowToUse = workflow;
       if (!workflow) {
         const workflowId = c.req.param("workflowId");
@@ -1298,23 +1525,47 @@ function workflowRoute({
       if (!workflowToUse) {
         throw new Error("Workflow ID is required");
       }
-      const workflowObj = mastra.getWorkflow(workflowToUse);
-      if (!workflowObj) {
-        throw new Error(`Workflow ${workflowToUse} not found`);
+      if (contextRequestContext && params.requestContext) {
+        mastra.getLogger()?.warn(
+          `"requestContext" from the request body will be ignored because "requestContext" is already set in the route options.`
+        );
       }
-      const run = await workflowObj.createRun({ runId, resourceId, ...rest });
-      const stream = resumeData ? run.resumeStream({ resumeData, ...rest }) : run.stream({ inputData, ...rest });
-      const uiMessageStream = createUIMessageStream({
-        execute: async ({ writer }) => {
-          for await (const part of toAISdkV5Stream(stream, { from: "workflow" })) {
-            writer.write(part);
-          }
-        }
+      const uiMessageStream = await handleWorkflowStream({
+        mastra,
+        workflowId: workflowToUse,
+        params: {
+          ...params,
+          requestContext: contextRequestContext || params.requestContext
+        },
+        includeTextStreamParts
       });
       return createUIMessageStreamResponse({ stream: uiMessageStream });
     }
   });
 }
+async function handleNetworkStream({
+  mastra,
+  agentId,
+  params,
+  defaultOptions
+}) {
+  const { messages, ...rest } = params;
+  const agentObj = mastra.getAgentById(agentId);
+  if (!agentObj) {
+    throw new Error(`Agent ${agentId} not found`);
+  }
+  const result = await agentObj.network(messages, {
+    ...defaultOptions,
+    ...rest
+  });
+  return createUIMessageStream({
+    execute: async ({ writer }) => {
+      for await (const part of toAISdkV5Stream(result, { from: "network" })) {
+        writer.write(part);
+      }
+    }
+  });
+}
 function networkRoute({
   path = "/network/:agentId",
   agent,
@@ -1375,7 +1626,7 @@ function networkRoute({
       }
     },
     handler: async (c) => {
-      const { messages, ...rest } = await c.req.json();
+      const params = await c.req.json();
       const mastra = c.get("mastra");
       let agentToUse = agent;
       if (!agent) {
@@ -1390,20 +1641,11 @@ function networkRoute({
       if (!agentToUse) {
         throw new Error("Agent ID is required");
       }
-      const agentObj = mastra.getAgent(agentToUse);
-      if (!agentObj) {
-        throw new Error(`Agent ${agentToUse} not found`);
-      }
-      const result = await agentObj.network(messages, {
-        ...defaultOptions,
-        ...rest
-      });
-      const uiMessageStream = createUIMessageStream({
-        execute: async ({ writer }) => {
-          for await (const part of toAISdkV5Stream(result, { from: "network" })) {
-            writer.write(part);
-          }
-        }
+      const uiMessageStream = await handleNetworkStream({
+        mastra,
+        agentId: agentToUse,
+        params,
+        defaultOptions
       });
       return createUIMessageStreamResponse({ stream: uiMessageStream });
     }
@@ -1417,6 +1659,6 @@ function toAISdkFormat() {
   );
 }
 
-export { chatRoute, networkRoute, toAISdkFormat, toAISdkV5Stream as toAISdkStream, workflowRoute };
+export { chatRoute, handleChatStream, handleNetworkStream, handleWorkflowStream, networkRoute, toAISdkFormat, toAISdkV5Stream as toAISdkStream, workflowRoute };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map