@mastra/mcp 1.0.2 → 1.0.3

package/dist/index.js

@@ -743,7 +743,7 @@ var InternalMastraMCPClient = class extends MastraBase {
       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");
+    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.
@@ -899,6 +899,31 @@ var InternalMastraMCPClient = class extends MastraBase {
       });
     }
   }
+  /**
+   * Recursively applies `.passthrough()` to all ZodObject schemas so that
+   * unknown keys returned by an MCP server are preserved instead of being
+   * silently stripped by Zod's default "strip" mode.
+   */
+  applyPassthrough(schema) {
+    if (schema instanceof z.ZodObject) {
+      const shape = schema.shape;
+      const newShape = {};
+      for (const key of Object.keys(shape)) {
+        newShape[key] = this.applyPassthrough(shape[key]);
+      }
+      return z.object(newShape).passthrough();
+    }
+    if (schema instanceof z.ZodArray) {
+      return z.array(this.applyPassthrough(schema.element));
+    }
+    if (schema instanceof z.ZodOptional) {
+      return this.applyPassthrough(schema.unwrap()).optional();
+    }
+    if (schema instanceof z.ZodNullable) {
+      return this.applyPassthrough(schema.unwrap()).nullable();
+    }
+    return schema;
+  }
   async convertOutputSchema(outputSchema) {
     if (!outputSchema) return;
     if (isZodType(outputSchema)) {
@@ -907,11 +932,13 @@ var InternalMastraMCPClient = class extends MastraBase {
     try {
       await $RefParser.dereference(outputSchema);
       const jsonSchemaToConvert = "jsonSchema" in outputSchema ? outputSchema.jsonSchema : outputSchema;
+      let zodSchema;
       if ("toJSONSchema" in z) {
-        return convertJsonSchemaToZod(jsonSchemaToConvert);
+        zodSchema = convertJsonSchemaToZod(jsonSchemaToConvert);
       } else {
-        return convertJsonSchemaToZod$1(jsonSchemaToConvert);
+        zodSchema = convertJsonSchemaToZod$1(jsonSchemaToConvert);
       }
+      return this.applyPassthrough(zodSchema);
     } catch (error) {
       let errorDetails;
       if (error instanceof Error) {
@@ -1107,7 +1134,7 @@ To fix this you have three different options:
    * await mcp.progress.onUpdate('serverName', (params) => {
    *   console.log(`Progress: ${params.progress}%`);
    *   console.log(`Status: ${params.message}`);
-   *   
+   *
    *   if (params.total) {
    *     console.log(`Completed ${params.progress} of ${params.total} items`);
    *   }
@@ -1645,7 +1672,7 @@ To fix this you have three different options:
     this.disconnectPromise = (async () => {
       try {
         mcpClientInstances.delete(this.id);
-        await Promise.all(Array.from(this.mcpClientsById.values()).map((client) => client.disconnect()));
+        await Promise.allSettled(Array.from(this.mcpClientsById.values()).map((client) => client.disconnect()));
         this.mcpClientsById.clear();
       } finally {
         this.disconnectPromise = null;
@@ -1659,8 +1686,8 @@ To fix this you have three different options:
    * Tool names are namespaced as `serverName_toolName` to prevent conflicts between servers.
    * This method is intended to be passed directly to an Agent definition.
    *
-   * @returns Object mapping namespaced tool names to tool implementations
-   * @throws {MastraError} If retrieving tools fails
+   * @returns Object mapping namespaced tool names to tool implementations.
+   * Errors for individual servers are logged but don't throw - failed servers are skipped.
    *
    * @example
    * ```typescript
@@ -1676,21 +1703,28 @@ To fix this you have three different options:
   async listTools() {
     this.addToInstanceCache();
     const connectedTools = {};
-    try {
-      await this.eachClientTools(async ({ serverName, tools }) => {
+    for (const serverName of Object.keys(this.serverConfigs)) {
+      try {
+        const client = await this.getConnectedClientForServer(serverName);
+        const tools = await client.tools();
         for (const [toolName, toolConfig] of Object.entries(tools)) {
           connectedTools[`${serverName}_${toolName}`] = toolConfig;
         }
-      });
-    } catch (error) {
-      throw new MastraError(
-        {
-          id: "MCP_CLIENT_GET_TOOLS_FAILED",
-          domain: ErrorDomain.MCP,
-          category: ErrorCategory.THIRD_PARTY
-        },
-        error
-      );
+      } catch (error) {
+        const mastraError = new MastraError(
+          {
+            id: "MCP_CLIENT_GET_TOOLS_FAILED",
+            domain: ErrorDomain.MCP,
+            category: ErrorCategory.THIRD_PARTY,
+            details: {
+              serverName
+            }
+          },
+          error
+        );
+        this.logger.trackException(mastraError);
+        this.logger.error("Failed to list tools from server:", { error: mastraError.toString() });
+      }
     }
     return connectedTools;
   }
@@ -1700,8 +1734,8 @@ To fix this you have three different options:
    * Unlike listTools(), this returns tools grouped by server without namespacing.
    * This is intended to be passed dynamically to the generate() or stream() method.
    *
-   * @returns Object mapping server names to their tool collections
-   * @throws {MastraError} If retrieving toolsets fails
+   * @returns Object mapping server names to their tool collections.
+   * Errors for individual servers are logged but don't throw - failed servers are skipped.
    *
    * @example
    * ```typescript
@@ -1720,21 +1754,28 @@ To fix this you have three different options:
   async listToolsets() {
     this.addToInstanceCache();
     const connectedToolsets = {};
-    try {
-      await this.eachClientTools(async ({ serverName, tools }) => {
+    for (const serverName of Object.keys(this.serverConfigs)) {
+      try {
+        const client = await this.getConnectedClientForServer(serverName);
+        const tools = await client.tools();
         if (tools) {
           connectedToolsets[serverName] = tools;
         }
-      });
-    } catch (error) {
-      throw new MastraError(
-        {
-          id: "MCP_CLIENT_GET_TOOLSETS_FAILED",
-          domain: ErrorDomain.MCP,
-          category: ErrorCategory.THIRD_PARTY
-        },
-        error
-      );
+      } catch (error) {
+        const mastraError = new MastraError(
+          {
+            id: "MCP_CLIENT_GET_TOOLSETS_FAILED",
+            domain: ErrorDomain.MCP,
+            category: ErrorCategory.THIRD_PARTY,
+            details: {
+              serverName
+            }
+          },
+          error
+        );
+        this.logger.trackException(mastraError);
+        this.logger.error("Failed to list toolsets from server:", { error: mastraError.toString() });
+      }
     }
     return connectedToolsets;
   }
@@ -1814,15 +1855,6 @@ To fix this you have three different options:
     }
     return this.getConnectedClient(serverName, serverConfig);
   }
-  async eachClientTools(cb) {
-    await Promise.all(
-      Object.entries(this.serverConfigs).map(async ([serverName, serverConfig]) => {
-        const client = await this.getConnectedClient(serverName, serverConfig);
-        const tools = await client.tools();
-        await cb({ serverName, tools, client });
-      })
-    );
-  }
 };
 
 // src/client/oauth-provider.ts