@mastra/mcp 1.5.0 → 1.5.1-alpha.1

package/dist/index.js

@@ -1,7 +1,5 @@
 import { AsyncLocalStorage } from 'async_hooks';
-import $RefParser from '@apidevtools/json-schema-ref-parser';
 import { MastraBase } from '@mastra/core/base';
-import { MastraError, ErrorCategory, ErrorDomain } from '@mastra/core/error';
 import { createTool, isValidationError } from '@mastra/core/tools';
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 import { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js';
@@ -10,6 +8,7 @@ import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/
 import { DEFAULT_REQUEST_TIMEOUT_MSEC } from '@modelcontextprotocol/sdk/shared/protocol.js';
 import { LoggingMessageNotificationSchema, ListRootsRequestSchema, ListResourcesResultSchema, ReadResourceResultSchema, EmptyResultSchema, ListResourceTemplatesResultSchema, ListPromptsResultSchema, GetPromptResultSchema, PromptListChangedNotificationSchema, ResourceUpdatedNotificationSchema, ResourceListChangedNotificationSchema, ElicitRequestSchema, ProgressNotificationSchema, ListToolsRequestSchema, CallToolRequestSchema, SetLevelRequestSchema, ListResourcesRequestSchema, ReadResourceRequestSchema, ListResourceTemplatesRequestSchema, SubscribeRequestSchema, UnsubscribeRequestSchema, ListPromptsRequestSchema, PromptSchema, GetPromptRequestSchema, CallToolResultSchema, ErrorCode, JSONRPCMessageSchema } from '@modelcontextprotocol/sdk/types.js';
 import { asyncExitHook, gracefulExit } from 'exit-hook';
+import { MastraError, ErrorCategory, ErrorDomain } from '@mastra/core/error';
 import equal from 'fast-deep-equal';
 import { v5 } from 'uuid';
 import { randomUUID } from 'crypto';
@@ -25,6 +24,31 @@ export { UnauthorizedError, auth, buildDiscoveryUrls, discoverAuthorizationServe
 
 // src/client/client.ts
 
+// src/shared/mastra-tool-meta.ts
+var MASTRA_META_KEY = "mastra";
+var STRICT_META_KEY = "strict";
+function withMastraToolStrictMeta(meta, strict) {
+  if (strict == null) {
+    return meta;
+  }
+  const mastraMeta = meta?.[MASTRA_META_KEY] && typeof meta[MASTRA_META_KEY] === "object" ? meta[MASTRA_META_KEY] : void 0;
+  return {
+    ...meta ?? {},
+    [MASTRA_META_KEY]: {
+      ...mastraMeta ?? {},
+      [STRICT_META_KEY]: strict
+    }
+  };
+}
+function getMastraToolStrictMeta(meta) {
+  const mastraMeta = meta?.[MASTRA_META_KEY];
+  if (!mastraMeta || typeof mastraMeta !== "object") {
+    return void 0;
+  }
+  const strict = mastraMeta[STRICT_META_KEY];
+  return typeof strict === "boolean" ? strict : void 0;
+}
+
 // src/client/actions/elicitation.ts
 var ElicitationClientActions = class {
   client;
@@ -868,31 +892,7 @@ var InternalMastraMCPClient = class extends MastraBase {
     });
   }
   async convertInputSchema(inputSchema) {
-    try {
-      await $RefParser.dereference(inputSchema);
-      return "jsonSchema" in inputSchema ? inputSchema.jsonSchema : inputSchema;
-    } catch (error) {
-      let errorDetails;
-      if (error instanceof Error) {
-        errorDetails = error.stack;
-      } else {
-        try {
-          errorDetails = JSON.stringify(error);
-        } catch {
-          errorDetails = String(error);
-        }
-      }
-      this.log("error", "Failed to dereference JSON schema", {
-        error: errorDetails,
-        originalJsonSchema: inputSchema
-      });
-      throw new MastraError({
-        id: "MCP_TOOL_INPUT_SCHEMA_CONVERSION_FAILED",
-        domain: ErrorDomain.MCP,
-        category: ErrorCategory.USER,
-        details: { error: errorDetails ?? "Unknown error" }
-      });
-    }
+    return "jsonSchema" in inputSchema ? inputSchema.jsonSchema : inputSchema;
   }
   async tools() {
     this.log("debug", `Requesting tools from MCP server`);
@@ -917,6 +917,7 @@ var InternalMastraMCPClient = class extends MastraBase {
           id: `${this.name}_${tool.name}`,
           description: tool.description || "",
           inputSchema: await this.convertInputSchema(tool.inputSchema),
+          strict: getMastraToolStrictMeta(tool._meta),
           // Don't pass outputSchema to createTool — the MCP SDK's Client.callTool()
           // already validates structuredContent against the tool's outputSchema using AJV.
           // Passing it here causes Zod to strip unrecognized keys from the CallToolResult
@@ -2774,8 +2775,9 @@ var MCPServer = class extends MCPServerBase {
           if (tool.mcp?.annotations) {
             toolSpec.annotations = tool.mcp.annotations;
           }
-          if (tool.mcp?._meta) {
-            toolSpec._meta = tool.mcp._meta;
+          const toolMeta = withMastraToolStrictMeta(tool.mcp?._meta, tool.strict);
+          if (toolMeta) {
+            toolSpec._meta = toolMeta;
           }
           return toolSpec;
         })
@@ -4053,7 +4055,8 @@ Provided arguments: ${JSON.stringify(request.params.arguments, null, 2)}`
         description: tool.description,
         inputSchema: this.convertSchema(tool.parameters),
         outputSchema: this.convertSchema(tool.parameters),
-        toolType: tool.mcp?.toolType
+        toolType: tool.mcp?.toolType,
+        _meta: withMastraToolStrictMeta(tool.mcp?._meta, tool.strict)
       }))
     };
   }
@@ -4087,7 +4090,8 @@ Provided arguments: ${JSON.stringify(request.params.arguments, null, 2)}`
       description: tool.description,
       inputSchema: this.convertSchema(tool.parameters),
       outputSchema: this.convertSchema(tool.outputSchema),
-      toolType: tool.mcp?.toolType
+      toolType: tool.mcp?.toolType,
+      _meta: withMastraToolStrictMeta(tool.mcp?._meta, tool.strict)
     };
   }
   /**