@mastra/ai-sdk 0.3.1 → 0.3.2-alpha.0

package/dist/__tests__/__fixtures__/network.stream.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"network.stream.d.ts","sourceRoot":"","sources":["../../../src/__tests__/__fixtures__/network.stream.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAu9FhC,CAAC"}

package/dist/helpers.d.ts

@@ -1,5 +1,4 @@
-import type { ChunkType } from '@mastra/core';
-import type { PartialSchemaOutput, OutputSchema, DataChunkType } from '@mastra/core/stream';
+import type { ChunkType, PartialSchemaOutput, OutputSchema, DataChunkType } from '@mastra/core/stream';
 import type { InferUIMessageChunk, ObjectStreamPart, TextStreamPart, ToolSet, UIMessage } from 'ai';
 export type OutputChunkType<OUTPUT extends OutputSchema = undefined> = TextStreamPart<ToolSet> | ObjectStreamPart<PartialSchemaOutput<OUTPUT>> | DataChunkType | undefined;
 export type ToolAgentChunkType = {

package/dist/helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE9C,OAAO,KAAK,EAAE,mBAAmB,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAE5F,OAAO,KAAK,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,cAAc,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AAGpG,MAAM,MAAM,eAAe,CAAC,MAAM,SAAS,YAAY,GAAG,SAAS,IAC/D,cAAc,CAAC,OAAO,CAAC,GACvB,gBAAgB,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,GAC7C,aAAa,GACb,SAAS,CAAC;AAEd,MAAM,MAAM,kBAAkB,GAAG;IAAE,IAAI,EAAE,YAAY,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,GAAG,CAAA;CAAE,CAAC;AAC1F,MAAM,MAAM,qBAAqB,GAAG;IAAE,IAAI,EAAE,eAAe,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,GAAG,CAAA;CAAE,CAAC;AAChG,MAAM,MAAM,oBAAoB,GAAG;IAAE,IAAI,EAAE,cAAc,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,GAAG,CAAA;CAAE,CAAC;AAE9F,wBAAgB,2BAA2B,CAAC,MAAM,SAAS,YAAY,GAAG,SAAS,EAAE,EACnF,KAAK,EACL,IAAe,GAChB,EAAE;IACD,KAAK,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;IACzB,IAAI,CAAC,EAAE,UAAU,GAAG,QAAQ,CAAC;CAC9B,GAAG,eAAe,CAAC,MAAM,CAAC,CAiP1B;AAED,wBAAgB,uCAAuC,CAAC,UAAU,SAAS,SAAS,EAAE,EACpF,IAAI,EACJ,oBAAoB,EACpB,aAAa,EACb,WAAW,EACX,OAAO,EACP,SAAS,EACT,UAAU,EACV,iBAAiB,GAClB,EAAE;IAED,IAAI,EAAE,cAAc,CAAC,OAAO,CAAC,GAAG,aAAa,GAAG;QAAE,IAAI,EAAE,aAAa,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,GAAG,CAAA;KAAE,CAAC;IACzG,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,OAAO,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,MAAM,CAAC;IACpC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B,GAAG,mBAAmB,CAAC,UAAU,CAAC,GAAG,kBAAkB,GAAG,qBAAqB,GAAG,oBAAoB,GAAG,SAAS,CAwOlH"}
+{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,mBAAmB,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEvG,OAAO,KAAK,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,cAAc,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AAGpG,MAAM,MAAM,eAAe,CAAC,MAAM,SAAS,YAAY,GAAG,SAAS,IAC/D,cAAc,CAAC,OAAO,CAAC,GACvB,gBAAgB,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,GAC7C,aAAa,GACb,SAAS,CAAC;AAEd,MAAM,MAAM,kBAAkB,GAAG;IAAE,IAAI,EAAE,YAAY,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,GAAG,CAAA;CAAE,CAAC;AAC1F,MAAM,MAAM,qBAAqB,GAAG;IAAE,IAAI,EAAE,eAAe,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,GAAG,CAAA;CAAE,CAAC;AAChG,MAAM,MAAM,oBAAoB,GAAG;IAAE,IAAI,EAAE,cAAc,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,GAAG,CAAA;CAAE,CAAC;AAE9F,wBAAgB,2BAA2B,CAAC,MAAM,SAAS,YAAY,GAAG,SAAS,EAAE,EACnF,KAAK,EACL,IAAe,GAChB,EAAE;IACD,KAAK,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;IACzB,IAAI,CAAC,EAAE,UAAU,GAAG,QAAQ,CAAC;CAC9B,GAAG,eAAe,CAAC,MAAM,CAAC,CAiP1B;AAED,wBAAgB,uCAAuC,CAAC,UAAU,SAAS,SAAS,EAAE,EACpF,IAAI,EACJ,oBAAoB,EACpB,aAAa,EACb,WAAW,EACX,OAAO,EACP,SAAS,EACT,UAAU,EACV,iBAAiB,GAClB,EAAE;IAED,IAAI,EAAE,cAAc,CAAC,OAAO,CAAC,GAAG,aAAa,GAAG;QAAE,IAAI,EAAE,aAAa,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,GAAG,CAAA;KAAE,CAAC;IACzG,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,OAAO,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,MAAM,CAAC;IACpC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B,GAAG,mBAAmB,CAAC,UAAU,CAAC,GAAG,kBAAkB,GAAG,qBAAqB,GAAG,oBAAoB,GAAG,SAAS,CAyOlH"}

package/dist/index.cjs

@@ -10,6 +10,45 @@ var stream = require('@mastra/core/stream');
 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);
+  }
+  try {
+    const stringified = JSON.stringify(obj);
+    if (stringified === "{}") {
+      return String(obj);
+    }
+    return stringified;
+  } catch {
+    return String(obj);
+  }
+}
 var isAgentExecutionDataChunkType = (chunk) => {
   return chunk && typeof chunk === "object" && "type" in chunk && chunk.type?.startsWith("agent-execution-event-") && "payload" in chunk && typeof chunk.payload === "object" && "type" in chunk.payload && chunk.payload.type?.startsWith("data-");
 };
