@payloadcms/plugin-mcp 4.0.0-internal.cc18726 → 4.0.0-internal.cd47d20

package/dist/mcp/builtin/collections/fileInput.js

@@ -1,5 +1,5 @@
 import { APIError, z } from 'payload';
-import { getExternalFile, getFileFromUploadInstructions, isURLAllowed } from 'payload/internal';
+import { externalURLInputSchema, getFileFromUploadInstructions, resolveURLUploadInput } from 'payload/internal';
 import { sanitizeFilename } from 'payload/shared';
 const mimeTypeSchema = z.string().check(z.regex(/^[!#$%&'*+.^`|~\w-]+\/[!#$%&'*+.^`|~\w-]+$/, 'MIME type must use the type/subtype format'));
 const uploadFileSchema = z.strictObject({
@@ -15,11 +15,7 @@ export const fileInputSchema = z.discriminatedUnion('source', [
         mimeType: mimeTypeSchema.check(z.describe('The file MIME type, for example image/png.')),
         source: z.literal('base64')
     }),
-    z.strictObject({
-        name: z.optional(z.string().check(z.minLength(1))).check(z.describe('File name override.')),
-        source: z.literal('externalURL'),
-        url: z.url().check(z.describe('The http or https URL to download.'))
-    }),
+    externalURLInputSchema,
     z.strictObject({
         file: uploadFileSchema.check(z.describe('getUploadInstructions file field post-upload.')),
         source: z.literal('uploadReference')
@@ -43,51 +39,28 @@ export async function resolveFile({ slug, input, req }) {
             throw error;
         }
     }
+    if (input.source === 'externalURL') {
+        return resolveURLUploadInput({
+            slug,
+            input,
+            req
+        });
+    }
     const uploadConfig = req.payload.collections[slug]?.config.upload;
     if (!uploadConfig) {
         throw new APIError(`Collection "${slug}" does not support file uploads.`, 400);
     }
     const maxFileSize = req.payload.config.upload.limits?.fileSize;
-    let file;
-    if (input.source === 'base64') {
-        const data = decodeBase64({
-            maxFileSize,
-            value: input.data
-        });
-        file = {
-            name: sanitizeFilename(input.name),
-            data,
-            mimetype: input.mimeType,
-            size: data.length
-        };
-    } else {
-        if (uploadConfig.pasteURL === false) {
-            throw new APIError(`Uploading files from URLs is disabled for collection "${slug}".`, 400);
-        }
-        const url = new URL(input.url);
-        if (![
-            'http:',
-            'https:'
-        ].includes(url.protocol)) {
-            throw new APIError('File URLs must use http or https.', 400);
-        }
-        if (typeof uploadConfig.pasteURL === 'object' && !isURLAllowed(input.url, uploadConfig.pasteURL.allowList)) {
-            throw new APIError('The provided file URL is not allowed.', 400);
-        }
-        file = await getExternalFile({
-            data: {
-                filename: sanitizeFilename(input.name || getURLFilename(url)),
-                url: input.url
-            },
-            req,
-            uploadConfig: {
-                ...uploadConfig,
-                externalFileHeaderFilter: uploadConfig.externalFileHeaderFilter ?? (()=>({}))
-            }
-        });
-        file.mimetype = file.mimetype?.split(';')[0] || 'application/octet-stream';
-        file.size = file.data.length;
-    }
+    const data = decodeBase64({
+        maxFileSize,
+        value: input.data
+    });
+    const file = {
+        name: sanitizeFilename(input.name),
+        data,
+        mimetype: input.mimeType,
+        size: data.length
+    };
     if (maxFileSize !== undefined && Number.isFinite(maxFileSize) && file.size > maxFileSize) {
         throw new APIError(`File exceeds the ${maxFileSize} byte upload limit.`, 400);
     }
@@ -111,13 +84,5 @@ function decodeBase64({ maxFileSize, value }) {
     }
     return data;
 }
-function getURLFilename(url) {
-    const pathSegment = url.pathname.split('/').pop() || 'upload';
-    try {
-        return decodeURIComponent(pathSegment);
-    } catch  {
-        return pathSegment;
-    }
-}
 
 //# sourceMappingURL=fileInput.js.map

package/dist/mcp/builtin/collections/fileInput.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/mcp/builtin/collections/fileInput.ts"],"sourcesContent":["import type { CollectionSlug, File, FileData, PayloadRequest } from 'payload'\n\nimport { APIError, z } from 'payload'\nimport { getExternalFile, getFileFromUploadInstructions, isURLAllowed } from 'payload/internal'\nimport { sanitizeFilename } from 'payload/shared'\n\nconst mimeTypeSchema = z\n  .string()\n  .check(\n    z.regex(\n      /^[!#$%&'*+.^`|~\\w-]+\\/[!#$%&'*+.^`|~\\w-]+$/,\n      'MIME type must use the type/subtype format',\n    ),\n  )\n\nconst uploadFileSchema = z.strictObject({\n  filename: z.string(),\n  mimeType: z.string(),\n  size: z.int().check(z.nonnegative()),\n  uploadReference: z.record(z.string(), z.unknown()),\n})\n\nexport const fileInputSchema = z\n  .discriminatedUnion('source', [\n    z.strictObject({\n      name: z.string().check(z.minLength(1), z.describe('The file name, including its extension.')),\n      data: z\n        .string()\n        .check(z.describe('The base64-encoded file bytes, without a data URL prefix.')),\n      mimeType: mimeTypeSchema.check(z.describe('The file MIME type, for example image/png.')),\n      source: z.literal('base64'),\n    }),\n    z.strictObject({\n      name: z.optional(z.string().check(z.minLength(1))).check(z.describe('File name override.')),\n      source: z.literal('externalURL'),\n      url: z.url().check(z.describe('The http or https URL to download.')),\n    }),\n    z.strictObject({\n      file: uploadFileSchema.check(z.describe('getUploadInstructions file field post-upload.')),\n      source: z.literal('uploadReference'),\n    }),\n  ])\n  .check(\n    z.describe(\n      'A file for an upload collection. Prefer uploadReference after its upload succeeds; use base64 only for small local files or externalURL for an online file.',\n    ),\n  )\n\ntype FileInput = z.infer<typeof fileInputSchema>\n\nexport async function resolveFile({\n  slug,\n  input,\n  req,\n}: {\n  input?: FileInput\n  req: PayloadRequest\n  slug: CollectionSlug\n}): Promise<File | undefined> {\n  if (!input) {\n    return undefined\n  }\n\n  if (input.source === 'uploadReference') {\n    try {\n      return await getFileFromUploadInstructions({ collectionSlug: slug, file: input.file, req })\n    } catch (error) {\n      if (error instanceof Error && error.message === 'Staged upload was not found.') {\n        throw new APIError(\n          'Staged upload not found. Complete the upload action first, or use base64 for small local files.',\n          400,\n        )\n      }\n      throw error\n    }\n  }\n\n  const uploadConfig = req.payload.collections[slug]?.config.upload\n\n  if (!uploadConfig) {\n    throw new APIError(`Collection \"${slug}\" does not support file uploads.`, 400)\n  }\n\n  const maxFileSize = req.payload.config.upload.limits?.fileSize\n  let file: File\n\n  if (input.source === 'base64') {\n    const data = decodeBase64({ maxFileSize, value: input.data })\n\n    file = {\n      name: sanitizeFilename(input.name),\n      data,\n      mimetype: input.mimeType,\n      size: data.length,\n    }\n  } else {\n    if (uploadConfig.pasteURL === false) {\n      throw new APIError(`Uploading files from URLs is disabled for collection \"${slug}\".`, 400)\n    }\n\n    const url = new URL(input.url)\n\n    if (!['http:', 'https:'].includes(url.protocol)) {\n      throw new APIError('File URLs must use http or https.', 400)\n    }\n\n    if (\n      typeof uploadConfig.pasteURL === 'object' &&\n      !isURLAllowed(input.url, uploadConfig.pasteURL.allowList)\n    ) {\n      throw new APIError('The provided file URL is not allowed.', 400)\n    }\n\n    file = await getExternalFile({\n      data: {\n        filename: sanitizeFilename(input.name || getURLFilename(url)),\n        url: input.url,\n      } as FileData,\n      req,\n      uploadConfig: {\n        ...uploadConfig,\n        externalFileHeaderFilter: uploadConfig.externalFileHeaderFilter ?? (() => ({})),\n      },\n    })\n    file.mimetype = file.mimetype?.split(';')[0] || 'application/octet-stream'\n    file.size = file.data.length\n  }\n\n  if (maxFileSize !== undefined && Number.isFinite(maxFileSize) && file.size > maxFileSize) {\n    throw new APIError(`File exceeds the ${maxFileSize} byte upload limit.`, 400)\n  }\n\n  return file\n}\n\nfunction decodeBase64({ maxFileSize, value }: { maxFileSize?: number; value: string }): Buffer {\n  const normalized = value.replace(/\\s/g, '')\n\n  if (!/^[a-z0-9+/]*={0,2}$/i.test(normalized) || normalized.length % 4 === 1) {\n    throw new APIError('File data must be valid base64.', 400)\n  }\n\n  if (maxFileSize !== undefined && Number.isFinite(maxFileSize)) {\n    const paddingLength = normalized.endsWith('==') ? 2 : normalized.endsWith('=') ? 1 : 0\n    const decodedSize = Math.floor((normalized.length * 3) / 4) - paddingLength\n\n    if (decodedSize > maxFileSize) {\n      throw new APIError(`File exceeds the ${maxFileSize} byte upload limit.`, 400)\n    }\n  }\n\n  const data = Buffer.from(normalized, 'base64')\n\n  if (data.toString('base64').replace(/=+$/, '') !== normalized.replace(/=+$/, '')) {\n    throw new APIError('File data must be valid base64.', 400)\n  }\n\n  return data\n}\n\nfunction getURLFilename(url: URL): string {\n  const pathSegment = url.pathname.split('/').pop() || 'upload'\n\n  try {\n    return decodeURIComponent(pathSegment)\n  } catch {\n    return pathSegment\n  }\n}\n"],"names":["APIError","z","getExternalFile","getFileFromUploadInstructions","isURLAllowed","sanitizeFilename","mimeTypeSchema","string","check","regex","uploadFileSchema","strictObject","filename","mimeType","size","int","nonnegative","uploadReference","record","unknown","fileInputSchema","discriminatedUnion","name","minLength","describe","data","source","literal","optional","url","file","resolveFile","slug","input","req","undefined","collectionSlug","error","Error","message","uploadConfig","payload","collections","config","upload","maxFileSize","limits","fileSize","decodeBase64","value","mimetype","length","pasteURL","URL","includes","protocol","allowList","getURLFilename","externalFileHeaderFilter","split","Number","isFinite","normalized","replace","test","paddingLength","endsWith","decodedSize","Math","floor","Buffer","from","toString","pathSegment","pathname","pop","decodeURIComponent"],"mappings":"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"}
+{"version":3,"sources":["../../../../src/mcp/builtin/collections/fileInput.ts"],"sourcesContent":["import type { CollectionSlug, File, PayloadRequest } from 'payload'\n\nimport { APIError, z } from 'payload'\nimport {\n  externalURLInputSchema,\n  getFileFromUploadInstructions,\n  resolveURLUploadInput,\n} from 'payload/internal'\nimport { sanitizeFilename } from 'payload/shared'\n\nconst mimeTypeSchema = z\n  .string()\n  .check(\n    z.regex(\n      /^[!#$%&'*+.^`|~\\w-]+\\/[!#$%&'*+.^`|~\\w-]+$/,\n      'MIME type must use the type/subtype format',\n    ),\n  )\n\nconst uploadFileSchema = z.strictObject({\n  filename: z.string(),\n  mimeType: z.string(),\n  size: z.int().check(z.nonnegative()),\n  uploadReference: z.record(z.string(), z.unknown()),\n})\n\nexport const fileInputSchema = z\n  .discriminatedUnion('source', [\n    z.strictObject({\n      name: z.string().check(z.minLength(1), z.describe('The file name, including its extension.')),\n      data: z\n        .string()\n        .check(z.describe('The base64-encoded file bytes, without a data URL prefix.')),\n      mimeType: mimeTypeSchema.check(z.describe('The file MIME type, for example image/png.')),\n      source: z.literal('base64'),\n    }),\n    externalURLInputSchema,\n    z.strictObject({\n      file: uploadFileSchema.check(z.describe('getUploadInstructions file field post-upload.')),\n      source: z.literal('uploadReference'),\n    }),\n  ])\n  .check(\n    z.describe(\n      'A file for an upload collection. Prefer uploadReference after its upload succeeds; use base64 only for small local files or externalURL for an online file.',\n    ),\n  )\n\ntype FileInput = z.infer<typeof fileInputSchema>\n\nexport async function resolveFile({\n  slug,\n  input,\n  req,\n}: {\n  input?: FileInput\n  req: PayloadRequest\n  slug: CollectionSlug\n}): Promise<File | undefined> {\n  if (!input) {\n    return undefined\n  }\n\n  if (input.source === 'uploadReference') {\n    try {\n      return await getFileFromUploadInstructions({ collectionSlug: slug, file: input.file, req })\n    } catch (error) {\n      if (error instanceof Error && error.message === 'Staged upload was not found.') {\n        throw new APIError(\n          'Staged upload not found. Complete the upload action first, or use base64 for small local files.',\n          400,\n        )\n      }\n      throw error\n    }\n  }\n\n  if (input.source === 'externalURL') {\n    return resolveURLUploadInput({ slug, input, req })\n  }\n\n  const uploadConfig = req.payload.collections[slug]?.config.upload\n\n  if (!uploadConfig) {\n    throw new APIError(`Collection \"${slug}\" does not support file uploads.`, 400)\n  }\n\n  const maxFileSize = req.payload.config.upload.limits?.fileSize\n  const data = decodeBase64({ maxFileSize, value: input.data })\n  const file: File = {\n    name: sanitizeFilename(input.name),\n    data,\n    mimetype: input.mimeType,\n    size: data.length,\n  }\n\n  if (maxFileSize !== undefined && Number.isFinite(maxFileSize) && file.size > maxFileSize) {\n    throw new APIError(`File exceeds the ${maxFileSize} byte upload limit.`, 400)\n  }\n\n  return file\n}\n\nfunction decodeBase64({ maxFileSize, value }: { maxFileSize?: number; value: string }): Buffer {\n  const normalized = value.replace(/\\s/g, '')\n\n  if (!/^[a-z0-9+/]*={0,2}$/i.test(normalized) || normalized.length % 4 === 1) {\n    throw new APIError('File data must be valid base64.', 400)\n  }\n\n  if (maxFileSize !== undefined && Number.isFinite(maxFileSize)) {\n    const paddingLength = normalized.endsWith('==') ? 2 : normalized.endsWith('=') ? 1 : 0\n    const decodedSize = Math.floor((normalized.length * 3) / 4) - paddingLength\n\n    if (decodedSize > maxFileSize) {\n      throw new APIError(`File exceeds the ${maxFileSize} byte upload limit.`, 400)\n    }\n  }\n\n  const data = Buffer.from(normalized, 'base64')\n\n  if (data.toString('base64').replace(/=+$/, '') !== normalized.replace(/=+$/, '')) {\n    throw new APIError('File data must be valid base64.', 400)\n  }\n\n  return data\n}\n"],"names":["APIError","z","externalURLInputSchema","getFileFromUploadInstructions","resolveURLUploadInput","sanitizeFilename","mimeTypeSchema","string","check","regex","uploadFileSchema","strictObject","filename","mimeType","size","int","nonnegative","uploadReference","record","unknown","fileInputSchema","discriminatedUnion","name","minLength","describe","data","source","literal","file","resolveFile","slug","input","req","undefined","collectionSlug","error","Error","message","uploadConfig","payload","collections","config","upload","maxFileSize","limits","fileSize","decodeBase64","value","mimetype","length","Number","isFinite","normalized","replace","test","paddingLength","endsWith","decodedSize","Math","floor","Buffer","from","toString"],"mappings":"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"}

package/dist/mcp/builtin/collections/findTool.js

@@ -1,4 +1,4 @@
-import { findDocumentsInputSchema } from 'payload';
+import { findDocumentsInputSchema, parseDocumentID } from 'payload';
 import { defaultAccess } from '../../../defaultAccess.js';
 import { defineCollectionTool } from '../../../defineTool.js';
 import { getLogger } from '../../../utils/getLogger.js';
@@ -22,10 +22,14 @@ export const findDocumentsTool = defineCollectionTool({
     const { id, depth, draft, fallbackLocale, joins, limit, locale, page, pagination, populate, select, sort, trash, where } = input;
     logger.info(`Reading document from collection: ${slug}${id ? ` with ID: ${id}` : ''}, limit: ${limit}, page: ${page}${locale ? `, locale: ${locale}` : ''}`);
     try {
-        if (id) {
+        if (id !== undefined) {
             try {
                 const doc = await payload.findByID({
-                    id,
+                    id: parseDocumentID({
+                        id,
+                        collectionSlug: slug,
+                        payload
+                    }),
                     collection: slug,
                     depth,
                     overrideAccess: authorizedMCP.overrideAccess,

package/dist/mcp/builtin/collections/findTool.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/mcp/builtin/collections/findTool.ts"],"sourcesContent":["import { findDocumentsInputSchema } from 'payload'\n\nimport { defaultAccess } from '../../../defaultAccess.js'\nimport { defineCollectionTool } from '../../../defineTool.js'\nimport { getLogger } from '../../../utils/getLogger.js'\n\nconst DEFAULT_DESCRIPTION =\n  'Find documents in any collection by passing the collection slug and optional ID or where clause.'\n\nexport const findDocumentsTool = defineCollectionTool({\n  access: (args) =>\n    defaultAccess(args) && Boolean(args.permissions?.collections?.[args.slug]?.read),\n  annotations: {\n    destructiveHint: false,\n    idempotentHint: true,\n    openWorldHint: false,\n    readOnlyHint: true,\n    title: 'Find Documents',\n  },\n  description: DEFAULT_DESCRIPTION,\n  input: findDocumentsInputSchema,\n}).handler(async ({ slug, authorizedMCP, input, req }) => {\n  const payload = req.payload\n  const logger = getLogger({ payload })\n\n  const {\n    id,\n    depth,\n    draft,\n    fallbackLocale,\n    joins,\n    limit,\n    locale,\n    page,\n    pagination,\n    populate,\n    select,\n    sort,\n    trash,\n    where,\n  } = input\n\n  logger.info(\n    `Reading document from collection: ${slug}${id ? ` with ID: ${id}` : ''}, limit: ${limit}, page: ${page}${locale ? `, locale: ${locale}` : ''}`,\n  )\n\n  try {\n    if (id) {\n      try {\n        const doc = await payload.findByID({\n          id,\n          collection: slug,\n          depth,\n          overrideAccess: authorizedMCP.overrideAccess,\n          req,\n          ...(select && { select }),\n          ...(populate && { populate }),\n          ...(joins !== undefined && { joins }),\n          ...(locale && { locale }),\n          ...(fallbackLocale !== undefined && { fallbackLocale }),\n          ...(draft !== undefined && { draft }),\n          ...(trash !== undefined && { trash }),\n        })\n\n        return {\n          content: [\n            {\n              type: 'text',\n              text: `Document from collection \"${slug}\":\\n${JSON.stringify(doc)}`,\n            },\n          ],\n          doc: doc as Record<string, unknown>,\n        }\n      } catch {\n        logger.warn(`Document not found with ID: ${id} in collection: ${slug}`)\n        return {\n          content: [\n            {\n              type: 'text',\n              text: `Error: Document with ID \"${id}\" not found in collection \"${slug}\"`,\n            },\n          ],\n        }\n      }\n    }\n\n    const findOptions: Parameters<typeof payload.find>[0] = {\n      collection: slug,\n      depth,\n      limit,\n      overrideAccess: authorizedMCP.overrideAccess,\n      page,\n      req,\n      ...(select && { select }),\n      ...(populate && { populate }),\n      ...(joins !== undefined && { joins }),\n      ...(locale && { locale }),\n      ...(fallbackLocale !== undefined && { fallbackLocale }),\n      ...(draft !== undefined && { draft }),\n      ...(pagination !== undefined && { pagination }),\n      ...(trash !== undefined && { trash }),\n    }\n\n    if (sort) {\n      findOptions.sort = sort\n    }\n    if (where) {\n      findOptions.where = where\n    }\n\n    const result = await payload.find(findOptions)\n\n    let responseText = `Collection: \"${slug}\"\\nTotal: ${result.totalDocs} documents\\nPage: ${result.page} of ${result.totalPages}\\n`\n    for (const doc of result.docs) {\n      responseText += `\\n\\`\\`\\`json\\n${JSON.stringify(doc)}\\n\\`\\`\\``\n    }\n\n    return {\n      content: [{ type: 'text', text: responseText }],\n      doc: result as unknown as Record<string, unknown>,\n    }\n  } catch (error) {\n    const errorMessage = error instanceof Error ? error.message : 'Unknown error'\n    logger.error(`Error reading documents from collection ${slug}: ${errorMessage}`)\n    return {\n      content: [\n        {\n          type: 'text',\n          text: `❌ **Error reading documents from collection \"${slug}\":** ${errorMessage}`,\n        },\n      ],\n    }\n  }\n})\n"],"names":["findDocumentsInputSchema","defaultAccess","defineCollectionTool","getLogger","DEFAULT_DESCRIPTION","findDocumentsTool","access","args","Boolean","permissions","collections","slug","read","annotations","destructiveHint","idempotentHint","openWorldHint","readOnlyHint","title","description","input","handler","authorizedMCP","req","payload","logger","id","depth","draft","fallbackLocale","joins","limit","locale","page","pagination","populate","select","sort","trash","where","info","doc","findByID","collection","overrideAccess","undefined","content","type","text","JSON","stringify","warn","findOptions","result","find","responseText","totalDocs","totalPages","docs","error","errorMessage","Error","message"],"mappings":"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"}
+{"version":3,"sources":["../../../../src/mcp/builtin/collections/findTool.ts"],"sourcesContent":["import { findDocumentsInputSchema, parseDocumentID } from 'payload'\n\nimport { defaultAccess } from '../../../defaultAccess.js'\nimport { defineCollectionTool } from '../../../defineTool.js'\nimport { getLogger } from '../../../utils/getLogger.js'\n\nconst DEFAULT_DESCRIPTION =\n  'Find documents in any collection by passing the collection slug and optional ID or where clause.'\n\nexport const findDocumentsTool = defineCollectionTool({\n  access: (args) =>\n    defaultAccess(args) && Boolean(args.permissions?.collections?.[args.slug]?.read),\n  annotations: {\n    destructiveHint: false,\n    idempotentHint: true,\n    openWorldHint: false,\n    readOnlyHint: true,\n    title: 'Find Documents',\n  },\n  description: DEFAULT_DESCRIPTION,\n  input: findDocumentsInputSchema,\n}).handler(async ({ slug, authorizedMCP, input, req }) => {\n  const payload = req.payload\n  const logger = getLogger({ payload })\n\n  const {\n    id,\n    depth,\n    draft,\n    fallbackLocale,\n    joins,\n    limit,\n    locale,\n    page,\n    pagination,\n    populate,\n    select,\n    sort,\n    trash,\n    where,\n  } = input\n\n  logger.info(\n    `Reading document from collection: ${slug}${id ? ` with ID: ${id}` : ''}, limit: ${limit}, page: ${page}${locale ? `, locale: ${locale}` : ''}`,\n  )\n\n  try {\n    if (id !== undefined) {\n      try {\n        const doc = await payload.findByID({\n          id: parseDocumentID({ id, collectionSlug: slug, payload }),\n          collection: slug,\n          depth,\n          overrideAccess: authorizedMCP.overrideAccess,\n          req,\n          ...(select && { select }),\n          ...(populate && { populate }),\n          ...(joins !== undefined && { joins }),\n          ...(locale && { locale }),\n          ...(fallbackLocale !== undefined && { fallbackLocale }),\n          ...(draft !== undefined && { draft }),\n          ...(trash !== undefined && { trash }),\n        })\n\n        return {\n          content: [\n            {\n              type: 'text',\n              text: `Document from collection \"${slug}\":\\n${JSON.stringify(doc)}`,\n            },\n          ],\n          doc: doc as Record<string, unknown>,\n        }\n      } catch {\n        logger.warn(`Document not found with ID: ${id} in collection: ${slug}`)\n        return {\n          content: [\n            {\n              type: 'text',\n              text: `Error: Document with ID \"${id}\" not found in collection \"${slug}\"`,\n            },\n          ],\n        }\n      }\n    }\n\n    const findOptions: Parameters<typeof payload.find>[0] = {\n      collection: slug,\n      depth,\n      limit,\n      overrideAccess: authorizedMCP.overrideAccess,\n      page,\n      req,\n      ...(select && { select }),\n      ...(populate && { populate }),\n      ...(joins !== undefined && { joins }),\n      ...(locale && { locale }),\n      ...(fallbackLocale !== undefined && { fallbackLocale }),\n      ...(draft !== undefined && { draft }),\n      ...(pagination !== undefined && { pagination }),\n      ...(trash !== undefined && { trash }),\n    }\n\n    if (sort) {\n      findOptions.sort = sort\n    }\n    if (where) {\n      findOptions.where = where\n    }\n\n    const result = await payload.find(findOptions)\n\n    let responseText = `Collection: \"${slug}\"\\nTotal: ${result.totalDocs} documents\\nPage: ${result.page} of ${result.totalPages}\\n`\n    for (const doc of result.docs) {\n      responseText += `\\n\\`\\`\\`json\\n${JSON.stringify(doc)}\\n\\`\\`\\``\n    }\n\n    return {\n      content: [{ type: 'text', text: responseText }],\n      doc: result as unknown as Record<string, unknown>,\n    }\n  } catch (error) {\n    const errorMessage = error instanceof Error ? error.message : 'Unknown error'\n    logger.error(`Error reading documents from collection ${slug}: ${errorMessage}`)\n    return {\n      content: [\n        {\n          type: 'text',\n          text: `❌ **Error reading documents from collection \"${slug}\":** ${errorMessage}`,\n        },\n      ],\n    }\n  }\n})\n"],"names":["findDocumentsInputSchema","parseDocumentID","defaultAccess","defineCollectionTool","getLogger","DEFAULT_DESCRIPTION","findDocumentsTool","access","args","Boolean","permissions","collections","slug","read","annotations","destructiveHint","idempotentHint","openWorldHint","readOnlyHint","title","description","input","handler","authorizedMCP","req","payload","logger","id","depth","draft","fallbackLocale","joins","limit","locale","page","pagination","populate","select","sort","trash","where","info","undefined","doc","findByID","collectionSlug","collection","overrideAccess","content","type","text","JSON","stringify","warn","findOptions","result","find","responseText","totalDocs","totalPages","docs","error","errorMessage","Error","message"],"mappings":"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"}

package/dist/mcp/builtin/collections/updateTool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"updateTool.d.ts","sourceRoot":"","sources":["../../../../src/mcp/builtin/collections/updateTool.ts"],"names":[],"mappings":"AAoBA,eAAO,MAAM,kBAAkB,4CAwJ7B,CAAA"}
+{"version":3,"file":"updateTool.d.ts","sourceRoot":"","sources":["../../../../src/mcp/builtin/collections/updateTool.ts"],"names":[],"mappings":"AAqBA,eAAO,MAAM,kBAAkB,4CAuJ7B,CAAA"}

package/dist/mcp/builtin/collections/updateTool.js

@@ -1,10 +1,9 @@
-import { getCollectionInputSchema, getCollectionVirtualFieldNames, stripVirtualFields, transformPointDataToPayload, updateDocumentInputSchema } from 'payload';
+import { getCollectionInputSchema, getCollectionVirtualFieldNames, parseDocumentID, stripVirtualFields, transformPointDataToPayload, updateDocumentInputSchema, validateCollectionData } from 'payload';
 import { defaultAccess } from '../../../defaultAccess.js';
 import { defineCollectionTool } from '../../../defineTool.js';
 import { getLogger } from '../../../utils/getLogger.js';
-import { validateCollectionData } from '../validateEntityData.js';
+import { formatEntityError } from '../formatEntityError.js';
 import { fileInputSchema, resolveFile } from './fileInput.js';
-import { formatCollectionError } from './formatCollectionError.js';
 const DEFAULT_DESCRIPTION = 'Update documents. Prefer uploadReference after upload, externalURL for URLs, or base64 for small local files.';
 export const updateDocumentTool = defineCollectionTool({
     access: (args)=>defaultAccess(args) && Boolean(args.permissions?.collections?.[args.slug]?.update),
@@ -24,20 +23,17 @@ export const updateDocumentTool = defineCollectionTool({
     const logger = getLogger({
         payload
     });
-    const { id, data, depth, draft, fallbackLocale, file: fileInput, limit, locale, overrideLock, populate, publishAllLocales, select, sort, trash, unpublishAllLocales, where } = input;
+    const { id, data, depth, draft, fallbackLocale, file: fileInput, limit, locale, overrideLock, populate, publishAllLocales, returning, select, sort, trash, unpublishAllLocales, where } = input;
     logger.info(`Updating document in collection: ${slug}${id ? ` with ID: ${id}` : ' with where clause'}, draft: ${draft}${locale ? `, locale: ${locale}` : ''}`);
     try {
         const virtualFieldNames = getCollectionVirtualFieldNames(payload.config, slug);
         const inputData = stripVirtualFields(data, virtualFieldNames);
-        const validationError = validateCollectionData({
+        validateCollectionData({
             slug,
             data: inputData,
             partial: true,
             req
         });
-        if (validationError) {
-            return validationError;
-        }
         const parsedData = transformPointDataToPayload(inputData);
         const file = await resolveFile({
             slug,
@@ -47,7 +43,11 @@ export const updateDocumentTool = defineCollectionTool({
         const whereClause = where ?? {};
         if (id !== undefined) {
             const result = await payload.update({
-                id,
+                id: parseDocumentID({
+                    id,
+                    collectionSlug: slug,
+                    payload
+                }),
                 collection: slug,
                 data: parsedData,
                 depth,
@@ -59,21 +59,26 @@ export const updateDocumentTool = defineCollectionTool({
                 populate,
                 publishAllLocales,
                 req,
-                select,
+                select: returning ? select : {
+                    id: true
+                },
                 trash,
                 unpublishAllLocales,
                 ...file ? {
                     file
                 } : {}
             });
+            const responseResult = returning ? result : {
+                id: result.id
+            };
             return {
                 content: [
                     {
                         type: 'text',
-                        text: `Document updated successfully in collection "${slug}"!\nUpdated document:\n\`\`\`json\n${JSON.stringify(result)}\n\`\`\``
+                        text: `Document updated successfully in collection "${slug}"!\nResult:\n\`\`\`json\n${JSON.stringify(responseResult)}\n\`\`\``
                     }
                 ],
-                doc: result
+                doc: responseResult
             };
         }
         const result = await payload.update({
@@ -89,7 +94,9 @@ export const updateDocumentTool = defineCollectionTool({
             populate,
             publishAllLocales,
             req,
-            select,
+            select: returning ? select : {
+                id: true
+            },
             sort,
             trash,
             unpublishAllLocales,
@@ -98,7 +105,9 @@ export const updateDocumentTool = defineCollectionTool({
                 file
             } : {}
         });
-        const docs = result.docs || [];
+        const docs = returning ? result.docs : result.docs.map(({ id })=>({
+                id
+            }));
         const errors = result.errors || [];
         let responseText = `Multiple documents updated in collection "${slug}"!\nUpdated: ${docs.length} documents\nErrors: ${errors.length}\n---`;
         if (docs.length > 0) {
@@ -150,9 +159,10 @@ export const updateDocumentTool = defineCollectionTool({
     } catch (error) {
         const errorMessage = error instanceof Error ? error.message : 'Unknown error';
         logger.error(`Error updating document in ${slug}: ${errorMessage}`);
-        return formatCollectionError({
+        return formatEntityError({
             slug,
             action: 'updating',
+            entity: 'collection',
             error,
             req
         });

package/dist/mcp/builtin/collections/updateTool.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/mcp/builtin/collections/updateTool.ts"],"sourcesContent":["import type { Where } from 'payload'\n\nimport {\n  getCollectionInputSchema,\n  getCollectionVirtualFieldNames,\n  stripVirtualFields,\n  transformPointDataToPayload,\n  updateDocumentInputSchema,\n} from 'payload'\n\nimport { defaultAccess } from '../../../defaultAccess.js'\nimport { defineCollectionTool } from '../../../defineTool.js'\nimport { getLogger } from '../../../utils/getLogger.js'\nimport { validateCollectionData } from '../validateEntityData.js'\nimport { fileInputSchema, resolveFile } from './fileInput.js'\nimport { formatCollectionError } from './formatCollectionError.js'\n\nconst DEFAULT_DESCRIPTION =\n  'Update documents. Prefer uploadReference after upload, externalURL for URLs, or base64 for small local files.'\n\nexport const updateDocumentTool = defineCollectionTool({\n  access: (args) =>\n    defaultAccess(args) && Boolean(args.permissions?.collections?.[args.slug]?.update),\n  annotations: {\n    destructiveHint: true,\n    idempotentHint: false,\n    openWorldHint: false,\n    readOnlyHint: false,\n    title: 'Update Document',\n  },\n  description: DEFAULT_DESCRIPTION,\n  input: updateDocumentInputSchema({ file: fileInputSchema }),\n}).handler(async ({ slug, authorizedMCP, input, req }) => {\n  const payload = req.payload\n  const logger = getLogger({ payload })\n\n  const {\n    id,\n    data,\n    depth,\n    draft,\n    fallbackLocale,\n    file: fileInput,\n    limit,\n    locale,\n    overrideLock,\n    populate,\n    publishAllLocales,\n    select,\n    sort,\n    trash,\n    unpublishAllLocales,\n    where,\n  } = input\n\n  logger.info(\n    `Updating document in collection: ${slug}${id ? ` with ID: ${id}` : ' with where clause'}, draft: ${draft}${locale ? `, locale: ${locale}` : ''}`,\n  )\n\n  try {\n    const virtualFieldNames = getCollectionVirtualFieldNames(payload.config, slug)\n    const inputData = stripVirtualFields(data, virtualFieldNames)\n    const validationError = validateCollectionData({\n      slug,\n      data: inputData,\n      partial: true,\n      req,\n    })\n\n    if (validationError) {\n      return validationError\n    }\n\n    const parsedData = transformPointDataToPayload(inputData)\n    const file = await resolveFile({ slug, input: fileInput, req })\n\n    const whereClause: Where = where ?? {}\n\n    if (id !== undefined) {\n      const result = await payload.update({\n        id,\n        collection: slug,\n        data: parsedData,\n        depth,\n        draft,\n        fallbackLocale,\n        locale,\n        overrideAccess: authorizedMCP.overrideAccess,\n        overrideLock,\n        populate,\n        publishAllLocales,\n        req,\n        select,\n        trash,\n        unpublishAllLocales,\n        ...(file ? { file } : {}),\n      })\n\n      return {\n        content: [\n          {\n            type: 'text',\n            text: `Document updated successfully in collection \"${slug}\"!\\nUpdated document:\\n\\`\\`\\`json\\n${JSON.stringify(result)}\\n\\`\\`\\``,\n          },\n        ],\n        doc: result as Record<string, unknown>,\n      }\n    }\n\n    const result = await payload.update({\n      collection: slug,\n      data: parsedData,\n      depth,\n      draft,\n      fallbackLocale,\n      limit,\n      locale,\n      overrideAccess: authorizedMCP.overrideAccess,\n      overrideLock,\n      populate,\n      publishAllLocales,\n      req,\n      select,\n      sort,\n      trash,\n      unpublishAllLocales,\n      where: whereClause,\n      ...(file ? { file } : {}),\n    })\n\n    const docs = result.docs || []\n    const errors = result.errors || []\n\n    let responseText = `Multiple documents updated in collection \"${slug}\"!\\nUpdated: ${docs.length} documents\\nErrors: ${errors.length}\\n---`\n    if (docs.length > 0) {\n      responseText += `\\n\\nUpdated documents:\\n\\`\\`\\`json\\n${JSON.stringify(docs)}\\n\\`\\`\\``\n    }\n    if (errors.length > 0) {\n      responseText += `\\n\\nErrors:\\n\\`\\`\\`json\\n${JSON.stringify(errors)}\\n\\`\\`\\``\n\n      const errorSchema = getCollectionInputSchema({ collectionSlug: slug, req })\n\n      if (errorSchema) {\n        responseText += `\\n\\nUse this schema for data:\\n\\`\\`\\`json\\n${JSON.stringify(errorSchema)}\\n\\`\\`\\``\n      }\n\n      return {\n        content: [{ type: 'text', text: responseText }],\n        doc: { docs, errors } as unknown as Record<string, unknown>,\n        isError: true,\n        ...(errorSchema\n          ? {\n              structuredContent: {\n                slug,\n                docs,\n                errors,\n                schema: errorSchema,\n              },\n            }\n          : {}),\n      }\n    }\n\n    return {\n      content: [{ type: 'text', text: responseText }],\n      doc: { docs, errors } as unknown as Record<string, unknown>,\n    }\n  } catch (error) {\n    const errorMessage = error instanceof Error ? error.message : 'Unknown error'\n    logger.error(`Error updating document in ${slug}: ${errorMessage}`)\n    return formatCollectionError({ slug, action: 'updating', error, req })\n  }\n})\n"],"names":["getCollectionInputSchema","getCollectionVirtualFieldNames","stripVirtualFields","transformPointDataToPayload","updateDocumentInputSchema","defaultAccess","defineCollectionTool","getLogger","validateCollectionData","fileInputSchema","resolveFile","formatCollectionError","DEFAULT_DESCRIPTION","updateDocumentTool","access","args","Boolean","permissions","collections","slug","update","annotations","destructiveHint","idempotentHint","openWorldHint","readOnlyHint","title","description","input","file","handler","authorizedMCP","req","payload","logger","id","data","depth","draft","fallbackLocale","fileInput","limit","locale","overrideLock","populate","publishAllLocales","select","sort","trash","unpublishAllLocales","where","info","virtualFieldNames","config","inputData","validationError","partial","parsedData","whereClause","undefined","result","collection","overrideAccess","content","type","text","JSON","stringify","doc","docs","errors","responseText","length","errorSchema","collectionSlug","isError","structuredContent","schema","error","errorMessage","Error","message","action"],"mappings":"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"}
+{"version":3,"sources":["../../../../src/mcp/builtin/collections/updateTool.ts"],"sourcesContent":["import type { Where } from 'payload'\n\nimport {\n  getCollectionInputSchema,\n  getCollectionVirtualFieldNames,\n  parseDocumentID,\n  stripVirtualFields,\n  transformPointDataToPayload,\n  updateDocumentInputSchema,\n  validateCollectionData,\n} from 'payload'\n\nimport { defaultAccess } from '../../../defaultAccess.js'\nimport { defineCollectionTool } from '../../../defineTool.js'\nimport { getLogger } from '../../../utils/getLogger.js'\nimport { formatEntityError } from '../formatEntityError.js'\nimport { fileInputSchema, resolveFile } from './fileInput.js'\n\nconst DEFAULT_DESCRIPTION =\n  'Update documents. Prefer uploadReference after upload, externalURL for URLs, or base64 for small local files.'\n\nexport const updateDocumentTool = defineCollectionTool({\n  access: (args) =>\n    defaultAccess(args) && Boolean(args.permissions?.collections?.[args.slug]?.update),\n  annotations: {\n    destructiveHint: true,\n    idempotentHint: false,\n    openWorldHint: false,\n    readOnlyHint: false,\n    title: 'Update Document',\n  },\n  description: DEFAULT_DESCRIPTION,\n  input: updateDocumentInputSchema({ file: fileInputSchema }),\n}).handler(async ({ slug, authorizedMCP, input, req }) => {\n  const payload = req.payload\n  const logger = getLogger({ payload })\n\n  const {\n    id,\n    data,\n    depth,\n    draft,\n    fallbackLocale,\n    file: fileInput,\n    limit,\n    locale,\n    overrideLock,\n    populate,\n    publishAllLocales,\n    returning,\n    select,\n    sort,\n    trash,\n    unpublishAllLocales,\n    where,\n  } = input\n\n  logger.info(\n    `Updating document in collection: ${slug}${id ? ` with ID: ${id}` : ' with where clause'}, draft: ${draft}${locale ? `, locale: ${locale}` : ''}`,\n  )\n\n  try {\n    const virtualFieldNames = getCollectionVirtualFieldNames(payload.config, slug)\n    const inputData = stripVirtualFields(data, virtualFieldNames)\n    validateCollectionData({\n      slug,\n      data: inputData,\n      partial: true,\n      req,\n    })\n\n    const parsedData = transformPointDataToPayload(inputData)\n    const file = await resolveFile({ slug, input: fileInput, req })\n\n    const whereClause: Where = where ?? {}\n\n    if (id !== undefined) {\n      const result = await payload.update({\n        id: parseDocumentID({ id, collectionSlug: slug, payload }),\n        collection: slug,\n        data: parsedData,\n        depth,\n        draft,\n        fallbackLocale,\n        locale,\n        overrideAccess: authorizedMCP.overrideAccess,\n        overrideLock,\n        populate,\n        publishAllLocales,\n        req,\n        select: returning ? select : { id: true },\n        trash,\n        unpublishAllLocales,\n        ...(file ? { file } : {}),\n      })\n\n      const responseResult = returning ? result : { id: result.id }\n\n      return {\n        content: [\n          {\n            type: 'text',\n            text: `Document updated successfully in collection \"${slug}\"!\\nResult:\\n\\`\\`\\`json\\n${JSON.stringify(responseResult)}\\n\\`\\`\\``,\n          },\n        ],\n        doc: responseResult as Record<string, unknown>,\n      }\n    }\n\n    const result = await payload.update({\n      collection: slug,\n      data: parsedData,\n      depth,\n      draft,\n      fallbackLocale,\n      limit,\n      locale,\n      overrideAccess: authorizedMCP.overrideAccess,\n      overrideLock,\n      populate,\n      publishAllLocales,\n      req,\n      select: returning ? select : { id: true },\n      sort,\n      trash,\n      unpublishAllLocales,\n      where: whereClause,\n      ...(file ? { file } : {}),\n    })\n\n    const docs = returning ? result.docs : result.docs.map(({ id }) => ({ id }))\n    const errors = result.errors || []\n\n    let responseText = `Multiple documents updated in collection \"${slug}\"!\\nUpdated: ${docs.length} documents\\nErrors: ${errors.length}\\n---`\n    if (docs.length > 0) {\n      responseText += `\\n\\nUpdated documents:\\n\\`\\`\\`json\\n${JSON.stringify(docs)}\\n\\`\\`\\``\n    }\n    if (errors.length > 0) {\n      responseText += `\\n\\nErrors:\\n\\`\\`\\`json\\n${JSON.stringify(errors)}\\n\\`\\`\\``\n\n      const errorSchema = getCollectionInputSchema({ collectionSlug: slug, req })\n\n      if (errorSchema) {\n        responseText += `\\n\\nUse this schema for data:\\n\\`\\`\\`json\\n${JSON.stringify(errorSchema)}\\n\\`\\`\\``\n      }\n\n      return {\n        content: [{ type: 'text', text: responseText }],\n        doc: { docs, errors } as unknown as Record<string, unknown>,\n        isError: true,\n        ...(errorSchema\n          ? {\n              structuredContent: {\n                slug,\n                docs,\n                errors,\n                schema: errorSchema,\n              },\n            }\n          : {}),\n      }\n    }\n\n    return {\n      content: [{ type: 'text', text: responseText }],\n      doc: { docs, errors } as unknown as Record<string, unknown>,\n    }\n  } catch (error) {\n    const errorMessage = error instanceof Error ? error.message : 'Unknown error'\n    logger.error(`Error updating document in ${slug}: ${errorMessage}`)\n    return formatEntityError({ slug, action: 'updating', entity: 'collection', error, req })\n  }\n})\n"],"names":["getCollectionInputSchema","getCollectionVirtualFieldNames","parseDocumentID","stripVirtualFields","transformPointDataToPayload","updateDocumentInputSchema","validateCollectionData","defaultAccess","defineCollectionTool","getLogger","formatEntityError","fileInputSchema","resolveFile","DEFAULT_DESCRIPTION","updateDocumentTool","access","args","Boolean","permissions","collections","slug","update","annotations","destructiveHint","idempotentHint","openWorldHint","readOnlyHint","title","description","input","file","handler","authorizedMCP","req","payload","logger","id","data","depth","draft","fallbackLocale","fileInput","limit","locale","overrideLock","populate","publishAllLocales","returning","select","sort","trash","unpublishAllLocales","where","info","virtualFieldNames","config","inputData","partial","parsedData","whereClause","undefined","result","collectionSlug","collection","overrideAccess","responseResult","content","type","text","JSON","stringify","doc","docs","map","errors","responseText","length","errorSchema","isError","structuredContent","schema","error","errorMessage","Error","message","action","entity"],"mappings":"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"}

package/dist/mcp/builtin/formatEntityError.d.ts

@@ -0,0 +1,16 @@
+import type { CollectionSlug, GlobalSlug, PayloadRequest } from 'payload';
+import type { MCPToolResponse } from '../../types.js';
+export declare const formatEntityError: ({ slug, action, entity, error, req, }: {
+    action: 'creating' | 'duplicating' | 'updating';
+    entity: 'collection';
+    error: unknown;
+    req: PayloadRequest;
+    slug: CollectionSlug;
+} | {
+    action: 'updating';
+    entity: 'global';
+    error: unknown;
+    req: PayloadRequest;
+    slug: GlobalSlug;
+}) => MCPToolResponse;
+//# sourceMappingURL=formatEntityError.d.ts.map

package/dist/mcp/builtin/formatEntityError.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"formatEntityError.d.ts","sourceRoot":"","sources":["../../../src/mcp/builtin/formatEntityError.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAIzE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAErD,eAAO,MAAM,iBAAiB,0CAO1B;IACE,MAAM,EAAE,UAAU,GAAG,aAAa,GAAG,UAAU,CAAA;IAC/C,MAAM,EAAE,YAAY,CAAA;IACpB,KAAK,EAAE,OAAO,CAAA;IACd,GAAG,EAAE,cAAc,CAAA;IACnB,IAAI,EAAE,cAAc,CAAA;CACrB,GACD;IACE,MAAM,EAAE,UAAU,CAAA;IAClB,MAAM,EAAE,QAAQ,CAAA;IAChB,KAAK,EAAE,OAAO,CAAA;IACd,GAAG,EAAE,cAAc,CAAA;IACnB,IAAI,EAAE,UAAU,CAAA;CACjB,KAAG,eAsCP,CAAA"}

package/dist/mcp/builtin/formatEntityError.js

@@ -0,0 +1,55 @@
+import { getCollectionInputSchema, getGlobalInputSchema, ValidationError } from 'payload';
+export const formatEntityError = ({ slug, action, entity, error, req })=>{
+    const message = error instanceof Error ? error.message : 'Unknown error';
+    const target = entity === 'collection' ? `document in collection "${slug}"` : `global "${slug}"`;
+    if (!isValidationError(error, message)) {
+        return {
+            content: [
+                {
+                    type: 'text',
+                    text: `Error ${action} ${target}: ${message}`
+                }
+            ],
+            isError: true
+        };
+    }
+    const schema = entity === 'collection' ? getCollectionInputSchema({
+        collectionSlug: slug,
+        req
+    }) : getGlobalInputSchema({
+        globalSlug: slug,
+        req
+    });
+    const errors = error instanceof ValidationError ? error.data.errors : [
+        {
+            message
+        }
+    ];
+    const validationMessage = errors.map((issue)=>`${'path' in issue ? `${issue.path}: ` : ''}${issue.message}`).join('\n');
+    const schemaText = schema ? `\n\nUse this schema for data:\n\`\`\`json\n${JSON.stringify(schema)}\n\`\`\`` : '';
+    return {
+        content: [
+            {
+                type: 'text',
+                text: `Error ${action} ${target}: ${validationMessage}${schemaText}`
+            }
+        ],
+        isError: true,
+        ...schema ? {
+            structuredContent: {
+                slug,
+                errors,
+                schema
+            }
+        } : {}
+    };
+};
+const isValidationError = (error, message)=>{
+    if (error instanceof ValidationError) {
+        return true;
+    }
+    const name = error && typeof error === 'object' && 'name' in error ? error.name : undefined;
+    return name === 'CastError' || message.includes('Cast to ') || message.includes('validation failed');
+};
+
+//# sourceMappingURL=formatEntityError.js.map

package/dist/mcp/builtin/formatEntityError.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/mcp/builtin/formatEntityError.ts"],"sourcesContent":["import type { CollectionSlug, GlobalSlug, PayloadRequest } from 'payload'\n\nimport { getCollectionInputSchema, getGlobalInputSchema, ValidationError } from 'payload'\n\nimport type { MCPToolResponse } from '../../types.js'\n\nexport const formatEntityError = ({\n  slug,\n  action,\n  entity,\n  error,\n  req,\n}:\n  | {\n      action: 'creating' | 'duplicating' | 'updating'\n      entity: 'collection'\n      error: unknown\n      req: PayloadRequest\n      slug: CollectionSlug\n    }\n  | {\n      action: 'updating'\n      entity: 'global'\n      error: unknown\n      req: PayloadRequest\n      slug: GlobalSlug\n    }): MCPToolResponse => {\n  const message = error instanceof Error ? error.message : 'Unknown error'\n  const target = entity === 'collection' ? `document in collection \"${slug}\"` : `global \"${slug}\"`\n\n  if (!isValidationError(error, message)) {\n    return {\n      content: [{ type: 'text', text: `Error ${action} ${target}: ${message}` }],\n      isError: true,\n    }\n  }\n\n  const schema =\n    entity === 'collection'\n      ? getCollectionInputSchema({ collectionSlug: slug, req })\n      : getGlobalInputSchema({ globalSlug: slug, req })\n  const errors = error instanceof ValidationError ? error.data.errors : [{ message }]\n  const validationMessage = errors\n    .map((issue) => `${'path' in issue ? `${issue.path}: ` : ''}${issue.message}`)\n    .join('\\n')\n  const schemaText = schema\n    ? `\\n\\nUse this schema for data:\\n\\`\\`\\`json\\n${JSON.stringify(schema)}\\n\\`\\`\\``\n    : ''\n\n  return {\n    content: [\n      { type: 'text', text: `Error ${action} ${target}: ${validationMessage}${schemaText}` },\n    ],\n    isError: true,\n    ...(schema\n      ? {\n          structuredContent: {\n            slug,\n            errors,\n            schema,\n          },\n        }\n      : {}),\n  }\n}\n\nconst isValidationError = (error: unknown, message: string): boolean => {\n  if (error instanceof ValidationError) {\n    return true\n  }\n\n  const name = error && typeof error === 'object' && 'name' in error ? error.name : undefined\n\n  return (\n    name === 'CastError' || message.includes('Cast to ') || message.includes('validation failed')\n  )\n}\n"],"names":["getCollectionInputSchema","getGlobalInputSchema","ValidationError","formatEntityError","slug","action","entity","error","req","message","Error","target","isValidationError","content","type","text","isError","schema","collectionSlug","globalSlug","errors","data","validationMessage","map","issue","path","join","schemaText","JSON","stringify","structuredContent","name","undefined","includes"],"mappings":"AAEA,SAASA,wBAAwB,EAAEC,oBAAoB,EAAEC,eAAe,QAAQ,UAAS;AAIzF,OAAO,MAAMC,oBAAoB,CAAC,EAChCC,IAAI,EACJC,MAAM,EACNC,MAAM,EACNC,KAAK,EACLC,GAAG,EAeA;IACH,MAAMC,UAAUF,iBAAiBG,QAAQH,MAAME,OAAO,GAAG;IACzD,MAAME,SAASL,WAAW,eAAe,CAAC,wBAAwB,EAAEF,KAAK,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAEA,KAAK,CAAC,CAAC;IAEhG,IAAI,CAACQ,kBAAkBL,OAAOE,UAAU;QACtC,OAAO;YACLI,SAAS;gBAAC;oBAAEC,MAAM;oBAAQC,MAAM,CAAC,MAAM,EAAEV,OAAO,CAAC,EAAEM,OAAO,EAAE,EAAEF,SAAS;gBAAC;aAAE;YAC1EO,SAAS;QACX;IACF;IAEA,MAAMC,SACJX,WAAW,eACPN,yBAAyB;QAAEkB,gBAAgBd;QAAMI;IAAI,KACrDP,qBAAqB;QAAEkB,YAAYf;QAAMI;IAAI;IACnD,MAAMY,SAASb,iBAAiBL,kBAAkBK,MAAMc,IAAI,CAACD,MAAM,GAAG;QAAC;YAAEX;QAAQ;KAAE;IACnF,MAAMa,oBAAoBF,OACvBG,GAAG,CAAC,CAACC,QAAU,GAAG,UAAUA,QAAQ,GAAGA,MAAMC,IAAI,CAAC,EAAE,CAAC,GAAG,KAAKD,MAAMf,OAAO,EAAE,EAC5EiB,IAAI,CAAC;IACR,MAAMC,aAAaV,SACf,CAAC,2CAA2C,EAAEW,KAAKC,SAAS,CAACZ,QAAQ,QAAQ,CAAC,GAC9E;IAEJ,OAAO;QACLJ,SAAS;YACP;gBAAEC,MAAM;gBAAQC,MAAM,CAAC,MAAM,EAAEV,OAAO,CAAC,EAAEM,OAAO,EAAE,EAAEW,oBAAoBK,YAAY;YAAC;SACtF;QACDX,SAAS;QACT,GAAIC,SACA;YACEa,mBAAmB;gBACjB1B;gBACAgB;gBACAH;YACF;QACF,IACA,CAAC,CAAC;IACR;AACF,EAAC;AAED,MAAML,oBAAoB,CAACL,OAAgBE;IACzC,IAAIF,iBAAiBL,iBAAiB;QACpC,OAAO;IACT;IAEA,MAAM6B,OAAOxB,SAAS,OAAOA,UAAU,YAAY,UAAUA,QAAQA,MAAMwB,IAAI,GAAGC;IAElF,OACED,SAAS,eAAetB,QAAQwB,QAAQ,CAAC,eAAexB,QAAQwB,QAAQ,CAAC;AAE7E"}

package/dist/mcp/builtin/globals/updateTool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"updateTool.d.ts","sourceRoot":"","sources":["../../../../src/mcp/builtin/globals/updateTool.ts"],"names":[],"mappings":"AAcA,eAAO,MAAM,gBAAgB,wCAkF3B,CAAA"}
+{"version":3,"file":"updateTool.d.ts","sourceRoot":"","sources":["../../../../src/mcp/builtin/globals/updateTool.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,gBAAgB,wCA4E3B,CAAA"}

package/dist/mcp/builtin/globals/updateTool.js

@@ -1,8 +1,8 @@
-import { getGlobalVirtualFieldNames, stripVirtualFields, transformPointDataToPayload, updateGlobalInputSchema } from 'payload';
+import { getGlobalVirtualFieldNames, stripVirtualFields, transformPointDataToPayload, updateGlobalInputSchema, validateGlobalData } from 'payload';
 import { defaultAccess } from '../../../defaultAccess.js';
 import { defineGlobalTool } from '../../../defineTool.js';
 import { getLogger } from '../../../utils/getLogger.js';
-import { validateGlobalData } from '../validateEntityData.js';
+import { formatEntityError } from '../formatEntityError.js';
 const DEFAULT_DESCRIPTION = 'Update any Payload global by passing the global slug and data.';
 export const updateGlobalTool = defineGlobalTool({
     access: (args)=>defaultAccess(args) && Boolean(args.permissions?.globals?.[args.slug]?.update),
@@ -25,14 +25,11 @@ export const updateGlobalTool = defineGlobalTool({
     try {
         const virtualFieldNames = getGlobalVirtualFieldNames(payload.config, slug);
         const inputData = stripVirtualFields(data, virtualFieldNames);
-        const validationError = validateGlobalData({
+        validateGlobalData({
             slug,
             data: inputData,
             req
         });
-        if (validationError) {
-            return validationError;
-        }
         const parsedData = transformPointDataToPayload(inputData);
         const updateOptions = {
             slug,
@@ -66,16 +63,15 @@ export const updateGlobalTool = defineGlobalTool({
             doc: result
         };
     } catch (error) {
-        const errorMessage = error instanceof Error ? error.message : 'Unknown error';
-        logger.error(`Error updating global ${slug}: ${errorMessage}`);
-        return {
-            content: [
-                {
-                    type: 'text',
-                    text: `Error updating global "${slug}": ${errorMessage}`
-                }
-            ]
-        };
+        const message = error instanceof Error ? error.message : 'Unknown error';
+        logger.error(`Error updating global ${slug}: ${message}`);
+        return formatEntityError({
+            slug,
+            action: 'updating',
+            entity: 'global',
+            error,
+            req
+        });
     }
 });
 

package/dist/mcp/builtin/globals/updateTool.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/mcp/builtin/globals/updateTool.ts"],"sourcesContent":["import {\n  getGlobalVirtualFieldNames,\n  stripVirtualFields,\n  transformPointDataToPayload,\n  updateGlobalInputSchema,\n} from 'payload'\n\nimport { defaultAccess } from '../../../defaultAccess.js'\nimport { defineGlobalTool } from '../../../defineTool.js'\nimport { getLogger } from '../../../utils/getLogger.js'\nimport { validateGlobalData } from '../validateEntityData.js'\n\nconst DEFAULT_DESCRIPTION = 'Update any Payload global by passing the global slug and data.'\n\nexport const updateGlobalTool = defineGlobalTool({\n  access: (args) => defaultAccess(args) && Boolean(args.permissions?.globals?.[args.slug]?.update),\n  annotations: {\n    destructiveHint: true,\n    idempotentHint: false,\n    openWorldHint: false,\n    readOnlyHint: false,\n    title: 'Update Global',\n  },\n  description: DEFAULT_DESCRIPTION,\n  input: updateGlobalInputSchema,\n}).handler(async ({ slug, authorizedMCP, input, req }) => {\n  const payload = req.payload\n  const logger = getLogger({ payload })\n\n  const {\n    data,\n    depth,\n    draft,\n    fallbackLocale,\n    locale,\n    overrideLock,\n    populate,\n    publishAllLocales,\n    select,\n    unpublishAllLocales,\n  } = input\n\n  logger.info(`Updating global: ${slug}, draft: ${draft}${locale ? `, locale: ${locale}` : ''}`)\n\n  try {\n    const virtualFieldNames = getGlobalVirtualFieldNames(payload.config, slug)\n    const inputData = stripVirtualFields(data, virtualFieldNames)\n    const validationError = validateGlobalData({ slug, data: inputData, req })\n\n    if (validationError) {\n      return validationError\n    }\n\n    const parsedData = transformPointDataToPayload(inputData)\n\n    const updateOptions: Parameters<typeof payload.updateGlobal>[0] = {\n      slug,\n      data: parsedData,\n      depth,\n      draft,\n      overrideAccess: authorizedMCP.overrideAccess,\n      overrideLock,\n      populate,\n      publishAllLocales,\n      req,\n      unpublishAllLocales,\n    }\n\n    if (locale) {\n      updateOptions.locale = locale\n    }\n    if (fallbackLocale !== undefined) {\n      updateOptions.fallbackLocale = fallbackLocale\n    }\n    if (select) {\n      updateOptions.select = select\n    }\n\n    const result = await payload.updateGlobal(updateOptions)\n\n    return {\n      content: [\n        {\n          type: 'text',\n          text: `Global \"${slug}\" updated successfully!\\n\\`\\`\\`json\\n${JSON.stringify(result)}\\n\\`\\`\\``,\n        },\n      ],\n      doc: result as Record<string, unknown>,\n    }\n  } catch (error) {\n    const errorMessage = error instanceof Error ? error.message : 'Unknown error'\n    logger.error(`Error updating global ${slug}: ${errorMessage}`)\n    return {\n      content: [{ type: 'text', text: `Error updating global \"${slug}\": ${errorMessage}` }],\n    }\n  }\n})\n"],"names":["getGlobalVirtualFieldNames","stripVirtualFields","transformPointDataToPayload","updateGlobalInputSchema","defaultAccess","defineGlobalTool","getLogger","validateGlobalData","DEFAULT_DESCRIPTION","updateGlobalTool","access","args","Boolean","permissions","globals","slug","update","annotations","destructiveHint","idempotentHint","openWorldHint","readOnlyHint","title","description","input","handler","authorizedMCP","req","payload","logger","data","depth","draft","fallbackLocale","locale","overrideLock","populate","publishAllLocales","select","unpublishAllLocales","info","virtualFieldNames","config","inputData","validationError","parsedData","updateOptions","overrideAccess","undefined","result","updateGlobal","content","type","text","JSON","stringify","doc","error","errorMessage","Error","message"],"mappings":"AAAA,SACEA,0BAA0B,EAC1BC,kBAAkB,EAClBC,2BAA2B,EAC3BC,uBAAuB,QAClB,UAAS;AAEhB,SAASC,aAAa,QAAQ,4BAA2B;AACzD,SAASC,gBAAgB,QAAQ,yBAAwB;AACzD,SAASC,SAAS,QAAQ,8BAA6B;AACvD,SAASC,kBAAkB,QAAQ,2BAA0B;AAE7D,MAAMC,sBAAsB;AAE5B,OAAO,MAAMC,mBAAmBJ,iBAAiB;IAC/CK,QAAQ,CAACC,OAASP,cAAcO,SAASC,QAAQD,KAAKE,WAAW,EAAEC,SAAS,CAACH,KAAKI,IAAI,CAAC,EAAEC;IACzFC,aAAa;QACXC,iBAAiB;QACjBC,gBAAgB;QAChBC,eAAe;QACfC,cAAc;QACdC,OAAO;IACT;IACAC,aAAaf;IACbgB,OAAOrB;AACT,GAAGsB,OAAO,CAAC,OAAO,EAAEV,IAAI,EAAEW,aAAa,EAAEF,KAAK,EAAEG,GAAG,EAAE;IACnD,MAAMC,UAAUD,IAAIC,OAAO;IAC3B,MAAMC,SAASvB,UAAU;QAAEsB;IAAQ;IAEnC,MAAM,EACJE,IAAI,EACJC,KAAK,EACLC,KAAK,EACLC,cAAc,EACdC,MAAM,EACNC,YAAY,EACZC,QAAQ,EACRC,iBAAiB,EACjBC,MAAM,EACNC,mBAAmB,EACpB,GAAGf;IAEJK,OAAOW,IAAI,CAAC,CAAC,iBAAiB,EAAEzB,KAAK,SAAS,EAAEiB,QAAQE,SAAS,CAAC,UAAU,EAAEA,QAAQ,GAAG,IAAI;IAE7F,IAAI;QACF,MAAMO,oBAAoBzC,2BAA2B4B,QAAQc,MAAM,EAAE3B;QACrE,MAAM4B,YAAY1C,mBAAmB6B,MAAMW;QAC3C,MAAMG,kBAAkBrC,mBAAmB;YAAEQ;YAAMe,MAAMa;YAAWhB;QAAI;QAExE,IAAIiB,iBAAiB;YACnB,OAAOA;QACT;QAEA,MAAMC,aAAa3C,4BAA4ByC;QAE/C,MAAMG,gBAA4D;YAChE/B;YACAe,MAAMe;YACNd;YACAC;YACAe,gBAAgBrB,cAAcqB,cAAc;YAC5CZ;YACAC;YACAC;YACAV;YACAY;QACF;QAEA,IAAIL,QAAQ;YACVY,cAAcZ,MAAM,GAAGA;QACzB;QACA,IAAID,mBAAmBe,WAAW;YAChCF,cAAcb,cAAc,GAAGA;QACjC;QACA,IAAIK,QAAQ;YACVQ,cAAcR,MAAM,GAAGA;QACzB;QAEA,MAAMW,SAAS,MAAMrB,QAAQsB,YAAY,CAACJ;QAE1C,OAAO;YACLK,SAAS;gBACP;oBACEC,MAAM;oBACNC,MAAM,CAAC,QAAQ,EAAEtC,KAAK,qCAAqC,EAAEuC,KAAKC,SAAS,CAACN,QAAQ,QAAQ,CAAC;gBAC/F;aACD;YACDO,KAAKP;QACP;IACF,EAAE,OAAOQ,OAAO;QACd,MAAMC,eAAeD,iBAAiBE,QAAQF,MAAMG,OAAO,GAAG;QAC9D/B,OAAO4B,KAAK,CAAC,CAAC,sBAAsB,EAAE1C,KAAK,EAAE,EAAE2C,cAAc;QAC7D,OAAO;YACLP,SAAS;gBAAC;oBAAEC,MAAM;oBAAQC,MAAM,CAAC,uBAAuB,EAAEtC,KAAK,GAAG,EAAE2C,cAAc;gBAAC;aAAE;QACvF;IACF;AACF,GAAE"}
+{"version":3,"sources":["../../../../src/mcp/builtin/globals/updateTool.ts"],"sourcesContent":["import {\n  getGlobalVirtualFieldNames,\n  stripVirtualFields,\n  transformPointDataToPayload,\n  updateGlobalInputSchema,\n  validateGlobalData,\n} from 'payload'\n\nimport { defaultAccess } from '../../../defaultAccess.js'\nimport { defineGlobalTool } from '../../../defineTool.js'\nimport { getLogger } from '../../../utils/getLogger.js'\nimport { formatEntityError } from '../formatEntityError.js'\n\nconst DEFAULT_DESCRIPTION = 'Update any Payload global by passing the global slug and data.'\n\nexport const updateGlobalTool = defineGlobalTool({\n  access: (args) => defaultAccess(args) && Boolean(args.permissions?.globals?.[args.slug]?.update),\n  annotations: {\n    destructiveHint: true,\n    idempotentHint: false,\n    openWorldHint: false,\n    readOnlyHint: false,\n    title: 'Update Global',\n  },\n  description: DEFAULT_DESCRIPTION,\n  input: updateGlobalInputSchema,\n}).handler(async ({ slug, authorizedMCP, input, req }) => {\n  const payload = req.payload\n  const logger = getLogger({ payload })\n\n  const {\n    data,\n    depth,\n    draft,\n    fallbackLocale,\n    locale,\n    overrideLock,\n    populate,\n    publishAllLocales,\n    select,\n    unpublishAllLocales,\n  } = input\n\n  logger.info(`Updating global: ${slug}, draft: ${draft}${locale ? `, locale: ${locale}` : ''}`)\n\n  try {\n    const virtualFieldNames = getGlobalVirtualFieldNames(payload.config, slug)\n    const inputData = stripVirtualFields(data, virtualFieldNames)\n    validateGlobalData({ slug, data: inputData, req })\n\n    const parsedData = transformPointDataToPayload(inputData)\n\n    const updateOptions: Parameters<typeof payload.updateGlobal>[0] = {\n      slug,\n      data: parsedData,\n      depth,\n      draft,\n      overrideAccess: authorizedMCP.overrideAccess,\n      overrideLock,\n      populate,\n      publishAllLocales,\n      req,\n      unpublishAllLocales,\n    }\n\n    if (locale) {\n      updateOptions.locale = locale\n    }\n    if (fallbackLocale !== undefined) {\n      updateOptions.fallbackLocale = fallbackLocale\n    }\n    if (select) {\n      updateOptions.select = select\n    }\n\n    const result = await payload.updateGlobal(updateOptions)\n\n    return {\n      content: [\n        {\n          type: 'text',\n          text: `Global \"${slug}\" updated successfully!\\n\\`\\`\\`json\\n${JSON.stringify(result)}\\n\\`\\`\\``,\n        },\n      ],\n      doc: result as Record<string, unknown>,\n    }\n  } catch (error) {\n    const message = error instanceof Error ? error.message : 'Unknown error'\n    logger.error(`Error updating global ${slug}: ${message}`)\n    return formatEntityError({ slug, action: 'updating', entity: 'global', error, req })\n  }\n})\n"],"names":["getGlobalVirtualFieldNames","stripVirtualFields","transformPointDataToPayload","updateGlobalInputSchema","validateGlobalData","defaultAccess","defineGlobalTool","getLogger","formatEntityError","DEFAULT_DESCRIPTION","updateGlobalTool","access","args","Boolean","permissions","globals","slug","update","annotations","destructiveHint","idempotentHint","openWorldHint","readOnlyHint","title","description","input","handler","authorizedMCP","req","payload","logger","data","depth","draft","fallbackLocale","locale","overrideLock","populate","publishAllLocales","select","unpublishAllLocales","info","virtualFieldNames","config","inputData","parsedData","updateOptions","overrideAccess","undefined","result","updateGlobal","content","type","text","JSON","stringify","doc","error","message","Error","action","entity"],"mappings":"AAAA,SACEA,0BAA0B,EAC1BC,kBAAkB,EAClBC,2BAA2B,EAC3BC,uBAAuB,EACvBC,kBAAkB,QACb,UAAS;AAEhB,SAASC,aAAa,QAAQ,4BAA2B;AACzD,SAASC,gBAAgB,QAAQ,yBAAwB;AACzD,SAASC,SAAS,QAAQ,8BAA6B;AACvD,SAASC,iBAAiB,QAAQ,0BAAyB;AAE3D,MAAMC,sBAAsB;AAE5B,OAAO,MAAMC,mBAAmBJ,iBAAiB;IAC/CK,QAAQ,CAACC,OAASP,cAAcO,SAASC,QAAQD,KAAKE,WAAW,EAAEC,SAAS,CAACH,KAAKI,IAAI,CAAC,EAAEC;IACzFC,aAAa;QACXC,iBAAiB;QACjBC,gBAAgB;QAChBC,eAAe;QACfC,cAAc;QACdC,OAAO;IACT;IACAC,aAAaf;IACbgB,OAAOtB;AACT,GAAGuB,OAAO,CAAC,OAAO,EAAEV,IAAI,EAAEW,aAAa,EAAEF,KAAK,EAAEG,GAAG,EAAE;IACnD,MAAMC,UAAUD,IAAIC,OAAO;IAC3B,MAAMC,SAASvB,UAAU;QAAEsB;IAAQ;IAEnC,MAAM,EACJE,IAAI,EACJC,KAAK,EACLC,KAAK,EACLC,cAAc,EACdC,MAAM,EACNC,YAAY,EACZC,QAAQ,EACRC,iBAAiB,EACjBC,MAAM,EACNC,mBAAmB,EACpB,GAAGf;IAEJK,OAAOW,IAAI,CAAC,CAAC,iBAAiB,EAAEzB,KAAK,SAAS,EAAEiB,QAAQE,SAAS,CAAC,UAAU,EAAEA,QAAQ,GAAG,IAAI;IAE7F,IAAI;QACF,MAAMO,oBAAoB1C,2BAA2B6B,QAAQc,MAAM,EAAE3B;QACrE,MAAM4B,YAAY3C,mBAAmB8B,MAAMW;QAC3CtC,mBAAmB;YAAEY;YAAMe,MAAMa;YAAWhB;QAAI;QAEhD,MAAMiB,aAAa3C,4BAA4B0C;QAE/C,MAAME,gBAA4D;YAChE9B;YACAe,MAAMc;YACNb;YACAC;YACAc,gBAAgBpB,cAAcoB,cAAc;YAC5CX;YACAC;YACAC;YACAV;YACAY;QACF;QAEA,IAAIL,QAAQ;YACVW,cAAcX,MAAM,GAAGA;QACzB;QACA,IAAID,mBAAmBc,WAAW;YAChCF,cAAcZ,cAAc,GAAGA;QACjC;QACA,IAAIK,QAAQ;YACVO,cAAcP,MAAM,GAAGA;QACzB;QAEA,MAAMU,SAAS,MAAMpB,QAAQqB,YAAY,CAACJ;QAE1C,OAAO;YACLK,SAAS;gBACP;oBACEC,MAAM;oBACNC,MAAM,CAAC,QAAQ,EAAErC,KAAK,qCAAqC,EAAEsC,KAAKC,SAAS,CAACN,QAAQ,QAAQ,CAAC;gBAC/F;aACD;YACDO,KAAKP;QACP;IACF,EAAE,OAAOQ,OAAO;QACd,MAAMC,UAAUD,iBAAiBE,QAAQF,MAAMC,OAAO,GAAG;QACzD5B,OAAO2B,KAAK,CAAC,CAAC,sBAAsB,EAAEzC,KAAK,EAAE,EAAE0C,SAAS;QACxD,OAAOlD,kBAAkB;YAAEQ;YAAM4C,QAAQ;YAAYC,QAAQ;YAAUJ;YAAO7B;QAAI;IACpF;AACF,GAAE"}

package/dist/stdio.js

@@ -1,6 +1,6 @@
 /* eslint-disable no-console */ import { serveStdio } from '@modelcontextprotocol/server/stdio';
 import { fileURLToPath, pathToFileURL } from 'node:url';
-import { createLocalReq, getPayload } from 'payload';
+import { createPayloadRequest, getPayload } from 'payload';
 import { findConfig, loadEnv } from 'payload/node';
 import { getAuthorizedMCP } from './endpoint/access.js';
 import { buildMcpServer } from './mcp/buildMcpServer.js';
@@ -80,11 +80,12 @@ import { resolveProjectRoot } from './utils/resolveProjectRoot.js';
     if (process.env.PAYLOAD_MCP_AUTHORIZATION) {
         headers.set('Authorization', process.env.PAYLOAD_MCP_AUTHORIZATION);
     }
-    const req = await createLocalReq({
+    const req = await createPayloadRequest({
+        payload,
         req: {
             headers
         }
-    }, payload);
+    });
     req.payloadAPI = 'MCP';
     const authorizedMCP = await getAuthorizedMCP({
         overrideAccess,