mcp-use 1.2.1 → 1.2.2-canary.0

package/dist/index.cjs

@@ -3325,6 +3325,7 @@ var BaseConnector = class {
   client = null;
   connectionManager = null;
   toolsCache = null;
+  capabilitiesCache = null;
   connected = false;
   opts;
   constructor(opts = {}) {
@@ -3358,9 +3359,11 @@ var BaseConnector = class {
     }
     logger.debug("Caching server capabilities & tools");
     const capabilities = this.client.getServerCapabilities();
+    this.capabilitiesCache = capabilities;
     const listToolsRes = await this.client.listTools(void 0, defaultRequestOptions);
     this.toolsCache = listToolsRes.tools ?? [];
     logger.debug(`Fetched ${this.toolsCache.length} tools from server`);
+    logger.debug("Server capabilities:", capabilities);
     return capabilities;
   }
   /** Lazily expose the cached tools list. */
@@ -3382,7 +3385,7 @@ var BaseConnector = class {
   }
   /**
    * List resources from the server with optional pagination
-   * 
+   *
    * @param cursor - Optional cursor for pagination
    * @param options - Request options
    * @returns Resource list with optional nextCursor for pagination
@@ -3396,7 +3399,7 @@ var BaseConnector = class {
   }
   /**
    * List all resources from the server, automatically handling pagination
-   * 
+   *
    * @param options - Request options
    * @returns Complete list of all resources
    */
@@ -3404,19 +3407,31 @@ var BaseConnector = class {
     if (!this.client) {
       throw new Error("MCP client is not connected");
     }
-    logger.debug("Listing all resources (with auto-pagination)");
-    const allResources = [];
-    let cursor = void 0;
-    do {
-      const result = await this.client.listResources({ cursor }, options);
-      allResources.push(...result.resources || []);
-      cursor = result.nextCursor;
-    } while (cursor);
-    return { resources: allResources };
+    if (!this.capabilitiesCache?.resources) {
+      logger.debug("Server does not advertise resources capability, skipping");
+      return { resources: [] };
+    }
+    try {
+      logger.debug("Listing all resources (with auto-pagination)");
+      const allResources = [];
+      let cursor = void 0;
+      do {
+        const result = await this.client.listResources({ cursor }, options);
+        allResources.push(...result.resources || []);
+        cursor = result.nextCursor;
+      } while (cursor);
+      return { resources: allResources };
+    } catch (err) {
+      if (err.code === -32601) {
+        logger.debug("Server advertised resources but method not found");
+        return { resources: [] };
+      }
+      throw err;
+    }
   }
   /**
    * List resource templates from the server
-   * 
+   *
    * @param options - Request options
    * @returns List of available resource templates
    */
@@ -3434,11 +3449,11 @@ var BaseConnector = class {
     }
     logger.debug(`Reading resource ${uri}`);
     const res = await this.client.readResource({ uri }, options);
-    return { content: res.content, mimeType: res.mimeType };
+    return res;
   }
   /**
    * Subscribe to resource updates
-   * 
+   *
    * @param uri - URI of the resource to subscribe to
    * @param options - Request options
    */
@@ -3451,7 +3466,7 @@ var BaseConnector = class {
   }
   /**
    * Unsubscribe from resource updates
-   * 
+   *
    * @param uri - URI of the resource to unsubscribe from
    * @param options - Request options
    */
