@mastra/mcp 0.11.2 → 0.11.3-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/mcp",
-  "version": "0.11.2",
+  "version": "0.11.3-alpha.0",
   "description": "",
   "type": "module",
   "main": "dist/index.js",
@@ -28,7 +28,8 @@
     "exit-hook": "^4.0.0",
     "fast-deep-equal": "^3.1.3",
     "uuid": "^11.1.0",
-    "zod-from-json-schema": "^0.0.5"
+    "zod-from-json-schema": "^0.5.0",
+    "zod-from-json-schema-v3": "npm:zod-from-json-schema@^0.0.5"
   },
   "peerDependencies": {
     "@mastra/core": ">=0.15.2-0 <0.16.0-0",
@@ -52,8 +53,8 @@
     "zod": "^3.25.67",
     "zod-to-json-schema": "^3.24.5",
     "@internal/lint": "0.0.34",
-    "@mastra/core": "0.15.2",
-    "@internal/types-builder": "0.0.9"
+    "@internal/types-builder": "0.0.9",
+    "@mastra/core": "0.15.3-alpha.0"
   },
   "scripts": {
     "build": "tsup --silent --config tsup.config.ts",

package/src/client/client.ts

@@ -36,7 +36,8 @@ import {
 import { asyncExitHook, gracefulExit } from 'exit-hook';
 import { z } from 'zod';
 import { convertJsonSchemaToZod } from 'zod-from-json-schema';
-import type { JSONSchema } from 'zod-from-json-schema';
+import { convertJsonSchemaToZod as convertJsonSchemaToZodV3 } from 'zod-from-json-schema-v3';
+import type { JSONSchema } from 'zod-from-json-schema-v3';
 import { ElicitationClientActions } from './elicitationActions';
 import { PromptClientActions } from './promptActions';
 import { ResourceClientActions } from './resourceActions';
@@ -479,7 +480,13 @@ export class InternalMastraMCPClient extends MastraBase {
 
     try {
       await $RefParser.dereference(inputSchema);
-      return convertJsonSchemaToZod(inputSchema as JSONSchema);
+      const jsonSchemaToConvert = ('jsonSchema' in inputSchema ? inputSchema.jsonSchema : inputSchema) as JSONSchema;
+      if ('toJSONSchema' in z) {
+        // @ts-expect-error - zod type issue
+        return convertJsonSchemaToZod(jsonSchemaToConvert);
+      } else {
+        return convertJsonSchemaToZodV3(jsonSchemaToConvert);
+      }
     } catch (error: unknown) {
       let errorDetails: string | undefined;
       if (error instanceof Error) {
@@ -516,7 +523,13 @@ export class InternalMastraMCPClient extends MastraBase {
 
     try {
       await $RefParser.dereference(outputSchema);
-      return convertJsonSchemaToZod(outputSchema as JSONSchema);
+      const jsonSchemaToConvert = ('jsonSchema' in outputSchema ? outputSchema.jsonSchema : outputSchema) as JSONSchema;
+      if ('toJSONSchema' in z) {
+        // @ts-expect-error - zod type issue
+        return convertJsonSchemaToZod(jsonSchemaToConvert);
+      } else {
+        return convertJsonSchemaToZodV3(jsonSchemaToConvert);
+      }
     } catch (error: unknown) {
       let errorDetails: string | undefined;
       if (error instanceof Error) {

package/integration-tests/node_modules/.bin/mastra

@@ -1,21 +0,0 @@
-#!/bin/sh
-basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
-
-case `uname` in
-    *CYGWIN*|*MINGW*|*MSYS*)
-        if command -v cygpath > /dev/null 2>&1; then
-            basedir=`cygpath -w "$basedir"`
-        fi
-    ;;
-esac
-
-if [ -z "$NODE_PATH" ]; then
-  export NODE_PATH="/home/runner/work/mastra/mastra/packages/cli/dist/node_modules:/home/runner/work/mastra/mastra/packages/cli/node_modules:/home/runner/work/mastra/mastra/packages/node_modules:/home/runner/work/mastra/mastra/node_modules:/home/runner/work/mastra/node_modules:/home/runner/work/node_modules:/home/runner/node_modules:/home/node_modules:/node_modules:/home/runner/work/mastra/mastra/node_modules/.pnpm/node_modules"
-else
-  export NODE_PATH="/home/runner/work/mastra/mastra/packages/cli/dist/node_modules:/home/runner/work/mastra/mastra/packages/cli/node_modules:/home/runner/work/mastra/mastra/packages/node_modules:/home/runner/work/mastra/mastra/node_modules:/home/runner/work/mastra/node_modules:/home/runner/work/node_modules:/home/runner/node_modules:/home/node_modules:/node_modules:/home/runner/work/mastra/mastra/node_modules/.pnpm/node_modules:$NODE_PATH"
-fi
-if [ -x "$basedir/node" ]; then
-  exec "$basedir/node"  "$basedir/../mastra/dist/index.js" "$@"
-else
-  exec node  "$basedir/../mastra/dist/index.js" "$@"
-fi