add nip60 wallet ui and nutzap sending

refactor
implement nip61 nutzap redemption
2026-11-06 18:04:31 +07:00 · 2026-11-06 10:35:36 +07:00 · 2026-11-06 09:08:44 +07:00 · 2026-11-06 08:42:17 +07:00 · 2026-11-06 08:16:29 +07:00 · 2026-11-06 07:10:37 +07:00
130 changed files with 12668 additions and 2594 deletions
@@ -20,9 +20,6 @@ jobs:
          - platform: windows-arm64
            os: windows-11-arm
            target: aarch64-pc-windows-msvc
-          - platform: macos-x64
-            os: macos-15-intel
-            target: x86_64-apple-darwin
          - platform: macos-arm64
            os: macos-latest
            target: aarch64-apple-darwin
@@ -30,3 +30,26 @@ jobs:

      - name: Run tests
        run: cargo test --verbose
+
+  check-wasm:
+    name: Check web target
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install Rust nightly
+        uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: nightly-2026-10-31
+          targets: wasm32-unknown-unknown
+          components: llvm-tools-preview
+
+      - name: Install wasm C toolchain
+        run: sudo apt-get update && sudo apt-get install -y clang llvm
+
+      - name: Check web target
+        env:
+          CC_wasm32_unknown_unknown: clang
+          AR_wasm32_unknown_unknown: llvm-ar
+        run: cargo +nightly-2026-10-31 check -p coop_web --target wasm32-unknown-unknown
@@ -24,3 +24,4 @@ dist/
 vendor/
 wasm/
 node_modules/
+.wrangler/
@@ -4,27 +4,26 @@ members = ["crates/*", "desktop", "web"]
 default-members = ["desktop"]

 [workspace.package]
-version = "2.0.0-alpha"
+version = "2.0.0-alpha3"
 edition = "2024"
 publish = false

 [workspace.dependencies]
-gpui = { package = "gpui-pre", version = "0.3.8" }
-gpui_platform = { package = "gpui-pre-platform", version = "0.3.8", features = ["font-kit", "x11", "wayland"] }
-gpui_linux = { package = "gpui-pre-linux", version = "0.3.8" }
-gpui_windows = { package = "gpui-pre-windows", version = "0.3.8" }
-gpui_macos = { package = "gpui-pre-macos", version = "0.3.8" }
-gpui_web = { package = "gpui-pre-web", version = "0.3.8" }
-gpui_util = { package = "gpui-pre-util", version = "0.3.8" }
-reqwest_client = { package = "gpui-pre-reqwest-client", version = "0.3.8" }
+gpui = { package = "gpui-pre", version = "0.3.10" }
+gpui_platform = { package = "gpui-pre-platform", version = "0.3.10", features = ["font-kit", "x11", "wayland"] }
+gpui_linux = { package = "gpui-pre-linux", version = "0.3.10" }
+gpui_windows = { package = "gpui-pre-windows", version = "0.3.10" }
+gpui_macos = { package = "gpui-pre-macos", version = "0.3.10" }
+gpui_web = { package = "gpui-pre-web", version = "0.3.10" }
+gpui_util = { package = "gpui-pre-util", version = "0.3.10" }
+reqwest_client = { package = "gpui-pre-reqwest-client", version = "0.3.10" }
 gpui_tokio = { path = "crates/gpui_tokio" }
-gpui-base = "0.7.1"
-gpui-kit = "0.7.3"

-# Native OS theme reading; the connector is written against gpui-component 0.7.x
-# and gpui-pre 0.3.8, both satisfied by the versions above (0.7.3 / 0.3.9).
-native-theme = { version = "0.6.1", features = ["watch"] }
-native-theme-gpui = { version = "0.6.1", default-features = false, features = ["system-fonts"] }
+gpui-base = "0.8.1"
+gpui-kit = "0.8.1"
+
+native-theme = { version = "0.7", features = ["native", "watch"] }
+native-theme-gpui = { version = "0.7", default-features = false, features = ["system-fonts"] }

 # Nostr
 nostr-lmdb = { git = "https://github.com/rust-nostr/nostr" }
@@ -32,8 +31,10 @@ nostr-memory = { git = "https://github.com/rust-nostr/nostr" }
 nostr-blossom = { git = "https://github.com/rust-nostr/nostr" }
 nostr-gossip-memory = { git = "https://github.com/rust-nostr/nostr" }
 nostr-connect = { git = "https://github.com/rust-nostr/nostr" }
+nostr-browser-signer = { git = "https://github.com/rust-nostr/nostr" }
 nostr-sdk = { git = "https://github.com/rust-nostr/nostr" }
-nostr = { git = "https://github.com/rust-nostr/nostr", features = [ "nip59", "nip49", "nip44", "nip98" ] }
+nostr-sqlite = { git = "https://github.com/rust-nostr/nostr" }
+nostr = { git = "https://github.com/rust-nostr/nostr", features = [ "nip59", "nip49", "nip44", "nip60", "nip98" ] }

 # Crypto (NIP-17 encrypted file messages)
 aes-gcm = "0.10"
@@ -47,8 +48,16 @@ hmac = "0.12"
 # Pinned to the instance `nostr-sdk` already builds, so NIP-44 nonces share it
 rand = { version = "0.10", default-features = false, features = [ "std", "sys_rng", "thread_rng" ] }

+# Cashu (NIP-60). From git: the published 0.18.x line targets nostr 0.44 and
+# cannot unify with the git rust-nostr used here, while main targets 0.45.x
+# (redirected to this repo by the [patch.crates-io] section below). redb
+# storage: pure Rust, avoids the libsqlite3-sys links clash with nostr-sqlite.
+cdk = { git = "https://github.com/cashubtc/cdk", default-features = false, features = [ "wallet" ] }
+cdk-redb = { git = "https://github.com/cashubtc/cdk", default-features = false, features = [ "wallet" ] }
+
 # Others
 anyhow = "1.0.44"
+tts = { git = "https://github.com/ndarilek/tts-rs" }
 chrono = { version = "0.4.38", features = ["wasmbind"] }
 futures = "0.3"
 itertools = "0.13.0"
@@ -64,6 +73,12 @@ webbrowser = "1.0.4"
 tracing-subscriber = { version = "0.3.18", features = ["fmt"] }
 instant = "0.1"

+# cdk's registry nostr/nostr-sdk requirements are redirected onto the same
+# git repo coop already uses, keeping a single copy of each in the graph.
+[patch.crates-io]
+nostr = { git = "https://github.com/rust-nostr/nostr" }
+nostr-sdk = { git = "https://github.com/rust-nostr/nostr" }
+
 [profile.release]
 strip = true
 opt-level = "z"
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path d="M2.75 12C2.75 17.1086 6.89137 21.25 12 21.25C17.1086 21.25 21.25 17.1086 21.25 12C21.25 6.89137 17.1086 2.75 12 2.75C6.89137 2.75 2.75 6.89137 2.75 12Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M15.25 13L12 16.25L8.75 13" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M12 7.75V15.5" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
@@ -1,3 +1,16 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
-<path d="M10 5.75L3.75 12L10 18.25" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M4.5 12H20.25" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+    <path
+        d="M10 5.75L3.75 12L10 18.25"
+        stroke="currentColor"
+        stroke-width="1.5"
+        stroke-linecap="round"
+        stroke-linejoin="round"
+    />
+    <path
+        d="M4.5 12H20.25"
+        stroke="currentColor"
+        stroke-width="1.5"
+        stroke-linecap="round"
+        stroke-linejoin="round"
+    />
 </svg>
@@ -1,13 +1 @@
-<svg
-  xmlns="http://www.w3.org/2000/svg"
-  width="24"
-  height="24"
-  viewBox="0 0 24 24"
-  fill="none"
-  stroke="currentColor"
-  stroke-width="2"
-  stroke-linecap="round"
-  stroke-linejoin="round"
->
-  <path d="M4 19.5v-15A2.5 2.5 0 0 1 6.5 2H19a1 1 0 0 1 1 1v18a1 1 0 0 1-1 1H6.5a1 1 0 0 1 0-5H20" />
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none"> <path d="M9.25 9.75C7.317 9.75 5.75 8.183 5.75 6.25C5.75 4.317 7.317 2.75 9.25 2.75C11.183 2.75 12.75 4.317 12.75 6.25C12.75 8.183 11.183 9.75 9.25 9.75Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M15 2.75C16.933 2.75 18.5 4.317 18.5 6.25C18.5 8.183 16.933 9.75 15 9.75" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M9.24806 12.75C5.46395 12.75 2.27489 15.1517 1.30259 18.2496C0.971822 19.3035 1.89349 20.2187 2.99806 20.2188H15.4981C16.6026 20.2188 17.5243 19.3035 17.1935 18.2496C16.2212 15.1517 13.0322 12.75 9.24806 12.75Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M20.75 20.25H21.25C22.3546 20.25 23.2748 19.3347 22.9405 18.2819C22.2598 16.1389 20.512 14.31 18.25 13.5088" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/> </svg>
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path d="M5.75 9.5L12 15.75L18.25 9.5" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path d="M9.5 18.25L15.75 12L9.5 5.75" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<circle cx="12" cy="12" r="9.25" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M7.75 12.9231L10.5625 15.75L15.25 8.75" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
@@ -1 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none"><path d="M6.25 6.25L17.75 17.75M17.75 6.25L6.25 17.75" stroke="black" stroke-width="1.5" stroke-linecap="round"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path d="M6.25 6.25L17.75 17.75M17.75 6.25L6.25 17.75" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/>
+</svg>
@@ -1,14 +1,3 @@
-<svg
-  xmlns="http://www.w3.org/2000/svg"
-  width="24"
-  height="24"
-  viewBox="0 0 24 24"
-  fill="none"
-  stroke="currentColor"
-  stroke-width="2"
-  stroke-linecap="round"
-  stroke-linejoin="round"
->
-  <circle cx="12" cy="12" r="10" />
-  <path d="m16.24 7.76-1.804 5.411a2 2 0 0 1-1.265 1.265L7.76 16.24l1.804-5.411a2 2 0 0 1 1.265-1.265z" />
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<circle cx="12" cy="12" r="9.25" stroke="currentColor" stroke-width="1.5"/><ellipse cx="12" cy="12" rx="3.5" ry="9.25" stroke="currentColor" stroke-width="1.5"/><path d="M3.5 9.25H20.5" stroke="currentColor" stroke-width="1.5"/><path d="M3.5 14.75H20.5" stroke="currentColor" stroke-width="1.5"/>
 </svg>
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path d="M2.75 21.25L21.25 21.25" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M4.75 21.25V4.75C4.75 3.64543 5.64543 2.75 6.75 2.75H17.25C18.3546 2.75 19.25 3.64543 19.25 4.75V21.25" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M7.75 12.25H8.75" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path d="M21.25 12C21.25 17.1086 17.1086 21.25 12 21.25C6.89137 21.25 2.75 17.1086 2.75 12C2.75 6.89137 6.89137 2.75 12 2.75" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/><path d="M19 1.75V8.25M15.75 5H22.25" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/><path d="M10.75 9.9C10.75 11.0046 10.0784 11.75 9.25 11.75C8.42157 11.75 7.75 11.0046 7.75 9.9C7.75 8.79543 8.42157 8 9.25 8C10.0784 8 10.75 8.79543 10.75 9.9Z" fill="currentColor"/><path d="M16.25 9.9C16.25 11.0046 15.5784 11.75 14.75 11.75C13.9216 11.75 13.25 11.0046 13.25 9.9C13.25 8.79543 13.9216 8 14.75 8C15.5784 8 16.25 8.79543 16.25 9.9Z" fill="currentColor"/><path d="M16.1123 14.8493C16.1942 14.7105 16.2249 14.545 16.192 14.3857C16.1592 14.2263 16.0665 14.0867 15.933 13.9968C15.7996 13.9069 15.6354 13.8733 15.4754 13.9028C15.3154 13.9321 15.1736 14.0226 15.0757 14.1507C15.0008 14.2469 14.9237 14.3367 14.8415 14.4241C14.1096 15.2083 13.061 15.628 12.0035 15.625C10.946 15.6265 9.8972 15.2055 9.16254 14.4222C9.08002 14.3348 9.00261 14.2451 8.92738 14.1491C8.8291 14.0214 8.68699 13.9313 8.52686 13.9024C8.36679 13.8735 8.20268 13.9076 8.06954 13.9979C7.9364 14.0882 7.84406 14.2281 7.81174 14.3875C7.77938 14.547 7.81054 14.7123 7.89293 14.8509C7.97731 14.99 8.06686 15.1223 8.16553 15.2526C9.04297 16.4311 10.5292 17.1343 12.0024 17.125C13.4754 17.1367 14.965 16.4342 15.8405 15.2521C15.939 15.1215 16.0282 14.9888 16.1123 14.8493Z" fill="currentColor"/><path d="M21.25 12C21.25 17.1086 17.1086 21.25 12 21.25C6.89137 21.25 2.75 17.1086 2.75 12C2.75 6.89137 6.89137 2.75 12 2.75" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/>
+</svg>
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<circle cx="12" cy="8.75" r="3" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><circle cx="4" cy="9.80005" r="2" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><circle cx="20" cy="9.80005" r="2" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M7.25 16.625V16.5C7.25 13.8766 9.37665 11.75 12 11.75C14.6234 11.75 16.75 13.8766 16.75 16.5V16.625C16.75 17.5225 16.0225 18.25 15.125 18.25H8.875C7.97754 18.25 7.25 17.5225 7.25 16.625Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M4.25 17.2602H2.75C1.64543 17.2602 0.706551 16.3538 0.919944 15.2701C1.25877 13.5493 2.15049 12.3257 4 11.8301" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M19.75 17.2601H21.25C22.3546 17.2601 23.2935 16.3538 23.08 15.27C22.7412 13.5493 21.8495 12.3257 20 11.8301" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path d="M11.75 6.75H19.25C20.3546 6.75 21.25 7.64543 21.25 8.75V15.25C21.25 16.3546 20.3546 17.25 19.25 17.25H11.75" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M5.75 6.75H4.75C3.64543 6.75 2.75 7.64543 2.75 8.75V15.25C2.75 16.3546 3.64543 17.25 4.75 17.25H5.75" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M8.75 3.75V20.25" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path d="M4.75 10.9853V4.75C4.75 3.64543 5.64543 2.75 6.75 2.75H17.25C18.3546 2.75 19.25 3.64543 19.25 4.75V10.9853M9.75 7.75H14.25M12.617 13.5499L19.9415 11.1744C20.5875 10.9649 21.25 11.4465 21.25 12.1256V18.25C21.25 19.3546 20.3546 20.25 19.25 20.25H4.75C3.64543 20.25 2.75 19.3546 2.75 18.25V12.1256C2.75 11.4465 3.41249 10.9649 4.0585 11.1744L11.383 13.5499C11.784 13.68 12.216 13.68 12.617 13.5499Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
@@ -1,14 +1,3 @@
-<svg
-  xmlns="http://www.w3.org/2000/svg"
-  width="24"
-  height="24"
-  viewBox="0 0 24 24"
-  fill="none"
-  stroke="currentColor"
-  stroke-width="2"
-  stroke-linecap="round"
-  stroke-linejoin="round"
->
-  <path d="M10 13a5 5 0 0 0 7.54.54l3-3a5 5 0 0 0-7.07-7.07l-1.72 1.71" />
-  <path d="M14 11a5 5 0 0 0-7.54-.54l-3 3a5 5 0 0 0 7.07 7.07l1.71-1.71" />
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path d="M9.75027 5.52371L10.7168 4.55722C13.1264 2.14759 17.0332 2.14759 19.4428 4.55722C21.8524 6.96684 21.8524 10.8736 19.4428 13.2832L18.4742 14.2519M5.52886 9.74513L4.55722 10.7168C2.14759 13.1264 2.1476 17.0332 4.55722 19.4428C6.96684 21.8524 10.8736 21.8524 13.2832 19.4428L14.2478 18.4782M9.5 14.5L14.5 9.5" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/>
 </svg>
@@ -1,14 +1,3 @@
-<svg
-  xmlns="http://www.w3.org/2000/svg"
-  width="24"
-  height="24"
-  viewBox="0 0 24 24"
-  fill="none"
-  stroke="currentColor"
-  stroke-width="2"
-  stroke-linecap="round"
-  stroke-linejoin="round"
->
-  <rect width="18" height="11" x="3" y="11" rx="2" ry="2" />
-  <path d="M7 11V7a5 5 0 0 1 10 0v4" />
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path d="M12 8.75003C11.1716 8.75003 10.5 9.4216 10.5 10.25C10.5 11.0785 11.1716 11.75 12 11.75C12.8284 11.75 13.5 11.0785 13.5 10.25C13.5 9.4216 12.8284 8.75003 12 8.75003ZM12 8.75003V14.75M20.25 11.9124V6.94155C20.25 6.08069 19.6991 5.31641 18.8825 5.04418L12.6325 2.96085C12.2219 2.824 11.7781 2.824 11.3675 2.96085L5.11754 5.04418C4.30086 5.31641 3.75 6.08069 3.75 6.94155V11.9124C3.75 16.8848 8 19.25 12 21.4079C16 19.25 20.25 16.8848 20.25 11.9124Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path d="M21.75 12C21.75 6.84375 17.9583 3.75 12 3.75C6.04167 3.75 2.25 6.84375 2.25 12C2.25 13.3368 3.17054 15.6055 3.3145 15.9522C3.32742 15.9833 3.34021 16.0117 3.3518 16.0433C3.45089 16.3136 3.85722 17.7527 2.25 19.8828C4.41667 20.914 6.71766 19.2188 6.71766 19.2188C8.30963 20.0597 10.2038 20.25 12 20.25C17.9583 20.25 21.75 17.1562 21.75 12Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="square" stroke-linejoin="round"/>
+</svg>
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path d="M2.66936 5.12886C2.12122 3.64104 3.6759 2.24953 5.09409 2.95862L20.0468 10.435C21.3366 11.0799 21.3366 12.9205 20.0468 13.5655L5.09409 21.0418C3.67589 21.7509 2.12122 20.3594 2.66936 18.8715L4.92467 12.75H9.25021C9.66442 12.75 10.0002 12.4142 10.0002 12C10.0002 11.5858 9.66442 11.25 9.25021 11.25H4.92452L2.66936 5.12886Z" fill="currentColor"/>
+</svg>
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path d="M12.2126 10.7642L7.07919 15.8829C6.51216 16.4483 6.51216 17.365 7.07919 17.9304C7.64621 18.4958 8.56554 18.4958 9.13257 17.9304L19.3995 7.69303C19.9664 7.12769 20.25 6.38673 20.25 5.64575C20.25 4.90465 19.9665 4.16353 19.3995 3.59809C18.8324 3.03271 18.0893 2.75001 17.3461 2.75C16.6029 2.74999 15.8597 3.03269 15.2927 3.59809L5.02581 13.8354C4.17522 14.6836 3.74995 15.7952 3.75 16.9068C3.75005 18.0183 4.17532 19.1298 5.02581 19.9779C5.87635 20.826 6.99113 21.25 8.10591 21.25C9.22067 21.25 10.3354 20.8259 11.1859 19.9779L16.3194 14.8592" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/>
+</svg>
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none"> <path d="M21.75 12C21.75 6.84375 17.9583 3.75 12 3.75C6.04167 3.75 2.25 6.84375 2.25 12C2.25 13.3368 3.17054 15.6055 3.3145 15.9522C3.32742 15.9833 3.34021 16.0117 3.3518 16.0433C3.45089 16.3136 3.85722 17.7527 2.25 19.8828C4.41667 20.914 6.71766 19.2188 6.71766 19.2188C8.30963 20.0597 10.2038 20.25 12 20.25C17.9583 20.25 21.75 17.1562 21.75 12Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="square" stroke-linejoin="round"/><path d="M12 8.75V15.25M8.75 12H15.25" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/> </svg>
@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
-<path d="M12 5.25V12M12 12V18.75M12 12H5.25M12 12H18.75" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/>
+<path d="M12 6.75V12M12 12V17.25M12 12H6.75M12 12H17.25" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/>
 </svg>
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path d="M17.75 2.75H6.25C5.14543 2.75 4.25 3.64543 4.25 4.75V19.25C4.25 20.3546 5.14543 21.25 6.25 21.25H17.75C18.8546 21.25 19.75 20.3546 19.75 19.25V4.75C19.75 3.64543 18.8546 2.75 17.75 2.75Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><circle cx="12" cy="12.25" r="2.25" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/><path d="M16 21C16 18.7909 14.2091 17 12 17C9.79086 17 8 18.7909 8 21" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/><path d="M9.75 6.25H14.25" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/>
+</svg>
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<circle cx="12" cy="9.25" r="1.5" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M7.75 21.25L11.75 9.25H12.25L16.25 21.25" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M9.5 17.75H14.5" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M7.75693 12.7501C6.08102 10.7234 6.08103 7.77679 7.75693 5.75M16.2431 5.75C17.919 7.77679 17.919 10.7234 16.2431 12.7501" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M5.06494 2.7574C1.64285 6.40823 1.64502 12.1018 5.07145 15.75M18.9281 2.75C22.3572 6.40053 22.3573 12.0993 18.9285 15.75" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
@@ -1 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none"><path d="M20.25 20.25L16.1265 16.1265M16.1265 16.1265C17.4385 14.8145 18.25 13.002 18.25 11C18.25 6.99594 15.0041 3.75 11 3.75C6.99594 3.75 3.75 6.99594 3.75 11C3.75 15.0041 6.99594 18.25 11 18.25C13.002 18.25 14.8145 17.4385 16.1265 16.1265Z" stroke="black" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path d="M20 20L16.1265 16.1265M16.1265 16.1265C17.4385 14.8145 18.25 13.002 18.25 11C18.25 6.99594 15.0041 3.75 11 3.75C6.99594 3.75 3.75 6.99594 3.75 11C3.75 15.0041 6.99594 18.25 11 18.25C13.002 18.25 14.8145 17.4385 16.1265 16.1265Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path d="M13 19.25H5.95C4.82989 19.25 4.26984 19.25 3.84202 19.032C3.46569 18.8403 3.15973 18.5343 2.96799 18.158C2.75 17.7302 2.75 17.1701 2.75 16.05V7.95C2.75 6.82989 2.75 6.26984 2.96799 5.84202C3.15973 5.46569 3.46569 5.15973 3.84202 4.96799C4.26984 4.75 4.8299 4.75 5.95 4.75H18.05C19.1701 4.75 19.7302 4.75 20.158 4.96799C20.5343 5.15973 20.8403 5.46569 21.032 5.84202C21.25 6.26984 21.25 6.8299 21.25 7.95V11" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/><path d="M3 5.63635L10.9761 10.3898C11.6069 10.7657 12.3931 10.7657 13.0239 10.3898L21 5.63635" stroke="currentColor" stroke-width="1.5"/><path d="M21.8148 15.375L21.1669 15.7491M16.1856 18.625L16.8335 18.2509M21.8147 18.625L21.1669 18.251M16.1855 15.375L16.8335 15.7491M19.0002 20.25L19.0002 19.4375M19.0002 13.75V14.5625M21.1669 17C21.1669 16.6053 21.0613 16.2352 20.8769 15.9165C20.5022 15.269 19.8021 14.8333 19.0002 14.8333C18.1983 14.8333 17.4981 15.269 17.1235 15.9165C16.9391 16.2352 16.8335 16.6053 16.8335 17C16.8335 17.3947 16.9391 17.7648 17.1235 18.0835C17.4982 18.731 18.1983 19.1667 19.0002 19.1667C19.8021 19.1667 20.5022 18.731 20.8769 18.0835C21.0613 17.7648 21.1669 17.3947 21.1669 17Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<path d="M10.75 14.75V17.25" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M14.25 7.75V20.25" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M17.75 10.75V17.25" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M21.25 12.75V15.25" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M2.75 5.25V3.75H7M11.25 5.25V3.75H7M7 3.75V12.25M7 12.25H5.25M7 12.25H8.75" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
@@ -1,15 +1 @@
-<svg
-  xmlns="http://www.w3.org/2000/svg"
-  width="24"
-  height="24"
-  viewBox="0 0 24 24"
-  fill="none"
-  stroke="currentColor"
-  stroke-width="2"
-  stroke-linecap="round"
-  stroke-linejoin="round"
->
-  <path d="M12 3v12" />
-  <path d="m17 8-5-5-5 5" />
-  <path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4" />
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none"> <path d="M11.25 20.25H5.75C4.64543 20.25 3.75 19.3546 3.75 18.25V5.75C3.75 4.64543 4.64543 3.75 5.75 3.75H18.25C19.3546 3.75 20.25 4.64543 20.25 5.75V11.25" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/><path d="M3.75 16.25L6.58579 13.4142C7.36683 12.6332 8.63317 12.6332 9.41421 13.4142L12 16" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/><path d="M14.5 11.5C15.6046 11.5 16.5 10.6046 16.5 9.5C16.5 8.39543 15.6046 7.5 14.5 7.5C13.3954 7.5 12.5 8.39543 12.5 9.5C12.5 10.6046 13.3954 11.5 14.5 11.5Z" stroke="currentColor" stroke-width="1.5"/><path d="M15.75 18.5H21.25" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/><path d="M18.5 15.75V21.25" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/> </svg>
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
+<circle cx="12" cy="12" r="9.25" stroke="currentColor" stroke-width="1.5"/><path d="M11.3121 12.3511L11.0582 7.9983C11.0266 7.45662 11.4574 7 12 7C12.5426 7 12.9734 7.45662 12.9418 7.9983L12.6879 12.3511C12.6666 12.7154 12.365 13 12 13C11.635 13 11.3334 12.7154 11.3121 12.3511Z" fill="currentColor"/><circle cx="11.9999" cy="15.8998" r="1.1" fill="currentColor"/>
+</svg>
@@ -9,3 +9,8 @@ gpui.workspace = true
 anyhow.workspace = true
 rust-embed.workspace = true
 gpui-kit.workspace = true
+
+# On wasm there is no filesystem to read from, so rust-embed's debug-mode
+# disk loading returns nothing; embed the assets even in debug builds.
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+rust-embed = { workspace = true, features = ["debug-embed"] }
@@ -20,12 +20,39 @@ impl AssetSource for CombinedAssets {
        if let Ok(Some(data)) = Assets.load(path) {
            return Ok(Some(data));
        }
+
+        #[cfg(target_arch = "wasm32")]
+        {
+            // The kit bundle fetches icons over HTTP on the web; a single
+            // instance keeps its download cache alive across loads.
+            use std::sync::OnceLock;
+            static KIT_ASSETS: OnceLock<gpui_kit::assets::Assets> = OnceLock::new();
+            KIT_ASSETS
+                .get_or_init(gpui_kit::assets::Assets::default)
+                .load(path)
+        }
+
+        #[cfg(not(target_arch = "wasm32"))]
        gpui_kit::assets::Assets.load(path)
    }

    fn list(&self, path: &str) -> Result<Vec<SharedString>> {
        let mut paths = Assets.list(path).unwrap_or_default();
+
+        #[cfg(target_arch = "wasm32")]
+        {
+            use std::sync::OnceLock;
+            static KIT_ASSETS: OnceLock<gpui_kit::assets::Assets> = OnceLock::new();
+            paths.extend(
+                KIT_ASSETS
+                    .get_or_init(gpui_kit::assets::Assets::default)
+                    .list(path)?,
+            );
+        }
+
+        #[cfg(not(target_arch = "wasm32"))]
        paths.extend(gpui_kit::assets::Assets.list(path)?);
+
        Ok(paths)
    }
 }
@@ -1,39 +0,0 @@
-use gpui::AssetSource;
-
-#[test]
-fn icons_resolve_from_the_vendored_folder() {
-    // Icons coop's code and the kit components draw, served by the vendored
-    // folder (signed's set, filled with the kit bundle where coop needs more).
-    let vendored = [
-        "icons/search.svg",
-        "icons/close.svg",
-        "icons/panel-left.svg",
-        "icons/window-minimize.svg",
-        "icons/settings-2.svg",
-        "icons/x.svg",
-        "icons/compass.svg",
-        "icons/radio-tower.svg",
-    ];
-    for path in vendored {
-        let own = assets::Assets
-            .load(path)
-            .unwrap_or_else(|e| panic!("{path} errored in own embed: {e}"));
-        assert!(own.is_some(), "own embed is missing {path}");
-
-        let combined = assets::CombinedAssets.load(path).unwrap();
-        assert!(combined.is_some(), "CombinedAssets fails to serve {path}");
-    }
-
-    // Coop's own files still load through the combined source.
-    let own = [
-        "brand/coop.svg",
-        "brand/bg1.jpg",
-        "fonts/Inter/Inter-Medium.ttf",
-    ];
-    for path in own {
-        assert!(
-            matches!(assets::CombinedAssets.load(path), Ok(Some(_))),
-            "CombinedAssets fails to serve coop asset {path}"
-        );
-    }
-}
@@ -11,6 +11,7 @@ serde.workspace = true
 serde_json.workspace = true
 futures.workspace = true

+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 gpui-updater-pre = "0.2"

 [dev-dependencies]
@@ -37,9 +37,8 @@ pub fn asset_filter_for(os: &str, arch: &str) -> Option<AssetFilter> {
    };

    let arch = match (os, arch) {
-        // cargo-packager names the disk images `aarch64`/`x64`.
+        // cargo-packager names the disk images `aarch64`.
        ("macos", "aarch64") => "aarch64",
-        ("macos", "x86_64") => "x64",
        // `script/bundle-linux` names the tarballs `aarch64`/`x86_64`.
        ("linux", "aarch64") => "aarch64",
        ("linux", "x86_64") => "x86_64",
@@ -243,7 +242,7 @@ mod tests {
    #[test]
    fn picks_the_artifact_matching_os_and_architecture() {
        assert_eq!(selected("macos", "aarch64"), Some("Coop_1.0.1_aarch64.dmg"));
-        assert_eq!(selected("macos", "x86_64"), Some("Coop_1.0.1_x64.dmg"));
+        assert_eq!(selected("macos", "x86_64"), None);
        assert_eq!(
            selected("linux", "aarch64"),
            Some("coop-linux-aarch64.tar.gz")
@@ -258,6 +257,7 @@ mod tests {
    fn has_no_target_for_windows_or_unknown_platforms() {
        assert_eq!(asset_filter_for("windows", "x86_64"), None);
        assert_eq!(asset_filter_for("freebsd", "x86_64"), None);
+        assert_eq!(asset_filter_for("macos", "x86_64"), None);
        assert_eq!(asset_filter_for("macos", "riscv64"), None);
    }

@@ -11,12 +11,12 @@ use gpui::{
    App, AppContext, Context, Entity, EventEmitter, Global, SharedString, Subscription, Task,
    WeakEntity,
 };
-use instant::Duration;
+use instant::{Duration, Instant};
 use nip4e::{DeviceEvent, DeviceRegistry};
 use nostr_sdk::prelude::*;
 use person::PersonRegistry;
 use smallvec::{SmallVec, smallvec};
-use state::{DEVICE_GIFTWRAP, NostrRegistry, USER_GIFTWRAP};
+use state::{DEVICE_GIFTWRAP, NostrRegistry, USER_GIFTWRAP, UniversalSigner};

 mod message;
 mod room;
@@ -29,7 +29,10 @@ pub use state::FileAttachment;

 use crate::search::MessageSearchIndex;

-/// A static keypair used only for signing locally-cached rumor events.
+/// Upper bound on signals applied to the UI in a single update
+const MAX_SIGNAL_BATCH: usize = 256;
+
+/// Keypair used only for identifying locally-cached rumor events.
 static LOCAL_KEYS: LazyLock<Keys> = LazyLock::new(Keys::generate);

 pub fn init(cx: &mut App) {
@@ -44,6 +47,7 @@ impl Global for GlobalChatRegistry {}
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
 pub enum ChatEvent {
    Ping,
+    Loaded,
    InboxRelayNotFound,
    Error(String),
 }
@@ -74,6 +78,13 @@ impl Signal {
    }
 }

+/// Which signer to attempt when unwrapping a gift wrap
+enum UnwrapRoute {
+    User,
+    Device,
+    Both,
+}
+
 /// Chat Registry
 #[derive(Debug)]
 pub struct ChatRegistry {
@@ -216,32 +227,34 @@ impl ChatRegistry {
        let tx = self.signal_tx.clone();
        let rx = self.signal_rx.clone();

+        let executor = cx.background_executor().clone();
+
        self.notification_listener = Some(cx.background_spawn(async move {
-            let mut notifications = client.notifications();
-            let mut processed_events = HashSet::new();
            const MAX_PROCESSED: usize = 10_000;

+            let mut notifications = client.notifications();
+            let mut processed_events = HashSet::new();
+
+            let mut user_key = signer.get_public_key_async().await.ok();
+            let device_key = match device_signer.as_ref() {
+                Some(device) => device.get_public_key_async().await.ok(),
+                None => None,
+            };
+
+            let mut last_yield = Instant::now();
+
            while let Some(notification) = notifications.next().await {
+                if last_yield.elapsed() >= Duration::from_millis(8) {
+                    executor.timer(Duration::from_millis(0)).await;
+                    last_yield = Instant::now();
+                }
+
                let ClientNotification::Message { message, relay_url } = notification else {
                    continue;
                };

                match *message {
-                    RelayMessage::Event {
-                        subscription_id,
-                        event,
-                        ..
-                    } => {
-                        let chat_sub = subscription_id.as_str() != sub_id1.as_str();
-                        let device_sub = subscription_id.as_str() != sub_id2.as_str();
-
-                        // Concord wraps are also kind 1059.
-                        //
-                        // Only the two gift wrap subscriptions carry NIP-59 wraps for this account.
-                        if event.kind == Kind::GiftWrap && chat_sub && device_sub {
-                            continue;
-                        }
-
+                    RelayMessage::Event { event, .. } => {
                        // Prune the dedup set before it grows unbounded
                        if processed_events.len() >= MAX_PROCESSED {
                            processed_events.clear();
@@ -253,8 +266,10 @@ impl ChatRegistry {

                        // Handle msg relays event to determine when the app is ready to subscribe
                        if event.kind == Kind::InboxRelays {
-                            let current_user = signer.get_public_key_async().await?;
-                            if event.pubkey == current_user {
+                            if user_key.is_none() {
+                                user_key = signer.get_public_key_async().await.ok();
+                            }
+                            if Some(event.pubkey) == user_key {
                                tx.send_async(Signal::InboxReady).await?;
                            }
                        }
@@ -270,15 +285,39 @@ impl ChatRegistry {
                            seen.entry(event.id).or_default().insert(relay_url);
                        }

+                        // Route to the signer matching the recipient tag
+                        // so a wrap is never decrypted twice.
+                        let recipient = event.tags.public_keys().next();
+                        let route = match recipient {
+                            Some(key) if Some(key) == device_key => UnwrapRoute::Device,
+                            Some(key) if Some(key) == user_key => UnwrapRoute::User,
+                            Some(_) if user_key.is_some() && device_key.is_some() => continue,
+                            _ => UnwrapRoute::Both,
+                        };
+
                        // Extract the rumor from the gift wrap event
-                        match extract_rumor(
-                            &client,
-                            &signer,
-                            device_signer.as_ref(),
-                            event.as_ref(),
-                        )
-                        .await
-                        {
+                        let result = match route {
+                            UnwrapRoute::User => {
+                                extract_rumor(&client, &signer, None, event.as_ref()).await
+                            }
+                            UnwrapRoute::Device => match device_signer.as_ref() {
+                                Some(device) => {
+                                    extract_rumor(&client, device, None, event.as_ref()).await
+                                }
+                                None => continue,
+                            },
+                            UnwrapRoute::Both => {
+                                extract_rumor(
+                                    &client,
+                                    &signer,
+                                    device_signer.as_ref(),
+                                    event.as_ref(),
+                                )
+                                .await
+                            }
+                        };
+
+                        match result {
                            Ok(rumor) => {
                                let Some(rumor_id) = rumor.id else {
                                    log::error!("Rumor missing id after ensure_id");
@@ -317,35 +356,57 @@ impl ChatRegistry {
            Ok(())
        }));

-        self.signal_consumer = Some(cx.spawn(async move |this, cx| {
-            while let Ok(message) = rx.recv_async().await {
-                match message {
-                    Signal::Message(message) => {
-                        this.update(cx, |this, cx| {
-                            this.new_message(message, cx);
-                        })?;
-                    }
-                    Signal::InboxReady => {
-                        this.update(cx, |this, cx| {
-                            this.get_messages(cx);
-                        })?;
-                    }
-                    Signal::Eose => {
-                        this.update(cx, |this, _cx| {
-                            this.tracking.store(false, Ordering::Release);
-                        })?;
+        let tracking = self.tracking.clone();

-                        this.update(cx, |this, cx| {
-                            this.get_rooms(cx);
-                        })?;
+        self.signal_consumer = Some(cx.spawn(async move |this, cx| {
+            while let Ok(first) = rx.recv_async().await {
+                // Batch whatever has already arrived so the UI updates once per burst
+                let mut messages = Vec::new();
+                let mut errors = Vec::new();
+                let mut inbox_ready = false;
+                let mut eose = false;
+
+                let mut pending = Some(first);
+                while let Some(signal) = pending.take() {
+                    match signal {
+                        Signal::Message(message) => messages.push(message),
+                        Signal::InboxReady => inbox_ready = true,
+                        Signal::Eose => eose = true,
+                        Signal::Error(failed) => errors.push(failed),
                    }
-                    Signal::Error(failed) => {
-                        trash.update(cx, |this, cx| {
-                            this.insert(failed);
-                            cx.notify();
-                        })?;
+
+                    if messages.len() + errors.len() >= MAX_SIGNAL_BATCH {
+                        break;
                    }
-                };
+
+                    pending = rx.try_recv().ok();
+                }
+
+                if inbox_ready {
+                    this.update(cx, |this, cx| {
+                        this.get_messages(cx);
+                    })?;
+                }
+
+                if !messages.is_empty() {
+                    this.update(cx, |this, cx| {
+                        this.new_messages(messages, cx);
+                    })?;
+                }
+
+                if !errors.is_empty() {
+                    trash.update(cx, |trash, cx| {
+                        trash.extend(errors);
+                        cx.notify();
+                    })?;
+                }
+
+                if eose && tracking.swap(false, Ordering::AcqRel) {
+                    this.update(cx, |this, cx| {
+                        cx.emit(ChatEvent::Loaded);
+                        this.get_rooms(cx);
+                    })?;
+                }
            }

            Ok(())
@@ -669,6 +730,7 @@ impl ChatRegistry {
        self.rooms.clear();
        self.room_index.clear();
        self.search.write().unwrap().clear();
+        self.tracking.store(true, Ordering::Release);
        self.trash.update(cx, |this, cx| {
            this.clear();
            cx.notify();
@@ -748,6 +810,7 @@ impl ChatRegistry {
        let client = nostr.read(cx).client();
        let signer = nostr.read(cx).signer();
        let search = self.search.clone();
+        let executor = cx.background_executor().clone();

        cx.background_spawn(async move {
            let public_key = signer.get_public_key_async().await?;
@@ -775,7 +838,15 @@ impl ChatRegistry {
            let events = client.database().query(filter).await?;
            let mut grouped: HashMap<u64, Vec<UnsignedEvent>> = HashMap::new();

+            // Keep the single-threaded web event loop responsive during large rescans
+            let mut last_yield = Instant::now();
+
            for raw in events.into_iter() {
+                if last_yield.elapsed() >= Duration::from_millis(8) {
+                    executor.timer(Duration::from_millis(0)).await;
+                    last_yield = Instant::now();
+                }
+
                if let Ok(rumor) = UnsignedEvent::from_json(&raw.content)
                    && rumor.tags.public_keys().next().is_some()
                {
@@ -811,12 +882,17 @@ impl ChatRegistry {
        })
    }

-    /// Parse a nostr event into a message and push it to the belonging room
+    /// Parse nostr events into messages and push them to the belonging rooms
    ///
-    /// - If the room doesn't exist, it will be created.
-    /// - Updates room ordering based on the most recent messages.
-    pub(crate) fn new_message(&mut self, message: NewMessage, cx: &mut Context<Self>) {
-        self.search.write().unwrap().insert(&message.rumor);
+    /// - If a room doesn't exist, it will be created.
+    /// - Room ordering is updated once after the whole batch.
+    pub(crate) fn new_messages(&mut self, messages: Vec<NewMessage>, cx: &mut Context<Self>) {
+        {
+            let mut search = self.search.write().unwrap();
+            for message in &messages {
+                search.insert(&message.rumor);
+            }
+        }

        let nostr = NostrRegistry::global(cx);

@@ -824,37 +900,42 @@ impl ChatRegistry {
            return;
        };

-        match self.room_index.get(&message.room).cloned() {
-            Some(room) => {
-                room.update(cx, |this, cx| {
-                    if this.kind == RoomKind::Request
-                        && (message.rumor.pubkey == public_key || this.auto_trusted(public_key, cx))
-                    {
-                        this.set_ongoing(cx);
-                    }
-                    this.push_message(message, cx);
-                });
-                self.sort(cx);
-            }
-            None => {
-                // Push the new room to the front of the list
-                self.add_room(message.rumor, cx);
+        for message in messages {
+            match self.room_index.get(&message.room).cloned() {
+                Some(room) => {
+                    room.update(cx, |this, cx| {
+                        if this.kind == RoomKind::Request
+                            && (message.rumor.pubkey == public_key
+                                || this.auto_trusted(public_key, cx))
+                        {
+                            this.set_ongoing(cx);
+                        }
+                        this.push_message(message, cx);
+                    });
+                }
+                None => {
+                    // Push the new room to the front of the list
+                    self.add_room(message.rumor, cx);
+                }
            }
        }
+
+        self.sort(cx);
+    }
+
+    /// Parse a nostr event into a message and push it to the belonging room
+    pub(crate) fn new_message(&mut self, message: NewMessage, cx: &mut Context<Self>) {
+        self.new_messages(vec![message], cx);
    }
 }

 /// Unwraps a gift-wrapped event and processes its contents.
-async fn extract_rumor<S, D>(
+async fn extract_rumor(
    client: &Client,
-    signer: &S,
-    device_signer: Option<&D>,
+    signer: &UniversalSigner,
+    device_signer: Option<&UniversalSigner>,
    gift_wrap: &Event,
-) -> Result<UnsignedEvent, Error>
-where
-    S: AsyncNip44 + ?Sized,
-    D: AsyncNip44 + ?Sized,
-{
+) -> Result<UnsignedEvent, Error> {
    // Try to get cached rumor first
    if let Ok(rumor) = get_rumor(client, gift_wrap.id).await {
        return Ok(rumor);
@@ -866,7 +947,11 @@ where
            let Some(device_signer) = device_signer else {
                return Err(error);
            };
-            try_unwrap_with(device_signer, gift_wrap).await?
+            match try_unwrap_with(device_signer, gift_wrap).await {
+                Ok(unwrapped) => unwrapped,
+                // The wrap may be sealed to a key retired by a rotation
+                Err(_) => try_unwrap_archived(client, signer, gift_wrap).await?,
+            }
        }
    };
    let mut rumor = unwrapped.rumor;
@@ -888,10 +973,10 @@ where
 }

 /// Attempts to unwrap a gift wrap event with a given signer.
-async fn try_unwrap_with<S>(signer: &S, gift_wrap: &Event) -> Result<UnwrappedGift, Error>
-where
-    S: AsyncNip44 + ?Sized,
-{
+async fn try_unwrap_with(
+    signer: &UniversalSigner,
+    gift_wrap: &Event,
+) -> Result<UnwrappedGift, Error> {
    // Get the sealed event
    let seal = signer
        .nip44_decrypt_async(&gift_wrap.pubkey, &gift_wrap.content)
@@ -922,21 +1007,50 @@ where
    })
 }

+/// Unwrap with an encryption key retired by a rotation; peers may still seal
+/// to the previous key until their announcement cache refreshes
+async fn try_unwrap_archived(
+    client: &Client,
+    signer: &UniversalSigner,
+    gift_wrap: &Event,
+) -> Result<UnwrappedGift, Error> {
+    for keys in DeviceRegistry::archived_keys(client, signer).await? {
+        let archived = UniversalSigner::new(keys);
+        if let Ok(unwrapped) = try_unwrap_with(&archived, gift_wrap).await {
+            return Ok(unwrapped);
+        }
+    }
+
+    Err(anyhow!(
+        "No archived encryption key could unwrap the gift wrap"
+    ))
+}
+
 /// Stores an unwrapped event in local database with reference to original
 async fn set_rumor(client: &Client, id: EventId, rumor: &UnsignedEvent) -> Result<(), Error> {
    let room_id = rumor.uniq_id().to_string();

-    let tags = vec![
+    let tags = Tags::from_list(vec![
        Tag::identifier(id),
        Tag::public_key(rumor.pubkey),
        Tag::custom("r", [room_id]),
        Tag::custom("k", [rumor.kind.to_string()]),
-    ];
+    ]);

-    let event = EventBuilder::new(Kind::ApplicationSpecificData, rumor.as_json())
-        .tags(tags)
-        .finalize_async(&*LOCAL_KEYS)
-        .await?;
+    let public_key = LOCAL_KEYS.public_key();
+    let created_at = Timestamp::now();
+    let kind = Kind::ApplicationSpecificData;
+    let content = rumor.as_json();
+
+    let event = Event::new(
+        EventId::compute(&public_key, &created_at, &kind, &tags, &content),
+        public_key,
+        created_at,
+        kind,
+        tags,
+        content,
+        Signature::from_byte_array([0u8; 64]),
+    );

    client.database().save_event(&event).await?;

@@ -1,16 +1,13 @@
 use std::hash::Hash;
 use std::ops::Range;

-use common::{EventExt, NostrParser, emojis_from_tags, extract_and_remove_media_urls};
+use common::{EventExt, NostrParser, emojis_from_tags, extract_and_remove_media_urls, nevent_refs};
 use gpui::{SharedString, SharedUri};
 use nostr_sdk::prelude::*;
 use state::FileAttachment;

 pub(crate) const KIND_FILE_MESSAGE: Kind = Kind::Custom(15);

-const SCHEME_WITH_COLON: &str = "nostr:";
-const NEVENT_PREFIX: &str = "nevent1";
-
 /// Rendered message.
 #[derive(Debug, Clone)]
 pub struct Message {
@@ -248,61 +245,6 @@ fn extract_mentions(content: &str) -> Vec<Mention> {
        .collect()
 }

-/// A `nevent` reference found in a content string.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct NeventRef {
-    /// Range of the reference, including the optional `nostr:` scheme
-    pub range: Range<usize>,
-    /// Compact display label, like `https://njump.me/nevent1...d9sp`
-    pub label: String,
-}
-
-/// Extracts valid `nevent1...` and `nostr:nevent1...` references from content.
-pub fn nevent_refs(content: &str) -> Vec<NeventRef> {
-    let mut references = Vec::new();
-
-    for (match_start, _) in content.match_indices(NEVENT_PREFIX) {
-        // Only lowercase references are matched, matching NIP-19 encodings in practice
-        let start = if content[..match_start].ends_with(SCHEME_WITH_COLON) {
-            match_start - SCHEME_WITH_COLON.len()
-        } else {
-            match_start
-        };
-
-        // Skip matches glued to word characters, like the `nevent1` in `xnevent1...`
-        if content[..start].ends_with(char::is_alphanumeric) {
-            continue;
-        }
-
-        let end = match_start
-            + content[match_start..]
-                .bytes()
-                .take_while(u8::is_ascii_alphanumeric)
-                .count();
-
-        // The bech32 token excludes the optional `nostr:` scheme
-        let bech32 = &content[match_start..end];
-        if Nip19Event::from_bech32(bech32).is_err() {
-            continue;
-        }
-
-        references.push(NeventRef {
-            range: start..end,
-            label: nevent_label(bech32),
-        });
-    }
-
-    references
-}
-
-/// Compact display of a nevent link, like `https://njump.me/nevent1...d9sp`.
-fn nevent_label(bech32: &str) -> String {
-    match bech32.len() {
-        0..=4 => format!("https://njump.me/{bech32}"),
-        _ => format!("https://njump.me/nevent1...{}", &bech32[bech32.len() - 4..]),
-    }
-}
-
 /// Extracts all reply (ids) from the event tags.
 fn extract_reply_ids(inner: &Tags) -> Vec<EventId> {
    let mut replies_to = vec![];
@@ -16,6 +16,7 @@ use crate::{FileAttachment, KIND_FILE_MESSAGE, NewMessage};

 const NO_DEKEY: &str = "User hasn't set up a decoupled encryption key yet.";
 const USER_NO_DEKEY: &str = "You haven't set up a decoupled encryption key yet. Set one up in the settings to message them.";
+const KEY_STALE: &str = "Your encryption key is out of date; sync it from another device in the settings to keep messaging.";

 /// The outcome of delivering an encrypted rumor to a single receiver.
 #[derive(Debug, Clone)]
@@ -553,6 +554,7 @@ impl Room {
        let config = self.config.clone();

        let device = DeviceRegistry::global(cx);
+        let resyncing = device.read(cx).is_resyncing();
        let encryption_signer = device.read(cx).signer(cx);

        let nostr = NostrRegistry::global(cx);
@@ -574,6 +576,28 @@ impl Room {
        Some(cx.background_spawn(async move {
            let signer_kind = config.signer_kind();

+            // Block sends while the local encryption key is stale against the
+            // current announcement; the replacement is being synced from
+            // another device
+            if resyncing && matches!(signer_kind, SignerKind::Auto | SignerKind::Encryption) {
+                let mut reports: Vec<SendReport> = receivers
+                    .into_iter()
+                    .map(|receiver| SendReport {
+                        receiver: receiver.public_key(),
+                        result: Err(KEY_STALE.into()),
+                    })
+                    .collect();
+
+                if config.backup() {
+                    reports.push(SendReport {
+                        receiver: sender.public_key(),
+                        result: Err(KEY_STALE.into()),
+                    });
+                }
+
+                return reports;
+            }
+
            // Deliver to every receiver concurrently
            let sends = receivers.into_iter().map(|receiver| {
                deliver(
@@ -6,14 +6,16 @@ publish.workspace = true

 [dependencies]
 state = { path = "../state" }
+speech = { path = "../speech" }
 ui = { path = "../ui" }
-gpui-kit.workspace = true
+gpui-kit = { workspace = true, features = ["speech"] }
 common = { path = "../common" }
 person = { path = "../person" }
 chat = { path = "../chat" }
 settings = { path = "../settings" }

 gpui.workspace = true
+instant.workspace = true
 nostr-sdk.workspace = true
 anyhow.workspace = true
 itertools.workspace = true
@@ -21,3 +23,6 @@ smallvec.workspace = true
 serde.workspace = true

 regex = "1"
+
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+nip60_ui = { path = "../nip60_ui" }
@@ -1,4 +1,4 @@
-use gpui::Action;
+use gpui::{Action, actions};
 use nostr_sdk::prelude::*;
 use serde::Deserialize;
 use settings::SignerKind;
@@ -15,3 +15,6 @@ pub enum Command {
    Njump(PublicKey),
    Trace(EventId),
 }
+
+// Start or stop dictation in the focused composer
+actions!(chat, [ToggleDictation]);
@@ -1,32 +1,70 @@
-use std::path::{Path, PathBuf};
-
-use chat::FileAttachment;
+use anyhow::Error;
 use gpui::SharedString;
 use nostr_sdk::prelude::*;
+use state::{FileAttachment, LocalFile, PickedFile};

 /// A file attachment that has been uploaded, but not sent yet.
 ///
-/// The local `path` is kept around so the composer can preview
+/// The `local` handle is kept around so the composer can preview
 /// the file without downloading and decrypting it again.
 pub(crate) struct PendingFile {
    pub file: FileAttachment,
-    pub path: PathBuf,
+    pub local: LocalFile,
 }

 /// State of the encrypted file attachment of a message
 pub(crate) enum DecryptedFile {
    Loading,
-    Ready(PathBuf),
+    Ready(LocalFile),
    Failed(SharedString),
 }

 /// Result of an upload, either plain or encrypted
 pub(crate) enum Uploaded {
    Url(Url),
-    File(FileAttachment, PathBuf),
+    File(Box<UploadedFile>),
 }

-/// A `file://` url for a decrypted file, so it can be opened by the OS
-pub(crate) fn file_url(path: &Path) -> String {
-    format!("file://{}", path.display())
+/// An encrypted upload and the handle to preview it locally
+pub(crate) struct UploadedFile {
+    pub file: FileAttachment,
+    pub local: LocalFile,
+}
+
+impl Uploaded {
+    /// Build the upload result for a picked file, encrypted when the
+    /// attachment is the whole message
+    pub(crate) async fn from_pick(
+        encrypted: bool,
+        server: Url,
+        picked: PickedFile,
+        cx: &gpui::AsyncApp,
+    ) -> Result<Self, Error> {
+        if encrypted {
+            let UploadedFileParts { file, local } = upload_encrypted(server, picked, cx).await?;
+
+            Ok(Self::File(Box::new(UploadedFile { file, local })))
+        } else {
+            state::upload_file(server, picked, cx).await.map(Self::Url)
+        }
+    }
+}
+
+/// The pieces of an encrypted upload, split so the local handle survives the
+/// picked file being consumed by the upload
+struct UploadedFileParts {
+    file: FileAttachment,
+    local: LocalFile,
+}
+
+async fn upload_encrypted(
+    server: Url,
+    picked: PickedFile,
+    cx: &gpui::AsyncApp,
+) -> Result<UploadedFileParts, Error> {
+    let local = picked.local.clone();
+
+    state::upload_encrypted_file(server, picked, cx)
+        .await
+        .map(|file| UploadedFileParts { file, local })
 }
@@ -1,6 +1,6 @@
 use std::collections::{BTreeMap, HashMap, HashSet};
-use std::path::PathBuf;
 use std::sync::{Arc, LazyLock, RwLock};
+use std::time::Duration;

 pub use actions::*;
 use anyhow::Error;
@@ -10,12 +10,10 @@ use gpui::prelude::FluentBuilder;
 use gpui::{
    AnyElement, App, AppContext, ClipboardItem, Context, Entity, EventEmitter, FocusHandle,
    Focusable, InteractiveElement, IntoElement, ListAlignment, ListOffset, ListState, MouseButton,
-    ObjectFit, ParentElement, PathPromptOptions, Render, SharedString, SharedUri,
-    StatefulInteractiveElement, Styled, StyledImage, Subscription, SystemNotification,
-    SystemNotificationAction, Task, WeakEntity, Window, div, img, list, px, red, relative,
-    retain_all, svg, white,
+    ObjectFit, ParentElement, Render, SharedString, SharedUri, StatefulInteractiveElement, Styled,
+    StyledImage, Subscription, SystemNotification, SystemNotificationAction, Task, WeakEntity,
+    Window, div, img, list, px, red, relative, retain_all, svg, white,
 };
-use gpui_kit::assets::IconName;
 use gpui_kit::base::StyledExt as _;
 use gpui_kit::component::button::{Button, ButtonVariants};
 use gpui_kit::component::dock::{Panel, PanelEvent};
@@ -23,6 +21,7 @@ use gpui_kit::component::input::{Input, InputEvent, InputState, Textarea, Textar
 use gpui_kit::component::menu::DropdownMenu;
 use gpui_kit::component::notification::Notification;
 use gpui_kit::component::scroll::Scrollbar;
+use gpui_kit::component::speech::{SpeechButton, SpeechEvent, SpeechState, SpeechWaveform};
 use gpui_kit::component::tooltip::Tooltip;
 use gpui_kit::component::{ActiveTheme, Disableable, Icon, Sizable, WindowExt, h_flex, v_flex};
 use itertools::Itertools;
@@ -31,26 +30,23 @@ use person::{Directory, Person};
 use regex::Regex;
 use settings::{AppSettings, SignerKind};
 use smallvec::{SmallVec, smallvec};
+use speech::speaker::{END_GRACE, Speaker};
 use state::{
-    FileAttachment, NostrRegistry, download_and_decrypt_to_file, upload, upload_encrypted,
+    FileAttachment, LocalFile, NostrRegistry, PickedFile, download_and_decrypt_file, pick_file,
+};
+use ui::{
+    Avatar, COMPACT_REACTION_EMOJIS, IconName, MessageActions, MessageMedia, MessageRow,
+    REACTION_EMOJIS, ReactionBar, RenderedText, ReplyPreview, RevealText, WelcomeMessage,
+    group_reactions, opens_run, rendered_text,
 };

 use crate::file::*;
-use crate::message::{
-    Avatar, MessageMedia, MessageRow, ReactionBar, ReplyPreview, WelcomeMessage, group_reactions,
-    opens_run,
-};
-use crate::text::RenderedText;
-
-const REACTION_EMOJIS: &[&str] = &["👍", "👎", "😄", "🎉", "😕", "❤️", "🚀", "👀"];
-const COMPACT_REACTION_EMOJIS: &[&str] = &["👍", "❤️", "👀"];

 /// Notice shown when a conversation has no messages, and above the message list.
 const PRIVATE_NOTICE: &str =
    "This conversation is private. Only members can see each other's messages.";

-/// Regex matching strings that consist entirely of emoji characters,
-/// zero-width joiners, variation selectors, and keycap combiners.
+/// Regex matching strings that consist entirely of emoji characters.
 static EMOJI_RE: LazyLock<Regex> =
    LazyLock::new(|| Regex::new(r"^[\p{Emoji}\u{200D}\u{FE0F}\u{20E3}]+$").unwrap());

@@ -60,8 +56,6 @@ static CUSTOM_EMOJI_RE: LazyLock<Regex> =

 mod actions;
 mod file;
-pub mod message;
-pub mod text;

 pub fn init(room: WeakEntity<Room>, window: &mut Window, cx: &mut App) -> Entity<ChatPanel> {
    cx.new(|cx| ChatPanel::new(room, window, cx))
@@ -71,60 +65,50 @@ pub fn init(room: WeakEntity<Room>, window: &mut Window, cx: &mut App) -> Entity
 pub struct ChatPanel {
    id: SharedString,
    focus_handle: FocusHandle,
-
    /// Chat Room
    room: WeakEntity<Room>,
-
    /// Person directory shared with the room
    directory: Entity<Directory>,
-
    /// Message list state
    list_state: ListState,
-
    /// All messages (sorted by created_at)
    messages: Vec<Message>,
-
    /// O(1) message lookup by EventId
    message_index: HashMap<EventId, usize>,
-
    /// All reactions
    reactions: BTreeMap<EventId, Vec<(SharedString, Option<SharedUri>, PublicKey)>>,
-
    /// Mapping message ids to their rendered texts
    rendered_texts_by_id: BTreeMap<EventId, RenderedText>,
-
    /// Mapping message (rumor event) ids to their reports
    reports_by_id: Arc<RwLock<BTreeMap<EventId, Vec<SendReport>>>>,
-
    /// Chat input state
    input: Entity<TextareaState>,
-
+    /// Dictation session for the chat input
+    speech: Entity<SpeechState>,
+    /// When the running dictation started, for the elapsed counter
+    speech_started: Option<instant::Instant>,
+    /// Reads messages aloud
+    speaker: Speaker,
+    /// The message being revealed in step with speech, with its estimated duration
+    speech_reveal: Option<(EventId, Duration)>,
+    /// Fallback reveal end for backends that cannot report utterance end
+    reveal_timeout: Option<Task<Result<(), Error>>>,
    /// Subject input state
    subject_input: Entity<InputState>,
-
    /// Subject bar visibility
    subject_bar: Entity<bool>,
-
    /// Replies to
    replies_to: Entity<HashSet<EventId>>,
-
    /// Media Attachment
    attachments: Entity<Vec<Url>>,
-
    /// Uploaded, encrypted file attachments which are not sent yet
    encrypted_attachments: Entity<Vec<PendingFile>>,
-
    /// Decrypted attachments of file messages, by message id
    decrypted_files: HashMap<EventId, DecryptedFile>,
-
    /// Upload state
    uploading: bool,
-
-    /// Async operations
    tasks: Vec<Task<Result<(), Error>>>,
-
-    /// Event subscriptions
-    subscriptions: SmallVec<[Subscription; 3]>,
+    subscriptions: SmallVec<[Subscription; 4]>,
 }

 impl ChatPanel {
@@ -168,6 +152,19 @@ impl ChatPanel {
                .clean_on_escape()
        });

+        // Define dictation state
+        let speech = cx.new(|cx| {
+            let state = SpeechState::new(cx)
+                .recognizer(speech::recognizer())
+                // Batch transcription of a long recording can take a while.
+                .stop_timeout(Duration::from_secs(180));
+
+            #[cfg(target_arch = "wasm32")]
+            let state = state.input(speech::input());
+
+            state
+        });
+
        // Define subject input state
        let subject_input = cx.new(|cx| InputState::new(window, cx).placeholder("New subject..."));
        let subject_bar = cx.new(|_cx| false);
@@ -186,15 +183,39 @@ impl ChatPanel {

        subscriptions.push(
            // Subscribe the subject input event
-            cx.subscribe_in(
-                &subject_input,
-                window,
-                move |this, _input, event, window, cx| {
-                    if let InputEvent::PressEnter { .. } = event {
-                        this.change_subject(window, cx);
-                    };
-                },
-            ),
+            cx.subscribe_in(&subject_input, window, move |this, _, event, window, cx| {
+                if let InputEvent::PressEnter { .. } = event {
+                    this.change_subject(window, cx);
+                };
+            }),
+        );
+
+        subscriptions.push(
+            // Insert the dictated text into the chat input
+            cx.subscribe_in(&speech, window, move |this, _speech, event, window, cx| {
+                match event {
+                    SpeechEvent::Started => {
+                        this.speech_started = Some(instant::Instant::now());
+                        cx.notify();
+                    }
+                    SpeechEvent::Final(text) => {
+                        this.speech_started = None;
+
+                        if !text.is_empty() {
+                            this.input
+                                .update(cx, |input, cx| input.insert(text.clone(), window, cx));
+                        }
+                    }
+                    SpeechEvent::Error(error) => {
+                        this.speech_started = None;
+                        window.push_notification(Notification::error(error.to_string()), cx);
+                    }
+                    SpeechEvent::Cancelled => {
+                        this.speech_started = None;
+                    }
+                    _ => {}
+                };
+            }),
        );

        // Define all functions that will run after the current cycle
@@ -204,6 +225,20 @@ impl ChatPanel {
            this.get_messages(window, cx);
        });

+        // End the speech reveal when the utterance finishes ahead of its estimate
+        let speaker = Speaker::new();
+        let end_events = speaker.end_events();
+        let reveal_end_task = cx.spawn(async move |this, cx| {
+            while end_events.recv_async().await.is_ok() {
+                this.update(cx, |this, cx| {
+                    this.speech_reveal = None;
+                    cx.notify();
+                })?;
+            }
+
+            Ok(())
+        });
+
        Self {
            focus_handle: cx.focus_handle(),
            id,
@@ -214,6 +249,11 @@ impl ChatPanel {
            directory,
            list_state,
            input,
+            speech,
+            speech_started: None,
+            speaker,
+            speech_reveal: None,
+            reveal_timeout: None,
            subject_input,
            subject_bar,
            replies_to,
@@ -224,7 +264,7 @@ impl ChatPanel {
            reports_by_id,
            uploading: false,
            subscriptions,
-            tasks: vec![],
+            tasks: vec![reveal_end_task],
        }
    }

@@ -641,6 +681,41 @@ impl ChatPanel {
        });
    }

+    /// Open the nutzap dialog for the room's peer; direct chats only
+    fn open_nutzap(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        #[cfg(target_arch = "wasm32")]
+        let _ = (window, cx);
+
+        #[cfg(not(target_arch = "wasm32"))]
+        {
+            let Some(room) = self.room.upgrade() else {
+                return;
+            };
+
+            let nostr = NostrRegistry::global(cx);
+            let Some(me) = nostr.read(cx).current_user() else {
+                return;
+            };
+
+            let peers: Vec<PublicKey> = room
+                .read(cx)
+                .members()
+                .iter()
+                .copied()
+                .filter(|key| *key != me)
+                .collect();
+
+            if let [recipient] = peers[..] {
+                nip60_ui::open_nutzap(window, cx, recipient, None);
+            } else {
+                window.push_notification(
+                    Notification::warning("Nutzaps can only be sent in direct chats"),
+                    cx,
+                );
+            }
+        }
+    }
+
    fn upload(&mut self, window: &mut Window, cx: &mut Context<Self>) {
        // Get the user's configured blossom server
        let server = AppSettings::get_file_server(cx);
@@ -648,22 +723,17 @@ impl ChatPanel {
        // Encrypt attachments which are not part of a message being written
        let encrypted = self.input.read(cx).value().trim().is_empty();

-        // Ask user for file upload
-        let path = cx.prompt_for_paths(PathPromptOptions {
-            files: true,
-            directories: false,
-            multiple: false,
-            prompt: None,
-        });
+        // Ask the user for a file to upload
+        let picker = pick_file(cx);

        self.tasks.push(cx.spawn_in(window, async move |this, cx| {
            // Selecting no file means the prompt was cancelled
-            let Some(path) = path.await??.and_then(|mut paths| paths.pop()) else {
+            let Some(picked) = picker.await? else {
                return Ok(());
            };

            this.update_in(cx, |this, window, cx| {
-                this.upload_file(server, path, encrypted, window, cx);
+                this.upload_file(server, picked, encrypted, window, cx);
            })?;

            Ok(())
@@ -674,7 +744,7 @@ impl ChatPanel {
    fn upload_file(
        &mut self,
        server: Url,
-        path: PathBuf,
+        picked: PickedFile,
        encrypted: bool,
        window: &mut Window,
        cx: &mut Context<Self>,
@@ -682,25 +752,18 @@ impl ChatPanel {
        self.set_uploading(true, cx);

        self.tasks.push(cx.spawn_in(window, async move |this, cx| {
-            let result = if encrypted {
-                upload_encrypted(server.clone(), path.clone(), cx)
-                    .await
-                    .map(|file| Uploaded::File(file, path.clone()))
-            } else {
-                upload(server.clone(), path.clone(), cx)
-                    .await
-                    .map(Uploaded::Url)
-            };
+            let result = Uploaded::from_pick(encrypted, server.clone(), picked, cx).await;

            this.update_in(cx, |this, window, cx| {
                this.set_uploading(false, cx);

                match result {
                    Ok(Uploaded::Url(url)) => this.add_attachment(url, cx),
-                    Ok(Uploaded::File(file, path)) => this.add_pending_file(file, path, cx),
-                    Err(e) if encrypted => {
-                        this.report_encrypted_upload_error(server, path, e, window, cx)
+                    Ok(Uploaded::File(uploaded)) => {
+                        let UploadedFile { file, local } = *uploaded;
+                        this.add_pending_file(file, local, cx);
                    }
+                    Err(e) if encrypted => this.report_encrypted_upload_error(e, window, cx),
                    Err(e) => {
                        window.push_notification(
                            Notification::error(e.to_string()).autohide(false),
@@ -717,8 +780,6 @@ impl ChatPanel {
    /// Report a failed encrypted upload, offering to retry it without encryption
    fn report_encrypted_upload_error(
        &mut self,
-        server: Url,
-        path: PathBuf,
        error: Error,
        window: &mut Window,
        cx: &mut Context<Self>,
@@ -730,14 +791,12 @@ impl ChatPanel {
                .title("Encrypted upload failed")
                .action(move |_this, _window, _cx| {
                    let view = view.clone();
-                    let server = server.clone();
-                    let path = path.clone();

                    Button::new("retry-without-encryption")
-                        .label("Upload without encryption")
+                        .label("Pick the file again without encryption")
                        .on_click(move |_ev, window, cx| {
                            view.update(cx, |this, cx| {
-                                this.upload_file(server.clone(), path.clone(), false, window, cx);
+                                this.upload(window, cx);
                            })
                            .ok();
                        })
@@ -767,9 +826,9 @@ impl ChatPanel {
        });
    }

-    fn add_pending_file(&mut self, file: FileAttachment, path: PathBuf, cx: &mut Context<Self>) {
+    fn add_pending_file(&mut self, file: FileAttachment, local: LocalFile, cx: &mut Context<Self>) {
        self.encrypted_attachments.update(cx, |this, cx| {
-            this.push(PendingFile { file, path });
+            this.push(PendingFile { file, local });
            cx.notify();
        });
    }
@@ -788,12 +847,13 @@ impl ChatPanel {
        self.decrypted_files.insert(id, DecryptedFile::Loading);

        self.tasks.push(cx.spawn(async move |this, cx| {
-            let result = download_and_decrypt_to_file(&file, cx).await;
+            let result = download_and_decrypt_file(&file, cx).await;

            this.update(cx, |this, cx| {
                match result {
-                    Ok(path) => {
-                        this.decrypted_files.insert(id, DecryptedFile::Ready(path));
+                    Ok(downloaded) => {
+                        this.decrypted_files
+                            .insert(id, DecryptedFile::Ready(downloaded.local));
                    }
                    Err(e) => {
                        this.decrypted_files
@@ -808,7 +868,7 @@ impl ChatPanel {
        }));
    }

-    /// Decrypt the attachment of a file message and open it with the OS
+    /// Decrypt the attachment of a file message and open it with the platform handler
    fn open_file(
        &mut self,
        id: EventId,
@@ -816,25 +876,30 @@ impl ChatPanel {
        window: &mut Window,
        cx: &mut Context<Self>,
    ) {
-        match self.decrypted_files.get(&id) {
-            Some(DecryptedFile::Ready(path)) => {
-                cx.open_url(&file_url(path));
-                return;
-            }
-            Some(DecryptedFile::Loading) => return,
-            _ => {}
-        };
+        if let Some(DecryptedFile::Ready(local)) = self.decrypted_files.get(&id) {
+            let _ = local.open(cx).map_err(|e| {
+                window.push_notification(Notification::error(e.to_string()).autohide(false), cx);
+            });
+            return;
+        }
+
+        if let Some(DecryptedFile::Loading) = self.decrypted_files.get(&id) {
+            return;
+        }

        self.decrypted_files.insert(id, DecryptedFile::Loading);

        self.tasks.push(cx.spawn_in(window, async move |this, cx| {
-            let result = download_and_decrypt_to_file(&file, cx).await;
+            let result = download_and_decrypt_file(&file, cx).await;

-            this.update_in(cx, |this, _window, cx| {
+            this.update_in(cx, |this, window, cx| {
                match result {
-                    Ok(path) => {
-                        cx.open_url(&file_url(&path));
-                        this.decrypted_files.insert(id, DecryptedFile::Ready(path));
+                    Ok(downloaded) => {
+                        if let Err(e) = downloaded.open(cx) {
+                            window.push_notification(Notification::error(e.to_string()), cx);
+                        }
+                        this.decrypted_files
+                            .insert(id, DecryptedFile::Ready(downloaded.local));
                    }
                    Err(e) => {
                        this.decrypted_files
@@ -853,6 +918,17 @@ impl ChatPanel {
        self.directory.read(cx).person(public_key, cx)
    }

+    fn toggle_dictation(
+        &mut self,
+        _: &ToggleDictation,
+        _window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.speech.update(cx, |speech, cx| {
+            speech.toggle(cx);
+        });
+    }
+
    fn on_command(&mut self, command: &Command, window: &mut Window, cx: &mut Context<Self>) {
        match command {
            Command::Insert(content) => {
@@ -1050,7 +1126,7 @@ impl ChatPanel {
                            .rounded_full()
                            .bg(cx.theme().warning.opacity(0.15))
                            .text_color(cx.theme().warning)
-                            .child(Icon::new(IconName::TriangleAlert).small()),
+                            .child(Icon::new(IconName::Warning).small()),
                    )
                    .child(
                        div()
@@ -1108,9 +1184,12 @@ impl ChatPanel {
                .rendered_texts_by_id
                .entry(message.id)
                .or_insert_with(|| {
-                    text::rendered_text(
+                    rendered_text(
                        &message.content,
-                        &message.mentions,
+                        message
+                            .mentions
+                            .iter()
+                            .map(|mention| (mention.range.clone(), mention.public_key)),
                        &message.emojis,
                        &directory,
                        cx,
@@ -1149,12 +1228,22 @@ impl ChatPanel {
            nostr.read(cx).current_user(),
        ));

+        let body = match self
+            .speech_reveal
+            .as_ref()
+            .filter(|(reveal_id, _)| *reveal_id == id)
+        {
+            Some((_, duration)) => RevealText::new(message.preview(), *duration).into_any_element(),
+            None => rendered_text,
+        };
+
        MessageRow::new(ix)
            .show_author(show_author)
            .hide_avatar(hide_avatar)
            .avatar(
                Avatar::new(author.avatar())
                    .seed(author.avatar_seed())
+                    .small()
                    .flex_shrink_0()
                    .relative()
                    .dropdown_menu(move |this, _window, _cx| {
@@ -1172,7 +1261,7 @@ impl ChatPanel {
            .when(has_replies, |this| {
                this.children(self.render_message_replies(replies, cx))
            })
-            .when(message.file.is_none(), |this| this.child(rendered_text))
+            .when(message.file.is_none(), |this| this.child(body))
            .child(MessageMedia::new(&message.media))
            .when_some(message.file.as_ref(), |this, file| {
                this.child(self.render_message_file(&id, file, cx))
@@ -1391,83 +1480,76 @@ impl ChatPanel {
        public_key: &PublicKey,
        cx: &Context<Self>,
    ) -> impl IntoElement {
-        h_flex()
-            .p_0p5()
-            .gap_1()
-            .invisible()
-            .absolute()
-            .right_4()
-            .top_neg_2()
-            .when(cx.theme().shadow, |this| this.shadow_sm())
-            .rounded(cx.theme().radius_lg)
-            .border_1()
-            .border_color(cx.theme().border)
-            .bg(cx.theme().background)
-            .children({
-                let mut items = vec![];
+        let mut actions = MessageActions::new();

-                for emoji in COMPACT_REACTION_EMOJIS {
-                    items.push(
-                        Button::new(*emoji)
-                            .label(*emoji)
-                            .tooltip(*emoji)
-                            .small()
-                            .ghost()
-                            .on_click({
-                                let emoji = *emoji;
-                                let id = *id;
-                                cx.listener(move |this, _event, window, cx| {
-                                    this.send_reaction(emoji, &id, window, cx);
-                                })
-                            }),
-                    );
-                }
+        for emoji in COMPACT_REACTION_EMOJIS {
+            let id = *id;
+            actions = actions.reaction(
+                emoji,
+                cx.listener(move |this, _event, window, cx| {
+                    this.send_reaction(emoji, &id, window, cx);
+                }),
+            );
+        }

-                items
-            })
-            .child(div().flex_shrink_0().h_4().w_px().bg(cx.theme().border))
-            .child(
-                Button::new("reply")
-                    .icon(IconName::Reply)
-                    .tooltip("Reply")
-                    .small()
-                    .ghost()
-                    .on_click({
-                        let id = id.to_owned();
-                        cx.listener(move |this, _event, _window, cx| {
-                            this.reply_to(&id, cx);
-                        })
-                    }),
+        let reply_id = *id;
+        let dropdown_id = *id;
+        let public_key = *public_key;
+
+        let actions = actions.reply(cx.listener(move |this, _event, _window, cx| {
+            this.reply_to(&reply_id, cx);
+        }));
+
+        let actions = if let Some(message) = self.message(id) {
+            actions.copy(
+                SharedString::from(format!("message-copy-{id}")),
+                message.preview(),
            )
-            .child(
-                Button::new("copy")
-                    .icon(IconName::Copy)
-                    .tooltip("Copy")
-                    .small()
-                    .ghost()
-                    .on_click({
-                        let id = id.to_owned();
-                        cx.listener(move |this, _event, _window, cx| {
-                            this.copy_message(&id, cx);
-                        })
-                    }),
-            )
-            .child(div().flex_shrink_0().h_4().w_px().bg(cx.theme().border))
-            .child(
-                Button::new("advance")
-                    .icon(IconName::Ellipsis)
-                    .small()
-                    .ghost()
-                    .dropdown_menu({
-                        let public_key = *public_key;
-                        let id = *id;
-                        move |this, _window, _cx| {
-                            this.menu("Copy author", Box::new(Command::Copy(public_key)))
-                                .menu("Seen on", Box::new(Command::Trace(id)))
+        } else {
+            actions
+        };
+
+        let speaking = self.speech_reveal.is_some();
+        let speech_id = *id;
+
+        let actions = actions.speech(
+            speaking,
+            cx.listener(move |this, _event, window, cx| {
+                let text = this.message(&speech_id).map(|message| message.preview());
+
+                if let Some(text) = text {
+                    match this.speaker.speak(&text) {
+                        Ok(duration) => {
+                            this.speech_reveal = Some((speech_id, duration));
+
+                            // Re-enable speaking when no end event ever arrives
+                            let session = (speech_id, duration);
+                            let timer = cx.background_executor().timer(duration + END_GRACE);
+                            this.reveal_timeout = Some(cx.spawn(async move |this, cx| {
+                                timer.await;
+                                this.update(cx, |this, cx| {
+                                    if this.speech_reveal.as_ref() == Some(&session) {
+                                        this.speech_reveal = None;
+                                        cx.notify();
+                                    }
+                                })?;
+
+                                Ok(())
+                            }));
+                            cx.notify();
                        }
-                    }),
-            )
-            .group_hover("", |this| this.visible())
+                        Err(error) => {
+                            window.push_notification(Notification::error(error.to_string()), cx)
+                        }
+                    }
+                }
+            }),
+        );
+
+        actions.dropdown(move |menu, _window, _cx| {
+            menu.menu("Copy author", Box::new(Command::Copy(public_key)))
+                .menu("Seen on", Box::new(Command::Trace(dropdown_id)))
+        })
    }

    fn render_attachment(&self, url: &Url, cx: &Context<Self>) -> impl IntoElement {
@@ -1493,7 +1575,7 @@ impl ChatPanel {
                    .justify_center()
                    .rounded_full()
                    .bg(red())
-                    .child(Icon::new(IconName::X).size_2().text_color(white())),
+                    .child(Icon::new(IconName::Close).size_2().text_color(white())),
            )
            .on_click({
                let url = url.clone();
@@ -1526,16 +1608,16 @@ impl ChatPanel {
    ) -> AnyElement {
        let state = self.decrypted_files.get(id);

-        if let Some(path) = state
+        if let Some(local) = state
            .and_then(|state| match state {
-                DecryptedFile::Ready(path) => Some(path),
+                DecryptedFile::Ready(local) => Some(local),
                _ => None,
            })
            .filter(|_| file.is_image())
        {
            return div()
                .child(
-                    img(path.clone())
+                    img(local.image_source())
                        .border_1()
                        .border_color(cx.theme().border)
                        .h(px(250.))
@@ -1611,7 +1693,7 @@ impl ChatPanel {
            .map(|this| {
                if file.is_image() {
                    this.child(
-                        img(pending.path.clone())
+                        img(pending.local.image_source())
                            .size_16()
                            .when(cx.theme().shadow, |this| this.shadow_sm())
                            .rounded(cx.theme().radius)
@@ -1694,7 +1776,7 @@ impl ChatPanel {
                        )
                        .child(
                            Button::new("remove-reply")
-                                .icon(IconName::X)
+                                .icon(IconName::Close)
                                .xsmall()
                                .ghost()
                                .on_click({
@@ -1732,7 +1814,12 @@ impl ChatPanel {
        items
    }

-    fn render_config_menu(&self, _window: &mut Window, cx: &Context<Self>) -> impl IntoElement {
+    fn render_config_menu(
+        &self,
+        disabled: bool,
+        _window: &mut Window,
+        cx: &Context<Self>,
+    ) -> impl IntoElement {
        let (backup, signer_kind) = self
            .room
            .read_with(cx, |this, _cx| {
@@ -1745,7 +1832,7 @@ impl ChatPanel {
            .icon(IconName::Settings2)
            .tooltip("Configuration")
            .ghost()
-            .large()
+            .disabled(disabled)
            .dropdown_menu(move |this, _window, _cx| {
                let auto = matches!(signer_kind, SignerKind::Auto);
                let encryption = matches!(signer_kind, SignerKind::Encryption);
@@ -1776,7 +1863,12 @@ impl ChatPanel {
            })
    }

-    fn render_emoji_menu(&self, _window: &Window, cx: &Context<Self>) -> impl IntoElement {
+    fn render_emoji_menu(
+        &self,
+        disabled: bool,
+        _window: &Window,
+        cx: &Context<Self>,
+    ) -> impl IntoElement {
        let nostr = NostrRegistry::global(cx);
        let current_user = nostr.read(cx).current_user();

@@ -1791,9 +1883,9 @@ impl ChatPanel {
            .unwrap_or_default();

        Button::new("emoji")
-            .icon(IconName::Sticker)
+            .icon(IconName::Emoji)
            .ghost()
-            .large()
+            .disabled(disabled)
            .dropdown_menu_with_anchor(gpui::Anchor::BottomLeft, move |this, _window, _cx| {
                let menu = REACTION_EMOJIS.iter().fold(this, |this, emoji| {
                    this.menu(*emoji, Box::new(Command::Insert(emoji.to_string())))
@@ -1839,7 +1931,7 @@ impl Panel for ChatPanel {

        Some(vec![
            Button::new("subject")
-                .icon(IconName::TextCursorInput)
+                .icon(IconName::Input)
                .tooltip("Change subject")
                .small()
                .ghost()
@@ -1867,10 +1959,12 @@ impl Render for ChatPanel {

        let is_typing = !self.input.read(cx).value().trim().is_empty();
        let pending_attachments = !self.encrypted_attachments.read(cx).is_empty();
+        let dictating = self.speech.read(cx).status().is_active();

        v_flex()
            .image_cache(retain_all(self.id.clone()))
            .on_action(cx.listener(Self::on_command))
+            .on_action(cx.listener(Self::toggle_dictation))
            .size_full()
            .when(*self.subject_bar.read(cx), |this| {
                this.child(
@@ -1881,10 +1975,10 @@ impl Render for ChatPanel {
                        .gap_2()
                        .border_b_1()
                        .border_color(cx.theme().border)
-                        .child(Input::new(&self.subject_input).small())
+                        .child(Input::new(&self.subject_input))
                        .child(
                            Button::new("change")
-                                .icon(IconName::CircleCheck)
+                                .icon(IconName::CheckCircle)
                                .label("Change")
                                .secondary()
                                .disabled(self.uploading)
@@ -1944,29 +2038,68 @@ impl Render for ChatPanel {
                            .items_end()
                            .child(
                                Button::new("upload")
-                                    .icon(IconName::Plus)
+                                    .icon(IconName::Paperclip)
                                    .tooltip("Upload media")
                                    .loading(self.uploading)
-                                    .disabled(self.uploading)
+                                    .disabled(dictating || self.uploading)
                                    .ghost()
-                                    .large()
                                    .on_click(cx.listener(move |this, _ev, window, cx| {
                                        this.upload(window, cx);
                                    })),
                            )
-                            .child(Textarea::new(&self.input).appearance(false).flex_1())
+                            .when(cfg!(not(target_arch = "wasm32")), |this| {
+                                this.child(
+                                    Button::new("nutzap")
+                                        .icon(gpui_kit::assets::IconName::Coins)
+                                        .tooltip("Send eCash")
+                                        .disabled(dictating)
+                                        .ghost()
+                                        .on_click(cx.listener(move |this, _ev, window, cx| {
+                                            this.open_nutzap(window, cx);
+                                        })),
+                                )
+                            })
+                            .when(dictating, |this| {
+                                this.child(
+                                    h_flex()
+                                        .h_8()
+                                        .flex_1()
+                                        .gap_2()
+                                        .pl_1()
+                                        .child(SpeechWaveform::new(&self.speech).small().flex_1())
+                                        .when_some(self.speech_started, |this, started| {
+                                            this.child(speech::elapsed(started, cx))
+                                        }),
+                                )
+                            })
+                            .when(!dictating, |this| {
+                                this.child(
+                                    Textarea::new(&self.input)
+                                        .appearance(false)
+                                        .small()
+                                        .min_h_8()
+                                        .py_1()
+                                        .flex_1(),
+                                )
+                            })
+                            .child(
+                                h_flex()
+                                    .items_end()
+                                    .gap_1()
+                                    .pl_1()
+                                    .child(SpeechButton::new(&self.speech)),
+                            )
                            .child(
                                h_flex()
                                    .pl_1()
                                    .gap_1()
-                                    .child(self.render_emoji_menu(window, cx))
-                                    .child(self.render_config_menu(window, cx))
+                                    .child(self.render_emoji_menu(dictating, window, cx))
+                                    .child(self.render_config_menu(dictating, window, cx))
                                    .child(
                                        Button::new("send")
-                                            .icon(IconName::SendHorizontal)
-                                            .disabled(self.uploading)
+                                            .icon(IconName::PaperPlaneFill)
+                                            .disabled(dictating || self.uploading)
                                            .ghost()
-                                            .large()
                                            .on_click(cx.listener(move |this, _ev, window, cx| {
                                                this.send_text_message(window, cx);
                                            })),
@@ -16,3 +16,7 @@ futures.workspace = true

 dirs = "5.0"
 regex = "1.10"
+anyhow.workspace = true
+
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+web-sys = { version = "0.3", features = ["Window", "Storage"] }
@@ -1,13 +1,16 @@
-pub use debounced_delay::*;
-pub use display::*;
-pub use event::*;
-pub use media_extractor::*;
-pub use parser::*;
-pub use paths::*;
-
 mod debounced_delay;
 mod display;
 mod event;
 mod media_extractor;
 mod parser;
 mod paths;
+
+#[cfg(target_arch = "wasm32")]
+pub mod web_store;
+
+pub use debounced_delay::*;
+pub use display::*;
+pub use event::*;
+pub use media_extractor::*;
+pub use parser::*;
+pub use paths::*;
@@ -4,6 +4,62 @@ use nostr::prelude::*;

 const BECH32_SEPARATOR: u8 = b'1';
 const SCHEME_WITH_COLON: &str = "nostr:";
+const NEVENT_PREFIX: &str = "nevent1";
+
+/// A `nevent` reference found in a content string.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct NeventRef {
+    /// Range of the reference, including the optional `nostr:` scheme
+    pub range: Range<usize>,
+    /// Compact display label, like `https://njump.me/nevent1...d9sp`
+    pub label: String,
+}
+
+/// Extracts valid `nevent1...` and `nostr:nevent1...` references from content.
+pub fn nevent_refs(content: &str) -> Vec<NeventRef> {
+    let mut references = Vec::new();
+
+    for (match_start, _) in content.match_indices(NEVENT_PREFIX) {
+        // Only lowercase references are matched, matching NIP-19 encodings in practice
+        let start = if content[..match_start].ends_with(SCHEME_WITH_COLON) {
+            match_start - SCHEME_WITH_COLON.len()
+        } else {
+            match_start
+        };
+
+        // Skip matches glued to word characters, like the `nevent1` in `xnevent1...`
+        if content[..start].ends_with(char::is_alphanumeric) {
+            continue;
+        }
+
+        let end = match_start
+            + content[match_start..]
+                .bytes()
+                .take_while(u8::is_ascii_alphanumeric)
+                .count();
+
+        // The bech32 token excludes the optional `nostr:` scheme
+        let bech32 = &content[match_start..end];
+        if Nip19Event::from_bech32(bech32).is_err() {
+            continue;
+        }
+
+        references.push(NeventRef {
+            range: start..end,
+            label: nevent_label(bech32),
+        });
+    }
+
+    references
+}
+
+/// Compact display of a nevent link, like `https://njump.me/nevent1...d9sp`.
+fn nevent_label(bech32: &str) -> String {
+    match bech32.len() {
+        0..=4 => format!("https://njump.me/{bech32}"),
+        _ => format!("https://njump.me/nevent1...{}", &bech32[bech32.len() - 4..]),
+    }
+}

 /// Nostr parsed token with its range in the original text
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -0,0 +1,32 @@
+use anyhow::{Error, anyhow};
+
+const LOCAL_STORAGE: &str = "localStorage";
+
+fn storage() -> Result<web_sys::Storage, Error> {
+    web_sys::window()
+        .ok_or_else(|| anyhow!("no browser window"))?
+        .local_storage()
+        .map_err(|e| anyhow!("{LOCAL_STORAGE} unavailable: {e:?}"))?
+        .ok_or_else(|| anyhow!("{LOCAL_STORAGE} unavailable"))
+}
+
+/// Read a value previously written with [`set`]
+pub fn get(key: &str) -> Result<Option<String>, Error> {
+    storage()?
+        .get_item(key)
+        .map_err(|e| anyhow!("{LOCAL_STORAGE} read failed: {e:?}"))
+}
+
+/// Write a value, replacing any previous one
+pub fn set(key: &str, value: &str) -> Result<(), Error> {
+    storage()?
+        .set_item(key, value)
+        .map_err(|e| anyhow!("{LOCAL_STORAGE} write failed: {e:?}"))
+}
+
+/// Remove a value if it exists
+pub fn remove(key: &str) -> Result<(), Error> {
+    storage()?
+        .remove_item(key)
+        .map_err(|e| anyhow!("{LOCAL_STORAGE} delete failed: {e:?}"))
+}
@@ -11,11 +11,13 @@ common = { path = "../common" }
 nip29 = { path = "../nip29" }
 person = { path = "../person" }
 settings = { path = "../settings" }
+speech = { path = "../speech" }
 state = { path = "../state" }
-gpui-kit.workspace = true
+gpui-kit = { workspace = true, features = ["speech"] }
 ui = { path = "../ui" }

 gpui.workspace = true
+instant.workspace = true
 nostr-sdk.workspace = true
 anyhow.workspace = true
 log.workspace = true
@@ -1,14 +1,14 @@
 use std::collections::BTreeMap;
+use std::time::Duration;

 use anyhow::Result;
-use chat_ui::message::WelcomeMessage;
-use chat_ui::text::{RenderedText, rendered_text};
+use chat_ui::ToggleDictation;
 use gpui::prelude::FluentBuilder;
 use gpui::{
    Action, AnyElement, App, AppContext, Context, Entity, EventEmitter, FocusHandle, Focusable,
-    FollowMode, IntoElement, ListAlignment, ListScrollEvent, ListState, ParentElement,
-    PathPromptOptions, Render, SharedString, Styled, Subscription, Task, WeakEntity, Window, div,
-    list, px,
+    FollowMode, InteractiveElement, IntoElement, ListAlignment, ListScrollEvent, ListState,
+    ParentElement, Render, SharedString, Styled, Subscription, Task, WeakEntity, Window, div, list,
+    px,
 };
 use gpui_kit::assets::IconName;
 use gpui_kit::base::StyledExt as _;
@@ -18,6 +18,7 @@ use gpui_kit::component::dock::{Panel, PanelEvent};
 use gpui_kit::component::input::{InputEvent, Textarea, TextareaState};
 use gpui_kit::component::notification::Notification;
 use gpui_kit::component::scroll::Scrollbar;
+use gpui_kit::component::speech::{SpeechButton, SpeechEvent, SpeechState, SpeechWaveform};
 use gpui_kit::component::{ActiveTheme, Disableable, Icon, Sizable, WindowExt, h_flex, v_flex};
 use nip29::{Group, GroupEvent, GroupKey, GroupsRegistry, Membership, Pin, Row};
 use nostr_sdk::prelude::*;
@@ -25,8 +26,9 @@ use person::Directory;
 use serde::Deserialize;
 use settings::AppSettings;
 use smallvec::{SmallVec, smallvec};
-use state::{NostrRegistry, upload};
-use ui::Avatar;
+use speech::speaker::Speaker;
+use state::{NostrRegistry, pick_file, upload_file};
+use ui::{Avatar, RenderedText, RevealText, WelcomeMessage, rendered_text};
 use util::{attachment_name, display_name, opens_run, pin_label, report};

 mod details;
@@ -315,6 +317,16 @@ pub struct GroupPanel {
    reply_to: Option<EventId>,
    rendered_texts_by_id: BTreeMap<EventId, RenderedText>,
    input: Entity<TextareaState>,
+    /// Dictation session for the composer input
+    speech: Entity<SpeechState>,
+    /// When the running dictation started, for the elapsed counter
+    speech_started: Option<instant::Instant>,
+    /// Reads messages aloud
+    speaker: Speaker,
+    /// The message being revealed in step with speech, with its estimated duration
+    speech_reveal: Option<(EventId, Duration)>,
+    /// Fallback reveal end for backends that cannot report utterance end
+    reveal_timeout: Option<Task<Result<()>>>,
    /// Uploaded, non-encrypted attachments waiting to be sent.
    attachments: Vec<Url>,
    /// Whether an upload is in flight.
@@ -322,7 +334,7 @@ pub struct GroupPanel {
    /// Whether the user closed the encryption notice this visit
    notice_dismissed: bool,
    tasks: SmallVec<[Task<Result<()>>; 4]>,
-    _subscriptions: SmallVec<[Subscription; 3]>,
+    _subscriptions: SmallVec<[Subscription; 4]>,
 }

 impl GroupPanel {
@@ -341,6 +353,18 @@ impl GroupPanel {
                .clean_on_escape()
        });

+        let speech = cx.new(|cx| {
+            let state = SpeechState::new(cx)
+                .recognizer(speech::recognizer())
+                // Batch transcription of a long recording can take a while.
+                .stop_timeout(Duration::from_secs(180));
+
+            #[cfg(target_arch = "wasm32")]
+            let state = state.input(speech::input());
+
+            state
+        });
+
        let mut subscriptions = smallvec![];

        subscriptions.push(
@@ -351,6 +375,34 @@ impl GroupPanel {
            }),
        );

+        subscriptions.push(
+            cx.subscribe_in(&speech, window, |this, _, event, window, cx| {
+                match event {
+                    SpeechEvent::Started => {
+                        this.speech_started = Some(instant::Instant::now());
+                        cx.notify();
+                    }
+                    SpeechEvent::Final(text) => {
+                        this.speech_started = None;
+
+                        if !text.is_empty() {
+                            this.input.update(cx, |input, cx| {
+                                input.insert(text.clone(), window, cx);
+                            });
+                        }
+                    }
+                    SpeechEvent::Error(error) => {
+                        this.speech_started = None;
+                        window.push_notification(Notification::error(error.to_string()), cx);
+                    }
+                    SpeechEvent::Cancelled => {
+                        this.speech_started = None;
+                    }
+                    _ => {}
+                };
+            }),
+        );
+
        subscriptions.push(cx.subscribe(&group, |this, _group, event, cx| {
            if !matches!(event, GroupEvent::Sent(_)) {
                this.sync(cx);
@@ -374,9 +426,24 @@ impl GroupPanel {
                    }
                },
            ));
+            this.track_participants(cx);
        });

-        let mut this = Self {
+        // End the speech reveal when the utterance finishes ahead of its estimate
+        let speaker = Speaker::new();
+        let end_events = speaker.end_events();
+        let reveal_end_task = cx.spawn(async move |this, cx| {
+            while end_events.recv_async().await.is_ok() {
+                this.update(cx, |this, cx| {
+                    this.speech_reveal = None;
+                    cx.notify();
+                })?;
+            }
+
+            Ok(())
+        });
+
+        Self {
            focus_handle: cx.focus_handle(),
            group: group.downgrade(),
            directory: Directory::new(cx),
@@ -386,19 +453,19 @@ impl GroupPanel {
            notice_dismissed: false,
            rendered_texts_by_id: BTreeMap::new(),
            input,
+            speech,
+            speech_started: None,
+            speaker,
+            speech_reveal: None,
+            reveal_timeout: None,
            attachments: Vec::new(),
            uploading: false,
-            tasks: smallvec![],
+            tasks: smallvec![reveal_end_task],
            _subscriptions: subscriptions,
-        };
-
-        this.track_participants(cx);
-
-        this
+        }
    }

-    /// Track the keys rendered by this panel: members, message authors, and
-    /// activity subjects
+    /// Track the keys rendered by this panel.
    fn track_participants(&mut self, cx: &mut Context<Self>) {
        let Some(group) = self.group.upgrade() else {
            return;
@@ -555,22 +622,17 @@ impl GroupPanel {
    fn upload(&mut self, window: &mut Window, cx: &mut Context<Self>) {
        let server = AppSettings::get_file_server(cx);

-        let path = cx.prompt_for_paths(PathPromptOptions {
-            files: true,
-            directories: false,
-            multiple: false,
-            prompt: None,
-        });
+        let picker = pick_file(cx);

        self.tasks.push(cx.spawn_in(window, async move |this, cx| {
            // Selecting no file means the prompt was cancelled
-            let Some(path) = path.await??.and_then(|mut paths| paths.pop()) else {
+            let Some(picked) = picker.await? else {
                return Ok(());
            };

            this.update(cx, |this, cx| this.set_uploading(true, cx))?;

-            match upload(server, path, cx).await {
+            match upload_file(server, picked, cx).await {
                Ok(url) => {
                    this.update_in(cx, |this, _window, cx| {
                        this.attachments.push(url);
@@ -981,19 +1043,29 @@ impl GroupPanel {
        let nostr = NostrRegistry::global(cx);
        let directory = self.directory.clone();

-        let content = self
-            .rendered_texts_by_id
-            .entry(message.id)
-            .or_insert_with(|| {
-                rendered_text(
-                    &message.content,
-                    &message.mentions,
-                    &message.emojis,
-                    &directory,
-                    cx,
-                )
-            })
-            .element(ix.into(), window, cx);
+        let content = match self
+            .speech_reveal
+            .as_ref()
+            .filter(|(reveal_id, _)| *reveal_id == message.id)
+        {
+            Some((_, duration)) => RevealText::new(message.preview(), *duration).into_any_element(),
+            None => self
+                .rendered_texts_by_id
+                .entry(message.id)
+                .or_insert_with(|| {
+                    rendered_text(
+                        &message.content,
+                        message
+                            .mentions
+                            .iter()
+                            .map(|mention| (mention.range.clone(), mention.public_key)),
+                        &message.emojis,
+                        &directory,
+                        cx,
+                    )
+                })
+                .element(ix.into(), window, cx),
+        };

        let admin = nostr
            .read(cx)
@@ -1014,12 +1086,24 @@ impl GroupPanel {
                panel: cx.weak_entity(),
                admin,
                pinned,
+                speaking: self.speech_reveal.is_some(),
                persons: self.directory.clone(),
            },
            cx,
        )
    }

+    fn toggle_dictation(
+        &mut self,
+        _ev: &ToggleDictation,
+        _window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.speech.update(cx, |speech, cx| {
+            speech.toggle(cx);
+        });
+    }
+
    fn render_composer(&self, cx: &mut Context<Self>) -> AnyElement {
        let notice = self.group.upgrade().and_then(|group| {
            let group = group.read(cx);
@@ -1045,6 +1129,8 @@ impl GroupPanel {
            return self.render_notice(&notice, cx);
        }

+        let dictating = self.speech.read(cx).status().is_active();
+
        v_flex()
            .flex_shrink_0()
            .w_full()
@@ -1060,23 +1146,45 @@ impl GroupPanel {
                    .items_end()
                    .child(
                        Button::new("upload")
-                            .icon(IconName::Upload)
-                            .tooltip("Upload file")
+                            .icon(ui::IconName::Paperclip)
+                            .tooltip("Upload media")
                            .loading(self.uploading)
-                            .disabled(self.uploading)
+                            .disabled(dictating || self.uploading)
                            .ghost()
-                            .large()
                            .on_click(cx.listener(|this, _event, window, cx| {
                                this.upload(window, cx);
                            })),
                    )
-                    .child(Textarea::new(&self.input).appearance(false).flex_1())
+                    .when(dictating, |this| {
+                        this.child(
+                            h_flex()
+                                .h_8()
+                                .flex_1()
+                                .gap_2()
+                                .child(SpeechWaveform::new(&self.speech).small().flex_1())
+                                .when_some(self.speech_started, |this, started| {
+                                    this.child(speech::elapsed(started, cx))
+                                }),
+                        )
+                    })
+                    .when(!dictating, |this| {
+                        this.child(
+                            Textarea::new(&self.input)
+                                .appearance(false)
+                                .bg(cx.theme().input)
+                                .small()
+                                .min_h_8()
+                                .py_1()
+                                .flex_1(),
+                        )
+                    })
+                    .child(SpeechButton::new(&self.speech))
                    .child(
                        Button::new("send")
-                            .icon(IconName::SendHorizontal)
+                            .icon(ui::IconName::PaperPlaneFill)
                            .tooltip("Send")
                            .ghost()
-                            .large()
+                            .disabled(dictating || self.uploading)
                            .on_click(cx.listener(|this, _event, window, cx| {
                                this.send(window, cx);
                            })),
@@ -1141,7 +1249,7 @@ impl GroupPanel {
            )
            .child(
                Button::new("cancel-reply")
-                    .icon(IconName::X)
+                    .icon(ui::IconName::Close)
                    .tooltip("Cancel reply")
                    .ghost()
                    .small()
@@ -1178,7 +1286,7 @@ impl GroupPanel {
                    )
                    .child(
                        Button::new(SharedString::from(format!("remove-attachment-{ix}")))
-                            .icon(IconName::X)
+                            .icon(ui::IconName::Close)
                            .tooltip("Remove")
                            .ghost()
                            .xsmall()
@@ -1274,6 +1382,7 @@ impl Render for GroupPanel {
        v_flex()
            .size_full()
            .min_w_0()
+            .on_action(cx.listener(Self::toggle_dictation))
            .child(self.render_encryption_notice(cx))
            .child(self.render_banner(cx))
            .child(self.render_pins(cx))
@@ -1,5 +1,4 @@
 use chat::Message;
-use chat_ui::message::{MessageMedia, MessageRow, ReactionBar, ReplyPreview, group_reactions};
 use common::TimestampExt;
 use gpui::prelude::FluentBuilder;
 use gpui::{
@@ -8,24 +7,29 @@ use gpui::{
 };
 use gpui_kit::assets::IconName;
 use gpui_kit::base::StyledExt as _;
-use gpui_kit::component::menu::{ContextMenuExt as _, PopupMenu, PopupMenuItem};
-use gpui_kit::component::{ActiveTheme, Icon, Sizable, h_flex};
+use gpui_kit::component::menu::{ContextMenuExt as _, PopupMenuItem};
+use gpui_kit::component::notification::Notification;
+use gpui_kit::component::{ActiveTheme, Icon, Sizable, WindowExt, h_flex};
 use nip29::{Activity, Group, Reaction};
 use nostr_sdk::prelude::{EventId, Kind};
 use person::Directory;
 use settings::AppSettings;
+use speech::speaker::END_GRACE;
 use state::NostrRegistry;
-use ui::Avatar;
+use ui::{
+    Avatar, MessageActions, MessageMedia, MessageRow, REACTION_EMOJIS, ReactionBar, ReplyPreview,
+    group_reactions, react_menu,
+};

 use crate::GroupPanel;

-const REACTIONS: [&str; 6] = ["👍", "❤️", "😂", "🎉", "😮", "😢"];
-
 pub(crate) struct Actions {
    pub group: WeakEntity<Group>,
    pub panel: WeakEntity<GroupPanel>,
    pub admin: bool,
    pub pinned: bool,
+    /// Whether a message is currently being spoken, disabling the speech buttons
+    pub speaking: bool,
    pub persons: Entity<Directory>,
 }

@@ -61,6 +65,7 @@ pub(crate) fn render(
        .avatar(
            Avatar::new(author.avatar())
                .seed(author.avatar_seed())
+                .small()
                .flex_shrink_0(),
        )
        .author(author.name())
@@ -86,7 +91,57 @@ pub(crate) fn render(
    let admin = actions.admin;
    let pinned = actions.pinned;
    let group = actions.group;
-    let panel = actions.panel;
+    let speech_panel = actions.panel;
+    let panel = speech_panel.clone();
+    let speech_text = message.preview();
+    let speech_id = message.id;
+    let speaking = actions.speaking;
+
+    let row = row.overlay(
+        MessageActions::new().speech(speaking, move |_event, _window, cx| {
+            _ = speech_panel.update_in(cx, |panel, window, cx| {
+                match panel.speaker.speak(&speech_text) {
+                    Ok(duration) => {
+                        panel.speech_reveal = Some((speech_id, duration));
+
+                        let session = (speech_id, duration);
+                        let timer = cx.background_executor().timer(duration + END_GRACE);
+
+                        panel.reveal_timeout = Some(cx.spawn(async move |this, cx| {
+                            timer.await;
+                            this.update(cx, |this, cx| {
+                                if this.speech_reveal.as_ref() == Some(&session) {
+                                    this.speech_reveal = None;
+                                    cx.notify();
+                                }
+                            })?;
+
+                            Ok(())
+                        }));
+
+                        cx.notify();
+                    }
+                    Err(error) => {
+                        window.push_notification(Notification::error(error.to_string()), cx)
+                    }
+                }
+            });
+        }),
+    );
+
+    let custom = nostr
+        .read(cx)
+        .current_user()
+        .map(|current_user| {
+            persons
+                .read(cx)
+                .person(&current_user, cx)
+                .emojis()
+                .iter()
+                .map(|(shortcode, _)| format!(":{shortcode}:"))
+                .collect::<Vec<_>>()
+        })
+        .unwrap_or_default();

    let row = div()
        .id(SharedString::from(format!("message-menu-{}", id.to_hex())))
@@ -106,8 +161,20 @@ pub(crate) fn render(
                .submenu("React", window, cx, {
                    let group = group.clone();
                    let panel = panel.clone();
+                    let custom = custom.clone();

-                    move |menu, _window, cx| react_menu(menu, group.clone(), panel.clone(), id, cx)
+                    move |menu, _window, _cx| {
+                        let group = group.clone();
+                        let panel = panel.clone();
+
+                        react_menu(menu, REACTION_EMOJIS, &custom, move |emoji, _window, cx| {
+                            if let Err(error) = panel.update_in(cx, |panel, window, cx| {
+                                panel.react(group.clone(), id, emoji.to_owned(), window, cx);
+                            }) {
+                                log::warn!("nip29: sending a reaction failed: {error}");
+                            }
+                        })
+                    }
                });

            if !admin {
@@ -142,67 +209,6 @@ pub(crate) fn render(
    row.into_any_element()
 }

-fn react_menu(
-    menu: PopupMenu,
-    group: WeakEntity<Group>,
-    panel: WeakEntity<GroupPanel>,
-    id: EventId,
-    cx: &App,
-) -> PopupMenu {
-    let menu = REACTIONS.iter().fold(menu, |menu, emoji| {
-        let emoji = *emoji;
-        let group = group.clone();
-        let panel = panel.clone();
-
-        menu.item(
-            PopupMenuItem::new(emoji).on_click(move |_event, _window, cx| {
-                if let Err(error) = panel.update_in(cx, |panel, window, cx| {
-                    panel.react(group.clone(), id, emoji.to_owned(), window, cx);
-                }) {
-                    log::warn!("nip29: sending a reaction failed: {error}");
-                }
-            }),
-        )
-    });
-
-    let emojis = panel
-        .upgrade()
-        .and_then(|panel| {
-            let current_user = NostrRegistry::global(cx).read(cx).current_user()?;
-            Some(
-                panel
-                    .read(cx)
-                    .directory
-                    .read(cx)
-                    .person(&current_user, cx)
-                    .emojis()
-                    .to_vec(),
-            )
-        })
-        .unwrap_or_default();
-
-    if emojis.is_empty() {
-        return menu;
-    }
-
-    let menu = menu.separator();
-    emojis.into_iter().fold(menu, |menu, (shortcode, _)| {
-        let emoji = format!(":{shortcode}:");
-        let group = group.clone();
-        let panel = panel.clone();
-
-        menu.item(
-            PopupMenuItem::new(emoji.clone()).on_click(move |_event, _window, cx| {
-                if let Err(error) = panel.update_in(cx, |panel, window, cx| {
-                    panel.react(group.clone(), id, emoji.clone(), window, cx);
-                }) {
-                    log::warn!("nip29: sending a reaction failed: {error}");
-                }
-            }),
-        )
-    })
-}
-
 pub(crate) fn render_activity(
    ix: usize,
    activity: &Activity,
@@ -218,7 +224,7 @@ pub(crate) fn render_activity(
        .gap_2()
        .py_1()
        .px_3()
-        .hover(|this| this.bg(cx.theme().primary))
+        .hover(|this| this.bg(cx.theme().list_hover))
        .child(badge(activity, cx))
        .when(!hide_avatar, |this| {
            this.child(
@@ -8,13 +8,13 @@ use gpui::{
 };
 use gpui_kit::component::button::{Button, ButtonVariants};
 use gpui_kit::component::dialog::DialogButtonProps;
-use gpui_kit::component::form::field as form_field;
 use gpui_kit::component::input::InputState;
 use gpui_kit::component::notification::Notification;
 use gpui_kit::component::switch::Switch;
 use gpui_kit::component::{ActiveTheme, Sizable, WindowExt, h_flex, v_flex};
 use nip29::{Group, GroupId, GroupMetadata};
 use nostr_sdk::prelude::RelayUrl;
+use ui::settings_row;

 use crate::util::field;

@@ -126,73 +126,61 @@ pub(crate) fn open(group: WeakEntity<Group>, window: &mut Window, cx: &mut App)
                    .child(
                        v_flex()
                            .gap_2()
-                            .child(
-                                form_field()
-                                    .label("Private")
-                                    .description("Only members can read group messages")
-                                    .child(
-                                        Switch::new("private")
-                                            .checked(current.private)
-                                            .on_click(toggle(&flags, |flags| &mut flags.private)),
-                                    ),
-                            )
-                            .child(
-                                form_field()
-                                    .label("Restricted")
-                                    .description("Only members can post messages")
-                                    .child(
-                                        Switch::new("restricted")
-                                            .checked(current.restricted)
-                                            .on_click(toggle(&flags, |flags| {
-                                                &mut flags.restricted
-                                            })),
-                                    ),
-                            )
-                            .child(
-                                form_field()
-                                    .label("Hidden")
-                                    .description("Hidden from non-members, not discoverable")
-                                    .child(
-                                        Switch::new("hidden")
-                                            .checked(current.hidden)
-                                            .on_click(toggle(&flags, |flags| &mut flags.hidden)),
-                                    ),
-                            )
-                            .child(
-                                form_field()
-                                    .label("Closed")
-                                    .description("Join requests are ignored (invite-only)")
-                                    .child(
-                                        Switch::new("closed")
-                                            .checked(current.closed)
-                                            .on_click(toggle(&flags, |flags| &mut flags.closed)),
-                                    ),
-                            )
-                            .child(
-                                form_field()
-                                    .label("LiveKit")
-                                    .description(if supported {
-                                        "Announce audio and video support."
-                                    } else {
-                                        "The relay doesn't announce LiveKit support."
-                                    })
-                                    .child(
-                                        Switch::new("livekit").checked(current.livekit).on_click({
-                                            let flags = flags.clone();
-                                            let livekit = livekit.clone();
+                            .child(settings_row(
+                                "Private",
+                                "Only members can read group messages",
+                                Switch::new("private")
+                                    .checked(current.private)
+                                    .on_click(toggle(&flags, |flags| &mut flags.private)),
+                                cx,
+                            ))
+                            .child(settings_row(
+                                "Restricted",
+                                "Only members can post messages",
+                                Switch::new("restricted")
+                                    .checked(current.restricted)
+                                    .on_click(toggle(&flags, |flags| &mut flags.restricted)),
+                                cx,
+                            ))
+                            .child(settings_row(
+                                "Hidden",
+                                "Hidden from non-members, not discoverable",
+                                Switch::new("hidden")
+                                    .checked(current.hidden)
+                                    .on_click(toggle(&flags, |flags| &mut flags.hidden)),
+                                cx,
+                            ))
+                            .child(settings_row(
+                                "Closed",
+                                "Join requests are ignored (invite-only)",
+                                Switch::new("closed")
+                                    .checked(current.closed)
+                                    .on_click(toggle(&flags, |flags| &mut flags.closed)),
+                                cx,
+                            ))
+                            .child(settings_row(
+                                "LiveKit",
+                                if supported {
+                                    "Announce audio and video support."
+                                } else {
+                                    "The relay doesn't announce LiveKit support."
+                                },
+                                Switch::new("livekit").checked(current.livekit).on_click({
+                                    let flags = flags.clone();
+                                    let livekit = livekit.clone();

-                                            move |next, _window, cx| {
-                                                if *next && *livekit.read(cx) == Some(false) {
-                                                    return;
-                                                }
-                                                flags.update(cx, |flags, cx| {
-                                                    flags.livekit = *next;
-                                                    cx.notify();
-                                                });
-                                            }
-                                        }),
-                                    ),
-                            ),
+                                    move |next, _window, cx| {
+                                        if *next && *livekit.read(cx) == Some(false) {
+                                            return;
+                                        }
+                                        flags.update(cx, |flags, cx| {
+                                            flags.livekit = *next;
+                                            cx.notify();
+                                        });
+                                    }
+                                }),
+                                cx,
+                            )),
                    ),
            )
            .on_ok({
@@ -35,7 +35,7 @@ pub(crate) fn opens_run(rows: &[Row], index: usize) -> bool {
    };

    match (current, previous) {
-        (Row::Message(current), Row::Message(previous)) => chat_ui::message::opens_run(
+        (Row::Message(current), Row::Message(previous)) => ui::opens_run(
            Some((previous.author, previous.created_at.as_secs())),
            (current.author, current.created_at.as_secs()),
        ),
@@ -1,9 +1,10 @@
 use std::cell::Cell;
-use std::collections::HashSet;
+use std::collections::{HashSet, VecDeque};
 use std::path::PathBuf;
 use std::rc::Rc;
 use std::sync::Arc;
 use std::sync::atomic::{AtomicBool, Ordering};
+use std::time::Duration;

 use anyhow::{Context as AnyhowContext, Error, anyhow};
 use gpui::{
@@ -16,12 +17,14 @@ use gpui_kit::component::notification::{Notification, NotificationType};
 use gpui_kit::component::{ActiveTheme, Disableable, Sizable, WindowExt, h_flex, v_flex};
 use nostr_sdk::prelude::*;
 use person::Directory;
-use settings::AppSettings;
+use settings::{AppSettings, NIP4E_ROTATION_MAX_DAYS, NIP4E_ROTATION_MIN_DAYS};
 use smallvec::{SmallVec, smallvec};
-use state::{Announcement, CLIENT_NAME, NostrRegistry, UniversalSigner};
+use state::{Announcement, NostrRegistry, UniversalSigner, credentials};
 use ui::Avatar;

-const IDENTIFIER: &str = "coop:device";
+mod storage;
+
+use storage::{SECONDS_PER_DAY, archive_key, get_keys, load_device_keys, set_keys};

 pub fn init(cx: &mut App) {
    DeviceRegistry::set_global(cx.new(DeviceRegistry::new), cx);
@@ -59,10 +62,18 @@ impl DeviceEvent {
 #[derive(Debug)]
 pub struct DeviceRegistry {
    signer: Entity<Option<UniversalSigner>>,
-    /// Whether there is a pending request for encryption key approval
-    pub(crate) pending_request: bool,
+    /// Ephemeral client key for the in-flight key request; never persisted
+    app_keys: Option<Keys>,
+    /// The key request currently awaiting user approval on this device
+    pending_request: Option<PendingRequest>,
+    /// Handled key-sync request ids, bounded and persisted
+    processed_requests: VecDeque<EventId>,
    /// Whether an announcement has been made for this device
    pub(crate) announcement_existed: Arc<AtomicBool>,
+    /// Whether the local key is stale against the current announcement.
+    resync: Arc<AtomicBool>,
+    /// Whether a key rotation is in flight, to coalesce overlapping requests
+    rotating: bool,
    /// Person directory for requesters shown in notifications
    directory: Entity<Directory>,
    /// Relay notification listener
@@ -108,6 +119,21 @@ impl DeviceRegistry {
                if event.signer_changed() && settings.read(cx).is_nip4e_enabled(cx) {
                    // The old account's state must not leak into the new one
                    this.announcement_existed.store(false, Ordering::Relaxed);
+                    this.resync.store(false, Ordering::Relaxed);
+                    // The in-flight request and client key belong to the old account
+                    this.app_keys = None;
+
+                    if this.pending_request.take().is_some() {
+                        // The old approval must not target the new account's signer
+                        if let Some(window) = cx.windows().first().copied() {
+                            window
+                                .update(cx, |_view, window, cx| {
+                                    window.remove_notification::<DeviceNotification>(cx);
+                                })
+                                .ok();
+                        }
+                    }
+
                    this.handle_notifications(cx);
                    this.get_announcement(cx);
                }
@@ -115,15 +141,19 @@ impl DeviceRegistry {
        );

        cx.defer(move |cx| {
-            entity
-                .update(cx, |this, cx| this.handle_notifications(cx))
-                .ok();
+            let _ = entity.update(cx, |this, cx| {
+                this.handle_notifications(cx);
+            });
        });

        Self {
            signer,
-            pending_request: false,
+            app_keys: None,
+            pending_request: None,
+            processed_requests: VecDeque::new(),
            announcement_existed: Arc::new(AtomicBool::new(false)),
+            resync: Arc::new(AtomicBool::new(false)),
+            rotating: false,
            directory: Directory::new(cx),
            notification_listener: None,
            tasks: vec![],
@@ -141,6 +171,8 @@ impl DeviceRegistry {
        let announcement_existed = self.announcement_existed.clone();
        let (tx, rx) = flume::bounded::<Event>(100);

+        let read = credentials::read_processed_requests(cx);
+
        self.notification_listener = Some(cx.background_spawn(async move {
            let mut notifications = client.notifications();
            let mut processed_events = HashSet::new();
@@ -175,6 +207,21 @@ impl DeviceRegistry {
        }));

        self.tasks.push(cx.spawn(async move |this, cx| {
+            // Hydrate the processed-request log before routing any events
+            match read.await {
+                Ok(bytes) => {
+                    let processed = bytes
+                        .map(|bytes| parse_processed_requests(&bytes))
+                        .unwrap_or_default();
+
+                    this.update(cx, |this, _cx| {
+                        this.processed_requests = processed;
+                    })
+                    .ok();
+                }
+                Err(e) => log::error!("Failed to read processed key-sync requests: {e}"),
+            }
+
            while let Ok(event) = rx.recv_async().await {
                match event.kind {
                    Kind::Custom(10044) => {
@@ -191,7 +238,7 @@ impl DeviceRegistry {
                    // New response event from the master device
                    Kind::Custom(4455) => {
                        this.update(cx, |this, cx| {
-                            this.extract_encryption(event, cx);
+                            this.handle_transfer(event, cx);
                        })?;
                    }
                    _ => {}
@@ -201,12 +248,62 @@ impl DeviceRegistry {
        }));
    }

-    /// Set whether there is a pending request for encryption key approval
-    fn set_pending_request(&mut self, pending: bool, cx: &mut Context<Self>) {
-        self.pending_request = pending;
+    /// Record a handled key-sync request id, persisting a bounded log
+    fn mark_request_processed(&mut self, event_id: EventId, cx: &mut Context<Self>) {
+        if self.processed_requests.contains(&event_id) {
+            return;
+        }
+        self.processed_requests.push_back(event_id);
+        while self.processed_requests.len() > PROCESSED_REQUESTS_LIMIT {
+            self.processed_requests.pop_front();
+        }
+
+        let bytes: Vec<u8> = self
+            .processed_requests
+            .iter()
+            .flat_map(|id| id.to_hex().into_bytes())
+            .collect();
+        let write = credentials::write_processed_requests(cx, &bytes);
+        cx.background_spawn(async move {
+            if let Err(e) = write.await {
+                log::error!("Failed to persist processed key-sync requests: {e}");
+            }
+        })
+        .detach();
+    }
+
+    /// Withdraw the pending approval.
+    fn resolve_pending_request(&mut self, cx: &mut Context<Self>) {
+        let Some(pending) = self.pending_request.take() else {
+            return;
+        };
+        self.mark_request_processed(pending.event.id, cx);
+
+        if let Some(window) = cx.windows().first().copied() {
+            window
+                .update(cx, |_view, window, cx| {
+                    window.remove_notification::<DeviceNotification>(cx);
+                })
+                .ok();
+        }
        cx.notify();
    }

+    /// Route a key transfer.
+    fn handle_transfer(&mut self, event: Event, cx: &mut Context<Self>) {
+        let resolved = self
+            .pending_request
+            .as_ref()
+            .is_some_and(|pending| transfer_addresses(&event, pending.client_key));
+
+        if resolved {
+            self.resolve_pending_request(cx);
+            return;
+        }
+
+        self.extract_encryption(event, cx);
+    }
+
    /// Get the signer
    pub fn signer(&self, cx: &App) -> Option<UniversalSigner> {
        self.signer.read(cx).clone()
@@ -218,28 +315,48 @@ impl DeviceRegistry {
            *this = Some(UniversalSigner::new(new_signer));
            cx.notify();
        });
+        // The local key is now consistent with the announcement
+        self.resync.store(false, Ordering::Release);
        cx.emit(DeviceEvent::Set);
    }

-    /// Backup the encryption's secret key to a file
-    pub fn backup(&self, path: PathBuf, cx: &App) -> Task<Result<(), Error>> {
+    /// Whether the local encryption key is stale against the current announcement.
+    pub fn is_resyncing(&self) -> bool {
+        self.resync.load(Ordering::Acquire)
+    }
+
+    /// Backup the encryption's secret key, returning the `nsec1...` content
+    pub fn backup_bytes(&self, cx: &App) -> Task<Result<String, Error>> {
        let nostr = NostrRegistry::global(cx);
        let client = nostr.read(cx).client();
        let signer = nostr.read(cx).signer();

        cx.background_spawn(async move {
            let keys = get_keys(&client, &signer).await?;
-            let content = keys.secret_key().to_bech32()?;
+            Ok(keys.secret_key().to_bech32()?)
+        })
+    }

-            if cfg!(target_arch = "wasm32") {
-                return Err(anyhow!("Not supported"));
-            }
+    /// Backup the encryption's secret key to a file
+    pub fn backup(&self, path: PathBuf, cx: &App) -> Task<Result<(), Error>> {
+        let backup = self.backup_bytes(cx);

-            #[cfg(not(target_arch = "wasm32"))]
+        #[cfg(not(target_arch = "wasm32"))]
+        return cx.background_spawn(async move {
+            let content = backup.await?;
            smol::fs::write(path, &content).await?;

            Ok(())
-        })
+        });
+
+        #[cfg(target_arch = "wasm32")]
+        {
+            let _ = path;
+            cx.background_spawn(async move {
+                backup.await?;
+                Err(anyhow!("File backups are not supported on web; copy the key from the backup panel instead."))
+            })
+        }
    }

    /// Get device announcement for current user
@@ -310,6 +427,88 @@ impl DeviceRegistry {
        }));
    }

+    /// Replace the encryption key with a new one, archiving the old key.
+    pub fn rotate(&mut self, cx: &mut Context<Self>) {
+        if self.rotating {
+            return;
+        }
+        self.rotating = true;
+
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+        let signer = nostr.read(cx).signer();
+
+        self.tasks.push(cx.spawn(async move |this, cx| {
+            let result: Result<Keys, Error> = async {
+                // Archive the current key before replacing it
+                if let Ok(old) = get_keys(&client, &signer).await {
+                    archive_key(&client, &signer, &old.secret_key().to_secret_hex()).await?;
+                }
+
+                let created = this
+                    .update(cx, |this, cx| this.create_encryption(Keys::generate(), cx))?
+                    .await?;
+
+                this.update(cx, |this, cx| {
+                    this.set_signer(created.clone(), cx);
+                    this.wait_for_request(cx);
+                })?;
+
+                Ok(created)
+            }
+            .await;
+
+            this.update(cx, |this, cx| {
+                this.rotating = false;
+                if let Err(e) = result {
+                    cx.emit(DeviceEvent::error(e.to_string()));
+                }
+            })
+            .ok();
+
+            Ok(())
+        }));
+    }
+
+    /// Rotate the encryption key when the configured interval has elapsed.
+    ///
+    /// Runs after the announcement reconciled, outside the blocking boot path.
+    pub fn rotate_if_due(&mut self, cx: &mut Context<Self>) {
+        let Some(interval_days) = AppSettings::get_nip4e_rotation_days(cx) else {
+            return;
+        };
+        let interval_days = interval_days.clamp(NIP4E_ROTATION_MIN_DAYS, NIP4E_ROTATION_MAX_DAYS);
+
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+        let signer = nostr.read(cx).signer();
+
+        self.tasks.push(cx.spawn(async move |this, cx| {
+            let Ok(keys) = load_device_keys(&client, &signer).await else {
+                return Ok(());
+            };
+
+            let elapsed = Timestamp::now()
+                .as_secs()
+                .saturating_sub(keys.created_at.as_secs());
+            if elapsed < u64::from(interval_days) * SECONDS_PER_DAY {
+                return Ok(());
+            }
+
+            this.update(cx, |this, cx| this.rotate(cx)).ok();
+
+            Ok(())
+        }));
+    }
+
+    /// Load encryption keys retired by a rotation from the local database.
+    pub async fn archived_keys<S>(client: &Client, signer: &S) -> Result<Vec<Keys>, Error>
+    where
+        S: AsyncGetPublicKey + AsyncNip44 + ?Sized,
+    {
+        storage::archived_keys(client, signer).await
+    }
+
    /// Create new encryption key and announce it to user's relay list
    fn create_encryption(&self, keys: Keys, cx: &App) -> Task<Result<Keys, Error>> {
        let nostr = NostrRegistry::global(cx);
@@ -318,6 +517,7 @@ impl DeviceRegistry {

        let secret = keys.secret_key().to_secret_hex();
        let n = keys.public_key();
+        let created_at = Timestamp::now();

        cx.background_spawn(async move {
            // Construct an announcement event
@@ -327,7 +527,7 @@ impl DeviceRegistry {
                .await?;

            // Persist the key locally before announcing it
-            set_keys(&client, &signer, &secret).await?;
+            set_keys(&client, &signer, &secret, created_at).await?;

            // Publish announcement
            client
@@ -370,10 +570,12 @@ impl DeviceRegistry {
                this.update(cx, |this, cx| {
                    this.set_signer(keys, cx);
                    this.wait_for_request(cx);
+                    this.rotate_if_due(cx);
                })?;
            } else {
                this.update(cx, |this, cx| {
-                    this.request(cx);
+                    this.resync.store(true, Ordering::Release);
+                    this.request(Some(device_pubkey), cx);
                })?;
            }
            Ok(())
@@ -401,15 +603,17 @@ impl DeviceRegistry {
    }

    /// Request encryption keys from other device
-    pub(crate) fn request(&mut self, cx: &mut Context<Self>) {
+    pub(crate) fn request(
+        &mut self,
+        expected_encryption: Option<PublicKey>,
+        cx: &mut Context<Self>,
+    ) {
        let nostr = NostrRegistry::global(cx);
        let client = nostr.read(cx).client();
        let signer = nostr.read(cx).signer();
-
-        let app_keys_task = get_or_init_app_keys(cx);
+        let app_keys = self.app_keys.get_or_insert_with(Keys::generate).clone();

        let task: Task<Result<Option<Event>, Error>> = cx.background_spawn(async move {
-            let app_keys = app_keys_task.await?;
            let app_pubkey = app_keys.public_key();
            let public_key = signer.get_public_key_async().await?;

@@ -421,8 +625,7 @@ impl DeviceRegistry {
                .limit(1);

            if let Some(event) = client.database().query(filter).await?.into_iter().next() {
-                // Only reuse the stored approval if its key is still valid,
-                // otherwise it's stale and a fresh request is needed
+                // Only reuse the stored approval if its key is still valid
                if decrypt_approval(&client, &app_keys, public_key, &event)
                    .await
                    .is_ok()
@@ -431,9 +634,26 @@ impl DeviceRegistry {
                }
            }

-            // No usable approval event found, construct a request event
+            // No usable approval event found, construct a request event.
+            //
+            // The `pubkey` tag is a compatibility alias for the draft's `P`,
+            // `relay` hints tell other devices where the response is accepted,
+            // `n` names the exact key this device expects to be transferred
+            let mut tags = vec![
+                Tag::custom("P", vec![app_pubkey]),
+                Tag::custom("pubkey", vec![app_pubkey]),
+            ];
+
+            for url in write_relay_hints(&client, public_key).await? {
+                tags.push(Tag::custom("relay", vec![url.to_string()]));
+            }
+
+            if let Some(expected) = expected_encryption {
+                tags.push(Tag::custom("n", vec![expected]));
+            }
+
            let event = EventBuilder::new(Kind::Custom(4454), "")
-                .tags(vec![Tag::custom("P", vec![app_pubkey])])
+                .tags(tags)
                .finalize_async(&signer)
                .await?;

@@ -470,19 +690,13 @@ impl DeviceRegistry {
        let nostr = NostrRegistry::global(cx);
        let client = nostr.read(cx).client();
        let signer = nostr.read(cx).signer();
-        let app_keys_task = get_or_init_app_keys(cx);
+
+        let Some(app_keys) = self.app_keys.clone() else {
+            log::warn!("Cannot wait for approval without a client key");
+            return;
+        };

        self.tasks.push(cx.spawn(async move |this, cx| {
-            let app_keys = match app_keys_task.await {
-                Ok(app_keys) => app_keys,
-                Err(e) => {
-                    this.update(cx, |_this, cx| {
-                        cx.emit(DeviceEvent::error(e.to_string()));
-                    })?;
-                    return Ok(());
-                }
-            };
-
            this.update(cx, |_this, cx| {
                cx.emit(DeviceEvent::Requesting(authorization_code(
                    &app_keys.public_key(),
@@ -492,7 +706,7 @@ impl DeviceRegistry {
            let task: Task<Result<(), Error>> = cx.background_spawn(async move {
                let public_key = signer.get_public_key_async().await?;

-                // Only approvals addressed to this device's app key matter
+                // Only approvals addressed to this device's client key matter
                let filter = Filter::new()
                    .kind(Kind::Custom(4455))
                    .author(public_key)
@@ -516,15 +730,18 @@ impl DeviceRegistry {

    /// Parse the approval event to get encryption key then set it
    fn extract_encryption(&mut self, event: Event, cx: &mut Context<Self>) {
-        let app_keys_task = get_or_init_app_keys(cx);
        let nostr = NostrRegistry::global(cx);
        let client = nostr.read(cx).client();
        let signer = nostr.read(cx).signer();

+        let Some(app_keys) = self.app_keys.clone() else {
+            log::warn!("Ignoring key transfer addressed to another device");
+            return;
+        };
+
        let approval_id = event.id;

        let task: Task<Result<Keys, Error>> = cx.background_spawn(async move {
-            let app_keys = app_keys_task.await?;
            let identity = signer.get_public_key_async().await?;
            let keys = decrypt_approval(&client, &app_keys, identity, &event).await?;

@@ -536,14 +753,14 @@ impl DeviceRegistry {
                Ok(keys) => {
                    this.update(cx, |this, cx| {
                        this.set_signer(keys, cx);
+                        // The client key was consumed; start fresh on the next request
+                        this.app_keys = None;
                        // Clean up our request and the approval event from relays
                        this.cleanup_sync_events(approval_id, cx);
                    })?;
                }
                Err(e) => {
-                    this.update(cx, |_this, cx| {
-                        cx.emit(DeviceEvent::error(e.to_string()));
-                    })?;
+                    log::warn!("Ignoring key transfer: {e}");
                }
            }
            Ok(())
@@ -597,40 +814,58 @@ impl DeviceRegistry {
        let client = nostr.read(cx).client();
        let signer = nostr.read(cx).signer();

-        // Get user's write relays
        let event = event.clone();
+        let request_id = event.id;

        let task: Task<Result<(), Error>> = cx.background_spawn(async move {
            // Get device keys
            let keys = get_keys(&client, &signer).await?;
            let secret = keys.secret_key().to_secret_hex();
+            let identity = signer.get_public_key_async().await?;

            // Extract the target public key from the event tags
-            let target = event
-                .tags
-                .iter()
-                .find(|tag| tag.kind() == "P")
-                .and_then(|tag| tag.content())
-                .and_then(|content| PublicKey::parse(content).ok())
-                .context("Target is not a valid public key")?;
+            let target =
+                client_pubkey_from_event(&event).context("Target is not a valid public key")?;

-            // Encrypt the device keys with the user's signer
-            let payload = keys.nip44_encrypt_async(&target, &secret).await?;
+            // The requester may pin the exact key it expects
+            if let Some(requested) = requested_encryption_key(&event)
+                && requested != keys.public_key()
+            {
+                return Err(anyhow!(
+                    "The requesting device expects an encryption key this device no longer holds"
+                ));
+            }
+
+            // Encrypt to a fresh one-time keypair so the transfer event
+            // can never be decrypted with the long-lived encryption key.
+            let sender = Keys::generate();
+            let payload = sender.nip44_encrypt_async(&target, &secret).await?;

            // Construct the response event
            //
-            // P tag: the current device's public key
-            // p tag: the requester's public key
-            let event = EventBuilder::new(Kind::Custom(4455), payload)
+            // P tag: the one-time sender key used for the encryption
+            // p tag: the account identity, for inbox routing
+            // p tag: the requester's client key
+            let response = EventBuilder::new(Kind::Custom(4455), payload)
                .tags(vec![
-                    Tag::custom("P", vec![keys.public_key().to_hex()]),
+                    Tag::custom("P", vec![sender.public_key().to_hex()]),
+                    Tag::public_key(identity),
                    Tag::public_key(target),
                ])
                .finalize_async(&signer)
                .await?;

-            // Send the response event to the user's relay list
-            client.send_event(&event).to_nip65().await?;
+            let relays = merge_relays(
+                write_relay_hints(&client, identity).await?,
+                request_relay_hints(&event),
+            );
+
+            let send = client.send_event(&response);
+            if relays.is_empty() {
+                send.to_nip65().await?;
+            } else {
+                send.to(relays).await?;
+            }

            Ok(())
        });
@@ -639,8 +874,11 @@ impl DeviceRegistry {
            match task.await {
                Ok(_) => {
                    this.update(cx, |this, cx| {
+                        // Record the request as handled so it cannot resurface
+                        this.mark_request_processed(request_id, cx);
                        // Allow future requests to surface again
-                        this.set_pending_request(false, cx);
+                        this.pending_request = None;
+                        cx.notify();
                    })?;

                    cx.update(|window, cx| {
@@ -665,21 +903,70 @@ impl DeviceRegistry {

    /// Handle encryption request
    fn ask_for_approval(&mut self, event: Event, cx: &mut Context<Self>) {
-        // Ignore if there is already a pending request
-        if self.pending_request {
+        let Some(client_key) = client_pubkey_from_event(&event) else {
+            log::warn!("Ignoring invalid encryption key request: no valid requester key");
            return;
-        }
-        self.set_pending_request(true, cx);
+        };

-        let notification = match self.notification(event, cx) {
+        let read = credentials::read_processed_requests(cx);
+        cx.spawn(async move |this, cx| {
+            let processed = match read.await {
+                Ok(bytes) => bytes
+                    .map(|bytes| parse_processed_requests(&bytes).contains(&event.id))
+                    .unwrap_or(false),
+                Err(e) => {
+                    log::error!("Failed to read processed key-sync requests: {e}");
+                    false
+                }
+            };
+
+            this.update(cx, |this, cx| {
+                if processed || this.processed_requests.contains(&event.id) {
+                    return;
+                }
+
+                match this.pending_request.take() {
+                    // A retry signs a new request id but keeps the same client key
+                    Some(mut pending) if pending.client_key == client_key => {
+                        this.mark_request_processed(event.id, cx);
+                        pending.event = event;
+                        this.pending_request = Some(pending);
+                    }
+
+                    // A different client key is a remounted requester
+                    other => {
+                        if let Some(pending) = other {
+                            this.mark_request_processed(pending.event.id, cx);
+                            if let Some(window) = cx.windows().first().copied() {
+                                window
+                                    .update(cx, |_view, window, cx| {
+                                        window.remove_notification::<DeviceNotification>(cx);
+                                    })
+                                    .ok();
+                            }
+                        }
+                        this.show_approval(event, client_key, cx);
+                    }
+                }
+            })
+            .ok();
+        })
+        .detach();
+    }
+
+    /// Build and surface the approval notification for a key request
+    fn show_approval(&mut self, event: Event, client_key: PublicKey, cx: &mut Context<Self>) {
+        let notification = match self.notification(event.clone(), cx) {
            Ok(notification) => notification,
            Err(e) => {
                log::warn!("Ignoring invalid encryption key request: {e}");
-                self.set_pending_request(false, cx);
                return;
            }
        };

+        self.pending_request = Some(PendingRequest { event, client_key });
+        cx.notify();
+
        if let Some(window) = cx.windows().first().copied() {
            if let Err(error) = window.update(cx, |_view, window, cx| {
                window.push_notification(notification, cx);
@@ -702,19 +989,17 @@ impl DeviceRegistry {
                           compare the code with the one shown on the requesting \
                           device.";

-        let requester = event
-            .tags
-            .iter()
-            .find(|tag| tag.kind() == "P")
-            .and_then(|tag| tag.content())
-            .and_then(|content| PublicKey::parse(content).ok())
-            .context("Request has no valid requester key")?;
+        let requester =
+            client_pubkey_from_event(&event).context("Request has no valid requester key")?;

        let code = authorization_code(&requester);
-        let directory = self.directory.clone();
-        directory.update(cx, |directory, cx| directory.track([requester], cx));
        let code_label = code.clone();

+        let directory = self.directory.clone();
+        directory.update(cx, |directory, cx| {
+            directory.track([requester], cx);
+        });
+
        let entity = cx.entity().downgrade();
        let loading = Rc::new(Cell::new(false));

@@ -818,6 +1103,111 @@ impl DeviceRegistry {

 struct DeviceNotification;

+/// A key request awaiting user approval on this device
+#[derive(Debug)]
+struct PendingRequest {
+    event: Event,
+    client_key: PublicKey,
+}
+
+/// Keep the durable processed-request log bounded
+const PROCESSED_REQUESTS_LIMIT: usize = 256;
+
+/// Parse concatenated hex event ids
+fn parse_processed_requests(bytes: &[u8]) -> VecDeque<EventId> {
+    let Ok(hex) = std::str::from_utf8(bytes) else {
+        return VecDeque::new();
+    };
+
+    hex.as_bytes()
+        .as_chunks::<64>()
+        .0
+        .iter()
+        .filter_map(|chunk| EventId::from_hex(std::str::from_utf8(chunk).ok()?).ok())
+        .collect()
+}
+
+/// Extract the client public key from an event.
+fn client_pubkey_from_event(event: &Event) -> Option<PublicKey> {
+    let key = event
+        .tags
+        .iter()
+        .find(|tag| tag.kind() == "P")
+        .and_then(|tag| tag.content())
+        .and_then(|content| PublicKey::parse(content).ok());
+
+    key.or_else(|| {
+        event
+            .tags
+            .iter()
+            .find(|tag| tag.kind() == "pubkey")
+            .and_then(|tag| tag.content())
+            .and_then(|content| PublicKey::parse(content).ok())
+    })
+}
+
+/// Whether the transfer event is p-tagged to the given client key
+fn transfer_addresses(event: &Event, client_key: PublicKey) -> bool {
+    event.tags.iter().any(|tag| {
+        tag.kind() == "p"
+            && tag
+                .content()
+                .and_then(|content| PublicKey::parse(content).ok())
+                .is_some_and(|key| key == client_key)
+    })
+}
+
+/// Parse the `relay` hints attached to a key request.
+fn request_relay_hints(event: &Event) -> Vec<RelayUrl> {
+    event
+        .tags
+        .iter()
+        .filter(|tag| tag.kind() == "relay")
+        .filter_map(|tag| {
+            tag.content()
+                .and_then(|content| RelayUrl::parse(content).ok())
+        })
+        .collect()
+}
+
+/// Parse the optional `n` tag of a key request.
+fn requested_encryption_key(event: &Event) -> Option<PublicKey> {
+    event
+        .tags
+        .iter()
+        .find(|tag| tag.kind() == "n")
+        .and_then(|tag| tag.content())
+        .and_then(|content| PublicKey::parse(content).ok())
+}
+
+/// Collect the user's NIP-65 write relays.
+async fn write_relay_hints(client: &Client, identity: PublicKey) -> Result<Vec<RelayUrl>, Error> {
+    let filter = Filter::new()
+        .kind(Kind::RelayList)
+        .author(identity)
+        .limit(1);
+
+    let Some(event) = client.database().query(filter).await?.into_iter().next() else {
+        return Ok(vec![]);
+    };
+
+    // Unmarked relays serve both reads and writes
+    Ok(nip65::extract_relay_list(&event)
+        .filter(|(_, metadata)| *metadata != Some(RelayMetadata::Read))
+        .map(|(url, _)| url)
+        .collect())
+}
+
+/// Merge relay lists, dropping duplicates
+fn merge_relays(first: Vec<RelayUrl>, second: Vec<RelayUrl>) -> Vec<RelayUrl> {
+    first
+        .into_iter()
+        .chain(second)
+        .collect::<HashSet<_>>()
+        .into_iter()
+        .collect()
+}
+
 /// The first eight hexadecimal characters of the client public key.
 fn authorization_code(public_key: &PublicKey) -> SharedString {
    let hex = public_key.to_hex();
@@ -825,36 +1215,6 @@ fn authorization_code(public_key: &PublicKey) -> SharedString {
    SharedString::from(format!("{} {}", &code[..4], &code[4..]))
 }

-/// Get or create new app keys (async, returns a task)
-fn get_or_init_app_keys(cx: &App) -> Task<Result<Keys, Error>> {
-    let read = cx.read_credentials(CLIENT_NAME);
-
-    cx.spawn(async move |cx| {
-        if let Ok(Some((_, secret))) = read.await
-            && let Ok(keys) = SecretKey::from_slice(&secret).map(Keys::new)
-        {
-            return Ok(keys);
-        }
-
-        // No stored keys found or invalid — generate new ones
-        let keys = Keys::generate();
-        let user = keys.public_key().to_hex();
-        let secret = keys.secret_key().to_secret_bytes();
-
-        cx.update(|cx| {
-            let write = cx.write_credentials(CLIENT_NAME, &user, &secret);
-            cx.background_spawn(async move {
-                if let Err(e) = write.await {
-                    log::error!("Keyring not available or panic: {e}")
-                }
-            })
-            .detach();
-        });
-
-        Ok(keys)
-    })
-}
-
 /// Decrypt and validate an approval event against the current announcement.
 async fn decrypt_approval(
    client: &Client,
@@ -862,13 +1222,7 @@ async fn decrypt_approval(
    identity: PublicKey,
    event: &Event,
 ) -> Result<Keys, Error> {
-    let master = event
-        .tags
-        .iter()
-        .find(|tag| tag.kind() == "P")
-        .and_then(|tag| tag.content())
-        .and_then(|content| PublicKey::parse(content).ok())
-        .context("Invalid event's tags")?;
+    let master = client_pubkey_from_event(event).context("Invalid event's tags")?;

    let decrypted = app_keys
        .nip44_decrypt_async(&master, event.content.as_str())
@@ -877,71 +1231,52 @@ async fn decrypt_approval(
    let secret = SecretKey::from_hex(&decrypted)?;
    let keys = Keys::new(secret);

-    // Reject approvals carrying a key that no longer matches the published announcement.
+    // Reject approvals carrying a key that no longer matches the published announcement
    let filter = Filter::new()
        .kind(Kind::Custom(10044))
        .author(identity)
        .limit(1);

-    if let Some(announcement) = client.database().query(filter).await?.into_iter().next() {
-        let announced = announcement
-            .tags
-            .iter()
-            .find(|tag| tag.kind() == "n")
-            .and_then(|tag| tag.content())
-            .and_then(|content| PublicKey::parse(content).ok())
-            .context("Announcement has no valid encryption key")?;
+    let announcement = client
+        .database()
+        .query(filter.clone())
+        .await?
+        .into_iter()
+        .next();

-        if keys.public_key() != announced {
-            return Err(anyhow!("Approval key doesn't match the announcement"));
+    let announcement = match announcement {
+        Some(announcement) => Some(announcement),
+        None => {
+            let mut stream = client
+                .stream_events(filter)
+                .timeout(Duration::from_secs(3))
+                .await?;
+
+            stream
+                .next()
+                .await
+                .map(|(_url, result)| result)
+                .transpose()?
        }
+    };
+
+    let Some(announcement) = announcement else {
+        return Err(anyhow!(
+            "No encryption announcement available to validate the approval"
+        ));
+    };
+
+    let announced = announcement
+        .tags
+        .iter()
+        .find(|tag| tag.kind() == "n")
+        .and_then(|tag| tag.content())
+        .and_then(|content| PublicKey::parse(content).ok())
+        .context("Announcement has no valid encryption key")?;
+
+    if keys.public_key() != announced {
+        return Err(anyhow!("Approval key doesn't match the announcement"));
    }

    Ok(keys)
 }
-
-/// Encrypt and store device keys in the local database.
-async fn set_keys<S>(client: &Client, signer: &S, secret: &str) -> Result<(), Error>
-where
-    S: AsyncGetPublicKey + AsyncSignEvent + AsyncNip44 + ?Sized,
-{
-    let public_key = signer.get_public_key_async().await?;
-    let content = signer.nip44_encrypt_async(&public_key, secret).await?;
-
-    // Construct the application data event
-    let event = EventBuilder::new(Kind::ApplicationSpecificData, content)
-        .tag(Tag::identifier(IDENTIFIER))
-        .finalize_async(signer)
-        .await?;
-
-    // Save the event to the database
-    client.database().save_event(&event).await?;
-
-    Ok(())
-}
-
-/// Get device keys from the local database.
-async fn get_keys<S>(client: &Client, signer: &S) -> Result<Keys, Error>
-where
-    S: AsyncGetPublicKey + AsyncNip44 + ?Sized,
-{
-    let public_key = signer.get_public_key_async().await?;
-
-    let filter = Filter::new()
-        .kind(Kind::ApplicationSpecificData)
-        .identifier(IDENTIFIER)
-        .author(public_key);
-
-    if let Some(event) = client.database().query(filter).await?.first() {
-        let content = signer
-            .nip44_decrypt_async(&public_key, &event.content)
-            .await?;
-
-        let secret = SecretKey::parse(&content)?;
-        let keys = Keys::new(secret);
-
-        Ok(keys)
-    } else {
-        Err(anyhow!("Key not found"))
-    }
-}
@@ -0,0 +1,174 @@
+use anyhow::{Error, anyhow};
+use nostr_sdk::prelude::*;
+
+/// The storage identifier for the device encryption key
+const IDENTIFIER: &str = "coop:device";
+/// The storage identifier for encryption keys retired by a rotation
+const ARCHIVE_IDENTIFIER: &str = "coop:device-archive";
+/// Keep the archived key list bounded
+const ARCHIVE_LIMIT: usize = 10;
+/// Seconds in a day, for rotation intervals
+pub(crate) const SECONDS_PER_DAY: u64 = 24 * 60 * 60;
+
+/// Device encryption key material with its creation time
+#[derive(Debug, Clone)]
+pub(crate) struct DeviceKeys {
+    pub(crate) keys: Keys,
+    pub(crate) created_at: Timestamp,
+}
+
+/// Encode the stored key content: secret hex and creation time
+fn encode_keys_content(secret: &str, created_at: &Timestamp) -> String {
+    format!("{secret}\n{}", created_at.as_secs())
+}
+
+/// Parse stored key content.
+fn parse_keys_content(content: &str) -> Result<(SecretKey, Timestamp), Error> {
+    match content.split_once('\n') {
+        Some((secret, created_at)) => {
+            let created_at = created_at
+                .trim()
+                .parse::<u64>()
+                .unwrap_or_else(|_| Timestamp::now().as_secs());
+            Ok((
+                SecretKey::from_hex(secret)?,
+                Timestamp::from_secs(created_at),
+            ))
+        }
+        None => Ok((SecretKey::from_hex(content)?, Timestamp::now())),
+    }
+}
+
+/// Parse archived secrets from stored content, one hex secret per line
+fn parse_archived_keys(content: &str) -> Vec<Keys> {
+    content
+        .lines()
+        .filter_map(|line| SecretKey::from_hex(line.trim()).ok())
+        .map(Keys::new)
+        .collect()
+}
+
+/// Load the device keys with their creation time from the local database.
+pub(crate) async fn load_device_keys<S>(client: &Client, signer: &S) -> Result<DeviceKeys, Error>
+where
+    S: AsyncGetPublicKey + AsyncNip44 + ?Sized,
+{
+    let public_key = signer.get_public_key_async().await?;
+
+    let filter = Filter::new()
+        .kind(Kind::ApplicationSpecificData)
+        .identifier(IDENTIFIER)
+        .author(public_key);
+
+    let Some(event) = client.database().query(filter).await?.into_iter().next() else {
+        return Err(anyhow!("Key not found"));
+    };
+
+    let content = signer
+        .nip44_decrypt_async(&public_key, &event.content)
+        .await?;
+    let (secret, created_at) = parse_keys_content(&content)?;
+
+    Ok(DeviceKeys {
+        keys: Keys::new(secret),
+        created_at,
+    })
+}
+
+/// Encrypt and store device keys in the local database.
+pub(crate) async fn set_keys<S>(
+    client: &Client,
+    signer: &S,
+    secret: &str,
+    created_at: Timestamp,
+) -> Result<(), Error>
+where
+    S: AsyncGetPublicKey + AsyncSignEvent + AsyncNip44 + ?Sized,
+{
+    let public_key = signer.get_public_key_async().await?;
+    let content = signer
+        .nip44_encrypt_async(&public_key, &encode_keys_content(secret, &created_at))
+        .await?;
+
+    // Construct the application data event
+    let event = EventBuilder::new(Kind::ApplicationSpecificData, content)
+        .tag(Tag::identifier(IDENTIFIER))
+        .finalize_async(signer)
+        .await?;
+
+    // Save the event to the database
+    client.database().save_event(&event).await?;
+
+    Ok(())
+}
+
+/// Append an encryption secret to the bounded archive of retired keys.
+pub(crate) async fn archive_key<S>(client: &Client, signer: &S, secret: &str) -> Result<(), Error>
+where
+    S: AsyncGetPublicKey + AsyncSignEvent + AsyncNip44 + ?Sized,
+{
+    let public_key = signer.get_public_key_async().await?;
+
+    let filter = Filter::new()
+        .kind(Kind::ApplicationSpecificData)
+        .identifier(ARCHIVE_IDENTIFIER)
+        .author(public_key);
+
+    let mut archived: Vec<String> = match client.database().query(filter).await?.into_iter().next()
+    {
+        Some(event) => {
+            let content = signer
+                .nip44_decrypt_async(&public_key, &event.content)
+                .await?;
+            content.lines().map(str::to_string).collect()
+        }
+        None => vec![],
+    };
+
+    archived.insert(0, secret.to_string());
+    archived.truncate(ARCHIVE_LIMIT);
+
+    let content = signer
+        .nip44_encrypt_async(&public_key, &archived.join("\n"))
+        .await?;
+
+    let event = EventBuilder::new(Kind::ApplicationSpecificData, content)
+        .tag(Tag::identifier(ARCHIVE_IDENTIFIER))
+        .finalize_async(signer)
+        .await?;
+
+    client.database().save_event(&event).await?;
+
+    Ok(())
+}
+
+/// Get device keys from the local database.
+pub(crate) async fn get_keys<S>(client: &Client, signer: &S) -> Result<Keys, Error>
+where
+    S: AsyncGetPublicKey + AsyncNip44 + ?Sized,
+{
+    Ok(load_device_keys(client, signer).await?.keys)
+}
+
+/// Load encryption keys retired by a rotation from the local database.
+pub(crate) async fn archived_keys<S>(client: &Client, signer: &S) -> Result<Vec<Keys>, Error>
+where
+    S: AsyncGetPublicKey + AsyncNip44 + ?Sized,
+{
+    let public_key = signer.get_public_key_async().await?;
+
+    let filter = Filter::new()
+        .kind(Kind::ApplicationSpecificData)
+        .identifier(ARCHIVE_IDENTIFIER)
+        .author(public_key);
+
+    let Some(event) = client.database().query(filter).await?.into_iter().next() else {
+        return Ok(vec![]);
+    };
+
+    let content = signer
+        .nip44_decrypt_async(&public_key, &event.content)
+        .await?;
+
+    Ok(parse_archived_keys(&content))
+}
@@ -0,0 +1,26 @@
+[package]
+name = "nip60"
+version.workspace = true
+edition.workspace = true
+publish.workspace = true
+
+[dependencies]
+state = { path = "../state" }
+common = { path = "../common" }
+
+gpui.workspace = true
+gpui_tokio.workspace = true
+nostr.workspace = true
+nostr-sdk.workspace = true
+anyhow.workspace = true
+smallvec.workspace = true
+log.workspace = true
+flume.workspace = true
+serde_json.workspace = true
+futures.workspace = true
+hkdf.workspace = true
+sha2.workspace = true
+tokio = { version = "1", default-features = false, features = [ "rt" ] }
+
+cdk.workspace = true
+cdk-redb.workspace = true
@@ -0,0 +1,369 @@
+use anyhow::{Error, anyhow};
+use hkdf::Hkdf;
+use nostr::nips::nip60::TokenEvent;
+use nostr_sdk::prelude::*;
+use sha2::Sha256;
+
+const SEED_SALT: &[u8] = b"coop nip60 seed salt";
+const SEED_INFO: &[u8] = b"coop cashu seed";
+
+/// Parsed 17375 wallet event: the wallet key and its mint list.
+#[derive(Clone)]
+pub(crate) struct WalletData {
+    pub(crate) event_id: EventId,
+    pub(crate) created_at: Timestamp,
+    pub(crate) privkey: SecretKey,
+    pub(crate) mints: Vec<Url>,
+}
+
+impl WalletData {
+    /// A new wallet with a fresh key.
+    pub(crate) fn generate(first_mint: Url) -> Self {
+        Self {
+            event_id: EventId::from_byte_array([0; 32]),
+            created_at: Timestamp::from_secs(0),
+            privkey: SecretKey::generate(),
+            mints: vec![first_mint],
+        }
+    }
+
+    /// The cdk seed, derived deterministically from the wallet key.
+    pub(crate) fn derive_seed(privkey: &SecretKey) -> Result<[u8; 64], Error> {
+        let ikm = privkey.to_secret_bytes();
+        let hk = Hkdf::<Sha256>::new(Some(SEED_SALT), &ikm);
+        let mut seed = [0u8; 64];
+        hk.expand(SEED_INFO, &mut seed)
+            .map_err(|error| anyhow!("seed derivation failed: {error}"))?;
+        Ok(seed)
+    }
+
+    /// Decrypt and parse a 17375 event published by this account.
+    pub(crate) async fn decrypt<S>(signer: &S, me: &PublicKey, event: &Event) -> Result<Self, Error>
+    where
+        S: AsyncNip44 + ?Sized,
+    {
+        if event.pubkey != *me {
+            return Err(anyhow!("wallet event was not published by this account"));
+        }
+
+        let content = signer.nip44_decrypt_async(me, &event.content).await?;
+        let (privkey, mints) = parse_wallet_content(&content)?;
+
+        Ok(Self {
+            event_id: event.id,
+            created_at: event.created_at,
+            privkey,
+            mints,
+        })
+    }
+
+    /// Build the encrypted 17375 event for this wallet data.
+    pub(crate) async fn to_event<S>(&self, signer: &S, me: &PublicKey) -> Result<Event, Error>
+    where
+        S: AsyncGetPublicKey + AsyncSignEvent + AsyncNip44 + ?Sized,
+    {
+        let mut rows = vec![vec!["privkey".to_string(), self.privkey.to_secret_hex()]];
+        for mint in &self.mints {
+            rows.push(vec!["mint".to_string(), mint.to_string()]);
+        }
+
+        let content = signer
+            .nip44_encrypt_async(me, &serde_json::to_string(&rows)?)
+            .await?;
+
+        Ok(EventBuilder::new(Kind::CashuWallet, content)
+            .finalize_async(signer)
+            .await?)
+    }
+}
+
+fn parse_wallet_content(content: &str) -> Result<(SecretKey, Vec<Url>), Error> {
+    let rows: Vec<Vec<String>> =
+        serde_json::from_str(content).map_err(|error| anyhow!("invalid wallet event: {error}"))?;
+
+    let mut privkey = None;
+    let mut mints = Vec::new();
+    for row in rows {
+        let (Some(key), Some(value)) = (row.first(), row.get(1)) else {
+            continue;
+        };
+        match key.as_str() {
+            "privkey" if privkey.is_none() => privkey = Some(SecretKey::from_hex(value)?),
+            "mint" => {
+                if let Ok(mint) = Url::parse(value) {
+                    mints.push(mint);
+                }
+            }
+            _ => {}
+        }
+    }
+
+    let Some(privkey) = privkey else {
+        return Err(anyhow!("wallet event is missing the private key"));
+    };
+    if mints.is_empty() {
+        return Err(anyhow!("wallet event is missing mints"));
+    }
+
+    Ok((privkey, mints))
+}
+
+pub(crate) async fn decrypt_token_event<S>(
+    signer: &S,
+    me: &PublicKey,
+    event: &Event,
+) -> Result<TokenEvent, Error>
+where
+    S: AsyncNip44 + ?Sized,
+{
+    if event.pubkey != *me {
+        return Err(anyhow!("token event was not published by this account"));
+    }
+
+    let content = signer.nip44_decrypt_async(me, &event.content).await?;
+
+    let token =
+        serde_json::from_str(&content).map_err(|error| anyhow!("invalid token event: {error}"))?;
+
+    Ok(token)
+}
+
+pub(crate) async fn build_token_event<S>(
+    signer: &S,
+    me: &PublicKey,
+    token: &TokenEvent,
+) -> Result<Event, Error>
+where
+    S: AsyncGetPublicKey + AsyncSignEvent + AsyncNip44 + ?Sized,
+{
+    let content = signer
+        .nip44_encrypt_async(me, &serde_json::to_string(token)?)
+        .await?;
+
+    Ok(EventBuilder::new(Kind::CashuWalletUnspentProof, content)
+        .finalize_async(signer)
+        .await?)
+}
+
+/// NIP-09 deletion carrying the `k: 7375` tag required by NIP-60.
+pub(crate) async fn build_token_deletion<S>(signer: &S, ids: &[EventId]) -> Result<Event, Error>
+where
+    S: AsyncGetPublicKey + AsyncSignEvent + AsyncNip44 + ?Sized,
+{
+    let mut tags: Vec<Tag> = ids.iter().map(|id| Tag::event(*id)).collect();
+    tags.push(Tag::custom("k", ["7375".to_string()]));
+
+    Ok(EventBuilder::new(Kind::EventDeletion, "")
+        .tags(tags)
+        .finalize_async(signer)
+        .await?)
+}
+
+/// Decrypted 7376 payload, enough for the wallet panel's history list.
+pub(crate) struct HistoryPayload {
+    pub(crate) direction: TransactionDirection,
+    pub(crate) amount: u64,
+}
+
+pub(crate) async fn decrypt_history_event<S>(
+    signer: &S,
+    me: &PublicKey,
+    event: &Event,
+) -> Result<HistoryPayload, Error>
+where
+    S: AsyncNip44 + ?Sized,
+{
+    if event.pubkey != *me {
+        return Err(anyhow!("history event was not published by this account"));
+    }
+
+    let content = signer.nip44_decrypt_async(me, &event.content).await?;
+    let rows: Vec<Vec<String>> = serde_json::from_str(&content)
+        .map_err(|error| anyhow!("invalid history event: {error}"))?;
+
+    let mut direction = None;
+    let mut amount = None;
+    for row in rows {
+        let (Some(key), Some(value)) = (row.first(), row.get(1)) else {
+            continue;
+        };
+        match key.as_str() {
+            "direction" if direction.is_none() => direction = value.parse().ok(),
+            "amount" if amount.is_none() => amount = value.parse().ok(),
+            _ => {}
+        }
+    }
+
+    let Some(direction) = direction else {
+        return Err(anyhow!("history event is missing the direction"));
+    };
+    let Some(amount) = amount else {
+        return Err(anyhow!("history event is missing the amount"));
+    };
+
+    Ok(HistoryPayload { direction, amount })
+}
+
+/// Build the public kind 9321 nutzap event carrying P2PK-locked proofs.
+pub(crate) async fn build_nutzap_event<S>(
+    signer: &S,
+    recipient: PublicKey,
+    mint: &str,
+    proofs: &[String],
+    target: Option<EventId>,
+    comment: &str,
+) -> Result<Event, Error>
+where
+    S: AsyncGetPublicKey + AsyncSignEvent + ?Sized,
+{
+    let mut tags: Vec<Tag> = vec![
+        Tag::custom("p", [recipient.to_hex()]),
+        Tag::custom("u", [mint.to_string()]),
+        Tag::custom("unit", ["sat".to_string()]),
+    ];
+
+    for proof in proofs {
+        tags.push(Tag::custom("proof", [proof.clone()]));
+    }
+
+    if let Some(target) = target {
+        tags.push(Tag::custom("e", [target.to_hex()]));
+    }
+
+    Ok(EventBuilder::new(Kind::Custom(9321), comment)
+        .tags(tags)
+        .finalize_async(signer)
+        .await?)
+}
+
+/// Encrypted 7376 history payload for one state change.
+pub(crate) struct History {
+    pub(crate) direction: TransactionDirection,
+    pub(crate) amount: u64,
+    /// NIP-61 nutzap events redeemed by this state change
+    pub(crate) redeemed: Vec<EventId>,
+    /// Author of the redeemed nutzap, for the unencrypted `p` tag
+    pub(crate) sender: Option<PublicKey>,
+}
+
+pub(crate) async fn build_history_event<S>(
+    signer: &S,
+    me: &PublicKey,
+    history: &History,
+    created: EventId,
+    destroyed: &[EventId],
+) -> Result<Event, Error>
+where
+    S: AsyncGetPublicKey + AsyncSignEvent + AsyncNip44 + ?Sized,
+{
+    let mut rows = vec![
+        vec!["direction".to_string(), history.direction.to_string()],
+        vec!["amount".to_string(), history.amount.to_string()],
+    ];
+
+    for id in destroyed {
+        rows.push(vec![
+            "e".to_string(),
+            id.to_hex(),
+            String::new(),
+            "destroyed".to_string(),
+        ]);
+    }
+
+    rows.push(vec![
+        "e".to_string(),
+        created.to_hex(),
+        String::new(),
+        "created".to_string(),
+    ]);
+
+    let mut tags: Vec<Tag> = history
+        .redeemed
+        .iter()
+        .map(|id| Tag::custom("e", [id.to_hex(), String::new(), "redeemed".to_string()]))
+        .collect();
+
+    if let Some(sender) = history.sender {
+        tags.push(Tag::custom("p", [sender.to_hex()]));
+    }
+
+    let content = signer
+        .nip44_encrypt_async(me, &serde_json::to_string(&rows)?)
+        .await?;
+
+    Ok(EventBuilder::new(Kind::CashuWalletSpendingHistory, content)
+        .tags(tags)
+        .finalize_async(signer)
+        .await?)
+}
+
+pub(crate) async fn build_nutzap_info_event<S>(
+    signer: &S,
+    mints: &[Url],
+    relays: &[RelayUrl],
+    wallet_pubkey: PublicKey,
+) -> Result<Event, Error>
+where
+    S: AsyncGetPublicKey + AsyncSignEvent + ?Sized,
+{
+    let mut tags: Vec<Tag> = relays
+        .iter()
+        .map(|relay| Tag::custom("relay", [relay.to_string()]))
+        .collect();
+
+    for mint in mints {
+        tags.push(Tag::custom("mint", [mint.to_string(), "sat".to_string()]));
+    }
+
+    tags.push(Tag::custom(
+        "pubkey",
+        [format!("02{}", wallet_pubkey.to_hex())],
+    ));
+
+    Ok(EventBuilder::new(Kind::Custom(10019), "")
+        .tags(tags)
+        .finalize_async(signer)
+        .await?)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn parses_wallet_content() {
+        let privkey = SecretKey::generate();
+        let mint = Url::parse("https://mint.example.com").expect("valid mint URL");
+
+        let content = serde_json::to_string(&vec![
+            vec!["privkey".to_string(), privkey.to_secret_hex()],
+            vec!["mint".to_string(), mint.to_string()],
+        ])
+        .expect("serialization cannot fail");
+
+        let (parsed_key, mints) = parse_wallet_content(&content).expect("valid content");
+        assert_eq!(parsed_key.to_secret_hex(), privkey.to_secret_hex());
+        assert_eq!(mints, vec![mint]);
+    }
+
+    #[test]
+    fn wallet_content_rejects_missing_privkey() {
+        let mint = Url::parse("https://mint.example.com").expect("valid mint URL");
+        let content = serde_json::to_string(&vec![vec!["mint".to_string(), mint.to_string()]])
+            .expect("serialization cannot fail");
+
+        assert!(parse_wallet_content(&content).is_err());
+    }
+
+    #[test]
+    fn seed_is_deterministic_per_key() {
+        let key = SecretKey::generate();
+        let first = WalletData::derive_seed(&key).expect("seed derivation cannot fail");
+        let second = WalletData::derive_seed(&key).expect("seed derivation cannot fail");
+        assert_eq!(first, second);
+
+        let other =
+            WalletData::derive_seed(&SecretKey::generate()).expect("seed derivation cannot fail");
+        assert_ne!(first, other);
+    }
+}
@@ -0,0 +1,617 @@
+use std::collections::{HashMap, HashSet};
+use std::str::FromStr;
+use std::time::Duration;
+
+use anyhow::{Error, anyhow};
+use cdk::Amount;
+use cdk::amount::SplitTarget;
+use cdk::mint_url::MintUrl;
+use cdk::nuts::nut00::KnownMethod;
+use cdk::nuts::{
+    CurrencyUnit, Id, KeySetInfo, MeltQuoteState, MintQuoteState, PaymentMethod, Proof, Proofs,
+    SecretKey, SpendingConditions, State,
+};
+use cdk::secret::Secret;
+use cdk::wallet::types::ProofInfo;
+use cdk::wallet::{ReceiveOptions, SendOptions, Wallet};
+use futures::StreamExt;
+use nostr::nips::nip60::{CashuProof, TokenEvent, TransactionDirection};
+use nostr_sdk::prelude::*;
+
+use crate::keys;
+
+/// How long to wait for relays when fetching a recipient's wallet info
+const FETCH_TIMEOUT: Duration = Duration::from_secs(5);
+
+/// A job mutating the wallet store or reconciling it with relays.
+#[derive(Debug, Clone)]
+pub(crate) enum Job {
+    Reconcile,
+    CreateQuote {
+        mint: MintUrl,
+        amount: u64,
+    },
+    ClaimQuote {
+        mint: MintUrl,
+        quote_id: String,
+    },
+    Melt {
+        mint: MintUrl,
+        invoice: String,
+    },
+    SendToken {
+        mint: MintUrl,
+        amount: u64,
+    },
+    SendNutzap {
+        recipient: PublicKey,
+        amount: u64,
+        target: Option<EventId>,
+        comment: Option<String>,
+    },
+    Receive {
+        mint: MintUrl,
+        token: String,
+    },
+    RedeemNutzap {
+        mint: MintUrl,
+        proofs: Proofs,
+        nutzap_id: EventId,
+        sender: PublicKey,
+    },
+}
+
+impl Job {
+    pub(crate) async fn run<S>(self, ctx: JobCtx<S>) -> Result<Outcome, Error>
+    where
+        S: AsyncGetPublicKey + AsyncSignEvent + AsyncNip44 + Send + Sync + 'static,
+    {
+        match self {
+            Job::Reconcile => ctx.reconcile().await,
+            Job::CreateQuote { mint, amount } => {
+                let wallet = ctx.wallet(&mint)?;
+                let quote = wallet
+                    .mint_quote(
+                        PaymentMethod::Known(KnownMethod::Bolt11),
+                        Some(Amount::from(amount)),
+                        None,
+                        None,
+                    )
+                    .await?;
+
+                Ok(Outcome::QuoteCreated {
+                    mint,
+                    quote_id: quote.id,
+                    request: quote.request,
+                    amount,
+                })
+            }
+            Job::ClaimQuote { mint, quote_id } => {
+                let wallet = ctx.wallet(&mint)?;
+                let quote = wallet.check_mint_quote(&quote_id).await?;
+
+                if quote.state != MintQuoteState::Paid {
+                    return Ok(Outcome::Idle);
+                }
+
+                let proofs = wallet.mint(&quote_id, SplitTarget::default(), None).await?;
+                let amount: u64 = proofs.iter().map(|proof| u64::from(proof.amount)).sum();
+
+                let update = ctx
+                    .sync_token_events(
+                        wallet,
+                        nostr_mint(&mint)?,
+                        &ctx.previous_ids(&mint),
+                        Some(keys::History {
+                            direction: TransactionDirection::In,
+                            amount: u64::from(quote.amount.unwrap_or_default()),
+                            redeemed: Vec::new(),
+                            sender: None,
+                        }),
+                    )
+                    .await?;
+
+                Ok(Outcome::QuoteMinted {
+                    quote_id,
+                    update,
+                    amount,
+                })
+            }
+            Job::Melt { mint, invoice } => {
+                let wallet = ctx.wallet(&mint)?;
+                let quote = wallet
+                    .melt_quote(
+                        PaymentMethod::Known(KnownMethod::Bolt11),
+                        invoice,
+                        None,
+                        None,
+                    )
+                    .await?;
+
+                let finalized = wallet
+                    .prepare_melt(&quote.id, HashMap::new())
+                    .await?
+                    .confirm()
+                    .await?;
+
+                if finalized.state() != MeltQuoteState::Paid {
+                    return Err(anyhow!("melt did not settle: {:?}", finalized.state()));
+                }
+
+                let amount = u64::from(finalized.total_amount());
+                let update = ctx
+                    .sync_token_events(
+                        wallet,
+                        nostr_mint(&mint)?,
+                        &ctx.previous_ids(&mint),
+                        Some(keys::History {
+                            direction: TransactionDirection::Out,
+                            amount,
+                            redeemed: Vec::new(),
+                            sender: None,
+                        }),
+                    )
+                    .await?;
+
+                Ok(Outcome::Melted { update, amount })
+            }
+            Job::SendToken { mint, amount } => {
+                let wallet = ctx.wallet(&mint)?;
+                let prepared = wallet
+                    .prepare_send(Amount::from(amount), SendOptions::default())
+                    .await?;
+                let token = prepared.confirm(None).await?.to_string();
+
+                let update = ctx
+                    .sync_token_events(
+                        wallet,
+                        nostr_mint(&mint)?,
+                        &ctx.previous_ids(&mint),
+                        Some(keys::History {
+                            direction: TransactionDirection::Out,
+                            amount,
+                            redeemed: Vec::new(),
+                            sender: None,
+                        }),
+                    )
+                    .await?;
+
+                Ok(Outcome::Sent { update, token })
+            }
+            Job::SendNutzap {
+                recipient,
+                amount,
+                target,
+                comment,
+            } => {
+                let (mint_url, mint_tag, p2pk) = recipient_wallet_info(&ctx, recipient).await?;
+                let wallet = ctx.wallet(&mint_url)?;
+
+                let keysets = wallet
+                    .keysets(cdk::wallet::types::KeysetLoadPolicy::CacheOnly)
+                    .await?;
+
+                let infos: Vec<KeySetInfo> = keysets
+                    .iter()
+                    .map(|keyset| KeySetInfo {
+                        id: keyset.id,
+                        unit: keyset.unit.clone(),
+                        active: keyset.active.unwrap_or(true),
+                        input_fee_ppk: keyset.input_fee_ppk,
+                        final_expiry: keyset.final_expiry,
+                    })
+                    .collect();
+
+                let options = SendOptions {
+                    conditions: Some(SpendingConditions::new_p2pk(p2pk, None)),
+                    ..Default::default()
+                };
+
+                let token = wallet
+                    .prepare_send(Amount::from(amount), options)
+                    .await?
+                    .confirm(None)
+                    .await?;
+                let proofs = token.proofs(&infos)?;
+
+                let mut tags = Vec::new();
+                for proof in &proofs {
+                    tags.push(serde_json::to_string(proof)?);
+                }
+
+                let event = keys::build_nutzap_event(
+                    &ctx.signer,
+                    recipient,
+                    &mint_tag,
+                    &tags,
+                    target,
+                    comment.as_deref().unwrap_or(""),
+                )
+                .await?;
+                ctx.client.send_event(&event).await?;
+
+                let update = ctx
+                    .sync_token_events(
+                        wallet,
+                        nostr_mint(&mint_url)?,
+                        &ctx.previous_ids(&mint_url),
+                        Some(keys::History {
+                            direction: TransactionDirection::Out,
+                            amount,
+                            redeemed: Vec::new(),
+                            sender: None,
+                        }),
+                    )
+                    .await?;
+
+                Ok(Outcome::NutzapSent { update, amount })
+            }
+            Job::Receive { mint, token } => {
+                let wallet = ctx.wallet(&mint)?;
+                let received = wallet.receive(&token, ReceiveOptions::default()).await?;
+
+                let update = ctx
+                    .sync_token_events(
+                        wallet,
+                        nostr_mint(&mint)?,
+                        &ctx.previous_ids(&mint),
+                        Some(keys::History {
+                            direction: TransactionDirection::In,
+                            amount: u64::from(received),
+                            redeemed: Vec::new(),
+                            sender: None,
+                        }),
+                    )
+                    .await?;
+
+                Ok(Outcome::Received {
+                    update,
+                    amount: u64::from(received),
+                })
+            }
+            Job::RedeemNutzap {
+                mint,
+                proofs,
+                nutzap_id,
+                sender,
+            } => {
+                let wallet = ctx.wallet(&mint)?;
+                let options = ReceiveOptions {
+                    p2pk_signing_keys: vec![ctx.wallet_key.clone()],
+                    ..Default::default()
+                };
+                let received = wallet.receive_proofs(proofs, options, None, None).await?;
+
+                let update = ctx
+                    .sync_token_events(
+                        wallet,
+                        nostr_mint(&mint)?,
+                        &ctx.previous_ids(&mint),
+                        Some(keys::History {
+                            direction: TransactionDirection::In,
+                            amount: u64::from(received),
+                            redeemed: vec![nutzap_id],
+                            sender: Some(sender),
+                        }),
+                    )
+                    .await?;
+
+                Ok(Outcome::NutzapRedeemed {
+                    update,
+                    nutzap_id,
+                    amount: u64::from(received),
+                })
+            }
+        }
+    }
+}
+
+pub(crate) struct TokenUpdate {
+    pub(crate) event_id: EventId,
+    pub(crate) token: TokenEvent,
+    pub(crate) destroyed: Vec<EventId>,
+}
+
+pub(crate) enum Outcome {
+    /// Nothing changed (e.g. an unpaid quote)
+    Idle,
+    /// Token events published by a reconcile pass
+    Reconciled {
+        updates: Vec<TokenUpdate>,
+    },
+    QuoteCreated {
+        mint: MintUrl,
+        quote_id: String,
+        request: String,
+        amount: u64,
+    },
+    QuoteMinted {
+        quote_id: String,
+        update: TokenUpdate,
+        amount: u64,
+    },
+    Melted {
+        update: TokenUpdate,
+        amount: u64,
+    },
+    Sent {
+        update: TokenUpdate,
+        token: String,
+    },
+    NutzapSent {
+        update: TokenUpdate,
+        amount: u64,
+    },
+    Received {
+        update: TokenUpdate,
+        amount: u64,
+    },
+    NutzapRedeemed {
+        update: TokenUpdate,
+        nutzap_id: EventId,
+        amount: u64,
+    },
+}
+
+pub(crate) struct JobCtx<S> {
+    pub(crate) wallets: HashMap<MintUrl, Wallet>,
+    /// Wallet signing key, unlocking P2PK-locked nutzap proofs
+    pub(crate) wallet_key: SecretKey,
+    pub(crate) signer: S,
+    pub(crate) client: Client,
+    /// Relay token events at schedule time.
+    pub(crate) tokens: HashMap<EventId, TokenEvent>,
+}
+
+impl<S> JobCtx<S>
+where
+    S: AsyncGetPublicKey + AsyncSignEvent + AsyncNip44 + Sync,
+{
+    fn wallet(&self, mint: &MintUrl) -> Result<&Wallet, Error> {
+        self.wallets
+            .get(mint)
+            .ok_or_else(|| anyhow!("no open wallet for mint {mint}"))
+    }
+
+    fn previous_ids(&self, mint: &MintUrl) -> Vec<EventId> {
+        previous_ids(&self.tokens, mint)
+    }
+
+    /// Publish the store's current unspent set as a fresh token event.
+    async fn sync_token_events(
+        &self,
+        wallet: &Wallet,
+        mint: Url,
+        previous: &[EventId],
+        history: Option<keys::History>,
+    ) -> Result<TokenUpdate, Error> {
+        let me = self.signer.get_public_key_async().await?;
+        let unspent = wallet.get_unspent_proofs().await?;
+
+        let proofs = unspent
+            .iter()
+            .map(cashu_proof)
+            .collect::<Result<Vec<_>, _>>()?;
+
+        let mut token = TokenEvent::new(mint, proofs);
+        token.del = previous.iter().map(|id| id.to_hex()).collect();
+        let event = keys::build_token_event(&self.signer, &me, &token).await?;
+        self.client.send_event(&event).await?;
+
+        if !previous.is_empty() {
+            let deletion = keys::build_token_deletion(&self.signer, previous).await?;
+            self.client.send_event(&deletion).await?;
+        }
+
+        if let Some(history) = history {
+            let history_event =
+                keys::build_history_event(&self.signer, &me, &history, event.id, previous).await?;
+            self.client.send_event(&history_event).await?;
+        }
+
+        Ok(TokenUpdate {
+            event_id: event.id,
+            token,
+            destroyed: previous.to_vec(),
+        })
+    }
+
+    /// Claim paid quotes, then converge each mint.
+    async fn reconcile(self) -> Result<Outcome, Error> {
+        let mut tokens = self.tokens.clone();
+        let mut updates = Vec::new();
+
+        for (mint_url, wallet) in &self.wallets {
+            if let Err(error) = wallet.recover_incomplete_sagas().await {
+                log::warn!("saga recovery failed for {mint_url}: {error:#}");
+            }
+
+            let minted = wallet.mint_unissued_quotes().await?;
+            if minted == Amount::ZERO {
+                continue;
+            }
+
+            let update = self
+                .sync_token_events(
+                    wallet,
+                    nostr_mint(mint_url)?,
+                    &previous_ids(&tokens, mint_url),
+                    Some(keys::History {
+                        direction: TransactionDirection::In,
+                        amount: u64::from(minted),
+                        redeemed: Vec::new(),
+                        sender: None,
+                    }),
+                )
+                .await?;
+
+            for id in &update.destroyed {
+                tokens.remove(id);
+            }
+            tokens.insert(update.event_id, update.token.clone());
+            updates.push(update);
+        }
+
+        for (mint_url, wallet) in &self.wallets {
+            let mut relay_ys = HashSet::new();
+            let mut added = Vec::new();
+
+            for token in tokens
+                .values()
+                .filter(|token| token.mint.as_str() == mint_url.to_string())
+            {
+                for proof in &token.proofs {
+                    let info = match proof_info(proof, mint_url) {
+                        Ok(info) => info,
+                        Err(error) => {
+                            log::warn!("skipping proof: {error:#}");
+                            continue;
+                        }
+                    };
+                    if relay_ys.insert(info.y) {
+                        added.push(info);
+                    }
+                }
+            }
+
+            let unspent = wallet.get_unspent_proofs().await?;
+            let removed = unspent
+                .iter()
+                .filter(|proof| match proof.y() {
+                    Ok(y) => !relay_ys.contains(&y),
+                    Err(_) => false,
+                })
+                .map(|proof| proof.y())
+                .collect::<Result<Vec<_>, _>>()?;
+
+            wallet.localstore.update_proofs(added, removed).await?;
+        }
+
+        Ok(Outcome::Reconciled { updates })
+    }
+}
+
+fn previous_ids(tokens: &HashMap<EventId, TokenEvent>, mint: &MintUrl) -> Vec<EventId> {
+    tokens
+        .iter()
+        .filter(|(_, token)| token.mint.as_str() == mint.to_string())
+        .map(|(id, _)| *id)
+        .collect()
+}
+
+/// Resolve a recipient's 10019 wallet info and pick a mint we share with them.
+async fn recipient_wallet_info<S>(
+    ctx: &JobCtx<S>,
+    recipient: PublicKey,
+) -> Result<(MintUrl, String, cdk::nuts::PublicKey), Error>
+where
+    S: AsyncGetPublicKey + AsyncSignEvent + AsyncNip44 + Sync,
+{
+    let filter = Filter::new()
+        .author(recipient)
+        .kind(Kind::Custom(10019))
+        .limit(1);
+
+    let info = match ctx
+        .client
+        .database()
+        .query(filter.clone())
+        .await?
+        .into_iter()
+        .next()
+    {
+        Some(event) => event,
+        None => {
+            let mut stream = ctx
+                .client
+                .stream_events(filter)
+                .timeout(FETCH_TIMEOUT)
+                .await?;
+            let mut found: Option<Event> = None;
+
+            while let Some((_url, result)) = stream.next().await {
+                if let Ok(event) = result {
+                    let newer = found
+                        .as_ref()
+                        .is_none_or(|current| event.created_at > current.created_at);
+
+                    if newer {
+                        found = Some(event);
+                    }
+                }
+            }
+
+            found.ok_or_else(|| anyhow!("recipient has no wallet info"))?
+        }
+    };
+
+    let (p2pk, mints) = parse_nutzap_info(&info)?;
+
+    for mint in mints {
+        let Ok(mint_url) = MintUrl::from_str(&mint) else {
+            continue;
+        };
+
+        if ctx.wallets.contains_key(&mint_url) {
+            return Ok((mint_url, mint, p2pk));
+        }
+    }
+
+    Err(anyhow!("no shared mint with the recipient"))
+}
+
+fn parse_nutzap_info(event: &Event) -> Result<(cdk::nuts::PublicKey, Vec<String>), Error> {
+    let mut p2pk = None;
+    let mut mints = Vec::new();
+
+    for tag in event.tags.iter() {
+        let Some(value) = tag.content() else {
+            continue;
+        };
+
+        match tag.kind() {
+            "pubkey" if p2pk.is_none() => {
+                p2pk = Some(cdk::nuts::PublicKey::from_str(value)?);
+            }
+            "mint" => mints.push(value.to_string()),
+            _ => {}
+        }
+    }
+
+    let Some(p2pk) = p2pk else {
+        return Err(anyhow!("recipient has no wallet pubkey"));
+    };
+
+    Ok((p2pk, mints))
+}
+
+fn cashu_proof(proof: &Proof) -> Result<CashuProof, Error> {
+    Ok(CashuProof {
+        id: proof.keyset_id.to_string(),
+        amount: u64::from(proof.amount),
+        secret: proof.secret.to_string(),
+        c: proof.c.to_string(),
+    })
+}
+
+fn nostr_mint(mint: &MintUrl) -> Result<Url, Error> {
+    Url::parse(&mint.to_string()).map_err(|error| anyhow!("invalid mint url: {error}"))
+}
+
+fn proof_info(proof: &CashuProof, mint: &MintUrl) -> Result<ProofInfo, Error> {
+    let keyset_id = Id::from_str(&proof.id)?;
+    let c = cdk::nuts::PublicKey::from_str(&proof.c)?;
+    let info = ProofInfo::new(
+        Proof::new(
+            Amount::from(proof.amount),
+            keyset_id,
+            Secret::new(proof.secret.clone()),
+            c,
+        ),
+        mint.clone(),
+        State::Unspent,
+        CurrencyUnit::Sat,
+    )?;
+
+    Ok(info)
+}
@@ -0,0 +1,15 @@
+[package]
+name = "nip60_ui"
+version.workspace = true
+edition.workspace = true
+publish.workspace = true
+
+[dependencies]
+common = { path = "../common" }
+nip60 = { path = "../nip60" }
+
+gpui.workspace = true
+gpui-kit.workspace = true
+nostr-sdk.workspace = true
+anyhow.workspace = true
+smallvec.workspace = true
@@ -0,0 +1,79 @@
+#![cfg(not(target_arch = "wasm32"))]
+
+use std::rc::Rc;
+
+use gpui::{App, AppContext, ClickEvent, ParentElement, Styled, Window, px};
+use gpui_kit::component::button::{Button, ButtonVariants};
+use gpui_kit::component::input::{Input, InputState};
+use gpui_kit::component::notification::Notification;
+use gpui_kit::component::{WindowExt, h_flex, v_flex};
+use nip60::WalletRegistry;
+use nostr_sdk::prelude::{EventId, PublicKey};
+
+pub mod wallet;
+
+type SubmitFn = Rc<dyn Fn(&ClickEvent, &mut Window, &mut App) -> bool>;
+
+/// Ask for an amount and send a nutzap to `recipient`, optionally
+/// nutzapping the event with `target`.
+pub fn open_nutzap(
+    window: &mut Window,
+    cx: &mut App,
+    recipient: PublicKey,
+    target: Option<EventId>,
+) {
+    let input = cx.new(|cx| InputState::new(window, cx).placeholder("Amount (sats)"));
+
+    let send: SubmitFn = {
+        let input = input.clone();
+        Rc::new(move |_, window, cx| {
+            let amount = match input.read(cx).value().trim().parse::<u64>() {
+                Ok(amount) if amount > 0 => amount,
+                _ => {
+                    window.push_notification(Notification::error("Enter an amount in sats"), cx);
+                    return false;
+                }
+            };
+
+            let wallet = WalletRegistry::global(cx);
+            wallet.update(cx, |registry, cx| {
+                registry.send_nutzap(recipient, amount, target, None, cx);
+            });
+
+            true
+        })
+    };
+
+    window.open_dialog(cx, move |this, _window, _cx| {
+        this.width(px(380.))
+            .title("Send Nutzap")
+            .on_ok({
+                let send = send.clone();
+                move |event, window, cx| send(event, window, cx)
+            })
+            .child(
+                v_flex()
+                    .gap_3()
+                    .child(Input::new(&input).cleanable(true))
+                    .child(
+                        h_flex()
+                            .gap_1()
+                            .justify_end()
+                            .child(
+                                Button::new("cancel")
+                                    .label("Cancel")
+                                    .ghost()
+                                    .on_click(|_, window, cx| window.close_dialog(cx)),
+                            )
+                            .child(Button::new("send").label("Send").primary().on_click({
+                                let send = send.clone();
+                                move |event, window, cx| {
+                                    if send(event, window, cx) {
+                                        window.close_dialog(cx);
+                                    }
+                                }
+                            })),
+                    ),
+            )
+    });
+}
@@ -0,0 +1,422 @@
+use ::nip60::{HistoryEntry, MintQuoteEntry, WalletEvent, WalletRegistry};
+use common::TimestampExt;
+use gpui::prelude::FluentBuilder;
+use gpui::{
+    App, AppContext, Context, Entity, EventEmitter, FocusHandle, Focusable, IntoElement,
+    ParentElement, Render, SharedString, Styled, Subscription, Window, div,
+};
+use gpui_kit::assets::IconName;
+use gpui_kit::base::StyledExt as _;
+use gpui_kit::component::button::{Button, ButtonVariants as _};
+use gpui_kit::component::clipboard::Clipboard;
+use gpui_kit::component::dock::{Panel, PanelEvent};
+use gpui_kit::component::input::{Input, InputState};
+use gpui_kit::component::notification::Notification;
+use gpui_kit::component::scroll::ScrollableElement as _;
+use gpui_kit::component::separator::Separator;
+use gpui_kit::component::{ActiveTheme, Icon, Sizable, WindowExt, h_flex, v_flex};
+use nostr_sdk::prelude::*;
+use smallvec::SmallVec;
+pub fn init(window: &mut Window, cx: &mut App) -> Entity<WalletPanel> {
+    cx.new(|cx| WalletPanel::new(window, cx))
+}
+
+pub struct WalletPanel {
+    name: SharedString,
+    focus_handle: FocusHandle,
+
+    /// Mint URL input for the setup flow
+    mint_input: Entity<InputState>,
+    /// Amount input for sending a cashu token
+    send_input: Entity<InputState>,
+    /// Amount input for the funding invoice
+    invoice_input: Entity<InputState>,
+    /// Pasted token input for receiving ecash
+    token_input: Entity<InputState>,
+    /// The token produced by the last send, shown for copying
+    sent_token: Option<SharedString>,
+
+    _subscriptions: SmallVec<[Subscription; 1]>,
+}
+
+impl WalletPanel {
+    fn new(window: &mut Window, cx: &mut Context<Self>) -> Self {
+        let mint_input = cx.new(|cx| InputState::new(window, cx).placeholder("https://mint…"));
+        let send_input = cx.new(|cx| InputState::new(window, cx).placeholder("Amount (sats)"));
+        let invoice_input = cx.new(|cx| InputState::new(window, cx).placeholder("Amount (sats)"));
+        let token_input = cx.new(|cx| InputState::new(window, cx).placeholder("cashu…"));
+
+        let wallet = WalletRegistry::global(cx);
+        let mut subscriptions = SmallVec::new();
+        subscriptions.push(
+            cx.subscribe_in(
+                &wallet,
+                window,
+                |this, _wallet, event, window, cx| match event {
+                    WalletEvent::Updated => cx.notify(),
+                    WalletEvent::Error(error) => {
+                        window.push_notification(Notification::error(error.clone()), cx);
+                    }
+                    WalletEvent::TokenCreated(token) => {
+                        this.sent_token = Some(token.clone().into());
+                        cx.notify();
+                    }
+                },
+            ),
+        );
+
+        Self {
+            name: "Wallet".into(),
+            focus_handle: cx.focus_handle(),
+            mint_input,
+            send_input,
+            invoice_input,
+            token_input,
+            sent_token: None,
+            _subscriptions: subscriptions,
+        }
+    }
+
+    fn parse_amount(&self, input: &Entity<InputState>, cx: &Context<Self>) -> Option<u64> {
+        match input.read(cx).value().trim().parse::<u64>() {
+            Ok(amount) if amount > 0 => Some(amount),
+            _ => None,
+        }
+    }
+
+    fn setup(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let mint = self.mint_input.read(cx).value().trim().to_string();
+        if mint.is_empty() {
+            window.push_notification(Notification::error("Enter a mint URL"), cx);
+            return;
+        }
+
+        WalletRegistry::global(cx).update(cx, |registry, cx| {
+            registry.setup(mint, cx);
+        });
+    }
+
+    fn send_token(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let Some(amount) = self.parse_amount(&self.send_input, cx) else {
+            window.push_notification(Notification::error("Enter an amount in sats"), cx);
+            return;
+        };
+
+        WalletRegistry::global(cx).update(cx, |registry, cx| {
+            registry.send_token(amount, cx);
+        });
+    }
+
+    fn create_invoice(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let Some(amount) = self.parse_amount(&self.invoice_input, cx) else {
+            window.push_notification(Notification::error("Enter an amount in sats"), cx);
+            return;
+        };
+
+        WalletRegistry::global(cx).update(cx, |registry, cx| {
+            registry.create_mint_quote(amount, cx);
+        });
+    }
+
+    fn claim_quote(&mut self, quote_id: String, cx: &mut Context<Self>) {
+        WalletRegistry::global(cx).update(cx, |registry, cx| {
+            registry.claim_mint_quote(quote_id, cx);
+        });
+    }
+
+    fn receive_token(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let token = self.token_input.read(cx).value().trim().to_string();
+        if token.is_empty() {
+            window.push_notification(Notification::error("Paste a cashu token"), cx);
+            return;
+        }
+
+        WalletRegistry::global(cx).update(cx, |registry, cx| {
+            registry.receive_token(token, cx);
+        });
+    }
+
+    fn render_balance(&self, cx: &Context<Self>) -> impl IntoElement {
+        let balance = WalletRegistry::global(cx).read(cx).balance();
+
+        h_flex()
+            .gap_2()
+            .items_end()
+            .child(
+                div()
+                    .text_2xl()
+                    .child(SharedString::from(balance.to_string())),
+            )
+            .child(
+                div()
+                    .text_xs()
+                    .text_color(cx.theme().muted_foreground)
+                    .child("sats"),
+            )
+    }
+
+    fn render_setup(&self, cx: &mut Context<Self>) -> impl IntoElement {
+        let has_wallet = WalletRegistry::global(cx).read(cx).has_wallet();
+
+        v_flex()
+            .gap_1p5()
+            .w_full()
+            .child(
+                div()
+                    .text_xs()
+                    .font_semibold()
+                    .text_color(cx.theme().muted_foreground)
+                    .child(SharedString::from(if has_wallet {
+                        "Add a mint:"
+                    } else {
+                        "Set up your wallet with a mint:"
+                    })),
+            )
+            .child(
+                h_flex()
+                    .gap_1()
+                    .w_full()
+                    .child(Input::new(&self.mint_input).cleanable(true))
+                    .child(
+                        Button::new("setup")
+                            .label(if has_wallet { "Add" } else { "Set up" })
+                            .primary()
+                            .small()
+                            .on_click(cx.listener(move |this, _ev, window, cx| {
+                                this.setup(window, cx);
+                            })),
+                    ),
+            )
+    }
+
+    fn render_send(&self, cx: &Context<Self>) -> impl IntoElement {
+        v_flex()
+            .gap_1p5()
+            .w_full()
+            .child(
+                div()
+                    .text_xs()
+                    .font_semibold()
+                    .text_color(cx.theme().muted_foreground)
+                    .child("Send ecash:"),
+            )
+            .child(
+                h_flex()
+                    .gap_1()
+                    .w_full()
+                    .child(Input::new(&self.send_input).cleanable(true))
+                    .child(
+                        Button::new("send")
+                            .label("Send")
+                            .small()
+                            .on_click(cx.listener(move |this, _ev, window, cx| {
+                                this.send_token(window, cx);
+                            })),
+                    ),
+            )
+            .when_some(self.sent_token.as_ref(), |this, token| {
+                this.child(
+                    h_flex()
+                        .gap_1()
+                        .w_full()
+                        .child(
+                            div()
+                                .flex_1()
+                                .min_w_0()
+                                .truncate()
+                                .text_color(cx.theme().muted_foreground)
+                                .child(token.clone()),
+                        )
+                        .child(
+                            Clipboard::new("copy-token")
+                                .accessibility_label("Copy cashu token")
+                                .value_fn({
+                                    let token = token.clone();
+                                    move |_, _| SharedString::from(token.to_string())
+                                }),
+                        ),
+                )
+            })
+    }
+
+    fn render_receive(&self, cx: &Context<Self>) -> impl IntoElement {
+        let quotes = WalletRegistry::global(cx).read(cx).mint_quotes().to_vec();
+
+        let mut section =
+            v_flex()
+                .gap_1p5()
+                .w_full()
+                .child(
+                    div()
+                        .text_xs()
+                        .font_semibold()
+                        .text_color(cx.theme().muted_foreground)
+                        .child("Receive:"),
+                )
+                .child(
+                    h_flex()
+                        .gap_1()
+                        .w_full()
+                        .child(Input::new(&self.invoice_input).cleanable(true))
+                        .child(Button::new("invoice").label("Invoice").small().on_click(
+                            cx.listener(move |this, _ev, window, cx| {
+                                this.create_invoice(window, cx);
+                            }),
+                        )),
+                );
+
+        for quote in quotes {
+            section = section.child(self.render_quote(&quote, cx));
+        }
+
+        section.child(
+            h_flex()
+                .gap_1()
+                .w_full()
+                .child(Input::new(&self.token_input).cleanable(true))
+                .child(
+                    Button::new("receive")
+                        .label("Redeem")
+                        .small()
+                        .on_click(cx.listener(move |this, _ev, window, cx| {
+                            this.receive_token(window, cx);
+                        })),
+                ),
+        )
+    }
+
+    fn render_quote(&self, quote: &MintQuoteEntry, cx: &Context<Self>) -> impl IntoElement {
+        h_flex()
+            .gap_1()
+            .w_full()
+            .child(
+                div()
+                    .flex_1()
+                    .min_w_0()
+                    .truncate()
+                    .text_color(cx.theme().muted_foreground)
+                    .child(SharedString::from(quote.request.clone())),
+            )
+            .child(
+                Clipboard::new(SharedString::from(format!("copy_{}", quote.quote_id)))
+                    .accessibility_label("Copy lightning invoice")
+                    .value_fn({
+                        let request = SharedString::from(quote.request.clone());
+                        move |_, _| request.clone()
+                    }),
+            )
+            .child(
+                Button::new(SharedString::from(format!("claim_{}", quote.quote_id)))
+                    .label("Claim")
+                    .small()
+                    .on_click({
+                        let quote_id = quote.quote_id.clone();
+                        cx.listener(move |this, _ev, _window, cx| {
+                            this.claim_quote(quote_id.clone(), cx);
+                        })
+                    }),
+            )
+    }
+
+    fn render_history(&self, cx: &Context<Self>) -> impl IntoElement {
+        let history = WalletRegistry::global(cx).read(cx).history().to_vec();
+
+        let mut section = v_flex().gap_1().w_full().child(
+            div()
+                .text_xs()
+                .font_semibold()
+                .text_color(cx.theme().muted_foreground)
+                .child("History:"),
+        );
+
+        if history.is_empty() {
+            section = section.child(
+                div()
+                    .text_xs()
+                    .text_color(cx.theme().muted_foreground)
+                    .child("No transactions yet."),
+            );
+        }
+
+        for entry in history {
+            section = section.child(self.render_history_entry(&entry, cx));
+        }
+
+        section
+    }
+
+    fn render_history_entry(&self, entry: &HistoryEntry, cx: &Context<Self>) -> impl IntoElement {
+        let (label, color) = match entry.direction {
+            TransactionDirection::In => ("Received", cx.theme().success),
+            TransactionDirection::Out => ("Sent", cx.theme().danger),
+        };
+
+        h_flex()
+            .justify_between()
+            .w_full()
+            .py_0p5()
+            .text_xs()
+            .child(
+                h_flex()
+                    .gap_2()
+                    .child(div().text_color(color).child(label))
+                    .child(SharedString::from(format!("{} sats", entry.amount))),
+            )
+            .child(
+                div()
+                    .text_color(cx.theme().muted_foreground)
+                    .child(entry.created_at.to_human_time()),
+            )
+    }
+}
+
+impl gpui_kit::component::dock::BasePanel for WalletPanel {
+    fn panel_name(&self) -> &'static str {
+        "Wallet"
+    }
+}
+
+impl Panel for WalletPanel {
+    fn title(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        h_flex()
+            .gap_1p5()
+            .child(
+                Icon::new(IconName::Wallet)
+                    .small()
+                    .text_color(cx.theme().muted_foreground),
+            )
+            .child(self.name.clone())
+            .into_any_element()
+    }
+}
+
+impl EventEmitter<PanelEvent> for WalletPanel {}
+
+impl Focusable for WalletPanel {
+    fn focus_handle(&self, _: &App) -> FocusHandle {
+        self.focus_handle.clone()
+    }
+}
+
+impl Render for WalletPanel {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let has_wallet = WalletRegistry::global(cx).read(cx).has_wallet();
+
+        v_flex()
+            .p_3()
+            .gap_3()
+            .w_full()
+            .overflow_y_scrollbar()
+            .text_xs()
+            .when(!has_wallet, |this| this.child(self.render_setup(cx)))
+            .when(has_wallet, |this| {
+                this.child(self.render_balance(cx))
+                    .child(Separator::horizontal())
+                    .child(self.render_send(cx))
+                    .child(self.render_receive(cx))
+                    .child(Separator::horizontal())
+                    .child(self.render_history(cx))
+                    .child(self.render_setup(cx))
+            })
+    }
+}
@@ -8,6 +8,7 @@ publish.workspace = true
 common = { path = "../common" }
 state = { path = "../state" }

+futures.workspace = true
 gpui.workspace = true
 nostr-sdk.workspace = true
 instant.workspace = true
@@ -3,7 +3,10 @@ use std::sync::RwLock;

 use anyhow::{Error, anyhow};
 use common::emojis_from_tags;
-use gpui::{App, AppContext, Context, Entity, EventEmitter, Global, Subscription, Task};
+use futures::{FutureExt, pin_mut};
+use gpui::{
+    App, AppContext, BackgroundExecutor, Context, Entity, EventEmitter, Global, Subscription, Task,
+};
 use instant::Duration;
 use nostr_sdk::prelude::*;
 use smallvec::{SmallVec, smallvec};
@@ -51,7 +54,7 @@ impl EventEmitter<PersonEvent> for PersonRegistry {}

 #[derive(Debug, Clone)]
 enum Dispatch {
-    Person(Person),
+    Person(Box<Person>),
    Announcement(Event),
    Relays(Event),
    Emojis(Event),
@@ -98,8 +101,9 @@ impl PersonRegistry {
        }));

        let client3 = client.clone();
+        let executor = cx.background_executor().clone();
        tasks.push(cx.background_spawn(async move {
-            Self::handle_requests(&client3, &metadata_rx).await;
+            Self::handle_requests(&client3, &metadata_rx, executor).await;
        }));

        tasks.push(cx.spawn(async move |this, cx| {
@@ -107,7 +111,7 @@ impl PersonRegistry {
                this.update(cx, |this, cx| {
                    match event {
                        Dispatch::Person(person) => {
-                            this.insert(person, cx);
+                            this.insert(*person, cx);
                        }
                        Dispatch::Announcement(event) => {
                            this.set_announcement(&event, cx);
@@ -171,7 +175,11 @@ impl PersonRegistry {
                        let metadata = Metadata::from_json(&event.content).unwrap_or_default();
                        let person = Person::new(event.pubkey, metadata);

-                        if tx.send_async(Dispatch::Person(person)).await.is_err() {
+                        if tx
+                            .send_async(Dispatch::Person(Box::new(person)))
+                            .await
+                            .is_err()
+                        {
                            log::warn!("Channel closed, dropping metadata event");
                        }
                    }
@@ -193,30 +201,45 @@ impl PersonRegistry {
    }

    /// Handle request for metadata
-    async fn handle_requests(client: &Client, rx: &flume::Receiver<PublicKey>) {
+    async fn handle_requests(
+        client: &Client,
+        rx: &flume::Receiver<PublicKey>,
+        executor: BackgroundExecutor,
+    ) {
        let mut batch: HashSet<PublicKey> = HashSet::new();

        loop {
-            match flume::Selector::new()
-                .recv(rx, |result| result.ok())
-                .wait_timeout(Duration::from_secs(TIMEOUT))
-            {
-                Ok(Some(public_key)) => {
-                    batch.insert(public_key);
-                    // Process the batch if it's full
-                    if batch.len() >= 20
-                        && let Err(e) = get_metadata(client, std::mem::take(&mut batch)).await
-                    {
-                        log::warn!("Failed to get metadata batch: {e}");
+            let timer = executor.timer(Duration::from_secs(TIMEOUT)).fuse();
+            pin_mut!(timer);
+
+            let request = futures::select! {
+                result = rx.recv_async().fuse() => match result {
+                    Ok(public_key) => public_key,
+                    Err(_) => {
+                        if !batch.is_empty()
+                            && let Err(e) = get_metadata(client, std::mem::take(&mut batch)).await
+                        {
+                            log::warn!("Failed to get metadata batch: {e}");
+                        }
+                        return;
                    }
-                }
-                _ => {
+                },
+                () = timer => {
                    if !batch.is_empty()
                        && let Err(e) = get_metadata(client, std::mem::take(&mut batch)).await
                    {
                        log::warn!("Failed to get metadata batch: {e}");
                    }
+                    continue;
                }
+            };
+
+            batch.insert(request);
+            // Process the batch if it's full
+            if batch.len() >= 20
+                && let Err(e) = get_metadata(client, std::mem::take(&mut batch)).await
+            {
+                log::warn!("Failed to get metadata batch: {e}");
            }
        }
    }
@@ -144,6 +144,13 @@ impl Person {

    /// Set profile encryption keys announcement
    pub(crate) fn set_announcement(&mut self, announcement: Announcement) {
+        // A delayed or repeated announcement must not roll the key back
+        if let Some(current) = &self.announcement
+            && !announcement.is_newer_than(current)
+        {
+            return;
+        }
+
        self.announcement = Some(announcement);
    }

@@ -4,7 +4,7 @@ use gpui::{Context, EventEmitter, Task};
 use instant::Duration;
 use nostr_sdk::prelude::*;
 use smallvec::{SmallVec, smallvec};
-use state::NostrRegistry;
+use state::{BOOTSTRAP_RELAYS, NostrRegistry};

 /// Disable scoring when the follow set exceeds this size
 const MAX_FOLLOWS: usize = 2000;
@@ -14,6 +14,10 @@ const MAX_TAGS_PER_LIST: usize = 5000;
 const SYNC_INTERVAL: u64 = 15 * 60;
 /// Longest wait between retries while the graph has no data yet
 const MAX_RETRY_WAIT: u64 = 60;
+/// Time for a relay to prove negentropy support before the reconcile gives up
+const SYNC_INITIAL_TIMEOUT: u64 = 30;
+/// Longest silence from a relay before the reconcile gives up
+const SYNC_IDLE_TIMEOUT: u64 = 60;

 /// The web of trust graph changed
 #[derive(Debug, Clone)]
@@ -77,6 +81,36 @@ impl Snapshot {

        snapshot
    }
+
+    /// Build the snapshot from the contact lists the local database holds
+    async fn load(client: &Client, self_key: PublicKey) -> Option<Self> {
+        let own = stored_contact_list(client, self_key).await?;
+        let follows: HashSet<PublicKey> = own.tags.public_keys().take(MAX_FOLLOWS + 1).collect();
+
+        let events: Vec<Event> = if follows.is_empty() {
+            Vec::new()
+        } else {
+            let authors: Vec<PublicKey> = follows.iter().copied().collect();
+            let filter = Filter::new().kind(Kind::ContactList).authors(authors);
+
+            client
+                .database()
+                .query(filter)
+                .await
+                .unwrap_or_default()
+                .into_iter()
+                .collect()
+        };
+
+        let snapshot = Self::build(self_key, follows, events);
+        log::debug!(
+            "wot loaded from database: {} follows, {} scored keys",
+            snapshot.follows.len(),
+            snapshot.scores.len()
+        );
+
+        Some(snapshot)
+    }
 }

 impl EventEmitter<WoTEvent> for WebOfTrust {}
@@ -88,8 +122,10 @@ impl EventEmitter<WoTEvent> for WebOfTrust {}
 pub struct WebOfTrust {
    /// Current user's public key
    self_key: Option<PublicKey>,
-    /// Latest built snapshot, none until the first refresh completes
+    /// Latest built snapshot, none until the first load completes
    snapshot: Option<Snapshot>,
+    /// Whether a reconciliation with the relays is in flight
+    syncing: bool,
    /// In-flight refresh, replaced by newer ones
    refresh_task: Option<Task<()>>,
    /// Keeps the periodic reconciliation loop alive
@@ -110,9 +146,9 @@ impl WebOfTrust {

                let mut has_data = false;

-                // Ignore errors, the next refresh will retry
+                // Ignore errors, the next sync will retry
                let _ = this.update(cx, |this, cx| {
-                    this.refresh(cx);
+                    this.sync(cx);
                    has_data = this.has_data();
                });

@@ -133,34 +169,14 @@ impl WebOfTrust {
        Self {
            self_key: None,
            snapshot: None,
+            syncing: false,
            refresh_task: None,
            _tasks: tasks,
        }
    }

-    /// Load the graph for the current account
+    /// Load the graph for the current account from the local database
    pub(crate) fn hydrate(&mut self, cx: &mut Context<Self>) {
-        let nostr = NostrRegistry::global(cx);
-        let Some(self_key) = nostr.read(cx).current_user() else {
-            return;
-        };
-
-        self.self_key = Some(self_key);
-        self.refresh(cx);
-    }
-
-    /// Clear the graph on sign out or account switch
-    pub(crate) fn reset(&mut self, cx: &mut Context<Self>) {
-        self.self_key = None;
-        self.snapshot = None;
-        self.refresh_task = None;
-
-        cx.emit(WoTEvent);
-        cx.notify();
-    }
-
-    /// Reconcile the follow set's contact lists with the relays and rebuild.
-    fn refresh(&mut self, cx: &mut Context<Self>) {
        let nostr = NostrRegistry::global(cx);
        let client = nostr.read(cx).client();

@@ -168,6 +184,56 @@ impl WebOfTrust {
            return;
        };

+        self.self_key = Some(self_key);
+        // Replacing the task below cancels any in-flight work
+        self.syncing = false;
+
+        self.refresh_task = Some(cx.spawn(async move |this, cx| {
+            let Some(snapshot) = Snapshot::load(&client, self_key).await else {
+                return;
+            };
+
+            this.update(cx, |this, cx| {
+                this.snapshot = Some(snapshot);
+                cx.emit(WoTEvent);
+                cx.notify();
+            })
+            .ok();
+        }));
+    }
+
+    /// Clear the graph on sign out or account switch
+    pub(crate) fn reset(&mut self, cx: &mut Context<Self>) {
+        self.self_key = None;
+        self.snapshot = None;
+        self.syncing = false;
+        self.refresh_task = None;
+
+        cx.emit(WoTEvent);
+        cx.notify();
+    }
+
+    /// Reconcile the follow set's contact lists with the bootstrap relays and rebuild.
+    fn sync(&mut self, cx: &mut Context<Self>) {
+        if self.syncing {
+            return;
+        }
+
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+
+        let Some(self_key) = nostr.read(cx).current_user() else {
+            return;
+        };
+
+        // The defaults are too short for relays streaming large batches
+        let opts = SyncOptions::new()
+            .initial_timeout(Duration::from_secs(SYNC_INITIAL_TIMEOUT))
+            .idle_timeout(Duration::from_secs(SYNC_IDLE_TIMEOUT));
+
+        self.syncing = true;
+        cx.notify();
+
        self.refresh_task = Some(cx.spawn(async move |this, cx| {
            // Scope the reconcile to the follow set known so far
            let known: HashSet<PublicKey> = stored_contact_list(&client, self_key)
@@ -178,60 +244,37 @@ impl WebOfTrust {
            let mut authors: Vec<PublicKey> = known.iter().copied().collect();
            authors.push(self_key);

-            // Negentropy transfers only the lists the relays hold
-            // and the database is missing
            let filter = Filter::new().kind(Kind::ContactList).authors(authors);
-            if let Err(error) = client.sync(filter).await {
-                log::warn!("Failed to reconcile contact lists: {error}");
+            match client.sync(filter).with(BOOTSTRAP_RELAYS).opts(opts).await {
+                Ok(output) => {
+                    for (url, error) in output.failed {
+                        log::warn!("Failed to reconcile contact lists with {url}: {error}");
+                    }
+                }
+                Err(error) => log::warn!("Failed to reconcile contact lists: {error}"),
            }

            // The follow set after the reconcile
-            let Some(own) = stored_contact_list(&client, self_key).await else {
-                return;
-            };
-
-            let follows: HashSet<PublicKey> =
-                own.tags.public_keys().take(MAX_FOLLOWS + 1).collect();
-
-            let mut authors: Vec<PublicKey> = follows.iter().copied().collect();
-            authors.push(self_key);
-
-            let events: Vec<Event> = if follows.is_empty() {
-                Vec::new()
-            } else {
-                let filter = Filter::new().kind(Kind::ContactList).authors(authors);
-                client
-                    .database()
-                    .query(filter)
-                    .await
-                    .unwrap_or_default()
-                    .into_iter()
-                    .collect()
-            };
-
-            let snapshot = Snapshot::build(self_key, follows.clone(), events);
-            log::debug!(
-                "Web of trust rebuilt: {} follows, {} scored keys",
-                snapshot.follows.len(),
-                snapshot.scores.len()
-            );
-
-            // Newly followed authors were not part of the reconcile
-            let grew = !known.is_superset(&follows);
+            let snapshot = Snapshot::load(&client, self_key).await;

            this.update(cx, |this, cx| {
-                this.snapshot = Some(snapshot);
-                cx.emit(WoTEvent);
+                this.syncing = false;
+
+                if let Some(snapshot) = snapshot {
+                    // Newly followed authors were not part of the reconcile
+                    let grew = !known.is_superset(&snapshot.follows);
+
+                    this.snapshot = Some(snapshot);
+                    cx.emit(WoTEvent);
+
+                    if grew {
+                        this.sync(cx);
+                    }
+                }
+
                cx.notify();
            })
            .ok();
-
-            if grew {
-                this.update(cx, |this, cx| {
-                    this.refresh(cx);
-                })
-                .ok();
-            }
        }));
    }

@@ -273,6 +316,11 @@ impl WebOfTrust {
            .is_some_and(|snapshot| !snapshot.disabled)
    }

+    /// Whether a reconciliation with the relays is in flight
+    pub fn is_syncing(&self) -> bool {
+        self.syncing
+    }
+
    /// Whether the snapshot covers a follow set
    fn has_data(&self) -> bool {
        self.snapshot
@@ -1,12 +1,17 @@
 use std::path::PathBuf;

 use anyhow::{Error, anyhow};
+#[cfg(not(target_arch = "wasm32"))]
 use common::config_dir;
-use gpui::{App, AppContext, Context, Entity, Global, ImageSource, Subscription, Task};
+use gpui::{App, AppContext, Context, Entity, Global, ImageSource, Subscription, Task, px};
 use nostr_sdk::prelude::*;
 use serde::{Deserialize, Serialize};
 use smallvec::{SmallVec, smallvec};

+/// Browser storage key for the settings JSON
+#[cfg(target_arch = "wasm32")]
+const SETTINGS_KEY: &str = "coop.settings";
+
 /// The user's appearance preference, persisted with the rest of the settings.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Default, Serialize, Deserialize)]
 pub enum AppearanceMode {
@@ -31,31 +36,76 @@ impl AppearanceMode {
    }
 }

+/// The default base font size for the interface
+pub const DEFAULT_FONT_SIZE: f32 = 16.0;
+
+/// User tuning applied on top of the native OS theme
+#[derive(Debug, Clone, Copy, PartialEq, Serialize, Deserialize)]
+pub struct ThemeSettings {
+    /// The base UI font size in pixels
+    pub font_size: f32,
+    /// Draw a ring around focused controls
+    pub focus_ring: bool,
+    /// Corner radius for general elements; follows the OS theme when unset
+    pub radius: Option<f32>,
+    /// Corner radius for large elements like dialogs; follows the OS theme when unset
+    pub radius_lg: Option<f32>,
+}
+
+impl Default for ThemeSettings {
+    fn default() -> Self {
+        Self {
+            font_size: DEFAULT_FONT_SIZE,
+            focus_ring: false,
+            radius: None,
+            radius_lg: None,
+        }
+    }
+}
+
 pub fn init(cx: &mut App) {
    AppSettings::set_global(cx.new(AppSettings::new), cx)
 }

 /// Read the persisted appearance mode synchronously.
-///
-/// The async load fills the global settings later; the native theme must be
-/// applied before the first window opens, so boot reads the mode straight
-/// from the settings file instead.
+fn persisted_settings() -> Option<Settings> {
+    let content = persisted_content();
+    content.and_then(|content| serde_json::from_str(&content).ok())
+}
+
+/// The persisted settings JSON, from the config file or browser storage
+#[cfg(not(target_arch = "wasm32"))]
+fn persisted_content() -> Option<String> {
+    let path = config_dir().join(".settings");
+    std::fs::read_to_string(path).ok()
+}
+
+#[cfg(target_arch = "wasm32")]
+fn persisted_content() -> Option<String> {
+    common::web_store::get(SETTINGS_KEY).ok().flatten()
+}
+
 pub fn persisted_appearance_mode() -> AppearanceMode {
-    #[cfg(not(target_arch = "wasm32"))]
-    {
-        let path = config_dir().join(".settings");
-        if let Ok(content) = std::fs::read_to_string(path)
-            && let Ok(settings) = serde_json::from_str::<Settings>(&content)
-        {
-            return settings.appearance_mode;
-        }
-    }
-    AppearanceMode::default()
+    persisted_settings()
+        .map(|settings| settings.appearance_mode)
+        .unwrap_or_default()
+}
+
+/// Read the persisted theme tuning synchronously.
+pub fn persisted_theme() -> ThemeSettings {
+    persisted_settings()
+        .map(|settings| settings.theme)
+        .unwrap_or_default()
 }

 const DEFAULT_FILE_SERVER: &str = "https://nostr.download/";
 const LEGACY_FILE_SERVER: &str = "blossom.band";
-
+/// Minimum days between automatic encryption key rotations
+pub const NIP4E_ROTATION_MIN_DAYS: u32 = 1;
+/// Maximum days between automatic encryption key rotations
+pub const NIP4E_ROTATION_MAX_DAYS: u32 = 90;
+/// Days between automatic encryption key rotations when enabled
+pub const NIP4E_ROTATION_DEFAULT_DAYS: u32 = 30;
 /// Built-in image shown behind chat and group panels
 pub const DEFAULT_BACKGROUND: &str = "brand/default-bg.jpg";

@@ -102,6 +152,7 @@ setting_accessors! {
    pub screening: bool,
    pub wot_auto_trust: bool,
    pub nip4e: bool,
+    pub nip4e_rotation_days: Option<u32>,
    pub hide_group_notice: bool,
    pub file_server: Url,
    pub panel_background: bool,
@@ -109,6 +160,7 @@ setting_accessors! {
 }

 setting_getters! {
+    pub theme: ThemeSettings,
    pub pinned_rooms: Vec<u64>,
    pub pinned_groups: Vec<String>,
 }
@@ -176,9 +228,15 @@ pub struct Settings {
    pub wot_auto_trust: bool,
    /// Enable decoupling encryption key
    pub nip4e: bool,
+    /// Days between automatic encryption key rotations; None disables rotation
+    #[serde(default)]
+    pub nip4e_rotation_days: Option<u32>,
    /// Hide the notice that messages in public groups are not encrypted
    #[serde(default)]
    pub hide_group_notice: bool,
+    /// Tuning applied on top of the native OS theme
+    #[serde(default)]
+    pub theme: ThemeSettings,
    /// Show an image behind chat and group panels
    #[serde(default)]
    pub panel_background: bool,
@@ -205,7 +263,9 @@ impl Default for Settings {
            screening: true,
            wot_auto_trust: true,
            nip4e: false,
+            nip4e_rotation_days: None,
            hide_group_notice: false,
+            theme: ThemeSettings::default(),
            panel_background: true,
            panel_background_path: None,
            trusted_relays: vec![],
@@ -270,6 +330,52 @@ impl AppSettings {
        });
    }

+    /// Edit the theme tuning
+    pub fn update_theme(edit: impl FnOnce(&mut ThemeSettings), cx: &mut App) {
+        Self::global(cx).update(cx, |this, cx| {
+            this.inner.update(cx, |inner, cx| {
+                edit(&mut inner.theme);
+                cx.notify();
+            });
+        });
+    }
+
+    pub fn apply_theme_style(cx: &mut App) {
+        Self::apply_theme_tuning(Self::get_theme(cx), cx);
+    }
+
+    fn apply_theme_tuning(tuning: ThemeSettings, cx: &mut App) {
+        use gpui_kit::component::Theme;
+
+        {
+            let styled = Theme::global_mut(cx);
+            styled.font_size = px(tuning.font_size);
+            styled.focus_ring = tuning.focus_ring;
+            if let Some(radius) = tuning.radius {
+                styled.radius = px(radius);
+            }
+            if let Some(radius_lg) = tuning.radius_lg {
+                styled.radius_lg = px(radius_lg);
+            }
+        }
+
+        Theme::update(cx, |styled| {
+            let background = styled.background;
+            let foreground = styled.foreground;
+            let (hover_alpha, active_alpha) = if styled.is_dark() {
+                (0.08, 0.12)
+            } else {
+                (0.04, 0.06)
+            };
+            if styled.list_hover == background {
+                styled.list_hover = foreground.alpha(hover_alpha);
+            }
+            if styled.tab_active == background {
+                styled.tab_active = foreground.alpha(active_alpha);
+            }
+        });
+    }
+
    /// Load settings
    fn load(&mut self, cx: &mut Context<Self>) {
        let task: Task<Result<Settings, Error>> = cx.background_spawn(async move {
@@ -280,6 +386,14 @@ impl AppSettings {
                    return Ok(serde_json::from_str(&content)?);
                }
            }
+
+            #[cfg(target_arch = "wasm32")]
+            {
+                if let Some(content) = common::web_store::get(SETTINGS_KEY)? {
+                    return Ok(serde_json::from_str(&content)?);
+                }
+            }
+
            Err(anyhow!("Not found"))
        });

@@ -312,6 +426,11 @@ impl AppSettings {
                smol::fs::write(&path, content).await.ok();
            })
            .detach();
+
+            #[cfg(target_arch = "wasm32")]
+            if let Err(e) = common::web_store::set(SETTINGS_KEY, &content) {
+                log::warn!("failed to persist settings: {e}");
+            }
        }
    }

@@ -325,7 +444,8 @@ impl AppSettings {
            AppearanceMode::Light => Theme::change(gpui_kit::component::ThemeMode::Light, None, cx),
            AppearanceMode::Dark => Theme::change(gpui_kit::component::ThemeMode::Dark, None, cx),
        }
-        cx.refresh_windows();
+        let tuning = self.inner.read(cx).theme;
+        Self::apply_theme_tuning(tuning, cx);
    }

    /// Check if decoupling encryption key is enabled
@@ -382,3 +502,27 @@ impl AppSettings {
        });
    }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    /// Settings written before theme tuning existed must keep loading.
+    #[test]
+    fn settings_without_theme_keep_defaults() {
+        let settings: Settings = serde_json::from_str(
+            r#"{
+                "appearance_mode": "Dark",
+                "hide_avatar": false,
+                "screening": true,
+                "wot_auto_trust": true,
+                "nip4e": false,
+                "trusted_relays": [],
+                "file_server": "https://nostr.download/"
+            }"#,
+        )
+        .unwrap();
+
+        assert_eq!(settings.theme, ThemeSettings::default());
+    }
+}
@@ -0,0 +1,31 @@
+[package]
+name = "speech"
+version.workspace = true
+edition.workspace = true
+publish.workspace = true
+
+[dependencies]
+anyhow.workspace = true
+log.workspace = true
+gpui.workspace = true
+gpui-kit = { workspace = true, features = ["speech"] }
+flume.workspace = true
+instant.workspace = true
+tts.workspace = true
+
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+common = { path = "../common" }
+parakeet-rs = "=0.3.8"
+ort = "=2.0.0-rc.13"
+reqwest = { version = "0.12", default-features = false, features = [
+    "blocking",
+    "rustls-tls",
+] }
+serde.workspace = true
+serde_json.workspace = true
+sha2.workspace = true
+
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+js-sys = "0.3"
+wasm-bindgen = "0.2"
+web-sys = { version = "0.3", features = ["Window"] }
@@ -0,0 +1,54 @@
+#[cfg(not(target_arch = "wasm32"))]
+pub mod model;
+#[cfg(not(target_arch = "wasm32"))]
+mod parakeet;
+pub mod speaker;
+#[cfg(target_arch = "wasm32")]
+mod web;
+
+use std::time::Duration;
+
+use gpui::{
+    Animation, AnimationExt as _, AnyElement, App, IntoElement as _, ParentElement as _,
+    Styled as _, div,
+};
+use gpui_kit::component::ActiveTheme as _;
+use gpui_kit::component::speech::SpeechRecognizer;
+
+/// A ticking `M:SS` counter for the dictation in progress.
+pub fn elapsed(started: instant::Instant, cx: &App) -> AnyElement {
+    div()
+        .text_xs()
+        .text_color(cx.theme().muted_foreground)
+        .with_animation(
+            "dictation-elapsed",
+            Animation::new(Duration::from_secs(1))
+                .repeat()
+                .with_max_fps(1.),
+            move |counter, _| counter.child(format_elapsed(started)),
+        )
+        .into_any_element()
+}
+
+fn format_elapsed(started: instant::Instant) -> String {
+    let seconds = started.elapsed().as_secs();
+    format!("{}:{:02}", seconds / 60, seconds % 60)
+}
+
+/// The recognizer backing the composer's microphone button.
+#[cfg(not(target_arch = "wasm32"))]
+pub fn recognizer() -> impl SpeechRecognizer {
+    parakeet::ParakeetRecognizer
+}
+
+/// The recognizer backing the composer's microphone button.
+#[cfg(target_arch = "wasm32")]
+pub fn recognizer() -> impl SpeechRecognizer {
+    web::WebSpeechRecognizer
+}
+
+/// The audio source backing the composer's microphone button on the web.
+#[cfg(target_arch = "wasm32")]
+pub fn input() -> impl gpui_kit::component::speech::AudioInput {
+    web::SelfCapturedInput
+}
@@ -0,0 +1,23 @@
+{
+  "repository": "istupakov/parakeet-tdt-0.6b-v3-onnx",
+  "revision": "8f23f0c03c8761650bdb5b40aaf3e40d2c15f1ce",
+  "source": "nvidia/parakeet-tdt-0.6b-v3",
+  "license": "CC-BY-4.0",
+  "files": [
+    {
+      "name": "decoder_joint-model.int8.onnx",
+      "size": 18202004,
+      "sha256": "eea7483ee3d1a30375daedc8ed83e3960c91b098812127a0d99d1c8977667a70"
+    },
+    {
+      "name": "encoder-model.int8.onnx",
+      "size": 652183999,
+      "sha256": "6139d2fa7e1b086097b277c7149725edbab89cc7c7ae64b23c741be4055aff09"
+    },
+    {
+      "name": "vocab.txt",
+      "size": 93939,
+      "sha256": "d58544679ea4bc6ac563d1f545eb7d474bd6cfa467f0a6e2c1dc1c7d37e3c35d"
+    }
+  ]
+}
@@ -0,0 +1,295 @@
+use std::path::{Path, PathBuf};
+use std::sync::atomic::{AtomicBool, Ordering};
+use std::sync::{Arc, Mutex, OnceLock};
+use std::{fs, io};
+
+use anyhow::{Result, bail};
+use serde::Deserialize;
+
+/// How the model is currently available.
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum Status {
+    NotInstalled,
+    Downloading { downloaded: u64, total: u64 },
+    Installed,
+}
+
+impl Status {
+    pub fn is_downloading(self) -> bool {
+        matches!(self, Status::Downloading { .. })
+    }
+}
+
+#[derive(Debug, Deserialize)]
+struct Manifest {
+    repository: String,
+    revision: String,
+    files: Vec<Artifact>,
+}
+
+#[derive(Debug, Deserialize)]
+struct Artifact {
+    name: String,
+    size: u64,
+    sha256: String,
+}
+
+fn manifest() -> &'static Manifest {
+    static MANIFEST: OnceLock<Manifest> = OnceLock::new();
+
+    MANIFEST.get_or_init(|| {
+        serde_json::from_str(include_str!("model.json")).expect("pinned model manifest")
+    })
+}
+
+/// The directory the model artifacts are downloaded into.
+pub fn dir() -> PathBuf {
+    common::config_dir()
+        .join("speech")
+        .join("parakeet-tdt-0.6b-v3")
+}
+
+/// Total download size in bytes.
+pub fn total_size() -> u64 {
+    manifest().files.iter().map(|file| file.size).sum()
+}
+
+/// The revision of the installed model, if its artifacts are complete.
+fn installed_revision() -> Option<String> {
+    let manifest = manifest();
+    let dir = dir();
+
+    let complete = manifest.files.iter().all(|file| {
+        fs::metadata(dir.join(&file.name)).is_ok_and(|metadata| metadata.len() == file.size)
+    });
+
+    if complete
+        && fs::read_to_string(dir.join("verified"))
+            .is_ok_and(|revision| revision == manifest.revision)
+    {
+        Some(manifest.revision.clone())
+    } else {
+        None
+    }
+}
+
+/// Whether the model is ready to load.
+pub fn installed() -> bool {
+    status() == Status::Installed
+}
+
+/// The current status, reconciling the download state with the disk.
+pub fn status() -> Status {
+    let state = state().lock().unwrap_or_else(|error| error.into_inner());
+
+    if let Download::Running {
+        downloaded, total, ..
+    } = state.download
+    {
+        return Status::Downloading { downloaded, total };
+    }
+
+    if installed_revision().is_some() {
+        Status::Installed
+    } else {
+        Status::NotInstalled
+    }
+}
+
+/// Take the last download failure, if it has not been reported yet.
+pub fn take_error() -> Option<String> {
+    let mut state = state().lock().unwrap_or_else(|error| error.into_inner());
+    state.error.take()
+}
+
+/// Start downloading the model, unless a download is already running.
+pub fn start_download() {
+    let mut state = state().lock().unwrap_or_else(|error| error.into_inner());
+
+    if matches!(state.download, Download::Running { .. }) {
+        return;
+    }
+
+    let cancel = Arc::new(AtomicBool::new(false));
+    state.error = None;
+    state.download = Download::Running {
+        downloaded: 0,
+        total: total_size(),
+        cancel: cancel.clone(),
+    };
+
+    if let Err(error) = std::thread::Builder::new()
+        .name("speech-model-download".into())
+        .spawn(move || download(cancel))
+    {
+        state.download = Download::Idle;
+        state.error = Some(error.to_string());
+    }
+}
+
+/// Request cancellation of the running download.
+pub fn cancel_download() {
+    let state = state().lock().unwrap_or_else(|error| error.into_inner());
+
+    if let Download::Running { cancel, .. } = &state.download {
+        cancel.store(true, Ordering::Release);
+    }
+}
+
+/// Delete the downloaded model and any partial download.
+pub fn delete() {
+    super::parakeet::unload();
+    cancel_download();
+
+    if let Err(error) = fs::remove_dir_all(dir())
+        && error.kind() != io::ErrorKind::NotFound
+    {
+        log::warn!("failed to remove the speech model: {error}");
+    }
+}
+
+fn download(cancel: Arc<AtomicBool>) {
+    let result = download_inner(&cancel);
+
+    let mut state = state().lock().unwrap_or_else(|error| error.into_inner());
+    state.download = Download::Idle;
+
+    // A cancelled download must not report a spurious failure.
+    if !cancelled(&cancel)
+        && let Err(error) = result
+    {
+        state.error = Some(format!("{error:#}"));
+    }
+}
+
+fn download_inner(cancel: &AtomicBool) -> Result<()> {
+    let manifest = manifest();
+    let dir = dir();
+    let client = reqwest::blocking::Client::builder()
+        .connect_timeout(std::time::Duration::from_secs(20))
+        .build()?;
+
+    fs::create_dir_all(&dir)?;
+
+    for file in &manifest.files {
+        if cancelled(cancel) {
+            bail!("Cancelled");
+        }
+
+        let staging = dir.join(format!("{}.part", file.name));
+        let result = download_file(&client, manifest, file, &staging, cancel);
+
+        if result.is_err() || cancelled(cancel) {
+            let _unused = fs::remove_file(&staging);
+            result?;
+            bail!("Cancelled");
+        }
+    }
+
+    fs::write(dir.join("verified"), &manifest.revision)?;
+    Ok(())
+}
+
+fn download_file(
+    client: &reqwest::blocking::Client,
+    manifest: &Manifest,
+    file: &Artifact,
+    staging: &Path,
+    cancel: &AtomicBool,
+) -> Result<()> {
+    use std::io::{Read as _, Write as _};
+
+    use sha2::Digest as _;
+
+    let url = format!(
+        "https://huggingface.co/{}/resolve/{}/{}",
+        manifest.repository, manifest.revision, file.name
+    );
+
+    let mut response = client.get(url).send()?.error_for_status()?;
+    let mut out = fs::File::create(staging)?;
+    let mut hash = sha2::Sha256::new();
+    let mut size = 0u64;
+
+    loop {
+        if cancelled(cancel) {
+            bail!("Cancelled");
+        }
+
+        let mut chunk = [0u8; 64 * 1024];
+        let read = response.read(&mut chunk)?;
+
+        if read == 0 {
+            break;
+        }
+
+        size += read as u64;
+        if size > file.size {
+            bail!("Unexpected model size");
+        }
+
+        hash.update(&chunk[..read]);
+        out.write_all(&chunk[..read])?;
+
+        let mut state = state().lock().unwrap_or_else(|error| error.into_inner());
+        if let Download::Running { downloaded, .. } = &mut state.download {
+            *downloaded += read as u64;
+        }
+    }
+
+    if size != file.size || format!("{:x}", hash.finalize()) != file.sha256 {
+        bail!("Model checksum verification failed");
+    }
+
+    out.sync_all()?;
+    fs::rename(staging, dir().join(&file.name))?;
+    Ok(())
+}
+
+fn cancelled(cancel: &AtomicBool) -> bool {
+    cancel.load(Ordering::Acquire)
+}
+
+enum Download {
+    Idle,
+    Running {
+        downloaded: u64,
+        total: u64,
+        cancel: Arc<AtomicBool>,
+    },
+}
+
+struct State {
+    download: Download,
+    error: Option<String>,
+}
+
+fn state() -> &'static Mutex<State> {
+    static STATE: Mutex<State> = Mutex::new(State {
+        download: Download::Idle,
+        error: None,
+    });
+
+    &STATE
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn manifest_pins_v3_artifacts_with_exact_sizes() {
+        let manifest = manifest();
+
+        assert_eq!(manifest.repository, "istupakov/parakeet-tdt-0.6b-v3-onnx");
+        assert_eq!(manifest.revision.len(), 40);
+        assert_eq!(manifest.files.len(), 3);
+        assert_eq!(total_size(), 670_479_942);
+        assert!(
+            manifest
+                .files
+                .iter()
+                .all(|file| file.sha256.len() == 64 && !file.name.contains('/'))
+        );
+    }
+}
@@ -0,0 +1,214 @@
+use std::path::PathBuf;
+use std::sync::OnceLock;
+use std::time::Duration;
+
+use anyhow::{Context as _, Result, anyhow};
+use gpui::{App, Task};
+use gpui_kit::component::speech::{
+    AudioFormat, RecognitionSession, SpeechError, SpeechRecognizer, SpeechSink,
+};
+use parakeet_rs::{ParakeetTDT, Transcriber as _};
+
+const MODEL_RATE: u32 = 16_000;
+const MAX_SECONDS: usize = 120;
+
+/// The on-device recognizer.
+pub struct ParakeetRecognizer;
+
+impl SpeechRecognizer for ParakeetRecognizer {
+    fn audio_format(&self) -> AudioFormat {
+        AudioFormat::new(MODEL_RATE, 1)
+    }
+
+    fn is_available(&self, _cx: &App) -> bool {
+        true
+    }
+
+    fn start(
+        &self,
+        sink: SpeechSink,
+        cx: &mut App,
+    ) -> Result<Box<dyn RecognitionSession>, SpeechError> {
+        if super::model::installed() {
+            worker().send_or_log(Command::Warm(super::model::dir()));
+        } else if super::model::status().is_downloading() {
+            return Err(SpeechError::recognizer(anyhow!(
+                "The speech model is still downloading. Try again when it finishes."
+            )));
+        } else {
+            return Err(SpeechError::recognizer(anyhow!(
+                "No speech model is installed. Download it from Settings."
+            )));
+        }
+
+        // The session buffers everything it is pushed,
+        // so audio is accepted right away.
+        sink.ready(cx);
+
+        Ok(Box::new(ParakeetSession {
+            sink,
+            samples: Vec::new(),
+            _result: None,
+        }))
+    }
+}
+
+struct ParakeetSession {
+    sink: SpeechSink,
+    samples: Vec<f32>,
+    _result: Option<Task<()>>,
+}
+
+impl RecognitionSession for ParakeetSession {
+    fn push_audio(&mut self, samples: &[i16], _cx: &mut App) {
+        if self.samples.len() < MAX_SECONDS * MODEL_RATE as usize {
+            self.samples
+                .extend(samples.iter().map(|sample| f32::from(*sample) / 32_768.0));
+        }
+    }
+
+    fn finish(&mut self, cx: &mut App) {
+        let samples = std::mem::take(&mut self.samples);
+        let sink = self.sink.clone();
+
+        // Speech too short to transcribe ends the session at once.
+        let silent = samples.iter().all(|sample| sample.abs() < 0.0001);
+        if samples.len() < MODEL_RATE as usize / 5 || silent {
+            sink.finish(cx);
+            return;
+        }
+
+        let (sender, receiver) = flume::unbounded();
+        worker().send_or_log(Command::Transcribe { samples, sender });
+
+        self._result = Some(cx.spawn(async move |cx| {
+            let result = receiver.recv_async().await;
+
+            cx.update(|cx| match result {
+                Ok(Ok(text)) if !text.is_empty() => {
+                    sink.phrase(text, cx);
+                    sink.finish(cx);
+                }
+                Ok(Ok(_)) => sink.finish(cx),
+                Ok(Err(error)) => sink.error(SpeechError::recognizer(error), cx),
+                Err(_) => sink.error(
+                    SpeechError::recognizer(anyhow!("The speech worker is unavailable")),
+                    cx,
+                ),
+            });
+        }));
+    }
+}
+
+enum Command {
+    Warm(PathBuf),
+    Transcribe {
+        samples: Vec<f32>,
+        sender: flume::Sender<Result<String, anyhow::Error>>,
+    },
+    Unload,
+}
+
+/// A handle to the single inference worker.
+fn worker() -> &'static flume::Sender<Command> {
+    static WORKER: OnceLock<flume::Sender<Command>> = OnceLock::new();
+
+    WORKER.get_or_init(|| {
+        let (sender, receiver) = flume::unbounded::<Command>();
+
+        let spawned = std::thread::Builder::new()
+            .name("speech-parakeet".into())
+            .spawn(move || run_worker(receiver));
+
+        if let Err(error) = spawned {
+            log::error!("failed to spawn the speech worker: {error}");
+        }
+
+        sender
+    })
+}
+
+fn run_worker(receiver: flume::Receiver<Command>) {
+    let mut cached: Option<(PathBuf, ParakeetTDT)> = None;
+
+    while let Ok(command) = receiver.recv_timeout(Duration::from_secs(30)) {
+        match command {
+            Command::Unload => {
+                cached = None;
+            }
+            Command::Warm(dir) => {
+                let loaded = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| {
+                    load(&mut cached, &dir).map(|_| ())
+                }));
+
+                match flatten_panic(loaded) {
+                    Ok(Ok(())) => {}
+                    Ok(Err(error)) | Err(error) => {
+                        log::warn!("failed to load the speech model: {error:#}")
+                    }
+                }
+            }
+            Command::Transcribe { samples, sender } => {
+                let transcribed = std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| {
+                    transcribe(&mut cached, samples)
+                }));
+
+                let result = match flatten_panic(transcribed) {
+                    Ok(result) => result,
+                    Err(_) => {
+                        cached = None;
+                        Err(anyhow!("Dictation stopped unexpectedly. Try again."))
+                    }
+                };
+
+                if sender.send(result).is_err() {
+                    log::debug!("speech session was cancelled before its result arrived");
+                }
+            }
+        }
+    }
+}
+
+fn load<'a>(
+    cached: &'a mut Option<(PathBuf, ParakeetTDT)>,
+    dir: &PathBuf,
+) -> Result<&'a mut ParakeetTDT> {
+    if cached.as_ref().is_none_or(|(path, _)| path != dir) {
+        let model = ParakeetTDT::from_pretrained(dir, None)
+            .map_err(|error| anyhow!("Could not load the speech model: {error}"))?;
+        *cached = Some((dir.clone(), model));
+    }
+
+    let (_, model) = cached.as_mut().context("speech model was unloaded")?;
+    Ok(model)
+}
+
+fn transcribe(cached: &mut Option<(PathBuf, ParakeetTDT)>, samples: Vec<f32>) -> Result<String> {
+    let model = load(cached, &super::model::dir())?;
+
+    model
+        .transcribe_samples(samples, MODEL_RATE, 1, None)
+        .map(|result| result.text)
+        .map_err(|error| anyhow!("Could not transcribe this recording: {error}"))
+}
+
+trait SendOrLog {
+    fn send_or_log(&self, command: Command);
+}
+
+impl SendOrLog for flume::Sender<Command> {
+    fn send_or_log(&self, command: Command) {
+        if self.send(command).is_err() {
+            log::debug!("speech worker is gone; command dropped");
+        }
+    }
+}
+
+/// Retire cached weights, e.g. after the model was deleted.
+pub(crate) fn unload() {
+    worker().send_or_log(Command::Unload);
+}
+
+fn flatten_panic<T>(result: std::thread::Result<T>) -> Result<T> {
+    result.map_err(|_| anyhow!("The speech worker panicked"))
+}
@@ -0,0 +1,88 @@
+use std::time::Duration;
+
+use tts::Tts;
+
+/// Words per minute of an engine at its normal rate, for estimating speech duration.
+const NORMAL_WPM: f32 = 160.0;
+
+/// Extra time past the estimate before speech is considered finished, for backends that
+/// cannot report utterance end.
+pub const END_GRACE: Duration = Duration::from_secs(5);
+
+/// Reads text aloud through the platform's speech backend, created on first use.
+pub struct Speaker {
+    tts: Option<Tts>,
+    end_tx: flume::Sender<()>,
+    end_rx: flume::Receiver<()>,
+}
+
+impl Speaker {
+    pub fn new() -> Self {
+        let (end_tx, end_rx) = flume::unbounded();
+
+        Self {
+            tts: None,
+            end_tx,
+            end_rx,
+        }
+    }
+
+    /// Cloneable stream of utterance-finish events.
+    pub fn end_events(&self) -> flume::Receiver<()> {
+        self.end_rx.clone()
+    }
+
+    /// Speak the text, interrupting what this speaker is already saying.
+    pub fn speak(&mut self, text: &str) -> Result<Duration, tts::Error> {
+        let end_tx = self.end_tx.clone();
+        let tts = match self.tts.as_ref() {
+            Some(tts) => tts,
+            None => self.tts.insert({
+                let tts = Tts::default()?;
+                if let Err(error) = tts.on_utterance_end(move |_| {
+                    // A send error only means the panel dropped its event loop.
+                    let _ = end_tx.send(());
+                }) {
+                    log::warn!("utterance end events unavailable ({error})");
+                }
+                tts
+            }),
+        };
+        tts.speak(text, true)?;
+        Ok(Self::estimate(tts, text))
+    }
+
+    /// Stop speaking, a speaker that never spoke is already silent.
+    pub fn stop(&mut self) -> Result<(), tts::Error> {
+        match self.tts.as_ref() {
+            Some(tts) => tts.stop()?,
+            None => return Ok(()),
+        }
+
+        Ok(())
+    }
+
+    /// Best-effort speaking state, a speaker that never spoke is silent.
+    pub fn speaking(&self) -> bool {
+        self.tts
+            .as_ref()
+            .and_then(|tts| tts.is_speaking().ok())
+            .unwrap_or(false)
+    }
+
+    /// How long speaking the text is expected to take at the engine's current speed.
+    fn estimate(tts: &Tts, text: &str) -> Duration {
+        let words = text.split_whitespace().count().max(1) as f32;
+        let speed = match (tts.get_rate(), tts.normal_rate()) {
+            (Ok(rate), Ok(normal)) if normal > 0. => (rate / normal).clamp(0.2, 4.),
+            _ => 1.,
+        };
+        Duration::from_secs_f32(words / NORMAL_WPM * 60. / speed)
+    }
+}
+
+impl Default for Speaker {
+    fn default() -> Self {
+        Self::new()
+    }
+}
@@ -0,0 +1,256 @@
+use std::cell::RefCell;
+
+use anyhow::anyhow;
+use gpui::App;
+use gpui_kit::Subscription;
+use gpui_kit::component::speech::{
+    AudioFormat, AudioInput, AudioSink, RecognitionSession, SpeechError, SpeechRecognizer,
+    SpeechSink,
+};
+use js_sys::{Array, Function, JsString, Reflect};
+use wasm_bindgen::closure::Closure;
+use wasm_bindgen::{JsCast as _, JsValue};
+use web_sys::window;
+
+/// The recognizer backed by `SpeechRecognition` (or its `webkit` prefix).
+pub struct WebSpeechRecognizer;
+
+impl SpeechRecognizer for WebSpeechRecognizer {
+    fn audio_format(&self) -> AudioFormat {
+        AudioFormat::default()
+    }
+
+    fn is_available(&self, _cx: &App) -> bool {
+        true
+    }
+
+    fn start(
+        &self,
+        sink: SpeechSink,
+        cx: &mut App,
+    ) -> Result<Box<dyn RecognitionSession>, SpeechError> {
+        let recognition = Recognition::open(sink, cx).map_err(SpeechError::recognizer)?;
+
+        Ok(Box::new(recognition))
+    }
+}
+
+pub struct SelfCapturedInput;
+
+impl AudioInput for SelfCapturedInput {
+    fn start(
+        &self,
+        _format: AudioFormat,
+        _sink: AudioSink,
+        _cx: &mut App,
+    ) -> Result<Subscription, SpeechError> {
+        Ok(Subscription::new(|| {}))
+    }
+}
+
+enum Event {
+    Hypothesis(String),
+    Phrase(String),
+    Error(String),
+    End,
+}
+
+struct Recognition {
+    recognition: JsValue,
+    on_result: Option<Closure<dyn FnMut(JsValue)>>,
+    on_error: Option<Closure<dyn FnMut(JsValue)>>,
+    on_end: Option<Closure<dyn FnMut(JsValue)>>,
+    _task: gpui::Task<()>,
+}
+
+impl Recognition {
+    fn open(sink: SpeechSink, cx: &mut App) -> anyhow::Result<Self> {
+        let window = window().ok_or_else(|| anyhow!("No browser window"))?;
+
+        let constructor = Reflect::get(&window, &JsString::from("SpeechRecognition"))
+            .ok()
+            .filter(|value| value.is_function())
+            .or_else(|| {
+                Reflect::get(&window, &JsString::from("webkitSpeechRecognition"))
+                    .ok()
+                    .filter(|value| value.is_function())
+            })
+            .ok_or_else(|| anyhow!("This browser does not support speech recognition"))?;
+
+        let recognition =
+            Reflect::construct(constructor.unchecked_ref::<Function>(), &Array::new())
+                .map_err(|error| js_error("constructing the recognizer", error))?;
+
+        let (sender, receiver) = flume::unbounded::<Event>();
+        let error_sender = sender.clone();
+        let end_sender = sender.clone();
+
+        let finalized = RefCell::new(0usize);
+        let on_result = Closure::wrap(Box::new(move |event: JsValue| {
+            let read = |value: &JsValue, property: &str| -> Option<JsValue> {
+                Reflect::get(value, &JsString::from(property)).ok()
+            };
+
+            let Some(results) = read(&event, "results") else {
+                return;
+            };
+            let length = read(&results, "length")
+                .and_then(|length| length.as_f64())
+                .unwrap_or(0.0) as usize;
+
+            let mut finalized = finalized.borrow_mut();
+            let mut interim = String::new();
+
+            for index in *finalized..length {
+                let Some(result) = read(&results, &index.to_string()) else {
+                    continue;
+                };
+
+                let Some(alternative) = read(&result, "0") else {
+                    continue;
+                };
+
+                let Some(text) = read(&alternative, "transcript").and_then(|text| text.as_string())
+                else {
+                    continue;
+                };
+
+                let is_final = read(&result, "isFinal")
+                    .and_then(|final_value| final_value.as_bool())
+                    .unwrap_or(false);
+
+                if is_final {
+                    *finalized += 1;
+                    if sender.send(Event::Phrase(text)).is_err() {
+                        log::debug!("speech session was cancelled mid-utterance");
+                    }
+                } else {
+                    interim.push_str(&text);
+                }
+            }
+
+            if !interim.is_empty() && sender.send(Event::Hypothesis(interim)).is_err() {
+                log::debug!("speech session was cancelled mid-utterance");
+            }
+        }) as Box<dyn FnMut(JsValue)>);
+
+        let on_error = Closure::wrap(Box::new(move |event: JsValue| {
+            let message = Reflect::get(&event, &JsString::from("error"))
+                .ok()
+                .and_then(|error| error.as_string())
+                .unwrap_or_else(|| "unknown speech error".into());
+
+            if error_sender.send(Event::Error(message)).is_err() {
+                log::debug!("speech session was cancelled before its error arrived");
+            }
+        }) as Box<dyn FnMut(JsValue)>);
+
+        let on_end = Closure::wrap(Box::new(move |_event: JsValue| {
+            if end_sender.send(Event::End).is_err() {
+                log::debug!("speech session was cancelled before its end arrived");
+            }
+        }) as Box<dyn FnMut(JsValue)>);
+
+        set_callback(&recognition, "onresult", on_result.as_ref().unchecked_ref())?;
+        set_callback(&recognition, "onerror", on_error.as_ref().unchecked_ref())?;
+        set_callback(&recognition, "onend", on_end.as_ref().unchecked_ref())?;
+        set_bool(&recognition, "continuous", true)?;
+        set_bool(&recognition, "interimResults", true)?;
+
+        call_method(&recognition, "start")?;
+
+        // The browser consumes audio as soon as it has permission
+        sink.ready(cx);
+
+        let task = cx.spawn(async move |cx| {
+            while let Ok(event) = receiver.recv_async().await {
+                let done = matches!(event, Event::End);
+
+                // The speech state ignores sink calls once its session ended,
+                // so a late event after a cancel is harmless.
+                cx.update(|cx| match event {
+                    Event::Hypothesis(text) => sink.hypothesis(text, cx),
+                    Event::Phrase(text) => sink.phrase(text, cx),
+                    Event::Error(message) => {
+                        sink.error(SpeechError::recognizer(anyhow!("{message}")), cx)
+                    }
+                    Event::End => sink.finish(cx),
+                });
+
+                if done {
+                    break;
+                }
+            }
+        });
+
+        Ok(Self {
+            recognition,
+            on_result: Some(on_result),
+            on_error: Some(on_error),
+            on_end: Some(on_end),
+            _task: task,
+        })
+    }
+
+    fn stop(&mut self) {
+        self.on_result = None;
+        self.on_error = None;
+        self.on_end = None;
+
+        let _ignored = call_method(&self.recognition, "abort");
+    }
+}
+
+impl Drop for Recognition {
+    fn drop(&mut self) {
+        self.stop();
+    }
+}
+
+impl RecognitionSession for Recognition {
+    fn push_audio(&mut self, _samples: &[i16], _cx: &mut App) {
+        // The browser recognizer captures the microphone itself.
+        // the state still pushes audio through its input, which is a no-op here.
+    }
+
+    fn finish(&mut self, _cx: &mut App) {
+        // The end handler reports completion, so no result is fabricated here.
+        let _ignored = call_method(&self.recognition, "stop");
+    }
+}
+
+fn set_callback(target: &JsValue, property: &str, callback: &Function) -> anyhow::Result<()> {
+    Reflect::set(target, &JsString::from(property), callback)
+        .map_err(|error| js_error(property, error))?;
+    Ok(())
+}
+
+fn set_bool(target: &JsValue, property: &str, value: bool) -> anyhow::Result<()> {
+    Reflect::set(target, &JsString::from(property), &JsValue::from(value))
+        .map_err(|error| js_error(property, error))?;
+    Ok(())
+}
+
+fn call_method(target: &JsValue, method: &str) -> anyhow::Result<()> {
+    let function = Reflect::get(target, &JsString::from(method))
+        .map_err(|error| js_error(method, error))?
+        .unchecked_into::<Function>();
+
+    function
+        .call0(target)
+        .map(|_| ())
+        .map_err(|error| js_error(method, error))
+}
+
+fn js_error(what: &str, error: JsValue) -> anyhow::Error {
+    let description = error
+        .as_string()
+        .or_else(|| {
+            Reflect::get(&error, &JsString::from("message"))
+                .ok()
+                .and_then(|message| message.as_string())
+        })
+        .unwrap_or_else(|| "unknown error".into());
+
+    anyhow!("{what} failed: {description}")
+}
@@ -20,6 +20,7 @@ futures.workspace = true
 anyhow.workspace = true
 webbrowser.workspace = true
 serde_json.workspace = true
+log.workspace = true

 mime_guess = "2.0.4"

@@ -28,7 +29,24 @@ sha2.workspace = true
 data-encoding.workspace = true

 [target.'cfg(target_arch = "wasm32")'.dependencies]
+js-sys = "0.3"
+nostr-browser-signer.workspace = true
 nostr-memory.workspace = true
+nostr-sqlite.workspace = true
+wasm-bindgen = "0.2"
+wasm-bindgen-futures = "0.4"
+web-sys = { version = "0.3", features = [
+    "Blob",
+    "BlobPropertyBag",
+    "File",
+    "FileList",
+    "HtmlAnchorElement",
+    "HtmlInputElement",
+    "Url",
+    "Window",
+] }
+sqlite-wasm-rs = "0.5"
+sqlite-wasm-vfs = "0.2"

 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 browser-signer-proxy = { path = "../browser-signer-proxy" }
@@ -1,17 +1,10 @@
-use std::path::PathBuf;
-
 use anyhow::{Error, anyhow};
 use gpui::AsyncApp;
 #[cfg(not(target_arch = "wasm32"))]
 use gpui_tokio::Tokio;
-#[cfg(not(target_arch = "wasm32"))]
-use mime_guess::from_path;
 use nostr_blossom::prelude::*;
 use nostr_sdk::prelude::*;

-#[cfg(not(target_arch = "wasm32"))]
-use crate::file::sha256_hex;
-
 /// Upload a blob to a blossom server and return its URL
 #[cfg(not(target_arch = "wasm32"))]
 pub(crate) async fn upload_blob(
@@ -41,16 +34,26 @@ pub(crate) async fn upload_blob(
    .map_err(|e| anyhow!("Upload error: {e}"))?
 }

-#[cfg(not(target_arch = "wasm32"))]
-pub async fn upload(server: Url, path: PathBuf, cx: &AsyncApp) -> Result<Url, Error> {
-    let content_type = from_path(&path).first_or_octet_stream().to_string();
-    let data = smol::fs::read(&path).await?;
-    let sha256 = sha256_hex(&data);
-
-    upload_blob(&server, data, &content_type, &sha256, cx).await
-}
-
+/// Upload a blob to a blossom server and return its URL.
 #[cfg(target_arch = "wasm32")]
-pub async fn upload(_server: Url, _path: PathBuf, _cx: &AsyncApp) -> Result<Url, Error> {
-    Err(anyhow!("File upload not supported on web"))
+pub(crate) async fn upload_blob(
+    server: &Url,
+    data: Vec<u8>,
+    content_type: &str,
+    sha256: &str,
+    _cx: &AsyncApp,
+) -> Result<Url, Error> {
+    let client = BlossomClient::new(server.clone());
+    let keys = Keys::generate();
+    let base = server.clone();
+    let hash = sha256.to_string();
+
+    match client
+        .upload_blob(data, Some(content_type.to_string()), None, Some(&keys))
+        .await
+    {
+        Ok(blob) => Ok(blob.url),
+        Err(e) if e.to_string().contains("201 Created") => Ok(base.join(&hash)?),
+        Err(e) => Err(anyhow!(e.to_string())),
+    }
 }
@@ -0,0 +1,105 @@
+use anyhow::Result;
+#[cfg(target_arch = "wasm32")]
+use common::web_store;
+use gpui::{App, AppContext as _, Task};
+
+use crate::USER_KEYRING;
+
+/// The storage key for the log of handled NIP-4e key-sync request ids
+const PROCESSED_REQUESTS_KEY: &str = "coop/nip4e/processed-requests";
+
+/// Read the stored credential as `(username, secret)`
+#[allow(clippy::type_complexity)]
+pub(crate) fn read(cx: &App) -> Task<Result<Option<(String, Vec<u8>)>>> {
+    #[cfg(not(target_arch = "wasm32"))]
+    return cx.read_credentials(USER_KEYRING);
+
+    #[cfg(target_arch = "wasm32")]
+    {
+        let _ = cx;
+        Task::ready(
+            web_store::get(USER_KEYRING)
+                .map(|stored| stored.map(|content| (String::new(), content.into_bytes()))),
+        )
+    }
+}
+
+/// Write the stored credential
+pub(crate) fn write(cx: &App, username: &str, secret: &[u8]) -> Task<Result<()>> {
+    #[cfg(not(target_arch = "wasm32"))]
+    return cx.write_credentials(USER_KEYRING, username, secret);
+
+    #[cfg(target_arch = "wasm32")]
+    {
+        let _ = (cx, username);
+        let content = match std::str::from_utf8(secret) {
+            Ok(content) => content,
+            Err(e) => return Task::ready(Err(anyhow::anyhow!("credential is not UTF-8: {e}"))),
+        };
+
+        Task::ready(web_store::set(USER_KEYRING, content))
+    }
+}
+
+/// Delete the stored credential
+pub(crate) fn delete(cx: &App) -> Task<Result<()>> {
+    #[cfg(not(target_arch = "wasm32"))]
+    return cx.delete_credentials(USER_KEYRING);
+
+    #[cfg(target_arch = "wasm32")]
+    {
+        let _ = cx;
+        Task::ready(web_store::remove(USER_KEYRING))
+    }
+}
+
+/// Read named bytes from the platform keyring,
+/// falling back to browser storage on web where no keyring exists
+fn read_named(cx: &App, key: &str) -> Task<Result<Option<Vec<u8>>>> {
+    #[cfg(not(target_arch = "wasm32"))]
+    {
+        let key = key.to_owned();
+        let read = cx.read_credentials(&key);
+        cx.background_spawn(async move { Ok(read.await?.map(|(_, secret)| secret)) })
+    }
+
+    #[cfg(target_arch = "wasm32")]
+    {
+        let _ = cx;
+        let stored = web_store::get(key).map(|content| content.map(|s| s.into_bytes()));
+        Task::ready(stored)
+    }
+}
+
+/// Write named bytes to the platform keyring,
+/// falling back to browser storage on web where no keyring exists
+fn write_named(cx: &App, key: &str, secret: &[u8]) -> Task<Result<()>> {
+    #[cfg(not(target_arch = "wasm32"))]
+    {
+        let key = key.to_owned();
+        let secret = secret.to_vec();
+        let write = cx.write_credentials(&key, "", &secret);
+        cx.background_spawn(write)
+    }
+
+    #[cfg(target_arch = "wasm32")]
+    {
+        let _ = cx;
+        let content = match std::str::from_utf8(secret) {
+            Ok(content) => content,
+            Err(e) => return Task::ready(Err(anyhow::anyhow!("secret is not UTF-8: {e}"))),
+        };
+
+        Task::ready(web_store::set(key, content))
+    }
+}
+
+/// Read the log of handled key-sync request ids, as concatenated hex ids
+pub fn read_processed_requests(cx: &App) -> Task<Result<Option<Vec<u8>>>> {
+    read_named(cx, PROCESSED_REQUESTS_KEY)
+}
+
+/// Persist the log of handled key-sync request ids, as concatenated hex ids
+pub fn write_processed_requests(cx: &App, ids: &[u8]) -> Task<Result<()>> {
+    write_named(cx, PROCESSED_REQUESTS_KEY, ids)
+}
@@ -7,8 +7,10 @@ use aes_gcm::{Aes256Gcm, AesGcm, Nonce};
 use anyhow::{Error, anyhow, bail};
 use data_encoding::HEXLOWER;
 use futures::AsyncReadExt;
+#[cfg(not(target_arch = "wasm32"))]
+use gpui::PathPromptOptions;
 use gpui::http_client::AsyncBody;
-use gpui::{AsyncApp, SharedString};
+use gpui::{AppContext as _, AsyncApp, SharedString, SharedUri, Task};
 #[cfg(not(target_arch = "wasm32"))]
 use mime_guess::from_path;
 use nostr::nips::nip94::Sha256Hash;
@@ -115,6 +117,56 @@ impl FileAttachment {
    }
 }

+/// A file the user picked, read into memory.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct PickedFile {
+    pub name: String,
+    pub mime: String,
+    pub data: Vec<u8>,
+    pub local: LocalFile,
+}
+
+/// A handle to a file stored on the user's device
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum LocalFile {
+    /// A path on disk (desktop)
+    Path(PathBuf),
+    /// An in-memory blob URL (web)
+    Url(String),
+}
+
+impl LocalFile {
+    /// The source an `img` element can render
+    pub fn image_source(&self) -> gpui::ImageSource {
+        match self {
+            LocalFile::Path(path) => path.clone().into(),
+            LocalFile::Url(url) => SharedUri::from(url.clone()).into(),
+        }
+    }
+
+    /// The URL the platform opener understands
+    pub fn open_url(&self) -> String {
+        match self {
+            LocalFile::Path(path) => format!("file://{}", path.display()),
+            LocalFile::Url(url) => url.clone(),
+        }
+    }
+
+    /// Open the file with the platform handler
+    pub fn open(&self, cx: &gpui::App) -> Result<(), Error> {
+        match self {
+            LocalFile::Path(_) => {
+                cx.open_url(&self.open_url());
+                Ok(())
+            }
+            #[cfg(target_arch = "wasm32")]
+            LocalFile::Url(url) => crate::web_file::open_url(url),
+            #[cfg(not(target_arch = "wasm32"))]
+            LocalFile::Url(_) => Ok(()),
+        }
+    }
+}
+
 pub(crate) fn encrypt(data: &[u8]) -> Result<EncryptedFile, Error> {
    let key = Aes256Gcm::generate_key(OsRng);
    let nonce = AesGcm::<Aes256, U16>::generate_nonce(OsRng);
@@ -165,21 +217,63 @@ pub(crate) fn sha256_hex(data: &[u8]) -> String {
    Sha256Hash::from_byte_array(hash).to_hex()
 }

-#[cfg(not(target_arch = "wasm32"))]
-pub async fn upload_encrypted(
+/// Ask the user for a single file and read it into memory
+pub fn pick_file(cx: &gpui::App) -> Task<Result<Option<PickedFile>, Error>> {
+    #[cfg(not(target_arch = "wasm32"))]
+    {
+        let dialog = cx.prompt_for_paths(PathPromptOptions {
+            files: true,
+            directories: false,
+            multiple: false,
+            prompt: None,
+        });
+
+        cx.background_spawn(async move {
+            let Some(path) = dialog.await?? else {
+                return Ok(None);
+            };
+            let path = path.into_iter().next().ok_or_else(|| anyhow!("No file"))?;
+
+            let mime = from_path(&path).first_or_octet_stream().to_string();
+            let name = path
+                .file_name()
+                .map(|name| name.to_string_lossy().into_owned())
+                .unwrap_or_else(|| path.display().to_string());
+            let data = smol::fs::read(&path).await?;
+
+            Ok(Some(PickedFile {
+                name,
+                mime,
+                data,
+                local: LocalFile::Path(path),
+            }))
+        })
+    }
+
+    #[cfg(target_arch = "wasm32")]
+    {
+        let _ = cx;
+        cx.background_spawn(async move { crate::web_file::pick_file().await })
+    }
+}
+
+/// Upload a file unencrypted and return its URL
+pub async fn upload_file(server: Url, file: PickedFile, cx: &AsyncApp) -> Result<Url, Error> {
+    let PickedFile { mime, data, .. } = file;
+    let sha256 = sha256_hex(&data);
+
+    crate::blossom::upload_blob(&server, data, &mime, &sha256, cx).await
+}
+
+/// Upload a file encrypted as an opaque blob, returning the attachment metadata
+pub async fn upload_encrypted_file(
    server: Url,
-    path: PathBuf,
+    file: PickedFile,
    cx: &AsyncApp,
 ) -> Result<FileAttachment, Error> {
-    let mime = from_path(&path).first_or_octet_stream().to_string();
-    let name = path
-        .file_name()
-        .map(|name| name.to_string_lossy().into_owned());
-    let data = smol::fs::read(&path).await?;
-
-    let encrypted = encrypt(&data)?;
+    let encrypted = encrypt(&file.data)?;
    let sha256 = sha256_hex(&encrypted.data);
-    let original_sha256 = sha256_hex(&data);
+    let original_sha256 = sha256_hex(&file.data);
    let size = encrypted.data.len() as u64;
    let base_url = server.to_string();

@@ -207,26 +301,17 @@ pub async fn upload_encrypted(

    Ok(FileAttachment {
        url,
-        mime,
+        mime: file.mime,
        key: encrypted.key,
        nonce: encrypted.nonce,
        sha256: Some(sha256),
        original_sha256: Some(original_sha256),
        size: Some(size),
        dim: None,
-        name,
+        name: Some(file.name),
    })
 }

-#[cfg(target_arch = "wasm32")]
-pub async fn upload_encrypted(
-    _server: Url,
-    _path: PathBuf,
-    _cx: &AsyncApp,
-) -> Result<FileAttachment, Error> {
-    Err(anyhow!("File upload not supported on web"))
-}
-
 pub(crate) async fn download_and_decrypt(
    url: &Url,
    key: &str,
@@ -261,33 +346,49 @@ pub(crate) async fn download_and_decrypt(
    decrypt(&data, key, nonce)
 }

-/// Download and decrypt a file attachment into a temporary file.
-///
-/// The same attachment always maps to the same path, so callers can render the
-/// result directly (e.g. with `img`) without downloading it more than once.
-#[cfg(not(target_arch = "wasm32"))]
-pub async fn download_and_decrypt_to_file(
-    file: &FileAttachment,
-    cx: &AsyncApp,
-) -> Result<PathBuf, Error> {
-    let name = file
-        .sha256
-        .clone()
-        .unwrap_or_else(|| sha256_hex(file.url.as_str().as_bytes()));
+/// A downloaded and decrypted attachment on the user's device
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct DownloadedFile {
+    pub local: LocalFile,
+    pub mime: String,
+    pub name: String,
+    /// The decrypted bytes, kept so the web can offer them as a download
+    #[cfg(target_arch = "wasm32")]
+    pub(crate) data: Vec<u8>,
+}

-    let extension = mime_guess::get_mime_extensions_str(&file.mime)
-        .and_then(|extensions| extensions.first())
-        .copied()
-        .unwrap_or("bin");
-
-    let path = std::env::temp_dir()
-        .join("coop-files")
-        .join(format!("{name}.{extension}"));
-
-    if smol::fs::metadata(&path).await.is_ok() {
-        return Ok(path);
+impl DownloadedFile {
+    pub fn open(&self, cx: &gpui::App) -> Result<(), Error> {
+        match &self.local {
+            LocalFile::Path(path) => {
+                cx.open_with_system(path);
+                Ok(())
+            }
+            #[cfg(target_arch = "wasm32")]
+            LocalFile::Url(url) => {
+                if self.mime.starts_with("image/") {
+                    crate::web_file::open_url(url)
+                } else {
+                    crate::web_file::download(&self.name, &self.mime, &self.data)
+                }
+            }
+            #[cfg(not(target_arch = "wasm32"))]
+            LocalFile::Url(_) => Ok(()),
+        }
    }

+    /// Save the file to the user's downloads (web)
+    #[cfg(target_arch = "wasm32")]
+    pub fn save(&self) -> Result<(), Error> {
+        crate::web_file::download(&self.name, &self.mime, &self.data)
+    }
+}
+
+/// Download and decrypt a file attachment to the user's device
+pub async fn download_and_decrypt_file(
+    file: &FileAttachment,
+    cx: &AsyncApp,
+) -> Result<DownloadedFile, Error> {
    let data = download_and_decrypt(
        &file.url,
        &file.key,
@@ -297,25 +398,66 @@ pub async fn download_and_decrypt_to_file(
    )
    .await?;

-    let Some(parent) = path.parent() else {
-        bail!("Invalid file path");
-    };
-    smol::fs::create_dir_all(parent).await?;
+    let name = file
+        .name
+        .clone()
+        .unwrap_or_else(|| fallback_name(&file.url));

-    // Write under a temporary name first, so an interrupted download is never reused
-    let partial = path.with_extension("download");
-    smol::fs::write(&partial, data).await?;
-    smol::fs::rename(&partial, &path).await?;
+    let local = store_file(&name, &file.mime, &data).await?;

-    Ok(path)
+    Ok(DownloadedFile {
+        local,
+        mime: file.mime.clone(),
+        name,
+        #[cfg(target_arch = "wasm32")]
+        data,
+    })
 }

-#[cfg(target_arch = "wasm32")]
-pub async fn download_and_decrypt_to_file(
-    _file: &FileAttachment,
-    _cx: &AsyncApp,
-) -> Result<PathBuf, Error> {
-    Err(anyhow!("File download not supported on web"))
+/// Persist decrypted bytes somewhere the platform can render or open them
+async fn store_file(name: &str, mime: &str, data: &[u8]) -> Result<LocalFile, Error> {
+    #[cfg(not(target_arch = "wasm32"))]
+    {
+        let digest = sha256_hex(name.as_bytes());
+        let extension = mime_guess::get_mime_extensions_str(mime)
+            .and_then(|extensions| extensions.first())
+            .copied()
+            .unwrap_or("bin");
+
+        let path = std::env::temp_dir()
+            .join("coop-files")
+            .join(format!("{digest}.{extension}"));
+
+        if smol::fs::metadata(&path).await.is_err() {
+            let Some(parent) = path.parent() else {
+                bail!("Invalid file path");
+            };
+            smol::fs::create_dir_all(parent).await?;
+
+            // Write under a temporary name first, so an interrupted download is never reused
+            let partial = path.with_extension("download");
+            smol::fs::write(&partial, data).await?;
+            smol::fs::rename(&partial, &path).await?;
+        }
+
+        Ok(LocalFile::Path(path))
+    }
+
+    #[cfg(target_arch = "wasm32")]
+    {
+        let _ = name;
+        let url = crate::web_file::blob_url(mime, data)?;
+        Ok(LocalFile::Url(url))
+    }
+}
+
+/// A file name derived from the attachment URL's last path segment
+fn fallback_name(url: &Url) -> String {
+    url.path()
+        .rsplit('/')
+        .find(|segment| !segment.is_empty())
+        .unwrap_or("attachment")
+        .to_string()
 }

 fn tag_value<'a>(tags: &'a Tags, name: &str) -> Option<&'a str> {
@@ -4,26 +4,33 @@ use std::sync::Arc;
 use anyhow::{Error, anyhow};
 #[cfg(not(target_arch = "wasm32"))]
 use browser_signer_proxy::prelude::*;
+#[cfg(not(target_arch = "wasm32"))]
 use common::config_dir;
 use gpui::{App, AppContext, Context, Entity, EventEmitter, Global, Task, TaskExt};
+#[cfg(not(target_arch = "wasm32"))]
 use gpui_tokio::Tokio;
 use instant::Duration;
+#[cfg(target_arch = "wasm32")]
+use nostr_browser_signer::BrowserSigner;
 use nostr_connect::prelude::*;
 use nostr_gossip_memory::prelude::*;
 #[cfg(not(target_arch = "wasm32"))]
 use nostr_lmdb::prelude::*;
-#[cfg(target_arch = "wasm32")]
-use nostr_memory::prelude::*;
 use nostr_sdk::prelude::*;

 mod blossom;
 mod constants;
+pub mod credentials;
 mod file;
 mod nip05;
 mod nip4e;
 mod signer;

-pub use blossom::*;
+#[cfg(target_arch = "wasm32")]
+pub mod web_database;
+#[cfg(target_arch = "wasm32")]
+pub mod web_file;
+
 pub use constants::*;
 pub use file::*;
 pub use nip4e::*;
@@ -107,7 +114,6 @@ impl NostrRegistry {
        let signer = UniversalSigner::new(Keys::generate());
        let authenticator = SignerAuthenticator::new(signer.clone());

-        // Construct the nostr lmdb instance
        #[cfg(not(target_arch = "wasm32"))]
        let database = cx.foreground_executor().block_on(async move {
            NostrLmdb::open(config_dir().join("nostr"))
@@ -116,7 +122,7 @@ impl NostrRegistry {
        });

        #[cfg(target_arch = "wasm32")]
-        let database = MemoryDatabase::unbounded();
+        let database = web_database::take();

        // Construct the nostr client
        let client = ClientBuilder::default()
@@ -137,9 +143,7 @@ impl NostrRegistry {
            let _ = entity.update(cx, |this, cx| {
                this.connect_bootstrap_relays(cx);

-                if cfg!(target_arch = "wasm32") {
-                    cx.emit(StateEvent::NoSigner);
-                } else if let Some(secret) = cli_key {
+                if let Some(secret) = cli_key {
                    // Use CLI-provided key -- same path as restore_session
                    let keys = Keys::new(secret);
                    this.set_signer(keys, cx);
@@ -241,7 +245,7 @@ impl NostrRegistry {

    /// Restore the signer from the stored credential
    fn restore_session(&mut self, cx: &mut Context<Self>) {
-        let user_keyring = cx.read_credentials(USER_KEYRING);
+        let user_keyring = credentials::read(cx);

        self.tasks.push(cx.spawn(async move |this, cx| {
            let result = async {
@@ -278,6 +282,11 @@ impl NostrRegistry {
                            this.update(cx, |this, cx| {
                                this.connect_proxy(cx);
                            })?;
+                        } else if content == "extension" {
+                            #[cfg(target_arch = "wasm32")]
+                            this.update(cx, |this, cx| {
+                                this.connect_extension(cx);
+                            })?;
                        } else {
                            this.update(cx, |_, cx| {
                                cx.emit(StateEvent::NoSigner);
@@ -313,7 +322,7 @@ impl NostrRegistry {
        cx: &mut Context<Self>,
    ) -> Task<Result<PublicKey, Error>> {
        let password = password.to_owned();
-        let user_keyring = cx.read_credentials(USER_KEYRING);
+        let user_keyring = credentials::read(cx);

        cx.spawn(async move |this, cx| {
            let content = user_keyring
@@ -372,9 +381,8 @@ impl NostrRegistry {
            let (keys, ncryptsec) = job.await?;
            let public_key = keys.public_key();

-            let write = cx.update(|cx| {
-                cx.write_credentials(USER_KEYRING, &public_key.to_hex(), ncryptsec.as_bytes())
-            });
+            let write =
+                cx.update(|cx| credentials::write(cx, &public_key.to_hex(), ncryptsec.as_bytes()));
            write.await?;

            this.update(cx, |this, cx| {
@@ -411,9 +419,8 @@ impl NostrRegistry {
            let keys = decrypt_task.await?;
            let public_key = keys.public_key();

-            let write = cx.update(|cx| {
-                cx.write_credentials(USER_KEYRING, &public_key.to_hex(), stored.as_bytes())
-            });
+            let write =
+                cx.update(|cx| credentials::write(cx, &public_key.to_hex(), stored.as_bytes()));
            write.await?;

            this.update(cx, |this, cx| {
@@ -439,7 +446,7 @@ impl NostrRegistry {

        let keys = Keys::generate();
        let credential = with_master_key(&uri_string, &keys);
-        let write = cx.write_credentials(USER_KEYRING, "bunker", credential.as_bytes());
+        let write = credentials::write(cx, "bunker", credential.as_bytes());

        cx.spawn(async move |this, cx| {
            let signer = NostrConnect::builder(connect_uri, keys)
@@ -463,12 +470,50 @@ impl NostrRegistry {
        self.current_user = None;
        self.passphrase_required = false;

-        cx.delete_credentials(USER_KEYRING).detach_and_log_err(cx);
+        credentials::delete(cx).detach_and_log_err(cx);
        cx.emit(StateEvent::SignerChanged);
        cx.emit(StateEvent::NoSigner);
        cx.notify();
    }

+    /// Connect the browser extension signer (NIP-07).
+    #[cfg(target_arch = "wasm32")]
+    pub fn connect_extension(&mut self, cx: &mut Context<Self>) {
+        let signer = match BrowserSigner::new() {
+            Ok(signer) => signer,
+            Err(e) => {
+                cx.emit(StateEvent::error(format!("No Nostr extension found: {e}.")));
+                cx.emit(StateEvent::NoSigner);
+                return;
+            }
+        };
+
+        self.tasks.push(cx.spawn(async move |this, cx| {
+            match signer.get_public_key_async().await {
+                Ok(public_key) => {
+                    this.update(cx, |this, cx| {
+                        credentials::write(cx, "extension", b"extension").detach_and_log_err(cx);
+                        this.signer.swap_inner(signer);
+                        this.current_user = Some(public_key);
+                        this.passphrase_required = false;
+
+                        cx.emit(StateEvent::SignerChanged);
+                        cx.notify();
+                    })?;
+                }
+                Err(e) => {
+                    this.update(cx, |_, cx| {
+                        credentials::delete(cx).detach_and_log_err(cx);
+                        cx.emit(StateEvent::error(e.to_string()));
+                        cx.emit(StateEvent::NoSigner);
+                    })?;
+                }
+            };
+
+            Ok(())
+        }));
+    }
+
    /// Start the browser proxy
    #[cfg(not(target_arch = "wasm32"))]
    pub fn connect_proxy(&mut self, cx: &mut Context<Self>) {
@@ -5,6 +5,10 @@ use nostr_sdk::prelude::*;
 pub struct Announcement {
    /// The public key of the device that created this announcement.
    public_key: PublicKey,
+    /// The id of the announcement event, for ordering
+    event_id: EventId,
+    /// The creation time of the announcement event
+    created_at: Timestamp,
 }

 impl Announcement {
@@ -16,11 +20,20 @@ impl Announcement {
            .and_then(|tag| tag.content())
            .and_then(|c| PublicKey::parse(c).ok())?;

-        Some(Self { public_key })
+        Some(Self {
+            public_key,
+            event_id: event.id,
+            created_at: event.created_at,
+        })
    }

    /// Returns the public key of the device that created this announcement.
    pub fn public_key(&self) -> PublicKey {
        self.public_key
    }
+
+    pub fn is_newer_than(&self, other: &Self) -> bool {
+        self.created_at > other.created_at
+            || (self.created_at == other.created_at && self.event_id < other.event_id)
+    }
 }
@@ -188,7 +188,13 @@ impl AuthUrlHandler for CoopAuthUrlHandler {
        auth_url: Url,
    ) -> Pin<Box<dyn Future<Output = Result<(), nostr_connect::error::Error>> + Send + '_>> {
        Box::pin(async move {
+            #[cfg(not(target_arch = "wasm32"))]
            webbrowser::open(auth_url.as_str()).map_err(nostr_connect::error::Error::other)?;
+
+            #[cfg(target_arch = "wasm32")]
+            crate::web_file::open_url(auth_url.as_str())
+                .map_err(nostr_connect::error::Error::other)?;
+
            Ok(())
        })
    }
@@ -0,0 +1,62 @@
+use std::cell::RefCell;
+use std::sync::Arc;
+
+use nostr_memory::prelude::*;
+use nostr_sqlite::prelude::NostrSqlite;
+use sqlite_wasm_rs::WasmOsCallback;
+use sqlite_wasm_vfs::relaxed_idb;
+
+const DATABASE_PATH: &str = "coop.sqlite3";
+const VFS_NAME: &str = "coop-relaxed-idb";
+
+thread_local! {
+    static DATABASE: RefCell<Option<NostrSqlite>> = const { RefCell::new(None) };
+}
+
+/// Install the IndexedDB storage backend and open the database.
+pub async fn open() {
+    match open_persistent().await {
+        Some(database) => DATABASE.with(|slot| *slot.borrow_mut() = Some(database)),
+        None => log::error!("Falling back to the in-memory nostr database"),
+    }
+}
+
+/// Hand the opened database to the client constructor
+pub(crate) fn take() -> Arc<dyn NostrDatabase> {
+    let database = DATABASE.with(|slot| slot.borrow_mut().take());
+
+    match database {
+        Some(database) => Arc::new(database),
+        None => {
+            log::error!("Persistent web database was not opened, falling back to memory");
+            Arc::new(MemoryDatabase::unbounded())
+        }
+    }
+}
+
+/// Open the database on IndexedDB storage, or `None` when unavailable
+async fn open_persistent() -> Option<NostrSqlite> {
+    let options = relaxed_idb::RelaxedIdbCfgBuilder::new()
+        .vfs_name(VFS_NAME)
+        .build();
+
+    if let Err(e) = relaxed_idb::install::<WasmOsCallback>(&options, true).await {
+        log::warn!("IndexedDB storage unavailable: {e:?}");
+        return None;
+    }
+
+    match NostrSqlite::builder()
+        .persistent_with_vfs(DATABASE_PATH, VFS_NAME)
+        .build()
+        .await
+    {
+        Ok(database) => {
+            log::info!("Nostr database opened on IndexedDB storage");
+            Some(database)
+        }
+        Err(e) => {
+            log::error!("Failed to open the nostr database on IndexedDB: {e:?}");
+            None
+        }
+    }
+}
@@ -0,0 +1,198 @@
+//! Browser file interoperability: a persistent hidden `<input type="file">`
+//! picker, blob URLs for rendering, and anchor-based downloads.
+
+use std::cell::RefCell;
+
+use anyhow::{Error, anyhow};
+use flume::Sender;
+use wasm_bindgen::JsCast;
+use wasm_bindgen::closure::Closure;
+use web_sys::{File, HtmlAnchorElement, HtmlInputElement, Url as DomUrl, window as js_window};
+
+use crate::file::PickedFile;
+
+type PickResult = Result<Option<PickedFile>, Error>;
+
+thread_local! {
+    /// The picker input lives for the whole page so its change closure does
+    /// not have to be leaked or re-registered on every pick
+    static PICKER: RefCell<Option<Picker>> = const { RefCell::new(None) };
+    /// The sender the active pick delivers through
+    static PENDING: RefCell<Option<Sender<PickResult>>> = const { RefCell::new(None) };
+}
+
+struct Picker {
+    input: HtmlInputElement,
+    /// Keep the change handler alive for the life of the page
+    _on_change: Closure<dyn FnMut()>,
+}
+
+/// Ask the user for a single file and read its bytes
+pub async fn pick_file() -> PickResult {
+    let (sender, receiver) = flume::bounded(1);
+
+    PICKER.with(|picker| -> Result<(), Error> {
+        let mut picker = picker.borrow_mut();
+        if picker.is_none() {
+            *picker = Some(init_picker()?);
+        }
+        let picker = picker.as_ref().expect("picker just initialized");
+
+        PENDING.with(|pending| *pending.borrow_mut() = Some(sender));
+        picker.input.click();
+
+        Ok(())
+    })?;
+
+    receiver
+        .recv_async()
+        .await
+        .map_err(|_| anyhow!("File picker closed"))?
+}
+
+fn init_picker() -> Result<Picker, Error> {
+    let document = js_window()
+        .ok_or_else(|| anyhow!("no browser window"))?
+        .document()
+        .ok_or_else(|| anyhow!("no browser document"))?;
+
+    let input = document
+        .create_element("input")
+        .map_err(|e| anyhow!("failed to create file input: {e:?}"))?
+        .dyn_into::<HtmlInputElement>()
+        .map_err(|_| anyhow!("created element is not an input"))?;
+
+    input.set_type("file");
+    input.style().set_property("display", "none").ok();
+
+    let on_change = Closure::wrap(Box::new(move || {
+        let Some(sender) = PENDING.with(|pending| pending.borrow_mut().take()) else {
+            return;
+        };
+
+        wasm_bindgen_futures::spawn_local(async move {
+            sender.send_async(read_selected_file().await).await.ok();
+        });
+    }) as Box<dyn FnMut()>);
+
+    input.set_onchange(Some(on_change.as_ref().unchecked_ref()));
+
+    let body = document.body().ok_or_else(|| anyhow!("no browser body"))?;
+    body.append_child(&input)
+        .map_err(|e| anyhow!("failed to mount file input: {e:?}"))?;
+
+    Ok(Picker {
+        input,
+        _on_change: on_change,
+    })
+}
+
+/// Read the first file of the picker input, if one was chosen
+async fn read_selected_file() -> PickResult {
+    let picker = PICKER
+        .with(|picker| picker.borrow().as_ref().map(|picker| picker.input.clone()))
+        .ok_or_else(|| anyhow!("file picker is not initialized"))?;
+
+    let Some(file) = picker.files().and_then(|files| files.get(0)) else {
+        // The dialog was dismissed without choosing a file
+        return Ok(None);
+    };
+
+    let mime = non_empty(file.type_());
+    let data = read_file_bytes(&file).await?;
+    let local = crate::file::LocalFile::Url(blob_url(&mime, &data)?);
+
+    Ok(Some(PickedFile {
+        name: file.name(),
+        mime,
+        data,
+        local,
+    }))
+}
+
+/// Read a browser `File` into memory
+async fn read_file_bytes(file: &File) -> Result<Vec<u8>, Error> {
+    let promise = file.array_buffer();
+    let buffer = wasm_bindgen_futures::JsFuture::from(promise)
+        .await
+        .map_err(|e| anyhow!("failed to read file: {e:?}"))?;
+
+    Ok(js_sys::Uint8Array::new(&buffer).to_vec())
+}
+
+/// Create an object URL for bytes, so images and downloads render from memory
+pub fn blob_url(mime: &str, data: &[u8]) -> Result<String, Error> {
+    let array = js_sys::Uint8Array::from(data);
+    let parts = js_sys::Array::new();
+    parts.push(&array);
+
+    let bag = web_sys::BlobPropertyBag::new();
+    bag.set_type(mime);
+
+    let blob = web_sys::Blob::new_with_u8_array_sequence_and_options(&parts.into(), &bag)
+        .map_err(|e| anyhow!("failed to create blob: {e:?}"))?;
+
+    DomUrl::create_object_url_with_blob(&blob).map_err(|e| anyhow!("failed to create url: {e:?}"))
+}
+
+/// Offer bytes to the user as a browser download
+pub fn download(name: &str, mime: &str, data: &[u8]) -> Result<(), Error> {
+    let window = js_window().ok_or_else(|| anyhow!("no browser window"))?;
+    let document = window
+        .document()
+        .ok_or_else(|| anyhow!("no browser document"))?;
+
+    let url = blob_url(mime, data)?;
+
+    let anchor: HtmlAnchorElement = document
+        .create_element("a")
+        .map_err(|e| anyhow!("failed to create download link: {e:?}"))?
+        .dyn_into()
+        .map_err(|_| anyhow!("created element is not an anchor"))?;
+    anchor.set_href(&url);
+    anchor.set_download(name);
+    anchor.style().set_property("display", "none").ok();
+
+    let body = document.body().ok_or_else(|| anyhow!("no browser body"))?;
+    body.append_child(&anchor)
+        .map_err(|e| anyhow!("failed to mount download link: {e:?}"))?;
+    anchor.click();
+    body.remove_child(&anchor)
+        .map_err(|e| anyhow!("failed to remove download link: {e:?}"))?;
+
+    // Keep the blob alive briefly so the download is not cancelled
+    let callback = Closure::wrap(Box::new(move || {
+        DomUrl::revoke_object_url(&url).ok();
+    }) as Box<dyn FnMut()>);
+    window
+        .set_timeout_with_callback_and_timeout_and_arguments_0(
+            callback.as_ref().unchecked_ref(),
+            10_000,
+        )
+        .map_err(|e| anyhow!("failed to schedule cleanup: {e:?}"))?;
+    // The closure only runs once, after which it can be released
+    callback.forget();
+
+    Ok(())
+}
+
+/// Open a URL in a new browser tab
+pub fn open_url(url: &str) -> Result<(), Error> {
+    js_window()
+        .ok_or_else(|| anyhow!("no browser window"))?
+        .open_with_url_and_target(url, "_blank")
+        .map_err(|e| anyhow!("failed to open url: {e:?}"))?
+        .ok_or_else(|| anyhow!("the browser blocked opening the url"))?;
+
+    Ok(())
+}
+
+fn non_empty(value: impl Into<String>) -> String {
+    let value: String = value.into();
+
+    if value.is_empty() {
+        "application/octet-stream".to_string()
+    } else {
+        value
+    }
+}
@@ -6,9 +6,12 @@ publish.workspace = true

 [dependencies]

+common = { path = "../common" }
+person = { path = "../person" }
 gpui.workspace = true
 gpui-base.workspace = true
 gpui-kit.workspace = true
+nostr-sdk.workspace = true
 web-time = "1.1"
 smallvec.workspace = true
 log.workspace = true
@@ -167,11 +167,16 @@ impl RenderOnce for PixelAvatar {
            }
        }

+        // Pad the grid so the art stays clear of the circular edge, keeping the
+        // inset look of signed's rounded-square frame.
+        let inset = self.side / (GRID_SIZE as f32 * 2.);
+
        div()
            .grid()
            .grid_cols(GRID_SIZE as u16)
            .grid_rows(GRID_SIZE as u16)
            .size(self.side)
+            .p(inset)
            .flex_shrink_0()
            .rounded_full()
            .overflow_hidden()
@@ -0,0 +1,62 @@
+use gpui::{App, Div, IntoElement, ParentElement, SharedString, Styled, div};
+use gpui_kit::base::StyledExt as _;
+use gpui_kit::component::{ActiveTheme, h_flex, v_flex};
+
+/// A settings row: the label and description on the left, the control on the right.
+pub fn settings_row(
+    label: impl Into<SharedString>,
+    description: impl Into<SharedString>,
+    control: impl IntoElement,
+    cx: &App,
+) -> Div {
+    h_flex()
+        .w_full()
+        .gap_4()
+        .items_center()
+        .justify_between()
+        .child(
+            v_flex()
+                .flex_1()
+                .min_w_0()
+                .child(div().text_sm().font_semibold().child(label.into()))
+                .child(
+                    div()
+                        .text_xs()
+                        .text_color(cx.theme().muted_foreground)
+                        .child(description.into()),
+                ),
+        )
+        .child(
+            h_flex()
+                .w_40()
+                .flex_shrink_0()
+                .justify_end()
+                .items_center()
+                .child(control),
+        )
+}
+
+/// A full-width settings block with the label and description in one header.
+pub fn settings_block(
+    label: impl Into<SharedString>,
+    description: impl Into<SharedString>,
+    control: impl IntoElement,
+    cx: &App,
+) -> impl IntoElement {
+    v_flex()
+        .w_full()
+        .gap_3()
+        .child(
+            v_flex()
+                .w_full()
+                .child(div().text_sm().font_semibold().child(label.into()))
+                .child(
+                    div()
+                        .text_xs()
+                        .text_color(cx.theme().muted_foreground)
+                        .truncate()
+                        .child(description.into()),
+                ),
+        )
+        .child(control)
+}
@@ -0,0 +1,73 @@
+use gpui::SharedString;
+use gpui_kit::assets::IconNamed;
+
+/// Coop icons kept from before the gpui-kit migration; absent from the kit bundle.
+#[derive(Clone, Copy)]
+pub enum IconName {
+    ArrowDownCircle,
+    ArrowLeft,
+    Book,
+    CaretDown,
+    CaretRight,
+    CheckCircle,
+    Close,
+    Compass,
+    Door,
+    Emoji,
+    Group,
+    Input,
+    Invite,
+    Link,
+    Lock,
+    Message,
+    Paperclip,
+    PaperPlaneFill,
+    Plus,
+    PlusChat,
+    Profile,
+    Relay,
+    Speech,
+    Search,
+    Settings,
+    Settings2,
+    Unlock,
+    Upload,
+    Warning,
+}
+
+impl IconNamed for IconName {
+    fn path(self) -> SharedString {
+        match self {
+            Self::ArrowDownCircle => "icons/arrow-down-circle.svg",
+            Self::ArrowLeft => "icons/arrow-left.svg",
+            Self::Book => "icons/book.svg",
+            Self::CaretDown => "icons/caret-down.svg",
+            Self::CaretRight => "icons/caret-right.svg",
+            Self::CheckCircle => "icons/check-circle.svg",
+            Self::Close => "icons/close.svg",
+            Self::Compass => "icons/compass.svg",
+            Self::Door => "icons/door.svg",
+            Self::Emoji => "icons/emoji.svg",
+            Self::Group => "icons/group.svg",
+            Self::Input => "icons/input.svg",
+            Self::Invite => "icons/invite.svg",
+            Self::Link => "icons/link.svg",
+            Self::Lock => "icons/lock.svg",
+            Self::Message => "icons/message.svg",
+            Self::Paperclip => "icons/paperclip.svg",
+            Self::PaperPlaneFill => "icons/paper-plane-fill.svg",
+            Self::Plus => "icons/plus.svg",
+            Self::PlusChat => "icons/plus-chat.svg",
+            Self::Profile => "icons/profile.svg",
+            Self::Relay => "icons/relay.svg",
+            Self::Speech => "icons/speech.svg",
+            Self::Search => "icons/search.svg",
+            Self::Settings => "icons/settings.svg",
+            Self::Settings2 => "icons/settings2.svg",
+            Self::Unlock => "icons/unlock.svg",
+            Self::Upload => "icons/upload.svg",
+            Self::Warning => "icons/warning.svg",
+        }
+        .into()
+    }
+}
@@ -1,5 +1,13 @@
 pub use avatar::Avatar;
+pub use form::*;
+pub use icon::IconName;
+pub use message::*;
+pub use text::*;
 pub use window_drag::title_bar_drag_handlers;

 pub mod avatar;
+pub mod form;
+pub mod icon;
+pub mod message;
+pub mod text;
 pub mod window_drag;
@@ -1,20 +1,28 @@
 use std::collections::BTreeMap;
+use std::rc::Rc;
+use std::time::Duration;

 use gpui::prelude::FluentBuilder as _;
 use gpui::{
-    AnyElement, App, ClickEvent, ElementId, InteractiveElement as _, IntoElement, MouseButton,
-    MouseDownEvent, ObjectFit, ParentElement as _, RenderOnce, SharedString, SharedUri,
-    StatefulInteractiveElement as _, StyleRefinement, Styled, StyledImage, Window, div, img, px,
+    Animation, AnimationExt as _, AnyElement, App, ClickEvent, Context, ElementId,
+    InteractiveElement as _, IntoElement, MouseButton, MouseDownEvent, ObjectFit,
+    ParentElement as _, RenderOnce, SharedString, SharedUri, StatefulInteractiveElement as _,
+    StyleRefinement, Styled, StyledImage, Window, div, img, px,
 };
+use gpui_kit::assets::IconName;
+use gpui_kit::component::button::{Button, ButtonVariants as _};
+use gpui_kit::component::clipboard::Clipboard;
+use gpui_kit::component::menu::{DropdownMenu as _, PopupMenu, PopupMenuItem};
 use gpui_kit::component::{
-    ActiveTheme, InteractiveElementExt as _, StyledExt as _, h_flex, v_flex,
+    ActiveTheme, Disableable, InteractiveElementExt as _, Sizable as _, StyledExt as _, h_flex,
+    v_flex,
 };
 use smallvec::SmallVec;

-pub use ui::Avatar;
-
 type MouseDownListener = Box<dyn Fn(&MouseDownEvent, &mut Window, &mut App) + 'static>;
 type ClickListener = Box<dyn Fn(&ClickEvent, &mut Window, &mut App) + 'static>;
+type SharedClickListener = Rc<dyn Fn(&ClickEvent, &mut Window, &mut App)>;
+type DropdownBuilder = Rc<dyn Fn(PopupMenu, &mut Window, &mut Context<PopupMenu>) -> PopupMenu>;

 /// Messages from the same author within this window are grouped into one run.
 pub const RUN_WINDOW_SECS: u64 = 300;
@@ -179,7 +187,7 @@ impl RenderOnce for MessageRow {
            .group("")
            .relative()
            .w_full()
-            .py_1()
+            .py_0p5()
            .when(show_author, |this| this.pt_2())
            .px_3()
            .refine_style(&style)
@@ -191,10 +199,10 @@ impl RenderOnce for MessageRow {
                        if show_author {
                            match avatar {
                                Some(avatar) => this.child(avatar),
-                                None => this.child(div().flex_shrink_0().w(px(32.))),
+                                None => this.child(div().flex_shrink_0().w(px(24.))),
                            }
                        } else {
-                            this.child(div().flex_shrink_0().w(px(32.)))
+                            this.child(div().flex_shrink_0().w(px(24.)))
                        }
                    })
                    .child(
@@ -204,6 +212,7 @@ impl RenderOnce for MessageRow {
                            .min_w_0()
                            .flex_initial()
                            .overflow_hidden()
+                            .text_size(px(15.))
                            .when(show_author, |this| {
                                this.child(
                                    h_flex()
@@ -229,7 +238,7 @@ impl RenderOnce for MessageRow {
            .when_some(on_double_click, |this, listener| {
                this.on_double_click(listener)
            })
-            .hover(|this| this.bg(cx.theme().accent))
+            .hover(|this| this.bg(cx.theme().list_hover))
            .into_any_element()
    }
 }
@@ -297,7 +306,7 @@ impl RenderOnce for ReplyPreview {
            .refine_style(&style)
            .child(div().font_semibold().child(author))
            .child(div().w_full().text_ellipsis().line_clamp(1).child(preview))
-            .hover(|this| this.bg(cx.theme().secondary))
+            .hover(|this| this.bg(cx.theme().list_hover))
            .when_some(on_click, |this, on_click| this.on_click(on_click))
            .into_any_element()
    }
@@ -554,3 +563,235 @@ impl RenderOnce for WelcomeMessage {
            )
    }
 }
+
+/// Quick reaction emojis offered in message menus.
+pub const REACTION_EMOJIS: &[&str] = &["👍", "👎", "😄", "🎉", "😕", "❤️", "🚀", "👀"];
+
+/// Quick reaction emojis shown on a hovered message's action bar.
+pub const COMPACT_REACTION_EMOJIS: &[&str] = &["👍", "❤️", "👀"];
+
+/// Fill a popup menu with reactions to a message, offering `emojis` then the custom ones.
+///
+/// `react` receives the reaction content: an emoji, or a `:shortcode:` for a custom one.
+pub fn react_menu(
+    menu: PopupMenu,
+    emojis: &[&'static str],
+    custom: &[String],
+    react: impl Fn(&str, &mut Window, &mut App) + Clone + 'static,
+) -> PopupMenu {
+    let menu = emojis.iter().fold(menu, |menu, emoji| {
+        let emoji = *emoji;
+        let react = react.clone();
+        menu.item(PopupMenuItem::new(emoji).on_click(move |_, window, cx| react(emoji, window, cx)))
+    });
+
+    if custom.is_empty() {
+        return menu;
+    }
+
+    custom.iter().fold(menu.separator(), |menu, emoji| {
+        let emoji = emoji.clone();
+        let react = react.clone();
+        menu.item(
+            PopupMenuItem::new(emoji.clone())
+                .on_click(move |_, window, cx| react(&emoji, window, cx)),
+        )
+    })
+}
+
+/// A hovered message's action bar: quick reactions, reply, copy, read aloud, and an overflow menu.
+#[derive(IntoElement)]
+pub struct MessageActions {
+    style: StyleRefinement,
+    reactions: SmallVec<[(&'static str, SharedClickListener); 4]>,
+    reply: Option<SharedClickListener>,
+    copy: Option<(ElementId, SharedString)>,
+    speech: Option<(bool, SharedClickListener)>,
+    dropdown: Option<DropdownBuilder>,
+}
+
+impl MessageActions {
+    /// Create an empty action bar.
+    pub fn new() -> Self {
+        Self {
+            style: StyleRefinement::default(),
+            reactions: SmallVec::new(),
+            reply: None,
+            copy: None,
+            speech: None,
+            dropdown: None,
+        }
+    }
+
+    /// Add a quick reaction button.
+    pub fn reaction(
+        mut self,
+        emoji: &'static str,
+        handler: impl Fn(&ClickEvent, &mut Window, &mut App) + 'static,
+    ) -> Self {
+        self.reactions.push((emoji, Rc::new(handler)));
+        self
+    }
+
+    /// Add the reply button.
+    pub fn reply(mut self, handler: impl Fn(&ClickEvent, &mut Window, &mut App) + 'static) -> Self {
+        self.reply = Some(Rc::new(handler));
+        self
+    }
+
+    /// Add the copy button for the given value.
+    /// The id must be unique per bar, the clipboard component keys its copied state on it.
+    pub fn copy(mut self, id: impl Into<ElementId>, value: impl Into<SharedString>) -> Self {
+        self.copy = Some((id.into(), value.into()));
+        self
+    }
+
+    /// Add the read-aloud button, disabled while a message is already being spoken.
+    pub fn speech(
+        mut self,
+        disabled: bool,
+        handler: impl Fn(&ClickEvent, &mut Window, &mut App) + 'static,
+    ) -> Self {
+        self.speech = Some((disabled, Rc::new(handler)));
+        self
+    }
+
+    /// Fill the bar's overflow menu.
+    pub fn dropdown(
+        mut self,
+        dropdown: impl Fn(PopupMenu, &mut Window, &mut Context<PopupMenu>) -> PopupMenu + 'static,
+    ) -> Self {
+        self.dropdown = Some(Rc::new(dropdown));
+        self
+    }
+}
+
+impl Default for MessageActions {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl Styled for MessageActions {
+    fn style(&mut self) -> &mut StyleRefinement {
+        &mut self.style
+    }
+}
+
+impl RenderOnce for MessageActions {
+    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
+        let Self {
+            style,
+            reactions,
+            reply,
+            copy,
+            speech,
+            dropdown,
+        } = self;
+
+        // The leading separator only separates reactions from the center buttons
+        let has_center =
+            !reactions.is_empty() && (reply.is_some() || copy.is_some() || speech.is_some());
+
+        h_flex()
+            .p_0p5()
+            .gap_1()
+            .invisible()
+            .absolute()
+            .right_4()
+            .top_neg_2()
+            .when(cx.theme().shadow, |this| this.shadow_sm())
+            .rounded(cx.theme().radius_lg)
+            .border_1()
+            .border_color(cx.theme().border)
+            .bg(cx.theme().background)
+            .children(reactions.into_iter().map(|(emoji, handler)| {
+                Button::new(emoji)
+                    .label(emoji)
+                    .tooltip(emoji)
+                    .small()
+                    .ghost()
+                    .on_click(move |event, window, cx| handler(event, window, cx))
+            }))
+            .when(has_center, |this| {
+                this.child(div().flex_shrink_0().h_4().w_px().bg(cx.theme().border))
+            })
+            .when_some(reply, |this, reply| {
+                this.child(
+                    Button::new("reply")
+                        .icon(IconName::Reply)
+                        .tooltip("Reply")
+                        .small()
+                        .ghost()
+                        .on_click(move |event, window, cx| reply(event, window, cx)),
+                )
+            })
+            .when_some(copy, |this, (id, value)| {
+                this.child(Clipboard::new(id).value(value).tooltip("Copy").small())
+            })
+            .when_some(speech, |this, (disabled, speech)| {
+                this.child(
+                    Button::new("speech")
+                        .icon(crate::IconName::Speech)
+                        .tooltip("Read aloud")
+                        .small()
+                        .ghost()
+                        .disabled(disabled)
+                        .on_click(move |event, window, cx| speech(event, window, cx)),
+                )
+            })
+            .when_some(dropdown, |this, dropdown| {
+                this.child(div().flex_shrink_0().h_4().w_px().bg(cx.theme().border))
+                    .child(
+                        Button::new("more")
+                            .icon(IconName::Ellipsis)
+                            .small()
+                            .ghost()
+                            .dropdown_menu(move |menu, window, cx| dropdown(menu, window, cx)),
+                    )
+            })
+            .group_hover("", |this| this.visible())
+            .refine_style(&style)
+    }
+}
+
+/// A message's text revealed word by word, paced by the estimated speech duration.
+#[derive(IntoElement)]
+pub struct RevealText {
+    text: SharedString,
+    duration: Duration,
+}
+
+impl RevealText {
+    pub fn new(text: impl Into<SharedString>, duration: Duration) -> Self {
+        Self {
+            text: text.into(),
+            duration,
+        }
+    }
+}
+
+impl RenderOnce for RevealText {
+    fn render(self, _window: &mut Window, _cx: &mut App) -> impl IntoElement {
+        let words: Vec<SharedString> = self
+            .text
+            .split_whitespace()
+            .map(SharedString::from)
+            .collect();
+        let total = words.len().max(1) as f32;
+
+        div().flex().flex_wrap().gap_x_1().with_animation(
+            "speech-reveal",
+            Animation::new(self.duration).with_max_fps(30.),
+            move |this, progress| {
+                let visible = ((progress * total).ceil() as usize).min(words.len());
+
+                this.children(words.iter().enumerate().map(|(ix, word)| {
+                    div()
+                        .when(ix >= visible, |this| this.invisible())
+                        .child(word.clone())
+                }))
+            },
+        )
+    }
+}
@@ -1,9 +1,9 @@
 use std::ops::Range;

-use chat::{Mention, nevent_refs};
+use common::nevent_refs;
 use gpui::{AnyElement, App, ElementId, Entity, IntoElement as _, SharedString, SharedUri, Window};
 use gpui_kit::component::text::TextView;
-use nostr_sdk::prelude::Url;
+use nostr_sdk::prelude::{PublicKey, Url};
 use person::Directory;

 /// A span of the source content, by byte range, that renders as `text` instead.
@@ -121,22 +121,22 @@ fn nevent_bech32(url: &str) -> Option<&str> {
    bech32.starts_with("nevent1").then_some(bech32)
 }

+/// Composes a message's rendered text: mention names, NIP-30 emojis, and nevent links.
+///
+/// `mentions` are the `(byte range, mentioned public key)` pairs found in `content`.
 pub fn rendered_text(
    content: &str,
-    mentions: &[Mention],
+    mentions: impl IntoIterator<Item = (Range<usize>, PublicKey)>,
    emojis: &[(String, Url)],
    persons: &Entity<Directory>,
    cx: &App,
 ) -> RenderedText {
    let mut replacements = mentions
-        .iter()
-        .map(|mention| {
+        .into_iter()
+        .map(|(range, public_key)| {
            InlineReplacement::new(
-                mention.range.clone(),
-                format!(
-                    "@{}",
-                    persons.read(cx).person(&mention.public_key, cx).name()
-                ),
+                range,
+                format!("@{}", persons.read(cx).person(&public_key, cx).name()),
            )
        })
        .collect::<Vec<_>>();
@@ -9,12 +9,13 @@ ui = { path = "../ui" }
 gpui-kit.workspace = true
 common = { path = "../common" }
 state = { path = "../state" }
+nip29 = { path = "../nip29" }
+nip29_ui = { path = "../nip29_ui" }
 nip4e = { path = "../nip4e" }
 chat = { path = "../chat" }
 chat_ui = { path = "../chat_ui" }
-nip29 = { path = "../nip29" }
-nip29_ui = { path = "../nip29_ui" }
 settings = { path = "../settings" }
+speech = { path = "../speech" }
 person = { path = "../person" }
 auto_update = { path = "../auto_update" }

@@ -27,4 +28,9 @@ nostr-connect.workspace = true
 anyhow.workspace = true
 serde.workspace = true
 log.workspace = true
+rand.workspace = true
 smallvec.workspace = true
+
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+nip60 = { path = "../nip60" }
+nip60_ui = { path = "../nip60_ui" }
@@ -1,15 +1,18 @@
 use anyhow::Error;
 use gpui::prelude::FluentBuilder;
 use gpui::{
-    App, AppContext, Context, Entity, IntoElement, ParentElement, Render, SharedString, Styled,
-    Subscription, Task, Window, div, px, relative,
+    App, AppContext, Context, Div, Entity, IntoElement, ParentElement, Render, SharedString,
+    Styled, Subscription, Task, Window, div, px, relative,
 };
 use gpui_kit::component::button::{Button, ButtonVariants};
+use gpui_kit::component::dialog::{DialogDescription, DialogFooter, DialogHeader, DialogTitle};
+use gpui_kit::component::form::{field, v_form};
 use gpui_kit::component::input::{Input, InputEvent, InputState};
 use gpui_kit::component::{ActiveTheme, Disableable, WindowExt, v_flex};
 use instant::Duration;
 use nostr_connect::prelude::*;
-use state::NostrRegistry;
+use state::{NostrRegistry, StateEvent};
+use ui::IconName;

 pub fn open(window: &mut Window, cx: &mut App) {
    let import = cx.new(|cx| ImportIdentity::new(window, cx));
@@ -29,11 +32,9 @@ pub fn open_unlock(window: &mut Window, cx: &mut App) {
    let import = cx.new(|cx| ImportIdentity::new_unlock(window, cx));

    window.open_dialog(cx, move |this, _window, _cx| {
-        this.width(px(450.))
-            .close_button(false)
+        this.close_button(false)
            .overlay_closable(false)
            .keyboard(false)
-            .title("Unlock your identity")
            .child(import.clone())
    });
 }
@@ -73,12 +74,21 @@ impl ImportIdentity {
    }

    fn build(mode: Mode, window: &mut Window, cx: &mut Context<Self>) -> Self {
+        let nostr = NostrRegistry::global(cx);
        let key_input = cx.new(|cx| InputState::new(window, cx).placeholder("secret or bunker://"));
-        let pass_input = cx.new(|cx| InputState::new(window, cx).masked(true));
+        let pass_input = cx.new(|cx| {
+            let input = InputState::new(window, cx).masked(true);
+
+            if mode == Mode::Unlock {
+                input.placeholder("Passphrase to unlock your identity")
+            } else {
+                input
+            }
+        });
        let repass_input = cx.new(|cx| InputState::new(window, cx).masked(true));
        let error = cx.new(|_| None);

-        let subscriptions = vec![
+        let mut subscriptions = vec![
            cx.subscribe_in(&key_input, window, |this, _input, event, _window, cx| {
                if let InputEvent::PressEnter { .. } = event {
                    this.login(cx);
@@ -96,6 +106,14 @@ impl ImportIdentity {
            }),
        ];

+        subscriptions.push(
+            cx.subscribe_in(&nostr, window, |this, _nostr, event, _window, cx| {
+                if let StateEvent::Error(error) = event {
+                    this.set_error(error.clone(), cx);
+                }
+            }),
+        );
+
        Self {
            mode,
            key_input,
@@ -188,6 +206,14 @@ impl ImportIdentity {
        });
    }

+    #[cfg(target_arch = "wasm32")]
+    fn extension(&mut self, cx: &mut Context<Self>) {
+        let nostr = NostrRegistry::global(cx);
+        nostr.update(cx, |this, cx| {
+            this.connect_extension(cx);
+        });
+    }
+
    fn set_loading(&mut self, status: bool, cx: &mut Context<Self>) {
        self.loading = status;
        cx.notify();
@@ -219,16 +245,59 @@ impl ImportIdentity {
            Ok(())
        }));
    }
+
+    fn render_unlock(&self, cx: &mut Context<Self>) -> Div {
+        v_flex()
+            .gap_4()
+            .child(
+                DialogHeader::new()
+                    .child(DialogTitle::new().child("Unlock your identity"))
+                    .child(
+                        DialogDescription::new()
+                            .child("Enter the passphrase used to encrypt this identity."),
+                    ),
+            )
+            .child(
+                v_form().child(
+                    field()
+                        .label("Passphrase")
+                        .required(true)
+                        .child(Input::new(&self.pass_input)),
+                ),
+            )
+            .when_some(self.error.read(cx).as_ref(), |this, error| {
+                this.child(
+                    div()
+                        .text_sm()
+                        .text_color(cx.theme().danger)
+                        .child(error.clone()),
+                )
+            })
+            .child(
+                DialogFooter::new().child(
+                    Button::new("unlock")
+                        .primary()
+                        .icon(IconName::Unlock)
+                        .label("Unlock")
+                        .loading(self.loading)
+                        .disabled(self.loading)
+                        .on_click(cx.listener(move |this, _ev, _window, cx| {
+                            this.login(cx);
+                        })),
+                ),
+            )
+    }
 }

 impl Render for ImportIdentity {
    fn render(&mut self, _window: &mut gpui::Window, cx: &mut Context<Self>) -> impl IntoElement {
+        if self.mode == Mode::Unlock {
+            return self.render_unlock(cx);
+        }
+
        const BUNKER_WARN: &str = "Nostr Connect will usually take more time to get all your messages. Please keep your session open until you see all your messages.";
        const KEY_WARN: &str = "Coop encrypts your key with your passphrase and stores it on this device. You only need the passphrase to sign in next time.";

-        let is_wasm = cfg!(target_arch = "wasm32");
-        let is_unlock = self.mode == Mode::Unlock;
-
        let value = self.key_input.read(cx).value().trim().to_string();
        let require_password = value.starts_with("ncryptsec1");
        let require_encrypt = value.starts_with("nsec1");
@@ -242,25 +311,19 @@ impl Render for ImportIdentity {
            .child(
                v_flex()
                    .gap_2()
-                    .when(!is_unlock, |this| {
+                    .child(
+                        v_flex()
+                            .gap_1()
+                            .text_color(cx.theme().muted_foreground)
+                            .child("Use secret key or bunker connection")
+                            .child(Input::new(&self.key_input)),
+                    )
+                    .when(require_password, |this| {
                        this.child(
                            v_flex()
                                .gap_1()
                                .text_color(cx.theme().muted_foreground)
-                                .child("Use secret key or bunker connection")
-                                .child(Input::new(&self.key_input)),
-                        )
-                    })
-                    .when(is_unlock || require_password, |this| {
-                        this.child(
-                            v_flex()
-                                .gap_1()
-                                .text_color(cx.theme().muted_foreground)
-                                .child(if is_unlock {
-                                    "Passphrase to unlock your identity:"
-                                } else {
-                                    "Decrypt Password:"
-                                })
+                                .child("Decrypt Password:")
                                .child(Input::new(&self.pass_input)),
                        )
                    })
@@ -305,26 +368,41 @@ impl Render for ImportIdentity {
                        )
                    }),
            )
-            .child(
-                Button::new("login")
-                    .label(if is_unlock { "Unlock" } else { "Continue" })
-                    .primary()
-                    .loading(self.loading)
-                    .disabled(self.loading)
-                    .on_click(cx.listener(move |this, _ev, _window, cx| {
-                        this.login(cx);
-                    })),
-            )
-            .when(!is_wasm && !is_unlock, |this| {
-                this.child(
+            .child({
+                let content = v_flex().gap_1().child(
+                    Button::new("login")
+                        .label("Continue")
+                        .primary()
+                        .loading(self.loading)
+                        .disabled(self.loading)
+                        .on_click(cx.listener(move |this, _ev, _window, cx| {
+                            this.login(cx);
+                        })),
+                );
+
+                #[cfg(not(target_arch = "wasm32"))]
+                let content = content.child(
                    Button::new("proxy")
-                        .label("Connect via Web Extension (Experimental)")
+                        .label("Connect via Web Extension")
                        .ghost()
                        .disabled(self.loading)
                        .on_click(cx.listener(move |this, _ev, _window, cx| {
                            this.proxy(cx);
                        })),
-                )
+                );
+
+                #[cfg(target_arch = "wasm32")]
+                let content = content.child(
+                    Button::new("extension")
+                        .label("Continue with Browser Extension")
+                        .ghost()
+                        .disabled(self.loading)
+                        .on_click(cx.listener(move |this, _ev, _window, cx| {
+                            this.extension(cx);
+                        })),
+                );
+
+                content
            })
            .when_some(self.error.read(cx).as_ref(), |this, error| {
                this.child(
@@ -1,11 +1,11 @@
+use std::rc::Rc;
+
+use gpui::{App, AppContext, ClickEvent, ParentElement, Styled, Window, px};
 use gpui_kit::assets::IconName;
 use gpui_kit::component::button::{Button, ButtonVariants};
 use gpui_kit::component::input::{Input, InputState};
 use gpui_kit::component::notification::Notification;
 use gpui_kit::component::{WindowExt, h_flex, v_flex};
-use std::rc::Rc;
-
-use gpui::{App, AppContext, ClickEvent, ParentElement, Styled, Window, px};
 use nip29::{GroupReference, GroupsRegistry};

 type SubmitFn = Rc<dyn Fn(&ClickEvent, &mut Window, &mut App) -> bool>;
@@ -10,7 +10,6 @@ use gpui::{
    Window, div, px, uniform_list,
 };
 use gpui_kit::assets::IconName;
-use gpui_kit::base::StyledExt as _;
 use gpui_kit::component::button::{Button, ButtonVariants};
 use gpui_kit::component::dock::{DockArea, DockPlacement, PanelHandle};
 use gpui_kit::component::input::{Input, InputEvent, InputState};
@@ -205,6 +204,7 @@ impl NewChat {

                Ok(())
            }));
+
            return;
        }

@@ -338,7 +338,7 @@ impl NewChat {

                Nav::new(start + offset)
                    .label(profile.name())
-                    .text_xs()
+                    .text_sm()
                    .when(!AppSettings::get_hide_avatar(cx), |this| {
                        this.prefix(
                            Avatar::new(profile.avatar())
@@ -369,15 +369,13 @@ impl NewChat {
                    .p_0p5()
                    .rounded_full()
                    .bg(cx.theme().secondary)
-                    .text_xs()
-                    .font_medium()
                    .hover(|this| this.bg(cx.theme().primary))
                    .child(
                        Avatar::new(profile.avatar())
                            .seed(profile.avatar_seed())
                            .xsmall(),
                    )
-                    .child(div().max_w_32().truncate().child(profile.name()))
+                    .child(div().max_w_32().truncate().text_xs().child(profile.name()))
                    .on_click(cx.listener(move |this, _event, _window, cx| {
                        this.toggle_member(&public_key, cx);
                    }))
@@ -2,15 +2,15 @@ use anyhow::Error;
 use gpui::prelude::FluentBuilder;
 use gpui::{
    App, AppContext, Context, Div, Entity, FocusHandle, InteractiveElement as _, IntoElement,
-    ParentElement, PathPromptOptions, Render, SharedString, StatefulInteractiveElement as _,
-    Styled, Subscription, Task, WeakEntity, Window, div, px, rems,
+    ParentElement, Render, SharedString, StatefulInteractiveElement as _, StyleRefinement, Styled,
+    Subscription, Task, WeakEntity, Window, div, px, rems,
 };
 use gpui_base::{Popup, Select};
 use gpui_kit::assets::IconName;
 use gpui_kit::base::StyledExt as _;
 use gpui_kit::component::button::{Button, ButtonVariants};
 use gpui_kit::component::dock::{DockArea, DockPlacement, PanelHandle};
-use gpui_kit::component::form::field;
+use gpui_kit::component::group_box::{GroupBox, GroupBoxVariants};
 use gpui_kit::component::input::{Input, InputEvent, InputState, Textarea, TextareaState};
 use gpui_kit::component::separator::Separator;
 use gpui_kit::component::switch::Switch;
@@ -18,15 +18,15 @@ use gpui_kit::component::{ActiveTheme, Disableable, Icon, Sizable, WindowExt, h_
 use nip29::{GroupCreateOptions, GroupKey, GroupsEvent, GroupsRegistry};
 use nostr_sdk::prelude::*;
 use settings::AppSettings;
-use state::upload;
-use ui::Avatar;
+use state::{pick_file, upload_file};
+use ui::{Avatar, settings_row};

 const DEFAULT_RELAYS: [&str; 2] = ["wss://relay.ditto.net", "wss://chat.wisp.talk"];
 const PRIVATE_DESC: &str = "Only members can read group messages";
 const CLOSED_DESC: &str = "Join requests are ignored (invite-only)";
 const RESTRICTED_DESC: &str = "Only members can post messages";
 const HIDDEN_DESC: &str = "Hidden from non-members, not discoverable";
-const LIST_PRIVATE_DESC: &str = "Kept encrypted in your group list so others can't see you joined";
+const LIST_PRIVATE_DESC: &str = "Kept encrypted in your group list so others can't see";

 pub fn open(dock: WeakEntity<DockArea>, window: &mut Window, cx: &mut App) {
    open_with(dock, None, window, cx);
@@ -297,16 +297,11 @@ impl NewGroup {
    fn upload(&mut self, window: &mut Window, cx: &mut Context<Self>) {
        let server = AppSettings::get_file_server(cx);

-        let path = cx.prompt_for_paths(PathPromptOptions {
-            files: true,
-            directories: false,
-            multiple: false,
-            prompt: None,
-        });
+        let picker = pick_file(cx);

        self.tasks.push(cx.spawn_in(window, async move |this, cx| {
            // Selecting no file means the prompt was cancelled
-            let Some(path) = path.await??.and_then(|mut paths| paths.pop()) else {
+            let Some(picked) = picker.await? else {
                return Ok(());
            };

@@ -314,7 +309,7 @@ impl NewGroup {
                this.set_uploading(true, cx);
            })?;

-            match upload(server, path, cx).await {
+            match upload_file(server, picked, cx).await {
                Ok(url) => {
                    this.update(cx, |this, cx| {
                        this.picture = Some(url.to_string().into());
@@ -462,71 +457,72 @@ impl NewGroup {
    }

    fn render_access(&self, cx: &mut Context<Self>) -> impl IntoElement {
-        let private = field().label("Private").description(PRIVATE_DESC).child(
-            Switch::new("private")
-                .checked(self.private)
-                .on_click(cx.listener(|this, checked: &bool, _window, cx| {
-                    this.private = *checked;
-                    cx.notify();
-                })),
-        );
-
-        let closed = field().label("Closed").description(CLOSED_DESC).child(
-            Switch::new("closed")
-                .checked(self.closed)
-                .on_click(cx.listener(|this, checked: &bool, _window, cx| {
-                    this.closed = *checked;
-                    cx.notify();
-                })),
-        );
-
-        let restricted = field()
-            .label("Restricted")
-            .description(RESTRICTED_DESC)
-            .child(
+        GroupBox::new()
+            .fill()
+            .title("Access settings")
+            .title_style(group_box_title_style(cx))
+            .child(settings_row(
+                "Private",
+                PRIVATE_DESC,
+                Switch::new("private")
+                    .checked(self.private)
+                    .on_click(cx.listener(|this, checked: &bool, _window, cx| {
+                        this.private = *checked;
+                        cx.notify();
+                    })),
+                cx,
+            ))
+            .child(settings_row(
+                "Closed",
+                CLOSED_DESC,
+                Switch::new("closed")
+                    .checked(self.closed)
+                    .on_click(cx.listener(|this, checked: &bool, _window, cx| {
+                        this.closed = *checked;
+                        cx.notify();
+                    })),
+                cx,
+            ))
+            .child(settings_row(
+                "Restricted",
+                RESTRICTED_DESC,
                Switch::new("restricted")
                    .checked(self.restricted)
                    .on_click(cx.listener(|this, checked: &bool, _window, cx| {
                        this.restricted = *checked;
                        cx.notify();
                    })),
-            );
-
-        let hidden = field().label("Hidden").description(HIDDEN_DESC).child(
-            Switch::new("hidden")
-                .checked(self.hidden)
-                .on_click(cx.listener(|this, checked: &bool, _window, cx| {
-                    this.hidden = *checked;
-                    cx.notify();
-                })),
-        );
-
-        v_flex()
-            .gap_2()
-            .child(field_label("Access settings", cx))
-            .child(switch_row(private, cx))
-            .child(switch_row(closed, cx))
-            .child(switch_row(restricted, cx))
-            .child(switch_row(hidden, cx))
+                cx,
+            ))
+            .child(settings_row(
+                "Hidden",
+                HIDDEN_DESC,
+                Switch::new("hidden")
+                    .checked(self.hidden)
+                    .on_click(cx.listener(|this, checked: &bool, _window, cx| {
+                        this.hidden = *checked;
+                        cx.notify();
+                    })),
+                cx,
+            ))
    }

    fn render_list_setting(&self, cx: &mut Context<Self>) -> impl IntoElement {
-        let list_private = field()
-            .label("Private on my list")
-            .description(LIST_PRIVATE_DESC)
-            .child(
+        GroupBox::new()
+            .fill()
+            .title("List")
+            .title_style(group_box_title_style(cx))
+            .child(settings_row(
+                "Private on my list",
+                LIST_PRIVATE_DESC,
                Switch::new("list-private")
                    .checked(self.list_private)
                    .on_click(cx.listener(|this, checked: &bool, _window, cx| {
                        this.list_private = *checked;
                        cx.notify();
                    })),
-            );
-
-        v_flex()
-            .gap_2()
-            .child(field_label("List", cx))
-            .child(switch_row(list_private, cx))
+                cx,
+            ))
    }

    fn render_error(
@@ -662,13 +658,12 @@ fn field_label(text: &'static str, cx: &App) -> Div {
        .child(text)
 }

-fn switch_row(switch: impl IntoElement, cx: &App) -> Div {
-    div()
-        .w_full()
-        .p_2()
-        .rounded(cx.theme().radius)
-        .bg(cx.theme().secondary)
-        .child(switch)
+/// Match [`field_label`]'s design for GroupBox titles.
+fn group_box_title_style(cx: &App) -> StyleRefinement {
+    StyleRefinement::default()
+        .text_xs()
+        .text_color(cx.theme().muted_foreground)
+        .font_semibold()
 }

 fn relay_label(relay: &RelayUrl) -> SharedString {
@@ -4,21 +4,21 @@ use anyhow::Error;
 use chat::{ChatRegistry, Room, RoomKind};
 use gpui::prelude::FluentBuilder;
 use gpui::{
-    App, AppContext, ClipboardItem, Context, Div, Entity, IntoElement, ParentElement,
-    PathPromptOptions, Render, SharedString, Styled, Task, Window, div, retain_all,
+    App, AppContext, Context, Div, Entity, IntoElement, ParentElement, Render, SharedString,
+    Styled, Task, Window, div, retain_all,
 };
 use gpui_kit::assets::IconName;
 use gpui_kit::base::StyledExt as _;
 use gpui_kit::component::button::{Button, ButtonVariants};
+use gpui_kit::component::clipboard::Clipboard;
 use gpui_kit::component::dock::DockPlacement;
 use gpui_kit::component::input::{Input, InputState, Textarea, TextareaState};
 use gpui_kit::component::notification::Notification;
 use gpui_kit::component::{ActiveTheme, Disableable, Sizable, WindowExt, h_flex, v_flex};
-use instant::Duration;
 use nostr_sdk::prelude::*;
 use person::{Directory, Person, PersonRegistry, shorten_pubkey};
 use settings::AppSettings;
-use state::{NostrRegistry, upload};
+use state::{NostrRegistry, pick_file, upload_file};
 use ui::Avatar;

 use crate::Workspace;
@@ -49,8 +49,6 @@ struct ProfileDialog {
    website_input: Entity<InputState>,
    /// Uploading state
    uploading: bool,
-    /// Copied states
-    copied: bool,
    /// Updating state
    updating: bool,
    /// Tasks
@@ -92,7 +90,6 @@ impl ProfileDialog {
            bio_input,
            website_input,
            uploading: false,
-            copied: false,
            updating: false,
            tasks: vec![],
        }
@@ -141,35 +138,6 @@ impl ProfileDialog {
        cx.notify();
    }

-    fn copy(&mut self, value: String, window: &mut Window, cx: &mut Context<Self>) {
-        let item = ClipboardItem::new_string(value);
-        cx.write_to_clipboard(item);
-
-        self.set_copied(true, window, cx);
-    }
-
-    fn set_copied(&mut self, status: bool, window: &mut Window, cx: &mut Context<Self>) {
-        self.copied = status;
-        cx.notify();
-
-        if status {
-            self.tasks.push(cx.spawn_in(window, async move |this, cx| {
-                cx.background_executor().timer(Duration::from_secs(2)).await;
-
-                // Reset the copied state after a delay
-                cx.update(|window, cx| {
-                    this.update(cx, |this, cx| {
-                        this.set_copied(false, window, cx);
-                    })
-                    .ok();
-                })
-                .ok();
-
-                Ok(())
-            }));
-        }
-    }
-
    fn set_uploading(&mut self, status: bool, cx: &mut Context<Self>) {
        self.uploading = status;
        cx.notify();
@@ -179,17 +147,12 @@ impl ProfileDialog {
        // Get the user's configured blossom server
        let server = AppSettings::get_file_server(cx);

-        // Ask user for file upload
-        let path = cx.prompt_for_paths(PathPromptOptions {
-            files: true,
-            directories: false,
-            multiple: false,
-            prompt: None,
-        });
+        // Ask the user for an image to upload
+        let picker = pick_file(cx);

        self.tasks.push(cx.spawn_in(window, async move |this, cx| {
            // Selecting no file means the prompt was cancelled
-            let Some(path) = path.await??.and_then(|mut paths| paths.pop()) else {
+            let Some(picked) = picker.await? else {
                return Ok(());
            };

@@ -198,7 +161,7 @@ impl ProfileDialog {
            })?;

            // Upload via blossom client
-            match upload(server, path, cx).await {
+            match upload_file(server, picked, cx).await {
                Ok(url) => {
                    this.update_in(cx, |this, window, cx| {
                        this.avatar_input.update(cx, |this, cx| {
@@ -373,7 +336,8 @@ impl Render for ProfileDialog {
                    .w_full()
                    .items_center()
                    .justify_center()
-                    .bg(cx.theme().sidebar)
+                    .rounded(cx.theme().radius_lg)
+                    .bg(cx.theme().muted)
                    .child(Avatar::new(avatar).seed(profile.avatar_seed()).large())
                    .when(self.editing, |this| {
                        this.child(
@@ -398,25 +362,13 @@ impl Render for ProfileDialog {
                        .justify_center()
                        .gap_3()
                        .rounded(cx.theme().radius)
-                        .bg(cx.theme().sidebar)
+                        .bg(cx.theme().muted)
                        .text_xs()
                        .child(shorten_pkey)
-                        .child(
-                            Button::new("copy")
-                                .icon({
-                                    if self.copied {
-                                        IconName::CircleCheck
-                                    } else {
-                                        IconName::Copy
-                                    }
-                                })
-                                .xsmall()
-                                .secondary()
-                                .on_click(cx.listener(move |this, _ev, window, cx| {
-                                    let pk = this.public_key.to_bech32().unwrap();
-                                    this.copy(pk, window, cx)
-                                })),
-                        ),
+                        .child(Clipboard::new("copy").value_fn({
+                            let public_key = self.public_key;
+                            move |_, _| public_key.to_bech32().unwrap_or_default().into()
+                        })),
                ),
            )
            .when(self.editing, |this| {
@@ -424,19 +376,19 @@ impl Render for ProfileDialog {
                    v_flex()
                        .gap_1p5()
                        .child(label("Name", cx))
-                        .child(Input::new(&self.name_input).small()),
+                        .child(Input::new(&self.name_input)),
                )
                .child(
                    v_flex()
                        .gap_1p5()
                        .child(label("About", cx))
-                        .child(Textarea::new(&self.bio_input).small()),
+                        .child(Textarea::new(&self.bio_input)),
                )
                .child(
                    v_flex()
                        .gap_1p5()
                        .child(label("Website", cx))
-                        .child(Input::new(&self.website_input).small()),
+                        .child(Input::new(&self.website_input)),
                )
            })
            .when(!self.editing, |this| {
@@ -549,7 +501,7 @@ fn field(
    };

    v_flex()
-        .gap_1p5()
+        .gap_1()
        .child(label(text, cx))
-        .child(div().text_xs().text_color(color).child(content))
+        .child(div().text_sm().text_color(color).child(content))
 }
@@ -1,11 +1,3 @@
-use gpui_kit::assets::IconName;
-use gpui_kit::base::StyledExt as _;
-use gpui_kit::component::button::{Button, ButtonVariants};
-use gpui_kit::component::input::{Input, InputEvent, InputState};
-use gpui_kit::component::menu::{DropdownMenu, PopupMenuItem};
-use gpui_kit::component::scroll::ScrollableElement;
-use gpui_kit::component::tab::{Tab, TabBar};
-use gpui_kit::component::{ActiveTheme, Disableable, Sizable, WindowExt, h_flex, v_flex};
 use std::collections::HashSet;

 use anyhow::{Error, anyhow};
@@ -15,6 +7,14 @@ use gpui::{
    ParentElement, Render, SharedString, Stateful, Styled, Subscription, Task, TextAlign,
    WeakEntity, Window, div, rems,
 };
+use gpui_kit::assets::IconName;
+use gpui_kit::base::StyledExt as _;
+use gpui_kit::component::button::{Button, ButtonVariants};
+use gpui_kit::component::input::{Input, InputEvent, InputState};
+use gpui_kit::component::menu::{DropdownMenu, PopupMenuItem};
+use gpui_kit::component::scroll::ScrollableElement;
+use gpui_kit::component::tab::{Tab, TabBar};
+use gpui_kit::component::{ActiveTheme, Disableable, Sizable, WindowExt, h_flex, v_flex};
 use instant::Duration;
 use nostr_sdk::prelude::*;
 use smallvec::{SmallVec, smallvec};
@@ -119,7 +119,7 @@ impl RelayManager {
                h_flex()
                    .gap_1()
                    .w_full()
-                    .child(Input::new(&self.gossip.input).small().cleanable(true))
+                    .child(Input::new(&self.gossip.input).cleanable(true))
                    .child(
                        Button::new("metadata")
                            .map(|this| {
@@ -208,7 +208,7 @@ impl RelayManager {
                h_flex()
                    .gap_1()
                    .w_full()
-                    .child(Input::new(&self.inbox.input).small().cleanable(true))
+                    .child(Input::new(&self.inbox.input).cleanable(true))
                    .child(
                        Button::new("add-inbox")
                            .icon(IconName::Plus)
@@ -264,7 +264,7 @@ impl RelayManager {

    fn render_tab_bar(&self, cx: &mut Context<Self>) -> impl IntoElement {
        TabBar::new("relays-tabs")
-            .segmented()
+            .pill()
            .selected_index(self.active_tab)
            .on_click(cx.listener(|this, ix: &usize, _window, cx| {
                this.active_tab = *ix;
@@ -1,20 +1,35 @@
+#[cfg(not(target_arch = "wasm32"))]
+use std::time::Duration;
+
+use chat_ui::ToggleDictation;
+#[cfg(not(target_arch = "wasm32"))]
+use gpui::PathPromptOptions;
+#[cfg(not(target_arch = "wasm32"))]
+use gpui::Task;
 use gpui::http_client::Url;
 use gpui::{
-    App, AppContext, Context, Entity, IntoElement, ParentElement, PathPromptOptions, Render,
-    SharedString, Styled, Window, div,
+    AnyElement, App, AppContext, Context, Entity, IntoElement, ParentElement, Render, Styled,
+    Subscription, Window, div,
 };
 use gpui_kit::assets::IconName;
-use gpui_kit::base::StyledExt as _;
 use gpui_kit::component::button::{Button, ButtonVariants};
-use gpui_kit::component::form::field;
-use gpui_kit::component::group_box::{GroupBox, GroupBoxVariants};
-use gpui_kit::component::input::{Input, InputState};
+use gpui_kit::component::input::{Input, InputEvent, InputState, NumberInput};
+use gpui_kit::component::kbd::Kbd;
 use gpui_kit::component::menu::{DropdownMenu, PopupMenuItem};
 use gpui_kit::component::notification::Notification;
+#[cfg(not(target_arch = "wasm32"))]
+use gpui_kit::component::progress::Progress;
+use gpui_kit::component::separator::Separator;
 use gpui_kit::component::switch::Switch;
-use gpui_kit::component::{ActiveTheme, Disableable, Sizable, WindowExt, h_flex, v_flex};
-use settings::AppSettings;
-use settings::AppearanceMode;
+use gpui_kit::component::{Disableable, Sizable, WindowExt, h_flex, v_flex};
+use settings::{AppSettings, AppearanceMode, NIP4E_ROTATION_DEFAULT_DAYS};
+#[cfg(not(target_arch = "wasm32"))]
+use speech::model::{self as speech_model};
+use ui::{settings_block, settings_row};
+
+/// Bounds for the theme number inputs
+const FONT_SIZE_RANGE: (f32, f32) = (10., 32.);
+const RADIUS_RANGE: (f32, f32) = (0., 24.);

 pub fn init(window: &mut Window, cx: &mut App) -> Entity<Preferences> {
    cx.new(|cx| Preferences::new(window, cx))
@@ -22,6 +37,13 @@ pub fn init(window: &mut Window, cx: &mut App) -> Entity<Preferences> {

 pub struct Preferences {
    file_input: Entity<InputState>,
+    font_size_input: Entity<InputState>,
+    radius_input: Entity<InputState>,
+    radius_lg_input: Entity<InputState>,
+    #[cfg(not(target_arch = "wasm32"))]
+    _speech_poll: Task<()>,
+    /// Keeps the control subscriptions alive while the dialog is open
+    _subscriptions: Vec<Subscription>,
 }

 impl Preferences {
@@ -33,7 +55,120 @@ impl Preferences {
                .placeholder("https://myblossom.com")
        });

-        Self { file_input }
+        let theme = AppSettings::get_theme(cx);
+        let font_size_input = cx.new(|cx| {
+            InputState::new(window, cx)
+                .default_value(theme.font_size.to_string())
+                .step(1.)
+                .min(FONT_SIZE_RANGE.0 as f64)
+                .max(FONT_SIZE_RANGE.1 as f64)
+        });
+        let radius_input = cx.new(|cx| {
+            InputState::new(window, cx)
+                .default_value(
+                    theme
+                        .radius
+                        .map(|value| value.to_string())
+                        .unwrap_or_default(),
+                )
+                .placeholder("System")
+                .step(1.)
+                .min(RADIUS_RANGE.0 as f64)
+                .max(RADIUS_RANGE.1 as f64)
+        });
+        let radius_lg_input = cx.new(|cx| {
+            InputState::new(window, cx)
+                .default_value(
+                    theme
+                        .radius_lg
+                        .map(|value| value.to_string())
+                        .unwrap_or_default(),
+                )
+                .placeholder("System")
+                .step(1.)
+                .min(RADIUS_RANGE.0 as f64)
+                .max(RADIUS_RANGE.1 as f64)
+        });
+
+        let subscriptions = vec![
+            Self::wire_number_input(&font_size_input, FONT_SIZE_RANGE, cx, |value, cx| {
+                if let Some(font_size) = value {
+                    AppSettings::update_theme(|theme| theme.font_size = font_size, cx);
+                    AppSettings::apply_theme_style(cx);
+                }
+            }),
+            Self::wire_number_input(&radius_input, RADIUS_RANGE, cx, |value, cx| {
+                AppSettings::update_theme(|theme| theme.radius = value, cx);
+                AppSettings::apply_theme_style(cx);
+            }),
+            Self::wire_number_input(&radius_lg_input, RADIUS_RANGE, cx, |value, cx| {
+                AppSettings::update_theme(|theme| theme.radius_lg = value, cx);
+                AppSettings::apply_theme_style(cx);
+            }),
+        ];
+
+        #[cfg(not(target_arch = "wasm32"))]
+        let _speech_poll = cx.spawn_in(window, async move |this, cx| {
+            let timer = Duration::from_millis(500);
+            let mut last = speech_model::status();
+
+            loop {
+                cx.background_executor().timer(timer).await;
+
+                let status = speech_model::status();
+                let error = speech_model::take_error();
+
+                if status == last {
+                    continue;
+                }
+
+                last = status;
+
+                this.update_in(cx, |_, window, cx| {
+                    if let Some(error) = error {
+                        window.push_notification(Notification::error(error).autohide(false), cx);
+                    }
+                    cx.notify();
+                })
+                .ok();
+            }
+        });
+
+        Self {
+            file_input,
+            font_size_input,
+            radius_input,
+            radius_lg_input,
+            #[cfg(not(target_arch = "wasm32"))]
+            _speech_poll,
+            _subscriptions: subscriptions,
+        }
+    }
+
+    /// Persist a theme number as it changes; an empty value stores `None`
+    fn wire_number_input(
+        state: &Entity<InputState>,
+        range: (f32, f32),
+        cx: &mut Context<Self>,
+        persist: impl Fn(Option<f32>, &mut App) + 'static,
+    ) -> Subscription {
+        let (min, max) = range;
+        let state = state.clone();
+
+        cx.subscribe(&state, move |_, state, event: &InputEvent, cx| {
+            if !matches!(event, InputEvent::Change) {
+                return;
+            }
+
+            let value = state
+                .read(cx)
+                .value()
+                .trim()
+                .parse::<f32>()
+                .ok()
+                .map(|value| value.clamp(min, max));
+            persist(value, cx);
+        })
    }

    /// Update the file server (blossom) URL
@@ -59,46 +194,160 @@ impl Preferences {
    }

    /// Ask the user for an image to show behind chat and group panels
-    fn choose_background(cx: &mut App) {
-        let task = cx.prompt_for_paths(PathPromptOptions {
-            files: true,
-            directories: false,
-            multiple: false,
-            prompt: None,
-        });
+    fn choose_background(
+        #[cfg_attr(not(target_arch = "wasm32"), allow(unused_variables))] window: &mut Window,
+        cx: &mut App,
+    ) {
+        #[cfg(target_arch = "wasm32")]
+        {
+            let note = Notification::warning("Background images are not supported on web yet.");
+            window.push_notification(note, cx);
+        }

-        cx.spawn(async move |cx| {
-            let Ok(Ok(Some(mut paths))) = task.await else {
-                return;
-            };
-
-            let Some(path) = paths.pop() else {
-                return;
-            };
-
-            cx.update(|cx| {
-                AppSettings::update_panel_background_path(Some(path), cx);
-                cx.refresh_windows();
+        #[cfg(not(target_arch = "wasm32"))]
+        {
+            let task = cx.prompt_for_paths(PathPromptOptions {
+                files: true,
+                directories: false,
+                multiple: false,
+                prompt: None,
            });
-        })
-        .detach();
+
+            cx.spawn(async move |cx| {
+                let Ok(Ok(Some(mut paths))) = task.await else {
+                    return;
+                };
+
+                let Some(path) = paths.pop() else {
+                    return;
+                };
+
+                cx.update(|cx| {
+                    AppSettings::update_panel_background_path(Some(path), cx);
+                    cx.refresh_windows();
+                });
+            })
+            .detach();
+        }
+    }
+
+    fn render_speech(
+        &mut self,
+        #[cfg_attr(target_arch = "wasm32", allow(unused_variables))] cx: &mut Context<Self>,
+    ) -> AnyElement {
+        #[cfg(target_arch = "wasm32")]
+        {
+            return div().into_any_element();
+        }
+
+        #[cfg(not(target_arch = "wasm32"))]
+        {
+            let size = speech_model::total_size() / 1_000_000;
+            let status = speech_model::status();
+
+            let (description, control) = match &status {
+                speech_model::Status::NotInstalled => (
+                    format!("{size} MB download"),
+                    Button::new("download-model")
+                        .label("Download")
+                        .secondary()
+                        .small()
+                        .on_click(|_, _window, cx| {
+                            speech_model::start_download();
+                            cx.refresh_windows();
+                        })
+                        .into_any_element(),
+                ),
+                speech_model::Status::Downloading { downloaded, total } => (
+                    format!(
+                        "Downloading · {} of {} MB",
+                        downloaded / 1_000_000,
+                        total / 1_000_000
+                    ),
+                    Button::new("cancel-download")
+                        .label("Cancel")
+                        .ghost()
+                        .small()
+                        .on_click(|_, _window, cx| {
+                            speech_model::cancel_download();
+                            cx.refresh_windows();
+                        })
+                        .into_any_element(),
+                ),
+                speech_model::Status::Installed => (
+                    format!("Parakeet v3 · {size} MB"),
+                    Button::new("remove-model")
+                        .label("Remove")
+                        .secondary()
+                        .small()
+                        .on_click(|_, _window, cx| {
+                            speech_model::delete();
+                            cx.refresh_windows();
+                        })
+                        .into_any_element(),
+                ),
+            };
+
+            let mut block = v_flex().w_full().gap_3().child(settings_row(
+                "Speech model",
+                description,
+                control,
+                cx,
+            ));
+
+            if let speech_model::Status::Downloading { downloaded, total } = &status {
+                let (downloaded, total) = (*downloaded, *total);
+
+                block = block.child(
+                    Progress::new("speech-model-download")
+                        .value(downloaded as f32 / total.max(1) as f32 * 100.)
+                        .small(),
+                );
+            }
+
+            block.into_any_element()
+        }
+    }
+
+    /// Shows the keystroke actually bound to the dictation action at startup
+    fn render_dictation_shortcut(
+        &self,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> impl IntoElement {
+        let control = match Kbd::global_binding_for_action(&ToggleDictation, window) {
+            Some(kbd) => kbd.into_any_element(),
+            None => div().into_any_element(),
+        };
+
+        settings_row("Shortcut", "Press to start or stop dictation", control, cx)
    }
 }

 impl Render for Preferences {
-    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
        const SCREENING: &str = "Show an screening dialog to verify the unknown sender.";
        const WOT: &str = "Treat people followed by your contacts as known senders.";
        const AVATAR: &str = "Hide all avatar pictures to improve performance.";
-        const MODE: &str = "Follow the OS, or always use light or dark.";
+        const APPEARANCE: &str =
+            "Choose whether the app follows the system theme or uses a light/dark theme.";
+        const FONT_SIZE: &str = "The base font size for the interface.";
+        const RADIUS: &str = "Corner radius for UI elements. Empty follows the OS theme.";
+        const RADIUS_LG: &str =
+            "Corner radius for large elements like dialogs. Empty follows the OS theme.";
+        const FOCUS_RING: &str = "Draw a ring around focused controls.";
        const NIP4E: &str = "Use a dedicated key to encrypt and decrypt messages.";
+        const NIP4E_ROTATION: &str = "Automatically rotate the encryption key every 30 days, keeping the previous key for messages still sealed to it.";
        const BACKGROUND: &str = "Show an image behind chat and group panels.";
+        const MEDIA: &str = "Server for media attachments. Only blossom services are supported.";

        let screening = AppSettings::get_screening(cx);
        let wot_auto_trust = AppSettings::get_wot_auto_trust(cx);
        let hide_avatar = AppSettings::get_hide_avatar(cx);
        let nip4e = AppSettings::get_nip4e(cx);
+        let nip4e_rotation_days = AppSettings::get_nip4e_rotation_days(cx);
        let appearance_mode = AppSettings::get_appearance_mode(cx);
+        let theme = AppSettings::get_theme(cx);
        let panel_background = AppSettings::get_panel_background(cx);
        let panel_background_path = AppSettings::get_panel_background_path(cx);

@@ -108,185 +357,194 @@ impl Render for Preferences {
        };

        v_flex()
+            .my_2()
            .gap_4()
+            .w_full()
            .child(
-                GroupBox::new()
-                    .id("general")
-                    .title("General")
-                    .fill()
-                    .child(field().label("Screening").description(SCREENING).child(
+                v_flex()
+                    .w_full()
+                    .gap_3()
+                    .child(settings_row(
+                        "Screening",
+                        SCREENING,
                        Switch::new("screening").checked(screening).on_click(
                            move |_, _window, cx| {
                                AppSettings::update_screening(!screening, cx);
                            },
                        ),
+                        cx,
                    ))
-                    .child(
-                        field().label("Web of Trust").description(WOT).child(
-                            Switch::new("wot-auto-trust")
-                                .checked(wot_auto_trust)
-                                .on_click(move |_, _window, cx| {
-                                    AppSettings::update_wot_auto_trust(!wot_auto_trust, cx);
-                                }),
-                        ),
-                    )
-                    .child(field().label("Hide user avatar").description(AVATAR).child(
+                    .child(settings_row(
+                        "Web of Trust",
+                        WOT,
+                        Switch::new("wot-auto-trust")
+                            .checked(wot_auto_trust)
+                            .on_click(move |_, _window, cx| {
+                                AppSettings::update_wot_auto_trust(!wot_auto_trust, cx);
+                            }),
+                        cx,
+                    ))
+                    .child(settings_row(
+                        "Hide user avatar",
+                        AVATAR,
                        Switch::new("avatar").checked(hide_avatar).on_click(
                            move |_, _window, cx| {
                                AppSettings::update_hide_avatar(!hide_avatar, cx);
                            },
                        ),
+                        cx,
                    )),
            )
+            .child(Separator::horizontal())
+            .child(settings_row(
+                "Appearance",
+                APPEARANCE,
+                Button::new("appearance-mode")
+                    .label(appearance_mode.label())
+                    .ghost()
+                    .small()
+                    .dropdown_menu(|this, _window, _cx| {
+                        AppearanceMode::ALL.iter().fold(this, |menu, mode| {
+                            menu.item(PopupMenuItem::new(mode.label()).on_click(
+                                move |_, _window, cx| {
+                                    Self::set_appearance_mode(*mode, cx);
+                                },
+                            ))
+                        })
+                    }),
+                cx,
+            ))
+            .child(Separator::horizontal())
            .child(
-                GroupBox::new()
-                    .id("appearance")
-                    .title("Appearance")
-                    .fill()
-                    .child(
+                v_flex()
+                    .w_full()
+                    .gap_3()
+                    .child(settings_row(
+                        "Font Size",
+                        FONT_SIZE,
+                        NumberInput::new(&self.font_size_input).w_24(),
+                        cx,
+                    ))
+                    .child(settings_row(
+                        "Corner Radius",
+                        RADIUS,
+                        NumberInput::new(&self.radius_input).w_24(),
+                        cx,
+                    ))
+                    .child(settings_row(
+                        "Large Corner Radius",
+                        RADIUS_LG,
+                        NumberInput::new(&self.radius_lg_input).w_24(),
+                        cx,
+                    ))
+                    .child(settings_row(
+                        "Focus Ring",
+                        FOCUS_RING,
+                        Switch::new("focus-ring")
+                            .checked(theme.focus_ring)
+                            .on_click(move |_, _window, cx| {
+                                AppSettings::update_theme(
+                                    |theme| theme.focus_ring = !theme.focus_ring,
+                                    cx,
+                                );
+                                AppSettings::apply_theme_style(cx);
+                            }),
+                        cx,
+                    )),
+            )
+            .child(Separator::horizontal())
+            .child(
+                v_flex()
+                    .w_full()
+                    .gap_3()
+                    .child(settings_row(
+                        "Panel background",
+                        BACKGROUND,
+                        Switch::new("panel-background")
+                            .checked(panel_background)
+                            .on_click(move |_, _window, cx| {
+                                AppSettings::update_panel_background(!panel_background, cx);
+                                cx.refresh_windows();
+                            }),
+                        cx,
+                    ))
+                    .child(settings_block(
+                        "Image",
+                        background_label,
                        h_flex()
-                            .gap_3()
-                            .justify_between()
+                            .justify_end()
+                            .gap_1()
                            .child(
-                                v_flex()
-                                    .child(div().text_xs().child(SharedString::from("Mode")))
-                                    .child(
-                                        div()
-                                            .text_xs()
-                                            .text_color(cx.theme().muted_foreground)
-                                            .child(SharedString::from(MODE)),
-                                    ),
-                            )
-                            .child(
-                                Button::new("appearance-mode")
-                                    .label(appearance_mode.label())
+                                Button::new("choose-background")
+                                    .label("Choose image")
                                    .ghost()
                                    .small()
-                                    .dropdown_menu(|this, _window, _cx| {
-                                        AppearanceMode::ALL.iter().fold(this, |menu, mode| {
-                                            menu.item(PopupMenuItem::new(mode.label()).on_click(
-                                                move |_, _window, cx| {
-                                                    Self::set_appearance_mode(*mode, cx);
-                                                },
-                                            ))
-                                        })
+                                    .disabled(!panel_background)
+                                    .on_click(|_, window, cx| {
+                                        Self::choose_background(window, cx);
                                    }),
-                            ),
-                    ),
-            )
-            .child(
-                GroupBox::new()
-                    .id("background")
-                    .title("Background")
-                    .fill()
-                    .child(
-                        field()
-                            .label("Panel background")
-                            .description(BACKGROUND)
+                            )
                            .child(
-                                Switch::new("panel-background")
-                                    .checked(panel_background)
-                                    .on_click(move |_, _window, cx| {
-                                        AppSettings::update_panel_background(!panel_background, cx);
+                                Button::new("reset-background")
+                                    .label("Reset")
+                                    .ghost()
+                                    .small()
+                                    .disabled(!panel_background || panel_background_path.is_none())
+                                    .on_click(|_, _window, cx| {
+                                        AppSettings::update_panel_background_path(None, cx);
                                        cx.refresh_windows();
                                    }),
                            ),
-                    )
-                    .child(
-                        h_flex()
-                            .gap_3()
-                            .justify_between()
-                            .child(
-                                v_flex()
-                                    .flex_1()
-                                    .min_w_0()
-                                    .child(div().text_xs().child(SharedString::from("Image")))
-                                    .child(
-                                        div()
-                                            .text_xs()
-                                            .text_color(cx.theme().muted_foreground)
-                                            .truncate()
-                                            .child(SharedString::from(background_label)),
-                                    ),
-                            )
-                            .child(
-                                h_flex()
-                                    .flex_shrink_0()
-                                    .gap_1()
-                                    .child(
-                                        Button::new("choose-background")
-                                            .label("Choose image")
-                                            .ghost()
-                                            .small()
-                                            .disabled(!panel_background)
-                                            .on_click(|_, _window, cx| {
-                                                Self::choose_background(cx);
-                                            }),
-                                    )
-                                    .child(
-                                        Button::new("reset-background")
-                                            .label("Reset")
-                                            .ghost()
-                                            .small()
-                                            .disabled(
-                                                !panel_background
-                                                    || panel_background_path.is_none(),
-                                            )
-                                            .on_click(|_, _window, cx| {
-                                                AppSettings::update_panel_background_path(None, cx);
-                                                cx.refresh_windows();
-                                            }),
-                                    ),
-                            ),
-                    ),
+                        cx,
+                    )),
            )
-            .child(
-                GroupBox::new()
-                    .id("experiments")
-                    .title("Experiments")
-                    .fill()
+            .child(Separator::horizontal())
+            .child(settings_row(
+                "Decoupling Encryption Key",
+                NIP4E,
+                Switch::new("nip4e")
+                    .checked(nip4e)
+                    .on_click(move |_, _window, cx| {
+                        AppSettings::update_nip4e(!nip4e, cx);
+                    }),
+                cx,
+            ))
+            .child(settings_row(
+                "Rotate Encryption Key",
+                NIP4E_ROTATION,
+                Switch::new("nip4e_rotation")
+                    .checked(nip4e_rotation_days.is_some())
+                    .on_click(move |_, _window, cx| {
+                        let enabled = AppSettings::get_nip4e_rotation_days(cx).is_some();
+                        let days = if enabled {
+                            None
+                        } else {
+                            Some(NIP4E_ROTATION_DEFAULT_DAYS)
+                        };
+                        AppSettings::update_nip4e_rotation_days(days, cx);
+                    }),
+                cx,
+            ))
+            .child(Separator::horizontal())
+            .child(self.render_speech(cx))
+            .child(self.render_dictation_shortcut(window, cx))
+            .child(Separator::horizontal())
+            .child(settings_block(
+                "Media Upload Service",
+                MEDIA,
+                h_flex()
+                    .gap_1()
+                    .child(div().flex_1().child(Input::new(&self.file_input)))
                    .child(
-                        field()
-                            .label("Decoupling Encryption Key")
-                            .description(NIP4E)
-                            .child(Switch::new("nip4e").checked(nip4e).on_click(
-                                move |_, _window, cx| {
-                                    AppSettings::update_nip4e(!nip4e, cx);
-                                },
-                            )),
+                        Button::new("update-file-server")
+                            .icon(IconName::Check)
+                            .ghost()
+                            .size_8()
+                            .on_click(cx.listener(move |this, _ev, window, cx| {
+                                this.update_file_server(window, cx)
+                            })),
                    ),
-            )
-            .child(
-                GroupBox::new()
-                    .id("media")
-                    .title("Media Upload Service")
-                    .fill()
-                    .child(
-                        v_flex()
-                            .gap_0p5()
-                            .child(
-                                h_flex()
-                                    .gap_1()
-                                    .child(Input::new(&self.file_input).small())
-                                    .child(
-                                        Button::new("update-file-server")
-                                            .icon(IconName::Check)
-                                            .ghost()
-                                            .size_8()
-                                            .on_click(cx.listener(move |this, _ev, window, cx| {
-                                                this.update_file_server(window, cx)
-                                            })),
-                                    ),
-                            )
-                            .child(
-                                div()
-                                    .text_xs()
-                                    .font_medium()
-                                    .italic()
-                                    .text_color(cx.theme().muted_foreground)
-                                    .child(SharedString::from("Only support blossom service")),
-                            ),
-                    ),
-            )
+                cx,
+            ))
    }
 }
@@ -1,5 +1,4 @@
 use std::cell::Cell;
-use std::ops::Deref as _;
 use std::rc::Rc;
 use std::sync::Arc;

@@ -166,7 +165,7 @@ impl CoopDockSkin {
            .on_drag(ResizePanel, move |info, _, _, cx| {
                cx.stop_propagation();
                shared.resizing_dock().set(Some(placement));
-                cx.new(|_| info.deref().clone())
+                cx.new(|_| info.clone())
            })
    }
 }
@@ -54,6 +54,7 @@ impl Render for DragPanelPreview {
            .cursor_grab()
            .p_1()
            .whitespace_nowrap()
+            .font_family(cx.theme().font_family.clone())
            .border_1()
            .border_color(cx.theme().border)
            .rounded(cx.theme().radius_lg)
@@ -358,7 +359,7 @@ impl CoopTabGroupSkin {
                    this
                } else {
                    this.text_color(cx.theme().tab_foreground)
-                        .bg(cx.theme().tab)
+                        .bg(cx.theme().list_hover)
                }
            })
            .selected(active)
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
reya	53aa54a034	add nip60 wallet ui and nutzap sending	2026-11-06 18:04:31 +07:00
reya	2d85c563fa	refactor	2026-11-06 10:35:36 +07:00
reya	8c5b816ebf	implement nip61 nutzap redemption	2026-11-06 09:08:44 +07:00
reya	4b9e229532	implement nip60 wallet operations	2026-11-06 08:42:17 +07:00
reya	d466cac99e	implement nip60 wallet registry	2026-11-06 08:16:29 +07:00
reya	c5dc0ca242	add nip60 crate	2026-11-06 07:10:37 +07:00
reya	73962d351f	add plan	2026-11-05 19:55:20 +07:00
reya	c1757bbcae	chore: fix web build	2026-11-04 13:05:03 +07:00
reya	74d548e5c6	nip4e: catch up psstpsst (#70 ) Reviewed-on: #70	2026-11-04 03:12:52 +00:00
reya	690dc37fc5	chore: fix web build	2026-11-01 16:40:49 +07:00
reya	2f2661ecd2	chore: improve native theme usage	2026-11-01 16:15:28 +07:00
reya	d045a7ef3a	chore: update the unlock dialog	2026-10-30 20:17:37 +07:00
reya	23d7017f25	feat: add text to speech (#69 ) Reviewed-on: #69	2026-10-30 07:16:46 +00:00
reya	af2a276b1b	chore: update deps	2026-10-28 10:08:47 +07:00
reya	69ca199a7d	chore: drop macos x64 from release builds	2026-10-28 09:09:18 +07:00
reya	83a440d893	chore: release version 2.0.0-alpha3	2026-10-28 05:14:03 +07:00
reya	77b2a5f3cd	feat: add support for speech to text (#68 ) Reviewed-on: #68	2026-10-27 06:25:19 +00:00
reya	b0121f8df2	chore: simplify import dialog & sidebar menu	2026-10-26 19:59:48 +07:00
reya	bfa34959cf	feat: add deploy to cloudflare script	2026-10-26 10:16:14 +07:00
reya	4d0e2f5050	feat: add syncing progress	2026-10-26 09:54:38 +07:00
reya	0824b1825b	feat: make the web version fully working (#67 ) Reviewed-on: #67	2026-10-25 13:10:51 +00:00
reya	3212951ed4	chore: release version 2.0.0-alpha2	2026-10-24 16:09:59 +07:00
reya	ceb69660be	chore: improve wot	2026-10-24 11:39:22 +07:00
reya	8f35ae92b7	feat: add user-configurable theme settings	2026-10-24 09:15:12 +07:00
reya	30da985ac1	feat: adopt the native OS theme (#66 ) Reviewed-on: #66	2026-10-23 04:07:11 +00:00
				`@@ -0,0 +1 @@`
				<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none"> <path d="M21.75 12C21.75 6.84375 17.9583 3.75 12 3.75C6.04167 3.75 2.25 6.84375 2.25 12C2.25 13.3368 3.17054 15.6055 3.3145 15.9522C3.32742 15.9833 3.34021 16.0117 3.3518 16.0433C3.45089 16.3136 3.85722 17.7527 2.25 19.8828C4.41667 20.914 6.71766 19.2188 6.71766 19.2188C8.30963 20.0597 10.2038 20.25 12 20.25C17.9583 20.25 21.75 17.1562 21.75 12Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="square" stroke-linejoin="round"/><path d="M12 8.75V15.25M8.75 12H15.25" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/> </svg>