@payloadcms/plugin-mcp 4.0.0-canary.0 → 4.0.0-internal.183b315

package/dist/utils/schemaConversion/sanitizeEntitySchema.spec.js

@@ -0,0 +1,158 @@
+import { describe, expect, it } from 'vitest';
+import { sanitizeEntitySchema } from './sanitizeEntitySchema.js';
+describe('sanitizeEntitySchema', ()=>{
+    it('keeps a Lexical node union strict (oneOf) while simplifying relationship values to IDs', ()=>{
+        // Shaped like the schema the MCP server prepares for a collection with a Lexical richText field:
+        // a `$defs` node union (a `oneOf` of node shapes) where a relationship node's `value` is either
+        // an ID or a `$ref` to the populated related collection.
+        const standalone = {
+            type: 'object',
+            $defs: {
+                LexicalNodes_ABCDEF12: {
+                    oneOf: [
+                        {
+                            type: 'object',
+                            additionalProperties: false,
+                            properties: {
+                                type: {
+                                    const: 'paragraph'
+                                }
+                            },
+                            required: [
+                                'type'
+                            ]
+                        },
+                        {
+                            type: 'object',
+                            additionalProperties: false,
+                            properties: {
+                                type: {
+                                    const: 'relationship'
+                                },
+                                value: {
+                                    oneOf: [
+                                        {
+                                            type: 'string'
+                                        },
+                                        {
+                                            $ref: '#/$defs/posts'
+                                        }
+                                    ]
+                                }
+                            },
+                            required: [
+                                'type'
+                            ]
+                        }
+                    ]
+                },
+                posts: {
+                    type: 'object',
+                    additionalProperties: false,
+                    properties: {
+                        id: {
+                            type: 'string'
+                        },
+                        title: {
+                            type: 'string'
+                        }
+                    }
+                }
+            },
+            properties: {
+                id: {
+                    type: 'string'
+                },
+                content: {
+                    type: 'object',
+                    properties: {
+                        root: {
+                            type: 'object',
+                            properties: {
+                                children: {
+                                    type: 'array',
+                                    items: {
+                                        $ref: '#/$defs/LexicalNodes_ABCDEF12'
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        };
+        expect(sanitizeEntitySchema(standalone)).toStrictEqual({
+            type: 'object',
+            $defs: {
+                // The node union is renamed to a short, readable `node`, and stays a strict discriminated
+                // `oneOf` - not loosened to `anyOf`...
+                node: {
+                    oneOf: [
+                        {
+                            type: 'object',
+                            additionalProperties: false,
+                            properties: {
+                                type: {
+                                    const: 'paragraph'
+                                }
+                            },
+                            required: [
+                                'type'
+                            ]
+                        },
+                        {
+                            type: 'object',
+                            additionalProperties: false,
+                            properties: {
+                                type: {
+                                    const: 'relationship'
+                                },
+                                // ...while the relationship `value` is simplified to a bare ID (the populated-doc `$ref` is dropped).
+                                value: {
+                                    type: 'string',
+                                    description: 'The ID of the related "posts" document.'
+                                }
+                            },
+                            required: [
+                                'type'
+                            ]
+                        }
+                    ]
+                },
+                posts: {
+                    type: 'object',
+                    additionalProperties: false,
+                    properties: {
+                        id: {
+                            type: 'string'
+                        },
+                        title: {
+                            type: 'string'
+                        }
+                    }
+                }
+            },
+            properties: {
+                // `id` is dropped - it's a Payload-managed field MCP clients never set.
+                content: {
+                    type: 'object',
+                    properties: {
+                        root: {
+                            type: 'object',
+                            properties: {
+                                children: {
+                                    type: 'array',
+                                    items: {
+                                        $ref: '#/$defs/node'
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        });
+    });
+});
+
+//# sourceMappingURL=sanitizeEntitySchema.spec.js.map

package/dist/utils/schemaConversion/sanitizeEntitySchema.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/utils/schemaConversion/sanitizeEntitySchema.spec.ts"],"sourcesContent":["import { describe, expect, it } from 'vitest'\n\nimport type { JsonSchemaType } from '../../types.js'\n\nimport { sanitizeEntitySchema } from './sanitizeEntitySchema.js'\n\ndescribe('sanitizeEntitySchema', () => {\n  it('keeps a Lexical node union strict (oneOf) while simplifying relationship values to IDs', () => {\n    // Shaped like the schema the MCP server prepares for a collection with a Lexical richText field:\n    // a `$defs` node union (a `oneOf` of node shapes) where a relationship node's `value` is either\n    // an ID or a `$ref` to the populated related collection.\n    const standalone: JsonSchemaType = {\n      type: 'object',\n      $defs: {\n        LexicalNodes_ABCDEF12: {\n          oneOf: [\n            {\n              type: 'object',\n              additionalProperties: false,\n              properties: { type: { const: 'paragraph' } },\n              required: ['type'],\n            },\n            {\n              type: 'object',\n              additionalProperties: false,\n              properties: {\n                type: { const: 'relationship' },\n                value: { oneOf: [{ type: 'string' }, { $ref: '#/$defs/posts' }] },\n              },\n              required: ['type'],\n            },\n          ],\n        },\n        posts: {\n          type: 'object',\n          additionalProperties: false,\n          properties: { id: { type: 'string' }, title: { type: 'string' } },\n        },\n      },\n      properties: {\n        id: { type: 'string' },\n        content: {\n          type: 'object',\n          properties: {\n            root: {\n              type: 'object',\n              properties: {\n                children: { type: 'array', items: { $ref: '#/$defs/LexicalNodes_ABCDEF12' } },\n              },\n            },\n          },\n        },\n      },\n    }\n\n    expect(sanitizeEntitySchema(standalone)).toStrictEqual({\n      type: 'object',\n      $defs: {\n        // The node union is renamed to a short, readable `node`, and stays a strict discriminated\n        // `oneOf` - not loosened to `anyOf`...\n        node: {\n          oneOf: [\n            {\n              type: 'object',\n              additionalProperties: false,\n              properties: { type: { const: 'paragraph' } },\n              required: ['type'],\n            },\n            {\n              type: 'object',\n              additionalProperties: false,\n              properties: {\n                type: { const: 'relationship' },\n                // ...while the relationship `value` is simplified to a bare ID (the populated-doc `$ref` is dropped).\n                value: { type: 'string', description: 'The ID of the related \"posts\" document.' },\n              },\n              required: ['type'],\n            },\n          ],\n        },\n        posts: {\n          type: 'object',\n          additionalProperties: false,\n          properties: { id: { type: 'string' }, title: { type: 'string' } },\n        },\n      },\n      properties: {\n        // `id` is dropped - it's a Payload-managed field MCP clients never set.\n        content: {\n          type: 'object',\n          properties: {\n            root: {\n              type: 'object',\n              properties: {\n                children: { type: 'array', items: { $ref: '#/$defs/node' } },\n              },\n            },\n          },\n        },\n      },\n    })\n  })\n})\n"],"names":["describe","expect","it","sanitizeEntitySchema","standalone","type","$defs","LexicalNodes_ABCDEF12","oneOf","additionalProperties","properties","const","required","value","$ref","posts","id","title","content","root","children","items","toStrictEqual","node","description"],"mappings":"AAAA,SAASA,QAAQ,EAAEC,MAAM,EAAEC,EAAE,QAAQ,SAAQ;AAI7C,SAASC,oBAAoB,QAAQ,4BAA2B;AAEhEH,SAAS,wBAAwB;IAC/BE,GAAG,0FAA0F;QAC3F,iGAAiG;QACjG,gGAAgG;QAChG,yDAAyD;QACzD,MAAME,aAA6B;YACjCC,MAAM;YACNC,OAAO;gBACLC,uBAAuB;oBACrBC,OAAO;wBACL;4BACEH,MAAM;4BACNI,sBAAsB;4BACtBC,YAAY;gCAAEL,MAAM;oCAAEM,OAAO;gCAAY;4BAAE;4BAC3CC,UAAU;gCAAC;6BAAO;wBACpB;wBACA;4BACEP,MAAM;4BACNI,sBAAsB;4BACtBC,YAAY;gCACVL,MAAM;oCAAEM,OAAO;gCAAe;gCAC9BE,OAAO;oCAAEL,OAAO;wCAAC;4CAAEH,MAAM;wCAAS;wCAAG;4CAAES,MAAM;wCAAgB;qCAAE;gCAAC;4BAClE;4BACAF,UAAU;gCAAC;6BAAO;wBACpB;qBACD;gBACH;gBACAG,OAAO;oBACLV,MAAM;oBACNI,sBAAsB;oBACtBC,YAAY;wBAAEM,IAAI;4BAAEX,MAAM;wBAAS;wBAAGY,OAAO;4BAAEZ,MAAM;wBAAS;oBAAE;gBAClE;YACF;YACAK,YAAY;gBACVM,IAAI;oBAAEX,MAAM;gBAAS;gBACrBa,SAAS;oBACPb,MAAM;oBACNK,YAAY;wBACVS,MAAM;4BACJd,MAAM;4BACNK,YAAY;gCACVU,UAAU;oCAAEf,MAAM;oCAASgB,OAAO;wCAAEP,MAAM;oCAAgC;gCAAE;4BAC9E;wBACF;oBACF;gBACF;YACF;QACF;QAEAb,OAAOE,qBAAqBC,aAAakB,aAAa,CAAC;YACrDjB,MAAM;YACNC,OAAO;gBACL,0FAA0F;gBAC1F,uCAAuC;gBACvCiB,MAAM;oBACJf,OAAO;wBACL;4BACEH,MAAM;4BACNI,sBAAsB;4BACtBC,YAAY;gCAAEL,MAAM;oCAAEM,OAAO;gCAAY;4BAAE;4BAC3CC,UAAU;gCAAC;6BAAO;wBACpB;wBACA;4BACEP,MAAM;4BACNI,sBAAsB;4BACtBC,YAAY;gCACVL,MAAM;oCAAEM,OAAO;gCAAe;gCAC9B,sGAAsG;gCACtGE,OAAO;oCAAER,MAAM;oCAAUmB,aAAa;gCAA0C;4BAClF;4BACAZ,UAAU;gCAAC;6BAAO;wBACpB;qBACD;gBACH;gBACAG,OAAO;oBACLV,MAAM;oBACNI,sBAAsB;oBACtBC,YAAY;wBAAEM,IAAI;4BAAEX,MAAM;wBAAS;wBAAGY,OAAO;4BAAEZ,MAAM;wBAAS;oBAAE;gBAClE;YACF;YACAK,YAAY;gBACV,wEAAwE;gBACxEQ,SAAS;oBACPb,MAAM;oBACNK,YAAY;wBACVS,MAAM;4BACJd,MAAM;4BACNK,YAAY;gCACVU,UAAU;oCAAEf,MAAM;oCAASgB,OAAO;wCAAEP,MAAM;oCAAe;gCAAE;4BAC7D;wBACF;oBACF;gBACF;YACF;QACF;IACF;AACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/plugin-mcp",
-  "version": "4.0.0-canary.0",
+  "version": "4.0.0-internal.183b315",
   "description": "MCP (Model Context Protocol) capabilities with Payload",
   "keywords": [
     "plugin",
@@ -62,13 +62,13 @@
     "@types/react": "19.2.14",
     "react": "^19.0.1 || ^19.1.2 || ^19.2.1",
     "@payloadcms/eslint-config": "3.28.0",
-    "payload": "4.0.0-canary.0",
-    "@payloadcms/ui": "4.0.0-canary.0"
+    "@payloadcms/ui": "4.0.0-internal.183b315",
+    "payload": "4.0.0-internal.183b315"
   },
   "peerDependencies": {
     "react": "^19.0.1 || ^19.1.2 || ^19.2.1",
-    "@payloadcms/ui": "4.0.0-canary.0",
-    "payload": "4.0.0-canary.0"
+    "@payloadcms/ui": "4.0.0-internal.183b315",
+    "payload": "4.0.0-internal.183b315"
   },
   "//deps_notes": {
     "zod": "zod is a hard dependency of @modelcontextprotocol/server, thus we can safely use it without it impacting bundle size. Make extra sure the zod version here matches exactly what's defined in the dependencies of @modelcontextprotocol/server to avoid duplicate versions being installed.",

package/src/@types/assets.d.ts

@@ -0,0 +1,3 @@
+declare module '*.css'
+
+declare module '*.scss'

package/src/collection/index.ts

@@ -55,6 +55,7 @@ export const getAPIKeysCollection = ({
       plural: 'API Keys',
       singular: 'API Key',
     },
+    versions: false,
   }
 
   return pluginConfig.overrideApiKeyCollection

package/src/mcp/buildMcpServer.ts

@@ -1,5 +1,5 @@
 import { McpServer, type ServerContext } from '@modelcontextprotocol/server'
-import { APIError, configToJSONSchema, type PayloadRequest } from 'payload'
+import { APIError, entityToStandaloneJSONSchema, type PayloadRequest } from 'payload'
 
 import type {
   AuthorizedMCP,
@@ -64,13 +64,6 @@ export const buildMcpServer = ({
     return rest
   }
 
-  const configSchema = configToJSONSchema(
-    req.payload.config,
-    req.payload.db.defaultIDType,
-    req.i18n,
-    { forceInlineBlocks: true },
-  ) as JsonSchemaType
-
   try {
     for (const item of authorizedMCP.items) {
       switch (item.type) {
@@ -79,15 +72,20 @@ export const buildMcpServer = ({
           const name = wireName(item.key, item.collectionSlug)
           let inputSchema = tool.input
           if (typeof inputSchema === 'function') {
-            const raw = configSchema.$defs?.[item.collectionSlug]
-            if (!raw) {
+            const collection = req.payload.collections[item.collectionSlug]?.config
+            if (!collection) {
               throw new APIError(
                 `Collection schema not found for slug: ${item.collectionSlug}`,
                 500,
               )
             }
             const collectionSchema = removeVirtualFieldsFromSchema(
-              JSON.parse(JSON.stringify(raw)) as JsonSchemaType,
+              entityToStandaloneJSONSchema({
+                config: req.payload.config,
+                defaultIDType: req.payload.db.defaultIDType,
+                entity: collection,
+                i18n: req.i18n,
+              }) as unknown as JsonSchemaType,
               getCollectionVirtualFieldNames(req.payload.config, item.collectionSlug),
             )
             inputSchema = inputSchema({ collectionSchema })
@@ -118,12 +116,19 @@ export const buildMcpServer = ({
           const name = wireName(item.key, item.globalSlug)
           let inputSchema = tool.input
           if (typeof inputSchema === 'function') {
-            const raw = configSchema.$defs?.[item.globalSlug]
-            if (!raw) {
+            const globalEntity = req.payload.config.globals.find(
+              (globalConfig) => globalConfig.slug === item.globalSlug,
+            )
+            if (!globalEntity) {
               throw new APIError(`Global schema not found for slug: ${item.globalSlug}`, 500)
             }
             const globalSchema = removeVirtualFieldsFromSchema(
-              JSON.parse(JSON.stringify(raw)) as JsonSchemaType,
+              entityToStandaloneJSONSchema({
+                config: req.payload.config,
+                defaultIDType: req.payload.db.defaultIDType,
+                entity: globalEntity,
+                i18n: req.i18n,
+              }) as unknown as JsonSchemaType,
               getGlobalVirtualFieldNames(req.payload.config, item.globalSlug),
             )
 

package/src/mcp/builtin/collections/createTool.ts

@@ -9,7 +9,8 @@ import {
   stripVirtualFields,
 } from '../../../utils/getVirtualFieldNames.js'
 import { localAPIDefaults } from '../../../utils/localAPIDefaults.js'
-import { prepareCollectionSchema } from '../../../utils/schemaConversion/prepareCollectionSchema.js'
+import { buildToolInput } from '../../../utils/schemaConversion/buildToolInput.js'
+import { sanitizeEntitySchema } from '../../../utils/schemaConversion/sanitizeEntitySchema.js'
 import { transformPointDataToPayload } from '../../../utils/transformPointDataToPayload.js'
 
 const DEFAULT_DESCRIPTION = 'Create a document in a collection.'
@@ -17,41 +18,40 @@ const DEFAULT_DESCRIPTION = 'Create a document in a collection.'
 export const createCollectionTool = defineCollectionTool({
   description: DEFAULT_DESCRIPTION,
   input: ({ collectionSchema }) =>
-    z.object({
-      data: z
-        .fromJSONSchema(
-          prepareCollectionSchema(collectionSchema) as unknown as z.core.JSONSchema.JSONSchema,
-        )
-        .describe('The document fields to create'),
-      depth: z
-        .number()
-        .int()
-        .min(0)
-        .max(10)
-        .describe('How many levels deep to populate relationships in response')
-        .optional()
-        .default(0),
-      draft: z
-        .boolean()
-        .describe('Whether to create the document as a draft')
-        .optional()
-        .default(false),
-      fallbackLocale: z
-        .string()
-        .describe('Optional: fallback locale code to use when requested locale is not available')
-        .optional(),
-      locale: z
-        .string()
-        .describe(
-          'Optional: locale code to create the document in (e.g., "en", "es"). Defaults to the default locale',
-        )
-        .optional(),
-      select: z
-        .string()
-        .describe(
-          'Optional: define exactly which fields you\'d like to create (JSON), e.g., \'{"title": "My Post"}\'',
-        )
-        .optional(),
+    buildToolInput({
+      controls: {
+        depth: z
+          .number()
+          .int()
+          .min(0)
+          .max(10)
+          .describe('How many levels deep to populate relationships in response')
+          .optional()
+          .default(0),
+        draft: z
+          .boolean()
+          .describe('Whether to create the document as a draft')
+          .optional()
+          .default(false),
+        fallbackLocale: z
+          .string()
+          .describe('Optional: fallback locale code to use when requested locale is not available')
+          .optional(),
+        locale: z
+          .string()
+          .describe(
+            'Optional: locale code to create the document in (e.g., "en", "es"). Defaults to the default locale',
+          )
+          .optional(),
+        select: z
+          .string()
+          .describe(
+            'Optional: define exactly which fields you\'d like to create (JSON), e.g., \'{"title": "My Post"}\'',
+          )
+          .optional(),
+      },
+      dataDescription: 'The document fields to create',
+      dataSchema: sanitizeEntitySchema(collectionSchema),
     }),
 }).handler(async ({ authorizedMCP, collectionSlug, input, req }) => {
   const payload = req.payload
@@ -64,7 +64,7 @@ export const createCollectionTool = defineCollectionTool({
   )
 
   try {
-    let parsedData = transformPointDataToPayload(data as Record<string, unknown>)
+    let parsedData = transformPointDataToPayload(data)
     const virtualFieldNames = getCollectionVirtualFieldNames(payload.config, collectionSlug)
     parsedData = stripVirtualFields(parsedData, virtualFieldNames)
 

package/src/mcp/builtin/collections/updateTool.ts

@@ -9,7 +9,8 @@ import {
   stripVirtualFields,
 } from '../../../utils/getVirtualFieldNames.js'
 import { localAPIDefaults } from '../../../utils/localAPIDefaults.js'
-import { prepareCollectionSchema } from '../../../utils/schemaConversion/prepareCollectionSchema.js'
+import { buildToolInput } from '../../../utils/schemaConversion/buildToolInput.js'
+import { sanitizeEntitySchema } from '../../../utils/schemaConversion/sanitizeEntitySchema.js'
 import { transformPointDataToPayload } from '../../../utils/transformPointDataToPayload.js'
 
 const DEFAULT_DESCRIPTION = 'Update documents in a collection by ID or where clause.'
@@ -17,7 +18,7 @@ const DEFAULT_DESCRIPTION = 'Update documents in a collection by ID or where cla
 export const updateCollectionTool = defineCollectionTool({
   description: DEFAULT_DESCRIPTION,
   input: ({ collectionSchema }) => {
-    const partialSchema = prepareCollectionSchema(collectionSchema)
+    const partialSchema = sanitizeEntitySchema(collectionSchema)
 
     // Collection updates do not require all required fields to be passed => delete .required.
     //
@@ -25,52 +26,56 @@ export const updateCollectionTool = defineCollectionTool({
     // data: DeepPartial<RequiredDataFromCollectionSlug<TSlug>>
     delete partialSchema.required
 
-    return z.object({
-      id: z.union([z.string(), z.number()]).describe('The ID of the document to update').optional(),
-      data: z
-        .fromJSONSchema(partialSchema as unknown as z.core.JSONSchema.JSONSchema)
-        .describe('The fields to update'),
-      depth: z
-        .number()
-        .describe('How many levels deep to populate relationships')
-        .optional()
-        .default(0),
-      draft: z
-        .boolean()
-        .describe('Whether to update the document as a draft')
-        .optional()
-        .default(false),
-      fallbackLocale: z
-        .string()
-        .describe('Optional: fallback locale code to use when requested locale is not available')
-        .optional(),
-      filePath: z.string().describe('File path for file uploads').optional(),
-      locale: z
-        .string()
-        .describe(
-          'Optional: locale code to update the document in (e.g., "en", "es"). Defaults to the default locale',
-        )
-        .optional(),
-      overrideLock: z
-        .boolean()
-        .describe('Whether to override document locks')
-        .optional()
-        .default(true),
-      overwriteExistingFiles: z
-        .boolean()
-        .describe('Whether to overwrite existing files')
-        .optional()
-        .default(false),
-      select: z
-        .string()
-        .describe(
-          'Optional: define exactly which fields you\'d like to return in the response (JSON), e.g., \'{"title": "My Post"}\'',
-        )
-        .optional(),
-      where: z
-        .string()
-        .describe('JSON string for where clause to update multiple documents')
-        .optional(),
+    return buildToolInput({
+      controls: {
+        id: z
+          .union([z.string(), z.number()])
+          .describe('The ID of the document to update')
+          .optional(),
+        depth: z
+          .number()
+          .describe('How many levels deep to populate relationships')
+          .optional()
+          .default(0),
+        draft: z
+          .boolean()
+          .describe('Whether to update the document as a draft')
+          .optional()
+          .default(false),
+        fallbackLocale: z
+          .string()
+          .describe('Optional: fallback locale code to use when requested locale is not available')
+          .optional(),
+        filePath: z.string().describe('File path for file uploads').optional(),
+        locale: z
+          .string()
+          .describe(
+            'Optional: locale code to update the document in (e.g., "en", "es"). Defaults to the default locale',
+          )
+          .optional(),
+        overrideLock: z
+          .boolean()
+          .describe('Whether to override document locks')
+          .optional()
+          .default(true),
+        overwriteExistingFiles: z
+          .boolean()
+          .describe('Whether to overwrite existing files')
+          .optional()
+          .default(false),
+        select: z
+          .string()
+          .describe(
+            'Optional: define exactly which fields you\'d like to return in the response (JSON), e.g., \'{"title": "My Post"}\'',
+          )
+          .optional(),
+        where: z
+          .string()
+          .describe('JSON string for where clause to update multiple documents')
+          .optional(),
+      },
+      dataDescription: 'The fields to update',
+      dataSchema: partialSchema,
     })
   },
 }).handler(async ({ authorizedMCP, collectionSlug, input, req }) => {
@@ -102,7 +107,7 @@ export const updateCollectionTool = defineCollectionTool({
       }
     }
 
-    let parsedData = transformPointDataToPayload(data as Record<string, unknown>)
+    let parsedData = transformPointDataToPayload(data)
     const virtualFieldNames = getCollectionVirtualFieldNames(payload.config, collectionSlug)
     parsedData = stripVirtualFields(parsedData, virtualFieldNames)
 

package/src/mcp/builtin/globals/updateTool.ts

@@ -9,50 +9,52 @@ import {
   stripVirtualFields,
 } from '../../../utils/getVirtualFieldNames.js'
 import { localAPIDefaults } from '../../../utils/localAPIDefaults.js'
-import { prepareCollectionSchema } from '../../../utils/schemaConversion/prepareCollectionSchema.js'
+import { buildToolInput } from '../../../utils/schemaConversion/buildToolInput.js'
+import { sanitizeEntitySchema } from '../../../utils/schemaConversion/sanitizeEntitySchema.js'
 
 const DEFAULT_DESCRIPTION = 'Update a Payload global singleton configuration.'
 
 export const updateGlobalTool = defineGlobalTool({
   description: DEFAULT_DESCRIPTION,
   input: ({ globalSchema }) => {
-    const partialSchema = prepareCollectionSchema(globalSchema)
+    const partialSchema = sanitizeEntitySchema(globalSchema)
     // Global updates do not require all required fields to be passed => delete .required.
     //
     // Local API equivalent: packages/payload/src/global/operations/local/update.ts#BaseOptions#data:
     // data: DeepPartial<Omit<DataFromGlobalSlug<TSlug>, 'id'>>
     delete partialSchema.required
 
-    return z.object({
-      data: z
-        .fromJSONSchema(partialSchema as unknown as z.core.JSONSchema.JSONSchema)
-        .describe('The fields to update'),
-      depth: z
-        .number()
-        .describe('Optional: Depth of relationships to populate')
-        .optional()
-        .default(0),
-      draft: z
-        .boolean()
-        .describe('Optional: Whether to save as draft (default: false)')
-        .optional()
-        .default(false),
-      fallbackLocale: z
-        .string()
-        .describe('Optional: fallback locale code to use when requested locale is not available')
-        .optional(),
-      locale: z
-        .string()
-        .describe(
-          'Optional: locale code to update data in (e.g., "en", "es"). Use "all" to update all locales for localized fields',
-        )
-        .optional(),
-      select: z
-        .string()
-        .describe(
-          'Optional: define exactly which fields you\'d like to return in the response (JSON), e.g., \'{"siteName": "My Site"}\'',
-        )
-        .optional(),
+    return buildToolInput({
+      controls: {
+        depth: z
+          .number()
+          .describe('Optional: Depth of relationships to populate')
+          .optional()
+          .default(0),
+        draft: z
+          .boolean()
+          .describe('Optional: Whether to save as draft (default: false)')
+          .optional()
+          .default(false),
+        fallbackLocale: z
+          .string()
+          .describe('Optional: fallback locale code to use when requested locale is not available')
+          .optional(),
+        locale: z
+          .string()
+          .describe(
+            'Optional: locale code to update data in (e.g., "en", "es"). Use "all" to update all locales for localized fields',
+          )
+          .optional(),
+        select: z
+          .string()
+          .describe(
+            'Optional: define exactly which fields you\'d like to return in the response (JSON), e.g., \'{"siteName": "My Site"}\'',
+          )
+          .optional(),
+      },
+      dataDescription: 'The fields to update',
+      dataSchema: partialSchema,
     })
   },
 }).handler(async ({ authorizedMCP, globalSlug, input, req }) => {
@@ -67,7 +69,7 @@ export const updateGlobalTool = defineGlobalTool({
 
   try {
     const virtualFieldNames = getGlobalVirtualFieldNames(payload.config, globalSlug)
-    const parsedData = stripVirtualFields(data as Record<string, unknown>, virtualFieldNames)
+    const parsedData = stripVirtualFields(data, virtualFieldNames)
 
     let selectClause: SelectType | undefined
     if (select) {