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

package/dist/src/server/index.js

@@ -7,7 +7,7 @@ import {
   createEnhancedContext,
   findSessionContext,
   isValidLogLevel
-} from "../../chunk-Q3PFK7Y4.js";
+} from "../../chunk-L6P6GBCW.js";
 import {
   convertToolResultToResourceResult
 } from "../../chunk-362PI25Z.js";
@@ -307,37 +307,12 @@ function binary(base64Data, mimeType) {
 }
 __name(binary, "binary");
 function widget(config) {
-  const {
-    name,
-    data,
-    message,
-    invoking,
-    invoked,
-    widgetAccessible = true,
-    resultCanProduceWidget = true,
-    buildId
-  } = config;
-  const randomId = Math.random().toString(36).substring(2, 15);
-  const buildIdPart = buildId ? `-${buildId}` : "";
-  const uniqueUri = `ui://widget/${name}${buildIdPart}-${randomId}.html`;
-  const metadata = {
-    "openai/outputTemplate": uniqueUri,
-    "openai/widgetAccessible": widgetAccessible,
-    "openai/resultCanProduceWidget": resultCanProduceWidget
-  };
-  if (invoking) {
-    metadata["openai/toolInvocation/invoking"] = invoking;
-  }
-  if (invoked) {
-    metadata["openai/toolInvocation/invoked"] = invoked;
-  }
-  const displayMessage = message || `Displaying ${name}`;
+  const { data, message } = config;
   return {
-    _meta: metadata,
     content: [
       {
         type: "text",
-        text: displayMessage
+        text: message || ""
       }
     ],
     // structuredContent will be injected as window.openai.toolOutput by Apps SDK
@@ -1006,6 +981,7 @@ function createWidgetRegistration(widgetName, metadata, html2, serverConfig, isD
   const props = metadata.inputs || {};
   const description = metadata.description || `Widget: ${widgetName}`;
   const title = metadata.title || widgetName;
+  const exposeAsTool = metadata.exposeAsTool !== void 0 ? metadata.exposeAsTool : true;
   const mcp_connect_domain = serverConfig.serverBaseUrl ? new URL(serverConfig.serverBaseUrl || "").origin : null;
   return {
     name: widgetName,
@@ -1021,7 +997,8 @@ function createWidgetRegistration(widgetName, metadata, html2, serverConfig, isD
         type: "appsSdk",
         props,
         html: html2,
-        dev: isDev
+        dev: isDev,
+        exposeAsTool
       },
       ...metadata._meta || {}
     },
@@ -1587,25 +1564,31 @@ 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;
+  if (definition.type === "appsSdk" && definition._meta) {
+    server.widgetDefinitions.set(
+      definition.name,
+      definition._meta
+    );
+  }
   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 +1597,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 +1624,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,
@@ -1668,70 +1651,77 @@ function uiResourceRegistration(definition) {
       }, "readCallback")
     });
   }
