@mastra/mcp 0.10.6-alpha.0 → 0.10.6

package/.turbo/turbo-build.log

@@ -1,23 +1,23 @@
 
-> @mastra/mcp@0.10.6-alpha.0 build /home/runner/work/mastra/mastra/packages/mcp
+> @mastra/mcp@0.10.6-alpha.1 build /home/runner/work/mastra/mastra/packages/mcp
 > tsup src/index.ts --format esm,cjs --experimental-dts --clean --treeshake=smallest --splitting
 
 CLI Building entry: src/index.ts
 CLI Using tsconfig: tsconfig.json
 CLI tsup v8.5.0
 TSC Build start
-TSC ⚡️ Build success in 22958ms
+TSC ⚡️ Build success in 22460ms
 DTS Build start
 CLI Target: es2022
 Analysis will use the bundled TypeScript version 5.8.3
 Writing package typings: /home/runner/work/mastra/mastra/packages/mcp/dist/_tsup-dts-rollup.d.ts
 Analysis will use the bundled TypeScript version 5.8.3
 Writing package typings: /home/runner/work/mastra/mastra/packages/mcp/dist/_tsup-dts-rollup.d.cts
-DTS ⚡️ Build success in 30106ms
+DTS ⚡️ Build success in 29484ms
 CLI Cleaning output folder
 ESM Build start
 CJS Build start
-CJS dist/index.cjs 89.38 KB
-CJS ⚡️ Build success in 2235ms
-ESM dist/index.js 88.70 KB
-ESM ⚡️ Build success in 2236ms
+ESM dist/index.js 88.94 KB
+ESM ⚡️ Build success in 2100ms
+CJS dist/index.cjs 89.72 KB
+CJS ⚡️ Build success in 2103ms

package/CHANGELOG.md

@@ -1,5 +1,42 @@
 # @mastra/mcp
 
+## 0.10.6
+
+### Patch Changes
+
+- f5ec3a4: Fix tool calling args for mcp server to ensure validatedArgs are not undefined
+- ab3bbff: Add support for extra arguments in mcp
+- c0ba5e2: Handle json schema with $defs and $ref property for MCP tool schemas.
+- cb16baf: Fix MCP tool output schema type and return value
+- Updated dependencies [2873c7f]
+- Updated dependencies [1c1c6a1]
+- Updated dependencies [f8ce2cc]
+- Updated dependencies [8c846b6]
+- Updated dependencies [c7bbf1e]
+- Updated dependencies [8722d53]
+- Updated dependencies [565cc0c]
+- Updated dependencies [b790fd1]
+- Updated dependencies [132027f]
+- Updated dependencies [0c85311]
+- Updated dependencies [d7ed04d]
+- Updated dependencies [cb16baf]
+- Updated dependencies [f36e4f1]
+- Updated dependencies [7f6e403]
+  - @mastra/core@0.10.11
+
+## 0.10.6-alpha.1
+
+### Patch Changes
+
+- c0ba5e2: Handle json schema with $defs and $ref property for MCP tool schemas.
+- cb16baf: Fix MCP tool output schema type and return value
+- Updated dependencies [c7bbf1e]
+- Updated dependencies [8722d53]
+- Updated dependencies [132027f]
+- Updated dependencies [0c85311]
+- Updated dependencies [cb16baf]
+  - @mastra/core@0.10.11-alpha.3
+
 ## 0.10.6-alpha.0
 
 ### Patch Changes

package/LICENSE.md

@@ -1,46 +1,15 @@
-# Elastic License 2.0 (ELv2)
+# Apache License 2.0
 
-Copyright (c) 2025 Mastra AI, Inc.
+Copyright (c) 2025 Kepler Software, Inc.
 
-**Acceptance**
-By using the software, you agree to all of the terms and conditions below.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
 
-**Copyright License**
-The licensor grants you a non-exclusive, royalty-free, worldwide, non-sublicensable, non-transferable license to use, copy, distribute, make available, and prepare derivative works of the software, in each case subject to the limitations and conditions below
+    http://www.apache.org/licenses/LICENSE-2.0
 
