mcp-use 1.10.0-canary.2 → 1.10.0-canary.3

package/dist/src/connectors/base.d.ts

@@ -54,7 +54,7 @@ export declare abstract class BaseConnector {
     protected client: Client | null;
     protected connectionManager: ConnectionManager<any> | null;
     protected toolsCache: Tool[] | null;
-    protected capabilitiesCache: any;
+    protected capabilitiesCache: Record<string, unknown> | null;
     protected serverInfoCache: {
         name: string;
         version?: string;
@@ -149,7 +149,7 @@ export declare abstract class BaseConnector {
     /** Lazily expose the cached tools list. */
     get tools(): Tool[];
     /** Expose cached server capabilities. */
-    get serverCapabilities(): any;
+    get serverCapabilities(): Record<string, unknown>;
     /** Expose cached server info. */
     get serverInfo(): {
         name: string;

package/dist/src/connectors/base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../../src/connectors/base.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../../src/connectors/base.ts"],"names":[],"mappings":"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"}

package/dist/src/oauth-helper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"oauth-helper.d.ts","sourceRoot":"","sources":["../../src/oauth-helper.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"oauth-helper.d.ts","sourceRoot":"","sources":["../../src/oauth-helper.ts"],"names":[],"mappings":"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"}

package/dist/src/react/WidgetControls.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WidgetControls.d.ts","sourceRoot":"","sources":["../../../src/react/WidgetControls.tsx"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAsC,MAAM,OAAO,CAAC;AAG3D,KAAK,QAAQ,GACT,UAAU,GACV,YAAY,GACZ,WAAW,GACX,aAAa,GACb,cAAc,GACd,aAAa,GACb,eAAe,GACf,cAAc,CAAC;AAEnB,UAAU,mBAAmB;IAC3B,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,QAAQ,CAAC,EAAE,WAAW,GAAG,IAAI,CAAC;IAC9B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,OAAO,GAAG,KAAK,GAAG,YAAY,CAAC;CAC/C;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,cAAc,CAAC,EAC7B,QAAQ,EACR,SAAc,EACd,QAAsB,EACtB,QAAQ,EACR,UAAiB,EACjB,QAAQ,EAAE,cAAsB,EAChC,YAAoB,GACrB,EAAE,mBAAmB,qBAmrBrB"}
+{"version":3,"file":"WidgetControls.d.ts","sourceRoot":"","sources":["../../../src/react/WidgetControls.tsx"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAsC,MAAM,OAAO,CAAC;AAG3D,KAAK,QAAQ,GACT,UAAU,GACV,YAAY,GACZ,WAAW,GACX,aAAa,GACb,cAAc,GACd,aAAa,GACb,eAAe,GACf,cAAc,CAAC;AAEnB,UAAU,mBAAmB;IAC3B,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,QAAQ,CAAC,EAAE,WAAW,GAAG,IAAI,CAAC;IAC9B,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,OAAO,GAAG,KAAK,GAAG,YAAY,CAAC;CAC/C;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,cAAc,CAAC,EAC7B,QAAQ,EACR,SAAc,EACd,QAAsB,EACtB,QAAQ,EACR,UAAiB,EACjB,QAAQ,EAAE,cAAsB,EAChC,YAAoB,GACrB,EAAE,mBAAmB,qBAwrBrB"}

package/dist/src/react/index.cjs

@@ -741,7 +741,7 @@ var BaseConnector = class {
     }
     logger.debug("Caching server capabilities & tools");
     const capabilities = this.client.getServerCapabilities();
-    this.capabilitiesCache = capabilities;
+    this.capabilitiesCache = capabilities || null;
     const serverInfo = this.client.getServerVersion();
     this.serverInfoCache = serverInfo || null;
     const listToolsRes = await this.client.listTools(
@@ -763,7 +763,7 @@ var BaseConnector = class {
   }
   /** Expose cached server capabilities. */
   get serverCapabilities() {
-    return this.capabilitiesCache;
+    return this.capabilitiesCache || {};
   }
   /** Expose cached server info. */
   get serverInfo() {
@@ -830,7 +830,8 @@ var BaseConnector = class {
       } while (cursor);
       return { resources: allResources };
     } catch (err) {
-      if (err.code === -32601) {
+      const error = err;
+      if (error.code === -32601) {
         logger.debug("Server advertised resources but method not found");
         return { resources: [] };
       }
@@ -897,7 +898,8 @@ var BaseConnector = class {
       logger.debug("Listing prompts");
       return await this.client.listPrompts();
     } catch (err) {
-      if (err.code === -32601) {
+      const error = err;
+      if (error.code === -32601) {
         logger.debug("Server advertised prompts but method not found");
         return { prompts: [] };
       }
@@ -2421,8 +2423,9 @@ function useMcp(options) {
         }
         return "success";
       } catch (err) {
-        const errorMessage = err?.message || String(err);
-        if (err.code === 401 || errorMessage.includes("401") || errorMessage.includes("Unauthorized")) {
+        const error2 = err;
+        const errorMessage = error2?.message || String(err);
+        if (error2.code === 401 || errorMessage.includes("401") || errorMessage.includes("Unauthorized")) {
           if (authProviderRef.current) {
             addLog(
               "info",
@@ -2470,7 +2473,10 @@ function useMcp(options) {
           );
           return "failed";
         }
-        failConnection(errorMessage, err);
+        failConnection(
+          errorMessage,
+          error2 instanceof Error ? error2 : new Error(String(error2))
+        );
         return "failed";
       }
     }, "tryConnectWithTransport");
@@ -3474,7 +3480,8 @@ function WidgetControls({
       const result = await callTool(toolName, args);
       setActionResult(`Success: ${JSON.stringify(result, null, 2)}`);
     } catch (error) {
-      setActionResult(`Error: ${error.message}`);
+      const err = error;
+      setActionResult(`Error: ${err.message}`);
     }
   }, "handleCallTool");
   const handleSendFollowUpMessage = /* @__PURE__ */ __name(async () => {
@@ -3483,7 +3490,8 @@ function WidgetControls({
       await sendFollowUpMessage(followUpMessage);
       setActionResult("Follow-up message sent successfully");
     } catch (error) {
-      setActionResult(`Error: ${error.message}`);
+      const err = error;
+      setActionResult(`Error: ${err.message}`);
     }
   }, "handleSendFollowUpMessage");
   const handleOpenExternal = /* @__PURE__ */ __name(() => {
@@ -3491,7 +3499,8 @@ function WidgetControls({
       openExternal(externalUrl);
       setActionResult(`Opened external link: ${externalUrl}`);
     } catch (error) {
-      setActionResult(`Error: ${error.message}`);
+      const err = error;
+      setActionResult(`Error: ${err.message}`);
     }
   }, "handleOpenExternal");
   const handleRequestDisplayMode = /* @__PURE__ */ __name(async (mode) => {
@@ -3500,7 +3509,8 @@ function WidgetControls({
       const result = await requestDisplayMode(mode);
       setActionResult(`Display mode granted: ${result.mode}`);
     } catch (error) {
-      setActionResult(`Error: ${error.message}`);
+      const err = error;
+      setActionResult(`Error: ${err.message}`);
     }
   }, "handleRequestDisplayMode");
   const handleSetState = /* @__PURE__ */ __name(async () => {
@@ -3510,7 +3520,8 @@ function WidgetControls({
       await setState(newState);
       setActionResult(`State updated: ${JSON.stringify(newState, null, 2)}`);
     } catch (error) {
-      setActionResult(`Error: ${error.message}`);
+      const err = error;
+      setActionResult(`Error: ${err.message}`);
     }
   }, "handleSetState");
   const handleFullscreen = /* @__PURE__ */ __name(async () => {

package/dist/src/react/index.js

@@ -9,13 +9,13 @@ import {
   useWidgetProps,
   useWidgetState,
   useWidgetTheme
-} from "../../chunk-BFFS67JY.js";
-import "../../chunk-HRWL2M2I.js";
+} from "../../chunk-VPHP7ERH.js";
+import "../../chunk-QBTQXCAI.js";
+import "../../chunk-LTA4LQTH.js";
+import "../../chunk-34R6SIER.js";
 import {
   onMcpAuthorization
 } from "../../chunk-3R5PDYIN.js";
-import "../../chunk-ZQUCGISK.js";
-import "../../chunk-34R6SIER.js";
 import "../../chunk-MTHLLDCX.js";
 import "../../chunk-3GQAWCBQ.js";
 export {

package/dist/src/react/useMcp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useMcp.d.ts","sourceRoot":"","sources":["../../../src/react/useMcp.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAQ9D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,wBAAgB,MAAM,CAAC,OAAO,EAAE,aAAa,GAAG,YAAY,CA4+B3D"}
+{"version":3,"file":"useMcp.d.ts","sourceRoot":"","sources":["../../../src/react/useMcp.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAQ9D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,wBAAgB,MAAM,CAAC,OAAO,EAAE,aAAa,GAAG,YAAY,CAg/B3D"}

package/dist/src/server/endpoints/mount-mcp.d.ts

@@ -13,7 +13,10 @@ import type { ServerConfig } from "../types/index.js";
  * Uses FetchStreamableHTTPServerTransport (Web Standard APIs) for proper bidirectional communication.
  * Follows the official Hono example from PR #1209.
  */
-export declare function mountMcp(app: HonoType, mcpServerInstance: any, // The McpServer instance with getServerForSession() method
+export declare function mountMcp(app: HonoType, mcpServerInstance: {
+    getServerForSession: () => import("@modelcontextprotocol/sdk/server/mcp.js").McpServer;
+    cleanupSessionSubscriptions?: (sessionId: string) => void;
+}, // The McpServer instance with getServerForSession() method
 sessions: Map<string, SessionData>, config: ServerConfig, isProductionMode: boolean): Promise<{
     mcpMounted: boolean;
     idleCleanupInterval?: NodeJS.Timeout;

package/dist/src/server/endpoints/mount-mcp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mount-mcp.d.ts","sourceRoot":"","sources":["../../../../src/server/endpoints/mount-mcp.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAW,IAAI,IAAI,QAAQ,EAAE,MAAM,MAAM,CAAC;AACtD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAGtD;;;;;GAKG;AACH,wBAAsB,QAAQ,CAC5B,GAAG,EAAE,QAAQ,EACb,iBAAiB,EAAE,GAAG,EAAE,2DAA2D;AACnF,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,EAClC,MAAM,EAAE,YAAY,EACpB,gBAAgB,EAAE,OAAO,GACxB,OAAO,CAAC;IAAE,UAAU,EAAE,OAAO,CAAC;IAAC,mBAAmB,CAAC,EAAE,MAAM,CAAC,OAAO,CAAA;CAAE,CAAC,CAgGxE"}
+{"version":3,"file":"mount-mcp.d.ts","sourceRoot":"","sources":["../../../../src/server/endpoints/mount-mcp.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAW,IAAI,IAAI,QAAQ,EAAE,MAAM,MAAM,CAAC;AACtD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAGtD;;;;;GAKG;AACH,wBAAsB,QAAQ,CAC5B,GAAG,EAAE,QAAQ,EACb,iBAAiB,EAAE;IACjB,mBAAmB,EAAE,MAAM,OAAO,yCAAyC,EAAE,SAAS,CAAC;IACvF,2BAA2B,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;CAC3D,EAAE,2DAA2D;AAC9D,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,EAClC,MAAM,EAAE,YAAY,EACpB,gBAAgB,EAAE,OAAO,GACxB,OAAO,CAAC;IAAE,UAAU,EAAE,OAAO,CAAC;IAAC,mBAAmB,CAAC,EAAE,MAAM,CAAC,OAAO,CAAA;CAAE,CAAC,CAgGxE"}

package/dist/src/server/index.cjs

@@ -403,9 +403,10 @@ function createElicitMethod(elicitInput) {
           data: validatedData
         };
       } catch (error2) {
+        const err = error2;
         throw new ElicitationValidationError(
-          `Elicitation data validation failed: ${error2.message}`,
-          error2
+          `Elicitation data validation failed: ${err.message}`,
+          err
         );
       }
     }
@@ -2398,25 +2399,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:
@@ -2425,12 +2426,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,
@@ -2452,9 +2453,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,
@@ -2494,13 +2495,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,
@@ -2510,7 +2513,7 @@ function uiResourceRegistration(definition) {
         const randomId = Math.random().toString(36).substring(2, 15);
         const uniqueUri = generateWidgetUri(
           definition.name,
-          this.buildId,
+          server.buildId,
           ".html",
           randomId
         );
@@ -2540,9 +2543,9 @@ function uiResourceRegistration(definition) {
           uiResource
         ]
       };
-    }, "cb")
-  });
-  return this;
+    }
+  );
+  return server;
 }
 __name(uiResourceRegistration, "uiResourceRegistration");
 
@@ -3605,12 +3608,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 || []
       };
@@ -3765,37 +3769,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.
@@ -3853,11 +3876,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;
           }
@@ -3906,8 +3930,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;
         }
@@ -3926,8 +3950,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;
         }
@@ -3972,20 +3996,23 @@ var MCPServer = class {
         config.name,
         template,
         metadata,
-        async (uri) => {
+        async (uri, extra) => {
           const params = this.parseTemplateUri(uriTemplate, uri.toString());
-          const result = await handler(uri, params);
+          const result = await handler(uri, params, extra);
           if ("contents" in result && Array.isArray(result.contents)) {
             return result;
           }
           const { convertToolResultToResourceResult: convertToolResultToResourceResult2 } = await Promise.resolve().then(() => (init_conversion(), conversion_exports));
-          return convertToolResultToResourceResult2(uri.toString(), result);
+          return convertToolResultToResourceResult2(
+            uri.toString(),
+            result
+          );
         }
       );
     }
     newServer.server.setRequestHandler(
       import_zod2.z.object({ method: import_zod2.z.literal("logging/setLevel") }).passthrough(),
-      async (request) => {
+      (async (request, extra) => {
         const level = request.params?.level;
         if (!level) {
           throw new import_types2.McpError(
@@ -4024,7 +4051,7 @@ var MCPServer = class {
           "[MCP] Could not find session for logging/setLevel request"
         );
         throw new import_types2.McpError(import_types2.ErrorCode.InternalError, "Could not find session");
-      }
+      })
     );
     this.subscriptionManager.registerHandlers(newServer, this.sessions);
     return newServer;
@@ -4074,7 +4101,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
    *
@@ -4162,7 +4191,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,
@@ -4215,7 +4244,7 @@ var MCPServer = class {
    * ```
    */
   async getHandler(options) {
-    if (this.oauthConfig && !this.oauthSetupState.complete) {
+    if (this.oauthConfig && !this.oauthSetupState.complete && this.oauthProvider) {
       await setupOAuthForServer(
         this.app,
         this.oauthProvider,
@@ -4368,12 +4397,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
@@ -4446,6 +4476,7 @@ var Auth0OAuthProvider = class {
     }
   }
   getUserInfo(payload) {
+    const scope = payload.scope;
     return {
       userId: payload.sub,
       email: payload.email,
@@ -4458,7 +4489,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
@@ -4530,8 +4561,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) {
@@ -4545,6 +4578,7 @@ var KeycloakOAuthProvider = class {
         }
       );
     }
+    const scope = payload.scope;
     return {
       userId: payload.sub,
       email: payload.email,
@@ -4555,7 +4589,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,
@@ -4684,7 +4718,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}`);
     }
@@ -4693,16 +4727,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() {