-  const toolMetadata = definition._meta || {};
-  if (definition.type === "appsSdk" && definition.appsSdkMetadata) {
-    toolMetadata["openai/outputTemplate"] = resourceUri;
-    const toolMetadataFields = [
-      "openai/toolInvocation/invoking",
-      "openai/toolInvocation/invoked",
-      "openai/widgetAccessible",
-      "openai/resultCanProduceWidget"
-    ];
-    for (const field of toolMetadataFields) {
-      if (definition.appsSdkMetadata[field] !== void 0) {
-        toolMetadata[field] = definition.appsSdkMetadata[field];
+  const widgetMetadata = definition._meta?.["mcp-use/widget"];
+  const exposeAsTool = definition.exposeAsTool ?? widgetMetadata?.exposeAsTool ?? true;
+  if (exposeAsTool) {
+    const toolMetadata = definition._meta || {};
+    if (definition.type === "appsSdk" && definition.appsSdkMetadata) {
+      toolMetadata["openai/outputTemplate"] = resourceUri;
+      const toolMetadataFields = [
+        "openai/toolInvocation/invoking",
+        "openai/toolInvocation/invoked",
+        "openai/widgetAccessible",
+        "openai/resultCanProduceWidget"
+      ];
+      for (const field of toolMetadataFields) {
+        if (definition.appsSdkMetadata[field] !== void 0) {
+          toolMetadata[field] = definition.appsSdkMetadata[field];
+        }
       }
     }
-  }
-  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) => {
-      const uiResource = await createWidgetUIResource(
-        definition,
-        params,
-        serverConfig
-      );
-      if (definition.type === "appsSdk") {
-        const randomId = Math.random().toString(36).substring(2, 15);
-        const uniqueUri = generateWidgetUri(
-          definition.name,
-          this.buildId,
-          ".html",
-          randomId
+    server.tool(
+      {
+        name: definition.name,
+        title: definition.title,
+        description: definition.description,
+        inputs: convertPropsToInputs(definition.props),
+        annotations: definition.toolAnnotations,
+        _meta: Object.keys(toolMetadata).length > 0 ? toolMetadata : void 0
+      },
+      async (params) => {
+        const uiResource = await createWidgetUIResource(
+          definition,
+          params,
+          serverConfig
         );
-        const uniqueToolMetadata = {
-          ...toolMetadata,
-          "openai/outputTemplate": uniqueUri
-        };
+        if (definition.type === "appsSdk") {
+          const randomId = Math.random().toString(36).substring(2, 15);
+          const uniqueUri = generateWidgetUri(
+            definition.name,
+            server.buildId,
+            ".html",
+            randomId
+          );
+          const uniqueToolMetadata = {
+            ...toolMetadata,
+            "openai/outputTemplate": uniqueUri
+          };
+          return {
+            _meta: uniqueToolMetadata,
+            content: [
+              {
+                type: "text",
+                text: `Displaying ${displayName}`
+              }
+            ],
+            // structuredContent will be injected as window.openai.toolOutput by Apps SDK
+            structuredContent: params
+          };
+        }
         return {
-          _meta: uniqueToolMetadata,
           content: [
             {
               type: "text",
-              text: `Displaying ${displayName}`
-            }
-          ],
-          // structuredContent will be injected as window.openai.toolOutput by Apps SDK
-          structuredContent: params
+              text: `Displaying ${displayName}`,
+              description: `Show MCP-UI widget for ${displayName}`
+            },
+            uiResource
+          ]
         };
       }
-      return {
-        content: [
-          {
-            type: "text",
-            text: `Displaying ${displayName}`,
-            description: `Show MCP-UI widget for ${displayName}`
-          },
-          uiResource
-        ]
-      };
-    }, "cb")
-  });
-  return this;
+    );
+  }
+  return server;
 }
 __name(uiResourceRegistration, "uiResourceRegistration");
 
