@payloadcms/plugin-mcp 4.0.0-internal.688c4d0 → 4.0.0-internal.bc5cf8c

package/dist/mcp/builtinTools.d.ts

@@ -1,7 +1,17 @@
 import type { CollectionTool, GlobalTool, Tool } from '../types.js';
+type CollectionBuiltin = {
+    mcpName: string;
+    requiresDuplicateEnabled?: boolean;
+    requiresVersions?: boolean;
+    tool: CollectionTool;
+};
+type GlobalBuiltin = {
+    mcpName: string;
+    requiresVersions?: boolean;
+    tool: GlobalTool;
+};
 export declare const TOOL_BUILTINS: {
     getConfigInfo: {
-        label: string;
         mcpName: string;
         tool: Tool;
     };
@@ -12,6 +22,15 @@ export declare const TOOL_BUILTINS: {
  * automatically.
  */
 export declare const COLLECTION_BUILTINS: {
+    count: {
+        mcpName: string;
+        tool: CollectionTool;
+    };
+    countVersions: {
+        mcpName: string;
+        requiresVersions: true;
+        tool: CollectionTool;
+    };
     create: {
         mcpName: string;
         tool: CollectionTool;
@@ -20,52 +39,69 @@ export declare const COLLECTION_BUILTINS: {
         mcpName: string;
         tool: CollectionTool;
     };
+    duplicate: {
+        mcpName: string;
+        requiresDuplicateEnabled: true;
+        tool: CollectionTool;
+    };
     find: {
         mcpName: string;
         tool: CollectionTool;
     };
+    findDistinct: {
+        mcpName: string;
+        tool: CollectionTool;
+    };
+    findVersionByID: {
+        mcpName: string;
+        requiresVersions: true;
+        tool: CollectionTool;
+    };
+    findVersions: {
+        mcpName: string;
+        requiresVersions: true;
+        tool: CollectionTool;
+    };
     getCollectionSchema: {
         mcpName: string;
         tool: CollectionTool;
     };
+    restoreVersion: {
+        mcpName: string;
+        requiresVersions: true;
+        tool: CollectionTool;
+    };
     update: {
         mcpName: string;
         tool: CollectionTool;
     };
 };
 /**
- * The static auth tools surfaced under auth-enabled collections. Each entry
- * carries the admin-UI label alongside the tool. Keys are the source of truth
- * for `MCPCollectionAuthToolName`.
+ * The static auth tools surfaced under auth-enabled collections. Keys are the
+ * source of truth for `MCPCollectionAuthToolName`.
  */
 export declare const COLLECTION_AUTH_BUILTINS: {
     auth: {
-        label: string;
         mcpName: string;
         tool: CollectionTool;
     };
     forgotPassword: {
-        label: string;
         mcpName: string;
         tool: CollectionTool;
     };
     login: {
-        label: string;
         mcpName: string;
         tool: CollectionTool;
     };
     resetPassword: {
-        label: string;
         mcpName: string;
         tool: CollectionTool;
     };
     unlock: {
-        label: string;
         mcpName: string;
         tool: CollectionTool;
     };
     verify: {
-        label: string;
         mcpName: string;
         tool: CollectionTool;
     };
@@ -75,14 +111,34 @@ export declare const COLLECTION_AUTH_BUILTINS: {
  * `MCPGlobalBuiltinName`.
  */
 export declare const GLOBAL_BUILTINS: {
+    countGlobalVersions: {
+        mcpName: string;
+        requiresVersions: true;
+        tool: GlobalTool;
+    };
     find: {
         mcpName: string;
         tool: GlobalTool;
     };
+    findGlobalVersionByID: {
+        mcpName: string;
+        requiresVersions: true;
+        tool: GlobalTool;
+    };
+    findGlobalVersions: {
+        mcpName: string;
+        requiresVersions: true;
+        tool: GlobalTool;
+    };
     getGlobalSchema: {
         mcpName: string;
         tool: GlobalTool;
     };
+    restoreGlobalVersion: {
+        mcpName: string;
+        requiresVersions: true;
+        tool: GlobalTool;
+    };
     update: {
         mcpName: string;
         tool: GlobalTool;
@@ -99,7 +155,8 @@ export type MCPTopLevelBuiltinName = keyof typeof TOOL_BUILTINS;
  * defeats the narrow type lookups on `MCPCollectionToolsMap`.
  */
 export declare const TOOL_BUILTIN_ENTRIES: Array<[MCPTopLevelBuiltinName, (typeof TOOL_BUILTINS)[MCPTopLevelBuiltinName]]>;
-export declare const COLLECTION_BUILTIN_ENTRIES: Array<[MCPCollectionBuiltinName, (typeof COLLECTION_BUILTINS)[MCPCollectionBuiltinName]]>;
+export declare const COLLECTION_BUILTIN_ENTRIES: Array<[MCPCollectionBuiltinName, CollectionBuiltin]>;
 export declare const COLLECTION_AUTH_BUILTIN_ENTRIES: Array<[MCPCollectionAuthToolName, (typeof COLLECTION_AUTH_BUILTINS)[MCPCollectionAuthToolName]]>;
-export declare const GLOBAL_BUILTIN_ENTRIES: Array<[MCPGlobalBuiltinName, (typeof GLOBAL_BUILTINS)[MCPGlobalBuiltinName]]>;
+export declare const GLOBAL_BUILTIN_ENTRIES: Array<[MCPGlobalBuiltinName, GlobalBuiltin]>;
+export {};
 //# sourceMappingURL=builtinTools.d.ts.map

package/dist/mcp/builtinTools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"builtinTools.d.ts","sourceRoot":"","sources":["../../src/mcp/builtinTools.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AAoBnE,eAAO,MAAM,aAAa;;;;;;CAEgD,CAAA;AAE1E;;;;GAIG;AACH,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;CAMqC,CAAA;AAErE;;;;GAIG;AACH,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAe+C,CAAA;AAEpF;;;GAGG;AACH,eAAO,MAAM,eAAe;;;;;;;;;;;;;CAIqC,CAAA;AAEjE,MAAM,MAAM,wBAAwB,GAAG,MAAM,OAAO,mBAAmB,CAAA;AAEvE,MAAM,MAAM,yBAAyB,GAAG,MAAM,OAAO,wBAAwB,CAAA;AAE7E,MAAM,MAAM,oBAAoB,GAAG,MAAM,OAAO,eAAe,CAAA;AAE/D,MAAM,MAAM,sBAAsB,GAAG,MAAM,OAAO,aAAa,CAAA;AAE/D;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,EAAoC,KAAK,CACxE,CAAC,sBAAsB,EAAE,CAAC,OAAO,aAAa,EAAE,sBAAsB,CAAC,CAAC,CACzE,CAAA;AAED,eAAO,MAAM,0BAA0B,EAA0C,KAAK,CACpF,CAAC,wBAAwB,EAAE,CAAC,OAAO,mBAAmB,EAAE,wBAAwB,CAAC,CAAC,CACnF,CAAA;AAED,eAAO,MAAM,+BAA+B,EAA+C,KAAK,CAC9F,CAAC,yBAAyB,EAAE,CAAC,OAAO,wBAAwB,EAAE,yBAAyB,CAAC,CAAC,CAC1F,CAAA;AAED,eAAO,MAAM,sBAAsB,EAAsC,KAAK,CAC5E,CAAC,oBAAoB,EAAE,CAAC,OAAO,eAAe,EAAE,oBAAoB,CAAC,CAAC,CACvE,CAAA"}
+{"version":3,"file":"builtinTools.d.ts","sourceRoot":"","sources":["../../src/mcp/builtinTools.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,aAAa,CAAA;AA+BnE,KAAK,iBAAiB,GAAG;IACvB,OAAO,EAAE,MAAM,CAAA;IACf,wBAAwB,CAAC,EAAE,OAAO,CAAA;IAClC,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,IAAI,EAAE,cAAc,CAAA;CACrB,CAAA;AAED,KAAK,aAAa,GAAG;IACnB,OAAO,EAAE,MAAM,CAAA;IACf,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,IAAI,EAAE,UAAU,CAAA;CACjB,CAAA;AAED,eAAO,MAAM,aAAa;;;;;CAEiC,CAAA;AAE3D;;;;GAIG;AACH,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAqBa,CAAA;AAE7C;;;GAGG;AACH,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;;;;;CAagC,CAAA;AAErE;;;GAGG;AACH,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwBa,CAAA;AAEzC,MAAM,MAAM,wBAAwB,GAAG,MAAM,OAAO,mBAAmB,CAAA;AAEvE,MAAM,MAAM,yBAAyB,GAAG,MAAM,OAAO,wBAAwB,CAAA;AAE7E,MAAM,MAAM,oBAAoB,GAAG,MAAM,OAAO,eAAe,CAAA;AAE/D,MAAM,MAAM,sBAAsB,GAAG,MAAM,OAAO,aAAa,CAAA;AAE/D;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,EAAoC,KAAK,CACxE,CAAC,sBAAsB,EAAE,CAAC,OAAO,aAAa,EAAE,sBAAsB,CAAC,CAAC,CACzE,CAAA;AAED,eAAO,MAAM,0BAA0B,EAA0C,KAAK,CACpF,CAAC,wBAAwB,EAAE,iBAAiB,CAAC,CAC9C,CAAA;AAED,eAAO,MAAM,+BAA+B,EAA+C,KAAK,CAC9F,CAAC,yBAAyB,EAAE,CAAC,OAAO,wBAAwB,EAAE,yBAAyB,CAAC,CAAC,CAC1F,CAAA;AAED,eAAO,MAAM,sBAAsB,EAAsC,KAAK,CAC5E,CAAC,oBAAoB,EAAE,aAAa,CAAC,CACtC,CAAA"}

package/dist/mcp/builtinTools.js

@@ -1,16 +1,26 @@
 import { authCollectionTool, forgotPasswordCollectionTool, loginCollectionTool, resetPasswordCollectionTool, unlockCollectionTool, verifyCollectionTool } from './builtin/collections/authTools.js';
+import { countDocumentsTool } from './builtin/collections/countTool.js';
+import { countVersionsTool } from './builtin/collections/countVersionsTool.js';
 import { createDocumentTool } from './builtin/collections/createTool.js';
 import { deleteDocumentsTool } from './builtin/collections/deleteTool.js';
+import { duplicateDocumentTool } from './builtin/collections/duplicateTool.js';
+import { findDistinctTool } from './builtin/collections/findDistinctTool.js';
 import { findDocumentsTool } from './builtin/collections/findTool.js';
+import { findVersionByIDTool } from './builtin/collections/findVersionByIDTool.js';
+import { findVersionsTool } from './builtin/collections/findVersionsTool.js';
 import { getCollectionSchemaTool } from './builtin/collections/getCollectionSchemaTool.js';
+import { restoreVersionTool } from './builtin/collections/restoreVersionTool.js';
 import { updateDocumentTool } from './builtin/collections/updateTool.js';
 import { getConfigInfoTool } from './builtin/getConfigInfoTool.js';
+import { countGlobalVersionsTool } from './builtin/globals/countVersionsTool.js';
 import { findGlobalTool } from './builtin/globals/findTool.js';
+import { findGlobalVersionByIDTool } from './builtin/globals/findVersionByIDTool.js';
+import { findGlobalVersionsTool } from './builtin/globals/findVersionsTool.js';
 import { getGlobalSchemaTool } from './builtin/globals/getGlobalSchemaTool.js';
+import { restoreGlobalVersionTool } from './builtin/globals/restoreVersionTool.js';
 import { updateGlobalTool } from './builtin/globals/updateTool.js';
 export const TOOL_BUILTINS = {
     getConfigInfo: {
-        label: 'Config Info',
         mcpName: 'getConfigInfo',
         tool: getConfigInfoTool
     }
@@ -20,6 +30,15 @@ export const TOOL_BUILTINS = {
  * for `MCPCollectionBuiltinName` — adding/removing an entry updates the type
  * automatically.
  */ export const COLLECTION_BUILTINS = {
+    count: {
+        mcpName: 'countDocuments',
+        tool: countDocumentsTool
+    },
+    countVersions: {
+        mcpName: 'countVersions',
+        requiresVersions: true,
+        tool: countVersionsTool
+    },
     create: {
         mcpName: 'createDocument',
         tool: createDocumentTool
@@ -28,51 +47,68 @@ export const TOOL_BUILTINS = {
         mcpName: 'deleteDocuments',
         tool: deleteDocumentsTool
     },
+    duplicate: {
+        mcpName: 'duplicateDocument',
+        requiresDuplicateEnabled: true,
+        tool: duplicateDocumentTool
+    },
     find: {
         mcpName: 'findDocuments',
         tool: findDocumentsTool
     },
+    findDistinct: {
+        mcpName: 'findDistinct',
+        tool: findDistinctTool
+    },
+    findVersionByID: {
+        mcpName: 'findVersionByID',
+        requiresVersions: true,
+        tool: findVersionByIDTool
+    },
+    findVersions: {
+        mcpName: 'findVersions',
+        requiresVersions: true,
+        tool: findVersionsTool
+    },
     getCollectionSchema: {
         mcpName: 'getCollectionSchema',
         tool: getCollectionSchemaTool
     },
+    restoreVersion: {
+        mcpName: 'restoreVersion',
+        requiresVersions: true,
+        tool: restoreVersionTool
+    },
     update: {
         mcpName: 'updateDocument',
         tool: updateDocumentTool
     }
 };
 /**
- * The static auth tools surfaced under auth-enabled collections. Each entry
- * carries the admin-UI label alongside the tool. Keys are the source of truth
- * for `MCPCollectionAuthToolName`.
+ * The static auth tools surfaced under auth-enabled collections. Keys are the
+ * source of truth for `MCPCollectionAuthToolName`.
  */ export const COLLECTION_AUTH_BUILTINS = {
     auth: {
-        label: 'Check Auth Status',
         mcpName: 'auth',
         tool: authCollectionTool
     },
     forgotPassword: {
-        label: 'Forgot Password',
         mcpName: 'forgotPassword',
         tool: forgotPasswordCollectionTool
     },
     login: {
-        label: 'User Login',
         mcpName: 'login',
         tool: loginCollectionTool
     },
     resetPassword: {
-        label: 'Reset Password',
         mcpName: 'resetPassword',
         tool: resetPasswordCollectionTool
     },
     unlock: {
-        label: 'Unlock Account',
         mcpName: 'unlock',
         tool: unlockCollectionTool
     },
     verify: {
-        label: 'Email Verification',
         mcpName: 'verify',
         tool: verifyCollectionTool
     }
@@ -81,14 +117,34 @@ export const TOOL_BUILTINS = {
  * The static built-in global tools. Keys are the source of truth for
  * `MCPGlobalBuiltinName`.
  */ export const GLOBAL_BUILTINS = {
+    countGlobalVersions: {
+        mcpName: 'countGlobalVersions',
+        requiresVersions: true,
+        tool: countGlobalVersionsTool
+    },
     find: {
         mcpName: 'findGlobal',
         tool: findGlobalTool
     },
+    findGlobalVersionByID: {
+        mcpName: 'findGlobalVersionByID',
+        requiresVersions: true,
+        tool: findGlobalVersionByIDTool
+    },
+    findGlobalVersions: {
+        mcpName: 'findGlobalVersions',
+        requiresVersions: true,
+        tool: findGlobalVersionsTool
+    },
     getGlobalSchema: {
         mcpName: 'getGlobalSchema',
         tool: getGlobalSchemaTool
     },
+    restoreGlobalVersion: {
+        mcpName: 'restoreGlobalVersion',
+        requiresVersions: true,
+        tool: restoreGlobalVersionTool
+    },
     update: {
         mcpName: 'updateGlobal',
         tool: updateGlobalTool

package/dist/mcp/builtinTools.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/mcp/builtinTools.ts"],"sourcesContent":["import type { CollectionTool, GlobalTool, Tool } from '../types.js'\n\nimport {\n  authCollectionTool,\n  forgotPasswordCollectionTool,\n  loginCollectionTool,\n  resetPasswordCollectionTool,\n  unlockCollectionTool,\n  verifyCollectionTool,\n} from './builtin/collections/authTools.js'\nimport { createDocumentTool } from './builtin/collections/createTool.js'\nimport { deleteDocumentsTool } from './builtin/collections/deleteTool.js'\nimport { findDocumentsTool } from './builtin/collections/findTool.js'\nimport { getCollectionSchemaTool } from './builtin/collections/getCollectionSchemaTool.js'\nimport { updateDocumentTool } from './builtin/collections/updateTool.js'\nimport { getConfigInfoTool } from './builtin/getConfigInfoTool.js'\nimport { findGlobalTool } from './builtin/globals/findTool.js'\nimport { getGlobalSchemaTool } from './builtin/globals/getGlobalSchemaTool.js'\nimport { updateGlobalTool } from './builtin/globals/updateTool.js'\n\nexport const TOOL_BUILTINS = {\n  getConfigInfo: { label: 'Config Info', mcpName: 'getConfigInfo', tool: getConfigInfoTool },\n} satisfies Record<string, { label: string; mcpName: string; tool: Tool }>\n\n/**\n * The static built-in collection CRUD tools. Keys here are the source of truth\n * for `MCPCollectionBuiltinName` — adding/removing an entry updates the type\n * automatically.\n */\nexport const COLLECTION_BUILTINS = {\n  create: { mcpName: 'createDocument', tool: createDocumentTool },\n  delete: { mcpName: 'deleteDocuments', tool: deleteDocumentsTool },\n  find: { mcpName: 'findDocuments', tool: findDocumentsTool },\n  getCollectionSchema: { mcpName: 'getCollectionSchema', tool: getCollectionSchemaTool },\n  update: { mcpName: 'updateDocument', tool: updateDocumentTool },\n} satisfies Record<string, { mcpName: string; tool: CollectionTool }>\n\n/**\n * The static auth tools surfaced under auth-enabled collections. Each entry\n * carries the admin-UI label alongside the tool. Keys are the source of truth\n * for `MCPCollectionAuthToolName`.\n */\nexport const COLLECTION_AUTH_BUILTINS = {\n  auth: { label: 'Check Auth Status', mcpName: 'auth', tool: authCollectionTool },\n  forgotPassword: {\n    label: 'Forgot Password',\n    mcpName: 'forgotPassword',\n    tool: forgotPasswordCollectionTool,\n  },\n  login: { label: 'User Login', mcpName: 'login', tool: loginCollectionTool },\n  resetPassword: {\n    label: 'Reset Password',\n    mcpName: 'resetPassword',\n    tool: resetPasswordCollectionTool,\n  },\n  unlock: { label: 'Unlock Account', mcpName: 'unlock', tool: unlockCollectionTool },\n  verify: { label: 'Email Verification', mcpName: 'verify', tool: verifyCollectionTool },\n} satisfies Record<string, { label: string; mcpName: string; tool: CollectionTool }>\n\n/**\n * The static built-in global tools. Keys are the source of truth for\n * `MCPGlobalBuiltinName`.\n */\nexport const GLOBAL_BUILTINS = {\n  find: { mcpName: 'findGlobal', tool: findGlobalTool },\n  getGlobalSchema: { mcpName: 'getGlobalSchema', tool: getGlobalSchemaTool },\n  update: { mcpName: 'updateGlobal', tool: updateGlobalTool },\n} satisfies Record<string, { mcpName: string; tool: GlobalTool }>\n\nexport type MCPCollectionBuiltinName = keyof typeof COLLECTION_BUILTINS\n\nexport type MCPCollectionAuthToolName = keyof typeof COLLECTION_AUTH_BUILTINS\n\nexport type MCPGlobalBuiltinName = keyof typeof GLOBAL_BUILTINS\n\nexport type MCPTopLevelBuiltinName = keyof typeof TOOL_BUILTINS\n\n/**\n * Pre-typed `Object.entries` for each registry. The cast from `string` to the\n * literal key union lives here once so consumers can iterate without their own\n * cast — TypeScript's `Object.entries` always widens keys to `string`, which\n * defeats the narrow type lookups on `MCPCollectionToolsMap`.\n */\nexport const TOOL_BUILTIN_ENTRIES = Object.entries(TOOL_BUILTINS) as Array<\n  [MCPTopLevelBuiltinName, (typeof TOOL_BUILTINS)[MCPTopLevelBuiltinName]]\n>\n\nexport const COLLECTION_BUILTIN_ENTRIES = Object.entries(COLLECTION_BUILTINS) as Array<\n  [MCPCollectionBuiltinName, (typeof COLLECTION_BUILTINS)[MCPCollectionBuiltinName]]\n>\n\nexport const COLLECTION_AUTH_BUILTIN_ENTRIES = Object.entries(COLLECTION_AUTH_BUILTINS) as Array<\n  [MCPCollectionAuthToolName, (typeof COLLECTION_AUTH_BUILTINS)[MCPCollectionAuthToolName]]\n>\n\nexport const GLOBAL_BUILTIN_ENTRIES = Object.entries(GLOBAL_BUILTINS) as Array<\n  [MCPGlobalBuiltinName, (typeof GLOBAL_BUILTINS)[MCPGlobalBuiltinName]]\n>\n"],"names":["authCollectionTool","forgotPasswordCollectionTool","loginCollectionTool","resetPasswordCollectionTool","unlockCollectionTool","verifyCollectionTool","createDocumentTool","deleteDocumentsTool","findDocumentsTool","getCollectionSchemaTool","updateDocumentTool","getConfigInfoTool","findGlobalTool","getGlobalSchemaTool","updateGlobalTool","TOOL_BUILTINS","getConfigInfo","label","mcpName","tool","COLLECTION_BUILTINS","create","delete","find","getCollectionSchema","update","COLLECTION_AUTH_BUILTINS","auth","forgotPassword","login","resetPassword","unlock","verify","GLOBAL_BUILTINS","getGlobalSchema","TOOL_BUILTIN_ENTRIES","Object","entries","COLLECTION_BUILTIN_ENTRIES","COLLECTION_AUTH_BUILTIN_ENTRIES","GLOBAL_BUILTIN_ENTRIES"],"mappings":"AAEA,SACEA,kBAAkB,EAClBC,4BAA4B,EAC5BC,mBAAmB,EACnBC,2BAA2B,EAC3BC,oBAAoB,EACpBC,oBAAoB,QACf,qCAAoC;AAC3C,SAASC,kBAAkB,QAAQ,sCAAqC;AACxE,SAASC,mBAAmB,QAAQ,sCAAqC;AACzE,SAASC,iBAAiB,QAAQ,oCAAmC;AACrE,SAASC,uBAAuB,QAAQ,mDAAkD;AAC1F,SAASC,kBAAkB,QAAQ,sCAAqC;AACxE,SAASC,iBAAiB,QAAQ,iCAAgC;AAClE,SAASC,cAAc,QAAQ,gCAA+B;AAC9D,SAASC,mBAAmB,QAAQ,2CAA0C;AAC9E,SAASC,gBAAgB,QAAQ,kCAAiC;AAElE,OAAO,MAAMC,gBAAgB;IAC3BC,eAAe;QAAEC,OAAO;QAAeC,SAAS;QAAiBC,MAAMR;IAAkB;AAC3F,EAA0E;AAE1E;;;;CAIC,GACD,OAAO,MAAMS,sBAAsB;IACjCC,QAAQ;QAAEH,SAAS;QAAkBC,MAAMb;IAAmB;IAC9DgB,QAAQ;QAAEJ,SAAS;QAAmBC,MAAMZ;IAAoB;IAChEgB,MAAM;QAAEL,SAAS;QAAiBC,MAAMX;IAAkB;IAC1DgB,qBAAqB;QAAEN,SAAS;QAAuBC,MAAMV;IAAwB;IACrFgB,QAAQ;QAAEP,SAAS;QAAkBC,MAAMT;IAAmB;AAChE,EAAqE;AAErE;;;;CAIC,GACD,OAAO,MAAMgB,2BAA2B;IACtCC,MAAM;QAAEV,OAAO;QAAqBC,SAAS;QAAQC,MAAMnB;IAAmB;IAC9E4B,gBAAgB;QACdX,OAAO;QACPC,SAAS;QACTC,MAAMlB;IACR;IACA4B,OAAO;QAAEZ,OAAO;QAAcC,SAAS;QAASC,MAAMjB;IAAoB;IAC1E4B,eAAe;QACbb,OAAO;QACPC,SAAS;QACTC,MAAMhB;IACR;IACA4B,QAAQ;QAAEd,OAAO;QAAkBC,SAAS;QAAUC,MAAMf;IAAqB;IACjF4B,QAAQ;QAAEf,OAAO;QAAsBC,SAAS;QAAUC,MAAMd;IAAqB;AACvF,EAAoF;AAEpF;;;CAGC,GACD,OAAO,MAAM4B,kBAAkB;IAC7BV,MAAM;QAAEL,SAAS;QAAcC,MAAMP;IAAe;IACpDsB,iBAAiB;QAAEhB,SAAS;QAAmBC,MAAMN;IAAoB;IACzEY,QAAQ;QAAEP,SAAS;QAAgBC,MAAML;IAAiB;AAC5D,EAAiE;AAUjE;;;;;CAKC,GACD,OAAO,MAAMqB,uBAAuBC,OAAOC,OAAO,CAACtB,eAElD;AAED,OAAO,MAAMuB,6BAA6BF,OAAOC,OAAO,CAACjB,qBAExD;AAED,OAAO,MAAMmB,kCAAkCH,OAAOC,OAAO,CAACX,0BAE7D;AAED,OAAO,MAAMc,yBAAyBJ,OAAOC,OAAO,CAACJ,iBAEpD"}
+{"version":3,"sources":["../../src/mcp/builtinTools.ts"],"sourcesContent":["import type { CollectionTool, GlobalTool, Tool } from '../types.js'\n\nimport {\n  authCollectionTool,\n  forgotPasswordCollectionTool,\n  loginCollectionTool,\n  resetPasswordCollectionTool,\n  unlockCollectionTool,\n  verifyCollectionTool,\n} from './builtin/collections/authTools.js'\nimport { countDocumentsTool } from './builtin/collections/countTool.js'\nimport { countVersionsTool } from './builtin/collections/countVersionsTool.js'\nimport { createDocumentTool } from './builtin/collections/createTool.js'\nimport { deleteDocumentsTool } from './builtin/collections/deleteTool.js'\nimport { duplicateDocumentTool } from './builtin/collections/duplicateTool.js'\nimport { findDistinctTool } from './builtin/collections/findDistinctTool.js'\nimport { findDocumentsTool } from './builtin/collections/findTool.js'\nimport { findVersionByIDTool } from './builtin/collections/findVersionByIDTool.js'\nimport { findVersionsTool } from './builtin/collections/findVersionsTool.js'\nimport { getCollectionSchemaTool } from './builtin/collections/getCollectionSchemaTool.js'\nimport { restoreVersionTool } from './builtin/collections/restoreVersionTool.js'\nimport { updateDocumentTool } from './builtin/collections/updateTool.js'\nimport { getConfigInfoTool } from './builtin/getConfigInfoTool.js'\nimport { countGlobalVersionsTool } from './builtin/globals/countVersionsTool.js'\nimport { findGlobalTool } from './builtin/globals/findTool.js'\nimport { findGlobalVersionByIDTool } from './builtin/globals/findVersionByIDTool.js'\nimport { findGlobalVersionsTool } from './builtin/globals/findVersionsTool.js'\nimport { getGlobalSchemaTool } from './builtin/globals/getGlobalSchemaTool.js'\nimport { restoreGlobalVersionTool } from './builtin/globals/restoreVersionTool.js'\nimport { updateGlobalTool } from './builtin/globals/updateTool.js'\n\ntype CollectionBuiltin = {\n  mcpName: string\n  requiresDuplicateEnabled?: boolean\n  requiresVersions?: boolean\n  tool: CollectionTool\n}\n\ntype GlobalBuiltin = {\n  mcpName: string\n  requiresVersions?: boolean\n  tool: GlobalTool\n}\n\nexport const TOOL_BUILTINS = {\n  getConfigInfo: { mcpName: 'getConfigInfo', tool: getConfigInfoTool },\n} satisfies Record<string, { mcpName: string; tool: Tool }>\n\n/**\n * The static built-in collection CRUD tools. Keys here are the source of truth\n * for `MCPCollectionBuiltinName` — adding/removing an entry updates the type\n * automatically.\n */\nexport const COLLECTION_BUILTINS = {\n  count: { mcpName: 'countDocuments', tool: countDocumentsTool },\n  countVersions: { mcpName: 'countVersions', requiresVersions: true, tool: countVersionsTool },\n  create: { mcpName: 'createDocument', tool: createDocumentTool },\n  delete: { mcpName: 'deleteDocuments', tool: deleteDocumentsTool },\n  duplicate: {\n    mcpName: 'duplicateDocument',\n    requiresDuplicateEnabled: true,\n    tool: duplicateDocumentTool,\n  },\n  find: { mcpName: 'findDocuments', tool: findDocumentsTool },\n  findDistinct: { mcpName: 'findDistinct', tool: findDistinctTool },\n  findVersionByID: {\n    mcpName: 'findVersionByID',\n    requiresVersions: true,\n    tool: findVersionByIDTool,\n  },\n  findVersions: { mcpName: 'findVersions', requiresVersions: true, tool: findVersionsTool },\n  getCollectionSchema: { mcpName: 'getCollectionSchema', tool: getCollectionSchemaTool },\n  restoreVersion: { mcpName: 'restoreVersion', requiresVersions: true, tool: restoreVersionTool },\n  update: { mcpName: 'updateDocument', tool: updateDocumentTool },\n} satisfies Record<string, CollectionBuiltin>\n\n/**\n * The static auth tools surfaced under auth-enabled collections. Keys are the\n * source of truth for `MCPCollectionAuthToolName`.\n */\nexport const COLLECTION_AUTH_BUILTINS = {\n  auth: { mcpName: 'auth', tool: authCollectionTool },\n  forgotPassword: {\n    mcpName: 'forgotPassword',\n    tool: forgotPasswordCollectionTool,\n  },\n  login: { mcpName: 'login', tool: loginCollectionTool },\n  resetPassword: {\n    mcpName: 'resetPassword',\n    tool: resetPasswordCollectionTool,\n  },\n  unlock: { mcpName: 'unlock', tool: unlockCollectionTool },\n  verify: { mcpName: 'verify', tool: verifyCollectionTool },\n} satisfies Record<string, { mcpName: string; tool: CollectionTool }>\n\n/**\n * The static built-in global tools. Keys are the source of truth for\n * `MCPGlobalBuiltinName`.\n */\nexport const GLOBAL_BUILTINS = {\n  countGlobalVersions: {\n    mcpName: 'countGlobalVersions',\n    requiresVersions: true,\n    tool: countGlobalVersionsTool,\n  },\n  find: { mcpName: 'findGlobal', tool: findGlobalTool },\n  findGlobalVersionByID: {\n    mcpName: 'findGlobalVersionByID',\n    requiresVersions: true,\n    tool: findGlobalVersionByIDTool,\n  },\n  findGlobalVersions: {\n    mcpName: 'findGlobalVersions',\n    requiresVersions: true,\n    tool: findGlobalVersionsTool,\n  },\n  getGlobalSchema: { mcpName: 'getGlobalSchema', tool: getGlobalSchemaTool },\n  restoreGlobalVersion: {\n    mcpName: 'restoreGlobalVersion',\n    requiresVersions: true,\n    tool: restoreGlobalVersionTool,\n  },\n  update: { mcpName: 'updateGlobal', tool: updateGlobalTool },\n} satisfies Record<string, GlobalBuiltin>\n\nexport type MCPCollectionBuiltinName = keyof typeof COLLECTION_BUILTINS\n\nexport type MCPCollectionAuthToolName = keyof typeof COLLECTION_AUTH_BUILTINS\n\nexport type MCPGlobalBuiltinName = keyof typeof GLOBAL_BUILTINS\n\nexport type MCPTopLevelBuiltinName = keyof typeof TOOL_BUILTINS\n\n/**\n * Pre-typed `Object.entries` for each registry. The cast from `string` to the\n * literal key union lives here once so consumers can iterate without their own\n * cast — TypeScript's `Object.entries` always widens keys to `string`, which\n * defeats the narrow type lookups on `MCPCollectionToolsMap`.\n */\nexport const TOOL_BUILTIN_ENTRIES = Object.entries(TOOL_BUILTINS) as Array<\n  [MCPTopLevelBuiltinName, (typeof TOOL_BUILTINS)[MCPTopLevelBuiltinName]]\n>\n\nexport const COLLECTION_BUILTIN_ENTRIES = Object.entries(COLLECTION_BUILTINS) as Array<\n  [MCPCollectionBuiltinName, CollectionBuiltin]\n>\n\nexport const COLLECTION_AUTH_BUILTIN_ENTRIES = Object.entries(COLLECTION_AUTH_BUILTINS) as Array<\n  [MCPCollectionAuthToolName, (typeof COLLECTION_AUTH_BUILTINS)[MCPCollectionAuthToolName]]\n>\n\nexport const GLOBAL_BUILTIN_ENTRIES = Object.entries(GLOBAL_BUILTINS) as Array<\n  [MCPGlobalBuiltinName, GlobalBuiltin]\n>\n"],"names":["authCollectionTool","forgotPasswordCollectionTool","loginCollectionTool","resetPasswordCollectionTool","unlockCollectionTool","verifyCollectionTool","countDocumentsTool","countVersionsTool","createDocumentTool","deleteDocumentsTool","duplicateDocumentTool","findDistinctTool","findDocumentsTool","findVersionByIDTool","findVersionsTool","getCollectionSchemaTool","restoreVersionTool","updateDocumentTool","getConfigInfoTool","countGlobalVersionsTool","findGlobalTool","findGlobalVersionByIDTool","findGlobalVersionsTool","getGlobalSchemaTool","restoreGlobalVersionTool","updateGlobalTool","TOOL_BUILTINS","getConfigInfo","mcpName","tool","COLLECTION_BUILTINS","count","countVersions","requiresVersions","create","delete","duplicate","requiresDuplicateEnabled","find","findDistinct","findVersionByID","findVersions","getCollectionSchema","restoreVersion","update","COLLECTION_AUTH_BUILTINS","auth","forgotPassword","login","resetPassword","unlock","verify","GLOBAL_BUILTINS","countGlobalVersions","findGlobalVersionByID","findGlobalVersions","getGlobalSchema","restoreGlobalVersion","TOOL_BUILTIN_ENTRIES","Object","entries","COLLECTION_BUILTIN_ENTRIES","COLLECTION_AUTH_BUILTIN_ENTRIES","GLOBAL_BUILTIN_ENTRIES"],"mappings":"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"}

package/dist/mcp/sanitizeMCPConfig.d.ts

@@ -5,7 +5,6 @@ import type { MCPPluginConfig, SanitizedMCPPluginConfig } from '../types.js';
  *  - Flattens `tools` / `prompts` / `resources` / per-collection / per-global
  *    tool maps into a single `items` array.
  *  - Applies built-in tools for collections and globals, respecting opt-out user overrides.
- *  - Applies the `userCollection` default
  *
  * Called once during plugin init. After that, `plugins['@payloadcms/plugin-mcp']
  * ?.options` holds the sanitized result

package/dist/mcp/sanitizeMCPConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sanitizeMCPConfig.d.ts","sourceRoot":"","sources":["../../src/mcp/sanitizeMCPConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,MAAM,EAGN,eAAe,EAEhB,MAAM,SAAS,CAAA;AAEhB,OAAO,KAAK,EAMV,eAAe,EACf,wBAAwB,EACzB,MAAM,aAAa,CAAA;AAapB;;;;;;;;;GASG;AACH,eAAO,MAAM,iBAAiB,GAAI,2BAG/B;IACD,MAAM,EAAE,MAAM,GAAG,eAAe,CAAA;IAChC,YAAY,EAAE,eAAe,CAAA;CAC9B,KAAG,wBAkEH,CAAA"}
+{"version":3,"file":"sanitizeMCPConfig.d.ts","sourceRoot":"","sources":["../../src/mcp/sanitizeMCPConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,MAAM,EAGN,eAAe,EAEhB,MAAM,SAAS,CAAA;AAEhB,OAAO,KAAK,EAMV,eAAe,EACf,wBAAwB,EACzB,MAAM,aAAa,CAAA;AAcpB;;;;;;;;GAQG;AACH,eAAO,MAAM,iBAAiB,GAAI,2BAG/B;IACD,MAAM,EAAE,MAAM,GAAG,eAAe,CAAA;IAChC,YAAY,EAAE,eAAe,CAAA;CAC9B,KAAG,wBA4DH,CAAA"}

package/dist/mcp/sanitizeMCPConfig.js

@@ -1,10 +1,10 @@
+import { defaultAccess } from '../defaultAccess.js';
 import { COLLECTION_AUTH_BUILTIN_ENTRIES, COLLECTION_AUTH_BUILTINS, COLLECTION_BUILTIN_ENTRIES, COLLECTION_BUILTINS, GLOBAL_BUILTIN_ENTRIES, GLOBAL_BUILTINS, TOOL_BUILTIN_ENTRIES, TOOL_BUILTINS } from './builtinTools.js';
 /**
  * Converts the user-configured `MCPPluginConfig` into a `SanitizedMCPPluginConfig`:
  *  - Flattens `tools` / `prompts` / `resources` / per-collection / per-global
  *    tool maps into a single `items` array.
  *  - Applies built-in tools for collections and globals, respecting opt-out user overrides.
- *  - Applies the `userCollection` default
  *
  * Called once during plugin init. After that, `plugins['@payloadcms/plugin-mcp']
  * ?.options` holds the sanitized result
@@ -22,13 +22,16 @@ import { COLLECTION_AUTH_BUILTIN_ENTRIES, COLLECTION_AUTH_BUILTINS, COLLECTION_B
             pluginConfig
         }));
     }
-    for (const [configKey, { label, mcpName, tool }] of TOOL_BUILTIN_ENTRIES){
+    for (const [configKey, { mcpName, tool }] of TOOL_BUILTIN_ENTRIES){
         items.push({
             type: 'tool',
             configKey,
-            label,
+            label: tool.annotations?.title ?? configKey,
             mcpName,
-            tool
+            tool: {
+                ...tool,
+                access: tool.access ?? defaultAccess
+            }
         });
     }
     for (const [configKey, tool] of Object.entries(pluginConfig.tools ?? {})){
@@ -38,9 +41,12 @@ import { COLLECTION_AUTH_BUILTIN_ENTRIES, COLLECTION_AUTH_BUILTINS, COLLECTION_B
         items.push({
             type: 'tool',
             configKey,
-            label: configKey,
+            label: tool.annotations?.title ?? configKey,
             mcpName: configKey,
-            tool
+            tool: {
+                ...tool,
+                access: tool.access ?? defaultAccess
+            }
         });
     }
     for (const [configKey, prompt] of Object.entries(pluginConfig.prompts ?? {})){
@@ -49,7 +55,10 @@ import { COLLECTION_AUTH_BUILTIN_ENTRIES, COLLECTION_AUTH_BUILTINS, COLLECTION_B
             configKey,
             label: prompt.title ?? configKey,
             mcpName: configKey,
-            prompt
+            prompt: {
+                ...prompt,
+                access: prompt.access ?? defaultAccess
+            }
         });
     }
     for (const [configKey, resource] of Object.entries(pluginConfig.resources ?? {})){
@@ -58,62 +67,80 @@ import { COLLECTION_AUTH_BUILTIN_ENTRIES, COLLECTION_AUTH_BUILTINS, COLLECTION_B
             configKey,
             label: resource.title ?? configKey,
             mcpName: configKey,
-            resource
+            resource: {
+                ...resource,
+                access: resource.access ?? defaultAccess
+            }
         });
     }
-    // Mirror Payload's own admin.user detection (sanitize.ts) since plugins run first.
-    const firstCollectionWithAuth = config.collections.find(({ auth })=>Boolean(auth));
     return {
         disabled: pluginConfig.disabled,
         items,
         mcp: pluginConfig.mcp,
-        overrideApiKeyCollection: pluginConfig.overrideApiKeyCollection,
-        overrideAuth: pluginConfig.overrideAuth,
-        userCollection: pluginConfig.userCollection ?? config.admin?.user ?? firstCollectionWithAuth?.slug ?? 'users'
+        overrideGetAuthorizedMCP: pluginConfig.overrideGetAuthorizedMCP
     };
 };
 const sanitizeCollectionConfig = ({ collection, pluginConfig })=>{
-    if (collection.slug === 'payload-mcp-api-keys') {
-        return [];
-    }
     const slug = collection.slug;
     const collectionPluginConfig = pluginConfig.collections?.[slug];
     const items = [];
-    for (const [toolKey, { mcpName, tool }] of COLLECTION_BUILTIN_ENTRIES){
+    /**
+   * Payload disables duplicate for auth collections by default unless the
+   * collection explicitly opts back in with `disableDuplicate: false`.
+   */ const isDuplicateDisabled = collection.disableDuplicate === true || Boolean(collection.auth) && collection.disableDuplicate !== false;
+    for (const [toolKey, { mcpName, requiresDuplicateEnabled, requiresVersions, tool }] of COLLECTION_BUILTIN_ENTRIES){
+        if (requiresVersions && !collection.versions) {
+            continue;
+        }
+        if (requiresDuplicateEnabled && isDuplicateDisabled) {
+            continue;
+        }
         const matchedConfigEntry = collectionPluginConfig?.tools?.[toolKey];
         if (matchedConfigEntry === false) {
             continue;
         }
         const override = typeof matchedConfigEntry === 'object' ? matchedConfigEntry : undefined;
+        const annotations = {
+            ...tool.annotations,
+            ...override?.annotations
+        };
         items.push({
             type: 'collectionTool',
             collectionSlug: slug,
             configKey: toolKey,
-            label: capitalize(toolKey),
+            label: annotations.title ?? toolKey,
             mcpName,
             tool: {
                 ...tool,
+                access: override?.access ?? tool.access ?? defaultAccess,
+                annotations,
                 description: override?.description ?? tool.description,
                 overrideResponse: override?.overrideResponse ?? collectionPluginConfig?.overrideResponse ?? tool.overrideResponse
             }
         });
     }
     if (collection.auth) {
-        for (const [authToolKey, { label, mcpName, tool }] of COLLECTION_AUTH_BUILTIN_ENTRIES){
+        for (const [authToolKey, { mcpName, tool }] of COLLECTION_AUTH_BUILTIN_ENTRIES){
             const matchedConfigEntry = collectionPluginConfig?.tools?.[authToolKey];
             if (!matchedConfigEntry) {
                 continue;
             }
             // `true` means "enable, no override"; only the object form carries fields.
             const override = typeof matchedConfigEntry === 'object' ? matchedConfigEntry : undefined;
+            const annotations = {
+                ...tool.annotations,
+                ...override?.annotations
+            };
             items.push({
                 type: 'collectionTool',
                 collectionSlug: slug,
                 configKey: authToolKey,
-                label,
+                label: annotations.title ?? authToolKey,
                 mcpName,
                 tool: {
                     ...tool,
+                    access: override?.access ?? tool.access ?? defaultAccess,
+                    annotations,
                     description: override?.description ?? tool.description,
                     overrideResponse: override?.overrideResponse ?? collectionPluginConfig?.overrideResponse ?? tool.overrideResponse
                 }
@@ -134,9 +161,12 @@ const sanitizeCollectionConfig = ({ collection, pluginConfig })=>{
             type: 'collectionTool',
             collectionSlug: slug,
             configKey,
-            label: configKey,
+            label: customTool.annotations?.title ?? configKey,
             mcpName: configKey,
-            tool: customTool
+            tool: {
+                ...customTool,
+                access: customTool.access ?? defaultAccess
+            }
         });
     }
     return items;
@@ -145,20 +175,29 @@ const sanitizeGlobalConfig = ({ global, pluginConfig })=>{
     const slug = global.slug;
     const globalPluginConfig = pluginConfig.globals?.[slug];
     const items = [];
-    for (const [toolKey, { mcpName, tool }] of GLOBAL_BUILTIN_ENTRIES){
+    for (const [toolKey, { mcpName, requiresVersions, tool }] of GLOBAL_BUILTIN_ENTRIES){
+        if (requiresVersions && !global.versions) {
+            continue;
+        }
         const matchedConfigEntry = globalPluginConfig?.tools?.[toolKey];
         if (matchedConfigEntry === false) {
             continue;
         }
         const override = typeof matchedConfigEntry === 'object' ? matchedConfigEntry : undefined;
+        const annotations = {
+            ...tool.annotations,
+            ...override?.annotations
+        };
         items.push({
             type: 'globalTool',
             configKey: toolKey,
             globalSlug: slug,
-            label: capitalize(toolKey),
+            label: annotations.title ?? toolKey,
             mcpName,
             tool: {
                 ...tool,
+                access: override?.access ?? tool.access ?? defaultAccess,
+                annotations,
                 description: override?.description ?? tool.description,
                 overrideResponse: override?.overrideResponse ?? globalPluginConfig?.overrideResponse ?? tool.overrideResponse
             }
@@ -176,13 +215,15 @@ const sanitizeGlobalConfig = ({ global, pluginConfig })=>{
             type: 'globalTool',
             configKey,
             globalSlug: slug,
-            label: configKey,
+            label: customTool.annotations?.title ?? configKey,
             mcpName: configKey,
-            tool: customTool
+            tool: {
+                ...customTool,
+                access: customTool.access ?? defaultAccess
+            }
         });
     }
     return items;
 };
-const capitalize = (s)=>s.charAt(0).toUpperCase() + s.slice(1);
 
 //# sourceMappingURL=sanitizeMCPConfig.js.map