@phantom/browser-sdk 1.0.0-beta.14 → 1.0.0-beta.16

package/dist/index.js

@@ -31,6 +31,7 @@ __export(src_exports, {
   getDeeplinkToPhantom: () => getDeeplinkToPhantom,
   getPlatformName: () => getPlatformName,
   isMobileDevice: () => isMobileDevice,
+  isPhantomLoginAvailable: () => isPhantomLoginAvailable,
   parseBrowserFromUserAgent: () => parseBrowserFromUserAgent,
   waitForPhantomExtension: () => waitForPhantomExtension
 });
@@ -476,7 +477,12 @@ var InjectedProvider = class {
             debug.info(DebugCategory.INJECTED_PROVIDER, "Solana connected successfully", { address: publicKey });
           }
         } catch (err) {
-          debug.warn(DebugCategory.INJECTED_PROVIDER, "Failed to connect Solana", { error: err });
+          debug.warn(DebugCategory.INJECTED_PROVIDER, "Failed to connect Solana, stopping", { error: err });
+          this.emit("connect_error", {
+            error: err instanceof Error ? err.message : "Failed to connect",
+            source: "manual-connect"
+          });
+          throw err;
         }
       }
       if (this.addressTypes.includes(import_client4.AddressType.ethereum)) {
@@ -492,7 +498,12 @@ var InjectedProvider = class {
             debug.info(DebugCategory.INJECTED_PROVIDER, "Ethereum connected successfully", { addresses: accounts });
           }
         } catch (err) {
-          debug.warn(DebugCategory.INJECTED_PROVIDER, "Failed to connect Ethereum", { error: err });
+          debug.warn(DebugCategory.INJECTED_PROVIDER, "Failed to connect Ethereum, stopping", { error: err });
+          this.emit("connect_error", {
+            error: err instanceof Error ? err.message : "Failed to connect",
+            source: "manual-connect"
+          });
+          throw err;
         }
       }
       if (connectedAddresses.length === 0) {
@@ -901,6 +912,47 @@ var BrowserStorage = class {
       };
     });
   }
+  async getShouldClearPreviousSession() {
+    debug.log(DebugCategory.STORAGE, "Getting shouldClearPreviousSession flag from IndexedDB");
+    const db = await this.getDB();
+    return new Promise((resolve, reject) => {
+      const transaction = db.transaction([this.storeName], "readonly");
+      const store = transaction.objectStore(this.storeName);
+      const request = store.get("shouldClearPreviousSession");
+      request.onsuccess = () => {
+        const shouldClear = request.result ?? false;
+        debug.log(DebugCategory.STORAGE, "Retrieved shouldClearPreviousSession flag from IndexedDB", {
+          shouldClear
+        });
+        resolve(shouldClear);
+      };
+      request.onerror = () => {
+        debug.error(DebugCategory.STORAGE, "Failed to get shouldClearPreviousSession flag from IndexedDB", {
+          error: request.error
+        });
+        reject(request.error);
+      };
+    });
+  }
+  async setShouldClearPreviousSession(should) {
+    debug.log(DebugCategory.STORAGE, "Setting shouldClearPreviousSession flag in IndexedDB", { should });
+    const db = await this.getDB();
+    return new Promise((resolve, reject) => {
+      const transaction = db.transaction([this.storeName], "readwrite");
+      const store = transaction.objectStore(this.storeName);
+      const request = store.put(should, "shouldClearPreviousSession");
+      request.onsuccess = () => {
+        debug.log(DebugCategory.STORAGE, "Successfully set shouldClearPreviousSession flag in IndexedDB");
+        resolve();
+      };
+      request.onerror = () => {
+        debug.error(DebugCategory.STORAGE, "Failed to set shouldClearPreviousSession flag in IndexedDB", {
+          error: request.error
+        });
+        reject(request.error);
+      };
+    });
+  }
 };
 
 // src/providers/embedded/adapters/url-params.ts
@@ -914,6 +966,147 @@ var browserUrlParamsAccessor = new BrowserURLParamsAccessor();
 
 // src/providers/embedded/adapters/auth.ts
 var import_constants = require("@phantom/constants");
