@mastra/schema-compat 0.0.0-ai-v5-20250626003446 → 0.0.0-ai-v5-20250710191716

package/.turbo/turbo-build.log

@@ -1,23 +1,23 @@
 
-> @mastra/schema-compat@0.10.2 build /home/runner/work/mastra/mastra/packages/schema-compat
+> @mastra/schema-compat@0.10.4 build /home/runner/work/mastra/mastra/packages/schema-compat
 > tsup src/index.ts --format esm,cjs --experimental-dts --clean --treeshake=smallest --splitting
 
 CLI Building entry: src/index.ts
 CLI Using tsconfig: tsconfig.json
 CLI tsup v8.5.0
 TSC Build start
-TSC ⚡️ Build success in 2200ms
+TSC ⚡️ Build success in 2248ms
 DTS Build start
 CLI Target: es2022
 Analysis will use the bundled TypeScript version 5.8.3
 Writing package typings: /home/runner/work/mastra/mastra/packages/schema-compat/dist/_tsup-dts-rollup.d.ts
 Analysis will use the bundled TypeScript version 5.8.3
 Writing package typings: /home/runner/work/mastra/mastra/packages/schema-compat/dist/_tsup-dts-rollup.d.cts
-DTS ⚡️ Build success in 1893ms
+DTS ⚡️ Build success in 2018ms
 CLI Cleaning output folder
 ESM Build start
 CJS Build start
-ESM dist/index.js 21.19 KB
-ESM ⚡️ Build success in 149ms
-CJS dist/index.cjs 21.82 KB
-CJS ⚡️ Build success in 149ms
+ESM dist/index.js 21.30 KB
+ESM ⚡️ Build success in 137ms
+CJS dist/index.cjs 21.92 KB
+CJS ⚡️ Build success in 137ms

package/CHANGELOG.md

@@ -1,11 +1,42 @@
 # @mastra/schema-compat
 
-## 0.0.0-ai-v5-20250626003446
+## 0.0.0-ai-v5-20250710191716
 
 ### Minor Changes
 
 - 66858d4: AI SDK v5 beta
 
+## 0.10.4
+
+### Patch Changes
+
+- 0c85311: Fix Google models ZodNull tool schema handling
+
+## 0.10.4-alpha.0
+
+### Patch Changes
+
+- 0c85311: Fix Google models ZodNull tool schema handling
+
+## 0.10.3
+
+### Patch Changes
+
+- 98bbe5a: Claude cannot handle tuple schemas now.
+- a853c43: Allow for object.passthrough in schema compat (aka MCP tool support).
+
+## 0.10.3-alpha.1
+
+### Patch Changes
+
+- a853c43: Allow for object.passthrough in schema compat (aka MCP tool support).
+
+## 0.10.3-alpha.0
+
+### Patch Changes
+
+- 98bbe5a: Claude cannot handle tuple schemas now.
+
 ## 0.10.2
 
 ### Patch Changes

package/LICENSE.md

@@ -1,46 +1,15 @@
-# Elastic License 2.0 (ELv2)
+# Apache License 2.0
 
-Copyright (c) 2025 Mastra AI, Inc.
+Copyright (c) 2025 Kepler Software, Inc.
 
-**Acceptance**
-By using the software, you agree to all of the terms and conditions below.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
 
-**Copyright License**
-The licensor grants you a non-exclusive, royalty-free, worldwide, non-sublicensable, non-transferable license to use, copy, distribute, make available, and prepare derivative works of the software, in each case subject to the limitations and conditions below
+    http://www.apache.org/licenses/LICENSE-2.0
 
