@mastra/mcp 1.0.3 → 1.1.0-alpha.0

package/dist/index.cjs

@@ -1,5 +1,6 @@
 'use strict';
 
+var async_hooks = require('async_hooks');
 var $RefParser = require('@apidevtools/json-schema-ref-parser');
 var base = require('@mastra/core/base');
 var error = require('@mastra/core/error');
@@ -420,7 +421,7 @@ var InternalMastraMCPClient = class extends base.MastraBase {
   enableProgressTracking;
   serverConfig;
   transport;
-  currentOperationContext = null;
+  operationContextStore = new async_hooks.AsyncLocalStorage();
   exitHookUnsubscribe;
   sigTermHandler;
   _roots;
@@ -492,7 +493,7 @@ var InternalMastraMCPClient = class extends base.MastraBase {
         timestamp: /* @__PURE__ */ new Date(),
         serverName: this.name,
         details,
-        requestContext: this.currentOperationContext
+        requestContext: this.operationContextStore.getStore() ?? null
       });
     }
   }
@@ -585,7 +586,8 @@ var InternalMastraMCPClient = class extends base.MastraBase {
     }
   }
   async connectHttp(url) {
-    const { requestInit, eventSourceInit, authProvider, connectTimeout, fetch: fetch2 } = this.serverConfig;
+    const { requestInit, eventSourceInit, authProvider, connectTimeout, fetch: userFetch } = this.serverConfig;
+    const fetch2 = userFetch ? (url2, init) => userFetch(url2, init, this.operationContextStore.getStore() ?? null) : void 0;
     this.log("debug", `Attempting to connect to URL: ${url}`);
     let shouldTrySSE = url.pathname.endsWith(`/sse`);
     if (!shouldTrySSE) {
@@ -982,66 +984,65 @@ var InternalMastraMCPClient = class extends base.MastraBase {
           inputSchema: await this.convertInputSchema(tool.inputSchema),
           outputSchema: await this.convertOutputSchema(tool.outputSchema),
           execute: async (input, context) => {
-            const previousContext = this.currentOperationContext;
-            this.currentOperationContext = context?.requestContext || null;
-            const executeToolCall = async () => {
-              this.log("debug", `Executing tool: ${tool.name}`, { toolArgs: input, runId: context?.runId });
-              const res = await this.client.callTool(
-                {
-                  name: tool.name,
-                  arguments: input,
-                  // Use runId as progress token if available, otherwise generate a random UUID
-                  ...this.enableProgressTracking ? { _meta: { progressToken: context?.runId || crypto.randomUUID() } } : {}
-                },
-                types_js.CallToolResultSchema,
-                {
-                  timeout: this.timeout
+            const operationContext = context?.requestContext ?? null;
+            return this.operationContextStore.run(operationContext, async () => {
+              const executeToolCall = async () => {
+                this.log("debug", `Executing tool: ${tool.name}`, { toolArgs: input, runId: context?.runId });
+                const res = await this.client.callTool(
+                  {
+                    name: tool.name,
+                    arguments: input,
+                    // Use runId as progress token if available, otherwise generate a random UUID
+                    ...this.enableProgressTracking ? { _meta: { progressToken: context?.runId || crypto.randomUUID() } } : {}
+                  },
+                  types_js.CallToolResultSchema,
+                  {
+                    timeout: this.timeout
+                  }
+                );
+                this.log("debug", `Tool executed successfully: ${tool.name}`);
+                if (res.structuredContent !== void 0) {
+                  return res.structuredContent;
                 }
-              );
-              this.log("debug", `Tool executed successfully: ${tool.name}`);
-              if (res.structuredContent !== void 0) {
-                return res.structuredContent;
-              }
-              if (tool.outputSchema && !res.isError) {
-                const content = res.content;
-                if (content && content.length === 1 && content[0].type === "text" && content[0].text !== void 0) {
-                  try {
-                    return JSON.parse(content[0].text);
-                  } catch {
-                    return content[0].text;
+                if (tool.outputSchema && !res.isError) {
+                  const content = res.content;
+                  if (content && content.length === 1 && content[0].type === "text" && content[0].text !== void 0) {
+                    try {
+                      return JSON.parse(content[0].text);
+                    } catch {
+                      return content[0].text;
+                    }
                   }
                 }
-              }
-              return res;
-            };
-            try {
-              return await executeToolCall();
-            } catch (e) {
-              if (this.isSessionError(e)) {
-                this.log("debug", `Session error detected for tool ${tool.name}, attempting reconnection...`, {
-                  error: e instanceof Error ? e.message : String(e)
-                });
-                try {
-                  await this.forceReconnect();
-                  this.log("debug", `Retrying tool ${tool.name} after reconnection...`);
-                  return await executeToolCall();
-                } catch (reconnectError) {
-                  this.log("error", `Reconnection or retry failed for tool ${tool.name}`, {
-                    originalError: e instanceof Error ? e.message : String(e),
-                    reconnectError: reconnectError instanceof Error ? reconnectError.stack : String(reconnectError),
-                    toolArgs: input
+                return res;
+              };
+              try {
+                return await executeToolCall();
+              } catch (e) {
+                if (this.isSessionError(e)) {
+                  this.log("debug", `Session error detected for tool ${tool.name}, attempting reconnection...`, {
+                    error: e instanceof Error ? e.message : String(e)
                   });
-                  throw e;
+                  try {
+                    await this.forceReconnect();
+                    this.log("debug", `Retrying tool ${tool.name} after reconnection...`);
+                    return await executeToolCall();
+                  } catch (reconnectError) {
+                    this.log("error", `Reconnection or retry failed for tool ${tool.name}`, {
+                      originalError: e instanceof Error ? e.message : String(e),
+                      reconnectError: reconnectError instanceof Error ? reconnectError.stack : String(reconnectError),
+                      toolArgs: input
+                    });
+                    throw e;
+                  }
                 }
+                this.log("error", `Error calling tool: ${tool.name}`, {
+                  error: e instanceof Error ? e.stack : JSON.stringify(e, null, 2),
+                  toolArgs: input
+                });
+                throw e;
               }
-              this.log("error", `Error calling tool: ${tool.name}`, {
-                error: e instanceof Error ? e.stack : JSON.stringify(e, null, 2),
-                toolArgs: input
-              });
-              throw e;
-            } finally {
-              this.currentOperationContext = previousContext;
-            }
+            });
           }
         });
         if (tool.name) {