@mastra/mcp 0.14.5-alpha.0 → 0.14.5-alpha.1

package/dist/index.js

@@ -8,7 +8,7 @@ import { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js';
 import { StdioClientTransport, getDefaultEnvironment } from '@modelcontextprotocol/sdk/client/stdio.js';
 import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
 import { DEFAULT_REQUEST_TIMEOUT_MSEC } from '@modelcontextprotocol/sdk/shared/protocol.js';
-import { ListToolsRequestSchema, CallToolRequestSchema, SetLevelRequestSchema, ListResourcesRequestSchema, ReadResourceRequestSchema, ListResourceTemplatesRequestSchema, SubscribeRequestSchema, UnsubscribeRequestSchema, ListPromptsRequestSchema, PromptSchema, GetPromptRequestSchema, ListResourcesResultSchema, ReadResourceResultSchema, ListResourceTemplatesResultSchema, ListPromptsResultSchema, GetPromptResultSchema, PromptListChangedNotificationSchema, ResourceUpdatedNotificationSchema, ResourceListChangedNotificationSchema, ElicitRequestSchema, CallToolResultSchema, JSONRPCMessageSchema, ErrorCode } from '@modelcontextprotocol/sdk/types.js';
+import { ListToolsRequestSchema, CallToolRequestSchema, SetLevelRequestSchema, ListResourcesRequestSchema, ReadResourceRequestSchema, ListResourceTemplatesRequestSchema, SubscribeRequestSchema, UnsubscribeRequestSchema, ListPromptsRequestSchema, PromptSchema, GetPromptRequestSchema, ListResourcesResultSchema, ReadResourceResultSchema, ListResourceTemplatesResultSchema, ListPromptsResultSchema, GetPromptResultSchema, PromptListChangedNotificationSchema, ResourceUpdatedNotificationSchema, ResourceListChangedNotificationSchema, ElicitRequestSchema, JSONRPCMessageSchema, CallToolResultSchema, ErrorCode } from '@modelcontextprotocol/sdk/types.js';
 import { asyncExitHook, gracefulExit } from 'exit-hook';
 import { z } from 'zod';
 import { convertJsonSchemaToZod } from 'zod-from-json-schema';
@@ -603,9 +603,57 @@ var InternalMastraMCPClient = class extends MastraBase {
       throw e;
     } finally {
       this.transport = void 0;
-      this.isConnected = Promise.resolve(false);
+      this.isConnected = null;
     }
   }
+  /**
+   * Checks if an error indicates a session invalidation that requires reconnection.
+   * 
+   * Common session-related errors include:
+   * - "No valid session ID provided" (HTTP 400)
+   * - "Server not initialized" (HTTP 400)
+   * - "Not connected" (protocol state error)
+   * - Connection refused errors
+   * 
+   * @param error - The error to check
+   * @returns true if the error indicates a session problem requiring reconnection
+   * 
+   * @internal
+   */
+  isSessionError(error) {
+    if (!(error instanceof Error)) {
+      return false;
+    }
+    const errorMessage = error.message.toLowerCase();
+    return errorMessage.includes("no valid session") || errorMessage.includes("session") || errorMessage.includes("server not initialized") || errorMessage.includes("not connected") || errorMessage.includes("http 400") || errorMessage.includes("http 401") || errorMessage.includes("http 403") || errorMessage.includes("econnrefused") || errorMessage.includes("fetch failed") || errorMessage.includes("connection refused");
+  }
+  /**
+   * Forces a reconnection to the MCP server by disconnecting and reconnecting.
+   * 
+   * This is useful when the session becomes invalid (e.g., after server restart)
+   * and the client needs to establish a fresh connection.
+   * 
+   * @returns Promise resolving when reconnection is complete
+   * @throws {Error} If reconnection fails
+   * 
+   * @internal
+   */
+  async forceReconnect() {
+    this.log("debug", "Forcing reconnection to MCP server...");
+    try {
+      if (this.transport) {
+        await this.transport.close();
+      }
+    } catch (e) {
+      this.log("debug", "Error during force disconnect (ignored)", {
+        error: e instanceof Error ? e.message : String(e)
+      });
+    }
+    this.transport = void 0;
+    this.isConnected = null;
+    await this.connect();
+    this.log("debug", "Successfully reconnected to MCP server");
+  }
   async listResources() {
     this.log("debug", `Requesting resources from MCP server`);
     return await this.client.request({ method: "resources/list" }, ListResourcesResultSchema, {
@@ -778,7 +826,7 @@ var InternalMastraMCPClient = class extends MastraBase {
           execute: async ({ context, runtimeContext }) => {
             const previousContext = this.currentOperationContext;
             this.currentOperationContext = runtimeContext || null;
-            try {
+            const executeToolCall = async () => {
               this.log("debug", `Executing tool: ${tool.name}`, { toolArgs: context });
               const res = await this.client.callTool(
                 {
@@ -795,7 +843,27 @@ var InternalMastraMCPClient = class extends MastraBase {
                 return res.structuredContent;
               }
               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: context
+                  });
+                  throw e;
+                }
+              }
               this.log("error", `Error calling tool: ${tool.name}`, {
                 error: e instanceof Error ? e.stack : JSON.stringify(e, null, 2),
                 toolArgs: context