@mastra/mcp 1.1.0 → 1.2.0-alpha.0

package/dist/index.js

@@ -3,22 +3,20 @@ import $RefParser from '@apidevtools/json-schema-ref-parser';
 import { MastraBase } from '@mastra/core/base';
 import { MastraError, ErrorCategory, ErrorDomain } from '@mastra/core/error';
 import { createTool } from '@mastra/core/tools';
-import { isZodType, makeCoreTool } from '@mastra/core/utils';
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 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 { ListRootsRequestSchema, ListResourcesResultSchema, ReadResourceResultSchema, ListResourceTemplatesResultSchema, ListPromptsResultSchema, GetPromptResultSchema, PromptListChangedNotificationSchema, ResourceUpdatedNotificationSchema, ResourceListChangedNotificationSchema, ElicitRequestSchema, ProgressNotificationSchema, ListToolsRequestSchema, CallToolRequestSchema, SetLevelRequestSchema, ListResourcesRequestSchema, ReadResourceRequestSchema, ListResourceTemplatesRequestSchema, SubscribeRequestSchema, UnsubscribeRequestSchema, ListPromptsRequestSchema, PromptSchema, GetPromptRequestSchema, CallToolResultSchema, ErrorCode, JSONRPCMessageSchema } from '@modelcontextprotocol/sdk/types.js';
+import { LoggingMessageNotificationSchema, ListRootsRequestSchema, ListResourcesResultSchema, ReadResourceResultSchema, EmptyResultSchema, ListResourceTemplatesResultSchema, ListPromptsResultSchema, GetPromptResultSchema, PromptListChangedNotificationSchema, ResourceUpdatedNotificationSchema, ResourceListChangedNotificationSchema, ElicitRequestSchema, ProgressNotificationSchema, ListToolsRequestSchema, CallToolRequestSchema, SetLevelRequestSchema, ListResourcesRequestSchema, ReadResourceRequestSchema, ListResourceTemplatesRequestSchema, SubscribeRequestSchema, UnsubscribeRequestSchema, ListPromptsRequestSchema, PromptSchema, GetPromptRequestSchema, CallToolResultSchema, ErrorCode, JSONRPCMessageSchema } from '@modelcontextprotocol/sdk/types.js';
 import { asyncExitHook, gracefulExit } from 'exit-hook';
-import { z } from 'zod';
-import { convertJsonSchemaToZod } from 'zod-from-json-schema';
-import { convertJsonSchemaToZod as convertJsonSchemaToZod$1 } from 'zod-from-json-schema-v3';
 import equal from 'fast-deep-equal';
 import { v5 } from 'uuid';
 import { randomUUID } from 'crypto';
 import { MCPServerBase } from '@mastra/core/mcp';
 import { RequestContext } from '@mastra/core/request-context';
+import { isStandardSchemaWithJSON, standardSchemaToJSONSchema } from '@mastra/core/schema';
+import { makeCoreTool } from '@mastra/core/utils';
 import { Server } from '@modelcontextprotocol/sdk/server/index.js';
 import { SSEServerTransport } from '@modelcontextprotocol/sdk/server/sse.js';
 import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
