@payloadcms/plugin-mcp 4.0.0-internal.a0ef1b8 → 4.0.0-internal.a6582c6

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

@@ -27,6 +27,13 @@ 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/defaultAccess.d.ts

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

package/dist/defaultAccess.d.ts.map

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

package/dist/defaultAccess.js

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

package/dist/defaultAccess.js.map

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

package/dist/defineTool.d.ts

@@ -11,16 +11,16 @@ import type { CollectionTool, GlobalTool, Prompt, Tool, ToolInputSchema } from '
  * Config and handler signatures are derived from `Tool` / `CollectionTool` / `GlobalTool` /
  * `Prompt` via `Omit` + indexed access so there's no duplication with `types.ts`.
  */
-export declare const defineTool: <TSchema extends ToolInputSchema | undefined = ToolInputSchema | undefined>(args: Omit<Tool<TSchema>, "handler">) => {
-    handler: (fn: Tool<TSchema>["handler"]) => Tool;
+export declare const defineTool: <TSchema extends ToolInputSchema | undefined = ToolInputSchema | undefined>(args: Omit<Tool<TSchema>, 'handler'>) => {
+    handler: (fn: Tool<TSchema>['handler']) => Tool;
 };
-export declare const defineCollectionTool: <TSchema extends ToolInputSchema | undefined = ToolInputSchema | undefined>(args: Omit<CollectionTool<TSchema>, "handler">) => {
-    handler: (fn: CollectionTool<TSchema>["handler"]) => CollectionTool;
+export declare const defineCollectionTool: <TSchema extends ToolInputSchema | undefined = ToolInputSchema | undefined>(args: Omit<CollectionTool<TSchema>, 'handler'>) => {
+    handler: (fn: CollectionTool<TSchema>['handler']) => CollectionTool;
 };
-export declare const defineGlobalTool: <TSchema extends ToolInputSchema | undefined = ToolInputSchema | undefined>(args: Omit<GlobalTool<TSchema>, "handler">) => {
-    handler: (fn: GlobalTool<TSchema>["handler"]) => GlobalTool;
+export declare const defineGlobalTool: <TSchema extends ToolInputSchema | undefined = ToolInputSchema | undefined>(args: Omit<GlobalTool<TSchema>, 'handler'>) => {
+    handler: (fn: GlobalTool<TSchema>['handler']) => GlobalTool;
 };
-export declare const definePrompt: <TSchema extends ToolInputSchema = ToolInputSchema>(args: Omit<Prompt<TSchema>, "handler">) => {
-    handler: (fn: Prompt<TSchema>["handler"]) => Prompt;
+export declare const definePrompt: <TSchema extends ToolInputSchema = ToolInputSchema>(args: Omit<Prompt<TSchema>, 'handler'>) => {
+    handler: (fn: Prompt<TSchema>['handler']) => Prompt;
 };
 //# sourceMappingURL=defineTool.d.ts.map

package/dist/defineTool.d.ts.map

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

package/dist/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,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,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

package/dist/endpoint/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/endpoint/index.ts"],"sourcesContent":["import { WebStandardStreamableHTTPServerTransport } from '@modelcontextprotocol/server'\nimport { APIError, type PayloadHandler } 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 authorizedMCP = await getAuthorizedMCP({ req })\n\n  const server = buildMcpServer({ authorizedMCP, pluginConfig, req })\n\n  const transport = new WebStandardStreamableHTTPServerTransport({\n    enableJsonResponse: true,\n    sessionIdGenerator: undefined, // stateless mode\n  })\n\n  await server.connect(transport)\n\n  const mcpRequest = new Request(req.url, {\n    body: req.body,\n    duplex: 'half',\n    headers: req.headers,\n    method: req.method,\n  } as { duplex: 'half' } & RequestInit)\n\n  return await transport.handleRequest(mcpRequest)\n}\n"],"names":["WebStandardStreamableHTTPServerTransport","APIError","buildMcpServer","getPluginConfig","getAuthorizedMCP","mcpEndpoint","req","url","payloadAPI","pluginConfig","config","payload","authorizedMCP","server","transport","enableJsonResponse","sessionIdGenerator","undefined","connect","mcpRequest","Request","body","duplex","headers","method","handleRequest"],"mappings":"AAAA,SAASA,wCAAwC,QAAQ,+BAA8B;AACvF,SAASC,QAAQ,QAA6B,UAAS;AAEvD,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,gBAAgB,MAAMR,iBAAiB;QAAEE;IAAI;IAEnD,MAAMO,SAASX,eAAe;QAAEU;QAAeH;QAAcH;IAAI;IAEjE,MAAMQ,YAAY,IAAId,yCAAyC;QAC7De,oBAAoB;QACpBC,oBAAoBC;IACtB;IAEA,MAAMJ,OAAOK,OAAO,CAACJ;IAErB,MAAMK,aAAa,IAAIC,QAAQd,IAAIC,GAAG,EAAE;QACtCc,MAAMf,IAAIe,IAAI;QACdC,QAAQ;QACRC,SAASjB,IAAIiB,OAAO;QACpBC,QAAQlB,IAAIkB,MAAM;IACpB;IAEA,OAAO,MAAMV,UAAUW,aAAa,CAACN;AACvC,EAAC"}
+{"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"}

package/dist/exports/client.d.ts

@@ -1,2 +1,2 @@
-export { AccessField } from '../components/AccessField/index.client.js';
+export {};
 //# sourceMappingURL=client.d.ts.map

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

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

package/dist/exports/client.js

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

package/dist/exports/client.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/exports/client.ts"],"sourcesContent":["'use client'\nexport { AccessField } from '../components/AccessField/index.client.js'\n"],"names":["AccessField"],"mappings":"AAAA;AACA,SAASA,WAAW,QAAQ,4CAA2C"}
+{"version":3,"sources":["../../src/exports/client.ts"],"sourcesContent":["'use client'\n\nexport {}\n"],"names":[],"mappings":"AAAA;AAEA,WAAS"}

package/dist/exports/internal.d.ts

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

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

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

package/dist/exports/internal.js

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

package/dist/exports/internal.js.map

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

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import type { AuthorizedMCP, MCPPluginConfig, SanitizedMCPPluginConfig } from './types.js';
 declare module 'payload' {
-    interface PayloadRequest {
-        payloadAPI: 'GraphQL' | 'local' | 'MCP' | 'REST';
+    interface PayloadRequestAPI {
+        MCP: true;
     }
     interface RegisteredPlugins {
         /** After the plugin's `plugin` callback runs, `options` holds the sanitized config. */

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;AAM1F,OAAO,QAAQ,SAAS,CAAC;IACvB,UAAiB,cAAc;QAC7B,UAAU,EAAE,SAAS,GAAG,OAAO,GAAG,KAAK,GAAG,MAAM,CAAA;KACjD;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,wDAwCpB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,eAAe,EAAE,wBAAwB,EAAE,MAAM,YAAY,CAAA;AAK1F,OAAO,QAAQ,SAAS,CAAC;IACvB,UAAiB,iBAAiB;QAChC,GAAG,EAAE,IAAI,CAAA;KACV;IACD,UAAU,iBAAiB;QACzB,uFAAuF;QACvF,wBAAwB,EAAE,eAAe,CAAA;KAC1C;CACF;AAED,YAAY,EAAE,aAAa,EAAE,eAAe,EAAE,wBAAwB,EAAE,CAAA;AAExE,OAAO,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAElG,eAAO,MAAM,SAAS,wDAiCpB,CAAA"}

package/dist/index.js

@@ -1,25 +1,14 @@
-import { defaultUserCollection, definePlugin } from 'payload';
-import { getAPIKeysCollection } from './collection/index.js';
+import { definePlugin } from 'payload';
 import { mcpEndpoint } from './endpoint/index.js';
 import { sanitizeMCPConfig } from './mcp/sanitizeMCPConfig.js';
 export { defineCollectionTool, defineGlobalTool, definePrompt, defineTool } from './defineTool.js';
 export const mcpPlugin = definePlugin({
     slug: '@payloadcms/plugin-mcp',
     order: 10,
-    plugin: ({ config, plugins, ...rawConfig })=>{
-        // Our `payload-mcp-api-keys` is auth-enabled; if it'd be the only auth
-        // collection, Payload's later sanitize would pick it as `admin.user`.
-        // Pre-seed the default user collection to prevent that.
-        if (!config.admin?.user) {
-            const firstCollectionWithAuth = (config.collections ?? []).find(({ auth })=>Boolean(auth));
-            if (!firstCollectionWithAuth) {
-                ;
-                (config.collections ??= []).push(defaultUserCollection);
-            }
-        }
+    plugin: ({ config, options, plugins })=>{
         const pluginConfig = sanitizeMCPConfig({
             config,
-            pluginConfig: rawConfig
+            pluginConfig: options
         });
         // Stash the sanitized config on plugin options so `getPluginConfig()` reads it.
         const registered = plugins['@payloadcms/plugin-mcp'];
@@ -27,12 +16,6 @@ export const mcpPlugin = definePlugin({
             // @ts-expect-error
             registered.sanitizedOptions = pluginConfig;
         }
-        ;
-        (config.collections ??= []).push(getAPIKeysCollection({
-            pluginConfig
-        }));
-        // Keep the API-keys collection registered even when disabled, so DB schema
-        // and generated types don't drift between enabled/disabled environments.
         if (pluginConfig.disabled) {
             return config;
         }
@@ -45,6 +28,18 @@ export const mcpPlugin = definePlugin({
                     handler: mcpEndpoint,
                     method: 'post',
                     path: '/mcp'
+                },
+                // Streamable HTTP's optional server=>client GET stream. We don't offer
+                // one, so answer 405 per spec-— clients then skip it cleanly
+                {
+                    handler: ()=>new Response(null, {
+                            headers: {
+                                Allow: 'POST'
+                            },
+                            status: 405
+                        }),
+                    method: 'get',
+                    path: '/mcp'
                 }
             ]
         };