@mastra/mcp 0.4.2-alpha.0 → 0.4.2-alpha.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/mcp",
-  "version": "0.4.2-alpha.0",
+  "version": "0.4.2-alpha.3",
   "description": "",
   "type": "module",
   "main": "dist/index.js",
@@ -27,7 +27,7 @@
     "exit-hook": "^4.0.0",
     "fast-deep-equal": "^3.1.3",
     "uuid": "^11.1.0",
-    "@mastra/core": "^0.9.2-alpha.0"
+    "@mastra/core": "^0.9.2-alpha.3"
   },
   "devDependencies": {
     "@ai-sdk/anthropic": "^1.1.15",

package/src/client.ts

@@ -1,6 +1,6 @@
 import { MastraBase } from '@mastra/core/base';
 import { createTool } from '@mastra/core/tools';
-import { jsonSchemaToModel } from '@mastra/core/utils';
+import { isZodType, resolveSerializedZodOutput } from '@mastra/core/utils';
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 import { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js';
 import type { SSEClientTransportOptions } from '@modelcontextprotocol/sdk/client/sse.js';
@@ -14,6 +14,8 @@ import type { ClientCapabilities, LoggingLevel } from '@modelcontextprotocol/sdk
 import { CallToolResultSchema, ListResourcesResultSchema } from '@modelcontextprotocol/sdk/types.js';
 
 import { asyncExitHook, gracefulExit } from 'exit-hook';
+import jsonSchemaToZod from 'json-schema-to-zod';
+import type { JsonSchema } from 'json-schema-to-zod';
 import { z } from 'zod';
 
 // Re-export MCP SDK LoggingLevel for convenience
@@ -89,13 +91,20 @@ function convertLogLevelToLoggerMethod(level: LoggingLevel): 'debug' | 'info' |
   }
 }
 
+export type InternalMastraMCPClientOptions = {
+  name: string;
+  server: MastraMCPServerDefinition;
+  capabilities?: ClientCapabilities;
+  version?: string;
+  timeout?: number;
+};
+
 export class InternalMastraMCPClient extends MastraBase {
   name: string;
   private client: Client;
   private readonly timeout: number;
   private logHandler?: LogHandler;
   private enableServerLogs?: boolean;
-  private static hasWarned = false;
   private serverConfig: MastraMCPServerDefinition;
   private transport?: Transport;
 
@@ -105,21 +114,8 @@ export class InternalMastraMCPClient extends MastraBase {
     server,
     capabilities = {},
     timeout = DEFAULT_REQUEST_TIMEOUT_MSEC,
-  }: {
-    name: string;
-    server: MastraMCPServerDefinition;
-    capabilities?: ClientCapabilities;
-    version?: string;
-    timeout?: number;
-  }) {
+  }: InternalMastraMCPClientOptions) {
     super({ name: 'MastraMCPClient' });
-    if (!InternalMastraMCPClient.hasWarned) {
-      // eslint-disable-next-line no-console
-      console.warn(
-        '[DEPRECATION] MastraMCPClient is deprecated and will be removed in a future release. Please use MCPClient instead.',
-      );
-      InternalMastraMCPClient.hasWarned = true;
-    }
     this.name = name;
     this.timeout = timeout;
     this.logHandler = server.logger;
@@ -326,17 +322,25 @@ export class InternalMastraMCPClient extends MastraBase {
     });
   }
 
+  private convertInputSchema(
+    inputSchema: Awaited<ReturnType<Client['listTools']>>['tools'][0]['inputSchema'] | JsonSchema,
+  ): z.ZodType {
+    return isZodType(inputSchema)
+      ? inputSchema
+      : resolveSerializedZodOutput(jsonSchemaToZod(inputSchema as JsonSchema));
+  }
+
   async tools() {
     this.log('debug', `Requesting tools from MCP server`);
     const { tools } = await this.client.listTools({ timeout: this.timeout });
     const toolsRes: Record<string, any> = {};
     tools.forEach(tool => {
       this.log('debug', `Processing tool: ${tool.name}`);
-      const s = jsonSchemaToModel(tool.inputSchema);
+
       const mastraTool = createTool({
         id: `${this.name}_${tool.name}`,
         description: tool.description || '',
-        inputSchema: s,
+        inputSchema: this.convertInputSchema(tool.inputSchema),
         execute: async ({ context }) => {
           try {
             this.log('debug', `Executing tool: ${tool.name}`, { toolArgs: context });
@@ -374,4 +378,12 @@ export class InternalMastraMCPClient extends MastraBase {
 /**
  * @deprecated MastraMCPClient is deprecated and will be removed in a future release. Please use MCPClient instead.
  */
-export const MastraMCPClient = InternalMastraMCPClient;
+
+export class MastraMCPClient extends InternalMastraMCPClient {
+  constructor(args: InternalMastraMCPClientOptions) {
+    super(args);
+    this.logger.warn(
+      '[DEPRECATION] MastraMCPClient is deprecated and will be removed in a future release. Please use MCPClient instead.',
+    );
+  }
+}