@payloadcms/plugin-mcp 4.0.0-canary.2 → 4.0.0-internal.011fd46

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/plugin-mcp",
-  "version": "4.0.0-canary.2",
+  "version": "4.0.0-internal.011fd46",
   "description": "MCP (Model Context Protocol) capabilities with Payload",
   "keywords": [
     "plugin",
@@ -57,19 +57,19 @@
     "@modelcontextprotocol/server": "2.0.0-alpha.2",
     "tsx": "4.22.4",
     "zod": "^4.0.0",
-    "@payloadcms/translations": "4.0.0-canary.2"
+    "@payloadcms/translations": "4.0.0-internal.011fd46"
   },
   "devDependencies": {
     "@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.2",
-    "@payloadcms/ui": "4.0.0-canary.2"
+    "@payloadcms/ui": "4.0.0-internal.011fd46",
+    "payload": "4.0.0-internal.011fd46",
+    "@payloadcms/eslint-config": "3.28.0"
   },
   "peerDependencies": {
     "react": "^19.0.1 || ^19.1.2 || ^19.2.1",
-    "@payloadcms/ui": "4.0.0-canary.2",
-    "payload": "4.0.0-canary.2"
+    "@payloadcms/ui": "4.0.0-internal.011fd46",
+    "payload": "4.0.0-internal.011fd46"
   },
   "//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/components/APIKeyField/index.client.tsx

@@ -3,10 +3,7 @@
 import { APIKeyInput, Button, useField, useTranslation, WarningTriangleIcon } from '@payloadcms/ui'
 import React, { useState } from 'react'
 
-import type {
-  PluginMCPTranslationKeys,
-  PluginMCPTranslations,
-} from '../../translations/index.js'
+import type { PluginMCPTranslationKeys, PluginMCPTranslations } from '../../translations/index.js'
 
 import './index.css'
 
