@glyphteck/veyl 0.77.1 → 0.78.0

package/dist/index.js

@@ -5855,7 +5855,7 @@ var init_canonical = __esm(() => {
 });
 
 // ../../core/config.js
-var MS_PER_SECOND = 1000, MINUTE_MS, HOUR_MS, DAY_MS, KIB_BYTES = 1024, MIB_BYTES, SATS_PER_BITCOIN = 100000000n, USERNAME_MAX_CHARS = 12, PASSWORD_MIN_CHARS = 15, PASSWORD_MAX_CHARS = 64, PASSWORD_MAX_BYTES, ACCOUNT_CONNECTION_SLOW_MS, ACCOUNT_CONNECTION_UNAVAILABLE_MS, ACCOUNT_CONNECTION_RETRY_MIN_MS, ACCOUNT_CONNECTION_RETRY_MAX_MS, TICKET_MESSAGE_LIMIT = 4000, TICKET_ATTACHMENT_LIMIT = 3, TICKET_ATTACHMENT_MAX_BYTES, AUTOLOCK_MIN_MINUTES = 1, AUTOLOCK_MAX_MINUTES = 60, BTC_PRICE_FALLBACK = 80000, CHAT_MESSAGE_EDIT_WINDOW_MS, CHAT_SEND_CONNECTION_WAIT_MS, CALL_SPEAKING_THRESHOLD = 0.02, CALL_SPEAKING_HOLD_MS = 320, LOCAL_CACHE_WRITE_DELAY_MS = 350, WEB_LAYOUT_SAVE_DELAY_MS, WEB_CHAT_LAYOUT_LIMIT = 32, LOCAL_MEDIA_CACHE_MAX_BYTES, LOCAL_MEDIA_CACHE_MAX_ITEMS = 1000, LOCAL_MEDIA_ACCESS_TOUCH_MIN_MS, LOCAL_PROFILE_CACHE_MAX_ITEMS = 500, LOCAL_PROFILE_CACHE_MAX_AGE_MS, LOCAL_CHAT_CACHE_MAX_ITEMS = 1000, LOCAL_CHAT_MESSAGE_CACHE_MAX_VISIBLE = 1000, LOCAL_CHAT_MESSAGE_CACHE_WRITE_DELAY_MS = 2500, LOCAL_AVATAR_CACHE_MAX_BYTES, LOCAL_AVATAR_CACHE_MAX_AGE_MS, AVATAR_IMAGE_MAX_BYTES, AVATAR_IMAGE_QUALITY_ATTEMPTS, CHAT_AVATAR_IMAGE_MAX_BYTES, CHAT_AVATAR_REF_MAX_CHARS = 256, CHAT_MESSAGE_FILE_CACHE_MAX_BYTES, IDLE_CALLBACK_MIN_TIMEOUT_MS = 50, ATTACHMENT_CACHE_IDLE_TIMEOUT_MS = 2500, ATTACHMENT_CACHE_FALLBACK_DELAY_MS = 250, CHAT_UNSAVED_TTL_DAYS = 21, CHAT_UNSAVED_TTL_MS, CHAT_AFTER_SEEN_MS, CHAT_MEDIA_TTL_DAYS, CHAT_MEDIA_TTL_MS, CHAT_UPLOAD_MAX_BYTES, CHAT_AUDIO_TRANSCODE_BITRATE_BPS = 128000, CHAT_VIDEO_TRANSCODE_VIDEO_BITRATE_BPS = 3000000, CHAT_VIDEO_TRANSCODE_AUDIO_BITRATE_BPS, CHAT_MESSAGE_BATCH_SIZE = 40, CHAT_MESSAGE_QUERY_MAX_DOCS = 120, CHAT_MESSAGE_MUTATION_MAX_ITEMS = 256, CHAT_TTL_CLIENT_DELETE_GRACE_MS, CHAT_BATCH_CLEANUP_IDLE_TIMEOUT_MS = 1500, CHAT_BATCH_CLEANUP_IDLE_DELAY_MS = 250, CHAT_LIST_PAGE_SIZE = 20, CHAT_ADMISSION_CACHE_PEERS = 1024, CHAT_LIST_LIVE_COUNT, CHAT_INBOX_PING_PAGE_SIZE = 25, CHAT_INBOX_DISCOVERY_PARALLEL_CHATS, CHAT_INBOX_SETTLEMENT_PARALLEL_CHATS = 4, CHAT_INBOX_CURSOR_OVERLAP_MS, CHAT_LIST_CACHE_WRITE_DELAY_MS = 1500, CHAT_LIST_SNAPSHOT_COALESCE_MS = 80, CHAT_LIST_COMPLETE_SYNC_DELAY_MS = 250, CHAT_LIST_LISTENER_RETRY_MS = 1000, CHAT_TOP_WARM_COUNT = 0, CHAT_EAGER_WARM_COUNT = 0, CHAT_WARM_DELAY_MS = 3000, CHAT_WARM_BATCH_SIZE, CHAT_MESSAGE_VIEW_CACHE_SIZE = 30, CHAT_MEDIA_WARM_MESSAGES_PER_CHAT, CHAT_MEDIA_WARM_START_DELAY_MS = 600, CHAT_MEDIA_WARM_STEP_DELAY_MS = 120, CHAT_MEDIA_WARM_TYPES, CHAT_MEDIA_WARM_MAX_BYTES = 0, CHAT_READ_WRITE_INTERVAL_MS, CHAT_READ_WRITE_MAX_WAIT_MS, CHAT_LIVE_PING_INTERVAL_MS, CHAT_LIVE_SWEEP_INTERVAL_MS, CHAT_LIVE_STALE_AFTER_MS, LIVE_RECONNECT_MIN_MS = 500, LIVE_RECONNECT_MAX_MS, LIVE_RECONNECT_STABLE_MS, LIVE_READY_TIMEOUT_MS, CHAT_LIVE_TYPING_IDLE_MS, CHAT_LIVE_TYPING_RENEW_MS, CHAT_LIVE_COMPOSITION_HANDOFF_MS, CHAT_LIVE_READ_SEND_INTERVAL_MS = 120, CHAT_LIVE_READ_SEND_MAX_WAIT_MS = 500, CHAT_LIVE_READ_WRITE_INTERVAL_MS, CHAT_LIVE_READ_WRITE_MAX_WAIT_MS, CHAT_SEND_QUEUE_RATE_LIMIT_COUNT = 12, CHAT_SEND_QUEUE_RATE_LIMIT_WINDOW_MS, CHAT_SETTINGS_BODY_MAX_BYTES, CHAT_TITLE_STATE_MAX_CHARS = 128, CHAT_MANIFEST_MAX_BYTES, CHAT_RECEIPT_MAX_MEMBERS = 32, CHAT_ORDINARY_DELIVERY_MAX_MEMBERS = 128, CHAT_MAX_MEMBERS = 256, CHAT_LARGE_GROUP_MENTION_MAX_TARGETS = 16, CHAT_MAX_TEXT_CHARS = 2048, CHAT_TITLE_INPUT_MAX_CHARS = 16, CHAT_MAX_REACTIONS, SEARCH_DEBOUNCE_MS = 300, SEARCH_USERNAME_LIMIT = 15, SEARCH_ROLE_LIMIT = 15, RECENT_PEER_REFRESH_LIMIT = 50, RECENT_PEER_REFRESH_DELAY_MS = 250, RECENT_PEER_REFRESH_THROTTLE_MS = 120, BAN_REFRESH_GRACE_MS = 50, REQUEST_MONEY_MAX_SATS, WALLET_TRANSFER_POLL_MS, WALLET_TRANSFER_REPAIR_MS, WALLET_CACHE_HYDRATE_DELAY_MS = 0, WALLET_BOOT_REFRESH_DELAY_MS = 500, WALLET_BOOT_CACHED_REFRESH_DELAY_MS = 2500, WALLET_REGTEST_DEPOSIT_CLAIM_POLL_MS, WALLET_MAINNET_DEPOSIT_CLAIM_POLL_MS, WALLET_BALANCE_EVENT_COALESCE_MS = 100, WALLET_INCOMING_UPDATE_COALESCE_MS = 250, WALLET_AUTO_CLAIM_MAX_FEE_SATS = 5000, WALLET_CLAIM_PAGE_SIZE = 100, WALLET_PENDING_TRANSFER_CLAIM_BATCH_SIZE = 50, WALLET_PENDING_TRANSFER_STATUS_BATCH_SIZE = 2, WALLET_PENDING_TRANSFER_COLD_REFRESH_BATCH_SIZE = 50, WALLET_PENDING_TRANSFER_COLD_REFRESH_INTERVAL_MS, WALLET_PENDING_TRANSFER_ADAPTIVE_BATCH_SMALL_QUEUE = 3, WALLET_PENDING_TRANSFER_ADAPTIVE_BATCH_LARGE_QUEUE = 10, WALLET_PENDING_TRANSFER_ADAPTIVE_BATCH_SMALL_SIZE = 2, WALLET_PENDING_TRANSFER_ADAPTIVE_BATCH_LARGE_SIZE = 3, WALLET_PENDING_TRANSFER_SLOW_CLAIM_MS, WALLET_PENDING_TRANSFER_CLAIM_COOLDOWN_MS, WALLET_SDK_BACKGROUND_QUIET_MS, WALLET_RECENT_TRANSFER_LIMIT = 100, WALLET_TRANSFER_PAGE_LIMIT = 100, WALLET_TOKEN_HISTORY_PAGE_SIZE = 50, WALLET_TRANSFER_FETCH_THROTTLE_MS = 150, WALLET_PENDING_TRANSFER_CLAIM_RETRY_MS, WALLET_SENT_TRANSFER_REFRESH_DELAY_MS, WALLET_PENDING_TRANSFER_BOOT_GRACE_MS, WALLET_PENDING_TRANSFER_HOT_AGE_MS, WALLET_PENDING_TRANSFER_WARM_AGE_MS, WALLET_PENDING_TRANSFER_WARM_RETRY_MS, WALLET_PENDING_TRANSFER_STALE_RETRY_MS, WALLET_PENDING_TRANSFER_STUCK_RETRY_MS, WALLET_PENDING_TRANSFER_DORMANT_RETRY_MS, WALLET_TRANSFER_CACHE_WRITE_DELAY_MS, BITCOIN_POLL_MS = 60000, BITCOIN_FETCH_TIMEOUT_MS = 8000, BITCOIN_FEES_MAX_AGE_MS;
+var MS_PER_SECOND = 1000, MINUTE_MS, HOUR_MS, DAY_MS, KIB_BYTES = 1024, MIB_BYTES, SATS_PER_BITCOIN = 100000000n, USERNAME_MAX_CHARS = 12, PASSWORD_MIN_CHARS = 15, PASSWORD_MAX_CHARS = 64, PASSWORD_MAX_BYTES, ACCOUNT_CONNECTION_SLOW_MS, ACCOUNT_CONNECTION_UNAVAILABLE_MS, ACCOUNT_CONNECTION_RETRY_MIN_MS, ACCOUNT_CONNECTION_RETRY_MAX_MS, TICKET_MESSAGE_LIMIT = 4000, TICKET_ATTACHMENT_LIMIT = 3, TICKET_ATTACHMENT_MAX_BYTES, AUTOLOCK_MIN_MINUTES = 1, AUTOLOCK_MAX_MINUTES = 60, BTC_PRICE_FALLBACK = 80000, CHAT_MESSAGE_EDIT_WINDOW_MS, CHAT_SEND_CONNECTION_WAIT_MS, CALL_SPEAKING_THRESHOLD = 0.02, CALL_SPEAKING_HOLD_MS = 320, LOCAL_CACHE_WRITE_DELAY_MS = 350, WEB_LAYOUT_SAVE_DELAY_MS, WEB_CHAT_LAYOUT_LIMIT = 32, LOCAL_MEDIA_CACHE_MAX_BYTES, LOCAL_MEDIA_CACHE_MAX_ITEMS = 1000, LOCAL_MEDIA_ACCESS_TOUCH_MIN_MS, LOCAL_PROFILE_CACHE_MAX_ITEMS = 500, LOCAL_PROFILE_CACHE_MAX_AGE_MS, LOCAL_CHAT_CACHE_MAX_ITEMS = 1000, LOCAL_CHAT_MESSAGE_CACHE_MAX_VISIBLE = 1000, LOCAL_CHAT_MESSAGE_CACHE_WRITE_DELAY_MS = 2500, LOCAL_AVATAR_CACHE_MAX_BYTES, LOCAL_AVATAR_CACHE_MAX_AGE_MS, AVATAR_IMAGE_MAX_BYTES, AVATAR_IMAGE_QUALITY_ATTEMPTS, CHAT_AVATAR_IMAGE_MAX_BYTES, CHAT_AVATAR_REF_MAX_CHARS = 256, CHAT_MESSAGE_FILE_CACHE_MAX_BYTES, IDLE_CALLBACK_MIN_TIMEOUT_MS = 50, ATTACHMENT_CACHE_IDLE_TIMEOUT_MS = 2500, ATTACHMENT_CACHE_FALLBACK_DELAY_MS = 250, CHAT_UNSAVED_TTL_DAYS = 21, CHAT_UNSAVED_TTL_MS, CHAT_AFTER_SEEN_MS, CHAT_MEDIA_TTL_DAYS, CHAT_MEDIA_TTL_MS, CHAT_UPLOAD_MAX_BYTES, CHAT_AUDIO_TRANSCODE_BITRATE_BPS = 128000, CHAT_VIDEO_TRANSCODE_VIDEO_BITRATE_BPS = 3000000, CHAT_VIDEO_TRANSCODE_AUDIO_BITRATE_BPS, CHAT_MESSAGE_BATCH_SIZE = 40, CHAT_MESSAGE_QUERY_MAX_DOCS = 120, CHAT_MESSAGE_MUTATION_MAX_ITEMS = 256, CHAT_TTL_CLIENT_DELETE_GRACE_MS, CHAT_BATCH_CLEANUP_IDLE_TIMEOUT_MS = 1500, CHAT_BATCH_CLEANUP_IDLE_DELAY_MS = 250, CHAT_LIST_PAGE_SIZE = 20, CHAT_ADMISSION_CACHE_PEERS = 1024, CHAT_LIST_LIVE_COUNT, CHAT_INBOX_PING_PAGE_SIZE = 25, CHAT_INBOX_DISCOVERY_PARALLEL_CHATS, CHAT_INBOX_SETTLEMENT_PARALLEL_CHATS = 4, CHAT_INBOX_CURSOR_OVERLAP_MS, CHAT_LIST_CACHE_WRITE_DELAY_MS = 1500, CHAT_LIST_SNAPSHOT_COALESCE_MS = 80, CHAT_LIST_COMPLETE_SYNC_DELAY_MS = 250, CHAT_LIST_LISTENER_RETRY_MS = 1000, CHAT_TOP_WARM_COUNT = 0, CHAT_EAGER_WARM_COUNT = 0, CHAT_WARM_DELAY_MS = 3000, CHAT_WARM_BATCH_SIZE, CHAT_MESSAGE_VIEW_CACHE_SIZE = 30, CHAT_MEDIA_WARM_MESSAGES_PER_CHAT, CHAT_MEDIA_WARM_START_DELAY_MS = 600, CHAT_MEDIA_WARM_STEP_DELAY_MS = 120, CHAT_MEDIA_WARM_TYPES, CHAT_MEDIA_WARM_MAX_BYTES = 0, CHAT_READ_WRITE_INTERVAL_MS, CHAT_READ_WRITE_MAX_WAIT_MS, CHAT_LIVE_PING_INTERVAL_MS, CHAT_LIVE_SWEEP_INTERVAL_MS, CHAT_LIVE_STALE_AFTER_MS, LIVE_RECONNECT_MIN_MS = 500, LIVE_RECONNECT_MAX_MS, LIVE_RECONNECT_STABLE_MS, LIVE_READY_TIMEOUT_MS, CHAT_LIVE_TYPING_IDLE_MS, CHAT_LIVE_TYPING_RENEW_MS, CHAT_LIVE_COMPOSITION_HANDOFF_MS, CHAT_LIVE_READ_SEND_INTERVAL_MS = 120, CHAT_LIVE_READ_SEND_MAX_WAIT_MS = 500, CHAT_LIVE_READ_WRITE_INTERVAL_MS, CHAT_LIVE_READ_WRITE_MAX_WAIT_MS, CHAT_SEND_QUEUE_RATE_LIMIT_COUNT = 12, CHAT_SEND_QUEUE_RATE_LIMIT_WINDOW_MS, CHAT_SETTINGS_BODY_MAX_BYTES, CHAT_TITLE_STATE_MAX_CHARS = 128, CHAT_MANIFEST_MAX_BYTES, CHAT_RECEIPT_MAX_MEMBERS = 32, CHAT_ORDINARY_DELIVERY_MAX_MEMBERS = 128, CHAT_MAX_MEMBERS = 256, CHAT_LARGE_GROUP_MENTION_MAX_TARGETS = 16, CHAT_MAX_TEXT_CHARS = 2048, CHAT_TITLE_INPUT_MAX_CHARS = 16, CHAT_MAX_REACTIONS, SEARCH_DEBOUNCE_MS = 300, SEARCH_USERNAME_LIMIT = 15, SEARCH_ROLE_LIMIT = 15, RECENT_PEER_REFRESH_LIMIT = 50, RECENT_PEER_REFRESH_DELAY_MS = 250, RECENT_PEER_REFRESH_THROTTLE_MS = 120, BAN_REFRESH_GRACE_MS = 50, REQUEST_MONEY_MAX_SATS, WALLET_TRANSFER_POLL_MS, WALLET_TRANSFER_REPAIR_MS, WALLET_CACHE_HYDRATE_DELAY_MS = 0, WALLET_BOOT_REFRESH_DELAY_MS = 500, WALLET_BOOT_CACHED_REFRESH_DELAY_MS = 2500, WALLET_REGTEST_DEPOSIT_CLAIM_POLL_MS, WALLET_MAINNET_DEPOSIT_CLAIM_POLL_MS, WALLET_BALANCE_EVENT_COALESCE_MS = 100, WALLET_INCOMING_UPDATE_COALESCE_MS = 250, WALLET_AUTO_CLAIM_MAX_FEE_SATS = 5000, WALLET_CLAIM_PAGE_SIZE = 100, WALLET_PENDING_TRANSFER_CLAIM_BATCH_SIZE = 50, WALLET_PENDING_TRANSFER_STATUS_BATCH_SIZE = 2, WALLET_PENDING_TRANSFER_COLD_REFRESH_BATCH_SIZE = 50, WALLET_PENDING_TRANSFER_COLD_REFRESH_INTERVAL_MS, WALLET_PENDING_TRANSFER_ADAPTIVE_BATCH_SMALL_QUEUE = 3, WALLET_PENDING_TRANSFER_ADAPTIVE_BATCH_LARGE_QUEUE = 10, WALLET_PENDING_TRANSFER_ADAPTIVE_BATCH_SMALL_SIZE = 2, WALLET_PENDING_TRANSFER_ADAPTIVE_BATCH_LARGE_SIZE = 3, WALLET_PENDING_TRANSFER_SLOW_CLAIM_MS, WALLET_PENDING_TRANSFER_CLAIM_COOLDOWN_MS, WALLET_SDK_BACKGROUND_QUIET_MS, WALLET_RECENT_TRANSFER_LIMIT = 100, WALLET_TRANSFER_PAGE_LIMIT = 100, WALLET_TOKEN_HISTORY_PAGE_SIZE = 50, WALLET_TRANSFER_FETCH_THROTTLE_MS = 150, WALLET_PENDING_TRANSFER_CLAIM_RETRY_MS, WALLET_SENT_TRANSFER_REFRESH_DELAY_MS, WALLET_PENDING_TRANSFER_BOOT_GRACE_MS, WALLET_PENDING_TRANSFER_HOT_AGE_MS, WALLET_PENDING_TRANSFER_WARM_AGE_MS, WALLET_PENDING_TRANSFER_WARM_RETRY_MS, WALLET_PENDING_TRANSFER_STALE_RETRY_MS, WALLET_PENDING_TRANSFER_STUCK_RETRY_MS, WALLET_PENDING_TRANSFER_DORMANT_RETRY_MS, WALLET_TRANSFER_CACHE_WRITE_DELAY_MS, BITCOIN_POLL_MS = 60000, BITCOIN_FETCH_TIMEOUT_MS = 8000, BITCOIN_FEES_MAX_AGE_MS, CALL_MAX_VIDEO_SOURCES = 4, CALL_MAX_VIDEO_SOURCES_PER_PARTICIPANT = 1;
 var init_config = __esm(() => {
   MINUTE_MS = 60 * MS_PER_SECOND;
   HOUR_MS = 60 * MINUTE_MS;
@@ -6126,150 +6126,6 @@ function sameText(left, right) {
   return lowerText(left) === lowerText(right);
 }
 
-// ../../core/utils/time.js
-function timestampMs(value, fallback = null, options = {}) {
-  let ms = null;
-  if (typeof value?.toMillis === "function") {
-    ms = value.toMillis();
-  } else if (value instanceof Date) {
-    ms = value.getTime();
-  } else if (typeof value?.seconds === "number") {
-    ms = value.seconds * 1000 + Math.floor((value.nanoseconds || 0) / 1e6);
-  } else if (typeof value?._seconds === "number") {
-    ms = value._seconds * 1000 + Math.floor((value._nanoseconds || 0) / 1e6);
-  } else if (Number.isFinite(value)) {
-    ms = value;
-  } else if (options.parseString && typeof value === "string") {
-    const numberMs = Number(value);
-    ms = Number.isFinite(numberMs) ? numberMs : Date.parse(value);
-  }
-  if (!Number.isFinite(ms) || options.positive && ms <= 0) {
-    return fallback;
-  }
-  return ms;
-}
-function timestampKey(value) {
-  if (value == null) {
-    return null;
-  }
-  return timestampMs(value, null) ?? String(value);
-}
-function makeTimestamp(ms) {
-  return {
-    toMillis() {
-      return ms;
-    },
-    toDate() {
-      return new Date(ms);
-    }
-  };
-}
-function twoDigits(value) {
-  return String(value).padStart(2, "0");
-}
-function dayKey(date) {
-  return `${date.getFullYear()}-${twoDigits(date.getMonth() + 1)}-${twoDigits(date.getDate())}`;
-}
-function localDayKey(value) {
-  const ms = timestampMs(value, null, { parseString: true });
-  if (!Number.isFinite(ms))
-    return "";
-  return dayKey(new Date(ms));
-}
-function hourKey(dateOrHour) {
-  const hour = dateOrHour instanceof Date ? dateOrHour.getHours() : dateOrHour;
-  return twoDigits(hour);
-}
-function dayHourKey(date) {
-  return `${dayKey(date)}-${hourKey(date)}`;
-}
-function nextLocalDayStartMs(ms) {
-  const date = new Date(ms);
-  date.setDate(date.getDate() + 1);
-  date.setHours(0, 0, 0, 0);
-  return date.getTime();
-}
-function nextRowDateTimeRefreshMs(value, now = Date.now()) {
-  const ms = timestampMs(value, null, { parseString: true });
-  const nowMs2 = timestampMs(now, Date.now(), { parseString: true });
-  if (!Number.isFinite(ms) || !Number.isFinite(nowMs2))
-    return null;
-  const age = nowMs2 - ms;
-  if (age < -MINUTE_MS2)
-    return ms - MINUTE_MS2;
-  if (age < MINUTE_MS2)
-    return ms + MINUTE_MS2;
-  if (age < HOUR_MS2)
-    return ms + (Math.floor(age / MINUTE_MS2) + 1) * MINUTE_MS2;
-  if (localDayKey(ms) === localDayKey(nowMs2))
-    return nextLocalDayStartMs(nowMs2);
-  return null;
-}
-function nextRelativeTimeRefreshMs(value, now = Date.now()) {
-  const ms = timestampMs(value, null, { parseString: true });
-  const nowMs2 = timestampMs(now, Date.now(), { parseString: true });
-  if (!Number.isFinite(ms) || !Number.isFinite(nowMs2))
-    return null;
-  const age = Math.max(0, nowMs2 - ms);
-  if (age < 30000)
-    return ms + 30000;
-  if (age < 60 * 60000)
-    return ms + (Math.floor(age / 60000) + 1) * 60000;
-  if (age < 24 * 60 * 60000)
-    return ms + (Math.floor(age / (60 * 60000)) + 1) * 60 * 60000;
-  return ms + (Math.floor(age / (24 * 60 * 60000)) + 1) * 24 * 60 * 60000;
-}
-var MINUTE_MS2 = 60000, HOUR_MS2;
-var init_time = __esm(() => {
-  HOUR_MS2 = 60 * MINUTE_MS2;
-});
-
-// ../../core/chat/state.js
-function makeCid() {
-  return `${Date.now().toString(36)}${toHex(randomBytes3(3))}`;
-}
-function getMessageKey(message) {
-  return message?.cid || message?.id || null;
-}
-function getCidMs(cid) {
-  if (typeof cid !== "string" || !/^[0-9a-z]+[0-9a-f]{6}$/u.test(cid)) {
-    return null;
-  }
-  const base = cid.slice(0, -6);
-  const ms = Number.parseInt(base, 36);
-  return Number.isSafeInteger(ms) && ms > 0 ? ms : null;
-}
-function getMessageOrderMs(message) {
-  return getCidMs(message?.cid) ?? timestampMs(message?.ts, Infinity);
-}
-function sortMessages(messages) {
-  return [...messages].sort((a, b) => {
-    const aMs = getMessageOrderMs(a);
-    const bMs = getMessageOrderMs(b);
-    if (aMs !== bMs) {
-      return aMs - bMs;
-    }
-    return String(a?.id || "").localeCompare(String(b?.id || ""));
-  });
-}
-function mergeMessages(...groups) {
-  const merged = new Map;
-  for (const group of groups) {
-    for (const message of group || []) {
-      const key = getMessageKey(message);
-      if (!key) {
-        continue;
-      }
-      merged.set(key, message);
-    }
-  }
-  return sortMessages([...merged.values()]);
-}
-var init_state = __esm(() => {
-  init_core();
-  init_time();
-});
-
 // ../../core/chat/messages/call.js
 function readCallMessage(message) {
   if (message?.t !== CALL_MSG_TYPE || typeof message.callId !== "string" || !/^[0-9a-f]{64}$/u.test(message.callId) || !["started", "ended"].includes(message.event))
@@ -6286,17 +6142,7 @@ function callMessageText(message) {
   const call = readCallMessage(message);
   return call ? `call ${call.event}` : "";
 }
-function latestCallStartKey(messages) {
-  for (let index = messages.length - 1;index >= 0; index -= 1) {
-    if (readCallMessage(messages[index])?.event === "started")
-      return getMessageKey(messages[index]);
-  }
-  return "";
-}
 var CALL_MSG_TYPE = "call";
-var init_call = __esm(() => {
-  init_state();
-});
 
 // ../../core/chat/messages/types.js
 var ATTACHMENT_MSG_TYPES, MAX_TXT_CHARS, REACTION_MSG_TYPE = "rxn", DELETE_MSG_TYPE = "del", SYSTEM_MSG_TYPE = "sys", EPOCH_TRANSITION_MSG_TYPE = "epoch", EPOCH_PROPOSAL_MSG_TYPE = "epoch_proposal", SYSTEM_SETTINGS_KIND = "settings", DEFAULT_REACTION_EMOJI = "❤️", MAX_REACTIONS, HOLD_VISIBLE_KEY = "__holdVisible", SOURCE_GONE_VISIBLE_KEY = "__sourceGoneVisible";
@@ -6547,7 +6393,6 @@ var init_notifications = __esm(() => {
   init_seed();
   init_sign();
   init_config();
-  init_call();
   init_types();
   "use client";
   CHAT_NOTIFICATION_MODES = Object.freeze({
@@ -6857,6 +6702,7 @@ var init_origins = __esm(() => {
     root: ROOT_DOMAIN,
     rootDev: `dev.${ROOT_DOMAIN}`,
     veyl: `veyl.${ROOT_DOMAIN}`,
+    veylOpen: `open.veyl.${ROOT_DOMAIN}`,
     veylDev: `dev.veyl.${ROOT_DOMAIN}`,
     live: `live.veyl.${ROOT_DOMAIN}`,
     liveDev: `live.dev.veyl.${ROOT_DOMAIN}`,
@@ -6868,6 +6714,7 @@ var init_origins = __esm(() => {
     root: `https://${domains.root}`,
     rootDev: `https://${domains.rootDev}`,
     veyl: `https://${domains.veyl}`,
+    veylOpen: `https://${domains.veylOpen}`,
     veylDev: `https://${domains.veylDev}`,
     veylDevWeb: getVeylDevWebOrigin(VEYL_DEV_WEB_PORT_MIN)
   });
@@ -6882,7 +6729,8 @@ var init_origins = __esm(() => {
   ]);
   appLinkDomains = Object.freeze([
     domains.veyl,
-    domains.veylDev
+    domains.veylDev,
+    domains.veylOpen
   ]);
 });
 
@@ -7011,9 +6859,6 @@ function normalizeSettings(settings, base = defaultSettings) {
   if (!MONEY_FORMATS.includes(next.moneyFormat)) {
     throw new SettingsValidationError("money-format", "bad moneyFormat");
   }
-  if (!WEB_LAYOUTS.includes(next.webLayout)) {
-    throw new SettingsValidationError("web-layout", "bad webLayout");
-  }
   if (typeof next.glass !== "boolean") {
     throw new SettingsValidationError("glass", "glass must be boolean");
   }
@@ -7035,7 +6880,7 @@ function normalizeSettings(settings, base = defaultSettings) {
   if (next.faceID !== null && typeof next.faceID !== "boolean") {
     throw new SettingsValidationError("face-id", "faceID must be boolean or null");
   }
-  return next;
+  return Object.fromEntries(Object.keys(defaultSettings).map((key) => [key, next[key]]));
 }
 function normalizeCallAudio(patch, base = defaultSettings.callAudio) {
   if (patch !== undefined && (!patch || typeof patch !== "object" || Array.isArray(patch)))
@@ -7063,12 +6908,11 @@ function normalizePeerAudio(patch, base = {}) {
   }
   return Object.fromEntries(entries);
 }
-var SEND_ON_SCAN_ENABLED = false, WEB_LAYOUTS, WEB_SIDEBAR_WIDTH, DEFAULT_WEB_CHAT_LAYOUT, WALLET_NETWORKS, SettingsValidationError, defaultSettings;
+var SEND_ON_SCAN_ENABLED = false, WEB_SIDEBAR_WIDTH, DEFAULT_WEB_CHAT_LAYOUT, WALLET_NETWORKS, SettingsValidationError, defaultSettings;
 var init_settings = __esm(() => {
   init_config();
   init_money();
   init_network();
-  WEB_LAYOUTS = ["floating", "sidebar"];
   WEB_SIDEBAR_WIDTH = { default: 320, min: 64, max: 480 };
   DEFAULT_WEB_CHAT_LAYOUT = Object.freeze({ open: null, width: null });
   WALLET_NETWORKS = new Set([MAINNET_NETWORK, REGTEST_NETWORK]);
@@ -7080,7 +6924,6 @@ var init_settings = __esm(() => {
   };
   defaultSettings = {
     glass: true,
-    webLayout: "floating",
     sidebarWidth: WEB_SIDEBAR_WIDTH.default,
     walletChartHeight: null,
     webChatLayouts: [],
@@ -8495,15 +8338,13 @@ async function bootWallet(walletMnemonic, user, {
     decodeSparkAddress,
     network
   });
-  const initializeWallet = WalletClass.getOrCreateWallet || WalletClass.initialize;
   try {
     let wallet;
     const sparkStartedAt = Date.now();
     markDiag(diag, "vault.bootWallet.spark.start", {});
-    ({ wallet } = await initializeWallet.call(WalletClass, {
+    ({ wallet } = await WalletClass.initialize({
       mnemonicOrSeed: walletMnemonic,
       accountNumber,
-      forceReinit: true,
       options: {
         log: false,
         network,
@@ -8928,7 +8769,14 @@ async function openVaultAccountSession(vault, password, options = {}) {
         return Promise.reject(new Error("account session closed"));
       if (connecting)
         return connecting;
+      let releaseBoot;
       connecting = (async () => {
+        const walletStartedAt = Date.now();
+        mark(diag, "vault.unlock.wallet.start", { source });
+        const boot = startWalletBoot(bootWallet2, mnemonicFromWalletEntropy(sessionWalletEntropy), currentUser, { network, diag });
+        walletBoot = boot;
+        releaseBoot = session.own(boot);
+        boot.result.catch(() => {});
         const authStartedAt = Date.now();
         mark(diag, "vault.unlock.session.start", { source });
         await cloud.auth.user.getIdToken(true);
@@ -8962,11 +8810,6 @@ async function openVaultAccountSession(vault, password, options = {}) {
           requireCurrent(isCurrent);
           chatIdentitiesRegistered = true;
         }
-        const walletStartedAt = Date.now();
-        mark(diag, "vault.unlock.wallet.start", { source });
-        const boot = startWalletBoot(bootWallet2, mnemonicFromWalletEntropy(sessionWalletEntropy), currentUser, { network, diag });
-        walletBoot = boot;
-        const releaseBoot = session.own(boot);
         const walletReady = boot.result.then(async (walletIdentity) => {
           if (session.closed)
             throw new Error("account session closed");
@@ -8998,6 +8841,7 @@ async function openVaultAccountSession(vault, password, options = {}) {
         walletReady.catch(() => {});
         return { walletReady };
       })().catch((error) => {
+        releaseBoot?.();
         connecting = null;
         throw error;
       });
@@ -9061,6 +8905,104 @@ var init_agreement = __esm(() => {
   TERMS_VERSION_PATTERN = /^\d{4}-\d{2}-\d{2}(?:\.\d+)?$/u;
 });
 
+// ../../core/utils/time.js
+function timestampMs(value, fallback = null, options = {}) {
+  let ms = null;
+  if (typeof value?.toMillis === "function") {
+    ms = value.toMillis();
+  } else if (value instanceof Date) {
+    ms = value.getTime();
+  } else if (typeof value?.seconds === "number") {
+    ms = value.seconds * 1000 + Math.floor((value.nanoseconds || 0) / 1e6);
+  } else if (typeof value?._seconds === "number") {
+    ms = value._seconds * 1000 + Math.floor((value._nanoseconds || 0) / 1e6);
+  } else if (Number.isFinite(value)) {
+    ms = value;
+  } else if (options.parseString && typeof value === "string") {
+    const numberMs = Number(value);
+    ms = Number.isFinite(numberMs) ? numberMs : Date.parse(value);
+  }
+  if (!Number.isFinite(ms) || options.positive && ms <= 0) {
+    return fallback;
+  }
+  return ms;
+}
+function timestampKey(value) {
+  if (value == null) {
+    return null;
+  }
+  return timestampMs(value, null) ?? String(value);
+}
+function makeTimestamp(ms) {
+  return {
+    toMillis() {
+      return ms;
+    },
+    toDate() {
+      return new Date(ms);
+    }
+  };
+}
+function twoDigits(value) {
+  return String(value).padStart(2, "0");
+}
+function dayKey(date) {
+  return `${date.getFullYear()}-${twoDigits(date.getMonth() + 1)}-${twoDigits(date.getDate())}`;
+}
+function localDayKey(value) {
+  const ms = timestampMs(value, null, { parseString: true });
+  if (!Number.isFinite(ms))
+    return "";
+  return dayKey(new Date(ms));
+}
+function hourKey(dateOrHour) {
+  const hour = dateOrHour instanceof Date ? dateOrHour.getHours() : dateOrHour;
+  return twoDigits(hour);
+}
+function dayHourKey(date) {
+  return `${dayKey(date)}-${hourKey(date)}`;
+}
+function nextLocalDayStartMs(ms) {
+  const date = new Date(ms);
+  date.setDate(date.getDate() + 1);
+  date.setHours(0, 0, 0, 0);
+  return date.getTime();
+}
+function nextRowDateTimeRefreshMs(value, now = Date.now()) {
+  const ms = timestampMs(value, null, { parseString: true });
+  const nowMs2 = timestampMs(now, Date.now(), { parseString: true });
+  if (!Number.isFinite(ms) || !Number.isFinite(nowMs2))
+    return null;
+  const age = nowMs2 - ms;
+  if (age < -MINUTE_MS2)
+    return ms - MINUTE_MS2;
+  if (age < MINUTE_MS2)
+    return ms + MINUTE_MS2;
+  if (age < HOUR_MS2)
+    return ms + (Math.floor(age / MINUTE_MS2) + 1) * MINUTE_MS2;
+  if (localDayKey(ms) === localDayKey(nowMs2))
+    return nextLocalDayStartMs(nowMs2);
+  return null;
+}
+function nextRelativeTimeRefreshMs(value, now = Date.now()) {
+  const ms = timestampMs(value, null, { parseString: true });
+  const nowMs2 = timestampMs(now, Date.now(), { parseString: true });
+  if (!Number.isFinite(ms) || !Number.isFinite(nowMs2))
+    return null;
+  const age = Math.max(0, nowMs2 - ms);
+  if (age < 30000)
+    return ms + 30000;
+  if (age < 60 * 60000)
+    return ms + (Math.floor(age / 60000) + 1) * 60000;
+  if (age < 24 * 60 * 60000)
+    return ms + (Math.floor(age / (60 * 60000)) + 1) * 60 * 60000;
+  return ms + (Math.floor(age / (24 * 60 * 60000)) + 1) * 24 * 60 * 60000;
+}
+var MINUTE_MS2 = 60000, HOUR_MS2;
+var init_time = __esm(() => {
+  HOUR_MS2 = 60 * MINUTE_MS2;
+});
+
 // ../../core/moderation.js
 function banUntilMs(ban) {
   if (!ban || typeof ban !== "object" || Array.isArray(ban) || ban.until == null) {
@@ -9597,6 +9539,7 @@ function createUser({ cloud, network, avatarCache = null, diag = null, onSession
   let avatarPreview;
   let blockedSource = state.blocked;
   let blockedSet = new Set(blockedSource);
+  const blockedChanges = new Map;
   let banTimer = null;
   let unsubscribeAuth = NOOP;
   let userWatches = [];
@@ -9610,11 +9553,27 @@ function createUser({ cloud, network, avatarCache = null, diag = null, onSession
   function makeSnapshot() {
     const bans = banState(state.banned);
     const userBan = bans.full || bans.chat;
+    const visibleBlocked = new Set(state.blocked);
+    const blockedPending = [];
+    for (const [uid, change] of blockedChanges) {
+      if (change.blocked)
+        visibleBlocked.add(uid);
+      else
+        visibleBlocked.delete(uid);
+      if (!change.written)
+        blockedPending.push(uid);
+    }
+    if (visibleBlocked.size !== blockedSet.size || [...visibleBlocked].some((uid) => !blockedSet.has(uid))) {
+      blockedSet = visibleBlocked;
+    }
+    const blocked = snapshot?.blocked && snapshot.blocked.length === blockedSet.size && snapshot.blocked.every((uid) => blockedSet.has(uid)) ? snapshot.blocked : [...blockedSet];
     return {
       ...state,
       avatar: avatarPreview === undefined ? state.avatar : avatarPreview,
       network: activeNetwork,
       blockedSet,
+      blocked,
+      blockedPending: snapshot?.blockedPending && snapshot.blockedPending.length === blockedPending.length && snapshot.blockedPending.every((uid, index) => uid === blockedPending[index]) ? snapshot.blockedPending : blockedPending,
       chatBanned: bans.chatBanned,
       avatarBanned: bans.avatarBanned,
       chatBanUntil: userBan?.until ?? null,
@@ -9898,6 +9857,7 @@ function createUser({ cloud, network, avatarCache = null, diag = null, onSession
     const authStartedAt = Date.now();
     const session = authSession + 1;
     authSession = session;
+    blockedChanges.clear();
     closeUserWatches();
     markDiag(diag, "user.auth.state", { signedIn: !!authUser });
     if (!authUser) {
@@ -9997,6 +9957,20 @@ function createUser({ cloud, network, avatarCache = null, diag = null, onSession
       setState((user) => ({ ...user, banned: null }));
     })));
     userWatches.push(cloud.user.blocked.watch(authUser.uid, current((blocked, info = {}) => {
+      if (info.pending || info.fromCache && state.blockedReady)
+        return;
+      const confirmed = new Set(blocked);
+      for (const [uid, change] of blockedChanges) {
+        if (!change.written)
+          continue;
+        if (!info.fromCache && confirmed.has(uid) === change.blocked)
+          blockedChanges.delete(uid);
+        else if (state.blocked.includes(uid))
+          confirmed.add(uid);
+        else
+          confirmed.delete(uid);
+      }
+      blocked = [...confirmed];
       setState((user) => {
         const blockedReady = user.blockedReady || !info.fromCache;
         if (user.blockedReady === blockedReady && user.blocked.length === blocked.length && user.blocked.every((id, index) => id === blocked[index])) {
@@ -10072,6 +10046,7 @@ function createUser({ cloud, network, avatarCache = null, diag = null, onSession
     if (!started)
       return;
     authSession += 1;
+    blockedChanges.clear();
     closeUserWatches();
     unsubscribeAuth();
     setState((user) => ({ ...user, authError: null, authSessionError: null, profileError: null, settingsError: null }));
@@ -10093,6 +10068,7 @@ function createUser({ cloud, network, avatarCache = null, diag = null, onSession
     agreementStored = null;
     agreementOverride = null;
     agreementAcceptance = null;
+    blockedChanges.clear();
     userUid = null;
     avatarFetch = { uid: null, key: null, promise: null };
     avatarPreview = undefined;
@@ -10101,25 +10077,63 @@ function createUser({ cloud, network, avatarCache = null, diag = null, onSession
     blockedSet = new Set(blockedSource);
     snapshot = makeSnapshot();
   }
-  function blockPeer(peer) {
+  function changePeerBlock(peer, blocked, { beforeCommit } = {}) {
     const nextPeerUid = peerUid(peer);
     const uid = cloud.auth.user?.uid;
+    const session = authSession;
     if (!uid)
       throw new Error("auth");
     if (!nextPeerUid)
       throw new Error("peer uid required");
-    if (nextPeerUid === uid)
+    if (blocked && nextPeerUid === uid)
       return;
-    return cloud.user.blocked.add(uid, nextPeerUid);
+    const prior = blockedChanges.get(nextPeerUid);
+    if (prior && prior.blocked === blocked)
+      return prior.promise;
+    const current = () => isCurrentUser(uid, session);
+    const assertCurrent = () => {
+      if (!current())
+        throw new Error("account changed during block update");
+    };
+    const change = { blocked, written: false, promise: null };
+    change.promise = Promise.resolve().then(async () => {
+      try {
+        await prior?.promise.catch(NOOP);
+        assertCurrent();
+        await beforeCommit?.();
+        assertCurrent();
+        const result = await cloud.user.blocked[blocked ? "add" : "remove"](uid, nextPeerUid);
+        assertCurrent();
+        change.written = true;
+        if (blockedChanges.get(nextPeerUid) === change && state.blocked.includes(nextPeerUid) === blocked) {
+          blockedChanges.delete(nextPeerUid);
+        }
+        const confirmed = new Set(state.blocked);
+        if (blocked)
+          confirmed.add(nextPeerUid);
+        else
+          confirmed.delete(nextPeerUid);
+        setState((user) => ({ ...user, blocked: [...confirmed] }));
+        return result;
+      } catch (error) {
+        if (current() && blockedChanges.get(nextPeerUid) === change) {
+          blockedChanges.delete(nextPeerUid);
+          if (prior?.written)
+            blockedChanges.set(nextPeerUid, prior);
+          setState(state, true);
+        }
+        throw error;
+      }
+    });
+    blockedChanges.set(nextPeerUid, change);
+    setState(state, true);
+    return change.promise;
   }
-  function unblockPeer(peer) {
-    const nextPeerUid = peerUid(peer);
-    const uid = cloud.auth.user?.uid;
-    if (!uid)
-      throw new Error("auth");
-    if (!nextPeerUid)
-      throw new Error("peer uid required");
-    return cloud.user.blocked.remove(uid, nextPeerUid);
+  function blockPeer(peer, options) {
+    return changePeerBlock(peer, true, options);
+  }
+  function unblockPeer(peer, options) {
+    return changePeerBlock(peer, false, options);
   }
   async function acceptAgreement(requestedAgreement = CURRENT_AGREEMENT) {
     const uid = cloud.auth.user?.uid;
@@ -10333,6 +10347,13 @@ function createUser({ cloud, network, avatarCache = null, diag = null, onSession
     syncAvatar();
     return true;
   }
+  function restoreBlocked({ uid, blocked }) {
+    if (!started || !uid || uid !== state.uid || cloud.auth.user?.uid !== uid)
+      return;
+    if (state.blockedReady || !Array.isArray(blocked))
+      return;
+    setState((user) => ({ ...user, blocked: [...blocked], blockedReady: true }));
+  }
   snapshot = makeSnapshot();
   return {
     getSnapshot() {
@@ -10358,6 +10379,7 @@ function createUser({ cloud, network, avatarCache = null, diag = null, onSession
     previewAvatar,
     confirmAvatar,
     restoreBootstrap,
+    restoreBlocked,
     retry
   };
 }
@@ -22167,6 +22189,52 @@ var init_bootstrap = __esm(() => {
   PROFILE_FIELDS = ["username", "identities", "walletPK", "chatPK", "chatSigningPK", "notificationPK", "chatAdmission", "accountType", "hasAvatarEntry", "avatarVersion"];
 });
 
+// ../../core/chat/state.js
+function makeCid() {
+  return `${Date.now().toString(36)}${toHex(randomBytes3(3))}`;
+}
+function getMessageKey(message) {
+  return message?.cid || message?.id || null;
+}
+function getCidMs(cid) {
+  if (typeof cid !== "string" || !/^[0-9a-z]+[0-9a-f]{6}$/u.test(cid)) {
+    return null;
+  }
+  const base = cid.slice(0, -6);
+  const ms = Number.parseInt(base, 36);
+  return Number.isSafeInteger(ms) && ms > 0 ? ms : null;
+}
+function getMessageOrderMs(message) {
+  return getCidMs(message?.cid) ?? timestampMs(message?.ts, Infinity);
+}
+function sortMessages(messages) {
+  return [...messages].sort((a, b) => {
+    const aMs = getMessageOrderMs(a);
+    const bMs = getMessageOrderMs(b);
+    if (aMs !== bMs) {
+      return aMs - bMs;
+    }
+    return String(a?.id || "").localeCompare(String(b?.id || ""));
+  });
+}
+function mergeMessages(...groups) {
+  const merged = new Map;
+  for (const group of groups) {
+    for (const message of group || []) {
+      const key = getMessageKey(message);
+      if (!key) {
+        continue;
+      }
+      merged.set(key, message);
+    }
+  }
+  return sortMessages([...merged.values()]);
+}
+var init_state = __esm(() => {
+  init_core();
+  init_time();
+});
+
 // ../../core/chat/ids.js
 function isChatMessageForParticipants(message, chatPK, peerChatPK, memberChatPKs = null) {
   const members = Array.isArray(memberChatPKs) ? new Set(memberChatPKs.filter(Boolean)) : null;
@@ -24905,6 +24973,24 @@ async function openStateRecordsWithEvidence(epochState, records) {
     closeStateEpoch(opened);
   }
 }
+async function readChatMemberState(cloud, epochState, actorChatPK) {
+  if (!chatEpochCapabilities(epochState).sharedReceipts)
+    return null;
+  const member = epochState?.manifest?.members?.find((value) => value.chatPK === actorChatPK);
+  if (!member)
+    return null;
+  const opened = openStateEpoch(epochState);
+  try {
+    const slotId = deriveChatMemberStateSlot(opened.epoch, member.chatSigningPK);
+    const record = await cloud.chat.memberState.readSlot(opened.epoch.epochId, slotId);
+    if (!record || !stateRecordActive(record))
+      return null;
+    const state = await openChatMemberState(opened.epoch, record);
+    return state.actor === actorChatPK ? stateRecordProjection(opened.epoch.epochId, record, state) : null;
+  } finally {
+    closeStateEpoch(opened);
+  }
+}
 function watchChatMemberStateEvidence(cloud, epochState, onUpdate, onError) {
   if (!chatEpochCapabilities(epochState).sharedReceipts)
     return () => {};
@@ -26092,8 +26178,6 @@ function cleanChatPayment(message, { requireTx }) {
     } catch {
       return null;
     }
-    if (message.mode || message.transfers?.length !== 1)
-      return null;
   } else if (message.tokenIdentifier != null)
     return null;
   const transfers = cleanChatPaymentTransfers(message?.transfers, { requireTx, token });
@@ -26105,6 +26189,13 @@ function cleanChatPayment(message, { requireTx }) {
   if (transfers.length > 1 && !mode || rawMode && !mode)
     return null;
   const total = transfers.reduce((sum, transfer) => sum + BigInt(transfer.a), 0n);
+  if (token) {
+    try {
+      tokenUnits(total);
+    } catch {
+      return null;
+    }
+  }
   if (!mode && (transfers.length !== 1 || BigInt(transfers[0].a) !== amount))
     return null;
   if (mode === GROUP_SEND_MODES.EACH && transfers.some((transfer) => BigInt(transfer.a) !== amount))
@@ -26130,14 +26221,14 @@ function makeChatPaymentPayload({ amountSats, amountUnits, tokenIdentifier, tran
   if (token) {
     tokenAsset(tokenIdentifier, paymentNetwork);
     tokenUnits(amount);
-    if (mode || transfers.length !== 1)
-      throw new Error("token payments require one direct recipient");
   }
   const rawMode = cleanText(mode);
   const groupMode = GROUP_PAYMENT_MODES.has(rawMode) ? rawMode : null;
   if (transfers.length > 1 && !groupMode || rawMode && !groupMode)
     throw new Error("chat payment mode required");
   const total = transfers.reduce((sum, transfer) => sum + BigInt(transfer.a), 0n);
+  if (token)
+    tokenUnits(total);
   if (!groupMode && (transfers.length !== 1 || BigInt(transfers[0].a) !== amount)) {
     throw new Error("direct payment amount must match its transfer");
   }
@@ -26187,8 +26278,6 @@ function chatPaymentMembersValid(message, payment) {
   if (sender && recipients.includes(sender))
     return false;
   const epochMembers = Array.isArray(message?.epochMemberChatPKs) ? new Set(message.epochMemberChatPKs.map((member) => cleanText(member).toLowerCase()).filter(Boolean)) : null;
-  if (message.tokenIdentifier != null && epochMembers?.size > 2)
-    return false;
   return !epochMembers?.size || recipients.every((recipient) => epochMembers.has(recipient));
 }
 function isChatPayment(message) {
@@ -26796,7 +26885,6 @@ var init_control = __esm(() => {
   init_files2();
   init_text();
   init_tab2();
-  init_call();
   init_request();
   init_types();
   sourceGoneVisibleMessageCache = new WeakMap;
@@ -26912,17 +27000,10 @@ function analyzeMessageExpiry(messages, selfChatPublicKey, _peerChatPublicKey, o
   const heldExpired = [];
   const shorten = [];
   let nextExpiryAt = null;
-  const latestStart = latestCallStartKey(projectedMessages.filter(isServerConfirmedMsg));
-  const endedCalls = new Set(projectedMessages.filter(isServerConfirmedMsg).filter((message) => readCallMessage(message)?.event === "ended").map((message) => message.callId));
   for (const message of projectedMessages) {
     if (!isServerConfirmedMsg(message) || !canShowMsg(message) || message.ttl == null)
       continue;
-    const call = readCallMessage(message);
-    if (call?.event === "started" && getMessageKey(message) === latestStart && (options.activeCallId === undefined && !endedCalls.has(call.callId) || options.activeCallId === call.callId))
-      continue;
-    const readTarget = isPaymentRequest(message) ? message.paymentConfirmation : message;
-    if (!readTarget)
-      continue;
+    const readTarget = isPaymentRequest(message) && message.paymentConfirmation ? message.paymentConfirmation : message;
     const originalSeenAt = allReadersSeenAt(message, members, evidence, options.memberStatesByEpoch);
     const resultSeenAt = readTarget === message ? originalSeenAt : allReadersSeenAt(readTarget, members, evidence, options.memberStatesByEpoch);
     if (originalSeenAt == null || resultSeenAt == null)
@@ -26968,7 +27049,6 @@ var init_expiry = __esm(() => {
   init_control();
   init_receipt();
   init_config();
-  init_call();
   init_request();
 });
 
@@ -27118,7 +27198,6 @@ function sendableMsgPayload(message) {
 var init_compose = __esm(() => {
   init_control();
   init_messagekeys();
-  init_call();
 });
 
 // ../../core/chat/messages/preview.js
@@ -27470,7 +27549,6 @@ var init_preview = __esm(() => {
   init_files2();
   init_text();
   init_request();
-  init_call();
   CHAT_PREVIEW_TEXT = Object.freeze({
     hidden: "",
     fallback: "sent a message",
@@ -27497,7 +27575,6 @@ var init_messages = __esm(() => {
   init_preview();
   init_request();
   init_tab2();
-  init_call();
   "use client";
 });
 
@@ -31159,6 +31236,20 @@ function uniqueValues(items) {
 function sortedUniqueValues(items) {
   return uniqueValues(items).sort();
 }
+function sameArray(a, b) {
+  if (a === b) {
+    return true;
+  }
+  if (!Array.isArray(a) || !Array.isArray(b) || a.length !== b.length) {
+    return false;
+  }
+  for (let index = 0;index < a.length; index += 1) {
+    if (a[index] !== b[index]) {
+      return false;
+    }
+  }
+  return true;
+}
 
 // ../../core/chat/chats.js
 function sameSigningKeys(left, right) {
@@ -32682,7 +32773,8 @@ function writeCachedChats(cache, chats, options = {}) {
       }
     }
     for (const item of items) {
-      byId.set(item.id, item);
+      const previous = reviveChat(payload.chatsById?.[item.id]);
+      byId.set(item.id, previous ? serializeChat(mergeChatActivity(item, previous, options.chatPK)) : item);
     }
     const merged = [...byId.values()];
     const capped = merged.length > LOCAL_CHAT_CACHE_MAX_ITEMS;
@@ -32858,18 +32950,24 @@ function readCachedReadFrontiers(cache, chatId) {
     return [];
   return Object.values(source).map(cleanFrontier2).filter(Boolean);
 }
-function writeCachedReadFrontier(cache, chatId, value) {
+function writeCachedChatRead(cache, chatId, { frontier: value, message, openedAt, chatPK } = {}) {
   const frontier = cleanFrontier2(value);
-  if (!cache?.patch || !chatId || !frontier)
+  if (!cache?.patch || !chatId || !frontier && !message)
     return Promise.resolve(false);
   return cache.patch((payload) => {
-    const chats = payload.pendingReadFrontiersByChat || {};
-    const current = chats[chatId] || {};
-    chats[chatId] = {
-      ...current,
-      [frontier.epochId]: laterFrontier(cleanFrontier2(current[frontier.epochId]), frontier)
-    };
-    payload.pendingReadFrontiersByChat = chats;
+    if (frontier) {
+      const chats = payload.pendingReadFrontiersByChat || {};
+      const current = chats[chatId] || {};
+      chats[chatId] = {
+        ...current,
+        [frontier.epochId]: laterFrontier(cleanFrontier2(current[frontier.epochId]), frontier)
+      };
+      payload.pendingReadFrontiersByChat = chats;
+    }
+    const chat = payload.chatsById?.[chatId];
+    if (chat && message) {
+      [payload.chatsById[chatId]] = markChatsRead([chat], chatId, message, { openedAt, chatPK });
+    }
     return payload;
   }, { flush: true }).then(() => true);
 }
@@ -32894,6 +32992,7 @@ function dropCachedReadFrontier(cache, chatId, value) {
   }, { flush: true }).then(() => true);
 }
 var init_reads = __esm(() => {
+  init_read();
   "use client";
 });
 
@@ -33847,6 +33946,15 @@ function createPendingSendQueue({ diag = null } = {}) {
   const generationRef = { current: 0 };
   const sentAtRef = { current: [] };
   const timerRef = { current: null };
+  let active = true;
+  let scheduleVersion = 0;
+  function clearSchedule() {
+    scheduleVersion += 1;
+    if (timerRef.current !== null)
+      clearTimeout(timerRef.current);
+    timerRef.current = null;
+    scheduledRef.current = false;
+  }
   function nextRateDelay() {
     const now = Date.now();
     const since = now - CHAT_SEND_QUEUE_RATE_LIMIT_WINDOW_MS;
@@ -33888,6 +33996,8 @@ function createPendingSendQueue({ diag = null } = {}) {
     }
   }
   const flush = () => {
+    if (!active)
+      return;
     if (scheduledRef.current || !queueRef.current.length) {
       markDiag(diag, "chat.send.queue.flush.skip", {
         scheduled: !!scheduledRef.current,
@@ -33913,7 +34023,10 @@ function createPendingSendQueue({ diag = null } = {}) {
       running: runningJobsRef.current.size,
       sentWindow: sentAtRef.current.length
     });
+    const version = ++scheduleVersion;
     timerRef.current = setTimeout(() => {
+      if (!active || version !== scheduleVersion)
+        return;
       timerRef.current = null;
       scheduledRef.current = false;
       const nextIndex = nextRunnableJobIndex();
@@ -34008,6 +34121,7 @@ function createPendingSendQueue({ diag = null } = {}) {
   };
   const resetPendingSendQueue = () => {
     generationRef.current += 1;
+    clearSchedule();
     if (queueRef.current.length) {
       const error = new Error("chat reset");
       queueRef.current.forEach((job) => {
@@ -34016,16 +34130,18 @@ function createPendingSendQueue({ diag = null } = {}) {
       });
     }
     queueRef.current = [];
-    scheduledRef.current = false;
     sentAtRef.current = [];
-    if (timerRef.current) {
-      clearTimeout(timerRef.current);
-      timerRef.current = null;
-    }
   };
   return {
     enqueuePendingSendJob,
     resetPendingSendQueue,
+    setActive(value) {
+      active = value === true;
+      clearSchedule();
+      markDiag(diag, "chat.send.queue.activity", { active, queued: queueRef.current.length, running: runningJobsRef.current.size });
+      if (active)
+        flush();
+    },
     close: resetPendingSendQueue
   };
 }
@@ -35736,6 +35852,7 @@ ${cid}` : "";
   };
   return {
     resetSending,
+    setActive: pendingSendQueueRef.current.setActive,
     ackMessages,
     stageMessage: showLocalMessage,
     discardLocalMessage: (chatId, cid) => ackMessages(chatId, [cid], { remove: true }),
@@ -38443,7 +38560,7 @@ function createChatListCache({ getSources, state }) {
     const pending = pendingWrite;
     pendingWrite = null;
     if (pending?.cache && Array.isArray(pending.chats)) {
-      writeCachedChats(pending.cache, pending.chats, { ownerListToken: pending.ownerListToken });
+      writeCachedChats(pending.cache, pending.chats, { ownerListToken: pending.ownerListToken, chatPK: pending.chatPK });
     }
   };
   const queue = (nextChats, options = {}) => {
@@ -38455,6 +38572,7 @@ function createChatListCache({ getSources, state }) {
     const requestedToken = requestedCoverage === CACHE_COVERAGE.COMPLETE ? cleanOwnerListToken(options.ownerListToken) : requestedCoverage === CACHE_COVERAGE.INCOMPLETE ? null : pendingWrite?.ownerListToken;
     pendingWrite = {
       cache: sources.localCache,
+      chatPK: sources.chatPK,
       chats: nextChats,
       ownerListToken: requestedToken
     };
@@ -38481,6 +38599,11 @@ function createChatListCache({ getSources, state }) {
       state.setHasMoreChats(false);
     }
     hydrateReadCache(cachedChats, sources.readCacheRef.current);
+    for (const chatId of Object.keys(cachedPayload?.pendingReadFrontiersByChat || {})) {
+      const at = Math.max(0, ...readCachedReadFrontiers(sources.localCache, chatId).map((frontier) => frontier.at));
+      if (at > (sources.readCacheRef.current.get(chatId) || 0))
+        sources.readCacheRef.current.set(chatId, at);
+    }
     const cachedChatsWithRead = applyReadCache(cachedChats, sources.chatPK, sources.readCacheRef.current);
     if (hasSavedChatSnapshot) {
       const shownCachedChats = hydrateRows(cachedChatsWithRead);
@@ -41315,6 +41438,14 @@ var init_listepoch = __esm(() => {
 });
 
 // ../../core/chat/listindex.js
+function sameRecord(left, right) {
+  if (left === right)
+    return true;
+  if (!left || !right)
+    return false;
+  const keys = Object.keys(left);
+  return keys.length === Object.keys(right).length && keys.every((key) => Object.hasOwn(right, key) && Object.is(left[key], right[key]));
+}
 function ownerRevision(chat) {
   return Number.isSafeInteger(chat?.ownEntry?.ownerRevision) ? chat.ownEntry.ownerRevision : 0;
 }
@@ -41344,11 +41475,26 @@ function activityFromChat(chat) {
     unseen: chat.unseen === true
   };
 }
-function structuralChat(chat) {
+function structuralChat(chat, previous) {
   if (!chat)
     return null;
+  const structure = {};
+  if (previous && previous.epochId === chat.epochId && previous.epochVersion === chat.epochVersion) {
+    for (const key of ["memberChatPKs", "memberUids"]) {
+      if (sameArray(previous[key], chat[key]))
+        structure[key] = previous[key];
+    }
+    for (const key of ["signingKeysByChatKey", "settings"]) {
+      if (sameRecord(previous[key], chat[key]))
+        structure[key] = previous[key];
+    }
+    if (Array.isArray(previous.members) && Array.isArray(chat.members) && previous.members.length === chat.members.length && previous.members.every((member, index) => sameRecord(member, chat.members[index]))) {
+      structure.members = previous.members;
+    }
+  }
   return {
     ...chat,
+    ...structure,
     preview: null,
     readMs: null,
     inboxMessageId: null,
@@ -41412,7 +41558,7 @@ function sourceEntry() {
     presentation: null
   };
 }
-function createChatListIndex({ cache, filterHiddenChats, getSources, isHiddenChatId, state }) {
+function createChatListIndex({ cache, filterHiddenChats, getSources, isHiddenChatId, state, onOwnersChanged }) {
   const entries = new Map;
   const authorityBoundaries = new Map;
   let authorityRevision = 0;
@@ -41533,8 +41679,14 @@ function createChatListIndex({ cache, filterHiddenChats, getSources, isHiddenCha
     const visible = sources.blockedReady ? filterBlockedChats(composedRows()) : [];
     const trimmed = trimExpiredChatPreviews(visible);
     const shown = sources.blockedReady ? sortedChats(filterBlockedChats(setLocalChats(trimmed, sources.localByChatRef.current))) : [];
-    sources.chatsRef.current = shown;
-    state.setChats((current) => sameChats(current, shown) ? current : shown);
+    state.setChats((current) => {
+      const byId = new Map(current.map((chat) => [chat.id, chat]));
+      const next = shown.map((chat) => {
+        const previous = byId.get(chat.id);
+        return previous && sameChats([previous], [chat]) ? previous : chat;
+      });
+      return sameArray(current, next) ? current : next;
+    });
     const last = getLastChat(shown);
     state.setLastChat((current) => sameLastChat(current, last) ? current : last);
     updatePeers(shown);
@@ -41552,6 +41704,7 @@ function createChatListIndex({ cache, filterHiddenChats, getSources, isHiddenCha
     if (options.warm !== false) {
       sources.warmChats(sources.blockedReady ? filterBlockedChats(owners) : []);
     }
+    onOwnersChanged?.(owners);
     return owners;
   };
   const applyBlockedFilter = () => {
@@ -41577,7 +41730,7 @@ function createChatListIndex({ cache, filterHiddenChats, getSources, isHiddenCha
     for (const chat of filterHiddenChats(rows)) {
       const entry = entryFor(chat.id);
       captureActivity(entry, chat);
-      entry.cache = structuralChat(chat);
+      entry.cache = structuralChat(chat, entry.cache);
     }
     const shown = render();
     updatePeers(shown);
@@ -41627,7 +41780,7 @@ function createChatListIndex({ cache, filterHiddenChats, getSources, isHiddenCha
     for (const chat of incoming) {
       const entry = entryFor(chat.id);
       captureActivity(entry, chat);
-      entry.observedOwner = selectOwner(entry.observedOwner, structuralChat(chat));
+      entry.observedOwner = selectOwner(entry.observedOwner, structuralChat(chat, structuralOwnerFor(entry) || entry.cache));
       if (entry.committedOwner && compareOwners(entry.observedOwner, entry.committedOwner) >= 0) {
         entry.committedOwner = null;
       }
@@ -41645,7 +41798,7 @@ function createChatListIndex({ cache, filterHiddenChats, getSources, isHiddenCha
     for (const chat of (rows || []).filter((item) => item?.id && sourceCanPublish(item, options.sourceRevision))) {
       const entry = entryFor(chat.id);
       captureActivity(entry, chat);
-      entry.observedOwner = selectOwner(entry.observedOwner, structuralChat(chat));
+      entry.observedOwner = selectOwner(entry.observedOwner, structuralChat(chat, structuralOwnerFor(entry) || entry.cache));
       if (entry.committedOwner && compareOwners(entry.observedOwner, entry.committedOwner) >= 0) {
         entry.committedOwner = null;
       }
@@ -41665,7 +41818,7 @@ function createChatListIndex({ cache, filterHiddenChats, getSources, isHiddenCha
       return false;
     const entry = entryFor(chat.id);
     captureActivity(entry, chat);
-    entry.committedOwner = selectOwner(entry.committedOwner, structuralChat(chat));
+    entry.committedOwner = selectOwner(entry.committedOwner, structuralChat(chat, structuralOwnerFor(entry) || entry.cache));
     if (ownerCoversAnnouncement(ownerFor(entry), entry.announcement))
       entry.announcement = null;
     entry.cache = null;
@@ -41841,6 +41994,9 @@ function createChatListIndex({ cache, filterHiddenChats, getSources, isHiddenCha
     });
     if (next === current)
       return false;
+    const readCache = getSources().readCacheRef.current;
+    if (next.readMs > (readCache.get(chatId) || 0))
+      readCache.set(chatId, next.readMs);
     replaceActivity(entry, next);
     publishOwners();
     return true;
@@ -42520,6 +42676,79 @@ var init_listpreview = __esm(() => {
   init_chats();
 });
 
+// ../../core/chat/listreads.js
+function createChatListReads({ getSources, index }) {
+  const attempted = new Set;
+  let queue = [];
+  let generation = 0;
+  let running = false;
+  const admitted = (chat, sources) => !sources.chatBanned && !(chat?.memberUids || []).some((uid) => sources.blockedUidSet.has(uid)) && chat?.unseen && chat.ownEntry && !isChatMembershipRemoved(chat);
+  const eligible = (chat, sources) => sources.isActive && admitted(chat, sources);
+  const pump = async () => {
+    if (running)
+      return;
+    running = true;
+    const run2 = generation;
+    try {
+      while (queue.length && run2 === generation) {
+        const { chatId, epochId, key } = queue.shift();
+        const sources = getSources();
+        const chat = index.getOwnerChat(chatId);
+        if (!eligible(chat, sources)) {
+          attempted.delete(key);
+          continue;
+        }
+        try {
+          const epoch = epochId === chat.epochId ? chat.epochState : await sources.getEpochState(chat, epochId);
+          if (run2 !== generation)
+            return;
+          const state = epoch ? await readChatMemberState(sources.cloud, epoch, sources.chatPK) : null;
+          if (run2 !== generation || !admitted(index.getOwnerChat(chatId), getSources()))
+            continue;
+          const frontier = state?.readFrontier;
+          if (frontier)
+            index.markChatRead(chatId, { id: frontier.id, ts: frontier.at }, frontier.seenAt);
+        } catch (error) {
+          if (run2 !== generation)
+            return;
+          markError(sources.diag, "chat.list.read.restore", Date.now(), error);
+        }
+      }
+    } finally {
+      if (run2 === generation)
+        running = false;
+    }
+  };
+  return {
+    restore(chats) {
+      const sources = getSources();
+      if (typeof sources.cloud?.chat?.memberState?.readSlot !== "function")
+        return;
+      for (const chat of chats) {
+        if (!eligible(chat, sources))
+          continue;
+        const epochId = chat.preview?.epochId || chat.epochId;
+        const key = `${chat.id}:${epochId}`;
+        if (attempted.has(key))
+          continue;
+        attempted.add(key);
+        queue.push({ chatId: chat.id, epochId, key });
+      }
+      return pump();
+    },
+    reset() {
+      generation += 1;
+      attempted.clear();
+      queue = [];
+      running = false;
+    }
+  };
+}
+var init_listreads = __esm(() => {
+  init_memberstate();
+  init_entry();
+});
+
 // ../../core/chat/liststate.js
 function nextValue(current, next) {
   return typeof next === "function" ? next(current) : next;
@@ -42698,7 +42927,16 @@ function createChatList(initialSources) {
   const filterHiddenChats = (chats) => (chats || []).filter((chatItem) => chatItem?.id && !isHiddenChatId(chatItem.id));
   const state = createChatListState({ getSources });
   const cache = createChatListCache({ getSources, state });
-  const index = createChatListIndex({ cache, filterHiddenChats, getSources, isHiddenChatId, state });
+  let reads = null;
+  const index = createChatListIndex({
+    cache,
+    filterHiddenChats,
+    getSources,
+    isHiddenChatId,
+    state,
+    onOwnersChanged: (chats) => reads?.restore(chats)
+  });
+  reads = createChatListReads({ getSources, index });
   const epoch = createChatListEpochOwner({ getGeneration, getSources, index });
   const paging = createChatListPaging({ cache, getGeneration, getSources, index, isHiddenChatId, state });
   const invalidateRuntimeTasks = () => {
@@ -42707,6 +42945,7 @@ function createChatList(initialSources) {
     epoch.reset();
   };
   const resetChatList = (ready = false) => {
+    reads.reset();
     invalidateRuntimeTasks();
     index.reset(ready);
   };
@@ -42757,6 +42996,7 @@ function createChatList(initialSources) {
       index.applyBlockedFilter();
       paging.fillVisibleChatPage();
     }
+    reads.restore(index.getOwnerChats());
   };
   const start2 = () => {
     if (listener.isListening())
@@ -42765,6 +43005,7 @@ function createChatList(initialSources) {
     preview2.schedule();
   };
   const close = () => {
+    reads.reset();
     listener.close();
     preview2.close();
     cache.flush();
@@ -42810,6 +43051,7 @@ var init_listsession = __esm(() => {
   init_listlistener();
   init_listpaging();
   init_listpreview();
+  init_listreads();
 });
 
 // ../../core/chat/inboxtransport.js
@@ -45192,7 +45434,7 @@ function chatDisplayTitle(chat, selfChatPK, peerByChatPK, options = {}) {
   }));
   if (chat?.lineage === "direct" && names.length === 1)
     return names[0];
-  const shown = names.slice(0, 3);
+  const shown = names.slice(0, options.maxNames ?? 3);
   const extra = names.length - shown.length;
   return `${shown.join(", ")}${extra > 0 ? ` +${extra}` : ""}`;
 }
@@ -45854,9 +46096,6 @@ function createChatSessionPending({
     return track(launchId, previousOperation.then((result) => sendDurableSharedAttachment(result?.chatId || launchId, queuedAttachment, options)));
   };
   const sendChatMessage = (chatId, message, options = {}) => {
-    const chat = getOwnerChat(resolvePendingChatId(chatId)) || launchForChat(chatId)?.chat;
-    if (message?.tokenIdentifier != null && chat?.lineage === "group")
-      throw new Error("group payments support bitcoin only");
     const operation = operationForChat(chatId);
     if (operation?.discarding)
       throw makeChatUnavailableError();
@@ -47314,7 +47553,6 @@ function createChatSeen({
   const scheduleRead = (chatId, message, previewMs, frontierMessage, messages = []) => {
     const frontier = Number.isSafeInteger(frontierMessage?.at) && frontierMessage?.epochId ? frontierMessage : readFrontierFromMessage(frontierMessage, { seenAt: previewMs });
     if (frontier) {
-      writeCachedReadFrontier(localCache, chatId, frontier);
       onReadFrontier?.(chatId, frontier);
     }
     const timing = getReadWriteTiming?.(chatId) || {};
@@ -47348,6 +47586,12 @@ function createChatSeen({
     const frontier = readFrontierFromMessage(frontierMessage, { seenAt: read?.previewMs || Date.now() });
     if (!read && !frontier && !cachedFrontiers.length)
       return false;
+    const savedRead = writeCachedChatRead(localCache, chatId, {
+      frontier,
+      message: read?.preview,
+      openedAt: read?.previewMs,
+      chatPK
+    }).catch((error) => markError(diag, "chat.read.cache", Date.now(), error));
     if (read) {
       markChatRead?.(chatId, read.preview, read.previewMs);
       readCacheRef.current.set(chatId, read.readMs);
@@ -47357,6 +47601,7 @@ function createChatSeen({
     for (const cached of cachedFrontiers)
       scheduleRead(chatId, preview2, previewMs, cached, messages);
     scheduleRead(chatId, preview2, previewMs, frontierMessage, messages);
+    await savedRead;
     return true;
   };
   const markChatReadState = async (chatId, message, options = {}) => {
@@ -47457,6 +47702,7 @@ function createChatSessionActions({
   diag,
   readWriteInterval,
   adoptLocalMessageMedia,
+  getActive,
   getIdentity,
   getLiveActivity,
   getOwnerChat,
@@ -47588,6 +47834,7 @@ function createChatSessionActions({
       reconcileEpoch: (chatId) => getChatListOwner().reconcileChatEpoch(chatId),
       diag
     });
+    sendActions.setActive(getActive());
     reactionActions = createChatReaction({
       cloud,
       uid: identity().uid,
@@ -47741,10 +47988,10 @@ function sameReadFrontier(left, right) {
   return left.actor === right.actor && left.readFrontier?.epochId === right.readFrontier?.epochId && left.readFrontier?.id === right.readFrontier?.id && left.readFrontier?.at === right.readFrontier?.at && left.readFrontier?.seenAt === right.readFrontier?.seenAt;
 }
 function sameActivity2(left, right) {
-  return left.connected === right.connected && left.activeChatPKs.length === right.activeChatPKs.length && left.compositions.length === right.compositions.length && left.readFrontiers.length === right.readFrontiers.length && left.activeChatPKs.every((value, index) => value === right.activeChatPKs[index]) && left.compositions.every((value, index) => sameComposition(value, right.compositions[index])) && left.readFrontiers.every((value, index) => sameReadFrontier(value, right.readFrontiers[index]));
+  return left.connected === right.connected && left.lastObservedAtByChatPK === right.lastObservedAtByChatPK && left.activeChatPKs.length === right.activeChatPKs.length && left.compositions.length === right.compositions.length && left.readFrontiers.length === right.readFrontiers.length && left.activeChatPKs.every((value, index) => value === right.activeChatPKs[index]) && left.compositions.every((value, index) => sameComposition(value, right.compositions[index])) && left.readFrontiers.every((value, index) => sameReadFrontier(value, right.readFrontiers[index]));
 }
 function hasActivity(activity) {
-  return !!(activity?.connected || activity?.activeChatPKs?.length || activity?.compositions?.length || activity?.readFrontiers?.length);
+  return !!(activity?.connected || activity?.activeChatPKs?.length || activity?.compositions?.length || activity?.readFrontiers?.length || Object.keys(activity?.lastObservedAtByChatPK || {}).length);
 }
 function summarizeLocalMessage(summary, message) {
   summary.messages += 1;
@@ -47885,6 +48132,17 @@ function createChatSessionState({
       return;
     const next = new Map(liveActivityByChat);
     const previous = next.get(chatId);
+    let lastObservedAtByChatPK = previous?.lastObservedAtByChatPK;
+    const departed = previous?.connected ? previous.activeChatPKs.filter((actor) => !activity?.connected || !activity.activeChatPKs.includes(actor)) : [];
+    if (departed.length) {
+      const now = Date.now();
+      lastObservedAtByChatPK = { ...lastObservedAtByChatPK };
+      for (const actor of departed)
+        lastObservedAtByChatPK[actor] = Math.max(lastObservedAtByChatPK[actor] || 0, now);
+      Object.freeze(lastObservedAtByChatPK);
+    }
+    if (lastObservedAtByChatPK)
+      activity = { ...activity, lastObservedAtByChatPK };
     if (previous?.connected && !activity?.connected)
       onLiveDisconnect(chatId);
     if (hasActivity(activity)) {
@@ -48298,6 +48556,7 @@ function normalizeChatSessionSources(sources = {}) {
     uid: sources.uid || "",
     online: sources.online !== false,
     blocked: Array.isArray(sources.blocked) ? sources.blocked : [],
+    blockedPending: Array.isArray(sources.blockedPending) ? sources.blockedPending : [],
     blockedReady: sources.blockedReady === true,
     chatPK: sources.chatPK || "",
     chatBanned: sources.chatBanned === true,
@@ -48347,7 +48606,6 @@ function createChatSession({
   mls = null,
   live = null,
   maintenance,
-  resolveActiveCall,
   incomingChatDecision = null,
   getPeerProfile = null,
   refreshPeerProfile = null,
@@ -48365,6 +48623,7 @@ function createChatSession({
     uid = "",
     online = true,
     blocked = [],
+    blockedPending = [],
     blockedReady = false,
     chatPK = "",
     chatSigningPK = "",
@@ -48381,6 +48640,7 @@ function createChatSession({
   let inboxEnabled = initialSources.inboxEnabled === true;
   let started = false;
   let appStateSubscription = null;
+  const messageListeners = new Set;
   let mlsPoolReplenishment = null;
   let mlsPoolReplenishQueued = false;
   let mlsPoolNeedsReplenish = true;
@@ -48555,6 +48815,13 @@ function createChatSession({
   };
   const handleBatchMessages = (chatId, messages) => {
     chatListOwner.observeMessages(chatId, messages);
+    for (const listener of messageListeners) {
+      try {
+        listener(chatId, messages);
+      } catch (error) {
+        diag?.("chat.message.observer.error", { code: error?.code || "chat/observer" });
+      }
+    }
     if (![...messages || []].reverse().some(isEpochTransitionMsg))
       return;
     const startedAt = Date.now();
@@ -48987,8 +49254,6 @@ function createChatSession({
     const chat = getOwnerChat(chatId);
     if (!chat)
       throw makeChatUnavailableError();
-    if (payment.tokenIdentifier != null && chat.lineage !== "direct")
-      throw new Error("group payments support bitcoin only");
     const members = Array.isArray(chat?.memberChatPKs) ? chat.memberChatPKs.map((memberChatPK) => cleanText(memberChatPK).toLowerCase()) : (chat?.members || []).map((member) => cleanText(member?.chatPK).toLowerCase());
     const message = pending ? makePendingChatPayment(payment) : makeChatPayment(payment);
     const recipients = chatPaymentRecipients(message);
@@ -49015,6 +49280,7 @@ function createChatSession({
   };
   const getLocalMessages = (chatId) => isChatPendingDelete(chatId) || !isChatIdVisible(chatId) ? EMPTY_LOCAL_MESSAGES : localByChatRef.current.get(chatId) ?? EMPTY_LOCAL_MESSAGES;
   const blockedAuthority = (values) => [...values || []].sort().join("|");
+  const committedBlocked = () => blocked.filter((uid2) => !blockedPending.includes(uid2));
   const bulkOperation = (blockedUids = null) => ({
     generation: authGeneration,
     identity: {
@@ -49030,7 +49296,7 @@ function createChatSession({
     deleteActions: actionOwner.deleteActions,
     blockedKey: blockedUids ? blockedAuthority(blockedUids) : null
   });
-  const isBulkOperationCurrent = (operation) => operation.generation === authGeneration && operation.deleteActions === actionOwner.deleteActions && (operation.blockedKey == null || operation.blockedKey === blockedAuthority(blocked));
+  const isBulkOperationCurrent = (operation) => operation.generation === authGeneration && operation.deleteActions === actionOwner.deleteActions && (operation.blockedKey == null || operation.blockedKey === blockedAuthority(committedBlocked()));
   const assertBulkOperationCurrent = (operation) => {
     requireOnline();
     if (!isBulkOperationCurrent(operation))
@@ -49044,32 +49310,42 @@ function createChatSession({
       return 0;
     let allChats = await loadOwnerChats(cloud, identity.uid, identity.chatPK, identity.chatPrivateKey);
     assertBulkOperationCurrent(operation);
-    let processedInbox = true;
-    while (processedInbox) {
-      processedInbox = await processInbox(cloud, identity.uid, identity.chatPK, identity.chatPrivateKey, {
-        currentChats: allChats,
-        chatSigningPK: identity.chatSigningPK,
-        chatSigningSecret: identity.chatSigningSecret,
-        notificationPK: identity.notificationPK,
-        notificationPrivateKey: identity.notificationPrivateKey,
-        mls,
-        blockedUids: new Set(identity.blocked),
-        chatAdmission,
-        incomingChatDecision,
-        scanAllSlots: true,
-        requireComplete: true
-      });
-      assertBulkOperationCurrent(operation);
-      if (processedInbox) {
-        allChats = await loadOwnerChats(cloud, identity.uid, identity.chatPK, identity.chatPrivateKey);
-        assertBulkOperationCurrent(operation);
-      }
-    }
+    await processInbox(cloud, identity.uid, identity.chatPK, identity.chatPrivateKey, {
+      currentChats: allChats,
+      chatSigningPK: identity.chatSigningPK,
+      chatSigningSecret: identity.chatSigningSecret,
+      notificationPK: identity.notificationPK,
+      notificationPrivateKey: identity.notificationPrivateKey,
+      mls,
+      blockedUids: new Set(identity.blocked),
+      chatAdmission,
+      incomingChatDecision,
+      scanAllSlots: true,
+      requireComplete: true,
+      isCurrent: () => isBulkOperationCurrent(operation),
+      diag
+    });
+    assertBulkOperationCurrent(operation);
+    allChats = await loadOwnerChats(cloud, identity.uid, identity.chatPK, identity.chatPrivateKey);
+    assertBulkOperationCurrent(operation);
     if (!allChats.length)
       return 0;
     let retired = 0;
-    for (const chat of allChats) {
+    for (const ownedChat of allChats) {
       assertBulkOperationCurrent(operation);
+      let chat = ownedChat;
+      if (!isChatMembershipRemoved(chat)) {
+        chatListOwner.commitOwner(chat);
+        const reconciliation = await chatListOwner.reconcileChatEpoch(chat.id);
+        assertBulkOperationCurrent(operation);
+        chat = getOwnerChat(chat.id);
+        if (!chat) {
+          if (!reconciliation.removed)
+            throw makeChatUnavailableError();
+          retired += 1;
+          continue;
+        }
+      }
       if (isChatMembershipRemoved(chat)) {
         await operation.deleteActions.deleteChat(chat, { cleanup: false });
         assertBulkOperationCurrent(operation);
@@ -49211,9 +49487,10 @@ function createChatSession({
       return false;
     }
   };
-  const prepareCall = async (chatId) => {
+  const prepareCall = async (chatId, options = {}) => {
     const generation = authGeneration;
-    const current = () => generation === authGeneration && online && pendingOwner.canSendToChat(chatId);
+    await sendReadiness.wait(chatId, options);
+    const current = () => generation === authGeneration && !options.signal?.aborted && online && pendingOwner.canSendToChat(chatId);
     if (!current())
       throw new Error("chat unavailable");
     await pendingOwner.assertChatAdmission(chatId);
@@ -49230,7 +49507,13 @@ function createChatSession({
       throw new Error("chat unavailable");
     return chat.epochState;
   };
-  const materializeChat = (chatId) => pendingOwner.runChatMutation(chatId, (canonicalId) => canonicalId);
+  const materializeChat = async (chatId, options = {}) => {
+    const generation = authGeneration;
+    await sendReadiness.wait(chatId, options);
+    if (generation !== authGeneration || options.signal?.aborted)
+      throw makeChatUnavailableError();
+    return pendingOwner.runChatMutation(chatId, (canonicalId) => canonicalId);
+  };
   const flushChatReadFrontier = (chatId) => {
     if (!online)
       return false;
@@ -49422,6 +49705,7 @@ function createChatSession({
     lastHydratedCacheKeyRef,
     chatsRef,
     reconcileMessageBatches: (...args) => messageBatchOwner.reconcileChats(...args),
+    getEpochState: (...args) => historyOwner.getEpochState(...args),
     warmChats: (...args) => messageBatchOwner.warm(...args),
     onOwnerRemoved: (chatIds) => {
       for (const chatId of chatIds)
@@ -49480,6 +49764,7 @@ function createChatSession({
     });
   };
   stateOwner.setActions({
+    ensureChat,
     loadMoreChats: loadMoreChats2,
     selectChat,
     resolveChatRequest,
@@ -49548,7 +49833,6 @@ function createChatSession({
     deleteMessage,
     deleteMessages,
     deleteMessageDocs,
-    resolveActiveCall,
     setChatTtl,
     makeMessagePermanent,
     makeMessageTemporary,
@@ -49565,6 +49849,7 @@ function createChatSession({
     diag,
     readWriteInterval,
     adoptLocalMessageMedia,
+    getActive: () => isActive,
     getIdentity: () => ({
       uid,
       chatPK,
@@ -49614,6 +49899,7 @@ function createChatSession({
   const setActive = (nextActive) => {
     foreground = nextActive === true;
     const value = foreground && online;
+    actionOwner.sendActions.setActive(value);
     if (isActive === value)
       return;
     if (!value) {
@@ -49641,7 +49927,7 @@ function createChatSession({
     inboxTransport.setSource(inboxSource());
   };
   const setSources = (nextSources = {}) => {
-    const previousBlockedKey = [...blocked].sort().join("|");
+    const previousBlockedKey = blockedAuthority(committedBlocked());
     const current = { uid, chatPK, chatBanned, chatPrivateKey, chatSigningPK, chatSigningSecret, notificationPK, notificationPrivateKey, chatAdmission, localCache };
     const next = normalizeChatSessionSources(nextSources);
     const admissionChanged = !sameChatAdmission(chatAdmission, next.chatAdmission);
@@ -49658,6 +49944,7 @@ function createChatSession({
       uid,
       online,
       blocked,
+      blockedPending,
       blockedReady,
       chatPK,
       chatBanned,
@@ -49692,9 +49979,9 @@ function createChatSession({
       drainMembershipOutbox();
       replenishMlsPool({ force: true });
     }
-    const nextBlockedKey = [...blocked].sort().join("|");
+    const nextBlockedKey = blockedAuthority(committedBlocked());
     if (online && blockedReady && nextBlockedKey && nextBlockedKey !== previousBlockedKey) {
-      retireBlockedChats(new Set(blocked)).catch((error) => {
+      retireBlockedChats(new Set(committedBlocked())).catch((error) => {
         markDiag(diag, "chat.block.retire.failed", { message: error?.message || String(error) });
       });
     }
@@ -49714,8 +50001,8 @@ function createChatSession({
     publish();
     inboxTransport.start(inboxSource());
     chatListOwner.start();
-    if (blockedReady && blocked.length) {
-      retireBlockedChats(new Set(blocked)).catch((error) => {
+    if (blockedReady && committedBlocked().length) {
+      retireBlockedChats(new Set(committedBlocked())).catch((error) => {
         markDiag(diag, "chat.block.retire.failed", { message: error?.message || String(error) });
       });
     }
@@ -49728,6 +50015,7 @@ function createChatSession({
   };
   const close = () => {
     authGeneration += 1;
+    messageListeners.clear();
     sendReadiness.reset();
     pendingOwner.reset();
     maintenance.close();
@@ -49753,7 +50041,20 @@ function createChatSession({
   const subscribeFields = stateOwner.subscribeFields;
   const getSnapshot = stateOwner.getSnapshot;
   publish();
-  return { close, getSnapshot, refreshAdmissionProjection, setInboxEnabled, setSources, start: start2, subscribe, subscribeFields };
+  return {
+    close,
+    getSnapshot,
+    refreshAdmissionProjection,
+    setInboxEnabled,
+    setSources,
+    start: start2,
+    subscribe,
+    subscribeFields,
+    subscribeMessages(listener) {
+      messageListeners.add(listener);
+      return () => messageListeners.delete(listener);
+    }
+  };
 }
 var DEFAULT_READ_WRITE_INTERVAL_MS, EMPTY_LOCAL_MESSAGES;
 var init_session3 = __esm(() => {
@@ -49961,6 +50262,7 @@ function createPresence({ cloud, diag = null, now = Date.now } = {}) {
   const peerListeners = new Set;
   const records = new Map;
   const peers = new Map;
+  const peersByUid = new Map;
   const readyShards = new Map;
   let sources = { uid: null, identity: null, enabled: false };
   let channel = null;
@@ -49972,11 +50274,13 @@ function createPresence({ cloud, diag = null, now = Date.now } = {}) {
   let seq = 0;
   let renewTimer = null;
   let expiryTimer = null;
+  let expiryAt = Infinity;
+  let ownTopic = null;
   let command = null;
   let authenticating = null;
   let snapshot = Object.freeze({ visibility: null, ready: false, pending: false, pendingVisibility: null, error: null, ...UNKNOWN_PRESENCE });
   function topic() {
-    return sources.uid ? derivePresenceTopic(realm2, sources.uid) : null;
+    return ownTopic;
   }
   function isReady() {
     return Boolean(channel && challenge && policy && sources.enabled && !closed);
@@ -50009,17 +50313,19 @@ function createPresence({ cloud, diag = null, now = Date.now } = {}) {
     const latest = fresh.reduce((selected, lease) => !selected || lease.issuedAt > selected.issuedAt || lease.issuedAt === selected.issuedAt && lease.session > selected.session ? lease : selected, null);
     return { availability: fresh.length ? "online" : "offline", status: latest?.status ?? null, lastActiveAt };
   }
-  function refresh() {
-    clearTimeout(expiryTimer);
-    expiryTimer = null;
-    let changed = false;
+  function refresh(keys = records.keys(), changedUids = new Set) {
     let deadline = Infinity;
     const timestamp = now();
-    for (const record of records.values()) {
+    for (const key of keys) {
+      const record = records.get(key);
+      if (!record)
+        continue;
       const next = projection(record);
       if (!samePresence(record.view, next)) {
         record.view = Object.freeze(next);
-        changed = true;
+        const uid = peers.get(key)?.uid;
+        if (uid)
+          changedUids.add(uid);
       }
       if (record.ready) {
         for (const lease of record.leases)
@@ -50032,11 +50338,18 @@ function createPresence({ cloud, diag = null, now = Date.now } = {}) {
     }
     const own = records.get(topic())?.view || UNKNOWN_PRESENCE;
     publish(policy?.visibility === "private" ? OFFLINE_PRESENCE : own);
-    if (changed)
+    if (changedUids.size)
       for (const listener of peerListeners)
-        listener();
-    if (Number.isFinite(deadline) && deadline > timestamp)
-      expiryTimer = setTimeout(refresh, deadline - timestamp + 1);
+        listener(changedUids);
+    if (deadline < expiryAt && deadline > timestamp) {
+      clearTimeout(expiryTimer);
+      expiryAt = deadline;
+      expiryTimer = setTimeout(() => {
+        expiryAt = Infinity;
+        expiryTimer = null;
+        refresh();
+      }, deadline - timestamp + 1);
+    }
   }
   function finishCommand(error = null) {
     if (!command)
@@ -50051,7 +50364,7 @@ function createPresence({ cloud, diag = null, now = Date.now } = {}) {
       pending.resolve(snapshot);
   }
   function expected(identity, extra = {}) {
-    return { realm: realm2, topic: derivePresenceTopic(realm2, identity.uid), signingPK: identity.chatSigningPK, now: now(), ...extra };
+    return { realm: realm2, topic: identity.topic, signingPK: identity.chatSigningPK, now: now(), ...extra };
   }
   function receive(frame) {
     const identity = peers.get(frame.topic);
@@ -50076,6 +50389,15 @@ function createPresence({ cloud, diag = null, now = Date.now } = {}) {
             lastActiveAt = verifyPresenceObservation(frame.lastObservation, scope).lastActiveAt;
           } catch {}
         }
+        const timestamp = now();
+        if (previous?.revision === currentPolicy.revision) {
+          lastActiveAt = Math.max(lastActiveAt || 0, previous.lastActiveAt || 0) || null;
+          if (!frame.leases?.length && previous.ready && previous.leases.some((lease) => lease.expiresAt > timestamp)) {
+            lastActiveAt = Math.max(lastActiveAt || 0, timestamp);
+          }
+        }
+        for (const lease of leases)
+          lastActiveAt = Math.max(lastActiveAt || 0, Math.min(lease.issuedAt, timestamp));
       }
       records.set(frame.topic, {
         ready: true,
@@ -50084,7 +50406,7 @@ function createPresence({ cloud, diag = null, now = Date.now } = {}) {
         revision: currentPolicy?.revision ?? previous?.revision ?? 0,
         view: previous?.view || UNKNOWN_PRESENCE
       });
-      refresh();
+      refresh([frame.topic]);
     } catch (error) {
       report(error);
     }
@@ -50102,10 +50424,10 @@ function createPresence({ cloud, diag = null, now = Date.now } = {}) {
     if (!session || !policy || policy.visibility !== "public" || command)
       return;
     const timestamp = now();
-    const ownTopic = topic();
+    const ownTopic2 = topic();
     const lease = signPresenceLease(sources.identity, {
       realm: realm2,
-      topic: ownTopic,
+      topic: ownTopic2,
       session,
       challenge,
       policyRevision: policy.revision,
@@ -50116,11 +50438,11 @@ function createPresence({ cloud, diag = null, now = Date.now } = {}) {
     });
     const observation = signPresenceObservation(sources.identity, {
       realm: realm2,
-      topic: ownTopic,
+      topic: ownTopic2,
       policyRevision: policy.revision,
       lastActiveAt: Math.floor(timestamp / PRESENCE_LAST_ACTIVE_BUCKET_MS) * PRESENCE_LAST_ACTIVE_BUCKET_MS
     });
-    channel.send(presenceShard(ownTopic), { type: "lease", lease, observation });
+    channel.send(presenceShard(ownTopic2), { type: "lease", lease, observation });
   }
   function receiveOwner(frame) {
     if (frame.topic !== topic() || !sources.identity)
@@ -50142,7 +50464,7 @@ function createPresence({ cloud, diag = null, now = Date.now } = {}) {
       if (policy.visibility === "private") {
         const previous = records.get(topic());
         records.set(topic(), { ready: true, leases: [], lastActiveAt: null, revision: policy.revision, view: previous?.view || UNKNOWN_PRESENCE });
-        refresh();
+        refresh([topic()]);
       }
       if (command && policy.revision >= command.policy.revision) {
         finishCommand(policy.signature === command.policy.signature ? null : new Error("activity setting changed on another device; try again"));
@@ -50253,7 +50575,7 @@ function createPresence({ cloud, diag = null, now = Date.now } = {}) {
   function setPeers(profiles2) {
     const next = new Map;
     if (sources.uid && sources.identity)
-      next.set(topic(), { uid: sources.uid, chatSigningPK: sources.identity.publicKey });
+      next.set(topic(), { uid: sources.uid, topic: topic(), chatSigningPK: sources.identity.publicKey });
     for (const profile of profiles2 || []) {
       if (next.size >= PRESENCE_MAX_SUBSCRIPTIONS)
         break;
@@ -50261,27 +50583,34 @@ function createPresence({ cloud, diag = null, now = Date.now } = {}) {
         continue;
       if (profile.uid === sources.uid)
         continue;
-      next.set(derivePresenceTopic(realm2, profile.uid), { uid: profile.uid, chatSigningPK: profile.chatSigningPK });
+      const key = peersByUid.get(profile.uid)?.topic || derivePresenceTopic(realm2, profile.uid);
+      next.set(key, { uid: profile.uid, topic: key, chatSigningPK: profile.chatSigningPK });
     }
     let changed = peers.size !== next.size;
+    const changedUids = new Set;
     for (const [key, identity] of next) {
       if (peers.get(key)?.chatSigningPK !== identity.chatSigningPK) {
         changed = true;
+        changedUids.add(identity.uid);
         records.delete(key);
       }
     }
+    for (const [key, identity] of peers)
+      if (!next.has(key))
+        changedUids.add(identity.uid);
     if (!changed)
       return;
     peers.clear();
-    for (const [key, value] of next)
+    peersByUid.clear();
+    for (const [key, value] of next) {
       peers.set(key, value);
+      peersByUid.set(value.uid, value);
+    }
     for (const key of records.keys())
       if (!peers.has(key))
         records.delete(key);
     sync();
-    refresh();
-    for (const listener of peerListeners)
-      listener();
+    refresh([], changedUids);
   }
   function update(next) {
     const accountChanged = sources.uid !== next.uid;
@@ -50290,11 +50619,15 @@ function createPresence({ cloud, diag = null, now = Date.now } = {}) {
       stop();
       policy = null;
       records.clear();
-      if (accountChanged)
+      if (accountChanged) {
         peers.clear();
+        peersByUid.clear();
+      }
       publish({ visibility: null, error: null, ...UNKNOWN_PRESENCE });
     }
     sources = next;
+    if (accountChanged)
+      ownTopic = next.uid ? derivePresenceTopic(realm2, next.uid) : null;
     setPeers([...peers.values()]);
     sync();
   }
@@ -50335,10 +50668,10 @@ function createPresence({ cloud, diag = null, now = Date.now } = {}) {
     getPeer(profile) {
       if (!profile?.uid)
         return UNKNOWN_PRESENCE;
-      const key = derivePresenceTopic(realm2, profile.uid);
-      if (peers.get(key)?.chatSigningPK !== profile.chatSigningPK)
+      const identity = peersByUid.get(profile.uid);
+      if (!identity || identity.chatSigningPK !== profile.chatSigningPK)
         return UNKNOWN_PRESENCE;
-      return records.get(key)?.view || UNKNOWN_PRESENCE;
+      return records.get(identity.topic)?.view || UNKNOWN_PRESENCE;
     },
     subscribe(listener) {
       listeners.add(listener);
@@ -50357,6 +50690,7 @@ function createPresence({ cloud, diag = null, now = Date.now } = {}) {
       listeners.clear();
       peerListeners.clear();
       peers.clear();
+      peersByUid.clear();
       records.clear();
     }
   });
@@ -50627,6 +50961,10 @@ function openCallMailbox({ cloud, capability, endpoint, protocol, onChange, onEr
   }
   return Object.freeze({
     getSnapshot: () => candidate || record,
+    async settled() {
+      await tail;
+      return record;
+    },
     async ready() {
       const response = await channel.ready();
       await consume(response.record);
@@ -50979,6 +51317,23 @@ var init_accountlease = __esm(() => {
   init_wire();
 });
 
+// ../../core/calls/sources.js
+function callVideoCapacity(participants, holder, count = 1) {
+  return participants.filter((peer) => peer.holder !== holder).reduce((count2, peer) => count2 + (peer.media?.sources?.length || 0), 0) + count <= CALL_MAX_VIDEO_SOURCES;
+}
+function assertCallVideoSources(participants, holder, media) {
+  const sources = media?.sources || [];
+  if (!Array.isArray(sources) || sources.length > CALL_MAX_VIDEO_SOURCES_PER_PARTICIPANT || sources.some((source) => !/^[A-Za-z0-9_-]{1,64}$/u.test(source?.id || "") || !["screen", "camera"].includes(source.kind) || !Number.isInteger(source.contextId) || source.contextId < 1 || source.contextId >= 2 ** 24) || new Set(sources.map((source) => source.id)).size !== sources.length || new Set(sources.map((source) => source.contextId)).size !== sources.length) {
+    throw Object.assign(new Error("invalid call video sources"), { code: "calls/invalid-source" });
+  }
+  if (sources.length && !callVideoCapacity(participants, holder, sources.length)) {
+    throw Object.assign(new Error(`this call already has ${CALL_MAX_VIDEO_SOURCES} cameras or screens`), { code: "calls/video-full" });
+  }
+}
+var init_sources = __esm(() => {
+  init_config();
+});
+
 // ../../core/calls/room.js
 function openCallRoom({
   cloud,
@@ -51065,6 +51420,14 @@ function openCallRoom({
       settleAdmission(admissionError("calls/taken-over", "call moved to another device"));
     }
   }
+  function retireMembership() {
+    departing = true;
+    joined = false;
+    clearTimeout(pulseTimer);
+    disposeState(state);
+    state = null;
+    onRemoved?.();
+  }
   async function adopt(next, admissions) {
     verifyCallMembers(next, admissions, protocol);
     if (closed) {
@@ -51076,7 +51439,7 @@ function openCallRoom({
     disposeState(previous);
     const self2 = next.members.find((item) => toHex(item.leafId) === localHolder);
     if (!self2) {
-      onRemoved?.();
+      retireMembership();
       return;
     }
     if (!admissions.some((item) => item.holder === localHolder && item.actor === admission.actor && item.endpoint === endpoint.publicKey))
@@ -51150,7 +51513,15 @@ function openCallRoom({
         if (bound)
           leaving.add(packet.holder);
       } else if (packet.kind === "pulse") {
-        published.set(packet.holder, packet.data);
+        let media = packet.data.media;
+        try {
+          assertCallVideoSources(participants(), packet.holder, media);
+        } catch {
+          media = published.get(packet.holder)?.media || null;
+        }
+        published.set(packet.holder, { ...packet.data, media });
+        if (packet.holder === localHolder)
+          ownMedia = media;
       } else if (packet.kind === "signal") {
         if (packet.data.to === localHolder && head?.participants.some((item) => item.holder === packet.holder && item.actor === packet.actor)) {
           signals.push(packet);
@@ -51160,7 +51531,7 @@ function openCallRoom({
         membershipChanged = true;
         if (state && !replacement.participants.some((item) => item.holder === localHolder)) {
           settleAdmission(cancelled2());
-          onRemoved?.();
+          retireMembership();
           return;
         }
         head = replacement;
@@ -51176,7 +51547,7 @@ function openCallRoom({
           pendingCandidate = null;
           if (next.removed) {
             disposeState(next);
-            onRemoved?.();
+            retireMembership();
             return;
           }
           await adopt(next, change.participants);
@@ -51213,7 +51584,7 @@ function openCallRoom({
       verifiedHead = null;
       admittedIdentities.clear();
       if (joined) {
-        onRemoved?.();
+        retireMembership();
         return;
       }
       if (submittedJoin)
@@ -51317,7 +51688,7 @@ function openCallRoom({
     for (let attempt = 0;!closed && performance.now() < deadline; attempt += 1) {
       if (kind === "join" && departing)
         throw cancelled2();
-      const current = mailbox.getSnapshot();
+      const current = await mailbox.settled();
       if (!current?.head)
         throw kind === "join" ? empty() : new Error("call ended");
       if (kind === "join") {
@@ -51326,9 +51697,14 @@ function openCallRoom({
           throw admissionFailure;
       }
       try {
+        const value = typeof data === "function" ? data() : data;
+        if (kind === "pulse")
+          assertCallVideoSources(participants(), localHolder, value.media);
         if (kind === "join")
           submittedJoin = true;
-        return await mailbox.append([protocol.sign(kind, data)], { expectedRevision: current.revision });
+        const result = await mailbox.append([protocol.sign(kind, value)], { expectedRevision: current.revision });
+        await mailbox.settled();
+        return result;
       } catch (error) {
         if (closed)
           throw cancelled2();
@@ -51359,7 +51735,7 @@ function openCallRoom({
     if (closed || departing || !joined)
       return;
     try {
-      await event("pulse", { ...audio, media: ownMedia });
+      await event("pulse", () => ({ ...audio, media: ownMedia }));
     } catch (error) {
       fail(error);
     }
@@ -51441,13 +51817,12 @@ function openCallRoom({
       return event("signal", { to, signal });
     },
     async publishMedia(media) {
-      ownMedia = media;
-      await event("pulse", { ...audio, media });
+      await event("pulse", () => ({ ...audio, media }));
     },
     async setAudio(value) {
       audio = { muted: value.muted === true || value.deafened === true, deafened: value.deafened === true };
       if (joined && !departing && !closed)
-        await event("pulse", { ...audio, media: ownMedia });
+        await event("pulse", () => ({ ...audio, media: ownMedia }));
     },
     async leave() {
       if (closed)
@@ -51485,6 +51860,7 @@ var init_room = __esm(() => {
   init_wire();
   init_protocol3();
   init_mailbox();
+  init_sources();
 });
 
 // ../../core/calls/activity.js
@@ -51644,15 +52020,15 @@ function createCallMediaSession({ port, mode, holder, preparation, provider, sig
   const pendingSignals = [];
   const incomingSignals = [];
   function sourcesFor(peer) {
-    if (!port.capabilities?.video || !videoCapable(peer) || !Array.isArray(peer.media.sources) || peer.media.sources.length > 2)
+    if (!port.capabilities?.video || !videoCapable(peer) || !Array.isArray(peer.media.sources) || peer.media.sources.length > CALL_MAX_VIDEO_SOURCES_PER_PARTICIPANT)
       return [];
-    const sources = peer.media.sources;
+    const sources = peer.media.sources.filter((source) => mode === "group" ? source?.trackName != null : source?.mid != null);
     if (sources.some((source) => !validSourceId(source?.id) || !["screen", "camera"].includes(source.kind) || !validContext(source.contextId) || (mode === "group" ? !/^[a-f0-9]{32}$/u.test(source.trackName || "") : !validMid(source.mid))) || new Set(sources.map((source) => source.id)).size !== sources.length || new Set(sources.map((source) => source.contextId)).size !== sources.length || new Set(sources.map((source) => mode === "group" ? source.trackName : source.mid)).size !== sources.length)
       return [];
     return sources;
   }
   function videoProjection() {
-    const next = [...localSources.values()].map((source) => ({ id: source.id, holder, kind: source.kind, stream: source.stream, local: true }));
+    const next = [...localSources.values()].filter((source) => source.admitted).map((source) => ({ id: source.id, holder, kind: source.kind, stream: source.stream, local: true }));
     for (const peer of peers) {
       if (peer.holder === holder)
         continue;
@@ -51672,11 +52048,11 @@ function createCallMediaSession({ port, mode, holder, preparation, provider, sig
     const base2 = mode === "group" ? { sessionId, trackName: microphoneTrack } : {};
     if (!port.capabilities?.video)
       return base2;
-    return { ...base2, capabilities: ["video"], sources: [...localSources.values()].filter((source) => source.published).map((source) => ({
+    return { ...base2, capabilities: ["video"], sources: [...localSources.values()].map((source) => ({
       id: source.id,
       kind: source.kind,
       contextId: source.contextId,
-      ...mode === "group" ? { trackName: source.trackName } : { mid: source.mid }
+      ...source.published ? mode === "group" ? { trackName: source.trackName } : { mid: source.mid } : {}
     })) };
   }
   async function publishMedia() {
@@ -52131,7 +52507,7 @@ function createCallMediaSession({ port, mode, holder, preparation, provider, sig
         current(generation);
         if (videoCapable(peer))
           for (const source of localSources.values()) {
-            if (source.attached)
+            if (!source.admitted || source.attached)
               continue;
             media.addSource(source);
             source.attached = true;
@@ -52260,68 +52636,101 @@ function createCallMediaSession({ port, mode, holder, preparation, provider, sig
     current();
     videoProjection();
   }
+  function detachSource(source) {
+    localSources.delete(source.id);
+    source.stream.getTracks().forEach((track) => track.stop());
+    if (source.attached)
+      media?.removeSource(source.id);
+    videoProjection();
+  }
+  async function closeSourceTrack(source) {
+    if (mode === "group" && source.published) {
+      await applyDescription(await provider("tracks/close", { sessionId, tracks: [{ mid: source.mid }] }));
+    }
+  }
   return Object.freeze({
-    supportsScreen() {
-      return port.capabilities?.screen === true && port.capabilities?.video === true;
+    supportsSource(kind) {
+      return port.capabilities?.[kind] === true && port.capabilities?.video === true;
     },
-    async addSource(source) {
+    async addSource(source, replaceId = null) {
       current();
       if (!started || !media?.addSource || !port.capabilities?.video)
         throw new Error("video sharing unavailable");
-      if (!validSourceId(source?.id) || !["screen", "camera"].includes(source.kind) || !validContext(source.contextId) || sourceContexts.has(source.contextId) || localSources.has(source.id) || localSources.size >= 2)
+      const previous = localSources.get(replaceId);
+      if (!validSourceId(source?.id) || !["screen", "camera"].includes(source.kind) || !validContext(source.contextId) || sourceContexts.has(source.contextId) || localSources.has(source.id) || localSources.size - (previous ? 1 : 0) >= CALL_MAX_VIDEO_SOURCES_PER_PARTICIPANT)
         throw new Error("invalid call source");
       const generation = connectionGeneration;
-      if (mode === "group")
-        media.addSource(source);
-      const local = { ...source, attached: mode === "group", published: false };
+      if (previous)
+        detachSource(previous);
+      const local = { ...source, attached: false, admitted: false, published: false };
       localSources.set(source.id, local);
       sourceContexts.add(source.contextId);
-      videoProjection();
-      await updateKeys();
-      current(generation);
-      return serialize(async () => {
-        current(generation);
-        if (localSources.get(source.id) !== local)
-          return;
-        if (mode === "group") {
-          const offer = await media.offer();
+      const result = await serialize(async () => {
+        try {
           current(generation);
-          local.mid = media.sourceMid(source.id);
-          local.trackName = toHex(randomBytes3(16));
-          if (!validMid(local.mid))
-            throw new Error("video track unavailable");
-          const result = await provider("tracks/new", { sessionId, sessionDescription: sdp(offer), tracks: [{ location: "local", mid: local.mid, trackName: local.trackName }] });
+          if (previous)
+            await closeSourceTrack(previous);
+          if (localSources.get(source.id) !== local)
+            return;
+          await publishMedia();
           current(generation);
-          if (result?.tracks?.length !== 1 || result.tracks[0].mid !== local.mid || result.tracks[0].trackName !== local.trackName)
-            throw new Error("video publication failed");
-          await applyDescription(result, true);
+          if (localSources.get(source.id) !== local)
+            return;
+          local.admitted = true;
+          if (mode === "group") {
+            media.addSource(local);
+            local.attached = true;
+          }
+          videoProjection();
+          await updateKeys();
           current(generation);
-          local.published = true;
+          if (localSources.get(source.id) !== local)
+            return;
+          if (mode === "group") {
+            const offer = await media.offer();
+            current(generation);
+            local.mid = media.sourceMid(source.id);
+            local.trackName = toHex(randomBytes3(16));
+            if (!validMid(local.mid))
+              throw new Error("video track unavailable");
+            const response = await provider("tracks/new", { sessionId, sessionDescription: sdp(offer), tracks: [{ location: "local", mid: local.mid, trackName: local.trackName }] });
+            current(generation);
+            if (response?.tracks?.length !== 1 || response.tracks[0].mid !== local.mid || response.tracks[0].trackName !== local.trackName)
+              throw new Error("video publication failed");
+            await applyDescription(response, true);
+            current(generation);
+            local.published = true;
+            await publishMedia();
+          } else
+            await negotiate();
+        } catch (error) {
+          if (closed || generation !== connectionGeneration || !["calls/video-full", "calls/invalid-source"].includes(error?.code))
+            throw error;
+          if (localSources.get(source.id) === local)
+            detachSource(local);
+          await updateKeys();
           await publishMedia();
-        } else
-          await negotiate();
+          await closeSourceTrack(local);
+          return { error };
+        }
       });
+      if (result?.error)
+        throw result.error;
     },
     removeSource(id) {
       current();
       const local = localSources.get(id);
       if (!local)
         return Promise.resolve();
-      localSources.delete(id);
-      local.stream.getTracks().forEach((track) => track.stop());
-      if (local.attached)
-        media?.removeSource(id);
-      videoProjection();
+      detachSource(local);
       const removedKeys = updateKeys();
       removedKeys.catch(() => {});
       return serialize(async () => {
         await removedKeys;
         current();
         await publishMedia();
-        if (mode === "group") {
-          if (local.published)
-            await applyDescription(await provider("tracks/close", { sessionId, tracks: [{ mid: local.mid }] }));
-        } else if (local.attached) {
+        await closeSourceTrack(local);
+        if (mode === "direct" && local.attached) {
           directDirty = true;
           await negotiate();
         }
@@ -52514,6 +52923,7 @@ var sdp = (value) => ({ type: value.type, sdp: value.sdp }), validMid = (value)
 var init_media5 = __esm(() => {
   init_core();
   init_activity();
+  init_config();
   retiredConnection = new Error("call connection retired");
 });
 
@@ -52612,6 +53022,7 @@ function createCallSession({ cloud, chat, media: mediaPort, mls, savePeerAudio,
   const discoveries = new Map;
   const discoveryReads = new Map;
   const observers = new Map;
+  const messageHints = new Map;
   const retiring = new Set;
   let state = initial();
   const confirmedPeerAudio = new Map;
@@ -52619,6 +53030,7 @@ function createCallSession({ cloud, chat, media: mediaPort, mls, savePeerAudio,
   let peerAudioSource = null;
   let audioSource = normalizeCallAudio();
   let pendingAudio = null;
+  let audioSaveTail = Promise.resolve();
   let identity = null;
   let endpoint = null;
   let leaseEndpoint = null;
@@ -52655,7 +53067,27 @@ function createCallSession({ cloud, chat, media: mediaPort, mls, savePeerAudio,
       diag?.("call.message.error", { event, code: error?.code || "" });
     });
   }
-  const canShareScreen = (call2) => !!call2 && !call2.leaving && call2.mediaReady && !!mediaPort?.captureScreen && ["connecting", "connected", "waiting"].includes(state.phase) && call2.media?.supportsScreen() === true;
+  const captureFor = (kind) => kind === "camera" ? mediaPort?.captureCamera : mediaPort?.captureScreen;
+  const canShare = (call2, kind) => !!call2 && !call2.leaving && call2.mediaReady && !!captureFor(kind) && ["connecting", "connected", "waiting"].includes(state.phase) && call2.media?.supportsSource(kind) === true && callVideoCapacity(call2.participants, call2.endpoint.holder);
+  const sourceState = (call2) => ({
+    sharingScreen: call2?.visual?.kind === "screen",
+    sharingCamera: call2?.visual?.kind === "camera",
+    screenShareAvailable: canShare(call2, "screen"),
+    cameraAvailable: canShare(call2, "camera")
+  });
+  async function captureVisual(operation) {
+    while (operation.visual) {
+      const source = operation.visual;
+      try {
+        await source.capture;
+      } catch (error) {
+        if (operation.visual === source)
+          throw error;
+      }
+      if (operation.visual === source)
+        return;
+    }
+  }
   function current(token) {
     if (closed || !identity || token !== generation)
       throw cancelled2();
@@ -52676,17 +53108,29 @@ function createCallSession({ cloud, chat, media: mediaPort, mls, savePeerAudio,
   }
   function available() {
     const entry = discoveries.get(focused);
-    const value = (chatId, current2) => current2?.descriptor ? {
-      chatId,
-      callId: current2.descriptor.callId,
-      startedAt: current2.descriptor.startedAt,
-      participants: current2.descriptor.participants || 1,
-      roster: (active?.discovery === current2 ? active.participants : current2.roster).filter((peer) => ![...retiring].some((call2) => call2.callId === current2.descriptor.callId && call2.endpoint.holder === peer.holder))
-    } : null;
+    const value = (chatId, current2) => {
+      if (!current2?.descriptor)
+        return null;
+      const roster = (active?.discovery === current2 ? active.participants : current2.roster)?.filter((peer) => ![...retiring].some((call2) => call2.callId === current2.descriptor.callId && call2.endpoint.holder === peer.holder));
+      if (roster?.length === 0)
+        return null;
+      return {
+        chatId,
+        callId: current2.descriptor.callId,
+        startedAt: current2.descriptor.startedAt,
+        participants: roster?.length ?? (current2.descriptor.participants || 1),
+        roster: roster || []
+      };
+    };
     for (const observer of observers.values()) {
+      const observed = discoveries.get(observer.chatId);
+      if (!observer.resolved && observed?.revision !== null && observed?.revision !== undefined) {
+        observer.resolved = true;
+        diag?.("call.discovery.observed", { elapsedMs: Date.now() - observer.startedAt, active: !!observed.descriptor });
+      }
       if (!observer.onAvailable)
         continue;
-      const next2 = value(observer.chatId, discoveries.get(observer.chatId));
+      const next2 = value(observer.chatId, observed);
       const fingerprint = JSON.stringify(next2);
       if (observer.fingerprint === fingerprint)
         continue;
@@ -52722,7 +53166,6 @@ function createCallSession({ cloud, chat, media: mediaPort, mls, savePeerAudio,
       return;
     }
     entry.observation?.close();
-    entry.roster = [];
     entry.observedCallId = callId;
     const token = generation;
     const protocol = createCallProtocol({ realm: cloud.environment, epochState: entry.epochState, identity, endpoint, callId });
@@ -52753,7 +53196,7 @@ function createCallSession({ cloud, chat, media: mediaPort, mls, savePeerAudio,
   }
   function prune() {
     for (const [chatId, value] of discoveries) {
-      if (![...observers.values()].some((item) => item.chatId === chatId) && chatId !== active?.chatId && chatId !== joining?.chatId && ![...retiring].some((call2) => call2.chatId === chatId)) {
+      if (!messageHints.get(chatId)?.watch && !discoveryReads.has(chatId) && !value.finishing.size && ![...observers.values()].some((item) => item.chatId === chatId) && chatId !== active?.chatId && chatId !== joining?.chatId && ![...retiring].some((call2) => call2.chatId === chatId)) {
         closeDiscovery(value);
         discoveries.delete(chatId);
       } else
@@ -52775,7 +53218,7 @@ function createCallSession({ cloud, chat, media: mediaPort, mls, savePeerAudio,
       mailbox: null,
       observation: null,
       observedCallId: null,
-      roster: [],
+      roster: null,
       revision: null,
       expiredCallId: null,
       finishing: new Map
@@ -52792,17 +53235,25 @@ function createCallSession({ cloud, chat, media: mediaPort, mls, savePeerAudio,
         if (descriptor && (!/^[a-f0-9]{64}$/u.test(descriptor.callId) || !/^[a-f0-9]{64}$/u.test(descriptor.secret) || descriptor.mode !== epochState.manifest.lineage || !Number.isSafeInteger(descriptor.startedAt) || descriptor.startedAt < 0 || descriptor.startedAt > Date.now() + 5000))
           throw new Error("invalid call discovery");
         const previous = entry.descriptor;
+        if (previous?.callId !== descriptor?.callId)
+          entry.roster = null;
         entry.expiredCallId = !record.head ? previous?.callId || entry.expiredCallId : null;
         entry.descriptor = descriptor;
         if (!record.head && previous)
           finishDiscovery(entry, previous);
         const changed = entry.revision !== record.revision;
         entry.revision = record.revision;
+        if (!descriptor) {
+          const hint = messageHints.get(chatId);
+          if (hint)
+            hint.watch = false;
+        }
         if (active?.discovery === entry && active.published && descriptor?.callId !== active.callId) {
           leave();
         }
         observeRoster(entry, changed);
         available();
+        prune();
       },
       onError(error) {
         if (token !== generation || discoveries.get(chatId) !== entry)
@@ -52849,7 +53300,7 @@ function createCallSession({ cloud, chat, media: mediaPort, mls, savePeerAudio,
   function observe(chatId, onAvailable) {
     if (!chatId || closed)
       return () => {};
-    const observer = { chatId, onAvailable, fingerprint: undefined };
+    const observer = { chatId, onAvailable, fingerprint: undefined, startedAt: Date.now(), resolved: false };
     observers.set(observer, observer);
     focused = chatId;
     if (state.error?.chatId === chatId)
@@ -52901,11 +53352,11 @@ function createCallSession({ cloud, chat, media: mediaPort, mls, savePeerAudio,
       })();
       const destination = (async () => {
         if (!onlyExisting && !continuation)
-          chatId = await chat.getSnapshot().materializeChat(chatId);
+          chatId = await chat.getSnapshot().materializeChat(chatId, { signal: operation.controller.signal });
         check();
         joining.chatId = chatId;
         step("chat");
-        const epochState = continuation ? chat.getSnapshot().getOwnerChat(chatId)?.epochState : await chat.getSnapshot().prepareCall(chatId);
+        const epochState = continuation ? chat.getSnapshot().getOwnerChat(chatId)?.epochState : await chat.getSnapshot().prepareCall(chatId, { signal: operation.controller.signal });
         check();
         if (!epochState)
           throw cancelled2();
@@ -52914,7 +53365,7 @@ function createCallSession({ cloud, chat, media: mediaPort, mls, savePeerAudio,
         step("discovery");
         return entry2;
       })();
-      const [, entry] = await Promise.all([permission, destination, operation.screen?.capture]);
+      const [, entry] = await Promise.all([permission, destination, captureVisual(operation)]);
       check();
       const discoveryRecord = entry.mailbox.getSnapshot();
       const create = !entry.descriptor;
@@ -52950,7 +53401,8 @@ function createCallSession({ cloud, chat, media: mediaPort, mls, savePeerAudio,
         wasReady: false,
         signalingReady: true,
         ownershipReady: true,
-        screen: null,
+        visual: null,
+        capturing: null,
         sourceContext: 0,
         leaving: false,
         muteTail: Promise.resolve()
@@ -52996,7 +53448,7 @@ function createCallSession({ cloud, chat, media: mediaPort, mls, savePeerAudio,
         const waiting = call2.mediaReady && descriptor.mode === "direct" && state.participants.length < 2;
         const ready = call2.mediaState === "connected" || waiting;
         if (ready && call2.signalingReady && call2.ownershipReady) {
-          call2.wasReady = true;
+          call2.wasReady = !waiting;
           clearTimeout(call2.joinTimer);
           call2.joinTimer = null;
           emit({ phase: waiting ? "waiting" : "connected" });
@@ -53010,7 +53462,7 @@ function createCallSession({ cloud, chat, media: mediaPort, mls, savePeerAudio,
                 fail(new Error("call did not connect"));
             }, 30000);
         }
-        emit({ screenShareAvailable: canShareScreen(call2) });
+        emit(sourceState(call2));
       };
       call2.connectionProgress = connectionProgress;
       call2.media = createCallMediaSession({
@@ -53057,8 +53509,8 @@ function createCallSession({ cloud, chat, media: mediaPort, mls, savePeerAudio,
             emit({ videoSources });
         },
         onSourceEnded(id) {
-          if (valid() && call2.screen?.id === id)
-            stopScreenShare().catch(() => {});
+          if (valid() && call2.visual?.id === id)
+            stopVisual().catch(() => {});
         },
         onError(error) {
           if (valid())
@@ -53103,7 +53555,7 @@ function createCallSession({ cloud, chat, media: mediaPort, mls, savePeerAudio,
             if (preference)
               call2.media.setPeerAudio(peer.holder, { volume: preference.volume / 100, muted: preference.muted }).catch((error) => diag?.("call.peer.audio.error", { code: error?.code || "calls/audio" }));
           }
-          emit({ participants: value, screenShareAvailable: canShareScreen(call2) });
+          emit({ participants: value, ...sourceState(call2) });
           available();
           call2.refresh?.();
           if (call2.mediaReady)
@@ -53134,6 +53586,8 @@ function createCallSession({ cloud, chat, media: mediaPort, mls, savePeerAudio,
       checkCall();
       await call2.room.start({ create });
       checkCall();
+      if (operation.visual)
+        assertCallVideoSources(call2.participants, callEndpoint.holder, { sources: [{ ...operation.visual, contextId: 1 }] });
       step("admission");
       if (create) {
         try {
@@ -53235,12 +53689,14 @@ function createCallSession({ cloud, chat, media: mediaPort, mls, savePeerAudio,
       };
       call2.refresh = refresh;
       refresh(true);
-      if (operation.screen) {
-        await operation.screen.capture;
+      while (operation.visual) {
+        await captureVisual(operation);
         check();
-        await publishScreen(call2, operation.screen);
+        const source = operation.visual;
+        await publishVisual(call2, source);
         check();
-        operation.screen = null;
+        if (operation.visual === source)
+          operation.visual = null;
       }
       return chatId;
     } catch (error) {
@@ -53273,20 +53729,21 @@ function createCallSession({ cloud, chat, media: mediaPort, mls, savePeerAudio,
       throw new Error("open veyl to join a call");
     return runJoin(chatId, expectedCallId, onlyExisting);
   }
-  function runJoin(chatId, expectedCallId = null, onlyExisting = false, continuation = null, screen = null) {
+  function runJoin(chatId, expectedCallId = null, onlyExisting = false, continuation = null, visual = null) {
     const intent = ++joinIntent;
-    const operation = { predecessor: active, chatId, candidate: null, continuation, screen };
+    const operation = { predecessor: active, chatId, candidate: null, continuation, visual, controller: new AbortController };
     let resolve, reject;
     operation.promise = new Promise((done, fail2) => {
       resolve = done;
       reject = fail2;
     });
-    if (screen)
-      screen.promise = operation.promise;
+    if (visual)
+      visual.promise = operation.promise;
     const previous = joining;
     joining = operation;
+    previous?.controller.abort();
     previous?.preparation?.close();
-    previous?.screen?.stop();
+    previous?.visual?.stop();
     emit({ joiningChatId: chatId });
     if (previous?.candidate && previous.candidate !== active)
       disposeCall(previous.candidate);
@@ -53310,7 +53767,8 @@ function createCallSession({ cloud, chat, media: mediaPort, mls, savePeerAudio,
           }
         }
       } finally {
-        operation.screen?.stop();
+        operation.controller.abort();
+        operation.visual?.stop();
         if (joining === operation) {
           joining = null;
           emit({ joiningChatId: null });
@@ -53322,8 +53780,9 @@ function createCallSession({ cloud, chat, media: mediaPort, mls, savePeerAudio,
   }
   function leave() {
     joinIntent += 1;
+    joining?.controller.abort();
     joining?.preparation?.close();
-    joining?.screen?.stop();
+    joining?.visual?.stop();
     const candidate = joining?.candidate;
     joining = null;
     emit({ joiningChatId: null });
@@ -53338,8 +53797,9 @@ function createCallSession({ cloud, chat, media: mediaPort, mls, savePeerAudio,
     if (!operation)
       return Promise.resolve();
     joinIntent += 1;
+    operation.controller.abort();
     operation.preparation?.close();
-    operation.screen?.stop();
+    operation.visual?.stop();
     joining = null;
     emit({ joiningChatId: null });
     const pending = operation.candidate && operation.candidate !== active ? disposeCall(operation.candidate) : null;
@@ -53358,15 +53818,17 @@ function createCallSession({ cloud, chat, media: mediaPort, mls, savePeerAudio,
       leaving = retired.length ? Promise.race([released, Promise.all(retired.map((room) => room.closing))]) : released;
     }
     if (!call2) {
-      emit({ phase: "idle", chatId: null, callId: null, mode: null, transport: null, participants: [], speaking: [], videoSources: [], sharingScreen: false, screenShareAvailable: false });
+      emit({ phase: "idle", chatId: null, callId: null, mode: null, transport: null, participants: [], speaking: [], videoSources: [], sharingScreen: false, screenShareAvailable: false, sharingCamera: false, cameraAvailable: false });
       return leaving;
     }
+    if (call2.discovery.descriptor?.callId === call2.callId)
+      call2.discovery.roster = call2.participants;
     active = null;
     leaving = disposeCall(call2);
     if (identity && discoveries.get(call2.chatId) === call2.discovery)
       observeRoster(call2.discovery);
     available();
-    emit({ phase: "idle", chatId: null, callId: null, mode: null, transport: null, participants: [], speaking: [], videoSources: [], sharingScreen: false, screenShareAvailable: false });
+    emit({ phase: "idle", chatId: null, callId: null, mode: null, transport: null, participants: [], speaking: [], videoSources: [], sharingScreen: false, screenShareAvailable: false, sharingCamera: false, cameraAvailable: false });
     return leaving;
   }
   async function retireDiscovery(call2) {
@@ -53387,15 +53849,20 @@ function createCallSession({ cloud, chat, media: mediaPort, mls, savePeerAudio,
   function finishDiscovery(entry, descriptor) {
     if (entry.finishing.has(descriptor.callId))
       return;
-    const finishing = retireDiscovery({ discovery: entry, callId: descriptor.callId, chatId: entry.epochState.manifest.chatId }).catch((error) => diag?.("call.close.error", { code: error?.code || "calls/discovery" })).finally(() => entry.finishing.delete(descriptor.callId));
+    const finishing = retireDiscovery({ discovery: entry, callId: descriptor.callId, chatId: entry.epochState.manifest.chatId }).catch((error) => diag?.("call.close.error", { code: error?.code || "calls/discovery" })).finally(() => {
+      entry.finishing.delete(descriptor.callId);
+      prune();
+    });
     entry.finishing.set(descriptor.callId, finishing);
   }
   function disposeCall(call2) {
     if (call2.closing)
       return call2.closing;
     call2.leaving = true;
-    call2.screen?.stop();
-    call2.screen = null;
+    call2.capturing?.stop();
+    call2.capturing = null;
+    call2.visual?.stop();
+    call2.visual = null;
     retiring.add(call2);
     clearTimeout(call2.timer);
     clearTimeout(call2.joinTimer);
@@ -53437,28 +53904,40 @@ function createCallSession({ cloud, chat, media: mediaPort, mls, savePeerAudio,
     });
     return call2.closing;
   }
-  function startScreenShare(chatId = active?.chatId) {
-    if (!identity || closed || !mediaPort?.captureScreen || !mediaPort.capabilities?.screen || !mediaPort.capabilities?.video || !mls || !cloud.calls || !chatId)
-      return Promise.reject(new Error("screen sharing is unavailable in this call"));
+  function startVisual(kind, chatId = active?.chatId) {
+    if (!identity || closed || !captureFor(kind) || !mediaPort.capabilities?.[kind] || !mediaPort.capabilities?.video || !mls || !cloud.calls || !chatId)
+      return Promise.reject(new Error(`${kind === "camera" ? "camera" : "screen sharing"} is unavailable in this call`));
     const operation = joining && [joining.chatId, state.joiningChatId].includes(chatId) ? joining : null;
-    if (operation?.screen)
-      return operation.screen.promise;
     const call2 = active?.chatId === chatId ? active : null;
-    if (call2 && !operation && !canShareScreen(call2))
-      return Promise.reject(new Error("screen sharing is unavailable in this call"));
+    const pending = operation?.visual || call2?.capturing;
+    if (pending?.kind === kind)
+      return pending.promise;
+    if (!pending && call2?.visual?.kind === kind)
+      return call2.visual.promise;
+    if (call2 && !operation && !canShare(call2, kind)) {
+      try {
+        assertCallVideoSources(call2.participants, call2.endpoint.holder, { sources: [{ id: "capture", kind, contextId: 1 }] });
+      } catch (error) {
+        return Promise.reject(error);
+      }
+      return Promise.reject(new Error(`${kind} is unavailable in this call`));
+    }
     if (!call2 && !foreground)
       return Promise.reject(new Error("open veyl to join a call"));
-    if (call2?.screen)
-      return call2.screen.promise;
+    let rejectCapture;
+    const cancellation = new Promise((_, reject) => {
+      rejectCapture = reject;
+    });
     const source = {
       id: toHex(randomBytes3(16)),
       contextId: null,
-      kind: "screen",
+      kind,
       stream: null,
       promise: null,
       cancelled: false,
       stop() {
         source.cancelled = true;
+        rejectCapture(cancelled2());
         for (const track of source.stream?.getTracks() || []) {
           track.removeEventListener?.("ended", sourceEnded);
           track.stop();
@@ -53466,18 +53945,18 @@ function createCallSession({ cloud, chat, media: mediaPort, mls, savePeerAudio,
       }
     };
     const sourceEnded = () => {
-      if (joining?.screen === source)
+      if (joining?.visual === source)
         cancelJoin();
-      else if (active?.screen === source)
-        stopScreenShare().catch(() => {});
+      else if (active?.visual === source || active?.capturing === source)
+        stopVisual().catch(() => {});
     };
     let capturing;
     try {
-      capturing = mediaPort.captureScreen();
+      capturing = captureFor(kind).call(mediaPort);
     } catch (error) {
       return Promise.reject(error);
     }
-    source.capture = Promise.resolve(capturing).then((stream) => {
+    source.capture = Promise.race([cancellation, Promise.resolve(capturing).then((stream) => {
       if (source.cancelled || stream.getTracks().some((track) => track.readyState === "ended")) {
         stream.getTracks().forEach((track) => track.stop());
         throw cancelled2();
@@ -53485,64 +53964,78 @@ function createCallSession({ cloud, chat, media: mediaPort, mls, savePeerAudio,
       source.stream = stream;
       for (const track of stream.getTracks())
         track.addEventListener?.("ended", sourceEnded, { once: true });
-    });
+    })]);
     if (operation) {
+      operation.visual = source;
+      if (pending !== call2?.visual)
+        pending?.stop();
       source.promise = Promise.all([source.capture, operation.promise]).then(() => {
         return;
       });
-      operation.screen = source;
       return source.promise;
     }
     if (!call2) {
       source.promise = runJoin(chatId, null, false, null, source);
       return source.promise;
     }
-    call2.screen = source;
+    call2.capturing = source;
+    if (pending !== call2.visual)
+      pending?.stop();
     source.promise = source.capture.then(() => {
-      if (!canShareScreen(call2))
+      if (source.cancelled || active !== call2 || call2.capturing !== source || call2.leaving || !call2.mediaReady)
         throw cancelled2();
-      return publishScreen(call2, source);
+      return publishVisual(call2, source);
     }).catch(async (error) => {
       source.stop();
-      if (call2.screen === source) {
-        call2.screen = null;
+      if (call2.visual === source) {
+        call2.visual = null;
         if (active === call2)
-          emit({ sharingScreen: false });
+          emit(sourceState(call2));
         if (!call2.leaving && source.stream)
           await call2.media.removeSource(source.id).catch(() => {});
       }
       throw error;
+    }).finally(() => {
+      if (call2.capturing === source)
+        call2.capturing = null;
     });
     return source.promise;
   }
-  async function publishScreen(call2, source) {
-    if (source.cancelled || active !== call2 || call2.leaving || !call2.mediaReady || !call2.media.supportsScreen())
+  async function publishVisual(call2, source) {
+    if (source.cancelled || active !== call2 || call2.leaving || !call2.mediaReady || !call2.media.supportsSource(source.kind))
       throw cancelled2();
+    const previous = call2.visual;
     source.contextId = ++call2.sourceContext;
-    call2.screen = source;
-    emit({ sharingScreen: true });
-    await call2.media.addSource(source);
-    if (active !== call2 || call2.screen !== source)
+    previous?.stop();
+    call2.visual = source;
+    emit(sourceState(call2));
+    await call2.media.addSource(source, previous?.id);
+    if (active !== call2 || call2.visual !== source)
       throw cancelled2();
   }
-  async function stopScreenShare() {
-    if (joining?.screen)
+  async function stopVisual(kind) {
+    if (joining?.visual && (!kind || joining.visual.kind === kind))
       return cancelJoin();
     const call2 = active;
-    const source = call2?.screen;
-    if (!source)
+    if (call2?.capturing && (!kind || call2.capturing.kind === kind || call2.visual?.kind === kind)) {
+      call2.capturing.stop();
+      call2.capturing = null;
+    }
+    const source = call2?.visual;
+    if (!source || kind && source.kind !== kind)
       return;
-    call2.screen = null;
+    call2.visual = null;
     source.stop();
-    emit({ sharingScreen: false });
+    emit(sourceState(call2));
     if (source.stream)
       await call2.media.removeSource(source.id);
   }
   function applyAudio(call2) {
     const audio = { muted: state.muted || state.deafened, deafened: state.deafened };
     const applied = Promise.all([call2.media.mute(audio.muted), call2.media.deafen(audio.deafened)]);
+    call2.pendingAudio = audio;
     const result = Promise.all([applied, call2.muteTail]).then(() => {
-      if (!call2.leaving)
+      if (!call2.leaving && call2.pendingAudio === audio)
         return call2.room.setAudio(audio);
     });
     call2.muteTail = result.catch(() => {});
@@ -53554,14 +54047,16 @@ function createCallSession({ cloud, chat, media: mediaPort, mls, savePeerAudio,
       return;
     const token = generation;
     pendingAudio = value;
-    const saving = Promise.resolve().then(() => {
+    const saving = audioSaveTail.then(async () => {
       if (generation !== token)
         throw cancelled2();
-      return saveAudio(value);
-    }).then(() => {
+      if (pendingAudio !== value)
+        return;
+      await saveAudio(value);
       if (generation === token)
         audioSource = value;
     });
+    audioSaveTail = saving.catch(() => {});
     try {
       await Promise.all([saving, applyAudioPreferences(value)]);
     } finally {
@@ -53732,6 +54227,7 @@ function createCallSession({ cloud, chat, media: mediaPort, mls, savePeerAudio,
     endpoint = null;
     discoveries.clear();
     discoveryReads.clear();
+    messageHints.clear();
     identity = session;
     const stopped = leave();
     Promise.resolve(stopped).finally(() => {
@@ -53746,6 +54242,7 @@ function createCallSession({ cloud, chat, media: mediaPort, mls, savePeerAudio,
     confirmedPeerAudio.clear();
     pendingPeerAudio.clear();
     pendingAudio = null;
+    audioSaveTail = Promise.resolve();
     audioSource = normalizeCallAudio(settings.callAudio);
     peerAudioSource = session ? peerAudio : null;
     for (const [chatPK, value] of Object.entries(peerAudioSource || {}))
@@ -53763,10 +54260,41 @@ function createCallSession({ cloud, chat, media: mediaPort, mls, savePeerAudio,
     return retirement;
   }
   function refreshObserved() {
-    for (const chatId of new Set([...observers.values()].map((item) => item.chatId))) {
+    for (const chatId of observedChatIds()) {
       readDiscovery(chatId).catch((error) => diag?.("call.discovery.error", { stage: "prepare", code: error?.code || "calls/admission" }));
     }
   }
+  function observedChatIds() {
+    return new Set([...observers.values()].map((item) => item.chatId).concat([...messageHints].filter(([, hint]) => hint.watch).map(([chatId]) => chatId)));
+  }
+  const unsubscribeMessages = chat.subscribeMessages((chatId, messages) => {
+    if (!identity || closed)
+      return;
+    let latest = null;
+    for (const message of messages) {
+      if (!isServerConfirmedMsg(message) || !readCallMessage(message))
+        continue;
+      if (!latest || getMessageOrderMs(message) > getMessageOrderMs(latest) || getMessageOrderMs(message) === getMessageOrderMs(latest) && getMessageKey(message) > getMessageKey(latest))
+        latest = message;
+    }
+    if (!latest)
+      return;
+    const at = getMessageOrderMs(latest), key = getMessageKey(latest);
+    if (!Number.isFinite(at) || !key)
+      return;
+    const previous = messageHints.get(chatId);
+    if (previous && (previous.at > at || previous.at === at && previous.key >= key))
+      return;
+    const entry = discoveries.get(chatId);
+    const watch = latest.event === "started" || previous?.watch === true || !!entry?.descriptor;
+    messageHints.delete(chatId);
+    messageHints.set(chatId, { at, key, watch });
+    while (messageHints.size > RECENT_CALL_HINT_LIMIT)
+      messageHints.delete(messageHints.keys().next().value);
+    prune();
+    if (watch && online)
+      readDiscovery(chatId).catch((error) => diag?.("call.discovery.error", { stage: "message", code: error?.code || "calls/discovery" }));
+  });
   const unsubscribe = chat.subscribe(() => {
     if (!identity)
       return;
@@ -53780,6 +54308,7 @@ function createCallSession({ cloud, chat, media: mediaPort, mls, savePeerAudio,
         const intent = ++joinIntent;
         const previous = active || joining?.candidate;
         active = null;
+        joining?.controller.abort();
         joining = null;
         if (previous)
           disposeCall(previous);
@@ -53791,6 +54320,8 @@ function createCallSession({ cloud, chat, media: mediaPort, mls, savePeerAudio,
           videoSources: [],
           sharingScreen: false,
           screenShareAvailable: false,
+          sharingCamera: false,
+          cameraAvailable: false,
           participants: state.participants.filter((member) => members.has(member.chatPK))
         });
         diag?.("call.epoch.transition", { stage: "starting", participants: state.participants.length });
@@ -53809,11 +54340,11 @@ function createCallSession({ cloud, chat, media: mediaPort, mls, savePeerAudio,
       closeDiscovery(entry);
       discoveries.delete(chatId);
       available();
-      if (online && [...observers.values()].some((item) => item.chatId === chatId))
+      if (online && observedChatIds().has(chatId))
         readDiscovery(chatId).catch(() => {});
     }
     if (online)
-      for (const chatId of new Set([...observers.values()].map((item) => item.chatId))) {
+      for (const chatId of observedChatIds()) {
         if (!discoveries.has(chatId) && !discoveryReads.has(chatId) && chat.getSnapshot().getOwnerChat(chatId)?.epochState) {
           readDiscovery(chatId).catch((error) => diag?.("call.discovery.error", { stage: "prepare", code: error?.code || "calls/admission" }));
         }
@@ -53831,8 +54362,10 @@ function createCallSession({ cloud, chat, media: mediaPort, mls, savePeerAudio,
     leave,
     cancelJoin,
     setMicrophoneVolume,
-    startScreenShare,
-    stopScreenShare,
+    startScreenShare: (chatId) => startVisual("screen", chatId),
+    stopScreenShare: () => stopVisual("screen"),
+    startCamera: (chatId) => startVisual("camera", chatId),
+    stopCamera: () => stopVisual("camera"),
     async resolveActiveCall(chatId) {
       const entry = await readDiscovery(chatId);
       return entry.descriptor?.callId || null;
@@ -53847,6 +54380,7 @@ function createCallSession({ cloud, chat, media: mediaPort, mls, savePeerAudio,
         return Promise.reject(ended());
       return join(chatId, callId, true);
     },
+    setAudio,
     setMuted(value) {
       return setAudio({ muted: value === true });
     },
@@ -53880,6 +54414,7 @@ function createCallSession({ cloud, chat, media: mediaPort, mls, savePeerAudio,
       });
       closed = true;
       const stopped = setSources(null);
+      unsubscribeMessages();
       unsubscribe();
       listeners.clear();
       Promise.resolve(stopped).finally(() => Promise.all([mls?.close?.(), mediaPort?.close?.()])).then(finish, reject);
@@ -53887,7 +54422,7 @@ function createCallSession({ cloud, chat, media: mediaPort, mls, savePeerAudio,
     }
   });
 }
-var initial = () => ({ phase: "idle", chatId: null, callId: null, joiningChatId: null, mode: null, transport: null, available: null, elsewhere: null, participants: [], speaking: [], videoSources: [], sharingScreen: false, screenShareAvailable: false, peerAudio: {}, muted: false, deafened: false, microphoneVolume: 100, error: null }), cancelled2 = () => Object.assign(new Error("call cancelled"), { code: "calls/cancelled" }), ended = () => Object.assign(new Error("this call has ended"), { code: "calls/ended" }), callError = (chatId, error) => ({ chatId, code: error?.code || "calls/failed", message: error?.message || "could not connect the call" });
+var initial = () => ({ phase: "idle", chatId: null, callId: null, joiningChatId: null, mode: null, transport: null, available: null, elsewhere: null, participants: [], speaking: [], videoSources: [], sharingScreen: false, screenShareAvailable: false, sharingCamera: false, cameraAvailable: false, peerAudio: {}, muted: false, deafened: false, microphoneVolume: 100, error: null }), cancelled2 = () => Object.assign(new Error("call cancelled"), { code: "calls/cancelled" }), ended = () => Object.assign(new Error("this call has ended"), { code: "calls/ended" }), RECENT_CALL_HINT_LIMIT = 32, callError = (chatId, error) => ({ chatId, code: error?.code || "calls/failed", message: error?.message || "could not connect the call" });
 var init_session5 = __esm(() => {
   init_core();
   init_identity();
@@ -53898,9 +54433,11 @@ var init_session5 = __esm(() => {
   init_media5();
   init_observation();
   init_wire();
-  init_call();
+  init_state();
+  init_control();
   init_ownership();
   init_settings();
+  init_sources();
 });
 
 // ../../node_modules/.bun/@zxcvbn-ts+core@4.2.0/node_modules/@zxcvbn-ts/core/dist/utils/helper.cjs
@@ -57524,6 +58061,18 @@ function stablePeerMap(previous, next) {
   }
   return previous;
 }
+function replaceIndexedPeers(index2, updates, field) {
+  let next = index2;
+  for (const peer of updates.values()) {
+    const key = peer[field];
+    if (!key || index2.get(key)?.uid !== peer.uid)
+      continue;
+    if (next === index2)
+      next = new Map(index2);
+    next.set(key, peer);
+  }
+  return next;
+}
 function stableValueSet(previous, next) {
   if (previous === next)
     return previous;
@@ -57551,12 +58100,11 @@ function peerProfileSnapshot(peer) {
     active: !!peer.active,
     presence: peer.presence,
     accountType: peer.accountType || null,
-    blocked: !!peer.blocked,
-    hidden: !!peer.hidden
+    blocked: !!peer.blocked
   };
 }
 function samePeerProfile(left, right) {
-  return left === right || !!left && !!right && left.uid === right.uid && left.username === right.username && left.chatPK === right.chatPK && left.chatSigningPK === right.chatSigningPK && left.notificationPK === right.notificationPK && sameChatAdmission(left.chatAdmission, right.chatAdmission) && left.walletPK === right.walletPK && left.avatar === right.avatar && left.avatarVersion === right.avatarVersion && left.active === right.active && left.presence === right.presence && left.accountType === right.accountType && left.blocked === right.blocked && left.hidden === right.hidden;
+  return left === right || !!left && !!right && left.uid === right.uid && left.username === right.username && left.chatPK === right.chatPK && left.chatSigningPK === right.chatSigningPK && left.notificationPK === right.notificationPK && sameChatAdmission(left.chatAdmission, right.chatAdmission) && left.walletPK === right.walletPK && left.avatar === right.avatar && left.avatarVersion === right.avatarVersion && left.active === right.active && left.presence === right.presence && left.accountType === right.accountType && left.blocked === right.blocked;
 }
 function normalizeProfileIdentity(identity = {}) {
   const uid = String(identity?.uid || "").trim();
@@ -57646,7 +58194,6 @@ function createPeerList({ peerApi, presence, diag, onMissingPeers }) {
   let blockedUids = [];
   let blockedUidsKey = "";
   let blockedUidSet = new Set;
-  let hiddenPeerUidSet = new Set;
   let seenWalletPKs = new Set;
   let seenChatPKs = new Set;
   let walletPKs = [];
@@ -57680,7 +58227,7 @@ function createPeerList({ peerApi, presence, diag, onMissingPeers }) {
     subscriberCount += 1;
     if (!firstSubscriber)
       return;
-    unsubscribePresence = presence.subscribePeers(() => rebuild({ projection: true, persist: false }));
+    unsubscribePresence = presence.subscribePeers(updatePresence);
     hydrateLocalAvatars();
     const becameReady = startProfileLoad();
     if (becameReady) {
@@ -57712,7 +58259,7 @@ function createPeerList({ peerApi, presence, diag, onMissingPeers }) {
   function resolveProfile(identity) {
     if (!identity)
       return null;
-    const peer = (identity.uid ? peerByUid.get(identity.uid) : null) ?? (identity.username ? peerByUsername.get(identity.username) : null) ?? (identity.chatPK ? peerByChatPK.get(identity.chatPK) : null) ?? (identity.walletPK ? peerByWalletPK.get(identity.walletPK) : null) ?? null;
+    const peer = (identity.uid ? allPeerByUid.get(identity.uid) : null) ?? (identity.username ? peerByUsername.get(identity.username) : null) ?? (identity.chatPK ? peerByChatPK.get(identity.chatPK) : null) ?? (identity.walletPK ? peerByWalletPK.get(identity.walletPK) : null) ?? null;
     return peer?.uid ? peerProfilesByUid.get(peer.uid) || null : null;
   }
   function emitProfiles() {
@@ -57743,8 +58290,6 @@ function createPeerList({ peerApi, presence, diag, onMissingPeers }) {
       primePeer,
       findPeer,
       updatePeer,
-      dropPeer,
-      restorePeer,
       loadBlockedPeers
     };
   }
@@ -57822,7 +58367,7 @@ function createPeerList({ peerApi, presence, diag, onMissingPeers }) {
   function syncPresencePeers() {
     const candidates = new Map;
     const add2 = (profile) => {
-      if (!profile?.uid || profile.blocked || profile.hidden || candidates.size >= RECENT_PEER_REFRESH_LIMIT)
+      if (!profile?.uid || profile.blocked || candidates.size >= RECENT_PEER_REFRESH_LIMIT)
         return;
       candidates.set(profile.uid, profile);
     };
@@ -57846,33 +58391,61 @@ function createPeerList({ peerApi, presence, diag, onMissingPeers }) {
   function buildBasePeers() {
     allPeers = assemblePeers(walletPeerSet, sources.chatPeers, discoveredPeerUids);
   }
-  function buildPeerProjection() {
-    const blockedPeerUidSet = new Set(blockedUids);
-    for (const peer of blockedPeers) {
-      if (peer?.uid)
-        blockedPeerUidSet.add(peer.uid);
+  function projectPeer(peer) {
+    const activity = presence.getPeer(peer);
+    const next = {
+      ...peer,
+      active: activity.availability === "online",
+      presence: activity,
+      blocked: blockedUidSet.has(peer.uid)
+    };
+    const previous = allPeerByUid.get(peer.uid);
+    return samePeerRecord(previous, next) ? previous : next;
+  }
+  function updatePresence(changedUids) {
+    const updates = new Map;
+    for (const uid of changedUids) {
+      const previous = allPeerByUid.get(uid);
+      if (!previous)
+        continue;
+      const next = projectPeer(previous);
+      if (next !== previous)
+        updates.set(uid, next);
     }
+    if (!updates.size)
+      return;
+    allPeerByUid = replaceIndexedPeers(allPeerByUid, updates, "uid");
+    peerByUid = replaceIndexedPeers(peerByUid, updates, "uid");
+    peerByWalletPK = replaceIndexedPeers(peerByWalletPK, updates, "walletPK");
+    peerByChatPK = replaceIndexedPeers(peerByChatPK, updates, "chatPK");
+    peerByUsername = replaceIndexedPeers(peerByUsername, updates, "username");
+    const replaceList = (list) => stablePeerList(list, list.map((peer) => updates.get(peer.uid) || peer));
+    visiblePeers = replaceList(visiblePeers);
+    blockedPeerItems = replaceList(blockedPeerItems);
+    const all = replaceList(recentPeers.all);
+    const wallet = replaceList(recentPeers.wallet);
+    const chat = replaceList(recentPeers.chat);
+    if (all !== recentPeers.all || wallet !== recentPeers.wallet || chat !== recentPeers.chat)
+      recentPeers = { all, wallet, chat };
+    peerProfilesByUid = new Map(peerProfilesByUid);
+    for (const peer of updates.values()) {
+      const next = peerProfileSnapshot(peer);
+      const previous = peerProfilesByUid.get(peer.uid);
+      peerProfilesByUid.set(peer.uid, samePeerProfile(previous, next) ? previous : next);
+    }
+    publish();
+  }
+  function buildPeerProjection() {
     const peerMap = new Map;
     for (const peer of allPeers)
       mergePeerRecord(peerMap, peer);
     for (const peer of blockedPeers)
       mergePeerRecord(peerMap, peer);
-    const taggedPeers = Array.from(peerMap.values()).map((peer) => {
-      const activity = presence.getPeer(peer);
-      const next = {
-        ...peer,
-        active: activity.availability === "online",
-        presence: activity,
-        blocked: blockedPeerUidSet.has(peer.uid) || hiddenPeerUidSet.has(peer.uid),
-        hidden: hiddenPeerUidSet.has(peer.uid)
-      };
-      const previous = allPeerByUid.get(peer.uid);
-      return samePeerRecord(previous, next) ? previous : next;
-    });
-    visiblePeers = stablePeerList(visiblePeers, taggedPeers.filter((peer) => !peer.blocked && !peer.hidden));
+    const taggedPeers = Array.from(peerMap.values()).map(projectPeer);
+    visiblePeers = stablePeerList(visiblePeers, taggedPeers.filter((peer) => !peer.blocked));
     const blockedByUid = new Map(taggedPeers.filter((peer) => peer?.uid && peer.blocked).map((peer) => [peer.uid, peer]));
     const orderedBlocked = blockedUids.map((uid) => blockedByUid.get(uid)).filter((peer) => peer?.uid);
-    blockedPeerItems = stablePeerList(blockedPeerItems, orderedBlocked.length || blockedUids.length ? orderedBlocked : Array.from(blockedByUid.values()));
+    blockedPeerItems = stablePeerList(blockedPeerItems, orderedBlocked);
     blockedChatPKSet = stableValueSet(blockedChatPKSet, new Set(taggedPeers.filter((peer) => peer.blocked && peer.chatPK).map((peer) => peer.chatPK)));
     const allIndexes = indexPeers(taggedPeers);
     const visibleIndexes = indexPeers(visiblePeers);
@@ -57985,7 +58558,6 @@ function createPeerList({ peerApi, presence, diag, onMissingPeers }) {
     blockedPeersReady = false;
     discoveredPeerUids = new Set;
     blockedPeers = [];
-    hiddenPeerUidSet = new Set;
     seenWalletPKs = new Set;
     seenChatPKs = new Set;
     allPeers = [];
@@ -58098,6 +58670,10 @@ function createPeerList({ peerApi, presence, diag, onMissingPeers }) {
       blockedUids = nextBlockedUids;
       blockedUidsKey = nextBlockedUidsKey;
       blockedUidSet = new Set(blockedUids);
+      for (const uid of blockedUids) {
+        if (allPeerByUid.has(uid))
+          discoveredPeerUids.add(uid);
+      }
       if (blockedPeersReady) {
         blockedPeers = blockedPeers.filter((peer) => blockedUidSet.has(peer?.uid));
       }
@@ -58139,7 +58715,7 @@ function createPeerList({ peerApi, presence, diag, onMissingPeers }) {
     const enrichedPeer = await fetchAndCachePeer(partialProfile);
     if (!isCurrent(session) || !enrichedPeer)
       return null;
-    if (blockedUidSet.has(enrichedPeer.uid) || hiddenPeerUidSet.has(enrichedPeer.uid))
+    if (blockedUidSet.has(enrichedPeer.uid))
       return null;
     if (!discoveredPeerUids.has(enrichedPeer.uid)) {
       discoveredPeerUids.add(enrichedPeer.uid);
@@ -58198,37 +58774,14 @@ function createPeerList({ peerApi, presence, diag, onMissingPeers }) {
       if (requestedKey !== blockedUidsKey)
         continue;
       blockedPeers = requestedUids.map((uid) => nextByUid.get(uid)).filter((peer) => peer?.uid);
+      for (const peer of blockedPeers)
+        discoveredPeerUids.add(peer.uid);
       blockedPeersReady = true;
-      rebuild({ projection: true });
+      rebuild({ base: true });
       return blockedPeers;
     }
     return blockedPeers;
   }
-  function dropPeer(peer) {
-    const uid = peerUid(peer);
-    if (!uid)
-      return;
-    const discovered = discoveredPeerUids.has(uid);
-    if (!hiddenPeerUidSet.has(uid)) {
-      hiddenPeerUidSet.add(uid);
-    }
-    if (discovered) {
-      discoveredPeerUids.delete(uid);
-    }
-    if (typeof peer === "object" && peer?.uid) {
-      blockedPeers = [...blockedPeers.filter((item) => item?.uid !== uid), peer];
-    }
-    rebuild(discovered ? { base: true } : { projection: true });
-  }
-  function restorePeer(peer) {
-    const uid = peerUid(peer);
-    if (!uid)
-      return;
-    hiddenPeerUidSet.delete(uid);
-    blockedPeers = blockedPeers.filter((item) => item?.uid !== uid);
-    discoveredPeerUids.add(uid);
-    rebuild({ base: true });
-  }
   snapshot = makeSnapshot();
   return {
     getSnapshot() {
@@ -60972,7 +61525,7 @@ function compareRecentTransfer(a, b) {
   return String(b?.id || "").localeCompare(String(a?.id || ""));
 }
 function sameTransfer(left, right) {
-  return left?.id === right?.id && left?.status === right?.status && txCreatedMs(left) === txCreatedMs(right) && txUpdatedMs(left) === txUpdatedMs(right) && left?.totalValue === right?.totalValue && left?.type === right?.type && left?.transferDirection === right?.transferDirection && left?.senderIdentityPublicKey === right?.senderIdentityPublicKey && left?.receiverIdentityPublicKey === right?.receiverIdentityPublicKey && left?.bitcoinAddress === right?.bitcoinAddress && left?.bitcoinTxid === right?.bitcoinTxid && left?.lightningAddress === right?.lightningAddress;
+  return left?.id === right?.id && left?.status === right?.status && txCreatedMs(left) === txCreatedMs(right) && txUpdatedMs(left) === txUpdatedMs(right) && left?.totalValue === right?.totalValue && left?.tokenIdentifier === right?.tokenIdentifier && left?.amountUnits === right?.amountUnits && left?.network === right?.network && left?.type === right?.type && left?.transferDirection === right?.transferDirection && left?.senderIdentityPublicKey === right?.senderIdentityPublicKey && left?.receiverIdentityPublicKey === right?.receiverIdentityPublicKey && left?.bitcoinAddress === right?.bitcoinAddress && left?.bitcoinTxid === right?.bitcoinTxid && left?.lightningAddress === right?.lightningAddress;
 }
 function sameTransfers(a = [], b = []) {
   if (a === b) {
@@ -61030,7 +61583,7 @@ function compactTransfer(tx, { incoming = false, bitcoinAddress = null, bitcoinT
     senderIdentityPublicKey: hexKey(tx.senderIdentityPublicKey),
     receiverIdentityPublicKey: hexKey(tx.receiverIdentityPublicKey),
     status: enumName(tx.status, TRANSFER_STATUS_BY_CODE),
-    totalValue: satValue(tx.totalValue),
+    ...type === "TOKEN_TRANSFER" ? { tokenIdentifier: tx.tokenIdentifier, amountUnits: tx.amountUnits, network: tx.network } : { totalValue: satValue(tx.totalValue) },
     createdTime: tx.createdTime,
     updatedTime: tx.updatedTime,
     type,
@@ -61264,32 +61817,6 @@ function mergeTransferPageForWallet(currentTransfers = [], pageTransfers = [], w
   const page = compactTransfersForWallet(pageTransfers, walletPK);
   return mergeCompactedTransferPage(current, page, position);
 }
-function mergeRecentSnapshotForWallet(currentTransfers = [], latestTransfers = [], walletPK) {
-  const currentById = new Map(currentTransfers.map((tx) => [String(tx?.id || ""), tx]));
-  const latest = mergeTransferPageForWallet([], latestTransfers, walletPK, "append").map((tx) => mergeTransferDetails(currentById.get(String(tx?.id || "")), tx));
-  if (!latest.length) {
-    return filterTransfersForWallet(currentTransfers, walletPK);
-  }
-  const latestIds = new Set(latest.map((tx) => String(tx.id)));
-  const latestById = new Map(latest.map((tx) => [String(tx.id), tx]));
-  const oldestLatestMs = getOldestTransferMs(latest);
-  const olderCurrent = filterTransfersForWallet(currentTransfers, walletPK).filter((tx) => {
-    const id = String(tx?.id || "");
-    if (latestIds.has(id)) {
-      const latestTx = latestById.get(id);
-      if (isPendingTransfer(latestTx) && !isPendingTransfer(tx)) {
-        return true;
-      }
-      return false;
-    }
-    if (isPendingTransfer(tx)) {
-      return false;
-    }
-    const createdMs = txCreatedMs(tx);
-    return oldestLatestMs == null || createdMs > 0 && createdMs < oldestLatestMs;
-  });
-  return mergeTransferPage(latest, olderCurrent, "append");
-}
 function markClaimedTransfersCompleted(transfers = [], ids = []) {
   const claimedIds = new Set((Array.isArray(ids) ? ids : [ids]).map((id) => String(id || "")).filter(Boolean));
   if (!claimedIds.size)
@@ -61539,7 +62066,7 @@ async function refreshRequestedTransfers(owner, ids = []) {
         const resolvedIds = requestedTransfers.filter((transfer) => !isPendingTransfer(transfer)).map((transfer) => String(transfer.id));
         forgetPending(owner, resolvedIds);
         if (nextTransfers !== currentTransfers) {
-          await owner.snapshot.commitConfirmed(requestedTransfers.filter((transfer) => !isPendingTransfer(transfer)), { position: "prepend" });
+          await owner.snapshot.commitHistory(overlayPending(owner, updates.map((transfer) => compactTransfer(transfer))), { position: "prepend" });
           if (!isCurrentGeneration(owner, generation))
             return [];
           owner.snapshot.replace(mergeTransferPageForWallet(owner.snapshot.getTransfers(), updates, owner.walletPK, "append"));
@@ -61657,8 +62184,7 @@ async function commitPendingReconciliation(owner, plan, result, generation) {
   const nextTransfers = result.updates.length ? overlayPending(owner, mergeTransferPageForWallet(current, result.updates, owner.walletPK, "append")) : current;
   forgetPending(owner, result.resolvedIds);
   if (nextTransfers !== current) {
-    const selectedIds = new Set(plan.selectedIds);
-    await owner.snapshot.commitConfirmed(nextTransfers.filter((transfer) => selectedIds.has(String(transfer?.id)) && !isPendingTransfer(transfer)), { position: "prepend" });
+    await owner.snapshot.commitHistory(overlayPending(owner, result.updates.map((transfer) => compactTransfer(transfer))), { position: "prepend" });
     if (!isCurrentGeneration(owner, generation))
       return null;
     owner.snapshot.replace(mergeTransferPageForWallet(owner.snapshot.getTransfers(), result.updates, owner.walletPK, "append"));
@@ -61869,13 +62395,17 @@ function hydrateRecentHistory(owner) {
     return owner.hydratePromise;
   const generation = owner.generation;
   const startedAt = Date.now();
-  const request2 = owner.historyStore.query({ limit: WORKING_CONFIRMED_TRANSFER_LIMIT }).then((result) => {
-    if (!isCurrentGeneration2(owner, generation) || owner.snapshot.getTransfers().length || !result.transfers.length)
+  const request2 = owner.historyStore.query({ limit: WORKING_CONFIRMED_TRANSFER_LIMIT }).then(async (result) => {
+    const loadedIds = new Set(result.transfers.map((tx) => String(tx.id)));
+    const missingPending = Object.keys(owner.historyStore.getSnapshot().projection?.pending || {}).filter((id) => !loadedIds.has(id));
+    const pending = await Promise.all(missingPending.map((id) => owner.historyStore.getById(id)));
+    const transfers = pending.length ? mergeTransferPage(result.transfers, pending.filter(Boolean), "prepend") : result.transfers;
+    if (!isCurrentGeneration2(owner, generation) || owner.snapshot.getTransfers().length || !transfers.length)
       return false;
     owner.nextOffset = owner.historyStore.getSnapshot().nextOffset;
-    owner.snapshot.replace(result.transfers);
+    owner.snapshot.replace(transfers);
     owner.snapshot.setReady();
-    markDone(owner.diag, "wallet.history.hydrate", startedAt, { count: result.transfers.length });
+    markDone(owner.diag, "wallet.history.hydrate", startedAt, { count: transfers.length, pending: pendingTransfers(transfers).length });
     return true;
   }).catch((error) => {
     if (isCurrentGeneration2(owner, generation))
@@ -61934,13 +62464,12 @@ async function fetchHistoryPages(owner, options, generation) {
     completeOnStop: !!completeOnStop
   });
   try {
-    let stagedTransfers = owner.snapshot.getTransfers();
     let oldestFetchedMs = null;
     let stoppedAtKnownTransfer = false;
     while ((!owner.historyStore.getSnapshot().complete || force) && pages < maxPages) {
       if (!isCurrentGeneration2(owner, generation) || owner.backgroundSignal?.aborted === true)
         break;
-      if (!allHistory && Number.isFinite(sinceMs) && stagedHistoryCoverage(owner, stagedTransfers, oldestFetchedMs, sinceMs, force))
+      if (!allHistory && Number.isFinite(sinceMs) && stagedHistoryCoverage(owner, owner.snapshot.getTransfers(), oldestFetchedMs, sinceMs, force))
         break;
       const offset = owner.nextOffset;
       const rawPage = await owner.readPage(TRANSFER_PAGE_LIMIT, offset, undefined, new Date(boundaryMs));
@@ -61951,12 +62480,11 @@ async function fetchHistoryPages(owner, options, generation) {
       const pageHitStopId = stopIds.size > 0 && page.transfers.some((transfer) => stopIds.has(String(transfer?.id)));
       if (page.transfers.length) {
         owner.pending.forgetResolvedFetched(page.transfers);
-        stagedTransfers = boundedWorkingTransfers(mergeTransferPageForWallet(stagedTransfers, page.transfers, owner.walletPK, "append"));
         const oldestPageMs = getOldestTransferMs(page.transfers);
         if (oldestPageMs != null)
           oldestFetchedMs = oldestFetchedMs == null ? oldestPageMs : Math.min(oldestFetchedMs, oldestPageMs);
       }
-      await owner.commitConfirmed(page.transfers, {
+      await owner.commitHistory(page.transfers, {
         position: "append",
         nextOffset: page.nextOffset,
         boundaryMs,
@@ -61964,6 +62492,7 @@ async function fetchHistoryPages(owner, options, generation) {
       });
       if (!isCurrentGeneration2(owner, generation))
         break;
+      owner.snapshot.replace(mergeTransferPageForWallet(owner.snapshot.getTransfers(), page.transfers, owner.walletPK, "append"));
       owner.nextOffset = Math.max(owner.nextOffset, page.nextOffset);
       await yieldToUi();
       if (pageHitStopId) {
@@ -61974,7 +62503,6 @@ async function fetchHistoryPages(owner, options, generation) {
         break;
     }
     if (isCurrentGeneration2(owner, generation)) {
-      owner.snapshot.replace(stagedTransfers);
       markDone(owner.diag, label, startedAt, {
         pages,
         loaded: owner.snapshot.getTransfers().length,
@@ -62071,13 +62599,12 @@ async function refreshCachedHistory(owner, includePending = true, reason = "cach
       deltaAfterMs = Math.max(0, deltaState.newestMs - 1);
       deltaBeforeMs = Date.now();
       offset = 0;
-      await owner.commitConfirmed([], { deltaAfterMs, deltaBeforeMs, deltaNextOffset: 0 });
+      await owner.commitHistory([], { deltaAfterMs, deltaBeforeMs, deltaNextOffset: 0 });
       if (!isCurrentGeneration2(owner, generation))
         return null;
     }
     const createdAfter = new Date(deltaAfterMs);
     const createdBefore = new Date(deltaBeforeMs);
-    let stagedTransfers = owner.snapshot.getTransfers();
     let rawCount = 0;
     let pages = 0;
     let complete = false;
@@ -62089,10 +62616,7 @@ async function refreshCachedHistory(owner, includePending = true, reason = "cach
       rawCount += page.transfers.length;
       pages += 1;
       complete = !page.hasMore;
-      if (page.transfers.length) {
-        stagedTransfers = boundedWorkingTransfers(mergeTransferPageForWallet(stagedTransfers, page.transfers, walletKey, "prepend"));
-      }
-      await owner.commitConfirmed(page.transfers, {
+      await owner.commitHistory(page.transfers, {
         position: "prepend",
         deltaAfterMs: complete ? null : deltaAfterMs,
         deltaBeforeMs: complete ? null : deltaBeforeMs,
@@ -62100,6 +62624,8 @@ async function refreshCachedHistory(owner, includePending = true, reason = "cach
       });
       if (!isCurrentGeneration2(owner, generation))
         return null;
+      owner.pending.forgetResolvedFetched(page.transfers);
+      owner.snapshot.replace(mergeTransferPageForWallet(owner.snapshot.getTransfers(), page.transfers, walletKey, "prepend"));
       offset = page.nextOffset;
       if (complete)
         break;
@@ -62108,10 +62634,14 @@ async function refreshCachedHistory(owner, includePending = true, reason = "cach
     if (!isCurrentGeneration2(owner, generation) || owner.backgroundSignal?.aborted === true)
       return null;
     const pending = includePending ? await owner.pending.query() : [];
+    if (!isCurrentGeneration2(owner, generation))
+      return null;
+    if (pending.length)
+      await owner.commitHistory(pending, { position: "prepend" });
     if (!isCurrentGeneration2(owner, generation))
       return null;
     owner.pending.remember(pending.map((transfer) => transfer.id));
-    const nextTransfers = pending.length ? mergeTransferPageForWallet(stagedTransfers, pending, walletKey, "prepend") : stagedTransfers;
+    const nextTransfers = pending.length ? mergeTransferPageForWallet(owner.snapshot.getTransfers(), pending, walletKey, "prepend") : owner.snapshot.getTransfers();
     owner.snapshot.replace(nextTransfers);
     const visibleCount = Math.min(nextTransfers.length, Math.max(owner.snapshot.getTransfers().length, RECENT_TRANSFER_LIMIT));
     owner.snapshot.publish(nextTransfers.slice(0, visibleCount));
@@ -62200,7 +62730,7 @@ async function loadRecentTransfers(owner, options = {}, generation = owner.gener
     const loadedPendingIncoming = includePending ? owner.pending.claimCandidates(latestTransfers) : [];
     const latestIds = new Set(latestTransfers.map((transfer) => String(transfer?.id)).filter(Boolean));
     const reconcileIds = previousHistoryComplete ? [] : previousTransfers.filter((transfer) => transfer?.id && !latestIds.has(String(transfer.id)) && !isPendingTransfer(transfer)).map((transfer) => String(transfer.id));
-    await owner.commitConfirmed(page.transfers, {
+    await owner.commitHistory([...pending, ...page.transfers], {
       position: "prepend",
       nextOffset: Math.max(owner.historyStore.getSnapshot().nextOffset, page.nextOffset),
       boundaryMs,
@@ -62208,12 +62738,11 @@ async function loadRecentTransfers(owner, options = {}, generation = owner.gener
     });
     if (!isCurrentGeneration2(owner, generation))
       return null;
-    const fetchedTransfers = page.hasMore ? mergeRecentSnapshotForWallet(previousTransfers, latestTransfers, owner.walletPK) : mergeTransferPageForWallet([], latestTransfers, owner.walletPK);
-    const committedTransfers = boundedWorkingTransfers(mergeTransferPageForWallet(owner.snapshot.getTransfers(), fetchedTransfers, owner.walletPK, "append"));
     if (!showLoading)
       await yieldToUi();
     if (!isCurrentGeneration2(owner, generation))
       return null;
+    const committedTransfers = boundedWorkingTransfers(mergeTransferPageForWallet(owner.snapshot.getTransfers(), [...pending, ...page.transfers], owner.walletPK, "append"));
     owner.nextOffset = Math.max(owner.nextOffset, page.nextOffset);
     const committedHistory = owner.historyStore.getSnapshot();
     const visibleCount = Math.min(committedTransfers.length, Math.max(owner.snapshot.getTransfers().length, RECENT_TRANSFER_LIMIT));
@@ -62263,8 +62792,8 @@ function getRecentTransfers(owner, options = {}) {
   owner.recentPromise = request2;
   return request2;
 }
-function createTransferHistorySync({ walletPK, historyStore, initialOffset = 0, snapshot, readPage, commitConfirmed, pending, waitForWork, backgroundSignal = null, isClosed, diag = null } = {}) {
-  if (!walletPK || !historyStore || !snapshot || typeof readPage !== "function" || typeof commitConfirmed !== "function" || !pending || typeof waitForWork !== "function" || typeof isClosed !== "function") {
+function createTransferHistorySync({ walletPK, historyStore, initialOffset = 0, snapshot, readPage, commitHistory, pending, waitForWork, backgroundSignal = null, isClosed, diag = null } = {}) {
+  if (!walletPK || !historyStore || !snapshot || typeof readPage !== "function" || typeof commitHistory !== "function" || !pending || typeof waitForWork !== "function" || typeof isClosed !== "function") {
     throw new Error("transfer history sync requires history, snapshot, pending, and read ports");
   }
   const owner = {
@@ -62272,7 +62801,7 @@ function createTransferHistorySync({ walletPK, historyStore, initialOffset = 0,
     historyStore,
     snapshot,
     readPage,
-    commitConfirmed,
+    commitHistory,
     pending,
     waitForWork,
     backgroundSignal,
@@ -62362,13 +62891,20 @@ function compareTransfers(left, right) {
   const delta = txCreatedMs(right) - txCreatedMs(left);
   return delta || transferId(right).localeCompare(transferId(left));
 }
+function mergeHistoryTransfer(current, next) {
+  if (!current)
+    return next;
+  if (!isPendingTransfer(current) && isPendingTransfer(next) || txUpdatedMs(next) < txUpdatedMs(current))
+    return current;
+  return { ...current, ...next };
+}
 function normalizeTransfers(transfers, walletPK) {
   const byId = new Map;
   for (const transfer of Array.isArray(transfers) ? transfers : EMPTY_TRANSFERS) {
     const id = transferId(transfer);
     if (!id || !isVisibleTransfer(transfer) || !transferBelongsToWallet(transfer, walletPK))
       continue;
-    byId.set(id, jsonClone(transfer));
+    byId.set(id, mergeHistoryTransfer(byId.get(id), jsonClone(transfer)));
   }
   return [...byId.values()].sort(compareTransfers);
 }
@@ -62393,7 +62929,8 @@ function emptyProjection() {
     days: {},
     hours: {},
     months: {},
-    peers: {}
+    peers: {},
+    pending: {}
   };
 }
 function cleanStats(value) {
@@ -62408,6 +62945,7 @@ function cleanStats(value) {
 }
 function cleanProjection(value) {
   const projection = emptyProjection();
+  projection.pending = { ...value?.pending };
   projection.all = cleanStats(value?.all);
   for (const [key, stats] of Object.entries(value?.days || {}))
     projection.days[key] = cleanStats(stats);
@@ -62444,6 +62982,8 @@ function applyStats(stats, transfer, sign2, { excludeFunding = false } = {}) {
   const amount = Number(transfer?.totalValue) || 0;
   const incoming = isIncomingTransfer(transfer);
   stats.count += sign2;
+  if (incoming && isPendingTransfer(transfer))
+    return;
   stats.vol += sign2 * amount;
   if (incoming) {
     stats.received += sign2 * amount;
@@ -62462,6 +63002,11 @@ function normalizeStats(stats) {
   return stats;
 }
 function applyProjection(projection, transfer, sign2) {
+  const id = transferId(transfer);
+  if (sign2 > 0 && isPendingTransfer(transfer))
+    projection.pending[id] = txCreatedMs(transfer);
+  else
+    delete projection.pending[id];
   const { day, hour, month } = timeKeys(transfer);
   projection.days[day] ||= emptyStats();
   projection.hours[hour] ||= emptyStats();
@@ -62547,11 +63092,12 @@ function normalizeManifest(value, walletPK) {
     projection: cleanProjection(value.projection)
   };
 }
-function repositorySnapshot(manifest, ready, syncing = false) {
+function repositorySnapshot(manifest, ready, syncing = false, head = EMPTY_TRANSFERS) {
   return Object.freeze({
     walletPK: manifest.walletPK,
     ready,
     syncing,
+    head,
     count: manifest.count,
     complete: manifest.complete,
     bitcoinOldestMs: manifest.bitcoinOldestMs,
@@ -62599,8 +63145,14 @@ function buildSegmentCommitPlan({ manifest, incoming, removedIds, mappings, oldS
   const incomingById = new Map(incoming.map((transfer) => [transferId(transfer), transfer]));
   const working = new Map;
   for (const [segmentId, segmentTransfers] of oldSegments) {
-    for (const transfer of segmentTransfers)
-      previousById.set(transferId(transfer), transfer);
+    for (const transfer of segmentTransfers) {
+      const id = transferId(transfer);
+      previousById.set(id, transfer);
+      const next2 = incomingById.get(id);
+      if (!next2)
+        continue;
+      incomingById.set(id, mergeHistoryTransfer(transfer, next2));
+    }
     const next = segmentTransfers.filter((transfer) => !removedIds.has(transferId(transfer))).map((transfer) => incomingById.get(transferId(transfer)) || transfer);
     working.set(segmentId, normalizeTransfers(next, walletPK));
   }
@@ -62816,6 +63368,15 @@ async function openWalletHistoryRepository({ localCache, walletPK } = {}) {
     }
     return rememberSegment(id, transfers);
   };
+  const readHead = async () => {
+    const transfers = [];
+    for (const segment of manifest.segments) {
+      transfers.push(...await readSegment(segment.id));
+      if (transfers.length >= WALLET_HISTORY_HEAD_SIZE)
+        break;
+    }
+    return transfers.length ? Object.freeze(transfers.slice(0, WALLET_HISTORY_HEAD_SIZE)) : EMPTY_TRANSFERS;
+  };
   const readIdMappings = async (ids, generation = manifest.generation) => {
     const grouped = new Map;
     for (const id of ids) {
@@ -62860,7 +63421,7 @@ async function openWalletHistoryRepository({ localCache, walletPK } = {}) {
     if (!wrote)
       throw new Error("wallet history checkpoint write failed");
     manifest = normalizeManifest(nextManifest, requestedWalletPK);
-    snapshot = repositorySnapshot(manifest, true);
+    snapshot = repositorySnapshot(manifest, true, false, await readHead());
     emit(listeners);
   };
   const pruneSegments = async () => {
@@ -62878,6 +63439,13 @@ async function openWalletHistoryRepository({ localCache, walletPK } = {}) {
   };
   const prunePromise = pruneSegments();
   await prunePromise;
+  const initialHead = await readHead().catch(async (error) => {
+    if (!recoveryPromise)
+      throw error;
+    await recoveryPromise;
+    return EMPTY_TRANSFERS;
+  });
+  snapshot = repositorySnapshot(manifest, true, false, initialHead);
   const readCommitSource = async (incoming, removedIds, position) => {
     const ids = [...new Set([...incoming.map(transferId), ...removedIds])];
     const { mappings, known, buckets: idBuckets } = await readIdMappings(ids);
@@ -62949,7 +63517,9 @@ async function openWalletHistoryRepository({ localCache, walletPK } = {}) {
       if (!wrote)
         throw new Error("wallet history checkpoint write failed");
       manifest = normalizeManifest(nextManifest, requestedWalletPK);
-      snapshot = repositorySnapshot(manifest, true);
+      for (const record of plan.newSegmentRecords)
+        rememberSegment(record.descriptor.id, record.transfers);
+      snapshot = repositorySnapshot(manifest, true, false, await readHead());
       emit(listeners);
     } else {
       for (const record of plan.newSegmentRecords) {
@@ -62976,6 +63546,10 @@ async function openWalletHistoryRepository({ localCache, walletPK } = {}) {
     await prunePromise;
     const incoming = normalizeTransfers(transfers, requestedWalletPK);
     const removedIds = new Set((Array.isArray(options.removedIds) ? options.removedIds : []).map(String).filter(Boolean));
+    for (const transfer of transfers) {
+      if (transfer?.id && transferBelongsToWallet(transfer, requestedWalletPK) && !isVisibleTransfer(transfer))
+        removedIds.add(String(transfer.id));
+    }
     const bitcoinTimes = incoming.filter((tx) => !tx.tokenIdentifier).map(txCreatedMs);
     if (bitcoinTimes.length)
       options = { ...options, bitcoinOldestMs: Math.min(manifest.bitcoinOldestMs ?? Infinity, ...bitcoinTimes) };
@@ -63009,13 +63583,13 @@ async function openWalletHistoryRepository({ localCache, walletPK } = {}) {
     commitPage(transfers, options = {}) {
       if (corruptionDetected)
         return Promise.reject(new Error("wallet history cache recovery in progress"));
-      snapshot = repositorySnapshot(manifest, true, true);
+      snapshot = repositorySnapshot(manifest, true, true, snapshot.head);
       emit(listeners);
       const run2 = () => commit(transfers, options);
       const result = writeTail.then(run2, run2);
       writeTail = result.catch(() => {}).finally(() => {
         if (!closed) {
-          snapshot = repositorySnapshot(manifest, true, false);
+          snapshot = repositorySnapshot(manifest, true, false, snapshot.head);
           emit(listeners);
         }
       });
@@ -63239,11 +63813,12 @@ function createWalletHistoryStore() {
     }
   });
 }
-var MANIFEST_PART = "wallet-history-manifest", SEGMENT_PREFIX = "whs", ID_INDEX_PREFIX = "whi", PEER_INDEX_PREFIX = "whp", REPOSITORY_VERSION = 2, SEGMENT_SIZE = 100, SEGMENT_CACHE_LIMIT = 5, ID_BUCKET_COUNT = 4096, PEER_BUCKET_COUNT = 256, EMPTY_TRANSFERS;
+var MANIFEST_PART = "wallet-history-manifest", SEGMENT_PREFIX = "whs", ID_INDEX_PREFIX = "whi", PEER_INDEX_PREFIX = "whp", REPOSITORY_VERSION = 2, SEGMENT_SIZE = 100, WALLET_HISTORY_HEAD_SIZE, SEGMENT_CACHE_LIMIT = 5, ID_BUCKET_COUNT = 4096, PEER_BUCKET_COUNT = 256, EMPTY_TRANSFERS;
 var init_historyrepository = __esm(() => {
   init_core();
   init_time();
   init_tx();
+  WALLET_HISTORY_HEAD_SIZE = SEGMENT_SIZE;
   EMPTY_TRANSFERS = Object.freeze([]);
 });
 
@@ -63316,9 +63891,9 @@ function createWalletTransferSession({ wallet, walletPK, claimIncomingTransfers,
     const snapshot = transferStore.getSnapshot();
     return lowerText(snapshot.walletPK) === walletKey && snapshot.ready === true;
   };
-  const commitConfirmedHistoryPage = (pageTransfers, options = {}) => {
-    const confirmed = compactTransfersForWallet(pageTransfers, walletKey).filter((transfer) => !isPendingTransfer(transfer));
-    return historyStore.commitPage(confirmed, options);
+  const commitHistoryPage = (pageTransfers, options = {}) => {
+    const updates = pageTransfers.map((transfer) => compactTransfer(transfer)).filter((transfer) => transfer && transferBelongsToWallet(transfer, walletKey));
+    return historyStore.commitPage(updates, options);
   };
   const forgetPendingLookupIds = (ids = []) => pendingReconciliation.forget(ids);
   const rememberPendingTransferIds = (ids = []) => pendingReconciliation.remember(ids);
@@ -63354,9 +63929,6 @@ function createWalletTransferSession({ wallet, walletPK, claimIncomingTransfers,
     if (closed)
       return current;
     let ownedTransfers = owned ? nextTransfers : filterTransfersForWallet(nextTransfers, walletKey);
-    if (current.length && ownedTransfers.length && ownedTransfers.length < current.length) {
-      ownedTransfers = mergeTransferPageForWallet(ownedTransfers, current, walletKey, "append");
-    }
     ownedTransfers = boundedWorkingTransfers(applyTransferStatusOverlays(ownedTransfers));
     const committed = sameTransfers(current, ownedTransfers) ? current : ownedTransfers;
     transferStore.setHistory({ transfers: committed, walletPK: walletKey });
@@ -63493,7 +64065,7 @@ function createWalletTransferSession({ wallet, walletPK, claimIncomingTransfers,
       return [];
     const nextTransfers = markClaimedTransfersCompleted(current, knownIds);
     if (nextTransfers !== current) {
-      commitConfirmedHistoryPage(nextTransfers.filter((transfer) => knownIds.includes(String(transfer?.id))), { position: "prepend" });
+      commitHistoryPage(nextTransfers.filter((transfer) => knownIds.includes(String(transfer?.id))), { position: "prepend" });
       commitTransferSnapshot(nextTransfers, { publish: true, owned: true });
       setTxReadyValue(true);
     }
@@ -63518,7 +64090,7 @@ function createWalletTransferSession({ wallet, walletPK, claimIncomingTransfers,
     snapshot: {
       getTransfers: currentTransfers,
       replace: (transfers) => commitTransferSnapshot(transfers, { publish: true, owned: true }),
-      commitConfirmed: commitConfirmedHistoryPage,
+      commitHistory: commitHistoryPage,
       setReady: () => setTxReadyValue(true)
     },
     reads: {
@@ -63542,7 +64114,7 @@ function createWalletTransferSession({ wallet, walletPK, claimIncomingTransfers,
       setLoading: setIsTxLoading
     },
     readPage: fetchTransfersPage,
-    commitConfirmed: commitConfirmedHistoryPage,
+    commitHistory: commitHistoryPage,
     pending: {
       query: getPendingTransfersSnapshot,
       isQuerying: () => !!pendingQueryPromiseRef.current,
@@ -63599,7 +64171,10 @@ function createWalletTransferSession({ wallet, walletPK, claimIncomingTransfers,
         const current = currentTransfers();
         const nextTransfers = mergeTransferPageForWallet(current, incomingTransfers, walletKey, "prepend");
         if (nextTransfers !== current) {
-          commitTransferSnapshot(nextTransfers, { publish: true, owned: true });
+          await commitHistoryPage(incomingTransfers, { position: "prepend" });
+          if (closed)
+            return [];
+          commitTransferSnapshot(mergeTransferPageForWallet(currentTransfers(), incomingTransfers, walletKey, "prepend"), { publish: true, owned: true });
           setTxReadyValue(true);
         }
       }
@@ -63641,10 +64216,8 @@ function createWalletTransferSession({ wallet, walletPK, claimIncomingTransfers,
           forgetPendingLookupIds(resolvedUpdateIds);
         }
       }
-      const current = currentTransfers();
-      const nextTransfers = mergeTransferPageForWallet(current, updates, walletKey, "prepend");
-      await commitConfirmedHistoryPage(updates, { position: "prepend" });
-      commitTransferSnapshot(nextTransfers, { publish: true, owned: true });
+      await commitHistoryPage(updates, { position: "prepend" });
+      commitTransferSnapshot(mergeTransferPageForWallet(currentTransfers(), updates, walletKey, "prepend"), { publish: true, owned: true });
       setTxReadyValue(true);
       markDone(diag, "wallet.claimedTxs", startedAt2, { found: true, count: updates.length });
       return updates;
@@ -63669,10 +64242,8 @@ function createWalletTransferSession({ wallet, walletPK, claimIncomingTransfers,
           forgetPendingLookupIds([compact2.id]);
         }
       }
-      const current = currentTransfers();
-      const nextTransfers = mergeTransferPageForWallet(current, [compact2], walletKey, "prepend");
-      await commitConfirmedHistoryPage([compact2], { position: "prepend" });
-      commitTransferSnapshot(nextTransfers, { publish: true, owned: true });
+      await commitHistoryPage([compact2], { position: "prepend" });
+      commitTransferSnapshot(mergeTransferPageForWallet(currentTransfers(), [compact2], walletKey, "prepend"), { publish: true, owned: true });
       setTxReadyValue(true);
       markDone(diag, "wallet.claimedTx", startedAt, { found: true });
       return compact2;
@@ -64520,27 +65091,21 @@ var init_portfolio = __esm(() => {
 });
 
 // ../../core/wallet/txlist.js
-async function readTxListPage(pending, queryHistory, { offset = 0, limit = 100 } = {}) {
+async function readTxListPage(queryHistory, { offset = 0, limit = 100 } = {}) {
   const start2 = Math.max(0, Math.floor(offset));
   const count = Math.max(1, Math.min(500, Math.floor(limit)));
-  const head = pending.slice(start2, start2 + count);
-  const remaining = count - head.length;
-  const history = remaining ? await queryHistory({ offset: Math.max(0, start2 - pending.length), limit: remaining }) : { transfers: [] };
-  return { offset: start2, transfers: [...head, ...history.transfers] };
-}
-async function findTxListPeriod(pending, history, queryHistory, { sinceMs, untilMs, hourly }) {
-  const pendingIndex = pending.findIndex((tx) => tx.createdMs >= sinceMs && tx.createdMs < untilMs);
-  if (pendingIndex >= 0)
-    return pendingIndex;
+  const history = await queryHistory({ offset: start2, limit: count });
+  return { offset: start2, transfers: history.transfers };
+}
+async function findTxListPeriod(history, queryHistory, { sinceMs, hourly }) {
   const key = (hourly ? dayHourKey : dayKey)(new Date(sinceMs));
   const buckets = history.projection[hourly ? "hours" : "days"];
   const newer = Object.entries(buckets).reduce((count, [period, stats]) => count + (period > key ? stats.count : 0), 0);
   if (buckets[key]?.count)
-    return pending.length + newer;
+    return newer;
   const offset = Math.max(0, newer - 1);
   const { transfers } = await queryHistory({ offset, limit: 2 });
-  const candidates = pending.map((tx, index2) => ({ tx, index: index2 }));
-  transfers.forEach((tx, index2) => candidates.push({ tx, index: pending.length + offset + index2 }));
+  const candidates = transfers.map((tx, index2) => ({ tx, index: offset + index2 }));
   candidates.sort((a, b) => Math.abs(a.tx.createdMs - sinceMs) - Math.abs(b.tx.createdMs - sinceMs));
   return candidates[0]?.index ?? -1;
 }
@@ -64639,14 +65204,14 @@ function mergeTxSearchResults(loaded, found, limit = TX_SEARCH_DEFAULT_LIMIT) {
   }
   return [...byId.values()].sort(byRecentTx).slice(0, max2);
 }
-function getDailySeries({ days, transactions, aggregatedData, balance, historyComplete, oldestMs, cache }) {
+function getDailySeries({ days, transactions, aggregatedData, balance, historyComplete, oldestMs, cache, nowMs: nowMs2 = Date.now() }) {
   if (!transactions.length || balance == null)
     return [];
   const cacheKey = `daily-${days}`;
-  if (cache.has(cacheKey)) {
-    return cache.get(cacheKey);
-  }
-  const today = new Date;
+  const clock = Math.floor(nowMs2 / 60000);
+  if (cache.get(cacheKey)?.clock === clock)
+    return cache.get(cacheKey).series;
+  const today = new Date(nowMs2);
   today.setHours(0, 0, 0, 0);
   const series = [];
   let runningBalance = Number(balance);
@@ -64657,84 +65222,44 @@ function getDailySeries({ days, transactions, aggregatedData, balance, historyCo
     const d = new Date(today);
     d.setDate(d.getDate() - i2);
     const key = dayKey(d);
-    series.push({ date: key, balance: runningBalance });
+    const end = new Date(d);
+    end.setDate(end.getDate() + 1);
+    series.push({ date: key, timestamp: i2 === 0 ? nowMs2 : end.getTime(), now: i2 === 0, balance: runningBalance });
     const dayData = aggregatedData.dayMap.get(key);
     if (dayData) {
       runningBalance -= dayData.net;
     }
   }
   const result = series.reverse();
-  cache.set(cacheKey, result);
+  cache.set(cacheKey, { clock, series: result });
   return result;
 }
-function getHourlySeriesForData({ hours, prefix = "today", transactions, aggregatedData, balance, historyComplete, oldestMs, cache }) {
+function getHourlySeriesForData({ hours, prefix = "today", transactions, aggregatedData, balance, historyComplete, oldestMs, cache, nowMs: nowMs2 = Date.now() }) {
   if (!transactions.length || balance == null)
     return [];
   const cacheKey = `hourly-${hours}-${prefix}`;
-  if (cache.has(cacheKey)) {
-    return cache.get(cacheKey);
-  }
-  const now = new Date;
-  const series = [];
+  const clock = Math.floor(nowMs2 / 60000);
+  if (cache.get(cacheKey)?.clock === clock)
+    return cache.get(cacheKey).series;
+  const now = new Date(nowMs2);
+  const series = [{ hour: "now", timestamp: nowMs2, now: true, balance: Number(balance) }];
   let runningBalance = Number(balance);
-  const today = dayKey(now);
-  const yesterday = dayKey(new Date(now.getTime() - DAY_MS));
+  const today = new Date(now);
+  today.setHours(0, 0, 0, 0);
   const coveredHours = historyComplete ? hours : coveredUnitsSince(oldestMs, HOUR_MS, now.getTime());
   const actualHours = Math.min(hours, coveredHours);
-  if (prefix === "today") {
-    const currentHour = now.getHours();
-    const maxHour = Math.min(actualHours - 1, currentHour);
-    for (let i2 = 0;i2 <= maxHour; i2++) {
-      const key = `${today}-${hourKey(i2)}`;
-      const hourData = aggregatedData.hourMap.get(key);
-      if (hourData) {
-        runningBalance -= hourData.net;
-      }
-    }
-    for (let i2 = 0;i2 <= maxHour; i2++) {
-      const hour = hourKey(i2);
-      series.push({ hour, balance: runningBalance });
-      const key = `${today}-${hour}`;
-      const hourData = aggregatedData.hourMap.get(key);
-      if (hourData) {
-        runningBalance += hourData.net;
-      }
-    }
-    series.push({ hour: "now", balance: Number(balance) });
-  } else if (prefix === "24h") {
-    const currentHour = now.getHours();
-    const firstOffset = Math.max(0, 24 - actualHours);
-    for (let i2 = 0;i2 <= currentHour; i2++) {
-      const key = `${today}-${hourKey(i2)}`;
-      const hourData = aggregatedData.hourMap.get(key);
-      if (hourData)
-        runningBalance -= hourData.net;
-    }
-    for (let i2 = Math.max(currentHour + 1, firstOffset);i2 < 24; i2++) {
-      const key = `${yesterday}-${hourKey(i2)}`;
-      const hourData = aggregatedData.hourMap.get(key);
-      if (hourData)
-        runningBalance -= hourData.net;
-    }
-    for (let i2 = Math.max(currentHour + 1, firstOffset);i2 < 24; i2++) {
-      const hour = hourKey(i2);
-      series.push({ hour, balance: runningBalance });
-      const key = `${yesterday}-${hour}`;
-      const hourData = aggregatedData.hourMap.get(key);
-      if (hourData)
-        runningBalance += hourData.net;
-    }
-    for (let i2 = firstOffset > currentHour ? firstOffset : 0;i2 <= currentHour; i2++) {
-      const hour = hourKey(i2);
-      series.push({ hour, balance: runningBalance });
-      const key = `${today}-${hour}`;
-      const hourData = aggregatedData.hourMap.get(key);
-      if (hourData)
-        runningBalance += hourData.net;
-    }
-  }
-  cache.set(cacheKey, series);
-  return series;
+  const endHour = new Date(now);
+  endHour.setMinutes(0, 0, 0);
+  for (let offset = 0;offset < actualHours; offset++) {
+    const date = new Date(endHour.getTime() - offset * HOUR_MS);
+    if (prefix === "today" && date < today)
+      break;
+    runningBalance -= aggregatedData.hourMap.get(dayHourKey(date))?.net || 0;
+    series.push({ hour: hourKey(date), timestamp: date.getTime(), balance: runningBalance });
+  }
+  const result = series.reverse();
+  cache.set(cacheKey, { clock, series: result });
+  return result;
 }
 function getTxsInRangeFrom(sortedTransactions, timeRange) {
   if (!sortedTransactions.length)
@@ -64921,11 +65446,8 @@ function createTxData({ transferStore, historyStore, diag = null, deferAggregati
       transfers: result.transfers.map((transfer) => getVisibleWalletTransfer(transfer, sources.walletPK)).filter(Boolean)
     };
   }
-  function pendingList() {
-    return readCurrentAggregatedData(sources.walletPK).sortedTxs.filter((tx) => tx.pending);
-  }
   function getTxListPage(options) {
-    return readTxListPage(pendingList(), queryHistory, options);
+    return readTxListPage(queryHistory, options);
   }
   async function findTxListPeriod2(period) {
     const { sinceMs, untilMs } = period;
@@ -64943,7 +65465,7 @@ function createTxData({ transferStore, historyStore, diag = null, deferAggregati
       return -1;
     if (!covered())
       throw new Error("transaction history is unavailable for this date");
-    return findTxListPeriod(pendingList(), historyStore.getSnapshot(), queryHistory, period);
+    return findTxListPeriod(historyStore.getSnapshot(), queryHistory, period);
   }
   async function getHistoryById(txId, tokenIdentifier) {
     const { walletPK, lookupTxById } = sources;
@@ -64963,31 +65485,17 @@ function createTxData({ transferStore, historyStore, diag = null, deferAggregati
     const peerKey = lowerText(peerPK);
     const limit = Math.max(1, Math.min(500, Math.floor(Number(options.limit) || 100)));
     const offset = Math.max(0, Math.floor(Number(options.offset) || 0));
-    const pendingData = getPeerDataFromTransfers(transferStore.getSnapshot().transfers.filter(isPendingTransfer), sources.walletPK, peerKey);
-    const pending = pendingData.txs;
-    const pendingPage = pending.slice(offset, offset + limit);
-    const historyOffset = Math.max(0, offset - pending.length);
-    const historyLimit = Math.max(0, limit - pendingPage.length);
-    const result = historyLimit ? await queryHistory({ ...options, peerPK: peerKey, offset: historyOffset, limit: historyLimit }) : { transfers: [], cursor: null };
+    const result = await queryHistory({ ...options, peerPK: peerKey, offset, limit });
     const storedStats = historyStore.getSnapshot().projection?.peers?.[peerKey];
-    const confirmedStats = {
+    const stats = {
       sent: Number(storedStats?.sent) || 0,
       received: Number(storedStats?.received) || 0,
       net: Number(storedStats?.net) || 0,
       vol: Number(storedStats?.vol) || 0,
       cnt: Number(storedStats?.count) || 0
     };
-    const pendingStats = pendingData.stats || { sent: 0, received: 0, net: 0, vol: 0, cnt: 0 };
-    const stats = confirmedStats.cnt || pendingStats.cnt ? {
-      sent: confirmedStats.sent + pendingStats.sent,
-      received: confirmedStats.received + pendingStats.received,
-      net: confirmedStats.net + pendingStats.net,
-      vol: confirmedStats.vol + pendingStats.vol,
-      cnt: confirmedStats.cnt + pendingStats.cnt
-    } : null;
-    const txs = [...pendingPage, ...result.transfers];
-    const total = confirmedStats.cnt + pending.length;
-    return { ...result, transfers: txs, txs, stats, total, hasMore: offset + txs.length < total };
+    const txs = result.transfers;
+    return { ...result, txs, stats: stats.cnt ? stats : null, total: stats.cnt, hasMore: offset + txs.length < stats.cnt };
   }
   async function getHistorySummary(timeRange = "all-time") {
     const result = await historyStore.summarize({ sinceMs: getTxRangeStartMs(timeRange) });
@@ -65043,31 +65551,16 @@ function createTxData({ transferStore, historyStore, diag = null, deferAggregati
     }
     return [...combined.values()].sort(byRecentTx).slice(0, limit);
   }
-  function addCashSeries(series, hourly, prefix) {
-    const history = historyStore.getSnapshot();
-    const tokens = sources.tokens;
+  function addCashSeries(series, hourly, history, tokens) {
     const coverage = !tokens.length || history.tokenComplete;
-    const now = new Date;
     const buckets = history.projection[hourly ? "hours" : "days"];
     return series.map((point) => {
-      let timestamp;
-      if (hourly) {
-        timestamp = new Date(now);
-        if (point.hour !== "now") {
-          const hour = Number(point.hour.slice(0, 2));
-          timestamp.setHours(hour, 0, 0, 0);
-          if (prefix === "24h" && hour > now.getHours())
-            timestamp.setDate(timestamp.getDate() - 1);
-        }
-      } else {
-        timestamp = new Date(`${point.date}T00:00:00`);
-        timestamp.setDate(timestamp.getDate() + 1);
-      }
-      const known = coverage || history.tokenOldestMs != null && timestamp.getTime() > history.tokenOldestMs;
+      const timestamp = new Date(point.timestamp);
+      const known = point.now || coverage || history.tokenOldestMs != null && timestamp.getTime() > history.tokenOldestMs;
       const key = (hourly ? dayHourKey : dayKey)(timestamp);
       const deltas = {};
-      if (point.hour !== "now")
-        for (const [bucketKey, stats] of Object.entries(buckets)) {
+      if (!point.now)
+        for (const [bucketKey, stats] of Object.entries(buckets || {})) {
           if (bucketKey < key)
             continue;
           for (const [id, units] of Object.entries(stats.tokens || {}))
@@ -65077,14 +65570,14 @@ function createTxData({ transferStore, historyStore, diag = null, deferAggregati
     });
   }
   function buildSnapshot() {
-    const { balance, walletPK, oldestTxMs, txReady, isTxLoading, ensureTxCoverage, loadMoreTxs } = sources;
+    const { balance, tokens, walletPK, oldestTxMs, txReady, isTxLoading, ensureTxCoverage, loadMoreTxs } = sources;
     const storeSnapshot = transferStore.getSnapshot();
     const historySnapshot = historyStore.getSnapshot();
     observedStoreSnapshot = storeSnapshot;
     observedHistorySnapshot = historySnapshot;
     const transfers = storeSnapshot.transfers;
     const aggregatedData = deferAggregation ? EMPTY_AGG : readCurrentAggregatedData(walletPK);
-    const projectedData = projectionData(historySnapshot);
+    const projectedData = historySnapshot.walletPK === walletPK ? projectionData(historySnapshot) : null;
     const transactions = aggregatedData.enrichedTxs;
     const sortedTransactions = aggregatedData.sortedTxs;
     const readLiveTransfers = () => deferAggregation ? transferStore.getSnapshot().transfers : transfers;
@@ -65154,16 +65647,17 @@ function createTxData({ transferStore, historyStore, diag = null, deferAggregati
         cache: seriesCache.current
       });
     };
-    const getHistorySeries = (days) => addCashSeries(getDailySeries({
+    const getHistorySeries = (days, nowMs2 = Date.now()) => !projectedData ? [] : addCashSeries(getDailySeries({
       days,
       transactions: projectedData.enrichedTxs,
       aggregatedData: projectedData,
       balance,
       historyComplete: historySnapshot.complete,
       oldestMs: historySnapshot.bitcoinOldestMs,
-      cache: historySeriesCache.current
-    }), false);
-    const getHistoryHourlySeries = (hours, prefix = "today") => addCashSeries(getHourlySeriesForData({
+      cache: historySeriesCache.current,
+      nowMs: nowMs2
+    }), false, historySnapshot, tokens);
+    const getHistoryHourlySeries = (hours, prefix = "today", nowMs2 = Date.now()) => !projectedData ? [] : addCashSeries(getHourlySeriesForData({
       hours,
       prefix,
       transactions: projectedData.enrichedTxs,
@@ -65171,8 +65665,9 @@ function createTxData({ transferStore, historyStore, diag = null, deferAggregati
       balance,
       historyComplete: historySnapshot.complete,
       oldestMs: historySnapshot.bitcoinOldestMs,
-      cache: historySeriesCache.current
-    }), true, prefix);
+      cache: historySeriesCache.current,
+      nowMs: nowMs2
+    }), true, historySnapshot, tokens);
     const getTxById = (txId) => getVisibleTransferById(readLiveTransfers(), walletPK, txId, transferByIdRef);
     const getPeerTxs = (peerPK) => peerPK ? readPeerData(peerPK).txs : EMPTY_TXS2;
     const getPeerStats = (peerPK) => peerPK ? readPeerData(peerPK).stats : null;
@@ -65205,7 +65700,7 @@ function createTxData({ transferStore, historyStore, diag = null, deferAggregati
       queryHistory,
       getTxListPage,
       findTxListPeriod: findTxListPeriod2,
-      txListCount: historySnapshot.count + transfers.filter((tx) => isPendingTransfer(tx) && isVisibleTransfer(tx) && transferBelongsToWallet(tx, walletPK)).length,
+      txListCount: historySnapshot.walletPK === walletPK ? historySnapshot.count : 0,
       getTxById,
       searchTxs,
       getPeerTxs,
@@ -65985,8 +66480,7 @@ function openAccount(options = {}) {
     getPeerProfile: getChatPeerProfile,
     refreshPeerProfile: refreshChatPeerProfile,
     resolvePeerProfile: resolveChatPeerProfile,
-    maintenance: messageMaintenance,
-    resolveActiveCall: (chatId) => calls.resolveActiveCall(chatId)
+    maintenance: messageMaintenance
   }, chatSources());
   const calls = createCallSession({
     cloud,
@@ -66013,11 +66507,11 @@ function openAccount(options = {}) {
   function chatSources(sessionOverride = chatSession) {
     const currentUser = state.user || {};
     const session = sessionOverride;
-    const cachedBlacklist = session?.localCache?.read?.()?.blacklist;
     return {
       uid: currentUser.uid || "",
-      blocked: currentUser.blockedReady ? currentUser.blocked : cachedBlacklist || [],
-      blockedReady: currentUser.blockedReady || Array.isArray(cachedBlacklist),
+      blocked: currentUser.blocked,
+      blockedPending: currentUser.blockedPending,
+      blockedReady: currentUser.blockedReady,
       online: state.online,
       chatPK: session?.chatPK || currentUser.chatPK || "",
       chatSigningPK: session?.chatSigningPK || currentUser.chatSigningPK || "",
@@ -66050,13 +66544,12 @@ function openAccount(options = {}) {
   }
   function syncPeers() {
     const currentUser = state.user || {};
-    const cachedBlacklist = state.session?.localCache?.read?.()?.blacklist;
     const chatSnapshot = chat.getSnapshot();
     peers.setSources({
       chatPeers: chatSnapshot.peers,
       chats: chatSnapshot.chats,
-      blocked: currentUser.blockedReady ? currentUser.blocked : cachedBlacklist || [],
-      blockedReady: currentUser.blockedReady || Array.isArray(cachedBlacklist),
+      blocked: currentUser.blocked,
+      blockedReady: currentUser.blockedReady,
       chatPK: state.session?.chatPK || currentUser.chatPK || "",
       chatSigningPK: state.session?.chatSigningPK || currentUser.chatSigningPK || "",
       walletPeers: wallet.getPeers(),
@@ -66341,8 +66834,9 @@ function openAccount(options = {}) {
         hasVault: !!vault,
         fromCache: !!info.fromCache
       });
+      const currentVault = state.vault && vault && equalBytes(state.vault, vault) ? state.vault : vault || null;
       emit2({
-        vault: vault || null,
+        vault: currentVault,
         vaultFromCache: false,
         vaultReady: state.vaultReady || !info.fromCache,
         vaultError: info.fromCache ? state.vaultError : null
@@ -66452,7 +66946,7 @@ function openAccount(options = {}) {
   function syncBootstrap() {
     if (closed || !state.session || state.session.closed || !serverReady())
       return;
-    if (state.user.blockedReady) {
+    if (state.user.blockedReady && !state.user.blockedPending?.length) {
       const cache = state.session.localCache;
       const blocked = state.user.blocked;
       if (JSON.stringify(cache?.read?.()?.blacklist) !== JSON.stringify(blocked)) {
@@ -66592,6 +67086,7 @@ function openAccount(options = {}) {
       });
       if (!isCurrent())
         throw new Error("account changed during unlock");
+      user.restoreBlocked({ uid, blocked: session.localCache?.read?.()?.blacklist });
       chatSession = session;
       chat.setSources(chatSources());
       unlockStage = "launching";
@@ -66786,15 +67281,21 @@ function openAccount(options = {}) {
       if (!observedVault)
         throw new Error("vault not ready");
       const isCurrent = () => !closed && !operationBarrier.blocksOperations && state.uid === uid && state.session === session && state.vault === observedVault && !session.closed && cloud.auth.user?.uid === uid;
+      markDiag(diag, "account.delete.phase", { phase: "verify-vault" });
       const verified = await vaultCrypto.verifyVaultPassword(observedVault, password);
       if (!verified)
         throw new Error("incorrect password");
       if (!isCurrent())
         throw new Error("account changed during deletion");
+      await waitForOnlineDeletion(isCurrent);
+      markDiag(diag, "account.delete.phase", { phase: "retire-chats" });
       const chats = await chat.getSnapshot().deleteAllChats();
       if (!isCurrent())
         throw new Error("account changed during deletion");
+      await waitForOnlineDeletion(isCurrent);
+      markDiag(diag, "account.delete.phase", { phase: "delete-account" });
       await cloud.user.delete();
+      markDiag(diag, "account.delete.phase", { phase: "clear-local-state" });
       try {
         await localCache?.clear?.();
       } catch (error) {
@@ -66818,6 +67319,31 @@ function openAccount(options = {}) {
       finishOperation();
     }
   }
+  function waitForOnlineDeletion(isCurrent) {
+    if (!isCurrent())
+      return Promise.reject(new Error("account changed during deletion"));
+    if (state.online)
+      return Promise.resolve();
+    return new Promise((resolve, reject) => {
+      const finish = (error) => {
+        clearTimeout(timer);
+        listeners.delete(check);
+        if (error)
+          reject(error);
+        else
+          resolve();
+      };
+      const check = () => {
+        if (!isCurrent())
+          finish(new Error("account changed during deletion"));
+        else if (state.online)
+          finish();
+      };
+      const timer = setTimeout(() => finish(new Error("couldnt connect to server")), ACCOUNT_CONNECTION_UNAVAILABLE_MS);
+      listeners.add(check);
+      check();
+    });
+  }
   async function switchNetwork(network) {
     if (state.lockState !== "unlocked") {
       throw new Error("unlock the vault before switching networks");
@@ -66947,6 +67473,7 @@ var init_account = __esm(() => {
   init_peers2();
   init_support();
   init_wallet();
+  init_utils2();
 });
 
 // ../../core/passkey.js
@@ -68574,7 +69101,6 @@ var init_listen = __esm(() => {
   init_messages();
   init_presentation();
   init_waveform();
-  init_call();
   init_messages3();
 });
 
@@ -68722,7 +69248,7 @@ function parseUrl(value) {
     return null;
   }
 }
-function readParams(params) {
+function readInviteParams(params) {
   const compact2 = compactInvite(params);
   if (compact2)
     return compact2;
@@ -68757,7 +69283,7 @@ function makeInvite(value = {}) {
   const toIsUsername = !!cleanUsername2(rawTo);
   const paymentKind2 = cleanedKind === invite.send || cleanedKind === invite.request;
   const receiver = value.r ?? value.walletPK ?? value.receiver ?? (paymentKind2 && !toIsUsername ? rawTo : null);
-  const data = readParams({
+  const data = readInviteParams({
     kind,
     from: value.from ?? value.sender,
     to: rawTo,
@@ -68807,7 +69333,7 @@ function readInvite(raw) {
     return makeInvite({ kind: invite.join });
   if (url.pathname !== "/")
     return null;
-  return readParams(url.searchParams);
+  return readInviteParams(url.searchParams);
 }
 var invite, inviteKinds, tokenKinds;
 var init_invite = __esm(() => {
@@ -69052,23 +69578,20 @@ function createRuntimeProductActions({
       const chatSnapshot = runtime.chat.getSnapshot();
       const result = await executeUserBlock({
         report: () => supportOwner.report(peer.uid),
-        block: () => chatSnapshot.retirePeerChat(peer.chatPK, {
-          onDeliveryRevoked: () => user.blockPeer(peer)
+        block: () => user.blockPeer(peer, {
+          beforeCommit: () => chatSnapshot.retirePeerChat(peer.chatPK)
         })
       });
       if (!result.blocked) {
         throw new Error(`block failed during private route retirement: ${result.blockError?.message || "unknown error"}`, { cause: result.blockError });
       }
-      runtime.peers.getSnapshot().dropPeer(peer);
       return { blocked: true, reported: result.reported, peer: projectPeer({ ...peer, blocked: true }) };
     },
     async unblock(value) {
       const runtime = await readyRuntime();
       const user = await getUser();
       const peer = await resolvePeer(value);
-      await runtime.chat.getSnapshot().retirePeerChat(peer.chatPK);
-      await user.unblockPeer(peer);
-      runtime.peers.getSnapshot().restorePeer(peer);
+      await user.unblockPeer(peer, { beforeCommit: () => runtime.chat.getSnapshot().retirePeerChat(peer.chatPK) });
       return { blocked: false, peer: projectPeer({ ...peer, blocked: false }) };
     }
   };
@@ -69600,7 +70123,6 @@ function deriveMessageRouteProjection({
   conversationStateKey,
   deleteMessageDocs,
   chatActivity,
-  resolveActiveCall,
   epochId,
   exists,
   expireMessageBatch: expireMessageBatch2,
@@ -69707,7 +70229,6 @@ function deriveMessageRouteProjection({
       expireMessageBatch: expireMessageBatch2,
       deleteMessageDocs,
       chatActivity,
-      resolveActiveCall,
       pruneMessageCache: pruneMessageCache2
     },
     liveWindowKey,
@@ -70764,11 +71285,11 @@ function messageStateHasKey(state, key) {
   }
   return false;
 }
-function shouldKeepInitialWindowHidden(currentlyHidden, hasOlder, messageGroups, pageSize) {
+function shouldKeepInitialWindowHidden(currentlyHidden, hasOlder, messageGroups) {
   if (!currentlyHidden || hasOlder !== true)
     return false;
   const visible = (messageGroups || []).reduce((total, messages) => total + countShowableRows(messages), 0);
-  return visible < Math.max(1, Math.floor(Number(pageSize) || 1));
+  return visible === 0;
 }
 function queueRouteCachePrune(refs, messageCacheWriter, config, messages, options) {
   const {
@@ -71035,11 +71556,11 @@ function currentHydrationWindow(refs) {
     visible: countShowableRows(historyMessages) + countShowableRows(latestMessages)
   };
 }
-function shouldGateInitialCache(refs, window2, routePageSize) {
-  return refs.initialHydratingCache.current && window2.count > 0 && window2.visible < routePageSize && refs.readMessageState().hasOlder && !refs.olderLoaded.current;
+function shouldGateInitialCache(refs, window2) {
+  return refs.initialHydratingCache.current && window2.count > 0 && window2.visible === 0 && refs.readMessageState().hasOlder && !refs.olderLoaded.current;
 }
 function adoptCurrentRouteWindow(refs, config, window2) {
-  if (!refs.olderLoaded.current || window2.count <= 0)
+  if (!refs.olderLoaded.current || window2.count <= 0 || refs.readMessageState().hasOlder)
     return false;
   refs.messageCachePartialHydrate.current = !!refs.readMessageState().hasOlder;
   config.setInitialHydratingCache(false);
@@ -71262,7 +71783,7 @@ function finishMessageCacheHydration(refs, config, hydrateTask) {
     refs.messageCacheHydratePromise.current = null;
   }
   const currentVisible = countShowableRows(refs.readMessageState().historyMessages) + countShowableRows(refs.readMessageState().latestMessages) + countShowableRows(refs.locals.current);
-  const cacheWindowCanReveal = refs.readMessageState()?.ready === true && currentVisible >= config.routePageSize && (refs.initialServerWindowApplied.current || !refs.messageCachePartialHydrate.current || refs.readMessageState().hasOlder !== true);
+  const cacheWindowCanReveal = refs.readMessageState()?.ready === true && (currentVisible > 0 || refs.readMessageState().hasOlder !== true);
   if (!config.chatId || cacheWindowCanReveal || refs.routeActive.current !== true) {
     config.setInitialHydratingCache(false);
   }
@@ -71276,7 +71797,7 @@ function hydrateRouteMessageCache(refs, config) {
   refs.messageCacheHydrateKey.current = hydrateKey;
   const window2 = currentHydrationWindow(refs);
   if (window2.count > 0 && refs.initialHydratingCache.current) {
-    config.setInitialHydratingCache(shouldGateInitialCache(refs, window2, config.routePageSize));
+    config.setInitialHydratingCache(shouldGateInitialCache(refs, window2));
   }
   if (adoptCurrentRouteWindow(refs, config, window2))
     return;
@@ -71523,7 +72044,7 @@ function applyResolvedBatch(config, refs, msgBatch, prepared, context) {
       fast: true
     });
   }
-  config.setInitialHydratingCache(shouldKeepInitialWindowHidden(refs.initialHydratingCache.current || !refs.initialServerWindowApplied.current, merged.nextHasOlder, [merged.nextHistory, merged.nextLive, refs.locals.current], config.routePageSize));
+  config.setInitialHydratingCache(shouldKeepInitialWindowHidden(refs.initialHydratingCache.current || !refs.initialServerWindowApplied.current, merged.nextHasOlder, [merged.nextHistory, merged.nextLive, refs.locals.current]));
   if (context.applyingServerBatch)
     refs.initialServerWindowApplied.current = true;
   config.ackMessages(config.chatId, merged.nextBatchMessages);
@@ -72614,7 +73135,6 @@ function readRouteExpiry(current, chatId, options = {}) {
   const messages = current.rawMessages?.length ? current.rawMessages : current.messages;
   return analyzeMessageExpiry(messages, current.selfChatPublicKey, current.peerChatPublicKey, {
     now: options.now,
-    activeCallId: options.activeCallId,
     keepKeys: options.release ? new Set : current.keepKeys,
     memberChatPKs: current.memberChatPKs,
     memberStatesByEpoch: current.memberStatesByEpoch
@@ -72737,32 +73257,6 @@ function expireRouteMessages(current, chatId, options = {}, diag = null, data =
     return false;
   if (options.release === true)
     scheduleLoadedControlCompaction(current, chatId, diag, data);
-  if (options.release === true && typeof current.resolveActiveCall === "function" && ((current.rawMessages?.length) ? current.rawMessages : current.messages || []).some((message) => readCallMessage(message)?.event === "started")) {
-    const lease = messageMaintenance(current).claim("call-expiry", chatId);
-    if (lease) {
-      const work = Promise.resolve().then(() => {
-        lease.assertCurrent();
-        return current.resolveActiveCall(chatId).catch((error) => {
-          markError(diag, "chat.call.expiry", Date.now(), error);
-          return;
-        });
-      }).then((activeCallId) => {
-        lease.assertCurrent();
-        if (current.routeMemory?.isActive(chatId))
-          return;
-        const expired = readRouteExpiry(current, chatId, { ...options, activeCallId })?.expired || [];
-        if (!expired.length)
-          return;
-        hideExpiredRouteMessages(current, chatId, expired, diag, data);
-        return deleteExpiredMessages(current, chatId, expired, diag, data);
-      }).catch((error) => {
-        if (!isStaleMessageMaintenance(error))
-          markError(diag, "chat.call.expiry", Date.now(), error);
-      }).finally(() => lease.release());
-      messageMaintenance(current).track(work);
-    }
-    return true;
-  }
   const analysis = readRouteExpiry(current, chatId, { now: options.now, release: options.release === true });
   const expiredMessages = analysis?.expired || [];
   if (!expiredMessages.length) {
@@ -72785,7 +73279,6 @@ var init_expirycleanup = __esm(() => {
   init_maintenance();
   init_window();
   init_control();
-  init_call();
 });
 
 // ../../core/chat/messages/routerelease.js
@@ -74284,7 +74777,7 @@ function createRouteMessageHistory({
       return;
     }
     const before = countShowableRows(refs.readMessageState().historyMessages) + countShowableRows(refs.readMessageState().latestMessages) + countShowableRows(localsRef.current);
-    if (before >= routePageSize || routeActiveRef.current !== true) {
+    if (before > 0 || routeActiveRef.current !== true) {
       setInitialHydratingCache(false);
       return;
     }
@@ -74294,7 +74787,7 @@ function createRouteMessageHistory({
         return;
       }
       const after = countShowableRows(refs.readMessageState().historyMessages) + countShowableRows(refs.readMessageState().latestMessages) + countShowableRows(localsRef.current);
-      if (!refs.readMessageState().hasOlder || after >= routePageSize || after <= before) {
+      if (!refs.readMessageState().hasOlder || after > 0 || after <= before) {
         setInitialHydratingCache(false);
       }
     }).catch((error) => {
@@ -74852,7 +75345,6 @@ function deriveProjection(owner, input = owner.input) {
     conversationStateKey: input.conversationStateKey,
     deleteMessageDocs: input.deleteMessageDocs,
     chatActivity: input.chatActivity,
-    resolveActiveCall: input.resolveActiveCall,
     epochId: input.epochId,
     exists: state.exists,
     expireMessageBatch: input.messageRuntime.expireMessageBatch,
@@ -75113,7 +75605,6 @@ var init_routereconcile = __esm(() => {
     "conversationStateKey",
     "deleteMessageDocs",
     "chatActivity",
-    "resolveActiveCall",
     "epochId",
     "hasCurrentChat",
     "initialState",
@@ -75227,7 +75718,7 @@ function createMessageRouteState(initialInput) {
     yieldToMain: yieldToMain2
   } = routeStateOptions(initialInput);
   const messageStore = createMessageStore(messageStoreState(initialState, chatId, conversationStateKey));
-  const initialHydratingCache = !!chatId && (initialState?.ready !== true || initialState?.exists === true && initialState?.hasOlder === true);
+  const initialHydratingCache = !!chatId && (initialState?.ready !== true || initialState?.exists === true && initialState?.hasOlder === true && countShowableRows(initialState.historyMessages) + countShowableRows(initialState.latestMessages) === 0);
   const refs = routeRefs(messageStore, {
     chatPreviewKey,
     foreground: foreground === true,
@@ -75375,6 +75866,7 @@ var init_routestate = __esm(() => {
   init_routerelease();
   init_routereconcile();
   init_async();
+  init_history();
   ROUTE_STATE_DEFAULTS = Object.freeze({
     cancelSchedule: clearTimeout,
     chatPreviewKey: null,
@@ -76065,12 +76557,9 @@ function createRuntimeChatActions({
       throw new Error("chat id required");
     const runtime = await readyChatRuntime();
     let snapshot2 = runtime.chat.getSnapshot();
-    let chat = snapshot2.chats.find((item) => item?.id === id) || null;
-    while (!chat && snapshot2.hasMoreChats && !snapshot2.loadingMoreChats) {
-      await snapshot2.loadMoreChats();
-      snapshot2 = runtime.chat.getSnapshot();
-      chat = snapshot2.chats.find((item) => item?.id === id) || null;
-    }
+    await snapshot2.ensureChat(id);
+    snapshot2 = runtime.chat.getSnapshot();
+    let chat = snapshot2.getOwnerChat(id);
     if (!chat && options.allowPending === true && snapshot2.pendingChatLaunch?.id === id) {
       chat = snapshot2.pendingChatLaunch.chat || null;
     }
@@ -76429,8 +76918,18 @@ function createRuntimeChatActions({
     if (!["accept", "reject"].includes(nextDecision)) {
       throw new Error("chat request decision must be accept or reject");
     }
-    const { runtime, chat } = await chatForId(chatId);
-    if (chat.messageRequest !== true)
+    const runtime = await readyChatRuntime();
+    const id = cleanText(chatId).toLowerCase();
+    if (!/^[0-9a-f]{64}$/u.test(id))
+      throw new Error("chat id required");
+    let snapshot2 = runtime.chat.getSnapshot();
+    let chat = snapshot2.chats.find((item) => item.id === id);
+    while (!chat && snapshot2.hasMoreChats && !snapshot2.loadingMoreChats) {
+      await snapshot2.loadMoreChats();
+      snapshot2 = runtime.chat.getSnapshot();
+      chat = snapshot2.chats.find((item) => item.id === id);
+    }
+    if (chat?.messageRequest !== true)
       throw new Error("message request not found");
     const resolved = await runtime.chat.getSnapshot().resolveChatRequest(chat.id, nextDecision);
     if (resolved !== true)
@@ -77388,7 +77887,7 @@ var package_default;
 var init_package2 = __esm(() => {
   package_default = {
     name: "veyl",
-    version: "0.77.1",
+    version: "0.78.0",
     packageManager: "bun@1.4.0",
     private: true,
     license: "UNLICENSED",
@@ -78038,6 +78537,11 @@ class AccountRuntime {
     if (!this.session) {
       await this.unlockVault({ key: vaultSecret, saveKey: false });
     }
+    const session = this.session;
+    const ready = await waitForOwner(this.accountOwner, (state) => state.online || state.uid !== profile.uid || state.session !== session, options.timeoutMs);
+    if (ready.uid !== profile.uid || ready.session !== session || session.closed) {
+      throw new Error("account changed before deletion");
+    }
     const profileName = profile.profile || "";
     const localCache = this.session?.localCache;
     const result = await this.accountOwner.delete({