@mastra/mcp 0.10.5 → 0.10.6-alpha.1

package/.turbo/turbo-build.log

@@ -1,23 +1,23 @@
 
-> @mastra/mcp@0.10.5-alpha.2 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 21277ms
+TSC ⚡️ Build success in 17864ms
 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 30216ms
+DTS ⚡️ Build success in 29258ms
 CLI Cleaning output folder
 ESM Build start
 CJS Build start
-ESM dist/index.js 88.67 KB
-ESM ⚡️ Build success in 2174ms
-CJS dist/index.cjs 89.35 KB
-CJS ⚡️ Build success in 2174ms
+ESM dist/index.js 88.94 KB
+ESM ⚡️ Build success in 2045ms
+CJS dist/index.cjs 89.72 KB
+CJS ⚡️ Build success in 2045ms

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @mastra/mcp
 
+## 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
+
+- f5ec3a4: Fix tool calling args for mcp server to ensure validatedArgs are not undefined
+- ab3bbff: Add support for extra arguments in mcp
+- Updated dependencies [2873c7f]
+- Updated dependencies [1c1c6a1]
+- Updated dependencies [565cc0c]
+  - @mastra/core@0.10.11-alpha.2
+
 ## 0.10.5
 
 ### Patch Changes
@@ -296,7 +320,6 @@
   Added a new `getResources()` method to the MCPClient class that allows clients to retrieve resources from connected MCP servers. Resources are data or content exposed by MCP servers that can be accessed by clients.
 
   The implementation includes:
-
   - Direct access to resources from all connected MCP servers, grouped by server name
   - Robust error handling that allows partial results when some servers fail
   - Comprehensive test coverage with real server implementation
@@ -375,7 +398,6 @@
   Added a new `getResources()` method to the MCPClient class that allows clients to retrieve resources from connected MCP servers. Resources are data or content exposed by MCP servers that can be accessed by clients.
 
   The implementation includes:
-
   - Direct access to resources from all connected MCP servers, grouped by server name
   - Robust error handling that allows partial results when some servers fail
   - Comprehensive test coverage with real server implementation

package/dist/_tsup-dts-rollup.d.cts

@@ -20,6 +20,7 @@ import { objectOutputType } from 'zod';
 import { objectUtil } from 'zod';
 import type { Prompt } from '@modelcontextprotocol/sdk/types.js';
 import type { PromptMessage } from '@modelcontextprotocol/sdk/types.js';
+import type { RequestHandlerExtra } from '@modelcontextprotocol/sdk/shared/protocol.js';
 import type { Resource } from '@modelcontextprotocol/sdk/types.js';
 import type { ResourceTemplate } from '@modelcontextprotocol/sdk/types.js';
 import { ResourceUpdatedNotificationSchema } from '@modelcontextprotocol/sdk/types.js';
@@ -504,6 +505,11 @@ export { MCPConfigurationOptions }
 export { MCPConfigurationOptions as MCPConfigurationOptions_alias_1 }
 export { MCPConfigurationOptions as MCPConfigurationOptions_alias_2 }
 
