mcp-use 1.9.1-canary.1 → 1.10.0-canary.3

package/dist/src/server/index.js

@@ -7,7 +7,7 @@ import {
   createEnhancedContext,
   findSessionContext,
   isValidLogLevel
-} from "../../chunk-33U4IA4N.js";
+} from "../../chunk-L6P6GBCW.js";
 import {
   convertToolResultToResourceResult
 } from "../../chunk-362PI25Z.js";
@@ -1587,25 +1587,25 @@ function setupWidgetRoutes(app, serverConfig) {
 __name(setupWidgetRoutes, "setupWidgetRoutes");
 
 // src/server/widgets/ui-resource-registration.ts
-function uiResourceRegistration(definition) {
+function uiResourceRegistration(server, definition) {
   const displayName = definition.title || definition.name;
   let resourceUri;
   let mimeType;
   switch (definition.type) {
     case "externalUrl":
-      resourceUri = generateWidgetUri(definition.widget, this.buildId);
+      resourceUri = generateWidgetUri(definition.widget, server.buildId);
       mimeType = "text/uri-list";
       break;
     case "rawHtml":
-      resourceUri = generateWidgetUri(definition.name, this.buildId);
+      resourceUri = generateWidgetUri(definition.name, server.buildId);
       mimeType = "text/html";
       break;
     case "remoteDom":
-      resourceUri = generateWidgetUri(definition.name, this.buildId);
+      resourceUri = generateWidgetUri(definition.name, server.buildId);
       mimeType = "application/vnd.mcp-ui.remote-dom+javascript";
       break;
     case "appsSdk":
-      resourceUri = generateWidgetUri(definition.name, this.buildId, ".html");
+      resourceUri = generateWidgetUri(definition.name, server.buildId, ".html");
       mimeType = "text/html+skybridge";
       break;
     default:
@@ -1614,12 +1614,12 @@ function uiResourceRegistration(definition) {
       );
   }
   const serverConfig = {
-    serverHost: this.serverHost,
-    serverPort: this.serverPort || 3e3,
-    serverBaseUrl: this.serverBaseUrl,
-    buildId: this.buildId
+    serverHost: server.serverHost,
+    serverPort: server.serverPort || 3e3,
+    serverBaseUrl: server.serverBaseUrl,
+    buildId: server.buildId
   };
-  this.resource({
+  server.resource({
     name: definition.name,
     uri: resourceUri,
     title: definition.title,
@@ -1641,9 +1641,9 @@ function uiResourceRegistration(definition) {
     }, "readCallback")
   });
   if (definition.type === "appsSdk") {
-    const buildIdPart = this.buildId ? `-${this.buildId}` : "";
+    const buildIdPart = server.buildId ? `-${server.buildId}` : "";
     const uriTemplate = `ui://widget/${definition.name}${buildIdPart}-{id}.html`;
-    this.resourceTemplate({
+    server.resourceTemplate({
       name: `${definition.name}-dynamic`,
       resourceTemplate: {
         uriTemplate,
@@ -1683,13 +1683,15 @@ function uiResourceRegistration(definition) {
       }
     }
   }
-  this.tool({
-    name: definition.name,
-    title: definition.title,
-    description: definition.description,
-    inputs: convertPropsToInputs(definition.props),
-    _meta: Object.keys(toolMetadata).length > 0 ? toolMetadata : void 0,
-    cb: /* @__PURE__ */ __name(async (params) => {
+  server.tool(
+    {
+      name: definition.name,
+      title: definition.title,
+      description: definition.description,
+      inputs: convertPropsToInputs(definition.props),
+      _meta: Object.keys(toolMetadata).length > 0 ? toolMetadata : void 0
+    },
+    async (params) => {
       const uiResource = await createWidgetUIResource(
         definition,
         params,
@@ -1699,7 +1701,7 @@ function uiResourceRegistration(definition) {
         const randomId = Math.random().toString(36).substring(2, 15);
         const uniqueUri = generateWidgetUri(
           definition.name,
-          this.buildId,
+          server.buildId,
           ".html",
           randomId
         );
@@ -1729,9 +1731,9 @@ function uiResourceRegistration(definition) {
           uiResource
         ]
       };
-    }, "cb")
-  });
-  return this;
+    }
+  );
+  return server;
 }
 __name(uiResourceRegistration, "uiResourceRegistration");
 
@@ -1867,7 +1869,7 @@ function toolRegistration(toolDefinition, callback) {
       const initialRequestContext = getRequestContext();
       const extraProgressToken = extra?._meta?.progressToken;
       const extraSendNotification = extra?.sendNotification;
-      const { requestContext, progressToken, sendNotification: sendNotification2 } = findSessionContext(
+      const { requestContext, session, progressToken, sendNotification: sendNotification2 } = findSessionContext(
         this.sessions,
         initialRequestContext,
         extraProgressToken,
@@ -1878,7 +1880,9 @@ function toolRegistration(toolDefinition, callback) {
         this.createMessage.bind(this),
         this.server.server.elicitInput.bind(this.server.server),
         progressToken,
-        sendNotification2
+        sendNotification2,
+        session?.logLevel,
+        session?.clientCapabilities
       );
       const executeCallback = /* @__PURE__ */ __name(async () => {
         if (actualCallback.length >= 2) {
@@ -2057,7 +2061,7 @@ function registerResource(resourceDefinition, callback) {
   const explicitMimeType = resourceDefinition.mimeType;
   const wrappedCallback = /* @__PURE__ */ __name(async () => {
     const { getRequestContext: getRequestContext2, runWithContext: runWithContext2 } = await import("../../context-storage-NA4MHWOZ.js");
-    const { findSessionContext: findSessionContext2 } = await import("../../tool-execution-helpers-BQJTPWPN.js");
+    const { findSessionContext: findSessionContext2 } = await import("../../tool-execution-helpers-2LGVSS7L.js");
     const initialRequestContext = getRequestContext2();
     const sessions = this.sessions || /* @__PURE__ */ new Map();
     const { requestContext } = findSessionContext2(
@@ -2105,24 +2109,25 @@ function registerResourceTemplate(resourceTemplateDefinition, callback) {
       `Resource template '${resourceTemplateDefinition.name}' must have either a readCallback property or a callback parameter`
     );
   }
-  const template = new ResourceTemplate(
-    resourceTemplateDefinition.resourceTemplate.uriTemplate,
-    {
-      list: void 0,
-      // Optional: callback to list all matching resources
-      complete: void 0
-      // Optional: callback for auto-completion
-    }
-  );
+  const isFlatStructure = "uriTemplate" in resourceTemplateDefinition;
+  const uriTemplate = isFlatStructure ? resourceTemplateDefinition.uriTemplate : resourceTemplateDefinition.resourceTemplate.uriTemplate;
+  const mimeType = isFlatStructure ? resourceTemplateDefinition.mimeType : resourceTemplateDefinition.resourceTemplate.mimeType;
+  const templateDescription = isFlatStructure ? void 0 : resourceTemplateDefinition.resourceTemplate.description;
+  const template = new ResourceTemplate(uriTemplate, {
+    list: void 0,
+    // Optional: callback to list all matching resources
+    complete: void 0
+    // Optional: callback for auto-completion
+  });
   const metadata = {};
   if (resourceTemplateDefinition.title) {
     metadata.title = resourceTemplateDefinition.title;
   }
-  if (resourceTemplateDefinition.description || resourceTemplateDefinition.resourceTemplate.description) {
-    metadata.description = resourceTemplateDefinition.description || resourceTemplateDefinition.resourceTemplate.description;
+  if (resourceTemplateDefinition.description || templateDescription) {
+    metadata.description = resourceTemplateDefinition.description || templateDescription;
   }
-  if (resourceTemplateDefinition.resourceTemplate.mimeType) {
-    metadata.mimeType = resourceTemplateDefinition.resourceTemplate.mimeType;
+  if (mimeType) {
+    metadata.mimeType = mimeType;
   }
   if (resourceTemplateDefinition.annotations) {
     metadata.annotations = resourceTemplateDefinition.annotations;
@@ -2132,12 +2137,9 @@ function registerResourceTemplate(resourceTemplateDefinition, callback) {
     template,
     metadata,
     async (uri) => {
-      const params = this.parseTemplateUri(
-        resourceTemplateDefinition.resourceTemplate.uriTemplate,
-        uri.toString()
-      );
+      const params = this.parseTemplateUri(uriTemplate, uri.toString());
       const { getRequestContext: getRequestContext2, runWithContext: runWithContext2 } = await import("../../context-storage-NA4MHWOZ.js");
-      const { findSessionContext: findSessionContext2 } = await import("../../tool-execution-helpers-BQJTPWPN.js");
+      const { findSessionContext: findSessionContext2 } = await import("../../tool-execution-helpers-2LGVSS7L.js");
       const initialRequestContext = getRequestContext2();
       const sessions = this.sessions || /* @__PURE__ */ new Map();
       const { requestContext } = findSessionContext2(
@@ -2150,8 +2152,12 @@ function registerResourceTemplate(resourceTemplateDefinition, callback) {
       const executeCallback = /* @__PURE__ */ __name(async () => {
         if (actualCallback.length >= 3) {
           return await actualCallback(uri, params, enhancedContext);
+        } else if (actualCallback.length === 2) {
+          return await actualCallback(uri, params);
+        } else if (actualCallback.length === 1) {
+          return await actualCallback(uri);
         }
-        return await actualCallback(uri, params);
+        return await actualCallback();
       }, "executeCallback");
       const result = requestContext ? await runWithContext2(requestContext, executeCallback) : await executeCallback();
       if ("contents" in result && Array.isArray(result.contents)) {
@@ -2188,7 +2194,7 @@ function registerPrompt(promptDefinition, callback) {
   }
   const wrappedCallback = /* @__PURE__ */ __name(async (params, extra) => {
     const { getRequestContext: getRequestContext2, runWithContext: runWithContext2 } = await import("../../context-storage-NA4MHWOZ.js");
-    const { findSessionContext: findSessionContext2 } = await import("../../tool-execution-helpers-BQJTPWPN.js");
+    const { findSessionContext: findSessionContext2 } = await import("../../tool-execution-helpers-2LGVSS7L.js");
     const initialRequestContext = getRequestContext2();
     const sessions = this.sessions || /* @__PURE__ */ new Map();
     const { requestContext } = findSessionContext2(
@@ -2522,6 +2528,17 @@ async function mountMcp(app, mcpServerInstance, sessions, config, isProductionMo
           context: c,
           honoContext: c
         });
+        server.server.oninitialized = () => {
+          const clientCapabilities = server.server.getClientCapabilities();
+          if (clientCapabilities && sessions.has(sid)) {
+            const session = sessions.get(sid);
+            session.clientCapabilities = clientCapabilities;
+            console.log(
+              `[MCP] Captured client capabilities for session ${sid}:`,
+              Object.keys(clientCapabilities)
+            );
+          }
+        };
       }, "onsessioninitialized"),
       onsessionclosed: /* @__PURE__ */ __name((sid) => {
         console.log(`[MCP] Session closed: ${sid}`);
@@ -2765,12 +2782,13 @@ function createBearerAuthMiddleware(provider, baseUrl) {
       const result = await provider.verifyToken(token);
       const payload = result.payload;
       const user = provider.getUserInfo(payload);
+      const scope = payload.scope;
       const authInfo = {
         user,
         payload,
         accessToken: token,
         // Extract scopes from scope claim (OAuth standard)
-        scopes: payload.scope ? payload.scope.split(" ") : [],
+        scopes: scope ? scope.split(" ") : [],
         // Extract permissions (Auth0 style, or custom)
         permissions: payload.permissions || []
       };
@@ -2818,9 +2836,9 @@ async function setupOAuthForServer(app, oauthProvider, baseUrl, state) {
 __name(setupOAuthForServer, "setupOAuthForServer");
 
 // src/server/mcp-server.ts
-var McpServer = class {
+var MCPServer = class {
   static {
-    __name(this, "McpServer");
+    __name(this, "MCPServer");
   }
   /**
    * Native MCP server instance from @modelcontextprotocol/sdk
@@ -2887,7 +2905,7 @@ var McpServer = class {
    * access to Hono methods while preserving MCP server functionality.
    *
    * @param config - Server configuration including name, version, and description
-   * @returns A proxied McpServer instance that supports both MCP and Hono methods
+   * @returns A proxied MCPServer instance that supports both MCP and Hono methods
    */
   constructor(config) {
     this.config = config;
@@ -2925,37 +2943,56 @@ var McpServer = class {
     const self = this;
     this.tool = ((toolDefinition, callback) => {
       const actualCallback = callback || toolDefinition.cb;
-      self.registrationRecipes.tools.set(toolDefinition.name, {
-        config: toolDefinition,
-        handler: actualCallback
-      });
+      if (actualCallback) {
+        self.registrationRecipes.tools.set(toolDefinition.name, {
+          config: toolDefinition,
+          handler: actualCallback
+        });
+      }
       return originalTool.call(self, toolDefinition, callback);
     });
-    this.prompt = function(promptDefinition, callback) {
+    this.prompt = ((promptDefinition, callback) => {
       const actualCallback = callback || promptDefinition.cb;
-      self.registrationRecipes.prompts.set(promptDefinition.name, {
-        config: promptDefinition,
-        handler: actualCallback
-      });
-      return originalPrompt.call(self, promptDefinition, callback);
-    };
-    this.resource = function(resourceDefinition, callback) {
+      if (actualCallback) {
+        self.registrationRecipes.prompts.set(promptDefinition.name, {
+          config: promptDefinition,
+          handler: actualCallback
+        });
+      }
+      return originalPrompt.call(
+        self,
+        promptDefinition,
+        callback
+      );
+    });
+    this.resource = ((resourceDefinition, callback) => {
       const actualCallback = callback || resourceDefinition.readCallback;
-      const resourceKey = `${resourceDefinition.name}:${resourceDefinition.uri}`;
-      self.registrationRecipes.resources.set(resourceKey, {
-        config: resourceDefinition,
-        handler: actualCallback
-      });
+      if (actualCallback) {
+        const resourceKey = `${resourceDefinition.name}:${resourceDefinition.uri}`;
+        self.registrationRecipes.resources.set(resourceKey, {
+          config: resourceDefinition,
+          handler: actualCallback
+        });
+      }
       return originalResource.call(self, resourceDefinition, callback);
-    };
-    this.resourceTemplate = function(templateDefinition, callback) {
+    });
+    this.resourceTemplate = ((templateDefinition, callback) => {
       const actualCallback = callback || templateDefinition.readCallback;
-      self.registrationRecipes.resourceTemplates.set(templateDefinition.name, {
-        config: templateDefinition,
-        handler: actualCallback
-      });
-      return originalResourceTemplate.call(self, templateDefinition, callback);
-    };
+      if (actualCallback) {
+        self.registrationRecipes.resourceTemplates.set(
+          templateDefinition.name,
+          {
+            config: templateDefinition,
+            handler: actualCallback
+          }
+        );
+      }
+      return originalResourceTemplate.call(
+        self,
+        templateDefinition,
+        callback
+      );
+    });
   }
   /**
    * Create a new server instance for a session following official SDK pattern.
@@ -2993,6 +3030,15 @@ var McpServer = class {
           extraProgressToken,
           extraSendNotification
         );
+        let sessionId;
+        if (session) {
+          for (const [id, s] of this.sessions.entries()) {
+            if (s === session) {
+              sessionId = id;
+              break;
+            }
+          }
+        }
         const createMessageWithLogging = /* @__PURE__ */ __name(async (params2, options) => {
           console.log("[createMessage] About to call server.createMessage");
           console.log("[createMessage] Has server:", !!newServer);
@@ -3004,11 +3050,12 @@ var McpServer = class {
             console.log("[createMessage] Got result successfully");
             return result;
           } catch (err) {
+            const error2 = err;
             console.error(
               "[createMessage] Error:",
-              err.message,
+              error2.message,
               "Code:",
-              err.code
+              error2.code
             );
             throw err;
           }
@@ -3019,7 +3066,10 @@ var McpServer = class {
           newServer.server.elicitInput.bind(newServer.server),
           progressToken,
           sendNotification2,
-          session?.logLevel
+          session?.logLevel,
+          session?.clientCapabilities,
+          sessionId,
+          this.sessions
         );
         const executeCallback = /* @__PURE__ */ __name(async () => {
           if (actualCallback.length >= 2) {
@@ -3054,8 +3104,8 @@ var McpServer = class {
       } else {
         argsSchema = void 0;
       }
-      const wrappedHandler = /* @__PURE__ */ __name(async (params) => {
-        const result = await handler(params);
+      const wrappedHandler = /* @__PURE__ */ __name(async (params, extra) => {
+        const result = await handler(params, extra);
         if ("messages" in result && Array.isArray(result.messages)) {
           return result;
         }
@@ -3074,8 +3124,8 @@ var McpServer = class {
     }
     for (const [_key, recipe] of this.registrationRecipes.resources) {
       const { config, handler } = recipe;
-      const wrappedHandler = /* @__PURE__ */ __name(async () => {
-        const result = await handler();
+      const wrappedHandler = /* @__PURE__ */ __name(async (extra) => {
+        const result = await handler(extra);
         if ("contents" in result && Array.isArray(result.contents)) {
           return result;
         }
@@ -3095,22 +3145,23 @@ var McpServer = class {
     }
     for (const [_name, recipe] of this.registrationRecipes.resourceTemplates) {
       const { config, handler } = recipe;
-      const template = new ResourceTemplate2(
-        config.resourceTemplate.uriTemplate,
-        {
-          list: void 0,
-          complete: void 0
-        }
-      );
+      const isFlatStructure = "uriTemplate" in config;
+      const uriTemplate = isFlatStructure ? config.uriTemplate : config.resourceTemplate.uriTemplate;
+      const mimeType = isFlatStructure ? config.mimeType : config.resourceTemplate.mimeType;
+      const templateDescription = isFlatStructure ? void 0 : config.resourceTemplate.description;
+      const template = new ResourceTemplate2(uriTemplate, {
+        list: void 0,
+        complete: void 0
+      });
       const metadata = {};
       if (config.title) {
         metadata.title = config.title;
       }
-      if (config.description || config.resourceTemplate.description) {
-        metadata.description = config.description || config.resourceTemplate.description;
+      if (config.description || templateDescription) {
+        metadata.description = config.description || templateDescription;
       }
-      if (config.resourceTemplate.mimeType) {
-        metadata.mimeType = config.resourceTemplate.mimeType;
+      if (mimeType) {
+        metadata.mimeType = mimeType;
       }
       if (config.annotations) {
         metadata.annotations = config.annotations;
@@ -3119,23 +3170,23 @@ var McpServer = class {
         config.name,
         template,
         metadata,
-        async (uri) => {
-          const params = this.parseTemplateUri(
-            config.resourceTemplate.uriTemplate,
-            uri.toString()
-          );
-          const result = await handler(uri, params);
+        async (uri, extra) => {
+          const params = this.parseTemplateUri(uriTemplate, uri.toString());
+          const result = await handler(uri, params, extra);
           if ("contents" in result && Array.isArray(result.contents)) {
             return result;
           }
           const { convertToolResultToResourceResult: convertToolResultToResourceResult2 } = await import("../../conversion-5MA4VY3B.js");
-          return convertToolResultToResourceResult2(uri.toString(), result);
+          return convertToolResultToResourceResult2(
+            uri.toString(),
+            result
+          );
         }
       );
     }
     newServer.server.setRequestHandler(
       z2.object({ method: z2.literal("logging/setLevel") }).passthrough(),
-      async (request) => {
+      (async (request, extra) => {
         const level = request.params?.level;
         if (!level) {
           throw new McpError(
@@ -3174,7 +3225,7 @@ var McpServer = class {
           "[MCP] Could not find session for logging/setLevel request"
         );
         throw new McpError(ErrorCode.InternalError, "Could not find session");
-      }
+      })
     );
     this.subscriptionManager.registerHandlers(newServer, this.sessions);
     return newServer;
@@ -3224,7 +3275,9 @@ var McpServer = class {
   async notifyResourceUpdated(uri) {
     return this.subscriptionManager.notifyResourceUpdated(uri, this.sessions);
   }
-  uiResource = uiResourceRegistration;
+  uiResource = /* @__PURE__ */ __name((definition) => {
+    return uiResourceRegistration(this, definition);
+  }, "uiResource");
   /**
    * Mount MCP server endpoints at /mcp and /sse
    *
@@ -3249,7 +3302,7 @@ var McpServer = class {
     const result = await mountMcp(
       this.app,
       this,
-      // Pass the McpServer instance so mountMcp can call getServerForSession()
+      // Pass the MCPServer instance so mountMcp can call getServerForSession()
       this.sessions,
       this.config,
       isProductionMode()
@@ -3312,7 +3365,7 @@ var McpServer = class {
       this.serverHost,
       this.serverPort
     );
-    if (this.oauthConfig && !this.oauthSetupState.complete) {
+    if (this.oauthConfig && !this.oauthSetupState.complete && this.oauthProvider) {
       await setupOAuthForServer(
         this.app,
         this.oauthProvider,
@@ -3349,7 +3402,7 @@ var McpServer = class {
    * @example
    * ```typescript
    * // For Supabase Edge Functions (handles path rewriting automatically)
-   * const server = createMCPServer('my-server');
+   * const server = new MCPServer({ name: 'my-server', version: '1.0.0' });
    * server.tool({ ... });
    * const handler = await server.getHandler({ provider: 'supabase' });
    * Deno.serve(handler);
@@ -3358,14 +3411,14 @@ var McpServer = class {
    * @example
    * ```typescript
    * // For Cloudflare Workers
-   * const server = createMCPServer('my-server');
+   * const server = new MCPServer({ name: 'my-server', version: '1.0.0' });
    * server.tool({ ... });
    * const handler = await server.getHandler();
    * export default { fetch: handler };
    * ```
    */
   async getHandler(options) {
-    if (this.oauthConfig && !this.oauthSetupState.complete) {
+    if (this.oauthConfig && !this.oauthSetupState.complete && this.oauthProvider) {
       await setupOAuthForServer(
         this.app,
         this.oauthProvider,
@@ -3436,7 +3489,7 @@ var McpServer = class {
   }
 };
 function createMCPServer(name, config = {}) {
-  const instance = new McpServer({
+  const instance = new MCPServer({
     name,
     version: config.version || "1.0.0",
     description: config.description,
@@ -3520,12 +3573,13 @@ var SupabaseOAuthProvider = class {
     }
   }
   getUserInfo(payload) {
+    const userMetadata = payload.user_metadata;
     return {
       userId: payload.sub || payload.user_id,
       email: payload.email,
-      name: payload.user_metadata?.name || payload.user_metadata?.full_name,
-      username: payload.user_metadata?.username,
-      picture: payload.user_metadata?.avatar_url,
+      name: userMetadata?.name || userMetadata?.full_name,
+      username: userMetadata?.username,
+      picture: userMetadata?.avatar_url,
       roles: payload.role ? [payload.role] : [],
       permissions: payload.aal ? [`aal:${payload.aal}`] : [],
       // Include Supabase-specific claims
@@ -3598,6 +3652,7 @@ var Auth0OAuthProvider = class {
     }
   }
   getUserInfo(payload) {
+    const scope = payload.scope;
     return {
       userId: payload.sub,
       email: payload.email,
@@ -3610,7 +3665,7 @@ var Auth0OAuthProvider = class {
       // Auth0 can include roles (if configured)
       roles: payload.roles || payload["https://your-app.com/roles"] || [],
       // Include scope as well
-      scopes: payload.scope ? payload.scope.split(" ") : [],
+      scopes: scope ? scope.split(" ") : [],
       // Additional Auth0-specific claims
       email_verified: payload.email_verified,
       updated_at: payload.updated_at
@@ -3682,8 +3737,10 @@ var KeycloakOAuthProvider = class {
     }
   }
   getUserInfo(payload) {
-    const realmRoles = payload.realm_access?.roles || [];
-    const clientRoles = this.config.clientId && payload.resource_access?.[this.config.clientId]?.roles || [];
+    const realmAccess = payload.realm_access;
+    const realmRoles = realmAccess?.roles || [];
+    const resourceAccess = payload.resource_access;
+    const clientRoles = this.config.clientId && (resourceAccess?.[this.config.clientId]?.roles || []) || [];
     const allRoles = [...realmRoles, ...clientRoles];
     const permissions = [];
     if (payload.resource_access) {
@@ -3697,6 +3754,7 @@ var KeycloakOAuthProvider = class {
         }
       );
     }
+    const scope = payload.scope;
     return {
       userId: payload.sub,
       email: payload.email,
@@ -3707,7 +3765,7 @@ var KeycloakOAuthProvider = class {
       roles: allRoles,
       permissions,
       // Include scope as well
-      scopes: payload.scope ? payload.scope.split(" ") : [],
+      scopes: scope ? scope.split(" ") : [],
       // Keycloak-specific claims
       email_verified: payload.email_verified,
       given_name: payload.given_name,
@@ -3836,7 +3894,7 @@ var CustomOAuthProvider = class {
   async verifyToken(token) {
     try {
       const result = await this.config.verifyToken(token);
-      return { payload: result };
+      return result;
     } catch (error2) {
       throw new Error(`Custom OAuth verification failed: ${error2}`);
     }
@@ -3845,16 +3903,19 @@ var CustomOAuthProvider = class {
     if (this.config.getUserInfo) {
       return this.config.getUserInfo(payload);
     }
+    const scope = payload.scope;
+    const roles = payload.roles;
+    const permissions = payload.permissions;
     return {
       userId: payload.sub || payload.user_id || payload.id,
-      email: payload.email,
-      name: payload.name,
-      username: payload.username || payload.preferred_username,
-      nickname: payload.nickname,
-      picture: payload.picture || payload.avatar_url,
-      roles: payload.roles || [],
-      permissions: payload.permissions || [],
-      scopes: payload.scope ? payload.scope.split(" ") : []
+      email: payload.email ? payload.email : void 0,
+      name: payload.name ? payload.name : void 0,
+      username: payload.username || payload.preferred_username ? payload.username || payload.preferred_username : void 0,
+      nickname: payload.nickname ? payload.nickname : void 0,
+      picture: payload.picture || payload.avatar_url ? payload.picture || payload.avatar_url : void 0,
+      roles: Array.isArray(roles) ? roles : [],
+      permissions: Array.isArray(permissions) ? permissions : [],
+      scopes: scope ? scope.split(" ") : []
     };
   }
   getIssuer() {
@@ -4039,6 +4100,7 @@ function requireAnyScope(needed) {
 }
 __name(requireAnyScope, "requireAnyScope");
 export {
+  MCPServer,
   adaptConnectMiddleware,
   adaptMiddleware,
   array,