@mastra/mcp 1.0.0-beta.2 → 1.0.0-beta.3

package/dist/index.js

@@ -394,6 +394,8 @@ var InternalMastraMCPClient = class extends MastraBase {
   serverConfig;
   transport;
   currentOperationContext = null;
+  exitHookUnsubscribe;
+  sigTermHandler;
   /** Provides access to resource operations (list, read, subscribe, etc.) */
   resources;
   /** Provides access to prompt operations (list, get, notifications) */
@@ -561,14 +563,19 @@ var InternalMastraMCPClient = class extends MastraBase {
         reject(e);
       }
     });
-    asyncExitHook(
-      async () => {
-        this.log("debug", `Disconnecting MCP server during exit`);
-        await this.disconnect();
-      },
-      { wait: 5e3 }
-    );
-    process.on("SIGTERM", () => gracefulExit());
+    if (!this.exitHookUnsubscribe) {
+      this.exitHookUnsubscribe = asyncExitHook(
+        async () => {
+          this.log("debug", `Disconnecting MCP server during exit`);
+          await this.disconnect();
+        },
+        { wait: 5e3 }
+      );
+    }
+    if (!this.sigTermHandler) {
+      this.sigTermHandler = () => gracefulExit();
+      process.on("SIGTERM", this.sigTermHandler);
+    }
     this.log("debug", `Successfully connected to MCP server`);
     return this.isConnected;
   }
@@ -604,6 +611,14 @@ var InternalMastraMCPClient = class extends MastraBase {
     } finally {
       this.transport = void 0;
       this.isConnected = Promise.resolve(false);
+      if (this.exitHookUnsubscribe) {
+        this.exitHookUnsubscribe();
+        this.exitHookUnsubscribe = void 0;
+      }
+      if (this.sigTermHandler) {
+        process.off("SIGTERM", this.sigTermHandler);
+        this.sigTermHandler = void 0;
+      }
     }
   }
   async listResources() {
@@ -791,6 +806,9 @@ var InternalMastraMCPClient = class extends MastraBase {
                 }
               );
               this.log("debug", `Tool executed successfully: ${tool.name}`);
+              if (res.structuredContent !== void 0) {
+                return res.structuredContent;
+              }
               return res;
             } catch (e) {
               this.log("error", `Error calling tool: ${tool.name}`, {
@@ -2999,7 +3017,7 @@ Provided arguments: ${JSON.stringify(request.params.arguments, null, 2)}`
     httpPath,
     req,
     res,
-    options = { sessionIdGenerator: () => randomUUID() }
+    options
   }) {
     this.logger.debug(`startHTTP: Received ${req.method} request to ${url.pathname}`);
     if (url.pathname !== httpPath) {
@@ -3008,11 +3026,18 @@ Provided arguments: ${JSON.stringify(request.params.arguments, null, 2)}`
       res.end();
       return;
     }
-    if (options?.serverless) {
-      this.logger.debug("startHTTP: Running in serverless (stateless) mode");
+    const isStatelessMode = options?.serverless || options && "sessionIdGenerator" in options && options.sessionIdGenerator === void 0;
+    if (isStatelessMode) {
+      this.logger.debug("startHTTP: Running in stateless mode (serverless or sessionIdGenerator: undefined)");
       await this.handleServerlessRequest(req, res);
       return;
     }
+    const mergedOptions = {
+      sessionIdGenerator: () => randomUUID(),
+      // default: enabled
+      ...options
+      // user-provided overrides default
+    };
     const sessionId = req.headers["mcp-session-id"];
     let transport;
     this.logger.debug(
@@ -3059,8 +3084,8 @@ Provided arguments: ${JSON.stringify(request.params.arguments, null, 2)}`
           if (isInitializeRequest(body)) {
             this.logger.debug("startHTTP: Received Streamable HTTP initialize request, creating new transport.");
             transport = new StreamableHTTPServerTransport({
-              ...options,
-              sessionIdGenerator: () => randomUUID(),
+              ...mergedOptions,
+              sessionIdGenerator: mergedOptions.sessionIdGenerator,
               onsessioninitialized: (id) => {
                 this.streamableHTTPTransports.set(id, transport);
               }