@mastra/ai-sdk 0.0.0-ai-sdk-workflow-route-20251010135341 → 0.0.0-ai-sdk-network-text-delta-20251017172601

package/CHANGELOG.md

@@ -1,16 +1,100 @@
 # @mastra/ai-sdk
 
-## 0.0.0-ai-sdk-workflow-route-20251010135341
+## 0.0.0-ai-sdk-network-text-delta-20251017172601
 
 ### Minor Changes
 
-- Update peer dependencies to match core package version bump (0.20.3) ([`af2c775`](https://github.com/mastra-ai/mastra/commit/af2c7751fbb3bda8f26181e95ff850eb5dc1d790))
+- Update peer dependencies to match core package version bump (0.21.2) ([`862ec5e`](https://github.com/mastra-ai/mastra/commit/862ec5e0f8c7d8fa2134307af1ad2e294cf5fa54))
+
+### Patch Changes
+
+- Pass original messages in chatRoute to fix uiMessages duplication #8830 ([#8904](https://github.com/mastra-ai/mastra/pull/8904))
+
+- network routing agent text delta ai-sdk streaming ([`862ec5e`](https://github.com/mastra-ai/mastra/commit/862ec5e0f8c7d8fa2134307af1ad2e294cf5fa54))
+
+- Updated dependencies [[`691af3a`](https://github.com/mastra-ai/mastra/commit/691af3a28d87294fdb4c66fb3e14480362fcaffa), [`92b7b1c`](https://github.com/mastra-ai/mastra/commit/92b7b1ce08232a14f577715de8d9c005edeb0f05), [`a783845`](https://github.com/mastra-ai/mastra/commit/a783845ae42dbae134289cb56c79366f1d8bbb9d), [`e792061`](https://github.com/mastra-ai/mastra/commit/e7920613f9517958202602d2a414ca88df24b31d), [`862ec5e`](https://github.com/mastra-ai/mastra/commit/862ec5e0f8c7d8fa2134307af1ad2e294cf5fa54), [`f053e89`](https://github.com/mastra-ai/mastra/commit/f053e89160dbd0bd3333fc3492f68231b5c7c349), [`9257233`](https://github.com/mastra-ai/mastra/commit/9257233c4ffce09b2bedc2a9adbd70d7a83fa8e2), [`0f1a4c9`](https://github.com/mastra-ai/mastra/commit/0f1a4c984fb4b104b2f0b63ba18c9fa77f567700), [`8aeea37`](https://github.com/mastra-ai/mastra/commit/8aeea37efdde347c635a67fed56794943b7f74ec), [`02fe153`](https://github.com/mastra-ai/mastra/commit/02fe15351d6021d214da48ec982a0e9e4150bcee), [`15a1733`](https://github.com/mastra-ai/mastra/commit/15a1733074cee8bd37370e1af34cd818e89fa7ac)]:
+  - @mastra/core@0.0.0-ai-sdk-network-text-delta-20251017172601
+
+## 0.2.1
+
+### Patch Changes
+
+- Update README to include more usage examples ([#8817](https://github.com/mastra-ai/mastra/pull/8817))
+
+- Updated dependencies [[`ca85c93`](https://github.com/mastra-ai/mastra/commit/ca85c932b232e6ad820c811ec176d98e68c59b0a), [`a1d40f8`](https://github.com/mastra-ai/mastra/commit/a1d40f88d4ce42c4508774ad22e38ac582157af2), [`01c4a25`](https://github.com/mastra-ai/mastra/commit/01c4a2506c514d5e861c004d3d2fb3791c6391f3), [`cce8aad`](https://github.com/mastra-ai/mastra/commit/cce8aad878a0dd98e5647680f3765caba0b1701c)]:
+  - @mastra/core@0.21.1
+
+## 0.2.1-alpha.0
+
+### Patch Changes
+
+- Update README to include more usage examples ([#8817](https://github.com/mastra-ai/mastra/pull/8817))
+
+- Updated dependencies [[`ca85c93`](https://github.com/mastra-ai/mastra/commit/ca85c932b232e6ad820c811ec176d98e68c59b0a), [`a1d40f8`](https://github.com/mastra-ai/mastra/commit/a1d40f88d4ce42c4508774ad22e38ac582157af2), [`01c4a25`](https://github.com/mastra-ai/mastra/commit/01c4a2506c514d5e861c004d3d2fb3791c6391f3), [`cce8aad`](https://github.com/mastra-ai/mastra/commit/cce8aad878a0dd98e5647680f3765caba0b1701c)]:
+  - @mastra/core@0.21.1-alpha.0
+
+## 0.2.0
+
+### Minor Changes
+
+- Update peer dependencies to match core package version bump (0.20.3) ([#8672](https://github.com/mastra-ai/mastra/pull/8672))
+
+- Update peer dependencies to match core package version bump (0.20.3) ([#8614](https://github.com/mastra-ai/mastra/pull/8614))
+
+### Patch Changes
+
+- 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))
+
+- Improve types for networkRoute and workflowRoute functions ([#8844](https://github.com/mastra-ai/mastra/pull/8844))
+
+- ai-sdk workflow route, agent network route ([#8672](https://github.com/mastra-ai/mastra/pull/8672))
+
+- 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), [`f59fc1e`](https://github.com/mastra-ai/mastra/commit/f59fc1e406b8912e692f6bff6cfd4754cc8d165c), [`158381d`](https://github.com/mastra-ai/mastra/commit/158381d39335be934b81ef8a1947bccace492c25), [`a1799bc`](https://github.com/mastra-ai/mastra/commit/a1799bcc1b5a1cdc188f2ac0165f17a1c4ac6f7b), [`6ff6094`](https://github.com/mastra-ai/mastra/commit/6ff60946f4ecfebdeef6e21d2b230c2204f2c9b8), [`fb703b9`](https://github.com/mastra-ai/mastra/commit/fb703b9634eeaff1a6eb2b5531ce0f9e8fb04727), [`37a2314`](https://github.com/mastra-ai/mastra/commit/37a23148e0e5a3b40d4f9f098b194671a8a49faf), [`7b1ef57`](https://github.com/mastra-ai/mastra/commit/7b1ef57fc071c2aa2a2e32905b18cd88719c5a39), [`05a9dee`](https://github.com/mastra-ai/mastra/commit/05a9dee3d355694d28847bfffb6289657fcf7dfa), [`e3c1077`](https://github.com/mastra-ai/mastra/commit/e3c107763aedd1643d3def5df450c235da9ff76c), [`1908ca0`](https://github.com/mastra-ai/mastra/commit/1908ca0521f90e43779cc29ab590173ca560443c), [`1bccdb3`](https://github.com/mastra-ai/mastra/commit/1bccdb33eb90cbeba2dc5ece1c2561fb774b26b6), [`5ef944a`](https://github.com/mastra-ai/mastra/commit/5ef944a3721d93105675cac2b2311432ff8cc393), [`d6b186f`](https://github.com/mastra-ai/mastra/commit/d6b186fb08f1caf1b86f73d3a5ee88fb999ca3be), [`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), [`65493b3`](https://github.com/mastra-ai/mastra/commit/65493b31c36f6fdb78f9679f7e1ecf0c250aa5ee), [`a998b8f`](https://github.com/mastra-ai/mastra/commit/a998b8f858091c2ec47683e60766cf12d03001e4), [`b5a66b7`](https://github.com/mastra-ai/mastra/commit/b5a66b748a14fc8b3f63b04642ddb9621fbcc9e0), [`8a37bdd`](https://github.com/mastra-ai/mastra/commit/8a37bddb6d8614a32c5b70303d583d80c620ea61), [`135d6f2`](https://github.com/mastra-ai/mastra/commit/135d6f22a326ed1dffff858700669dff09d2c9eb)]:
+  - @mastra/core@0.21.0
+
+## 0.2.0-alpha.2
+
+### Patch Changes
+
+- Improve types for networkRoute and workflowRoute functions ([#8844](https://github.com/mastra-ai/mastra/pull/8844))
+
+- Updated dependencies [[`a1799bc`](https://github.com/mastra-ai/mastra/commit/a1799bcc1b5a1cdc188f2ac0165f17a1c4ac6f7b), [`6ff6094`](https://github.com/mastra-ai/mastra/commit/6ff60946f4ecfebdeef6e21d2b230c2204f2c9b8)]:
+  - @mastra/core@0.21.0-alpha.3
+
+## 0.2.0-alpha.1
+
+### Minor Changes
+
+- Update peer dependencies to match core package version bump (0.20.3) ([#8672](https://github.com/mastra-ai/mastra/pull/8672))
+
+### Patch Changes
+
+- pass runtimeContext to agent stream options in chatRoute ([#8641](https://github.com/mastra-ai/mastra/pull/8641))
+
+- ai-sdk workflow route, agent network route ([#8672](https://github.com/mastra-ai/mastra/pull/8672))
+
+- Updated dependencies [[`1ed9670`](https://github.com/mastra-ai/mastra/commit/1ed9670d3ca50cb60dc2e517738c5eef3968ed27), [`158381d`](https://github.com/mastra-ai/mastra/commit/158381d39335be934b81ef8a1947bccace492c25), [`fb703b9`](https://github.com/mastra-ai/mastra/commit/fb703b9634eeaff1a6eb2b5531ce0f9e8fb04727), [`37a2314`](https://github.com/mastra-ai/mastra/commit/37a23148e0e5a3b40d4f9f098b194671a8a49faf), [`05a9dee`](https://github.com/mastra-ai/mastra/commit/05a9dee3d355694d28847bfffb6289657fcf7dfa), [`e3c1077`](https://github.com/mastra-ai/mastra/commit/e3c107763aedd1643d3def5df450c235da9ff76c), [`1bccdb3`](https://github.com/mastra-ai/mastra/commit/1bccdb33eb90cbeba2dc5ece1c2561fb774b26b6), [`5ef944a`](https://github.com/mastra-ai/mastra/commit/5ef944a3721d93105675cac2b2311432ff8cc393), [`d6b186f`](https://github.com/mastra-ai/mastra/commit/d6b186fb08f1caf1b86f73d3a5ee88fb999ca3be), [`65493b3`](https://github.com/mastra-ai/mastra/commit/65493b31c36f6fdb78f9679f7e1ecf0c250aa5ee), [`a998b8f`](https://github.com/mastra-ai/mastra/commit/a998b8f858091c2ec47683e60766cf12d03001e4), [`8a37bdd`](https://github.com/mastra-ai/mastra/commit/8a37bddb6d8614a32c5b70303d583d80c620ea61)]:
+  - @mastra/core@0.21.0-alpha.1
+
+## 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
 
-- ai-sdk workflow route, agent network route ([`af2c775`](https://github.com/mastra-ai/mastra/commit/af2c7751fbb3bda8f26181e95ff850eb5dc1d790))
+- 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))
 
@@ -20,8 +104,8 @@
 
 - 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), [`af2c775`](https://github.com/mastra-ai/mastra/commit/af2c7751fbb3bda8f26181e95ff850eb5dc1d790), [`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)]:
-  - @mastra/core@0.0.0-ai-sdk-workflow-route-20251010135341
+- 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/README.md

@@ -1,6 +1,6 @@
 # @mastra/ai-sdk
 
-`@mastra/ai-sdk` helps you setup custom API routes to more easily support [`useChat()`](https://ai-sdk.dev/docs/reference/ai-sdk-ui/use-chat).
+The recommended way of using Mastra and AI SDK together is by installing the `@mastra/ai-sdk` package. `@mastra/ai-sdk` provides custom API routes and utilities for streaming Mastra agents in AI SDK-compatible formats. Including chat, workflow, and network route handlers, along with utilities and exported types for UI integrations.
 
 ## Installation
 
@@ -47,9 +47,73 @@ After defining a dynamic route with `:agentId` you can use the `useChat()` hook
 
 ```typescript
 type MyMessage = {};
+
 const { error, status, sendMessage, messages, regenerate, stop } = useChat<MyMessage>({
   transport: new DefaultChatTransport({
     api: 'http://localhost:4111/chat/weatherAgent',
   }),
 });
 ```
+
+### Workflow route
+
+Stream a workflow in AI SDK-compatible format.
+
+```typescript
+import { workflowRoute } from '@mastra/ai-sdk';
+
+export const mastra = new Mastra({
+  server: {
+    apiRoutes: [
+      workflowRoute({
+        path: '/workflow',
+        agent: 'weatherAgent',
+      }),
+    ],
+  },
+});
+```
+
+### Network route
+
+Stream agent networks (routing + nested agent/workflow/tool executions) in AI SDK-compatible format.
+
+```typescript
+import { networkRoute } from '@mastra/ai-sdk';
+
+export const mastra = new Mastra({
+  server: {
+    apiRoutes: [
+      networkRoute({
+        path: '/network',
+        agent: 'weatherAgent',
+      }),
+    ],
+  },
+});
+```
+
+## Manual transformation
+
+If you have a raw Mastra `stream`, you can manually transform it to AI SDK UI message parts:
+
+```typescript
+import { toAISdkFormat } from '@mastra/ai-sdk';
+import { createUIMessageStream, createUIMessageStreamResponse } from 'ai';
+
+export async function POST(req: Request) {
+  const { messages } = await req.json();
+  const agent = mastra.getAgent('weatherAgent');
+  const stream = await agent.stream(messages);
+
+  const uiMessageStream = createUIMessageStream({
+    execute: async ({ writer }) => {
+      for await (const part of toAISdkFormat(stream, { from: 'agent' })!) {
+        writer.write(part);
+      }
+    },
+  });
+
+  return createUIMessageStreamResponse({ stream: uiMessageStream });
+}
+```

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,CAwJhE"}

package/dist/index.cjs

@@ -448,11 +448,11 @@ function AgentStreamToAISDKTransformer() {
           if (agentTransformed) controller.enqueue(agentTransformed);
         } else if (transformedChunk.type === "tool-workflow") {
           const payload = transformedChunk.payload;
-          const workflowChunk = transformWorkflow(payload, bufferedSteps);
+          const workflowChunk = transformWorkflow(payload, bufferedSteps, true);
           if (workflowChunk) controller.enqueue(workflowChunk);
         } else if (transformedChunk.type === "tool-network") {
           const payload = transformedChunk.payload;
-          const networkChunk = transformNetwork(payload, bufferedSteps);
+          const networkChunk = transformNetwork(payload, bufferedSteps, true);
           if (networkChunk) controller.enqueue(networkChunk);
         } else {
           controller.enqueue(transformedChunk);
@@ -597,7 +597,7 @@ function transformAgent(payload, bufferedSteps) {
   }
   return null;
 }
-function transformWorkflow(payload, bufferedWorkflows) {
+function transformWorkflow(payload, bufferedWorkflows, isNested) {
   switch (payload.type) {
     case "workflow-start":
       bufferedWorkflows.set(payload.runId, {
@@ -605,7 +605,7 @@ function transformWorkflow(payload, bufferedWorkflows) {
         steps: {}
       });
       return {
-        type: "data-workflow",
+        type: isNested ? "data-tool-workflow" : "data-workflow",
         id: payload.runId,
         data: {
           name: bufferedWorkflows.get(payload.runId).name,
@@ -624,7 +624,7 @@ function transformWorkflow(payload, bufferedWorkflows) {
       };
       bufferedWorkflows.set(payload.runId, current);
       return {
-        type: "data-workflow",
+        type: isNested ? "data-tool-workflow" : "data-workflow",
         id: payload.runId,
         data: {
           name: current.name,
@@ -643,7 +643,7 @@ function transformWorkflow(payload, bufferedWorkflows) {
         output: payload.payload.output ?? null
       };
       return {
-        type: "data-workflow",
+        type: isNested ? "data-tool-workflow" : "data-workflow",
         id: payload.runId,
         data: {
           name: current.name,
@@ -657,7 +657,7 @@ function transformWorkflow(payload, bufferedWorkflows) {
       const current = bufferedWorkflows.get(payload.runId);
       if (!current) return null;
       return {
-        type: "data-workflow",
+        type: isNested ? "data-tool-workflow" : "data-workflow",
         id: payload.runId,
         data: {
           name: current.name,
@@ -671,7 +671,7 @@ function transformWorkflow(payload, bufferedWorkflows) {
       return null;
   }
 }
-function transformNetwork(payload, bufferedNetworks) {
+function transformNetwork(payload, bufferedNetworks, isNested) {
   switch (payload.type) {
     case "routing-agent-start": {
       if (!bufferedNetworks.has(payload.payload.runId)) {
@@ -681,7 +681,7 @@ function transformNetwork(payload, bufferedNetworks) {
         });
       }
       return {
-        type: "data-network",
+        type: isNested ? "data-tool-network" : "data-network",
         id: payload.payload.runId,
         data: {
           name: bufferedNetworks.get(payload.payload.runId).name,
@@ -691,6 +691,23 @@ function transformNetwork(payload, bufferedNetworks) {
         }
       };
     }
+    case "routing-agent-text-start": {
+      const current = bufferedNetworks.get(payload.runId);
+      if (!current) return null;
+      return {
+        type: "text-start",
+        id: payload.runId
+      };
+    }
+    case "routing-agent-text-delta": {
+      const current = bufferedNetworks.get(payload.runId);
+      if (!current) return null;
+      return {
+        type: "text-delta",
+        id: payload.runId,
+        delta: payload.payload.text
+      };
+    }
     case "agent-execution-start": {
       const current = bufferedNetworks.get(payload.payload.runId) || { name: "", steps: [] };
       current.steps.push({
@@ -701,7 +718,7 @@ function transformNetwork(payload, bufferedNetworks) {
       });
       bufferedNetworks.set(payload.payload.runId, current);
       return {
-        type: "data-network",
+        type: isNested ? "data-tool-network" : "data-network",
         id: payload.payload.runId,
         data: {
           name: current.name,
@@ -721,7 +738,7 @@ function transformNetwork(payload, bufferedNetworks) {
       });
       bufferedNetworks.set(payload.payload.runId, current);
       return {
-        type: "data-network",
+        type: isNested ? "data-tool-network" : "data-network",
         id: payload.payload.runId,
         data: {
           name: current.name,
@@ -741,7 +758,7 @@ function transformNetwork(payload, bufferedNetworks) {
       });
       bufferedNetworks.set(payload.payload.runId, current);
       return {
-        type: "data-network",
+        type: isNested ? "data-tool-network" : "data-network",
         id: payload.payload.runId,
         data: {
           name: current.name,
@@ -761,7 +778,7 @@ function transformNetwork(payload, bufferedNetworks) {
         output: payload.payload.result
       });
       return {
-        type: "data-network",
+        type: isNested ? "data-tool-network" : "data-network",
         id: payload.runId,
         data: {
           name: current.name,
@@ -781,7 +798,7 @@ function transformNetwork(payload, bufferedNetworks) {
         output: payload.payload.result
       });
       return {
-        type: "data-network",
+        type: isNested ? "data-tool-network" : "data-network",
         id: payload.runId,
         data: {
           name: current.name,
@@ -801,7 +818,7 @@ function transformNetwork(payload, bufferedNetworks) {
         output: payload.payload.result
       });
       return {
-        type: "data-network",
+        type: isNested ? "data-tool-network" : "data-network",
         id: payload.runId,
         data: {
           name: current.name,
@@ -815,7 +832,7 @@ function transformNetwork(payload, bufferedNetworks) {
       const current = bufferedNetworks.get(payload.payload.runId);
       if (!current) return null;
       return {
-        type: "data-network",
+        type: isNested ? "data-tool-network" : "data-network",
         id: payload.payload.runId,
         data: {
           name: current.name,
@@ -829,7 +846,7 @@ function transformNetwork(payload, bufferedNetworks) {
       const current = bufferedNetworks.get(payload.payload.runId);
       if (!current) return null;
       return {
-        type: "data-network",
+        type: isNested ? "data-tool-network" : "data-network",
         id: payload.payload.runId,
         data: {
           name: current.name,
@@ -843,7 +860,7 @@ function transformNetwork(payload, bufferedNetworks) {
       const current = bufferedNetworks.get(payload.runId);
       if (!current) return null;
       return {
-        type: "data-network",
+        type: isNested ? "data-tool-network" : "data-network",
         id: payload.runId,
         data: {
           name: current.name,
@@ -976,6 +993,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");
@@ -986,6 +1004,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");
       }
@@ -995,9 +1016,11 @@ function chatRoute({
       }
       const result = await agentObj.stream(messages, {
         ...defaultOptions,
-        ...rest
+        ...rest,
+        runtimeContext: runtimeContext || defaultOptions?.runtimeContext
       });
       const uiMessageStream = ai.createUIMessageStream({
+        originalMessages: messages,
         execute: async ({ writer }) => {
           for await (const part of toAISdkFormat(result, { from: "agent" })) {
             writer.write(part);