@payloadcms/plugin-mcp 3.91.0-internal.c1569dc → 4.0.0-beta.1

package/LICENSE.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018-2024 Payload CMS, Inc. <info@payloadcms.com>
+Copyright (c) 2018-2026 Payload CMS, LLC <info@payloadcms.com>
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

package/README.md

@@ -2,6 +2,6 @@
 
 A plugin for [Payload](https://github.com/payloadcms/payload). This plugin adds [Model Context Protocol](https://modelcontextprotocol.io/docs/getting-started/intro) capabilities.
 
-- [Source code](https://github.com/payloadcms/payload/tree/3.x/packages/plugin-mcp)
+- [Source code](https://github.com/payloadcms/payload/tree/main/packages/plugin-mcp)
 - [Documentation](https://payloadcms.com/docs/plugins/mcp)
-- [Documentation source](https://github.com/payloadcms/payload/tree/3.x/docs/plugins/mcp.mdx)
+- [Documentation source](https://github.com/payloadcms/payload/tree/main/docs/plugins/mcp.mdx)

package/bin.js

@@ -0,0 +1,39 @@
+#!/usr/bin/env node
+/**
+ * stdio MCP server for Payload.
+ *
+ * Loads the project's `payload.config.{ts,js}` (via `findConfig`), boots Payload,
+ * and serves MCP over stdin/stdout. Intended for local-dev MCP clients (Claude
+ * Desktop, IDEs) that spawn stdio MCP servers - no running Next.js dev server required.
+ *
+ * Mirrors `payload/bin.js`: by default, transpiles TS on the fly via `tsx`. Pass
+ * `--disable-transpile` if your config is already JS (or you've registered your
+ * own loader).
+ */
+import path from 'path'
+import { fileURLToPath, pathToFileURL } from 'url'
+
+const disableTranspile = process.argv.includes('--disable-transpile')
+
+const filename = fileURLToPath(import.meta.url)
+const dirname = path.dirname(filename)
+const baseURL = pathToFileURL(dirname).toString() + '/'
+
+const start = async () => {
+  if (disableTranspile) {
+    process.argv = process.argv.filter((arg) => arg !== '--disable-transpile')
+    const { runMcpStdio } = await import('./dist/stdio.js')
+    await runMcpStdio()
+    return
+  }
+
+  const { tsImport } = await import('tsx/esm/api')
+  const { runMcpStdio } = await tsImport('./dist/stdio.js', baseURL)
+  await runMcpStdio()
+}
+
+start().catch((err) => {
+  // eslint-disable-next-line no-console
+  console.error('[payload-mcp] error:', err)
+  process.exit(1)
+})

package/dist/defaultAccess.d.ts

@@ -0,0 +1,3 @@
+import type { MCPAccessArgs } from './types.js';
+export declare const defaultAccess: ({ req }: MCPAccessArgs) => boolean;
+//# sourceMappingURL=defaultAccess.d.ts.map

package/dist/defaultAccess.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"defaultAccess.d.ts","sourceRoot":"","sources":["../src/defaultAccess.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAE/C,eAAO,MAAM,aAAa,YAAa,aAAa,KAAG,OAA4B,CAAA"}

package/dist/defaultAccess.js

@@ -0,0 +1,3 @@
+export const defaultAccess = ({ req })=>Boolean(req.user);
+
+//# sourceMappingURL=defaultAccess.js.map

package/dist/defaultAccess.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/defaultAccess.ts"],"sourcesContent":["import type { MCPAccessArgs } from './types.js'\n\nexport const defaultAccess = ({ req }: MCPAccessArgs): boolean => Boolean(req.user)\n"],"names":["defaultAccess","req","Boolean","user"],"mappings":"AAEA,OAAO,MAAMA,gBAAgB,CAAC,EAAEC,GAAG,EAAiB,GAAcC,QAAQD,IAAIE,IAAI,EAAC"}

package/dist/defineTool.d.ts

@@ -0,0 +1,26 @@
+import type { CollectionTool, GlobalTool, Prompt, Tool, ToolInputSchema } from './types.js';
+/**
+ * Two-stage builder: pass the schema/metadata first, then chain `.handler(fn)`. Splitting the
+ * call lets TypeScript resolve `TSchema` from `input` (call 1) before contextually typing the
+ * handler (call 2). A single-call API hit a TS limitation where property order in the literal
+ * decided whether `TSchema` was inferred or pinned to its default.
+ *
+ *     defineCollectionTool({ description, input })
+ *       .handler(({ input }) => …)   // ← input is fully typed here regardless of order
+ *
+ * Config and handler signatures are derived from `Tool` / `CollectionTool` / `GlobalTool` /
+ * `Prompt` via `Omit` + indexed access so there's no duplication with `types.ts`.
+ */
+export declare const defineTool: <TSchema extends ToolInputSchema | undefined = ToolInputSchema | undefined>(args: Omit<Tool<TSchema>, 'handler'>) => {
+    handler: (fn: Tool<TSchema>['handler']) => Tool;
+};
+export declare const defineCollectionTool: <TSchema extends ToolInputSchema | undefined = ToolInputSchema | undefined>(args: Omit<CollectionTool<TSchema>, 'handler'>) => {
+    handler: (fn: CollectionTool<TSchema>['handler']) => CollectionTool;
+};
+export declare const defineGlobalTool: <TSchema extends ToolInputSchema | undefined = ToolInputSchema | undefined>(args: Omit<GlobalTool<TSchema>, 'handler'>) => {
+    handler: (fn: GlobalTool<TSchema>['handler']) => GlobalTool;
+};
+export declare const definePrompt: <TSchema extends ToolInputSchema = ToolInputSchema>(args: Omit<Prompt<TSchema>, 'handler'>) => {
+    handler: (fn: Prompt<TSchema>['handler']) => Prompt;
+};
+//# sourceMappingURL=defineTool.d.ts.map

package/dist/defineTool.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"defineTool.d.ts","sourceRoot":"","sources":["../src/defineTool.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAE3F;;;;;;;;;;;GAWG;AAEH,eAAO,MAAM,UAAU,GACrB,OAAO,SAAS,eAAe,GAAG,SAAS,GAAG,eAAe,GAAG,SAAS,QAEnE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,KACnC;IAAE,OAAO,EAAE,CAAC,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,KAAK,IAAI,CAAA;CAElD,CAAA;AAEF,eAAO,MAAM,oBAAoB,GAC/B,OAAO,SAAS,eAAe,GAAG,SAAS,GAAG,eAAe,GAAG,SAAS,QAEnE,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,KAC7C;IAAE,OAAO,EAAE,CAAC,EAAE,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,KAAK,cAAc,CAAA;CAEtE,CAAA;AAEF,eAAO,MAAM,gBAAgB,GAC3B,OAAO,SAAS,eAAe,GAAG,SAAS,GAAG,eAAe,GAAG,SAAS,QAEnE,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,KACzC;IAAE,OAAO,EAAE,CAAC,EAAE,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,KAAK,UAAU,CAAA;CAE9D,CAAA;AAEF,eAAO,MAAM,YAAY,GAAI,OAAO,SAAS,eAAe,GAAG,eAAe,QACtE,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,KACrC;IAAE,OAAO,EAAE,CAAC,EAAE,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,KAAK,MAAM,CAAA;CAEtD,CAAA"}

package/dist/defineTool.js

@@ -0,0 +1,37 @@
+/**
+ * Two-stage builder: pass the schema/metadata first, then chain `.handler(fn)`. Splitting the
+ * call lets TypeScript resolve `TSchema` from `input` (call 1) before contextually typing the
+ * handler (call 2). A single-call API hit a TS limitation where property order in the literal
+ * decided whether `TSchema` was inferred or pinned to its default.
+ *
+ *     defineCollectionTool({ description, input })
+ *       .handler(({ input }) => …)   // ← input is fully typed here regardless of order
+ *
+ * Config and handler signatures are derived from `Tool` / `CollectionTool` / `GlobalTool` /
+ * `Prompt` via `Omit` + indexed access so there's no duplication with `types.ts`.
+ */ export const defineTool = (args)=>({
+        handler: (fn)=>({
+                ...args,
+                handler: fn
+            })
+    });
+export const defineCollectionTool = (args)=>({
+        handler: (fn)=>({
+                ...args,
+                handler: fn
+            })
+    });
+export const defineGlobalTool = (args)=>({
+        handler: (fn)=>({
+                ...args,
+                handler: fn
+            })
+    });
+export const definePrompt = (args)=>({
+        handler: (fn)=>({
+                ...args,
+                handler: fn
+            })
+    });
+
+//# sourceMappingURL=defineTool.js.map

package/dist/defineTool.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/defineTool.ts"],"sourcesContent":["import type { CollectionTool, GlobalTool, Prompt, Tool, ToolInputSchema } from './types.js'\n\n/**\n * Two-stage builder: pass the schema/metadata first, then chain `.handler(fn)`. Splitting the\n * call lets TypeScript resolve `TSchema` from `input` (call 1) before contextually typing the\n * handler (call 2). A single-call API hit a TS limitation where property order in the literal\n * decided whether `TSchema` was inferred or pinned to its default.\n *\n *     defineCollectionTool({ description, input })\n *       .handler(({ input }) => …)   // ← input is fully typed here regardless of order\n *\n * Config and handler signatures are derived from `Tool` / `CollectionTool` / `GlobalTool` /\n * `Prompt` via `Omit` + indexed access so there's no duplication with `types.ts`.\n */\n\nexport const defineTool = <\n  TSchema extends ToolInputSchema | undefined = ToolInputSchema | undefined,\n>(\n  args: Omit<Tool<TSchema>, 'handler'>,\n): { handler: (fn: Tool<TSchema>['handler']) => Tool } => ({\n  handler: (fn) => ({ ...args, handler: fn }) as unknown as Tool,\n})\n\nexport const defineCollectionTool = <\n  TSchema extends ToolInputSchema | undefined = ToolInputSchema | undefined,\n>(\n  args: Omit<CollectionTool<TSchema>, 'handler'>,\n): { handler: (fn: CollectionTool<TSchema>['handler']) => CollectionTool } => ({\n  handler: (fn) => ({ ...args, handler: fn }) as unknown as CollectionTool,\n})\n\nexport const defineGlobalTool = <\n  TSchema extends ToolInputSchema | undefined = ToolInputSchema | undefined,\n>(\n  args: Omit<GlobalTool<TSchema>, 'handler'>,\n): { handler: (fn: GlobalTool<TSchema>['handler']) => GlobalTool } => ({\n  handler: (fn) => ({ ...args, handler: fn }) as unknown as GlobalTool,\n})\n\nexport const definePrompt = <TSchema extends ToolInputSchema = ToolInputSchema>(\n  args: Omit<Prompt<TSchema>, 'handler'>,\n): { handler: (fn: Prompt<TSchema>['handler']) => Prompt } => ({\n  handler: (fn) => ({ ...args, handler: fn }) as unknown as Prompt,\n})\n"],"names":["defineTool","args","handler","fn","defineCollectionTool","defineGlobalTool","definePrompt"],"mappings":"AAEA;;;;;;;;;;;CAWC,GAED,OAAO,MAAMA,aAAa,CAGxBC,OACyD,CAAA;QACzDC,SAAS,CAACC,KAAQ,CAAA;gBAAE,GAAGF,IAAI;gBAAEC,SAASC;YAAG,CAAA;IAC3C,CAAA,EAAE;AAEF,OAAO,MAAMC,uBAAuB,CAGlCH,OAC6E,CAAA;QAC7EC,SAAS,CAACC,KAAQ,CAAA;gBAAE,GAAGF,IAAI;gBAAEC,SAASC;YAAG,CAAA;IAC3C,CAAA,EAAE;AAEF,OAAO,MAAME,mBAAmB,CAG9BJ,OACqE,CAAA;QACrEC,SAAS,CAACC,KAAQ,CAAA;gBAAE,GAAGF,IAAI;gBAAEC,SAASC;YAAG,CAAA;IAC3C,CAAA,EAAE;AAEF,OAAO,MAAMG,eAAe,CAC1BL,OAC6D,CAAA;QAC7DC,SAAS,CAACC,KAAQ,CAAA;gBAAE,GAAGF,IAAI;gBAAEC,SAASC;YAAG,CAAA;IAC3C,CAAA,EAAE"}

package/dist/endpoint/access.d.ts

@@ -0,0 +1,17 @@
+import type { PayloadRequest } from 'payload';
+import type { AuthorizedMCP, MCPItem } from '../types.js';
+export type GetAuthorizedMCPArgs = {
+    overrideAccess: boolean;
+    req: PayloadRequest;
+};
+/**
+ * Authenticates an MCP request and removes items the user cannot access.
+ * `overrideAccess` skips Payload and MCP item access checks.
+ */
+export declare const getAuthorizedMCP: (args: GetAuthorizedMCPArgs) => Promise<AuthorizedMCP>;
+export declare const filterMCPItems: ({ items, overrideAccess, req, }: {
+    items: MCPItem[];
+    overrideAccess: boolean;
+    req: PayloadRequest;
+}) => Promise<MCPItem[]>;
+//# sourceMappingURL=access.d.ts.map

package/dist/endpoint/access.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"access.d.ts","sourceRoot":"","sources":["../../src/endpoint/access.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAwB,MAAM,SAAS,CAAA;AAInE,OAAO,KAAK,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAIzD,MAAM,MAAM,oBAAoB,GAAG;IACjC,cAAc,EAAE,OAAO,CAAA;IACvB,GAAG,EAAE,cAAc,CAAA;CACpB,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,gBAAgB,EAAE,CAAC,IAAI,EAAE,oBAAoB,KAAK,OAAO,CAAC,aAAa,CAkCnF,CAAA;AAED,eAAO,MAAM,cAAc,oCAIxB;IACD,KAAK,EAAE,OAAO,EAAE,CAAA;IAChB,cAAc,EAAE,OAAO,CAAA;IACvB,GAAG,EAAE,cAAc,CAAA;CACpB,KAAG,OAAO,CAAC,OAAO,EAAE,CAkBpB,CAAA"}

package/dist/endpoint/access.js

@@ -0,0 +1,93 @@
+import { getAccessResults, UnauthorizedError } from 'payload';
+import { getPluginConfig } from '../utils/getPluginConfig.js';
+/**
+ * Authenticates an MCP request and removes items the user cannot access.
+ * `overrideAccess` skips Payload and MCP item access checks.
+ */ export const getAuthorizedMCP = async ({ overrideAccess, req })=>{
+    const pluginConfig = getPluginConfig({
+        config: req.payload.config
+    });
+    if (pluginConfig.overrideGetAuthorizedMCP) {
+        return await pluginConfig.overrideGetAuthorizedMCP({
+            overrideAccess,
+            pluginConfig,
+            req
+        });
+    }
+    if (req.headers) {
+        const headers = new Headers(req.headers);
+        const hasAuthorization = headers.has('Authorization');
+        headers.set('DisableAutologin', 'true');
+        req.user = (await req.payload.auth({
+            headers,
+            req
+        })).user;
+        if (hasAuthorization && !req.user) {
+            throw new UnauthorizedError(req.t);
+        }
+    }
+    return {
+        items: await filterMCPItems({
+            items: pluginConfig.items,
+            overrideAccess,
+            req
+        }),
+        overrideAccess
+    };
+};
+export const filterMCPItems = async ({ items, overrideAccess, req })=>{
+    // Match Payload core: overrideAccess bypasses access evaluation
+    if (overrideAccess) {
+        return items;
+    }
+    const authorizedItems = [];
+    const permissions = await getAccessResults({
+        req
+    });
+    for (const item of items){
+        if (!await checkItemAccess({
+            item,
+            permissions,
+            req
+        })) {
+            continue;
+        }
+        authorizedItems.push(item);
+    }
+    return authorizedItems;
+};
+/**
+ * Runs MCP item access callbacks
+ */ const checkItemAccess = async ({ item, permissions, req })=>{
+    switch(item.type){
+        case 'collectionTool':
+            return !item.tool.access || await item.tool.access({
+                slug: item.collectionSlug,
+                permissions,
+                req
+            });
+        case 'globalTool':
+            return !item.tool.access || await item.tool.access({
+                slug: item.globalSlug,
+                permissions,
+                req
+            });
+        case 'prompt':
+            return !item.prompt.access || await item.prompt.access({
+                permissions,
+                req
+            });
+        case 'resource':
+            return !item.resource.access || await item.resource.access({
+                permissions,
+                req
+            });
+        case 'tool':
+            return !item.tool.access || await item.tool.access({
+                permissions,
+                req
+            });
+    }
+};
+
+//# sourceMappingURL=access.js.map

package/dist/endpoint/access.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/endpoint/access.ts"],"sourcesContent":["import type { PayloadRequest, SanitizedPermissions } from 'payload'\n\nimport { getAccessResults, UnauthorizedError } from 'payload'\n\nimport type { AuthorizedMCP, MCPItem } from '../types.js'\n\nimport { getPluginConfig } from '../utils/getPluginConfig.js'\n\nexport type GetAuthorizedMCPArgs = {\n  overrideAccess: boolean\n  req: PayloadRequest\n}\n\n/**\n * Authenticates an MCP request and removes items the user cannot access.\n * `overrideAccess` skips Payload and MCP item access checks.\n */\nexport const getAuthorizedMCP: (args: GetAuthorizedMCPArgs) => Promise<AuthorizedMCP> = async ({\n  overrideAccess,\n  req,\n}) => {\n  const pluginConfig = getPluginConfig({ config: req.payload.config })\n\n  if (pluginConfig.overrideGetAuthorizedMCP) {\n    return await pluginConfig.overrideGetAuthorizedMCP({\n      overrideAccess,\n      pluginConfig,\n      req,\n    })\n  }\n\n  if (req.headers) {\n    const headers = new Headers(req.headers)\n    const hasAuthorization = headers.has('Authorization')\n\n    headers.set('DisableAutologin', 'true')\n    req.user = (await req.payload.auth({ headers, req })).user\n\n    if (hasAuthorization && !req.user) {\n      throw new UnauthorizedError(req.t)\n    }\n  }\n\n  return {\n    items: await filterMCPItems({\n      items: pluginConfig.items,\n      overrideAccess,\n      req,\n    }),\n    overrideAccess,\n  }\n}\n\nexport const filterMCPItems = async ({\n  items,\n  overrideAccess,\n  req,\n}: {\n  items: MCPItem[]\n  overrideAccess: boolean\n  req: PayloadRequest\n}): Promise<MCPItem[]> => {\n  // Match Payload core: overrideAccess bypasses access evaluation\n  if (overrideAccess) {\n    return items\n  }\n\n  const authorizedItems: MCPItem[] = []\n\n  const permissions = await getAccessResults({ req })\n\n  for (const item of items) {\n    if (!(await checkItemAccess({ item, permissions, req }))) {\n      continue\n    }\n    authorizedItems.push(item)\n  }\n\n  return authorizedItems\n}\n\n/**\n * Runs MCP item access callbacks\n */\nconst checkItemAccess = async ({\n  item,\n  permissions,\n  req,\n}: {\n  item: MCPItem\n  permissions?: SanitizedPermissions\n  req: PayloadRequest\n}): Promise<boolean> => {\n  switch (item.type) {\n    case 'collectionTool':\n      return (\n        !item.tool.access ||\n        (await item.tool.access({ slug: item.collectionSlug, permissions, req }))\n      )\n    case 'globalTool':\n      return (\n        !item.tool.access || (await item.tool.access({ slug: item.globalSlug, permissions, req }))\n      )\n    case 'prompt':\n      return !item.prompt.access || (await item.prompt.access({ permissions, req }))\n    case 'resource':\n      return !item.resource.access || (await item.resource.access({ permissions, req }))\n    case 'tool':\n      return !item.tool.access || (await item.tool.access({ permissions, req }))\n  }\n}\n"],"names":["getAccessResults","UnauthorizedError","getPluginConfig","getAuthorizedMCP","overrideAccess","req","pluginConfig","config","payload","overrideGetAuthorizedMCP","headers","Headers","hasAuthorization","has","set","user","auth","t","items","filterMCPItems","authorizedItems","permissions","item","checkItemAccess","push","type","tool","access","slug","collectionSlug","globalSlug","prompt","resource"],"mappings":"AAEA,SAASA,gBAAgB,EAAEC,iBAAiB,QAAQ,UAAS;AAI7D,SAASC,eAAe,QAAQ,8BAA6B;AAO7D;;;CAGC,GACD,OAAO,MAAMC,mBAA2E,OAAO,EAC7FC,cAAc,EACdC,GAAG,EACJ;IACC,MAAMC,eAAeJ,gBAAgB;QAAEK,QAAQF,IAAIG,OAAO,CAACD,MAAM;IAAC;IAElE,IAAID,aAAaG,wBAAwB,EAAE;QACzC,OAAO,MAAMH,aAAaG,wBAAwB,CAAC;YACjDL;YACAE;YACAD;QACF;IACF;IAEA,IAAIA,IAAIK,OAAO,EAAE;QACf,MAAMA,UAAU,IAAIC,QAAQN,IAAIK,OAAO;QACvC,MAAME,mBAAmBF,QAAQG,GAAG,CAAC;QAErCH,QAAQI,GAAG,CAAC,oBAAoB;QAChCT,IAAIU,IAAI,GAAG,AAAC,CAAA,MAAMV,IAAIG,OAAO,CAACQ,IAAI,CAAC;YAAEN;YAASL;QAAI,EAAC,EAAGU,IAAI;QAE1D,IAAIH,oBAAoB,CAACP,IAAIU,IAAI,EAAE;YACjC,MAAM,IAAId,kBAAkBI,IAAIY,CAAC;QACnC;IACF;IAEA,OAAO;QACLC,OAAO,MAAMC,eAAe;YAC1BD,OAAOZ,aAAaY,KAAK;YACzBd;YACAC;QACF;QACAD;IACF;AACF,EAAC;AAED,OAAO,MAAMe,iBAAiB,OAAO,EACnCD,KAAK,EACLd,cAAc,EACdC,GAAG,EAKJ;IACC,gEAAgE;IAChE,IAAID,gBAAgB;QAClB,OAAOc;IACT;IAEA,MAAME,kBAA6B,EAAE;IAErC,MAAMC,cAAc,MAAMrB,iBAAiB;QAAEK;IAAI;IAEjD,KAAK,MAAMiB,QAAQJ,MAAO;QACxB,IAAI,CAAE,MAAMK,gBAAgB;YAAED;YAAMD;YAAahB;QAAI,IAAK;YACxD;QACF;QACAe,gBAAgBI,IAAI,CAACF;IACvB;IAEA,OAAOF;AACT,EAAC;AAED;;CAEC,GACD,MAAMG,kBAAkB,OAAO,EAC7BD,IAAI,EACJD,WAAW,EACXhB,GAAG,EAKJ;IACC,OAAQiB,KAAKG,IAAI;QACf,KAAK;YACH,OACE,CAACH,KAAKI,IAAI,CAACC,MAAM,IAChB,MAAML,KAAKI,IAAI,CAACC,MAAM,CAAC;gBAAEC,MAAMN,KAAKO,cAAc;gBAAER;gBAAahB;YAAI;QAE1E,KAAK;YACH,OACE,CAACiB,KAAKI,IAAI,CAACC,MAAM,IAAK,MAAML,KAAKI,IAAI,CAACC,MAAM,CAAC;gBAAEC,MAAMN,KAAKQ,UAAU;gBAAET;gBAAahB;YAAI;QAE3F,KAAK;YACH,OAAO,CAACiB,KAAKS,MAAM,CAACJ,MAAM,IAAK,MAAML,KAAKS,MAAM,CAACJ,MAAM,CAAC;gBAAEN;gBAAahB;YAAI;QAC7E,KAAK;YACH,OAAO,CAACiB,KAAKU,QAAQ,CAACL,MAAM,IAAK,MAAML,KAAKU,QAAQ,CAACL,MAAM,CAAC;gBAAEN;gBAAahB;YAAI;QACjF,KAAK;YACH,OAAO,CAACiB,KAAKI,IAAI,CAACC,MAAM,IAAK,MAAML,KAAKI,IAAI,CAACC,MAAM,CAAC;gBAAEN;gBAAahB;YAAI;IAC3E;AACF"}

package/dist/endpoint/index.d.ts

@@ -0,0 +1,3 @@
+import type { PayloadHandler } from 'payload';
+export declare const mcpEndpoint: PayloadHandler;
+//# sourceMappingURL=index.d.ts.map

package/dist/endpoint/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/endpoint/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAkB,MAAM,SAAS,CAAA;AAc7D,eAAO,MAAM,WAAW,EAAE,cAmEzB,CAAA"}

package/dist/endpoint/index.js

@@ -0,0 +1,116 @@
+import { createMcpHandler, isLegacyRequest, readRequestBody, WebStandardStreamableHTTPServerTransport } from '@modelcontextprotocol/server';
+import { APIError } from 'payload';
+import { buildMcpServer } from '../mcp/buildMcpServer.js';
+import { getPluginConfig } from '../utils/getPluginConfig.js';
+import { getAuthorizedMCP } from './access.js';
+export const mcpEndpoint = async (req)=>{
+    if (!req.url) {
+        throw new APIError('Missing request URL', 400);
+    }
+    req.payloadAPI = 'MCP';
+    const pluginConfig = getPluginConfig({
+        config: req.payload.config
+    });
+    const overrideAccessParam = new URL(req.url).searchParams.get('overrideAccess');
+    if (overrideAccessParam !== null && process.env.NODE_ENV !== 'development') {
+        throw new APIError('MCP overrideAccess is only available in development.', 400);
+    }
+    let overrideAccess = false;
+    if (overrideAccessParam === 'true') {
+        overrideAccess = true;
+    } else if (overrideAccessParam !== null && overrideAccessParam !== 'false') {
+        throw new APIError('MCP overrideAccess must be "true" or "false".', 400);
+    }
+    const authorizedMCP = await getAuthorizedMCP({
+        overrideAccess,
+        req
+    });
+    const maxRequestBodySize = pluginConfig.mcp?.maxRequestBodySize;
+    // Payload augments the original web-standard Request in place.
+    const mcpRequest = req;
+    const parsedBody = await parseRequestBody({
+        maxRequestBodySize,
+        request: mcpRequest
+    });
+    // Keep the old JSON-only, stateless behavior because the SDK's 2025 fallback uses SSE.
+    if (await isLegacyRequest(mcpRequest, parsedBody, {
+        maxRequestBodySize
+    })) {
+        const server = buildMcpServer({
+            authorizedMCP,
+            pluginConfig,
+            req
+        });
+        const transport = new WebStandardStreamableHTTPServerTransport({
+            enableJsonResponse: true,
+            maxRequestBodySize,
+            sessionIdGenerator: undefined
+        });
+        transport.onerror = (err)=>{
+            req.payload.logger.error({
+                err,
+                msg: 'Error serving legacy MCP request'
+            });
+        };
+        try {
+            await server.connect(transport);
+            return await transport.handleRequest(mcpRequest, {
+                parsedBody
+            });
+        } finally{
+            await server.close().catch((err)=>{
+                req.payload.logger.error({
+                    err,
+                    msg: 'Error closing MCP server'
+                });
+            });
+        }
+    }
+    const handler = createMcpHandler(()=>buildMcpServer({
+            authorizedMCP,
+            pluginConfig,
+            req
+        }), {
+        legacy: 'reject',
+        maxRequestBodySize,
+        // SDK subscriptions always use SSE, so disable them to keep every response JSON-only.
+        maxSubscriptions: 0,
+        onerror: (err)=>{
+            req.payload.logger.error({
+                err,
+                msg: 'Error serving modern MCP request'
+            });
+        },
+        responseMode: 'json'
+    });
+    try {
+        return await handler.fetch(mcpRequest, {
+            parsedBody
+        });
+    } finally{
+        await handler.close().catch((err)=>{
+            req.payload.logger.error({
+                err,
+                msg: 'Error closing modern MCP handler'
+            });
+        });
+    }
+};
+/**
+ * Parses a POST body once so the era check and the SDK handler can share it. The SDK
+ * skips its size limit for a pre-parsed body, so this reads with the same limit. It reads
+ * a clone and returns `undefined` for any body the SDK should reject (too large, unreadable,
+ * or not JSON), leaving the original request for the SDK to read and answer.
+ */ const parseRequestBody = async ({ maxRequestBodySize, request })=>{
+    if (request.method.toUpperCase() !== 'POST') {
+        return undefined;
+    }
+    try {
+        const body = await readRequestBody(request.clone(), maxRequestBodySize);
+        return body.tooLarge ? undefined : JSON.parse(body.text);
+    } catch  {
+        return undefined;
+    }
+};
+
+//# sourceMappingURL=index.js.map

package/dist/endpoint/index.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/endpoint/index.ts"],"sourcesContent":["import type { PayloadHandler, PayloadRequest } from 'payload'\n\nimport {\n  createMcpHandler,\n  isLegacyRequest,\n  readRequestBody,\n  WebStandardStreamableHTTPServerTransport,\n} from '@modelcontextprotocol/server'\nimport { APIError } from 'payload'\n\nimport { buildMcpServer } from '../mcp/buildMcpServer.js'\nimport { getPluginConfig } from '../utils/getPluginConfig.js'\nimport { getAuthorizedMCP } from './access.js'\n\nexport const mcpEndpoint: PayloadHandler = async (req) => {\n  if (!req.url) {\n    throw new APIError('Missing request URL', 400)\n  }\n\n  req.payloadAPI = 'MCP' as const\n\n  const pluginConfig = getPluginConfig({ config: req.payload.config })\n  const overrideAccessParam = new URL(req.url).searchParams.get('overrideAccess')\n\n  if (overrideAccessParam !== null && process.env.NODE_ENV !== 'development') {\n    throw new APIError('MCP overrideAccess is only available in development.', 400)\n  }\n\n  let overrideAccess = false\n  if (overrideAccessParam === 'true') {\n    overrideAccess = true\n  } else if (overrideAccessParam !== null && overrideAccessParam !== 'false') {\n    throw new APIError('MCP overrideAccess must be \"true\" or \"false\".', 400)\n  }\n\n  const authorizedMCP = await getAuthorizedMCP({ overrideAccess, req })\n  const maxRequestBodySize = pluginConfig.mcp?.maxRequestBodySize\n  // Payload augments the original web-standard Request in place.\n  const mcpRequest = req as PayloadRequest & Request\n  const parsedBody = await parseRequestBody({ maxRequestBodySize, request: mcpRequest })\n\n  // Keep the old JSON-only, stateless behavior because the SDK's 2025 fallback uses SSE.\n  if (await isLegacyRequest(mcpRequest, parsedBody, { maxRequestBodySize })) {\n    const server = buildMcpServer({ authorizedMCP, pluginConfig, req })\n    const transport = new WebStandardStreamableHTTPServerTransport({\n      enableJsonResponse: true,\n      maxRequestBodySize,\n      sessionIdGenerator: undefined, // stateless mode\n    })\n    transport.onerror = (err) => {\n      req.payload.logger.error({ err, msg: 'Error serving legacy MCP request' })\n    }\n\n    try {\n      await server.connect(transport)\n      return await transport.handleRequest(mcpRequest, { parsedBody })\n    } finally {\n      await server.close().catch((err) => {\n        req.payload.logger.error({ err, msg: 'Error closing MCP server' })\n      })\n    }\n  }\n\n  const handler = createMcpHandler(() => buildMcpServer({ authorizedMCP, pluginConfig, req }), {\n    legacy: 'reject',\n    maxRequestBodySize,\n    // SDK subscriptions always use SSE, so disable them to keep every response JSON-only.\n    maxSubscriptions: 0,\n    onerror: (err) => {\n      req.payload.logger.error({ err, msg: 'Error serving modern MCP request' })\n    },\n    responseMode: 'json',\n  })\n\n  try {\n    return await handler.fetch(mcpRequest, { parsedBody })\n  } finally {\n    await handler.close().catch((err) => {\n      req.payload.logger.error({ err, msg: 'Error closing modern MCP handler' })\n    })\n  }\n}\n\n/**\n * Parses a POST body once so the era check and the SDK handler can share it. The SDK\n * skips its size limit for a pre-parsed body, so this reads with the same limit. It reads\n * a clone and returns `undefined` for any body the SDK should reject (too large, unreadable,\n * or not JSON), leaving the original request for the SDK to read and answer.\n */\nconst parseRequestBody = async ({\n  maxRequestBodySize,\n  request,\n}: {\n  maxRequestBodySize?: number\n  request: Request\n}): Promise<unknown> => {\n  if (request.method.toUpperCase() !== 'POST') {\n    return undefined\n  }\n\n  try {\n    const body = await readRequestBody(request.clone(), maxRequestBodySize)\n    return body.tooLarge ? undefined : JSON.parse(body.text)\n  } catch {\n    return undefined\n  }\n}\n"],"names":["createMcpHandler","isLegacyRequest","readRequestBody","WebStandardStreamableHTTPServerTransport","APIError","buildMcpServer","getPluginConfig","getAuthorizedMCP","mcpEndpoint","req","url","payloadAPI","pluginConfig","config","payload","overrideAccessParam","URL","searchParams","get","process","env","NODE_ENV","overrideAccess","authorizedMCP","maxRequestBodySize","mcp","mcpRequest","parsedBody","parseRequestBody","request","server","transport","enableJsonResponse","sessionIdGenerator","undefined","onerror","err","logger","error","msg","connect","handleRequest","close","catch","handler","legacy","maxSubscriptions","responseMode","fetch","method","toUpperCase","body","clone","tooLarge","JSON","parse","text"],"mappings":"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"}

package/dist/exports/client.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=client.d.ts.map

package/dist/exports/client.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/exports/client.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAA"}

package/dist/exports/client.js

@@ -0,0 +1,4 @@
+'use client';
+export { };
+
+//# sourceMappingURL=client.js.map

package/dist/exports/client.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/exports/client.ts"],"sourcesContent":["'use client'\n\nexport {}\n"],"names":[],"mappings":"AAAA;AAEA,WAAS"}

package/dist/exports/internal.d.ts

@@ -0,0 +1,2 @@
+export { filterMCPItems, getAuthorizedMCP } from '../endpoint/access.js';
+//# sourceMappingURL=internal.d.ts.map

package/dist/exports/internal.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"internal.d.ts","sourceRoot":"","sources":["../../src/exports/internal.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA"}

package/dist/exports/internal.js

@@ -0,0 +1,3 @@
+export { filterMCPItems, getAuthorizedMCP } from '../endpoint/access.js';
+
+//# sourceMappingURL=internal.js.map

package/dist/exports/internal.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/exports/internal.ts"],"sourcesContent":["export { filterMCPItems, getAuthorizedMCP } from '../endpoint/access.js'\n"],"names":["filterMCPItems","getAuthorizedMCP"],"mappings":"AAAA,SAASA,cAAc,EAAEC,gBAAgB,QAAQ,wBAAuB"}

package/dist/index.d.ts

@@ -1,17 +1,14 @@
-import type { MCPAccessSettings, MCPPluginConfig } from './types.js';
+import type { AuthorizedMCP, MCPPluginConfig, SanitizedMCPPluginConfig } from './types.js';
 declare module 'payload' {
-    interface PayloadRequest {
-        payloadAPI: 'GraphQL' | 'local' | 'MCP' | 'REST';
+    interface PayloadRequestAPI {
+        MCP: true;
     }
     interface RegisteredPlugins {
+        /** After the plugin's `plugin` callback runs, `options` holds the sanitized config. */
         '@payloadcms/plugin-mcp': MCPPluginConfig;
     }
 }
-export type { MCPAccessSettings, MCPPluginConfig };
-/**
- * The MCP Plugin for Payload. This plugin allows you to add MCP capabilities to your Payload project.
- *
- * @param pluginOptions - The options for the MCP plugin.
- */
+export type { AuthorizedMCP, MCPPluginConfig, SanitizedMCPPluginConfig };
+export { defineCollectionTool, defineGlobalTool, definePrompt, defineTool } from './defineTool.js';
 export declare const mcpPlugin: (options: MCPPluginConfig) => import("payload").Plugin;
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAKpE,OAAO,QAAQ,SAAS,CAAC;IACvB,UAAiB,cAAc;QAC7B,UAAU,EAAE,SAAS,GAAG,OAAO,GAAG,KAAK,GAAG,MAAM,CAAA;KACjD;IACD,UAAU,iBAAiB;QACzB,wBAAwB,EAAE,eAAe,CAAA;KAC1C;CACF;AAID,YAAY,EAAE,iBAAiB,EAAE,eAAe,EAAE,CAAA;AAElD;;;;GAIG;AACH,eAAO,MAAM,SAAS,wDAuFpB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,eAAe,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAA;AAK1F,OAAO,QAAQ,SAAS,CAAC;IACvB,UAAiB,iBAAiB;QAChC,GAAG,EAAE,IAAI,CAAA;KACV;IACD,UAAU,iBAAiB;QACzB,uFAAuF;QACvF,wBAAwB,EAAE,eAAe,CAAA;KAC1C;CACF;AAED,YAAY,EAAE,aAAa,EAAE,eAAe,EAAE,wBAAwB,EAAE,CAAA;AAExE,OAAO,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAElG,eAAO,MAAM,SAAS,wDAiCpB,CAAA"}

package/dist/index.js

@@ -1,76 +1,48 @@
 import { definePlugin } from 'payload';
-import { createAPIKeysCollection } from './collections/createApiKeysCollection.js';
-import { initializeMCPHandler } from './endpoints/mcp.js';
-import { defaults } from './defaults.js';
-/**
- * The MCP Plugin for Payload. This plugin allows you to add MCP capabilities to your Payload project.
- *
- * @param pluginOptions - The options for the MCP plugin.
- */ export const mcpPlugin = definePlugin({
+import { mcpEndpoint } from './endpoint/index.js';
+import { sanitizeMCPConfig } from './mcp/sanitizeMCPConfig.js';
+export { defineCollectionTool, defineGlobalTool, definePrompt, defineTool } from './defineTool.js';
+export const mcpPlugin = definePlugin({
     slug: '@payloadcms/plugin-mcp',
     order: 10,
-    plugin: ({ config, plugins: _plugins, ...pluginOptions })=>{
-        if (!config.collections) {
-            config.collections = [];
-        }
-        // Collections
-        const collections = pluginOptions.collections || {};
-        // Globals
-        const globals = pluginOptions.globals || {};
-        // Extract custom tools for the global config
-        const customTools = pluginOptions.mcp?.tools?.map((tool)=>({
-                name: tool.name,
-                description: tool.description
-            })) || [];
-        // User Collection
-        pluginOptions.userCollection = pluginOptions.userCollection ?? config?.admin?.user ?? defaults.userCollection;
-        const experimentalTools = pluginOptions?.experimental?.tools || {};
-        /**
-     * API Keys
-     * --------
-     * High resolution control over MCP capabilities is crucial when using Payload with LLMs.
-     *
-     * This API Keys collection has ways for admins to create API keys and allow or disallow the MCP capabilities.
-     * This is useful when Admins want to allow or disallow the use of the MCP capabilities in real time.
-     * For example:
-     *  - If a collection has all of its capabilities enabled, admins can allow or disallow the create, update, delete, and find capabilities on that collection.
-     *  - If a collection only has the find capability enabled, admins can only allow or disallow the find capability on that collection.
-     *  - If a global has all of its capabilities enabled, admins can allow or disallow the find and update capabilities on that global.
-     *  - If a custom tool has gone haywire, admins can disallow that tool.
-     *
-     */ const apiKeyCollection = createAPIKeysCollection(collections, globals, customTools, experimentalTools, pluginOptions);
-        if (pluginOptions.overrideApiKeyCollection) {
-            config.collections.push(pluginOptions.overrideApiKeyCollection(apiKeyCollection));
-        } else {
-            config.collections.push(apiKeyCollection);
+    plugin: ({ config, options, plugins })=>{
+        const pluginConfig = sanitizeMCPConfig({
+            config,
+            pluginConfig: options
+        });
+        // Stash the sanitized config on plugin options so `getPluginConfig()` reads it.
+        const registered = plugins['@payloadcms/plugin-mcp'];
+        if (registered) {
+            // @ts-expect-error
+            registered.sanitizedOptions = pluginConfig;
         }
-        /**
-     * If the plugin is disabled, we still want to keep added collections/fields so the database schema is consistent which is important for migrations.
-     * If your plugin heavily modifies the database schema, you may want to remove this property.
-     */ if (pluginOptions.disabled) {
+        if (pluginConfig.disabled) {
             return config;
         }
-        if (!config.endpoints) {
-            config.endpoints = [];
-        }
-        /**
-     * This is the primary MCP Server Endpoint.
-     * Payload will automatically add the /api prefix to the path, so the full path is `/api/mcp`
-     * NOTE: This is only transport method until we add full support for SSE which will be another endpoint at `/api/sse`
-     */ config.endpoints.push({
-            handler: initializeMCPHandler(pluginOptions),
-            method: 'post',
-            path: '/mcp'
-        });
-        /**
-     * The GET response is always: {"jsonrpc":"2.0","error":{"code":-32000,"message":"Method not allowed."},"id":null} -- even with an API key
-     * This is expected behavior and MCP clients should always use the POST endpoint.
-     */ config.endpoints.push({
-            handler: initializeMCPHandler(pluginOptions),
-            method: 'get',
-            path: '/mcp'
-        });
-        return config;
+        return {
+            ...config,
+            endpoints: [
+                ...config.endpoints ?? [],
+                // Payload prefixes /api, so the full path is /api/mcp.
+                {
+                    handler: mcpEndpoint,
+                    method: 'post',
+                    path: '/mcp'
+                },
+                // Streamable HTTP's optional server=>client GET stream. We don't offer
+                // one, so answer 405 per spec-— clients then skip it cleanly
+                {
+                    handler: ()=>new Response(null, {
+                            headers: {
+                                Allow: 'POST'
+                            },
+                            status: 405
+                        }),
+                    method: 'get',
+                    path: '/mcp'
+                }
+            ]
+        };
     }
 });