@mastra/mcp 1.17.2 → 1.17.3-alpha.1

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";
@@ -17418,7 +17418,7 @@ let customAlphabet = (alphabet, defaultSize = 21) => {
 	return (size = defaultSize) => {
 		let id = "";
 		let i = size | 0;
-		while (i--) id += alphabet[Math.random() * alphabet.length | 0];
+		while (i-- > 0) id += alphabet[Math.random() * alphabet.length | 0];
 		return id;
 	};
 };
@@ -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;
@@ -24185,7 +24200,7 @@ onListChanged: async (serverName, handler) => {
 	}
 };
 //#endregion
-//#region ../../../../../setup-pnpm/node_modules/.bin/store/v11/links/@/hono/4.12.30/1b2e4fcdfb5fc9f7f51bffc1540f859608c39e01fb7d73d8ab30d60a680eaffc/node_modules/hono/dist/utils/stream.js
+//#region ../../../../../setup-pnpm/node_modules/.bin/store/v11/links/@/hono/4.12.34/86d7f25c35c79da0f9cccb7fef43100dfeaf7989a3b5712a780063b91be3ae59/node_modules/hono/dist/utils/stream.js
 var StreamingApi = class {
 	writer;
 	encoder;
@@ -24258,7 +24273,7 @@ var StreamingApi = class {
 	}
 };
 //#endregion
-//#region ../../../../../setup-pnpm/node_modules/.bin/store/v11/links/@/hono/4.12.30/1b2e4fcdfb5fc9f7f51bffc1540f859608c39e01fb7d73d8ab30d60a680eaffc/node_modules/hono/dist/helper/streaming/utils.js
+//#region ../../../../../setup-pnpm/node_modules/.bin/store/v11/links/@/hono/4.12.34/86d7f25c35c79da0f9cccb7fef43100dfeaf7989a3b5712a780063b91be3ae59/node_modules/hono/dist/helper/streaming/utils.js
 var isOldBunVersion = () => {
 	const version = typeof Bun !== "undefined" ? Bun.version : void 0;
 	if (version === void 0) return false;
@@ -24267,7 +24282,7 @@ var isOldBunVersion = () => {
 	return result;
 };
 //#endregion
-//#region ../../../../../setup-pnpm/node_modules/.bin/store/v11/links/@/hono/4.12.30/1b2e4fcdfb5fc9f7f51bffc1540f859608c39e01fb7d73d8ab30d60a680eaffc/node_modules/hono/dist/utils/html.js
+//#region ../../../../../setup-pnpm/node_modules/.bin/store/v11/links/@/hono/4.12.34/86d7f25c35c79da0f9cccb7fef43100dfeaf7989a3b5712a780063b91be3ae59/node_modules/hono/dist/utils/html.js
 var HtmlEscapedCallbackPhase = {
 	Stringify: 1,
 	BeforeStream: 2,
@@ -24297,7 +24312,7 @@ var resolveCallback = async (str, phase, preserveCallbacks, context, buffer) =>
 	else return resStr;
 };
 //#endregion
-//#region ../../../../../setup-pnpm/node_modules/.bin/store/v11/links/@/hono/4.12.30/1b2e4fcdfb5fc9f7f51bffc1540f859608c39e01fb7d73d8ab30d60a680eaffc/node_modules/hono/dist/helper/streaming/sse.js
+//#region ../../../../../setup-pnpm/node_modules/.bin/store/v11/links/@/hono/4.12.34/86d7f25c35c79da0f9cccb7fef43100dfeaf7989a3b5712a780063b91be3ae59/node_modules/hono/dist/helper/streaming/sse.js
 var SSEStreamingApi = class extends StreamingApi {
 	constructor(writable, readable) {
 		super(writable, readable);
@@ -24306,16 +24321,15 @@ var SSEStreamingApi = class extends StreamingApi {
 		const dataLines = (await resolveCallback(message.data, HtmlEscapedCallbackPhase.Stringify, false, {})).split(/\r\n|\r|\n/).map((line) => {
 			return `data: ${line}`;
 		}).join("\n");
-		for (const key of [
-			"event",
-			"id",
-			"retry"
-		]) if (message[key] && /[\r\n]/.test(message[key])) throw new Error(`${key} must not contain "\\r" or "\\n"`);
+		for (const key of ["event", "id"]) {
+			const value = message[key];
+			if (value && /[\r\n]/.test(value)) throw new Error(`${key} must not contain "\\r" or "\\n"`);
+		}
 		const sseData = [
 			message.event && `event: ${message.event}`,
 			dataLines,
-			message.id && `id: ${message.id}`,
-			message.retry && `retry: ${message.retry}`
+			message.id !== void 0 && `id: ${message.id}`,
+			message.retry !== void 0 && `retry: ${message.retry}`
 		].filter(Boolean).join("\n") + "\n\n";
 		await this.write(sseData);
 	}
@@ -24351,7 +24365,7 @@ var streamSSE = (c, cb, onError) => {
 	return c.newResponse(stream.responseReadable);
 };
 //#endregion
-//#region ../../../../../setup-pnpm/node_modules/.bin/store/v11/links/@/hono-mcp-server-sse-transport/0.0.7/d5ae5a23aa2b79db7055621f11a7cbc8d27f7caba1eeb308ab2cf5bcb1a8e5b8/node_modules/hono-mcp-server-sse-transport/build/sse.js
+//#region ../../../../../setup-pnpm/node_modules/.bin/store/v11/links/@/hono-mcp-server-sse-transport/0.0.7/2a63beb8624fb1bf3c7a3ca090a15654580e3b90bf86b236de2fea1561bf2a49/node_modules/hono-mcp-server-sse-transport/build/sse.js
 const MAXIMUM_MESSAGE_SIZE = 4 * 1024 * 1024;
 var SSETransport = class {
 	messageUrl;