-**Limitations**
-You may not provide the software to third parties as a hosted or managed service, where the service provides users with access to any substantial set of the features or functionality of the software.
-
-You may not move, change, disable, or circumvent the license key functionality in the software, and you may not remove or obscure any functionality in the software that is protected by the license key.
-
-You may not alter, remove, or obscure any licensing, copyright, or other notices of the licensor in the software. Any use of the licensor’s trademarks is subject to applicable law.
-
-**Patents**
-The licensor grants you a license, under any patent claims the licensor can license, or becomes able to license, to make, have made, use, sell, offer for sale, import and have imported the software, in each case subject to the limitations and conditions in this license. This license does not cover any patent claims that you cause to be infringed by modifications or additions to the software. If you or your company make any written claim that the software infringes or contributes to infringement of any patent, your patent license for the software granted under these terms ends immediately. If your company makes such a claim, your patent license ends immediately for work on behalf of your company.
-
-**Notices**
-You must ensure that anyone who gets a copy of any part of the software from you also gets a copy of these terms.
-
-If you modify the software, you must include in any modified copies of the software prominent notices stating that you have modified the software.
-
-**No Other Rights**
-These terms do not imply any licenses other than those expressly granted in these terms.
-
-**Termination**
-If you use the software in violation of these terms, such use is not licensed, and your licenses will automatically terminate. If the licensor provides you with a notice of your violation, and you cease all violation of this license no later than 30 days after you receive that notice, your licenses will be reinstated retroactively. However, if you violate these terms after such reinstatement, any additional violation of these terms will cause your licenses to terminate automatically and permanently.
-
-**No Liability**
-As far as the law allows, the software comes as is, without any warranty or condition, and the licensor will not be liable to you for any damages arising out of these terms or the use or nature of the software, under any kind of legal claim.
-
-**Definitions**
-The _licensor_ is the entity offering these terms, and the _software_ is the software the licensor makes available under these terms, including any portion of it.
-
-_you_ refers to the individual or entity agreeing to these terms.
-
-_your company_ is any legal entity, sole proprietorship, or other kind of organization that you work for, plus all organizations that have control over, are under the control of, or are under common control with that organization. _control_ means ownership of substantially all the assets of an entity, or the power to direct its management and policies by vote, contract, or otherwise. Control can be direct or indirect.
-
-_your licenses_ are all the licenses granted to you for the software under these terms.
-
-_use_ means anything you do with the software requiring one of your licenses.
-
-_trademark_ means trademarks, service marks, and similar rights.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

package/dist/index.cjs

@@ -1,5 +1,6 @@
 'use strict';
 
+var $RefParser = require('@apidevtools/json-schema-ref-parser');
 var base = require('@mastra/core/base');
 var error = require('@mastra/core/error');
 var tools = require('@mastra/core/tools');
@@ -26,6 +27,7 @@ var streamableHttp_js = require('@modelcontextprotocol/sdk/server/streamableHttp
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
+var $RefParser__default = /*#__PURE__*/_interopDefault($RefParser);
 var equal__default = /*#__PURE__*/_interopDefault(equal);
 
 // src/client/client.ts
@@ -504,11 +506,12 @@ var InternalMastraMCPClient = class extends base.MastraBase {
       return handler(request.params);
     });
   }
-  convertInputSchema(inputSchema) {
+  async convertInputSchema(inputSchema) {
     if (utils.isZodType(inputSchema)) {
       return inputSchema;
     }
     try {
+      await $RefParser__default.default.dereference(inputSchema);
       return zodFromJsonSchema.convertJsonSchemaToZod(inputSchema);
     } catch (error$1) {
       let errorDetails;
@@ -533,12 +536,13 @@ var InternalMastraMCPClient = class extends base.MastraBase {
       });
     }
   }