@@ -29,9 +26,7 @@ export const APIKeyField: React.FC = () => {
 
   return (
     <div className={baseClass}>
-      <p className={`${baseClass}__description`}>
-        {t('plugin-mcp:apiKeyDescription')}
-      </p>
+      <p className={`${baseClass}__description`}>{t('plugin-mcp:apiKeyDescription')}</p>
       <div className={`${baseClass}__panel`}>
         <div className={`${baseClass}__header`}>
           <span className={`${baseClass}__title`}>{t('authentication:apiKey')}</span>

package/src/components/APIKeysEmptyState/index.client.tsx

@@ -5,10 +5,7 @@ import type { NoResultsClientProps } from 'payload'
 import { Button, NoListResults, useTranslation } from '@payloadcms/ui'
 import React from 'react'
 
-import type {
-  PluginMCPTranslationKeys,
-  PluginMCPTranslations,
-} from '../../translations/index.js'
+import type { PluginMCPTranslationKeys, PluginMCPTranslations } from '../../translations/index.js'
 
 export const APIKeysEmptyState: React.FC<NoResultsClientProps> = ({
   hasCreatePermission,

package/src/components/AccessField/index.client.tsx

@@ -5,10 +5,7 @@ import type { JSONFieldClientProps } from 'payload'
 import { CheckboxInput, Collapsible, Tabs, useField, useTranslation } from '@payloadcms/ui'
 import React, { useState } from 'react'
 
-import type {
-  PluginMCPTranslationKeys,
-  PluginMCPTranslations,
-} from '../../translations/index.js'
+import type { PluginMCPTranslationKeys, PluginMCPTranslations } from '../../translations/index.js'
 import type { ClientMCPPluginConfig, MCPAPIKeysDocAccessTree } from '../../types.js'
 
 import './index.css'

package/src/components/SettingsMenu/index.client.tsx

@@ -4,10 +4,7 @@ import { PopupList, useConfig, useTranslation } from '@payloadcms/ui'
 import { formatAdminURL } from 'payload/shared'
 import React from 'react'
 
-import type {
-  PluginMCPTranslationKeys,
-  PluginMCPTranslations,
-} from '../../translations/index.js'
+import type { PluginMCPTranslationKeys, PluginMCPTranslations } from '../../translations/index.js'
 
 /**
  * Entry in the user menu's Settings sub-popup linking to the API keys
@@ -20,7 +17,6 @@ export const MCPSettingsMenu: React.FC = () => {
 
   return (
     <PopupList.MenuItem>
-      <PopupList.GroupLabel label={t('plugin-mcp:mcp')} />
       <PopupList.Button
         href={formatAdminURL({
           adminRoute: config.routes.admin,

package/src/index.ts

@@ -88,7 +88,10 @@ export const mcpPlugin = definePlugin<MCPPluginConfig>({
           ...config.admin?.components,
           userMenuSettingsItems: [
             ...(config.admin?.components?.userMenuSettingsItems ?? []),
-            '@payloadcms/plugin-mcp/client#MCPSettingsMenu',
+            {
+              group: 'MCP',
+              items: ['@payloadcms/plugin-mcp/client#MCPSettingsMenu'],
+            },
           ],
         },
       },

package/src/mcp/buildMcpServer.ts

@@ -137,6 +137,7 @@ export const buildMcpServer = ({
           server.registerTool(
             item.mcpName,
             {
+              annotations: item.tool.annotations,
               description: item.tool.description,
               inputSchema: toStandardSchema(inputSchema),
             },
@@ -193,6 +194,7 @@ export const buildMcpServer = ({
           server.registerTool(
             item.mcpName,
             {
+              annotations: tool.annotations,
               description: tool.description,
               inputSchema: tool.input ? toStandardSchema(tool.input) : undefined,
             },

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

@@ -32,13 +32,18 @@ const wrapError =
   }
 
 export const authCollectionTool = defineCollectionTool({
+  annotations: {
+    destructiveHint: false,
+    idempotentHint: true,
+    openWorldHint: false,
+    readOnlyHint: true,
+    title: 'Check Auth Status',
+  },
   description: 'Checks authentication status for the current user.',
   input: z.object({
     headers: z
-      .string()
-      .describe(
-        'Optional JSON string containing custom headers to send with the authentication request',
-      )
+      .record(z.string(), z.string())
+      .describe('Optional custom headers to send with the authentication request')
       .optional(),
   }),
 }).handler(async ({ collectionSlug, input, req }) => {
@@ -46,11 +51,7 @@ export const authCollectionTool = defineCollectionTool({
   try {
     let authHeaders = new Headers()
     if (input.headers) {
-      try {
-        authHeaders = new Headers(JSON.parse(input.headers) as Record<string, string>)
-      } catch {
-        logger.warn(`Invalid headers JSON for auth: ${input.headers}, using empty headers`)
-      }
+      authHeaders = new Headers(input.headers)
     }
     const result = await req.payload.auth({ headers: authHeaders })
     return {
@@ -70,6 +71,13 @@ export const authCollectionTool = defineCollectionTool({
 })
 
 export const forgotPasswordCollectionTool = defineCollectionTool({
+  annotations: {
+    destructiveHint: false,
+    idempotentHint: false,
+    openWorldHint: true,
+    readOnlyHint: false,
+    title: 'Forgot Password',
+  },
   description: 'Sends a password reset email to a user.',
   input: z.object({
     disableEmail: z
@@ -104,6 +112,13 @@ export const forgotPasswordCollectionTool = defineCollectionTool({
 })
 
 export const loginCollectionTool = defineCollectionTool({
+  annotations: {
+    destructiveHint: false,
+    idempotentHint: false,
+    openWorldHint: false,
+    readOnlyHint: false,
+    title: 'User Login',
+  },
   description: 'Authenticates a user with email and password.',
   input: z.object({
     depth: z
@@ -148,6 +163,13 @@ export const loginCollectionTool = defineCollectionTool({
 })
 
 export const resetPasswordCollectionTool = defineCollectionTool({
+  annotations: {
+    destructiveHint: false,
+    idempotentHint: false,
+    openWorldHint: false,
+    readOnlyHint: false,
+    title: 'Reset Password',
+  },
   description: 'Resets a user password with a reset token.',
   input: z.object({
     password: z.string().describe('The new password for the user'),
@@ -178,6 +200,13 @@ export const resetPasswordCollectionTool = defineCollectionTool({
 })
 
 export const unlockCollectionTool = defineCollectionTool({
+  annotations: {
+    destructiveHint: false,
+    idempotentHint: true,
+    openWorldHint: false,
+    readOnlyHint: false,
+    title: 'Unlock Account',
+  },
   description: 'Unlocks a user account that has been locked due to failed login attempts.',
   input: z.object({ email: emailSchema }),
 }).handler(async ({ collectionSlug, input, req }) => {
@@ -205,6 +234,13 @@ export const unlockCollectionTool = defineCollectionTool({
 })
 
 export const verifyCollectionTool = defineCollectionTool({
+  annotations: {
+    destructiveHint: false,
+    idempotentHint: false,
+    openWorldHint: false,
+    readOnlyHint: false,
+    title: 'Email Verification',
+  },
   description: 'Verifies a user email with a verification token.',
   input: z.object({
     token: z.string().describe('The verification token sent to the user email'),

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

@@ -17,6 +17,13 @@ const DEFAULT_DESCRIPTION =
   'Create a document in any collection by passing the collection slug and data.'
 
 export const createDocumentTool = defineCollectionTool({
+  annotations: {
+    destructiveHint: false,
+    idempotentHint: false,
+    openWorldHint: false,
+    readOnlyHint: false,
+    title: 'Create Document',
+  },
   description: DEFAULT_DESCRIPTION,
   input: z.object({
     data: z.record(z.string(), z.unknown()).describe('The document fields to create'),
@@ -44,9 +51,9 @@ export const createDocumentTool = defineCollectionTool({
       )
       .optional(),
     select: z
-      .string()
+      .record(z.string(), z.unknown())
       .describe(
-        "Optional: define exactly which fields you'd like to return (JSON), e.g., '{\"title\": true}'",
+        'Optional: define exactly which fields you\'d like to return, e.g., {"title": true}',
       )
       .optional(),
   }),
@@ -71,16 +78,6 @@ export const createDocumentTool = defineCollectionTool({
 
     const parsedData = transformPointDataToPayload(inputData)
 
-    let selectClause: SelectType | undefined
-    if (select) {
-      try {
-        selectClause = JSON.parse(select) as SelectType
-      } catch {
-        logger.warn(`Invalid select clause JSON: ${select}`)
-        return { content: [{ type: 'text', text: 'Error: Invalid JSON in select clause' }] }
-      }
-    }
-
     const result = await payload.create({
       collection: collectionSlug,
       data: parsedData,
@@ -90,7 +87,7 @@ export const createDocumentTool = defineCollectionTool({
       ...localAPIDefaults(authorizedMCP),
       ...(locale ? { locale } : {}),
       ...(fallbackLocale ? { fallbackLocale } : {}),
-      ...(selectClause ? { select: selectClause } : {}),
+      ...(select ? { select: select as SelectType } : {}),
     })
 
     logger.info(`Successfully created document in ${collectionSlug} with ID: ${result.id}`)

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

@@ -9,6 +9,13 @@ const DEFAULT_DESCRIPTION =
   'Delete documents in any collection by passing the collection slug and ID or where clause.'
 
 export const deleteDocumentsTool = defineCollectionTool({
+  annotations: {
+    destructiveHint: true,
+    idempotentHint: false,
+    openWorldHint: false,
+    readOnlyHint: false,
+    title: 'Delete Documents',
+  },
   description: DEFAULT_DESCRIPTION,
   input: z.object({
     id: z

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

@@ -1,4 +1,4 @@
-import type { SelectType } from 'payload'
+import type { JoinQuery, PopulateType, SelectType } from 'payload'
 
 import { z } from 'zod'
 
@@ -11,6 +11,13 @@ const DEFAULT_DESCRIPTION =
   'Find documents in any collection by passing the collection slug and optional ID or where clause.'
 
 export const findDocumentsTool = defineCollectionTool({
+  annotations: {
+    destructiveHint: false,
+    idempotentHint: true,
+    openWorldHint: false,
+    readOnlyHint: true,
+    title: 'Find Documents',
+  },
   description: DEFAULT_DESCRIPTION,
   input: z.object({
     id: z
@@ -37,6 +44,10 @@ export const findDocumentsTool = defineCollectionTool({
       .string()
       .describe('Optional: fallback locale code to use when requested locale is not available')
       .optional(),
+    joins: z
+      .union([z.record(z.string(), z.unknown()), z.literal(false)])
+      .describe('Optional: configure join field queries, or pass false to disable all join fields.')
+      .optional(),
     limit: z
       .number()
       .int()
@@ -58,16 +69,30 @@ export const findDocumentsTool = defineCollectionTool({
       .describe('Page number for pagination (default: 1)')
       .optional()
       .default(1),
+    pagination: z
+      .boolean()
+      .describe('Optional: set to false to skip the count query overhead')
+      .optional(),
+    populate: z
+      .record(z.string(), z.unknown())
+      .describe(
+        'Optional: control which fields to include from populated relationship or upload documents.',
+      )
+      .optional(),
     select: z
-      .string()
+      .record(z.string(), z.unknown())
       .describe(
-        "Optional: define exactly which fields you'd like to return in the response (JSON), e.g., '{\"title\": true}'",
+        'Optional: define exactly which fields you\'d like to return in the response, e.g., {"title": true}',
       )
       .optional(),
     sort: z
       .string()
       .describe('Field to sort by (e.g., "createdAt", "-updatedAt" for descending)')
       .optional(),
+    trash: z
+      .boolean()
+      .describe('Optional: include soft-deleted documents when trash is enabled on the collection')
+      .optional(),
     where: whereSchema
       .describe(
         'Optional: where clause for filtering. Use field names with Payload operators, and/or arrays for grouping. Example: {"title":{"contains":"test"}}',
@@ -78,23 +103,28 @@ export const findDocumentsTool = defineCollectionTool({
   const payload = req.payload
   const logger = getLogger({ payload })
 
-  const { id, depth, draft, fallbackLocale, limit, locale, page, select, sort, where } = input
+  const {
+    id,
+    depth,
+    draft,
+    fallbackLocale,
+    joins,
+    limit,
+    locale,
+    page,
+    pagination,
+    populate,
+    select,
+    sort,
+    trash,
+    where,
+  } = input
 
   logger.info(
     `Reading document from collection: ${collectionSlug}${id ? ` with ID: ${id}` : ''}, limit: ${limit}, page: ${page}${locale ? `, locale: ${locale}` : ''}`,
   )
 
   try {
-    let selectClause: SelectType | undefined
-    if (select) {
-      try {
-        selectClause = JSON.parse(select) as SelectType
-      } catch {
-        logger.warn(`Invalid select clause JSON: ${select}`)
-        return { content: [{ type: 'text', text: 'Error: Invalid JSON in select clause' }] }
-      }
-    }
-
     if (id) {
       try {
         const doc = await payload.findByID({
@@ -103,10 +133,13 @@ export const findDocumentsTool = defineCollectionTool({
           depth,
           req,
           ...localAPIDefaults(authorizedMCP),
-          ...(selectClause && { select: selectClause }),
+          ...(select && { select: select as SelectType }),
+          ...(populate && { populate: populate as PopulateType }),
+          ...(joins !== undefined && { joins: joins as JoinQuery }),
           ...(locale && { locale }),
           ...(fallbackLocale && { fallbackLocale }),
           ...(draft !== undefined && { draft }),
+          ...(trash !== undefined && { trash }),
         })
 
         return {
@@ -138,10 +171,14 @@ export const findDocumentsTool = defineCollectionTool({
       page,
       req,
       ...localAPIDefaults(authorizedMCP),
-      ...(selectClause && { select: selectClause }),
+      ...(select && { select: select as SelectType }),
+      ...(populate && { populate: populate as PopulateType }),
+      ...(joins !== undefined && { joins: joins as JoinQuery }),
       ...(locale && { locale }),
       ...(fallbackLocale && { fallbackLocale }),
       ...(draft !== undefined && { draft }),
+      ...(pagination !== undefined && { pagination }),
+      ...(trash !== undefined && { trash }),
     }
 
     if (sort) {

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

@@ -2,6 +2,13 @@ import { defineCollectionTool } from '../../../defineTool.js'
 import { getCollectionInputSchema } from '../../../utils/schemaConversion/getEntityInputSchema.js'
 
 export const getCollectionSchemaTool = defineCollectionTool({
+  annotations: {
+    destructiveHint: false,
+    idempotentHint: true,
+    openWorldHint: false,
+    readOnlyHint: true,
+    title: 'Get Collection Schema',
+  },
   description: 'Get the input schema for creating or updating documents in a collection.',
 }).handler(({ collectionSlug, req }) => {
   const inputSchema = getCollectionInputSchema({ collectionSlug, req })

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

@@ -19,6 +19,13 @@ const DEFAULT_DESCRIPTION =
   'Update documents in any collection by passing the collection slug and data.'
 
 export const updateDocumentTool = defineCollectionTool({
+  annotations: {
+    destructiveHint: true,
+    idempotentHint: false,
+    openWorldHint: false,
+    readOnlyHint: false,
+    title: 'Update Document',
+  },
   description: DEFAULT_DESCRIPTION,
   input: z.object({
     id: z.union([z.string(), z.number()]).describe('The ID of the document to update').optional(),
@@ -55,9 +62,9 @@ export const updateDocumentTool = defineCollectionTool({
       .optional()
       .default(false),
     select: z
-      .string()
+      .record(z.string(), z.unknown())
       .describe(
-        "Optional: define exactly which fields you'd like to return in the response (JSON), e.g., '{\"title\": true}'",
+        'Optional: define exactly which fields you\'d like to return in the response, e.g., {"title": true}',
       )
       .optional(),
     where: whereSchema
@@ -112,16 +119,6 @@ export const updateDocumentTool = defineCollectionTool({
 
     const whereClause: Where = where ?? {}
 
-    let selectClause: SelectType | undefined
-    if (select) {
-      try {
-        selectClause = JSON.parse(select) as SelectType
-      } catch {
-        logger.warn(`Invalid select clause JSON: ${select}`)
-        return { content: [{ type: 'text', text: 'Error: Invalid JSON in select clause' }] }
-      }
-    }
-
     if (id) {
       const result = await payload.update({
         id,
@@ -136,7 +133,7 @@ export const updateDocumentTool = defineCollectionTool({
         ...(overwriteExistingFiles ? { overwriteExistingFiles } : {}),
         ...(locale ? { locale } : {}),
         ...(fallbackLocale ? { fallbackLocale } : {}),
-        ...(selectClause ? { select: selectClause } : {}),
+        ...(select ? { select: select as SelectType } : {}),
       })
 
       return {
@@ -163,7 +160,7 @@ export const updateDocumentTool = defineCollectionTool({
       ...(overwriteExistingFiles ? { overwriteExistingFiles } : {}),
       ...(locale ? { locale } : {}),
       ...(fallbackLocale ? { fallbackLocale } : {}),
-      ...(selectClause ? { select: selectClause } : {}),
+      ...(select ? { select: select as SelectType } : {}),
     })
 
     const docs = result.docs || []

package/src/mcp/builtin/getConfigInfoTool.ts

@@ -3,6 +3,13 @@ import { getAccessResults, isEntityHidden } from 'payload'
 import { defineTool } from '../../defineTool.js'
 
 export const getConfigInfoTool = defineTool({
+  annotations: {
+    destructiveHint: false,
+    idempotentHint: true,
+    openWorldHint: false,
+    readOnlyHint: true,
+    title: 'Config Info',
+  },
   description: 'List the Payload collection and global slugs visible to this MCP client.',
 }).handler(async ({ authorizedMCP, req }) => {
   const user = authorizedMCP.user ?? req.user ?? null

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

@@ -1,4 +1,4 @@
-import type { SelectType } from 'payload'
+import type { PopulateType, SelectType } from 'payload'
 
 import { z } from 'zod'
 
@@ -9,6 +9,13 @@ import { localAPIDefaults } from '../../../utils/localAPIDefaults.js'
 const DEFAULT_DESCRIPTION = 'Find any Payload global by passing the global slug.'
 
 export const findGlobalTool = defineGlobalTool({
+  annotations: {
+    destructiveHint: false,
+    idempotentHint: true,
+    openWorldHint: false,
+    readOnlyHint: true,
+    title: 'Find Global',
+  },
   description: DEFAULT_DESCRIPTION,
   input: z.object({
     depth: z
@@ -29,10 +36,16 @@ export const findGlobalTool = defineGlobalTool({
         'Optional: locale code to retrieve data in (e.g., "en", "es"). Use "all" to retrieve all locales for localized fields',
       )
       .optional(),
+    populate: z
+      .record(z.string(), z.unknown())
+      .describe(
+        'Optional: control which fields to include from populated relationship or upload documents.',
+      )
+      .optional(),
     select: z
-      .string()
+      .record(z.string(), z.unknown())
       .describe(
-        "Optional: define exactly which fields you'd like to return in the response (JSON), e.g., '{\"title\": true}'",
+        'Optional: define exactly which fields you\'d like to return in the response, e.g., {"title": true}',
       )
       .optional(),
   }),
@@ -40,7 +53,7 @@ export const findGlobalTool = defineGlobalTool({
   const payload = req.payload
   const logger = getLogger({ payload })
 
-  const { depth, fallbackLocale, locale, select } = input
+  const { depth, fallbackLocale, locale, populate, select } = input
 
   logger.info(
     `Reading global: ${globalSlug}, depth: ${depth}${locale ? `, locale: ${locale}` : ''}`,
@@ -53,24 +66,17 @@ export const findGlobalTool = defineGlobalTool({
       ...localAPIDefaults(authorizedMCP),
     }
 
-    let selectClause: SelectType | undefined
-    if (select) {
-      try {
-        selectClause = JSON.parse(select) as SelectType
-      } catch {
-        logger.warn(`Invalid select clause JSON for global: ${select}`)
-        return { content: [{ type: 'text', text: 'Error: Invalid JSON in select clause' }] }
-      }
-    }
-
     if (locale) {
       findOptions.locale = locale
     }
     if (fallbackLocale) {
       findOptions.fallbackLocale = fallbackLocale
     }
-    if (selectClause) {
-      findOptions.select = selectClause
+    if (select) {
+      findOptions.select = select as SelectType
+    }
+    if (populate) {
+      findOptions.populate = populate as PopulateType
     }
 
     const result = await payload.findGlobal(findOptions)

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

@@ -2,6 +2,13 @@ import { defineGlobalTool } from '../../../defineTool.js'
 import { getGlobalInputSchema } from '../../../utils/schemaConversion/getEntityInputSchema.js'
 
 export const getGlobalSchemaTool = defineGlobalTool({
+  annotations: {
+    destructiveHint: false,
+    idempotentHint: true,
+    openWorldHint: false,
+    readOnlyHint: true,
+    title: 'Get Global Schema',
+  },
   description: 'Get the input schema for updating a global.',
 }).handler(({ globalSlug, req }) => {
   const inputSchema = getGlobalInputSchema({ globalSlug, req })

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

@@ -15,6 +15,13 @@ import { validateGlobalData } from '../validateEntityData.js'
 const DEFAULT_DESCRIPTION = 'Update any Payload global by passing the global slug and data.'
 
 export const updateGlobalTool = defineGlobalTool({
+  annotations: {
+    destructiveHint: true,
+    idempotentHint: false,
+    openWorldHint: false,
+    readOnlyHint: false,
+    title: 'Update Global',
+  },
   description: DEFAULT_DESCRIPTION,
   input: z.object({
     data: z.record(z.string(), z.unknown()).describe('The global fields to update'),
@@ -39,9 +46,9 @@ export const updateGlobalTool = defineGlobalTool({
       )
       .optional(),
     select: z
-      .string()
+      .record(z.string(), z.unknown())
       .describe(
-        "Optional: define exactly which fields you'd like to return in the response (JSON), e.g., '{\"siteName\": true}'",
+        'Optional: define exactly which fields you\'d like to return in the response, e.g., {"siteName": true}',
       )
       .optional(),
   }),
@@ -66,16 +73,6 @@ export const updateGlobalTool = defineGlobalTool({
 
     const parsedData = transformPointDataToPayload(inputData)
 
-    let selectClause: SelectType | undefined
-    if (select) {
-      try {
-        selectClause = JSON.parse(select) as SelectType
-      } catch {
-        logger.warn(`Invalid select clause JSON for global: ${select}`)
-        return { content: [{ type: 'text', text: 'Error: Invalid JSON in select clause' }] }
-      }
-    }
-
     const updateOptions: Parameters<typeof payload.updateGlobal>[0] = {
       slug: globalSlug,
       data: parsedData,
@@ -90,8 +87,8 @@ export const updateGlobalTool = defineGlobalTool({
     if (fallbackLocale) {
       updateOptions.fallbackLocale = fallbackLocale
     }
-    if (selectClause) {
-      updateOptions.select = selectClause
+    if (select) {
+      updateOptions.select = select as SelectType
     }
 
     const result = await payload.updateGlobal(updateOptions)