@mastra/mcp 2.1.0-alpha.0 → 2.1.1-alpha.0

package/dist/index.js

@@ -22216,6 +22216,90 @@ function trimStartOfStream() {
 }
 require_json_schema_traverse();
 //#endregion
+//#region src/shared/json-schema-dialect.ts
+const JSON_SCHEMA_2020_12 = "https://json-schema.org/draft/2020-12/schema";
+const JSON_SCHEMA_2019_09 = /^https?:\/\/json-schema\.org\/draft\/2019-09\/schema#?$/;
+/** Keywords whose value is a subschema (`items` may also be an array of subschemas). */
+const SCHEMA_KEYWORDS = /* @__PURE__ */ new Set([
+	"items",
+	"additionalItems",
+	"contains",
+	"additionalProperties",
+	"propertyNames",
+	"unevaluatedItems",
+	"unevaluatedProperties",
+	"if",
+	"then",
+	"else",
+	"not"
+]);
+/** Keywords whose value is an array of subschemas. */
+const SCHEMA_ARRAY_KEYWORDS = /* @__PURE__ */ new Set([
+	"allOf",
+	"anyOf",
+	"oneOf"
+]);
+/** Keywords whose values map arbitrary names to subschemas. */
+const SCHEMA_MAP_KEYWORDS = /* @__PURE__ */ new Set([
+	"properties",
+	"patternProperties",
+	"$defs",
+	"definitions",
+	"dependentSchemas"
+]);
+const MAX_JSON_SCHEMA_NODES = 1e4;
+var Unconvertible = class extends Error {};
+/**
+* Converts a 2019-09 schema (e.g. from zod v3) into 2020-12 form. Tuples are the
+* only structural difference handled: array-form `items` becomes `prefixItems`,
+* and `additionalItems` becomes `items`.
+*
+* Returns `undefined` when the schema does not declare 2019-09, or relies on
+* features this conversion cannot preserve (`$recursiveRef`/`$recursiveAnchor`,
+* `$ref` pointers into tuple members, embedded `$schema` declarations,
+* `unevaluatedItems`, `prefixItems`, or `contentSchema`), or exceeds the depth/node limits.
+* Callers should then keep the original.
+*/
+function toJsonSchema2020(schema) {
+	if (!schema.$schema || !JSON_SCHEMA_2019_09.test(schema.$schema)) return void 0;
+	try {
+		return {
+			...rewrite(schema, 0, { nodes: 0 }, true),
+			$schema: JSON_SCHEMA_2020_12
+		};
+	} catch (error) {
+		if (error instanceof Unconvertible) return void 0;
+		throw error;
+	}
+}
+function checkBudget(depth, budget) {
+	if (depth > 128 || ++budget.nodes > 1e4) throw new Unconvertible();
+}
+/** Rewrites a value in a subschema position. Only known schema keywords are walked; everything else is copied as-is. */
+function rewrite(schema, depth, budget, isRoot = false) {
+	if (!schema || typeof schema !== "object" || Array.isArray(schema)) return schema;
+	checkBudget(depth, budget);
+	const out = { ...schema };
+	if (!isRoot && "$schema" in out) throw new Unconvertible();
+	if ("$recursiveRef" in out || "$recursiveAnchor" in out) throw new Unconvertible();
+	if ("unevaluatedItems" in out || "prefixItems" in out || "contentSchema" in out) throw new Unconvertible();
+	if (typeof out.$ref === "string" && /\/(items\/\d+|additionalItems)(\/|$)/.test(out.$ref)) throw new Unconvertible();
+	for (const [key, child] of Object.entries(out)) if (SCHEMA_KEYWORDS.has(key)) out[key] = Array.isArray(child) ? (checkBudget(depth + 1, budget), child.map((item) => rewrite(item, depth + 2, budget))) : rewrite(child, depth + 1, budget);
+	else if (SCHEMA_ARRAY_KEYWORDS.has(key) && Array.isArray(child)) {
+		checkBudget(depth + 1, budget);
+		out[key] = child.map((item) => rewrite(item, depth + 2, budget));
+	} else if (SCHEMA_MAP_KEYWORDS.has(key) && child && typeof child === "object" && !Array.isArray(child)) {
+		checkBudget(depth + 1, budget);
+		out[key] = Object.fromEntries(Object.entries(child).map(([name, sub]) => [name, rewrite(sub, depth + 2, budget)]));
+	}
+	if (!Array.isArray(out.items)) return out;
+	out.prefixItems = out.items;
+	if ("additionalItems" in out) out.items = out.additionalItems;
+	else delete out.items;
+	delete out.additionalItems;
+	return out;
+}
+//#endregion
 //#region src/shared/mastra-tool-meta.ts
 const MASTRA_META_KEY = "mastra";
 const STRICT_META_KEY = "strict";
