@mastra/mcp 1.4.1 → 1.4.2-alpha.0

package/dist/index.js

@@ -381,6 +381,15 @@ var ResourceClientActions = class {
   }
 };
 
+// src/client/error-utils.ts
+function isReconnectableMCPError(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") || errorMessage.includes("connection closed") || errorMessage.includes("sse stream disconnected") || errorMessage.includes("typeerror: terminated");
+}
+
 // src/client/client.ts
 var DEFAULT_SERVER_CONNECT_TIMEOUT_MSEC = 3e3;
 var SSE_FALLBACK_STATUS_CODES = [400, 404, 405];
@@ -739,27 +748,6 @@ var InternalMastraMCPClient = class extends MastraBase {
       }
     }
   }
-  /**
-   * 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") || errorMessage.includes("sse stream disconnected") || errorMessage.includes("typeerror: terminated");
-  }
   /**
    * Forces a reconnection to the MCP server by disconnecting and reconnecting.
    *
@@ -949,7 +937,7 @@ var InternalMastraMCPClient = class extends MastraBase {
               try {
                 return await executeToolCall();
               } catch (e) {
-                if (this.isSessionError(e)) {
+                if (isReconnectableMCPError(e)) {
                   this.log("debug", `Session error detected for tool ${tool.name}, attempting reconnection...`, {
                     error: e instanceof Error ? e.message : String(e)
                   });
@@ -989,6 +977,7 @@ var InternalMastraMCPClient = class extends MastraBase {
   }
 };
 var mcpClientInstances = /* @__PURE__ */ new Map();
+var TOOL_DISCOVERY_MAX_ATTEMPTS = 2;
 var MCPClient = class extends MastraBase {
   serverConfigs = {};
   id;
@@ -1642,6 +1631,7 @@ To fix this you have three different options:
    *
    * @returns Object mapping namespaced tool names to tool implementations.
    * Errors for individual servers are logged but don't throw - failed servers are skipped.
+   * Transient connection failures are retried once after reconnecting the affected server.
    *
    * @example
    * ```typescript
@@ -1659,8 +1649,7 @@ To fix this you have three different options:
     const connectedTools = {};
     for (const serverName of Object.keys(this.serverConfigs)) {
       try {
-        const client = await this.getConnectedClientForServer(serverName);
-        const tools = await client.tools();
+        const tools = await this.getToolsForServer(serverName);
         for (const [toolName, toolConfig] of Object.entries(tools)) {
           connectedTools[`${serverName}_${toolName}`] = toolConfig;
         }
@@ -1716,6 +1705,7 @@ To fix this you have three different options:
    * or list tools. This allows callers to report specific failure reasons per server.
    *
    * @returns Object with `toolsets` (successful servers) and `errors` (failed servers with error messages).
+   * Transient connection failures are retried once after reconnecting the affected server.
    *
    * @example
    * ```typescript
@@ -1731,8 +1721,7 @@ To fix this you have three different options:
     const errors = {};
     for (const serverName of Object.keys(this.serverConfigs)) {
       try {
-        const client = await this.getConnectedClientForServer(serverName);
-        const tools = await client.tools();
+        const tools = await this.getToolsForServer(serverName);
         if (tools) {
           connectedToolsets[serverName] = tools;
         }
@@ -1845,6 +1834,26 @@ To fix this you have three different options:
     }
     return this.getConnectedClient(serverName, serverConfig);
   }
+  async getToolsForServer(serverName) {
+    for (let attempt = 1; attempt <= TOOL_DISCOVERY_MAX_ATTEMPTS; attempt++) {
+      try {
+        const client = await this.getConnectedClientForServer(serverName);
+        return await client.tools();
+      } catch (error) {
+        if (attempt === TOOL_DISCOVERY_MAX_ATTEMPTS || !isReconnectableMCPError(error)) {
+          throw error;
+        }
+        this.logger.debug("Retrying MCP tool discovery after reconnect", {
+          serverName,
+          attempt,
+          maxAttempts: TOOL_DISCOVERY_MAX_ATTEMPTS,
+          error: error instanceof Error ? error.message : String(error)
+        });
+        await this.reconnectServer(serverName);
+      }
+    }
+    return {};
+  }
 };
 
 // src/client/oauth-provider.ts