@mastra/server 0.10.7-alpha.1 → 0.10.7-alpha.3

package/dist/{chunk-6TJSHFCJ.cjs → chunk-RQ2Z56EC.cjs}

@@ -17,20 +17,36 @@ chunk75ZPJI57_cjs.__export(memory_exports, {
   saveMessagesHandler: () => saveMessagesHandler,
   updateThreadHandler: () => updateThreadHandler
 });
-function getMemoryFromContext({
+async function getMemoryFromContext({
   mastra,
-  agentId
+  agentId,
+  networkId,
+  runtimeContext
 }) {
   const agent = agentId ? mastra.getAgent(agentId) : null;
   if (agentId && !agent) {
     throw new chunkOCWPVYNI_cjs.HTTPException(404, { message: "Agent not found" });
   }
-  const memory = agent?.getMemory?.() || mastra.getMemory();
-  return memory;
+  const network = networkId ? mastra.vnext_getNetwork(networkId) : null;
+  if (networkId && !network) {
+    throw new chunkOCWPVYNI_cjs.HTTPException(404, { message: "Network not found" });
+  }
+  if (agent) {
+    return agent?.getMemory() || mastra.getMemory();
+  }
+  if (network) {
+    return await network?.getMemory({ runtimeContext }) || mastra.getMemory();
+  }
+  return mastra.getMemory();
 }
-async function getMemoryStatusHandler({ mastra, agentId }) {
+async function getMemoryStatusHandler({
+  mastra,
+  agentId,
+  networkId,
+  runtimeContext
+}) {
   try {
-    const memory = getMemoryFromContext({ mastra, agentId });
+    const memory = await getMemoryFromContext({ mastra, agentId, networkId, runtimeContext });
     if (!memory) {
       return { result: false };
     }
@@ -42,10 +58,12 @@ async function getMemoryStatusHandler({ mastra, agentId }) {
 async function getThreadsHandler({
   mastra,
   agentId,
-  resourceId
+  resourceId,
+  networkId,
+  runtimeContext
 }) {
   try {
-    const memory = getMemoryFromContext({ mastra, agentId });
+    const memory = await getMemoryFromContext({ mastra, agentId, networkId, runtimeContext });
     if (!memory) {
       throw new chunkOCWPVYNI_cjs.HTTPException(400, { message: "Memory is not initialized" });
     }
@@ -59,11 +77,13 @@ async function getThreadsHandler({
 async function getThreadByIdHandler({
   mastra,
   agentId,
-  threadId
+  threadId,
+  networkId,
+  runtimeContext
 }) {
   try {
     chunk57CJTIPW_cjs.validateBody({ threadId });
-    const memory = getMemoryFromContext({ mastra, agentId });
+    const memory = await getMemoryFromContext({ mastra, agentId, networkId, runtimeContext });
     if (!memory) {
       throw new chunkOCWPVYNI_cjs.HTTPException(400, { message: "Memory is not initialized" });
     }
@@ -79,10 +99,12 @@ async function getThreadByIdHandler({
 async function saveMessagesHandler({
   mastra,
   agentId,
-  body
+  body,
+  networkId,
+  runtimeContext
 }) {
   try {
-    const memory = getMemoryFromContext({ mastra, agentId });
+    const memory = await getMemoryFromContext({ mastra, agentId, networkId, runtimeContext });
     if (!memory) {
       throw new chunkOCWPVYNI_cjs.HTTPException(400, { message: "Memory is not initialized" });
     }
@@ -106,10 +128,12 @@ async function saveMessagesHandler({
 async function createThreadHandler({
   mastra,
   agentId,
-  body
+  body,
+  networkId,
+  runtimeContext
 }) {
   try {
-    const memory = getMemoryFromContext({ mastra, agentId });
+    const memory = await getMemoryFromContext({ mastra, agentId, networkId, runtimeContext });
     if (!memory) {
       throw new chunkOCWPVYNI_cjs.HTTPException(400, { message: "Memory is not initialized" });
     }
@@ -129,10 +153,12 @@ async function updateThreadHandler({
   mastra,
   agentId,
   threadId,
-  body
+  body,
+  networkId,
+  runtimeContext
 }) {
   try {
-    const memory = getMemoryFromContext({ mastra, agentId });
+    const memory = await getMemoryFromContext({ mastra, agentId, networkId, runtimeContext });
     if (!body) {
       throw new chunkOCWPVYNI_cjs.HTTPException(400, { message: "Body is required" });
     }
@@ -163,11 +189,13 @@ async function updateThreadHandler({
 async function deleteThreadHandler({
   mastra,
   agentId,
-  threadId
+  threadId,
+  networkId,
+  runtimeContext
 }) {
   try {
     chunk57CJTIPW_cjs.validateBody({ threadId });
-    const memory = getMemoryFromContext({ mastra, agentId });
+    const memory = await getMemoryFromContext({ mastra, agentId, networkId, runtimeContext });
     if (!memory) {
       throw new chunkOCWPVYNI_cjs.HTTPException(400, { message: "Memory is not initialized" });
     }
@@ -185,14 +213,16 @@ async function getMessagesHandler({
   mastra,
   agentId,
   threadId,
-  limit
+  limit,
+  networkId,
+  runtimeContext
 }) {
   if (limit !== void 0 && (!Number.isInteger(limit) || limit <= 0)) {
     throw new chunkOCWPVYNI_cjs.HTTPException(400, { message: "Invalid limit: must be a positive integer" });
   }
   try {
     chunk57CJTIPW_cjs.validateBody({ threadId });
-    const memory = getMemoryFromContext({ mastra, agentId });
+    const memory = await getMemoryFromContext({ mastra, agentId, networkId, runtimeContext });
     if (!memory) {
       throw new chunkOCWPVYNI_cjs.HTTPException(400, { message: "Memory is not initialized" });
     }

package/dist/{chunk-JKTNRUKY.js → chunk-SOBBILUG.js}

@@ -1,9 +1,8 @@
-import { stringify, esm_default } from './chunk-TGJMNUYJ.js';
+import { stringify, esm_default } from './chunk-OSZM4EAY.js';
 import { handleError } from './chunk-M5ABIP7D.js';
 import { HTTPException } from './chunk-NYN7KFXL.js';
 import { __export } from './chunk-MLKGABMK.js';
 import { ReadableStream } from 'stream/web';
-import { RuntimeContext } from '@mastra/core/di';
 
 // src/server/handlers/workflows.ts
 var workflows_exports = {};
@@ -180,7 +179,7 @@ async function createWorkflowRunHandler({
     if (!workflow) {
       throw new HTTPException(404, { message: "Workflow not found" });
     }
-    const run = workflow.createRun({ runId: prevRunId });
+    const run = await workflow.createRunAsync({ runId: prevRunId });
     return { runId: run.runId };
   } catch (error) {
     throw new HTTPException(500, { message: error?.message || "Error creating workflow run" });
@@ -188,7 +187,7 @@ async function createWorkflowRunHandler({
 }
 async function startAsyncWorkflowHandler({
   mastra,
-  runtimeContext: payloadRuntimeContext,
+  runtimeContext,
   workflowId,
   runId,
   inputData
@@ -201,14 +200,7 @@ async function startAsyncWorkflowHandler({
     if (!workflow) {
       throw new HTTPException(404, { message: "Workflow not found" });
     }
-    let runtimeContext;
-    if (payloadRuntimeContext) {
-      runtimeContext = new RuntimeContext();
-      Object.entries(payloadRuntimeContext || {}).forEach(([key, value]) => {
-        runtimeContext.set(key, value);
-      });
-    }
-    const _run = workflow.createRun({ runId });
+    const _run = await workflow.createRunAsync({ runId });
     const result = await _run.start({
       inputData,
       runtimeContext
@@ -220,7 +212,7 @@ async function startAsyncWorkflowHandler({
 }
 async function startWorkflowRunHandler({
   mastra,
-  runtimeContext: payloadRuntimeContext,
+  runtimeContext,
   workflowId,
   runId,
   inputData
@@ -240,14 +232,7 @@ async function startWorkflowRunHandler({
     if (!run) {
       throw new HTTPException(404, { message: "Workflow run not found" });
     }
-    let runtimeContext;
-    if (payloadRuntimeContext) {
-      runtimeContext = new RuntimeContext();
-      Object.entries(payloadRuntimeContext || {}).forEach(([key, value]) => {
-        runtimeContext.set(key, value);
-      });
-    }
-    const _run = workflow.createRun({ runId });
+    const _run = await workflow.createRunAsync({ runId });
     void _run.start({
       inputData,
       runtimeContext
@@ -277,7 +262,7 @@ async function watchWorkflowHandler({
     if (!run) {
       throw new HTTPException(404, { message: "Workflow run not found" });
     }
-    const _run = workflow.createRun({ runId });
+    const _run = await workflow.createRunAsync({ runId });
     let unwatch;
     let asyncRef = null;
     const stream = new ReadableStream({
@@ -308,7 +293,7 @@ async function watchWorkflowHandler({
 }
 async function streamWorkflowHandler({
   mastra,
-  runtimeContext: payloadRuntimeContext,
+  runtimeContext,
   workflowId,
   runId,
   inputData
@@ -324,14 +309,7 @@ async function streamWorkflowHandler({
     if (!workflow) {
       throw new HTTPException(404, { message: "Workflow not found" });
     }
-    let runtimeContext;
-    if (payloadRuntimeContext) {
-      runtimeContext = new RuntimeContext();
-      Object.entries(payloadRuntimeContext || {}).forEach(([key, value]) => {
-        runtimeContext.set(key, value);
-      });
-    }
-    const run = workflow.createRun({ runId });
+    const run = await workflow.createRunAsync({ runId });
     const result = run.stream({
       inputData,
       runtimeContext
@@ -346,7 +324,7 @@ async function resumeAsyncWorkflowHandler({
   workflowId,
   runId,
   body,
-  runtimeContext: payloadRuntimeContext
+  runtimeContext
 }) {
   try {
     if (!workflowId) {
@@ -366,14 +344,7 @@ async function resumeAsyncWorkflowHandler({
     if (!run) {
       throw new HTTPException(404, { message: "Workflow run not found" });
     }
-    let runtimeContext;
-    if (payloadRuntimeContext) {
-      runtimeContext = new RuntimeContext();
-      Object.entries(payloadRuntimeContext || {}).forEach(([key, value]) => {
-        runtimeContext.set(key, value);
-      });
-    }
-    const _run = workflow.createRun({ runId });
+    const _run = await workflow.createRunAsync({ runId });
     const result = await _run.resume({
       step: body.step,
       resumeData: body.resumeData,
@@ -389,7 +360,7 @@ async function resumeWorkflowHandler({
   workflowId,
   runId,
   body,
-  runtimeContext: payloadRuntimeContext
+  runtimeContext
 }) {
   try {
     if (!workflowId) {
@@ -409,14 +380,7 @@ async function resumeWorkflowHandler({
     if (!run) {
       throw new HTTPException(404, { message: "Workflow run not found" });
     }
-    let runtimeContext;
-    if (payloadRuntimeContext) {
-      runtimeContext = new RuntimeContext();
-      Object.entries(payloadRuntimeContext || {}).forEach(([key, value]) => {
-        runtimeContext.set(key, value);
-      });
-    }
-    const _run = workflow.createRun({ runId });
+    const _run = await workflow.createRunAsync({ runId });
     void _run.resume({
       step: body.step,
       resumeData: body.resumeData,

package/dist/{chunk-FRXZL32L.cjs → chunk-TO5U6HW3.cjs}

@@ -1,11 +1,10 @@
 'use strict';
 
-var chunkASKESBJW_cjs = require('./chunk-ASKESBJW.cjs');
+var chunkMN6F4D5A_cjs = require('./chunk-MN6F4D5A.cjs');
 var chunk64U3UDTH_cjs = require('./chunk-64U3UDTH.cjs');
 var chunkOCWPVYNI_cjs = require('./chunk-OCWPVYNI.cjs');
 var chunk75ZPJI57_cjs = require('./chunk-75ZPJI57.cjs');
 var web = require('stream/web');
-var di = require('@mastra/core/di');
 
 // src/server/handlers/workflows.ts
 var workflows_exports = {};
@@ -34,16 +33,16 @@ async function getWorkflowsHandler({ mastra }) {
           acc2[key2] = {
             id: step.id,
             description: step.description,
-            inputSchema: step.inputSchema ? chunkASKESBJW_cjs.stringify(chunkASKESBJW_cjs.esm_default(step.inputSchema)) : void 0,
-            outputSchema: step.outputSchema ? chunkASKESBJW_cjs.stringify(chunkASKESBJW_cjs.esm_default(step.outputSchema)) : void 0,
-            resumeSchema: step.resumeSchema ? chunkASKESBJW_cjs.stringify(chunkASKESBJW_cjs.esm_default(step.resumeSchema)) : void 0,
-            suspendSchema: step.suspendSchema ? chunkASKESBJW_cjs.stringify(chunkASKESBJW_cjs.esm_default(step.suspendSchema)) : void 0
+            inputSchema: step.inputSchema ? chunkMN6F4D5A_cjs.stringify(chunkMN6F4D5A_cjs.esm_default(step.inputSchema)) : void 0,
+            outputSchema: step.outputSchema ? chunkMN6F4D5A_cjs.stringify(chunkMN6F4D5A_cjs.esm_default(step.outputSchema)) : void 0,
+            resumeSchema: step.resumeSchema ? chunkMN6F4D5A_cjs.stringify(chunkMN6F4D5A_cjs.esm_default(step.resumeSchema)) : void 0,
+            suspendSchema: step.suspendSchema ? chunkMN6F4D5A_cjs.stringify(chunkMN6F4D5A_cjs.esm_default(step.suspendSchema)) : void 0
           };
           return acc2;
         }, {}),
         stepGraph: workflow.serializedStepGraph,
-        inputSchema: workflow.inputSchema ? chunkASKESBJW_cjs.stringify(chunkASKESBJW_cjs.esm_default(workflow.inputSchema)) : void 0,
-        outputSchema: workflow.outputSchema ? chunkASKESBJW_cjs.stringify(chunkASKESBJW_cjs.esm_default(workflow.outputSchema)) : void 0
+        inputSchema: workflow.inputSchema ? chunkMN6F4D5A_cjs.stringify(chunkMN6F4D5A_cjs.esm_default(workflow.inputSchema)) : void 0,
+        outputSchema: workflow.outputSchema ? chunkMN6F4D5A_cjs.stringify(chunkMN6F4D5A_cjs.esm_default(workflow.outputSchema)) : void 0
       };
       return acc;
     }, {});
@@ -100,18 +99,18 @@ async function getWorkflowByIdHandler({ mastra, workflowId }) {
         acc[key] = {
           id: step.id,
           description: step.description,
-          inputSchema: step.inputSchema ? chunkASKESBJW_cjs.stringify(chunkASKESBJW_cjs.esm_default(step.inputSchema)) : void 0,
-          outputSchema: step.outputSchema ? chunkASKESBJW_cjs.stringify(chunkASKESBJW_cjs.esm_default(step.outputSchema)) : void 0,
-          resumeSchema: step.resumeSchema ? chunkASKESBJW_cjs.stringify(chunkASKESBJW_cjs.esm_default(step.resumeSchema)) : void 0,
-          suspendSchema: step.suspendSchema ? chunkASKESBJW_cjs.stringify(chunkASKESBJW_cjs.esm_default(step.suspendSchema)) : void 0
+          inputSchema: step.inputSchema ? chunkMN6F4D5A_cjs.stringify(chunkMN6F4D5A_cjs.esm_default(step.inputSchema)) : void 0,
+          outputSchema: step.outputSchema ? chunkMN6F4D5A_cjs.stringify(chunkMN6F4D5A_cjs.esm_default(step.outputSchema)) : void 0,
+          resumeSchema: step.resumeSchema ? chunkMN6F4D5A_cjs.stringify(chunkMN6F4D5A_cjs.esm_default(step.resumeSchema)) : void 0,
+          suspendSchema: step.suspendSchema ? chunkMN6F4D5A_cjs.stringify(chunkMN6F4D5A_cjs.esm_default(step.suspendSchema)) : void 0
         };
         return acc;
       }, {}),
       name: workflow.name,
       description: workflow.description,
       stepGraph: workflow.serializedStepGraph,
-      inputSchema: workflow.inputSchema ? chunkASKESBJW_cjs.stringify(chunkASKESBJW_cjs.esm_default(workflow.inputSchema)) : void 0,
-      outputSchema: workflow.outputSchema ? chunkASKESBJW_cjs.stringify(chunkASKESBJW_cjs.esm_default(workflow.outputSchema)) : void 0
+      inputSchema: workflow.inputSchema ? chunkMN6F4D5A_cjs.stringify(chunkMN6F4D5A_cjs.esm_default(workflow.inputSchema)) : void 0,
+      outputSchema: workflow.outputSchema ? chunkMN6F4D5A_cjs.stringify(chunkMN6F4D5A_cjs.esm_default(workflow.outputSchema)) : void 0
     };
   } catch (error) {
     throw new chunkOCWPVYNI_cjs.HTTPException(500, { message: error?.message || "Error getting workflow" });
@@ -182,7 +181,7 @@ async function createWorkflowRunHandler({
     if (!workflow) {
       throw new chunkOCWPVYNI_cjs.HTTPException(404, { message: "Workflow not found" });
     }
-    const run = workflow.createRun({ runId: prevRunId });
+    const run = await workflow.createRunAsync({ runId: prevRunId });
     return { runId: run.runId };
   } catch (error) {
     throw new chunkOCWPVYNI_cjs.HTTPException(500, { message: error?.message || "Error creating workflow run" });
@@ -190,7 +189,7 @@ async function createWorkflowRunHandler({
 }
 async function startAsyncWorkflowHandler({
   mastra,
-  runtimeContext: payloadRuntimeContext,
+  runtimeContext,
   workflowId,
   runId,
   inputData
@@ -203,14 +202,7 @@ async function startAsyncWorkflowHandler({
     if (!workflow) {
       throw new chunkOCWPVYNI_cjs.HTTPException(404, { message: "Workflow not found" });
     }
-    let runtimeContext;
-    if (payloadRuntimeContext) {
-      runtimeContext = new di.RuntimeContext();
-      Object.entries(payloadRuntimeContext || {}).forEach(([key, value]) => {
-        runtimeContext.set(key, value);
-      });
-    }
-    const _run = workflow.createRun({ runId });
+    const _run = await workflow.createRunAsync({ runId });
     const result = await _run.start({
       inputData,
       runtimeContext
@@ -222,7 +214,7 @@ async function startAsyncWorkflowHandler({
 }
 async function startWorkflowRunHandler({
   mastra,
-  runtimeContext: payloadRuntimeContext,
+  runtimeContext,
   workflowId,
   runId,
   inputData
@@ -242,14 +234,7 @@ async function startWorkflowRunHandler({
     if (!run) {
       throw new chunkOCWPVYNI_cjs.HTTPException(404, { message: "Workflow run not found" });
     }
-    let runtimeContext;
-    if (payloadRuntimeContext) {
-      runtimeContext = new di.RuntimeContext();
-      Object.entries(payloadRuntimeContext || {}).forEach(([key, value]) => {
-        runtimeContext.set(key, value);
-      });
-    }
-    const _run = workflow.createRun({ runId });
+    const _run = await workflow.createRunAsync({ runId });
     void _run.start({
       inputData,
       runtimeContext
@@ -279,7 +264,7 @@ async function watchWorkflowHandler({
     if (!run) {
       throw new chunkOCWPVYNI_cjs.HTTPException(404, { message: "Workflow run not found" });
     }
-    const _run = workflow.createRun({ runId });
+    const _run = await workflow.createRunAsync({ runId });
     let unwatch;
     let asyncRef = null;
     const stream = new web.ReadableStream({
@@ -310,7 +295,7 @@ async function watchWorkflowHandler({
 }
 async function streamWorkflowHandler({
   mastra,
-  runtimeContext: payloadRuntimeContext,
+  runtimeContext,
   workflowId,
   runId,
   inputData
@@ -326,14 +311,7 @@ async function streamWorkflowHandler({
     if (!workflow) {
       throw new chunkOCWPVYNI_cjs.HTTPException(404, { message: "Workflow not found" });
     }
-    let runtimeContext;
-    if (payloadRuntimeContext) {
-      runtimeContext = new di.RuntimeContext();
-      Object.entries(payloadRuntimeContext || {}).forEach(([key, value]) => {
-        runtimeContext.set(key, value);
-      });
-    }
-    const run = workflow.createRun({ runId });
+    const run = await workflow.createRunAsync({ runId });
     const result = run.stream({
       inputData,
       runtimeContext
@@ -348,7 +326,7 @@ async function resumeAsyncWorkflowHandler({
   workflowId,
   runId,
   body,
-  runtimeContext: payloadRuntimeContext
+  runtimeContext
 }) {
   try {
     if (!workflowId) {
@@ -368,14 +346,7 @@ async function resumeAsyncWorkflowHandler({
     if (!run) {
       throw new chunkOCWPVYNI_cjs.HTTPException(404, { message: "Workflow run not found" });
     }
-    let runtimeContext;
-    if (payloadRuntimeContext) {
-      runtimeContext = new di.RuntimeContext();
-      Object.entries(payloadRuntimeContext || {}).forEach(([key, value]) => {
-        runtimeContext.set(key, value);
-      });
-    }
-    const _run = workflow.createRun({ runId });
+    const _run = await workflow.createRunAsync({ runId });
     const result = await _run.resume({
       step: body.step,
       resumeData: body.resumeData,
@@ -391,7 +362,7 @@ async function resumeWorkflowHandler({
   workflowId,
   runId,
   body,
-  runtimeContext: payloadRuntimeContext
+  runtimeContext
 }) {
   try {
     if (!workflowId) {
@@ -411,14 +382,7 @@ async function resumeWorkflowHandler({
     if (!run) {
       throw new chunkOCWPVYNI_cjs.HTTPException(404, { message: "Workflow run not found" });
     }
-    let runtimeContext;
-    if (payloadRuntimeContext) {
-      runtimeContext = new di.RuntimeContext();
-      Object.entries(payloadRuntimeContext || {}).forEach(([key, value]) => {
-        runtimeContext.set(key, value);
-      });
-    }
-    const _run = workflow.createRun({ runId });
+    const _run = await workflow.createRunAsync({ runId });
     void _run.resume({
       step: body.step,
       resumeData: body.resumeData,

package/dist/{chunk-2HXKRRNS.js → chunk-XR7VJOOP.js}

@@ -1,4 +1,4 @@
-import { stringify, esm_default } from './chunk-TGJMNUYJ.js';
+import { stringify, esm_default } from './chunk-OSZM4EAY.js';
 import { validateBody } from './chunk-H5PTF3Y4.js';
 import { handleError } from './chunk-M5ABIP7D.js';
 import { HTTPException } from './chunk-NYN7KFXL.js';

package/dist/{chunk-I7KJZNX5.js → chunk-XUIJ7WRT.js}

@@ -15,20 +15,36 @@ __export(memory_exports, {
   saveMessagesHandler: () => saveMessagesHandler,
   updateThreadHandler: () => updateThreadHandler
 });
-function getMemoryFromContext({
+async function getMemoryFromContext({
   mastra,
-  agentId
+  agentId,
+  networkId,
+  runtimeContext
 }) {
   const agent = agentId ? mastra.getAgent(agentId) : null;
   if (agentId && !agent) {
     throw new HTTPException(404, { message: "Agent not found" });
   }
-  const memory = agent?.getMemory?.() || mastra.getMemory();
-  return memory;
+  const network = networkId ? mastra.vnext_getNetwork(networkId) : null;
+  if (networkId && !network) {
+    throw new HTTPException(404, { message: "Network not found" });
+  }
+  if (agent) {
+    return agent?.getMemory() || mastra.getMemory();
+  }
+  if (network) {
+    return await network?.getMemory({ runtimeContext }) || mastra.getMemory();
+  }
+  return mastra.getMemory();
 }
-async function getMemoryStatusHandler({ mastra, agentId }) {
+async function getMemoryStatusHandler({
+  mastra,
+  agentId,
+  networkId,
+  runtimeContext
+}) {
   try {
-    const memory = getMemoryFromContext({ mastra, agentId });
+    const memory = await getMemoryFromContext({ mastra, agentId, networkId, runtimeContext });
     if (!memory) {
       return { result: false };
     }
@@ -40,10 +56,12 @@ async function getMemoryStatusHandler({ mastra, agentId }) {
 async function getThreadsHandler({
   mastra,
   agentId,
-  resourceId
+  resourceId,
+  networkId,
+  runtimeContext
 }) {
   try {
-    const memory = getMemoryFromContext({ mastra, agentId });
+    const memory = await getMemoryFromContext({ mastra, agentId, networkId, runtimeContext });
     if (!memory) {
       throw new HTTPException(400, { message: "Memory is not initialized" });
     }
@@ -57,11 +75,13 @@ async function getThreadsHandler({
 async function getThreadByIdHandler({
   mastra,
   agentId,
-  threadId
+  threadId,
+  networkId,
+  runtimeContext
 }) {
   try {
     validateBody({ threadId });
-    const memory = getMemoryFromContext({ mastra, agentId });
+    const memory = await getMemoryFromContext({ mastra, agentId, networkId, runtimeContext });
     if (!memory) {
       throw new HTTPException(400, { message: "Memory is not initialized" });
     }
@@ -77,10 +97,12 @@ async function getThreadByIdHandler({
 async function saveMessagesHandler({
   mastra,
   agentId,
-  body
+  body,
+  networkId,
+  runtimeContext
 }) {
   try {
-    const memory = getMemoryFromContext({ mastra, agentId });
+    const memory = await getMemoryFromContext({ mastra, agentId, networkId, runtimeContext });
     if (!memory) {
       throw new HTTPException(400, { message: "Memory is not initialized" });
     }
@@ -104,10 +126,12 @@ async function saveMessagesHandler({
 async function createThreadHandler({
   mastra,
   agentId,
-  body
+  body,
+  networkId,
+  runtimeContext
 }) {
   try {
-    const memory = getMemoryFromContext({ mastra, agentId });
+    const memory = await getMemoryFromContext({ mastra, agentId, networkId, runtimeContext });
     if (!memory) {
       throw new HTTPException(400, { message: "Memory is not initialized" });
     }
@@ -127,10 +151,12 @@ async function updateThreadHandler({
   mastra,
   agentId,
   threadId,
-  body
+  body,
+  networkId,
+  runtimeContext
 }) {
   try {
-    const memory = getMemoryFromContext({ mastra, agentId });
+    const memory = await getMemoryFromContext({ mastra, agentId, networkId, runtimeContext });
     if (!body) {
       throw new HTTPException(400, { message: "Body is required" });
     }
@@ -161,11 +187,13 @@ async function updateThreadHandler({
 async function deleteThreadHandler({
   mastra,
   agentId,
-  threadId
+  threadId,
+  networkId,
+  runtimeContext
 }) {
   try {
     validateBody({ threadId });
-    const memory = getMemoryFromContext({ mastra, agentId });
+    const memory = await getMemoryFromContext({ mastra, agentId, networkId, runtimeContext });
     if (!memory) {
       throw new HTTPException(400, { message: "Memory is not initialized" });
     }
@@ -183,14 +211,16 @@ async function getMessagesHandler({
   mastra,
   agentId,
   threadId,
-  limit
+  limit,
+  networkId,
+  runtimeContext
 }) {
   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 });
+    const memory = await getMemoryFromContext({ mastra, agentId, networkId, runtimeContext });
     if (!memory) {
       throw new HTTPException(400, { message: "Memory is not initialized" });
     }