@@ -22870,9 +22954,6 @@ async function fetchFollowingAllowedRedirects(fetchImpl, url, init, allowedHosts
 //#endregion
 //#region src/client/client.ts
 const DEFAULT_SERVER_CONNECT_TIMEOUT_MSEC = 3e3;
-const JSON_SCHEMA_2020_12 = "https://json-schema.org/draft/2020-12/schema";
-const MAX_JSON_SCHEMA_DEPTH = 128;
-const MAX_JSON_SCHEMA_NODES = 1e4;
 /**
 * Bounds the work a validator can be asked to do for an untrusted tool catalogue.
 * Only schema-bearing keywords are walked, so deeply nested annotation data such as
@@ -22919,8 +23000,8 @@ function getJsonSchemaComplexityError(schema) {
 		if (value === null || typeof value !== "object" || Array.isArray(value) || seen.has(value)) continue;
 		seen.add(value);
 		nodes += 1;
-		if (depth > MAX_JSON_SCHEMA_DEPTH) return `JSON Schema exceeds the maximum depth of ${MAX_JSON_SCHEMA_DEPTH}`;
-		if (nodes > MAX_JSON_SCHEMA_NODES) return `JSON Schema exceeds the maximum node count of ${MAX_JSON_SCHEMA_NODES}`;
+		if (depth > 128) return `JSON Schema exceeds the maximum depth of 128`;
+		if (nodes > 1e4) return `JSON Schema exceeds the maximum node count of ${MAX_JSON_SCHEMA_NODES}`;
 		const record = value;
 		for (const keyword of schemaMapKeywords) {
 			const schemas = record[keyword];
@@ -22942,12 +23023,24 @@ function getJsonSchemaComplexityError(schema) {
 		});
 	}
 }
-/** MCP 2026-07-28 schemas default to JSON Schema 2020-12 when they declare no dialect. */
+const SUPPORTED_DIALECTS = /* @__PURE__ */ new Set([
+	JSON_SCHEMA_2020_12,
+	`${JSON_SCHEMA_2020_12}#`,
+	"http://json-schema.org/draft-07/schema",
+	"http://json-schema.org/draft-07/schema#"
+]);
+/**
+* MCP 2026-07-28 schemas default to JSON Schema 2020-12 when they declare no dialect.
+* 2019-09 schemas (e.g. from zod v3 servers) are converted to 2020-12 when that can be done
+* faithfully, so tool calls are not rejected before they run.
+*/
 function withDefaultDialect(schema) {
-	return schema.$schema ? schema : {
+	if (!schema.$schema) return {
 		...schema,
 		$schema: JSON_SCHEMA_2020_12
 	};
+	if (SUPPORTED_DIALECTS.has(schema.$schema)) return schema;
+	return toJsonSchema2020(schema) ?? schema;
 }
 const DEFAULT_INSTRUCTIONS_MAX_LENGTH = 512;
 const DEFAULT_SERVER_LOG_LEVEL = "info";
@@ -26291,14 +26384,18 @@ var MCPServer = class extends MCPServerBase {
 	/**
 	* Converts a tool schema to JSON Schema 2020-12, the dialect MCP 2026-07-28
 	* assumes when none is declared. The dialect declaration is kept so validators
-	* that dispatch on `$schema` pick the same draft on both sides.
+	* that dispatch on `$schema` pick the same draft on both sides. Some vendors
+	* (e.g. zod v3) emit 2019-09 for this target, so it is rewritten to 2020-12.
 	*/
 	jsonSchema(schema, options) {
 		if (!schema) return void 0;
-		return isStandardSchemaWithJSON(schema) ? standardSchemaToJSONSchema(schema, {
+		if (!isStandardSchemaWithJSON(schema)) return schema.jsonSchema ?? schema;
+		const converted = standardSchemaToJSONSchema(schema, {
 			...options,
 			target: "draft-2020-12"
-		}) : schema.jsonSchema ?? schema;
+		});
+		if (!converted.$schema || converted.$schema === "https://json-schema.org/draft/2020-12/schema") return converted;
+		return toJsonSchema2020(converted) ?? converted;
 	}
 	addTools(tools) {
 		const converted = this.convertTools(tools);