@payloadcms/plugin-mcp 4.0.0-internal.40de3ec → 4.0.0-internal.41055b1

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/bin.js

@@ -19,17 +19,26 @@ const filename = fileURLToPath(import.meta.url)
 const dirname = path.dirname(filename)
 const baseURL = pathToFileURL(dirname).toString() + '/'
 
-const start = async () => {
+const loadBin = async () => {
   if (disableTranspile) {
     process.argv = process.argv.filter((arg) => arg !== '--disable-transpile')
-    const { runMcpStdio } = await import('./dist/stdio.js')
-    await runMcpStdio()
-    return
+    return import('./dist/bin/index.js')
+  }
+
+  // tsx 4.22.4's synchronous loader leaks its namespace query onto Node built-ins on Node 23.5+.
+  // Force the stable asynchronous loader path, matching payload/bin.js.
+  const nodeModule = await import('node:module')
+  if (typeof nodeModule.default.registerHooks === 'function') {
+    nodeModule.default.registerHooks = undefined
   }
 
   const { tsImport } = await import('tsx/esm/api')
-  const { runMcpStdio } = await tsImport('./dist/stdio.js', baseURL)
-  await runMcpStdio()
+  return tsImport('@payloadcms/plugin-mcp/bin', baseURL)
+}
+
+const start = async () => {
+  const { bin } = await loadBin()
+  await bin()
 }
 
 start().catch((err) => {

package/dist/bin/index.d.ts

@@ -0,0 +1,2 @@
+export declare const bin: () => Promise<void>;
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/bin/index.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,GAAG,QAAa,OAAO,CAAC,IAAI,CAaxC,CAAA"}

package/dist/bin/index.js

@@ -0,0 +1,12 @@
+import { runMcpStdio } from '../stdio.js';
+export const bin = async ()=>{
+    let viteHMR;
+    if (process.env.NODE_ENV !== 'production' && process.env.NODE_ENV !== 'test' && process.env.DISABLE_PAYLOAD_HMR !== 'true') {
+        const { initializeViteHMR } = await import('./initializeViteHMR.js');
+        viteHMR = await initializeViteHMR();
+    }
+    await runMcpStdio(viteHMR?.config);
+    await viteHMR?.connect();
+};
+
+//# sourceMappingURL=index.js.map

package/dist/bin/index.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/bin/index.ts"],"sourcesContent":["import { runMcpStdio } from '../stdio.js'\n\nexport const bin = async (): Promise<void> => {\n  let viteHMR\n  if (\n    process.env.NODE_ENV !== 'production' &&\n    process.env.NODE_ENV !== 'test' &&\n    process.env.DISABLE_PAYLOAD_HMR !== 'true'\n  ) {\n    const { initializeViteHMR } = await import('./initializeViteHMR.js')\n    viteHMR = await initializeViteHMR()\n  }\n\n  await runMcpStdio(viteHMR?.config)\n  await viteHMR?.connect()\n}\n"],"names":["runMcpStdio","bin","viteHMR","process","env","NODE_ENV","DISABLE_PAYLOAD_HMR","initializeViteHMR","config","connect"],"mappings":"AAAA,SAASA,WAAW,QAAQ,cAAa;AAEzC,OAAO,MAAMC,MAAM;IACjB,IAAIC;IACJ,IACEC,QAAQC,GAAG,CAACC,QAAQ,KAAK,gBACzBF,QAAQC,GAAG,CAACC,QAAQ,KAAK,UACzBF,QAAQC,GAAG,CAACE,mBAAmB,KAAK,QACpC;QACA,MAAM,EAAEC,iBAAiB,EAAE,GAAG,MAAM,MAAM,CAAC;QAC3CL,UAAU,MAAMK;IAClB;IAEA,MAAMP,YAAYE,SAASM;IAC3B,MAAMN,SAASO;AACjB,EAAC"}

package/dist/bin/initializeViteHMR.d.ts

@@ -0,0 +1,8 @@
+import type { SanitizedConfig } from 'payload';
+type ViteHMR = {
+    config: SanitizedConfig;
+    connect: () => Promise<void>;
+};
+export declare const initializeViteHMR: () => Promise<undefined | ViteHMR>;
+export {};
+//# sourceMappingURL=initializeViteHMR.d.ts.map

package/dist/bin/initializeViteHMR.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"initializeViteHMR.d.ts","sourceRoot":"","sources":["../../src/bin/initializeViteHMR.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAW9C,KAAK,OAAO,GAAG;IACb,MAAM,EAAE,eAAe,CAAA;IACvB,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAC7B,CAAA;AAED,eAAO,MAAM,iBAAiB,QAAa,OAAO,CAAC,SAAS,GAAG,OAAO,CA2DrE,CAAA"}

package/dist/bin/initializeViteHMR.js

@@ -0,0 +1,75 @@
+/* eslint-disable no-console */ import { fileURLToPath } from 'node:url';
+import { getPayload, reload } from 'payload';
+import { findConfig, loadEnv } from 'payload/node';
+import { resolveProjectRoot } from '../utils/resolveProjectRoot.js';
+export const initializeViteHMR = async ()=>{
+    try {
+        import.meta.resolve('vite');
+    } catch (error) {
+        if (error.code !== 'ERR_MODULE_NOT_FOUND') {
+            throw error;
+        }
+        if (process.env.NODE_ENV === 'development') {
+            console.error('[payload-mcp] Vite is not installed, so Payload config changes will not hot reload. Install vite@~8.1.4 as a development dependency to enable HMR during local development.');
+        }
+        return;
+    }
+    const { createServer, createServerModuleRunner, normalizePath } = await import('vite');
+    const projectRoot = resolveProjectRoot(fileURLToPath(import.meta.url));
+    if (projectRoot) {
+        process.chdir(projectRoot);
+    }
+    loadEnv();
+    const vite = await createServer({
+        clearScreen: false,
+        configFile: false,
+        envDir: false,
+        logLevel: 'error',
+        optimizeDeps: {
+            noDiscovery: true
+        },
+        publicDir: false,
+        resolve: {
+            alias: {
+                'payload-mcp:config': normalizePath(findConfig())
+            },
+            tsconfigPaths: true
+        },
+        server: {
+            middlewareMode: true,
+            ws: false
+        },
+        ssr: {
+            noExternal: [
+                /^@payloadcms\//,
+                /^payload$/
+            ]
+        }
+    });
+    const runner = createServerModuleRunner(vite.environments.ssr);
+    const boundaryPath = fileURLToPath(new URL('./viteConfigBoundary.js', import.meta.url));
+    const boundary = await runner.import(boundaryPath);
+    const config = boundary.getConfig();
+    return {
+        config,
+        connect: async ()=>{
+            const payload = await getPayload({
+                config,
+                cron: false,
+                disableOnInit: true
+            });
+            let payloadReloadQueue = Promise.resolve();
+            const reloadPayload = (nextConfig)=>{
+                payloadReloadQueue = payloadReloadQueue.then(()=>reload(nextConfig, payload, false)).catch((error)=>console.error('[payload-mcp] config reload failed:', error));
+                return payloadReloadQueue;
+            };
+            boundary.subscribe(reloadPayload);
+            const latestConfig = boundary.getConfig();
+            if (config !== latestConfig) {
+                await reloadPayload(latestConfig);
+            }
+        }
+    };
+};
+
+//# sourceMappingURL=initializeViteHMR.js.map

package/dist/bin/initializeViteHMR.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/bin/initializeViteHMR.ts"],"sourcesContent":["import type { SanitizedConfig } from 'payload'\n\n/* eslint-disable no-console */\nimport { fileURLToPath } from 'node:url'\nimport { getPayload, reload } from 'payload'\nimport { findConfig, loadEnv } from 'payload/node'\n\nimport type * as ConfigBoundary from './viteConfigBoundary.js'\n\nimport { resolveProjectRoot } from '../utils/resolveProjectRoot.js'\n\ntype ViteHMR = {\n  config: SanitizedConfig\n  connect: () => Promise<void>\n}\n\nexport const initializeViteHMR = async (): Promise<undefined | ViteHMR> => {\n  try {\n    import.meta.resolve('vite')\n  } catch (error) {\n    if ((error as NodeJS.ErrnoException).code !== 'ERR_MODULE_NOT_FOUND') {\n      throw error\n    }\n\n    if (process.env.NODE_ENV === 'development') {\n      console.error(\n        '[payload-mcp] Vite is not installed, so Payload config changes will not hot reload. Install vite@~8.1.4 as a development dependency to enable HMR during local development.',\n      )\n    }\n    return\n  }\n\n  const { createServer, createServerModuleRunner, normalizePath } = await import('vite')\n  const projectRoot = resolveProjectRoot(fileURLToPath(import.meta.url))\n  if (projectRoot) {\n    process.chdir(projectRoot)\n  }\n\n  loadEnv()\n  const vite = await createServer({\n    clearScreen: false,\n    configFile: false,\n    envDir: false,\n    logLevel: 'error',\n    optimizeDeps: { noDiscovery: true },\n    publicDir: false,\n    resolve: { alias: { 'payload-mcp:config': normalizePath(findConfig()) }, tsconfigPaths: true },\n    server: { middlewareMode: true, ws: false },\n    ssr: { noExternal: [/^@payloadcms\\//, /^payload$/] },\n  })\n  const runner = createServerModuleRunner(vite.environments.ssr)\n  const boundaryPath = fileURLToPath(new URL('./viteConfigBoundary.js', import.meta.url))\n  const boundary = await runner.import<typeof ConfigBoundary>(boundaryPath)\n  const config = boundary.getConfig()\n\n  return {\n    config,\n    connect: async () => {\n      const payload = await getPayload({ config, cron: false, disableOnInit: true })\n      let payloadReloadQueue = Promise.resolve()\n      const reloadPayload = (nextConfig: SanitizedConfig): Promise<void> => {\n        payloadReloadQueue = payloadReloadQueue\n          .then(() => reload(nextConfig, payload, false))\n          .catch((error) => console.error('[payload-mcp] config reload failed:', error))\n        return payloadReloadQueue\n      }\n\n      boundary.subscribe(reloadPayload)\n\n      const latestConfig = boundary.getConfig()\n      if (config !== latestConfig) {\n        await reloadPayload(latestConfig)\n      }\n    },\n  }\n}\n"],"names":["fileURLToPath","getPayload","reload","findConfig","loadEnv","resolveProjectRoot","initializeViteHMR","resolve","error","code","process","env","NODE_ENV","console","createServer","createServerModuleRunner","normalizePath","projectRoot","url","chdir","vite","clearScreen","configFile","envDir","logLevel","optimizeDeps","noDiscovery","publicDir","alias","tsconfigPaths","server","middlewareMode","ws","ssr","noExternal","runner","environments","boundaryPath","URL","boundary","import","config","getConfig","connect","payload","cron","disableOnInit","payloadReloadQueue","Promise","reloadPayload","nextConfig","then","catch","subscribe","latestConfig"],"mappings":"AAEA,6BAA6B,GAC7B,SAASA,aAAa,QAAQ,WAAU;AACxC,SAASC,UAAU,EAAEC,MAAM,QAAQ,UAAS;AAC5C,SAASC,UAAU,EAAEC,OAAO,QAAQ,eAAc;AAIlD,SAASC,kBAAkB,QAAQ,iCAAgC;AAOnE,OAAO,MAAMC,oBAAoB;IAC/B,IAAI;QACF,YAAYC,OAAO,CAAC;IACtB,EAAE,OAAOC,OAAO;QACd,IAAI,AAACA,MAAgCC,IAAI,KAAK,wBAAwB;YACpE,MAAMD;QACR;QAEA,IAAIE,QAAQC,GAAG,CAACC,QAAQ,KAAK,eAAe;YAC1CC,QAAQL,KAAK,CACX;QAEJ;QACA;IACF;IAEA,MAAM,EAAEM,YAAY,EAAEC,wBAAwB,EAAEC,aAAa,EAAE,GAAG,MAAM,MAAM,CAAC;IAC/E,MAAMC,cAAcZ,mBAAmBL,cAAc,YAAYkB,GAAG;IACpE,IAAID,aAAa;QACfP,QAAQS,KAAK,CAACF;IAChB;IAEAb;IACA,MAAMgB,OAAO,MAAMN,aAAa;QAC9BO,aAAa;QACbC,YAAY;QACZC,QAAQ;QACRC,UAAU;QACVC,cAAc;YAAEC,aAAa;QAAK;QAClCC,WAAW;QACXpB,SAAS;YAAEqB,OAAO;gBAAE,sBAAsBZ,cAAcb;YAAc;YAAG0B,eAAe;QAAK;QAC7FC,QAAQ;YAAEC,gBAAgB;YAAMC,IAAI;QAAM;QAC1CC,KAAK;YAAEC,YAAY;gBAAC;gBAAkB;aAAY;QAAC;IACrD;IACA,MAAMC,SAASpB,yBAAyBK,KAAKgB,YAAY,CAACH,GAAG;IAC7D,MAAMI,eAAerC,cAAc,IAAIsC,IAAI,2BAA2B,YAAYpB,GAAG;IACrF,MAAMqB,WAAW,MAAMJ,OAAOK,MAAM,CAAwBH;IAC5D,MAAMI,SAASF,SAASG,SAAS;IAEjC,OAAO;QACLD;QACAE,SAAS;YACP,MAAMC,UAAU,MAAM3C,WAAW;gBAAEwC;gBAAQI,MAAM;gBAAOC,eAAe;YAAK;YAC5E,IAAIC,qBAAqBC,QAAQzC,OAAO;YACxC,MAAM0C,gBAAgB,CAACC;gBACrBH,qBAAqBA,mBAClBI,IAAI,CAAC,IAAMjD,OAAOgD,YAAYN,SAAS,QACvCQ,KAAK,CAAC,CAAC5C,QAAUK,QAAQL,KAAK,CAAC,uCAAuCA;gBACzE,OAAOuC;YACT;YAEAR,SAASc,SAAS,CAACJ;YAEnB,MAAMK,eAAef,SAASG,SAAS;YACvC,IAAID,WAAWa,cAAc;gBAC3B,MAAML,cAAcK;YACtB;QACF;IACF;AACF,EAAC"}

package/dist/bin/viteConfigBoundary.d.ts

@@ -0,0 +1,6 @@
+import type { SanitizedConfig } from 'payload';
+type ConfigListener = (config: SanitizedConfig) => Promise<void> | void;
+export declare const getConfig: () => SanitizedConfig;
+export declare const subscribe: (nextListener: ConfigListener) => void;
+export {};
+//# sourceMappingURL=viteConfigBoundary.d.ts.map

package/dist/bin/viteConfigBoundary.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"viteConfigBoundary.d.ts","sourceRoot":"","sources":["../../src/bin/viteConfigBoundary.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAM9C,KAAK,cAAc,GAAG,CAAC,MAAM,EAAE,eAAe,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAA;AAavE,eAAO,MAAM,SAAS,QAAO,eAAyB,CAAA;AAEtD,eAAO,MAAM,SAAS,GAAI,cAAc,cAAc,KAAG,IAExD,CAAA"}

package/dist/bin/viteConfigBoundary.js

@@ -0,0 +1,25 @@
+/// <reference types="vite/client" />
+/* eslint-disable no-console */ // @ts-expect-error - The Vite initializer resolves this ID to the Payload config.
+import * as configModule from 'payload-mcp:config';
+let listener;
+let configQueue = Promise.resolve();
+const resolveConfig = async (module)=>{
+    const config = module;
+    return await (config.default ?? module);
+};
+let config = await resolveConfig(configModule);
+export const getConfig = ()=>config;
+export const subscribe = (nextListener)=>{
+    listener = nextListener;
+};
+import.meta.hot?.accept('payload-mcp:config', (nextModule)=>{
+    if (!nextModule) {
+        return;
+    }
+    configQueue = configQueue.then(async ()=>{
+        config = await resolveConfig(nextModule);
+        await listener?.(config);
+    }).catch((error)=>console.error('[payload-mcp] config reload failed:', error));
+});
+
+//# sourceMappingURL=viteConfigBoundary.js.map

package/dist/bin/viteConfigBoundary.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/bin/viteConfigBoundary.ts"],"sourcesContent":["/// <reference types=\"vite/client\" />\n\nimport type { SanitizedConfig } from 'payload'\n\n/* eslint-disable no-console */\n// @ts-expect-error - The Vite initializer resolves this ID to the Payload config.\nimport * as configModule from 'payload-mcp:config'\n\ntype ConfigListener = (config: SanitizedConfig) => Promise<void> | void\n\nlet listener: ConfigListener | undefined\nlet configQueue = Promise.resolve()\n\nconst resolveConfig = async (module: unknown): Promise<SanitizedConfig> => {\n  const config = module as { default?: unknown }\n\n  return (await (config.default ?? module)) as SanitizedConfig\n}\n\nlet config = await resolveConfig(configModule)\n\nexport const getConfig = (): SanitizedConfig => config\n\nexport const subscribe = (nextListener: ConfigListener): void => {\n  listener = nextListener\n}\n\nimport.meta.hot?.accept('payload-mcp:config', (nextModule) => {\n  if (!nextModule) {\n    return\n  }\n\n  configQueue = configQueue\n    .then(async () => {\n      config = await resolveConfig(nextModule)\n      await listener?.(config)\n    })\n    .catch((error) => console.error('[payload-mcp] config reload failed:', error))\n})\n"],"names":["configModule","listener","configQueue","Promise","resolve","resolveConfig","module","config","default","getConfig","subscribe","nextListener","hot","accept","nextModule","then","catch","error","console"],"mappings":"AAAA,qCAAqC;AAIrC,6BAA6B,GAC7B,kFAAkF;AAClF,YAAYA,kBAAkB,qBAAoB;AAIlD,IAAIC;AACJ,IAAIC,cAAcC,QAAQC,OAAO;AAEjC,MAAMC,gBAAgB,OAAOC;IAC3B,MAAMC,SAASD;IAEf,OAAQ,MAAOC,CAAAA,OAAOC,OAAO,IAAIF,MAAK;AACxC;AAEA,IAAIC,SAAS,MAAMF,cAAcL;AAEjC,OAAO,MAAMS,YAAY,IAAuBF,OAAM;AAEtD,OAAO,MAAMG,YAAY,CAACC;IACxBV,WAAWU;AACb,EAAC;AAED,YAAYC,GAAG,EAAEC,OAAO,sBAAsB,CAACC;IAC7C,IAAI,CAACA,YAAY;QACf;IACF;IAEAZ,cAAcA,YACXa,IAAI,CAAC;QACJR,SAAS,MAAMF,cAAcS;QAC7B,MAAMb,WAAWM;IACnB,GACCS,KAAK,CAAC,CAACC,QAAUC,QAAQD,KAAK,CAAC,uCAAuCA;AAC3E"}

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,GAAI,SAAS,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/endpoint/access.d.ts

@@ -1,10 +1,17 @@
 import type { PayloadRequest } from 'payload';
-import type { AuthorizedMCP } from '../types.js';
+import type { AuthorizedMCP, MCPItem } from '../types.js';
+export type GetAuthorizedMCPArgs = {
+    overrideAccess: boolean;
+    req: PayloadRequest;
+};
 /**
- * Resolves the API key (or dev-mode session) and returns the items the caller
- * may use. Denied items are dropped from the array.
+ * Authenticates an MCP request and removes items the user cannot access.
+ * `overrideAccess` skips Payload and MCP item access checks.
  */
-export declare const getAuthorizedMCP: (args: {
+export declare const getAuthorizedMCP: (args: GetAuthorizedMCPArgs) => Promise<AuthorizedMCP>;
+export declare const filterMCPItems: ({ items, overrideAccess, req, }: {
+    items: MCPItem[];
+    overrideAccess: boolean;
     req: PayloadRequest;
-}) => Promise<AuthorizedMCP>;
+}) => Promise<MCPItem[]>;
 //# sourceMappingURL=access.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"access.d.ts","sourceRoot":"","sources":["../../src/endpoint/access.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAyB,cAAc,EAAa,MAAM,SAAS,CAAA;AAK/E,OAAO,KAAK,EAAE,aAAa,EAAiB,MAAM,aAAa,CAAA;AAK/D;;;GAGG;AACH,eAAO,MAAM,gBAAgB,EAAE,CAAC,IAAI,EAAE;IAAE,GAAG,EAAE,cAAc,CAAA;CAAE,KAAK,OAAO,CAAC,aAAa,CAiDtF,CAAA"}
+{"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,GAAU,iCAIlC;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

@@ -1,106 +1,93 @@
-import crypto from 'crypto';
-import { UnauthorizedError } from 'payload';
-import { getLogger } from '../utils/getLogger.js';
+import { getAccessResults, UnauthorizedError } from 'payload';
 import { getPluginConfig } from '../utils/getPluginConfig.js';
 /**
- * Resolves the API key (or dev-mode session) and returns the items the caller
- * may use. Denied items are dropped from the array.
- */ export const getAuthorizedMCP = async ({ req })=>{
-    const logger = getLogger({
-        payload: req.payload
-    });
+ * 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
     });
-    const authHeader = req.headers.get('Authorization');
-    const hasBearerToken = authHeader?.startsWith('Bearer ');
-    const buildAuthorized = (apiKeyDoc)=>({
-            items: pluginConfig.items.filter((item)=>{
-                switch(item.type){
-                    case 'collectionTool':
-                        return apiKeyDoc.access.collections?.[item.collectionSlug]?.[item.key] !== false;
-                    case 'globalTool':
-                        return apiKeyDoc.access.globals?.[item.globalSlug]?.[item.key] !== false;
-                    case 'prompt':
-                        return apiKeyDoc.access.prompts?.[item.key] !== false;
-                    case 'resource':
-                        return apiKeyDoc.access.resources?.[item.key] !== false;
-                    case 'tool':
-                        return apiKeyDoc.access.tools?.[item.key] !== false;
-                }
-            }),
-            overrideAccess: typeof apiKeyDoc.overrideAccess === 'boolean' ? apiKeyDoc.overrideAccess : false,
-            user: apiKeyDoc.user
-        });
-    if (pluginConfig.overrideAuth) {
-        return await pluginConfig.overrideAuth({
-            getAPIKeyDoc: (overrideApiKey)=>getAPIKeyDoc({
-                    logger,
-                    overrideApiKey,
-                    pluginConfig,
-                    req
-                }),
-            getAuthorizedMCP: ({ apiKeyDoc })=>buildAuthorized(apiKeyDoc),
+    if (pluginConfig.overrideGetAuthorizedMCP) {
+        return await pluginConfig.overrideGetAuthorizedMCP({
+            overrideAccess,
             pluginConfig,
             req
         });
     }
-    if (process.env.NODE_ENV === 'development' && !hasBearerToken) {
-        logger.info('Dev mode: skipping API key check, using session user');
-        return buildAuthorized({
-            id: -1,
-            access: {},
-            overrideAccess: true,
-            user: req.user ?? null
-        });
+    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 buildAuthorized(await getAPIKeyDoc({
-        logger,
-        pluginConfig,
-        req
-    }));
+    return {
+        items: await filterMCPItems({
+            items: pluginConfig.items,
+            overrideAccess,
+            req
+        }),
+        overrideAccess
+    };
 };
-const getAPIKeyDoc = async ({ logger, overrideApiKey, pluginConfig, req })=>{
-    const authHeader = req.headers.get('Authorization');
-    const hasBearerToken = authHeader?.startsWith('Bearer ');
-    const apiKey = overrideApiKey ?? (hasBearerToken ? authHeader?.replace('Bearer ', '').trim() || null : null);
-    if (!apiKey) {
-        throw new UnauthorizedError();
-    }
-    const sha256APIKeyIndex = crypto.createHmac('sha256', req.payload.secret).update(apiKey).digest('hex');
-    const doc = await req.payload.db.findOne({
-        collection: 'payload-mcp-api-keys',
-        req,
-        where: {
-            apiKeyIndex: {
-                equals: sha256APIKeyIndex
-            }
-        }
-    });
-    if (!doc || !doc.user) {
-        throw new UnauthorizedError();
+export const filterMCPItems = async ({ items, overrideAccess, req })=>{
+    // Match Payload core: overrideAccess bypasses access evaluation
+    if (overrideAccess) {
+        return items;
     }
-    logger.info('API Key is valid');
-    const userRef = doc.user;
-    const userID = typeof userRef === 'object' && userRef !== null && 'id' in userRef ? userRef.id : userRef;
-    const user = await req.payload.findByID({
-        id: userID,
-        collection: pluginConfig.userCollection,
-        depth: 0,
-        disableErrors: true,
+    const authorizedItems = [];
+    const permissions = await getAccessResults({
         req
     });
-    if (!user) {
-        throw new UnauthorizedError();
-    }
-    return {
-        ...doc,
-        user: {
-            ...user,
-            _strategy: 'mcp-api-key',
-            collection: pluginConfig.userCollection
+    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({
+                collectionSlug: item.collectionSlug,
+                permissions,
+                req
+            });
+        case 'globalTool':
+            return !item.tool.access || await item.tool.access({
+                globalSlug: 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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/endpoint/access.ts"],"sourcesContent":["import type { DefaultDocumentIDType, PayloadRequest, TypedUser } from 'payload'\n\nimport crypto from 'crypto'\nimport { UnauthorizedError } from 'payload'\n\nimport type { AuthorizedMCP, MCPAPIKeysDoc } from '../types.js'\n\nimport { getLogger } from '../utils/getLogger.js'\nimport { getPluginConfig } from '../utils/getPluginConfig.js'\n\n/**\n * Resolves the API key (or dev-mode session) and returns the items the caller\n * may use. Denied items are dropped from the array.\n */\nexport const getAuthorizedMCP: (args: { req: PayloadRequest }) => Promise<AuthorizedMCP> = async ({\n  req,\n}) => {\n  const logger = getLogger({ payload: req.payload })\n  const pluginConfig = getPluginConfig({ config: req.payload.config })\n\n  const authHeader = req.headers.get('Authorization')\n  const hasBearerToken = authHeader?.startsWith('Bearer ')\n\n  const buildAuthorized = (apiKeyDoc: MCPAPIKeysDoc): AuthorizedMCP => ({\n    items: pluginConfig.items.filter((item) => {\n      switch (item.type) {\n        case 'collectionTool':\n          return apiKeyDoc.access.collections?.[item.collectionSlug]?.[item.key] !== false\n        case 'globalTool':\n          return apiKeyDoc.access.globals?.[item.globalSlug]?.[item.key] !== false\n        case 'prompt':\n          return apiKeyDoc.access.prompts?.[item.key] !== false\n        case 'resource':\n          return apiKeyDoc.access.resources?.[item.key] !== false\n        case 'tool':\n          return apiKeyDoc.access.tools?.[item.key] !== false\n      }\n    }),\n    overrideAccess:\n      typeof apiKeyDoc.overrideAccess === 'boolean' ? apiKeyDoc.overrideAccess : false,\n    user: apiKeyDoc.user,\n  })\n\n  if (pluginConfig.overrideAuth) {\n    return await pluginConfig.overrideAuth({\n      getAPIKeyDoc: (overrideApiKey) => getAPIKeyDoc({ logger, overrideApiKey, pluginConfig, req }),\n      getAuthorizedMCP: ({ apiKeyDoc }) => buildAuthorized(apiKeyDoc),\n      pluginConfig,\n      req,\n    })\n  }\n\n  if (process.env.NODE_ENV === 'development' && !hasBearerToken) {\n    logger.info('Dev mode: skipping API key check, using session user')\n    return buildAuthorized({\n      id: -1,\n      access: {},\n      overrideAccess: true,\n      user: req.user ?? null,\n    })\n  }\n\n  return buildAuthorized(await getAPIKeyDoc({ logger, pluginConfig, req }))\n}\n\nconst getAPIKeyDoc = async ({\n  logger,\n  overrideApiKey,\n  pluginConfig,\n  req,\n}: {\n  logger: ReturnType<typeof getLogger>\n  overrideApiKey?: string\n  pluginConfig: ReturnType<typeof getPluginConfig>\n  req: PayloadRequest\n}): Promise<MCPAPIKeysDoc> => {\n  const authHeader = req.headers.get('Authorization')\n  const hasBearerToken = authHeader?.startsWith('Bearer ')\n\n  const apiKey =\n    overrideApiKey ?? (hasBearerToken ? authHeader?.replace('Bearer ', '').trim() || null : null)\n\n  if (!apiKey) {\n    throw new UnauthorizedError()\n  }\n\n  const sha256APIKeyIndex = crypto\n    .createHmac('sha256', req.payload.secret)\n    .update(apiKey)\n    .digest('hex')\n\n  const doc = await req.payload.db.findOne<MCPAPIKeysDoc>({\n    collection: 'payload-mcp-api-keys',\n    req,\n    where: {\n      apiKeyIndex: { equals: sha256APIKeyIndex },\n    },\n  })\n\n  if (!doc || !doc.user) {\n    throw new UnauthorizedError()\n  }\n\n  logger.info('API Key is valid')\n\n  const userRef = doc.user\n  const userID =\n    typeof userRef === 'object' && userRef !== null && 'id' in userRef\n      ? userRef.id\n      : (userRef as unknown as DefaultDocumentIDType)\n\n  const user = (await req.payload.findByID({\n    id: userID,\n    collection: pluginConfig.userCollection,\n    depth: 0,\n    disableErrors: true,\n    req,\n  })) as null | TypedUser\n\n  if (!user) {\n    throw new UnauthorizedError()\n  }\n\n  return {\n    ...doc,\n    user: {\n      ...user,\n      _strategy: 'mcp-api-key' as const,\n      collection: pluginConfig.userCollection,\n    },\n  }\n}\n"],"names":["crypto","UnauthorizedError","getLogger","getPluginConfig","getAuthorizedMCP","req","logger","payload","pluginConfig","config","authHeader","headers","get","hasBearerToken","startsWith","buildAuthorized","apiKeyDoc","items","filter","item","type","access","collections","collectionSlug","key","globals","globalSlug","prompts","resources","tools","overrideAccess","user","overrideAuth","getAPIKeyDoc","overrideApiKey","process","env","NODE_ENV","info","id","apiKey","replace","trim","sha256APIKeyIndex","createHmac","secret","update","digest","doc","db","findOne","collection","where","apiKeyIndex","equals","userRef","userID","findByID","userCollection","depth","disableErrors","_strategy"],"mappings":"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"}
+{"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({ collectionSlug: item.collectionSlug, permissions, req }))\n      )\n    case 'globalTool':\n      return (\n        !item.tool.access ||\n        (await item.tool.access({ globalSlug: 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","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,gBAAgBN,KAAKM,cAAc;gBAAEP;gBAAahB;YAAI;QAEpF,KAAK;YACH,OACE,CAACiB,KAAKI,IAAI,CAACC,MAAM,IAChB,MAAML,KAAKI,IAAI,CAACC,MAAM,CAAC;gBAAEE,YAAYP,KAAKO,UAAU;gBAAER;gBAAahB;YAAI;QAE5E,KAAK;YACH,OAAO,CAACiB,KAAKQ,MAAM,CAACH,MAAM,IAAK,MAAML,KAAKQ,MAAM,CAACH,MAAM,CAAC;gBAAEN;gBAAahB;YAAI;QAC7E,KAAK;YACH,OAAO,CAACiB,KAAKS,QAAQ,CAACJ,MAAM,IAAK,MAAML,KAAKS,QAAQ,CAACJ,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

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

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/endpoint/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAY,KAAK,cAAc,EAAE,MAAM,SAAS,CAAA;AAMvD,eAAO,MAAM,WAAW,EAAE,cA2BzB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/endpoint/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAkB,MAAM,SAAS,CAAA;AAa7D,eAAO,MAAM,WAAW,EAAE,cA+DzB,CAAA"}

package/dist/endpoint/index.js

@@ -1,4 +1,4 @@
-import { WebStandardStreamableHTTPServerTransport } from '@modelcontextprotocol/server';
+import { createMcpHandler, isLegacyRequest, WebStandardStreamableHTTPServerTransport } from '@modelcontextprotocol/server';
 import { APIError } from 'payload';
 import { buildMcpServer } from '../mcp/buildMcpServer.js';
 import { getPluginConfig } from '../utils/getPluginConfig.js';
@@ -11,26 +11,77 @@ export const mcpEndpoint = async (req)=>{
     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 server = buildMcpServer({
-        authorizedMCP,
-        pluginConfig,
-        req
-    });
-    const transport = new WebStandardStreamableHTTPServerTransport({
-        enableJsonResponse: true,
-        sessionIdGenerator: undefined
-    });
-    await server.connect(transport);
-    const mcpRequest = new Request(req.url, {
-        body: req.body,
-        duplex: 'half',
-        headers: req.headers,
-        method: req.method
+    // Payload augments the original web-standard Request in place.
+    const mcpRequest = req;
+    // Keep the old JSON-only, stateless behavior because the SDK's 2025 fallback uses SSE.
+    if (await isLegacyRequest(mcpRequest)) {
+        const server = buildMcpServer({
+            authorizedMCP,
+            pluginConfig,
+            req
+        });
+        const transport = new WebStandardStreamableHTTPServerTransport({
+            enableJsonResponse: true,
+            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);
+        } 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',
+        // 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'
     });
-    return await transport.handleRequest(mcpRequest);
+    try {
+        return await handler.fetch(mcpRequest);
+    } finally{
+        await handler.close().catch((err)=>{
+            req.payload.logger.error({
+                err,
+                msg: 'Error closing modern MCP handler'
+            });
+        });
+    }
 };
 
 //# sourceMappingURL=index.js.map