-  convertOutputSchema(outputSchema) {
+  async convertOutputSchema(outputSchema) {
     if (!outputSchema) return;
     if (utils.isZodType(outputSchema)) {
       return outputSchema;
     }
     try {
+      await $RefParser__default.default.dereference(outputSchema);
       return zodFromJsonSchema.convertJsonSchemaToZod(outputSchema);
     } catch (error$1) {
       let errorDetails;
@@ -567,14 +571,14 @@ var InternalMastraMCPClient = class extends base.MastraBase {
     this.log("debug", `Requesting tools from MCP server`);
     const { tools: tools$1 } = await this.client.listTools({ timeout: this.timeout });
     const toolsRes = {};
-    tools$1.forEach((tool) => {
+    for (const tool of tools$1) {
       this.log("debug", `Processing tool: ${tool.name}`);
       try {
         const mastraTool = tools.createTool({
           id: `${this.name}_${tool.name}`,
           description: tool.description || "",
-          inputSchema: this.convertInputSchema(tool.inputSchema),
-          outputSchema: this.convertOutputSchema(tool.outputSchema),
+          inputSchema: await this.convertInputSchema(tool.inputSchema),
+          outputSchema: await this.convertOutputSchema(tool.outputSchema),
           execute: async ({ context, runtimeContext }) => {
             const previousContext = this.currentOperationContext;
             this.currentOperationContext = runtimeContext || null;
@@ -612,7 +616,7 @@ var InternalMastraMCPClient = class extends base.MastraBase {
           mcpToolDefinition: tool
         });
       }
-    });
+    }
     return toolsRes;
   }
 };
@@ -1567,10 +1571,13 @@ var MCPServer = class extends mcp.MCPServerBase {
         this.logger.info(`Tool '${request.params.name}' executed successfully in ${duration}ms.`);
         const response = { isError: false, content: [] };
         if (tool.outputSchema) {
-          if (!result.structuredContent) {
-            throw new Error(`Tool ${request.params.name} has an output schema but no structured content was provided.`);
+          let structuredContent;
+          if (result && typeof result === "object" && "structuredContent" in result) {
+            structuredContent = result.structuredContent;
+          } else {
+            structuredContent = result;
           }
-          const outputValidation = tool.outputSchema.validate?.(result.structuredContent ?? {});
+          const outputValidation = tool.outputSchema.validate?.(structuredContent ?? {});
           if (outputValidation && !outputValidation.success) {
             this.logger.warn(`CallTool: Invalid structured content for '${request.params.name}'`, {
               errors: outputValidation.error
@@ -1579,7 +1586,7 @@ var MCPServer = class extends mcp.MCPServerBase {
               `Invalid structured content for tool ${request.params.name}: ${JSON.stringify(outputValidation.error)}`
             );
           }
-          response.structuredContent = result.structuredContent;
+          response.structuredContent = structuredContent;
         }
         if (response.structuredContent) {
           response.content = [{ type: "text", text: JSON.stringify(response.structuredContent) }];

package/dist/index.js

@@ -1,3 +1,4 @@
+import $RefParser from '@apidevtools/json-schema-ref-parser';
 import { MastraBase } from '@mastra/core/base';
 import { MastraError, ErrorCategory, ErrorDomain } from '@mastra/core/error';
 import { createTool as createTool$1 } from '@mastra/core/tools';
@@ -498,11 +499,12 @@ var InternalMastraMCPClient = class extends MastraBase {
       return handler(request.params);
     });
   }
-  convertInputSchema(inputSchema) {
+  async convertInputSchema(inputSchema) {
     if (isZodType(inputSchema)) {
       return inputSchema;
     }
     try {
+      await $RefParser.dereference(inputSchema);
       return convertJsonSchemaToZod(inputSchema);
     } catch (error) {
       let errorDetails;
@@ -527,12 +529,13 @@ var InternalMastraMCPClient = class extends MastraBase {
       });
     }
   }
-  convertOutputSchema(outputSchema) {
+  async convertOutputSchema(outputSchema) {
     if (!outputSchema) return;
     if (isZodType(outputSchema)) {
       return outputSchema;
     }
     try {
+      await $RefParser.dereference(outputSchema);
       return convertJsonSchemaToZod(outputSchema);
     } catch (error) {
       let errorDetails;
@@ -561,14 +564,14 @@ var InternalMastraMCPClient = class extends MastraBase {
     this.log("debug", `Requesting tools from MCP server`);
     const { tools } = await this.client.listTools({ timeout: this.timeout });
     const toolsRes = {};
-    tools.forEach((tool) => {
+    for (const tool of tools) {
       this.log("debug", `Processing tool: ${tool.name}`);
       try {
         const mastraTool = createTool$1({
           id: `${this.name}_${tool.name}`,
           description: tool.description || "",
-          inputSchema: this.convertInputSchema(tool.inputSchema),
-          outputSchema: this.convertOutputSchema(tool.outputSchema),
+          inputSchema: await this.convertInputSchema(tool.inputSchema),
+          outputSchema: await this.convertOutputSchema(tool.outputSchema),
           execute: async ({ context, runtimeContext }) => {
             const previousContext = this.currentOperationContext;
             this.currentOperationContext = runtimeContext || null;
@@ -606,7 +609,7 @@ var InternalMastraMCPClient = class extends MastraBase {
           mcpToolDefinition: tool
         });
       }
-    });
+    }
     return toolsRes;
   }
 };
@@ -1561,10 +1564,13 @@ var MCPServer = class extends MCPServerBase {
         this.logger.info(`Tool '${request.params.name}' executed successfully in ${duration}ms.`);
         const response = { isError: false, content: [] };
         if (tool.outputSchema) {
-          if (!result.structuredContent) {
-            throw new Error(`Tool ${request.params.name} has an output schema but no structured content was provided.`);
+          let structuredContent;
+          if (result && typeof result === "object" && "structuredContent" in result) {
+            structuredContent = result.structuredContent;
+          } else {
+            structuredContent = result;
           }
-          const outputValidation = tool.outputSchema.validate?.(result.structuredContent ?? {});
+          const outputValidation = tool.outputSchema.validate?.(structuredContent ?? {});
           if (outputValidation && !outputValidation.success) {
             this.logger.warn(`CallTool: Invalid structured content for '${request.params.name}'`, {
               errors: outputValidation.error
@@ -1573,7 +1579,7 @@ var MCPServer = class extends MCPServerBase {
               `Invalid structured content for tool ${request.params.name}: ${JSON.stringify(outputValidation.error)}`
             );
           }
-          response.structuredContent = result.structuredContent;
+          response.structuredContent = structuredContent;
         }
         if (response.structuredContent) {
           response.content = [{ type: "text", text: JSON.stringify(response.structuredContent) }];

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

@@ -0,0 +1,21 @@
+#!/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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/mcp",
-  "version": "0.10.6-alpha.0",
+  "version": "0.10.6",
   "description": "",
   "type": "module",
   "main": "dist/index.js",
@@ -20,8 +20,9 @@
   },
   "keywords": [],
   "author": "",
-  "license": "Elastic-2.0",
+  "license": "Apache-2.0",
   "dependencies": {
+    "@apidevtools/json-schema-ref-parser": "^14.1.0",
     "@modelcontextprotocol/sdk": "^1.13.0",
     "date-fns": "^4.1.0",
     "exit-hook": "^4.0.0",
@@ -50,8 +51,8 @@
     "vitest": "^3.2.4",
     "zod": "^3.25.67",
     "zod-to-json-schema": "^3.24.5",
-    "@internal/lint": "0.0.17",
-    "@mastra/core": "0.10.11-alpha.2"
+    "@internal/lint": "0.0.18",
+    "@mastra/core": "0.10.11"
   },
   "scripts": {
     "build": "tsup src/index.ts --format esm,cjs --experimental-dts --clean --treeshake=smallest --splitting",

package/src/client/client.ts

@@ -1,5 +1,5 @@
+import $RefParser from '@apidevtools/json-schema-ref-parser';
 import { MastraBase } from '@mastra/core/base';
-
 import type { RuntimeContext } from '@mastra/core/di';
 import { ErrorCategory, ErrorDomain, MastraError } from '@mastra/core/error';
 import { createTool } from '@mastra/core/tools';
@@ -468,15 +468,16 @@ export class InternalMastraMCPClient extends MastraBase {
       return handler(request.params);
     });
   }
-
-  private convertInputSchema(
+  
+  private async convertInputSchema(
     inputSchema: Awaited<ReturnType<Client['listTools']>>['tools'][0]['inputSchema'] | JSONSchema,
-  ): z.ZodType {
+  ): Promise<z.ZodType> {
     if (isZodType(inputSchema)) {
       return inputSchema;
     }
 
     try {
+      await $RefParser.dereference(inputSchema)
       return convertJsonSchemaToZod(inputSchema as JSONSchema);
     } catch (error: unknown) {
       let errorDetails: string | undefined;
@@ -504,15 +505,16 @@ export class InternalMastraMCPClient extends MastraBase {
     }
   }
 
-  private convertOutputSchema(
+  private async convertOutputSchema(
     outputSchema: Awaited<ReturnType<Client['listTools']>>['tools'][0]['outputSchema'] | JSONSchema,
-  ): z.ZodType | undefined {
+  ): Promise<z.ZodType | undefined> {
     if (!outputSchema) return
     if (isZodType(outputSchema)) {
       return outputSchema;
     }
 
     try {
+      await $RefParser.dereference(outputSchema)
       return convertJsonSchemaToZod(outputSchema as JSONSchema);
     } catch (error: unknown) {
       let errorDetails: string | undefined;
@@ -544,14 +546,14 @@ export class InternalMastraMCPClient extends MastraBase {
     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 => {
+    for (const tool of tools) {
       this.log('debug', `Processing tool: ${tool.name}`);
       try {
         const mastraTool = createTool({
           id: `${this.name}_${tool.name}`,
           description: tool.description || '',
-          inputSchema: this.convertInputSchema(tool.inputSchema),
-          outputSchema: this.convertOutputSchema(tool.outputSchema),
+          inputSchema: await this.convertInputSchema(tool.inputSchema),
+          outputSchema: await this.convertOutputSchema(tool.outputSchema),
           execute: async ({ context, runtimeContext }: { context: any; runtimeContext?: RuntimeContext | null }) => {
             const previousContext = this.currentOperationContext;
             this.currentOperationContext = runtimeContext || null; // Set current context
@@ -592,7 +594,7 @@ export class InternalMastraMCPClient extends MastraBase {
           mcpToolDefinition: tool,
         });
       }
-    });
+    }
 
     return toolsRes;
   }

package/src/server/server.test.ts

@@ -1789,10 +1789,8 @@ describe('MCPServer with Tool Output Schema', () => {
         timestamp: z.string(),
       }),
       execute: async ({ input }: { input: string }) => ({
-        structuredContent: {
-          processedInput: `processed: ${input}`,
-          timestamp: mockDateISO,
-        },
+        processedInput: `processed: ${input}`,
+        timestamp: mockDateISO,
       }),
     },
   };

package/src/server/server.ts

@@ -282,10 +282,17 @@ export class MCPServer extends MCPServerBase {
         const response: CallToolResult = { isError: false, content: [] };
 
         if (tool.outputSchema) {
-          if (!result.structuredContent) {
-            throw new Error(`Tool ${request.params.name} has an output schema but no structured content was provided.`);
+          // Handle both cases: tools that return { structuredContent: ... } and tools that return the plain object
+          let structuredContent;
+          if (result && typeof result === 'object' && 'structuredContent' in result) {
+            // Tool returned { structuredContent: ... } format (MCP-aware tool)
+            structuredContent = result.structuredContent;
+          } else {
+            // Tool returned plain object, wrap it automatically for backward compatibility
+            structuredContent = result;
           }
-          const outputValidation = tool.outputSchema.validate?.(result.structuredContent ?? {});
+
+          const outputValidation = tool.outputSchema.validate?.(structuredContent ?? {});
           if (outputValidation && !outputValidation.success) {
             this.logger.warn(`CallTool: Invalid structured content for '${request.params.name}'`, {
               errors: outputValidation.error,
@@ -294,7 +301,7 @@ export class MCPServer extends MCPServerBase {
               `Invalid structured content for tool ${request.params.name}: ${JSON.stringify(outputValidation.error)}`,
             );
           }
-          response.structuredContent = result.structuredContent;
+          response.structuredContent = structuredContent;
         }
 
         if (response.structuredContent) {