@@ -2059,7 +2049,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-RRMGLAHR.js");
+    const { findSessionContext: findSessionContext2 } = await import("../../tool-execution-helpers-2LGVSS7L.js");
     const initialRequestContext = getRequestContext2();
     const sessions = this.sessions || /* @__PURE__ */ new Map();
     const { requestContext } = findSessionContext2(
@@ -2137,7 +2127,7 @@ function registerResourceTemplate(resourceTemplateDefinition, callback) {
     async (uri) => {
       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-RRMGLAHR.js");
+      const { findSessionContext: findSessionContext2 } = await import("../../tool-execution-helpers-2LGVSS7L.js");
       const initialRequestContext = getRequestContext2();
       const sessions = this.sessions || /* @__PURE__ */ new Map();
       const { requestContext } = findSessionContext2(
@@ -2192,7 +2182,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-RRMGLAHR.js");
+    const { findSessionContext: findSessionContext2 } = await import("../../tool-execution-helpers-2LGVSS7L.js");
     const initialRequestContext = getRequestContext2();
     const sessions = this.sessions || /* @__PURE__ */ new Map();
     const { requestContext } = findSessionContext2(
@@ -2780,12 +2770,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 || []
       };
@@ -2833,9 +2824,9 @@ async function setupOAuthForServer(app, oauthProvider, baseUrl, state) {
 __name(setupOAuthForServer, "setupOAuthForServer");
 
 // src/server/mcp-server.ts
-var MCPServer = class {
+var MCPServerClass = class {
   static {
-    __name(this, "MCPServer");
+    __name(this, "MCPServerClass");
   }
   /**
    * Native MCP server instance from @modelcontextprotocol/sdk
@@ -2859,8 +2850,6 @@ var MCPServer = class {
   buildId;
   sessions = /* @__PURE__ */ new Map();
   idleCleanupInterval;
-  oauthConfig;
-  // Store OAuth config for lazy initialization
   oauthSetupState = {
     complete: false,
     provider: void 0,
@@ -2878,6 +2867,11 @@ var MCPServer = class {
     resources: /* @__PURE__ */ new Map(),
     resourceTemplates: /* @__PURE__ */ new Map()
   };
+  /**
+   * Storage for widget definitions, used to inject metadata into tool responses
+   * when using the widget() helper with returnsWidget option
+   */
+  widgetDefinitions = /* @__PURE__ */ new Map();
   /**
    * Resource subscription manager for tracking and notifying resource updates
    */
@@ -2924,7 +2918,7 @@ var MCPServer = class {
       }
     );
     this.app = createHonoApp(requestLogger);
-    this.oauthConfig = config.oauth;
+    this.oauthProvider = config.oauth;
     this.wrapRegistrationMethods();
     return createHonoProxy(this, this.app);
   }
@@ -2939,38 +2933,97 @@ var MCPServer = class {
     const originalResourceTemplate = registerResourceTemplate;
     const self = this;
     this.tool = ((toolDefinition, callback) => {
-      const actualCallback = callback || toolDefinition.cb;
-      self.registrationRecipes.tools.set(toolDefinition.name, {
-        config: toolDefinition,
-        handler: actualCallback
-      });
-      return originalTool.call(self, toolDefinition, callback);
+      const widgetConfig = toolDefinition.widget;
+      const widgetName = widgetConfig?.name;
+      if (widgetConfig && widgetName) {
+        const buildIdPart = self.buildId ? `-${self.buildId}` : "";
+        const outputTemplate = `ui://widget/${widgetName}${buildIdPart}.html`;
+        toolDefinition._meta = {
+          ...toolDefinition._meta,
+          "openai/outputTemplate": outputTemplate,
+          "openai/toolInvocation/invoking": widgetConfig.invoking ?? `Loading ${widgetName}...`,
+          "openai/toolInvocation/invoked": widgetConfig.invoked ?? `${widgetName} ready`,
+          "openai/widgetAccessible": widgetConfig.widgetAccessible ?? true,
+          "openai/resultCanProduceWidget": widgetConfig.resultCanProduceWidget ?? true
+        };
+      }
+      let actualCallback = callback || toolDefinition.cb;
+      if (widgetConfig && widgetName && actualCallback) {
+        const originalCallback = actualCallback;
+        actualCallback = /* @__PURE__ */ __name((async (params, ctx) => {
+          const result = await originalCallback(params, ctx);
+          const widgetDef = self.widgetDefinitions.get(widgetName);
+          if (result && typeof result === "object") {
+            const randomId = Math.random().toString(36).substring(2, 15);
+            const buildIdPart = self.buildId ? `-${self.buildId}` : "";
+            const uniqueUri = `ui://widget/${widgetName}${buildIdPart}-${randomId}.html`;
+            const responseMeta = {
+              ...widgetDef || {},
+              // Include mcp-use/widget and other widget metadata
+              "openai/outputTemplate": uniqueUri,
+              "openai/toolInvocation/invoking": widgetConfig.invoking ?? `Loading ${widgetName}...`,
+              "openai/toolInvocation/invoked": widgetConfig.invoked ?? `${widgetName} ready`,
+              "openai/widgetAccessible": widgetConfig.widgetAccessible ?? true,
+              "openai/resultCanProduceWidget": widgetConfig.resultCanProduceWidget ?? true
+            };
+            result._meta = responseMeta;
+            if (result.content?.[0]?.type === "text" && !result.content[0].text) {
+              result.content[0].text = `Displaying ${widgetName}`;
+            }
+          }
+          return result;
+        }), "actualCallback");
+      }
+      if (actualCallback) {
+        self.registrationRecipes.tools.set(toolDefinition.name, {
+          config: toolDefinition,
+          handler: actualCallback
+        });
+      }
+      return originalTool.call(self, toolDefinition, actualCallback);
     });
-    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.
@@ -3028,11 +3081,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;
           }
@@ -3081,8 +3135,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;
         }
@@ -3101,8 +3155,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;
         }
@@ -3147,20 +3201,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 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(
@@ -3199,7 +3256,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;
@@ -3215,18 +3272,18 @@ var MCPServer = class {
       this.serverPort
     );
   }
-  // Tool registration helper
-  tool = toolRegistration;
+  // Tool registration helper - type is set in wrapRegistrationMethods
+  tool;
   // Schema conversion helpers (used by tool registration)
   convertZodSchemaToParams = convertZodSchemaToParams;
   createParamsSchema = createParamsSchema;
   // Template URI parsing helper (used by resource templates)
   parseTemplateUri = parseTemplateUri;
-  // Resource registration helpers
-  resource = registerResource;
-  resourceTemplate = registerResourceTemplate;
-  // Prompt registration helper
-  prompt = registerPrompt;
+  // Resource registration helpers - types are set in wrapRegistrationMethods
+  resource;
+  resourceTemplate;
+  // Prompt registration helper - type is set in wrapRegistrationMethods
+  prompt;
   // Notification helpers
   getActiveSessions = getActiveSessions;
   sendNotification = sendNotification;
@@ -3249,7 +3306,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
    *
@@ -3337,7 +3396,7 @@ var MCPServer = class {
       this.serverHost,
       this.serverPort
     );
-    if (this.oauthConfig && !this.oauthSetupState.complete) {
+    if (this.oauthProvider && !this.oauthSetupState.complete) {
       await setupOAuthForServer(
         this.app,
         this.oauthProvider,
@@ -3390,7 +3449,7 @@ var MCPServer = class {
    * ```
    */
   async getHandler(options) {
-    if (this.oauthConfig && !this.oauthSetupState.complete) {
+    if (this.oauthProvider && !this.oauthSetupState.complete) {
       await setupOAuthForServer(
         this.app,
         this.oauthProvider,
@@ -3460,8 +3519,9 @@ var MCPServer = class {
     }
   }
 };
+var MCPServer = MCPServerClass;
 function createMCPServer(name, config = {}) {
-  const instance = new MCPServer({
+  const instance = new MCPServerClass({
     name,
     version: config.version || "1.0.0",
     description: config.description,
@@ -3545,12 +3605,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
@@ -3623,6 +3684,7 @@ var Auth0OAuthProvider = class {
     }
   }
   getUserInfo(payload) {
+    const scope = payload.scope;
     return {
       userId: payload.sub,
       email: payload.email,
@@ -3635,7 +3697,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
@@ -3707,8 +3769,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) {
@@ -3722,6 +3786,7 @@ var KeycloakOAuthProvider = class {
         }
       );
     }
+    const scope = payload.scope;
     return {
       userId: payload.sub,
       email: payload.email,
@@ -3732,7 +3797,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,
@@ -3861,7 +3926,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}`);
     }
@@ -3870,16 +3935,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() {