@mastra/server 0.0.0-fix-memory-xxhash-20250409202110 → 0.0.0-fix-message-embedding-20250506021742

package/dist/_tsup-dts-rollup.d.ts

@@ -1,27 +1,34 @@
 import type { Agent } from '@mastra/core/agent';
 import type { AgentNetwork } from '@mastra/core/network';
-import { BaseLogMessage } from '@mastra/core';
+import type { BaseLogMessage } from '@mastra/core/logger';
 import { CoreMessage } from 'ai';
-import { EvalRow } from '@mastra/core';
+import { EvalRow } from '@mastra/core/storage';
 import { GenerateObjectResult } from 'ai';
 import { GenerateTextResult } from 'ai';
 import type { Mastra } from '@mastra/core/mastra';
-import type { Mastra as Mastra_2 } from '@mastra/core';
 import type { MastraMemory } from '@mastra/core/memory';
 import { Message } from 'ai';
-import { MessageType } from '@mastra/core';
+import { MessageType } from '@mastra/core/memory';
+import { NewStep } from '@mastra/core/workflows/vNext';
+import type { NewWorkflow } from '@mastra/core/workflows/vNext';
 import type { QueryResult } from '@mastra/core/vector';
 import { ReadableStream as ReadableStream_2 } from 'node:stream/web';
-import { Step } from '@mastra/core';
-import { StepExecutionContext } from '@mastra/core';
-import { StepGraph } from '@mastra/core';
-import { StorageThreadType } from '@mastra/core';
+import type { RuntimeContext } from '@mastra/core/runtime-context';
+import type { RuntimeContext as RuntimeContext_2 } from '@mastra/core/di';
+import { SerializedStepFlowEntry } from '@mastra/core/workflows/vNext';
+import { Step } from '@mastra/core/workflows';
+import { StepExecutionContext } from '@mastra/core/workflows';
+import { StepGraph } from '@mastra/core/workflows';
+import { StorageThreadType } from '@mastra/core/memory';
 import type { ToolAction } from '@mastra/core/tools';
 import type { VercelTool } from '@mastra/core/tools';
 import type { Workflow } from '@mastra/core/workflows';
-import { WorkflowContext as WorkflowContext_2 } from '@mastra/core';
-import { WorkflowRunResult } from '@mastra/core';
-import { WorkflowRuns } from '@mastra/core';
+import { WorkflowContext as WorkflowContext_2 } from '@mastra/core/workflows';
+import { WorkflowResult } from '@mastra/core/workflows/vNext';
+import { WorkflowRunResult } from '@mastra/core/workflows';
+import type { WorkflowRuns } from '@mastra/core/storage';
+import { ZodType } from 'zod';
+import { ZodTypeDef } from 'zod';
 
 export declare namespace agents {
     export {
@@ -67,6 +74,10 @@ export declare function createThreadHandler({ mastra, agentId, body, }: Pick<Mem
     };
 }): Promise<StorageThreadType>;
 