+
+// src/utils/browser-detection.ts
+function parseBrowserFromUserAgent(userAgent, hasBraveAPI) {
+  let name = "unknown";
+  let version = "unknown";
+  if (!userAgent || typeof userAgent !== "string") {
+    return { name, version, userAgent: "unknown" };
+  }
+  try {
+    if (userAgent.includes("Edg/")) {
+      name = "edge";
+      const match = userAgent.match(/Edg\/([0-9]+(?:\.[0-9]+)*)/);
+      if (match)
+        version = match[1].split(".")[0];
+    } else if (userAgent.includes("OPR/") || userAgent.includes("Opera/")) {
+      name = "opera";
+      const match = userAgent.match(/(?:OPR|Opera)\/([0-9]+(?:\.[0-9]+)*)/);
+      if (match)
+        version = match[1].split(".")[0];
+    } else if (userAgent.includes("SamsungBrowser/")) {
+      name = "samsung";
+      const match = userAgent.match(/SamsungBrowser\/([0-9]+(?:\.[0-9]+)*)/);
+      if (match)
+        version = match[1].split(".")[0];
+    } else if (userAgent.includes("DuckDuckGo/")) {
+      name = "duckduckgo";
+      const match = userAgent.match(/DuckDuckGo\/([0-9]+(?:\.[0-9]+)*)/);
+      if (match)
+        version = match[1].split(".")[0];
+    } else if (userAgent.includes("Chrome/") && hasBraveAPI) {
+      name = "brave";
+      const match = userAgent.match(/Chrome\/([0-9]+(?:\.[0-9]+)*)/);
+      if (match)
+        version = match[1].split(".")[0];
+    } else if (userAgent.includes("Mobile/") || userAgent.includes("Android")) {
+      if (userAgent.includes("Chrome/")) {
+        name = "chrome-mobile";
+        const match = userAgent.match(/Chrome\/([0-9]+(?:\.[0-9]+)*)/);
+        if (match)
+          version = match[1].split(".")[0];
+      } else if (userAgent.includes("Firefox/")) {
+        name = "firefox-mobile";
+        const match = userAgent.match(/Firefox\/([0-9]+(?:\.[0-9]+)*)/);
+        if (match)
+          version = match[1].split(".")[0];
+      } else if (userAgent.includes("Safari/") && userAgent.includes("Mobile/")) {
+        name = "safari-mobile";
+        const match = userAgent.match(/Version\/([0-9]+(?:\.[0-9]+)*)/);
+        if (match)
+          version = match[1].split(".")[0];
+      } else {
+        name = "mobile";
+      }
+    } else if (userAgent.includes("Chrome/")) {
+      name = "chrome";
+      const match = userAgent.match(/Chrome\/([0-9]+(?:\.[0-9]+)*)/);
+      if (match)
+        version = match[1].split(".")[0];
+    } else if (userAgent.includes("Firefox/")) {
+      name = "firefox";
+      const match = userAgent.match(/Firefox\/([0-9]+(?:\.[0-9]+)*)/);
+      if (match)
+        version = match[1].split(".")[0];
+    } else if (userAgent.includes("Safari/") && !userAgent.includes("Chrome/")) {
+      name = "safari";
+      const match = userAgent.match(/Version\/([0-9]+(?:\.[0-9]+)*)/);
+      if (match)
+        version = match[1].split(".")[0];
+    }
+    if (name === "unknown") {
+      const patterns = [
+        { regex: /Chrome\/([0-9]+)/, name: "chrome" },
+        { regex: /Firefox\/([0-9]+)/, name: "firefox" },
+        { regex: /Safari\/([0-9]+)/, name: "safari" },
+        { regex: /Edge\/([0-9]+)/, name: "edge" },
+        { regex: /Opera\/([0-9]+)/, name: "opera" }
+      ];
+      for (const pattern of patterns) {
+        const match = userAgent.match(pattern.regex);
+        if (match) {
+          name = pattern.name;
+          version = match[1];
+          break;
+        }
+      }
+    }
+  } catch (error) {
+  }
+  return { name, version, userAgent };
+}
+function detectBrowser() {
+  if (typeof window === "undefined" || !window.navigator?.userAgent) {
+    return { name: "unknown", version: "unknown", userAgent: "unknown" };
+  }
+  const userAgent = window.navigator.userAgent;
+  const hasBraveAPI = !!navigator.brave;
+  return parseBrowserFromUserAgent(userAgent, hasBraveAPI);
+}
+function getPlatformName() {
+  const { name, version } = detectBrowser();
+  return version !== "unknown" ? `${name}-v${version}` : name;
+}
+function getBrowserDisplayName() {
+  const { name, version } = detectBrowser();
+  const capitalizedName = name.charAt(0).toUpperCase() + name.slice(1);
+  return version !== "unknown" ? `${capitalizedName} ${version}` : capitalizedName;
+}
+function isMobileDevice() {
+  if (typeof window === "undefined" || !window.navigator?.userAgent) {
+    return false;
+  }
+  const userAgent = window.navigator.userAgent.toLowerCase();
+  const mobilePatterns = [
+    /android/,
+    /iphone|ipad|ipod/,
+    /blackberry/,
+    /windows phone/,
+    /mobile/,
+    /tablet/,
+    /silk/,
+    /kindle/,
+    /opera mini/,
+    /opera mobi/
+  ];
+  const isMobileUA = mobilePatterns.some((pattern) => pattern.test(userAgent));
+  let isSmallScreen = false;
+  try {
+    isSmallScreen = window.screen.width <= 768 || window.screen.height <= 768;
+  } catch (error) {
+    isSmallScreen = false;
+  }
+  let isTouchDevice = false;
+  try {
+    isTouchDevice = "ontouchstart" in window || navigator.maxTouchPoints > 0;
+  } catch (error) {
+    isTouchDevice = false;
+  }
+  return isMobileUA || isSmallScreen && isTouchDevice;
+}
+
+// src/providers/embedded/adapters/auth.ts
 var BrowserAuthProvider = class {
   constructor(urlParamsAccessor) {
     this.urlParamsAccessor = urlParamsAccessor;
@@ -935,8 +1128,7 @@ var BrowserAuthProvider = class {
         publicKey: phantomOptions.publicKey,
         appId: phantomOptions.appId,
         provider: phantomOptions.provider,
-        authUrl: phantomOptions.authUrl,
-        hasCustomData: !!phantomOptions.customAuthData
+        authUrl: phantomOptions.authUrl
       });
       const baseUrl = phantomOptions.authUrl || import_constants.DEFAULT_AUTH_URL;
       debug.log(DebugCategory.PHANTOM_CONNECT_AUTH, "Using auth URL", { baseUrl });
@@ -945,8 +1137,12 @@ var BrowserAuthProvider = class {
         app_id: phantomOptions.appId,
         redirect_uri: phantomOptions.redirectUrl || (typeof window !== "undefined" ? this.getValidatedCurrentUrl() : ""),
         session_id: phantomOptions.sessionId,
-        clear_previous_session: true.toString(),
-        sdk_version: "1.0.0-beta.14"
+        // OAuth session management - defaults to allow refresh unless explicitly clearing after logout
+        clear_previous_session: (phantomOptions.clearPreviousSession ?? false).toString(),
+        allow_refresh: (phantomOptions.allowRefresh ?? true).toString(),
+        sdk_version: "1.0.0-beta.16",
+        sdk_type: "browser",
+        platform: detectBrowser().name
       });
       if (phantomOptions.provider) {
         debug.log(DebugCategory.PHANTOM_CONNECT_AUTH, "Provider specified, will skip selection", {
@@ -957,10 +1153,6 @@ var BrowserAuthProvider = class {
         debug.log(DebugCategory.PHANTOM_CONNECT_AUTH, "No provider specified, defaulting to Google");
         params.append("provider", "google");
       }
-      if (phantomOptions.customAuthData) {
-        debug.log(DebugCategory.PHANTOM_CONNECT_AUTH, "Adding custom auth data");
-        params.append("authData", JSON.stringify(phantomOptions.customAuthData));
-      }
       const authContext = {
         publicKey: phantomOptions.publicKey,
         appId: phantomOptions.appId,
@@ -1031,12 +1223,14 @@ var BrowserAuthProvider = class {
       });
       const organizationId = this.urlParamsAccessor.getParam("organization_id");
       const expiresInMs = this.urlParamsAccessor.getParam("expires_in_ms");
+      const authUserId = this.urlParamsAccessor.getParam("auth_user_id");
       debug.log(DebugCategory.PHANTOM_CONNECT_AUTH, "Auth redirect parameters", {
         walletId,
         organizationId,
         sessionId,
         accountDerivationIndex,
-        expiresInMs
+        expiresInMs,
+        authUserId
       });
       if (!organizationId) {
         debug.error(DebugCategory.PHANTOM_CONNECT_AUTH, "Missing organization_id in auth response");
@@ -1050,9 +1244,9 @@ var BrowserAuthProvider = class {
       return {
         walletId,
         organizationId,
-        userInfo: context,
         accountDerivationIndex: accountDerivationIndex ? parseInt(accountDerivationIndex) : 0,
-        expiresInMs: expiresInMs ? parseInt(expiresInMs) : 0
+        expiresInMs: expiresInMs ? parseInt(expiresInMs) : 0,
+        authUserId: authUserId || void 0
       };
     } catch (error) {
       sessionStorage.removeItem("phantom-auth-context");
@@ -1061,6 +1255,74 @@ var BrowserAuthProvider = class {
   }
 };
 
+// src/providers/embedded/adapters/phantom-app.ts
+var import_browser_injected_sdk2 = require("@phantom/browser-injected-sdk");
+var BrowserPhantomAppProvider = class {
+  /**
+   * Check if the Phantom extension is installed in the browser
+   */
+  isAvailable() {
+    return (0, import_browser_injected_sdk2.isPhantomExtensionInstalled)();
+  }
+  /**
+   * Authenticate using the Phantom browser extension
+   */
+  async authenticate(options) {
+    if (!this.isAvailable()) {
+      throw new Error(
+        "Phantom extension is not installed. Please install the Phantom browser extension to use this authentication method."
+      );
+    }
+    if (!window.phantom?.app?.login || typeof window.phantom.app.login !== "function") {
+      throw new Error(
+        "Phantom extension authentication is not yet implemented. The extension needs to expose an app.login API (window.phantom.app.login)."
+      );
+    }
+    try {
+      if (!window.phantom?.app?.features || typeof window.phantom.app.features !== "function") {
+        throw new Error(
+          "Phantom Login is not available. The extension does not support the features API."
+        );
+      }
+      const features = await window.phantom.app.features();
+      if (!Array.isArray(features) || !features.includes("phantom_login")) {
+        throw new Error(
+          "Phantom Login is not available. Please update your Phantom extension to use this authentication method."
+        );
+      }
+    } catch (error) {
+      if (error instanceof Error) {
+        throw error;
+      }
+      throw new Error(
+        "Failed to check Phantom Login availability. Please ensure you have the latest version of the Phantom extension."
+      );
+    }
+    try {
+      const result = await window.phantom.app.login({
+        publicKey: options.publicKey,
+        appId: options.appId,
+        sessionId: options.sessionId
+      });
+      if (!result || !result.walletId || !result.organizationId) {
+        throw new Error("Invalid authentication response from Phantom extension");
+      }
+      return {
+        walletId: result.walletId,
+        organizationId: result.organizationId,
+        provider: "phantom",
+        accountDerivationIndex: result.accountDerivationIndex ?? 0,
+        expiresInMs: result.expiresInMs ?? 0
+      };
+    } catch (error) {
+      if (error instanceof Error) {
+        throw error;
+      }
+      throw new Error(`Phantom extension authentication failed: ${String(error)}`);
+    }
+  }
+};
+
 // src/providers/embedded/adapters/logger.ts
 var BrowserLogger = class {
   info(category, message, data) {
@@ -1077,145 +1339,6 @@ var BrowserLogger = class {
   }
 };
 
-// src/utils/browser-detection.ts
-function parseBrowserFromUserAgent(userAgent, hasBraveAPI) {
-  let name = "unknown";
-  let version = "unknown";
-  if (!userAgent || typeof userAgent !== "string") {
-    return { name, version, userAgent: "unknown" };
-  }
-  try {
-    if (userAgent.includes("Edg/")) {
-      name = "edge";
-      const match = userAgent.match(/Edg\/([0-9]+(?:\.[0-9]+)*)/);
-      if (match)
-        version = match[1].split(".")[0];
-    } else if (userAgent.includes("OPR/") || userAgent.includes("Opera/")) {
-      name = "opera";
-      const match = userAgent.match(/(?:OPR|Opera)\/([0-9]+(?:\.[0-9]+)*)/);
-      if (match)
-        version = match[1].split(".")[0];
-    } else if (userAgent.includes("SamsungBrowser/")) {
-      name = "samsung";
-      const match = userAgent.match(/SamsungBrowser\/([0-9]+(?:\.[0-9]+)*)/);
-      if (match)
-        version = match[1].split(".")[0];
-    } else if (userAgent.includes("DuckDuckGo/")) {
-      name = "duckduckgo";
-      const match = userAgent.match(/DuckDuckGo\/([0-9]+(?:\.[0-9]+)*)/);
-      if (match)
-        version = match[1].split(".")[0];
-    } else if (userAgent.includes("Chrome/") && hasBraveAPI) {
-      name = "brave";
-      const match = userAgent.match(/Chrome\/([0-9]+(?:\.[0-9]+)*)/);
-      if (match)
-        version = match[1].split(".")[0];
-    } else if (userAgent.includes("Mobile/") || userAgent.includes("Android")) {
-      if (userAgent.includes("Chrome/")) {
-        name = "chrome-mobile";
-        const match = userAgent.match(/Chrome\/([0-9]+(?:\.[0-9]+)*)/);
-        if (match)
-          version = match[1].split(".")[0];
-      } else if (userAgent.includes("Firefox/")) {
-        name = "firefox-mobile";
-        const match = userAgent.match(/Firefox\/([0-9]+(?:\.[0-9]+)*)/);
-        if (match)
-          version = match[1].split(".")[0];
-      } else if (userAgent.includes("Safari/") && userAgent.includes("Mobile/")) {
-        name = "safari-mobile";
-        const match = userAgent.match(/Version\/([0-9]+(?:\.[0-9]+)*)/);
-        if (match)
-          version = match[1].split(".")[0];
-      } else {
-        name = "mobile";
-      }
-    } else if (userAgent.includes("Chrome/")) {
-      name = "chrome";
-      const match = userAgent.match(/Chrome\/([0-9]+(?:\.[0-9]+)*)/);
-      if (match)
-        version = match[1].split(".")[0];
-    } else if (userAgent.includes("Firefox/")) {
-      name = "firefox";
-      const match = userAgent.match(/Firefox\/([0-9]+(?:\.[0-9]+)*)/);
-      if (match)
-        version = match[1].split(".")[0];
-    } else if (userAgent.includes("Safari/") && !userAgent.includes("Chrome/")) {
-      name = "safari";
-      const match = userAgent.match(/Version\/([0-9]+(?:\.[0-9]+)*)/);
-      if (match)
-        version = match[1].split(".")[0];
-    }
-    if (name === "unknown") {
-      const patterns = [
-        { regex: /Chrome\/([0-9]+)/, name: "chrome" },
-        { regex: /Firefox\/([0-9]+)/, name: "firefox" },
-        { regex: /Safari\/([0-9]+)/, name: "safari" },
-        { regex: /Edge\/([0-9]+)/, name: "edge" },
-        { regex: /Opera\/([0-9]+)/, name: "opera" }
-      ];
-      for (const pattern of patterns) {
-        const match = userAgent.match(pattern.regex);
-        if (match) {
-          name = pattern.name;
-          version = match[1];
-          break;
-        }
-      }
-    }
-  } catch (error) {
-  }
-  return { name, version, userAgent };
-}
-function detectBrowser() {
-  if (typeof window === "undefined" || !window.navigator?.userAgent) {
-    return { name: "unknown", version: "unknown", userAgent: "unknown" };
-  }
-  const userAgent = window.navigator.userAgent;
-  const hasBraveAPI = !!navigator.brave;
-  return parseBrowserFromUserAgent(userAgent, hasBraveAPI);
-}
-function getPlatformName() {
-  const { name, version } = detectBrowser();
-  return version !== "unknown" ? `${name}-v${version}` : name;
-}
-function getBrowserDisplayName() {
-  const { name, version } = detectBrowser();
-  const capitalizedName = name.charAt(0).toUpperCase() + name.slice(1);
-  return version !== "unknown" ? `${capitalizedName} ${version}` : capitalizedName;
-}
-function isMobileDevice() {
-  if (typeof window === "undefined" || !window.navigator?.userAgent) {
-    return false;
-  }
-  const userAgent = window.navigator.userAgent.toLowerCase();
-  const mobilePatterns = [
-    /android/,
-    /iphone|ipad|ipod/,
-    /blackberry/,
-    /windows phone/,
-    /mobile/,
-    /tablet/,
-    /silk/,
-    /kindle/,
-    /opera mini/,
-    /opera mobi/
-  ];
-  const isMobileUA = mobilePatterns.some((pattern) => pattern.test(userAgent));
-  let isSmallScreen = false;
-  try {
-    isSmallScreen = window.screen.width <= 768 || window.screen.height <= 768;
-  } catch (error) {
-    isSmallScreen = false;
-  }
-  let isTouchDevice = false;
-  try {
-    isTouchDevice = "ontouchstart" in window || navigator.maxTouchPoints > 0;
-  } catch (error) {
-    isTouchDevice = false;
-  }
-  return isMobileUA || isSmallScreen && isTouchDevice;
-}
-
 // src/providers/embedded/index.ts
 var import_constants2 = require("@phantom/constants");
 var EmbeddedProvider = class extends import_embedded_provider_core.EmbeddedProvider {
@@ -1232,6 +1355,7 @@ var EmbeddedProvider = class extends import_embedded_provider_core.EmbeddedProvi
     const platform = {
       storage: new BrowserStorage(),
       authProvider: new BrowserAuthProvider(urlParamsAccessor),
+      phantomAppProvider: new BrowserPhantomAppProvider(),
       urlParamsAccessor,
       stamper,
       name: platformName,
@@ -1244,7 +1368,7 @@ var EmbeddedProvider = class extends import_embedded_provider_core.EmbeddedProvi
         // Full user agent for more detailed info
         [import_constants2.ANALYTICS_HEADERS.APP_ID]: config.appId,
         [import_constants2.ANALYTICS_HEADERS.WALLET_TYPE]: config.embeddedWalletType,
-        [import_constants2.ANALYTICS_HEADERS.SDK_VERSION]: "1.0.0-beta.14"
+        [import_constants2.ANALYTICS_HEADERS.SDK_VERSION]: "1.0.0-beta.16"
         // Replaced at build time
       }
     };
@@ -1257,6 +1381,25 @@ var EmbeddedProvider = class extends import_embedded_provider_core.EmbeddedProvi
 
 // src/ProviderManager.ts
 var import_constants3 = require("@phantom/constants");
+
+// src/utils/auth-callback.ts
+function isAuthFailureCallback(searchParams) {
+  if (typeof window === "undefined" && !searchParams)
+    return false;
+  const params = searchParams || new URLSearchParams(window.location.search);
+  const responseType = params.get("response_type");
+  const sessionId = params.get("session_id");
+  return responseType === "failure" && !!sessionId;
+}
+function isAuthCallbackUrl(searchParams) {
+  if (typeof window === "undefined" && !searchParams)
+    return false;
+  const params = searchParams || new URLSearchParams(window.location.search);
+  const sessionId = params.get("session_id");
+  return !!(sessionId && (params.has("response_type") || params.has("wallet_id")));
+}
+
+// src/ProviderManager.ts
 var ProviderManager = class {
   // Track which providers have forwarding set up
   constructor(config) {
@@ -1322,24 +1465,53 @@ var ProviderManager = class {
   }
   /**
    * Connect using the current provider
+   * Automatically switches provider based on authOptions.provider if specified
    */
   async connect(authOptions) {
     debug.info(DebugCategory.PROVIDER_MANAGER, "Starting connection", {
       currentProviderKey: this.currentProviderKey,
       authOptions: authOptions ? { provider: authOptions.provider, hasJwtToken: !!authOptions.jwtToken } : void 0
     });
+    if (authOptions?.provider) {
+      const requestedProvider = authOptions.provider;
+      let targetProviderType = null;
+      if (requestedProvider === "injected") {
+        targetProviderType = "injected";
+      } else if (["google", "apple", "jwt", "phantom"].includes(requestedProvider)) {
+        targetProviderType = "embedded";
+      }
+      if (targetProviderType) {
+        const currentInfo = this.getCurrentProviderInfo();
+        if (currentInfo?.type !== targetProviderType) {
+          debug.log(DebugCategory.PROVIDER_MANAGER, "Auto-switching provider based on auth options", {
+            from: currentInfo?.type,
+            to: targetProviderType,
+            requestedProvider
+          });
+          const switchOptions = {};
+          if (targetProviderType === "embedded") {
+            switchOptions.embeddedWalletType = currentInfo?.embeddedWalletType || this.config.embeddedWalletType;
+          }
+          this.switchProvider(targetProviderType, switchOptions);
+        }
+      }
+    }
     if (!this.currentProvider) {
       debug.error(DebugCategory.PROVIDER_MANAGER, "No provider selected");
       throw new Error("No provider selected");
     }
     debug.log(DebugCategory.PROVIDER_MANAGER, "Delegating to provider connect method");
     const result = await this.currentProvider.connect(authOptions);
+    const providerInfo = this.getCurrentProviderInfo();
+    result.providerType = providerInfo?.type;
     debug.log(DebugCategory.PROVIDER_MANAGER, "Connection successful, saving preferences", {
-      addressCount: result.addresses?.length || 0
+      addressCount: result.addresses?.length || 0,
+      providerType: result.providerType
     });
     this.saveProviderPreference();
     debug.info(DebugCategory.PROVIDER_MANAGER, "Connect completed", {
-      addresses: result.addresses
+      addresses: result.addresses,
+      providerType: result.providerType
     });
     return result;
   }
@@ -1373,6 +1545,10 @@ var ProviderManager = class {
    */
   async autoConnect() {
     debug.log(DebugCategory.PROVIDER_MANAGER, "Starting auto-connect with fallback strategy");
+    if (isAuthFailureCallback()) {
+      debug.warn(DebugCategory.PROVIDER_MANAGER, "Auth failure detected in URL, skipping autoConnect fallback");
+      return false;
+    }
     const embeddedWalletType = this.config.embeddedWalletType || "user-wallet";
     const embeddedKey = this.getProviderKey("embedded", embeddedWalletType);
     if (this.providers.has(embeddedKey)) {
@@ -1398,6 +1574,10 @@ var ProviderManager = class {
         debug.log(DebugCategory.PROVIDER_MANAGER, "Embedded auto-connect failed", {
           error: error.message
         });
+        if (isAuthCallbackUrl()) {
+          debug.log(DebugCategory.PROVIDER_MANAGER, "In auth callback URL, not attempting injected fallback");
+          return false;
+        }
       }
     }
     const injectedKey = this.getProviderKey("injected");
@@ -1515,7 +1695,11 @@ var ProviderManager = class {
     }
     debug.log(DebugCategory.PROVIDER_MANAGER, "Creating injected provider");
     this.createProvider("injected");
-    this.switchProvider(defaultType, { embeddedWalletType: defaultEmbeddedType });
+    const switchOptions = {};
+    if (defaultType === "embedded") {
+      switchOptions.embeddedWalletType = defaultEmbeddedType;
+    }
+    this.switchProvider(defaultType, switchOptions);
   }
   /**
    * Create a provider instance
@@ -1575,35 +1759,17 @@ var ProviderManager = class {
       console.error("Failed to save provider preference:", error);
     }
   }
-  /**
-   * Restore provider preference from localStorage
-   */
-  /*
-  private restoreProviderPreference(): void {
-    try {
-      const saved = localStorage.getItem("phantom-provider-preference");
-      if (saved) {
-        const preference: ProviderPreference = JSON.parse(saved);
-        this.switchProvider(preference.type, {
-          embeddedWalletType: preference.embeddedWalletType,
-        });
-      }
-    } catch (error) {
-      // Ignore localStorage errors - just use default provider
-      console.error("Failed to restore provider preference:", error);
-    }
-  }*/
 };
 
 // src/waitForPhantomExtension.ts
-var import_browser_injected_sdk2 = require("@phantom/browser-injected-sdk");
+var import_browser_injected_sdk3 = require("@phantom/browser-injected-sdk");
 async function waitForPhantomExtension(timeoutMs = 3e3) {
   return new Promise((resolve) => {
     const startTime = Date.now();
     const checkInterval = 100;
     const checkForExtension = () => {
       try {
-        if ((0, import_browser_injected_sdk2.isPhantomExtensionInstalled)()) {
+        if ((0, import_browser_injected_sdk3.isPhantomExtensionInstalled)()) {
           resolve(true);
           return;
         }
@@ -1696,22 +1862,6 @@ var BrowserSDK = class {
       throw error;
     }
   }
-  /**
-   * Switch between provider types (injected vs embedded)
-   */
-  async switchProvider(type, options) {
-    debug.info(DebugCategory.BROWSER_SDK, "Switching provider", { type, options });
-    try {
-      await this.providerManager.switchProvider(type, options);
-      debug.info(DebugCategory.BROWSER_SDK, "Provider switch successful", { type });
-    } catch (error) {
-      debug.error(DebugCategory.BROWSER_SDK, "Provider switch failed", {
-        type,
-        error: error.message
-      });
-      throw error;
-    }
-  }
   // ===== STATE QUERIES =====
   /**
    * Check if the SDK is connected to a wallet
@@ -1921,6 +2071,49 @@ function getDeeplinkToPhantom(ref) {
   return `https://phantom.app/ul/browse/${currentUrl}${refParam}`;
 }
 
+// src/isPhantomLoginAvailable.ts
+var import_browser_injected_sdk4 = require("@phantom/browser-injected-sdk");
+async function isPhantomLoginAvailable(timeoutMs = 3e3) {
+  const extensionInstalled = await waitForExtension(timeoutMs);
+  if (!extensionInstalled) {
+    return false;
+  }
+  try {
+    if (!window.phantom?.app?.features || typeof window.phantom.app.features !== "function") {
+      return false;
+    }
+    const features = await window.phantom.app.features();
+    if (!Array.isArray(features)) {
+      return false;
+    }
+    return features.includes("phantom_login");
+  } catch (error) {
+    return false;
+  }
+}
+async function waitForExtension(timeoutMs) {
+  return new Promise((resolve) => {
+    const startTime = Date.now();
+    const checkInterval = 100;
+    const checkForExtension = () => {
+      try {
+        if ((0, import_browser_injected_sdk4.isPhantomExtensionInstalled)()) {
+          resolve(true);
+          return;
+        }
+      } catch (error) {
+      }
+      const elapsed = Date.now() - startTime;
+      if (elapsed >= timeoutMs) {
+        resolve(false);
+        return;
+      }
+      setTimeout(checkForExtension, checkInterval);
+    };
+    checkForExtension();
+  });
+}
+
 // src/index.ts
 var import_constants5 = require("@phantom/constants");
 var import_client5 = require("@phantom/client");