@bwalletx/connect 0.5.3 → 0.5.6

package/dist/react.cjs

@@ -34,12 +34,16 @@ __export(react_exports, {
   BwalletxProvider: () => BwalletxProvider,
   BwalletxSignin: () => BwalletxSignin,
   PaymentError: () => PaymentError,
+  accountFor: () => accountFor,
+  autoChoice: () => autoChoice,
   brc100Option: () => brc100Option,
   default: () => react_default,
   discoverWallets: () => discoverWallets,
   handcashAdapter: () => handcashAdapter,
   pairingOption: () => pairingOption,
-  useBwalletX: () => useBwalletX
+  signinStateFor: () => signinStateFor,
+  useBwalletX: () => useBwalletX,
+  useBwalletXAccount: () => useBwalletXAccount
 });
 module.exports = __toCommonJS(react_exports);
 var import_react = require("react");
@@ -83,10 +87,22 @@ function pairUrl(link) {
   const q = new URLSearchParams({ v: link.v, r: link.r, c: link.c, k: link.k, o: link.o, e: String(link.e) });
   return `https://${PAIR_HOST}/pair?${q}`;
 }
-var relaySocketUrl = (relay, channel, role, expiry) => {
+var newClaim = () => b64url(crypto.getRandomValues(new Uint8Array(16)));
+var WALLET_CLAIM_INFO = "bwallet-pair-wallet-claim-v1";
+var hex = (b) => Array.from(b, (x) => x.toString(16).padStart(2, "0")).join("");
+async function walletClaimFor(channel, sitePub) {
+  const d = await crypto.subtle.digest("SHA-256", enc.encode(`${WALLET_CLAIM_INFO}|${channel}|${sitePub}`));
+  return b64url(new Uint8Array(d));
+}
+async function claimDigest(claim) {
+  return hex(new Uint8Array(await crypto.subtle.digest("SHA-256", enc.encode(claim))));
+}
+var relaySocketUrl = (relay, channel, role, expiry, claim, walletClaimHash) => {
   const local = /^(localhost|127\.0\.0\.1)(:\d+)?$/.test(relay);
   const q = new URLSearchParams({ role });
   if (expiry) q.set("e", String(expiry));
+  if (claim) q.set("claim", claim);
+  if (walletClaimHash && role === "site") q.set("wc", walletClaimHash);
   return `${local ? "ws" : "wss"}://${relay}/v1/c/${channel}?${q}`;
 };
 async function deriveSession(mine, theirs, channel) {
@@ -184,6 +200,7 @@ function parseStored(raw) {
     if (typeof p.s !== "string" || !/^[0-9a-f]{64}$/i.test(p.s)) return null;
     if (typeof p.k !== "string" || !/^0[23][0-9a-f]{64}$/i.test(p.k)) return null;
     if (!n(p.sent) || !n(p.lastSeen) || !n(p.pairedAt)) return null;
+    if (p.sc !== void 0 && (typeof p.sc !== "string" || !/^[A-Za-z0-9_-]{22,64}$/.test(p.sc))) return null;
     return p;
   } catch {
     return null;
@@ -241,7 +258,12 @@ var Link = class {
     await this.opening;
   }
   reopen() {
-    const ws = this.socket(relaySocketUrl(this.p.r, this.p.c, "site", Math.floor(Date.now() / 1e3) + QR_LIFETIME_S - 10));
+    if (!this.p.sc) {
+      this.p = { ...this.p, sc: newClaim() };
+      this.persist();
+    }
+    const e = Math.floor(Date.now() / 1e3) + QR_LIFETIME_S - 10;
+    const ws = this.socket(relaySocketUrl(this.p.r, this.p.c, "site", e, this.p.sc));
     return new Promise((resolve, reject) => {
       ws.onopen = () => {
         this.ws = ws;
@@ -335,11 +357,13 @@ function pairBwalletX(opts) {
   const siteKey = import_sdk2.PrivateKey.fromRandom();
   const channel = newChannel();
   const expiry = Math.floor(Date.now() / 1e3) + QR_LIFETIME_S;
-  return new Promise((resolve, reject) => {
+  const siteClaim = newClaim();
+  const sitePub = siteKey.toPublicKey().toString();
+  return walletClaimFor(channel, sitePub).then(claimDigest).then((wc) => new Promise((resolve, reject) => {
     if (opts.signal?.aborted) return reject(new Error("cancelled"));
     let ws;
     try {
-      ws = socket(relaySocketUrl(relay, channel, "site", expiry));
+      ws = socket(relaySocketUrl(relay, channel, "site", expiry, siteClaim, wc));
     } catch (e) {
       return reject(e);
     }
@@ -378,7 +402,7 @@ function pairBwalletX(opts) {
       if (msg.t === "ready") {
         settled = true;
         clearTimeout(timer);
-        const p = { v: 1, c: channel, r: relay, s: siteKey.toHex(), k: walletKey, ...sealer.counters, pairedAt: Date.now() };
+        const p = { v: 1, c: channel, r: relay, s: siteKey.toHex(), k: walletKey, ...sealer.counters, pairedAt: Date.now(), sc: siteClaim };
         await Promise.resolve(storage.setItem(key, JSON.stringify(p))).catch(() => {
         });
         const link = new Link(p, sealer, storage, key, socket, opts.callTimeoutMs ?? 12e4);
@@ -388,8 +412,8 @@ function pairBwalletX(opts) {
         fail(new Error("Pairing was declined in bWalletX"));
       }
     });
-    opts.onLink(pairUrl({ v: PAIR_VERSION, r: relay, c: channel, k: siteKey.toPublicKey().toString(), o: origin, e: expiry }));
-  });
+    opts.onLink(pairUrl({ v: PAIR_VERSION, r: relay, c: channel, k: sitePub, o: origin, e: expiry }));
+  }));
 }
 async function restorePairing(opts = {}) {
   const storage = opts.storage === void 0 ? defaultStorage() : opts.storage ?? memoryStorage();
@@ -426,18 +450,88 @@ function declareWalletTheme(theme) {
   if (meta.content !== id) meta.content = id;
 }
 
+// src/account.ts
+var PAYMAIL_LOOKUP_URL = "https://pay.bwallet.space/api/paymail/lookup?key=";
+var BAVATAR_URL = "https://chat.bwalletx.com/api/bavatar/";
+function shortKey(key) {
+  return key.length > 12 ? `${key.slice(0, 6)}\u2026${key.slice(-4)}` : key;
+}
+function accountLabel(a) {
+  if (a.paymail && /@bwalletx\.com$/i.test(a.paymail)) return "$" + a.paymail.split("@")[0];
+  if (a.handle) return a.handle;
+  if (a.paymail) return a.paymail;
+  return a.identityKey ? shortKey(a.identityKey) : "";
+}
+function avatarUrlFor(identityKey) {
+  return identityKey && /^0[23][0-9a-fA-F]{64}$/.test(identityKey) ? `${BAVATAR_URL}${identityKey.toLowerCase()}.png` : null;
+}
+var cache = /* @__PURE__ */ new Map();
+function lookupPaymail(identityKey, url = PAYMAIL_LOOKUP_URL) {
+  if (url === "off" || typeof fetch === "undefined") return Promise.resolve(null);
+  const k = `${url}|${identityKey}`;
+  let p = cache.get(k);
+  if (!p) {
+    p = fetch(url + encodeURIComponent(identityKey)).then((r) => r.ok ? r.json() : null).then((j) => j && typeof j.paymail === "string" ? j.paymail : null).catch(() => null);
+    cache.set(k, p);
+  }
+  return p;
+}
+function isUserRejection(e) {
+  const code = e?.code;
+  if (code === "ERR_PERMISSION_DENIED" || code === 4001) return true;
+  const msg = e instanceof Error ? e.message : String(e ?? "");
+  return /denied|reject|cancel|declin|refused|not now|user closed/i.test(msg);
+}
+function signInErrorText(e) {
+  if (isUserRejection(e)) return "Sign-in cancelled";
+  const code = e?.code;
+  if (code === "NOT_FOUND") return "bWalletX was not found in this browser";
+  const msg = e instanceof Error ? e.message : String(e ?? "");
+  if (/lock/i.test(msg)) return "Your wallet is locked. Unlock it and try again";
+  if (/timeout|timed out|expired/i.test(msg)) return "The wallet did not answer in time";
+  if (/origin/i.test(msg)) return "This page is not on the site\u2019s configured origin";
+  return "Sign-in failed";
+}
+async function copyText(text) {
+  try {
+    await navigator.clipboard.writeText(text);
+    return true;
+  } catch {
+    return false;
+  }
+}
+var IDENTITY_HINT_KEY = "bwx:identityKey";
+function rememberedIdentity() {
+  try {
+    const k = globalThis.localStorage?.getItem(IDENTITY_HINT_KEY) ?? "";
+    return /^0[23][0-9a-f]{64}$/i.test(k) ? k : void 0;
+  } catch {
+    return void 0;
+  }
+}
+function rememberIdentity(key) {
+  try {
+    if (key) globalThis.localStorage?.setItem(IDENTITY_HINT_KEY, key);
+    else globalThis.localStorage?.removeItem(IDENTITY_HINT_KEY);
+  } catch {
+  }
+}
+
 // src/discover.ts
 var import_sdk3 = require("@bsv/sdk");
 var RDNS_EXTENSION = "com.bwalletx.extension";
 var RDNS_MOBILE = "space.bwallet.mobile";
 var BWALLETX_RDNS = [RDNS_EXTENSION, RDNS_MOBILE];
-function discoverBwalletX(ms = 1200) {
+var DEFAULT_DISCOVER_MS = 300;
+function discoverBwalletX(ms = DEFAULT_DISCOVER_MS) {
   if (typeof window === "undefined") return Promise.resolve(null);
   return new Promise((resolve) => {
     let done = false;
+    let timer;
     const finish = (r) => {
       if (done) return;
       done = true;
+      if (timer !== void 0) clearTimeout(timer);
       window.removeEventListener("brc100:announceWallet", onAnnounce);
       resolve(r);
     };
@@ -450,11 +544,14 @@ function discoverBwalletX(ms = 1200) {
     };
     window.addEventListener("brc100:announceWallet", onAnnounce);
     window.dispatchEvent(new Event("brc100:requestWallet"));
-    setTimeout(() => {
-      const cwi = window.CWI;
-      if (cwi) return finish({ wallet: cwi, method: "in-app", rdns: null });
-      if (!isFramed()) return finish(null);
-      void probeXdm(ms).then((w) => finish(w ? { wallet: w, method: "in-app", rdns: null } : null));
+    if (done) return;
+    if (isFramed()) {
+      void probeXdm(Math.max(ms, 1200)).then((w) => finish(w ? { wallet: w, method: "in-app", rdns: null } : null));
+      return;
+    }
+    timer = setTimeout(() => {
+      timer = void 0;
+      finish(null);
     }, ms);
   });
 }
@@ -510,39 +607,116 @@ async function probeXdm(ms = 1200, allowed = BWALLETX_PARENT_ORIGINS) {
     return null;
   }
 }
+var warmedAt = 0;
+function prewarmBwalletX() {
+  if (typeof window === "undefined" || Date.now() - warmedAt < 2e4) return;
+  warmedAt = Date.now();
+  void discoverBwalletX(0).then((f) => {
+    if (f && f.method === "extension") void f.wallet.isAuthenticated({}).catch(() => {
+    });
+  });
+}
+function bindPrewarm(el2) {
+  const on = () => prewarmBwalletX();
+  const evs = ["pointerenter", "focus", "touchstart"];
+  for (const e of evs) el2.addEventListener(e, on, { passive: true });
+  return () => evs.forEach((e) => el2.removeEventListener(e, on));
+}
 
 // src/signin.ts
 var LOGIN_PROTOCOL = [2, "bwallet sign in"];
 async function connectBwalletX(opts = {}) {
-  if (opts.wallet) return { wallet: opts.wallet, method: "wallet" };
-  const found = await discoverBwalletX(opts.discoverMs);
-  if (found) return { wallet: found.wallet, method: found.method };
+  const status = (s) => {
+    try {
+      opts.onStatus?.(s);
+    } catch {
+    }
+  };
+  if (opts.wallet) {
+    status("opening");
+    return { wallet: opts.wallet, method: "wallet" };
+  }
+  status("finding");
+  const found = await discoverBwalletX(opts.discoverMs ?? DEFAULT_DISCOVER_MS);
+  if (found) {
+    status("opening");
+    return { wallet: found.wallet, method: found.method };
+  }
   if (opts.reusePairing !== false) {
     const restored = await restorePairing(opts.pairing ?? {});
-    if (restored) return { wallet: restored, method: "pairing" };
+    if (restored) {
+      status("opening");
+      return { wallet: restored, method: "pairing" };
+    }
   }
   if (!opts.pairing) {
     throw Object.assign(new Error("bWalletX was not found in this browser"), { code: "NOT_FOUND" });
   }
+  status("pairing");
   return { wallet: await pairBwalletX(opts.pairing), method: "pairing" };
 }
+async function waitIfLocked(wallet) {
+  let ok = false;
+  try {
+    ok = !!(await wallet.isAuthenticated({}))?.authenticated;
+  } catch {
+  }
+  if (!ok) await Promise.resolve().then(() => wallet.waitForAuthentication({})).catch(() => {
+  });
+}
+function challengeWantsIdentityKey(e) {
+  const msg = e instanceof Error ? e.message : String(e ?? "");
+  return /identityKey/i.test(msg);
+}
 async function signInWithBwalletX(opts) {
   const { wallet, method } = await connectBwalletX(opts);
-  if (method !== "pairing") await wallet.waitForAuthentication({}).catch(() => {
+  if (method !== "pairing" && !opts.skipWaitForAuthentication) await waitIfLocked(wallet);
+  const status = () => {
+    try {
+      opts.onStatus?.("signing");
+    } catch {
+    }
+  };
+  const sign = (c2) => wallet.createSignature({
+    protocolID: c2.protocolID ?? LOGIN_PROTOCOL,
+    keyID: c2.keyID,
+    counterparty: "anyone",
+    data: Array.from(new TextEncoder().encode(c2.message))
   });
-  const { publicKey: identityKey } = await atStage("identity", () => wallet.getPublicKey({ identityKey: true }));
-  const c = await atStage("challenge", () => opts.challenge(identityKey));
-  const { signature } = await atStage(
-    "signature",
-    () => wallet.createSignature({
-      protocolID: c.protocolID ?? LOGIN_PROTOCOL,
-      keyID: c.keyID,
-      counterparty: "anyone",
-      data: Array.from(new TextEncoder().encode(c.message))
-    })
-  );
+  const keyFirst = async () => {
+    const { publicKey: identityKey2 } = await atStage("identity", () => wallet.getPublicKey({ identityKey: true }));
+    status();
+    const c2 = await atStage("challenge", () => opts.challenge(identityKey2));
+    const { signature: signature2 } = await atStage("signature", () => sign(c2));
+    return { identityKey: identityKey2, signature: Array.from(signature2), nonce: c2.nonce, method, wallet };
+  };
+  if (opts.challengeNeedsIdentityKey && !opts.identityKey) return keyFirst();
+  let c;
+  try {
+    c = await atStage("challenge", () => opts.challenge(opts.identityKey));
+  } catch (e) {
+    if (!opts.identityKey && challengeWantsIdentityKey(e)) return keyFirst();
+    throw e;
+  }
+  status();
+  const [{ publicKey: identityKey }, { signature }] = await Promise.all([
+    opts.identityKey ? Promise.resolve({ publicKey: opts.identityKey }) : atStage("identity", () => wallet.getPublicKey({ identityKey: true })),
+    atStage("signature", () => sign(c))
+  ]);
   return { identityKey, signature: Array.from(signature), nonce: c.nonce, method, wallet };
 }
+async function signInAndVerify(opts) {
+  const hinted = !opts.identityKey && !!opts.identityKeyHint;
+  const r = await signInWithBwalletX({ ...opts, identityKey: opts.identityKey ?? opts.identityKeyHint });
+  try {
+    return { result: r, verified: await atStage("verify", () => opts.verify(r)) };
+  } catch (e) {
+    const status = e?.status;
+    if (!hinted || status !== 401) throw e;
+    const again = await signInWithBwalletX({ ...opts, wallet: r.wallet, identityKey: void 0, skipWaitForAuthentication: true });
+    return { result: again, verified: await atStage("verify", () => opts.verify(again)) };
+  }
+}
 async function atStage(stage, run) {
   try {
     return await run();
@@ -553,11 +727,272 @@ async function atStage(stage, run) {
   }
 }
 
+// src/wallets.ts
+var import_sdk4 = require("@bsv/sdk");
+async function brc100Connected(wallet, o, c = {}) {
+  if (c.identity === false) return { wallet, payer: wallet, identityKey: null, optionId: o.id, kind: o.kind };
+  await waitIfLocked(wallet);
+  const { publicKey } = await wallet.getPublicKey({ identityKey: true });
+  return { wallet, payer: wallet, identityKey: publicKey, optionId: o.id, kind: o.kind };
+}
+function brc100Option(wallet, info) {
+  const opt = {
+    id: info.id,
+    name: info.name,
+    icon: info.icon,
+    rdns: info.rdns,
+    kind: "brc100",
+    isBwalletX: info.isBwalletX ?? false,
+    substrate: info.substrate,
+    wallet,
+    connect: (c) => brc100Connected(wallet, opt, c)
+  };
+  return opt;
+}
+function pairingOption(pairing) {
+  const opt = {
+    id: "bwalletx-pairing",
+    name: "bWalletX on your phone",
+    kind: "pairing",
+    isBwalletX: true,
+    substrate: "pairing",
+    async connect(c) {
+      const p = typeof pairing === "function" ? pairing() : pairing;
+      const w = await restorePairing(p) ?? await pairBwalletX(p);
+      return brc100Connected(w, opt, c);
+    }
+  };
+  return opt;
+}
+function handcashAdapter(o) {
+  const opt = {
+    id: "handcash",
+    name: "HandCash",
+    icon: o.icon,
+    kind: "handcash",
+    isBwalletX: false,
+    substrate: "adapter",
+    async connect() {
+      const p = await o.login();
+      return {
+        wallet: null,
+        payer: o.pay ? { pay: o.pay } : null,
+        identityKey: p.identityKey ?? null,
+        handle: p.handle,
+        paymail: p.paymail ?? `${p.handle.replace(/^\$/, "")}@handcash.io`,
+        optionId: opt.id,
+        kind: "handcash",
+        transitional: true
+      };
+    }
+  };
+  return opt;
+}
+var NAMES = { [RDNS_EXTENSION]: "bWalletX", "space.bwallet.mobile": "bWalletX" };
+async function probe(substrate, ms) {
+  try {
+    const w = new import_sdk4.WalletClient(substrate);
+    const ok = await Promise.race([w.isAuthenticated({}).then(() => true), new Promise((r) => setTimeout(() => r(false), ms))]);
+    return ok ? w : null;
+  } catch {
+    return null;
+  }
+}
+function cwiIsAnnounced(cwi, announced) {
+  return announced.some((o) => o.wallet === cwi || o.rdns === RDNS_MOBILE);
+}
+async function discoverWallets(o = {}) {
+  const out = [];
+  const ms = o.ms ?? 300;
+  if (typeof window !== "undefined") {
+    const seen = /* @__PURE__ */ new Map();
+    const onAnnounce = (e) => {
+      const d = e.detail;
+      if (!d?.wallet) return;
+      const rdns = d.info?.rdns ?? d.info?.uuid ?? `wallet-${seen.size}`;
+      if (seen.has(rdns)) return;
+      const isB = BWALLETX_RDNS.includes(rdns);
+      const substrate = rdns === RDNS_EXTENSION ? "extension" : rdns === RDNS_MOBILE ? "in-app" : "injected";
+      seen.set(rdns, brc100Option(d.wallet, { id: rdns, rdns, name: NAMES[rdns] ?? d.info?.name ?? rdns, icon: d.info?.icon, isBwalletX: isB, substrate }));
+    };
+    window.addEventListener("brc100:announceWallet", onAnnounce);
+    window.dispatchEvent(new Event("brc100:requestWallet"));
+    const local = o.probeLocal ? Promise.all([probe("json-api", ms), probe("Cicada", ms)]) : Promise.resolve([null, null]);
+    await new Promise((r) => setTimeout(r, seen.size > 0 || window.CWI ? Math.min(ms, 50) : ms));
+    window.removeEventListener("brc100:announceWallet", onAnnounce);
+    out.push(...seen.values());
+    if (![...seen.values()].some((w) => w.isBwalletX) && isFramed()) {
+      const x = await probeXdm(Math.max(ms, 1200));
+      if (x) out.push(brc100Option(x, { id: "bwalletx-xdm", name: "bWalletX", isBwalletX: true, substrate: "xdm" }));
+    }
+    const cwi = window.CWI;
+    if (cwi && !cwiIsAnnounced(cwi, [...seen.values()])) {
+      out.push(brc100Option(cwi, { id: "window.CWI", name: seen.size ? "Another browser wallet" : "Browser wallet", isBwalletX: false, substrate: "window.CWI" }));
+    }
+    const [json, cicada] = await local;
+    if (json) out.push(brc100Option(json, { id: "localhost:3321", name: "Desktop wallet (localhost:3321)", substrate: "json-api" }));
+    if (cicada) out.push(brc100Option(cicada, { id: "localhost:3301", name: "Desktop wallet (localhost:3301)", substrate: "cicada" }));
+  }
+  if (o.pairing) out.push(pairingOption(o.pairing));
+  out.push(...o.extra ?? []);
+  const rank = (w) => w.isBwalletX ? 0 : w.kind === "handcash" ? 2 : 1;
+  return out.map((w, i) => ({ w, i })).sort((a, b) => rank(a.w) - rank(b.w) || a.i - b.i).map((x) => x.w);
+}
+var DESKTOP_OPTION_ID = "desktop";
+function desktopOption(ms = 1500) {
+  const opt = {
+    id: DESKTOP_OPTION_ID,
+    name: "Desktop wallet",
+    kind: "brc100",
+    isBwalletX: false,
+    substrate: "json-api",
+    async connect(c) {
+      const [json, cicada] = await Promise.all([probe("json-api", ms), probe("Cicada", ms)]);
+      const w = json ?? cicada;
+      if (!w) throw Object.assign(new Error("No desktop wallet answered on this computer"), { code: "NOT_FOUND" });
+      opt.wallet = w;
+      opt.substrate = json ? "json-api" : "cicada";
+      return brc100Connected(w, opt, c);
+    }
+  };
+  return opt;
+}
+function autoChoice(list, force = false) {
+  const detected = list.filter((w) => w.kind === "brc100");
+  const others = list.filter((w) => w.kind === "handcash" || w.kind === "custom");
+  if (force) return detected[0] ?? list.find((w) => w.kind !== "pairing") ?? list[0] ?? null;
+  if (!list.length) return null;
+  if (list.length === 1) return list[0];
+  if (detected.length === 1 && others.length === 0) return detected[0];
+  if (detected.length === 0 && others.length === 0) return list[0];
+  return void 0;
+}
+
+// src/choice.ts
+var BWALLETX_TYPE = "bwalletx";
+function substrateOf(o) {
+  if (o.substrate) return o.substrate;
+  if (o.kind === "pairing") return "pairing";
+  if (o.isBwalletX && o.kind === "brc100") return o.rdns === RDNS_MOBILE ? "in-app" : o.id === "bwalletx-xdm" ? "xdm" : "extension";
+  if (o.kind === "handcash" || o.kind === "custom") return "adapter";
+  if (o.rdns === RDNS_EXTENSION) return "extension";
+  if (o.rdns === RDNS_MOBILE) return "in-app";
+  if (o.id === "window.CWI") return "window.CWI";
+  if (o.id === "localhost:3321" || o.id === DESKTOP_OPTION_ID) return "json-api";
+  if (o.id === "localhost:3301") return "cicada";
+  return "injected";
+}
+function walletTypeOf(o) {
+  return o.isBwalletX ? BWALLETX_TYPE : o.rdns ?? o.id;
+}
+var OWN_MARKERS = ["extension", "in-app", "xdm"];
+function isPresentBwalletX(o) {
+  return o.isBwalletX && o.kind === "brc100" && !!o.wallet && OWN_MARKERS.includes(substrateOf(o));
+}
+function hasBwalletX(list) {
+  return list.some(isPresentBwalletX);
+}
+function otherDetected(list) {
+  return list.filter((o) => !o.isBwalletX && o.kind === "brc100" && !!o.wallet);
+}
+function chooserOrder(list) {
+  const rank = (o) => isPresentBwalletX(o) ? 0 : o.isBwalletX ? 1 : o.kind === "brc100" ? 2 : o.kind === "custom" ? 3 : 4;
+  return list.map((o, i) => ({ o, i })).sort((a, b) => rank(a.o) - rank(b.o) || a.i - b.i).map((x) => x.o);
+}
+function decideWallet(list, o = {}) {
+  if (o.walletId) {
+    const w = list.find((x) => x.id === o.walletId);
+    if (w) return { option: w, reason: "requested" };
+  }
+  if (o.chooser) return { option: null, reason: list.length || o.picker !== false ? "chooser" : "none" };
+  if (o.fastPath === false) {
+    const a = autoChoice([...list], o.picker === false);
+    return a === void 0 ? { option: null, reason: "chooser" } : a === null ? { option: null, reason: "none" } : { option: a, reason: "legacy" };
+  }
+  const b = list.find(isPresentBwalletX);
+  if (b) return { option: b, reason: "bwalletx" };
+  if (o.picker === false) {
+    const phone = list.find((x) => x.isBwalletX);
+    return phone ? { option: phone, reason: "bwalletx-phone" } : { option: null, reason: "none" };
+  }
+  return list.length ? { option: null, reason: "chooser" } : { option: null, reason: "none" };
+}
+function outcomeOf(e) {
+  const err = e;
+  if (err?.code === "NOT_FOUND") return "not-found";
+  if (err?.name === "AbortError" || err?.message === "cancelled") return "cancelled";
+  if (isUserRejection(e)) return "rejected";
+  return "error";
+}
+function attemptFor(option, outcome, startedAt, now = Date.now()) {
+  return {
+    walletType: option ? walletTypeOf(option) : null,
+    substrate: option ? substrateOf(option) : null,
+    outcome,
+    ms: Math.max(0, Math.round(now - startedAt))
+  };
+}
+function reportAttempt(hook, a) {
+  if (!hook) return;
+  try {
+    hook(Object.freeze({ walletType: a.walletType, substrate: a.substrate, outcome: a.outcome, ms: a.ms }));
+  } catch {
+  }
+}
+
+// src/connect-flow.ts
+async function runConnect(o) {
+  const started = Date.now();
+  const { list } = o;
+  let choice = null;
+  let reason = "none";
+  try {
+    const d = decideWallet(list, { walletId: o.walletId, chooser: o.chooser, picker: o.picker, fastPath: o.fastPath });
+    choice = d.option;
+    reason = d.reason;
+    if (!choice && d.reason === "chooser") choice = await o.pick(list);
+    if (!choice) {
+      if (d.reason === "none" || !list.length) throw Object.assign(new Error("No wallet found. Get bWalletX at bwalletx.com."), { code: "NOT_FOUND" });
+      reportAttempt(o.onAttempt, attemptFor(null, "cancelled", started));
+      return null;
+    }
+    const signIn = !!(o.challengeUrl && o.verifyUrl) && choice.kind !== "handcash";
+    const cw = await choice.connect(signIn ? { identity: false } : void 0);
+    let handle = cw.handle ?? null;
+    let paymail = cw.paymail ?? null;
+    let identityKey = cw.identityKey;
+    let signedIn = false;
+    if (cw.wallet && signIn) {
+      const { result, verified } = await signInAndVerify({
+        wallet: cw.wallet,
+        identityKey: cw.identityKey ?? void 0,
+        // The key that signed in here last time: a repeat sign-in is then the signature alone.
+        identityKeyHint: rememberedIdentity(),
+        challengeNeedsIdentityKey: o.challengeNeedsIdentityKey,
+        challenge: (key) => o.post(o.challengeUrl, key ? { identityKey: key } : {}),
+        verify: (r) => o.post(o.verifyUrl, { identityKey: r.identityKey, nonce: r.nonce, signature: r.signature })
+      });
+      rememberIdentity(result.identityKey);
+      identityKey = result.identityKey;
+      handle = verified.handle ?? handle;
+      paymail = verified.paymail ?? paymail;
+      signedIn = true;
+    } else if (cw.wallet && !identityKey) {
+      identityKey = (await cw.wallet.getPublicKey({ identityKey: true })).publicKey;
+    }
+    reportAttempt(o.onAttempt, attemptFor(choice, signedIn ? "signed-in" : "connected", started));
+    return { connected: cw, identityKey, handle, paymail, signedIn, walletType: walletTypeOf(choice), substrate: substrateOf(choice), reason };
+  } catch (e) {
+    reportAttempt(o.onAttempt, attemptFor(choice, outcomeOf(e), started));
+    throw e;
+  }
+}
+
 // src/modal.ts
 var import_qrcode_generator = __toESM(require("qrcode-generator"), 1);
 
 // src/access-client.ts
-var import_sdk4 = require("@bsv/sdk");
+var import_sdk5 = require("@bsv/sdk");
 
 // src/access.ts
 var ACCESS_PROTOCOL = [2, "bwalletx access"];
@@ -695,7 +1130,7 @@ async function proveHoldings(wallet, challenge, tokenId, basket = "bsv21") {
     const counterparty = ci.counterparty ?? "self";
     for (const protocolID of ci.protocolID ? [ci.protocolID] : [ONESAT, LEGACY_ONESAT]) {
       const { publicKey } = await wallet.getPublicKey({ protocolID, keyID: ci.keyID, counterparty });
-      const h = import_sdk4.Utils.toHex(import_sdk4.Hash.hash160(import_sdk4.PublicKey.fromString(publicKey).encode(true)));
+      const h = import_sdk5.Utils.toHex(import_sdk5.Hash.hash160(import_sdk5.PublicKey.fromString(publicKey).encode(true)));
       if (want && h !== want) continue;
       const existing = byKey.get(publicKey);
       if (existing) {
@@ -745,7 +1180,7 @@ async function requestAccess(o) {
 var SIGNIN_TAG = "bwalletx-signin";
 var GET_URL = "https://bwalletx.com/get";
 var WEB_WALLET_URL = "https://web.bwalletx.com";
-var VERBS = { signin: "Sign in with", continue: "Continue with", connect: "Connect" };
+var VERBS = { signin: "Sign in with", continue: "Continue with", connect: "Connect", get: "Get", play: "Play with" };
 function signinText(label = "signin", brand = "bWalletX") {
   return `${VERBS[label] ?? VERBS.signin} ${brand}`;
 }
@@ -800,7 +1235,50 @@ button[aria-busy=true]{cursor:wait}
 .nf a:focus-visible{outline:2px solid #b45309;outline-offset:2px;border-radius:2px}
 :host([theme=dark]) .nf,:host-context(.dark) .nf{color:#a1a1aa}
 .sr{position:absolute;width:1px;height:1px;overflow:hidden;clip:rect(0 0 0 0);white-space:nowrap}
+/* pending: one plain line under the button */
+.note{margin:8px 0 0;width:0;min-width:100%;font-size:12px;line-height:1.4;color:#71717a;text-align:center;overflow-wrap:break-word}
+:host([theme=dark]) .note,:host-context(.dark) .note{color:#a1a1aa}
+/* "Other wallets" (0.5.6): one small link under the button */
+.ow{margin:8px 0 0;width:0;min-width:100%;font-size:12px;line-height:1.4;color:#71717a;text-align:center}
+:host([theme=dark]) .ow,:host-context(.dark) .ow{color:#a1a1aa}
+.lnk{all:unset;cursor:pointer;color:inherit;font-weight:600;text-decoration:underline;text-underline-offset:2px}
+.lnk:focus-visible{outline:2px solid #b45309;outline-offset:2px;border-radius:2px}
+/* error: one line plus Retry */
+.err{margin:0 0 8px;width:0;min-width:100%;font-size:13px;font-weight:600;line-height:1.4;color:#b91c1c;text-align:center;overflow-wrap:anywhere}
+:host([theme=dark]) .err,:host-context(.dark) .err{color:#fca5a5}
+/* signed in: the badge */
+button.chip{display:inline-flex;align-items:center;justify-content:flex-start;gap:10px;width:auto;max-width:100%;padding:5px 14px 5px 5px;border-radius:999px;
+ background:#0b0b0c;color:#ffd24d;border:1px solid rgba(255,210,77,.55);box-shadow:none;font-size:15px}
+button.chip:hover{background:#151517;border-color:#ffd24d}
+button.chip:active{background:#000;transform:none}
+button.chip:focus-visible{outline:2px solid #ffd24d;outline-offset:3px}
+:host([theme=light]) button.chip{background:#fff;color:#09090b;border-color:#f59e0b}
+:host([theme=light]) button.chip:hover{background:#fffbeb}
+:host([full-width]) button.chip{width:100%}
+.av{position:relative;flex:none;display:inline-grid;place-items:center;width:30px;height:30px;border-radius:50%;overflow:hidden;
+ background:radial-gradient(circle at 30% 30%,#ffe27a,#f5b800 55%,#b88600);color:#000;font-weight:800;font-size:14px}
+.av img{position:absolute;inset:0;width:100%;height:100%;object-fit:cover}
+.name{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;min-width:0;max-width:min(52vw,260px)}
+.dot{flex:none;width:8px;height:8px;border-radius:50%;background:#ffd24d;box-shadow:0 0 0 3px rgba(255,210,77,.22)}
+:host([size=sm]) button.chip{font-size:13px;padding:3px 12px 3px 3px;gap:8px}
+:host([size=sm]) .av{width:26px;height:26px}
+:host([size=icon]) button.chip{width:48px;height:48px;padding:0;justify-content:center}
+:host([size=icon]) .name,:host([size=icon]) .dot{display:none}
+:host([size=icon]) .av{width:40px;height:40px}
+`;
+var MENU_CSS = `
+:host{all:initial}
+.menu{position:fixed;z-index:2147483600;box-sizing:border-box;min-width:200px;padding:6px;border-radius:14px;background:#0b0b0c;color:#ffd24d;
+ border:1px solid rgba(255,210,77,.55);box-shadow:0 12px 32px rgba(0,0,0,.45);font:600 14px/1.3 Inter,ui-sans-serif,system-ui,-apple-system,"Segoe UI",Roboto,sans-serif}
+.who{padding:8px 10px 10px;font-size:12px;font-weight:500;color:#e7d9a8;overflow-wrap:anywhere;border-bottom:1px solid rgba(255,210,77,.3);margin-bottom:4px}
+.item{all:unset;box-sizing:border-box;display:block;width:100%;padding:11px 10px;border-radius:10px;cursor:pointer;color:#ffd24d}
+.item:hover,.item:focus-visible{background:#ffd24d;color:#000;outline:none}
+.tip{position:fixed;z-index:2147483600;box-sizing:border-box;padding:8px 12px;border-radius:10px;background:#0b0b0c;color:#e7d9a8;
+ border:1px solid rgba(255,210,77,.4);box-shadow:0 8px 24px rgba(0,0,0,.35);font:500 12px/1.4 Inter,ui-sans-serif,system-ui,-apple-system,"Segoe UI",Roboto,sans-serif}
 `;
+var PENDING_NOTE = "Sign in: shares only your public identity key, moves no money";
+var PENDING_LABEL = "Approve in bWalletX\u2026";
+var PENDING_LABEL_OTHER = "Approve in your wallet\u2026";
 function b64url2(bytes) {
   let s = "";
   for (const b of bytes) s += String.fromCharCode(b);
@@ -833,14 +1311,15 @@ async function buildAuthorizeUrl(p) {
 async function postJson(url, body) {
   const res = await fetch(url, { method: "POST", credentials: "include", headers: { "content-type": "application/json" }, body: JSON.stringify(body) });
   const data = await res.json().catch(() => ({}));
-  if (!res.ok) throw new Error(data.error ?? `HTTP ${res.status}`);
+  if (!res.ok) throw Object.assign(new Error(data.error ?? `HTTP ${res.status}`), { status: res.status });
   return data;
 }
 async function postAccess(url, body) {
   const res = await fetch(url, { method: "POST", credentials: "include", headers: { "content-type": "application/json" }, body: JSON.stringify(body) });
   return res.json().catch(() => ({ error: "bad_request", message: `HTTP ${res.status}` }));
 }
-var OBSERVED = ["size", "theme", "label", "brand", "subtitle", "loading", "disabled", "full-width", "aria-label", "get-url", "web-url"];
+var OBSERVED = ["size", "theme", "label", "brand", "subtitle", "loading", "disabled", "full-width", "aria-label", "get-url", "web-url", "state", "identity-key", "paymail", "handle", "avatar-url", "error", "other-wallets", "challenge-url"];
+var STATES = ["signed-out", "restoring", "pending", "signed-in", "error"];
 function createClass() {
   return class BwalletxSigninElement extends HTMLElement {
     static get observedAttributes() {
@@ -849,12 +1328,23 @@ function createClass() {
     #root;
     #notFound = false;
     #busy = false;
+    #phase = "signed-out";
+    #account = null;
+    #error = "";
+    #restored = false;
+    #pendingLabel = PENDING_LABEL;
+    #menu = null;
     constructor() {
       super();
       this.#root = this.attachShadow({ mode: "open" });
     }
     connectedCallback() {
       this.#render();
+      void this.#restore();
+    }
+    disconnectedCallback() {
+      this.#menu?.close(false);
+      this.#hideTip();
     }
     attributeChangedCallback() {
       if (this.isConnected) this.#render();
@@ -866,92 +1356,402 @@ function createClass() {
     get notFound() {
       return this.#notFound;
     }
+    /** The state shown now (the `state` attribute when set, else the element's own). */
+    get state() {
+      const a = this.#attr("state");
+      return a && STATES.includes(a) ? a : this.#phase;
+    }
+    /** The signed-in account, or null. */
+    get account() {
+      if (!this.#controlled) return this.#account;
+      const identityKey = this.#attr("identity-key");
+      return identityKey ? { identityKey, paymail: this.#attr("paymail"), handle: this.#attr("handle"), avatarUrl: this.#attr("avatar-url") } : null;
+    }
+    /** True while the menu is open (tests). */
+    get menuOpen() {
+      return !!this.#menu;
+    }
     focus(opts) {
       this.button?.focus(opts);
     }
+    get #controlled() {
+      return this.hasAttribute("state");
+    }
+    get #stateful() {
+      return !this.hasAttribute("stateless");
+    }
     #attr(name) {
       return this.getAttribute(name);
     }
+    /** Restore the badge from session-url once, with no wallet call. */
+    async #restore() {
+      const url = this.#attr("session-url");
+      if (this.#restored || !url || this.#controlled || !this.#stateful) return;
+      this.#restored = true;
+      this.#set("restoring");
+      try {
+        const r = await fetch(url, { credentials: "include", headers: { accept: "application/json" } });
+        const j = await r.json().catch(() => ({}));
+        if (this.#phase !== "restoring") return;
+        if (j.identityKey) this.#signedIn({ identityKey: j.identityKey, handle: j.handle ?? null, paymail: j.paymail ?? null });
+        else this.#set("signed-out");
+      } catch {
+        if (this.#phase === "restoring") this.#set("signed-out");
+      }
+    }
+    #set(p) {
+      this.#phase = p;
+      if (p !== "signed-in") this.#menu?.close(false);
+      this.#render();
+    }
+    #signedIn(a) {
+      this.#account = a;
+      this.#error = "";
+      this.#set("signed-in");
+      const lookup = this.#attr("lookup-url");
+      if (!a.paymail && lookup !== "off") {
+        void lookupPaymail(a.identityKey, lookup ?? void 0).then((pm) => {
+          if (pm && this.#account?.identityKey === a.identityKey && !this.#account.paymail) {
+            this.#account = { ...this.#account, paymail: pm };
+            this.#render();
+          }
+        });
+      }
+    }
     #render() {
       const size = this.#attr("size") ?? "lg";
       const brand = this.#attr("brand") === "bWallet" ? "bWallet" : "bWalletX";
-      const text = signinText(this.#attr("label") ?? "signin", brand);
+      const esc = (s) => s.replace(/[&<>"]/g, (c) => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;" })[c]);
+      const state = this.state;
+      const acct = this.account;
+      if (state === "signed-in" && acct) {
+        this.#hideTip();
+        const name = accountLabel(acct);
+        const avatar = acct.avatarUrl ?? avatarUrlFor(acct.identityKey);
+        const initial = (name.replace(/^\$/, "").charAt(0) || "b").toUpperCase();
+        this.#root.innerHTML = `<style>${SIGNIN_CSS}</style><button type="button" class="chip" part="button chip" aria-haspopup="menu" aria-expanded="${this.#menu ? "true" : "false"}" aria-label="Signed in with bWalletX as ${esc(name)}. Account menu" title="Signed in as ${esc(name)}"><span class="av" part="avatar" aria-hidden="true">${esc(initial)}${avatar ? `<img alt="" src="${esc(avatar)}" referrerpolicy="no-referrer">` : ""}</span><span class="name" part="label">${esc(name)}</span><span class="dot" part="dot" aria-hidden="true"></span></button>`;
+        const img = this.#root.querySelector("img");
+        if (img) img.addEventListener("error", () => img.remove(), { once: true });
+        const chip = this.button;
+        chip.addEventListener("click", () => this.#menu ? this.#menu.close(true) : this.#openMenu());
+        chip.addEventListener("keydown", (e) => {
+          if ((e.key === "ArrowDown" || e.key === "Enter" || e.key === " ") && !this.#menu) {
+            e.preventDefault();
+            this.#openMenu();
+          }
+        });
+        return;
+      }
+      const pending = state === "pending";
+      const restoring = state === "restoring";
+      const error = state === "error";
+      const pendingLabel = this.#controlled ? PENDING_LABEL : this.#pendingLabel;
+      const text = pending ? pendingLabel : error ? "Retry" : signinText(this.#attr("label") ?? "signin", brand);
       const subAttr = this.#attr("subtitle");
       const subDefault = brand === "bWalletX" && (size === "lg" || size === "md") ? "also works with bWallet" : null;
-      const subtitle = subAttr === null || subAttr === "" || subAttr === "on" ? subAttr === "on" ? "also works with bWallet" : subDefault : subAttr === "off" ? null : subAttr;
-      const loading = this.hasAttribute("loading") || this.#busy;
+      const subtitle = pending || error ? null : subAttr === null || subAttr === "" || subAttr === "on" ? subAttr === "on" ? "also works with bWallet" : subDefault : subAttr === "off" ? null : subAttr;
+      const loading = this.hasAttribute("loading") || this.#busy || pending || restoring;
       const disabled = this.hasAttribute("disabled");
       const markPx = size === "icon" ? 24 : size === "sm" ? 15 : size === "md" ? 17 : 20;
-      const aria = this.#attr("aria-label") ?? (subtitle && size !== "icon" ? `${text}, ${subtitle}` : text);
+      const aria = pending ? pendingLabel : this.#attr("aria-label") ?? (subtitle && size !== "icon" ? `${text}, ${subtitle}` : text);
       const getUrl = this.#attr("get-url") ?? GET_URL;
       const webUrl = this.#attr("web-url") ?? WEB_WALLET_URL;
-      const esc = (s) => s.replace(/[&<>"]/g, (c) => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;" })[c]);
+      const errText = error ? (this.#controlled ? this.#attr("error") : this.#error) || "Sign-in failed" : "";
       const label = size === "icon" ? "" : `<span class="txt" part="text"><b part="label">${esc(text)}</b>${subtitle ? `<small part="subtitle">${esc(subtitle)}</small>` : ""}</span>`;
       const mark = loading ? '<span class="spin" aria-hidden="true"></span>' : markSvg(markPx);
-      const nf = this.#notFound ? `<p class="nf" part="not-found" role="status">bWalletX wasn't found in this browser. <a href="${esc(getUrl)}" target="_blank" rel="noopener">Get ${brand}</a> or <a href="${esc(webUrl)}" target="_blank" rel="noopener">use the web wallet</a>.</p>` : "";
-      this.#root.innerHTML = `<style>${SIGNIN_CSS}</style><button type="button" part="button" aria-label="${esc(aria)}" title="${esc(subtitle ? `${text} (${subtitle})` : text)}"${disabled ? " disabled" : ""}${loading ? ' aria-busy="true"' : ""}><span class="mark" part="mark">${mark}</span>${label}</button>${loading ? '<span class="sr" role="status">Connecting to bWalletX\u2026</span>' : ""}${nf}`;
+      const otherOff = this.#attr("other-wallets") === "off";
+      const otherLink = '<button type="button" class="lnk" data-act="other" part="other-wallets-link">Other wallets</button>';
+      const nf = this.#notFound ? `<p class="nf" part="not-found" role="status">bWalletX wasn't found in this browser. <a href="${esc(getUrl)}" target="_blank" rel="noopener">Get ${brand}</a> or <a href="${esc(webUrl)}" target="_blank" rel="noopener">use the web wallet</a>.${otherOff ? "" : ` ${otherLink}`}</p>` : "";
+      const ow = !this.#notFound && !pending && !restoring && this.#otherWalletsShown(size) ? `<p class="ow" part="other-wallets">${otherLink}</p>` : "";
+      const err = error ? `<p class="err" part="error" role="alert">${esc(errText)}</p>` : "";
+      const compact = size === "sm" || size === "icon";
+      const note = pending && !compact ? `<p class="note" part="note">${esc(PENDING_NOTE)}</p>` : "";
+      const status = pending ? `<span class="sr" role="status">${esc(pendingLabel)}</span>` : loading ? '<span class="sr" role="status">Connecting to bWalletX\u2026</span>' : "";
+      this.#root.innerHTML = `<style>${SIGNIN_CSS}</style>${err}<button type="button" part="button" aria-label="${esc(aria)}" title="${esc(subtitle ? `${text} (${subtitle})` : text)}"${disabled ? " disabled" : ""}${loading ? ' aria-busy="true"' : ""}><span class="mark" part="mark">${mark}</span>${label}</button>${status}${note}${ow}${nf}`;
       this.button.addEventListener("click", () => void this.#click());
+      for (const l of Array.from(this.#root.querySelectorAll("[data-act=other]"))) l.addEventListener("click", () => void this.otherWallets());
+      bindPrewarm(this.button);
+      if (pending && compact) this.#showTip(PENDING_NOTE);
+      else this.#hideTip();
+    }
+    #tip = null;
+    #showTip(text) {
+      const b = this.button;
+      if (!b || typeof document === "undefined") return;
+      if (!this.#tip) {
+        const host = document.createElement("div");
+        host.setAttribute("data-bwalletx-tip", "");
+        const root = host.attachShadow({ mode: "open" });
+        root.innerHTML = `<style>${MENU_CSS}</style><div class="tip" role="note"></div>`;
+        document.body.appendChild(host);
+        this.#tip = host;
+      }
+      const tip2 = this.#tip.shadowRoot.querySelector(".tip");
+      tip2.textContent = text;
+      const r = b.getBoundingClientRect();
+      const vw = window.innerWidth || document.documentElement.clientWidth || 360;
+      const width = Math.min(280, vw - 32);
+      tip2.style.width = `${width}px`;
+      tip2.style.left = `${Math.max(16, Math.min(r.right - width, vw - width - 16))}px`;
+      tip2.style.top = `${r.bottom + 8}px`;
+    }
+    #hideTip() {
+      this.#tip?.remove();
+      this.#tip = null;
+    }
+    #openMenu() {
+      const acct = this.account;
+      const chip = this.button;
+      if (!acct || !chip || typeof document === "undefined") return;
+      const name = accountLabel(acct);
+      const host = document.createElement("div");
+      host.setAttribute("data-bwalletx-menu", "");
+      const root = host.attachShadow({ mode: "open" });
+      const style = document.createElement("style");
+      style.textContent = MENU_CSS;
+      const menu = document.createElement("div");
+      menu.className = "menu";
+      menu.setAttribute("role", "menu");
+      menu.setAttribute("aria-label", "bWalletX account");
+      const who = document.createElement("div");
+      who.className = "who";
+      who.textContent = `Signed in as ${acct.paymail || name}`;
+      const item = (text, run) => {
+        const b = document.createElement("button");
+        b.type = "button";
+        b.className = "item";
+        b.setAttribute("role", "menuitem");
+        b.tabIndex = -1;
+        b.textContent = text;
+        b.addEventListener("click", () => run(b));
+        return b;
+      };
+      const copyWhat = acct.paymail ? "paymail" : "key";
+      const copy = item(`Copy ${copyWhat}`, (b) => {
+        void copyText(acct.paymail || acct.identityKey).then((ok) => {
+          b.textContent = ok ? "Copied" : `Copy ${copyWhat}`;
+          setTimeout(() => close(true), ok ? 600 : 0);
+        });
+      });
+      const out = item("Disconnect", () => {
+        close(false);
+        void this.signOut();
+      });
+      menu.append(who, copy, out);
+      root.append(style, menu);
+      document.body.appendChild(host);
+      const place = () => {
+        const r = chip.getBoundingClientRect();
+        const vw = window.innerWidth || document.documentElement.clientWidth || 360;
+        const vh = window.innerHeight || document.documentElement.clientHeight || 640;
+        const width = Math.min(260, vw - 32);
+        menu.style.width = `${width}px`;
+        const left = Math.max(16, Math.min(r.right - width, vw - width - 16));
+        menu.style.left = `${left}px`;
+        const h = menu.offsetHeight || 150;
+        const below = r.bottom + 8;
+        menu.style.top = `${below + h > vh && r.top - 8 - h > 0 ? r.top - 8 - h : below}px`;
+      };
+      place();
+      const items = [copy, out];
+      const focusAt = (i) => items[(i + items.length) % items.length].focus();
+      const onKey = (e) => {
+        const i = items.indexOf(root.activeElement);
+        if (e.key === "Escape") {
+          e.preventDefault();
+          close(true);
+        } else if (e.key === "ArrowDown") {
+          e.preventDefault();
+          focusAt(i + 1);
+        } else if (e.key === "ArrowUp") {
+          e.preventDefault();
+          focusAt(i - 1);
+        } else if (e.key === "Home") {
+          e.preventDefault();
+          focusAt(0);
+        } else if (e.key === "End") {
+          e.preventDefault();
+          focusAt(items.length - 1);
+        } else if (e.key === "Tab") close(false);
+      };
+      const onDown = (e) => {
+        const path = e.composedPath?.() ?? [];
+        if (!path.includes(host) && !path.includes(this)) close(false);
+      };
+      const onMove = () => close(false);
+      menu.addEventListener("keydown", onKey);
+      document.addEventListener("pointerdown", onDown, true);
+      window.addEventListener("resize", onMove);
+      window.addEventListener("scroll", place, true);
+      const close = (focusChip = false) => {
+        if (this.#menu?.host !== host) return;
+        this.#menu = null;
+        menu.removeEventListener("keydown", onKey);
+        document.removeEventListener("pointerdown", onDown, true);
+        window.removeEventListener("resize", onMove);
+        window.removeEventListener("scroll", place, true);
+        host.remove();
+        this.button?.setAttribute("aria-expanded", "false");
+        if (focusChip) this.button?.focus();
+      };
+      this.#menu = { host, close };
+      chip.setAttribute("aria-expanded", "true");
+      focusAt(0);
+    }
+    /**
+     * Disconnect: emits bwalletx-disconnect (cancelable). Unless a listener cancels it (BwalletXProvider signs out
+     * itself) or the element is driven by `state`, posts logout-url and shows signed out.
+     */
+    async signOut() {
+      this.#menu?.close(false);
+      if (!this.#emit("bwalletx-disconnect", { element: this, account: this.account }, true)) return;
+      if (this.#controlled) return;
+      const url = this.#attr("logout-url");
+      if (url) await fetch(url, { method: "POST", credentials: "include", headers: { "content-type": "application/json" }, body: "{}" }).catch(() => void 0);
+      this.#account = null;
+      this.#set("signed-out");
+      this.#emit("bwalletx-signed-out");
+      this.button?.focus();
     }
     #emit(type, detail, cancelable = false) {
       return this.dispatchEvent(new CustomEvent(type, { detail, bubbles: true, composed: true, cancelable }));
     }
-    #setBusy(on) {
-      this.#busy = on;
-      this.#render();
+    /** "Other wallets" is offered under the button: other-wallets on, or auto at lg/md when this element signs in. */
+    #otherWalletsShown(size) {
+      const a = this.#attr("other-wallets");
+      if (a === "off") return false;
+      if (a === "on") return true;
+      return (size === "lg" || size === "md") && (this.#controlled || !!this.#attr("challenge-url"));
     }
-    async #click() {
-      if (this.hasAttribute("disabled") || this.hasAttribute("loading") || this.#busy) return;
-      if (!this.#emit("bwalletx-signin", { element: this }, true)) return;
-      const href = this.#attr("href");
-      const authorizeUrl = this.#attr("authorize-url");
-      if (authorizeUrl) {
-        location.assign(await buildAuthorizeUrl({ authorizeUrl, clientId: this.#attr("client-id"), redirectUri: this.#attr("redirect-uri"), scope: this.#attr("scope") }));
-        return;
+    /** Open the wallet chooser (the "Other wallets" link): phone QR, other browser wallets, desktop wallets. */
+    otherWallets() {
+      return this.#click("chooser");
+    }
+    #attempt(option, outcome, started) {
+      this.#emit("bwalletx-attempt", attemptFor(option, outcome, started));
+    }
+    /**
+     * Which wallet: bWalletX by its own marker goes straight to its sheet; otherwise the chooser ("Get bWalletX" first)
+     * when another wallet is here or the user asked; otherwise 'not-found'. null: the chooser was closed.
+     */
+    async #choose(mode, ms, pairing) {
+      if (mode !== "chooser") {
+        const f = await discoverBwalletX(ms);
+        if (f) {
+          const substrate = f.rdns === RDNS_EXTENSION ? "extension" : f.rdns === RDNS_MOBILE ? "in-app" : "xdm";
+          return brc100Option(f.wallet, { id: f.rdns ?? "bwalletx-xdm", rdns: f.rdns ?? void 0, name: "bWalletX", isBwalletX: true, substrate });
+        }
       }
-      if (href) {
-        location.assign(href);
-        return;
+      const list = await discoverWallets({ ms: 50, pairing: () => pairing });
+      if (mode !== "chooser" && !hasBwalletX(list) && !otherDetected(list).length) return "not-found";
+      return chooseWallet(list, { getUrl: this.#attr("get-url") ?? void 0 });
+    }
+    async #click(mode = "signin") {
+      if (this.hasAttribute("disabled") || this.hasAttribute("loading") || this.#busy || this.state === "pending") return;
+      if (!this.#emit("bwalletx-signin", { element: this, mode }, true)) return;
+      if (mode === "signin") {
+        const href = this.#attr("href");
+        const authorizeUrl = this.#attr("authorize-url");
+        if (authorizeUrl) {
+          location.assign(await buildAuthorizeUrl({ authorizeUrl, clientId: this.#attr("client-id"), redirectUri: this.#attr("redirect-uri"), scope: this.#attr("scope") }));
+          return;
+        }
+        if (href) {
+          location.assign(href);
+          return;
+        }
       }
       const challengeUrl = this.#attr("challenge-url");
       if (!challengeUrl) return;
+      const own = this.#stateful && !this.#controlled;
+      const prev = this.#phase === "signed-in" ? "signed-in" : "signed-out";
+      const started = Date.now();
+      const pairing = pairingModal();
+      let option = null;
       this.#notFound = false;
-      this.#setBusy(true);
+      this.#busy = true;
+      this.#pendingLabel = PENDING_LABEL;
+      if (own) this.#set("pending");
+      else this.#render();
       try {
-        const ms = Number(this.#attr("discover-ms")) || 1200;
-        const found = await discoverBwalletX(ms);
-        if (!found) {
+        const ms = Number(this.#attr("discover-ms")) || DEFAULT_DISCOVER_MS;
+        const picked = await this.#choose(mode, ms, pairing);
+        if (picked === "not-found") {
           this.#notFound = true;
+          if (own) this.#phase = "signed-out";
+          this.#attempt(null, "not-found", started);
           this.#emit("bwalletx-not-found");
           if (this.#attr("require-token")) this.#emit("bwalletx-access-denied", { code: "not_installed", message: "No wallet found" });
           return;
         }
+        if (!picked) {
+          if (own) this.#phase = prev;
+          this.#attempt(null, "cancelled", started);
+          return;
+        }
+        option = picked;
+        if (!option.isBwalletX) {
+          this.#pendingLabel = PENDING_LABEL_OTHER;
+          if (own) this.#render();
+        }
+        const cw = await option.connect({ identity: false });
+        const wallet = cw.wallet;
+        if (!wallet) throw Object.assign(new Error("This wallet cannot sign in here"), { code: "NOT_SUPPORTED" });
+        const sub = substrateOf(option);
+        const method = sub === "extension" ? "extension" : sub === "in-app" || sub === "xdm" ? "in-app" : sub === "pairing" ? "pairing" : "wallet";
         const requireToken = this.#attr("require-token");
         if (requireToken) {
+          if (own) this.#phase = "signed-out";
           const verifyUrl2 = this.#attr("verify-url");
           const min = this.#attr("min");
           const minBps = this.#attr("min-bps");
           const hint = { token: { id: requireToken, ...minBps ? { minBps: Number(minBps) } : { min: min ?? "1" } } };
           try {
             const a = await requestAccess({
-              wallet: found.wallet,
+              wallet,
               challenge: (identityKey) => postJson(challengeUrl, { identityKey, require: hint }),
               verify: verifyUrl2 ? (response2) => postAccess(verifyUrl2, response2) : void 0
             });
+            this.#attempt(option, "signed-in", started);
             this.#emit("bwalletx-access-granted", { identityKey: a.response.identityKey, response: a.verified });
           } catch (e) {
             const err = e instanceof AccessError ? e : new AccessError("bad_request", String(e));
+            this.#attempt(option, outcomeOf(e), started);
             this.#emit("bwalletx-access-denied", { code: err.code, message: err.message, have: err.have, need: err.need });
           }
           return;
         }
-        const r = await signInWithBwalletX({ wallet: found.wallet, challenge: (identityKey) => postJson(challengeUrl, { identityKey }) });
         const verifyUrl = this.#attr("verify-url");
-        const response = verifyUrl ? await postJson(verifyUrl, { identityKey: r.identityKey, nonce: r.nonce, signature: r.signature }) : null;
-        this.#emit("bwalletx-signed-in", { identityKey: r.identityKey, method: found.method, nonce: r.nonce, signature: r.signature, response });
+        const { result: r, verified } = await signInAndVerify({
+          wallet,
+          identityKeyHint: verifyUrl ? rememberedIdentity() : void 0,
+          challenge: (identityKey) => postJson(challengeUrl, identityKey ? { identityKey } : {}),
+          verify: async (res) => verifyUrl ? await postJson(verifyUrl, { identityKey: res.identityKey, nonce: res.nonce, signature: res.signature }) : {}
+        });
+        if (verifyUrl) rememberIdentity(r.identityKey);
+        const response = verifyUrl ? verified : null;
+        if (own) this.#signedIn({ identityKey: r.identityKey, handle: response?.handle ?? null, paymail: response?.paymail ?? null });
+        this.#attempt(option, "signed-in", started);
+        this.#emit("bwalletx-signed-in", { identityKey: r.identityKey, method, nonce: r.nonce, signature: r.signature, response });
       } catch (error) {
-        this.#emit("bwalletx-error", { error });
+        const outcome = outcomeOf(error);
+        this.#attempt(option, outcome, started);
+        const closedQr = outcome === "cancelled" && option?.kind === "pairing";
+        if (own) {
+          if (closedQr) this.#phase = prev;
+          else {
+            this.#error = signInErrorText(error);
+            this.#phase = "error";
+          }
+        }
+        if (!closedQr) this.#emit("bwalletx-error", { error });
       } finally {
-        this.#setBusy(false);
+        this.#busy = false;
+        try {
+          pairing.close();
+        } catch {
+        }
+        this.#render();
       }
     }
   };
@@ -983,7 +1783,21 @@ a.bwx-btn{display:block;text-align:center;text-decoration:none;box-sizing:border
 .bwx-list{display:flex;flex-direction:column;gap:8px}
 .bwx-opt{display:flex;align-items:center;gap:10px;text-align:left}
 .bwx-opt img{width:24px;height:24px;border-radius:6px}
-.bwx-tag{margin-left:auto;font-size:11px;color:#8d866f}
+.bwx-tag{margin-left:auto;font-size:11px;color:#8d866f;white-space:nowrap}
+.bwx-opt{min-height:48px;box-sizing:border-box}
+a.bwx-btn.bwx-opt{display:flex;text-align:left}
+.bwx-btn:focus{outline:none}
+.bwx-btn:focus-visible{outline:2px solid #e8c766;outline-offset:2px}
+.bwx-mk{display:inline-flex;align-items:center;justify-content:center;flex:none;width:28px;height:28px;border-radius:50%;background:#000}
+.bwx-ico{display:inline-grid;place-items:center;flex:none;width:28px;height:28px;border-radius:8px;background:#2a2518;color:#e8c766;font-weight:700;font-size:13px}
+.bwx-opt img{width:28px;height:28px;border-radius:8px;flex:none}
+.bwx-txt{display:flex;flex-direction:column;min-width:0;gap:1px}
+.bwx-txt b{font-weight:600}
+.bwx-txt small{font-size:12px;color:#8d866f;font-weight:400}
+.bwx-primary .bwx-txt small{color:rgba(0,0,0,.68)}
+.bwx-primary .bwx-tag{color:rgba(0,0,0,.6)}
+.bwx-sep{font-size:12px;color:#8d866f;margin:6px 2px 0}
+.bwx-foot{font-size:12px;color:#8d866f;margin:12px 0 0}
 `;
 function mount() {
   const root = document.createElement("div");
@@ -1112,105 +1926,94 @@ function pickWallet(options, o = {}) {
     ui.box.lastChild.append(cancel);
   });
 }
-
-// src/wallets.ts
-var import_sdk5 = require("@bsv/sdk");
-async function brc100Connected(wallet, o) {
-  await wallet.waitForAuthentication({}).catch(() => {
-  });
-  const { publicKey } = await wallet.getPublicKey({ identityKey: true });
-  return { wallet, payer: wallet, identityKey: publicKey, optionId: o.id, kind: o.kind };
-}
-function brc100Option(wallet, info) {
-  const opt = {
-    id: info.id,
-    name: info.name,
-    icon: info.icon,
-    rdns: info.rdns,
-    kind: "brc100",
-    isBwalletX: info.isBwalletX ?? false,
-    connect: () => brc100Connected(wallet, opt)
-  };
-  return opt;
-}
-function pairingOption(pairing) {
-  const opt = {
-    id: "bwalletx-pairing",
-    name: "bWalletX on your phone",
-    kind: "pairing",
-    isBwalletX: true,
-    async connect() {
-      const p = typeof pairing === "function" ? pairing() : pairing;
-      const w = await restorePairing(p) ?? await pairBwalletX(p);
-      return brc100Connected(w, opt);
-    }
-  };
-  return opt;
-}
-function handcashAdapter(o) {
-  const opt = {
-    id: "handcash",
-    name: "HandCash",
-    icon: o.icon,
-    kind: "handcash",
-    isBwalletX: false,
-    async connect() {
-      const p = await o.login();
-      return {
-        wallet: null,
-        payer: o.pay ? { pay: o.pay } : null,
-        identityKey: p.identityKey ?? null,
-        handle: p.handle,
-        paymail: p.paymail ?? `${p.handle.replace(/^\$/, "")}@handcash.io`,
-        optionId: opt.id,
-        kind: "handcash",
-        transitional: true
-      };
-    }
-  };
-  return opt;
-}
-var NAMES = { [RDNS_EXTENSION]: "bWalletX", "space.bwallet.mobile": "bWalletX" };
-async function probe(substrate, ms) {
-  try {
-    const w = new import_sdk5.WalletClient(substrate);
-    const ok = await Promise.race([w.isAuthenticated({}).then(() => true), new Promise((r) => setTimeout(() => r(false), ms))]);
-    return ok ? w : null;
-  } catch {
-    return null;
+function optionRow(w, primary, sub, tag) {
+  const b = el("button", `bwx-btn bwx-opt${primary ? " bwx-primary" : ""}`);
+  b.type = "button";
+  b.dataset.wallet = w.id;
+  if (w.isBwalletX) {
+    const mk = el("span", "bwx-mk");
+    mk.innerHTML = markSvg(18);
+    b.append(mk);
+  } else if (w.icon) {
+    const img = el("img");
+    img.src = w.icon;
+    img.alt = "";
+    b.append(img);
+  } else {
+    b.append(el("span", "bwx-ico", (w.name.trim().charAt(0) || "W").toUpperCase()));
   }
+  const t = el("span", "bwx-txt");
+  t.append(el("b", "", w.name));
+  if (sub) t.append(el("small", "", sub));
+  b.append(t);
+  if (tag) b.append(el("span", "bwx-tag", tag));
+  return b;
 }
-async function discoverWallets(o = {}) {
-  const out = [];
-  const ms = o.ms ?? 1200;
-  if (typeof window !== "undefined") {
-    const seen = /* @__PURE__ */ new Map();
-    const onAnnounce = (e) => {
-      const d = e.detail;
-      if (!d?.wallet) return;
-      const rdns = d.info?.rdns ?? d.info?.uuid ?? `wallet-${seen.size}`;
-      if (seen.has(rdns)) return;
-      const isB = BWALLETX_RDNS.includes(rdns);
-      seen.set(rdns, brc100Option(d.wallet, { id: rdns, rdns, name: NAMES[rdns] ?? d.info?.name ?? rdns, icon: d.info?.icon, isBwalletX: isB }));
+function chooseWallet(options, o = {}) {
+  if (typeof document === "undefined") return Promise.resolve(null);
+  return new Promise((resolve) => {
+    const ui = mount();
+    ui.root.dataset.bwxChooser = "";
+    const done = (w) => {
+      document.removeEventListener("keydown", onKey, true);
+      ui.close();
+      resolve(w);
     };
-    window.addEventListener("brc100:announceWallet", onAnnounce);
-    window.dispatchEvent(new Event("brc100:requestWallet"));
-    const local = o.probeLocal ? Promise.all([probe("json-api", ms), probe("Cicada", ms)]) : Promise.resolve([null, null]);
-    await new Promise((r) => setTimeout(r, ms));
-    window.removeEventListener("brc100:announceWallet", onAnnounce);
-    out.push(...seen.values());
-    const cwi = window.CWI;
-    if (cwi && ![...seen.values()].some((x) => x.rdns === "space.bwallet.mobile")) {
-      out.push(brc100Option(cwi, { id: "window.CWI", name: "This app\u2019s wallet", isBwalletX: false }));
+    const onKey = (e) => {
+      if (e.key === "Escape") {
+        e.preventDefault();
+        done(null);
+      }
+    };
+    document.addEventListener("keydown", onKey, true);
+    ui.box.append(el("h2", "", o.title ?? "Choose a wallet"));
+    const list = el("div", "bwx-list");
+    const here = hasBwalletX(options);
+    if (!here) {
+      const get = el("a", "bwx-btn bwx-opt bwx-primary");
+      get.href = o.getUrl ?? GET_URL;
+      get.target = "_blank";
+      get.rel = "noopener";
+      get.dataset.wallet = "get-bwalletx";
+      const mk = el("span", "bwx-mk");
+      mk.innerHTML = markSvg(18);
+      const t = el("span", "bwx-txt");
+      t.append(el("b", "", "Get bWalletX"), el("small", "", "Free. Every feature on this site"));
+      get.append(mk, t);
+      list.append(get);
     }
-    const [json, cicada] = await local;
-    if (json) out.push(brc100Option(json, { id: "localhost:3321", name: "Desktop wallet (localhost:3321)" }));
-    if (cicada) out.push(brc100Option(cicada, { id: "localhost:3301", name: "Desktop wallet (localhost:3301)" }));
-  }
-  if (o.pairing) out.push(pairingOption(o.pairing));
-  out.push(...o.extra ?? []);
-  const rank = (w) => w.isBwalletX ? 0 : w.kind === "handcash" ? 2 : 1;
-  return out.map((w, i) => ({ w, i })).sort((a, b) => rank(a.w) - rank(b.w) || a.i - b.i).map((x) => x.w);
+    const ordered = chooserOrder(options);
+    const touch = isTouchDevice();
+    let sep = false;
+    for (const w of ordered) {
+      if (!here && !sep) {
+        list.append(el("p", "bwx-sep", "Or use"));
+        sep = true;
+      }
+      const sub = isPresentBwalletX(w) ? "Recommended" : w.kind === "pairing" ? touch ? "Open the bWalletX app" : "Scan a QR with your phone" : void 0;
+      const tag = w.kind === "handcash" ? "until BRC-100" : !w.isBwalletX && w.kind === "brc100" ? "Fewer features" : void 0;
+      const row2 = optionRow(w, isPresentBwalletX(w), sub, tag);
+      row2.onclick = () => done(w);
+      list.append(row2);
+    }
+    if (o.desktop !== false && !options.some((w) => w.substrate === "json-api" || w.substrate === "cicada")) {
+      if (!here && !sep) list.append(el("p", "bwx-sep", "Or use"));
+      const d = desktopOption();
+      const row2 = optionRow(d, false, "Metanet or BSV Desktop on this computer", "Fewer features");
+      row2.onclick = () => done(d);
+      list.append(row2);
+    }
+    ui.box.append(list);
+    if (otherDetected(options).length || !here) ui.box.append(el("p", "bwx-foot", "Some features need bWalletX."));
+    const row = el("div", "bwx-row");
+    const cancel = el("button", "bwx-btn", "Cancel");
+    cancel.type = "button";
+    cancel.onclick = () => done(null);
+    row.append(cancel);
+    ui.box.append(row);
+    ui.root.onclick = (e) => e.target === ui.root && done(null);
+    list.querySelector("a,button")?.focus();
+  });
 }
 
 // src/pay.ts
@@ -1293,11 +2096,11 @@ async function resolvePaymailP2P(paymail, sats, f = fetch) {
   return {
     outputs: body.outputs.map((o) => ({ script: o.script, satoshis: o.satoshis })),
     reference: body.reference,
-    submit: receive ? async (hex) => {
+    submit: receive ? async (hex2) => {
       await f(fill(receive), {
         method: "POST",
         headers: { "content-type": "application/json" },
-        body: JSON.stringify({ hex, reference: body.reference, metadata: {} })
+        body: JSON.stringify({ hex: hex2, reference: body.reference, metadata: {} })
       });
     } : void 0
   };
@@ -1375,19 +2178,52 @@ async function buyToken(source, req) {
 }
 
 // src/react.ts
+function signinStateFor(v) {
+  if (v.status === "restoring") return "restoring";
+  if (v.status === "connecting") return "pending";
+  if (v.status === "error") return "error";
+  if (v.status === "connected" && v.identityKey) return "signed-in";
+  return "signed-out";
+}
 function BwalletxSignin(props) {
   const ref = (0, import_react.useRef)(null);
   const cb = (0, import_react.useRef)(props);
   cb.current = props;
+  const ctx = (0, import_react.useContext)(Ctx);
+  const ctxRef = (0, import_react.useRef)(ctx);
+  ctxRef.current = ctx;
+  const driven = !!ctx && props.stateful !== false;
   (0, import_react.useEffect)(() => {
     defineBwalletxSignin();
     const el2 = ref.current;
     if (!el2) return;
     const on = [
-      ["bwalletx-signin", (e) => cb.current.onClick?.(e)],
+      [
+        "bwalletx-signin",
+        (e) => {
+          cb.current.onClick?.(e);
+          const c = ctxRef.current;
+          if (!e.defaultPrevented && c && cb.current.stateful !== false) {
+            e.preventDefault();
+            const mode = e.detail?.mode;
+            c.connect(mode === "chooser" ? { chooser: true } : {}).catch(() => void 0);
+          }
+        }
+      ],
       ["bwalletx-signed-in", (e) => cb.current.onSignedIn?.(e.detail)],
       ["bwalletx-not-found", () => cb.current.onNotFound?.()],
-      ["bwalletx-error", (e) => cb.current.onError?.(e.detail.error)]
+      ["bwalletx-error", (e) => cb.current.onError?.(e.detail.error)],
+      [
+        "bwalletx-disconnect",
+        (e) => {
+          const c = ctxRef.current;
+          if (c && cb.current.stateful !== false) {
+            e.preventDefault();
+            void c.disconnect().then(() => cb.current.onSignedOut?.());
+          }
+        }
+      ],
+      ["bwalletx-signed-out", () => cb.current.onSignedOut?.()]
     ];
     for (const [t, f] of on) el2.addEventListener(t, f);
     return () => {
@@ -1396,6 +2232,7 @@ function BwalletxSignin(props) {
   }, []);
   const p = props;
   const flag = (v) => v ? "" : void 0;
+  const state = driven ? signinStateFor(ctx) : void 0;
   return (0, import_react.createElement)("bwalletx-signin", {
     ref,
     id: p.id,
@@ -1411,6 +2248,16 @@ function BwalletxSignin(props) {
     disabled: flag(p.disabled),
     "challenge-url": p.challengeUrl,
     "verify-url": p.verifyUrl,
+    "session-url": driven ? void 0 : p.sessionUrl,
+    "logout-url": driven ? void 0 : p.logoutUrl,
+    "lookup-url": p.lookupUrl,
+    stateless: p.stateful === false ? "" : void 0,
+    state,
+    "identity-key": driven ? ctx.identityKey ?? void 0 : void 0,
+    paymail: driven ? ctx.paymail ?? void 0 : void 0,
+    handle: driven ? ctx.handle ?? void 0 : void 0,
+    "avatar-url": driven ? avatarUrlFor(ctx.identityKey) ?? void 0 : void 0,
+    error: driven && ctx.status === "error" ? signInErrorText(ctx.error) : void 0,
     "get-url": p.getUrl,
     "web-url": p.webUrl,
     href: p.href,
@@ -1419,6 +2266,7 @@ function BwalletxSignin(props) {
     "redirect-uri": p.redirectUri,
     scope: p.scope,
     "discover-ms": p.discoverMs,
+    "other-wallets": p.otherWallets,
     "aria-label": p["aria-label"]
   });
 }
@@ -1430,6 +2278,7 @@ var empty = {
   paymail: null,
   wallet: null,
   walletId: null,
+  walletType: null,
   transitional: false,
   signedIn: false,
   error: null
@@ -1491,45 +2340,42 @@ function BwalletXProvider(p) {
       setState((s) => ({ ...s, status: "connecting", error: null }));
       try {
         const list = await listWallets();
-        let choice = opts.walletId ? list.find((w) => w.id === opts.walletId) : void 0;
-        if (!choice) {
-          const direct = list.filter((w) => w.kind !== "pairing");
-          choice = c.picker !== false && list.length > 1 ? await pickWallet(list) : direct[0] ?? list[0] ?? null;
-        }
-        if (!choice) {
-          if (!list.length) throw Object.assign(new Error("No wallet found. Get bWalletX at bwalletx.com."), { code: "NOT_FOUND" });
-          setState((s) => ({ ...s, status: s.identityKey ? "connected" : "idle" }));
+        const fast = c.fastPath !== false;
+        const r = await runConnect({
+          list,
+          walletId: opts.walletId,
+          chooser: opts.chooser,
+          picker: c.picker,
+          fastPath: fast,
+          pick: fast ? (l) => chooseWallet(l) : pickWallet,
+          onAttempt: c.onAttempt,
+          challengeUrl: c.challengeUrl,
+          verifyUrl: c.verifyUrl,
+          challengeNeedsIdentityKey: c.challengeNeedsIdentityKey,
+          post: postJson2
+        });
+        if (!r) {
+          setState((s) => ({ ...s, status: s.identityKey && s.signedIn ? "connected" : "idle" }));
           return null;
         }
-        const cw = await choice.connect();
-        let { handle = null, paymail = null } = cw;
-        let signedIn = false;
-        if (cw.wallet && c.challengeUrl && c.verifyUrl) {
-          const r = await signInWithBwalletX({
-            wallet: cw.wallet,
-            challenge: (identityKey) => postJson2(c.challengeUrl, { identityKey })
-          });
-          const v = await atStage("verify", () => postJson2(c.verifyUrl, { identityKey: r.identityKey, nonce: r.nonce, signature: r.signature }));
-          handle = v.handle ?? handle;
-          paymail = v.paymail ?? paymail;
-          signedIn = true;
-        }
+        const cw = r.connected;
         payer.current = cw.payer;
         setState({
           status: "connected",
-          identityKey: cw.identityKey,
-          handle,
-          paymail,
+          identityKey: r.identityKey,
+          handle: r.handle,
+          paymail: r.paymail,
           wallet: cw.wallet,
           walletId: cw.optionId,
+          walletType: r.walletType,
           transitional: !!cw.transitional,
-          signedIn,
+          signedIn: r.signedIn,
           error: null
         });
-        return cw;
+        return { ...cw, identityKey: r.identityKey, handle: r.handle ?? void 0, paymail: r.paymail ?? void 0 };
       } catch (e) {
         if (e?.message === "cancelled") {
-          setState((s) => ({ ...s, status: s.identityKey ? "connected" : "idle" }));
+          setState((s) => ({ ...s, status: s.identityKey && s.signedIn ? "connected" : "idle" }));
           return null;
         }
         throw fail(e);
@@ -1545,6 +2391,17 @@ function BwalletXProvider(p) {
     payer.current = null;
     setState(empty);
   }, [state.walletId]);
+  (0, import_react.useEffect)(() => {
+    const key = state.identityKey;
+    if (!key || state.paymail || p.lookupUrl === "off") return;
+    let live = true;
+    void lookupPaymail(key, p.lookupUrl).then((pm) => {
+      if (live && pm) setState((s) => s.identityKey === key && !s.paymail ? { ...s, paymail: pm } : s);
+    });
+    return () => {
+      live = false;
+    };
+  }, [state.identityKey, state.paymail, p.lookupUrl]);
   const need = () => {
     if (!payer.current) throw new PaymentError("NOT_SUPPORTED", "Connect a wallet first (connect()).");
     return payer.current;
@@ -1569,6 +2426,24 @@ function useBwalletX() {
   if (!v) throw new Error("useBwalletX() must be used inside <BwalletXProvider>");
   return v;
 }
+function accountFor(v) {
+  const status = signinStateFor(v);
+  const signedIn = status === "signed-in";
+  return {
+    status,
+    identityKey: signedIn ? v.identityKey : null,
+    paymail: signedIn ? v.paymail : null,
+    handle: signedIn ? v.handle : null,
+    label: signedIn ? accountLabel(v) : null,
+    avatarUrl: signedIn ? avatarUrlFor(v.identityKey) : null,
+    error: status === "error" ? signInErrorText(v.error) : null,
+    login: () => v.connect().then(() => void 0, () => void 0),
+    logout: () => v.disconnect()
+  };
+}
+function useBwalletXAccount() {
+  return accountFor(useBwalletX());
+}
 var BwalletxProvider = BwalletXProvider;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
@@ -1576,10 +2451,14 @@ var BwalletxProvider = BwalletXProvider;
   BwalletxProvider,
   BwalletxSignin,
   PaymentError,
+  accountFor,
+  autoChoice,
   brc100Option,
   discoverWallets,
   handcashAdapter,
   pairingOption,
-  useBwalletX
+  signinStateFor,
+  useBwalletX,
+  useBwalletXAccount
 });
 //# sourceMappingURL=react.cjs.map