+export declare function createVNextWorkflowRunHandler({ mastra, workflowId, runId: prevRunId, }: Pick<VNextWorkflowContext, 'mastra' | 'workflowId' | 'runId'>): Promise<{
+    runId: string;
+}>;
+
 export declare function deleteIndex({ mastra, vectorName, indexName, }: Pick<VectorContext, 'mastra' | 'vectorName'> & {
     indexName?: string;
 }): Promise<{
@@ -87,23 +98,27 @@ export declare function describeIndex({ mastra, vectorName, indexName, }: Pick<V
     metric: string | undefined;
 }>;
 
-export declare function executeAgentToolHandler({ mastra, agentId, toolId, data, }: Pick<ToolsContext, 'mastra' | 'toolId'> & {
+export declare function executeAgentToolHandler({ mastra, agentId, toolId, data, runtimeContext, }: Pick<ToolsContext, 'mastra' | 'toolId'> & {
     agentId?: string;
     data: any;
+    runtimeContext: RuntimeContext;
 }): Promise<any>;
 
-export declare function executeToolHandler(tools: ToolsContext['tools']): ({ mastra, runId, toolId, data, }: Pick<ToolsContext, "mastra" | "toolId" | "runId"> & {
+export declare function executeToolHandler(tools: ToolsContext['tools']): ({ mastra, runId, toolId, data, runtimeContext, }: Pick<ToolsContext, "mastra" | "toolId" | "runId"> & {
     data?: unknown;
+    runtimeContext: RuntimeContext;
 }) => Promise<any>;
 
-export declare function generateHandler({ mastra, agentId, body, }: Context & {
+export declare function generateHandler({ mastra, runtimeContext, agentId, body, }: Context & {
+    runtimeContext: RuntimeContext;
     agentId: string;
     body: GetBody<'generate'> & {
         resourceid?: string;
     };
 }): Promise<GenerateTextResult<any, any>>;
 
-export declare function generateHandler_alias_1({ mastra, networkId, body, }: NetworkContext & {
+export declare function generateHandler_alias_1({ mastra, runtimeContext, networkId, body, }: NetworkContext & {
+    runtimeContext: RuntimeContext;
     body: {
         messages?: Parameters<AgentNetwork['generate']>[0];
     } & Parameters<AgentNetwork['generate']>[1];
@@ -117,11 +132,10 @@ export declare function generateSpeechHandler({ mastra, agentId, body, }: VoiceC
         text?: string;
         speakerId?: string;
     };
-}): Promise<{
-    audioData: Buffer<ArrayBuffer>;
-}>;
+}): Promise<NodeJS.ReadableStream>;
 
-export declare function getAgentByIdHandler({ mastra, agentId }: Context & {
+export declare function getAgentByIdHandler({ mastra, runtimeContext, agentId, }: Context & {
+    runtimeContext: RuntimeContext;
     agentId: string;
 }): Promise<{
     name: any;
@@ -131,7 +145,9 @@ export declare function getAgentByIdHandler({ mastra, agentId }: Context & {
     modelId: string;
 }>;
 
-export declare function getAgentsHandler({ mastra }: Context): Promise<any>;
+export declare function getAgentsHandler({ mastra, runtimeContext }: Context & {
+    runtimeContext: RuntimeContext;
+}): Promise<any>;
 
 declare type GetBody<T extends keyof Agent & {
     [K in keyof Agent]: Agent[K] extends (...args: any) => any ? K : never;
@@ -139,7 +155,8 @@ declare type GetBody<T extends keyof Agent & {
     messages: Parameters<Agent[T]>[0];
 } & Parameters<Agent[T]>[1];
 
-export declare function getEvalsByAgentIdHandler({ mastra, agentId }: Context & {
+export declare function getEvalsByAgentIdHandler({ mastra, runtimeContext, agentId, }: Context & {
+    runtimeContext: RuntimeContext;
     agentId: string;
 }): Promise<{
     id: string;
@@ -148,7 +165,8 @@ export declare function getEvalsByAgentIdHandler({ mastra, agentId }: Context &
     evals: EvalRow[];
 }>;
 
-export declare function getLiveEvalsByAgentIdHandler({ mastra, agentId }: Context & {
+export declare function getLiveEvalsByAgentIdHandler({ mastra, runtimeContext, agentId, }: Context & {
+    runtimeContext: RuntimeContext;
     agentId: string;
 }): Promise<{
     id: string;
@@ -159,7 +177,7 @@ export declare function getLiveEvalsByAgentIdHandler({ mastra, agentId }: Contex
 
 export declare function getLogsByRunIdHandler({ mastra, runId, transportId, }: Pick<LogsContext, 'mastra' | 'runId' | 'transportId'>): Promise<BaseLogMessage[] | undefined>;
 
-export declare function getLogsHandler({ mastra, transportId }: Pick<LogsContext, 'mastra' | 'transportId'>): Promise<BaseLogMessage[]>;
+export declare function getLogsHandler({ mastra, transportId, }: Pick<LogsContext, 'mastra' | 'transportId'>): Promise<BaseLogMessage[]>;
 
 export declare function getLogTransports({ mastra }: Pick<LogsContext, 'mastra'>): Promise<{
     transports: string[];
@@ -174,7 +192,7 @@ export declare function getMessagesHandler({ mastra, agentId, threadId, }: Pick<
     uiMessages: Message[];
 }>;
 
-export declare function getNetworkByIdHandler({ mastra, networkId }: Pick<NetworkContext, 'mastra' | 'networkId'>): Promise<{
+export declare function getNetworkByIdHandler({ mastra, networkId, runtimeContext, }: Pick<NetworkContext, 'mastra' | 'networkId' | 'runtimeContext'>): Promise<{
     id: string;
     name: string;
     instructions: string;
@@ -189,7 +207,7 @@ export declare function getNetworkByIdHandler({ mastra, networkId }: Pick<Networ
     };
 }>;
 
-export declare function getNetworksHandler({ mastra }: Pick<NetworkContext, 'mastra'>): Promise<{
+export declare function getNetworksHandler({ mastra, runtimeContext, }: Pick<NetworkContext, 'mastra' | 'runtimeContext'>): Promise<{
     id: string;
     name: string;
     instructions: string;
@@ -221,6 +239,26 @@ export declare function getToolByIdHandler({ tools, toolId }: Pick<ToolsContext,
 
 export declare function getToolsHandler({ tools }: Pick<ToolsContext, 'tools'>): Promise<Record<string, any>>;
 
+export declare function getVNextWorkflowByIdHandler({ mastra, workflowId }: VNextWorkflowContext): Promise<{
+    steps: any;
+    name: string | undefined;
+    stepGraph: SerializedStepFlowEntry[];
+    inputSchema: string | undefined;
+    outputSchema: string | undefined;
+}>;
+
+export declare function getVNextWorkflowRunHandler({ mastra, workflowId, runId, }: Pick<VNextWorkflowContext, 'mastra' | 'workflowId' | 'runId'>): Promise<ReturnType<NewWorkflow['getWorkflowRun']>>;
+
+export declare function getVNextWorkflowRunsHandler({ mastra, workflowId, fromDate, toDate, limit, offset, resourceId, }: VNextWorkflowContext & {
+    fromDate?: Date;
+    toDate?: Date;
+    limit?: number;
+    offset?: number;
+    resourceId?: string;
+}): Promise<WorkflowRuns>;
+
+export declare function getVNextWorkflowsHandler({ mastra }: VNextWorkflowContext): Promise<any>;
+
 export declare function getWorkflowByIdHandler({ mastra, workflowId }: WorkflowContext): Promise<{
     stepGraph: StepGraph;
     stepSubscriberGraph: Record<string, StepGraph>;
@@ -233,7 +271,13 @@ export declare function getWorkflowByIdHandler({ mastra, workflowId }: WorkflowC
 
 export declare function getWorkflowRunHandler({ mastra, workflowId, runId, }: Pick<WorkflowContext, 'mastra' | 'workflowId' | 'runId'>): Promise<ReturnType<Workflow['getRun']>>;
 
-export declare function getWorkflowRunsHandler({ mastra, workflowId }: WorkflowContext): Promise<WorkflowRuns>;
+export declare function getWorkflowRunsHandler({ mastra, workflowId, fromDate, toDate, limit, offset, resourceId, }: WorkflowContext & {
+    fromDate?: Date;
+    toDate?: Date;
+    limit?: number;
+    offset?: number;
+    resourceId?: string;
+}): Promise<WorkflowRuns>;
 
 export declare function getWorkflowsHandler({ mastra }: WorkflowContext): Promise<any>;
 
@@ -346,6 +390,7 @@ export declare namespace network {
 
 declare interface NetworkContext extends Context {
     networkId?: string;
+    runtimeContext: RuntimeContext;
 }
 
 declare interface QueryRequest {
@@ -362,18 +407,38 @@ export declare function queryVectors({ mastra, vectorName, query, }: Pick<Vector
 
 declare type RedirectStatusCode = 300 | 301 | 302 | 303 | 304 | DeprecatedStatusCode | 307 | 308;
 
-export declare function resumeAsyncWorkflowHandler({ mastra, workflowId, runId, body, }: WorkflowContext & {
+export declare function resumeAsyncVNextWorkflowHandler({ mastra, workflowId, runId, body, runtimeContext, }: VNextWorkflowContext & {
+    body: {
+        step: string | string[];
+        resumeData?: unknown;
+    };
+    runtimeContext?: RuntimeContext_2;
+}): Promise<WorkflowResult<ZodType<any, ZodTypeDef, any>, NewStep<string, any, any, any, any>[]>>;
+
+export declare function resumeAsyncWorkflowHandler({ mastra, workflowId, runId, body, runtimeContext, }: WorkflowContext & {
     body: {
         stepId: string;
         context: any;
     };
+    runtimeContext: RuntimeContext;
 }): Promise<Omit<WorkflowRunResult<any, Step<string, any, any, StepExecutionContext<any, WorkflowContext_2<any, Step<string, any, any, any>[], Record<string, any>>>>[], any>, "runId"> | undefined>;
 
-export declare function resumeWorkflowHandler({ mastra, workflowId, runId, body, }: WorkflowContext & {
+export declare function resumeVNextWorkflowHandler({ mastra, workflowId, runId, body, runtimeContext, }: VNextWorkflowContext & {
+    body: {
+        step: string | string[];
+        resumeData?: unknown;
+    };
+    runtimeContext?: RuntimeContext_2;
+}): Promise<{
+    message: string;
+}>;
+
+export declare function resumeWorkflowHandler({ mastra, workflowId, runId, body, runtimeContext, }: WorkflowContext & {
     body: {
         stepId: string;
         context: any;
     };
+    runtimeContext: RuntimeContext;
 }): Promise<{
     message: string;
 }>;
@@ -386,12 +451,26 @@ export declare function saveMessagesHandler({ mastra, agentId, body, }: Pick<Mem
 
 declare type ServerErrorStatusCode = 500 | 501 | 502 | 503 | 504 | 505 | 506 | 507 | 508 | 510 | 511;
 
-export declare function startAsyncWorkflowHandler({ mastra, workflowId, runId, triggerData, }: Pick<WorkflowContext, 'mastra' | 'workflowId' | 'runId'> & {
+export declare function startAsyncVNextWorkflowHandler({ mastra, runtimeContext, workflowId, runId, inputData, }: Pick<VNextWorkflowContext, 'mastra' | 'workflowId' | 'runId'> & {
+    inputData?: unknown;
+    runtimeContext?: RuntimeContext_2;
+}): Promise<WorkflowResult<ZodType<any, ZodTypeDef, any>, NewStep<string, any, any, any, any>[]>>;
+
+export declare function startAsyncWorkflowHandler({ mastra, runtimeContext, workflowId, runId, triggerData, }: Pick<WorkflowContext, 'mastra' | 'workflowId' | 'runId'> & {
     triggerData?: unknown;
+    runtimeContext: RuntimeContext;
 }): Promise<WorkflowRunResult<any, Step<string, any, any, StepExecutionContext<any, WorkflowContext_2<any, Step<string, any, any, any>[], Record<string, any>>>>[], any>>;
 
-export declare function startWorkflowRunHandler({ mastra, workflowId, runId, triggerData, }: Pick<WorkflowContext, 'mastra' | 'workflowId' | 'runId'> & {
+export declare function startVNextWorkflowRunHandler({ mastra, runtimeContext, workflowId, runId, inputData, }: Pick<VNextWorkflowContext, 'mastra' | 'workflowId' | 'runId'> & {
+    inputData?: unknown;
+    runtimeContext?: RuntimeContext_2;
+}): Promise<{
+    message: string;
+}>;
+
+export declare function startWorkflowRunHandler({ mastra, runtimeContext, workflowId, runId, triggerData, }: Pick<WorkflowContext, 'mastra' | 'workflowId' | 'runId'> & {
     triggerData?: unknown;
+    runtimeContext: RuntimeContext;
 }): Promise<{
     message: string;
 }>;
@@ -415,14 +494,16 @@ export declare function storeTelemetryHandler({ mastra, body }: Context & {
     traceCount: number;
 }>;
 
-export declare function streamGenerateHandler({ mastra, agentId, body, }: Context & {
+export declare function streamGenerateHandler({ mastra, runtimeContext, agentId, body, }: Context & {
+    runtimeContext: RuntimeContext;
     agentId: string;
     body: GetBody<'stream'> & {
         resourceid?: string;
     };
 }): Promise<Response | undefined>;
 
-export declare function streamGenerateHandler_alias_1({ mastra, networkId, body, }: NetworkContext & {
+export declare function streamGenerateHandler_alias_1({ mastra, networkId, body, runtimeContext, }: NetworkContext & {
+    runtimeContext: RuntimeContext;
     body: {
         messages?: Parameters<AgentNetwork['stream']>[0];
     } & Parameters<AgentNetwork['stream']>[1];
@@ -444,6 +525,8 @@ declare interface TelemetryContext extends Context {
         page?: number;
         perPage?: number;
         attribute?: string | string[];
+        fromDate?: Date;
+        toDate?: Date;
     };
 }
 
@@ -526,6 +609,26 @@ declare interface VectorContext extends Context {
     vectorName?: string;
 }
 
+declare interface VNextWorkflowContext extends Context {
+    workflowId?: string;
+    runId?: string;
+}
+
+export declare namespace vNextWorkflows {
+    export {
+        getVNextWorkflowsHandler,
+        getVNextWorkflowByIdHandler,
+        getVNextWorkflowRunHandler,
+        createVNextWorkflowRunHandler,
+        startAsyncVNextWorkflowHandler,
+        startVNextWorkflowRunHandler,
+        watchVNextWorkflowHandler,
+        resumeAsyncVNextWorkflowHandler,
+        resumeVNextWorkflowHandler,
+        getVNextWorkflowRunsHandler
+    }
+}
+
 export declare namespace voice {
     export {
         getSpeakersHandler,
@@ -538,10 +641,11 @@ declare interface VoiceContext extends Context {
     agentId?: string;
 }
 
+export declare function watchVNextWorkflowHandler({ mastra, workflowId, runId, }: Pick<VNextWorkflowContext, 'mastra' | 'workflowId' | 'runId'>): Promise<ReadableStream_2<string>>;
+
 export declare function watchWorkflowHandler({ mastra, workflowId, runId, }: Pick<WorkflowContext, 'mastra' | 'workflowId' | 'runId'>): Promise<ReadableStream_2<string>>;
 
-declare interface WorkflowContext {
-    mastra: Mastra_2;
+declare interface WorkflowContext extends Context {
     workflowId?: string;
     runId?: string;
 }

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

@@ -9,7 +9,10 @@ __export(logs_exports, {
   getLogsByRunIdHandler: () => getLogsByRunIdHandler,
   getLogsHandler: () => getLogsHandler
 });
-async function getLogsHandler({ mastra, transportId }) {
+async function getLogsHandler({
+  mastra,
+  transportId
+}) {
   try {
     validateBody({ transportId });
     const logs = await mastra.getLogs(transportId);

package/dist/{chunk-ILW7XYNJ.js → chunk-3XTEV33Q.js}

@@ -1,4 +1,4 @@
-import { stringify, esm_default } from './chunk-VK6FX47H.js';
+import { stringify, esm_default } from './chunk-OMN3UI6X.js';
 import { handleError } from './chunk-3AHQ5RGN.js';
 import { __export, HTTPException } from './chunk-TRDNDNGQ.js';
 import { ReadableStream } from 'node:stream/web';
@@ -32,7 +32,9 @@ async function getWorkflowsHandler({ mastra }) {
         steps: Object.entries(workflow.steps).reduce((acc2, [key2, step]) => {
           const _step = step;
           acc2[key2] = {
-            ..._step,
+            id: _step.id,
+            description: _step.description,
+            workflowId: _step.workflowId,
             inputSchema: _step.inputSchema ? stringify(esm_default(_step.inputSchema)) : void 0,
             outputSchema: _step.outputSchema ? stringify(esm_default(_step.outputSchema)) : void 0
           };
@@ -65,7 +67,9 @@ async function getWorkflowByIdHandler({ mastra, workflowId }) {
       steps: Object.entries(workflow.steps).reduce((acc, [key, step]) => {
         const _step = step;
         acc[key] = {
-          ..._step,
+          id: _step.id,
+          description: _step.description,
+          workflowId: _step.workflowId,
           inputSchema: _step.inputSchema ? stringify(esm_default(_step.inputSchema)) : void 0,
           outputSchema: _step.outputSchema ? stringify(esm_default(_step.outputSchema)) : void 0
         };
@@ -78,6 +82,7 @@ async function getWorkflowByIdHandler({ mastra, workflowId }) {
 }
 async function startAsyncWorkflowHandler({
   mastra,
+  runtimeContext,
   workflowId,
   runId,
   triggerData
@@ -93,7 +98,8 @@ async function startAsyncWorkflowHandler({
     if (!runId) {
       const { start } = workflow.createRun();
       const result2 = await start({
-        triggerData
+        triggerData,
+        runtimeContext
       });
       return result2;
     }
@@ -102,7 +108,8 @@ async function startAsyncWorkflowHandler({
       throw new HTTPException(404, { message: "Workflow run not found" });
     }
     const result = await run.start({
-      triggerData
+      triggerData,
+      runtimeContext
     });
     return result;
   } catch (error) {
@@ -155,6 +162,7 @@ async function createRunHandler({
 }
 async function startWorkflowRunHandler({
   mastra,
+  runtimeContext,
   workflowId,
   runId,
   triggerData
@@ -172,7 +180,8 @@ async function startWorkflowRunHandler({
       throw new HTTPException(404, { message: "Workflow run not found" });
     }
     await run.start({
-      triggerData
+      triggerData,
+      runtimeContext
     });
     return { message: "Workflow run started" };
   } catch (e) {
@@ -227,7 +236,8 @@ async function resumeAsyncWorkflowHandler({
   mastra,
   workflowId,
   runId,
-  body
+  body,
+  runtimeContext
 }) {
   try {
     if (!workflowId) {
@@ -243,7 +253,8 @@ async function resumeAsyncWorkflowHandler({
     }
     const result = await run.resume({
       stepId: body.stepId,
-      context: body.context
+      context: body.context,
+      runtimeContext
     });
     return result;
   } catch (error) {
@@ -254,7 +265,8 @@ async function resumeWorkflowHandler({
   mastra,
   workflowId,
   runId,
-  body
+  body,
+  runtimeContext
 }) {
   try {
     if (!workflowId) {
@@ -270,20 +282,29 @@ async function resumeWorkflowHandler({
     }
     await run.resume({
       stepId: body.stepId,
-      context: body.context
+      context: body.context,
+      runtimeContext
     });
     return { message: "Workflow run resumed" };
   } catch (error) {
     return handleError(error, "Error resuming workflow");
   }
 }
-async function getWorkflowRunsHandler({ mastra, workflowId }) {
+async function getWorkflowRunsHandler({
+  mastra,
+  workflowId,
+  fromDate,
+  toDate,
+  limit,
+  offset,
+  resourceId
+}) {
   try {
     if (!workflowId) {
       throw new HTTPException(400, { message: "Workflow ID is required" });
     }
     const workflow = mastra.getWorkflow(workflowId);
-    const workflowRuns = await workflow.getWorkflowRuns() || {
+    const workflowRuns = await workflow.getWorkflowRuns({ fromDate, toDate, limit, offset, resourceId }) || {
       runs: [],
       total: 0
     };

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

@@ -1,6 +1,6 @@
 'use strict';
 
-var chunkQH6XWSXP_cjs = require('./chunk-QH6XWSXP.cjs');
+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');
@@ -15,27 +15,35 @@ chunkFV45V6WC_cjs.__export(agents_exports, {
   getLiveEvalsByAgentIdHandler: () => getLiveEvalsByAgentIdHandler,
   streamGenerateHandler: () => streamGenerateHandler
 });
-async function getAgentsHandler({ mastra }) {
+async function getAgentsHandler({ mastra, runtimeContext }) {
   try {
     const agents = mastra.getAgents();
-    const serializedAgents = Object.entries(agents).reduce((acc, [_id, _agent]) => {
-      const agent = _agent;
-      const serializedAgentTools = Object.entries(agent?.tools || {}).reduce((acc2, [key, tool]) => {
-        const _tool = tool;
-        acc2[key] = {
-          ..._tool,
-          inputSchema: _tool.inputSchema ? chunkQH6XWSXP_cjs.stringify(chunkQH6XWSXP_cjs.esm_default(_tool.inputSchema)) : void 0,
-          outputSchema: _tool.outputSchema ? chunkQH6XWSXP_cjs.stringify(chunkQH6XWSXP_cjs.esm_default(_tool.outputSchema)) : void 0
+    const serializedAgentsMap = await Promise.all(
+      Object.entries(agents).map(async ([id, agent]) => {
+        const instructions = await agent.getInstructions({ runtimeContext });
+        const tools = await agent.getTools({ runtimeContext });
+        const llm = await agent.getLLM({ 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
+          };
+          return acc;
+        }, {});
+        return {
+          id,
+          name: agent.name,
+          instructions,
+          tools: serializedAgentTools,
+          provider: llm?.getProvider(),
+          modelId: llm?.getModelId()
         };
-        return acc2;
-      }, {});
-      acc[_id] = {
-        name: agent.name,
-        instructions: agent.instructions,
-        tools: serializedAgentTools,
-        provider: agent.llm?.getProvider(),
-        modelId: agent.llm?.getModelId()
-      };
+      })
+    );
+    const serializedAgents = serializedAgentsMap.reduce((acc, { id, ...rest }) => {
+      acc[id] = rest;
       return acc;
     }, {});
     return serializedAgents;
@@ -43,54 +51,71 @@ async function getAgentsHandler({ mastra }) {
     return chunkZLBRQFDD_cjs.handleError(error, "Error getting agents");
   }
 }
-async function getAgentByIdHandler({ mastra, agentId }) {
+async function getAgentByIdHandler({
+  mastra,
+  runtimeContext,
+  agentId
+}) {
   try {
     const agent = mastra.getAgent(agentId);
     if (!agent) {
       throw new chunkFV45V6WC_cjs.HTTPException(404, { message: "Agent not found" });
     }
-    const serializedAgentTools = Object.entries(agent?.tools || {}).reduce((acc, [key, tool]) => {
+    const tools = await agent.getTools({ runtimeContext });
+    const serializedAgentTools = Object.entries(tools || {}).reduce((acc, [key, tool]) => {
       const _tool = tool;
       acc[key] = {
         ..._tool,
-        inputSchema: _tool.inputSchema ? chunkQH6XWSXP_cjs.stringify(chunkQH6XWSXP_cjs.esm_default(_tool.inputSchema)) : void 0,
-        outputSchema: _tool.outputSchema ? chunkQH6XWSXP_cjs.stringify(chunkQH6XWSXP_cjs.esm_default(_tool.outputSchema)) : void 0
+        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
       };
       return acc;
     }, {});
+    const instructions = await agent.getInstructions({ runtimeContext });
+    const llm = await agent.getLLM({ runtimeContext });
     return {
       name: agent.name,
-      instructions: agent.instructions,
+      instructions,
       tools: serializedAgentTools,
-      provider: agent.llm?.getProvider(),
-      modelId: agent.llm?.getModelId()
+      provider: llm?.getProvider(),
+      modelId: llm?.getModelId()
     };
   } catch (error) {
     return chunkZLBRQFDD_cjs.handleError(error, "Error getting agent");
   }
 }
-async function getEvalsByAgentIdHandler({ mastra, agentId }) {
+async function getEvalsByAgentIdHandler({
+  mastra,
+  runtimeContext,
+  agentId
+}) {
   try {
     const agent = mastra.getAgent(agentId);
-    const evals = await mastra.getStorage()?.__getEvalsByAgentName?.(agent.name, "test") || [];
+    const evals = await mastra.getStorage()?.getEvalsByAgentName?.(agent.name, "test") || [];
+    const instructions = await agent.getInstructions({ runtimeContext });
     return {
       id: agentId,
       name: agent.name,
-      instructions: agent.instructions,
+      instructions,
       evals
     };
   } catch (error) {
     return chunkZLBRQFDD_cjs.handleError(error, "Error getting test evals");
   }
 }
-async function getLiveEvalsByAgentIdHandler({ mastra, agentId }) {
+async function getLiveEvalsByAgentIdHandler({
+  mastra,
+  runtimeContext,
+  agentId
+}) {
   try {
     const agent = mastra.getAgent(agentId);
-    const evals = await mastra.getStorage()?.__getEvalsByAgentName?.(agent.name, "live") || [];
+    const evals = await mastra.getStorage()?.getEvalsByAgentName?.(agent.name, "live") || [];
+    const instructions = await agent.getInstructions({ runtimeContext });
     return {
       id: agentId,
       name: agent.name,
-      instructions: agent.instructions,
+      instructions,
       evals
     };
   } catch (error) {
@@ -99,6 +124,7 @@ async function getLiveEvalsByAgentIdHandler({ mastra, agentId }) {
 }
 async function generateHandler({
   mastra,
+  runtimeContext,
   agentId,
   body
 }) {
@@ -113,7 +139,8 @@ async function generateHandler({
     const result = await agent.generate(messages, {
       ...rest,
       // @ts-expect-error TODO fix types
-      resourceId: finalResourceId
+      resourceId: finalResourceId,
+      runtimeContext
     });
     return result;
   } catch (error) {
@@ -122,6 +149,7 @@ async function generateHandler({
 }
 async function streamGenerateHandler({
   mastra,
+  runtimeContext,
   agentId,
   body
 }) {
@@ -136,7 +164,8 @@ async function streamGenerateHandler({
     const streamResult = await agent.stream(messages, {
       ...rest,
       // @ts-expect-error TODO fix types
-      resourceId: finalResourceId
+      resourceId: finalResourceId,
+      runtimeContext
     });
     const streamResponse = rest.output ? streamResult.toTextStreamResponse() : streamResult.toDataStreamResponse({
       sendUsage: true,