-**Limitations**
-You may not provide the software to third parties as a hosted or managed service, where the service provides users with access to any substantial set of the features or functionality of the software.
-
-You may not move, change, disable, or circumvent the license key functionality in the software, and you may not remove or obscure any functionality in the software that is protected by the license key.
-
-You may not alter, remove, or obscure any licensing, copyright, or other notices of the licensor in the software. Any use of the licensor’s trademarks is subject to applicable law.
-
-**Patents**
-The licensor grants you a license, under any patent claims the licensor can license, or becomes able to license, to make, have made, use, sell, offer for sale, import and have imported the software, in each case subject to the limitations and conditions in this license. This license does not cover any patent claims that you cause to be infringed by modifications or additions to the software. If you or your company make any written claim that the software infringes or contributes to infringement of any patent, your patent license for the software granted under these terms ends immediately. If your company makes such a claim, your patent license ends immediately for work on behalf of your company.
-
-**Notices**
-You must ensure that anyone who gets a copy of any part of the software from you also gets a copy of these terms.
-
-If you modify the software, you must include in any modified copies of the software prominent notices stating that you have modified the software.
-
-**No Other Rights**
-These terms do not imply any licenses other than those expressly granted in these terms.
-
-**Termination**
-If you use the software in violation of these terms, such use is not licensed, and your licenses will automatically terminate. If the licensor provides you with a notice of your violation, and you cease all violation of this license no later than 30 days after you receive that notice, your licenses will be reinstated retroactively. However, if you violate these terms after such reinstatement, any additional violation of these terms will cause your licenses to terminate automatically and permanently.
-
-**No Liability**
-As far as the law allows, the software comes as is, without any warranty or condition, and the licensor will not be liable to you for any damages arising out of these terms or the use or nature of the software, under any kind of legal claim.
-
-**Definitions**
-The _licensor_ is the entity offering these terms, and the _software_ is the software the licensor makes available under these terms, including any portion of it.
-
-_you_ refers to the individual or entity agreeing to these terms.
-
-_your company_ is any legal entity, sole proprietorship, or other kind of organization that you work for, plus all organizations that have control over, are under the control of, or are under common control with that organization. _control_ means ownership of substantially all the assets of an entity, or the power to direct its management and policies by vote, contract, or otherwise. Control can be direct or indirect.
-
-_your licenses_ are all the licenses granted to you for the software under these terms.
-
-_use_ means anything you do with the software requiring one of your licenses.
-
-_trademark_ means trademarks, service marks, and similar rights.
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

package/dist/_tsup-dts-rollup.d.cts

@@ -6,6 +6,7 @@ import { z } from 'zod';
 import { ZodArray } from 'zod';
 import { ZodDate } from 'zod';
 import { ZodDefault } from 'zod';
+import { ZodNull } from 'zod';
 import { ZodNumber } from 'zod';
 import { ZodObject } from 'zod';
 import { ZodOptional } from 'zod';
@@ -195,6 +196,8 @@ export declare const isDate: (v: ZodTypeAny) => v is ZodDate;
 
 export declare const isDefault: (v: ZodTypeAny) => v is ZodDefault<any>;
 
+export declare const isNull: (v: ZodTypeAny) => v is ZodNull;
+
 declare const isNumber: (v: ZodTypeAny) => v is ZodNumber;
 export { isNumber }
 export { isNumber as isNumber_alias_1 }