@@ -492,18 +490,10 @@ var InternalMastraMCPClient = class extends MastraBase {
   }
   setupLogging() {
     if (this.enableServerLogs) {
-      this.client.setNotificationHandler(
-        z.object({
-          method: z.literal("notifications/message"),
-          params: z.object({
-            level: z.string()
-          }).passthrough()
-        }),
-        (notification) => {
-          const { level, ...params } = notification.params;
-          this.log(level, "[MCP SERVER LOG]", params);
-        }
-      );
+      this.client.setNotificationHandler(LoggingMessageNotificationSchema, (notification) => {
+        const { level, ...params } = notification.params;
+        this.log(level, "[MCP SERVER LOG]", params);
+      });
     }
   }
   /**
@@ -569,7 +559,9 @@ var InternalMastraMCPClient = class extends MastraBase {
       this.transport = new StdioClientTransport({
         command,
         args: this.serverConfig.args,
-        env: { ...getDefaultEnvironment(), ...this.serverConfig.env || {} }
+        env: { ...getDefaultEnvironment(), ...this.serverConfig.env || {} },
+        stderr: this.serverConfig.stderr,
+        cwd: this.serverConfig.cwd
       });
       await this.client.connect(this.transport, { timeout: this.serverConfig.timeout ?? this.timeout });
       this.log("debug", `Successfully connected to MCP server via Stdio`);
@@ -788,13 +780,13 @@ var InternalMastraMCPClient = class extends MastraBase {
   }
   async subscribeResource(uri) {
     this.log("debug", `Subscribing to resource on MCP server: ${uri}`);
-    return await this.client.request({ method: "resources/subscribe", params: { uri } }, z.object({}), {
+    return await this.client.request({ method: "resources/subscribe", params: { uri } }, EmptyResultSchema, {
       timeout: this.timeout
     });
   }
   async unsubscribeResource(uri) {
     this.log("debug", `Unsubscribing from resource on MCP server: ${uri}`);
-    return await this.client.request({ method: "resources/unsubscribe", params: { uri } }, z.object({}), {
+    return await this.client.request({ method: "resources/unsubscribe", params: { uri } }, EmptyResultSchema, {
       timeout: this.timeout
     });
   }
@@ -867,17 +859,9 @@ var InternalMastraMCPClient = class extends MastraBase {
     });
   }
   async convertInputSchema(inputSchema) {
-    if (isZodType(inputSchema)) {
-      return inputSchema;
-    }
     try {
       await $RefParser.dereference(inputSchema);
-      const jsonSchemaToConvert = "jsonSchema" in inputSchema ? inputSchema.jsonSchema : inputSchema;
-      if ("toJSONSchema" in z) {
-        return convertJsonSchemaToZod(jsonSchemaToConvert);
-      } else {
-        return convertJsonSchemaToZod$1(jsonSchemaToConvert);
-      }
+      return "jsonSchema" in inputSchema ? inputSchema.jsonSchema : inputSchema;
     } catch (error) {
       let errorDetails;
       if (error instanceof Error) {
@@ -889,7 +873,7 @@ var InternalMastraMCPClient = class extends MastraBase {
           errorDetails = String(error);
         }
       }
-      this.log("error", "Failed to convert JSON schema to Zod schema using zodFromJsonSchema", {
+      this.log("error", "Failed to dereference JSON schema", {
         error: errorDetails,
         originalJsonSchema: inputSchema
       });
@@ -901,46 +885,11 @@ 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)) {
-      return outputSchema;
-    }
     try {
       await $RefParser.dereference(outputSchema);
-      const jsonSchemaToConvert = "jsonSchema" in outputSchema ? outputSchema.jsonSchema : outputSchema;
-      let zodSchema;
-      if ("toJSONSchema" in z) {
-        zodSchema = convertJsonSchemaToZod(jsonSchemaToConvert);
-      } else {
-        zodSchema = convertJsonSchemaToZod$1(jsonSchemaToConvert);
-      }
-      return this.applyPassthrough(zodSchema);
+      return "jsonSchema" in outputSchema ? outputSchema.jsonSchema : outputSchema;
     } catch (error) {
       let errorDetails;
       if (error instanceof Error) {
@@ -952,7 +901,7 @@ var InternalMastraMCPClient = class extends MastraBase {
           errorDetails = String(error);
         }
       }
-      this.log("error", "Failed to convert JSON schema to Zod schema using zodFromJsonSchema", {
+      this.log("error", "Failed to dereference JSON schema", {
         error: errorDetails,
         originalJsonSchema: outputSchema
       });
@@ -976,6 +925,10 @@ var InternalMastraMCPClient = class extends MastraBase {
           description: tool.description || "",
           inputSchema: await this.convertInputSchema(tool.inputSchema),
           outputSchema: await this.convertOutputSchema(tool.outputSchema),
+          mcpMetadata: {
+            serverName: this.name,
+            serverVersion: this.client.getServerVersion()?.version
+          },
           execute: async (input, context) => {
             const operationContext = context?.requestContext ?? null;
             return this.operationContextStore.run(operationContext, async () => {
@@ -990,7 +943,8 @@ var InternalMastraMCPClient = class extends MastraBase {
                   },
                   CallToolResultSchema,
                   {
-                    timeout: this.timeout
+                    timeout: this.timeout,
+                    signal: context?.abortSignal
                   }
                 );
                 this.log("debug", `Tool executed successfully: ${tool.name}`);
@@ -2740,10 +2694,10 @@ var MCPServer = class extends MCPServerBase {
           const toolSpec = {
             name: tool.id || "unknown",
             description: tool.description,
-            inputSchema: tool.parameters.jsonSchema
+            inputSchema: this.convertSchema(tool.parameters)
           };
           if (tool.outputSchema) {
-            toolSpec.outputSchema = tool.outputSchema.jsonSchema;
+            toolSpec.outputSchema = this.convertSchema(tool.outputSchema);
           }
           if (tool.mcp?.annotations) {
             toolSpec.annotations = tool.mcp.annotations;
@@ -2855,17 +2809,18 @@ Provided arguments: ${JSON.stringify(request.params.arguments, null, 2)}`
         return response;
       } catch (error) {
         const duration = Date.now() - startTime;
-        if (error instanceof z.ZodError) {
+        if (error instanceof Error && "issues" in error && Array.isArray(error.issues)) {
+          const issues = error.issues;
           this.logger.warn("Invalid tool arguments", {
             tool: request.params.name,
-            errors: error.errors,
+            errors: issues,
             duration: `${duration}ms`
           });
           return {
             content: [
               {
                 type: "text",
-                text: `Invalid arguments: ${error.errors.map((e) => `${e.path.join(".")}: ${e.message}`).join(", ")}`
+                text: `Invalid arguments: ${issues.map((e) => `${e.path.join(".")}: ${e.message}`).join(", ")}`
               }
             ],
             isError: true
@@ -3098,12 +3053,18 @@ Provided arguments: ${JSON.stringify(request.params.arguments, null, 2)}`
       const agentToolDefinition = createTool({
         id: agentToolName,
         description: `Ask agent '${agent.name}' a question. Agent description: ${agentDescription}`,
-        inputSchema: z.object({
-          message: z.string().describe("The question or input for the agent.")
-        }),
+        inputSchema: {
+          type: "object",
+          properties: {
+            message: { type: "string", description: "The question or input for the agent." }
+          },
+          required: ["message"],
+          additionalProperties: false
+        },
         execute: async (inputData, context) => {
+          const { message } = inputData;
           this.logger.debug(
-            `Executing agent tool '${agentToolName}' for agent '${agent.name}' with message: "${inputData.message}"`
+            `Executing agent tool '${agentToolName}' for agent '${agent.name}' with message: "${message}"`
           );
           try {
             const proxiedContext = context?.requestContext || new RequestContext();
@@ -3112,7 +3073,7 @@ Provided arguments: ${JSON.stringify(request.params.arguments, null, 2)}`
                 proxiedContext.set(key, value);
               });
             }
-            const response = await agent.generate(inputData.message, {
+            const response = await agent.generate(message, {
               ...context ?? {},
               requestContext: proxiedContext
             });
@@ -3965,6 +3926,12 @@ Provided arguments: ${JSON.stringify(request.params.arguments, null, 2)}`
       remotes: this.remotes
     };
   }
+  convertSchema(schema) {
+    if (isStandardSchemaWithJSON(schema)) {
+      return standardSchemaToJSONSchema(schema);
+    }
+    return schema?.jsonSchema || schema;
+  }
   /**
    * Gets a list of all tools provided by this MCP server with their schemas.
    *
@@ -3989,8 +3956,8 @@ Provided arguments: ${JSON.stringify(request.params.arguments, null, 2)}`
         id: toolId,
         name: tool.id || toolId,
         description: tool.description,
-        inputSchema: tool.parameters?.jsonSchema || tool.parameters,
-        outputSchema: tool.outputSchema?.jsonSchema || tool.outputSchema,
+        inputSchema: this.convertSchema(tool.parameters),
+        outputSchema: this.convertSchema(tool.parameters),
         toolType: tool.mcp?.toolType
       }))
     };
@@ -4023,8 +3990,8 @@ Provided arguments: ${JSON.stringify(request.params.arguments, null, 2)}`
     return {
       name: tool.id || toolId,
       description: tool.description,
-      inputSchema: tool.parameters?.jsonSchema || tool.parameters,
-      outputSchema: tool.outputSchema?.jsonSchema || tool.outputSchema,
+      inputSchema: this.convertSchema(tool.parameters),
+      outputSchema: this.convertSchema(tool.outputSchema),
       toolType: tool.mcp?.toolType
     };
   }
@@ -4059,23 +4026,29 @@ Provided arguments: ${JSON.stringify(request.params.arguments, null, 2)}`
         throw new Error(`Unknown tool: ${toolId}`);
       }
       this.logger.debug(`ExecuteTool: Invoking '${toolId}' with arguments:`, args);
-      if (tool.parameters instanceof z.ZodType && typeof tool.parameters.safeParse === "function") {
-        const validation = tool.parameters.safeParse(args ?? {});
-        if (!validation.success) {
-          const errorMessages = validation.error.errors.map((e) => `- ${e.path?.join(".") || "root"}: ${e.message}`).join("\n");
+      const paramsSchema = tool.parameters;
+      const validation = typeof paramsSchema?.validate === "function" ? paramsSchema.validate(args ?? {}) : typeof paramsSchema?.safeParse === "function" ? paramsSchema.safeParse(args ?? {}) : null;
+      if (validation) {
+        const success = typeof validation.success === "boolean" ? validation.success : !validation.issues?.length;
+        if (!success) {
+          const issues = validation.error?.issues ?? validation.error?.errors ?? validation.issues ?? [];
+          const errorMessages = issues.map(
+            (e) => `- ${e.path?.join(".") || "root"}: ${e.message}`
+          ).join("\n");
+          const validationErrors = validation.error?.format?.() ?? validation.error ?? validation.issues;
           this.logger.warn(`ExecuteTool: Invalid tool arguments for '${toolId}': ${errorMessages}`, {
-            errors: validation.error.format()
+            errors: validationErrors
           });
           return {
             error: true,
             message: `Tool validation failed. Please fix the following errors and try again:
-${errorMessages}
+${errorMessages || "Validation failed"}
 
 Provided arguments: ${JSON.stringify(args, null, 2)}`,
-            validationErrors: validation.error.format()
+            validationErrors
           };
         }
-        validatedArgs = validation.data;
+        validatedArgs = validation.data ?? validation.value ?? args;
       } else {
         this.logger.debug(
           `ExecuteTool: Tool '${toolId}' parameters is not a Zod schema with safeParse or is undefined. Skipping validation.`