@mastra/server 0.0.0-mcp-server-deploy-20250507160341 → 0.0.0-pass-headers-for-create-mastra-client-20250529190531

package/dist/{chunk-4BIX6GMY.cjs → chunk-A3KDUGS7.cjs}

@@ -1,13 +1,15 @@
 'use strict';
 
-var chunk5SWCVTNL_cjs = require('./chunk-5SWCVTNL.cjs');
-var chunkQN4KF3BH_cjs = require('./chunk-QN4KF3BH.cjs');
-var chunkZLBRQFDD_cjs = require('./chunk-ZLBRQFDD.cjs');
-var chunkFV45V6WC_cjs = require('./chunk-FV45V6WC.cjs');
+var chunkYWLUOY3D_cjs = require('./chunk-YWLUOY3D.cjs');
+var chunk57CJTIPW_cjs = require('./chunk-57CJTIPW.cjs');
+var chunk64U3UDTH_cjs = require('./chunk-64U3UDTH.cjs');
+var chunkOCWPVYNI_cjs = require('./chunk-OCWPVYNI.cjs');
+var chunk75ZPJI57_cjs = require('./chunk-75ZPJI57.cjs');
+var runtimeContext = require('@mastra/core/runtime-context');
 
 // src/server/handlers/agents.ts
 var agents_exports = {};
-chunkFV45V6WC_cjs.__export(agents_exports, {
+chunk75ZPJI57_cjs.__export(agents_exports, {
   generateHandler: () => generateHandler,
   getAgentByIdHandler: () => getAgentByIdHandler,
   getAgentsHandler: () => getAgentsHandler,
@@ -27,18 +29,38 @@ async function getAgentsHandler({ mastra, runtimeContext }) {
           const _tool = tool;
           acc[key] = {
             ..._tool,
-            inputSchema: _tool.inputSchema ? chunk5SWCVTNL_cjs.stringify(chunk5SWCVTNL_cjs.esm_default(_tool.inputSchema)) : void 0,
-            outputSchema: _tool.outputSchema ? chunk5SWCVTNL_cjs.stringify(chunk5SWCVTNL_cjs.esm_default(_tool.outputSchema)) : void 0
+            inputSchema: _tool.inputSchema ? chunkYWLUOY3D_cjs.stringify(chunkYWLUOY3D_cjs.esm_default(_tool.inputSchema)) : void 0,
+            outputSchema: _tool.outputSchema ? chunkYWLUOY3D_cjs.stringify(chunkYWLUOY3D_cjs.esm_default(_tool.outputSchema)) : void 0
           };
           return acc;
         }, {});
+        let serializedAgentWorkflows = {};
+        if ("getWorkflows" in agent) {
+          const logger = mastra.getLogger();
+          try {
+            const workflows = await agent.getWorkflows({ runtimeContext });
+            serializedAgentWorkflows = Object.entries(workflows || {}).reduce((acc, [key, workflow]) => {
+              return {
+                ...acc,
+                [key]: {
+                  name: workflow.name
+                }
+              };
+            }, {});
+          } catch (error) {
+            logger.error("Error getting workflows for agent", { agentName: agent.name, error });
+          }
+        }
         return {
           id,
           name: agent.name,
           instructions,
           tools: serializedAgentTools,
+          workflows: serializedAgentWorkflows,
           provider: llm?.getProvider(),
-          modelId: llm?.getModelId()
+          modelId: llm?.getModelId(),
+          defaultGenerateOptions: agent.getDefaultGenerateOptions(),
+          defaultStreamOptions: agent.getDefaultStreamOptions()
         };
       })
     );