@@ -477,7 +516,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) {
@@ -491,7 +533,7 @@ function WorkflowStreamToAISDKTransformer() {
       });
     },
     transform(chunk, controller) {
-      const transformed = transformWorkflow(chunk, bufferedWorkflows);
+      const transformed = transformWorkflow(chunk, bufferedWorkflows, false, includeTextStreamParts);
       if (transformed) controller.enqueue(transformed);
     }
   });
@@ -520,7 +562,9 @@ function AgentStreamToAISDKTransformer({
   sendStart,
   sendFinish,
   sendReasoning,
-  sendSources
+  sendSources,
+  messageMetadata,
+  onError
 }) {
   let bufferedSteps = /* @__PURE__ */ new Map();
   let tripwireOccurred = false;
@@ -538,11 +582,12 @@ function AgentStreamToAISDKTransformer({
         part,
         sendReasoning,
         sendSources,
+        messageMetadataValue: messageMetadata?.({ part }),
         sendStart,
         sendFinish,
         responseMessageId: lastMessageId,
-        onError() {
-          return "Error";
+        onError(error) {
+          return onError ? onError(error) : safeParseErrorObject(error);
         }
       });
       if (transformedChunk) {
@@ -709,7 +754,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, {
@@ -802,6 +847,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)) {
@@ -821,12 +889,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,
@@ -857,14 +942,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 {
@@ -877,14 +967,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 {
@@ -897,14 +992,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 {
@@ -919,14 +1021,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,
@@ -941,14 +1042,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,
@@ -962,14 +1062,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,
@@ -984,12 +1083,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
         }
@@ -1023,6 +1134,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(
@@ -1030,7 +1174,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)) {
@@ -1039,7 +1184,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)) {
@@ -1048,7 +1194,8 @@ function transformNetwork(payload, bufferedNetworks, isNested) {
  ${JSON.stringify(payload)}`
           );
         }
-        return payload.payload;
+        const { type, data } = payload.payload;
+        return { type, data };
       }
       return null;
     }
@@ -1063,7 +1210,10 @@ function toAISdkFormat(stream, options = {
 }) {
   const from = options?.from;
   if (from === "workflow") {
-    return stream.pipeThrough(WorkflowStreamToAISDKTransformer());
+    const includeTextStreamParts = options?.includeTextStreamParts ?? false;
+    return stream.pipeThrough(
+      WorkflowStreamToAISDKTransformer({ includeTextStreamParts })
+    );
   }
   if (from === "network") {
     return stream.pipeThrough(AgentNetworkToAISDKTransformer());
@@ -1075,7 +1225,9 @@ function toAISdkFormat(stream, options = {
       sendStart: options?.sendStart,
       sendFinish: options?.sendFinish,
       sendReasoning: options?.sendReasoning,
-      sendSources: options?.sendSources
+      sendSources: options?.sendSources,
+      messageMetadata: options?.messageMetadata,
+      onError: options?.onError
     })
   );
 }
@@ -1206,7 +1358,7 @@ function chatRoute({
       if (!agentToUse) {
         throw new Error("Agent ID is required");
       }
-      const agentObj = mastra.getAgent(agentToUse);
+      const agentObj = mastra.getAgentById(agentToUse);
       if (!agentObj) {
         throw new Error(`Agent ${agentToUse} not found`);
       }
@@ -1242,7 +1394,8 @@ function chatRoute({
 }
 function workflowRoute({
   path = "/api/workflows/:workflowId/stream",
-  workflow
+  workflow,
+  includeTextStreamParts = false
 }) {
   if (!workflow && !path.includes("/:workflowId")) {
     throw new Error("Path must include :workflowId to route to the correct workflow or pass the workflow explicitly");
@@ -1295,6 +1448,7 @@ function workflowRoute({
     handler: async (c) => {
       const { runId, resourceId, inputData, resumeData, ...rest } = await c.req.json();
       const mastra = c.get("mastra");
+      const runtimeContext = c.get("runtimeContext");
       let workflowToUse = workflow;
       if (!workflow) {
         const workflowId = c.req.param("workflowId");
@@ -1308,15 +1462,20 @@ function workflowRoute({
       if (!workflowToUse) {
         throw new Error("Workflow ID is required");
       }
-      const workflowObj = mastra.getWorkflow(workflowToUse);
+      const workflowObj = mastra.getWorkflowById(workflowToUse);
       if (!workflowObj) {
         throw new Error(`Workflow ${workflowToUse} not found`);
       }
+      if (runtimeContext && rest.runtimeContext) {
+        mastra.getLogger()?.warn(
+          `"runtimeContext" from the request body will be ignored because "runtimeContext" is already set in the route options.`
+        );
+      }
       const run = await workflowObj.createRunAsync({ runId, resourceId, ...rest });
-      const stream = resumeData ? run.resumeStream({ resumeData, ...rest }) : run.stream({ inputData, ...rest });
+      const stream = resumeData ? run.resumeStream({ resumeData, ...rest, runtimeContext: runtimeContext || rest.runtimeContext }) : run.stream({ inputData, ...rest, runtimeContext: runtimeContext || rest.runtimeContext });
       const uiMessageStream = ai.createUIMessageStream({
         execute: async ({ writer }) => {
-          for await (const part of toAISdkFormat(stream, { from: "workflow" })) {
+          for await (const part of toAISdkFormat(stream, { from: "workflow", includeTextStreamParts })) {
             writer.write(part);
           }
         }
@@ -1401,7 +1560,7 @@ function networkRoute({
       if (!agentToUse) {
         throw new Error("Agent ID is required");
       }
-      const agentObj = mastra.getAgent(agentToUse);
+      const agentObj = mastra.getAgentById(agentToUse);
       if (!agentObj) {
         throw new Error(`Agent ${agentToUse} not found`);
       }