@mastra/mcp 1.17.3-alpha.0 → 1.17.3-alpha.2

package/dist/index.js

@@ -2,7 +2,7 @@ import { createRequire } from "module";
 import { AsyncLocalStorage } from "async_hooks";
 import { MastraBase } from "@mastra/core/base";
 import { ErrorCategory, ErrorDomain, MastraError } from "@mastra/core/error";
-import { createTool, isValidationError } from "@mastra/core/tools";
+import { createTool, isValidationError, validateToolOutput } from "@mastra/core/tools";
 import { Client, DEFAULT_REQUEST_TIMEOUT_MSEC, ProtocolErrorCode, SSEClientTransport, SdkHttpError, StreamableHTTPClientTransport, UnauthorizedError, auth, buildDiscoveryUrls, discoverAuthorizationServerMetadata, discoverOAuthMetadata, discoverOAuthProtectedResourceMetadata, exchangeAuthorization, extractResourceMetadataUrl, parseErrorResponse, refreshAuthorization, registerClient, selectResourceURL, startAuthorization } from "@modelcontextprotocol/client";
 import { StdioClientTransport, getDefaultEnvironment } from "@modelcontextprotocol/client/stdio";
 import { asyncExitHook, gracefulExit } from "exit-hook";
@@ -22049,8 +22049,12 @@ var InternalMastraMCPClient = class extends MastraBase {
 		return "jsonSchema" in inputSchema ? inputSchema.jsonSchema : inputSchema;
 	}
 	/**
-	* Wraps the output schema with a validator that always succeeds. The MCP client validates
-	* structuredContent via AJV; the JSON schema is surfaced here for documentation only.
+	* Wraps the output schema with a validator that always succeeds. The tool's execute wrapper
+	* returns the full CallToolResult envelope when there is no structuredContent (and for
+	* in-band errors with `onToolError: 'return'`), which would never match the advertised
+	* outputSchema — so enforcement happens inside the execute wrapper, scoped to the
+	* structuredContent path (see buildToolFromListEntry). The JSON schema is surfaced here
+	* for documentation.
 	*/
 	convertOutputSchema(outputSchema) {
 		if (!outputSchema) return outputSchema;
@@ -22175,6 +22179,8 @@ var InternalMastraMCPClient = class extends MastraBase {
 				...toolMeta ? { _meta: toolMeta } : {},
 				...annotations ? { annotations } : {}
 			} } : {};
+			const rawOutputSchema = tool.outputSchema ? "jsonSchema" in tool.outputSchema ? tool.outputSchema.jsonSchema : tool.outputSchema : void 0;
+			const outputValidator = rawOutputSchema ? toStandardSchema(rawOutputSchema) : void 0;
 			const mastraTool = createTool({
 				id: `${this.name}_${tool.name}`,
 				description: tool.description || "",
@@ -22229,7 +22235,16 @@ var InternalMastraMCPClient = class extends MastraBase {
 								});
 							}
 							this.log("debug", `Tool executed successfully: ${tool.name}`);
-							if (res.structuredContent !== void 0) return attachMcpCallToolContent(res.structuredContent, res.content, res._meta ? this.stampServerIdInMeta(res._meta) : void 0);
+							if (res.structuredContent !== void 0) {
+								if (!res.isError && outputValidator) {
+									const validation = validateToolOutput(outputValidator, res.structuredContent, tool.name);
+									if (validation.error) {
+										this.log("debug", `Tool output failed schema validation: ${tool.name}`, { message: validation.error.message });
+										return validation.error;
+									}
+								}
+								return attachMcpCallToolContent(res.structuredContent, res.content, res._meta ? this.stampServerIdInMeta(res._meta) : void 0);
+							}
 							return res;
 						};
 						const failedTransport = this.transport;