@payloadcms/plugin-mcp 4.0.0-canary.1 → 4.0.0-canary.10

package/dist/mcp/sanitizeMCPConfig.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/mcp/sanitizeMCPConfig.ts"],"sourcesContent":["import type {\n  CollectionConfig,\n  Config,\n  GlobalConfig,\n  SanitizedCollectionConfig,\n  SanitizedConfig,\n  SanitizedGlobalConfig,\n} from 'payload'\n\nimport type {\n  CollectionMCPItem,\n  CollectionTool,\n  GlobalMCPItem,\n  GlobalTool,\n  MCPItem,\n  MCPPluginConfig,\n  SanitizedMCPPluginConfig,\n} from '../types.js'\n\nimport {\n  COLLECTION_AUTH_BUILTIN_ENTRIES,\n  COLLECTION_AUTH_BUILTINS,\n  COLLECTION_BUILTIN_ENTRIES,\n  COLLECTION_BUILTINS,\n  GLOBAL_BUILTIN_ENTRIES,\n  GLOBAL_BUILTINS,\n  TOOL_BUILTIN_ENTRIES,\n  TOOL_BUILTINS,\n} from './builtinTools.js'\n\n/**\n * Converts the user-configured `MCPPluginConfig` into a `SanitizedMCPPluginConfig`:\n *  - Flattens `tools` / `prompts` / `resources` / per-collection / per-global\n *    tool maps into a single `items` array.\n *  - Applies built-in tools for collections and globals, respecting opt-out user overrides.\n *  - Applies the `userCollection` default\n *\n * Called once during plugin init. After that, `plugins['@payloadcms/plugin-mcp']\n * ?.options` holds the sanitized result\n */\nexport const sanitizeMCPConfig = ({\n  config,\n  pluginConfig,\n}: {\n  config: Config | SanitizedConfig\n  pluginConfig: MCPPluginConfig\n}): SanitizedMCPPluginConfig => {\n  const items: MCPItem[] = []\n\n  for (const collection of config.collections ?? []) {\n    items.push(...sanitizeCollectionConfig({ collection, pluginConfig }))\n  }\n\n  for (const global of config.globals ?? []) {\n    items.push(...sanitizeGlobalConfig({ global, pluginConfig }))\n  }\n\n  for (const [configKey, { label, mcpName, tool }] of TOOL_BUILTIN_ENTRIES) {\n    items.push({\n      type: 'tool',\n      configKey,\n      label,\n      mcpName,\n      tool,\n    })\n  }\n\n  for (const [configKey, tool] of Object.entries(pluginConfig.tools ?? {})) {\n    if (configKey in TOOL_BUILTINS) {\n      continue\n    }\n    items.push({\n      type: 'tool',\n      configKey,\n      label: configKey,\n      mcpName: configKey,\n      tool,\n    })\n  }\n\n  for (const [configKey, prompt] of Object.entries(pluginConfig.prompts ?? {})) {\n    items.push({\n      type: 'prompt',\n      configKey,\n      label: prompt.title ?? configKey,\n      mcpName: configKey,\n      prompt,\n    })\n  }\n\n  for (const [configKey, resource] of Object.entries(pluginConfig.resources ?? {})) {\n    items.push({\n      type: 'resource',\n      configKey,\n      label: resource.title ?? configKey,\n      mcpName: configKey,\n      resource,\n    })\n  }\n\n  // Mirror Payload's own admin.user detection (sanitize.ts) since plugins run first.\n  const firstCollectionWithAuth = config.collections!.find(({ auth }) => Boolean(auth))\n\n  return {\n    disabled: pluginConfig.disabled,\n    items,\n    mcp: pluginConfig.mcp,\n    overrideApiKeyCollection: pluginConfig.overrideApiKeyCollection,\n    overrideAuth: pluginConfig.overrideAuth,\n    userCollection:\n      pluginConfig.userCollection ?? config.admin?.user ?? firstCollectionWithAuth?.slug ?? 'users',\n  }\n}\n\nconst sanitizeCollectionConfig = ({\n  collection,\n  pluginConfig,\n}: {\n  collection: CollectionConfig | SanitizedCollectionConfig\n  pluginConfig: MCPPluginConfig\n}): CollectionMCPItem[] => {\n  if (collection.slug === 'payload-mcp-api-keys') {\n    return []\n  }\n  const slug = collection.slug\n  const collectionPluginConfig = pluginConfig.collections?.[slug]\n  const items: CollectionMCPItem[] = []\n\n  for (const [toolKey, { mcpName, tool }] of COLLECTION_BUILTIN_ENTRIES) {\n    const matchedConfigEntry = collectionPluginConfig?.tools?.[toolKey]\n    if (matchedConfigEntry === false) {\n      continue\n    }\n    const override = typeof matchedConfigEntry === 'object' ? matchedConfigEntry : undefined\n    items.push({\n      type: 'collectionTool',\n      collectionSlug: slug,\n      configKey: toolKey,\n      label: capitalize(toolKey),\n      mcpName,\n      tool: {\n        ...tool,\n        description: override?.description ?? tool.description,\n        overrideResponse:\n          override?.overrideResponse ??\n          collectionPluginConfig?.overrideResponse ??\n          tool.overrideResponse,\n      },\n    })\n  }\n\n  if (collection.auth) {\n    for (const [authToolKey, { label, mcpName, tool }] of COLLECTION_AUTH_BUILTIN_ENTRIES) {\n      const matchedConfigEntry = collectionPluginConfig?.tools?.[authToolKey]\n      if (!matchedConfigEntry) {\n        continue\n      }\n      // `true` means \"enable, no override\"; only the object form carries fields.\n      const override = typeof matchedConfigEntry === 'object' ? matchedConfigEntry : undefined\n      items.push({\n        type: 'collectionTool',\n        collectionSlug: slug,\n        configKey: authToolKey,\n        label,\n        mcpName,\n        tool: {\n          ...tool,\n          description: override?.description ?? tool.description,\n          overrideResponse:\n            override?.overrideResponse ??\n            collectionPluginConfig?.overrideResponse ??\n            tool.overrideResponse,\n        },\n      })\n    }\n  }\n\n  // Cast: builtin keys are filtered out below, so the remaining values are\n  // always custom tools (`CollectionTool`) or undefined\n  const customEntries = Object.entries(collectionPluginConfig?.tools ?? {}) as Array<\n    [string, CollectionTool | undefined]\n  >\n  for (const [configKey, customTool] of customEntries) {\n    if (configKey in COLLECTION_BUILTINS || configKey in COLLECTION_AUTH_BUILTINS) {\n      continue\n    }\n    if (!customTool) {\n      continue\n    }\n    items.push({\n      type: 'collectionTool',\n      collectionSlug: slug,\n      configKey,\n      label: configKey,\n      mcpName: configKey,\n      tool: customTool,\n    })\n  }\n\n  return items\n}\n\nconst sanitizeGlobalConfig = ({\n  global,\n  pluginConfig,\n}: {\n  global: GlobalConfig | SanitizedGlobalConfig\n  pluginConfig: MCPPluginConfig\n}): GlobalMCPItem[] => {\n  const slug = global.slug\n  const globalPluginConfig = pluginConfig.globals?.[slug]\n  const items: GlobalMCPItem[] = []\n\n  for (const [toolKey, { mcpName, tool }] of GLOBAL_BUILTIN_ENTRIES) {\n    const matchedConfigEntry = globalPluginConfig?.tools?.[toolKey]\n    if (matchedConfigEntry === false) {\n      continue\n    }\n    const override = typeof matchedConfigEntry === 'object' ? matchedConfigEntry : undefined\n    items.push({\n      type: 'globalTool',\n      configKey: toolKey,\n      globalSlug: slug,\n      label: capitalize(toolKey),\n      mcpName,\n      tool: {\n        ...tool,\n        description: override?.description ?? tool.description,\n        overrideResponse:\n          override?.overrideResponse ??\n          globalPluginConfig?.overrideResponse ??\n          tool.overrideResponse,\n      },\n    })\n  }\n\n  const customEntries = Object.entries(globalPluginConfig?.tools ?? {}) as Array<\n    [string, GlobalTool | undefined]\n  >\n  for (const [configKey, customTool] of customEntries) {\n    if (configKey in GLOBAL_BUILTINS) {\n      continue\n    }\n    if (!customTool) {\n      continue\n    }\n    items.push({\n      type: 'globalTool',\n      configKey,\n      globalSlug: slug,\n      label: configKey,\n      mcpName: configKey,\n      tool: customTool,\n    })\n  }\n\n  return items\n}\n\nconst capitalize = (s: string): string => s.charAt(0).toUpperCase() + s.slice(1)\n"],"names":["COLLECTION_AUTH_BUILTIN_ENTRIES","COLLECTION_AUTH_BUILTINS","COLLECTION_BUILTIN_ENTRIES","COLLECTION_BUILTINS","GLOBAL_BUILTIN_ENTRIES","GLOBAL_BUILTINS","TOOL_BUILTIN_ENTRIES","TOOL_BUILTINS","sanitizeMCPConfig","config","pluginConfig","items","collection","collections","push","sanitizeCollectionConfig","global","globals","sanitizeGlobalConfig","configKey","label","mcpName","tool","type","Object","entries","tools","prompt","prompts","title","resource","resources","firstCollectionWithAuth","find","auth","Boolean","disabled","mcp","overrideApiKeyCollection","overrideAuth","userCollection","admin","user","slug","collectionPluginConfig","toolKey","matchedConfigEntry","override","undefined","collectionSlug","capitalize","description","overrideResponse","authToolKey","customEntries","customTool","globalPluginConfig","globalSlug","s","charAt","toUpperCase","slice"],"mappings":"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"}
+{"version":3,"sources":["../../src/mcp/sanitizeMCPConfig.ts"],"sourcesContent":["import type {\n  CollectionConfig,\n  Config,\n  GlobalConfig,\n  SanitizedCollectionConfig,\n  SanitizedConfig,\n  SanitizedGlobalConfig,\n} from 'payload'\n\nimport type {\n  CollectionMCPItem,\n  CollectionTool,\n  GlobalMCPItem,\n  GlobalTool,\n  MCPItem,\n  MCPPluginConfig,\n  SanitizedMCPPluginConfig,\n} from '../types.js'\n\nimport { defaultAccess } from '../defaultAccess.js'\nimport {\n  COLLECTION_AUTH_BUILTIN_ENTRIES,\n  COLLECTION_AUTH_BUILTINS,\n  COLLECTION_BUILTIN_ENTRIES,\n  COLLECTION_BUILTINS,\n  GLOBAL_BUILTIN_ENTRIES,\n  GLOBAL_BUILTINS,\n  TOOL_BUILTIN_ENTRIES,\n  TOOL_BUILTINS,\n} from './builtinTools.js'\n\n/**\n * Converts the user-configured `MCPPluginConfig` into a `SanitizedMCPPluginConfig`:\n *  - Flattens `tools` / `prompts` / `resources` / per-collection / per-global\n *    tool maps into a single `items` array.\n *  - Applies built-in tools for collections and globals, respecting opt-out user overrides.\n *\n * Called once during plugin init. After that, `plugins['@payloadcms/plugin-mcp']\n * ?.options` holds the sanitized result\n */\nexport const sanitizeMCPConfig = ({\n  config,\n  pluginConfig,\n}: {\n  config: Config | SanitizedConfig\n  pluginConfig: MCPPluginConfig\n}): SanitizedMCPPluginConfig => {\n  const items: MCPItem[] = []\n\n  for (const collection of config.collections ?? []) {\n    items.push(...sanitizeCollectionConfig({ collection, pluginConfig }))\n  }\n\n  for (const global of config.globals ?? []) {\n    items.push(...sanitizeGlobalConfig({ global, pluginConfig }))\n  }\n\n  for (const [configKey, { mcpName, tool }] of TOOL_BUILTIN_ENTRIES) {\n    items.push({\n      type: 'tool',\n      configKey,\n      label: tool.annotations?.title ?? configKey,\n      mcpName,\n      tool: { ...tool, access: tool.access ?? defaultAccess },\n    })\n  }\n\n  for (const [configKey, tool] of Object.entries(pluginConfig.tools ?? {})) {\n    if (configKey in TOOL_BUILTINS) {\n      continue\n    }\n    items.push({\n      type: 'tool',\n      configKey,\n      label: tool.annotations?.title ?? configKey,\n      mcpName: configKey,\n      tool: { ...tool, access: tool.access ?? defaultAccess },\n    })\n  }\n\n  for (const [configKey, prompt] of Object.entries(pluginConfig.prompts ?? {})) {\n    items.push({\n      type: 'prompt',\n      configKey,\n      label: prompt.title ?? configKey,\n      mcpName: configKey,\n      prompt: { ...prompt, access: prompt.access ?? defaultAccess },\n    })\n  }\n\n  for (const [configKey, resource] of Object.entries(pluginConfig.resources ?? {})) {\n    items.push({\n      type: 'resource',\n      configKey,\n      label: resource.title ?? configKey,\n      mcpName: configKey,\n      resource: { ...resource, access: resource.access ?? defaultAccess },\n    })\n  }\n\n  return {\n    disabled: pluginConfig.disabled,\n    hooks: pluginConfig.hooks,\n    items,\n    mcp: pluginConfig.mcp,\n    overrideGetAuthorizedMCP: pluginConfig.overrideGetAuthorizedMCP,\n  }\n}\n\nconst sanitizeCollectionConfig = ({\n  collection,\n  pluginConfig,\n}: {\n  collection: CollectionConfig | SanitizedCollectionConfig\n  pluginConfig: MCPPluginConfig\n}): CollectionMCPItem[] => {\n  const slug = collection.slug\n  const collectionPluginConfig = pluginConfig.collections?.[slug]\n  const items: CollectionMCPItem[] = []\n  /**\n   * Payload disables duplicate for auth collections by default unless the\n   * collection explicitly opts back in with `disableDuplicate: false`.\n   */\n  const isDuplicateDisabled =\n    collection.disableDuplicate === true ||\n    (Boolean(collection.auth) && collection.disableDuplicate !== false)\n\n  for (const [\n    toolKey,\n    { mcpName, requiresDuplicateEnabled, requiresVersions, tool },\n  ] of COLLECTION_BUILTIN_ENTRIES) {\n    if (requiresVersions && !collection.versions) {\n      continue\n    }\n    if (requiresDuplicateEnabled && isDuplicateDisabled) {\n      continue\n    }\n    const matchedConfigEntry = collectionPluginConfig?.tools?.[toolKey]\n    if (matchedConfigEntry === false) {\n      continue\n    }\n    const override = typeof matchedConfigEntry === 'object' ? matchedConfigEntry : undefined\n    const annotations = { ...tool.annotations, ...override?.annotations }\n    items.push({\n      type: 'collectionTool',\n      collectionSlug: slug,\n      configKey: toolKey,\n      label: annotations.title ?? toolKey,\n      mcpName,\n      tool: {\n        ...tool,\n        access: override?.access ?? tool.access ?? defaultAccess,\n        annotations,\n        description: override?.description ?? tool.description,\n        overrideResponse:\n          override?.overrideResponse ??\n          collectionPluginConfig?.overrideResponse ??\n          tool.overrideResponse,\n      },\n    })\n  }\n\n  if (collection.auth) {\n    for (const [authToolKey, { mcpName, tool }] of COLLECTION_AUTH_BUILTIN_ENTRIES) {\n      const matchedConfigEntry = collectionPluginConfig?.tools?.[authToolKey]\n      if (!matchedConfigEntry) {\n        continue\n      }\n      // `true` means \"enable, no override\"; only the object form carries fields.\n      const override = typeof matchedConfigEntry === 'object' ? matchedConfigEntry : undefined\n      const annotations = { ...tool.annotations, ...override?.annotations }\n      items.push({\n        type: 'collectionTool',\n        collectionSlug: slug,\n        configKey: authToolKey,\n        label: annotations.title ?? authToolKey,\n        mcpName,\n        tool: {\n          ...tool,\n          access: override?.access ?? tool.access ?? defaultAccess,\n          annotations,\n          description: override?.description ?? tool.description,\n          overrideResponse:\n            override?.overrideResponse ??\n            collectionPluginConfig?.overrideResponse ??\n            tool.overrideResponse,\n        },\n      })\n    }\n  }\n\n  // Cast: builtin keys are filtered out below, so the remaining values are\n  // always custom tools (`CollectionTool`) or undefined\n  const customEntries = Object.entries(collectionPluginConfig?.tools ?? {}) as Array<\n    [string, CollectionTool | undefined]\n  >\n  for (const [configKey, customTool] of customEntries) {\n    if (configKey in COLLECTION_BUILTINS || configKey in COLLECTION_AUTH_BUILTINS) {\n      continue\n    }\n    if (!customTool) {\n      continue\n    }\n    items.push({\n      type: 'collectionTool',\n      collectionSlug: slug,\n      configKey,\n      label: customTool.annotations?.title ?? configKey,\n      mcpName: configKey,\n      tool: { ...customTool, access: customTool.access ?? defaultAccess },\n    })\n  }\n\n  return items\n}\n\nconst sanitizeGlobalConfig = ({\n  global,\n  pluginConfig,\n}: {\n  global: GlobalConfig | SanitizedGlobalConfig\n  pluginConfig: MCPPluginConfig\n}): GlobalMCPItem[] => {\n  const slug = global.slug\n  const globalPluginConfig = pluginConfig.globals?.[slug]\n  const items: GlobalMCPItem[] = []\n\n  for (const [toolKey, { mcpName, requiresVersions, tool }] of GLOBAL_BUILTIN_ENTRIES) {\n    if (requiresVersions && !global.versions) {\n      continue\n    }\n    const matchedConfigEntry = globalPluginConfig?.tools?.[toolKey]\n    if (matchedConfigEntry === false) {\n      continue\n    }\n    const override = typeof matchedConfigEntry === 'object' ? matchedConfigEntry : undefined\n    const annotations = { ...tool.annotations, ...override?.annotations }\n    items.push({\n      type: 'globalTool',\n      configKey: toolKey,\n      globalSlug: slug,\n      label: annotations.title ?? toolKey,\n      mcpName,\n      tool: {\n        ...tool,\n        access: override?.access ?? tool.access ?? defaultAccess,\n        annotations,\n        description: override?.description ?? tool.description,\n        overrideResponse:\n          override?.overrideResponse ??\n          globalPluginConfig?.overrideResponse ??\n          tool.overrideResponse,\n      },\n    })\n  }\n\n  const customEntries = Object.entries(globalPluginConfig?.tools ?? {}) as Array<\n    [string, GlobalTool | undefined]\n  >\n  for (const [configKey, customTool] of customEntries) {\n    if (configKey in GLOBAL_BUILTINS) {\n      continue\n    }\n    if (!customTool) {\n      continue\n    }\n    items.push({\n      type: 'globalTool',\n      configKey,\n      globalSlug: slug,\n      label: customTool.annotations?.title ?? configKey,\n      mcpName: configKey,\n      tool: { ...customTool, access: customTool.access ?? defaultAccess },\n    })\n  }\n\n  return items\n}\n"],"names":["defaultAccess","COLLECTION_AUTH_BUILTIN_ENTRIES","COLLECTION_AUTH_BUILTINS","COLLECTION_BUILTIN_ENTRIES","COLLECTION_BUILTINS","GLOBAL_BUILTIN_ENTRIES","GLOBAL_BUILTINS","TOOL_BUILTIN_ENTRIES","TOOL_BUILTINS","sanitizeMCPConfig","config","pluginConfig","items","collection","collections","push","sanitizeCollectionConfig","global","globals","sanitizeGlobalConfig","configKey","mcpName","tool","type","label","annotations","title","access","Object","entries","tools","prompt","prompts","resource","resources","disabled","hooks","mcp","overrideGetAuthorizedMCP","slug","collectionPluginConfig","isDuplicateDisabled","disableDuplicate","Boolean","auth","toolKey","requiresDuplicateEnabled","requiresVersions","versions","matchedConfigEntry","override","undefined","collectionSlug","description","overrideResponse","authToolKey","customEntries","customTool","globalPluginConfig","globalSlug"],"mappings":"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"}

package/dist/stdio.d.ts

@@ -1,8 +1,8 @@
 /**
- * Stdio adapter for the Payload MCP server.
+ * Starts Payload's MCP server over stdin and stdout.
  *
- * Do not use in production. There's no auth; whoever can spawn the process gets
- * full access to your local data.
+ * Set `PAYLOAD_MCP_AUTHORIZATION` to authenticate. In development,
+ * `PAYLOAD_MCP_OVERRIDE_ACCESS=true` skips access checks.
  */
 export declare const runMcpStdio: () => Promise<void>;
 //# sourceMappingURL=stdio.d.ts.map

package/dist/stdio.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stdio.d.ts","sourceRoot":"","sources":["../src/stdio.ts"],"names":[],"mappings":"AAeA;;;;;GAKG;AACH,eAAO,MAAM,WAAW,QAAa,OAAO,CAAC,IAAI,CA4EhD,CAAA"}
+{"version":3,"file":"stdio.d.ts","sourceRoot":"","sources":["../src/stdio.ts"],"names":[],"mappings":"AAgBA;;;;;GAKG;AACH,eAAO,MAAM,WAAW,QAAa,OAAO,CAAC,IAAI,CA2GhD,CAAA"}

package/dist/stdio.js

@@ -1,76 +1,113 @@
-/* eslint-disable no-console */ import { StdioServerTransport } from '@modelcontextprotocol/server';
+/* eslint-disable no-console */ import { serveStdio } from '@modelcontextprotocol/server/stdio';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 import { createLocalReq, getPayload } from 'payload';
 import { findConfig } from 'payload/node';
+import { getAuthorizedMCP } from './endpoint/access.js';
 import { buildMcpServer } from './mcp/buildMcpServer.js';
 import { sanitizeMCPConfig } from './mcp/sanitizeMCPConfig.js';
 import { getPluginConfig } from './utils/getPluginConfig.js';
 import { resolveProjectRoot } from './utils/resolveProjectRoot.js';
 /**
- * Stdio adapter for the Payload MCP server.
+ * Starts Payload's MCP server over stdin and stdout.
  *
- * Do not use in production. There's no auth; whoever can spawn the process gets
- * full access to your local data.
+ * Set `PAYLOAD_MCP_AUTHORIZATION` to authenticate. In development,
+ * `PAYLOAD_MCP_OVERRIDE_ACCESS=true` skips access checks.
  */ export const runMcpStdio = async ()=>{
-    /**
-   * If MCP clients spawn stdio servers from an arbitrary working directory,
-   * Payload's cwd-anchored `findConfig()` can't locate the project on
-   * its own. This module always lives inside the project's `node_modules`, so
-   * we derive the project root from its own path and `chdir` into it.
-   *
-   * An absolute `PAYLOAD_CONFIG_PATH` still overrides everything; unusual
-   * layouts (e.g. a monorepo where the package is hoisted above the app) can
-   * fall back to it. See the implementation of findConfig for details.
-   */ const projectRoot = resolveProjectRoot(fileURLToPath(import.meta.url));
+    // MCP clients may start this command from another folder. Move to the Payload
+    // project so findConfig() can find the config.
+    const projectRoot = resolveProjectRoot(fileURLToPath(import.meta.url));
     if (projectRoot) {
         process.chdir(projectRoot);
     }
     const configPath = findConfig();
     const configModule = await import(pathToFileURL(configPath).toString());
     const config = await (configModule.default ?? configModule);
+    /**
+   * stdout is only for MCP messages. The spec says the server must not write
+   * logs there and may write them to stderr instead.
+   *
+   * The 2.0 client library recovers from stray stdout logs, but that behavior is not
+   * guaranteed. Move Payload logs to stderr so Payload does not add invalid data
+   * to stdout. Keep options from configurable loggers. Replace pre-built loggers
+   * because their output cannot be redirected.
+   *
+   * @see https://modelcontextprotocol.io/specification/2025-11-25/basic/transports#stdio
+   */ const loggerConfig = config;
+    if (loggerConfig.logger && typeof loggerConfig.logger === 'object' && 'options' in loggerConfig.logger) {
+        loggerConfig.logger.destination = process.stderr;
+    } else {
+        loggerConfig.logger = {
+            destination: process.stderr,
+            options: {}
+        };
+    }
     const payload = await getPayload({
-        config
+        config,
+        cron: false,
+        disableOnInit: true
     });
-    /**
-   * If the user added `mcpPlugin({...})` to their `plugins` array, read the
-   * sanitized config they registered. Otherwise fall back to the defaults. That way,
-   * the mcp works on any project that has `@payloadcms/plugin-mcp` installed,
-   * even if the plugin is not added to the plugins array.
-   */ let pluginConfig;
+    let pluginConfig;
     try {
         pluginConfig = getPluginConfig({
             config: payload.config
         });
     } catch  {
+        // The command also works when mcpPlugin() is not in the Payload config.
         pluginConfig = sanitizeMCPConfig({
             config: payload.config,
             pluginConfig: {}
         });
-        const fakePluginFn = (config)=>config;
-        fakePluginFn.slug = '@payloadcms/plugin-mcp';
-        // @ts-expect-error
-        fakePluginFn.sanitizedOptions = pluginConfig;
-        (payload.config.plugins ??= []).push(fakePluginFn);
+        const fallbackPlugin = (config)=>config;
+        Object.assign(fallbackPlugin, {
+            slug: '@payloadcms/plugin-mcp',
+            sanitizedOptions: pluginConfig
+        });
+        payload.config.plugins ??= [];
+        payload.config.plugins.push(fallbackPlugin);
     }
-    const authorizedMCP = {
-        items: pluginConfig.items,
-        overrideAccess: true,
-        user: null
-    };
-    const req = await createLocalReq({}, payload);
+    const overrideAccessEnv = process.env.PAYLOAD_MCP_OVERRIDE_ACCESS;
+    let overrideAccess = false;
+    if (overrideAccessEnv === 'true') {
+        overrideAccess = true;
+    } else if (overrideAccessEnv && overrideAccessEnv !== 'false') {
+        throw new Error('PAYLOAD_MCP_OVERRIDE_ACCESS must be "true" or "false".');
+    }
+    if (overrideAccess && process.env.NODE_ENV !== 'development') {
+        throw new Error('PAYLOAD_MCP_OVERRIDE_ACCESS is only available in development.');
+    }
+    const headers = new Headers();
+    if (process.env.PAYLOAD_MCP_AUTHORIZATION) {
+        headers.set('Authorization', process.env.PAYLOAD_MCP_AUTHORIZATION);
+    }
+    const req = await createLocalReq({
+        req: {
+            headers
+        }
+    }, payload);
     req.payloadAPI = 'MCP';
-    const server = buildMcpServer({
-        authorizedMCP,
-        pluginConfig,
+    const authorizedMCP = await getAuthorizedMCP({
+        overrideAccess,
         req
     });
-    const transport = new StdioServerTransport();
-    await server.connect(transport);
-    // Process now lives until stdin closes. Wire graceful shutdown so DB
-    // connections (and any other Payload-managed resources) get released.
-    const shutdown = async (code = 0)=>{
+    const stdioServer = serveStdio(()=>buildMcpServer({
+            authorizedMCP,
+            pluginConfig,
+            req
+        }), {
+        onerror: (err)=>{
+            // MCP messages use stdout, so write SDK errors to stderr.
+            console.error('[payload-mcp] error serving MCP over stdio:', err);
+        }
+    });
+    // Close the MCP server and Payload when the client disconnects or the process stops.
+    let isShuttingDown = false;
+    const shutdown = async ()=>{
+        if (isShuttingDown) {
+            return;
+        }
+        isShuttingDown = true;
         try {
-            await server.close();
+            await stdioServer.close();
         } catch (err) {
             console.error('[payload-mcp] error closing server:', err);
         }
@@ -79,11 +116,11 @@ import { resolveProjectRoot } from './utils/resolveProjectRoot.js';
         } catch (err) {
             console.error('[payload-mcp] error destroying payload:', err);
         }
-        process.exit(code);
+        process.exit(0);
     };
-    process.on('SIGINT', ()=>void shutdown(0));
-    process.on('SIGTERM', ()=>void shutdown(0));
-    process.stdin.on('close', ()=>void shutdown(0));
+    process.once('SIGINT', ()=>void shutdown());
+    process.once('SIGTERM', ()=>void shutdown());
+    process.stdin.once('close', ()=>void shutdown());
 };
 
 //# sourceMappingURL=stdio.js.map

package/dist/stdio.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/stdio.ts"],"sourcesContent":["import type { MaybePromise, Plugin, SanitizedConfig } from 'payload'\n\n/* eslint-disable no-console */\nimport { StdioServerTransport } from '@modelcontextprotocol/server'\nimport { fileURLToPath, pathToFileURL } from 'node:url'\nimport { createLocalReq, getPayload } from 'payload'\nimport { findConfig } from 'payload/node'\n\nimport type { AuthorizedMCP, SanitizedMCPPluginConfig } from './types.js'\n\nimport { buildMcpServer } from './mcp/buildMcpServer.js'\nimport { sanitizeMCPConfig } from './mcp/sanitizeMCPConfig.js'\nimport { getPluginConfig } from './utils/getPluginConfig.js'\nimport { resolveProjectRoot } from './utils/resolveProjectRoot.js'\n\n/**\n * Stdio adapter for the Payload MCP server.\n *\n * Do not use in production. There's no auth; whoever can spawn the process gets\n * full access to your local data.\n */\nexport const runMcpStdio = async (): Promise<void> => {\n  /**\n   * If MCP clients spawn stdio servers from an arbitrary working directory,\n   * Payload's cwd-anchored `findConfig()` can't locate the project on\n   * its own. This module always lives inside the project's `node_modules`, so\n   * we derive the project root from its own path and `chdir` into it.\n   *\n   * An absolute `PAYLOAD_CONFIG_PATH` still overrides everything; unusual\n   * layouts (e.g. a monorepo where the package is hoisted above the app) can\n   * fall back to it. See the implementation of findConfig for details.\n   */\n  const projectRoot = resolveProjectRoot(fileURLToPath(import.meta.url))\n  if (projectRoot) {\n    process.chdir(projectRoot)\n  }\n\n  const configPath = findConfig()\n  const configModule = await import(pathToFileURL(configPath).toString())\n  const config = (await (configModule.default ?? configModule)) as MaybePromise<SanitizedConfig>\n\n  const payload = await getPayload({ config })\n\n  /**\n   * If the user added `mcpPlugin({...})` to their `plugins` array, read the\n   * sanitized config they registered. Otherwise fall back to the defaults. That way,\n   * the mcp works on any project that has `@payloadcms/plugin-mcp` installed,\n   * even if the plugin is not added to the plugins array.\n   */\n  let pluginConfig: SanitizedMCPPluginConfig\n  try {\n    pluginConfig = getPluginConfig({ config: payload.config })\n  } catch {\n    pluginConfig = sanitizeMCPConfig({ config: payload.config, pluginConfig: {} })\n\n    const fakePluginFn: Plugin = (config) => config\n    fakePluginFn.slug = '@payloadcms/plugin-mcp'\n    // @ts-expect-error\n    fakePluginFn.sanitizedOptions = pluginConfig\n\n    // Push to payload config, to ensure consecutive calls to `getPluginConfig()` work\n    ;(payload.config.plugins ??= []).push(fakePluginFn)\n  }\n\n  const authorizedMCP: AuthorizedMCP = {\n    items: pluginConfig.items,\n    overrideAccess: true,\n    user: null,\n  }\n\n  const req = await createLocalReq({}, payload)\n  req.payloadAPI = 'MCP' as const\n\n  const server = buildMcpServer({ authorizedMCP, pluginConfig, req })\n\n  const transport = new StdioServerTransport()\n  await server.connect(transport)\n\n  // Process now lives until stdin closes. Wire graceful shutdown so DB\n  // connections (and any other Payload-managed resources) get released.\n  const shutdown = async (code = 0) => {\n    try {\n      await server.close()\n    } catch (err) {\n      console.error('[payload-mcp] error closing server:', err)\n    }\n    try {\n      await payload.destroy()\n    } catch (err) {\n      console.error('[payload-mcp] error destroying payload:', err)\n    }\n    process.exit(code)\n  }\n\n  process.on('SIGINT', () => void shutdown(0))\n  process.on('SIGTERM', () => void shutdown(0))\n  process.stdin.on('close', () => void shutdown(0))\n}\n"],"names":["StdioServerTransport","fileURLToPath","pathToFileURL","createLocalReq","getPayload","findConfig","buildMcpServer","sanitizeMCPConfig","getPluginConfig","resolveProjectRoot","runMcpStdio","projectRoot","url","process","chdir","configPath","configModule","toString","config","default","payload","pluginConfig","fakePluginFn","slug","sanitizedOptions","plugins","push","authorizedMCP","items","overrideAccess","user","req","payloadAPI","server","transport","connect","shutdown","code","close","err","console","error","destroy","exit","on","stdin"],"mappings":"AAEA,6BAA6B,GAC7B,SAASA,oBAAoB,QAAQ,+BAA8B;AACnE,SAASC,aAAa,EAAEC,aAAa,QAAQ,WAAU;AACvD,SAASC,cAAc,EAAEC,UAAU,QAAQ,UAAS;AACpD,SAASC,UAAU,QAAQ,eAAc;AAIzC,SAASC,cAAc,QAAQ,0BAAyB;AACxD,SAASC,iBAAiB,QAAQ,6BAA4B;AAC9D,SAASC,eAAe,QAAQ,6BAA4B;AAC5D,SAASC,kBAAkB,QAAQ,gCAA+B;AAElE;;;;;CAKC,GACD,OAAO,MAAMC,cAAc;IACzB;;;;;;;;;GASC,GACD,MAAMC,cAAcF,mBAAmBR,cAAc,YAAYW,GAAG;IACpE,IAAID,aAAa;QACfE,QAAQC,KAAK,CAACH;IAChB;IAEA,MAAMI,aAAaV;IACnB,MAAMW,eAAe,MAAM,MAAM,CAACd,cAAca,YAAYE,QAAQ;IACpE,MAAMC,SAAU,MAAOF,CAAAA,aAAaG,OAAO,IAAIH,YAAW;IAE1D,MAAMI,UAAU,MAAMhB,WAAW;QAAEc;IAAO;IAE1C;;;;;GAKC,GACD,IAAIG;IACJ,IAAI;QACFA,eAAeb,gBAAgB;YAAEU,QAAQE,QAAQF,MAAM;QAAC;IAC1D,EAAE,OAAM;QACNG,eAAed,kBAAkB;YAAEW,QAAQE,QAAQF,MAAM;YAAEG,cAAc,CAAC;QAAE;QAE5E,MAAMC,eAAuB,CAACJ,SAAWA;QACzCI,aAAaC,IAAI,GAAG;QACpB,mBAAmB;QACnBD,aAAaE,gBAAgB,GAAGH;QAG9BD,CAAAA,QAAQF,MAAM,CAACO,OAAO,KAAK,EAAE,AAAD,EAAGC,IAAI,CAACJ;IACxC;IAEA,MAAMK,gBAA+B;QACnCC,OAAOP,aAAaO,KAAK;QACzBC,gBAAgB;QAChBC,MAAM;IACR;IAEA,MAAMC,MAAM,MAAM5B,eAAe,CAAC,GAAGiB;IACrCW,IAAIC,UAAU,GAAG;IAEjB,MAAMC,SAAS3B,eAAe;QAAEqB;QAAeN;QAAcU;IAAI;IAEjE,MAAMG,YAAY,IAAIlC;IACtB,MAAMiC,OAAOE,OAAO,CAACD;IAErB,qEAAqE;IACrE,sEAAsE;IACtE,MAAME,WAAW,OAAOC,OAAO,CAAC;QAC9B,IAAI;YACF,MAAMJ,OAAOK,KAAK;QACpB,EAAE,OAAOC,KAAK;YACZC,QAAQC,KAAK,CAAC,uCAAuCF;QACvD;QACA,IAAI;YACF,MAAMnB,QAAQsB,OAAO;QACvB,EAAE,OAAOH,KAAK;YACZC,QAAQC,KAAK,CAAC,2CAA2CF;QAC3D;QACA1B,QAAQ8B,IAAI,CAACN;IACf;IAEAxB,QAAQ+B,EAAE,CAAC,UAAU,IAAM,KAAKR,SAAS;IACzCvB,QAAQ+B,EAAE,CAAC,WAAW,IAAM,KAAKR,SAAS;IAC1CvB,QAAQgC,KAAK,CAACD,EAAE,CAAC,SAAS,IAAM,KAAKR,SAAS;AAChD,EAAC"}
+{"version":3,"sources":["../src/stdio.ts"],"sourcesContent":["import type { Config, Plugin, SanitizedConfig } from 'payload'\n\n/* eslint-disable no-console */\nimport { serveStdio } from '@modelcontextprotocol/server/stdio'\nimport { fileURLToPath, pathToFileURL } from 'node:url'\nimport { createLocalReq, getPayload } from 'payload'\nimport { findConfig } from 'payload/node'\n\nimport type { SanitizedMCPPluginConfig } from './types.js'\n\nimport { getAuthorizedMCP } from './endpoint/access.js'\nimport { buildMcpServer } from './mcp/buildMcpServer.js'\nimport { sanitizeMCPConfig } from './mcp/sanitizeMCPConfig.js'\nimport { getPluginConfig } from './utils/getPluginConfig.js'\nimport { resolveProjectRoot } from './utils/resolveProjectRoot.js'\n\n/**\n * Starts Payload's MCP server over stdin and stdout.\n *\n * Set `PAYLOAD_MCP_AUTHORIZATION` to authenticate. In development,\n * `PAYLOAD_MCP_OVERRIDE_ACCESS=true` skips access checks.\n */\nexport const runMcpStdio = async (): Promise<void> => {\n  // MCP clients may start this command from another folder. Move to the Payload\n  // project so findConfig() can find the config.\n  const projectRoot = resolveProjectRoot(fileURLToPath(import.meta.url))\n  if (projectRoot) {\n    process.chdir(projectRoot)\n  }\n\n  const configPath = findConfig()\n  const configModule = await import(pathToFileURL(configPath).toString())\n  const config = (await (configModule.default ?? configModule)) as SanitizedConfig\n\n  /**\n   * stdout is only for MCP messages. The spec says the server must not write\n   * logs there and may write them to stderr instead.\n   *\n   * The 2.0 client library recovers from stray stdout logs, but that behavior is not\n   * guaranteed. Move Payload logs to stderr so Payload does not add invalid data\n   * to stdout. Keep options from configurable loggers. Replace pre-built loggers\n   * because their output cannot be redirected.\n   *\n   * @see https://modelcontextprotocol.io/specification/2025-11-25/basic/transports#stdio\n   */\n  const loggerConfig: { logger?: Config['logger'] } = config\n  if (\n    loggerConfig.logger &&\n    typeof loggerConfig.logger === 'object' &&\n    'options' in loggerConfig.logger\n  ) {\n    loggerConfig.logger.destination = process.stderr\n  } else {\n    loggerConfig.logger = { destination: process.stderr, options: {} }\n  }\n\n  const payload = await getPayload({ config, cron: false, disableOnInit: true })\n\n  let pluginConfig: SanitizedMCPPluginConfig\n  try {\n    pluginConfig = getPluginConfig({ config: payload.config })\n  } catch {\n    // The command also works when mcpPlugin() is not in the Payload config.\n    pluginConfig = sanitizeMCPConfig({ config: payload.config, pluginConfig: {} })\n\n    const fallbackPlugin: Plugin = (config) => config\n    Object.assign(fallbackPlugin, {\n      slug: '@payloadcms/plugin-mcp',\n      sanitizedOptions: pluginConfig,\n    })\n    payload.config.plugins ??= []\n    payload.config.plugins.push(fallbackPlugin)\n  }\n\n  const overrideAccessEnv = process.env.PAYLOAD_MCP_OVERRIDE_ACCESS\n  let overrideAccess = false\n\n  if (overrideAccessEnv === 'true') {\n    overrideAccess = true\n  } else if (overrideAccessEnv && overrideAccessEnv !== 'false') {\n    throw new Error('PAYLOAD_MCP_OVERRIDE_ACCESS must be \"true\" or \"false\".')\n  }\n\n  if (overrideAccess && process.env.NODE_ENV !== 'development') {\n    throw new Error('PAYLOAD_MCP_OVERRIDE_ACCESS is only available in development.')\n  }\n\n  const headers = new Headers()\n  if (process.env.PAYLOAD_MCP_AUTHORIZATION) {\n    headers.set('Authorization', process.env.PAYLOAD_MCP_AUTHORIZATION)\n  }\n\n  const req = await createLocalReq({ req: { headers } }, payload)\n  req.payloadAPI = 'MCP' as const\n  const authorizedMCP = await getAuthorizedMCP({ overrideAccess, req })\n\n  const stdioServer = serveStdio(() => buildMcpServer({ authorizedMCP, pluginConfig, req }), {\n    onerror: (err) => {\n      // MCP messages use stdout, so write SDK errors to stderr.\n      console.error('[payload-mcp] error serving MCP over stdio:', err)\n    },\n  })\n\n  // Close the MCP server and Payload when the client disconnects or the process stops.\n  let isShuttingDown = false\n  const shutdown = async () => {\n    if (isShuttingDown) {\n      return\n    }\n    isShuttingDown = true\n\n    try {\n      await stdioServer.close()\n    } catch (err) {\n      console.error('[payload-mcp] error closing server:', err)\n    }\n\n    try {\n      await payload.destroy()\n    } catch (err) {\n      console.error('[payload-mcp] error destroying payload:', err)\n    }\n\n    process.exit(0)\n  }\n\n  process.once('SIGINT', () => void shutdown())\n  process.once('SIGTERM', () => void shutdown())\n  process.stdin.once('close', () => void shutdown())\n}\n"],"names":["serveStdio","fileURLToPath","pathToFileURL","createLocalReq","getPayload","findConfig","getAuthorizedMCP","buildMcpServer","sanitizeMCPConfig","getPluginConfig","resolveProjectRoot","runMcpStdio","projectRoot","url","process","chdir","configPath","configModule","toString","config","default","loggerConfig","logger","destination","stderr","options","payload","cron","disableOnInit","pluginConfig","fallbackPlugin","Object","assign","slug","sanitizedOptions","plugins","push","overrideAccessEnv","env","PAYLOAD_MCP_OVERRIDE_ACCESS","overrideAccess","Error","NODE_ENV","headers","Headers","PAYLOAD_MCP_AUTHORIZATION","set","req","payloadAPI","authorizedMCP","stdioServer","onerror","err","console","error","isShuttingDown","shutdown","close","destroy","exit","once","stdin"],"mappings":"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"}

package/dist/types.d.ts

@@ -1,32 +1,16 @@
-import type { CallToolResult, ContentBlock, JsonSchemaType, McpServer, ResourceTemplate, ServerContext, StandardSchemaWithJSON } from '@modelcontextprotocol/server';
-import type { AuthCollectionSlug, CollectionConfig, CollectionSlug, DefaultDocumentIDType, GlobalSlug, MaybePromise, PayloadRequest, TypedUser } from 'payload';
+import type { CallToolResult, ContentBlock, JsonSchemaType, McpServer, ResourceTemplate, ServerContext, StandardSchemaWithJSON, ToolAnnotations } from '@modelcontextprotocol/server';
+import type { AuthCollectionSlug, CollectionSlug, GlobalSlug, MaybePromise, PayloadRequest, SanitizedPermissions } from 'payload';
+import type { GetAuthorizedMCPArgs } from './endpoint/access.js';
 import type { MCPCollectionAuthToolName, MCPCollectionBuiltinName, MCPGlobalBuiltinName } from './mcp/builtinTools.js';
 export type { MCPCollectionAuthToolName, MCPCollectionBuiltinName, MCPGlobalBuiltinName };
-/** Re-exported from `@modelcontextprotocol/server` — the JSON Schema shape the MCP runtime validates against. */
-export type { JsonSchemaType, StandardSchemaWithJSON };
+/** Re-exported from `@modelcontextprotocol/server` — common MCP types used in plugin config. */
+export type { JsonSchemaType, StandardSchemaWithJSON, ToolAnnotations };
 /**
  * What a tool's `input` (or a prompt's `argsSchema`) can be — either a raw
- * JSON Schema literal, or a Standard Schema instance (Zod, Valibot, …).
+ * JSON Schema 2020-12 literal, or a Standard Schema instance (Zod, Valibot, …).
+ * Raw schemas may omit `$schema`; when present it must declare the 2020-12 dialect.
  */
 export type ToolInputSchema = JsonSchemaType | StandardSchemaWithJSON;
-/**
- * Serializable mirror of `SanitizedMCPPluginConfig` for client components —
- * the full sanitized config carries functions (tool handlers, etc.) that can't
- * cross the server→client boundary. Built by `sanitizeClientPluginConfig` and
- * passed to the `AccessField` component via `clientProps`.
- *
- * @internal
- */
-export type ClientMCPPluginConfig = {
-    items: Array<{
-        collectionSlug?: string;
-        configKey: string;
-        description: string;
-        globalSlug?: string;
-        label: string;
-        type: 'collectionTool' | 'globalTool' | 'prompt' | 'resource' | 'tool';
-    }>;
-};
 export type MCPToolResponse = {
     content: ContentBlock[];
     /**
@@ -37,11 +21,27 @@ export type MCPToolResponse = {
     doc?: Record<string, unknown>;
 } & Pick<CallToolResult, '_meta' | 'isError' | 'structuredContent'>;
 export type MCPResponseOverride = (response: MCPToolResponse, doc: Record<string, unknown>, req: PayloadRequest) => MCPToolResponse;
+export type MCPAfterToolCallHook = (args: {
+    input: unknown;
+    req: PayloadRequest;
+    response: MCPToolResponse;
+    toolName: string;
+}) => MaybePromise<MCPToolResponse>;
 /**
  * The handler's `input` type. A specific Standard Schema (Zod, Valibot, …) gets
  * its inferred output; anything else falls back to `Record<string, unknown>`.
  */
 export type TypedInput<TSchema> = TSchema extends StandardSchemaWithJSON ? StandardSchemaWithJSON extends TSchema ? Record<string, unknown> : StandardSchemaWithJSON.InferOutput<TSchema> : Record<string, unknown>;
+export type MCPAccessArgs = {
+    permissions?: SanitizedPermissions;
+    req: PayloadRequest;
+};
+export type CollectionMCPAccessArgs = {
+    collectionSlug: CollectionSlug;
+} & MCPAccessArgs;
+export type GlobalMCPAccessArgs = {
+    globalSlug: GlobalSlug;
+} & MCPAccessArgs;
 export type ToolHandlerArgs<TSchema = undefined> = {
     authorizedMCP: AuthorizedMCP;
     input: TypedInput<TSchema>;
@@ -55,6 +55,13 @@ export type GlobalToolHandlerArgs<TSchema = undefined> = {
     globalSlug: GlobalSlug;
 } & ToolHandlerArgs<TSchema>;
 export type Tool<TSchema extends ToolInputSchema | undefined = ToolInputSchema | undefined> = {
+    /**
+     * Runs while authorizing each MCP request, before the tool is advertised or called. Return
+     * `false` to make the tool unavailable for that request. This is skipped when `overrideAccess`
+     * is enabled.
+     */
+    access?: (args: MCPAccessArgs) => MaybePromise<boolean>;
+    annotations?: ToolAnnotations;
     description: string;
     handler: (args: ToolHandlerArgs<TSchema>) => MaybePromise<MCPToolResponse>;
     input?: TSchema;
@@ -64,19 +71,50 @@ export type Tool<TSchema extends ToolInputSchema | undefined = ToolInputSchema |
     overrideResponse?: MCPResponseOverride;
 };
 export type CollectionTool<TSchema extends ToolInputSchema | undefined = ToolInputSchema | undefined> = {
+    /**
+     * Runs while authorizing each MCP request for this collection. Return `false` to reject calls
+     * to this tool for the collection. The shared tool is not advertised when no collections allow
+     * it, but can remain advertised when it is available for another collection. This is skipped
+     * when `overrideAccess` is enabled.
+     */
+    access?: (args: CollectionMCPAccessArgs) => MaybePromise<boolean>;
     handler: (args: CollectionToolHandlerArgs<TSchema>) => MaybePromise<MCPToolResponse>;
     input?: TSchema;
-} & Pick<Tool, 'description' | 'overrideResponse'>;
+} & Pick<Tool, 'annotations' | 'description' | 'overrideResponse'>;
 export type GlobalTool<TSchema extends ToolInputSchema | undefined = ToolInputSchema | undefined> = {
+    /**
+     * Runs while authorizing each MCP request for this global. Return `false` to reject calls to
+     * this tool for the global. The shared tool is not advertised when no globals allow it, but
+     * can remain advertised when it is available for another global. This is skipped when
+     * `overrideAccess` is enabled.
+     */
+    access?: (args: GlobalMCPAccessArgs) => MaybePromise<boolean>;
     handler: (args: GlobalToolHandlerArgs<TSchema>) => MaybePromise<MCPToolResponse>;
     input?: TSchema;
-} & Pick<Tool, 'description' | 'overrideResponse'>;
+} & Pick<Tool, 'annotations' | 'description' | 'overrideResponse'>;
 /**
  * Configures (or disables) a built-in tool without replacing it.
  * `handler?: never` prevents a full `CollectionTool`/`GlobalTool` (which has a
  * required handler) from being silently accepted at a built-in key slot.
  */
-export type MCPBuiltInToolOverride = {
+export type MCPBuiltInCollectionToolOverride = {
+    /**
+     * Replaces the built-in tool's access check. Return `false` to make the tool unavailable for
+     * this collection. This is skipped when `overrideAccess` is enabled.
+     */
+    access?: (args: CollectionMCPAccessArgs) => MaybePromise<boolean>;
+    annotations?: ToolAnnotations;
+    description?: string;
+    handler?: never;
+    overrideResponse?: MCPResponseOverride;
+};
+export type MCPBuiltInGlobalToolOverride = {
+    /**
+     * Replaces the built-in tool's access check. Return `false` to make the tool unavailable for
+     * this global. This is skipped when `overrideAccess` is enabled.
+     */
+    access?: (args: GlobalMCPAccessArgs) => MaybePromise<boolean>;
+    annotations?: ToolAnnotations;
     description?: string;
     handler?: never;
     overrideResponse?: MCPResponseOverride;
@@ -88,19 +126,19 @@ export type MCPBuiltInToolOverride = {
  */
 export type MCPTopLevelToolEntry = Tool;
 export type MCPCollectionToolsMap = {
-    [customToolName: string]: boolean | CollectionTool | MCPBuiltInToolOverride | undefined;
+    [customToolName: string]: boolean | CollectionTool | MCPBuiltInCollectionToolOverride | undefined;
 } & {
-    [K in MCPCollectionBuiltinName]?: false | MCPBuiltInToolOverride;
+    [K in MCPCollectionBuiltinName]?: false | MCPBuiltInCollectionToolOverride;
 };
 export type MCPAuthCollectionToolsMap = {
-    [K in MCPCollectionAuthToolName]?: MCPBuiltInToolOverride | true;
+    [K in MCPCollectionAuthToolName]?: MCPBuiltInCollectionToolOverride | true;
 } & MCPCollectionToolsMap;
 /** Auth-enabled collections get auth-tool name autocomplete; others get CRUD-only. */
 export type MCPToolsMapForCollection<Slug extends CollectionSlug> = Slug extends AuthCollectionSlug ? MCPAuthCollectionToolsMap : MCPCollectionToolsMap;
 export type MCPGlobalToolsMap = {
-    [customToolName: string]: boolean | GlobalTool | MCPBuiltInToolOverride | undefined;
+    [customToolName: string]: boolean | GlobalTool | MCPBuiltInGlobalToolOverride | undefined;
 } & {
-    [K in MCPGlobalBuiltinName]?: false | MCPBuiltInToolOverride;
+    [K in MCPGlobalBuiltinName]?: false | MCPBuiltInGlobalToolOverride;
 };
 export type MCPTopLevelToolsMap = Record<string, Tool>;
 export type PromptHandlerArgs<TSchema = undefined> = {
@@ -109,6 +147,12 @@ export type PromptHandlerArgs<TSchema = undefined> = {
     serverContext: ServerContext;
 };
 export type Prompt<TSchema extends ToolInputSchema = ToolInputSchema> = {
+    /**
+     * Runs while authorizing each MCP request, before the prompt is advertised or used. Return
+     * `false` to make the prompt unavailable for that request. This is skipped when
+     * `overrideAccess` is enabled.
+     */
+    access?: (args: MCPAccessArgs) => MaybePromise<boolean>;
     argsSchema: TSchema;
     description: string;
     handler: (args: PromptHandlerArgs<TSchema>) => MaybePromise<{
@@ -130,6 +174,12 @@ export type ResourceHandlerArgs = {
     uri: URL;
 };
 export type Resource = {
+    /**
+     * Runs while authorizing each MCP request, before the resource is advertised or read. Return
+     * `false` to make the resource unavailable for that request. This is skipped when
+     * `overrideAccess` is enabled.
+     */
+    access?: (args: MCPAccessArgs) => MaybePromise<boolean>;
     description: string;
     handler: (args: ResourceHandlerArgs) => MaybePromise<{
         contents: Array<{
@@ -163,81 +213,47 @@ export type MCPPluginConfig = {
     collections?: {
         [Slug in CollectionSlug]?: MCPPluginCollectionConfig<Slug>;
     };
-    /** Skip MCP registration. The API key collection is still added (so DB / types stay stable). */
+    /** Skip MCP endpoint registration. */
     disabled?: boolean;
     globals?: {
         [Slug in GlobalSlug]?: MCPPluginGlobalConfig;
     };
+    hooks?: {
+        /** Transform a tool response after its handler returns */
+        afterToolCall?: MCPAfterToolCallHook[];
+    };
     mcp?: {
         serverOptions?: MCPServerOptions;
         verboseLogs?: boolean;
     };
-    overrideApiKeyCollection?: (collection: CollectionConfig) => CollectionConfig;
-    /** Replace the default API-key auth with a custom resolver. */
-    overrideAuth?: (args: {
-        getAPIKeyDoc: (overrideApiKey?: string) => Promise<MCPAPIKeysDoc>;
-        getAuthorizedMCP: (args: {
-            apiKeyDoc: MCPAPIKeysDoc;
-        }) => AuthorizedMCP;
+    /**
+     * Replace the default MCP authorization resolver.
+     *
+     * This hook replaces the default authentication flow. It must set `req.user` to the
+     * authenticated Payload user, or to `null` for an anonymous caller, before returning.
+     */
+    overrideGetAuthorizedMCP?: (args: {
         pluginConfig: SanitizedMCPPluginConfig;
-        req: PayloadRequest;
-    }) => MaybePromise<AuthorizedMCP>;
+    } & GetAuthorizedMCPArgs) => MaybePromise<AuthorizedMCP>;
     prompts?: Record<string, Prompt>;
     resources?: Record<string, Resource>;
     /** Cross-cutting tools (not scoped to any collection or global). */
     tools?: MCPTopLevelToolsMap;
-    userCollection?: CollectionSlug;
 };
 export type SanitizedMCPPluginConfig = {
     items: MCPItem[];
-    userCollection: CollectionSlug;
-} & Pick<MCPPluginConfig, 'disabled' | 'mcp' | 'overrideApiKeyCollection' | 'overrideAuth'>;
+} & Pick<MCPPluginConfig, 'disabled' | 'hooks' | 'mcp' | 'overrideGetAuthorizedMCP'>;
 export type MCPServerOptions = {
     options?: ConstructorParameters<typeof McpServer>[1];
     serverInfo?: Partial<ConstructorParameters<typeof McpServer>[0]>;
 };
 /**
- * Nested access tree as stored in the collection.
- * A `false` leaf disables that tool; missing keys defer to
- * defaults (built-in CRUD is on, opt-in tools are off).
- */
-export type MCPAPIKeysDocAccessTree = {
-    collections?: {
-        [CollectionSlug: CollectionSlug]: {
-            [ToolKey: string]: boolean;
-        };
-    };
-    globals?: {
-        [GlobalSlug: GlobalSlug]: {
-            [ToolKey: string]: boolean;
-        };
-    };
-    prompts?: {
-        [PromptKey: string]: boolean;
-    };
-    resources?: {
-        [ResourceKey: string]: boolean;
-    };
-    tools?: {
-        [ToolKey: string]: boolean;
-    };
-};
-/**
- * Stored on `payload-mcp-api-keys` docs
- */
-export type MCPAPIKeysDoc = {
-    access: MCPAPIKeysDocAccessTree;
-    id: DefaultDocumentIDType;
-    overrideAccess?: boolean;
-    user: null | TypedUser;
-};
-/**
- * One MCP primitive plus the metadata needed for access checks, admin UI, and
+ * One MCP primitive plus the metadata needed for config-driven filtering and
  * registration.
  *
- * - `configKey`: the config/API-key identifier, e.g. `find` or `echo`.
+ * - `configKey`: the config identifier, e.g. `find` or `echo`.
  * - `mcpName`: the MCP wire name, e.g. `findDocuments` or `echo`.
- * - `label`: human-readable admin checkbox text.
+ * - `label`: human-readable display text.
  */
 export type MCPItemBase = {
     configKey: string;
@@ -265,14 +281,11 @@ export type MCPItem = ({
     type: 'tool';
 } & MCPItemBase) | CollectionMCPItem | GlobalMCPItem;
 /**
- * The caller's identity + the MCP items they can use for this request. Returned
- * by `getAuthorizedMCP`; denied items are simply absent from `items`. Handlers
- * receive this via `args.authorizedMCP` so they can spread
- * `localAPIDefaults(authorizedMCP)` into every local API call.
+ * The MCP items and access mode authorized for this request. The authenticated user is available
+ * as `req.user`.
  */
 export type AuthorizedMCP = {
     items: MCPItem[];
     overrideAccess: boolean;
-    user: null | TypedUser;
 };
 //# sourceMappingURL=types.d.ts.map