+declare type MCPRequestHandlerExtra = RequestHandlerExtra<any, any>;
+export { MCPRequestHandlerExtra }
+export { MCPRequestHandlerExtra as MCPRequestHandlerExtra_alias_1 }
+export { MCPRequestHandlerExtra as MCPRequestHandlerExtra_alias_2 }
+
 declare class MCPServer extends MCPServerBase {
     private server;
     private stdioTransport?;
@@ -740,6 +746,7 @@ declare type MCPTool = {
     outputSchema?: InternalCoreTool['outputSchema'];
     execute: (params: any, options: Parameters<NonNullable<InternalCoreTool['execute']>>[1] & {
         elicitation: ElicitationActions;
+        extra: MCPRequestHandlerExtra;
     }) => Promise<any>;
 };
 export { MCPTool }

package/dist/_tsup-dts-rollup.d.ts

@@ -20,6 +20,7 @@ import { objectOutputType } from 'zod';
 import { objectUtil } from 'zod';
 import type { Prompt } from '@modelcontextprotocol/sdk/types.js';
 import type { PromptMessage } from '@modelcontextprotocol/sdk/types.js';
+import type { RequestHandlerExtra } from '@modelcontextprotocol/sdk/shared/protocol.js';
 import type { Resource } from '@modelcontextprotocol/sdk/types.js';
 import type { ResourceTemplate } from '@modelcontextprotocol/sdk/types.js';
 import { ResourceUpdatedNotificationSchema } from '@modelcontextprotocol/sdk/types.js';
@@ -504,6 +505,11 @@ export { MCPConfigurationOptions }
 export { MCPConfigurationOptions as MCPConfigurationOptions_alias_1 }
 export { MCPConfigurationOptions as MCPConfigurationOptions_alias_2 }
 
+declare type MCPRequestHandlerExtra = RequestHandlerExtra<any, any>;
+export { MCPRequestHandlerExtra }
+export { MCPRequestHandlerExtra as MCPRequestHandlerExtra_alias_1 }
+export { MCPRequestHandlerExtra as MCPRequestHandlerExtra_alias_2 }
+
 declare class MCPServer extends MCPServerBase {
     private server;
     private stdioTransport?;
@@ -740,6 +746,7 @@ declare type MCPTool = {
     outputSchema?: InternalCoreTool['outputSchema'];
     execute: (params: any, options: Parameters<NonNullable<InternalCoreTool['execute']>>[1] & {
         elicitation: ElicitationActions;
+        extra: MCPRequestHandlerExtra;
     }) => Promise<any>;
 };
 export { MCPTool }

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;
   }
 };
@@ -1018,7 +1022,7 @@ var MCPConfiguration = class extends MCPClient {
   }
 };
 
-// ../../node_modules/.pnpm/hono@4.8.1/node_modules/hono/dist/utils/stream.js
+// ../../node_modules/.pnpm/hono@4.8.4/node_modules/hono/dist/utils/stream.js
 var StreamingApi = class {
   writer;
   encoder;
@@ -1085,7 +1089,7 @@ var StreamingApi = class {
   }
 };
 
-// ../../node_modules/.pnpm/hono@4.8.1/node_modules/hono/dist/helper/streaming/utils.js
+// ../../node_modules/.pnpm/hono@4.8.4/node_modules/hono/dist/helper/streaming/utils.js
 var isOldBunVersion = () => {
   const version = typeof Bun !== "undefined" ? Bun.version : void 0;
   if (version === void 0) {
@@ -1096,7 +1100,7 @@ var isOldBunVersion = () => {
   return result;
 };
 
-// ../../node_modules/.pnpm/hono@4.8.1/node_modules/hono/dist/utils/html.js
+// ../../node_modules/.pnpm/hono@4.8.4/node_modules/hono/dist/utils/html.js
 var HtmlEscapedCallbackPhase = {
   Stringify: 1};
 var resolveCallback = async (str, phase, preserveCallbacks, context, buffer) => {
@@ -1127,7 +1131,7 @@ var resolveCallback = async (str, phase, preserveCallbacks, context, buffer) =>
   }
 };
 
-// ../../node_modules/.pnpm/hono@4.8.1/node_modules/hono/dist/helper/streaming/sse.js
+// ../../node_modules/.pnpm/hono@4.8.4/node_modules/hono/dist/helper/streaming/sse.js
 var SSEStreamingApi = class extends StreamingApi {
   constructor(writable, readable) {
     super(writable, readable);
@@ -1523,7 +1527,7 @@ var MCPServer = class extends mcp.MCPServerBase {
         })
       };
     });
