@mastra/deployer 0.19.1-alpha.1 → 0.20.0-alpha.0

package/dist/server/index.cjs

@@ -35,7 +35,6 @@ var logs = require('@mastra/server/handlers/logs');
 var util = require('util');
 var buffer = require('buffer');
 var memory = require('@mastra/server/handlers/memory');
-var vNextNetwork = require('@mastra/server/handlers/vNextNetwork');
 var aiTracing = require('@mastra/core/ai-tracing');
 var observability = require('@mastra/server/handlers/observability');
 var scores = require('@mastra/server/handlers/scores');
@@ -353,13 +352,13 @@ function writeFromReadableStreamDefaultReader(reader, writable, currentReadPromi
     }
   }
 }
-function writeFromReadableStream(stream7, writable) {
-  if (stream7.locked) {
+function writeFromReadableStream(stream6, writable) {
+  if (stream6.locked) {
     throw new TypeError("ReadableStream is locked.");
   } else if (writable.destroyed) {
     return;
   }
-  return writeFromReadableStreamDefaultReader(stream7.getReader(), writable);
+  return writeFromReadableStreamDefaultReader(stream6.getReader(), writable);
 }
 var buildOutgoingHttpHeaders = (headers) => {
   const res = {};
@@ -624,21 +623,21 @@ var ENCODINGS = {
   gzip: ".gz"
 };
 var ENCODINGS_ORDERED_KEYS = Object.keys(ENCODINGS);
-var createStreamBody = (stream7) => {
+var createStreamBody = (stream6) => {
   const body = new ReadableStream({
     start(controller) {
-      stream7.on("data", (chunk) => {
+      stream6.on("data", (chunk) => {
         controller.enqueue(chunk);
       });
-      stream7.on("error", (err) => {
+      stream6.on("error", (err) => {
         controller.error(err);
       });
-      stream7.on("end", () => {
+      stream6.on("end", () => {
         controller.close();
       });
     },
     cancel() {
-      stream7.destroy();
+      stream6.destroy();
     }
   });
   return body;
@@ -730,10 +729,10 @@ var serveStatic = (options = { root: "" }) => {
       end = size - 1;
     }
     const chunksize = end - start + 1;
-    const stream7 = fs.createReadStream(path$1, { start, end });
+    const stream6 = fs.createReadStream(path$1, { start, end });
     c2.header("Content-Length", chunksize.toString());
     c2.header("Content-Range", `bytes ${start}-${end}/${stats.size}`);
-    return c2.body(createStreamBody(stream7), 206);
+    return c2.body(createStreamBody(stream6), 206);
   };
 };
 var RENDER_TYPE = {
@@ -1031,15 +1030,15 @@ async function getAgentExecutionHandler(c2) {
   if (body.method === "message/stream") {
     return streaming.stream(
       c2,
-      async (stream7) => {
+      async (stream6) => {
         try {
-          stream7.onAbort(() => {
+          stream6.onAbort(() => {
             if (!result.locked) {
               return result.cancel();
             }
           });
           for await (const chunk of result) {
-            await stream7.write(JSON.stringify(chunk) + "");
+            await stream6.write(JSON.stringify(chunk) + "");
           }
         } catch (err) {
           logger2.error("Error in message/stream stream: " + err?.message);
@@ -1286,7 +1285,7 @@ var authorizationMiddleware = async (c2, next) => {
 var clients = /* @__PURE__ */ new Set();
 var hotReloadDisabled = false;
 function handleClientsRefresh(c2) {
-  const stream7 = new ReadableStream({
+  const stream6 = new ReadableStream({
     start(controller) {
       clients.add(controller);
       controller.enqueue("data: connected\n\n");
@@ -1295,7 +1294,7 @@ function handleClientsRefresh(c2) {
       });
     }
   });
-  return new Response(stream7, {
+  return new Response(stream6, {
     headers: {
       "Content-Type": "text/event-stream",
       "Cache-Control": "no-cache",
@@ -1553,7 +1552,7 @@ async function watchAgentBuilderActionHandler(c2) {
       throw new httpException.HTTPException(400, { message: "runId required to watch action" });
     }
     c2.header("Transfer-Encoding", "chunked");
-    return streaming.stream(c2, async (stream7) => {
+    return streaming.stream(c2, async (stream6) => {
       try {
         disableHotReload();
         const result = await agentBuilder.watchAgentBuilderActionHandler({
@@ -1563,12 +1562,12 @@ async function watchAgentBuilderActionHandler(c2) {
           eventType
         });
         const reader = result.getReader();
-        stream7.onAbort(() => {
+        stream6.onAbort(() => {
           void reader.cancel("request aborted");
         });
         let chunkResult;
         while ((chunkResult = await reader.read()) && !chunkResult.done) {
-          await stream7.write(JSON.stringify(chunkResult.value) + "");
+          await stream6.write(JSON.stringify(chunkResult.value) + "");
         }
         enableHotReload();
       } catch (err) {
@@ -1592,7 +1591,7 @@ async function streamAgentBuilderActionHandler(c2) {
     c2.header("Transfer-Encoding", "chunked");
     return streaming.stream(
       c2,
-      async (stream7) => {
+      async (stream6) => {
         try {
           disableHotReload();
           const result = await agentBuilder.streamAgentBuilderActionHandler({
@@ -1603,17 +1602,17 @@ async function streamAgentBuilderActionHandler(c2) {
             runtimeContext
           });
           const reader = result.stream.getReader();
-          stream7.onAbort(() => {
+          stream6.onAbort(() => {
             void reader.cancel("request aborted");
           });
           let chunkResult;
           while ((chunkResult = await reader.read()) && !chunkResult.done) {
-            await stream7.write(JSON.stringify(chunkResult.value) + "");
+            await stream6.write(JSON.stringify(chunkResult.value) + "");
           }
         } catch (err) {
           logger2.error("Error in action stream: " + (err?.message ?? "Unknown error"));
         }
-        await stream7.close();
+        await stream6.close();
         enableHotReload();
       },
       async (err) => {
@@ -1636,7 +1635,7 @@ async function streamVNextAgentBuilderActionHandler(c2) {
     c2.header("Transfer-Encoding", "chunked");
     return streaming.stream(
       c2,
-      async (stream7) => {
+      async (stream6) => {
         try {
           disableHotReload();
           const result = await agentBuilder.streamVNextAgentBuilderActionHandler({
@@ -1647,12 +1646,12 @@ async function streamVNextAgentBuilderActionHandler(c2) {
             runtimeContext
           });
           const reader = result.getReader();
-          stream7.onAbort(() => {
+          stream6.onAbort(() => {
             void reader.cancel("request aborted");
           });
           let chunkResult;
           while ((chunkResult = await reader.read()) && !chunkResult.done) {
-            await stream7.write(JSON.stringify(chunkResult.value) + "");
+            await stream6.write(JSON.stringify(chunkResult.value) + "");
           }
         } catch (err) {
           logger2.error("Error in action VNext stream: " + (err?.message ?? "Unknown error"));
@@ -2500,61 +2499,112 @@ async function generateHandler(c2) {
     return handleError(error, "Error generating from agent");
   }
 }
-async function generateVNextHandler(c2) {
+async function streamGenerateLegacyHandler(c2) {
   try {
     const mastra = c2.get("mastra");
     const agentId = c2.req.param("agentId");
     const runtimeContext = c2.get("runtimeContext");
     const body = await c2.req.json();
-    const result = await agents.generateVNextHandler({
+    const streamResponse = await agents.streamGenerateLegacyHandler({
       mastra,
       agentId,
       runtimeContext,
       body,
       abortSignal: c2.req.raw.signal
     });
-    return c2.json(result);
+    return streamResponse;
   } catch (error) {
-    return handleError(error, "Error generating vnext from agent");
+    return handleError(error, "Error streaming from agent");
   }
 }
-async function streamGenerateLegacyHandler(c2) {
+async function streamGenerateHandler(c2) {
   try {
     const mastra = c2.get("mastra");
     const agentId = c2.req.param("agentId");
     const runtimeContext = c2.get("runtimeContext");
     const body = await c2.req.json();
-    const streamResponse = await agents.streamGenerateLegacyHandler({
-      mastra,
-      agentId,
-      runtimeContext,
-      body,
-      abortSignal: c2.req.raw.signal
-    });
-    return streamResponse;
+    const logger2 = mastra.getLogger();
+    c2.header("Transfer-Encoding", "chunked");
+    return streaming.stream(
+      c2,
+      async (stream6) => {
+        try {
+          const streamResponse = await agents.streamGenerateHandler({
+            mastra,
+            agentId,
+            runtimeContext,
+            body,
+            abortSignal: c2.req.raw.signal
+          });
+          const reader = streamResponse.fullStream.getReader();
+          stream6.onAbort(() => {
+            void reader.cancel("request aborted");
+          });
+          let chunkResult;
+          while ((chunkResult = await reader.read()) && !chunkResult.done) {
+            await stream6.write(`data: ${JSON.stringify(chunkResult.value)}
+
+`);
+          }
+          await stream6.write("data: [DONE]\n\n");
+        } catch (err) {
+          logger2.error("Error in stream generate: " + (err?.message ?? "Unknown error"));
+        }
+        await stream6.close();
+      },
+      async (err) => {
+        logger2.error("Error in watch stream: " + err?.message);
+      }
+    );
   } catch (error) {
     return handleError(error, "Error streaming from agent");
   }
 }
-async function streamGenerateHandler(c2) {
+async function approveToolCallHandler(c2) {
   try {
     const mastra = c2.get("mastra");
     const agentId = c2.req.param("agentId");
     const runtimeContext = c2.get("runtimeContext");
     const body = await c2.req.json();
-    const streamResponse = await agents.streamGenerateHandler({
-      mastra,
-      agentId,
-      runtimeContext,
-      body,
-      abortSignal: c2.req.raw.signal
-    });
-    return streamResponse;
+    const logger2 = mastra.getLogger();
+    c2.header("Transfer-Encoding", "chunked");
+    c2.header("Transfer-Encoding", "chunked");
+    return streaming.stream(
+      c2,
+      async (stream6) => {
+        try {
+          const streamResponse = await agents.approveToolCallHandler({
+            mastra,
+            runtimeContext,
+            agentId,
+            body,
+            abortSignal: c2.req.raw.signal
+          });
+          const reader = streamResponse.fullStream.getReader();
+          stream6.onAbort(() => {
+            void reader.cancel("request aborted");
+          });
+          let chunkResult;
+          while ((chunkResult = await reader.read()) && !chunkResult.done) {
+            await stream6.write(`data: ${JSON.stringify(chunkResult.value)}
+
+`);
+          }
+          await stream6.write("data: [DONE]\n\n");
+        } catch (err) {
+          logger2.error("Error in approve tool call: " + (err?.message ?? "Unknown error"));
+        }
+        await stream6.close();
+      },
+      async (err) => {
+        logger2.error("Error in watch stream: " + err?.message);
+      }
+    );
   } catch (error) {
-    return handleError(error, "Error streaming from agent");
+    return handleError(error, "Error approving tool call");
   }
 }
-async function streamVNextGenerateHandler(c2) {
+async function declineToolCallHandler(c2) {
   try {
     const mastra = c2.get("mastra");
     const agentId = c2.req.param("agentId");
@@ -2564,37 +2614,37 @@ async function streamVNextGenerateHandler(c2) {
     c2.header("Transfer-Encoding", "chunked");
     return streaming.stream(
       c2,
-      async (stream7) => {
+      async (stream6) => {
         try {
-          const streamResponse = await agents.streamVNextGenerateHandler({
+          const streamResponse = await agents.declineToolCallHandler({
             mastra,
-            agentId,
             runtimeContext,
+            agentId,
             body,
             abortSignal: c2.req.raw.signal
           });
           const reader = streamResponse.fullStream.getReader();
-          stream7.onAbort(() => {
+          stream6.onAbort(() => {
             void reader.cancel("request aborted");
           });
           let chunkResult;
           while ((chunkResult = await reader.read()) && !chunkResult.done) {
-            await stream7.write(`data: ${JSON.stringify(chunkResult.value)}
+            await stream6.write(`data: ${JSON.stringify(chunkResult.value)}
 
 `);
           }
-          await stream7.write("data: [DONE]\n\n");
+          await stream6.write("data: [DONE]\n\n");
         } catch (err) {
-          logger2.error("Error in streamVNext generate: " + (err?.message ?? "Unknown error"));
+          logger2.error("Error in decline tool call: " + (err?.message ?? "Unknown error"));
         }
-        await stream7.close();
+        await stream6.close();
       },
       async (err) => {
         logger2.error("Error in watch stream: " + err?.message);
       }
     );
   } catch (error) {
-    return handleError(error, "Error streaming from agent");
+    return handleError(error, "Error declining tool call");
   }
 }
 async function streamNetworkHandler(c2) {
@@ -2628,7 +2678,7 @@ async function streamNetworkHandler(c2) {
     c2.header("Transfer-Encoding", "chunked");
     return streaming.stream(
       c2,
-      async (stream7) => {
+      async (stream6) => {
         try {
           const streamResponse = await agents.streamNetworkHandler({
             mastra,
@@ -2638,20 +2688,20 @@ async function streamNetworkHandler(c2) {
             // abortSignal: c.req.raw.signal,
           });
           const reader = streamResponse.getReader();
-          stream7.onAbort(() => {
+          stream6.onAbort(() => {
             void reader.cancel("request aborted");
           });
           let chunkResult;
           while ((chunkResult = await reader.read()) && !chunkResult.done) {
-            await stream7.write(`data: ${JSON.stringify(chunkResult.value)}
+            await stream6.write(`data: ${JSON.stringify(chunkResult.value)}
 
 `);
           }
-          await stream7.write("data: [DONE]\n\n");
+          await stream6.write("data: [DONE]\n\n");
         } catch (err) {
           logger2.error("Error in streamNetwork generate: " + (err?.message ?? "Unknown error"));
         }
-        await stream7.close();
+        await stream6.close();
       },
       async (err) => {
         logger2.error("Error in watch stream: " + err?.message);
@@ -2661,13 +2711,13 @@ async function streamNetworkHandler(c2) {
     return handleError(error, "Error streaming from agent in network mode");
   }
 }
-async function streamVNextUIMessageHandler(c2) {
+async function streamUIMessageHandler(c2) {
   try {
     const mastra = c2.get("mastra");
     const agentId = c2.req.param("agentId");
     const runtimeContext = c2.get("runtimeContext");
     const body = await c2.req.json();
-    const streamResponse = await agents.streamVNextUIMessageHandler({
+    const streamResponse = await agents.streamUIMessageHandler({
       mastra,
       agentId,
       runtimeContext,
@@ -2725,9 +2775,9 @@ async function deprecatedStreamVNextHandler(c2) {
   return c2.json(
     {
       error: "This endpoint is deprecated",
-      message: "The /streamVNext endpoint has been deprecated. Please use an alternative streaming endpoint.",
-      deprecated_endpoint: "/api/agents/:agentId/streamVNext",
-      replacement_endpoint: "/api/agents/:agentId/stream/vnext"
+      message: "The /stream/vnext endpoint has been deprecated. Please use an alternative streaming endpoint.",
+      deprecated_endpoint: "/api/agents/:agentId/stream/vnext",
+      replacement_endpoint: "/api/agents/:agentId/stream"
     },
     410
     // 410 Gone status code for deprecated endpoints
@@ -3341,14 +3391,15 @@ function agentsRouter(bodyLimitOptions) {
         }
       }
     }),
-    generateVNextHandler
+    generateHandler
   );
   router.post(
     "/:agentId/stream/vnext",
     bodyLimit.bodyLimit(bodyLimitOptions),
     w({
-      description: "Generate a response from an agent",
+      description: "[DEPRECATED] This endpoint is deprecated. Please use /stream instead.",
       tags: ["agents"],
+      deprecated: true,
       parameters: [
         {
           name: "agentId",
@@ -3378,7 +3429,7 @@ function agentsRouter(bodyLimitOptions) {
         }
       }
     }),
-    streamVNextGenerateHandler
+    streamGenerateHandler
   );
   router.post(
     "/:agentId/stream-legacy",
@@ -3594,6 +3645,44 @@ function agentsRouter(bodyLimitOptions) {
   router.post(
     "/:agentId/stream/vnext/ui",
     bodyLimit.bodyLimit(bodyLimitOptions),
+    w({
+      description: "[DEPRECATED] This endpoint is deprecated. Please use /stream/ui instead.",
+      tags: ["agents"],
+      deprecated: true,
+      parameters: [
+        {
+          name: "agentId",
+          in: "path",
+          required: true,
+          schema: { type: "string" }
+        }
+      ],
+      requestBody: {
+        required: true,
+        content: {
+          "application/json": {
+            schema: {
+              type: "object",
+              properties: vNextBodyOptions,
+              required: ["messages"]
+            }
+          }
+        }
+      },
+      responses: {
+        200: {
+          description: "Streamed response"
+        },
+        404: {
+          description: "Agent not found"
+        }
+      }
+    }),
+    streamUIMessageHandler
+  );
+  router.post(
+    "/:agentId/stream/ui",
+    bodyLimit.bodyLimit(bodyLimitOptions),
     w({
       description: "Stream a response from an agent",
       tags: ["agents"],
@@ -3626,7 +3715,7 @@ function agentsRouter(bodyLimitOptions) {
         }
       }
     }),
-    streamVNextUIMessageHandler
+    streamUIMessageHandler
   );
   router.post(
     "/:agentId/model",
@@ -4271,6 +4360,88 @@ function agentsRouter(bodyLimitOptions) {
     }),
     executeAgentToolHandler
   );
+  router.post(
+    "/:agentId/approve-tool-call",
+    bodyLimit.bodyLimit(bodyLimitOptions),
+    w({
+      description: "Approve a tool call in human-in-the-loop workflow",
+      tags: ["agents"],
+      parameters: [
+        {
+          name: "agentId",
+          in: "path",
+          required: true,
+          schema: { type: "string" }
+        }
+      ],
+      requestBody: {
+        required: true,
+        content: {
+          "application/json": {
+            schema: {
+              type: "object",
+              properties: {
+                runId: { type: "string", description: "The run ID for the execution" },
+                runtimeContext: { type: "object", description: "Runtime context for the execution" },
+                format: { type: "string", enum: ["aisdk", "mastra"], description: "Output format" }
+              },
+              required: ["runId"]
+            }
+          }
+        }
+      },
+      responses: {
+        200: {
+          description: "Tool call approved and execution resumed"
+        },
+        404: {
+          description: "Agent not found"
+        }
+      }
+    }),
+    approveToolCallHandler
+  );
+  router.post(
+    "/:agentId/decline-tool-call",
+    bodyLimit.bodyLimit(bodyLimitOptions),
+    w({
+      description: "Decline a tool call in human-in-the-loop workflow",
+      tags: ["agents"],
+      parameters: [
+        {
+          name: "agentId",
+          in: "path",
+          required: true,
+          schema: { type: "string" }
+        }
+      ],
+      requestBody: {
+        required: true,
+        content: {
+          "application/json": {
+            schema: {
+              type: "object",
+              properties: {
+                runId: { type: "string", description: "The run ID for the execution" },
+                runtimeContext: { type: "object", description: "Runtime context for the execution" },
+                format: { type: "string", enum: ["aisdk", "mastra"], description: "Output format" }
+              },
+              required: ["runId"]
+            }
+          }
+        }
+      },
+      responses: {
+        200: {
+          description: "Tool call declined and execution resumed"
+        },
+        404: {
+          description: "Agent not found"
+        }
+      }
+    }),
+    declineToolCallHandler
+  );
   return router;
 }
 function agentsRouterDev(bodyLimitOptions) {
@@ -7076,11 +7247,9 @@ async function getMemoryStatusHandler(c2) {
   try {
     const mastra = c2.get("mastra");
     const agentId = c2.req.query("agentId");
-    const networkId = c2.req.query("networkId");
     const result = await memory.getMemoryStatusHandler({
       mastra,
-      agentId,
-      networkId
+      agentId
     });
     return c2.json(result);
   } catch (error) {
@@ -7091,11 +7260,9 @@ async function getMemoryConfigHandler(c2) {
   try {
     const mastra = c2.get("mastra");
     const agentId = c2.req.query("agentId");
-    const networkId = c2.req.query("networkId");
     const result = await memory.getMemoryConfigHandler({
       mastra,
-      agentId,
-      networkId
+      agentId
     });
     return c2.json(result);
   } catch (error) {
@@ -7107,14 +7274,12 @@ async function getThreadsHandler(c2) {
     const mastra = c2.get("mastra");
     const agentId = c2.req.query("agentId");
     const resourceId = c2.req.query("resourceid");
-    const networkId = c2.req.query("networkId");
     const orderBy = c2.req.query("orderBy");
     const sortDirection = c2.req.query("sortDirection");
     const result = await memory.getThreadsHandler({
       mastra,
       agentId,
       resourceId,
-      networkId,
       orderBy,
       sortDirection
     });
@@ -7128,7 +7293,6 @@ async function getThreadsPaginatedHandler(c2) {
     const mastra = c2.get("mastra");
     const agentId = c2.req.query("agentId");
     const resourceId = c2.req.query("resourceId");
-    const networkId = c2.req.query("networkId");
     const page = parseInt(c2.req.query("page") || "0", 10);
     const perPage = parseInt(c2.req.query("perPage") || "100", 10);
     const orderBy = c2.req.query("orderBy");
@@ -7137,7 +7301,6 @@ async function getThreadsPaginatedHandler(c2) {
       mastra,
       agentId,
       resourceId,
-      networkId,
       page,
       perPage,
       orderBy,
@@ -7153,12 +7316,10 @@ async function getThreadByIdHandler(c2) {
     const mastra = c2.get("mastra");
     const agentId = c2.req.query("agentId");
     const threadId = c2.req.param("threadId");
-    const networkId = c2.req.query("networkId");
     const result = await memory.getThreadByIdHandler({
       mastra,
       agentId,
-      threadId,
-      networkId
+      threadId
     });
     return c2.json(result);
   } catch (error) {
@@ -7169,13 +7330,11 @@ async function saveMessagesHandler(c2) {
   try {
     const mastra = c2.get("mastra");
     const agentId = c2.req.query("agentId");
-    const networkId = c2.req.query("networkId");
     const body = await c2.req.json();
     const result = await memory.saveMessagesHandler({
       mastra,
       agentId,
-      body,
-      networkId
+      body
     });
     return c2.json(result);
   } catch (error) {
@@ -7186,13 +7345,11 @@ async function createThreadHandler(c2) {
   try {
     const mastra = c2.get("mastra");
     const agentId = c2.req.query("agentId");
-    const networkId = c2.req.query("networkId");
     const body = await c2.req.json();
     const result = await memory.createThreadHandler({
       mastra,
       agentId,
-      body,
-      networkId
+      body
     });
     return c2.json(result);
   } catch (error) {
@@ -7204,14 +7361,12 @@ async function updateThreadHandler(c2) {
     const mastra = c2.get("mastra");
     const agentId = c2.req.query("agentId");
     const threadId = c2.req.param("threadId");
-    const networkId = c2.req.query("networkId");
     const body = await c2.req.json();
     const result = await memory.updateThreadHandler({
       mastra,
       agentId,
       threadId,
-      body,
-      networkId
+      body
     });
     return c2.json(result);
   } catch (error) {
@@ -7223,12 +7378,10 @@ async function deleteThreadHandler(c2) {
     const mastra = c2.get("mastra");
     const agentId = c2.req.query("agentId");
     const threadId = c2.req.param("threadId");
-    const networkId = c2.req.query("networkId");
     const result = await memory.deleteThreadHandler({
       mastra,
       agentId,
-      threadId,
-      networkId
+      threadId
     });
     return c2.json(result);
   } catch (error) {
@@ -7239,14 +7392,12 @@ async function getMessagesHandler(c2) {
   try {
     const mastra = c2.get("mastra");
     const agentId = c2.req.query("agentId");
-    const networkId = c2.req.query("networkId");
     const threadId = c2.req.param("threadId");
     const limit = parseLimit(c2.req.query("limit"));
     const result = await memory.getMessagesHandler({
       mastra,
       agentId,
       threadId,
-      networkId,
       limit
     });
     return c2.json(result);
@@ -7285,14 +7436,12 @@ async function updateWorkingMemoryHandler(c2) {
     const mastra = c2.get("mastra");
     const agentId = c2.req.query("agentId");
     const threadId = c2.req.param("threadId");
-    const networkId = c2.req.query("networkId");
     const body = await c2.req.json();
     const result = await memory.updateWorkingMemoryHandler({
       mastra,
       agentId,
       threadId,
-      body,
-      networkId
+      body
     });
     return c2.json(result);
   } catch (error) {
@@ -7305,13 +7454,11 @@ async function getWorkingMemoryHandler(c2) {
     const agentId = c2.req.query("agentId");
     const threadId = c2.req.param("threadId");
     const resourceId = c2.req.query("resourceId");
-    const networkId = c2.req.query("networkId");
     const result = await memory.getWorkingMemoryHandler({
       mastra,
       agentId,
       threadId,
-      resourceId,
-      networkId
+      resourceId
     });
     return c2.json(result);
   } catch (error) {
@@ -7327,7 +7474,6 @@ async function searchMemoryHandler(c2) {
     const threadId = c2.req.query("threadId");
     const limit = parseLimit(c2.req.query("limit"));
     const memoryConfig = c2.req.query("memoryConfig") ? JSON.parse(c2.req.query("memoryConfig")) : void 0;
-    const networkId = c2.req.query("networkId");
     const runtimeContext = c2.get("runtimeContext");
     const result = await memory.searchMemoryHandler({
       mastra,
@@ -7337,7 +7483,6 @@ async function searchMemoryHandler(c2) {
       threadId,
       limit,
       memoryConfig,
-      networkId,
       runtimeContext
     });
     return c2.json(result);
@@ -7349,7 +7494,6 @@ async function deleteMessagesHandler(c2) {
   try {
     const mastra = c2.get("mastra");
     const agentId = c2.req.query("agentId");
-    const networkId = c2.req.query("networkId");
     const runtimeContext = c2.get("runtimeContext");
     const body = await c2.req.json();
     const messageIds = body?.messageIds;
@@ -7357,7 +7501,6 @@ async function deleteMessagesHandler(c2) {
       mastra,
       agentId,
       messageIds,
-      networkId,
       runtimeContext
     });
     return c2.json(result);
@@ -8538,447 +8681,70 @@ function memoryRoutes(bodyLimitOptions) {
   );
   return router;
 }
-async function getVNextNetworksHandler(c2) {
+async function getAITraceHandler(c2) {
   try {
     const mastra = c2.get("mastra");
-    const runtimeContext = c2.get("runtimeContext");
-    const networks = await vNextNetwork.getVNextNetworksHandler({
+    const traceId = c2.req.param("traceId");
+    if (!traceId) {
+      return c2.json({ error: "Trace ID is required" }, 400);
+    }
+    const trace = await observability.getAITraceHandler({
       mastra,
-      runtimeContext
+      traceId
     });
-    return c2.json(networks);
+    return c2.json(trace);
   } catch (error) {
-    return handleError(error, "Error getting networks");
+    return handleError(error, "Error getting AI trace");
   }
 }
-async function getVNextNetworkByIdHandler(c2) {
+async function getAITracesPaginatedHandler(c2) {
   try {
     const mastra = c2.get("mastra");
-    const networkId = c2.req.param("networkId");
-    const runtimeContext = c2.get("runtimeContext");
-    const network = await vNextNetwork.getVNextNetworkByIdHandler({
+    const { page, perPage, name, spanType, dateRange, entityId, entityType } = c2.req.query();
+    const pagination = {
+      page: parseInt(page || "0"),
+      perPage: parseInt(perPage || "10")
+    };
+    const filters = {};
+    if (name) filters.name = name;
+    if (spanType) {
+      if (Object.values(aiTracing.AISpanType).includes(spanType)) {
+        filters.spanType = spanType;
+      } else {
+        return c2.json({ error: "Invalid spanType" }, 400);
+      }
+    }
+    if (entityId && entityType && (entityType === "agent" || entityType === "workflow")) {
+      filters.entityId = entityId;
+      filters.entityType = entityType;
+    }
+    let start;
+    let end;
+    if (dateRange) {
+      try {
+        const parsedDateRange = JSON.parse(dateRange);
+        start = parsedDateRange.start ? new Date(parsedDateRange.start) : void 0;
+        end = parsedDateRange.end ? new Date(parsedDateRange.end) : void 0;
+      } catch {
+        return c2.json({ error: "Invalid start date" }, 400);
+      }
+    }
+    if (start || end) {
+      pagination.dateRange = { start, end };
+    }
+    const result = await observability.getAITracesPaginatedHandler({
       mastra,
-      networkId,
-      runtimeContext
+      body: {
+        pagination,
+        filters
+      }
     });
-    return c2.json(network);
+    return c2.json(result);
   } catch (error) {
-    return handleError(error, "Error getting network by ID");
+    return handleError(error, "Error getting AI traces paginated");
   }
 }
-async function generateVNextNetworkHandler(c2) {
-  try {
-    const mastra = c2.get("mastra");
-    const runtimeContext = c2.get("runtimeContext");
-    const networkId = c2.req.param("networkId");
-    const body = await c2.req.json();
-    const result = await vNextNetwork.generateVNextNetworkHandler({
-      mastra,
-      runtimeContext,
-      networkId,
-      body
-    });
-    return c2.json(result);
-  } catch (error) {
-    return handleError(error, "Error generating from network");
-  }
-}
-async function streamGenerateVNextNetworkHandler(c2) {
-  try {
-    const mastra = c2.get("mastra");
-    const runtimeContext = c2.get("runtimeContext");
-    const logger2 = mastra.getLogger();
-    const networkId = c2.req.param("networkId");
-    const body = await c2.req.json();
-    c2.header("Transfer-Encoding", "chunked");
-    return streaming.stream(
-      c2,
-      async (stream7) => {
-        try {
-          const result = await vNextNetwork.streamGenerateVNextNetworkHandler({
-            mastra,
-            runtimeContext,
-            networkId,
-            body
-          });
-          const reader = result.stream.getReader();
-          stream7.onAbort(() => {
-            void reader.cancel("request aborted");
-          });
-          let chunkResult;
-          while ((chunkResult = await reader.read()) && !chunkResult.done) {
-            await stream7.write(JSON.stringify(chunkResult.value) + "");
-          }
-        } catch (err) {
-          mastra.getLogger().error("Error in network stream: " + (err?.message ?? "Unknown error"));
-        }
-      },
-      async (err) => {
-        logger2.error("Error in network stream: " + err?.message);
-      }
-    );
-  } catch (error) {
-    return handleError(error, "Error streaming from network");
-  }
-}
-async function loopVNextNetworkHandler(c2) {
-  try {
-    const mastra = c2.get("mastra");
-    const runtimeContext = c2.get("runtimeContext");
-    const networkId = c2.req.param("networkId");
-    const body = await c2.req.json();
-    const result = await vNextNetwork.loopVNextNetworkHandler({
-      mastra,
-      runtimeContext,
-      networkId,
-      body
-    });
-    return c2.json(result);
-  } catch (error) {
-    return handleError(error, "Error looping from network");
-  }
-}
-async function loopStreamVNextNetworkHandler(c2) {
-  try {
-    const mastra = c2.get("mastra");
-    const runtimeContext = c2.get("runtimeContext");
-    const logger2 = mastra.getLogger();
-    const networkId = c2.req.param("networkId");
-    const body = await c2.req.json();
-    c2.header("Transfer-Encoding", "chunked");
-    return streaming.stream(
-      c2,
-      async (stream7) => {
-        try {
-          const result = await vNextNetwork.loopStreamVNextNetworkHandler({
-            mastra,
-            runtimeContext,
-            networkId,
-            body
-          });
-          const reader = result.stream.getReader();
-          stream7.onAbort(() => {
-            void reader.cancel("request aborted");
-          });
-          let chunkResult;
-          while ((chunkResult = await reader.read()) && !chunkResult.done) {
-            await stream7.write(JSON.stringify(chunkResult.value) + "");
-          }
-        } catch (err) {
-          mastra.getLogger().error("Error in network loop stream: " + (err?.message ?? "Unknown error"));
-        }
-      },
-      async (err) => {
-        logger2.error("Error in network loop stream: " + err?.message);
-      }
-    );
-  } catch (error) {
-    return handleError(error, "Error streaming network loop");
-  }
-}
-
-// src/server/handlers/routes/networks/router.ts
-function vNextNetworksRouter(bodyLimitOptions) {
-  const router = new hono.Hono();
-  router.get(
-    "/v-next",
-    w({
-      description: "Get all available v-next networks",
-      tags: ["vNextNetworks"],
-      responses: {
-        200: {
-          description: "List of all v-next networks"
-        }
-      }
-    }),
-    getVNextNetworksHandler
-  );
-  router.get(
-    "/v-next/:networkId",
-    w({
-      description: "Get v-next network by ID",
-      tags: ["vNextNetworks"],
-      parameters: [
-        {
-          name: "networkId",
-          in: "path",
-          required: true,
-          schema: { type: "string" }
-        }
-      ],
-      responses: {
-        200: {
-          description: "v-next Network details"
-        },
-        404: {
-          description: "v-next Network not found"
-        }
-      }
-    }),
-    getVNextNetworkByIdHandler
-  );
-  router.post(
-    "/v-next/:networkId/generate",
-    bodyLimit.bodyLimit(bodyLimitOptions),
-    w({
-      description: "Generate a response from a v-next network",
-      tags: ["vNextNetworks"],
-      parameters: [
-        {
-          name: "networkId",
-          in: "path",
-          required: true,
-          schema: { type: "string" }
-        }
-      ],
-      requestBody: {
-        required: true,
-        content: {
-          "application/json": {
-            schema: {
-              type: "object",
-              properties: {
-                message: {
-                  type: "string",
-                  description: "Message for the v-next network"
-                },
-                threadId: {
-                  type: "string",
-                  description: "Thread Id of the conversation"
-                },
-                resourceId: {
-                  type: "string",
-                  description: "Resource Id of the conversation"
-                }
-              },
-              required: ["message"]
-            }
-          }
-        }
-      },
-      responses: {
-        200: {
-          description: "Generated response"
-        },
-        404: {
-          description: "v-next Network not found"
-        }
-      }
-    }),
-    generateVNextNetworkHandler
-  );
-  router.post(
-    "/v-next/:networkId/loop",
-    bodyLimit.bodyLimit(bodyLimitOptions),
-    w({
-      description: "Loop a v-next network",
-      tags: ["vNextNetworks"],
-      parameters: [
-        {
-          name: "networkId",
-          in: "path",
-          required: true,
-          schema: { type: "string" }
-        }
-      ],
-      requestBody: {
-        required: true,
-        content: {
-          "application/json": {
-            schema: {
-              type: "object",
-              properties: {
-                message: {
-                  type: "string",
-                  description: "Message for the v-next network"
-                }
-              },
-              required: ["message"]
-            }
-          }
-        }
-      },
-      responses: {
-        200: {
-          description: "Looped response"
-        },
-        404: {
-          description: "v-next Network not found"
-        }
-      }
-    }),
-    loopVNextNetworkHandler
-  );
-  router.post(
-    "/v-next/:networkId/loop-stream",
-    bodyLimit.bodyLimit(bodyLimitOptions),
-    w({
-      description: "Stream a v-next network loop",
-      tags: ["vNextNetworks"],
-      parameters: [
-        {
-          name: "networkId",
-          in: "path",
-          required: true,
-          schema: { type: "string" }
-        }
-      ],
-      requestBody: {
-        required: true,
-        content: {
-          "application/json": {
-            schema: {
-              type: "object",
-              properties: {
-                message: {
-                  type: "string",
-                  description: "Message for the v-next network"
-                },
-                threadId: {
-                  type: "string",
-                  description: "Thread Id of the conversation"
-                },
-                resourceId: {
-                  type: "string",
-                  description: "Resource Id of the conversation"
-                },
-                maxIterations: {
-                  type: "number",
-                  description: "Maximum number of iterations to run"
-                }
-              },
-              required: ["message"]
-            }
-          }
-        }
-      },
-      responses: {
-        200: {
-          description: "Streamed response"
-        },
-        404: {
-          description: "v-next Network not found"
-        }
-      }
-    }),
-    loopStreamVNextNetworkHandler
-  );
-  router.post(
-    "/v-next/:networkId/stream",
-    bodyLimit.bodyLimit(bodyLimitOptions),
-    w({
-      description: "Stream a response from a v-next network",
-      tags: ["vNextNetworks"],
-      parameters: [
-        {
-          name: "networkId",
-          in: "path",
-          required: true,
-          schema: { type: "string" }
-        }
-      ],
-      requestBody: {
-        required: true,
-        content: {
-          "application/json": {
-            schema: {
-              type: "object",
-              properties: {
-                message: {
-                  type: "string",
-                  description: "Message for the v-next network"
-                },
-                threadId: {
-                  type: "string",
-                  description: "Thread Id of the conversation"
-                },
-                resourceId: {
-                  type: "string",
-                  description: "Resource Id of the conversation"
-                }
-              },
-              required: ["message"]
-            }
-          }
-        }
-      },
-      responses: {
-        200: {
-          description: "Streamed response"
-        },
-        404: {
-          description: "v-next Network not found"
-        }
-      }
-    }),
-    streamGenerateVNextNetworkHandler
-  );
-  return router;
-}
-async function getAITraceHandler(c2) {
-  try {
-    const mastra = c2.get("mastra");
-    const traceId = c2.req.param("traceId");
-    if (!traceId) {
-      return c2.json({ error: "Trace ID is required" }, 400);
-    }
-    const trace = await observability.getAITraceHandler({
-      mastra,
-      traceId
-    });
-    return c2.json(trace);
-  } catch (error) {
-    return handleError(error, "Error getting AI trace");
-  }
-}
-async function getAITracesPaginatedHandler(c2) {
-  try {
-    const mastra = c2.get("mastra");
-    const { page, perPage, name, spanType, dateRange, entityId, entityType } = c2.req.query();
-    const pagination = {
-      page: parseInt(page || "0"),
-      perPage: parseInt(perPage || "10")
-    };
-    const filters = {};
-    if (name) filters.name = name;
-    if (spanType) {
-      if (Object.values(aiTracing.AISpanType).includes(spanType)) {
-        filters.spanType = spanType;
-      } else {
-        return c2.json({ error: "Invalid spanType" }, 400);
-      }
-    }
-    if (entityId && entityType && (entityType === "agent" || entityType === "workflow")) {
-      filters.entityId = entityId;
-      filters.entityType = entityType;
-    }
-    let start;
-    let end;
-    if (dateRange) {
-      try {
-        const parsedDateRange = JSON.parse(dateRange);
-        start = parsedDateRange.start ? new Date(parsedDateRange.start) : void 0;
-        end = parsedDateRange.end ? new Date(parsedDateRange.end) : void 0;
-      } catch {
-        return c2.json({ error: "Invalid start date" }, 400);
-      }
-    }
-    if (start || end) {
-      pagination.dateRange = { start, end };
-    }
-    const result = await observability.getAITracesPaginatedHandler({
-      mastra,
-      body: {
-        pagination,
-        filters
-      }
-    });
-    return c2.json(result);
-  } catch (error) {
-    return handleError(error, "Error getting AI traces paginated");
-  }
-}
-async function processTraceScoringHandler(c2) {
+async function processTraceScoringHandler(c2) {
   try {
     const mastra = c2.get("mastra");
     const { scorerName, targets } = await c2.req.json();
@@ -10107,7 +9873,7 @@ function watchWorkflowHandler(c2) {
     c2.header("Transfer-Encoding", "chunked");
     return streaming.stream(
       c2,
-      async (stream7) => {
+      async (stream6) => {
         try {
           const result = await workflows.watchWorkflowHandler({
             mastra,
@@ -10115,12 +9881,12 @@ function watchWorkflowHandler(c2) {
             runId
           });
           const reader = result.getReader();
-          stream7.onAbort(() => {
+          stream6.onAbort(() => {
             void reader.cancel("request aborted");
           });
           let chunkResult;
           while ((chunkResult = await reader.read()) && !chunkResult.done) {
-            await stream7.write(JSON.stringify(chunkResult.value) + "");
+            await stream6.write(JSON.stringify(chunkResult.value) + "");
           }
         } catch (err) {
           logger2.error("Error in watch stream: " + (err?.message ?? "Unknown error"));
@@ -10145,7 +9911,7 @@ async function streamWorkflowHandler(c2) {
     c2.header("Transfer-Encoding", "chunked");
     return streaming.stream(
       c2,
-      async (stream7) => {
+      async (stream6) => {
         try {
           const result = await workflows.streamWorkflowHandler({
             mastra,
@@ -10156,17 +9922,17 @@ async function streamWorkflowHandler(c2) {
             tracingOptions
           });
           const reader = result.stream.getReader();
-          stream7.onAbort(() => {
+          stream6.onAbort(() => {
             void reader.cancel("request aborted");
           });
           let chunkResult;
           while ((chunkResult = await reader.read()) && !chunkResult.done) {
-            await stream7.write(JSON.stringify(chunkResult.value) + "");
+            await stream6.write(JSON.stringify(chunkResult.value) + "");
           }
         } catch (err) {
           logger2.error("Error in workflow stream: " + (err?.message ?? "Unknown error"));
         }
-        await stream7.close();
+        await stream6.close();
       },
       async (err) => {
         logger2.error("Error in workflow stream: " + err?.message);
@@ -10188,7 +9954,7 @@ async function observeStreamWorkflowHandler(c2) {
     c2.header("Transfer-Encoding", "chunked");
     return streaming.stream(
       c2,
-      async (stream7) => {
+      async (stream6) => {
         try {
           const result = await workflows.observeStreamWorkflowHandler({
             mastra,
@@ -10196,17 +9962,17 @@ async function observeStreamWorkflowHandler(c2) {
             runId
           });
           const reader = result.getReader();
-          stream7.onAbort(() => {
+          stream6.onAbort(() => {
             void reader.cancel("request aborted");
           });
           let chunkResult;
           while ((chunkResult = await reader.read()) && !chunkResult.done) {
-            await stream7.write(JSON.stringify(chunkResult.value) + "");
+            await stream6.write(JSON.stringify(chunkResult.value) + "");
           }
         } catch (err) {
           logger2.error("Error in workflow observe stream: " + (err?.message ?? "Unknown error"));
         }
-        await stream7.close();
+        await stream6.close();
       },
       async (err) => {
         logger2.error("Error in workflow observe stream: " + err?.message);
@@ -10227,7 +9993,7 @@ async function streamVNextWorkflowHandler(c2) {
     c2.header("Transfer-Encoding", "chunked");
     return streaming.stream(
       c2,
-      async (stream7) => {
+      async (stream6) => {
         try {
           const result = await workflows.streamVNextWorkflowHandler({
             mastra,
@@ -10239,12 +10005,12 @@ async function streamVNextWorkflowHandler(c2) {
             tracingOptions
           });
           const reader = result.getReader();
-          stream7.onAbort(() => {
+          stream6.onAbort(() => {
             void reader.cancel("request aborted");
           });
           let chunkResult;
           while ((chunkResult = await reader.read()) && !chunkResult.done) {
-            await stream7.write(JSON.stringify(chunkResult.value) + "");
+            await stream6.write(JSON.stringify(chunkResult.value) + "");
           }
         } catch (err) {
           logger2.error("Error in workflow VNext stream: " + (err?.message ?? "Unknown error"));
@@ -10258,6 +10024,42 @@ async function streamVNextWorkflowHandler(c2) {
     return handleError(error, "Error streaming workflow");
   }
 }
+async function observeStreamVNextWorkflowHandler(c2) {
+  try {
+    const mastra = c2.get("mastra");
+    const logger2 = mastra.getLogger();
+    const workflowId = c2.req.param("workflowId");
+    const runId = c2.req.query("runId");
+    c2.header("Transfer-Encoding", "chunked");
+    return streaming.stream(
+      c2,
+      async (stream6) => {
+        try {
+          const result = await workflows.observeStreamVNextWorkflowHandler({
+            mastra,
+            workflowId,
+            runId
+          });
+          const reader = result.getReader();
+          stream6.onAbort(() => {
+            void reader.cancel("request aborted");
+          });
+          let chunkResult;
+          while ((chunkResult = await reader.read()) && !chunkResult.done) {
+            await stream6.write(JSON.stringify(chunkResult.value) + "");
+          }
+        } catch (err) {
+          logger2.error("Error in workflow VNext observe stream: " + (err?.message ?? "Unknown error"));
+        }
+      },
+      async (err) => {
+        logger2.error("Error in workflow VNext observe stream: " + err?.message);
+      }
+    );
+  } catch (error) {
+    return handleError(error, "Error observing vNext workflow stream");
+  }
+}
 async function resumeStreamWorkflowHandler(c2) {
   try {
     const mastra = c2.get("mastra");
@@ -10269,7 +10071,7 @@ async function resumeStreamWorkflowHandler(c2) {
     c2.header("Transfer-Encoding", "chunked");
     return streaming.stream(
       c2,
-      async (stream7) => {
+      async (stream6) => {
         try {
           const result = await workflows.resumeStreamWorkflowHandler({
             mastra,
@@ -10280,12 +10082,12 @@ async function resumeStreamWorkflowHandler(c2) {
             tracingOptions
           });
           const reader = result.getReader();
-          stream7.onAbort(() => {
+          stream6.onAbort(() => {
             void reader.cancel("request aborted");
           });
           let chunkResult;
           while ((chunkResult = await reader.read()) && !chunkResult.done) {
-            await stream7.write(JSON.stringify(chunkResult.value) + "");
+            await stream6.write(JSON.stringify(chunkResult.value) + "");
           }
         } catch (err) {
           logger2.error("Error in workflow VNext stream: " + (err?.message ?? "Unknown error"));
@@ -10515,20 +10317,20 @@ function watchLegacyWorkflowHandler(c2) {
     }
     return streaming.stream(
       c2,
-      async (stream7) => {
+      async (stream6) => {
         try {
           const result = await legacyWorkflows.watchLegacyWorkflowHandler({
             mastra,
             workflowId,
             runId
           });
-          stream7.onAbort(() => {
+          stream6.onAbort(() => {
             if (!result.locked) {
               return result.cancel();
             }
           });
           for await (const chunk of result) {
-            await stream7.write(chunk.toString() + "");
+            await stream6.write(chunk.toString() + "");
           }
         } catch (err) {
           console.error(err);
@@ -11322,6 +11124,36 @@ function workflowsRouter(bodyLimitOptions) {
     }),
     streamVNextWorkflowHandler
   );
+  router.post(
+    "/:workflowId/observe-streamVNext",
+    w({
+      description: "Observe workflow stream in real-time using the VNext streaming API",
+      parameters: [
+        {
+          name: "workflowId",
+          in: "path",
+          required: true,
+          schema: { type: "string" }
+        },
+        {
+          name: "runId",
+          in: "query",
+          required: true,
+          schema: { type: "string" }
+        }
+      ],
+      responses: {
+        200: {
+          description: "workflow stream vNext observed"
+        },
+        404: {
+          description: "workflow not found"
+        }
+      },
+      tags: ["workflows"]
+    }),
+    observeStreamVNextWorkflowHandler
+  );
   router.post(
     "/:workflowId/create-run",
     bodyLimit.bodyLimit(bodyLimitOptions),
@@ -12000,7 +11832,6 @@ async function createHonoServer(mastra, options = {
     getModelProvidersHandler
   );
   app.route("/api/agents", agentsRouter(bodyLimitOptions));
-  app.route("/api/networks", vNextNetworksRouter(bodyLimitOptions));
   if (options.isDev) {
     app.route("/api/agents", agentsRouterDev(bodyLimitOptions));
   }