@mastra/ai-sdk 0.0.0-dynamic-model-router-20251009231604 → 0.0.0-dynamic-model-router-20251010230835

package/CHANGELOG.md

@@ -1,11 +1,48 @@
 # @mastra/ai-sdk
 
-## 0.0.0-dynamic-model-router-20251009231604
+## 0.0.0-dynamic-model-router-20251010230835
+
+### Minor Changes
+
+- Update peer dependencies to match core package version bump (0.20.3) ([#8614](https://github.com/mastra-ai/mastra/pull/8614))
 
 ### Patch Changes
 
-- Updated dependencies [[`07eaf25`](https://github.com/mastra-ai/mastra/commit/07eaf25aada9e42235dbf905854de53da4d8121b), [`0d71771`](https://github.com/mastra-ai/mastra/commit/0d71771f5711164c79f8e80919bc84d6bffeb6bc), [`0d6e55e`](https://github.com/mastra-ai/mastra/commit/0d6e55ecc5a2e689cd4fc9c86525e0eb54d82372), [`68b1111`](https://github.com/mastra-ai/mastra/commit/68b11118a1303f93e9c0c157850c0751309304c5)]:
-  - @mastra/core@0.0.0-dynamic-model-router-20251009231604
+- pass runtimeContext to agent stream options in chatRoute ([#8641](https://github.com/mastra-ai/mastra/pull/8641))
+
+- Update peer dependencies to match core package version bump (0.21.0) ([#8619](https://github.com/mastra-ai/mastra/pull/8619))
+
+- Update peer dependencies to match core package version bump (0.21.0) ([#8557](https://github.com/mastra-ai/mastra/pull/8557))
+
+- Update peer dependencies to match core package version bump (0.21.0) ([#8626](https://github.com/mastra-ai/mastra/pull/8626))
+
+- Update peer dependencies to match core package version bump (0.21.0) ([#8686](https://github.com/mastra-ai/mastra/pull/8686))
+
+- nested ai-sdk workflows and networks streaming support ([#8614](https://github.com/mastra-ai/mastra/pull/8614))
+
+- Updated dependencies [[`1ed9670`](https://github.com/mastra-ai/mastra/commit/1ed9670d3ca50cb60dc2e517738c5eef3968ed27), [`b5a66b7`](https://github.com/mastra-ai/mastra/commit/b5a66b748a14fc8b3f63b04642ddb9621fbcc9e0), [`37a2314`](https://github.com/mastra-ai/mastra/commit/37a23148e0e5a3b40d4f9f098b194671a8a49faf), [`7b1ef57`](https://github.com/mastra-ai/mastra/commit/7b1ef57fc071c2aa2a2e32905b18cd88719c5a39), [`ee68e82`](https://github.com/mastra-ai/mastra/commit/ee68e8289ea4408d29849e899bc6e78b3bd4e843), [`228228b`](https://github.com/mastra-ai/mastra/commit/228228b0b1de9291cb8887587f5cea1a8757ebad), [`ea33930`](https://github.com/mastra-ai/mastra/commit/ea339301e82d6318257720d811b043014ee44064), [`b5a66b7`](https://github.com/mastra-ai/mastra/commit/b5a66b748a14fc8b3f63b04642ddb9621fbcc9e0), [`135d6f2`](https://github.com/mastra-ai/mastra/commit/135d6f22a326ed1dffff858700669dff09d2c9eb), [`59d036d`](https://github.com/mastra-ai/mastra/commit/59d036d4c2706b430b0e3f1f1e0ee853ce16ca04)]:
+  - @mastra/core@0.0.0-dynamic-model-router-20251010230835
+
+## 0.2.0-alpha.0
+
+### Minor Changes
+
+- Update peer dependencies to match core package version bump (0.20.3) ([#8614](https://github.com/mastra-ai/mastra/pull/8614))
+
+### Patch Changes
+
+- Update peer dependencies to match core package version bump (0.21.0) ([#8619](https://github.com/mastra-ai/mastra/pull/8619))
+
+- Update peer dependencies to match core package version bump (0.21.0) ([#8557](https://github.com/mastra-ai/mastra/pull/8557))
+
+- Update peer dependencies to match core package version bump (0.21.0) ([#8626](https://github.com/mastra-ai/mastra/pull/8626))
+
+- Update peer dependencies to match core package version bump (0.21.0) ([#8686](https://github.com/mastra-ai/mastra/pull/8686))
+
+- nested ai-sdk workflows and networks streaming support ([#8614](https://github.com/mastra-ai/mastra/pull/8614))
+
+- Updated dependencies [[`b5a66b7`](https://github.com/mastra-ai/mastra/commit/b5a66b748a14fc8b3f63b04642ddb9621fbcc9e0), [`7b1ef57`](https://github.com/mastra-ai/mastra/commit/7b1ef57fc071c2aa2a2e32905b18cd88719c5a39), [`ee68e82`](https://github.com/mastra-ai/mastra/commit/ee68e8289ea4408d29849e899bc6e78b3bd4e843), [`228228b`](https://github.com/mastra-ai/mastra/commit/228228b0b1de9291cb8887587f5cea1a8757ebad), [`ea33930`](https://github.com/mastra-ai/mastra/commit/ea339301e82d6318257720d811b043014ee44064), [`b5a66b7`](https://github.com/mastra-ai/mastra/commit/b5a66b748a14fc8b3f63b04642ddb9621fbcc9e0), [`135d6f2`](https://github.com/mastra-ai/mastra/commit/135d6f22a326ed1dffff858700669dff09d2c9eb), [`59d036d`](https://github.com/mastra-ai/mastra/commit/59d036d4c2706b430b0e3f1f1e0ee853ce16ca04)]:
+  - @mastra/core@0.21.0-alpha.0
 
 ## 0.1.1
 

package/dist/chat-route.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chat-route.d.ts","sourceRoot":"","sources":["../src/chat-route.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAChE,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAIxD,MAAM,MAAM,gBAAgB,CAAC,MAAM,SAAS,YAAY,GAAG,SAAS,IAAI;IACtE,cAAc,CAAC,EAAE,qBAAqB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACzD,GAAG,CACA;IACE,IAAI,EAAE,GAAG,MAAM,WAAW,MAAM,EAAE,CAAC;IACnC,KAAK,CAAC,EAAE,KAAK,CAAC;CACf,GACD;IACE,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf,CACJ,CAAC;AAEF,wBAAgB,SAAS,CAAC,MAAM,SAAS,YAAY,GAAG,SAAS,EAAE,EACjE,IAAuB,EACvB,KAAK,EACL,cAAc,GACf,EAAE,gBAAgB,CAAC,MAAM,CAAC,GAAG,UAAU,CAAC,OAAO,gBAAgB,CAAC,CA+IhE"}
+{"version":3,"file":"chat-route.d.ts","sourceRoot":"","sources":["../src/chat-route.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAEhE,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAIxD,MAAM,MAAM,gBAAgB,CAAC,MAAM,SAAS,YAAY,GAAG,SAAS,IAAI;IACtE,cAAc,CAAC,EAAE,qBAAqB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACzD,GAAG,CACA;IACE,IAAI,EAAE,GAAG,MAAM,WAAW,MAAM,EAAE,CAAC;IACnC,KAAK,CAAC,EAAE,KAAK,CAAC;CACf,GACD;IACE,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;CACf,CACJ,CAAC;AAEF,wBAAgB,SAAS,CAAC,MAAM,SAAS,YAAY,GAAG,SAAS,EAAE,EACjE,IAAuB,EACvB,KAAK,EACL,cAAc,GACf,EAAE,gBAAgB,CAAC,MAAM,CAAC,GAAG,UAAU,CAAC,OAAO,gBAAgB,CAAC,CAuJhE"}

package/dist/helpers.d.ts

@@ -7,6 +7,16 @@ export type ToolAgentChunkType = {
     toolCallId: string;
     payload: any;
 };
+export type ToolWorkflowChunkType = {
+    type: 'tool-workflow';
+    toolCallId: string;
+    payload: any;
+};
+export type ToolNetworkChunkType = {
+    type: 'tool-network';
+    toolCallId: string;
+    payload: any;
+};
 export declare function convertMastraChunkToAISDKv5<OUTPUT extends OutputSchema = undefined>({ chunk, mode, }: {
     chunk: ChunkType<OUTPUT>;
     mode?: 'generate' | 'stream';
@@ -24,5 +34,5 @@ export declare function convertFullStreamChunkToUIMessageStream<UI_MESSAGE exten
     sendStart?: boolean;
     sendFinish?: boolean;
     responseMessageId?: string;
-}): InferUIMessageChunk<UI_MESSAGE> | ToolAgentChunkType | undefined;
+}): InferUIMessageChunk<UI_MESSAGE> | ToolAgentChunkType | ToolWorkflowChunkType | ToolNetworkChunkType | undefined;
 //# sourceMappingURL=helpers.d.ts.map

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,MAAM,qBAAqB,CAAC;AAE7E,OAAO,KAAK,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,cAAc,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AAEpG,MAAM,MAAM,eAAe,CAAC,MAAM,SAAS,YAAY,GAAG,SAAS,IAC/D,cAAc,CAAC,OAAO,CAAC,GACvB,gBAAgB,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,GAC7C,SAAS,CAAC;AAEd,MAAM,MAAM,kBAAkB,GAAG;IAAE,IAAI,EAAE,YAAY,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,GAAG,CAAA;CAAE,CAAC;AAE1F,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,CAkN1B;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;IACD,IAAI,EAAE,cAAc,CAAC,OAAO,CAAC,GAAG;QAAE,IAAI,EAAE,aAAa,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,GAAG,CAAA;KAAE,CAAC;IACzF,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,SAAS,CA6MnE"}
+{"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,MAAM,qBAAqB,CAAC;AAE7E,OAAO,KAAK,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,cAAc,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AAEpG,MAAM,MAAM,eAAe,CAAC,MAAM,SAAS,YAAY,GAAG,SAAS,IAC/D,cAAc,CAAC,OAAO,CAAC,GACvB,gBAAgB,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,GAC7C,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,CAkN1B;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;QAAE,IAAI,EAAE,aAAa,CAAC;QAAC,UAAU,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,GAAG,CAAA;KAAE,CAAC;IACzF,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,CAyNlH"}

package/dist/index.cjs

@@ -317,6 +317,18 @@ function convertFullStreamChunkToUIMessageStream({
           toolCallId: part.toolCallId,
           payload: part.output
         };
+      } else if (part.output.from === "WORKFLOW") {
+        return {
+          type: "tool-workflow",
+          toolCallId: part.toolCallId,
+          payload: part.output
+        };
+      } else if (part.output.from === "NETWORK") {
+        return {
+          type: "tool-network",
+          toolCallId: part.toolCallId,
+          payload: part.output
+        };
       }
       return;
     }
@@ -374,9 +386,9 @@ function convertFullStreamChunkToUIMessageStream({
   }
 }
 
-// src/to-ai-sdk-format.ts
+// src/transformers.ts
 function WorkflowStreamToAISDKTransformer() {
-  const steps = {};
+  const bufferedWorkflows = /* @__PURE__ */ new Map();
   return new TransformStream({
     start(controller) {
       controller.enqueue({
@@ -397,73 +409,8 @@ function WorkflowStreamToAISDKTransformer() {
       });
     },
     transform(chunk, controller) {
-      let workflowName = "";
-      if (chunk.type === "workflow-start") {
-        workflowName = chunk.payload.workflowId;
-        controller.enqueue({
-          data: JSON.stringify({
-            type: "data-workflow",
-            id: chunk.runId,
-            data: {
-              name: workflowName,
-              status: "running",
-              steps: {},
-              output: null
-            }
-          })
-        });
-      } else if (chunk.type === "workflow-step-start") {
-        steps[chunk.payload.id] = {
-          // TODO swap with name
-          name: chunk.payload.id,
-          status: chunk.payload.status,
-          input: chunk.payload.payload ?? null,
-          output: null
-        };
-        controller.enqueue({
-          data: JSON.stringify({
-            type: "data-workflow",
-            id: chunk.runId,
-            data: {
-              name: workflowName,
-              status: "running",
-              steps,
-              output: null
-            }
-          })
-        });
-      } else if (chunk.type === "workflow-step-result") {
-        steps[chunk.payload.id] = {
-          ...steps[chunk.payload.id],
-          status: chunk.payload.status,
-          output: chunk.payload.output ?? null
-        };
-        controller.enqueue({
-          data: JSON.stringify({
-            type: "data-workflow",
-            id: chunk.runId,
-            data: {
-              name: workflowName,
-              status: "running",
-              steps,
-              output: null
-            }
-          })
-        });
-      } else if (chunk.type === "workflow-finish") {
-        controller.enqueue({
-          data: JSON.stringify({
-            type: "data-workflow",
-            id: chunk.runId,
-            data: {
-              name: workflowName,
-              steps,
-              output: chunk.payload.output ?? null,
-              status: chunk.payload.workflowStatus
-            }
-          })
-        });
-      }
+      const transformed = transformWorkflow(chunk, bufferedWorkflows);
+      if (transformed) controller.enqueue(transformed);
     }
   });
 }
@@ -488,6 +435,14 @@ function AgentStreamToAISDKTransformer() {
           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);
+          if (workflowChunk) controller.enqueue(workflowChunk);
+        } else if (transformedChunk.type === "tool-network") {
+          const payload = transformedChunk.payload;
+          const networkChunk = transformNetwork(payload, bufferedSteps);
+          if (networkChunk) controller.enqueue(networkChunk);
         } else {
           controller.enqueue(transformedChunk);
         }
@@ -631,6 +586,235 @@ function transformAgent(payload, bufferedSteps) {
   }
   return null;
 }
+function transformWorkflow(payload, bufferedWorkflows) {
+  switch (payload.type) {
+    case "workflow-start":
+      bufferedWorkflows.set(payload.runId, {
+        name: payload.payload.workflowId,
+        steps: {}
+      });
+      return {
+        type: "data-workflow",
+        id: payload.runId,
+        data: {
+          name: bufferedWorkflows.get(payload.runId).name,
+          status: "running",
+          steps: bufferedWorkflows.get(payload.runId).steps,
+          output: null
+        }
+      };
+    case "workflow-step-start": {
+      const current = bufferedWorkflows.get(payload.runId) || { name: "", steps: {} };
+      current.steps[payload.payload.id] = {
+        name: payload.payload.id,
+        status: payload.payload.status,
+        input: payload.payload.payload ?? null,
+        output: null
+      };
+      bufferedWorkflows.set(payload.runId, current);
+      return {
+        type: "data-workflow",
+        id: payload.runId,
+        data: {
+          name: current.name,
+          status: "running",
+          steps: current.steps,
+          output: null
+        }
+      };
+    }
+    case "workflow-step-result": {
+      const current = bufferedWorkflows.get(payload.runId);
+      if (!current) return null;
+      current.steps[payload.payload.id] = {
+        ...current.steps[payload.payload.id],
+        status: payload.payload.status,
+        output: payload.payload.output ?? null
+      };
+      return {
+        type: "data-workflow",
+        id: payload.runId,
+        data: {
+          name: current.name,
+          status: "running",
+          steps: current.steps,
+          output: null
+        }
+      };
+    }
+    case "workflow-finish": {
+      const current = bufferedWorkflows.get(payload.runId);
+      if (!current) return null;
+      return {
+        type: "data-workflow",
+        id: payload.runId,
+        data: {
+          name: current.name,
+          steps: current.steps,
+          output: payload.payload.output ?? null,
+          status: payload.payload.workflowStatus
+        }
+      };
+    }
+    default:
+      return null;
+  }
+}
+function transformNetwork(payload, bufferedNetworks) {
+  switch (payload.type) {
+    case "routing-agent-start": {
+      bufferedNetworks.set(payload.payload.runId, {
+        name: payload.payload.agentId,
+        steps: []
+      });
+      return {
+        type: "data-network",
+        id: payload.payload.runId,
+        data: {
+          name: bufferedNetworks.get(payload.payload.runId).name,
+          status: "running",
+          steps: bufferedNetworks.get(payload.payload.runId).steps,
+          output: null
+        }
+      };
+    }
+    case "agent-execution-start": {
+      const current = bufferedNetworks.get(payload.payload.runId) || { name: "", steps: [] };
+      current.steps.push({
+        name: payload.payload.agentId,
+        status: "running",
+        input: payload.payload.args || null,
+        output: null
+      });
+      bufferedNetworks.set(payload.payload.runId, current);
+      return {
+        type: "data-network",
+        id: payload.payload.runId,
+        data: {
+          name: current.name,
+          status: "running",
+          steps: current.steps,
+          output: null
+        }
+      };
+    }
+    case "workflow-execution-start": {
+      const current = bufferedNetworks.get(payload.payload.runId) || { name: "", steps: [] };
+      current.steps.push({
+        name: payload.payload.name,
+        status: "running",
+        input: payload.payload.args || null,
+        output: null
+      });
+      bufferedNetworks.set(payload.payload.runId, current);
+      return {
+        type: "data-network",
+        id: payload.payload.runId,
+        data: {
+          name: current.name,
+          status: "running",
+          steps: current.steps,
+          output: null
+        }
+      };
+    }
+    case "tool-execution-start": {
+      const current = bufferedNetworks.get(payload.payload.runId) || { name: "", steps: [] };
+      current.steps.push({
+        name: payload.payload.args?.toolName,
+        status: "running",
+        input: payload.payload.args?.args || null,
+        output: null
+      });
+      bufferedNetworks.set(payload.payload.runId, current);
+      return {
+        type: "data-network",
+        id: payload.payload.runId,
+        data: {
+          name: current.name,
+          status: "running",
+          steps: current.steps,
+          output: null
+        }
+      };
+    }
+    case "agent-execution-end":
+    case "tool-execution-end": {
+      const current = bufferedNetworks.get(payload.runId);
+      if (!current) return null;
+      return {
+        type: "data-network",
+        id: payload.runId,
+        data: {
+          name: current.name,
+          status: "running",
+          steps: current.steps,
+          output: null
+        }
+      };
+    }
+    case "workflow-execution-end": {
+      const current = bufferedNetworks.get(payload.runId);
+      if (!current) return null;
+      return {
+        type: "data-network",
+        id: payload.runId,
+        data: {
+          name: current.name,
+          status: "running",
+          steps: current.steps,
+          output: null
+        }
+      };
+    }
+    case "routing-agent-end": {
+      const current = bufferedNetworks.get(payload.payload.runId);
+      if (!current) return null;
+      return {
+        type: "data-network",
+        id: payload.payload.runId,
+        data: {
+          name: current.name,
+          status: "finished",
+          steps: current.steps,
+          output: payload.payload?.result ?? null
+        }
+      };
+    }
+    case "network-execution-event-step-finish": {
+      const current = bufferedNetworks.get(payload.payload.runId);
+      if (!current) return null;
+      return {
+        type: "data-network",
+        id: payload.payload.runId,
+        data: {
+          name: current.name,
+          status: "finished",
+          steps: current.steps,
+          output: payload.payload?.result ?? null
+        }
+      };
+    }
+    case "network-execution-event-finish": {
+      const current = bufferedNetworks.get(payload.runId);
+      if (!current) return null;
+      return {
+        type: "data-network",
+        id: payload.runId,
+        data: {
+          name: current.name,
+          status: "finished",
+          steps: current.steps,
+          output: payload.payload?.result ?? null
+        }
+      };
+    }
+    default:
+      return null;
+  }
+}
+
+// src/to-ai-sdk-format.ts
 function toAISdkFormat(stream) {
   return stream.fullStream.pipeThrough(AgentStreamToAISDKTransformer());
 }
@@ -740,6 +924,7 @@ function chatRoute({
     handler: async (c) => {
       const { messages, ...rest } = await c.req.json();
       const mastra = c.get("mastra");
+      const runtimeContext = c.get("runtimeContext");
       let agentToUse = agent;
       if (!agent) {
         const agentId = c.req.param("agentId");
@@ -750,6 +935,9 @@ function chatRoute({
           `Fixed agent ID was set together with an agentId path parameter. This can lead to unexpected behavior.`
         );
       }
+      if (runtimeContext && defaultOptions?.runtimeContext) {
+        mastra.getLogger()?.warn(`"runtimeContext" set in the route options will be overridden by the request's "runtimeContext".`);
+      }
       if (!agentToUse) {
         throw new Error("Agent ID is required");
       }
@@ -759,7 +947,8 @@ function chatRoute({
       }
       const result = await agentObj.stream(messages, {
         ...defaultOptions,
-        ...rest
+        ...rest,
+        runtimeContext: runtimeContext || defaultOptions?.runtimeContext
       });
       const uiMessageStream = ai.createUIMessageStream({
         execute: async ({ writer }) => {