@@ -3466,8 +3481,20 @@ var BaseConnector = class {
     if (!this.client) {
       throw new Error("MCP client is not connected");
     }
-    logger.debug("Listing prompt");
-    return await this.client.listPrompts();
+    if (!this.capabilitiesCache?.prompts) {
+      logger.debug("Server does not advertise prompts capability, skipping");
+      return { prompts: [] };
+    }
+    try {
+      logger.debug("Listing prompts");
+      return await this.client.listPrompts();
+    } catch (err) {
+      if (err.code === -32601) {
+        logger.debug("Server advertised prompts but method not found");
+        return { prompts: [] };
+      }
+      throw err;
+    }
   }
   async getPrompt(name, args) {
     if (!this.client) {
@@ -3563,7 +3590,9 @@ var HttpConnector = class extends BaseConnector {
       logger.info("\u2705 Successfully connected via streamable HTTP");
     } catch (err) {
       let fallbackReason = "Unknown error";
+      let is401Error = false;
       if (err instanceof import_streamableHttp2.StreamableHTTPError) {
+        is401Error = err.code === 401;
         if (err.code === 400 && err.message.includes("Missing session ID")) {
           fallbackReason = "Server requires session ID (FastMCP compatibility) - using SSE transport";
           logger.warn(`\u26A0\uFE0F  ${fallbackReason}`);
@@ -3577,6 +3606,7 @@ var HttpConnector = class extends BaseConnector {
       } else if (err instanceof Error) {
         const errorStr = err.toString();
         const errorMsg = err.message || "";
+        is401Error = errorStr.includes("401") || errorMsg.includes("Unauthorized");
         if (errorStr.includes("Missing session ID") || errorStr.includes("Bad Request: Missing session ID") || errorMsg.includes("FastMCP session ID error")) {
           fallbackReason = "Server requires session ID (FastMCP compatibility) - using SSE transport";
           logger.warn(`\u26A0\uFE0F  ${fallbackReason}`);
@@ -3588,6 +3618,13 @@ var HttpConnector = class extends BaseConnector {
           logger.debug(fallbackReason);
         }
       }
+      if (is401Error) {
+        logger.info("Authentication required - skipping SSE fallback");
+        await this.cleanupResources();
+        const authError = new Error("Authentication required");
+        authError.code = 401;
+        throw authError;
+      }
       logger.info("\u{1F504} Falling back to SSE transport...");
       try {
         await this.connectWithSse(baseUrl);
@@ -3596,6 +3633,12 @@ var HttpConnector = class extends BaseConnector {
         logger.error(`  Streamable HTTP: ${fallbackReason}`);
         logger.error(`  SSE: ${sseErr}`);
         await this.cleanupResources();
+        const sseIs401 = sseErr?.message?.includes("401") || sseErr?.message?.includes("Unauthorized");
+        if (sseIs401) {
+          const authError = new Error("Authentication required");
+          authError.code = 401;
+          throw authError;
+        }
         throw new Error("Could not connect to server with any available transport");
       }
     }
@@ -3605,6 +3648,8 @@ var HttpConnector = class extends BaseConnector {
       this.connectionManager = new StreamableHttpConnectionManager(
         baseUrl,
         {
+          authProvider: this.opts.authProvider,
+          // ← Pass OAuth provider to SDK
           requestInit: {
             headers: this.headers
           },
@@ -4002,7 +4047,7 @@ var WebSocketConnector = class extends BaseConnector {
   }
   async readResource(uri) {
     const res = await this.sendRequest("resources/read", { uri });
-    return { content: res.content, mimeType: res.mimeType };
+    return res;
   }
   async request(method, params = null) {
     return await this.sendRequest(method, params);
@@ -4821,14 +4866,45 @@ async function onMcpAuthorization() {
 __name(onMcpAuthorization, "onMcpAuthorization");
 
 // src/react/useMcp.ts
-var import_types = require("@modelcontextprotocol/sdk/types.js");
 var import_react = require("react");
-var import_auth2 = require("@modelcontextprotocol/sdk/client/auth.js");
-var import_client3 = require("@modelcontextprotocol/sdk/client/index.js");
-var import_sse3 = require("@modelcontextprotocol/sdk/client/sse.js");
-var import_streamableHttp3 = require("@modelcontextprotocol/sdk/client/streamableHttp.js");
 var import_strict_url_sanitise2 = require("strict-url-sanitise");
 
+// src/client/browser.ts
+var BrowserMCPClient = class _BrowserMCPClient extends BaseMCPClient {
+  static {
+    __name(this, "BrowserMCPClient");
+  }
+  constructor(config2) {
+    super(config2);
+  }
+  static fromDict(cfg) {
+    return new _BrowserMCPClient(cfg);
+  }
+  /**
+   * Create a connector from server configuration (Browser version)
+   * Supports HTTP and WebSocket connectors only
+   */
+  createConnectorFromConfig(serverConfig) {
+    const { url, transport, headers, authToken, authProvider } = serverConfig;
+    if (!url) {
+      throw new Error("Server URL is required");
+    }
+    const connectorOptions = {
+      headers,
+      authToken,
+      authProvider
+      // ← Pass OAuth provider to connector
+    };
+    if (transport === "websocket" || url.startsWith("ws://") || url.startsWith("wss://")) {
+      return new WebSocketConnector(url, connectorOptions);
+    } else if (transport === "http" || url.startsWith("http://") || url.startsWith("https://")) {
+      return new HttpConnector(url, connectorOptions);
+    } else {
+      return new HttpConnector(url, connectorOptions);
+    }
+  }
+};
+
 // src/utils/assert.ts
 function assert(condition, message) {
   if (!condition) {
@@ -4871,7 +4947,6 @@ function useMcp(options) {
   const [log, setLog] = (0, import_react.useState)([]);
   const [authUrl, setAuthUrl] = (0, import_react.useState)(void 0);
   const clientRef = (0, import_react.useRef)(null);
-  const transportRef = (0, import_react.useRef)(null);
   const authProviderRef = (0, import_react.useRef)(null);
   const connectingRef = (0, import_react.useRef)(false);
   const isMountedRef = (0, import_react.useRef)(true);
@@ -4900,9 +4975,15 @@ function useMcp(options) {
       connectingRef.current = false;
       if (authTimeoutRef.current) clearTimeout(authTimeoutRef.current);
       authTimeoutRef.current = null;
-      const transport = transportRef.current;
+      if (clientRef.current) {
+        try {
+          const serverName = "inspector-server";
+          await clientRef.current.closeSession(serverName);
+        } catch (err) {
+          if (!quiet) addLog("warn", "Error closing session:", err);
+        }
+      }
       clientRef.current = null;
-      transportRef.current = null;
       if (isMountedRef.current && !quiet) {
         setState("discovering");
         setTools([]);
@@ -4912,14 +4993,6 @@ function useMcp(options) {
         setError(void 0);
         setAuthUrl(void 0);
       }
-      if (transport) {
-        try {
-          await transport.close();
-          if (!quiet) addLog("debug", "Transport closed");
-        } catch (err) {
-          if (!quiet) addLog("warn", "Error closing transport:", err);
-        }
-      }
     },
     [addLog]
   );
@@ -4971,187 +5044,60 @@ function useMcp(options) {
       addLog("debug", "BrowserOAuthClientProvider initialized in connect.");
     }
     if (!clientRef.current) {
-      clientRef.current = new import_client3.Client(
-        { name: clientConfig.name || "mcp-use", version: clientConfig.version || "0.1.0" },
-        { capabilities: {} }
-      );
-      addLog("debug", "MCP Client initialized in connect.");
+      clientRef.current = new BrowserMCPClient();
+      addLog("debug", "BrowserMCPClient initialized in connect.");
     }
     const tryConnectWithTransport = /* @__PURE__ */ __name(async (transportTypeParam, isAuthRetry = false) => {
-      addLog("info", `Attempting connection with ${transportTypeParam.toUpperCase()} transport${isAuthRetry ? " (after auth)" : ""}...`);
-      if (stateRef.current !== "authenticating") {
-        setState("connecting");
-      }
-      let transportInstance;
+      addLog("info", `Attempting connection with transport: ${transportTypeParam}`);
       try {
-        assert(authProviderRef.current, "Auth Provider must be initialized");
-        assert(clientRef.current, "Client must be initialized");
-        if (transportRef.current) {
-          await transportRef.current.close().catch((e) => addLog("warn", `Error closing previous transport: ${e.message}`));
-          transportRef.current = null;
-        }
-        const commonOptions = {
-          authProvider: authProviderRef.current,
-          requestInit: {
-            headers: {
-              Accept: "application/json, text/event-stream",
-              ...customHeaders
-            }
-          }
-          // Note: The MCP SDK's SSEClientTransport doesn't expose timeout configuration directly
-          // Timeout handling is managed by the underlying EventSource and browser/Node.js fetch implementations
-          // The timeout and sseReadTimeout options are preserved for future use or custom implementations
+        const serverName = "inspector-server";
+        const serverConfig = {
+          url,
+          transport: transportTypeParam === "sse" ? "http" : transportTypeParam
         };
-        const sanitizedUrl = (0, import_strict_url_sanitise2.sanitizeUrl)(url);
-        const targetUrl = new URL(sanitizedUrl);
-        addLog("debug", `Creating ${transportTypeParam.toUpperCase()} transport for URL: ${targetUrl.toString()}`);
-        if (transportTypeParam === "http") {
-          addLog("debug", "Creating StreamableHTTPClientTransport...");
-          transportInstance = new import_streamableHttp3.StreamableHTTPClientTransport(targetUrl, commonOptions);
-          addLog("debug", "StreamableHTTPClientTransport created successfully");
-        } else {
-          addLog("debug", "Creating SSEClientTransport...");
-          transportInstance = new import_sse3.SSEClientTransport(targetUrl, commonOptions);
-          addLog("debug", "SSEClientTransport created successfully");
-        }
-        transportRef.current = transportInstance;
-        addLog("debug", `${transportTypeParam.toUpperCase()} transport created and assigned to ref.`);
-      } catch (err) {
-        failConnection(
-          `Failed to create ${transportTypeParam.toUpperCase()} transport: ${err instanceof Error ? err.message : String(err)}`,
-          err instanceof Error ? err : void 0
-        );
-        return "failed";
-      }
-      transportInstance.onmessage = (message) => {
-        addLog("debug", `[Transport] Received: ${JSON.stringify(message)}`);
-        clientRef.current?.handleMessage?.(message);
-      };
-      transportInstance.onerror = (err) => {
-        addLog("warn", `Transport error event (${transportTypeParam.toUpperCase()}):`, err);
-        failConnection(`Transport error (${transportTypeParam.toUpperCase()}): ${err.message}`, err);
-      };
-      transportInstance.onclose = () => {
-        if (!isMountedRef.current || connectingRef.current) return;
-        addLog("info", `Transport connection closed (${successfulTransportRef.current || "unknown"} type).`);
-        const currentState = stateRef.current;
-        const currentAutoReconnect = autoReconnectRef.current;
-        if (currentState === "ready" && currentAutoReconnect) {
-          const delay = typeof currentAutoReconnect === "number" ? currentAutoReconnect : DEFAULT_RECONNECT_DELAY;
-          addLog("info", `Attempting to reconnect in ${delay}ms...`);
-          setState("connecting");
-          setTimeout(() => {
-            if (isMountedRef.current) {
-              connect();
-            }
-          }, delay);
-        } else if (currentState !== "failed" && currentState !== "authenticating") {
-          failConnection("Cannot connect to server");
-        }
-      };
-      try {
-        addLog("info", `Connecting client via ${transportTypeParam.toUpperCase()}...`);
-        await clientRef.current.connect(transportInstance);
-        addLog("info", `Client connected via ${transportTypeParam.toUpperCase()}. Loading tools, resources, and prompts...`);
-        successfulTransportRef.current = transportTypeParam;
-        setState("loading");
-        const toolsResponse = await clientRef.current.request({ method: "tools/list" }, import_types.ListToolsResultSchema);
-        let resourcesResponse = { resources: [], resourceTemplates: [] };
-        try {
-          resourcesResponse = await clientRef.current.request({ method: "resources/list" }, import_types.ListResourcesResultSchema);
-        } catch (err) {
-          addLog("debug", "Server does not support resources/list method", err);
+        if (customHeaders && Object.keys(customHeaders).length > 0) {
+          serverConfig.headers = customHeaders;
         }
-        let promptsResponse = { prompts: [] };
-        try {
-          promptsResponse = await clientRef.current.request({ method: "prompts/list" }, import_types.ListPromptsResultSchema);
-        } catch (err) {
-          addLog("debug", "Server does not support prompts/list method", err);
-        }
-        if (isMountedRef.current) {
-          setTools(toolsResponse.tools);
-          setResources(resourcesResponse.resources);
-          setResourceTemplates(Array.isArray(resourcesResponse.resourceTemplates) ? resourcesResponse.resourceTemplates : []);
-          setPrompts(promptsResponse.prompts);
-          const summary = [`Loaded ${toolsResponse.tools.length} tools`];
-          if (resourcesResponse.resources.length > 0 || resourcesResponse.resourceTemplates && resourcesResponse.resourceTemplates.length > 0) {
-            summary.push(`${resourcesResponse.resources.length} resources`);
-            if (Array.isArray(resourcesResponse.resourceTemplates) && resourcesResponse.resourceTemplates.length > 0) {
-              summary.push(`${resourcesResponse.resourceTemplates.length} resource templates`);
-            }
-          }
-          if (promptsResponse.prompts.length > 0) {
-            summary.push(`${promptsResponse.prompts.length} prompts`);
+        if (authProviderRef.current) {
+          const tokens = await authProviderRef.current.tokens();
+          if (tokens?.access_token) {
+            serverConfig.headers = {
+              ...serverConfig.headers,
+              Authorization: `Bearer ${tokens.access_token}`
+            };
           }
-          addLog("info", summary.join(", ") + ".");
-          setState("ready");
-          connectAttemptRef.current = 0;
-          return "success";
-        } else {
-          return "failed";
         }
-      } catch (connectErr) {
-        addLog("debug", `Client connect error via ${transportTypeParam.toUpperCase()}:`, connectErr);
-        const errorInstance = connectErr instanceof Error ? connectErr : new Error(String(connectErr));
-        const errorMessage = errorInstance.message;
-        const is404 = errorMessage.includes("404") || errorMessage.includes("Not Found");
-        const is405 = errorMessage.includes("405") || errorMessage.includes("Method Not Allowed");
-        const isLikelyCors = errorMessage === "Failed to fetch" || errorMessage === "NetworkError when attempting to fetch resource." || errorMessage === "Load failed";
-        if (transportTypeParam === "http" && (is404 || is405 || isLikelyCors)) {
-          addLog("warn", `HTTP transport failed (${isLikelyCors ? "CORS" : is404 ? "404" : "405"}), will try fallback.`);
-          return "fallback";
-        }
-        if (errorInstance instanceof import_auth2.UnauthorizedError || errorMessage.includes("Unauthorized") || errorMessage.includes("401")) {
-          if (isAuthRetry) {
-            addLog("error", "Authentication failed even after successful token refresh. This may indicate a server issue.");
-            failConnection("Authentication loop detected - auth succeeded but connection still unauthorized.");
-            return "failed";
-          }
-          addLog("info", "Authentication required.");
-          assert(authProviderRef.current, "Auth Provider not available for auth flow");
-          const existingTokens = await authProviderRef.current.tokens();
-          if (preventAutoAuth && !existingTokens) {
-            addLog("info", "Authentication required but auto-auth prevented. User action needed.");
-            setState("pending_auth");
-            return "auth_redirect";
-          }
-          if (stateRef.current !== "authenticating" && stateRef.current !== "pending_auth") {
-            setState("authenticating");
-            if (authTimeoutRef.current) clearTimeout(authTimeoutRef.current);
-            authTimeoutRef.current = setTimeout(() => {
-              if (isMountedRef.current) {
-                const currentState = stateRef.current;
-                if (currentState === "authenticating") {
-                  failConnection("Authentication timed out. Please try again.");
-                }
-              }
-            }, AUTH_TIMEOUT);
-          }
-          try {
-            assert(url, "Server URL is required for authentication");
-            const baseUrl = new URL(url).origin;
-            const authResult = await (0, import_auth2.auth)(authProviderRef.current, { serverUrl: baseUrl });
-            if (!isMountedRef.current) return "failed";
-            if (authResult === "AUTHORIZED") {
-              addLog("info", "Authentication successful via existing token or refresh. Retrying transport connection...");
-              if (authTimeoutRef.current) clearTimeout(authTimeoutRef.current);
-              authTimeoutRef.current = null;
-              return await tryConnectWithTransport(transportTypeParam, true);
-            } else if (authResult === "REDIRECT") {
-              addLog("info", "Redirecting for authentication. Waiting for callback...");
-              return "auth_redirect";
-            }
-          } catch (sdkAuthError) {
-            if (!isMountedRef.current) return "failed";
-            if (authTimeoutRef.current) clearTimeout(authTimeoutRef.current);
+        clientRef.current.addServer(serverName, {
+          ...serverConfig,
+          authProvider: authProviderRef.current
+          // ← SDK handles OAuth automatically!
+        });
+        const session = await clientRef.current.createSession(serverName);
+        await session.initialize();
+        addLog("info", "\u2705 Successfully connected to MCP server");
+        setState("ready");
+        successfulTransportRef.current = transportTypeParam;
+        setTools(session.connector.tools || []);
+        const resourcesResult = await session.connector.listAllResources();
+        setResources(resourcesResult.resources || []);
+        const promptsResult = await session.connector.listPrompts();
+        setPrompts(promptsResult.prompts || []);
+        return "success";
+      } catch (err) {
+        const errorMessage = err?.message || String(err);
+        if (err.code === 401 || errorMessage.includes("401") || errorMessage.includes("Unauthorized")) {
+          if (customHeaders && Object.keys(customHeaders).length > 0) {
             failConnection(
-              `Failed to initiate authentication: ${sdkAuthError instanceof Error ? sdkAuthError.message : String(sdkAuthError)}`,
-              sdkAuthError instanceof Error ? sdkAuthError : void 0
+              "Authentication failed: Server returned 401 Unauthorized. Check your Authorization header value is correct."
             );
             return "failed";
           }
+          failConnection(
+            "Authentication required: Server returned 401 Unauthorized. Add an Authorization header in the Custom Headers section (e.g., Authorization: Bearer YOUR_API_KEY)."
+          );
+          return "failed";
         }
-        failConnection(`Failed to connect via ${transportTypeParam.toUpperCase()}: ${errorMessage}`, errorInstance);
+        failConnection(errorMessage, err);
         return "failed";
       }
     }, "tryConnectWithTransport");
@@ -5203,55 +5149,20 @@ function useMcp(options) {
       }
       addLog("info", `Calling tool: ${name}`, args);
       try {
-        const result = await clientRef.current.request({ method: "tools/call", params: { name, arguments: args } }, import_types.CallToolResultSchema);
+        const serverName = "inspector-server";
+        const session = clientRef.current.getSession(serverName);
+        if (!session) {
+          throw new Error("No active session found");
+        }
+        const result = await session.connector.callTool(name, args || {});
         addLog("info", `Tool "${name}" call successful:`, result);
         return result;
       } catch (err) {
-        addLog("error", `Error calling tool "${name}": ${err instanceof Error ? err.message : String(err)}`, err);
-        const errorInstance = err instanceof Error ? err : new Error(String(err));
-        if (errorInstance instanceof import_auth2.UnauthorizedError || errorInstance.message.includes("Unauthorized") || errorInstance.message.includes("401")) {
-          addLog("warn", "Tool call unauthorized, attempting re-authentication...");
-          setState("authenticating");
-          if (authTimeoutRef.current) clearTimeout(authTimeoutRef.current);
-          authTimeoutRef.current = setTimeout(() => {
-            if (isMountedRef.current) {
-              const currentState2 = stateRef.current;
-              if (currentState2 === "authenticating") {
-                failConnection("Authentication timed out. Please try again.");
-              }
-            }
-          }, AUTH_TIMEOUT);
-          try {
-            assert(authProviderRef.current, "Auth Provider not available for tool re-auth");
-            assert(url, "Server URL is required for authentication");
-            const baseUrl = new URL(url).origin;
-            const authResult = await (0, import_auth2.auth)(authProviderRef.current, { serverUrl: baseUrl });
-            if (!isMountedRef.current) return;
-            if (authResult === "AUTHORIZED") {
-              addLog("info", "Re-authentication successful. Retrying tool call is recommended, or reconnecting.");
-              if (authTimeoutRef.current) clearTimeout(authTimeoutRef.current);
-              connectingRef.current = false;
-              connect();
-            } else if (authResult === "REDIRECT") {
-              addLog("info", "Redirecting for re-authentication for tool call.");
-            }
-          } catch (sdkAuthError) {
-            if (!isMountedRef.current) return;
-            if (authTimeoutRef.current) clearTimeout(authTimeoutRef.current);
-            failConnection(
-              `Re-authentication failed: ${sdkAuthError instanceof Error ? sdkAuthError.message : String(sdkAuthError)}`,
-              sdkAuthError instanceof Error ? sdkAuthError : void 0
-            );
-          }
-        }
-        const currentState = stateRef.current;
-        if (currentState !== "authenticating") {
-          throw err;
-        }
-        return void 0;
+        addLog("error", `Tool "${name}" call failed:`, err);
+        throw err;
       }
     },
-    [state, url, addLog, failConnection, connect]
+    [state]
   );
   const retry = (0, import_react.useCallback)(() => {
     if (stateRef.current === "failed") {
@@ -5282,17 +5193,7 @@ function useMcp(options) {
       try {
         assert(authProviderRef.current, "Auth Provider not available for manual auth");
         assert(url, "Server URL is required for authentication");
-        const baseUrl = new URL(url).origin;
-        const authResult = await (0, import_auth2.auth)(authProviderRef.current, { serverUrl: baseUrl });
-        if (!isMountedRef.current) return;
-        if (authResult === "AUTHORIZED") {
-          addLog("info", "Manual authentication successful. Re-attempting connection...");
-          if (authTimeoutRef.current) clearTimeout(authTimeoutRef.current);
-          connectingRef.current = false;
-          connect();
-        } else if (authResult === "REDIRECT") {
-          addLog("info", "Redirecting for manual authentication. Waiting for callback...");
-        }
+        addLog("info", "Redirecting for manual authentication. Waiting for callback...");
       } catch (authError) {
         if (!isMountedRef.current) return;
         if (authTimeoutRef.current) clearTimeout(authTimeoutRef.current);
@@ -5325,75 +5226,93 @@ function useMcp(options) {
       addLog("warn", "Auth provider not initialized, cannot clear storage.");
     }
   }, [url, addLog, disconnect]);
-  const listResources = (0, import_react.useCallback)(async () => {
-    if (stateRef.current !== "ready" || !clientRef.current) {
-      throw new Error(`MCP client is not ready (current state: ${state}). Cannot list resources.`);
-    }
-    addLog("info", "Listing resources...");
-    try {
-      const resourcesResponse = await clientRef.current.request({ method: "resources/list" }, import_types.ListResourcesResultSchema);
-      if (isMountedRef.current) {
-        setResources(resourcesResponse.resources);
-        setResourceTemplates(Array.isArray(resourcesResponse.resourceTemplates) ? resourcesResponse.resourceTemplates : []);
-        addLog(
-          "info",
-          `Listed ${resourcesResponse.resources.length} resources, ${Array.isArray(resourcesResponse.resourceTemplates) ? resourcesResponse.resourceTemplates.length : 0} resource templates.`
-        );
+  const listResources = (0, import_react.useCallback)(
+    async () => {
+      if (stateRef.current !== "ready" || !clientRef.current) {
+        throw new Error(`MCP client is not ready (current state: ${state}). Cannot list resources.`);
       }
-    } catch (err) {
-      addLog("error", `Error listing resources: ${err instanceof Error ? err.message : String(err)}`, err);
-      throw err;
-    }
-  }, [state, addLog]);
+      addLog("info", "Listing resources");
+      try {
+        const serverName = "inspector-server";
+        const session = clientRef.current.getSession(serverName);
+        if (!session) {
+          throw new Error("No active session found");
+        }
+        const resourcesResult = await session.connector.listAllResources();
+        setResources(resourcesResult.resources || []);
+        addLog("info", "Resources listed successfully");
+      } catch (err) {
+        addLog("error", "List resources failed:", err);
+        throw err;
+      }
+    },
+    [state]
+  );
   const readResource = (0, import_react.useCallback)(
     async (uri) => {
       if (stateRef.current !== "ready" || !clientRef.current) {
-        throw new Error(`MCP client is not ready (current state: ${state}). Cannot read resource "${uri}".`);
+        throw new Error(`MCP client is not ready (current state: ${state}). Cannot read resource.`);
       }
       addLog("info", `Reading resource: ${uri}`);
       try {
-        const result = await clientRef.current.request({ method: "resources/read", params: { uri } }, import_types.ReadResourceResultSchema);
-        addLog("info", `Resource "${uri}" read successfully`);
+        const serverName = "inspector-server";
+        const session = clientRef.current.getSession(serverName);
+        if (!session) {
+          throw new Error("No active session found");
+        }
+        const result = await session.connector.readResource(uri);
+        addLog("info", "Resource read successful:", result);
         return result;
       } catch (err) {
-        addLog("error", `Error reading resource "${uri}": ${err instanceof Error ? err.message : String(err)}`, err);
+        addLog("error", "Resource read failed:", err);
         throw err;
       }
     },
-    [state, addLog]
+    [state]
   );
-  const listPrompts = (0, import_react.useCallback)(async () => {
-    if (stateRef.current !== "ready" || !clientRef.current) {
-      throw new Error(`MCP client is not ready (current state: ${state}). Cannot list prompts.`);
-    }
-    addLog("info", "Listing prompts...");
-    try {
-      const promptsResponse = await clientRef.current.request({ method: "prompts/list" }, import_types.ListPromptsResultSchema);
-      if (isMountedRef.current) {
-        setPrompts(promptsResponse.prompts);
-        addLog("info", `Listed ${promptsResponse.prompts.length} prompts.`);
+  const listPrompts = (0, import_react.useCallback)(
+    async () => {
+      if (stateRef.current !== "ready" || !clientRef.current) {
+        throw new Error(`MCP client is not ready (current state: ${state}). Cannot list prompts.`);
       }
-    } catch (err) {
-      addLog("error", `Error listing prompts: ${err instanceof Error ? err.message : String(err)}`, err);
-      throw err;
-    }
-  }, [state, addLog]);
+      addLog("info", "Listing prompts");
+      try {
+        const serverName = "inspector-server";
+        const session = clientRef.current.getSession(serverName);
+        if (!session) {
+          throw new Error("No active session found");
+        }
+        const promptsResult = await session.connector.listPrompts();
+        setPrompts(promptsResult.prompts || []);
+        addLog("info", "Prompts listed successfully");
+      } catch (err) {
+        addLog("error", "List prompts failed:", err);
+        throw err;
+      }
+    },
+    [state]
+  );
   const getPrompt = (0, import_react.useCallback)(
     async (name, args) => {
       if (stateRef.current !== "ready" || !clientRef.current) {
-        throw new Error(`MCP client is not ready (current state: ${state}). Cannot get prompt "${name}".`);
+        throw new Error(`MCP client is not ready (current state: ${state}). Cannot get prompt.`);
       }
       addLog("info", `Getting prompt: ${name}`, args);
       try {
-        const result = await clientRef.current.request({ method: "prompts/get", params: { name, arguments: args } }, import_types.GetPromptResultSchema);
-        addLog("info", `Prompt "${name}" retrieved successfully`);
+        const serverName = "inspector-server";
+        const session = clientRef.current.getSession(serverName);
+        if (!session) {
+          throw new Error("No active session found");
+        }
+        const result = await session.connector.getPrompt(name, args || {});
+        addLog("info", `Prompt "${name}" retrieved successfully:`, result);
         return result;
       } catch (err) {
-        addLog("error", `Error getting prompt "${name}": ${err instanceof Error ? err.message : String(err)}`, err);
+        addLog("error", `Prompt "${name}" retrieval failed:`, err);
         throw err;
       }
     },
-    [state, addLog]
+    [state]
   );
   const connectRef = (0, import_react.useRef)(connect);
   const failConnectionRef = (0, import_react.useRef)(failConnection);
@@ -5486,9 +5405,10 @@ function useMcp(options) {
     error,
     log,
     authUrl,
+    client: clientRef.current,
     callTool,
-    listResources,
     readResource,
+    listResources,
     listPrompts,
     getPrompt,
     retry,