@glyphteck/veyl 0.31.0 → 0.32.1

package/dist/cli.js

@@ -979,7 +979,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "veyl",
-    version: "0.31.0",
+    version: "0.32.1",
     private: true,
     license: "Apache-2.0",
     workspaces: {
@@ -104224,9 +104224,8 @@ var init_vaultsignature = __esm(() => {
     DELETE_ACCOUNT: "delete-account",
     DELETE_PASSKEY: "delete-passkey",
     LOGOUT_ALL_DEVICES: "logout-all-devices",
-    SET_CHAT_IDENTITY: "set-chat-identity",
-    SET_SETTINGS: "set-settings",
-    SET_WALLET_IDENTITY: "set-wallet-identity"
+    SET_IDENTITIES: "set-identities",
+    SET_SETTINGS: "set-settings"
   });
 });
 
@@ -106235,11 +106234,9 @@ function getBootWalletClass(SparkWallet3, { enableTokenSync = false } = {}) {
 function bytesToHex6(bytes) {
   return Array.from(bytes || []).map((b) => b.toString(16).padStart(2, "0")).join("");
 }
-async function bootWallet(walletMnemonic, user, { SparkWallet: SparkWallet3, cloud, network, enableTokenSync = false, diag = null } = {}) {
+async function bootWallet(walletMnemonic, user, { SparkWallet: SparkWallet3, network, enableTokenSync = false, diag = null } = {}) {
   if (!SparkWallet3)
     throw new Error("SparkWallet missing");
-  if (!cloud)
-    throw new Error("cloud missing");
   if (!network)
     throw new Error("network missing");
   const startedAt = Date.now();
@@ -106274,53 +106271,41 @@ async function bootWallet(walletMnemonic, user, { SparkWallet: SparkWallet3, clo
     const walletPK = lowerText(idPk);
     const expectedWalletPK = resolveWalletPK(user, network);
     markDone(diag, "vault.bootWallet.identity", identityStartedAt);
-    const setupStartedAt = Date.now();
+    let walletPKNeedsWrite = false;
     if (!expectedWalletPK) {
-      markDiag(diag, "vault.bootWallet.setup.start", { reason: "missing-wallet-pk" });
-      await cloud.user.profile.walletpk.write(idPk, { network });
-      markDone(diag, "vault.bootWallet.setup", setupStartedAt, { wrote: true });
+      walletPKNeedsWrite = true;
     } else if (!sameText(expectedWalletPK, walletPK)) {
       throw new Error("wallet identity mismatch for account");
     } else if (!hasWalletPKForNetwork(user, network)) {
-      markDiag(diag, "vault.bootWallet.setup.start", { reason: "missing-network-wallet-pk" });
-      await cloud.user.profile.walletpk.write(idPk, { network });
-      markDone(diag, "vault.bootWallet.setup", setupStartedAt, { wrote: true });
-    } else {
-      markDiag(diag, "vault.bootWallet.setup.skip", { elapsedMs: Date.now() - setupStartedAt });
+      walletPKNeedsWrite = true;
     }
     markDone(diag, "vault.bootWallet", startedAt);
-    return { wallet, walletPK };
+    return { wallet, walletPK, walletPKNeedsWrite };
   } catch (error) {
     markError(diag, "vault.bootWallet", startedAt, error);
     throw error;
   }
 }
-async function bootChat(chatSeed, user, { cloud, diag = null } = {}) {
+async function bootChat(chatSeed, user, { diag = null } = {}) {
   const startedAt = Date.now();
   markDiag(diag, "vault.bootChat.start", { hasChatPK: !!user?.chatPK });
   try {
-    if (!cloud)
-      throw new Error("cloud missing");
     const keyStartedAt = Date.now();
     const chatKeyPair = getKeyPair(chatSeed);
     chatSeed.fill(0);
     const chatPKHex = bytesToHex6(chatKeyPair.pub);
     markDone(diag, "vault.bootChat.derive", keyStartedAt);
+    let chatPKNeedsWrite = false;
     if (!user.chatPK) {
-      const setupStartedAt = Date.now();
-      markDiag(diag, "vault.bootChat.setup.start", { reason: "missing-chat-pk" });
-      await cloud.user.profile.chatpk.write(chatPKHex);
-      markDone(diag, "vault.bootChat.setup", setupStartedAt, { wrote: true });
+      chatPKNeedsWrite = true;
     } else if (!sameText(user.chatPK, chatPKHex)) {
       chatKeyPair.priv.fill(0);
       chatKeyPair.pub.fill(0);
       throw new Error("chat identity mismatch for account");
-    } else {
-      markDiag(diag, "vault.bootChat.setup.skip", {});
     }
     chatKeyPair.pub.fill(0);
     markDone(diag, "vault.bootChat", startedAt);
-    return { chatPrivateKey: chatKeyPair.priv, chatPK: chatPKHex };
+    return { chatPrivateKey: chatKeyPair.priv, chatPK: chatPKHex, chatPKNeedsWrite };
   } catch (error) {
     markError(diag, "vault.bootChat", startedAt, error);
     chatSeed.fill(0);
@@ -106518,9 +106503,18 @@ async function openVaultAccountSession(vault, password, options = {}) {
     onStage?.("unlocking");
     const authStartedAt = Date.now();
     mark(diag, "vault.unlock.session.start", { source });
-    await cloud.auth.user.getIdToken(true);
-    mark(diag, "vault.unlock.session.done", { elapsedMs: Date.now() - authStartedAt, source });
-    requireCurrent(isCurrent);
+    const authResult = cloud.auth.user.getIdToken(true).then(() => {
+      mark(diag, "vault.unlock.session.done", { elapsedMs: Date.now() - authStartedAt, source });
+      return { error: null };
+    }, (error) => {
+      mark(diag, "vault.unlock.session.error", {
+        elapsedMs: Date.now() - authStartedAt,
+        source,
+        code: error?.code || "",
+        message: error?.message || String(error)
+      });
+      return { error };
+    });
     const unpackStartedAt = Date.now();
     const unpacked = unpackVaultSeedData(vault);
     const { salt, iv, ct, kdf, registry: registryEnvelope } = unpacked;
@@ -106549,6 +106543,9 @@ async function openVaultAccountSession(vault, password, options = {}) {
     cleanBytes(walletEntropy, masterSeed);
     walletEntropy = null;
     masterSeed = null;
+    const sessionResult = await authResult;
+    if (sessionResult.error)
+      throw sessionResult.error;
     requireCurrent(isCurrent);
     const vaultSignatureStartedAt = Date.now();
     mark(diag, "vault.unlock.signature.start", { source });
@@ -106569,7 +106566,7 @@ async function openVaultAccountSession(vault, password, options = {}) {
     onStage?.("wallet");
     const walletStartedAt = Date.now();
     mark(diag, "vault.unlock.wallet.start", { source });
-    const walletIdentity = await bootWallet2(walletMnemonic, user, { network });
+    const walletIdentity = await bootWallet2(walletMnemonic, user, { network, diag });
     wallet = walletIdentity?.wallet;
     const walletPK = walletPubkey(walletIdentity?.walletPK);
     mark(diag, "vault.unlock.wallet.done", { elapsedMs: Date.now() - walletStartedAt, source });
@@ -106577,7 +106574,7 @@ async function openVaultAccountSession(vault, password, options = {}) {
     onStage?.("chat");
     const chatStartedAt = Date.now();
     mark(diag, "vault.unlock.chat.start", { source });
-    const chatIdentity = await bootChat2(chatSeed, user);
+    const chatIdentity = await bootChat2(chatSeed, user, { diag });
     chatPrivateKey = chatIdentity?.chatPrivateKey;
     const chatPK = cleanText(chatIdentity?.chatPK);
     if (!chatPrivateKey || !chatPK)
@@ -106585,6 +106582,30 @@ async function openVaultAccountSession(vault, password, options = {}) {
     chatSeed = null;
     mark(diag, "vault.unlock.chat.done", { elapsedMs: Date.now() - chatStartedAt, source });
     requireCurrent(isCurrent);
+    const identityPayload = {};
+    if (walletIdentity?.walletPKNeedsWrite) {
+      identityPayload.walletPK = walletPK;
+      identityPayload.network = network;
+    }
+    if (chatIdentity?.chatPKNeedsWrite) {
+      identityPayload.chatPK = chatPK;
+    }
+    const identityFields = Object.keys(identityPayload);
+    let identityResult = null;
+    if (identityFields.length) {
+      const identitiesStartedAt = Date.now();
+      mark(diag, "vault.unlock.identities.start", { source, fields: identityFields });
+      identityResult = cloud.user.profile.identity.write(identityPayload).then(() => {
+        mark(diag, "vault.unlock.identities.done", {
+          elapsedMs: Date.now() - identitiesStartedAt,
+          source,
+          fields: identityFields
+        });
+        return { error: null };
+      }, (error) => ({ error }));
+    } else {
+      mark(diag, "vault.unlock.identities.skip", { source });
+    }
     const cacheStartedAt = Date.now();
     mark(diag, "vault.unlock.localCache.start", { source });
     localCache = await openLocalCache(cacheKey, { uid, network });
@@ -106592,6 +106613,10 @@ async function openVaultAccountSession(vault, password, options = {}) {
     cleanBytes(cacheKey);
     cacheKey = null;
     requireCurrent(isCurrent);
+    const identityWrite = await identityResult;
+    if (identityWrite?.error)
+      throw identityWrite.error;
+    requireCurrent(isCurrent);
     const signatureResult = await vaultAccessResult;
     if (signatureResult.error)
       throw signatureResult.error;
@@ -106980,6 +107005,7 @@ function createUser({ cloud, network, avatarCache = null, diag = null, onSession
   let authSession = 0;
   let userUid = null;
   let settingsKey = null;
+  let settingsStored = null;
   let avatarFetch = { uid: null, key: null, promise: null };
   let blockedSource = state.blocked;
   let blockedSet = new Set(blockedSource);
@@ -107199,6 +107225,7 @@ function createUser({ cloud, network, avatarCache = null, diag = null, onSession
       userUid = null;
       clearSettingsKey(settingsKey);
       settingsKey = null;
+      settingsStored = null;
       if (signedOutUid) {
         keepOnlyCachedAvatar(null);
       }
@@ -107212,6 +107239,7 @@ function createUser({ cloud, network, avatarCache = null, diag = null, onSession
     if (authUidChanged) {
       clearSettingsKey(settingsKey);
       settingsKey = null;
+      settingsStored = null;
     }
     setState((user) => authUidChanged ? { ...defaultUser, authReady: true, uid: authUser.uid } : { ...user, authReady: true, isAdmin: false, adminReady: false });
     readCachedAvatar(authUser.uid).then((cached) => {
@@ -107268,6 +107296,9 @@ function createUser({ cloud, network, avatarCache = null, diag = null, onSession
         fromCache: !!info.fromCache,
         pending: !!info.pending
       });
+      if (!info.fromCache) {
+        settingsStored = Object.prototype.hasOwnProperty.call(privateData, "settings");
+      }
       setState((user) => ({
         ...user,
         agreement: privateData.agreement ?? null,
@@ -107275,6 +107306,7 @@ function createUser({ cloud, network, avatarCache = null, diag = null, onSession
       }));
     }), current((error) => {
       markError(diag, "user.settings.snapshot", authStartedAt, error);
+      settingsStored = null;
       setState((user) => ({
         ...user,
         settingsReady: true,
@@ -107378,6 +107410,7 @@ function createUser({ cloud, network, avatarCache = null, diag = null, onSession
     }
     clearSettingsKey(settingsKey);
     settingsKey = null;
+    settingsStored = null;
     userUid = null;
     avatarFetch = { uid: null, key: null, promise: null };
     state = defaultUser;
@@ -107428,7 +107461,7 @@ function createUser({ cloud, network, avatarCache = null, diag = null, onSession
       throw new Error("auth");
     if (!key)
       throw new Error("settings key required");
-    const nextSettings = await cloud.user.settings.read(uid, key);
+    const nextSettings = settingsStored === false ? settingsState() : await cloud.user.settings.read(uid, key);
     if (!isCurrentUser(uid, session))
       return nextSettings;
     setSettingsKey(key);
@@ -107452,6 +107485,7 @@ function createUser({ cloud, network, avatarCache = null, diag = null, onSession
     const nextSettings = await cloud.user.settings.write(uid, patch, { currentSettings: state.settings, key: settingsKey });
     if (!isCurrentUser(uid, session))
       return nextSettings;
+    settingsStored = true;
     setState((user) => ({
       ...user,
       settingsReady: true,
@@ -170238,16 +170272,11 @@ function createFirebaseCloud({ db, auth: auth2, getAuth: getAuth2, functions: fu
     await deleteObject(ref(targetStorage, avatarPath(uid)));
     return true;
   }
-  async function writeProfileWalletPK(walletPK, { network } = {}) {
-    if (!walletPK)
-      throw new Error("wallet public key required");
-    await callVaultFunction("setWalletPK", VAULT_SIGNATURE_PURPOSES.SET_WALLET_IDENTITY, { walletPK, network });
-    return true;
-  }
-  async function writeProfileChatPK(chatPK) {
-    if (!chatPK)
-      throw new Error("chat public key required");
-    await callVaultFunction("setChatPK", VAULT_SIGNATURE_PURPOSES.SET_CHAT_IDENTITY, { chatPK });
+  async function writeProfileIdentity(identity) {
+    if (!identity || typeof identity !== "object" || Array.isArray(identity)) {
+      throw new Error("profile identity required");
+    }
+    await callVaultFunction("setIdentities", VAULT_SIGNATURE_PURPOSES.SET_IDENTITIES, identity);
     return true;
   }
   async function getUsername(username) {
@@ -170297,9 +170326,7 @@ function createFirebaseCloud({ db, auth: auth2, getAuth: getAuth2, functions: fu
       }
       return openSettings(key, uid, readCloudBytes(saved, "settings body"));
     }
-    const settings = normalizeSettings(defaultSettings);
-    await callVaultFunction("setSettings", VAULT_SIGNATURE_PURPOSES.SET_SETTINGS, { settings: bytesBase64(await sealSettings(key, uid, settings)) });
-    return settings;
+    return normalizeSettings(defaultSettings);
   }
   async function writeSettings(uid, settings, { currentSettings, key } = {}) {
     requireUid(uid);
@@ -171187,16 +171214,13 @@ function createFirebaseCloud({ db, auth: auth2, getAuth: getAuth2, functions: fu
       },
       profile: {
         watch: watchProfile,
+        identity: {
+          write: writeProfileIdentity
+        },
         avatar: {
           write: writeProfileAvatar,
           upload: uploadProfileAvatar,
           delete: deleteProfileAvatar
-        },
-        walletpk: {
-          write: writeProfileWalletPK
-        },
-        chatpk: {
-          write: writeProfileChatPK
         }
       },
       private: {
@@ -173948,7 +173972,7 @@ function createRuntimeProductActions({
       if (Object.prototype.hasOwnProperty.call(patch, "walletNetwork") && nextNetwork !== previousNetwork) {
         await lockVault();
         if (nextNetwork)
-          setNetwork(nextNetwork);
+          await setNetwork(nextNetwork);
       }
       return { ...next, autolock: { ...next.autolock }, locked: nextNetwork !== previousNetwork };
     }
@@ -174256,6 +174280,12 @@ function findByKey(messages, target) {
   return (messages || []).find((message) => message?.id === key || message?.cid === key || getMessageKey(message) === key) || null;
 }
 function createRuntimeChatActions({ getRuntime, getSession, resolvePeer }) {
+  let activeReadWindow = null;
+  function releaseActiveWindow() {
+    const window2 = activeReadWindow;
+    activeReadWindow = null;
+    window2?.release?.();
+  }
   async function readyRuntime() {
     const runtime = await getRuntime();
     await waitFor2(runtime.chat, (snapshot) => snapshot?.isChatDataReady === true);
@@ -174344,13 +174374,20 @@ function createRuntimeChatActions({ getRuntime, getSession, resolvePeer }) {
   }
   async function read(peer, options2 = {}) {
     const window2 = await messageWindow(peer, options2);
-    if (!window2.chat)
+    if (!window2.chat) {
+      releaseActiveWindow();
       return { chat: null, messages: [] };
+    }
+    let retained = false;
     try {
       const { runtime, session, chat, messages } = window2;
       const lastPeer = [...messages].reverse().find((message) => isPeerMsg(message, session.chatPK));
       if (lastPeer)
         await runtime.chat.getSnapshot().markChatReadReceipt(chat.id, lastPeer, { messages });
+      const previousWindow = activeReadWindow;
+      activeReadWindow = window2;
+      retained = true;
+      previousWindow?.release?.();
       return {
         chat: simplifyAccountChat(chat, profileForChat(runtime, chat)),
         messages: messages.map((message) => simplifyAccountMessage(message, chat, session.chatPK, options2)),
@@ -174358,7 +174395,8 @@ function createRuntimeChatActions({ getRuntime, getSession, resolvePeer }) {
         nextOlderThan: window2.history?.nextOlderThan || null
       };
     } finally {
-      window2.release?.();
+      if (!retained)
+        window2.release?.();
     }
   }
   async function markRead(peer, options2 = {}) {
@@ -174381,9 +174419,17 @@ function createRuntimeChatActions({ getRuntime, getSession, resolvePeer }) {
     }
   }
   async function messageForPeer(peer, messageId, options2 = {}) {
-    const window2 = await messageWindow(peer, { ...options2, count: Math.max(positiveLimit2(options2.count, 100), 100), loadOlder: false });
-    if (!window2.chat)
+    const { runtime, chat } = await chatForPeer(peer);
+    if (!chat)
       throw new Error("chat not found");
+    const retained = activeReadWindow;
+    if (retained?.runtime === runtime && retained.chat?.id === chat.id) {
+      const message = findByKey(retained.batch?.sourceMessages, messageId) || findByKey(retained.messages, messageId);
+      if (message) {
+        return { ...retained, release: undefined, message, target: getMessageKey(message) || cleanText(messageId) };
+      }
+    }
+    const window2 = await messageWindow(peer, { ...options2, count: Math.max(positiveLimit2(options2.count, 100), 100), loadOlder: false });
     try {
       let message = findByKey(window2.batch?.sourceMessages, messageId) || findByKey(window2.messages, messageId);
       if (!message) {
@@ -174555,7 +174601,8 @@ function createRuntimeChatActions({ getRuntime, getSession, resolvePeer }) {
     const updated = await target.runtime.chat.getSnapshot().updateMessage(target.chat.id, target.message.id, message, target.profile.chatPK);
     return {
       chat: simplifyAccountChat(target.chat, target.profile),
-      message: simplifyAccountMessage(updated || message, target.chat, target.session.chatPK, options2)
+      message: simplifyAccountMessage(message, target.chat, target.session.chatPK, options2),
+      actionId: cleanText(updated?.msgId || updated?.cid) || null
     };
   }
   async function deleteChat(peer, options2 = {}) {
@@ -174563,6 +174610,9 @@ function createRuntimeChatActions({ getRuntime, getSession, resolvePeer }) {
     if (!chat)
       return { deleted: false, chat: null };
     const deleted = await runtime.chat.getSnapshot().deleteChat(chat, { cleanup: options2.cleanup !== false });
+    if (deleted === true && activeReadWindow?.runtime === runtime && activeReadWindow.chat?.id === chat.id) {
+      releaseActiveWindow();
+    }
     return { deleted: deleted === true, chat: simplifyAccountChat(chat, profile) };
   }
   async function retention(peer, value) {
@@ -174596,7 +174646,8 @@ function createRuntimeChatActions({ getRuntime, getSession, resolvePeer }) {
     deleteChat,
     retention,
     messageWindow,
-    messageForPeer
+    messageForPeer,
+    releaseActiveWindow
   };
 }
 function createRuntimeMoneyActions({ getRuntime, getSession, resolvePeer, chat }) {
@@ -174616,6 +174667,17 @@ function createRuntimeMoneyActions({ getRuntime, getSession, resolvePeer, chat }
       return fees || null;
     return { ...fees, spark: stripRaw(fees.spark, options2) };
   }
+  function summarizePaymentResult(value) {
+    if (!value || typeof value !== "object")
+      return value ?? null;
+    const transfer = value.transfer && typeof value.transfer === "object" ? simplifyAccountTransfer(value.transfer) : null;
+    return {
+      kind: value.kind || null,
+      id: value.id || value.transfer?.id || null,
+      status: value.status || value.transfer?.status || null,
+      transfer
+    };
+  }
   function cleanWithdrawal(withdrawal, options2 = {}) {
     if (!withdrawal)
       return null;
@@ -174723,8 +174785,8 @@ function createRuntimeMoneyActions({ getRuntime, getSession, resolvePeer, chat }
     return {
       id: result.result?.id || result.payment?.id || null,
       fees,
-      result: stripRaw(result.result, options2),
-      raw: options2.raw ? jsonSafe(result.payment) : undefined
+      result: summarizePaymentResult(result.result),
+      raw: options2.raw ? jsonSafe(result) : undefined
     };
   }
   async function lightningReceive(id, options2 = {}) {
@@ -174735,7 +174797,10 @@ function createRuntimeMoneyActions({ getRuntime, getSession, resolvePeer, chat }
   async function lightningSend(id, options2 = {}) {
     const { snapshot } = await readyWallet();
     const result = throwIfFailed(await snapshot.value.getLightningSendRequest(id), "could not read lightning send request");
-    return stripRaw(result.result, options2);
+    return {
+      ...summarizePaymentResult(result.result),
+      raw: options2.raw ? jsonSafe(result.result) : undefined
+    };
   }
   async function payInvoice(value, options2 = {}) {
     const raw = cleanText(value);
@@ -174757,7 +174822,8 @@ function createRuntimeMoneyActions({ getRuntime, getSession, resolvePeer, chat }
       type,
       id: result?.id || result?.result?.id || null,
       fees: result?.fees || null,
-      result: stripRaw(result?.result, options2)
+      result: summarizePaymentResult(result?.result),
+      raw: options2.raw ? jsonSafe(result) : undefined
     };
   }
   async function withdrawQuote(onchainAddress, sats, options2 = {}) {
@@ -175125,9 +175191,17 @@ class VeylHeadlessClient {
       resolvePeer: (peer, resolveOptions) => this.resolvePeer(peer, resolveOptions),
       chat: this.runtimeChat,
       lockVault: () => this.lockVault(),
-      setNetwork: (network) => {
-        this.network = network;
-        this.userOwner.setNetwork(network);
+      setNetwork: async (network) => {
+        const nextNetwork = String(network || "").toUpperCase();
+        this.network = nextNetwork;
+        this.userOwner.setNetwork(nextNetwork);
+        if (this.profileData) {
+          await this.saveProfile({
+            ...this.profileData,
+            network: nextNetwork,
+            walletPK: null
+          });
+        }
       },
       runPasskeyBrowserFlow,
       webUrl: options2.webUrl,
@@ -175240,7 +175314,7 @@ class VeylHeadlessClient {
       username: profile.username,
       profile: profile.profile,
       credentialId: profile.credentialId,
-      network: profile.network || this.network,
+      network: this.session?.network || profile.network || this.network,
       hasVault: profile.hasVault === true,
       hasVaultSecret: !!profile.vaultSecret,
       walletPK: profile.walletPK || null,
@@ -175265,6 +175339,7 @@ class VeylHeadlessClient {
   }
   async createAccount(options2 = {}) {
     const username = cleanUsername3(options2.username);
+    const profileName = this.store.profile || username;
     const network = String(options2.network || this.network).toUpperCase();
     const termsVersion = requireCurrentTermsVersion(options2.termsVersion);
     const machine = options2.credential || createMachineCredential();
@@ -175280,7 +175355,7 @@ class VeylHeadlessClient {
     await signInHeadless(this.auth, finish.token);
     this.autoLogin = true;
     const profile = await this.saveProfile({
-      profile: username,
+      profile: profileName,
       username,
       uid: finish.uid,
       network,
@@ -175300,7 +175375,7 @@ class VeylHeadlessClient {
   }
   async loginAccount(options2 = {}) {
     const username = cleanOptionalUsername(options2.username);
-    const profile = await this.loadProfile(username);
+    const profile = await this.loadProfile(this.store.profile || username);
     const credentialId = options2.credentialId || profile.credentialId;
     const privateKeyPem = options2.privateKeyPem || profile.privateKeyPem;
     if (!credentialId || !privateKeyPem) {
@@ -175339,6 +175414,7 @@ class VeylHeadlessClient {
   }
   async createPasskeyAccount(options2 = {}) {
     const username = cleanUsername3(options2.username);
+    const profileName = this.store.profile || username;
     const network = String(options2.network || this.network).toUpperCase();
     const termsVersion = requireCurrentTermsVersion(options2.termsVersion);
     const flow = await runPasskeyBrowserFlow({
@@ -175355,7 +175431,7 @@ class VeylHeadlessClient {
     const machine = options2.credential || createMachineCredential();
     const credential = machine ? await this.addMachineCredential(machine) : null;
     const profile = await this.saveProfile({
-      profile: username,
+      profile: profileName,
       username,
       uid: user.uid,
       network,
@@ -175375,7 +175451,7 @@ class VeylHeadlessClient {
   }
   async loginPasskeyAccount(options2 = {}) {
     const requested = cleanOptionalUsername(options2.username);
-    const stored = requested ? await this.store.load(requested) : await this.store.load();
+    const stored = await this.store.load(this.store.profile || requested);
     const flow = await runPasskeyBrowserFlow({
       mode: "login",
       uid: options2.uid || stored?.uid,
@@ -175391,7 +175467,7 @@ class VeylHeadlessClient {
     const credential = machine ? await this.addMachineCredential(machine) : null;
     const profile = await this.saveProfile({
       ...stored || {},
-      profile: username || stored?.profile || user.uid,
+      profile: this.store.profile || stored?.profile || username || user.uid,
       username: username || stored?.username || null,
       uid: user.uid,
       network: String(stored?.network || options2.network || this.network).toUpperCase(),
@@ -175599,10 +175675,9 @@ class VeylHeadlessClient {
         vaultCrypto: headlessVaultCrypto,
         bootWallet: (walletMnemonic, currentUser, { network }) => bootWallet(walletMnemonic, currentUser, {
           SparkWallet: SparkWalletNodeJS,
-          cloud: this.cloud,
           network
         }),
-        bootChat: (chatSeed, currentUser) => bootChat(chatSeed, currentUser, { cloud: this.cloud }),
+        bootChat: (chatSeed, currentUser) => bootChat(chatSeed, currentUser),
         openLocalCache: (cacheSeed, { uid, network }) => openHeadlessLocalDataCache(cacheSeed, {
           homeDir: this.store.dir,
           uid,
@@ -175647,6 +175722,7 @@ class VeylHeadlessClient {
       ...profile,
       hasVault: true,
       vaultSecret: options2.saveSecret === false ? null : vaultSecret,
+      network: session.network,
       walletPK: session.walletPK,
       chatPK: session.chatPK,
       vaultCreatedAt: Date.now()
@@ -175691,6 +175767,7 @@ class VeylHeadlessClient {
       ...profile,
       hasVault: true,
       vaultSecret: options2.saveSecret === false ? profile.vaultSecret || null : profile.vaultSecret || vaultSecret,
+      network: session.network,
       walletPK: session.walletPK,
       chatPK: session.chatPK,
       lastUnlockedAt: Date.now()
@@ -175700,6 +175777,7 @@ class VeylHeadlessClient {
   }
   closeVaultSession() {
     const session = this.session;
+    this.runtimeChat.releaseActiveWindow();
     this.session = null;
     this.runtime = null;
     closeAccountSession(session);

package/dist/index.js

@@ -5906,9 +5906,8 @@ var init_vaultsignature = __esm(() => {
     DELETE_ACCOUNT: "delete-account",
     DELETE_PASSKEY: "delete-passkey",
     LOGOUT_ALL_DEVICES: "logout-all-devices",
-    SET_CHAT_IDENTITY: "set-chat-identity",
-    SET_SETTINGS: "set-settings",
-    SET_WALLET_IDENTITY: "set-wallet-identity"
+    SET_IDENTITIES: "set-identities",
+    SET_SETTINGS: "set-settings"
   });
 });
 
@@ -7998,11 +7997,9 @@ function getBootWalletClass(SparkWallet, { enableTokenSync = false } = {}) {
 function bytesToHex4(bytes) {
   return Array.from(bytes || []).map((b) => b.toString(16).padStart(2, "0")).join("");
 }
-async function bootWallet(walletMnemonic, user, { SparkWallet, cloud, network, enableTokenSync = false, diag = null } = {}) {
+async function bootWallet(walletMnemonic, user, { SparkWallet, network, enableTokenSync = false, diag = null } = {}) {
   if (!SparkWallet)
     throw new Error("SparkWallet missing");
-  if (!cloud)
-    throw new Error("cloud missing");
   if (!network)
     throw new Error("network missing");
   const startedAt = Date.now();
@@ -8037,53 +8034,41 @@ async function bootWallet(walletMnemonic, user, { SparkWallet, cloud, network, e
     const walletPK = lowerText(idPk);
     const expectedWalletPK = resolveWalletPK(user, network);
     markDone(diag, "vault.bootWallet.identity", identityStartedAt);
-    const setupStartedAt = Date.now();
+    let walletPKNeedsWrite = false;
     if (!expectedWalletPK) {
-      markDiag(diag, "vault.bootWallet.setup.start", { reason: "missing-wallet-pk" });
-      await cloud.user.profile.walletpk.write(idPk, { network });
-      markDone(diag, "vault.bootWallet.setup", setupStartedAt, { wrote: true });
+      walletPKNeedsWrite = true;
     } else if (!sameText(expectedWalletPK, walletPK)) {
       throw new Error("wallet identity mismatch for account");
     } else if (!hasWalletPKForNetwork(user, network)) {
-      markDiag(diag, "vault.bootWallet.setup.start", { reason: "missing-network-wallet-pk" });
-      await cloud.user.profile.walletpk.write(idPk, { network });
-      markDone(diag, "vault.bootWallet.setup", setupStartedAt, { wrote: true });
-    } else {
-      markDiag(diag, "vault.bootWallet.setup.skip", { elapsedMs: Date.now() - setupStartedAt });
+      walletPKNeedsWrite = true;
     }
     markDone(diag, "vault.bootWallet", startedAt);
-    return { wallet, walletPK };
+    return { wallet, walletPK, walletPKNeedsWrite };
   } catch (error) {
     markError(diag, "vault.bootWallet", startedAt, error);
     throw error;
   }
 }
-async function bootChat(chatSeed, user, { cloud, diag = null } = {}) {
+async function bootChat(chatSeed, user, { diag = null } = {}) {
   const startedAt = Date.now();
   markDiag(diag, "vault.bootChat.start", { hasChatPK: !!user?.chatPK });
   try {
-    if (!cloud)
-      throw new Error("cloud missing");
     const keyStartedAt = Date.now();
     const chatKeyPair = getKeyPair(chatSeed);
     chatSeed.fill(0);
     const chatPKHex = bytesToHex4(chatKeyPair.pub);
     markDone(diag, "vault.bootChat.derive", keyStartedAt);
+    let chatPKNeedsWrite = false;
     if (!user.chatPK) {
-      const setupStartedAt = Date.now();
-      markDiag(diag, "vault.bootChat.setup.start", { reason: "missing-chat-pk" });
-      await cloud.user.profile.chatpk.write(chatPKHex);
-      markDone(diag, "vault.bootChat.setup", setupStartedAt, { wrote: true });
+      chatPKNeedsWrite = true;
     } else if (!sameText(user.chatPK, chatPKHex)) {
       chatKeyPair.priv.fill(0);
       chatKeyPair.pub.fill(0);
       throw new Error("chat identity mismatch for account");
-    } else {
-      markDiag(diag, "vault.bootChat.setup.skip", {});
     }
     chatKeyPair.pub.fill(0);
     markDone(diag, "vault.bootChat", startedAt);
-    return { chatPrivateKey: chatKeyPair.priv, chatPK: chatPKHex };
+    return { chatPrivateKey: chatKeyPair.priv, chatPK: chatPKHex, chatPKNeedsWrite };
   } catch (error) {
     markError(diag, "vault.bootChat", startedAt, error);
     chatSeed.fill(0);
@@ -8281,9 +8266,18 @@ async function openVaultAccountSession(vault, password, options = {}) {
     onStage?.("unlocking");
     const authStartedAt = Date.now();
     mark(diag, "vault.unlock.session.start", { source });
-    await cloud.auth.user.getIdToken(true);
-    mark(diag, "vault.unlock.session.done", { elapsedMs: Date.now() - authStartedAt, source });
-    requireCurrent(isCurrent);
+    const authResult = cloud.auth.user.getIdToken(true).then(() => {
+      mark(diag, "vault.unlock.session.done", { elapsedMs: Date.now() - authStartedAt, source });
+      return { error: null };
+    }, (error) => {
+      mark(diag, "vault.unlock.session.error", {
+        elapsedMs: Date.now() - authStartedAt,
+        source,
+        code: error?.code || "",
+        message: error?.message || String(error)
+      });
+      return { error };
+    });
     const unpackStartedAt = Date.now();
     const unpacked = unpackVaultSeedData(vault);
     const { salt, iv, ct, kdf, registry: registryEnvelope } = unpacked;
@@ -8312,6 +8306,9 @@ async function openVaultAccountSession(vault, password, options = {}) {
     cleanBytes(walletEntropy, masterSeed);
     walletEntropy = null;
     masterSeed = null;
+    const sessionResult = await authResult;
+    if (sessionResult.error)
+      throw sessionResult.error;
     requireCurrent(isCurrent);
     const vaultSignatureStartedAt = Date.now();
     mark(diag, "vault.unlock.signature.start", { source });
@@ -8332,7 +8329,7 @@ async function openVaultAccountSession(vault, password, options = {}) {
     onStage?.("wallet");
     const walletStartedAt = Date.now();
     mark(diag, "vault.unlock.wallet.start", { source });
-    const walletIdentity = await bootWallet2(walletMnemonic, user, { network });
+    const walletIdentity = await bootWallet2(walletMnemonic, user, { network, diag });
     wallet = walletIdentity?.wallet;
     const walletPK = walletPubkey(walletIdentity?.walletPK);
     mark(diag, "vault.unlock.wallet.done", { elapsedMs: Date.now() - walletStartedAt, source });
@@ -8340,7 +8337,7 @@ async function openVaultAccountSession(vault, password, options = {}) {
     onStage?.("chat");
     const chatStartedAt = Date.now();
     mark(diag, "vault.unlock.chat.start", { source });
-    const chatIdentity = await bootChat2(chatSeed, user);
+    const chatIdentity = await bootChat2(chatSeed, user, { diag });
     chatPrivateKey = chatIdentity?.chatPrivateKey;
     const chatPK = cleanText(chatIdentity?.chatPK);
     if (!chatPrivateKey || !chatPK)
@@ -8348,6 +8345,30 @@ async function openVaultAccountSession(vault, password, options = {}) {
     chatSeed = null;
     mark(diag, "vault.unlock.chat.done", { elapsedMs: Date.now() - chatStartedAt, source });
     requireCurrent(isCurrent);
+    const identityPayload = {};
+    if (walletIdentity?.walletPKNeedsWrite) {
+      identityPayload.walletPK = walletPK;
+      identityPayload.network = network;
+    }
+    if (chatIdentity?.chatPKNeedsWrite) {
+      identityPayload.chatPK = chatPK;
+    }
+    const identityFields = Object.keys(identityPayload);
+    let identityResult = null;
+    if (identityFields.length) {
+      const identitiesStartedAt = Date.now();
+      mark(diag, "vault.unlock.identities.start", { source, fields: identityFields });
+      identityResult = cloud.user.profile.identity.write(identityPayload).then(() => {
+        mark(diag, "vault.unlock.identities.done", {
+          elapsedMs: Date.now() - identitiesStartedAt,
+          source,
+          fields: identityFields
+        });
+        return { error: null };
+      }, (error) => ({ error }));
+    } else {
+      mark(diag, "vault.unlock.identities.skip", { source });
+    }
     const cacheStartedAt = Date.now();
     mark(diag, "vault.unlock.localCache.start", { source });
     localCache = await openLocalCache(cacheKey, { uid, network });
@@ -8355,6 +8376,10 @@ async function openVaultAccountSession(vault, password, options = {}) {
     cleanBytes(cacheKey);
     cacheKey = null;
     requireCurrent(isCurrent);
+    const identityWrite = await identityResult;
+    if (identityWrite?.error)
+      throw identityWrite.error;
+    requireCurrent(isCurrent);
     const signatureResult = await vaultAccessResult;
     if (signatureResult.error)
       throw signatureResult.error;
@@ -106357,6 +106382,7 @@ function createUser({ cloud, network, avatarCache = null, diag = null, onSession
   let authSession = 0;
   let userUid = null;
   let settingsKey = null;
+  let settingsStored = null;
   let avatarFetch = { uid: null, key: null, promise: null };
   let blockedSource = state.blocked;
   let blockedSet = new Set(blockedSource);
@@ -106576,6 +106602,7 @@ function createUser({ cloud, network, avatarCache = null, diag = null, onSession
       userUid = null;
       clearSettingsKey(settingsKey);
       settingsKey = null;
+      settingsStored = null;
       if (signedOutUid) {
         keepOnlyCachedAvatar(null);
       }
@@ -106589,6 +106616,7 @@ function createUser({ cloud, network, avatarCache = null, diag = null, onSession
     if (authUidChanged) {
       clearSettingsKey(settingsKey);
       settingsKey = null;
+      settingsStored = null;
     }
     setState((user) => authUidChanged ? { ...defaultUser, authReady: true, uid: authUser.uid } : { ...user, authReady: true, isAdmin: false, adminReady: false });
     readCachedAvatar(authUser.uid).then((cached) => {
@@ -106645,6 +106673,9 @@ function createUser({ cloud, network, avatarCache = null, diag = null, onSession
         fromCache: !!info.fromCache,
         pending: !!info.pending
       });
+      if (!info.fromCache) {
+        settingsStored = Object.prototype.hasOwnProperty.call(privateData, "settings");
+      }
       setState((user) => ({
         ...user,
         agreement: privateData.agreement ?? null,
@@ -106652,6 +106683,7 @@ function createUser({ cloud, network, avatarCache = null, diag = null, onSession
       }));
     }), current((error) => {
       markError(diag, "user.settings.snapshot", authStartedAt, error);
+      settingsStored = null;
       setState((user) => ({
         ...user,
         settingsReady: true,
@@ -106755,6 +106787,7 @@ function createUser({ cloud, network, avatarCache = null, diag = null, onSession
     }
     clearSettingsKey(settingsKey);
     settingsKey = null;
+    settingsStored = null;
     userUid = null;
     avatarFetch = { uid: null, key: null, promise: null };
     state = defaultUser;
@@ -106805,7 +106838,7 @@ function createUser({ cloud, network, avatarCache = null, diag = null, onSession
       throw new Error("auth");
     if (!key)
       throw new Error("settings key required");
-    const nextSettings = await cloud.user.settings.read(uid, key);
+    const nextSettings = settingsStored === false ? settingsState() : await cloud.user.settings.read(uid, key);
     if (!isCurrentUser(uid, session))
       return nextSettings;
     setSettingsKey(key);
@@ -106829,6 +106862,7 @@ function createUser({ cloud, network, avatarCache = null, diag = null, onSession
     const nextSettings = await cloud.user.settings.write(uid, patch, { currentSettings: state.settings, key: settingsKey });
     if (!isCurrentUser(uid, session))
       return nextSettings;
+    settingsStored = true;
     setState((user) => ({
       ...user,
       settingsReady: true,
@@ -169615,16 +169649,11 @@ function createFirebaseCloud({ db, auth: auth2, getAuth: getAuth2, functions: fu
     await deleteObject(ref(targetStorage, avatarPath(uid)));
     return true;
   }
-  async function writeProfileWalletPK(walletPK, { network } = {}) {
-    if (!walletPK)
-      throw new Error("wallet public key required");
-    await callVaultFunction("setWalletPK", VAULT_SIGNATURE_PURPOSES.SET_WALLET_IDENTITY, { walletPK, network });
-    return true;
-  }
-  async function writeProfileChatPK(chatPK) {
-    if (!chatPK)
-      throw new Error("chat public key required");
-    await callVaultFunction("setChatPK", VAULT_SIGNATURE_PURPOSES.SET_CHAT_IDENTITY, { chatPK });
+  async function writeProfileIdentity(identity) {
+    if (!identity || typeof identity !== "object" || Array.isArray(identity)) {
+      throw new Error("profile identity required");
+    }
+    await callVaultFunction("setIdentities", VAULT_SIGNATURE_PURPOSES.SET_IDENTITIES, identity);
     return true;
   }
   async function getUsername(username) {
@@ -169674,9 +169703,7 @@ function createFirebaseCloud({ db, auth: auth2, getAuth: getAuth2, functions: fu
       }
       return openSettings(key, uid, readCloudBytes(saved, "settings body"));
     }
-    const settings = normalizeSettings(defaultSettings);
-    await callVaultFunction("setSettings", VAULT_SIGNATURE_PURPOSES.SET_SETTINGS, { settings: bytesBase64(await sealSettings(key, uid, settings)) });
-    return settings;
+    return normalizeSettings(defaultSettings);
   }
   async function writeSettings(uid, settings, { currentSettings, key } = {}) {
     requireUid(uid);
@@ -170564,16 +170591,13 @@ function createFirebaseCloud({ db, auth: auth2, getAuth: getAuth2, functions: fu
       },
       profile: {
         watch: watchProfile,
+        identity: {
+          write: writeProfileIdentity
+        },
         avatar: {
           write: writeProfileAvatar,
           upload: uploadProfileAvatar,
           delete: deleteProfileAvatar
-        },
-        walletpk: {
-          write: writeProfileWalletPK
-        },
-        chatpk: {
-          write: writeProfileChatPK
         }
       },
       private: {
@@ -173325,7 +173349,7 @@ function createRuntimeProductActions({
       if (Object.prototype.hasOwnProperty.call(patch, "walletNetwork") && nextNetwork !== previousNetwork) {
         await lockVault();
         if (nextNetwork)
-          setNetwork(nextNetwork);
+          await setNetwork(nextNetwork);
       }
       return { ...next, autolock: { ...next.autolock }, locked: nextNetwork !== previousNetwork };
     }
@@ -173633,6 +173657,12 @@ function findByKey(messages, target) {
   return (messages || []).find((message) => message?.id === key || message?.cid === key || getMessageKey(message) === key) || null;
 }
 function createRuntimeChatActions({ getRuntime, getSession, resolvePeer }) {
+  let activeReadWindow = null;
+  function releaseActiveWindow() {
+    const window2 = activeReadWindow;
+    activeReadWindow = null;
+    window2?.release?.();
+  }
   async function readyRuntime() {
     const runtime = await getRuntime();
     await waitFor2(runtime.chat, (snapshot) => snapshot?.isChatDataReady === true);
@@ -173721,13 +173751,20 @@ function createRuntimeChatActions({ getRuntime, getSession, resolvePeer }) {
   }
   async function read(peer, options2 = {}) {
     const window2 = await messageWindow(peer, options2);
-    if (!window2.chat)
+    if (!window2.chat) {
+      releaseActiveWindow();
       return { chat: null, messages: [] };
+    }
+    let retained = false;
     try {
       const { runtime, session, chat, messages } = window2;
       const lastPeer = [...messages].reverse().find((message) => isPeerMsg(message, session.chatPK));
       if (lastPeer)
         await runtime.chat.getSnapshot().markChatReadReceipt(chat.id, lastPeer, { messages });
+      const previousWindow = activeReadWindow;
+      activeReadWindow = window2;
+      retained = true;
+      previousWindow?.release?.();
       return {
         chat: simplifyAccountChat(chat, profileForChat(runtime, chat)),
         messages: messages.map((message) => simplifyAccountMessage(message, chat, session.chatPK, options2)),
@@ -173735,7 +173772,8 @@ function createRuntimeChatActions({ getRuntime, getSession, resolvePeer }) {
         nextOlderThan: window2.history?.nextOlderThan || null
       };
     } finally {
-      window2.release?.();
+      if (!retained)
+        window2.release?.();
     }
   }
   async function markRead(peer, options2 = {}) {
@@ -173758,9 +173796,17 @@ function createRuntimeChatActions({ getRuntime, getSession, resolvePeer }) {
     }
   }
   async function messageForPeer(peer, messageId, options2 = {}) {
-    const window2 = await messageWindow(peer, { ...options2, count: Math.max(positiveLimit2(options2.count, 100), 100), loadOlder: false });
-    if (!window2.chat)
+    const { runtime, chat } = await chatForPeer(peer);
+    if (!chat)
       throw new Error("chat not found");
+    const retained = activeReadWindow;
+    if (retained?.runtime === runtime && retained.chat?.id === chat.id) {
+      const message = findByKey(retained.batch?.sourceMessages, messageId) || findByKey(retained.messages, messageId);
+      if (message) {
+        return { ...retained, release: undefined, message, target: getMessageKey(message) || cleanText(messageId) };
+      }
+    }
+    const window2 = await messageWindow(peer, { ...options2, count: Math.max(positiveLimit2(options2.count, 100), 100), loadOlder: false });
     try {
       let message = findByKey(window2.batch?.sourceMessages, messageId) || findByKey(window2.messages, messageId);
       if (!message) {
@@ -173932,7 +173978,8 @@ function createRuntimeChatActions({ getRuntime, getSession, resolvePeer }) {
     const updated = await target.runtime.chat.getSnapshot().updateMessage(target.chat.id, target.message.id, message, target.profile.chatPK);
     return {
       chat: simplifyAccountChat(target.chat, target.profile),
-      message: simplifyAccountMessage(updated || message, target.chat, target.session.chatPK, options2)
+      message: simplifyAccountMessage(message, target.chat, target.session.chatPK, options2),
+      actionId: cleanText(updated?.msgId || updated?.cid) || null
     };
   }
   async function deleteChat(peer, options2 = {}) {
@@ -173940,6 +173987,9 @@ function createRuntimeChatActions({ getRuntime, getSession, resolvePeer }) {
     if (!chat)
       return { deleted: false, chat: null };
     const deleted = await runtime.chat.getSnapshot().deleteChat(chat, { cleanup: options2.cleanup !== false });
+    if (deleted === true && activeReadWindow?.runtime === runtime && activeReadWindow.chat?.id === chat.id) {
+      releaseActiveWindow();
+    }
     return { deleted: deleted === true, chat: simplifyAccountChat(chat, profile) };
   }
   async function retention(peer, value) {
@@ -173973,7 +174023,8 @@ function createRuntimeChatActions({ getRuntime, getSession, resolvePeer }) {
     deleteChat,
     retention,
     messageWindow,
-    messageForPeer
+    messageForPeer,
+    releaseActiveWindow
   };
 }
 function createRuntimeMoneyActions({ getRuntime, getSession, resolvePeer, chat }) {
@@ -173993,6 +174044,17 @@ function createRuntimeMoneyActions({ getRuntime, getSession, resolvePeer, chat }
       return fees || null;
     return { ...fees, spark: stripRaw(fees.spark, options2) };
   }
+  function summarizePaymentResult(value) {
+    if (!value || typeof value !== "object")
+      return value ?? null;
+    const transfer = value.transfer && typeof value.transfer === "object" ? simplifyAccountTransfer(value.transfer) : null;
+    return {
+      kind: value.kind || null,
+      id: value.id || value.transfer?.id || null,
+      status: value.status || value.transfer?.status || null,
+      transfer
+    };
+  }
   function cleanWithdrawal(withdrawal, options2 = {}) {
     if (!withdrawal)
       return null;
@@ -174100,8 +174162,8 @@ function createRuntimeMoneyActions({ getRuntime, getSession, resolvePeer, chat }
     return {
       id: result.result?.id || result.payment?.id || null,
       fees,
-      result: stripRaw(result.result, options2),
-      raw: options2.raw ? jsonSafe(result.payment) : undefined
+      result: summarizePaymentResult(result.result),
+      raw: options2.raw ? jsonSafe(result) : undefined
     };
   }
   async function lightningReceive(id, options2 = {}) {
@@ -174112,7 +174174,10 @@ function createRuntimeMoneyActions({ getRuntime, getSession, resolvePeer, chat }
   async function lightningSend(id, options2 = {}) {
     const { snapshot } = await readyWallet();
     const result = throwIfFailed(await snapshot.value.getLightningSendRequest(id), "could not read lightning send request");
-    return stripRaw(result.result, options2);
+    return {
+      ...summarizePaymentResult(result.result),
+      raw: options2.raw ? jsonSafe(result.result) : undefined
+    };
   }
   async function payInvoice(value, options2 = {}) {
     const raw = cleanText(value);
@@ -174134,7 +174199,8 @@ function createRuntimeMoneyActions({ getRuntime, getSession, resolvePeer, chat }
       type,
       id: result?.id || result?.result?.id || null,
       fees: result?.fees || null,
-      result: stripRaw(result?.result, options2)
+      result: summarizePaymentResult(result?.result),
+      raw: options2.raw ? jsonSafe(result) : undefined
     };
   }
   async function withdrawQuote(onchainAddress, sats, options2 = {}) {
@@ -174824,7 +174890,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "veyl",
-    version: "0.31.0",
+    version: "0.32.1",
     private: true,
     license: "Apache-2.0",
     workspaces: {
@@ -175124,9 +175190,17 @@ class VeylHeadlessClient {
       resolvePeer: (peer, resolveOptions) => this.resolvePeer(peer, resolveOptions),
       chat: this.runtimeChat,
       lockVault: () => this.lockVault(),
-      setNetwork: (network) => {
-        this.network = network;
-        this.userOwner.setNetwork(network);
+      setNetwork: async (network) => {
+        const nextNetwork = String(network || "").toUpperCase();
+        this.network = nextNetwork;
+        this.userOwner.setNetwork(nextNetwork);
+        if (this.profileData) {
+          await this.saveProfile({
+            ...this.profileData,
+            network: nextNetwork,
+            walletPK: null
+          });
+        }
       },
       runPasskeyBrowserFlow,
       webUrl: options2.webUrl,
@@ -175239,7 +175313,7 @@ class VeylHeadlessClient {
       username: profile.username,
       profile: profile.profile,
       credentialId: profile.credentialId,
-      network: profile.network || this.network,
+      network: this.session?.network || profile.network || this.network,
       hasVault: profile.hasVault === true,
       hasVaultSecret: !!profile.vaultSecret,
       walletPK: profile.walletPK || null,
@@ -175264,6 +175338,7 @@ class VeylHeadlessClient {
   }
   async createAccount(options2 = {}) {
     const username = cleanUsername3(options2.username);
+    const profileName = this.store.profile || username;
     const network = String(options2.network || this.network).toUpperCase();
     const termsVersion = requireCurrentTermsVersion(options2.termsVersion);
     const machine = options2.credential || createMachineCredential();
@@ -175279,7 +175354,7 @@ class VeylHeadlessClient {
     await signInHeadless(this.auth, finish.token);
     this.autoLogin = true;
     const profile = await this.saveProfile({
-      profile: username,
+      profile: profileName,
       username,
       uid: finish.uid,
       network,
@@ -175299,7 +175374,7 @@ class VeylHeadlessClient {
   }
   async loginAccount(options2 = {}) {
     const username = cleanOptionalUsername(options2.username);
-    const profile = await this.loadProfile(username);
+    const profile = await this.loadProfile(this.store.profile || username);
     const credentialId = options2.credentialId || profile.credentialId;
     const privateKeyPem = options2.privateKeyPem || profile.privateKeyPem;
     if (!credentialId || !privateKeyPem) {
@@ -175338,6 +175413,7 @@ class VeylHeadlessClient {
   }
   async createPasskeyAccount(options2 = {}) {
     const username = cleanUsername3(options2.username);
+    const profileName = this.store.profile || username;
     const network = String(options2.network || this.network).toUpperCase();
     const termsVersion = requireCurrentTermsVersion(options2.termsVersion);
     const flow = await runPasskeyBrowserFlow({
@@ -175354,7 +175430,7 @@ class VeylHeadlessClient {
     const machine = options2.credential || createMachineCredential();
     const credential = machine ? await this.addMachineCredential(machine) : null;
     const profile = await this.saveProfile({
-      profile: username,
+      profile: profileName,
       username,
       uid: user.uid,
       network,
@@ -175374,7 +175450,7 @@ class VeylHeadlessClient {
   }
   async loginPasskeyAccount(options2 = {}) {
     const requested = cleanOptionalUsername(options2.username);
-    const stored = requested ? await this.store.load(requested) : await this.store.load();
+    const stored = await this.store.load(this.store.profile || requested);
     const flow = await runPasskeyBrowserFlow({
       mode: "login",
       uid: options2.uid || stored?.uid,
@@ -175390,7 +175466,7 @@ class VeylHeadlessClient {
     const credential = machine ? await this.addMachineCredential(machine) : null;
     const profile = await this.saveProfile({
       ...stored || {},
-      profile: username || stored?.profile || user.uid,
+      profile: this.store.profile || stored?.profile || username || user.uid,
       username: username || stored?.username || null,
       uid: user.uid,
       network: String(stored?.network || options2.network || this.network).toUpperCase(),
@@ -175598,10 +175674,9 @@ class VeylHeadlessClient {
         vaultCrypto: headlessVaultCrypto,
         bootWallet: (walletMnemonic, currentUser, { network }) => bootWallet(walletMnemonic, currentUser, {
           SparkWallet: SparkWalletNodeJS,
-          cloud: this.cloud,
           network
         }),
-        bootChat: (chatSeed, currentUser) => bootChat(chatSeed, currentUser, { cloud: this.cloud }),
+        bootChat: (chatSeed, currentUser) => bootChat(chatSeed, currentUser),
         openLocalCache: (cacheSeed, { uid, network }) => openHeadlessLocalDataCache(cacheSeed, {
           homeDir: this.store.dir,
           uid,
@@ -175646,6 +175721,7 @@ class VeylHeadlessClient {
       ...profile,
       hasVault: true,
       vaultSecret: options2.saveSecret === false ? null : vaultSecret,
+      network: session.network,
       walletPK: session.walletPK,
       chatPK: session.chatPK,
       vaultCreatedAt: Date.now()
@@ -175690,6 +175766,7 @@ class VeylHeadlessClient {
       ...profile,
       hasVault: true,
       vaultSecret: options2.saveSecret === false ? profile.vaultSecret || null : profile.vaultSecret || vaultSecret,
+      network: session.network,
       walletPK: session.walletPK,
       chatPK: session.chatPK,
       lastUnlockedAt: Date.now()
@@ -175699,6 +175776,7 @@ class VeylHeadlessClient {
   }
   closeVaultSession() {
     const session = this.session;
+    this.runtimeChat.releaseActiveWindow();
     this.session = null;
     this.runtime = null;
     closeAccountSession(session);

package/package.json

@@ -32,5 +32,5 @@
         "start": "node src/cli.js",
         "lint": "eslint src --quiet"
     },
-    "version": "0.31.0"
+    "version": "0.32.1"
 }