@mastra/mcp 0.10.6-alpha.0 → 0.10.6-alpha.1

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 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 30106ms
+DTS ⚡️ Build success in 29258ms
 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 2045ms
+CJS dist/index.cjs 89.72 KB
+CJS ⚡️ Build success in 2045ms

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @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

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/mcp",
-  "version": "0.10.6-alpha.0",
+  "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",
@@ -51,7 +52,7 @@
     "zod": "^3.25.67",
     "zod-to-json-schema": "^3.24.5",
     "@internal/lint": "0.0.17",
-    "@mastra/core": "0.10.11-alpha.2"
+    "@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

@@ -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) {