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

package/dist/index.cjs

@@ -35,9 +35,9 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 async function getNodeModules() {
   if (typeof process !== "undefined" && process.platform) {
     try {
-      const fs4 = await import("fs");
-      const path4 = await import("path");
-      return { fs: fs4.default, path: path4.default };
+      const fs2 = await import("fs");
+      const path2 = await import("path");
+      return { fs: fs2.default, path: path2.default };
     } catch {
       return { fs: null, path: null };
     }
@@ -1053,6 +1053,7 @@ __export(index_exports, {
   BaseCodeExecutor: () => BaseCodeExecutor,
   BaseConnector: () => BaseConnector,
   BrowserOAuthClientProvider: () => BrowserOAuthClientProvider,
+  BrowserTelemetry: () => Tel,
   ConnectMCPServerTool: () => ConnectMCPServerTool,
   E2BCodeExecutor: () => E2BCodeExecutor,
   ElicitationDeclinedError: () => ElicitationDeclinedError,
@@ -1076,17 +1077,21 @@ __export(index_exports, {
   RemoteAgent: () => RemoteAgent,
   ServerManager: () => ServerManager,
   StdioConnector: () => StdioConnector,
+  Tel: () => Tel,
   Telemetry: () => Telemetry,
   ThemeProvider: () => ThemeProvider,
+  VERSION: () => VERSION,
   VMCodeExecutor: () => VMCodeExecutor,
   WebSocketConnector: () => WebSocketConnector,
   WidgetControls: () => WidgetControls,
   createOAuthMCPConfig: () => createOAuthMCPConfig,
   createReadableStreamFromGenerator: () => createReadableStreamFromGenerator,
+  getPackageVersion: () => getPackageVersion,
   isVMAvailable: () => isVMAvailable,
   loadConfigFile: () => loadConfigFile,
   logger: () => logger,
   onMcpAuthorization: () => onMcpAuthorization,
+  setBrowserTelemetrySource: () => setTelemetrySource,
   setTelemetrySource: () => setTelemetrySource,
   streamEventsToAISDK: () => streamEventsToAISDK,
   streamEventsToAISDKWithTools: () => streamEventsToAISDKWithTools,
@@ -2512,22 +2517,6 @@ var ObservabilityManager = class {
   }
 };
 
-// src/telemetry/telemetry.ts
-var fs2 = __toESM(require("fs"), 1);
-var os = __toESM(require("os"), 1);
-var path2 = __toESM(require("path"), 1);
-var import_posthog_node = require("posthog-node");
-
-// src/server/utils/runtime.ts
-var isDeno = typeof globalThis.Deno !== "undefined";
-function generateUUID() {
-  return globalThis.crypto.randomUUID();
-}
-__name(generateUUID, "generateUUID");
-
-// src/telemetry/telemetry.ts
-init_logging();
-
 // src/telemetry/events.ts
 var BaseTelemetryEvent = class {
   static {
@@ -2578,23 +2567,322 @@ var MCPAgentExecutionEvent = class extends BaseTelemetryEvent {
     };
   }
 };
-
-// src/telemetry/utils.ts
-var fs = __toESM(require("fs"), 1);
-var path = __toESM(require("path"), 1);
-function getPackageVersion() {
-  try {
-    if (typeof __dirname === "undefined" || typeof fs === "undefined") {
-      return "unknown";
+function createServerRunEventData(server, transport) {
+  const toolRegistrations = Array.from(server.registrations.tools.values());
+  const promptRegistrations = Array.from(server.registrations.prompts.values());
+  const resourceRegistrations = Array.from(
+    server.registrations.resources.values()
+  );
+  const templateRegistrations = Array.from(
+    server.registrations.resourceTemplates.values()
+  );
+  const allResources = resourceRegistrations.map((r) => ({
+    name: r.config.name,
+    title: r.config.title ?? null,
+    description: r.config.description ?? null,
+    uri: r.config.uri ?? null,
+    mime_type: r.config.mimeType ?? null
+  }));
+  const appsSdkResources = allResources.filter(
+    (r) => r.mime_type === "text/html+skybridge"
+  );
+  const mcpUiResources = allResources.filter(
+    (r) => r.mime_type === "text/uri-list" || r.mime_type === "text/html"
+  );
+  const mcpAppsResources = allResources.filter(
+    (r) => r.mime_type === "text/html+mcp"
+  );
+  return {
+    transport,
+    toolsNumber: server.registeredTools.length,
+    resourcesNumber: server.registeredResources.length,
+    promptsNumber: server.registeredPrompts.length,
+    auth: !!server.oauthProvider,
+    name: server.config.name,
+    description: server.config.description ?? null,
+    baseUrl: server.serverBaseUrl ?? null,
+    toolNames: server.registeredTools.length > 0 ? server.registeredTools : null,
+    resourceNames: server.registeredResources.length > 0 ? server.registeredResources : null,
+    promptNames: server.registeredPrompts.length > 0 ? server.registeredPrompts : null,
+    tools: toolRegistrations.length > 0 ? toolRegistrations.map((r) => ({
+      name: r.config.name,
+      title: r.config.title ?? null,
+      description: r.config.description ?? null,
+      input_schema: r.config.schema ? JSON.stringify(r.config.schema) : null,
+      output_schema: r.config.outputSchema ? JSON.stringify(r.config.outputSchema) : null
+    })) : null,
+    resources: allResources.length > 0 ? allResources : null,
+    prompts: promptRegistrations.length > 0 ? promptRegistrations.map((r) => ({
+      name: r.config.name,
+      title: r.config.title ?? null,
+      description: r.config.description ?? null,
+      args: r.config.args ? JSON.stringify(r.config.args) : null
+    })) : null,
+    templates: templateRegistrations.length > 0 ? templateRegistrations.map((r) => ({
+      name: r.config.name,
+      title: r.config.title ?? null,
+      description: r.config.description ?? null
+    })) : null,
+    capabilities: {
+      logging: true,
+      resources: { subscribe: true, listChanged: true }
+    },
+    appsSdkResources: appsSdkResources.length > 0 ? appsSdkResources : null,
+    appsSdkResourcesNumber: appsSdkResources.length,
+    mcpUiResources: mcpUiResources.length > 0 ? mcpUiResources : null,
+    mcpUiResourcesNumber: mcpUiResources.length,
+    mcpAppsResources: mcpAppsResources.length > 0 ? mcpAppsResources : null,
+    mcpAppsResourcesNumber: mcpAppsResources.length
+  };
+}
+__name(createServerRunEventData, "createServerRunEventData");
+var ServerRunEvent = class extends BaseTelemetryEvent {
+  constructor(data) {
+    super();
+    this.data = data;
+  }
+  static {
+    __name(this, "ServerRunEvent");
+  }
+  get name() {
+    return "server_run";
+  }
+  get properties() {
+    return {
+      transport: this.data.transport,
+      tools_number: this.data.toolsNumber,
+      resources_number: this.data.resourcesNumber,
+      prompts_number: this.data.promptsNumber,
+      auth: this.data.auth,
+      name: this.data.name,
+      description: this.data.description ?? null,
+      base_url: this.data.baseUrl ?? null,
+      tool_names: this.data.toolNames ?? null,
+      resource_names: this.data.resourceNames ?? null,
+      prompt_names: this.data.promptNames ?? null,
+      tools: this.data.tools ?? null,
+      resources: this.data.resources ?? null,
+      prompts: this.data.prompts ?? null,
+      templates: this.data.templates ?? null,
+      capabilities: this.data.capabilities ? JSON.stringify(this.data.capabilities) : null,
+      apps_sdk_resources: this.data.appsSdkResources ? JSON.stringify(this.data.appsSdkResources) : null,
+      apps_sdk_resources_number: this.data.appsSdkResourcesNumber ?? 0,
+      mcp_ui_resources: this.data.mcpUiResources ? JSON.stringify(this.data.mcpUiResources) : null,
+      mcp_ui_resources_number: this.data.mcpUiResourcesNumber ?? 0,
+      mcp_apps_resources: this.data.mcpAppsResources ? JSON.stringify(this.data.mcpAppsResources) : null,
+      mcp_apps_resources_number: this.data.mcpAppsResourcesNumber ?? 0
+    };
+  }
+};
+var ServerInitializeEvent = class extends BaseTelemetryEvent {
+  constructor(data) {
+    super();
+    this.data = data;
+  }
+  static {
+    __name(this, "ServerInitializeEvent");
+  }
+  get name() {
+    return "server_initialize_call";
+  }
+  get properties() {
+    return {
+      protocol_version: this.data.protocolVersion,
+      client_info: JSON.stringify(this.data.clientInfo),
+      client_capabilities: JSON.stringify(this.data.clientCapabilities),
+      session_id: this.data.sessionId ?? null
+    };
+  }
+};
+var ServerToolCallEvent = class extends BaseTelemetryEvent {
+  constructor(data) {
+    super();
+    this.data = data;
+  }
+  static {
+    __name(this, "ServerToolCallEvent");
+  }
+  get name() {
+    return "server_tool_call";
+  }
+  get properties() {
+    return {
+      tool_name: this.data.toolName,
+      length_input_argument: this.data.lengthInputArgument,
+      success: this.data.success,
+      error_type: this.data.errorType ?? null,
+      execution_time_ms: this.data.executionTimeMs ?? null
+    };
+  }
+};
+var ServerResourceCallEvent = class extends BaseTelemetryEvent {
+  constructor(data) {
+    super();
+    this.data = data;
+  }
+  static {
+    __name(this, "ServerResourceCallEvent");
+  }
+  get name() {
+    return "server_resource_call";
+  }
+  get properties() {
+    return {
+      name: this.data.name,
+      description: this.data.description,
+      contents: this.data.contents,
+      success: this.data.success,
+      error_type: this.data.errorType ?? null
+    };
+  }
+};
+var ServerPromptCallEvent = class extends BaseTelemetryEvent {
+  constructor(data) {
+    super();
+    this.data = data;
+  }
+  static {
+    __name(this, "ServerPromptCallEvent");
+  }
+  get name() {
+    return "server_prompt_call";
+  }
+  get properties() {
+    return {
+      name: this.data.name,
+      description: this.data.description,
+      success: this.data.success,
+      error_type: this.data.errorType ?? null
+    };
+  }
+};
+var ServerContextEvent = class extends BaseTelemetryEvent {
+  constructor(data) {
+    super();
+    this.data = data;
+  }
+  static {
+    __name(this, "ServerContextEvent");
+  }
+  get name() {
+    return `server_context_${this.data.contextType}`;
+  }
+  get properties() {
+    return {
+      context_type: this.data.contextType,
+      notification_type: this.data.notificationType ?? null
+    };
+  }
+};
+var MCPClientInitEvent = class extends BaseTelemetryEvent {
+  constructor(data) {
+    super();
+    this.data = data;
+  }
+  static {
+    __name(this, "MCPClientInitEvent");
+  }
+  get name() {
+    return "mcpclient_init";
+  }
+  get properties() {
+    return {
+      code_mode: this.data.codeMode,
+      sandbox: this.data.sandbox,
+      all_callbacks: this.data.allCallbacks,
+      verify: this.data.verify,
+      servers: this.data.servers,
+      num_servers: this.data.numServers,
+      is_browser: this.data.isBrowser
+    };
+  }
+};
+var ConnectorInitEvent = class extends BaseTelemetryEvent {
+  constructor(data) {
+    super();
+    this.data = data;
+  }
+  static {
+    __name(this, "ConnectorInitEvent");
+  }
+  get name() {
+    return "connector_init";
+  }
+  get properties() {
+    return {
+      connector_type: this.data.connectorType,
+      server_command: this.data.serverCommand ?? null,
+      server_args: this.data.serverArgs ?? null,
+      server_url: this.data.serverUrl ?? null,
+      public_identifier: this.data.publicIdentifier ?? null
+    };
+  }
+};
+var ClientAddServerEvent = class extends BaseTelemetryEvent {
+  constructor(data) {
+    super();
+    this.data = data;
+  }
+  static {
+    __name(this, "ClientAddServerEvent");
+  }
+  get name() {
+    return "client_add_server";
+  }
+  get properties() {
+    const { serverName, serverConfig } = this.data;
+    const url = serverConfig.url;
+    return {
+      server_name: serverName,
+      server_url_domain: url ? this._extractHostname(url) : null,
+      transport: serverConfig.transport ?? null,
+      has_auth: !!(serverConfig.authToken || serverConfig.authProvider)
+    };
+  }
+  _extractHostname(url) {
+    try {
+      return new URL(url).hostname;
+    } catch {
+      return null;
     }
-    const packagePath = path.join(__dirname, "../../package.json");
-    const packageJson = JSON.parse(fs.readFileSync(packagePath, "utf-8"));
-    return packageJson.version || "unknown";
-  } catch {
-    return "unknown";
   }
+};
+var ClientRemoveServerEvent = class extends BaseTelemetryEvent {
+  constructor(data) {
+    super();
+    this.data = data;
+  }
+  static {
+    __name(this, "ClientRemoveServerEvent");
+  }
+  get name() {
+    return "client_remove_server";
+  }
+  get properties() {
+    return {
+      server_name: this.data.serverName
+    };
+  }
+};
+
+// src/server/utils/runtime.ts
+var isDeno = typeof globalThis.Deno !== "undefined";
+function generateUUID() {
+  return globalThis.crypto.randomUUID();
+}
+__name(generateUUID, "generateUUID");
+
+// src/telemetry/telemetry.ts
+init_logging();
+
+// src/version.ts
+var VERSION = "1.10.0-canary.11";
+function getPackageVersion() {
+  return VERSION;
 }
 __name(getPackageVersion, "getPackageVersion");
+
+// src/telemetry/utils.ts
 function getModelProvider(llm) {
   return llm._llm_type || llm.constructor.name.toLowerCase();
 }
@@ -2627,22 +2915,63 @@ function extractModelInfo(llm) {
 __name(extractModelInfo, "extractModelInfo");
 
 // src/telemetry/telemetry.ts
-function isNodeJSEnvironment2() {
+var USER_ID_STORAGE_KEY = "mcp_use_user_id";
+function detectRuntimeEnvironment() {
   try {
+    if (typeof globalThis.Bun !== "undefined") {
+      return "bun";
+    }
+    if (typeof globalThis.Deno !== "undefined") {
+      return "deno";
+    }
     if (typeof navigator !== "undefined" && navigator.userAgent?.includes("Cloudflare-Workers")) {
-      return false;
+      return "cloudflare-workers";
     }
-    if (typeof globalThis.EdgeRuntime !== "undefined" || typeof globalThis.Deno !== "undefined") {
-      return false;
+    if (typeof globalThis.EdgeRuntime !== "undefined") {
+      return "edge";
     }
-    const hasNodeGlobals = typeof process !== "undefined" && typeof process.platform !== "undefined" && typeof __dirname !== "undefined";
-    const hasNodeModules = typeof fs2 !== "undefined" && typeof os !== "undefined" && typeof fs2.existsSync === "function";
-    return hasNodeGlobals && hasNodeModules;
+    if (typeof window !== "undefined" && typeof document !== "undefined") {
+      return "browser";
+    }
+    if (typeof process !== "undefined" && typeof process.versions?.node !== "undefined") {
+      return "node";
+    }
+    return "unknown";
   } catch {
-    return false;
+    return "unknown";
+  }
+}
+__name(detectRuntimeEnvironment, "detectRuntimeEnvironment");
+function getStorageCapability(env) {
+  switch (env) {
+    case "node":
+    case "bun":
+      return "filesystem";
+    case "browser":
+      try {
+        if (typeof localStorage !== "undefined") {
+          localStorage.setItem("__mcp_use_test__", "1");
+          localStorage.removeItem("__mcp_use_test__");
+          return "localStorage";
+        }
+      } catch {
+      }
+      return "session-only";
+    case "deno":
+      return "session-only";
+    default:
+      return "session-only";
+  }
+}
+__name(getStorageCapability, "getStorageCapability");
+var cachedEnvironment = null;
+function getRuntimeEnvironment() {
+  if (cachedEnvironment === null) {
+    cachedEnvironment = detectRuntimeEnvironment();
   }
+  return cachedEnvironment;
 }
-__name(isNodeJSEnvironment2, "isNodeJSEnvironment");
+__name(getRuntimeEnvironment, "getRuntimeEnvironment");
 var ScarfEventLogger = class {
   static {
     __name(this, "ScarfEventLogger");
@@ -2674,79 +3003,49 @@ var ScarfEventLogger = class {
     }
   }
 };
-function getCacheHome() {
-  if (!isNodeJSEnvironment2()) {
-    return "/tmp/mcp_use_cache";
-  }
-  const envVar = process.env.XDG_CACHE_HOME;
-  if (envVar && path2.isAbsolute(envVar)) {
-    return envVar;
-  }
-  const platform = process.platform;
-  const homeDir = os.homedir();
-  if (platform === "win32") {
-    const appdata = process.env.LOCALAPPDATA || process.env.APPDATA;
-    if (appdata) {
-      return appdata;
-    }
-    return path2.join(homeDir, "AppData", "Local");
-  } else if (platform === "darwin") {
-    return path2.join(homeDir, "Library", "Caches");
-  } else {
-    return path2.join(homeDir, ".cache");
-  }
-}
-__name(getCacheHome, "getCacheHome");
 var Telemetry = class _Telemetry {
   static {
     __name(this, "Telemetry");
   }
   static instance = null;
-  USER_ID_PATH = path2.join(
-    getCacheHome(),
-    "mcp_use_3",
-    "telemetry_user_id"
-  );
-  VERSION_DOWNLOAD_PATH = path2.join(
-    getCacheHome(),
-    "mcp_use",
-    "download_version"
-  );
   PROJECT_API_KEY = "phc_lyTtbYwvkdSbrcMQNPiKiiRWrrM1seyKIMjycSvItEI";
   HOST = "https://eu.i.posthog.com";
   SCARF_GATEWAY_URL = "https://mcpuse.gateway.scarf.sh/events-ts";
   UNKNOWN_USER_ID = "UNKNOWN_USER_ID";
   _currUserId = null;
-  _posthogClient = null;
+  _posthogNodeClient = null;
+  _posthogBrowserClient = null;
+  _posthogLoading = null;
   _scarfClient = null;
-  _source = "typescript";
+  _runtimeEnvironment;
+  _storageCapability;
+  _source;
+  // Node.js specific paths (lazily computed)
+  _userIdPath = null;
+  _versionDownloadPath = null;
   constructor() {
-    const isNodeJS = isNodeJSEnvironment2();
-    const telemetryDisabled = typeof process !== "undefined" && process.env?.MCP_USE_ANONYMIZED_TELEMETRY?.toLowerCase() === "false" || false;
-    this._source = typeof process !== "undefined" && process.env?.MCP_USE_TELEMETRY_SOURCE || "typescript";
+    this._runtimeEnvironment = getRuntimeEnvironment();
+    this._storageCapability = getStorageCapability(this._runtimeEnvironment);
+    this._source = typeof process !== "undefined" && process.env?.MCP_USE_TELEMETRY_SOURCE || this._runtimeEnvironment;
+    const telemetryDisabled = this._checkTelemetryDisabled();
+    const canSupportTelemetry = this._runtimeEnvironment !== "unknown";
     if (telemetryDisabled) {
-      this._posthogClient = null;
+      this._posthogNodeClient = null;
+      this._posthogBrowserClient = null;
       this._scarfClient = null;
-      logger.debug("Telemetry disabled via environment variable");
-    } else if (!isNodeJS) {
-      this._posthogClient = null;
+      logger.debug("Telemetry disabled via environment/localStorage");
+    } else if (!canSupportTelemetry) {
+      this._posthogNodeClient = null;
+      this._posthogBrowserClient = null;
       this._scarfClient = null;
       logger.debug(
-        "Telemetry disabled - non-Node.js environment detected (e.g., Cloudflare Workers)"
+        `Telemetry disabled - unknown environment: ${this._runtimeEnvironment}`
       );
     } else {
       logger.info(
         "Anonymized telemetry enabled. Set MCP_USE_ANONYMIZED_TELEMETRY=false to disable."
       );
-      try {
-        this._posthogClient = new import_posthog_node.PostHog(this.PROJECT_API_KEY, {
-          host: this.HOST,
-          disableGeoip: false
-        });
-      } catch (e) {
-        logger.warn(`Failed to initialize PostHog telemetry: ${e}`);
-        this._posthogClient = null;
-      }
+      this._posthogLoading = this._initPostHog();
       try {
         this._scarfClient = new ScarfEventLogger(this.SCARF_GATEWAY_URL, 3e3);
       } catch (e) {
@@ -2755,6 +3054,87 @@ var Telemetry = class _Telemetry {
       }
     }
   }
+  _checkTelemetryDisabled() {
+    if (typeof process !== "undefined" && process.env?.MCP_USE_ANONYMIZED_TELEMETRY?.toLowerCase() === "false") {
+      return true;
+    }
+    if (typeof localStorage !== "undefined" && localStorage.getItem("MCP_USE_ANONYMIZED_TELEMETRY") === "false") {
+      return true;
+    }
+    return false;
+  }
+  async _initPostHog() {
+    const isBrowser = this._runtimeEnvironment === "browser";
+    if (isBrowser) {
+      await this._initPostHogBrowser();
+    } else {
+      await this._initPostHogNode();
+    }
+  }
+  async _initPostHogBrowser() {
+    try {
+      const posthogModule = await import("posthog-js");
+      const posthog = posthogModule.default || posthogModule.posthog;
+      if (!posthog || typeof posthog.init !== "function") {
+        throw new Error("posthog-js module did not export expected interface");
+      }
+      posthog.init(this.PROJECT_API_KEY, {
+        api_host: this.HOST,
+        persistence: "localStorage",
+        autocapture: false,
+        // We only want explicit captures
+        capture_pageview: false,
+        // We don't want automatic pageview tracking
+        disable_session_recording: true,
+        // No session recording
+        loaded: /* @__PURE__ */ __name(() => {
+          logger.debug("PostHog browser client initialized");
+        }, "loaded")
+      });
+      this._posthogBrowserClient = posthog;
+    } catch (e) {
+      logger.warn(`Failed to initialize PostHog browser telemetry: ${e}`);
+      this._posthogBrowserClient = null;
+    }
+  }
+  async _initPostHogNode() {
+    try {
+      const { PostHog } = await import("posthog-node");
+      const isServerlessEnvironment = [
+        "cloudflare-workers",
+        "edge",
+        "deno"
+      ].includes(this._runtimeEnvironment);
+      const posthogOptions = {
+        host: this.HOST,
+        disableGeoip: false
+      };
+      if (isServerlessEnvironment) {
+        posthogOptions.flushAt = 1;
+        posthogOptions.flushInterval = 0;
+      }
+      this._posthogNodeClient = new PostHog(
+        this.PROJECT_API_KEY,
+        posthogOptions
+      );
+      logger.debug("PostHog Node.js client initialized");
+    } catch (e) {
+      logger.warn(`Failed to initialize PostHog Node.js telemetry: ${e}`);
+      this._posthogNodeClient = null;
+    }
+  }
+  /**
+   * Get the detected runtime environment
+   */
+  get runtimeEnvironment() {
+    return this._runtimeEnvironment;
+  }
+  /**
+   * Get the storage capability for this environment
+   */
+  get storageCapability() {
+    return this._storageCapability;
+  }
   static getInstance() {
     if (!_Telemetry.instance) {
       _Telemetry.instance = new _Telemetry();
@@ -2776,92 +3156,201 @@ var Telemetry = class _Telemetry {
   getSource() {
     return this._source;
   }
+  /**
+   * Check if telemetry is enabled.
+   */
+  get isEnabled() {
+    return this._posthogNodeClient !== null || this._posthogBrowserClient !== null || this._scarfClient !== null;
+  }
   get userId() {
     if (this._currUserId) {
       return this._currUserId;
     }
-    if (!isNodeJSEnvironment2()) {
-      this._currUserId = this.UNKNOWN_USER_ID;
-      return this._currUserId;
-    }
     try {
-      const isFirstTime = !fs2.existsSync(this.USER_ID_PATH);
-      if (isFirstTime) {
-        logger.debug(`Creating user ID path: ${this.USER_ID_PATH}`);
-        fs2.mkdirSync(path2.dirname(this.USER_ID_PATH), { recursive: true });
-        const newUserId = generateUUID();
-        fs2.writeFileSync(this.USER_ID_PATH, newUserId);
-        this._currUserId = newUserId;
-        logger.debug(`User ID path created: ${this.USER_ID_PATH}`);
-      } else {
-        this._currUserId = fs2.readFileSync(this.USER_ID_PATH, "utf-8").trim();
+      switch (this._storageCapability) {
+        case "filesystem":
+          this._currUserId = this._getUserIdFromFilesystem();
+          break;
+        case "localStorage":
+          this._currUserId = this._getUserIdFromLocalStorage();
+          break;
+        case "session-only":
+        default:
+          this._currUserId = `session-${generateUUID()}`;
+          logger.debug(
+            `Using session-based user ID (${this._runtimeEnvironment} environment)`
+          );
+          break;
+      }
+      if (this._storageCapability === "filesystem" && this._currUserId) {
+        this._trackPackageDownloadInternal(this._currUserId, {
+          triggered_by: "user_id_property"
+        }).catch((e) => logger.debug(`Failed to track package download: ${e}`));
       }
-      this.trackPackageDownload({
-        triggered_by: "user_id_property"
-      }).catch((e) => logger.debug(`Failed to track package download: ${e}`));
     } catch (e) {
       logger.debug(`Failed to get/create user ID: ${e}`);
       this._currUserId = this.UNKNOWN_USER_ID;
     }
     return this._currUserId;
   }
+  /**
+   * Get or create user ID from filesystem (Node.js/Bun)
+   */
+  _getUserIdFromFilesystem() {
+    const fs2 = require("fs");
+    const os = require("os");
+    const path2 = require("path");
+    if (!this._userIdPath) {
+      this._userIdPath = path2.join(
+        this._getCacheHome(os, path2),
+        "mcp_use_3",
+        "telemetry_user_id"
+      );
+    }
+    const isFirstTime = !fs2.existsSync(this._userIdPath);
+    if (isFirstTime) {
+      logger.debug(`Creating user ID path: ${this._userIdPath}`);
+      fs2.mkdirSync(path2.dirname(this._userIdPath), { recursive: true });
+      const newUserId = generateUUID();
+      fs2.writeFileSync(this._userIdPath, newUserId);
+      logger.debug(`User ID path created: ${this._userIdPath}`);
+      return newUserId;
+    }
+    return fs2.readFileSync(this._userIdPath, "utf-8").trim();
+  }
+  /**
+   * Get or create user ID from localStorage (Browser)
+   */
+  _getUserIdFromLocalStorage() {
+    try {
+      let userId = localStorage.getItem(USER_ID_STORAGE_KEY);
+      if (!userId) {
+        userId = generateUUID();
+        localStorage.setItem(USER_ID_STORAGE_KEY, userId);
+        logger.debug(`Created new browser user ID`);
+      }
+      return userId;
+    } catch (e) {
+      logger.debug(`localStorage access failed: ${e}`);
+      return `session-${generateUUID()}`;
+    }
+  }
+  _getCacheHome(os, path2) {
+    const envVar = process.env.XDG_CACHE_HOME;
+    if (envVar && path2.isAbsolute(envVar)) {
+      return envVar;
+    }
+    const platform = process.platform;
+    const homeDir = os.homedir();
+    if (platform === "win32") {
+      const appdata = process.env.LOCALAPPDATA || process.env.APPDATA;
+      if (appdata) {
+        return appdata;
+      }
+      return path2.join(homeDir, "AppData", "Local");
+    } else if (platform === "darwin") {
+      return path2.join(homeDir, "Library", "Caches");
+    } else {
+      return path2.join(homeDir, ".cache");
+    }
+  }
   async capture(event) {
-    if (!this._posthogClient && !this._scarfClient) {
+    if (this._posthogLoading) {
+      await this._posthogLoading;
+    }
+    if (!this._posthogNodeClient && !this._posthogBrowserClient && !this._scarfClient) {
       return;
     }
-    if (this._posthogClient) {
+    const properties = { ...event.properties };
+    properties.mcp_use_version = getPackageVersion();
+    properties.language = "typescript";
+    properties.source = this._source;
+    properties.runtime = this._runtimeEnvironment;
+    if (this._posthogNodeClient) {
       try {
-        const properties = { ...event.properties };
-        properties.mcp_use_version = getPackageVersion();
-        properties.language = "typescript";
-        properties.source = this._source;
-        this._posthogClient.capture({
+        logger.debug(`CAPTURE: PostHog Node Event ${event.name}`);
+        this._posthogNodeClient.capture({
           distinctId: this.userId,
           event: event.name,
           properties
         });
       } catch (e) {
-        logger.debug(`Failed to track PostHog event ${event.name}: ${e}`);
+        logger.debug(`Failed to track PostHog Node event ${event.name}: ${e}`);
+      }
+    }
+    if (this._posthogBrowserClient) {
+      try {
+        logger.debug(`CAPTURE: PostHog Browser Event ${event.name}`);
+        this._posthogBrowserClient.capture(event.name, {
+          ...properties,
+          distinct_id: this.userId
+        });
+      } catch (e) {
+        logger.debug(
+          `Failed to track PostHog Browser event ${event.name}: ${e}`
+        );
       }
     }
     if (this._scarfClient) {
       try {
-        const properties = {};
-        properties.mcp_use_version = getPackageVersion();
-        properties.user_id = this.userId;
-        properties.event = event.name;
-        properties.language = "typescript";
-        properties.source = this._source;
-        await this._scarfClient.logEvent(properties);
+        const scarfProperties = {
+          ...properties,
+          user_id: this.userId,
+          event: event.name
+        };
+        await this._scarfClient.logEvent(scarfProperties);
       } catch (e) {
         logger.debug(`Failed to track Scarf event ${event.name}: ${e}`);
       }
     }
   }
+  // ============================================================================
+  // Package Download Tracking (Node.js only)
+  // ============================================================================
+  /**
+   * Track package download event.
+   * This is a public wrapper that safely accesses userId.
+   */
   async trackPackageDownload(properties) {
+    return this._trackPackageDownloadInternal(this.userId, properties);
+  }
+  /**
+   * Internal method to track package download with explicit userId.
+   */
+  async _trackPackageDownloadInternal(userId, properties) {
     if (!this._scarfClient) {
       return;
     }
-    if (!isNodeJSEnvironment2()) {
+    if (this._storageCapability !== "filesystem") {
       return;
     }
     try {
+      const fs2 = require("fs");
+      const path2 = require("path");
+      const os = require("os");
+      if (!this._versionDownloadPath) {
+        this._versionDownloadPath = path2.join(
+          this._getCacheHome(os, path2),
+          "mcp_use",
+          "download_version"
+        );
+      }
       const currentVersion = getPackageVersion();
       let shouldTrack = false;
       let firstDownload = false;
-      if (!fs2.existsSync(this.VERSION_DOWNLOAD_PATH)) {
+      if (!fs2.existsSync(this._versionDownloadPath)) {
         shouldTrack = true;
         firstDownload = true;
-        fs2.mkdirSync(path2.dirname(this.VERSION_DOWNLOAD_PATH), {
+        fs2.mkdirSync(path2.dirname(this._versionDownloadPath), {
           recursive: true
         });
-        fs2.writeFileSync(this.VERSION_DOWNLOAD_PATH, currentVersion);
+        fs2.writeFileSync(this._versionDownloadPath, currentVersion);
       } else {
-        const savedVersion = fs2.readFileSync(this.VERSION_DOWNLOAD_PATH, "utf-8").trim();
+        const savedVersion = fs2.readFileSync(this._versionDownloadPath, "utf-8").trim();
         if (currentVersion > savedVersion) {
           shouldTrack = true;
           firstDownload = false;
-          fs2.writeFileSync(this.VERSION_DOWNLOAD_PATH, currentVersion);
+          fs2.writeFileSync(this._versionDownloadPath, currentVersion);
         }
       }
       if (shouldTrack) {
@@ -2870,52 +3359,193 @@ var Telemetry = class _Telemetry {
         );
         const eventProperties = { ...properties || {} };
         eventProperties.mcp_use_version = currentVersion;
-        eventProperties.user_id = this.userId;
+        eventProperties.user_id = userId;
         eventProperties.event = "package_download";
         eventProperties.first_download = firstDownload;
         eventProperties.language = "typescript";
         eventProperties.source = this._source;
+        eventProperties.runtime = this._runtimeEnvironment;
         await this._scarfClient.logEvent(eventProperties);
       }
     } catch (e) {
       logger.debug(`Failed to track Scarf package_download event: ${e}`);
     }
   }
+  // ============================================================================
+  // Agent Events
+  // ============================================================================
   async trackAgentExecution(data) {
+    if (!this.isEnabled) return;
     const event = new MCPAgentExecutionEvent(data);
     await this.capture(event);
   }
+  // ============================================================================
+  // Server Events
+  // ============================================================================
+  /**
+   * Track server run event directly from an MCPServer instance.
+   */
+  async trackServerRunFromServer(server, transport) {
+    if (!this.isEnabled) return;
+    const data = createServerRunEventData(server, transport);
+    const event = new ServerRunEvent(data);
+    await this.capture(event);
+  }
+  async trackServerInitialize(data) {
+    if (!this.isEnabled) return;
+    const event = new ServerInitializeEvent(data);
+    await this.capture(event);
+  }
+  async trackServerToolCall(data) {
+    if (!this.isEnabled) return;
+    const event = new ServerToolCallEvent(data);
+    await this.capture(event);
+  }
+  async trackServerResourceCall(data) {
+    if (!this.isEnabled) return;
+    const event = new ServerResourceCallEvent(data);
+    await this.capture(event);
+  }
+  async trackServerPromptCall(data) {
+    if (!this.isEnabled) return;
+    const event = new ServerPromptCallEvent(data);
+    await this.capture(event);
+  }
+  async trackServerContext(data) {
+    if (!this.isEnabled) return;
+    const event = new ServerContextEvent(data);
+    await this.capture(event);
+  }
+  // ============================================================================
+  // Client Events
+  // ============================================================================
+  async trackMCPClientInit(data) {
+    if (!this.isEnabled) return;
+    const event = new MCPClientInitEvent(data);
+    await this.capture(event);
+  }
+  async trackConnectorInit(data) {
+    if (!this.isEnabled) return;
+    const event = new ConnectorInitEvent(data);
+    await this.capture(event);
+  }
+  async trackClientAddServer(serverName, serverConfig) {
+    if (!this.isEnabled) return;
+    const event = new ClientAddServerEvent({ serverName, serverConfig });
+    await this.capture(event);
+  }
+  async trackClientRemoveServer(serverName) {
+    if (!this.isEnabled) return;
+    const event = new ClientRemoveServerEvent({ serverName });
+    await this.capture(event);
+  }
+  // ============================================================================
+  // React Hook / Browser specific events
+  // ============================================================================
+  async trackUseMcpConnection(data) {
+    if (!this.isEnabled) return;
+    await this.capture({
+      name: "usemcp_connection",
+      properties: {
+        url_domain: new URL(data.url).hostname,
+        // Only domain for privacy
+        transport_type: data.transportType,
+        success: data.success,
+        error_type: data.errorType ?? null,
+        connection_time_ms: data.connectionTimeMs ?? null,
+        has_oauth: data.hasOAuth,
+        has_sampling: data.hasSampling,
+        has_elicitation: data.hasElicitation
+      }
+    });
+  }
+  async trackUseMcpToolCall(data) {
+    if (!this.isEnabled) return;
+    await this.capture({
+      name: "usemcp_tool_call",
+      properties: {
+        tool_name: data.toolName,
+        success: data.success,
+        error_type: data.errorType ?? null,
+        execution_time_ms: data.executionTimeMs ?? null
+      }
+    });
+  }
+  async trackUseMcpResourceRead(data) {
+    if (!this.isEnabled) return;
+    await this.capture({
+      name: "usemcp_resource_read",
+      properties: {
+        resource_uri_scheme: data.resourceUri.split(":")[0],
+        // Only scheme for privacy
+        success: data.success,
+        error_type: data.errorType ?? null
+      }
+    });
+  }
+  // ============================================================================
+  // Browser-specific Methods
+  // ============================================================================
+  /**
+   * Identify the current user (useful for linking sessions)
+   * Browser only - no-op in Node.js
+   */
+  identify(userId, properties) {
+    if (this._posthogBrowserClient) {
+      try {
+        this._posthogBrowserClient.identify(userId, properties);
+      } catch (e) {
+        logger.debug(`Failed to identify user: ${e}`);
+      }
+    }
+  }
+  /**
+   * Reset the user identity (useful for logout)
+   * Browser only - no-op in Node.js
+   */
+  reset() {
+    if (this._posthogBrowserClient) {
+      try {
+        this._posthogBrowserClient.reset();
+      } catch (e) {
+        logger.debug(`Failed to reset user: ${e}`);
+      }
+    }
+    this._currUserId = null;
+  }
+  // ============================================================================
+  // Node.js-specific Methods
+  // ============================================================================
+  /**
+   * Flush the telemetry queue (Node.js only)
+   */
   flush() {
-    if (this._posthogClient) {
+    if (this._posthogNodeClient) {
       try {
-        this._posthogClient.flush();
+        this._posthogNodeClient.flush();
         logger.debug("PostHog client telemetry queue flushed");
       } catch (e) {
         logger.debug(`Failed to flush PostHog client: ${e}`);
       }
     }
-    if (this._scarfClient) {
-      logger.debug("Scarf telemetry events sent immediately (no flush needed)");
-    }
   }
+  /**
+   * Shutdown the telemetry client (Node.js only)
+   */
   shutdown() {
-    if (this._posthogClient) {
+    if (this._posthogNodeClient) {
       try {
-        this._posthogClient.shutdown();
+        this._posthogNodeClient.shutdown();
         logger.debug("PostHog client shutdown successfully");
       } catch (e) {
         logger.debug(`Error shutting down PostHog client: ${e}`);
       }
     }
-    if (this._scarfClient) {
-      logger.debug("Scarf telemetry client shutdown (no action needed)");
-    }
   }
 };
-
-// src/telemetry/index.ts
+var Tel = Telemetry;
 function setTelemetrySource(source) {
-  Telemetry.getInstance().setSource(source);
+  Tel.getInstance().setSource(source);
 }
 __name(setTelemetrySource, "setTelemetrySource");
 
@@ -3246,6 +3876,13 @@ var MCPAgent = class {
   static {
     __name(this, "MCPAgent");
   }
+  /**
+   * Get the mcp-use package version.
+   * Works in all environments (Node.js, browser, Cloudflare Workers, Deno, etc.)
+   */
+  static getPackageVersion() {
+    return getPackageVersion();
+  }
   llm;
   client;
   connectors;
@@ -3969,7 +4606,7 @@ var MCPAgent = class {
       const historyToUse = externalHistory ?? this.conversationHistory;
       const langchainHistory = [];
       for (const msg of historyToUse) {
-        if (this._isHumanMessageLike(msg) || this._isAIMessageLike(msg)) {
+        if (this._isHumanMessageLike(msg) || this._isAIMessageLike(msg) || this._isToolMessageLike(msg)) {
           langchainHistory.push(msg);
         }
       }
@@ -4102,9 +4739,9 @@ var MCPAgent = class {
         }
       }
       if (this.memoryEnabled) {
-        this.addToHistory(new import_langchain2.HumanMessage(query));
-        if (finalOutput) {
-          this.addToHistory(new import_langchain2.AIMessage(finalOutput));
+        const newMessages = accumulatedMessages.slice(langchainHistory.length);
+        for (const msg of newMessages) {
+          this.addToHistory(msg);
         }
       }
       if (outputSchema && finalOutput) {
@@ -4539,7 +5176,9 @@ ${formatPrompt}`
         let chunkCount = 0;
         for await (const chunk of stream) {
           chunkCount++;
-          logger.info(`Chunk ${chunkCount}: ${JSON.stringify(chunk, null, 2)}`);
+          logger.debug(
+            `Chunk ${chunkCount}: ${JSON.stringify(chunk, null, 2)}`
+          );
           if (typeof chunk === "string") {
             try {
               structuredResult = JSON.parse(chunk);
@@ -4556,7 +5195,9 @@ ${formatPrompt}`
             }
           }
           if (chunkCount % 10 === 0) {
-            logger.info(`\u{1F504} Structured output streaming: ${chunkCount} chunks`);
+            logger.debug(
+              `\u{1F504} Structured output streaming: ${chunkCount} chunks`
+            );
           }
         }
         logger.info(
@@ -4723,6 +5364,190 @@ var MCPSession = class {
   getRoots() {
     return this.connector.getRoots();
   }
+  /**
+   * Get the cached list of tools from the server.
+   *
+   * @returns Array of available tools
+   *
+   * @example
+   * ```typescript
+   * const tools = session.tools;
+   * console.log(`Available tools: ${tools.map(t => t.name).join(", ")}`);
+   * ```
+   */
+  get tools() {
+    return this.connector.tools;
+  }
+  /**
+   * Get the server capabilities advertised during initialization.
+   *
+   * @returns Server capabilities object
+   */
+  get serverCapabilities() {
+    return this.connector.serverCapabilities;
+  }
+  /**
+   * Get the server information (name and version).
+   *
+   * @returns Server info object or null if not available
+   */
+  get serverInfo() {
+    return this.connector.serverInfo;
+  }
+  /**
+   * Call a tool on the server.
+   *
+   * @param name - Name of the tool to call
+   * @param args - Arguments to pass to the tool
+   * @param options - Optional request options (timeout, progress handlers, etc.)
+   * @returns Result from the tool execution
+   *
+   * @example
+   * ```typescript
+   * const result = await session.callTool("add", { a: 5, b: 3 });
+   * console.log(`Result: ${result.content[0].text}`);
+   * ```
+   */
+  async callTool(name, args, options) {
+    return this.connector.callTool(name, args, options);
+  }
+  /**
+   * 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
+   *
+   * @example
+   * ```typescript
+   * const result = await session.listResources();
+   * console.log(`Found ${result.resources.length} resources`);
+   * ```
+   */
+  async listResources(cursor, options) {
+    return this.connector.listResources(cursor, options);
+  }
+  /**
+   * List all resources from the server, automatically handling pagination.
+   *
+   * @param options - Request options
+   * @returns Complete list of all resources
+   *
+   * @example
+   * ```typescript
+   * const result = await session.listAllResources();
+   * console.log(`Total resources: ${result.resources.length}`);
+   * ```
+   */
+  async listAllResources(options) {
+    return this.connector.listAllResources(options);
+  }
+  /**
+   * List resource templates from the server.
+   *
+   * @param options - Request options
+   * @returns List of available resource templates
+   *
+   * @example
+   * ```typescript
+   * const result = await session.listResourceTemplates();
+   * console.log(`Available templates: ${result.resourceTemplates.length}`);
+   * ```
+   */
+  async listResourceTemplates(options) {
+    return this.connector.listResourceTemplates(options);
+  }
+  /**
+   * Read a resource by URI.
+   *
+   * @param uri - URI of the resource to read
+   * @param options - Request options
+   * @returns Resource content
+   *
+   * @example
+   * ```typescript
+   * const resource = await session.readResource("file:///path/to/file.txt");
+   * console.log(resource.contents);
+   * ```
+   */
+  async readResource(uri, options) {
+    return this.connector.readResource(uri, options);
+  }
+  /**
+   * Subscribe to resource updates.
+   *
+   * @param uri - URI of the resource to subscribe to
+   * @param options - Request options
+   *
+   * @example
+   * ```typescript
+   * await session.subscribeToResource("file:///path/to/file.txt");
+   * // Now you'll receive notifications when this resource changes
+   * ```
+   */
+  async subscribeToResource(uri, options) {
+    return this.connector.subscribeToResource(uri, options);
+  }
+  /**
+   * Unsubscribe from resource updates.
+   *
+   * @param uri - URI of the resource to unsubscribe from
+   * @param options - Request options
+   *
+   * @example
+   * ```typescript
+   * await session.unsubscribeFromResource("file:///path/to/file.txt");
+   * ```
+   */
+  async unsubscribeFromResource(uri, options) {
+    return this.connector.unsubscribeFromResource(uri, options);
+  }
+  /**
+   * List available prompts from the server.
+   *
+   * @returns List of available prompts
+   *
+   * @example
+   * ```typescript
+   * const result = await session.listPrompts();
+   * console.log(`Available prompts: ${result.prompts.length}`);
+   * ```
+   */
+  async listPrompts() {
+    return this.connector.listPrompts();
+  }
+  /**
+   * Get a specific prompt with arguments.
+   *
+   * @param name - Name of the prompt to get
+   * @param args - Arguments for the prompt
+   * @returns Prompt result
+   *
+   * @example
+   * ```typescript
+   * const prompt = await session.getPrompt("greeting", { name: "Alice" });
+   * console.log(prompt.messages);
+   * ```
+   */
+  async getPrompt(name, args) {
+    return this.connector.getPrompt(name, args);
+  }
+  /**
+   * Send a raw request through the client.
+   *
+   * @param method - MCP method name
+   * @param params - Request parameters
+   * @param options - Request options
+   * @returns Response from the server
+   *
+   * @example
+   * ```typescript
+   * const result = await session.request("custom/method", { key: "value" });
+   * ```
+   */
+  async request(method, params = null, options) {
+    return this.connector.request(method, params, options);
+  }
 };
 
 // src/client/base.ts
@@ -4744,11 +5569,13 @@ var BaseMCPClient = class {
   addServer(name, serverConfig) {
     this.config.mcpServers = this.config.mcpServers || {};
     this.config.mcpServers[name] = serverConfig;
+    Tel.getInstance().trackClientAddServer(name, serverConfig);
   }
   removeServer(name) {
     if (this.config.mcpServers?.[name]) {
       delete this.config.mcpServers[name];
       this.activeSessions = this.activeSessions.filter((n) => n !== name);
+      Tel.getInstance().trackClientRemoveServer(name);
     }
   }
   getServerNames() {
@@ -5479,7 +6306,7 @@ var VMCodeExecutor = class extends BaseCodeExecutor {
 };
 
 // src/connectors/base.ts
-var import_types = require("@modelcontextprotocol/sdk/types.js");
+var import_types = require("@mcp-use/modelcontextprotocol-sdk/types.js");
 init_logging();
 var BaseConnector = class {
   static {
@@ -5500,6 +6327,17 @@ var BaseConnector = class {
       this.rootsCache = [...opts.roots];
     }
   }
+  /**
+   * Track connector initialization event
+   * Should be called by subclasses after successful connection
+   */
+  trackConnectorInit(data) {
+    const connectorType = this.constructor.name;
+    Telemetry.getInstance().trackConnectorInit({
+      connectorType,
+      ...data
+    }).catch((e) => logger.debug(`Failed to track connector init: ${e}`));
+  }
   /**
    * Register a handler for server notifications
    *
@@ -5708,7 +6546,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(
@@ -5730,7 +6568,7 @@ var BaseConnector = class {
   }
   /** Expose cached server capabilities. */
   get serverCapabilities() {
-    return this.capabilitiesCache;
+    return this.capabilitiesCache || {};
   }
   /** Expose cached server info. */
   get serverInfo() {
@@ -5797,7 +6635,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: [] };
       }
@@ -5864,7 +6703,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: [] };
       }
@@ -6123,12 +6963,12 @@ var CodeModeConnector = class extends BaseConnector {
 var import_node_fs = require("fs");
 
 // src/connectors/http.ts
-var import_client = require("@modelcontextprotocol/sdk/client/index.js");
-var import_streamableHttp = require("@modelcontextprotocol/sdk/client/streamableHttp.js");
+var import_client = require("@mcp-use/modelcontextprotocol-sdk/client/index.js");
+var import_streamableHttp = require("@mcp-use/modelcontextprotocol-sdk/client/streamableHttp.js");
 init_logging();
 
 // src/task_managers/sse.ts
-var import_sse = require("@modelcontextprotocol/sdk/client/sse.js");
+var import_sse = require("@mcp-use/modelcontextprotocol-sdk/client/sse.js");
 init_logging();
 
 // src/task_managers/base.ts
@@ -6341,15 +7181,16 @@ var HttpConnector = class extends BaseConnector {
       let fallbackReason = "Unknown error";
       let is401Error = false;
       if (err instanceof import_streamableHttp.StreamableHTTPError) {
-        is401Error = err.code === 401;
-        if (err.code === 400 && err.message.includes("Missing session ID")) {
+        const streamableErr = err;
+        is401Error = streamableErr.code === 401;
+        if (streamableErr.code === 400 && streamableErr.message.includes("Missing session ID")) {
           fallbackReason = "Server requires session ID (FastMCP compatibility) - using SSE transport";
           logger.warn(`\u26A0\uFE0F  ${fallbackReason}`);
-        } else if (err.code === 404 || err.code === 405) {
-          fallbackReason = `Server returned ${err.code} - server likely doesn't support streamable HTTP`;
+        } else if (streamableErr.code === 404 || streamableErr.code === 405) {
+          fallbackReason = `Server returned ${streamableErr.code} - server likely doesn't support streamable HTTP`;
           logger.debug(fallbackReason);
         } else {
-          fallbackReason = `Server returned ${err.code}: ${err.message}`;
+          fallbackReason = `Server returned ${streamableErr.code}: ${streamableErr.message}`;
           logger.debug(fallbackReason);
         }
       } else if (err instanceof Error) {
@@ -6489,6 +7330,10 @@ var HttpConnector = class extends BaseConnector {
       logger.debug(
         `Successfully connected to MCP implementation via streamable HTTP: ${baseUrl}`
       );
+      this.trackConnectorInit({
+        serverUrl: this.baseUrl,
+        publicIdentifier: `${this.baseUrl} (streamable-http)`
+      });
     } catch (err) {
       await this.cleanupResources();
       throw err;
@@ -6536,6 +7381,10 @@ var HttpConnector = class extends BaseConnector {
       logger.debug(
         `Successfully connected to MCP implementation via HTTP/SSE: ${baseUrl}`
       );
+      this.trackConnectorInit({
+        serverUrl: this.baseUrl,
+        publicIdentifier: `${this.baseUrl} (sse)`
+      });
     } catch (err) {
       await this.cleanupResources();
       throw err;
@@ -6558,11 +7407,11 @@ var HttpConnector = class extends BaseConnector {
 
 // src/connectors/stdio.ts
 var import_node_process = __toESM(require("process"), 1);
-var import_client2 = require("@modelcontextprotocol/sdk/client/index.js");
+var import_client2 = require("@mcp-use/modelcontextprotocol-sdk/client/index.js");
 init_logging();
 
 // src/task_managers/stdio.ts
-var import_stdio = require("@modelcontextprotocol/sdk/client/stdio.js");
+var import_stdio = require("@mcp-use/modelcontextprotocol-sdk/client/stdio.js");
 init_logging();
 var StdioConnectionManager = class extends ConnectionManager {
   static {
@@ -6691,6 +7540,11 @@ var StdioConnector = class extends BaseConnector {
       logger.debug(
         `Successfully connected to MCP implementation: ${this.command}`
       );
+      this.trackConnectorInit({
+        serverCommand: this.command,
+        serverArgs: this.args,
+        publicIdentifier: `${this.command} ${this.args.join(" ")}`
+      });
     } catch (err) {
       logger.error(`Failed to connect to MCP implementation: ${err}`);
       await this.cleanupResources();
@@ -7024,6 +7878,13 @@ var MCPClient = class _MCPClient extends BaseMCPClient {
   static {
     __name(this, "MCPClient");
   }
+  /**
+   * Get the mcp-use package version.
+   * Works in all environments (Node.js, browser, Cloudflare Workers, Deno, etc.)
+   */
+  static getPackageVersion() {
+    return getPackageVersion();
+  }
   codeMode = false;
   _codeExecutor = null;
   _customCodeExecutor = null;
@@ -7061,12 +7922,30 @@ var MCPClient = class _MCPClient extends BaseMCPClient {
     if (this.codeMode) {
       this._setupCodeModeConnector();
     }
+    this._trackClientInit();
+  }
+  _trackClientInit() {
+    const servers = Object.keys(this.config.mcpServers ?? {});
+    const hasSamplingCallback = !!this._samplingCallback;
+    const hasElicitationCallback = !!this._elicitationCallback;
+    Tel.getInstance().trackMCPClientInit({
+      codeMode: this.codeMode,
+      sandbox: false,
+      // Sandbox not supported in TS yet
+      allCallbacks: hasSamplingCallback && hasElicitationCallback,
+      verify: false,
+      // No verify option in TS client
+      servers,
+      numServers: servers.length,
+      isBrowser: false
+      // Node.js MCPClient
+    }).catch((e) => logger.debug(`Failed to track MCPClient init: ${e}`));
   }
   static fromDict(cfg, options) {
     return new _MCPClient(cfg, options);
   }
-  static fromConfigFile(path4, options) {
-    return new _MCPClient(loadConfigFile(path4), options);
+  static fromConfigFile(path2, options) {
+    return new _MCPClient(loadConfigFile(path2), options);
   }
   /**
    * Save configuration to a file (Node.js only)
@@ -7310,19 +8189,20 @@ var OAuthHelper = class {
       );
       return false;
     } catch (error) {
+      const err = error;
       console.warn(
         "\u26A0\uFE0F [OAuthHelper] Could not check auth requirement for:",
         serverUrl,
         error
       );
-      if (error.name === "TypeError" && (error.message?.includes("CORS") || error.message?.includes("Failed to fetch"))) {
+      if (err.name === "TypeError" && (err.message?.includes("CORS") || err.message?.includes("Failed to fetch"))) {
         console.log(
           "\u{1F50D} [OAuthHelper] CORS blocked direct check, using heuristics for:",
           serverUrl
         );
         return this.checkAuthByHeuristics(serverUrl);
       }
-      if (error.name === "AbortError") {
+      if (err.name === "AbortError") {
         console.log(
           "\u23F0 [OAuthHelper] Request timeout, assuming no auth required for:",
           serverUrl
@@ -7345,15 +8225,15 @@ var OAuthHelper = class {
       // GitHub Copilot
       /api\.github\.com/i,
       // GitHub API
-      /.*\.googleapis\.com/i,
-      // Google APIs
+      /[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?\.googleapis\.com/i,
+      // Google APIs (DNS-safe, max 63 chars per label)
       /api\.openai\.com/i,
       // OpenAI
       /api\.anthropic\.com/i,
       // Anthropic
-      /.*\.atlassian\.net/i,
+      /[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?\.atlassian\.net/i,
       // Atlassian (Jira, Confluence)
-      /.*\.slack\.com/i,
+      /[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?\.slack\.com/i,
       // Slack
       /api\.notion\.com/i,
       // Notion
@@ -7367,7 +8247,7 @@ var OAuthHelper = class {
       // Local development
       /\.local/i,
       // Local development
-      /mcp\..*\.com/i
+      /mcp\.[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?\.com/i
       // Generic MCP server pattern (often public)
     ];
     for (const pattern of noAuthPatterns) {
@@ -7917,7 +8797,7 @@ var BrowserOAuthClientProvider = class {
 };
 
 // src/auth/callback.ts
-var import_auth = require("@modelcontextprotocol/sdk/client/auth.js");
+var import_auth = require("@mcp-use/modelcontextprotocol-sdk/client/auth.js");
 async function onMcpAuthorization() {
   const queryParams = new URLSearchParams(window.location.search);
   const code = queryParams.get("code");
@@ -8025,16 +8905,44 @@ async function onMcpAuthorization() {
       );
     }
     try {
-      document.body.innerHTML = `
-            <div style="font-family: sans-serif; padding: 20px;">
-            <h1>Authentication Error</h1>
-            <p style="color: red; background-color: #ffebeb; border: 1px solid red; padding: 10px; border-radius: 4px;">
-                ${errorMessage}
-            </p>
-            <p>You can close this window or <a href="#" onclick="window.close(); return false;">click here to close</a>.</p>
-            <pre style="font-size: 0.8em; color: #555; margin-top: 20px; white-space: pre-wrap;">${err instanceof Error ? err.stack : ""}</pre>
-            </div>
-        `;
+      document.body.innerHTML = "";
+      const container = document.createElement("div");
+      container.style.fontFamily = "sans-serif";
+      container.style.padding = "20px";
+      const heading = document.createElement("h1");
+      heading.textContent = "Authentication Error";
+      container.appendChild(heading);
+      const errorPara = document.createElement("p");
+      errorPara.style.color = "red";
+      errorPara.style.backgroundColor = "#ffebeb";
+      errorPara.style.border = "1px solid red";
+      errorPara.style.padding = "10px";
+      errorPara.style.borderRadius = "4px";
+      errorPara.textContent = errorMessage;
+      container.appendChild(errorPara);
+      const closePara = document.createElement("p");
+      closePara.textContent = "You can close this window or ";
+      const closeLink = document.createElement("a");
+      closeLink.href = "#";
+      closeLink.textContent = "click here to close";
+      closeLink.onclick = (e) => {
+        e.preventDefault();
+        window.close();
+        return false;
+      };
+      closePara.appendChild(closeLink);
+      closePara.appendChild(document.createTextNode("."));
+      container.appendChild(closePara);
+      if (err instanceof Error && err.stack) {
+        const stackPre = document.createElement("pre");
+        stackPre.style.fontSize = "0.8em";
+        stackPre.style.color = "#555";
+        stackPre.style.marginTop = "20px";
+        stackPre.style.whiteSpace = "pre-wrap";
+        stackPre.textContent = err.stack;
+        container.appendChild(stackPre);
+      }
+      document.body.appendChild(container);
     } catch (displayError) {
       console.error(
         `${logPrefix} Could not display error in callback window:`,
@@ -8056,12 +8964,39 @@ __name(onMcpAuthorization, "onMcpAuthorization");
 var import_react = require("react");
 
 // src/client/browser.ts
+init_logging();
 var BrowserMCPClient = class _BrowserMCPClient extends BaseMCPClient {
   static {
     __name(this, "BrowserMCPClient");
   }
+  /**
+   * Get the mcp-use package version.
+   * Works in all environments (Node.js, browser, Cloudflare Workers, Deno, etc.)
+   */
+  static getPackageVersion() {
+    return getPackageVersion();
+  }
   constructor(config) {
     super(config);
+    this._trackClientInit();
+  }
+  _trackClientInit() {
+    const servers = Object.keys(this.config.mcpServers ?? {});
+    Tel.getInstance().trackMCPClientInit({
+      codeMode: false,
+      // Browser client doesn't support code mode
+      sandbox: false,
+      // Sandbox not supported in browser
+      allCallbacks: false,
+      // Will be set per-server
+      verify: false,
+      servers,
+      numServers: servers.length,
+      isBrowser: true
+      // Browser MCPClient
+    }).catch(
+      (e) => logger.debug(`Failed to track BrowserMCPClient init: ${e}`)
+    );
   }
   static fromDict(cfg) {
     return new _BrowserMCPClient(cfg);
@@ -8240,8 +9175,20 @@ function useMcp(options) {
         }
       }
       connectingRef.current = false;
+      if (url) {
+        Tel.getInstance().trackUseMcpConnection({
+          url,
+          transportType,
+          success: false,
+          errorType: connectionError?.name || "UnknownError",
+          hasOAuth: !!authProviderRef.current,
+          hasSampling: !!samplingCallback,
+          hasElicitation: !!onElicitation
+        }).catch(() => {
+        });
+      }
     },
-    [addLog]
+    [addLog, url, transportType, samplingCallback, onElicitation]
   );
   const connect = (0, import_react.useCallback)(async () => {
     if (!enabled || !url) {
@@ -8350,6 +9297,15 @@ function useMcp(options) {
         );
         setState("ready");
         successfulTransportRef.current = transportTypeParam;
+        Tel.getInstance().trackUseMcpConnection({
+          url,
+          transportType: transportTypeParam,
+          success: true,
+          hasOAuth: !!authProviderRef.current,
+          hasSampling: !!samplingCallback,
+          hasElicitation: !!onElicitation
+        }).catch(() => {
+        });
         setTools(session.connector.tools || []);
         const resourcesResult = await session.connector.listAllResources();
         setResources(resourcesResult.resources || []);
@@ -8367,15 +9323,16 @@ 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",
               "Authentication required. OAuth provider available."
             );
             try {
-              const { auth: auth2 } = await import("@modelcontextprotocol/sdk/client/auth.js");
+              const { auth: auth2 } = await import("@mcp-use/modelcontextprotocol-sdk/client/auth.js");
               const baseUrl = new URL(url).origin;
               auth2(authProviderRef.current, { serverUrl: baseUrl }).catch(
                 () => {
@@ -8416,7 +9373,10 @@ function useMcp(options) {
           );
           return "failed";
         }
-        failConnection(errorMessage, err);
+        failConnection(
+          errorMessage,
+          error2 instanceof Error ? error2 : new Error(String(error2))
+        );
         return "failed";
       }
     }, "tryConnectWithTransport");
@@ -8470,6 +9430,7 @@ function useMcp(options) {
         );
       }
       addLog("info", `Calling tool: ${name}`, args);
+      const startTime = Date.now();
       try {
         const serverName = "inspector-server";
         const session = clientRef.current.getSession(serverName);
@@ -8482,9 +9443,22 @@ function useMcp(options) {
           options2
         );
         addLog("info", `Tool "${name}" call successful:`, result);
+        Tel.getInstance().trackUseMcpToolCall({
+          toolName: name,
+          success: true,
+          executionTimeMs: Date.now() - startTime
+        }).catch(() => {
+        });
         return result;
       } catch (err) {
         addLog("error", `Tool "${name}" call failed:`, err);
+        Tel.getInstance().trackUseMcpToolCall({
+          toolName: name,
+          success: false,
+          errorType: err instanceof Error ? err.name : "UnknownError",
+          executionTimeMs: Date.now() - startTime
+        }).catch(() => {
+        });
         throw err;
       }
     },
@@ -8540,7 +9514,7 @@ function useMcp(options) {
         });
         authProviderRef.current = freshAuthProvider;
         addLog("info", "Triggering fresh OAuth authorization...");
-        const { auth: auth2 } = await import("@modelcontextprotocol/sdk/client/auth.js");
+        const { auth: auth2 } = await import("@mcp-use/modelcontextprotocol-sdk/client/auth.js");
         const baseUrl = new URL(url).origin;
         auth2(freshAuthProvider, {
           serverUrl: baseUrl
@@ -8548,7 +9522,7 @@ function useMcp(options) {
           addLog(
             "info",
             "OAuth flow initiated:",
-            err?.message || "Redirecting..."
+            err instanceof Error ? err.message : "Redirecting..."
           );
         });
       } catch (authError) {
@@ -8634,9 +9608,20 @@ function useMcp(options) {
         }
         const result = await session.connector.readResource(uri);
         addLog("info", "Resource read successful:", result);
+        Tel.getInstance().trackUseMcpResourceRead({
+          resourceUri: uri,
+          success: true
+        }).catch(() => {
+        });
         return result;
       } catch (err) {
         addLog("error", "Resource read failed:", err);
+        Tel.getInstance().trackUseMcpResourceRead({
+          resourceUri: uri,
+          success: false,
+          errorType: err instanceof Error ? err.name : "UnknownError"
+        }).catch(() => {
+        });
         throw err;
       }
     },
@@ -9284,7 +10269,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 () => {
@@ -9293,7 +10279,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(() => {
@@ -9301,7 +10288,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) => {
@@ -9310,7 +10298,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 () => {
@@ -9320,7 +10309,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 () => {
@@ -9597,8 +10587,8 @@ __name(WidgetControls, "WidgetControls");
 var import_react7 = __toESM(require("react"), 1);
 function getBasename() {
   if (typeof window === "undefined") return "/";
-  const path4 = window.location.pathname;
-  const match = path4.match(/^(\/inspector\/api\/dev-widget\/[^/]+)/);
+  const path2 = window.location.pathname;
+  const match = path2.match(/^(\/inspector\/api\/dev-widget\/[^/]+)/);
   if (match) {
     return match[1];
   }