@mastra/ai-sdk 1.0.0-beta.4 → 1.0.0-beta.6

package/dist/index.d.ts

@@ -1,10 +1,10 @@
-export { chatRoute } from './chat-route.js';
-export type { chatRouteOptions } from './chat-route.js';
-export { workflowRoute } from './workflow-route.js';
-export type { WorkflowRouteOptions } from './workflow-route.js';
+export { chatRoute, handleChatStream } from './chat-route.js';
+export type { chatRouteOptions, ChatStreamHandlerParams, ChatStreamHandlerOptions } 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 { networkRoute } from './network-route.js';
-export type { NetworkRouteOptions } from './network-route.js';
+export { networkRoute, handleNetworkStream } from './network-route.js';
+export type { NetworkRouteOptions, NetworkStreamHandlerParams, NetworkStreamHandlerOptions } from './network-route.js';
 export type { NetworkDataPart } from './transformers.js';
 export type { AgentDataPart } from './transformers.js';
 export { toAISdkV5Stream as toAISdkStream } from './convert-streams.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,MAAM,cAAc,CAAC;AACzC,YAAY,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,YAAY,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,YAAY,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,YAAY,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAC3D,YAAY,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACtD,YAAY,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAEpD,OAAO,EAAE,eAAe,IAAI,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAGrE,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,EAAE,gBAAgB,EAAE,uBAAuB,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AACxG,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,eAAe,IAAI,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAGrE,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC"}

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);
@@ -490,7 +515,9 @@ function convertFullStreamChunkToUIMessageStream({
 
 // src/transformers.ts
 var PRIMITIVE_CACHE_SYMBOL = Symbol("primitive-cache");
-function WorkflowStreamToAISDKTransformer() {
+function WorkflowStreamToAISDKTransformer({
+  includeTextStreamParts
+} = {}) {
   const bufferedWorkflows = /* @__PURE__ */ new Map();
   return new TransformStream({
     start(controller) {
@@ -504,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);
     }
   });
@@ -725,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, {
@@ -820,6 +847,16 @@ 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(
@@ -1120,7 +1157,7 @@ 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) {
+        if (result && "data" in result) {
           const data = result.data;
           step.task = data;
           if (data.name && step.task) {
@@ -1171,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());
@@ -1191,6 +1231,57 @@ function toAISdkV5Stream(stream, options = {
 }
 
 // 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,
@@ -1227,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",
@@ -1297,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");
@@ -1310,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.getAgentById(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
@@ -1350,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");
@@ -1403,9 +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 requestContext = c.get("requestContext");
+      const contextRequestContext = c.get("requestContext");
       let workflowToUse = workflow;
       if (!workflow) {
         const workflowId = c.req.param("workflowId");
@@ -1419,28 +1525,47 @@ function workflowRoute({
       if (!workflowToUse) {
         throw new Error("Workflow ID is required");
       }
-      const workflowObj = mastra.getWorkflowById(workflowToUse);
-      if (!workflowObj) {
-        throw new Error(`Workflow ${workflowToUse} not found`);
-      }
-      if (requestContext && rest.requestContext) {
+      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, requestContext: requestContext || rest.requestContext }) : run.stream({ inputData, ...rest, requestContext: requestContext || rest.requestContext });
-      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,
@@ -1501,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) {
@@ -1516,20 +1641,11 @@ function networkRoute({
       if (!agentToUse) {
         throw new Error("Agent ID is required");
       }
-      const agentObj = mastra.getAgentById(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 });
     }
@@ -1543,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