@@ -48,7 +70,7 @@ async function getAgentsHandler({ mastra, runtimeContext }) {
     }, {});
     return serializedAgents;
   } catch (error) {
-    return chunkZLBRQFDD_cjs.handleError(error, "Error getting agents");
+    return chunk64U3UDTH_cjs.handleError(error, "Error getting agents");
   }
 }
 async function getAgentByIdHandler({
@@ -59,29 +81,49 @@ async function getAgentByIdHandler({
   try {
     const agent = mastra.getAgent(agentId);
     if (!agent) {
-      throw new chunkFV45V6WC_cjs.HTTPException(404, { message: "Agent not found" });
+      throw new chunkOCWPVYNI_cjs.HTTPException(404, { message: "Agent not found" });
     }
     const tools = await agent.getTools({ runtimeContext });
     const serializedAgentTools = Object.entries(tools || {}).reduce((acc, [key, tool]) => {
       const _tool = tool;
       acc[key] = {
         ..._tool,
-        inputSchema: _tool.inputSchema ? chunk5SWCVTNL_cjs.stringify(chunk5SWCVTNL_cjs.esm_default(_tool.inputSchema)) : void 0,
-        outputSchema: _tool.outputSchema ? chunk5SWCVTNL_cjs.stringify(chunk5SWCVTNL_cjs.esm_default(_tool.outputSchema)) : void 0
+        inputSchema: _tool.inputSchema ? chunkYWLUOY3D_cjs.stringify(chunkYWLUOY3D_cjs.esm_default(_tool.inputSchema)) : void 0,
+        outputSchema: _tool.outputSchema ? chunkYWLUOY3D_cjs.stringify(chunkYWLUOY3D_cjs.esm_default(_tool.outputSchema)) : void 0
       };
       return acc;
     }, {});
+    let serializedAgentWorkflows = {};
+    if ("getWorkflows" in agent) {
+      const logger = mastra.getLogger();
+      try {
+        const workflows = await agent.getWorkflows({ runtimeContext });
+        serializedAgentWorkflows = Object.entries(workflows || {}).reduce((acc, [key, workflow]) => {
+          return {
+            ...acc,
+            [key]: {
+              name: workflow.name
+            }
+          };
+        }, {});
+      } catch (error) {
+        logger.error("Error getting workflows for agent", { agentName: agent.name, error });
+      }
+    }
     const instructions = await agent.getInstructions({ runtimeContext });
     const llm = await agent.getLLM({ runtimeContext });
     return {
       name: agent.name,
       instructions,
       tools: serializedAgentTools,
+      workflows: serializedAgentWorkflows,
       provider: llm?.getProvider(),
-      modelId: llm?.getModelId()
+      modelId: llm?.getModelId(),
+      defaultGenerateOptions: agent.getDefaultGenerateOptions(),
+      defaultStreamOptions: agent.getDefaultStreamOptions()
     };
   } catch (error) {
-    return chunkZLBRQFDD_cjs.handleError(error, "Error getting agent");
+    return chunk64U3UDTH_cjs.handleError(error, "Error getting agent");
   }
 }
 async function getEvalsByAgentIdHandler({
@@ -100,7 +142,7 @@ async function getEvalsByAgentIdHandler({
       evals
     };
   } catch (error) {
-    return chunkZLBRQFDD_cjs.handleError(error, "Error getting test evals");
+    return chunk64U3UDTH_cjs.handleError(error, "Error getting test evals");
   }
 }
 async function getLiveEvalsByAgentIdHandler({
@@ -119,53 +161,61 @@ async function getLiveEvalsByAgentIdHandler({
       evals
     };
   } catch (error) {
-    return chunkZLBRQFDD_cjs.handleError(error, "Error getting live evals");
+    return chunk64U3UDTH_cjs.handleError(error, "Error getting live evals");
   }
 }
 async function generateHandler({
   mastra,
-  runtimeContext,
+  runtimeContext: runtimeContext$1,
   agentId,
   body
 }) {
   try {
     const agent = mastra.getAgent(agentId);
     if (!agent) {
-      throw new chunkFV45V6WC_cjs.HTTPException(404, { message: "Agent not found" });
+      throw new chunkOCWPVYNI_cjs.HTTPException(404, { message: "Agent not found" });
     }
-    const { messages, resourceId, resourceid, ...rest } = body;
+    const { messages, resourceId, resourceid, runtimeContext: agentRuntimeContext, ...rest } = body;
     const finalResourceId = resourceId ?? resourceid;
-    chunkQN4KF3BH_cjs.validateBody({ messages });
+    const finalRuntimeContext = new runtimeContext.RuntimeContext([
+      ...Array.from(runtimeContext$1.entries()),
+      ...Array.from(Object.entries(agentRuntimeContext ?? {}))
+    ]);
+    chunk57CJTIPW_cjs.validateBody({ messages });
     const result = await agent.generate(messages, {
       ...rest,
       // @ts-expect-error TODO fix types
       resourceId: finalResourceId,
-      runtimeContext
+      runtimeContext: finalRuntimeContext
     });
     return result;
   } catch (error) {
-    return chunkZLBRQFDD_cjs.handleError(error, "Error generating from agent");
+    return chunk64U3UDTH_cjs.handleError(error, "Error generating from agent");
   }
 }
 async function streamGenerateHandler({
   mastra,
-  runtimeContext,
+  runtimeContext: runtimeContext$1,
   agentId,
   body
 }) {
   try {
     const agent = mastra.getAgent(agentId);
     if (!agent) {
-      throw new chunkFV45V6WC_cjs.HTTPException(404, { message: "Agent not found" });
+      throw new chunkOCWPVYNI_cjs.HTTPException(404, { message: "Agent not found" });
     }
-    const { messages, resourceId, resourceid, ...rest } = body;
+    const { messages, resourceId, resourceid, runtimeContext: agentRuntimeContext, ...rest } = body;
     const finalResourceId = resourceId ?? resourceid;
-    chunkQN4KF3BH_cjs.validateBody({ messages });
+    const finalRuntimeContext = new runtimeContext.RuntimeContext([
+      ...Array.from(runtimeContext$1.entries()),
+      ...Array.from(Object.entries(agentRuntimeContext ?? {}))
+    ]);
+    chunk57CJTIPW_cjs.validateBody({ messages });
     const streamResult = await agent.stream(messages, {
       ...rest,
       // @ts-expect-error TODO fix types
       resourceId: finalResourceId,
-      runtimeContext
+      runtimeContext: finalRuntimeContext
     });
     const streamResponse = rest.output ? streamResult.toTextStreamResponse() : streamResult.toDataStreamResponse({
       sendUsage: true,
@@ -176,7 +226,7 @@ async function streamGenerateHandler({
     });
     return streamResponse;
   } catch (error) {
-    throw new chunkFV45V6WC_cjs.HTTPException(error?.status ?? 500, { message: error?.message ?? "Error streaming from agent" });
+    throw new chunkOCWPVYNI_cjs.HTTPException(error?.status ?? 500, { message: error?.message ?? "Error streaming from agent" });
   }
 }
 

package/dist/{chunk-M56ECCHK.cjs → chunk-BNEY4P4P.cjs}

@@ -1,11 +1,12 @@
 'use strict';
 
-var chunkZLBRQFDD_cjs = require('./chunk-ZLBRQFDD.cjs');
-var chunkFV45V6WC_cjs = require('./chunk-FV45V6WC.cjs');
+var chunk64U3UDTH_cjs = require('./chunk-64U3UDTH.cjs');
+var chunkOCWPVYNI_cjs = require('./chunk-OCWPVYNI.cjs');
+var chunk75ZPJI57_cjs = require('./chunk-75ZPJI57.cjs');
 
 // src/server/handlers/vector.ts
 var vector_exports = {};
-chunkFV45V6WC_cjs.__export(vector_exports, {
+chunk75ZPJI57_cjs.__export(vector_exports, {
   createIndex: () => createIndex,
   deleteIndex: () => deleteIndex,
   describeIndex: () => describeIndex,
@@ -15,24 +16,24 @@ chunkFV45V6WC_cjs.__export(vector_exports, {
 });
 function getVector(mastra, vectorName) {
   if (!vectorName) {
-    throw new chunkFV45V6WC_cjs.HTTPException(400, { message: "Vector name is required" });
+    throw new chunkOCWPVYNI_cjs.HTTPException(400, { message: "Vector name is required" });
   }
   const vector = mastra.getVector(vectorName);
   if (!vector) {
-    throw new chunkFV45V6WC_cjs.HTTPException(404, { message: `Vector store ${vectorName} not found` });
+    throw new chunkOCWPVYNI_cjs.HTTPException(404, { message: `Vector store ${vectorName} not found` });
   }
   return vector;
 }
 async function upsertVectors({ mastra, vectorName, index }) {
   try {
     if (!index?.indexName || !index?.vectors || !Array.isArray(index.vectors)) {
-      throw new chunkFV45V6WC_cjs.HTTPException(400, { message: "Invalid request index. indexName and vectors array are required." });
+      throw new chunkOCWPVYNI_cjs.HTTPException(400, { message: "Invalid request index. indexName and vectors array are required." });
     }
     const vector = getVector(mastra, vectorName);
     const result = await vector.upsert(index);
     return { ids: result };
   } catch (error) {
-    return chunkZLBRQFDD_cjs.handleError(error, "Error upserting vectors");
+    return chunk64U3UDTH_cjs.handleError(error, "Error upserting vectors");
   }
 }
 async function createIndex({
@@ -43,18 +44,18 @@ async function createIndex({
   try {
     const { indexName, dimension, metric } = index;
     if (!indexName || typeof dimension !== "number" || dimension <= 0) {
-      throw new chunkFV45V6WC_cjs.HTTPException(400, {
+      throw new chunkOCWPVYNI_cjs.HTTPException(400, {
         message: "Invalid request index, indexName and positive dimension number are required."
       });
     }
     if (metric && !["cosine", "euclidean", "dotproduct"].includes(metric)) {
-      throw new chunkFV45V6WC_cjs.HTTPException(400, { message: "Invalid metric. Must be one of: cosine, euclidean, dotproduct" });
+      throw new chunkOCWPVYNI_cjs.HTTPException(400, { message: "Invalid metric. Must be one of: cosine, euclidean, dotproduct" });
     }
     const vector = getVector(mastra, vectorName);
     await vector.createIndex({ indexName, dimension, metric });
     return { success: true };
   } catch (error) {
-    return chunkZLBRQFDD_cjs.handleError(error, "Error creating index");
+    return chunk64U3UDTH_cjs.handleError(error, "Error creating index");
   }
 }
 async function queryVectors({
@@ -64,13 +65,13 @@ async function queryVectors({
 }) {
   try {
     if (!query?.indexName || !query?.queryVector || !Array.isArray(query.queryVector)) {
-      throw new chunkFV45V6WC_cjs.HTTPException(400, { message: "Invalid request query. indexName and queryVector array are required." });
+      throw new chunkOCWPVYNI_cjs.HTTPException(400, { message: "Invalid request query. indexName and queryVector array are required." });
     }
     const vector = getVector(mastra, vectorName);
     const results = await vector.query(query);
     return results;
   } catch (error) {
-    return chunkZLBRQFDD_cjs.handleError(error, "Error querying vectors");
+    return chunk64U3UDTH_cjs.handleError(error, "Error querying vectors");
   }
 }
 async function listIndexes({ mastra, vectorName }) {
@@ -79,7 +80,7 @@ async function listIndexes({ mastra, vectorName }) {
     const indexes = await vector.listIndexes();
     return indexes.filter(Boolean);
   } catch (error) {
-    return chunkZLBRQFDD_cjs.handleError(error, "Error listing indexes");
+    return chunk64U3UDTH_cjs.handleError(error, "Error listing indexes");
   }
 }
 async function describeIndex({
@@ -89,17 +90,17 @@ async function describeIndex({
 }) {
   try {
     if (!indexName) {
-      throw new chunkFV45V6WC_cjs.HTTPException(400, { message: "Index name is required" });
+      throw new chunkOCWPVYNI_cjs.HTTPException(400, { message: "Index name is required" });
     }
     const vector = getVector(mastra, vectorName);
-    const stats = await vector.describeIndex(indexName);
+    const stats = await vector.describeIndex({ indexName });
     return {
       dimension: stats.dimension,
       count: stats.count,
       metric: stats.metric?.toLowerCase()
     };
   } catch (error) {
-    return chunkZLBRQFDD_cjs.handleError(error, "Error describing index");
+    return chunk64U3UDTH_cjs.handleError(error, "Error describing index");
   }
 }
 async function deleteIndex({
@@ -109,13 +110,13 @@ async function deleteIndex({
 }) {
   try {
     if (!indexName) {
-      throw new chunkFV45V6WC_cjs.HTTPException(400, { message: "Index name is required" });
+      throw new chunkOCWPVYNI_cjs.HTTPException(400, { message: "Index name is required" });
     }
     const vector = getVector(mastra, vectorName);
-    await vector.deleteIndex(indexName);
+    await vector.deleteIndex({ indexName });
     return { success: true };
   } catch (error) {
-    return chunkZLBRQFDD_cjs.handleError(error, "Error deleting index");
+    return chunk64U3UDTH_cjs.handleError(error, "Error deleting index");
   }
 }
 

package/dist/{chunk-QJ3AHN64.js → chunk-C7564HUT.js}

@@ -1,6 +1,7 @@
-import { validateBody } from './chunk-L7XE5QTW.js';
-import { handleError } from './chunk-3AHQ5RGN.js';
-import { __export, HTTPException } from './chunk-TRDNDNGQ.js';
+import { validateBody } from './chunk-H5PTF3Y4.js';
+import { handleError } from './chunk-M5ABIP7D.js';
+import { HTTPException } from './chunk-NYN7KFXL.js';
+import { __export } from './chunk-MLKGABMK.js';
 
 // src/server/handlers/network.ts
 var network_exports = {};

package/dist/{chunk-RBQASTUP.js → chunk-DJJIUEL2.js}

@@ -1,6 +1,7 @@
-import { validateBody } from './chunk-L7XE5QTW.js';
-import { handleError } from './chunk-3AHQ5RGN.js';
-import { __export, HTTPException } from './chunk-TRDNDNGQ.js';
+import { validateBody } from './chunk-H5PTF3Y4.js';
+import { handleError } from './chunk-M5ABIP7D.js';
+import { HTTPException } from './chunk-NYN7KFXL.js';
+import { __export } from './chunk-MLKGABMK.js';
 
 // src/server/handlers/memory.ts
 var memory_exports = {};
@@ -181,8 +182,12 @@ async function deleteThreadHandler({
 async function getMessagesHandler({
   mastra,
   agentId,
-  threadId
+  threadId,
+  limit
 }) {
+  if (limit !== void 0 && (!Number.isInteger(limit) || limit <= 0)) {
+    throw new HTTPException(400, { message: "Invalid limit: must be a positive integer" });
+  }
   try {
     validateBody({ threadId });
     const memory = getMemoryFromContext({ mastra, agentId });
@@ -193,7 +198,10 @@ async function getMessagesHandler({
     if (!thread) {
       throw new HTTPException(404, { message: "Thread not found" });
     }
-    const result = await memory.query({ threadId });
+    const result = await memory.query({
+      threadId,
+      ...limit && { selectBy: { last: limit } }
+    });
     return result;
   } catch (error) {
     return handleError(error, "Error getting messages");

package/dist/{chunk-3EJZQ6TQ.js → chunk-DQLE3DVM.js}

@@ -1,6 +1,6 @@
-import { validateBody } from './chunk-L7XE5QTW.js';
-import { handleError } from './chunk-3AHQ5RGN.js';
-import { __export } from './chunk-TRDNDNGQ.js';
+import { validateBody } from './chunk-H5PTF3Y4.js';
+import { handleError } from './chunk-M5ABIP7D.js';
+import { __export } from './chunk-MLKGABMK.js';
 
 // src/server/handlers/logs.ts
 var logs_exports = {};
@@ -37,9 +37,9 @@ async function getLogsByRunIdHandler({
 async function getLogTransports({ mastra }) {
   try {
     const logger = mastra.getLogger();
-    const transports = logger.transports;
+    const transports = logger.getTransports();
     return {
-      transports: transports ? Object.keys(transports) : []
+      transports: transports ? [...transports.keys()] : []
     };
   } catch (error) {
     return handleError(error, "Error getting log Transports");

package/dist/{chunk-L7XE5QTW.js → chunk-H5PTF3Y4.js}

@@ -1,4 +1,4 @@
-import { HTTPException } from './chunk-TRDNDNGQ.js';
+import { HTTPException } from './chunk-NYN7KFXL.js';
 
 // src/server/handlers/utils.ts
 function validateBody(body) {

package/dist/{chunk-Q6SHQECN.js → chunk-HFWCEP5S.js}

@@ -1,6 +1,7 @@
-import { validateBody } from './chunk-L7XE5QTW.js';
-import { handleError } from './chunk-3AHQ5RGN.js';
-import { __export, HTTPException } from './chunk-TRDNDNGQ.js';
+import { validateBody } from './chunk-H5PTF3Y4.js';
+import { handleError } from './chunk-M5ABIP7D.js';
+import { HTTPException } from './chunk-NYN7KFXL.js';
+import { __export } from './chunk-MLKGABMK.js';
 import { Readable } from 'stream';
 
 // src/server/handlers/voice.ts

package/dist/{chunk-Y3SV5XK4.js → chunk-J3PKLB3A.js}

@@ -1,7 +1,9 @@
-import { stringify, esm_default } from './chunk-OMN3UI6X.js';
-import { validateBody } from './chunk-L7XE5QTW.js';
-import { handleError } from './chunk-3AHQ5RGN.js';
-import { __export, HTTPException } from './chunk-TRDNDNGQ.js';
+import { stringify, esm_default } from './chunk-LIVAK2DM.js';
+import { validateBody } from './chunk-H5PTF3Y4.js';
+import { handleError } from './chunk-M5ABIP7D.js';
+import { HTTPException } from './chunk-NYN7KFXL.js';
+import { __export } from './chunk-MLKGABMK.js';
+import { RuntimeContext } from '@mastra/core/runtime-context';
 
 // src/server/handlers/agents.ts
 var agents_exports = {};
@@ -30,13 +32,33 @@ async function getAgentsHandler({ mastra, runtimeContext }) {
           };
           return acc;
         }, {});
+        let serializedAgentWorkflows = {};
+        if ("getWorkflows" in agent) {
+          const logger = mastra.getLogger();
+          try {
+            const workflows = await agent.getWorkflows({ runtimeContext });
+            serializedAgentWorkflows = Object.entries(workflows || {}).reduce((acc, [key, workflow]) => {
+              return {
+                ...acc,
+                [key]: {
+                  name: workflow.name
+                }
+              };
+            }, {});
+          } catch (error) {
+            logger.error("Error getting workflows for agent", { agentName: agent.name, error });
+          }
+        }
         return {
           id,
           name: agent.name,
           instructions,
           tools: serializedAgentTools,
+          workflows: serializedAgentWorkflows,
           provider: llm?.getProvider(),
-          modelId: llm?.getModelId()
+          modelId: llm?.getModelId(),
+          defaultGenerateOptions: agent.getDefaultGenerateOptions(),
+          defaultStreamOptions: agent.getDefaultStreamOptions()
         };
       })
     );
@@ -69,14 +91,34 @@ async function getAgentByIdHandler({
       };
       return acc;
     }, {});
+    let serializedAgentWorkflows = {};
+    if ("getWorkflows" in agent) {
+      const logger = mastra.getLogger();
+      try {
+        const workflows = await agent.getWorkflows({ runtimeContext });
+        serializedAgentWorkflows = Object.entries(workflows || {}).reduce((acc, [key, workflow]) => {
+          return {
+            ...acc,
+            [key]: {
+              name: workflow.name
+            }
+          };
+        }, {});
+      } catch (error) {
+        logger.error("Error getting workflows for agent", { agentName: agent.name, error });
+      }
+    }
     const instructions = await agent.getInstructions({ runtimeContext });
     const llm = await agent.getLLM({ runtimeContext });
     return {
       name: agent.name,
       instructions,
       tools: serializedAgentTools,
+      workflows: serializedAgentWorkflows,
       provider: llm?.getProvider(),
-      modelId: llm?.getModelId()
+      modelId: llm?.getModelId(),
+      defaultGenerateOptions: agent.getDefaultGenerateOptions(),
+      defaultStreamOptions: agent.getDefaultStreamOptions()
     };
   } catch (error) {
     return handleError(error, "Error getting agent");
@@ -131,14 +173,18 @@ async function generateHandler({
     if (!agent) {
       throw new HTTPException(404, { message: "Agent not found" });
     }
-    const { messages, resourceId, resourceid, ...rest } = body;
+    const { messages, resourceId, resourceid, runtimeContext: agentRuntimeContext, ...rest } = body;
     const finalResourceId = resourceId ?? resourceid;
+    const finalRuntimeContext = new RuntimeContext([
+      ...Array.from(runtimeContext.entries()),
+      ...Array.from(Object.entries(agentRuntimeContext ?? {}))
+    ]);
     validateBody({ messages });
     const result = await agent.generate(messages, {
       ...rest,
       // @ts-expect-error TODO fix types
       resourceId: finalResourceId,
-      runtimeContext
+      runtimeContext: finalRuntimeContext
     });
     return result;
   } catch (error) {
@@ -156,14 +202,18 @@ async function streamGenerateHandler({
     if (!agent) {
       throw new HTTPException(404, { message: "Agent not found" });
     }
-    const { messages, resourceId, resourceid, ...rest } = body;
+    const { messages, resourceId, resourceid, runtimeContext: agentRuntimeContext, ...rest } = body;
     const finalResourceId = resourceId ?? resourceid;
+    const finalRuntimeContext = new RuntimeContext([
+      ...Array.from(runtimeContext.entries()),
+      ...Array.from(Object.entries(agentRuntimeContext ?? {}))
+    ]);
     validateBody({ messages });
     const streamResult = await agent.stream(messages, {
       ...rest,
       // @ts-expect-error TODO fix types
       resourceId: finalResourceId,
-      runtimeContext
+      runtimeContext: finalRuntimeContext
     });
     const streamResponse = rest.output ? streamResult.toTextStreamResponse() : streamResult.toDataStreamResponse({
       sendUsage: true,