@payloadcms/plugin-mcp 4.0.0-internal.7b031c8 → 4.0.0-internal.7d5c665

package/bin.js

@@ -27,13 +27,6 @@ const start = async () => {
     return
   }
 
-  // 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()

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,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"}
+{"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,CA2CnF,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

@@ -1,4 +1,4 @@
-import { getAccessResults, UnauthorizedError } from 'payload';
+import { executeAuthStrategies, getAccessResults, UnauthorizedError } from 'payload';
 import { getPluginConfig } from '../utils/getPluginConfig.js';
 /**
  * Authenticates an MCP request and removes items the user cannot access.
@@ -18,11 +18,23 @@ import { getPluginConfig } from '../utils/getPluginConfig.js';
         const headers = new Headers(req.headers);
         const hasAuthorization = headers.has('Authorization');
         headers.set('DisableAutologin', 'true');
-        req.user = (await req.payload.auth({
+        // Not `payload.auth()`, which also computes permissions that filterMCPItems computes anyway
+        req.user = (await executeAuthStrategies({
             headers,
+            payload: req.payload,
             req
         })).user;
-        if (hasAuthorization && !req.user) {
+        // Only bearer tokens that no auth strategy accepted reach the hook, e.g. an OAuth access token.
+        // API keys use the `<collection> API-Key <key>` scheme instead of `Bearer`, so they never do.
+        const bearerToken = headers.get('Authorization')?.match(/^Bearer (.+)$/)?.[1];
+        if (!req.user && bearerToken && pluginConfig.oauth?.authenticate) {
+            req.user = await pluginConfig.oauth.authenticate({
+                req,
+                token: bearerToken
+            });
+        }
+        // With OAuth, the endpoint answers with a challenge that starts the client's sign-in
+        if (hasAuthorization && !req.user && !pluginConfig.oauth) {
             throw new UnauthorizedError(req.t);
         }
     }
@@ -62,13 +74,13 @@ export const filterMCPItems = async ({ items, overrideAccess, req })=>{
     switch(item.type){
         case 'collectionTool':
             return !item.tool.access || await item.tool.access({
-                collectionSlug: item.collectionSlug,
+                slug: item.collectionSlug,
                 permissions,
                 req
             });
         case 'globalTool':
             return !item.tool.access || await item.tool.access({
-                globalSlug: item.globalSlug,
+                slug: item.globalSlug,
                 permissions,
                 req
             });

package/dist/endpoint/access.js.map

@@ -1 +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({ 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"}
+{"version":3,"sources":["../../src/endpoint/access.ts"],"sourcesContent":["import type { PayloadRequest, SanitizedPermissions } from 'payload'\n\nimport { executeAuthStrategies, 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    // Not `payload.auth()`, which also computes permissions that filterMCPItems computes anyway\n    req.user = (await executeAuthStrategies({ headers, payload: req.payload, req })).user\n\n    // Only bearer tokens that no auth strategy accepted reach the hook, e.g. an OAuth access token.\n    // API keys use the `<collection> API-Key <key>` scheme instead of `Bearer`, so they never do.\n    const bearerToken = headers.get('Authorization')?.match(/^Bearer (.+)$/)?.[1]\n    if (!req.user && bearerToken && pluginConfig.oauth?.authenticate) {\n      req.user = await pluginConfig.oauth.authenticate({ req, token: bearerToken })\n    }\n\n    // With OAuth, the endpoint answers with a challenge that starts the client's sign-in\n    if (hasAuthorization && !req.user && !pluginConfig.oauth) {\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":["executeAuthStrategies","getAccessResults","UnauthorizedError","getPluginConfig","getAuthorizedMCP","overrideAccess","req","pluginConfig","config","payload","overrideGetAuthorizedMCP","headers","Headers","hasAuthorization","has","set","user","bearerToken","get","match","oauth","authenticate","token","t","items","filterMCPItems","authorizedItems","permissions","item","checkItemAccess","push","type","tool","access","slug","collectionSlug","globalSlug","prompt","resource"],"mappings":"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"}

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

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/endpoint/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAkB,MAAM,SAAS,CAAA;AAe7D,eAAO,MAAM,WAAW,EAAE,cA0EzB,CAAA"}

package/dist/endpoint/index.js

@@ -1,13 +1,21 @@
-import { createMcpHandler, isLegacyRequest, WebStandardStreamableHTTPServerTransport } from '@modelcontextprotocol/server';
+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';
+import { getMCPResource, oauthChallenge } from './oauth.js';
 export const mcpEndpoint = async (req)=>{
     if (!req.url) {
         throw new APIError('Missing request URL', 400);
     }
     req.payloadAPI = 'MCP';
+    // Lets auth strategies check that an OAuth access token was issued for this MCP server
+    req.context.mcp = {
+        resource: getMCPResource({
+            config: req.payload.config,
+            url: req.url
+        })
+    };
     const pluginConfig = getPluginConfig({
         config: req.payload.config
     });
@@ -25,10 +33,22 @@ export const mcpEndpoint = async (req)=>{
         overrideAccess,
         req
     });
+    if (pluginConfig.oauth && !req.user) {
+        return oauthChallenge({
+            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)) {
+    if (await isLegacyRequest(mcpRequest, parsedBody, {
+        maxRequestBodySize
+    })) {
         const server = buildMcpServer({
             authorizedMCP,
             pluginConfig,
@@ -36,6 +56,7 @@ export const mcpEndpoint = async (req)=>{
         });
         const transport = new WebStandardStreamableHTTPServerTransport({
             enableJsonResponse: true,
+            maxRequestBodySize,
             sessionIdGenerator: undefined
         });
         transport.onerror = (err)=>{
@@ -46,7 +67,9 @@ export const mcpEndpoint = async (req)=>{
         };
         try {
             await server.connect(transport);
-            return await transport.handleRequest(mcpRequest);
+            return await transport.handleRequest(mcpRequest, {
+                parsedBody
+            });
         } finally{
             await server.close().catch((err)=>{
                 req.payload.logger.error({
@@ -62,6 +85,7 @@ export const mcpEndpoint = async (req)=>{
             req
         }), {
         legacy: 'reject',
+        maxRequestBodySize,
         // SDK subscriptions always use SSE, so disable them to keep every response JSON-only.
         maxSubscriptions: 0,
         onerror: (err)=>{
@@ -73,7 +97,9 @@ export const mcpEndpoint = async (req)=>{
         responseMode: 'json'
     });
     try {
-        return await handler.fetch(mcpRequest);
+        return await handler.fetch(mcpRequest, {
+            parsedBody
+        });
     } finally{
         await handler.close().catch((err)=>{
             req.payload.logger.error({
@@ -83,5 +109,21 @@ export const mcpEndpoint = async (req)=>{
         });
     }
 };
+/**
+ * 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

@@ -1 +1 @@
-{"version":3,"sources":["../../src/endpoint/index.ts"],"sourcesContent":["import type { PayloadHandler, PayloadRequest } from 'payload'\n\nimport {\n  createMcpHandler,\n  isLegacyRequest,\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  // Payload augments the original web-standard Request in place.\n  const mcpRequest = req as PayloadRequest & Request\n\n  // Keep the old JSON-only, stateless behavior because the SDK's 2025 fallback uses SSE.\n  if (await isLegacyRequest(mcpRequest)) {\n    const server = buildMcpServer({ authorizedMCP, pluginConfig, req })\n    const transport = new WebStandardStreamableHTTPServerTransport({\n      enableJsonResponse: true,\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)\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    // 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)\n  } finally {\n    await handler.close().catch((err) => {\n      req.payload.logger.error({ err, msg: 'Error closing modern MCP handler' })\n    })\n  }\n}\n"],"names":["createMcpHandler","isLegacyRequest","WebStandardStreamableHTTPServerTransport","APIError","buildMcpServer","getPluginConfig","getAuthorizedMCP","mcpEndpoint","req","url","payloadAPI","pluginConfig","config","payload","overrideAccessParam","URL","searchParams","get","process","env","NODE_ENV","overrideAccess","authorizedMCP","mcpRequest","server","transport","enableJsonResponse","sessionIdGenerator","undefined","onerror","err","logger","error","msg","connect","handleRequest","close","catch","handler","legacy","maxSubscriptions","responseMode","fetch"],"mappings":"AAEA,SACEA,gBAAgB,EAChBC,eAAe,EACfC,wCAAwC,QACnC,+BAA8B;AACrC,SAASC,QAAQ,QAAQ,UAAS;AAElC,SAASC,cAAc,QAAQ,2BAA0B;AACzD,SAASC,eAAe,QAAQ,8BAA6B;AAC7D,SAASC,gBAAgB,QAAQ,cAAa;AAE9C,OAAO,MAAMC,cAA8B,OAAOC;IAChD,IAAI,CAACA,IAAIC,GAAG,EAAE;QACZ,MAAM,IAAIN,SAAS,uBAAuB;IAC5C;IAEAK,IAAIE,UAAU,GAAG;IAEjB,MAAMC,eAAeN,gBAAgB;QAAEO,QAAQJ,IAAIK,OAAO,CAACD,MAAM;IAAC;IAClE,MAAME,sBAAsB,IAAIC,IAAIP,IAAIC,GAAG,EAAEO,YAAY,CAACC,GAAG,CAAC;IAE9D,IAAIH,wBAAwB,QAAQI,QAAQC,GAAG,CAACC,QAAQ,KAAK,eAAe;QAC1E,MAAM,IAAIjB,SAAS,wDAAwD;IAC7E;IAEA,IAAIkB,iBAAiB;IACrB,IAAIP,wBAAwB,QAAQ;QAClCO,iBAAiB;IACnB,OAAO,IAAIP,wBAAwB,QAAQA,wBAAwB,SAAS;QAC1E,MAAM,IAAIX,SAAS,iDAAiD;IACtE;IAEA,MAAMmB,gBAAgB,MAAMhB,iBAAiB;QAAEe;QAAgBb;IAAI;IACnE,+DAA+D;IAC/D,MAAMe,aAAaf;IAEnB,uFAAuF;IACvF,IAAI,MAAMP,gBAAgBsB,aAAa;QACrC,MAAMC,SAASpB,eAAe;YAAEkB;YAAeX;YAAcH;QAAI;QACjE,MAAMiB,YAAY,IAAIvB,yCAAyC;YAC7DwB,oBAAoB;YACpBC,oBAAoBC;QACtB;QACAH,UAAUI,OAAO,GAAG,CAACC;YACnBtB,IAAIK,OAAO,CAACkB,MAAM,CAACC,KAAK,CAAC;gBAAEF;gBAAKG,KAAK;YAAmC;QAC1E;QAEA,IAAI;YACF,MAAMT,OAAOU,OAAO,CAACT;YACrB,OAAO,MAAMA,UAAUU,aAAa,CAACZ;QACvC,SAAU;YACR,MAAMC,OAAOY,KAAK,GAAGC,KAAK,CAAC,CAACP;gBAC1BtB,IAAIK,OAAO,CAACkB,MAAM,CAACC,KAAK,CAAC;oBAAEF;oBAAKG,KAAK;gBAA2B;YAClE;QACF;IACF;IAEA,MAAMK,UAAUtC,iBAAiB,IAAMI,eAAe;YAAEkB;YAAeX;YAAcH;QAAI,IAAI;QAC3F+B,QAAQ;QACR,sFAAsF;QACtFC,kBAAkB;QAClBX,SAAS,CAACC;YACRtB,IAAIK,OAAO,CAACkB,MAAM,CAACC,KAAK,CAAC;gBAAEF;gBAAKG,KAAK;YAAmC;QAC1E;QACAQ,cAAc;IAChB;IAEA,IAAI;QACF,OAAO,MAAMH,QAAQI,KAAK,CAACnB;IAC7B,SAAU;QACR,MAAMe,QAAQF,KAAK,GAAGC,KAAK,CAAC,CAACP;YAC3BtB,IAAIK,OAAO,CAACkB,MAAM,CAACC,KAAK,CAAC;gBAAEF;gBAAKG,KAAK;YAAmC;QAC1E;IACF;AACF,EAAC"}
+{"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'\nimport { getMCPResource, oauthChallenge } from './oauth.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  // Lets auth strategies check that an OAuth access token was issued for this MCP server\n  req.context.mcp = { resource: getMCPResource({ config: req.payload.config, url: req.url }) }\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\n  if (pluginConfig.oauth && !req.user) {\n    return oauthChallenge({ req })\n  }\n\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","getMCPResource","oauthChallenge","mcpEndpoint","req","url","payloadAPI","context","mcp","resource","config","payload","pluginConfig","overrideAccessParam","URL","searchParams","get","process","env","NODE_ENV","overrideAccess","authorizedMCP","oauth","user","maxRequestBodySize","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/endpoint/oauth.d.ts

@@ -0,0 +1,35 @@
+import type { PayloadHandler, PayloadRequest, SanitizedConfig } from 'payload';
+/**
+ * Serves the OAuth protected resource metadata (RFC 9728) at `/api/mcp/oauth-protected-resource`.
+ * The OAuth challenge links here, so MCP clients find the authorization server without setup.
+ */
+export declare const oauthProtectedResourceEndpoint: PayloadHandler;
+/**
+ * Serves the same metadata for clients that ignore the challenge's link and only look at
+ * `/.well-known/oauth-protected-resource`. Mount it at the site root, e.g. in Next.js at
+ * `app/.well-known/oauth-protected-resource/[[...path]]/route.ts`:
+ *
+ * ```ts
+ * import config from '@payload-config'
+ * import { oauthProtectedResourceHandler } from '@payloadcms/plugin-mcp'
+ *
+ * export const GET = oauthProtectedResourceHandler(config)
+ * ```
+ */
+export declare const oauthProtectedResourceHandler: (config: Promise<SanitizedConfig> | SanitizedConfig) => (request: Request) => Promise<Response>;
+/**
+ * Answers an unauthenticated MCP request with a challenge linking to the protected resource
+ * metadata, which starts the client's OAuth flow.
+ */
+export declare const oauthChallenge: ({ req }: {
+    req: PayloadRequest;
+}) => Response;
+/**
+ * The MCP endpoint's address, as advertised in the metadata's `resource`. Clients send it when
+ * they sign in, and authorization servers that support it put it in the access token's audience.
+ */
+export declare const getMCPResource: ({ config, url }: {
+    config: SanitizedConfig;
+    url: string;
+}) => string;
+//# sourceMappingURL=oauth.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"oauth.d.ts","sourceRoot":"","sources":["../../src/endpoint/oauth.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAU9E;;;GAGG;AACH,eAAO,MAAM,8BAA8B,EAAE,cACuB,CAAA;AAEpE;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,6BAA6B,WAC/B,OAAO,CAAC,eAAe,CAAC,GAAG,eAAe,eACnC,OAAO,KAAG,OAAO,CAAC,QAAQ,CACuB,CAAA;AAEnE;;;GAGG;AACH,eAAO,MAAM,cAAc,YAAa;IAAE,GAAG,EAAE,cAAc,CAAA;CAAE,KAAG,QAO/D,CAAA;AAEH;;;GAGG;AACH,eAAO,MAAM,cAAc,oBAAqB;IAAE,MAAM,EAAE,eAAe,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,KAAG,MAChB,CAAA"}

package/dist/endpoint/oauth.js

@@ -0,0 +1,75 @@
+import { bearerAuthChallengeResponse, OAuthError, OAuthErrorCode } from '@modelcontextprotocol/server';
+import { getPluginConfig } from '../utils/getPluginConfig.js';
+/**
+ * Serves the OAuth protected resource metadata (RFC 9728) at `/api/mcp/oauth-protected-resource`.
+ * The OAuth challenge links here, so MCP clients find the authorization server without setup.
+ */ export const oauthProtectedResourceEndpoint = (req)=>getMetadataResponse({
+        config: req.payload.config,
+        url: req.url
+    });
+/**
+ * Serves the same metadata for clients that ignore the challenge's link and only look at
+ * `/.well-known/oauth-protected-resource`. Mount it at the site root, e.g. in Next.js at
+ * `app/.well-known/oauth-protected-resource/[[...path]]/route.ts`:
+ *
+ * ```ts
+ * import config from '@payload-config'
+ * import { oauthProtectedResourceHandler } from '@payloadcms/plugin-mcp'
+ *
+ * export const GET = oauthProtectedResourceHandler(config)
+ * ```
+ */ export const oauthProtectedResourceHandler = (config)=>async (request)=>getMetadataResponse({
+            config: await config,
+            url: request.url
+        });
+/**
+ * Answers an unauthenticated MCP request with a challenge linking to the protected resource
+ * metadata, which starts the client's OAuth flow.
+ */ export const oauthChallenge = ({ req })=>bearerAuthChallengeResponse(new OAuthError(OAuthErrorCode.InvalidToken, req.t('error:unauthorized')), {
+        requiredScopes: getPluginConfig({
+            config: req.payload.config
+        }).oauth?.scopes,
+        resourceMetadataUrl: `${getMCPURL({
+            config: req.payload.config,
+            url: req.url
+        })}/oauth-protected-resource`
+    });
+/**
+ * The MCP endpoint's address, as advertised in the metadata's `resource`. Clients send it when
+ * they sign in, and authorization servers that support it put it in the access token's audience.
+ */ export const getMCPResource = ({ config, url })=>getPluginConfig({
+        config
+    }).oauth?.resource ?? getMCPURL({
+        config,
+        url
+    });
+const getMCPURL = ({ config, url })=>new URL(`${config.routes.api}/mcp`, config.serverURL || url).href;
+const getMetadataResponse = async ({ config, url })=>{
+    const pluginConfig = getPluginConfig({
+        config
+    });
+    if (!pluginConfig.oauth) {
+        return new Response(null, {
+            status: 404
+        });
+    }
+    const { authorizationServers, scopes } = pluginConfig.oauth;
+    return Response.json({
+        authorization_servers: typeof authorizationServers === 'function' ? await authorizationServers() : authorizationServers,
+        bearer_methods_supported: [
+            'header'
+        ],
+        resource: getMCPResource({
+            config,
+            url
+        }),
+        scopes_supported: scopes
+    }, // Public document, readable by browser-based MCP clients on any origin
+    {
+        headers: {
+            'Access-Control-Allow-Origin': '*'
+        }
+    });
+};
+
+//# sourceMappingURL=oauth.js.map

package/dist/endpoint/oauth.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/endpoint/oauth.ts"],"sourcesContent":["import type { OAuthProtectedResourceMetadata } from '@modelcontextprotocol/server'\nimport type { PayloadHandler, PayloadRequest, SanitizedConfig } from 'payload'\n\nimport {\n  bearerAuthChallengeResponse,\n  OAuthError,\n  OAuthErrorCode,\n} from '@modelcontextprotocol/server'\n\nimport { getPluginConfig } from '../utils/getPluginConfig.js'\n\n/**\n * Serves the OAuth protected resource metadata (RFC 9728) at `/api/mcp/oauth-protected-resource`.\n * The OAuth challenge links here, so MCP clients find the authorization server without setup.\n */\nexport const oauthProtectedResourceEndpoint: PayloadHandler = (req) =>\n  getMetadataResponse({ config: req.payload.config, url: req.url! })\n\n/**\n * Serves the same metadata for clients that ignore the challenge's link and only look at\n * `/.well-known/oauth-protected-resource`. Mount it at the site root, e.g. in Next.js at\n * `app/.well-known/oauth-protected-resource/[[...path]]/route.ts`:\n *\n * ```ts\n * import config from '@payload-config'\n * import { oauthProtectedResourceHandler } from '@payloadcms/plugin-mcp'\n *\n * export const GET = oauthProtectedResourceHandler(config)\n * ```\n */\nexport const oauthProtectedResourceHandler =\n  (config: Promise<SanitizedConfig> | SanitizedConfig) =>\n  async (request: Request): Promise<Response> =>\n    getMetadataResponse({ config: await config, url: request.url })\n\n/**\n * Answers an unauthenticated MCP request with a challenge linking to the protected resource\n * metadata, which starts the client's OAuth flow.\n */\nexport const oauthChallenge = ({ req }: { req: PayloadRequest }): Response =>\n  bearerAuthChallengeResponse(\n    new OAuthError(OAuthErrorCode.InvalidToken, req.t('error:unauthorized')),\n    {\n      requiredScopes: getPluginConfig({ config: req.payload.config }).oauth?.scopes,\n      resourceMetadataUrl: `${getMCPURL({ config: req.payload.config, url: req.url! })}/oauth-protected-resource`,\n    },\n  )\n\n/**\n * The MCP endpoint's address, as advertised in the metadata's `resource`. Clients send it when\n * they sign in, and authorization servers that support it put it in the access token's audience.\n */\nexport const getMCPResource = ({ config, url }: { config: SanitizedConfig; url: string }): string =>\n  getPluginConfig({ config }).oauth?.resource ?? getMCPURL({ config, url })\n\nconst getMCPURL = ({ config, url }: { config: SanitizedConfig; url: string }): string =>\n  new URL(`${config.routes.api}/mcp`, config.serverURL || url).href\n\nconst getMetadataResponse = async ({\n  config,\n  url,\n}: {\n  config: SanitizedConfig\n  url: string\n}): Promise<Response> => {\n  const pluginConfig = getPluginConfig({ config })\n\n  if (!pluginConfig.oauth) {\n    return new Response(null, { status: 404 })\n  }\n\n  const { authorizationServers, scopes } = pluginConfig.oauth\n\n  return Response.json(\n    {\n      authorization_servers:\n        typeof authorizationServers === 'function'\n          ? await authorizationServers()\n          : authorizationServers,\n      bearer_methods_supported: ['header'],\n      resource: getMCPResource({ config, url }),\n      scopes_supported: scopes,\n    } satisfies OAuthProtectedResourceMetadata,\n    // Public document, readable by browser-based MCP clients on any origin\n    { headers: { 'Access-Control-Allow-Origin': '*' } },\n  )\n}\n"],"names":["bearerAuthChallengeResponse","OAuthError","OAuthErrorCode","getPluginConfig","oauthProtectedResourceEndpoint","req","getMetadataResponse","config","payload","url","oauthProtectedResourceHandler","request","oauthChallenge","InvalidToken","t","requiredScopes","oauth","scopes","resourceMetadataUrl","getMCPURL","getMCPResource","resource","URL","routes","api","serverURL","href","pluginConfig","Response","status","authorizationServers","json","authorization_servers","bearer_methods_supported","scopes_supported","headers"],"mappings":"AAGA,SACEA,2BAA2B,EAC3BC,UAAU,EACVC,cAAc,QACT,+BAA8B;AAErC,SAASC,eAAe,QAAQ,8BAA6B;AAE7D;;;CAGC,GACD,OAAO,MAAMC,iCAAiD,CAACC,MAC7DC,oBAAoB;QAAEC,QAAQF,IAAIG,OAAO,CAACD,MAAM;QAAEE,KAAKJ,IAAII,GAAG;IAAE,GAAE;AAEpE;;;;;;;;;;;CAWC,GACD,OAAO,MAAMC,gCACX,CAACH,SACD,OAAOI,UACLL,oBAAoB;YAAEC,QAAQ,MAAMA;YAAQE,KAAKE,QAAQF,GAAG;QAAC,GAAE;AAEnE;;;CAGC,GACD,OAAO,MAAMG,iBAAiB,CAAC,EAAEP,GAAG,EAA2B,GAC7DL,4BACE,IAAIC,WAAWC,eAAeW,YAAY,EAAER,IAAIS,CAAC,CAAC,wBAClD;QACEC,gBAAgBZ,gBAAgB;YAAEI,QAAQF,IAAIG,OAAO,CAACD,MAAM;QAAC,GAAGS,KAAK,EAAEC;QACvEC,qBAAqB,GAAGC,UAAU;YAAEZ,QAAQF,IAAIG,OAAO,CAACD,MAAM;YAAEE,KAAKJ,IAAII,GAAG;QAAE,GAAG,yBAAyB,CAAC;IAC7G,GACD;AAEH;;;CAGC,GACD,OAAO,MAAMW,iBAAiB,CAAC,EAAEb,MAAM,EAAEE,GAAG,EAA4C,GACtFN,gBAAgB;QAAEI;IAAO,GAAGS,KAAK,EAAEK,YAAYF,UAAU;QAAEZ;QAAQE;IAAI,GAAE;AAE3E,MAAMU,YAAY,CAAC,EAAEZ,MAAM,EAAEE,GAAG,EAA4C,GAC1E,IAAIa,IAAI,GAAGf,OAAOgB,MAAM,CAACC,GAAG,CAAC,IAAI,CAAC,EAAEjB,OAAOkB,SAAS,IAAIhB,KAAKiB,IAAI;AAEnE,MAAMpB,sBAAsB,OAAO,EACjCC,MAAM,EACNE,GAAG,EAIJ;IACC,MAAMkB,eAAexB,gBAAgB;QAAEI;IAAO;IAE9C,IAAI,CAACoB,aAAaX,KAAK,EAAE;QACvB,OAAO,IAAIY,SAAS,MAAM;YAAEC,QAAQ;QAAI;IAC1C;IAEA,MAAM,EAAEC,oBAAoB,EAAEb,MAAM,EAAE,GAAGU,aAAaX,KAAK;IAE3D,OAAOY,SAASG,IAAI,CAClB;QACEC,uBACE,OAAOF,yBAAyB,aAC5B,MAAMA,yBACNA;QACNG,0BAA0B;YAAC;SAAS;QACpCZ,UAAUD,eAAe;YAAEb;YAAQE;QAAI;QACvCyB,kBAAkBjB;IACpB,GACA,uEAAuE;IACvE;QAAEkB,SAAS;YAAE,+BAA+B;QAAI;IAAE;AAEtD"}

package/dist/index.d.ts

@@ -7,8 +7,16 @@ declare module 'payload' {
         /** After the plugin's `plugin` callback runs, `options` holds the sanitized config. */
         '@payloadcms/plugin-mcp': MCPPluginConfig;
     }
+    interface RequestContext {
+        /** Set on MCP requests before they're authenticated. */
+        mcp?: {
+            /** The MCP endpoint's address, which OAuth access tokens for MCP are issued for. */
+            resource: string;
+        };
+    }
 }
 export type { AuthorizedMCP, MCPPluginConfig, SanitizedMCPPluginConfig };
 export { defineCollectionTool, defineGlobalTool, definePrompt, defineTool } from './defineTool.js';
+export { oauthProtectedResourceHandler } from './endpoint/oauth.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,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"}
+{"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;AAM1F,OAAO,QAAQ,SAAS,CAAC;IACvB,UAAiB,iBAAiB;QAChC,GAAG,EAAE,IAAI,CAAA;KACV;IACD,UAAU,iBAAiB;QACzB,uFAAuF;QACvF,wBAAwB,EAAE,eAAe,CAAA;KAC1C;IACD,UAAiB,cAAc;QAC7B,wDAAwD;QACxD,GAAG,CAAC,EAAE;YACJ,oFAAoF;YACpF,QAAQ,EAAE,MAAM,CAAA;SACjB,CAAA;KACF;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;AAClG,OAAO,EAAE,6BAA6B,EAAE,MAAM,qBAAqB,CAAA;AAEnE,eAAO,MAAM,SAAS,wDAyCpB,CAAA"}

package/dist/index.js

@@ -1,7 +1,9 @@
 import { definePlugin } from 'payload';
 import { mcpEndpoint } from './endpoint/index.js';
+import { oauthProtectedResourceEndpoint } from './endpoint/oauth.js';
 import { sanitizeMCPConfig } from './mcp/sanitizeMCPConfig.js';
 export { defineCollectionTool, defineGlobalTool, definePrompt, defineTool } from './defineTool.js';
+export { oauthProtectedResourceHandler } from './endpoint/oauth.js';
 export const mcpPlugin = definePlugin({
     slug: '@payloadcms/plugin-mcp',
     order: 10,
@@ -23,8 +25,10 @@ export const mcpPlugin = definePlugin({
             ...config,
             endpoints: [
                 ...config.endpoints ?? [],
-                // Payload prefixes /api, so the full path is /api/mcp.
+                // Payload prefixes /api, so the full path is /api/mcp. getAuthorizedMCP authenticates the
+                // request with dev auto-login turned off, so Payload doesn't authenticate it first.
                 {
+                    disableAuth: true,
                     handler: mcpEndpoint,
                     method: 'post',
                     path: '/mcp'
@@ -32,6 +36,7 @@ export const mcpPlugin = definePlugin({
                 // Streamable HTTP's optional server=>client GET stream. We don't offer
                 // one, so answer 405 per spec-— clients then skip it cleanly
                 {
+                    disableAuth: true,
                     handler: ()=>new Response(null, {
                             headers: {
                                 Allow: 'POST'
@@ -40,6 +45,12 @@ export const mcpPlugin = definePlugin({
                         }),
                     method: 'get',
                     path: '/mcp'
+                },
+                {
+                    disableAuth: true,
+                    handler: oauthProtectedResourceEndpoint,
+                    method: 'get',
+                    path: '/mcp/oauth-protected-resource'
                 }
             ]
         };

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import { definePlugin } from 'payload'\n\nimport type { AuthorizedMCP, MCPPluginConfig, SanitizedMCPPluginConfig } from './types.js'\n\nimport { mcpEndpoint } from './endpoint/index.js'\nimport { sanitizeMCPConfig } from './mcp/sanitizeMCPConfig.js'\n\ndeclare module 'payload' {\n  export interface PayloadRequestAPI {\n    MCP: true\n  }\n  interface RegisteredPlugins {\n    /** After the plugin's `plugin` callback runs, `options` holds the sanitized config. */\n    '@payloadcms/plugin-mcp': MCPPluginConfig\n  }\n}\n\nexport type { AuthorizedMCP, MCPPluginConfig, SanitizedMCPPluginConfig }\n\nexport { defineCollectionTool, defineGlobalTool, definePrompt, defineTool } from './defineTool.js'\n\nexport const mcpPlugin = definePlugin<MCPPluginConfig>({\n  slug: '@payloadcms/plugin-mcp',\n  order: 10,\n  plugin: ({ config, options, plugins }) => {\n    const pluginConfig = sanitizeMCPConfig({ config, pluginConfig: options })\n\n    // Stash the sanitized config on plugin options so `getPluginConfig()` reads it.\n    const registered = plugins['@payloadcms/plugin-mcp']\n    if (registered) {\n      // @ts-expect-error\n      registered.sanitizedOptions = pluginConfig as unknown as typeof registered.options\n    }\n\n    if (pluginConfig.disabled) {\n      return config\n    }\n\n    return {\n      ...config,\n      endpoints: [\n        ...(config.endpoints ?? []),\n        // Payload prefixes /api, so the full path is /api/mcp.\n        { handler: mcpEndpoint, method: 'post', path: '/mcp' },\n        // Streamable HTTP's optional server=>client GET stream. We don't offer\n        // one, so answer 405 per spec-— clients then skip it cleanly\n        {\n          handler: () => new Response(null, { headers: { Allow: 'POST' }, status: 405 }),\n          method: 'get',\n          path: '/mcp',\n        },\n      ],\n    }\n  },\n})\n"],"names":["definePlugin","mcpEndpoint","sanitizeMCPConfig","defineCollectionTool","defineGlobalTool","definePrompt","defineTool","mcpPlugin","slug","order","plugin","config","options","plugins","pluginConfig","registered","sanitizedOptions","disabled","endpoints","handler","method","path","Response","headers","Allow","status"],"mappings":"AAAA,SAASA,YAAY,QAAQ,UAAS;AAItC,SAASC,WAAW,QAAQ,sBAAqB;AACjD,SAASC,iBAAiB,QAAQ,6BAA4B;AAc9D,SAASC,oBAAoB,EAAEC,gBAAgB,EAAEC,YAAY,EAAEC,UAAU,QAAQ,kBAAiB;AAElG,OAAO,MAAMC,YAAYP,aAA8B;IACrDQ,MAAM;IACNC,OAAO;IACPC,QAAQ,CAAC,EAAEC,MAAM,EAAEC,OAAO,EAAEC,OAAO,EAAE;QACnC,MAAMC,eAAeZ,kBAAkB;YAAES;YAAQG,cAAcF;QAAQ;QAEvE,gFAAgF;QAChF,MAAMG,aAAaF,OAAO,CAAC,yBAAyB;QACpD,IAAIE,YAAY;YACd,mBAAmB;YACnBA,WAAWC,gBAAgB,GAAGF;QAChC;QAEA,IAAIA,aAAaG,QAAQ,EAAE;YACzB,OAAON;QACT;QAEA,OAAO;YACL,GAAGA,MAAM;YACTO,WAAW;mBACLP,OAAOO,SAAS,IAAI,EAAE;gBAC1B,uDAAuD;gBACvD;oBAAEC,SAASlB;oBAAamB,QAAQ;oBAAQC,MAAM;gBAAO;gBACrD,uEAAuE;gBACvE,6DAA6D;gBAC7D;oBACEF,SAAS,IAAM,IAAIG,SAAS,MAAM;4BAAEC,SAAS;gCAAEC,OAAO;4BAAO;4BAAGC,QAAQ;wBAAI;oBAC5EL,QAAQ;oBACRC,MAAM;gBACR;aACD;QACH;IACF;AACF,GAAE"}
+{"version":3,"sources":["../src/index.ts"],"sourcesContent":["import { definePlugin } from 'payload'\n\nimport type { AuthorizedMCP, MCPPluginConfig, SanitizedMCPPluginConfig } from './types.js'\n\nimport { mcpEndpoint } from './endpoint/index.js'\nimport { oauthProtectedResourceEndpoint } from './endpoint/oauth.js'\nimport { sanitizeMCPConfig } from './mcp/sanitizeMCPConfig.js'\n\ndeclare module 'payload' {\n  export interface PayloadRequestAPI {\n    MCP: true\n  }\n  interface RegisteredPlugins {\n    /** After the plugin's `plugin` callback runs, `options` holds the sanitized config. */\n    '@payloadcms/plugin-mcp': MCPPluginConfig\n  }\n  export interface RequestContext {\n    /** Set on MCP requests before they're authenticated. */\n    mcp?: {\n      /** The MCP endpoint's address, which OAuth access tokens for MCP are issued for. */\n      resource: string\n    }\n  }\n}\n\nexport type { AuthorizedMCP, MCPPluginConfig, SanitizedMCPPluginConfig }\n\nexport { defineCollectionTool, defineGlobalTool, definePrompt, defineTool } from './defineTool.js'\nexport { oauthProtectedResourceHandler } from './endpoint/oauth.js'\n\nexport const mcpPlugin = definePlugin<MCPPluginConfig>({\n  slug: '@payloadcms/plugin-mcp',\n  order: 10,\n  plugin: ({ config, options, plugins }) => {\n    const pluginConfig = sanitizeMCPConfig({ config, pluginConfig: options })\n\n    // Stash the sanitized config on plugin options so `getPluginConfig()` reads it.\n    const registered = plugins['@payloadcms/plugin-mcp']\n    if (registered) {\n      // @ts-expect-error\n      registered.sanitizedOptions = pluginConfig as unknown as typeof registered.options\n    }\n\n    if (pluginConfig.disabled) {\n      return config\n    }\n\n    return {\n      ...config,\n      endpoints: [\n        ...(config.endpoints ?? []),\n        // Payload prefixes /api, so the full path is /api/mcp. getAuthorizedMCP authenticates the\n        // request with dev auto-login turned off, so Payload doesn't authenticate it first.\n        { disableAuth: true, handler: mcpEndpoint, method: 'post', path: '/mcp' },\n        // Streamable HTTP's optional server=>client GET stream. We don't offer\n        // one, so answer 405 per spec-— clients then skip it cleanly\n        {\n          disableAuth: true,\n          handler: () => new Response(null, { headers: { Allow: 'POST' }, status: 405 }),\n          method: 'get',\n          path: '/mcp',\n        },\n        {\n          disableAuth: true,\n          handler: oauthProtectedResourceEndpoint,\n          method: 'get',\n          path: '/mcp/oauth-protected-resource',\n        },\n      ],\n    }\n  },\n})\n"],"names":["definePlugin","mcpEndpoint","oauthProtectedResourceEndpoint","sanitizeMCPConfig","defineCollectionTool","defineGlobalTool","definePrompt","defineTool","oauthProtectedResourceHandler","mcpPlugin","slug","order","plugin","config","options","plugins","pluginConfig","registered","sanitizedOptions","disabled","endpoints","disableAuth","handler","method","path","Response","headers","Allow","status"],"mappings":"AAAA,SAASA,YAAY,QAAQ,UAAS;AAItC,SAASC,WAAW,QAAQ,sBAAqB;AACjD,SAASC,8BAA8B,QAAQ,sBAAqB;AACpE,SAASC,iBAAiB,QAAQ,6BAA4B;AAqB9D,SAASC,oBAAoB,EAAEC,gBAAgB,EAAEC,YAAY,EAAEC,UAAU,QAAQ,kBAAiB;AAClG,SAASC,6BAA6B,QAAQ,sBAAqB;AAEnE,OAAO,MAAMC,YAAYT,aAA8B;IACrDU,MAAM;IACNC,OAAO;IACPC,QAAQ,CAAC,EAAEC,MAAM,EAAEC,OAAO,EAAEC,OAAO,EAAE;QACnC,MAAMC,eAAeb,kBAAkB;YAAEU;YAAQG,cAAcF;QAAQ;QAEvE,gFAAgF;QAChF,MAAMG,aAAaF,OAAO,CAAC,yBAAyB;QACpD,IAAIE,YAAY;YACd,mBAAmB;YACnBA,WAAWC,gBAAgB,GAAGF;QAChC;QAEA,IAAIA,aAAaG,QAAQ,EAAE;YACzB,OAAON;QACT;QAEA,OAAO;YACL,GAAGA,MAAM;YACTO,WAAW;mBACLP,OAAOO,SAAS,IAAI,EAAE;gBAC1B,0FAA0F;gBAC1F,oFAAoF;gBACpF;oBAAEC,aAAa;oBAAMC,SAASrB;oBAAasB,QAAQ;oBAAQC,MAAM;gBAAO;gBACxE,uEAAuE;gBACvE,6DAA6D;gBAC7D;oBACEH,aAAa;oBACbC,SAAS,IAAM,IAAIG,SAAS,MAAM;4BAAEC,SAAS;gCAAEC,OAAO;4BAAO;4BAAGC,QAAQ;wBAAI;oBAC5EL,QAAQ;oBACRC,MAAM;gBACR;gBACA;oBACEH,aAAa;oBACbC,SAASpB;oBACTqB,QAAQ;oBACRC,MAAM;gBACR;aACD;QACH;IACF;AACF,GAAE"}

package/dist/mcp/buildMcpServer.d.ts

@@ -1,5 +1,5 @@
+import type { PayloadRequest } from 'payload';
 import { McpServer } from '@modelcontextprotocol/server';
-import { type PayloadRequest } from 'payload';
 import type { AuthorizedMCP, SanitizedMCPPluginConfig } from '../types.js';
 /**
  * Serving-entry-agnostic core: registers every authorized MCP item onto a fresh
@@ -9,7 +9,7 @@ import type { AuthorizedMCP, SanitizedMCPPluginConfig } from '../types.js';
  *
  * `req` is the request context handlers see. For HTTP it's the live
  * `PayloadRequest` derived from the incoming HTTP request; for stdio it's a
- * synthesized one built via `createLocalReq`.
+ * synthesized one built via `createPayloadRequest`.
  */
 export declare const buildMcpServer: ({ authorizedMCP, pluginConfig, req, }: {
     authorizedMCP: AuthorizedMCP;

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

@@ -1 +1 @@
-{"version":3,"file":"buildMcpServer.d.ts","sourceRoot":"","sources":["../../src/mcp/buildMcpServer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAsB,MAAM,8BAA8B,CAAA;AAC5E,OAAO,EAAY,KAAK,cAAc,EAAE,MAAM,SAAS,CAAA;AAGvD,OAAO,KAAK,EACV,aAAa,EAMb,wBAAwB,EAEzB,MAAM,aAAa,CAAA;AAKpB;;;;;;;;;GASG;AACH,eAAO,MAAM,cAAc,0CAIxB;IACD,aAAa,EAAE,aAAa,CAAA;IAC5B,YAAY,EAAE,wBAAwB,CAAA;IACtC,GAAG,EAAE,cAAc,CAAA;CACpB,KAAG,SAkNH,CAAA"}
+{"version":3,"file":"buildMcpServer.d.ts","sourceRoot":"","sources":["../../src/mcp/buildMcpServer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAE7C,OAAO,EAAE,SAAS,EAAsB,MAAM,8BAA8B,CAAA;AAG5E,OAAO,KAAK,EACV,aAAa,EAMb,wBAAwB,EAEzB,MAAM,aAAa,CAAA;AAKpB;;;;;;;;;GASG;AACH,eAAO,MAAM,cAAc,0CAIxB;IACD,aAAa,EAAE,aAAa,CAAA;IAC5B,YAAY,EAAE,wBAAwB,CAAA;IACtC,GAAG,EAAE,cAAc,CAAA;CACpB,KAAG,SAgNH,CAAA"}

package/dist/mcp/buildMcpServer.js

@@ -1,6 +1,5 @@
 import { McpServer } from '@modelcontextprotocol/server';
-import { APIError } from 'payload';
-import { z } from 'zod';
+import { APIError, strictObject, z } from 'payload';
 import { getLogger } from '../utils/getLogger.js';
 import { toStandardSchema } from '../utils/toStandardSchema.js';
 /**
@@ -11,8 +10,9 @@ import { toStandardSchema } from '../utils/toStandardSchema.js';
  *
  * `req` is the request context handlers see. For HTTP it's the live
  * `PayloadRequest` derived from the incoming HTTP request; for stdio it's a
- * synthesized one built via `createLocalReq`.
+ * synthesized one built via `createPayloadRequest`.
  */ export const buildMcpServer = ({ authorizedMCP, pluginConfig, req })=>{
+    z.config(z.locales.en());
     const serverOptions = pluginConfig.mcp?.serverOptions || {};
     const server = new McpServer({
         name: 'Payload MCP Server',
@@ -40,20 +40,19 @@ import { toStandardSchema } from '../utils/toStandardSchema.js';
     };
     /**
    * Runs a collection/global tool call:
-   * - reads `collectionSlug` / `globalSlug` from the input
+   * - reads `slug` from the input
    * - runs access control: errors if `authorizedMCP.items` has no entry for this tool + slug
    * - runs the tool handler and finalizes its response
    */ const callEntityTool = async ({ input, item, serverContext })=>{
         const entity = item.type === 'collectionTool' ? 'collection' : 'global';
-        const slugKey = item.type === 'collectionTool' ? 'collectionSlug' : 'globalSlug';
         const toolInput = input ?? {};
-        const slug = toolInput[slugKey];
+        const slug = toolInput.slug;
         if (!slug) {
             return {
                 content: [
                     {
                         type: 'text',
-                        text: `Error: "${item.mcpName}" requires ${slugKey}. Use getConfigInfo to inspect ${entity} slugs.`
+                        text: `Error: "${item.mcpName}" requires slug. Use getConfigInfo to inspect ${entity} slugs.`
                     }
                 ],
                 isError: true
@@ -79,10 +78,10 @@ import { toStandardSchema } from '../utils/toStandardSchema.js';
         };
         const response = await (match.type === 'collectionTool' ? match.tool.handler({
             ...handlerArgs,
-            collectionSlug: slug
+            slug
         }) : match.tool.handler({
             ...handlerArgs,
-            globalSlug: slug
+            slug
         }));
         return finalizeToolResponse({
             input: toolInput,
@@ -103,7 +102,6 @@ import { toStandardSchema } from '../utils/toStandardSchema.js';
                         }
                         registeredEntityTools.add(item.mcpName);
                         const inputSchema = withSlugInput({
-                            name: item.type === 'collectionTool' ? 'collectionSlug' : 'globalSlug',
                             input: item.tool.input
                         });
                         server.registerTool(item.mcpName, {
@@ -189,33 +187,47 @@ import { toStandardSchema } from '../utils/toStandardSchema.js';
     }
     return server;
 };
-const withSlugInput = ({ name, input })=>{
-    const description = name === 'collectionSlug' ? 'The collection slug' : 'The global slug';
-    const slugSchema = z.string().describe(description);
+const withSlugInput = ({ input })=>{
+    const description = 'The target slug.';
+    const slugSchema = z.string().check(z.describe(description));
     if (!input) {
-        return z.object({
-            [name]: slugSchema
+        return strictObject({
+            slug: slugSchema
         });
     }
-    if (input instanceof z.ZodObject) {
-        return input.extend({
-            [name]: slugSchema
+    if (typeof input === 'object' && input !== null && '~standard' in input) {
+        const schema = input['~standard'].jsonSchema.input({
+            target: 'draft-2020-12'
+        });
+        const properties = schema.properties;
+        if (properties?.slug) {
+            return input;
+        }
+        return addSlugToJSONSchema({
+            description,
+            schema: schema
         });
     }
-    const schema = input;
+    return addSlugToJSONSchema({
+        description,
+        schema: input
+    });
+};
+const addSlugToJSONSchema = ({ description, schema })=>{
+    const objectSchema = schema;
     return {
-        ...schema,
+        ...objectSchema,
         type: 'object',
         properties: {
-            ...schema.properties,
-            [name]: {
+            ...objectSchema.properties,
+            slug: {
                 type: 'string',
                 description
             }
         },
         required: Array.from(new Set([
-            name,
-            ...schema.required ?? []
+            'slug',
+            ...objectSchema.required ?? []
         ]))
     };
 };