@payloadcms/plugin-mcp 4.0.0-internal.fa345ef → 4.0.0-internal.fec2230

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/mcp/builtin/collections/duplicateTool.ts"],"sourcesContent":["import type { PopulateType, SelectType } from 'payload'\n\nimport { z } from 'zod'\n\nimport { defaultAccess } from '../../../defaultAccess.js'\nimport { defineCollectionTool } from '../../../defineTool.js'\nimport { getLogger } from '../../../utils/getLogger.js'\nimport {\n  getCollectionVirtualFieldNames,\n  stripVirtualFields,\n} from '../../../utils/getVirtualFieldNames.js'\nimport { localAPIDefaults } from '../../../utils/localAPIDefaults.js'\nimport { transformPointDataToPayload } from '../../../utils/transformPointDataToPayload.js'\nimport { formatCollectionError } from './formatCollectionError.js'\n\nconst DEFAULT_DESCRIPTION =\n  'Duplicate a document in any collection by passing the collection slug and source document ID.'\n\nexport const duplicateDocumentTool = defineCollectionTool({\n  access: (args) =>\n    defaultAccess(args) && Boolean(args.permissions?.collections?.[args.collectionSlug]?.create),\n  annotations: {\n    destructiveHint: false,\n    idempotentHint: false,\n    openWorldHint: false,\n    readOnlyHint: false,\n    title: 'Duplicate Document',\n  },\n  description: DEFAULT_DESCRIPTION,\n  input: z.object({\n    id: z.union([z.string(), z.number()]).describe('The ID of the document to duplicate'),\n    data: z\n      .record(z.string(), z.unknown())\n      .describe('Optional: fields to override on the duplicated document')\n      .optional(),\n    depth: z\n      .number()\n      .int()\n      .min(0)\n      .max(10)\n      .describe('How many levels deep to populate relationships in response')\n      .optional()\n      .default(0),\n    draft: z\n      .boolean()\n      .describe('Whether to create the duplicate as a draft')\n      .optional()\n      .default(false),\n    fallbackLocale: z\n      .string()\n      .describe('Optional: fallback locale code to use when requested locale is not available')\n      .optional(),\n    locale: z\n      .string()\n      .describe(\n        'Optional: locale code to duplicate in (e.g., \"en\", \"es\"). Defaults to the default locale',\n      )\n      .optional(),\n    populate: z\n      .record(z.string(), z.unknown())\n      .describe(\n        'Optional: control which fields to include from populated relationship or upload documents.',\n      )\n      .optional(),\n    select: z\n      .record(z.string(), z.unknown())\n      .describe(\n        'Optional: define exactly which fields you\\'d like to return in the response, e.g., {\"title\": true}',\n      )\n      .optional(),\n    selectedLocales: z\n      .array(z.string())\n      .describe('Optional: localized field locales to include in the duplicated document')\n      .optional(),\n    showHiddenFields: z\n      .boolean()\n      .describe('Optional: include hidden fields in the duplicated document response')\n      .optional(),\n  }),\n}).handler(async ({ authorizedMCP, collectionSlug, input, req }) => {\n  const payload = req.payload\n  const logger = getLogger({ payload })\n  const {\n    id,\n    data,\n    depth,\n    draft,\n    fallbackLocale,\n    locale,\n    populate,\n    select,\n    selectedLocales,\n    showHiddenFields,\n  } = input\n\n  logger.info(`Duplicating document in collection: ${collectionSlug} with ID: ${id}`)\n\n  try {\n    const virtualFieldNames = getCollectionVirtualFieldNames(payload.config, collectionSlug)\n    const inputData = data ? stripVirtualFields(data, virtualFieldNames) : undefined\n    const parsedData = inputData ? transformPointDataToPayload(inputData) : undefined\n\n    const result = await payload.duplicate({\n      id,\n      collection: collectionSlug,\n      depth,\n      draft,\n      req,\n      ...localAPIDefaults(authorizedMCP),\n      ...(parsedData ? { data: parsedData } : {}),\n      ...(locale ? { locale } : {}),\n      ...(fallbackLocale ? { fallbackLocale } : {}),\n      ...(populate ? { populate: populate as PopulateType } : {}),\n      ...(select ? { select: select as SelectType } : {}),\n      ...(selectedLocales ? { selectedLocales } : {}),\n      ...(showHiddenFields !== undefined ? { showHiddenFields } : {}),\n    })\n\n    logger.info(`Successfully duplicated document in ${collectionSlug} from ID: ${id}`)\n\n    return {\n      content: [\n        {\n          type: 'text',\n          text: `Document duplicated successfully in collection \"${collectionSlug}\"!\\nDuplicated document:\\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 duplicating document in ${collectionSlug}: ${errorMessage}`)\n    return formatCollectionError({ action: 'duplicating', collectionSlug, error, req })\n  }\n})\n"],"names":["z","defaultAccess","defineCollectionTool","getLogger","getCollectionVirtualFieldNames","stripVirtualFields","localAPIDefaults","transformPointDataToPayload","formatCollectionError","DEFAULT_DESCRIPTION","duplicateDocumentTool","access","args","Boolean","permissions","collections","collectionSlug","create","annotations","destructiveHint","idempotentHint","openWorldHint","readOnlyHint","title","description","input","object","id","union","string","number","describe","data","record","unknown","optional","depth","int","min","max","default","draft","boolean","fallbackLocale","locale","populate","select","selectedLocales","array","showHiddenFields","handler","authorizedMCP","req","payload","logger","info","virtualFieldNames","config","inputData","undefined","parsedData","result","duplicate","collection","content","type","text","JSON","stringify","doc","error","errorMessage","Error","message","action"],"mappings":"AAEA,SAASA,CAAC,QAAQ,MAAK;AAEvB,SAASC,aAAa,QAAQ,4BAA2B;AACzD,SAASC,oBAAoB,QAAQ,yBAAwB;AAC7D,SAASC,SAAS,QAAQ,8BAA6B;AACvD,SACEC,8BAA8B,EAC9BC,kBAAkB,QACb,yCAAwC;AAC/C,SAASC,gBAAgB,QAAQ,qCAAoC;AACrE,SAASC,2BAA2B,QAAQ,gDAA+C;AAC3F,SAASC,qBAAqB,QAAQ,6BAA4B;AAElE,MAAMC,sBACJ;AAEF,OAAO,MAAMC,wBAAwBR,qBAAqB;IACxDS,QAAQ,CAACC,OACPX,cAAcW,SAASC,QAAQD,KAAKE,WAAW,EAAEC,aAAa,CAACH,KAAKI,cAAc,CAAC,EAAEC;IACvFC,aAAa;QACXC,iBAAiB;QACjBC,gBAAgB;QAChBC,eAAe;QACfC,cAAc;QACdC,OAAO;IACT;IACAC,aAAaf;IACbgB,OAAOzB,EAAE0B,MAAM,CAAC;QACdC,IAAI3B,EAAE4B,KAAK,CAAC;YAAC5B,EAAE6B,MAAM;YAAI7B,EAAE8B,MAAM;SAAG,EAAEC,QAAQ,CAAC;QAC/CC,MAAMhC,EACHiC,MAAM,CAACjC,EAAE6B,MAAM,IAAI7B,EAAEkC,OAAO,IAC5BH,QAAQ,CAAC,2DACTI,QAAQ;QACXC,OAAOpC,EACJ8B,MAAM,GACNO,GAAG,GACHC,GAAG,CAAC,GACJC,GAAG,CAAC,IACJR,QAAQ,CAAC,8DACTI,QAAQ,GACRK,OAAO,CAAC;QACXC,OAAOzC,EACJ0C,OAAO,GACPX,QAAQ,CAAC,8CACTI,QAAQ,GACRK,OAAO,CAAC;QACXG,gBAAgB3C,EACb6B,MAAM,GACNE,QAAQ,CAAC,gFACTI,QAAQ;QACXS,QAAQ5C,EACL6B,MAAM,GACNE,QAAQ,CACP,4FAEDI,QAAQ;QACXU,UAAU7C,EACPiC,MAAM,CAACjC,EAAE6B,MAAM,IAAI7B,EAAEkC,OAAO,IAC5BH,QAAQ,CACP,8FAEDI,QAAQ;QACXW,QAAQ9C,EACLiC,MAAM,CAACjC,EAAE6B,MAAM,IAAI7B,EAAEkC,OAAO,IAC5BH,QAAQ,CACP,sGAEDI,QAAQ;QACXY,iBAAiB/C,EACdgD,KAAK,CAAChD,EAAE6B,MAAM,IACdE,QAAQ,CAAC,2EACTI,QAAQ;QACXc,kBAAkBjD,EACf0C,OAAO,GACPX,QAAQ,CAAC,uEACTI,QAAQ;IACb;AACF,GAAGe,OAAO,CAAC,OAAO,EAAEC,aAAa,EAAEnC,cAAc,EAAES,KAAK,EAAE2B,GAAG,EAAE;IAC7D,MAAMC,UAAUD,IAAIC,OAAO;IAC3B,MAAMC,SAASnD,UAAU;QAAEkD;IAAQ;IACnC,MAAM,EACJ1B,EAAE,EACFK,IAAI,EACJI,KAAK,EACLK,KAAK,EACLE,cAAc,EACdC,MAAM,EACNC,QAAQ,EACRC,MAAM,EACNC,eAAe,EACfE,gBAAgB,EACjB,GAAGxB;IAEJ6B,OAAOC,IAAI,CAAC,CAAC,oCAAoC,EAAEvC,eAAe,UAAU,EAAEW,IAAI;IAElF,IAAI;QACF,MAAM6B,oBAAoBpD,+BAA+BiD,QAAQI,MAAM,EAAEzC;QACzE,MAAM0C,YAAY1B,OAAO3B,mBAAmB2B,MAAMwB,qBAAqBG;QACvE,MAAMC,aAAaF,YAAYnD,4BAA4BmD,aAAaC;QAExE,MAAME,SAAS,MAAMR,QAAQS,SAAS,CAAC;YACrCnC;YACAoC,YAAY/C;YACZoB;YACAK;YACAW;YACA,GAAG9C,iBAAiB6C,cAAc;YAClC,GAAIS,aAAa;gBAAE5B,MAAM4B;YAAW,IAAI,CAAC,CAAC;YAC1C,GAAIhB,SAAS;gBAAEA;YAAO,IAAI,CAAC,CAAC;YAC5B,GAAID,iBAAiB;gBAAEA;YAAe,IAAI,CAAC,CAAC;YAC5C,GAAIE,WAAW;gBAAEA,UAAUA;YAAyB,IAAI,CAAC,CAAC;YAC1D,GAAIC,SAAS;gBAAEA,QAAQA;YAAqB,IAAI,CAAC,CAAC;YAClD,GAAIC,kBAAkB;gBAAEA;YAAgB,IAAI,CAAC,CAAC;YAC9C,GAAIE,qBAAqBU,YAAY;gBAAEV;YAAiB,IAAI,CAAC,CAAC;QAChE;QAEAK,OAAOC,IAAI,CAAC,CAAC,oCAAoC,EAAEvC,eAAe,UAAU,EAAEW,IAAI;QAElF,OAAO;YACLqC,SAAS;gBACP;oBACEC,MAAM;oBACNC,MAAM,CAAC,gDAAgD,EAAElD,eAAe,sCAAsC,EAAEmD,KAAKC,SAAS,CAACP,QAAQ,QAAQ,CAAC;gBAClJ;aACD;YACDQ,KAAKR;QACP;IACF,EAAE,OAAOS,OAAO;QACd,MAAMC,eAAeD,iBAAiBE,QAAQF,MAAMG,OAAO,GAAG;QAC9DnB,OAAOgB,KAAK,CAAC,CAAC,8BAA8B,EAAEtD,eAAe,EAAE,EAAEuD,cAAc;QAC/E,OAAO/D,sBAAsB;YAAEkE,QAAQ;YAAe1D;YAAgBsD;YAAOlB;QAAI;IACnF;AACF,GAAE"}
+{"version":3,"sources":["../../../../src/mcp/builtin/collections/duplicateTool.ts"],"sourcesContent":["import {\n  duplicateDocumentInputSchema,\n  getCollectionVirtualFieldNames,\n  parseDocumentID,\n  stripVirtualFields,\n  transformPointDataToPayload,\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'\n\nconst DEFAULT_DESCRIPTION =\n  'Duplicate a document in any collection by passing the collection slug and source document ID.'\n\nexport const duplicateDocumentTool = defineCollectionTool({\n  access: (args) =>\n    defaultAccess(args) && Boolean(args.permissions?.collections?.[args.slug]?.create),\n  annotations: {\n    destructiveHint: false,\n    idempotentHint: false,\n    openWorldHint: false,\n    readOnlyHint: false,\n    title: 'Duplicate Document',\n  },\n  description: DEFAULT_DESCRIPTION,\n  input: duplicateDocumentInputSchema,\n}).handler(async ({ slug, authorizedMCP, input, req }) => {\n  const payload = req.payload\n  const logger = getLogger({ payload })\n  const { id, data, depth, draft, fallbackLocale, locale, populate, select, selectedLocales } =\n    input\n\n  logger.info(`Duplicating document in collection: ${slug} with ID: ${id}`)\n\n  try {\n    const virtualFieldNames = getCollectionVirtualFieldNames(payload.config, slug)\n    const inputData = data ? stripVirtualFields(data, virtualFieldNames) : undefined\n\n    if (inputData) {\n      validateCollectionData({\n        slug,\n        data: inputData,\n        partial: true,\n        req,\n      })\n    }\n\n    const parsedData = inputData ? transformPointDataToPayload(inputData) : undefined\n\n    const result = await payload.duplicate({\n      id: parseDocumentID({ id, collectionSlug: slug, payload }),\n      collection: slug,\n      depth,\n      draft,\n      overrideAccess: authorizedMCP.overrideAccess,\n      req,\n      ...(parsedData ? { data: parsedData } : {}),\n      ...(locale ? { locale } : {}),\n      ...(fallbackLocale !== undefined ? { fallbackLocale } : {}),\n      ...(populate ? { populate } : {}),\n      ...(select ? { select } : {}),\n      ...(selectedLocales ? { selectedLocales } : {}),\n    })\n\n    logger.info(`Successfully duplicated document in ${slug} from ID: ${id}`)\n\n    return {\n      content: [\n        {\n          type: 'text',\n          text: `Document duplicated successfully in collection \"${slug}\"!\\nDuplicated document:\\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 duplicating document in ${slug}: ${errorMessage}`)\n    return formatEntityError({ slug, action: 'duplicating', entity: 'collection', error, req })\n  }\n})\n"],"names":["duplicateDocumentInputSchema","getCollectionVirtualFieldNames","parseDocumentID","stripVirtualFields","transformPointDataToPayload","validateCollectionData","defaultAccess","defineCollectionTool","getLogger","formatEntityError","DEFAULT_DESCRIPTION","duplicateDocumentTool","access","args","Boolean","permissions","collections","slug","create","annotations","destructiveHint","idempotentHint","openWorldHint","readOnlyHint","title","description","input","handler","authorizedMCP","req","payload","logger","id","data","depth","draft","fallbackLocale","locale","populate","select","selectedLocales","info","virtualFieldNames","config","inputData","undefined","partial","parsedData","result","duplicate","collectionSlug","collection","overrideAccess","content","type","text","JSON","stringify","doc","error","errorMessage","Error","message","action","entity"],"mappings":"AAAA,SACEA,4BAA4B,EAC5BC,8BAA8B,EAC9BC,eAAe,EACfC,kBAAkB,EAClBC,2BAA2B,EAC3BC,sBAAsB,QACjB,UAAS;AAEhB,SAASC,aAAa,QAAQ,4BAA2B;AACzD,SAASC,oBAAoB,QAAQ,yBAAwB;AAC7D,SAASC,SAAS,QAAQ,8BAA6B;AACvD,SAASC,iBAAiB,QAAQ,0BAAyB;AAE3D,MAAMC,sBACJ;AAEF,OAAO,MAAMC,wBAAwBJ,qBAAqB;IACxDK,QAAQ,CAACC,OACPP,cAAcO,SAASC,QAAQD,KAAKE,WAAW,EAAEC,aAAa,CAACH,KAAKI,IAAI,CAAC,EAAEC;IAC7EC,aAAa;QACXC,iBAAiB;QACjBC,gBAAgB;QAChBC,eAAe;QACfC,cAAc;QACdC,OAAO;IACT;IACAC,aAAaf;IACbgB,OAAO1B;AACT,GAAG2B,OAAO,CAAC,OAAO,EAAEV,IAAI,EAAEW,aAAa,EAAEF,KAAK,EAAEG,GAAG,EAAE;IACnD,MAAMC,UAAUD,IAAIC,OAAO;IAC3B,MAAMC,SAASvB,UAAU;QAAEsB;IAAQ;IACnC,MAAM,EAAEE,EAAE,EAAEC,IAAI,EAAEC,KAAK,EAAEC,KAAK,EAAEC,cAAc,EAAEC,MAAM,EAAEC,QAAQ,EAAEC,MAAM,EAAEC,eAAe,EAAE,GACzFd;IAEFK,OAAOU,IAAI,CAAC,CAAC,oCAAoC,EAAExB,KAAK,UAAU,EAAEe,IAAI;IAExE,IAAI;QACF,MAAMU,oBAAoBzC,+BAA+B6B,QAAQa,MAAM,EAAE1B;QACzE,MAAM2B,YAAYX,OAAO9B,mBAAmB8B,MAAMS,qBAAqBG;QAEvE,IAAID,WAAW;YACbvC,uBAAuB;gBACrBY;gBACAgB,MAAMW;gBACNE,SAAS;gBACTjB;YACF;QACF;QAEA,MAAMkB,aAAaH,YAAYxC,4BAA4BwC,aAAaC;QAExE,MAAMG,SAAS,MAAMlB,QAAQmB,SAAS,CAAC;YACrCjB,IAAI9B,gBAAgB;gBAAE8B;gBAAIkB,gBAAgBjC;gBAAMa;YAAQ;YACxDqB,YAAYlC;YACZiB;YACAC;YACAiB,gBAAgBxB,cAAcwB,cAAc;YAC5CvB;YACA,GAAIkB,aAAa;gBAAEd,MAAMc;YAAW,IAAI,CAAC,CAAC;YAC1C,GAAIV,SAAS;gBAAEA;YAAO,IAAI,CAAC,CAAC;YAC5B,GAAID,mBAAmBS,YAAY;gBAAET;YAAe,IAAI,CAAC,CAAC;YAC1D,GAAIE,WAAW;gBAAEA;YAAS,IAAI,CAAC,CAAC;YAChC,GAAIC,SAAS;gBAAEA;YAAO,IAAI,CAAC,CAAC;YAC5B,GAAIC,kBAAkB;gBAAEA;YAAgB,IAAI,CAAC,CAAC;QAChD;QAEAT,OAAOU,IAAI,CAAC,CAAC,oCAAoC,EAAExB,KAAK,UAAU,EAAEe,IAAI;QAExE,OAAO;YACLqB,SAAS;gBACP;oBACEC,MAAM;oBACNC,MAAM,CAAC,gDAAgD,EAAEtC,KAAK,sCAAsC,EAAEuC,KAAKC,SAAS,CAACT,QAAQ,QAAQ,CAAC;gBACxI;aACD;YACDU,KAAKV;QACP;IACF,EAAE,OAAOW,OAAO;QACd,MAAMC,eAAeD,iBAAiBE,QAAQF,MAAMG,OAAO,GAAG;QAC9D/B,OAAO4B,KAAK,CAAC,CAAC,8BAA8B,EAAE1C,KAAK,EAAE,EAAE2C,cAAc;QACrE,OAAOnD,kBAAkB;YAAEQ;YAAM8C,QAAQ;YAAeC,QAAQ;YAAcL;YAAO9B;QAAI;IAC3F;AACF,GAAE"}

package/dist/mcp/builtin/collections/fileInput.d.ts

@@ -0,0 +1,28 @@
+import type { CollectionSlug, File, PayloadRequest } from 'payload';
+import { z } from 'payload';
+export declare const fileInputSchema: z.ZodMiniDiscriminatedUnion<[z.ZodMiniObject<{
+    name: z.ZodMiniString<string>;
+    data: z.ZodMiniString<string>;
+    mimeType: z.ZodMiniString<string>;
+    source: z.ZodMiniLiteral<"base64">;
+}, z.core.$strict>, z.ZodMiniObject<{
+    name: z.ZodMiniOptional<z.ZodMiniString<string>>;
+    source: z.ZodMiniLiteral<"externalURL">;
+    url: z.ZodMiniURL;
+}, z.core.$strict>, z.ZodMiniObject<{
+    file: z.ZodMiniObject<{
+        filename: z.ZodMiniString<string>;
+        mimeType: z.ZodMiniString<string>;
+        size: z.ZodMiniInt;
+        uploadReference: z.ZodMiniRecord<z.ZodMiniString<string>, z.ZodMiniUnknown>;
+    }, z.core.$strict>;
+    source: z.ZodMiniLiteral<"uploadReference">;
+}, z.core.$strict>], "source">;
+type FileInput = z.infer<typeof fileInputSchema>;
+export declare function resolveFile({ slug, input, req, }: {
+    input?: FileInput;
+    req: PayloadRequest;
+    slug: CollectionSlug;
+}): Promise<File | undefined>;
+export {};
+//# sourceMappingURL=fileInput.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"fileInput.d.ts","sourceRoot":"","sources":["../../../../src/mcp/builtin/collections/fileInput.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAEnE,OAAO,EAAY,CAAC,EAAE,MAAM,SAAS,CAAA;AAwBrC,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;8BAoBzB,CAAA;AAEH,KAAK,SAAS,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAA;AAEhD,wBAAsB,WAAW,CAAC,EAChC,IAAI,EACJ,KAAK,EACL,GAAG,GACJ,EAAE;IACD,KAAK,CAAC,EAAE,SAAS,CAAA;IACjB,GAAG,EAAE,cAAc,CAAA;IACnB,IAAI,EAAE,cAAc,CAAA;CACrB,GAAG,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC,CA2C5B"}

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

@@ -0,0 +1,88 @@
+import { APIError, z } from 'payload';
+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({
+    filename: z.string(),
+    mimeType: z.string(),
+    size: z.int().check(z.nonnegative()),
+    uploadReference: z.record(z.string(), z.unknown())
+});
+export const fileInputSchema = z.discriminatedUnion('source', [
+    z.strictObject({
+        name: z.string().check(z.minLength(1), z.describe('The file name, including its extension.')),
+        data: z.string().check(z.describe('The base64-encoded file bytes, without a data URL prefix.')),
+        mimeType: mimeTypeSchema.check(z.describe('The file MIME type, for example image/png.')),
+        source: z.literal('base64')
+    }),
+    externalURLInputSchema,
+    z.strictObject({
+        file: uploadFileSchema.check(z.describe('getUploadInstructions file field post-upload.')),
+        source: z.literal('uploadReference')
+    })
+]).check(z.describe('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.'));
+export async function resolveFile({ slug, input, req }) {
+    if (!input) {
+        return undefined;
+    }
+    if (input.source === 'uploadReference') {
+        try {
+            return await getFileFromUploadInstructions({
+                collectionSlug: slug,
+                file: input.file,
+                req
+            });
+        } catch (error) {
+            if (error instanceof Error && error.message === 'Staged upload was not found.') {
+                throw new APIError('Staged upload not found. Complete the upload action first, or use base64 for small local files.', 400);
+            }
+            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;
+    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);
+    }
+    return file;
+}
+function decodeBase64({ maxFileSize, value }) {
+    const normalized = value.replace(/\s/g, '');
+    if (!/^[a-z0-9+/]*={0,2}$/i.test(normalized) || normalized.length % 4 === 1) {
+        throw new APIError('File data must be valid base64.', 400);
+    }
+    if (maxFileSize !== undefined && Number.isFinite(maxFileSize)) {
+        const paddingLength = normalized.endsWith('==') ? 2 : normalized.endsWith('=') ? 1 : 0;
+        const decodedSize = Math.floor(normalized.length * 3 / 4) - paddingLength;
+        if (decodedSize > maxFileSize) {
+            throw new APIError(`File exceeds the ${maxFileSize} byte upload limit.`, 400);
+        }
+    }
+    const data = Buffer.from(normalized, 'base64');
+    if (data.toString('base64').replace(/=+$/, '') !== normalized.replace(/=+$/, '')) {
+        throw new APIError('File data must be valid base64.', 400);
+    }
+    return data;
+}
+
+//# sourceMappingURL=fileInput.js.map

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

@@ -0,0 +1 @@
+{"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/fileInput.spec.js

@@ -0,0 +1,86 @@
+import { describe, expect, it } from 'vitest';
+import { fileInputSchema, resolveFile } from './fileInput.js';
+describe('MCP file input', ()=>{
+    it('should reject malformed MIME types', ()=>{
+        const result = fileInputSchema.safeParse({
+            data: 'aGVsbG8=',
+            mimeType: 'text/plain\r\nx-test: value',
+            name: 'hello.txt',
+            source: 'base64'
+        });
+        expect(result.success).toBe(false);
+    });
+    it('should accept a prepared upload', ()=>{
+        const result = fileInputSchema.safeParse({
+            file: {
+                filename: 'image.png',
+                mimeType: 'image/png',
+                size: 123,
+                uploadReference: {
+                    uploadId: 'upload-id'
+                }
+            },
+            source: 'uploadReference'
+        });
+        expect(result.success).toBe(true);
+    });
+    it('should reject oversized base64 files', async ()=>{
+        const req = createRequest({
+            maxFileSize: 4
+        });
+        await expect(resolveFile({
+            slug: 'media',
+            input: {
+                data: Buffer.from('hello').toString('base64'),
+                mimeType: 'text/plain',
+                name: 'hello.txt',
+                source: 'base64'
+            },
+            req
+        })).rejects.toThrow('File exceeds the 4 byte upload limit.');
+    });
+    it('should reject URLs outside the collection allowlist', async ()=>{
+        const req = createRequest({
+            allowList: [
+                {
+                    hostname: 'assets.example.com',
+                    protocol: 'https'
+                }
+            ]
+        });
+        await expect(resolveFile({
+            slug: 'media',
+            input: {
+                source: 'externalURL',
+                url: 'https://example.com/image.png'
+            },
+            req
+        })).rejects.toThrow('The provided file URL is not allowed.');
+    });
+});
+function createRequest({ allowList, maxFileSize }) {
+    return {
+        payload: {
+            collections: {
+                media: {
+                    config: {
+                        upload: allowList ? {
+                            pasteURL: {
+                                allowList
+                            }
+                        } : {}
+                    }
+                }
+            },
+            config: {
+                upload: {
+                    limits: {
+                        fileSize: maxFileSize
+                    }
+                }
+            }
+        }
+    };
+}
+
+//# sourceMappingURL=fileInput.spec.js.map

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

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../src/mcp/builtin/collections/fileInput.spec.ts"],"sourcesContent":["import type { PayloadRequest } from 'payload'\n\nimport { describe, expect, it } from 'vitest'\n\nimport { fileInputSchema, resolveFile } from './fileInput.js'\n\ndescribe('MCP file input', () => {\n  it('should reject malformed MIME types', () => {\n    const result = fileInputSchema.safeParse({\n      data: 'aGVsbG8=',\n      mimeType: 'text/plain\\r\\nx-test: value',\n      name: 'hello.txt',\n      source: 'base64',\n    })\n\n    expect(result.success).toBe(false)\n  })\n\n  it('should accept a prepared upload', () => {\n    const result = fileInputSchema.safeParse({\n      file: {\n        filename: 'image.png',\n        mimeType: 'image/png',\n        size: 123,\n        uploadReference: { uploadId: 'upload-id' },\n      },\n      source: 'uploadReference',\n    })\n\n    expect(result.success).toBe(true)\n  })\n\n  it('should reject oversized base64 files', async () => {\n    const req = createRequest({ maxFileSize: 4 })\n\n    await expect(\n      resolveFile({\n        slug: 'media',\n        input: {\n          data: Buffer.from('hello').toString('base64'),\n          mimeType: 'text/plain',\n          name: 'hello.txt',\n          source: 'base64',\n        },\n        req,\n      }),\n    ).rejects.toThrow('File exceeds the 4 byte upload limit.')\n  })\n\n  it('should reject URLs outside the collection allowlist', async () => {\n    const req = createRequest({\n      allowList: [{ hostname: 'assets.example.com', protocol: 'https' }],\n    })\n\n    await expect(\n      resolveFile({\n        slug: 'media',\n        input: {\n          source: 'externalURL',\n          url: 'https://example.com/image.png',\n        },\n        req,\n      }),\n    ).rejects.toThrow('The provided file URL is not allowed.')\n  })\n})\n\nfunction createRequest({\n  allowList,\n  maxFileSize,\n}: {\n  allowList?: Array<{ hostname: string; protocol: 'http' | 'https' }>\n  maxFileSize?: number\n}): PayloadRequest {\n  return {\n    payload: {\n      collections: {\n        media: {\n          config: {\n            upload: allowList ? { pasteURL: { allowList } } : {},\n          },\n        },\n      },\n      config: {\n        upload: {\n          limits: {\n            fileSize: maxFileSize,\n          },\n        },\n      },\n    },\n  } as unknown as PayloadRequest\n}\n"],"names":["describe","expect","it","fileInputSchema","resolveFile","result","safeParse","data","mimeType","name","source","success","toBe","file","filename","size","uploadReference","uploadId","req","createRequest","maxFileSize","slug","input","Buffer","from","toString","rejects","toThrow","allowList","hostname","protocol","url","payload","collections","media","config","upload","pasteURL","limits","fileSize"],"mappings":"AAEA,SAASA,QAAQ,EAAEC,MAAM,EAAEC,EAAE,QAAQ,SAAQ;AAE7C,SAASC,eAAe,EAAEC,WAAW,QAAQ,iBAAgB;AAE7DJ,SAAS,kBAAkB;IACzBE,GAAG,sCAAsC;QACvC,MAAMG,SAASF,gBAAgBG,SAAS,CAAC;YACvCC,MAAM;YACNC,UAAU;YACVC,MAAM;YACNC,QAAQ;QACV;QAEAT,OAAOI,OAAOM,OAAO,EAAEC,IAAI,CAAC;IAC9B;IAEAV,GAAG,mCAAmC;QACpC,MAAMG,SAASF,gBAAgBG,SAAS,CAAC;YACvCO,MAAM;gBACJC,UAAU;gBACVN,UAAU;gBACVO,MAAM;gBACNC,iBAAiB;oBAAEC,UAAU;gBAAY;YAC3C;YACAP,QAAQ;QACV;QAEAT,OAAOI,OAAOM,OAAO,EAAEC,IAAI,CAAC;IAC9B;IAEAV,GAAG,wCAAwC;QACzC,MAAMgB,MAAMC,cAAc;YAAEC,aAAa;QAAE;QAE3C,MAAMnB,OACJG,YAAY;YACViB,MAAM;YACNC,OAAO;gBACLf,MAAMgB,OAAOC,IAAI,CAAC,SAASC,QAAQ,CAAC;gBACpCjB,UAAU;gBACVC,MAAM;gBACNC,QAAQ;YACV;YACAQ;QACF,IACAQ,OAAO,CAACC,OAAO,CAAC;IACpB;IAEAzB,GAAG,uDAAuD;QACxD,MAAMgB,MAAMC,cAAc;YACxBS,WAAW;gBAAC;oBAAEC,UAAU;oBAAsBC,UAAU;gBAAQ;aAAE;QACpE;QAEA,MAAM7B,OACJG,YAAY;YACViB,MAAM;YACNC,OAAO;gBACLZ,QAAQ;gBACRqB,KAAK;YACP;YACAb;QACF,IACAQ,OAAO,CAACC,OAAO,CAAC;IACpB;AACF;AAEA,SAASR,cAAc,EACrBS,SAAS,EACTR,WAAW,EAIZ;IACC,OAAO;QACLY,SAAS;YACPC,aAAa;gBACXC,OAAO;oBACLC,QAAQ;wBACNC,QAAQR,YAAY;4BAAES,UAAU;gCAAET;4BAAU;wBAAE,IAAI,CAAC;oBACrD;gBACF;YACF;YACAO,QAAQ;gBACNC,QAAQ;oBACNE,QAAQ;wBACNC,UAAUnB;oBACZ;gBACF;YACF;QACF;IACF;AACF"}

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

@@ -1 +1 @@
-{"version":3,"file":"findDistinctTool.d.ts","sourceRoot":"","sources":["../../../../src/mcp/builtin/collections/findDistinctTool.ts"],"names":[],"mappings":"AAaA,eAAO,MAAM,gBAAgB,4CAyG3B,CAAA"}
+{"version":3,"file":"findDistinctTool.d.ts","sourceRoot":"","sources":["../../../../src/mcp/builtin/collections/findDistinctTool.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,gBAAgB,4CAyD3B,CAAA"}

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

@@ -1,12 +1,10 @@
-import { z } from 'zod';
+import { findDistinctInputSchema } from 'payload';
 import { defaultAccess } from '../../../defaultAccess.js';
 import { defineCollectionTool } from '../../../defineTool.js';
 import { getLogger } from '../../../utils/getLogger.js';
-import { localAPIDefaults } from '../../../utils/localAPIDefaults.js';
-import { whereSchema } from '../../../utils/whereSchema.js';
 const DEFAULT_DESCRIPTION = 'Find distinct values for a field in any collection by passing the collection slug and field path.';
 export const findDistinctTool = defineCollectionTool({
-    access: (args)=>defaultAccess(args) && Boolean(args.permissions?.collections?.[args.collectionSlug]?.read),
+    access: (args)=>defaultAccess(args) && Boolean(args.permissions?.collections?.[args.slug]?.read),
     annotations: {
         destructiveHint: false,
         idempotentHint: true,
@@ -15,32 +13,21 @@ export const findDistinctTool = defineCollectionTool({
         title: 'Find Distinct'
     },
     description: DEFAULT_DESCRIPTION,
-    input: z.object({
-        depth: z.number().int().min(0).max(10).describe('How many levels deep to populate relationships in distinct values').optional().default(0),
-        field: z.string().describe('The field path to get distinct values for'),
-        limit: z.number().int().min(1).max(100).describe('Maximum number of distinct values to return (max: 100)').optional(),
-        locale: z.string().describe('Optional: locale code to retrieve data in (e.g., "en", "es"). Use "all" to retrieve all locales for localized fields').optional(),
-        page: z.number().int().min(1).describe('Page number for pagination').optional(),
-        populate: z.record(z.string(), z.unknown()).describe('Optional: control which fields to include from populated relationship or upload documents.').optional(),
-        showHiddenFields: z.boolean().describe('Optional: include hidden fields in the distinct query').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"}}').optional()
-    })
-}).handler(async ({ authorizedMCP, collectionSlug, input, req })=>{
+    input: findDistinctInputSchema
+}).handler(async ({ slug, authorizedMCP, input, req })=>{
     const payload = req.payload;
     const logger = getLogger({
         payload
     });
-    const { depth, field, limit, locale, page, populate, showHiddenFields, sort, trash, where } = input;
-    logger.info(`Finding distinct values in collection: ${collectionSlug}, field: ${field}`);
+    const { depth, field, limit, locale, page, populate, sort, trash, where } = input;
+    logger.info(`Finding distinct values in collection: ${slug}, field: ${field}`);
     try {
         const result = await payload.findDistinct({
-            collection: collectionSlug,
+            collection: slug,
             depth,
             field,
+            overrideAccess: authorizedMCP.overrideAccess,
             req,
-            ...localAPIDefaults(authorizedMCP),
             ...limit ? {
                 limit
             } : {},
@@ -51,10 +38,7 @@ export const findDistinctTool = defineCollectionTool({
                 page
             } : {},
             ...populate ? {
-                populate: populate
-            } : {},
-            ...showHiddenFields !== undefined ? {
-                showHiddenFields
+                populate
             } : {},
             ...sort ? {
                 sort
@@ -70,19 +54,19 @@ export const findDistinctTool = defineCollectionTool({
             content: [
                 {
                     type: 'text',
-                    text: `Distinct values for "${field}" in collection "${collectionSlug}":\n\`\`\`json\n${JSON.stringify(result)}\n\`\`\``
+                    text: `Distinct values for "${field}" in collection "${slug}":\n\`\`\`json\n${JSON.stringify(result)}\n\`\`\``
                 }
             ],
             doc: result
         };
     } catch (error) {
         const errorMessage = error instanceof Error ? error.message : 'Unknown error';
-        logger.error(`Error finding distinct values in ${collectionSlug}: ${errorMessage}`);
+        logger.error(`Error finding distinct values in ${slug}: ${errorMessage}`);
         return {
             content: [
                 {
                     type: 'text',
-                    text: `❌ **Error finding distinct values in collection "${collectionSlug}":** ${errorMessage}`
+                    text: `❌ **Error finding distinct values in collection "${slug}":** ${errorMessage}`
                 }
             ],
             isError: true

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/mcp/builtin/collections/findDistinctTool.ts"],"sourcesContent":["import type { PopulateType } from 'payload'\n\nimport { z } from 'zod'\n\nimport { defaultAccess } from '../../../defaultAccess.js'\nimport { defineCollectionTool } from '../../../defineTool.js'\nimport { getLogger } from '../../../utils/getLogger.js'\nimport { localAPIDefaults } from '../../../utils/localAPIDefaults.js'\nimport { whereSchema } from '../../../utils/whereSchema.js'\n\nconst DEFAULT_DESCRIPTION =\n  'Find distinct values for a field in any collection by passing the collection slug and field path.'\n\nexport const findDistinctTool = defineCollectionTool({\n  access: (args) =>\n    defaultAccess(args) && Boolean(args.permissions?.collections?.[args.collectionSlug]?.read),\n  annotations: {\n    destructiveHint: false,\n    idempotentHint: true,\n    openWorldHint: false,\n    readOnlyHint: true,\n    title: 'Find Distinct',\n  },\n  description: DEFAULT_DESCRIPTION,\n  input: z.object({\n    depth: z\n      .number()\n      .int()\n      .min(0)\n      .max(10)\n      .describe('How many levels deep to populate relationships in distinct values')\n      .optional()\n      .default(0),\n    field: z.string().describe('The field path to get distinct values for'),\n    limit: z\n      .number()\n      .int()\n      .min(1)\n      .max(100)\n      .describe('Maximum number of distinct values to return (max: 100)')\n      .optional(),\n    locale: z\n      .string()\n      .describe(\n        'Optional: locale code to retrieve data in (e.g., \"en\", \"es\"). Use \"all\" to retrieve all locales for localized fields',\n      )\n      .optional(),\n    page: z.number().int().min(1).describe('Page number for pagination').optional(),\n    populate: z\n      .record(z.string(), z.unknown())\n      .describe(\n        'Optional: control which fields to include from populated relationship or upload documents.',\n      )\n      .optional(),\n    showHiddenFields: z\n      .boolean()\n      .describe('Optional: include hidden fields in the distinct query')\n      .optional(),\n    sort: z\n      .string()\n      .describe('Field to sort by (e.g., \"createdAt\", \"-updatedAt\" for descending)')\n      .optional(),\n    trash: z\n      .boolean()\n      .describe('Optional: include soft-deleted documents when trash is enabled on the collection')\n      .optional(),\n    where: whereSchema\n      .describe(\n        'Optional: where clause for filtering. Use field names with Payload operators, and/or arrays for grouping. Example: {\"title\":{\"contains\":\"test\"}}',\n      )\n      .optional(),\n  }),\n}).handler(async ({ authorizedMCP, collectionSlug, input, req }) => {\n  const payload = req.payload\n  const logger = getLogger({ payload })\n  const { depth, field, limit, locale, page, populate, showHiddenFields, sort, trash, where } = input\n\n  logger.info(`Finding distinct values in collection: ${collectionSlug}, field: ${field}`)\n\n  try {\n    const result = await payload.findDistinct({\n      collection: collectionSlug,\n      depth,\n      field,\n      req,\n      ...localAPIDefaults(authorizedMCP),\n      ...(limit ? { limit } : {}),\n      ...(locale ? { locale } : {}),\n      ...(page ? { page } : {}),\n      ...(populate ? { populate: populate as PopulateType } : {}),\n      ...(showHiddenFields !== undefined ? { showHiddenFields } : {}),\n      ...(sort ? { sort } : {}),\n      ...(trash !== undefined ? { trash } : {}),\n      ...(where ? { where } : {}),\n    })\n\n    return {\n      content: [\n        {\n          type: 'text',\n          text: `Distinct values for \"${field}\" in collection \"${collectionSlug}\":\\n\\`\\`\\`json\\n${JSON.stringify(result)}\\n\\`\\`\\``,\n        },\n      ],\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 finding distinct values in ${collectionSlug}: ${errorMessage}`)\n    return {\n      content: [\n        {\n          type: 'text',\n          text: `❌ **Error finding distinct values in collection \"${collectionSlug}\":** ${errorMessage}`,\n        },\n      ],\n      isError: true,\n    }\n  }\n})\n"],"names":["z","defaultAccess","defineCollectionTool","getLogger","localAPIDefaults","whereSchema","DEFAULT_DESCRIPTION","findDistinctTool","access","args","Boolean","permissions","collections","collectionSlug","read","annotations","destructiveHint","idempotentHint","openWorldHint","readOnlyHint","title","description","input","object","depth","number","int","min","max","describe","optional","default","field","string","limit","locale","page","populate","record","unknown","showHiddenFields","boolean","sort","trash","where","handler","authorizedMCP","req","payload","logger","info","result","findDistinct","collection","undefined","content","type","text","JSON","stringify","doc","error","errorMessage","Error","message","isError"],"mappings":"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"}
+{"version":3,"sources":["../../../../src/mcp/builtin/collections/findDistinctTool.ts"],"sourcesContent":["import { findDistinctInputSchema } 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 distinct values for a field in any collection by passing the collection slug and field path.'\n\nexport const findDistinctTool = 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 Distinct',\n  },\n  description: DEFAULT_DESCRIPTION,\n  input: findDistinctInputSchema,\n}).handler(async ({ slug, authorizedMCP, input, req }) => {\n  const payload = req.payload\n  const logger = getLogger({ payload })\n  const { depth, field, limit, locale, page, populate, sort, trash, where } = input\n\n  logger.info(`Finding distinct values in collection: ${slug}, field: ${field}`)\n\n  try {\n    const result = await payload.findDistinct({\n      collection: slug,\n      depth,\n      field,\n      overrideAccess: authorizedMCP.overrideAccess,\n      req,\n      ...(limit ? { limit } : {}),\n      ...(locale ? { locale } : {}),\n      ...(page ? { page } : {}),\n      ...(populate ? { populate } : {}),\n      ...(sort ? { sort } : {}),\n      ...(trash !== undefined ? { trash } : {}),\n      ...(where ? { where } : {}),\n    })\n\n    return {\n      content: [\n        {\n          type: 'text',\n          text: `Distinct values for \"${field}\" in collection \"${slug}\":\\n\\`\\`\\`json\\n${JSON.stringify(result)}\\n\\`\\`\\``,\n        },\n      ],\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 finding distinct values in ${slug}: ${errorMessage}`)\n    return {\n      content: [\n        {\n          type: 'text',\n          text: `❌ **Error finding distinct values in collection \"${slug}\":** ${errorMessage}`,\n        },\n      ],\n      isError: true,\n    }\n  }\n})\n"],"names":["findDistinctInputSchema","defaultAccess","defineCollectionTool","getLogger","DEFAULT_DESCRIPTION","findDistinctTool","access","args","Boolean","permissions","collections","slug","read","annotations","destructiveHint","idempotentHint","openWorldHint","readOnlyHint","title","description","input","handler","authorizedMCP","req","payload","logger","depth","field","limit","locale","page","populate","sort","trash","where","info","result","findDistinct","collection","overrideAccess","undefined","content","type","text","JSON","stringify","doc","error","errorMessage","Error","message","isError"],"mappings":"AAAA,SAASA,uBAAuB,QAAQ,UAAS;AAEjD,SAASC,aAAa,QAAQ,4BAA2B;AACzD,SAASC,oBAAoB,QAAQ,yBAAwB;AAC7D,SAASC,SAAS,QAAQ,8BAA6B;AAEvD,MAAMC,sBACJ;AAEF,OAAO,MAAMC,mBAAmBH,qBAAqB;IACnDI,QAAQ,CAACC,OACPN,cAAcM,SAASC,QAAQD,KAAKE,WAAW,EAAEC,aAAa,CAACH,KAAKI,IAAI,CAAC,EAAEC;IAC7EC,aAAa;QACXC,iBAAiB;QACjBC,gBAAgB;QAChBC,eAAe;QACfC,cAAc;QACdC,OAAO;IACT;IACAC,aAAaf;IACbgB,OAAOpB;AACT,GAAGqB,OAAO,CAAC,OAAO,EAAEV,IAAI,EAAEW,aAAa,EAAEF,KAAK,EAAEG,GAAG,EAAE;IACnD,MAAMC,UAAUD,IAAIC,OAAO;IAC3B,MAAMC,SAAStB,UAAU;QAAEqB;IAAQ;IACnC,MAAM,EAAEE,KAAK,EAAEC,KAAK,EAAEC,KAAK,EAAEC,MAAM,EAAEC,IAAI,EAAEC,QAAQ,EAAEC,IAAI,EAAEC,KAAK,EAAEC,KAAK,EAAE,GAAGd;IAE5EK,OAAOU,IAAI,CAAC,CAAC,uCAAuC,EAAExB,KAAK,SAAS,EAAEgB,OAAO;IAE7E,IAAI;QACF,MAAMS,SAAS,MAAMZ,QAAQa,YAAY,CAAC;YACxCC,YAAY3B;YACZe;YACAC;YACAY,gBAAgBjB,cAAciB,cAAc;YAC5ChB;YACA,GAAIK,QAAQ;gBAAEA;YAAM,IAAI,CAAC,CAAC;YAC1B,GAAIC,SAAS;gBAAEA;YAAO,IAAI,CAAC,CAAC;YAC5B,GAAIC,OAAO;gBAAEA;YAAK,IAAI,CAAC,CAAC;YACxB,GAAIC,WAAW;gBAAEA;YAAS,IAAI,CAAC,CAAC;YAChC,GAAIC,OAAO;gBAAEA;YAAK,IAAI,CAAC,CAAC;YACxB,GAAIC,UAAUO,YAAY;gBAAEP;YAAM,IAAI,CAAC,CAAC;YACxC,GAAIC,QAAQ;gBAAEA;YAAM,IAAI,CAAC,CAAC;QAC5B;QAEA,OAAO;YACLO,SAAS;gBACP;oBACEC,MAAM;oBACNC,MAAM,CAAC,qBAAqB,EAAEhB,MAAM,iBAAiB,EAAEhB,KAAK,gBAAgB,EAAEiC,KAAKC,SAAS,CAACT,QAAQ,QAAQ,CAAC;gBAChH;aACD;YACDU,KAAKV;QACP;IACF,EAAE,OAAOW,OAAO;QACd,MAAMC,eAAeD,iBAAiBE,QAAQF,MAAMG,OAAO,GAAG;QAC9DzB,OAAOsB,KAAK,CAAC,CAAC,iCAAiC,EAAEpC,KAAK,EAAE,EAAEqC,cAAc;QACxE,OAAO;YACLP,SAAS;gBACP;oBACEC,MAAM;oBACNC,MAAM,CAAC,iDAAiD,EAAEhC,KAAK,KAAK,EAAEqC,cAAc;gBACtF;aACD;YACDG,SAAS;QACX;IACF;AACF,GAAE"}

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

@@ -1 +1 @@
-{"version":3,"file":"findTool.d.ts","sourceRoot":"","sources":["../../../../src/mcp/builtin/collections/findTool.ts"],"names":[],"mappings":"AAaA,eAAO,MAAM,iBAAiB,4CA2M5B,CAAA"}
+{"version":3,"file":"findTool.d.ts","sourceRoot":"","sources":["../../../../src/mcp/builtin/collections/findTool.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,iBAAiB,4CA4H5B,CAAA"}

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

@@ -1,12 +1,10 @@
-import { z } from 'zod';
+import { findDocumentsInputSchema, parseDocumentID } from 'payload';
 import { defaultAccess } from '../../../defaultAccess.js';
 import { defineCollectionTool } from '../../../defineTool.js';
 import { getLogger } from '../../../utils/getLogger.js';
-import { localAPIDefaults } from '../../../utils/localAPIDefaults.js';
-import { whereSchema } from '../../../utils/whereSchema.js';
 const DEFAULT_DESCRIPTION = 'Find documents in any collection by passing the collection slug and optional ID or where clause.';
 export const findDocumentsTool = defineCollectionTool({
-    access: (args)=>defaultAccess(args) && Boolean(args.permissions?.collections?.[args.collectionSlug]?.read),
+    access: (args)=>defaultAccess(args) && Boolean(args.permissions?.collections?.[args.slug]?.read),
     annotations: {
         destructiveHint: false,
         idempotentHint: true,
@@ -15,57 +13,40 @@ export const findDocumentsTool = defineCollectionTool({
         title: 'Find Documents'
     },
     description: DEFAULT_DESCRIPTION,
-    input: z.object({
-        id: z.union([
-            z.string(),
-            z.number()
-        ]).describe('Optional: specific document ID to retrieve. If not provided, returns all documents').optional(),
-        depth: z.number().int().min(0).max(10).describe('How many levels deep to populate relationships (default: 0)').optional().default(0),
-        draft: z.boolean().describe('Optional: whether the document should be queried from the versions table/collection or not.').optional(),
-        fallbackLocale: z.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().min(1).max(100).describe('Maximum number of documents to return (default: 10, max: 100)').optional().default(10),
-        locale: z.string().describe('Optional: locale code to retrieve data in (e.g., "en", "es"). Use "all" to retrieve all locales for localized fields').optional(),
-        page: z.number().int().min(1).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.record(z.string(), z.unknown()).describe('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"}}').optional()
-    })
-}).handler(async ({ authorizedMCP, collectionSlug, input, req })=>{
+    input: findDocumentsInputSchema
+}).handler(async ({ slug, authorizedMCP, input, req })=>{
     const payload = req.payload;
     const logger = getLogger({
         payload
     });
     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}` : ''}`);
+    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,
-                    collection: collectionSlug,
+                    id: parseDocumentID({
+                        id,
+                        collectionSlug: slug,
+                        payload
+                    }),
+                    collection: slug,
                     depth,
+                    overrideAccess: authorizedMCP.overrideAccess,
                     req,
-                    ...localAPIDefaults(authorizedMCP),
                     ...select && {
-                        select: select
+                        select
                     },
                     ...populate && {
-                        populate: populate
+                        populate
                     },
                     ...joins !== undefined && {
-                        joins: joins
+                        joins
                     },
                     ...locale && {
                         locale
                     },
-                    ...fallbackLocale && {
+                    ...fallbackLocale !== undefined && {
                         fallbackLocale
                     },
                     ...draft !== undefined && {
@@ -79,43 +60,43 @@ export const findDocumentsTool = defineCollectionTool({
                     content: [
                         {
                             type: 'text',
-                            text: `Document from collection "${collectionSlug}":\n${JSON.stringify(doc)}`
+                            text: `Document from collection "${slug}":\n${JSON.stringify(doc)}`
                         }
                     ],
                     doc: doc
                 };
             } catch  {
-                logger.warn(`Document not found with ID: ${id} in collection: ${collectionSlug}`);
+                logger.warn(`Document not found with ID: ${id} in collection: ${slug}`);
                 return {
                     content: [
                         {
                             type: 'text',
-                            text: `Error: Document with ID "${id}" not found in collection "${collectionSlug}"`
+                            text: `Error: Document with ID "${id}" not found in collection "${slug}"`
                         }
                     ]
                 };
             }
         }
         const findOptions = {
-            collection: collectionSlug,
+            collection: slug,
             depth,
             limit,
+            overrideAccess: authorizedMCP.overrideAccess,
             page,
             req,
-            ...localAPIDefaults(authorizedMCP),
             ...select && {
-                select: select
+                select
             },
             ...populate && {
-                populate: populate
+                populate
             },
             ...joins !== undefined && {
-                joins: joins
+                joins
             },
             ...locale && {
                 locale
             },
-            ...fallbackLocale && {
+            ...fallbackLocale !== undefined && {
                 fallbackLocale
             },
             ...draft !== undefined && {
@@ -135,7 +116,7 @@ export const findDocumentsTool = defineCollectionTool({
             findOptions.where = where;
         }
         const result = await payload.find(findOptions);
-        let responseText = `Collection: "${collectionSlug}"\nTotal: ${result.totalDocs} documents\nPage: ${result.page} of ${result.totalPages}\n`;
+        let responseText = `Collection: "${slug}"\nTotal: ${result.totalDocs} documents\nPage: ${result.page} of ${result.totalPages}\n`;
         for (const doc of result.docs){
             responseText += `\n\`\`\`json\n${JSON.stringify(doc)}\n\`\`\``;
         }
@@ -150,12 +131,12 @@ export const findDocumentsTool = defineCollectionTool({
         };
     } catch (error) {
         const errorMessage = error instanceof Error ? error.message : 'Unknown error';
-        logger.error(`Error reading documents from collection ${collectionSlug}: ${errorMessage}`);
+        logger.error(`Error reading documents from collection ${slug}: ${errorMessage}`);
         return {
             content: [
                 {
                     type: 'text',
-                    text: `❌ **Error reading documents from collection "${collectionSlug}":** ${errorMessage}`
+                    text: `❌ **Error reading documents from collection "${slug}":** ${errorMessage}`
                 }
             ]
         };