-    serverInstance.setRequestHandler(types_js.CallToolRequestSchema, async (request) => {
+    serverInstance.setRequestHandler(types_js.CallToolRequestSchema, async (request, extra) => {
       const startTime = Date.now();
       try {
         const tool = this.convertedTools[request.params.name];
@@ -1559,17 +1563,21 @@ var MCPServer = class extends mcp.MCPServerBase {
         const result = await tool.execute(validation?.value, {
           messages: [],
           toolCallId: "",
-          elicitation: sessionElicitation
+          elicitation: sessionElicitation,
+          extra
         });
         this.logger.debug(`CallTool: Tool '${request.params.name}' executed successfully with result:`, result);
         const duration = Date.now() - startTime;
         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
@@ -1578,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) }];
@@ -2480,7 +2488,7 @@ var MCPServer = class extends mcp.MCPServerBase {
    */
   async executeTool(toolId, args, executionContext) {
     const tool = this.convertedTools[toolId];
-    let validatedArgs;
+    let validatedArgs = args;
     try {
       if (!tool) {
         this.logger.warn(`ExecuteTool: Unknown tool '${toolId}' requested on MCPServer '${this.name}'.`);

package/dist/index.d.cts

@@ -15,6 +15,7 @@ export { MCPServerResources } from './_tsup-dts-rollup.cjs';
 export { MCPServerPromptMessagesCallback } from './_tsup-dts-rollup.cjs';
 export { MCPServerPrompts } from './_tsup-dts-rollup.cjs';
 export { ElicitationActions } from './_tsup-dts-rollup.cjs';
+export { MCPRequestHandlerExtra } from './_tsup-dts-rollup.cjs';
 export { MCPTool } from './_tsup-dts-rollup.cjs';
 export { Resource } from './_tsup-dts-rollup.cjs';
 export { ResourceTemplate } from './_tsup-dts-rollup.cjs';

package/dist/index.d.ts

@@ -15,6 +15,7 @@ export { MCPServerResources } from './_tsup-dts-rollup.js';
 export { MCPServerPromptMessagesCallback } from './_tsup-dts-rollup.js';
 export { MCPServerPrompts } from './_tsup-dts-rollup.js';
 export { ElicitationActions } from './_tsup-dts-rollup.js';
+export { MCPRequestHandlerExtra } from './_tsup-dts-rollup.js';
 export { MCPTool } from './_tsup-dts-rollup.js';
 export { Resource } from './_tsup-dts-rollup.js';
 export { ResourceTemplate } from './_tsup-dts-rollup.js';

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;
   }
 };
@@ -1012,7 +1015,7 @@ var MCPConfiguration = class extends MCPClient {
   }
 };
 
-// ../../node_modules/.pnpm/hono@4.8.1/node_modules/hono/dist/utils/stream.js
+// ../../node_modules/.pnpm/hono@4.8.4/node_modules/hono/dist/utils/stream.js
 var StreamingApi = class {
   writer;
   encoder;
@@ -1079,7 +1082,7 @@ var StreamingApi = class {
   }
 };
 
-// ../../node_modules/.pnpm/hono@4.8.1/node_modules/hono/dist/helper/streaming/utils.js
+// ../../node_modules/.pnpm/hono@4.8.4/node_modules/hono/dist/helper/streaming/utils.js
 var isOldBunVersion = () => {
   const version = typeof Bun !== "undefined" ? Bun.version : void 0;
   if (version === void 0) {
@@ -1090,7 +1093,7 @@ var isOldBunVersion = () => {
   return result;
 };
 
-// ../../node_modules/.pnpm/hono@4.8.1/node_modules/hono/dist/utils/html.js
+// ../../node_modules/.pnpm/hono@4.8.4/node_modules/hono/dist/utils/html.js
 var HtmlEscapedCallbackPhase = {
   Stringify: 1};
 var resolveCallback = async (str, phase, preserveCallbacks, context, buffer) => {
@@ -1121,7 +1124,7 @@ var resolveCallback = async (str, phase, preserveCallbacks, context, buffer) =>
   }
 };
 
-// ../../node_modules/.pnpm/hono@4.8.1/node_modules/hono/dist/helper/streaming/sse.js
+// ../../node_modules/.pnpm/hono@4.8.4/node_modules/hono/dist/helper/streaming/sse.js
 var SSEStreamingApi = class extends StreamingApi {
   constructor(writable, readable) {
     super(writable, readable);
@@ -1517,7 +1520,7 @@ var MCPServer = class extends MCPServerBase {
         })
       };
     });
-    serverInstance.setRequestHandler(CallToolRequestSchema, async (request) => {
+    serverInstance.setRequestHandler(CallToolRequestSchema, async (request, extra) => {
       const startTime = Date.now();
       try {
         const tool = this.convertedTools[request.params.name];
@@ -1553,17 +1556,21 @@ var MCPServer = class extends MCPServerBase {
         const result = await tool.execute(validation?.value, {
           messages: [],
           toolCallId: "",
-          elicitation: sessionElicitation
+          elicitation: sessionElicitation,
+          extra
         });
         this.logger.debug(`CallTool: Tool '${request.params.name}' executed successfully with result:`, result);
         const duration = Date.now() - startTime;
         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
@@ -1572,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) }];
@@ -2474,7 +2481,7 @@ var MCPServer = class extends MCPServerBase {
    */
   async executeTool(toolId, args, executionContext) {
     const tool = this.convertedTools[toolId];
-    let validatedArgs;
+    let validatedArgs = args;
     try {
       if (!tool) {
         this.logger.warn(`ExecuteTool: Unknown tool '${toolId}' requested on MCPServer '${this.name}'.`);

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

@@ -10,9 +10,9 @@ case `uname` in
 esac
 
 if [ -z "$NODE_PATH" ]; then
-  export NODE_PATH="/home/runner/work/mastra/mastra/node_modules/.pnpm/vitest@3.2.4_@types+debug@4.1.12_@types+node@20.19.1_@vitest+ui@3.2.3_jiti@2.4.2_jsdom@_9ed2428c73777463a3d92e2c0ddae976/node_modules/vitest/node_modules:/home/runner/work/mastra/mastra/node_modules/.pnpm/vitest@3.2.4_@types+debug@4.1.12_@types+node@20.19.1_@vitest+ui@3.2.3_jiti@2.4.2_jsdom@_9ed2428c73777463a3d92e2c0ddae976/node_modules:/home/runner/work/mastra/mastra/node_modules/.pnpm/node_modules"
+  export NODE_PATH="/home/runner/work/mastra/mastra/node_modules/.pnpm/vitest@3.2.4_@types+debug@4.1.12_@types+node@20.19.2_@vitest+ui@3.2.3_jiti@2.4.2_jsdom@_bcb3b08cf6e48f0a4d90e52d1b155bc5/node_modules/vitest/node_modules:/home/runner/work/mastra/mastra/node_modules/.pnpm/vitest@3.2.4_@types+debug@4.1.12_@types+node@20.19.2_@vitest+ui@3.2.3_jiti@2.4.2_jsdom@_bcb3b08cf6e48f0a4d90e52d1b155bc5/node_modules:/home/runner/work/mastra/mastra/node_modules/.pnpm/node_modules"
 else
-  export NODE_PATH="/home/runner/work/mastra/mastra/node_modules/.pnpm/vitest@3.2.4_@types+debug@4.1.12_@types+node@20.19.1_@vitest+ui@3.2.3_jiti@2.4.2_jsdom@_9ed2428c73777463a3d92e2c0ddae976/node_modules/vitest/node_modules:/home/runner/work/mastra/mastra/node_modules/.pnpm/vitest@3.2.4_@types+debug@4.1.12_@types+node@20.19.1_@vitest+ui@3.2.3_jiti@2.4.2_jsdom@_9ed2428c73777463a3d92e2c0ddae976/node_modules:/home/runner/work/mastra/mastra/node_modules/.pnpm/node_modules:$NODE_PATH"
+  export NODE_PATH="/home/runner/work/mastra/mastra/node_modules/.pnpm/vitest@3.2.4_@types+debug@4.1.12_@types+node@20.19.2_@vitest+ui@3.2.3_jiti@2.4.2_jsdom@_bcb3b08cf6e48f0a4d90e52d1b155bc5/node_modules/vitest/node_modules:/home/runner/work/mastra/mastra/node_modules/.pnpm/vitest@3.2.4_@types+debug@4.1.12_@types+node@20.19.2_@vitest+ui@3.2.3_jiti@2.4.2_jsdom@_bcb3b08cf6e48f0a4d90e52d1b155bc5/node_modules:/home/runner/work/mastra/mastra/node_modules/.pnpm/node_modules:$NODE_PATH"
 fi
 if [ -x "$basedir/node" ]; then
   exec "$basedir/node"  "$basedir/../vitest/vitest.mjs" "$@"

package/integration-tests/package.json

@@ -11,7 +11,7 @@
     "@ai-sdk/react": "^1.2.12",
     "@mastra/client-js": "workspace:*",
     "@mastra/mcp": "workspace:*",
-    "dotenv": "^16.5.0",
+    "dotenv": "^16.6.1",
     "zod": "^3.25.67"
   },
   "devDependencies": {
@@ -21,7 +21,7 @@
     "get-port": "^7.1.0",
     "mastra": "workspace:*",
     "typescript": "^5.8.2",
-    "vitest": "^3.2.3"
+    "vitest": "^3.2.4"
   },
   "peerDependencies": {
     "@mastra/core": "^0.10.0-alpha.0"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/mcp",
-  "version": "0.10.5",
+  "version": "0.10.6-alpha.1",
   "description": "",
   "type": "module",
   "main": "dist/index.js",
@@ -22,6 +22,7 @@
   "author": "",
   "license": "Elastic-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",
@@ -43,15 +44,15 @@
     "ai": "4.3.16",
     "eslint": "^9.29.0",
     "hono-mcp-server-sse-transport": "0.0.7",
-    "hono": "^4.7.11",
+    "hono": "^4.8.4",
     "tsup": "^8.5.0",
     "tsx": "^4.19.4",
     "typescript": "^5.8.3",
-    "vitest": "^3.2.3",
+    "vitest": "^3.2.4",
     "zod": "^3.25.67",
     "zod-to-json-schema": "^3.24.5",
-    "@internal/lint": "0.0.14",
-    "@mastra/core": "0.10.7"
+    "@internal/lint": "0.0.17",
+    "@mastra/core": "0.10.11-alpha.3"
   },
   "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

@@ -24,7 +24,7 @@ import { weatherTool } from '../__fixtures__/tools';
 import { InternalMastraMCPClient } from '../client/client';
 import { MCPClient } from '../client/configuration';
 import { MCPServer } from './server';
-import type { MCPServerResources, MCPServerResourceContent } from './types';
+import type { MCPServerResources, MCPServerResourceContent, MCPRequestHandlerExtra } from './types';
 
 const PORT = 9100 + Math.floor(Math.random() * 1000);
 let server: MCPServer;
@@ -937,12 +937,32 @@ describe('MCPServer', () => {
     let server: MCPServer;
     let client: MCPClient;
     const PORT = 9200 + Math.floor(Math.random() * 1000);
+    const TOKEN = `<random-token>`;
 
     beforeAll(async () => {
       server = new MCPServer({
         name: 'Test MCP Server',
         version: '0.1.0',
-        tools: { weatherTool },
+        tools: {
+          weatherTool,
+          testAuthTool: {
+            description: 'Test tool to validate auth information from extra params',
+            parameters: z.object({
+              message: z.string().describe('Message to show to user'),
+            }),
+            execute: async (context, options) => {
+              const extra = options.extra as MCPRequestHandlerExtra;
+
+              return {
+                message: context.message,
+                sessionId: extra?.sessionId || null,
+                authInfo: extra?.authInfo || null,
+                requestId: extra?.requestId || null,
+                hasExtra: !!extra,
+              };
+            },
+          },
+        },
       });
 
       httpServer = http.createServer(async (req: http.IncomingMessage, res: http.ServerResponse) => {
@@ -964,6 +984,9 @@ describe('MCPServer', () => {
         servers: {
           local: {
             url: new URL(`http://localhost:${PORT}/http`),
+            requestInit: {
+              headers: { Authorization: `Bearer ${TOKEN}` },
+            },
           },
         },
       });
@@ -1008,6 +1031,60 @@ describe('MCPServer', () => {
       expect(toolResult).toHaveProperty('windSpeed');
       expect(toolResult).toHaveProperty('windGust');
     });
+
+    it('should pass auth information through extra parameter', async () => {
+      const mockExtra: MCPRequestHandlerExtra = {
+        signal: new AbortController().signal,
+        sessionId: 'test-session-id',
+        authInfo: {
+          token: TOKEN,
+          clientId: 'test-client-id',
+          scopes: ['read'],
+        },
+        requestId: 'test-request-id',
+        sendNotification: vi.fn(),
+        sendRequest: vi.fn(),
+      };
+
+      const mockRequest = {
+        jsonrpc: '2.0' as const,
+        id: 'test-request-1',
+        method: 'tools/call' as const,
+        params: {
+          name: 'testAuthTool',
+          arguments: {
+            message: 'test auth',
+          },
+        },
+      };
+
+      const serverInstance = server.getServer();
+
+      // @ts-ignore - this is a private property, but we need to access it to test the request handler
+      const requestHandlers = serverInstance._requestHandlers;
+      const callToolHandler = requestHandlers.get('tools/call');
+
+      expect(callToolHandler).toBeDefined();
+
+      const result = await callToolHandler(mockRequest, mockExtra);
+
+      expect(result).toBeDefined();
+      expect(result.isError).toBe(false);
+      expect(result.content).toBeInstanceOf(Array);
+      expect(result.content.length).toBeGreaterThan(0);
+
+      const toolOutput = result.content[0];
+      expect(toolOutput.type).toBe('text');
+      const toolResult = JSON.parse(toolOutput.text);
+
+      expect(toolResult.message).toBe('test auth');
+      expect(toolResult.hasExtra).toBe(true);
+      expect(toolResult.sessionId).toBe('test-session-id');
+      expect(toolResult.authInfo).toBeDefined();
+      expect(toolResult.authInfo.token).toBe(TOKEN);
+      expect(toolResult.authInfo.clientId).toBe('test-client-id');
+      expect(toolResult.requestId).toBe('test-request-id');
+    });
   });
 
   describe('MCPServer Hono SSE Transport', () => {
@@ -1712,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

@@ -231,7 +231,7 @@ export class MCPServer extends MCPServerBase {
     });
 
     // Call tool handler
-    serverInstance.setRequestHandler(CallToolRequestSchema, async request => {
+    serverInstance.setRequestHandler(CallToolRequestSchema, async (request, extra) => {
       const startTime = Date.now();
       try {
         const tool = this.convertedTools[request.params.name] as MCPTool;
@@ -272,6 +272,7 @@ export class MCPServer extends MCPServerBase {
           messages: [],
           toolCallId: '',
           elicitation: sessionElicitation,
+          extra,
         });
 
         this.logger.debug(`CallTool: Tool '${request.params.name}' executed successfully with result:`, result);
@@ -281,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,
@@ -293,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) {
@@ -1335,7 +1343,7 @@ export class MCPServer extends MCPServerBase {
     executionContext?: { messages?: any[]; toolCallId?: string },
   ): Promise<any> {
     const tool = this.convertedTools[toolId];
-    let validatedArgs: any;
+    let validatedArgs = args;
     try {
       if (!tool) {
         this.logger.warn(`ExecuteTool: Unknown tool '${toolId}' requested on MCPServer '${this.name}'.`);

package/src/server/types.ts

@@ -1,4 +1,5 @@
 import type { InternalCoreTool } from '@mastra/core';
+import type { RequestHandlerExtra } from '@modelcontextprotocol/sdk/shared/protocol.js';
 import type {
   ElicitRequest,
   ElicitResult,
@@ -39,15 +40,19 @@ export type ElicitationActions = {
   sendRequest: (request: ElicitRequest['params']) => Promise<ElicitResult>;
 };
 
+export type MCPRequestHandlerExtra = RequestHandlerExtra<any, any>;
+
 export type MCPTool = {
   id?: InternalCoreTool['id'];
   description?: InternalCoreTool['description'];
   parameters: InternalCoreTool['parameters'];
   outputSchema?: InternalCoreTool['outputSchema'];
-  // Patch type to include elicitation in execute options
   execute: (
     params: any,
-    options: Parameters<NonNullable<InternalCoreTool['execute']>>[1] & { elicitation: ElicitationActions },
+    options: Parameters<NonNullable<InternalCoreTool['execute']>>[1] & {
+      elicitation: ElicitationActions;
+      extra: MCPRequestHandlerExtra;
+    },
   ) => Promise<any>;
 };
 

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