@@ -339,7 +342,9 @@ declare abstract class SchemaCompatLayer {
      * @param value - The Zod object to process
      * @returns The processed Zod object
      */
-    defaultZodObjectHandler(value: ZodObject<any, any, any>): ZodObject<any, any, any>;
+    defaultZodObjectHandler(value: ZodObject<any, any, any>, options?: {
+        passthrough?: boolean;
+    }): ZodObject<any, any, any>;
     /**
      * Merges validation constraints into a parameter description.
      *

package/dist/_tsup-dts-rollup.d.ts

@@ -6,6 +6,7 @@ import { z } from 'zod';
 import { ZodArray } from 'zod';
 import { ZodDate } from 'zod';
 import { ZodDefault } from 'zod';
+import { ZodNull } from 'zod';
 import { ZodNumber } from 'zod';
 import { ZodObject } from 'zod';
 import { ZodOptional } from 'zod';
@@ -195,6 +196,8 @@ export declare const isDate: (v: ZodTypeAny) => v is ZodDate;
 
 export declare const isDefault: (v: ZodTypeAny) => v is ZodDefault<any>;
 
+export declare const isNull: (v: ZodTypeAny) => v is ZodNull;
+
 declare const isNumber: (v: ZodTypeAny) => v is ZodNumber;
 export { isNumber }
 export { isNumber as isNumber_alias_1 }
@@ -339,7 +342,9 @@ declare abstract class SchemaCompatLayer {
      * @param value - The Zod object to process
      * @returns The processed Zod object
      */
-    defaultZodObjectHandler(value: ZodObject<any, any, any>): ZodObject<any, any, any>;
+    defaultZodObjectHandler(value: ZodObject<any, any, any>, options?: {
+        passthrough?: boolean;
+    }): ZodObject<any, any, any>;
     /**
      * Merges validation constraints into a parameter description.
      *

package/dist/index.cjs

@@ -73,6 +73,7 @@ var ALL_NUMBER_CHECKS = [
 var ALL_ARRAY_CHECKS = ["min", "max", "length"];
 var isOptional = (v) => v instanceof zod.ZodOptional;
 var isObj = (v) => v instanceof zod.ZodObject;
+var isNull = (v) => v instanceof zod.ZodNull;
 var isArr = (v) => v instanceof zod.ZodArray;
 var isUnion = (v) => v instanceof zod.ZodUnion;
 var isString = (v) => v instanceof zod.ZodString;
@@ -115,7 +116,7 @@ var SchemaCompatLayer = class {
    * @param value - The Zod object to process
    * @returns The processed Zod object
    */
-  defaultZodObjectHandler(value) {
+  defaultZodObjectHandler(value, options = { passthrough: true }) {
     const processedShape = Object.entries(value.shape).reduce((acc, [key, propValue]) => {
       acc[key] = this.processZodType(propValue);
       return acc;
@@ -130,6 +131,9 @@ var SchemaCompatLayer = class {
     if (value.description) {
       result = result.describe(value.description);
     }
+    if (options.passthrough && value._def.unknownKeys === "passthrough") {
+      result = result.passthrough();
+    }
     return result;
   }
   /**
@@ -425,9 +429,8 @@ var AnthropicSchemaCompatLayer = class extends SchemaCompatLayer {
   }
   processZodType(value) {
     if (isOptional(value)) {
-      const handleTypes = ["ZodObject", "ZodArray", "ZodUnion", "ZodNever", "ZodUndefined"];
+      const handleTypes = ["ZodObject", "ZodArray", "ZodUnion", "ZodNever", "ZodUndefined", "ZodTuple"];
       if (this.getModel().modelId.includes("claude-3.5-haiku")) handleTypes.push("ZodString");
-      if (this.getModel().modelId.includes("claude-3.7")) handleTypes.push("ZodTuple");
       return this.defaultZodOptionalHandler(value, handleTypes);
     } else if (isObj(value)) {
       return this.defaultZodObjectHandler(value);
@@ -442,11 +445,7 @@ var AnthropicSchemaCompatLayer = class extends SchemaCompatLayer {
         return value;
       }
     }
-    if (this.getModel().modelId.includes("claude-3.7")) {
-      return this.defaultUnsupportedZodTypeHandler(value, ["ZodNever", "ZodTuple", "ZodUndefined"]);
-    } else {
-      return this.defaultUnsupportedZodTypeHandler(value, ["ZodNever", "ZodUndefined"]);
-    }
+    return this.defaultUnsupportedZodTypeHandler(value, ["ZodNever", "ZodTuple", "ZodUndefined"]);
   }
 };
 
@@ -476,8 +475,6 @@ var DeepSeekSchemaCompatLayer = class extends SchemaCompatLayer {
     return value;
   }
 };
-
-// src/provider-compats/google.ts
 var GoogleSchemaCompatLayer = class extends SchemaCompatLayer {
   constructor(model) {
     super(model);
@@ -498,6 +495,8 @@ var GoogleSchemaCompatLayer = class extends SchemaCompatLayer {
         "ZodNumber",
         ...UNSUPPORTED_ZOD_TYPES
       ]);
+    } else if (isNull(value)) {
+      return zod.z.any().refine((v) => v === null, { message: "must be null" }).describe(value._def.description || "must be null");
     } else if (isObj(value)) {
       return this.defaultZodObjectHandler(value);
     } else if (isArr(value)) {
@@ -611,7 +610,7 @@ var OpenAIReasoningSchemaCompatLayer = class extends SchemaCompatLayer {
       const innerZodType = this.processZodType(value._def.innerType);
       return innerZodType.nullable();
     } else if (isObj(value)) {
-      return this.defaultZodObjectHandler(value);
+      return this.defaultZodObjectHandler(value, { passthrough: false });
     } else if (isArr(value)) {
       return this.defaultZodArrayHandler(value);
     } else if (isUnion(value)) {

package/dist/index.js

@@ -1,4 +1,4 @@
-import { ZodOptional, ZodObject, ZodArray, ZodUnion, ZodString, ZodNumber, z, ZodDefault, ZodDate } from 'zod';
+import { ZodOptional, ZodObject, ZodArray, ZodUnion, ZodString, ZodNumber, z, ZodNull, ZodDefault, ZodDate } from 'zod';
 import { jsonSchema } from 'ai';
 import { convertJsonSchemaToZod } from 'zod-from-json-schema';
 import { zodToJsonSchema } from 'zod-to-json-schema';
@@ -71,6 +71,7 @@ var ALL_NUMBER_CHECKS = [
 var ALL_ARRAY_CHECKS = ["min", "max", "length"];
 var isOptional = (v) => v instanceof ZodOptional;
 var isObj = (v) => v instanceof ZodObject;
+var isNull = (v) => v instanceof ZodNull;
 var isArr = (v) => v instanceof ZodArray;
 var isUnion = (v) => v instanceof ZodUnion;
 var isString = (v) => v instanceof ZodString;
@@ -113,7 +114,7 @@ var SchemaCompatLayer = class {
    * @param value - The Zod object to process
    * @returns The processed Zod object
    */
-  defaultZodObjectHandler(value) {
+  defaultZodObjectHandler(value, options = { passthrough: true }) {
     const processedShape = Object.entries(value.shape).reduce((acc, [key, propValue]) => {
       acc[key] = this.processZodType(propValue);
       return acc;
@@ -128,6 +129,9 @@ var SchemaCompatLayer = class {
     if (value.description) {
       result = result.describe(value.description);
     }
+    if (options.passthrough && value._def.unknownKeys === "passthrough") {
+      result = result.passthrough();
+    }
     return result;
   }
   /**
@@ -423,9 +427,8 @@ var AnthropicSchemaCompatLayer = class extends SchemaCompatLayer {
   }
   processZodType(value) {
     if (isOptional(value)) {
-      const handleTypes = ["ZodObject", "ZodArray", "ZodUnion", "ZodNever", "ZodUndefined"];
+      const handleTypes = ["ZodObject", "ZodArray", "ZodUnion", "ZodNever", "ZodUndefined", "ZodTuple"];
       if (this.getModel().modelId.includes("claude-3.5-haiku")) handleTypes.push("ZodString");
-      if (this.getModel().modelId.includes("claude-3.7")) handleTypes.push("ZodTuple");
       return this.defaultZodOptionalHandler(value, handleTypes);
     } else if (isObj(value)) {
       return this.defaultZodObjectHandler(value);
@@ -440,11 +443,7 @@ var AnthropicSchemaCompatLayer = class extends SchemaCompatLayer {
         return value;
       }
     }
-    if (this.getModel().modelId.includes("claude-3.7")) {
-      return this.defaultUnsupportedZodTypeHandler(value, ["ZodNever", "ZodTuple", "ZodUndefined"]);
-    } else {
-      return this.defaultUnsupportedZodTypeHandler(value, ["ZodNever", "ZodUndefined"]);
-    }
+    return this.defaultUnsupportedZodTypeHandler(value, ["ZodNever", "ZodTuple", "ZodUndefined"]);
   }
 };
 
@@ -474,8 +473,6 @@ var DeepSeekSchemaCompatLayer = class extends SchemaCompatLayer {
     return value;
   }
 };
-
-// src/provider-compats/google.ts
 var GoogleSchemaCompatLayer = class extends SchemaCompatLayer {
   constructor(model) {
     super(model);
@@ -496,6 +493,8 @@ var GoogleSchemaCompatLayer = class extends SchemaCompatLayer {
         "ZodNumber",
         ...UNSUPPORTED_ZOD_TYPES
       ]);
+    } else if (isNull(value)) {
+      return z.any().refine((v) => v === null, { message: "must be null" }).describe(value._def.description || "must be null");
     } else if (isObj(value)) {
       return this.defaultZodObjectHandler(value);
     } else if (isArr(value)) {
@@ -609,7 +608,7 @@ var OpenAIReasoningSchemaCompatLayer = class extends SchemaCompatLayer {
       const innerZodType = this.processZodType(value._def.innerType);
       return innerZodType.nullable();
     } else if (isObj(value)) {
-      return this.defaultZodObjectHandler(value);
+      return this.defaultZodObjectHandler(value, { passthrough: false });
     } else if (isArr(value)) {
       return this.defaultZodArrayHandler(value);
     } else if (isUnion(value)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/schema-compat",
-  "version": "0.0.0-ai-v5-20250626003446",
+  "version": "0.0.0-ai-v5-20250710191716",
   "description": "Tool schema compatibility layer for Mastra.ai",
   "type": "module",
   "main": "dist/index.js",
@@ -26,26 +26,26 @@
     "zod"
   ],
   "author": "",
-  "license": "Elastic-2.0",
+  "license": "Apache-2.0",
   "dependencies": {
     "json-schema": "^0.4.0",
     "zod-from-json-schema": "^0.0.5",
     "zod-to-json-schema": "^3.24.5"
   },
   "peerDependencies": {
-    "ai": "5.0.0-beta.1",
+    "ai": "5.0.0-beta.14",
     "zod": "^3.0.0"
   },
   "devDependencies": {
     "@types/json-schema": "^7.0.15",
-    "ai": "5.0.0-beta.1",
-    "eslint": "^9.28.0",
-    "tsup": "^8.5.0",
+    "ai": "5.0.0-beta.14",
     "@types/node": "^20.19.0",
+    "eslint": "^9.29.0",
+    "tsup": "^8.5.0",
     "typescript": "^5.8.3",
-    "vitest": "^3.2.3",
-    "zod": "^3.25.57",
-    "@internal/lint": "0.0.0-ai-v5-20250626003446"
+    "vitest": "^3.2.4",
+    "zod": "^3.25.67",
+    "@internal/lint": "0.0.0-ai-v5-20250710191716"
   },
   "scripts": {
     "build": "tsup src/index.ts --format esm,cjs --experimental-dts --clean --treeshake=smallest --splitting",

package/src/provider-compats/anthropic.ts

@@ -18,9 +18,8 @@ export class AnthropicSchemaCompatLayer extends SchemaCompatLayer {
 
   processZodType(value: ZodTypeAny): ZodTypeAny {
     if (isOptional(value)) {
-      const handleTypes: AllZodType[] = ['ZodObject', 'ZodArray', 'ZodUnion', 'ZodNever', 'ZodUndefined'];
+      const handleTypes: AllZodType[] = ['ZodObject', 'ZodArray', 'ZodUnion', 'ZodNever', 'ZodUndefined', 'ZodTuple'];
       if (this.getModel().modelId.includes('claude-3.5-haiku')) handleTypes.push('ZodString');
-      if (this.getModel().modelId.includes('claude-3.7')) handleTypes.push('ZodTuple');
       return this.defaultZodOptionalHandler(value, handleTypes);
     } else if (isObj(value)) {
       return this.defaultZodObjectHandler(value);
@@ -39,10 +38,6 @@ export class AnthropicSchemaCompatLayer extends SchemaCompatLayer {
       }
     }
 
-    if (this.getModel().modelId.includes('claude-3.7')) {
-      return this.defaultUnsupportedZodTypeHandler(value, ['ZodNever', 'ZodTuple', 'ZodUndefined']);
-    } else {
-      return this.defaultUnsupportedZodTypeHandler(value, ['ZodNever', 'ZodUndefined']);
-    }
+    return this.defaultUnsupportedZodTypeHandler(value, ['ZodNever', 'ZodTuple', 'ZodUndefined']);
   }
 }

package/src/provider-compats/google.ts

@@ -1,9 +1,11 @@
 import type { ZodTypeAny } from 'zod';
+import { z } from 'zod';
 import type { Targets } from 'zod-to-json-schema';
 import {
   SchemaCompatLayer,
   UNSUPPORTED_ZOD_TYPES,
   isArr,
+  isNull,
   isNumber,
   isObj,
   isOptional,
@@ -35,6 +37,12 @@ export class GoogleSchemaCompatLayer extends SchemaCompatLayer {
         'ZodNumber',
         ...UNSUPPORTED_ZOD_TYPES,
       ]);
+    } else if (isNull(value)) {
+      // Google models don't support null, so we need to convert it to any and then refine it to null
+      return z
+        .any()
+        .refine(v => v === null, { message: 'must be null' })
+        .describe(value._def.description || 'must be null');
     } else if (isObj(value)) {
       return this.defaultZodObjectHandler(value);
     } else if (isArr(value)) {

package/src/provider-compats/openai-reasoning.ts

@@ -46,7 +46,7 @@ export class OpenAIReasoningSchemaCompatLayer extends SchemaCompatLayer {
       const innerZodType = this.processZodType(value._def.innerType);
       return innerZodType.nullable();
     } else if (isObj(value)) {
-      return this.defaultZodObjectHandler(value);
+      return this.defaultZodObjectHandler(value, { passthrough: false });
     } else if (isArr(value)) {
       return this.defaultZodArrayHandler(value);
     } else if (isUnion(value)) {

package/src/schema-compatibility.ts

@@ -1,6 +1,6 @@
 import type { Schema, LanguageModel } from 'ai';
 import type { JSONSchema7 } from 'json-schema';
-import { z, ZodOptional, ZodObject, ZodArray, ZodUnion, ZodString, ZodNumber, ZodDate, ZodDefault } from 'zod';
+import { z, ZodOptional, ZodObject, ZodArray, ZodUnion, ZodString, ZodNumber, ZodDate, ZodDefault, ZodNull } from 'zod';
 import type { ZodTypeAny } from 'zod';
 import type { Targets } from 'zod-to-json-schema';
 import { convertZodSchemaToAISDKSchema } from './utils';
@@ -31,6 +31,7 @@ export const ALL_ARRAY_CHECKS = ['min', 'max', 'length'] as const;
 
 export const isOptional = (v: ZodTypeAny): v is ZodOptional<any> => v instanceof ZodOptional;
 export const isObj = (v: ZodTypeAny): v is ZodObject<any, any, any> => v instanceof ZodObject;
+export const isNull = (v: ZodTypeAny): v is ZodNull => v instanceof ZodNull;
 export const isArr = (v: ZodTypeAny): v is ZodArray<any, any> => v instanceof ZodArray;
 export const isUnion = (v: ZodTypeAny): v is ZodUnion<[ZodTypeAny, ...ZodTypeAny[]]> => v instanceof ZodUnion;
 export const isString = (v: ZodTypeAny): v is ZodString => v instanceof ZodString;
@@ -234,7 +235,10 @@ export abstract class SchemaCompatLayer {
    * @param value - The Zod object to process
    * @returns The processed Zod object
    */
-  public defaultZodObjectHandler(value: ZodObject<any, any, any>): ZodObject<any, any, any> {
+  public defaultZodObjectHandler(
+    value: ZodObject<any, any, any>,
+    options: { passthrough?: boolean } = { passthrough: true },
+  ): ZodObject<any, any, any> {
     const processedShape = Object.entries(value.shape).reduce<Record<string, ZodTypeAny>>((acc, [key, propValue]) => {
       acc[key] = this.processZodType(propValue as ZodTypeAny);
       return acc;
@@ -252,6 +256,11 @@ export abstract class SchemaCompatLayer {
     if (value.description) {
       result = result.describe(value.description);
     }
+
+    if (options.passthrough && value._def.unknownKeys === 'passthrough') {
+      result = result.passthrough();
+    }
+
     return result;
   }