@mastra/mcp 0.10.10 → 0.10.11-alpha.0

package/dist/server/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/server/server.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/server/server.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/mcp",
-  "version": "0.10.10",
+  "version": "0.10.11-alpha.0",
   "description": "",
   "type": "module",
   "main": "dist/index.js",
@@ -51,9 +51,9 @@
     "vitest": "^3.2.4",
     "zod": "^3.25.67",
     "zod-to-json-schema": "^3.24.5",
-    "@internal/types-builder": "0.0.2",
-    "@mastra/core": "0.13.0",
-    "@internal/lint": "0.0.27"
+    "@mastra/core": "0.13.2-alpha.2",
+    "@internal/types-builder": "0.0.3",
+    "@internal/lint": "0.0.28"
   },
   "scripts": {
     "build": "tsup --silent --config tsup.config.ts",

package/src/client/client.ts

@@ -169,7 +169,6 @@ export class InternalMastraMCPClient extends MastraBase {
     // Set up log message capturing
     this.setupLogging();
 
-
     this.resources = new ResourceClientActions({ client: this, logger: this.logger });
     this.prompts = new PromptClientActions({ client: this, logger: this.logger });
     this.elicitation = new ElicitationClientActions({ client: this, logger: this.logger });
@@ -318,7 +317,6 @@ export class InternalMastraMCPClient extends MastraBase {
             originalOnClose();
           }
         };
-
       } catch (e) {
         this.isConnected = null;
         reject(e);
@@ -466,12 +464,12 @@ export class InternalMastraMCPClient extends MastraBase {
 
   setElicitationRequestHandler(handler: ElicitationHandler): void {
     this.log('debug', 'Setting elicitation request handler');
-    this.client.setRequestHandler(ElicitRequestSchema, async (request) => {
+    this.client.setRequestHandler(ElicitRequestSchema, async request => {
       this.log('debug', `Received elicitation request: ${request.params.message}`);
       return handler(request.params);
     });
   }
-  
+
   private async convertInputSchema(
     inputSchema: Awaited<ReturnType<Client['listTools']>>['tools'][0]['inputSchema'] | JSONSchema,
   ): Promise<z.ZodType> {
@@ -480,7 +478,7 @@ export class InternalMastraMCPClient extends MastraBase {
     }
 
     try {
-      await $RefParser.dereference(inputSchema)
+      await $RefParser.dereference(inputSchema);
       return convertJsonSchemaToZod(inputSchema as JSONSchema);
     } catch (error: unknown) {
       let errorDetails: string | undefined;
@@ -511,13 +509,13 @@ export class InternalMastraMCPClient extends MastraBase {
   private async convertOutputSchema(
     outputSchema: Awaited<ReturnType<Client['listTools']>>['tools'][0]['outputSchema'] | JSONSchema,
   ): Promise<z.ZodType | undefined> {
-    if (!outputSchema) return
+    if (!outputSchema) return;
     if (isZodType(outputSchema)) {
       return outputSchema;
     }
 
     try {
-      await $RefParser.dereference(outputSchema)
+      await $RefParser.dereference(outputSchema);
       return convertJsonSchemaToZod(outputSchema as JSONSchema);
     } catch (error: unknown) {
       let errorDetails: string | undefined;

package/src/server/server.test.ts

@@ -1347,7 +1347,7 @@ describe('MCPServer - Workflow to Tool Conversion', () => {
   });
 
   it('should call workflow.createRun().start() when the derived tool is executed', async () => {
-    const testWorkflow = createMockWorkflow('MyExecWorkflow', 'Executable workflow');
+    const testWorkflow = createMockWorkflow('MyExecWorkflow', 'Executable workflow', z.object({ data: z.string() }));
     const step = createStep({
       id: 'my-step',
       description: 'My step description',
@@ -1855,3 +1855,288 @@ describe('MCPServer with Tool Output Schema', () => {
     expect(JSON.parse(result.content[0].text)).toEqual(result.structuredContent);
   });
 });
+
+describe('MCPServer - Tool Input Validation', () => {
+  let validationServer: MCPServer;
+  let validationClient: InternalMastraMCPClient;
+  let httpValidationServer: ServerType;
+  let tools: Record<string, any>;
+  const VALIDATION_PORT = 9700 + Math.floor(Math.random() * 100);
+
+  const toolsWithValidation: ToolsInput = {
+    stringTool: {
+      description: 'Tool that requires a string input',
+      parameters: z.object({
+        message: z.string().min(3, 'Message must be at least 3 characters'),
+        optional: z.string().optional(),
+      }),
+      execute: async args => ({
+        result: `Received: ${args.message}`,
+      }),
+    },
+    numberTool: {
+      description: 'Tool that requires number inputs',
+      parameters: z.object({
+        age: z.number().min(0).max(150),
+        score: z.number().optional(),
+      }),
+      execute: async args => ({
+        result: `Age: ${args.age}, Score: ${args.score ?? 'N/A'}`,
+      }),
+    },
+    complexTool: {
+      description: 'Tool with complex validation',
+      parameters: z.object({
+        email: z.string().email('Invalid email format'),
+        tags: z.array(z.string()).min(1, 'At least one tag required'),
+        metadata: z.object({
+          priority: z.enum(['low', 'medium', 'high']),
+          deadline: z.string().datetime().optional(),
+        }),
+      }),
+      execute: async args => ({
+        result: `Processing ${args.email} with ${args.tags.length} tags`,
+      }),
+    },
+  };
+
+  beforeAll(async () => {
+    const app = new Hono();
+    validationServer = new MCPServer({
+      name: 'ValidationTestServer',
+      version: '1.0.0',
+      description: 'Server for testing tool validation',
+      tools: toolsWithValidation,
+    });
+
+    app.get('/sse', async c => {
+      const url = new URL(c.req.url, `http://localhost:${VALIDATION_PORT}`);
+      return await validationServer.startHonoSSE({
+        url,
+        ssePath: '/sse',
+        messagePath: '/message',
+        context: c,
+      });
+    });
+
+    app.post('/message', async c => {
+      const url = new URL(c.req.url, `http://localhost:${VALIDATION_PORT}`);
+      return await validationServer.startHonoSSE({
+        url,
+        ssePath: '/sse',
+        messagePath: '/message',
+        context: c,
+      });
+    });
+
+    httpValidationServer = serve({
+      fetch: app.fetch,
+      port: VALIDATION_PORT,
+    });
+
+    validationClient = new InternalMastraMCPClient({
+      name: 'validation-test-client',
+      server: { url: new URL(`http://localhost:${VALIDATION_PORT}/sse`) },
+    });
+
+    await validationClient.connect();
+    tools = await validationClient.tools();
+  });
+
+  afterAll(async () => {
+    await validationClient.disconnect();
+    httpValidationServer.close();
+  });
+
+  it('should successfully execute tool with valid inputs', async () => {
+    const stringTool = tools['stringTool'];
+    expect(stringTool).toBeDefined();
+
+    const result = await stringTool.execute({
+      context: {
+        message: 'Hello world',
+        optional: 'optional value',
+      },
+    });
+
+    expect(result).toBeDefined();
+    expect(result.content[0].text).toContain('Received: Hello world');
+  });
+
+  it('should return validation error for missing required parameters', async () => {
+    const stringTool = tools['stringTool'];
+    const result = await stringTool.execute({
+      context: {},
+    });
+
+    expect(result).toBeDefined();
+    // Handle both client-side and server-side error formats
+    if (result.error) {
+      expect(result.error).toBe(true);
+      expect(result.message).toContain('Tool validation failed');
+      expect(result.message).toContain('Please fix the following errors');
+    } else {
+      expect(result.isError).toBe(true);
+      expect(result.content[0].text).toContain('Tool validation failed');
+      expect(result.content[0].text).toContain('Please fix the following errors');
+    }
+  });
+
+  it('should return validation error for invalid string length', async () => {
+    const stringTool = tools['stringTool'];
+    const result = await stringTool.execute({
+      context: {
+        message: 'Hi', // Too short, min is 3
+      },
+    });
+
+    expect(result).toBeDefined();
+    // Handle both client-side and server-side error formats
+    if (result.error) {
+      expect(result.error).toBe(true);
+      expect(result.message).toContain('Tool validation failed');
+      expect(result.message).toContain('String must contain at least 3 character(s)');
+    } else {
+      expect(result.isError).toBe(true);
+      expect(result.content[0].text).toContain('Tool validation failed');
+      expect(result.content[0].text).toContain('Message must be at least 3 characters');
+    }
+  });
+
+  it('should return validation error for invalid number range', async () => {
+    const numberTool = tools['numberTool'];
+    const result = await numberTool.execute({
+      context: {
+        age: -5, // Negative age not allowed
+      },
+    });
+
+    expect(result).toBeDefined();
+    // Handle both client-side and server-side error formats
+    if (result.error) {
+      expect(result.error).toBe(true);
+      expect(result.message).toContain('Tool validation failed');
+    } else {
+      expect(result.isError).toBe(true);
+      expect(result.content[0].text).toContain('Tool validation failed');
+    }
+  });
+
+  it('should return validation error for invalid email format', async () => {
+    const complexTool = tools['complexTool'];
+    const result = await complexTool.execute({
+      context: {
+        email: 'not-an-email',
+        tags: ['tag1'],
+        metadata: {
+          priority: 'medium',
+        },
+      },
+    });
+
+    expect(result).toBeDefined();
+    expect(result.isError).toBe(true);
+    expect(result.content[0].text).toContain('Tool validation failed');
+    expect(result.content[0].text).toContain('Invalid email format');
+  });
+
+  it('should return validation error for empty array when minimum required', async () => {
+    const complexTool = tools['complexTool'];
+    const result = await complexTool.execute({
+      context: {
+        email: 'test@example.com',
+        tags: [], // Empty array, min 1 required
+        metadata: {
+          priority: 'low',
+        },
+      },
+    });
+
+    expect(result).toBeDefined();
+    // Handle both client-side and server-side error formats
+    if (result.error) {
+      expect(result.error).toBe(true);
+      expect(result.message).toContain('Tool validation failed');
+      expect(result.message).toContain('Array must contain at least 1 element(s)');
+    } else {
+      expect(result.isError).toBe(true);
+      expect(result.content[0].text).toContain('Tool validation failed');
+      expect(result.content[0].text).toContain('Array must contain at least 1 element(s)');
+    }
+  });
+
+  it('should return validation error for invalid enum value', async () => {
+    const complexTool = tools['complexTool'];
+    const result = await complexTool.execute({
+      context: {
+        email: 'test@example.com',
+        tags: ['tag1'],
+        metadata: {
+          priority: 'urgent', // Not in enum ['low', 'medium', 'high']
+        },
+      },
+    });
+
+    expect(result).toBeDefined();
+    // Handle both client-side and server-side error formats
+    if (result.error) {
+      expect(result.error).toBe(true);
+      expect(result.message).toContain('Tool validation failed');
+    } else {
+      expect(result.isError).toBe(true);
+      expect(result.content[0].text).toContain('Tool validation failed');
+    }
+  });
+
+  it('should handle multiple validation errors', async () => {
+    const complexTool = tools['complexTool'];
+    const result = await complexTool.execute({
+      context: {
+        email: 'invalid-email',
+        tags: [],
+        metadata: {
+          priority: 'invalid',
+        },
+      },
+    });
+
+    expect(result).toBeDefined();
+    // Handle both client-side and server-side error formats
+    if (result.error) {
+      expect(result.error).toBe(true);
+      const errorText = result.message;
+      expect(errorText).toContain('Tool validation failed');
+      // Should contain multiple validation errors
+      // Note: Some validations might not trigger when there are other errors
+      expect(errorText).toContain('- tags: Array must contain at least 1 element(s)');
+      expect(errorText).toContain('Provided arguments:');
+    } else {
+      expect(result.isError).toBe(true);
+      const errorText = result.content[0].text;
+      expect(errorText).toContain('Tool validation failed');
+      // Should contain multiple validation errors
+      // Note: Some validations might not trigger when there are other errors
+      expect(errorText).toContain('- tags: Array must contain at least 1 element(s)');
+      expect(errorText).toContain('Provided arguments:');
+    }
+  });
+
+  it('should work with executeTool method directly', async () => {
+    // Test valid input
+    const validResult = await validationServer.executeTool('stringTool', {
+      message: 'Valid message',
+    });
+    // executeTool returns result directly, not in MCP format
+    expect(validResult.result).toBe('Received: Valid message');
+
+    // Test invalid input - should return validation error (not throw)
+    const invalidResult = await validationServer.executeTool('stringTool', {
+      message: 'No', // Too short
+    });
+
+    // executeTool returns client-side validation format
+    expect(invalidResult.error).toBe(true);
+    expect(invalidResult.message).toContain('Tool validation failed');
+    expect(invalidResult.message).toContain('Message must be at least 3 characters');
+  });
+});

package/src/server/server.ts

@@ -248,9 +248,25 @@ export class MCPServer extends MCPServerBase {
           this.logger.warn(`CallTool: Invalid tool arguments for '${request.params.name}'`, {
             errors: validation.error,
           });
+
+          // Format validation errors for agent understanding
+          let errorMessages = 'Validation failed';
+          if ('errors' in validation.error && Array.isArray(validation.error.errors)) {
+            errorMessages = validation.error.errors
+              .map((e: any) => `- ${e.path?.join('.') || 'root'}: ${e.message}`)
+              .join('\n');
+          } else if (validation.error instanceof Error) {
+            errorMessages = validation.error.message;
+          }
+
           return {
-            content: [{ type: 'text', text: `Invalid tool arguments: ${JSON.stringify(validation.error)}` }],
-            isError: true,
+            content: [
+              {
+                type: 'text',
+                text: `Tool validation failed. Please fix the following errors and try again:\n${errorMessages}\n\nProvided arguments: ${JSON.stringify(request.params.arguments, null, 2)}`,
+              },
+            ],
+            isError: true, // Set to true so the LLM sees the error and can self-correct
           };
         }
         if (!tool.execute) {
@@ -268,7 +284,7 @@ export class MCPServer extends MCPServerBase {
           },
         };
 
-        const result = await tool.execute(validation?.value, {
+        const result = await tool.execute(validation?.value ?? request.params.arguments ?? {}, {
           messages: [],
           toolCallId: '',
           elicitation: sessionElicitation,
@@ -1356,12 +1372,17 @@ export class MCPServer extends MCPServerBase {
         const validation = tool.parameters.safeParse(args ?? {});
         if (!validation.success) {
           const errorMessages = validation.error.errors
-            .map((e: z.ZodIssue) => `${e.path.join('.')}: ${e.message}`)
-            .join(', ');
+            .map((e: z.ZodIssue) => `- ${e.path?.join('.') || 'root'}: ${e.message}`)
+            .join('\n');
           this.logger.warn(`ExecuteTool: Invalid tool arguments for '${toolId}': ${errorMessages}`, {
             errors: validation.error.format(),
           });
-          throw new z.ZodError(validation.error.issues);
+          // Return validation error as a result instead of throwing
+          return {
+            error: true,
+            message: `Tool validation failed. Please fix the following errors and try again:\n${errorMessages}\n\nProvided arguments: ${JSON.stringify(args, null, 2)}`,
+            validationErrors: validation.error.format(),
+          };
         }
         validatedArgs = validation.data;
       } else {

package/integration-tests/node_modules/.bin/mastra

@@ -1,21 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*|*MINGW*|*MSYS*)
-        if command -v cygpath > /dev/null 2>&1; then
-            basedir=`cygpath -w "$basedir"`
-        fi
-    ;;
-esac
-
-if [ -z "$NODE_PATH" ]; then
-  export NODE_PATH="/home/runner/work/mastra/mastra/packages/cli/dist/node_modules:/home/runner/work/mastra/mastra/packages/cli/node_modules:/home/runner/work/mastra/mastra/packages/node_modules:/home/runner/work/mastra/mastra/node_modules:/home/runner/work/mastra/node_modules:/home/runner/work/node_modules:/home/runner/node_modules:/home/node_modules:/node_modules:/home/runner/work/mastra/mastra/node_modules/.pnpm/node_modules"
-else
-  export NODE_PATH="/home/runner/work/mastra/mastra/packages/cli/dist/node_modules:/home/runner/work/mastra/mastra/packages/cli/node_modules:/home/runner/work/mastra/mastra/packages/node_modules:/home/runner/work/mastra/mastra/node_modules:/home/runner/work/mastra/node_modules:/home/runner/work/node_modules:/home/runner/node_modules:/home/node_modules:/node_modules:/home/runner/work/mastra/mastra/node_modules/.pnpm/node_modules:$NODE_PATH"
-fi
-if [ -x "$basedir/node" ]; then
-  exec "$basedir/node"  "$basedir/../mastra/dist/index.js" "$@"
-else
-  exec node  "$basedir/../mastra/dist/index.js" "$@"
-fi