Replace flume Selector with futures select for wasm compatibility

.github/workflows/release.yml

@@ -20,6 +20,9 @@ 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

.github/workflows/rust.yml

@@ -39,9 +39,8 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install Rust nightly
-        uses: dtolnay/rust-toolchain@master
+        uses: dtolnay/rust-toolchain@nightly
         with:
-          toolchain: nightly-2026-10-31
           targets: wasm32-unknown-unknown
           components: llvm-tools-preview
 
@@ -52,4 +51,4 @@ jobs:
         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
+        run: cargo +nightly check -p coop_web --target wasm32-unknown-unknown

.gitignore

@@ -24,4 +24,3 @@ dist/
 vendor/
 wasm/
 node_modules/
-.wrangler/

Cargo.toml

@@ -4,26 +4,27 @@ members = ["crates/*", "desktop", "web"]
 default-members = ["desktop"]
 
 [workspace.package]
-version = "2.0.0-alpha3"
+version = "2.0.0-alpha2"
 edition = "2024"
 publish = false
 
 [workspace.dependencies]
-gpui = { package = "gpui-pre", version = "0.3.10" }
+gpui = { package = "gpui-pre", version = "0.3.8" }
-gpui_platform = { package = "gpui-pre-platform", version = "0.3.10", features = ["font-kit", "x11", "wayland"] }
+gpui_platform = { package = "gpui-pre-platform", version = "0.3.8", features = ["font-kit", "x11", "wayland"] }
-gpui_linux = { package = "gpui-pre-linux", version = "0.3.10" }
+gpui_linux = { package = "gpui-pre-linux", version = "0.3.8" }
-gpui_windows = { package = "gpui-pre-windows", version = "0.3.10" }
+gpui_windows = { package = "gpui-pre-windows", version = "0.3.8" }
-gpui_macos = { package = "gpui-pre-macos", version = "0.3.10" }
+gpui_macos = { package = "gpui-pre-macos", version = "0.3.8" }
-gpui_web = { package = "gpui-pre-web", version = "0.3.10" }
+gpui_web = { package = "gpui-pre-web", version = "0.3.8" }
-gpui_util = { package = "gpui-pre-util", version = "0.3.10" }
+gpui_util = { package = "gpui-pre-util", version = "0.3.8" }
-reqwest_client = { package = "gpui-pre-reqwest-client", version = "0.3.10" }
+reqwest_client = { package = "gpui-pre-reqwest-client", version = "0.3.8" }
 gpui_tokio = { path = "crates/gpui_tokio" }
+gpui-base = "0.7.1"
+gpui-kit = "0.7.3"
 
-gpui-base = "0.8.1"
+# Native OS theme reading; the connector is written against gpui-component 0.7.x
-gpui-kit = "0.8.1"
+# 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 = { version = "0.7", features = ["native", "watch"] }
+native-theme-gpui = { version = "0.6.1", default-features = false, features = ["system-fonts"] }
-native-theme-gpui = { version = "0.7", default-features = false, features = ["system-fonts"] }
 
 # Nostr
 nostr-lmdb = { git = "https://github.com/rust-nostr/nostr" }
@@ -33,7 +34,6 @@ 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-sqlite = { git = "https://github.com/rust-nostr/nostr" }
 nostr = { git = "https://github.com/rust-nostr/nostr", features = [ "nip59", "nip49", "nip44", "nip98" ] }
 
 # Crypto (NIP-17 encrypted file messages)
@@ -50,7 +50,6 @@ rand = { version = "0.10", default-features = false, features = [ "std", "sys_rn
 
 # 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"

assets/icons/paperclip.svg

@@ -1,3 +0,0 @@
-<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>

assets/icons/speech.svg

@@ -1,3 +0,0 @@
-<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>

crates/assets/tests/icons.rs

@@ -0,0 +1,39 @@
+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}"
+        );
+    }
+}

crates/auto_update/src/source.rs

@@ -37,8 +37,9 @@ pub fn asset_filter_for(os: &str, arch: &str) -> Option<AssetFilter> {
     };
 
     let arch = match (os, arch) {
-        // cargo-packager names the disk images `aarch64`.
+        // cargo-packager names the disk images `aarch64`/`x64`.
         ("macos", "aarch64") => "aarch64",
+        ("macos", "x86_64") => "x64",
         // `script/bundle-linux` names the tarballs `aarch64`/`x86_64`.
         ("linux", "aarch64") => "aarch64",
         ("linux", "x86_64") => "x86_64",
@@ -242,7 +243,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"), None);
+        assert_eq!(selected("macos", "x86_64"), Some("Coop_1.0.1_x64.dmg"));
         assert_eq!(
             selected("linux", "aarch64"),
             Some("coop-linux-aarch64.tar.gz")
@@ -257,7 +258,6 @@ 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);
     }
 

crates/chat/src/lib.rs

@@ -11,12 +11,12 @@ use gpui::{
     App, AppContext, Context, Entity, EventEmitter, Global, SharedString, Subscription, Task,
     WeakEntity,
 };
-use instant::{Duration, Instant};
+use instant::Duration;
 use nip4e::{DeviceEvent, DeviceRegistry};
 use nostr_sdk::prelude::*;
 use person::PersonRegistry;
 use smallvec::{SmallVec, smallvec};
-use state::{DEVICE_GIFTWRAP, NostrRegistry, USER_GIFTWRAP, UniversalSigner};
+use state::{DEVICE_GIFTWRAP, NostrRegistry, USER_GIFTWRAP};
 
 mod message;
 mod room;
@@ -29,10 +29,7 @@ pub use state::FileAttachment;
 
 use crate::search::MessageSearchIndex;
 
-/// Upper bound on signals applied to the UI in a single update
+/// A static keypair used only for signing locally-cached rumor events.
-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) {
@@ -47,7 +44,6 @@ impl Global for GlobalChatRegistry {}
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
 pub enum ChatEvent {
     Ping,
-    Loaded,
     InboxRelayNotFound,
     Error(String),
 }
@@ -78,13 +74,6 @@ impl Signal {
     }
 }
 
-/// Which signer to attempt when unwrapping a gift wrap
-enum UnwrapRoute {
-    User,
-    Device,
-    Both,
-}
-
 /// Chat Registry
 #[derive(Debug)]
 pub struct ChatRegistry {
@@ -227,34 +216,32 @@ 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 {
-            const MAX_PROCESSED: usize = 10_000;
-
             let mut notifications = client.notifications();
             let mut processed_events = HashSet::new();
-
+            const MAX_PROCESSED: usize = 10_000;
-            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 { event, .. } => {
+                    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;
+                        }
+
                         // Prune the dedup set before it grows unbounded
                         if processed_events.len() >= MAX_PROCESSED {
                             processed_events.clear();
@@ -266,10 +253,8 @@ impl ChatRegistry {
 
                         // Handle msg relays event to determine when the app is ready to subscribe
                         if event.kind == Kind::InboxRelays {
-                            if user_key.is_none() {
+                            let current_user = signer.get_public_key_async().await?;
-                                user_key = signer.get_public_key_async().await.ok();
+                            if event.pubkey == current_user {
-                            }
-                            if Some(event.pubkey) == user_key {
                                 tx.send_async(Signal::InboxReady).await?;
                             }
                         }
@@ -285,39 +270,15 @@ 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
-                        let result = match route {
+                        match extract_rumor(
-                            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");
@@ -356,57 +317,35 @@ impl ChatRegistry {
             Ok(())
         }));
 
-        let tracking = self.tracking.clone();
-
         self.signal_consumer = Some(cx.spawn(async move |this, cx| {
-            while let Ok(first) = rx.recv_async().await {
+            while let Ok(message) = rx.recv_async().await {
-                // Batch whatever has already arrived so the UI updates once per burst
+                match message {
-                let mut messages = Vec::new();
+                    Signal::Message(message) => {
-                let mut errors = Vec::new();
+                        this.update(cx, |this, cx| {
-                let mut inbox_ready = false;
+                            this.new_message(message, cx);
-                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::InboxReady => {
-                    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);
                         })?;
                     }
-
+                    Signal::Eose => {
-                if !messages.is_empty() {
+                        this.update(cx, |this, _cx| {
-                    this.update(cx, |this, cx| {
+                            this.tracking.store(false, Ordering::Release);
-                        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);
                         })?;
                     }
+                    Signal::Error(failed) => {
+                        trash.update(cx, |this, cx| {
+                            this.insert(failed);
+                            cx.notify();
+                        })?;
+                    }
+                };
             }
 
             Ok(())
@@ -730,7 +669,6 @@ 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();
@@ -810,7 +748,6 @@ 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?;
@@ -838,15 +775,7 @@ 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()
                 {
@@ -882,17 +811,12 @@ impl ChatRegistry {
         })
     }
 
-    /// Parse nostr events into messages and push them to the belonging rooms
+    /// Parse a nostr event into a message and push it to the belonging room
     ///
-    /// - If a room doesn't exist, it will be created.
+    /// - If the room doesn't exist, it will be created.
-    /// - Room ordering is updated once after the whole batch.
+    /// - Updates room ordering based on the most recent messages.
-    pub(crate) fn new_messages(&mut self, messages: Vec<NewMessage>, cx: &mut Context<Self>) {
+    pub(crate) fn new_message(&mut self, message: NewMessage, cx: &mut Context<Self>) {
-        {
+        self.search.write().unwrap().insert(&message.rumor);
-            let mut search = self.search.write().unwrap();
-            for message in &messages {
-                search.insert(&message.rumor);
-            }
-        }
 
         let nostr = NostrRegistry::global(cx);
 
@@ -900,18 +824,17 @@ impl ChatRegistry {
             return;
         };
 
-        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
+                        && (message.rumor.pubkey == public_key || this.auto_trusted(public_key, cx))
-                                || 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
@@ -919,23 +842,19 @@ impl ChatRegistry {
             }
         }
     }
-
-        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(
+async fn extract_rumor<S, D>(
     client: &Client,
-    signer: &UniversalSigner,
+    signer: &S,
-    device_signer: Option<&UniversalSigner>,
+    device_signer: Option<&D>,
     gift_wrap: &Event,
-) -> Result<UnsignedEvent, Error> {
+) -> Result<UnsignedEvent, Error>
+where
+    S: AsyncNip44 + ?Sized,
+    D: AsyncNip44 + ?Sized,
+{
     // Try to get cached rumor first
     if let Ok(rumor) = get_rumor(client, gift_wrap.id).await {
         return Ok(rumor);
@@ -947,11 +866,7 @@ async fn extract_rumor(
             let Some(device_signer) = device_signer else {
                 return Err(error);
             };
-            match try_unwrap_with(device_signer, gift_wrap).await {
+            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;
@@ -973,10 +888,10 @@ async fn extract_rumor(
 }
 
 /// Attempts to unwrap a gift wrap event with a given signer.
-async fn try_unwrap_with(
+async fn try_unwrap_with<S>(signer: &S, gift_wrap: &Event) -> Result<UnwrappedGift, Error>
-    signer: &UniversalSigner,
+where
-    gift_wrap: &Event,
+    S: AsyncNip44 + ?Sized,
-) -> Result<UnwrappedGift, Error> {
+{
     // Get the sealed event
     let seal = signer
         .nip44_decrypt_async(&gift_wrap.pubkey, &gift_wrap.content)
@@ -1007,50 +922,21 @@ async fn try_unwrap_with(
     })
 }
 
-/// 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 = Tags::from_list(vec![
+    let tags = vec![
         Tag::identifier(id),
         Tag::public_key(rumor.pubkey),
         Tag::custom("r", [room_id]),
         Tag::custom("k", [rumor.kind.to_string()]),
-    ]);
+    ];
 
-    let public_key = LOCAL_KEYS.public_key();
+    let event = EventBuilder::new(Kind::ApplicationSpecificData, rumor.as_json())
-    let created_at = Timestamp::now();
+        .tags(tags)
-    let kind = Kind::ApplicationSpecificData;
+        .finalize_async(&*LOCAL_KEYS)
-    let content = rumor.as_json();
+        .await?;
-
-    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?;
 

crates/chat/src/room.rs

@@ -16,7 +16,6 @@ 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)]
@@ -554,7 +553,6 @@ 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);
@@ -576,28 +574,6 @@ 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(

crates/chat_ui/Cargo.toml

@@ -6,16 +6,14 @@ publish.workspace = true
 
 [dependencies]
 state = { path = "../state" }
-speech = { path = "../speech" }
 ui = { path = "../ui" }
-gpui-kit = { workspace = true, features = ["speech"] }
+gpui-kit.workspace = true
 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

crates/chat_ui/src/actions.rs

@@ -1,4 +1,4 @@
-use gpui::{Action, actions};
+use gpui::Action;
 use nostr_sdk::prelude::*;
 use serde::Deserialize;
 use settings::SignerKind;
@@ -15,6 +15,3 @@ pub enum Command {
     Njump(PublicKey),
     Trace(EventId),
 }
-
-// Start or stop dictation in the focused composer
-actions!(chat, [ToggleDictation]);

crates/chat_ui/src/lib.rs

@@ -1,6 +1,5 @@
 use std::collections::{BTreeMap, HashMap, HashSet};
 use std::sync::{Arc, LazyLock, RwLock};
-use std::time::Duration;
 
 pub use actions::*;
 use anyhow::Error;
@@ -21,7 +20,6 @@ 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;
@@ -30,14 +28,13 @@ use person::{Directory, Person};
 use regex::Regex;
 use settings::{AppSettings, SignerKind};
 use smallvec::{SmallVec, smallvec};
-use speech::speaker::{END_GRACE, Speaker};
 use state::{
     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,
+    REACTION_EMOJIS, ReactionBar, RenderedText, ReplyPreview, WelcomeMessage, group_reactions,
-    group_reactions, opens_run, rendered_text,
+    opens_run, rendered_text,
 };
 
 use crate::file::*;
@@ -46,7 +43,8 @@ use crate::file::*;
 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.
+/// Regex matching strings that consist entirely of emoji characters,
+/// zero-width joiners, variation selectors, and keycap combiners.
 static EMOJI_RE: LazyLock<Regex> =
     LazyLock::new(|| Regex::new(r"^[\p{Emoji}\u{200D}\u{FE0F}\u{20E3}]+$").unwrap());
 
@@ -65,50 +63,60 @@ 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>>>,
-    subscriptions: SmallVec<[Subscription; 4]>,
+
+    /// Event subscriptions
+    subscriptions: SmallVec<[Subscription; 3]>,
 }
 
 impl ChatPanel {
@@ -152,19 +160,6 @@ 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);
@@ -183,39 +178,15 @@ impl ChatPanel {
 
         subscriptions.push(
             // Subscribe the subject input event
-            cx.subscribe_in(&subject_input, window, move |this, _, event, window, cx| {
+            cx.subscribe_in(
+                &subject_input,
+                window,
+                move |this, _input, 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
@@ -225,20 +196,6 @@ 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,
@@ -249,11 +206,6 @@ impl ChatPanel {
             directory,
             list_state,
             input,
-            speech,
-            speech_started: None,
-            speaker,
-            speech_reveal: None,
-            reveal_timeout: None,
             subject_input,
             subject_bar,
             replies_to,
@@ -264,7 +216,7 @@ impl ChatPanel {
             reports_by_id,
             uploading: false,
             subscriptions,
-            tasks: vec![reveal_end_task],
+            tasks: vec![],
         }
     }
 
@@ -883,17 +835,6 @@ 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) => {
@@ -1193,15 +1134,6 @@ 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)
@@ -1226,7 +1158,7 @@ impl ChatPanel {
             .when(has_replies, |this| {
                 this.children(self.render_message_replies(replies, cx))
             })
-            .when(message.file.is_none(), |this| this.child(body))
+            .when(message.file.is_none(), |this| this.child(rendered_text))
             .child(MessageMedia::new(&message.media))
             .when_some(message.file.as_ref(), |this, file| {
                 this.child(self.render_message_file(&id, file, cx))
@@ -1458,60 +1390,18 @@ impl ChatPanel {
         }
 
         let reply_id = *id;
+        let copy_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(),
-            )
-        } else {
         actions
-        };
+            .reply(cx.listener(move |this, _event, _window, cx| {
-
+                this.reply_to(&reply_id, cx);
-        let speaking = self.speech_reveal.is_some();
+            }))
-        let speech_id = *id;
+            .copy(cx.listener(move |this, _event, _window, cx| {
-
+                this.copy_message(&copy_id, cx);
-        let actions = actions.speech(
+            }))
-            speaking,
+            .dropdown(move |menu, _window, _cx| {
-            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();
-                        }
-                        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)))
             })
@@ -1779,12 +1669,7 @@ impl ChatPanel {
         items
     }
 
-    fn render_config_menu(
+    fn render_config_menu(&self, _window: &mut Window, cx: &Context<Self>) -> impl IntoElement {
-        &self,
-        disabled: bool,
-        _window: &mut Window,
-        cx: &Context<Self>,
-    ) -> impl IntoElement {
         let (backup, signer_kind) = self
             .room
             .read_with(cx, |this, _cx| {
@@ -1797,7 +1682,6 @@ impl ChatPanel {
             .icon(IconName::Settings2)
             .tooltip("Configuration")
             .ghost()
-            .disabled(disabled)
             .dropdown_menu(move |this, _window, _cx| {
                 let auto = matches!(signer_kind, SignerKind::Auto);
                 let encryption = matches!(signer_kind, SignerKind::Encryption);
@@ -1828,12 +1712,7 @@ impl ChatPanel {
             })
     }
 
-    fn render_emoji_menu(
+    fn render_emoji_menu(&self, _window: &Window, cx: &Context<Self>) -> impl IntoElement {
-        &self,
-        disabled: bool,
-        _window: &Window,
-        cx: &Context<Self>,
-    ) -> impl IntoElement {
         let nostr = NostrRegistry::global(cx);
         let current_user = nostr.read(cx).current_user();
 
@@ -1850,7 +1729,6 @@ impl ChatPanel {
         Button::new("emoji")
             .icon(IconName::Emoji)
             .ghost()
-            .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())))
@@ -1924,12 +1802,10 @@ 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(
@@ -2003,55 +1879,26 @@ impl Render for ChatPanel {
                             .items_end()
                             .child(
                                 Button::new("upload")
-                                    .icon(IconName::Paperclip)
+                                    .icon(IconName::Plus)
                                     .tooltip("Upload media")
                                     .loading(self.uploading)
-                                    .disabled(dictating || self.uploading)
+                                    .disabled(self.uploading)
                                     .ghost()
                                     .on_click(cx.listener(move |this, _ev, window, cx| {
                                         this.upload(window, cx);
                                     })),
                             )
-                            .when(dictating, |this| {
+                            .child(Textarea::new(&self.input).appearance(false).flex_1())
-                                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(dictating, window, cx))
+                                    .child(self.render_emoji_menu(window, cx))
-                                    .child(self.render_config_menu(dictating, window, cx))
+                                    .child(self.render_config_menu(window, cx))
                                     .child(
                                         Button::new("send")
                                             .icon(IconName::PaperPlaneFill)
-                                            .disabled(dictating || self.uploading)
+                                            .disabled(self.uploading)
                                             .ghost()
                                             .on_click(cx.listener(move |this, _ev, window, cx| {
                                                 this.send_text_message(window, cx);

crates/nip29_ui/Cargo.toml

@@ -11,13 +11,11 @@ common = { path = "../common" }
 nip29 = { path = "../nip29" }
 person = { path = "../person" }
 settings = { path = "../settings" }
-speech = { path = "../speech" }
 state = { path = "../state" }
-gpui-kit = { workspace = true, features = ["speech"] }
+gpui-kit.workspace = true
 ui = { path = "../ui" }
 
 gpui.workspace = true
-instant.workspace = true
 nostr-sdk.workspace = true
 anyhow.workspace = true
 log.workspace = true

crates/nip29_ui/src/lib.rs

@@ -1,14 +1,11 @@
 use std::collections::BTreeMap;
-use std::time::Duration;
 
 use anyhow::Result;
-use chat_ui::ToggleDictation;
 use gpui::prelude::FluentBuilder;
 use gpui::{
     Action, AnyElement, App, AppContext, Context, Entity, EventEmitter, FocusHandle, Focusable,
-    FollowMode, InteractiveElement, IntoElement, ListAlignment, ListScrollEvent, ListState,
+    FollowMode, IntoElement, ListAlignment, ListScrollEvent, ListState, ParentElement, Render,
-    ParentElement, Render, SharedString, Styled, Subscription, Task, WeakEntity, Window, div, list,
+    SharedString, Styled, Subscription, Task, WeakEntity, Window, div, list, px,
-    px,
 };
 use gpui_kit::assets::IconName;
 use gpui_kit::base::StyledExt as _;
@@ -18,7 +15,6 @@ 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::*;
@@ -26,9 +22,8 @@ use person::Directory;
 use serde::Deserialize;
 use settings::AppSettings;
 use smallvec::{SmallVec, smallvec};
-use speech::speaker::Speaker;
 use state::{NostrRegistry, pick_file, upload_file};
-use ui::{Avatar, RenderedText, RevealText, WelcomeMessage, rendered_text};
+use ui::{Avatar, RenderedText, WelcomeMessage, rendered_text};
 use util::{attachment_name, display_name, opens_run, pin_label, report};
 
 mod details;
@@ -317,16 +312,6 @@ 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.
@@ -334,7 +319,7 @@ pub struct GroupPanel {
     /// Whether the user closed the encryption notice this visit
     notice_dismissed: bool,
     tasks: SmallVec<[Task<Result<()>>; 4]>,
-    _subscriptions: SmallVec<[Subscription; 4]>,
+    _subscriptions: SmallVec<[Subscription; 3]>,
 }
 
 impl GroupPanel {
@@ -353,18 +338,6 @@ 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(
@@ -375,34 +348,6 @@ 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);
@@ -426,24 +371,9 @@ impl GroupPanel {
                     }
                 },
             ));
-            this.track_participants(cx);
         });
 
-        // End the speech reveal when the utterance finishes ahead of its estimate
+        let mut this = Self {
-        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),
@@ -453,19 +383,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![reveal_end_task],
+            tasks: smallvec![],
             _subscriptions: subscriptions,
-        }
+        };
+
+        this.track_participants(cx);
+
+        this
     }
 
-    /// Track the keys rendered by this panel.
+    /// Track the keys rendered by this panel: members, message authors, and
+    /// activity subjects
     fn track_participants(&mut self, cx: &mut Context<Self>) {
         let Some(group) = self.group.upgrade() else {
             return;
@@ -1043,13 +973,7 @@ impl GroupPanel {
         let nostr = NostrRegistry::global(cx);
         let directory = self.directory.clone();
 
-        let content = match self
+        let content = 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(|| {
@@ -1064,8 +988,7 @@ impl GroupPanel {
                     cx,
                 )
             })
-                .element(ix.into(), window, cx),
+            .element(ix.into(), window, cx);
-        };
 
         let admin = nostr
             .read(cx)
@@ -1086,24 +1009,12 @@ 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);
@@ -1129,8 +1040,6 @@ impl GroupPanel {
             return self.render_notice(&notice, cx);
         }
 
-        let dictating = self.speech.read(cx).status().is_active();
-
         v_flex()
             .flex_shrink_0()
             .w_full()
@@ -1146,45 +1055,21 @@ impl GroupPanel {
                     .items_end()
                     .child(
                         Button::new("upload")
-                            .icon(ui::IconName::Paperclip)
+                            .icon(IconName::Upload)
-                            .tooltip("Upload media")
+                            .tooltip("Upload file")
                             .loading(self.uploading)
-                            .disabled(dictating || self.uploading)
+                            .disabled(self.uploading)
                             .ghost()
                             .on_click(cx.listener(|this, _event, window, cx| {
                                 this.upload(window, cx);
                             })),
                     )
-                    .when(dictating, |this| {
+                    .child(Textarea::new(&self.input).appearance(false).flex_1())
-                        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(ui::IconName::PaperPlaneFill)
                             .tooltip("Send")
                             .ghost()
-                            .disabled(dictating || self.uploading)
                             .on_click(cx.listener(|this, _event, window, cx| {
                                 this.send(window, cx);
                             })),
@@ -1382,7 +1267,6 @@ 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))

crates/nip29_ui/src/message.rs

@@ -8,17 +8,15 @@ use gpui::{
 use gpui_kit::assets::IconName;
 use gpui_kit::base::StyledExt as _;
 use gpui_kit::component::menu::{ContextMenuExt as _, PopupMenuItem};
-use gpui_kit::component::notification::Notification;
+use gpui_kit::component::{ActiveTheme, Icon, Sizable, h_flex};
-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, MessageActions, MessageMedia, MessageRow, REACTION_EMOJIS, ReactionBar, ReplyPreview,
+    Avatar, MessageMedia, MessageRow, REACTION_EMOJIS, ReactionBar, ReplyPreview, group_reactions,
-    group_reactions, react_menu,
+    react_menu,
 };
 
 use crate::GroupPanel;
@@ -28,8 +26,6 @@ pub(crate) struct Actions {
     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>,
 }
 
@@ -91,44 +87,10 @@ pub(crate) fn render(
     let admin = actions.admin;
     let pinned = actions.pinned;
     let group = actions.group;
-    let speech_panel = actions.panel;
+    let 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)
-                    }
-                }
-            });
-        }),
-    );
 
+    // Reading the panel here would re-enter its ongoing update, so resolve
+    // the current user's custom emojis through the shared person directory.
     let custom = nostr
         .read(cx)
         .current_user()

crates/nip4e/src/lib.rs

@@ -1,10 +1,9 @@
 use std::cell::Cell;
-use std::collections::{HashSet, VecDeque};
+use std::collections::HashSet;
 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::{
@@ -17,14 +16,12 @@ 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, NIP4E_ROTATION_MAX_DAYS, NIP4E_ROTATION_MIN_DAYS};
+use settings::AppSettings;
 use smallvec::{SmallVec, smallvec};
-use state::{Announcement, NostrRegistry, UniversalSigner, credentials};
+use state::{Announcement, CLIENT_NAME, NostrRegistry, UniversalSigner};
 use ui::Avatar;
 
-mod storage;
+const IDENTIFIER: &str = "coop:device";
-
-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);
@@ -62,18 +59,10 @@ impl DeviceEvent {
 #[derive(Debug)]
 pub struct DeviceRegistry {
     signer: Entity<Option<UniversalSigner>>,
-    /// Ephemeral client key for the in-flight key request; never persisted
+    /// Whether there is a pending request for encryption key approval
-    app_keys: Option<Keys>,
+    pub(crate) pending_request: bool,
-    /// 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
@@ -119,21 +108,6 @@ 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);
                 }
@@ -141,19 +115,15 @@ impl DeviceRegistry {
         );
 
         cx.defer(move |cx| {
-            let _ = entity.update(cx, |this, cx| {
+            entity
-                this.handle_notifications(cx);
+                .update(cx, |this, cx| this.handle_notifications(cx))
-            });
+                .ok();
         });
 
         Self {
             signer,
-            app_keys: None,
+            pending_request: false,
-            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![],
@@ -171,8 +141,6 @@ 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();
@@ -207,21 +175,6 @@ 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) => {
@@ -238,7 +191,7 @@ impl DeviceRegistry {
                     // New response event from the master device
                     Kind::Custom(4455) => {
                         this.update(cx, |this, cx| {
-                            this.handle_transfer(event, cx);
+                            this.extract_encryption(event, cx);
                         })?;
                     }
                     _ => {}
@@ -248,62 +201,12 @@ impl DeviceRegistry {
         }));
     }
 
-    /// Record a handled key-sync request id, persisting a bounded log
+    /// Set whether there is a pending request for encryption key approval
-    fn mark_request_processed(&mut self, event_id: EventId, cx: &mut Context<Self>) {
+    fn set_pending_request(&mut self, pending: bool, cx: &mut Context<Self>) {
-        if self.processed_requests.contains(&event_id) {
+        self.pending_request = pending;
-            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()
@@ -315,16 +218,9 @@ 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);
     }
 
-    /// 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);
@@ -427,88 +323,6 @@ 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);
@@ -517,7 +331,6 @@ 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
@@ -527,7 +340,7 @@ impl DeviceRegistry {
                 .await?;
 
             // Persist the key locally before announcing it
-            set_keys(&client, &signer, &secret, created_at).await?;
+            set_keys(&client, &signer, &secret).await?;
 
             // Publish announcement
             client
@@ -570,12 +383,10 @@ 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.resync.store(true, Ordering::Release);
+                    this.request(cx);
-                    this.request(Some(device_pubkey), cx);
                 })?;
             }
             Ok(())
@@ -603,17 +414,15 @@ impl DeviceRegistry {
     }
 
     /// Request encryption keys from other device
-    pub(crate) fn request(
+    pub(crate) fn request(&mut self, cx: &mut Context<Self>) {
-        &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 = self.app_keys.get_or_insert_with(Keys::generate).clone();
+
+        let app_keys_task = get_or_init_app_keys(cx);
 
         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?;
 
@@ -625,7 +434,8 @@ 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
+                // Only reuse the stored approval if its key is still valid,
+                // otherwise it's stale and a fresh request is needed
                 if decrypt_approval(&client, &app_keys, public_key, &event)
                     .await
                     .is_ok()
@@ -634,26 +444,9 @@ 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(tags)
+                .tags(vec![Tag::custom("P", vec![app_pubkey])])
                 .finalize_async(&signer)
                 .await?;
 
@@ -690,13 +483,19 @@ 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(),
@@ -706,7 +505,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 client key matter
+                // Only approvals addressed to this device's app key matter
                 let filter = Filter::new()
                     .kind(Kind::Custom(4455))
                     .author(public_key)
@@ -730,18 +529,15 @@ 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?;
 
@@ -753,14 +549,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) => {
-                    log::warn!("Ignoring key transfer: {e}");
+                    this.update(cx, |_this, cx| {
+                        cx.emit(DeviceEvent::error(e.to_string()));
+                    })?;
                 }
             }
             Ok(())
@@ -814,58 +610,40 @@ 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 =
+            let target = event
-                client_pubkey_from_event(&event).context("Target is not a valid public key")?;
+                .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")?;
 
-            // The requester may pin the exact key it expects
+            // Encrypt the device keys with the user's signer
-            if let Some(requested) = requested_encryption_key(&event)
+            let payload = keys.nip44_encrypt_async(&target, &secret).await?;
-                && 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 one-time sender key used for the encryption
+            // P tag: the current device's public key
-            // p tag: the account identity, for inbox routing
+            // p tag: the requester's public key
-            // p tag: the requester's client key
+            let event = EventBuilder::new(Kind::Custom(4455), payload)
-            let response = EventBuilder::new(Kind::Custom(4455), payload)
                 .tags(vec![
-                    Tag::custom("P", vec![sender.public_key().to_hex()]),
+                    Tag::custom("P", vec![keys.public_key().to_hex()]),
-                    Tag::public_key(identity),
                     Tag::public_key(target),
                 ])
                 .finalize_async(&signer)
                 .await?;
 
-            let relays = merge_relays(
+            // Send the response event to the user's relay list
-                write_relay_hints(&client, identity).await?,
+            client.send_event(&event).to_nip65().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(())
         });
@@ -874,11 +652,8 @@ 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.pending_request = None;
+                        this.set_pending_request(false, cx);
-                        cx.notify();
                     })?;
 
                     cx.update(|window, cx| {
@@ -903,70 +678,21 @@ impl DeviceRegistry {
 
     /// Handle encryption request
     fn ask_for_approval(&mut self, event: Event, cx: &mut Context<Self>) {
-        let Some(client_key) = client_pubkey_from_event(&event) else {
+        // Ignore if there is already a pending request
-            log::warn!("Ignoring invalid encryption key request: no valid requester key");
+        if self.pending_request {
-            return;
-        };
-
-        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;
         }
+        self.set_pending_request(true, cx);
 
-                match this.pending_request.take() {
+        let notification = match self.notification(event, cx) {
-                    // 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);
@@ -989,16 +715,18 @@ impl DeviceRegistry {
                            compare the code with the one shown on the requesting \
                            device.";
 
-        let requester =
+        let requester = event
-            client_pubkey_from_event(&event).context("Request has no valid requester key")?;
+            .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 code = authorization_code(&requester);
-        let code_label = code.clone();
-
         let directory = self.directory.clone();
-        directory.update(cx, |directory, cx| {
+        directory.update(cx, |directory, cx| directory.track([requester], cx));
-            directory.track([requester], cx);
+        let code_label = code.clone();
-        });
 
         let entity = cx.entity().downgrade();
         let loading = Rc::new(Cell::new(false));
@@ -1103,111 +831,6 @@ 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();
@@ -1215,6 +838,36 @@ 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,
@@ -1222,7 +875,13 @@ async fn decrypt_approval(
     identity: PublicKey,
     event: &Event,
 ) -> Result<Keys, Error> {
-    let master = client_pubkey_from_event(event).context("Invalid event's tags")?;
+    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 decrypted = app_keys
         .nip44_decrypt_async(&master, event.content.as_str())
@@ -1231,41 +890,13 @@ 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);
 
-    let announcement = client
+    if let Some(announcement) = client.database().query(filter).await?.into_iter().next() {
-        .database()
-        .query(filter.clone())
-        .await?
-        .into_iter()
-        .next();
-
-    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()
@@ -1277,6 +908,53 @@ async fn decrypt_approval(
         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"))
+    }
+}

crates/nip4e/src/storage.rs

@@ -1,174 +0,0 @@
-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))
-}

crates/person/src/lib.rs

@@ -54,7 +54,7 @@ impl EventEmitter<PersonEvent> for PersonRegistry {}
 
 #[derive(Debug, Clone)]
 enum Dispatch {
-    Person(Box<Person>),
+    Person(Person),
     Announcement(Event),
     Relays(Event),
     Emojis(Event),
@@ -111,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);
@@ -175,11 +175,7 @@ impl PersonRegistry {
                         let metadata = Metadata::from_json(&event.content).unwrap_or_default();
                         let person = Person::new(event.pubkey, metadata);
 
-                        if tx
+                        if tx.send_async(Dispatch::Person(person)).await.is_err() {
-                            .send_async(Dispatch::Person(Box::new(person)))
-                            .await
-                            .is_err()
-                        {
                             log::warn!("Channel closed, dropping metadata event");
                         }
                     }

crates/person/src/person.rs

@@ -144,13 +144,6 @@ 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);
     }
 

crates/person/src/wot.rs

@@ -232,7 +232,6 @@ impl WebOfTrust {
             .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
@@ -266,13 +265,12 @@ impl WebOfTrust {
 
                     this.snapshot = Some(snapshot);
                     cx.emit(WoTEvent);
+                    cx.notify();
 
                     if grew {
                         this.sync(cx);
                     }
                 }
-
-                cx.notify();
             })
             .ok();
         }));
@@ -316,11 +314,6 @@ 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

crates/settings/src/lib.rs

@@ -100,12 +100,7 @@ pub fn persisted_theme() -> ThemeSettings {
 
 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";
 
@@ -152,7 +147,6 @@ 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,
@@ -228,9 +222,6 @@ 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,
@@ -263,7 +254,6 @@ 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,
@@ -340,40 +330,22 @@ impl AppSettings {
         });
     }
 
+    /// Apply the persisted theme tuning on top of the active theme
     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 theme = Self::get_theme(cx);
         let styled = Theme::global_mut(cx);
-            styled.font_size = px(tuning.font_size);
+        styled.font_size = px(theme.font_size);
-            styled.focus_ring = tuning.focus_ring;
+        styled.focus_ring = theme.focus_ring;
-            if let Some(radius) = tuning.radius {
+        if let Some(radius) = theme.radius {
             styled.radius = px(radius);
         }
-            if let Some(radius_lg) = tuning.radius_lg {
+        if let Some(radius_lg) = theme.radius_lg {
             styled.radius_lg = px(radius_lg);
         }
-        }
+        Theme::sync_base(cx);
-
+        cx.refresh_windows();
-        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
@@ -444,8 +416,7 @@ impl AppSettings {
             AppearanceMode::Light => Theme::change(gpui_kit::component::ThemeMode::Light, None, cx),
             AppearanceMode::Dark => Theme::change(gpui_kit::component::ThemeMode::Dark, None, cx),
         }
-        let tuning = self.inner.read(cx).theme;
+        cx.refresh_windows();
-        Self::apply_theme_tuning(tuning, cx);
     }
 
     /// Check if decoupling encryption key is enabled

crates/speech/Cargo.toml

@@ -1,31 +0,0 @@
-[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"] }

crates/speech/src/lib.rs

@@ -1,54 +0,0 @@
-#[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
-}

crates/speech/src/model.json

@@ -1,23 +0,0 @@
-{
-  "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"
-    }
-  ]
-}

crates/speech/src/model.rs

@@ -1,295 +0,0 @@
-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('/'))
-        );
-    }
-}

crates/speech/src/parakeet.rs

@@ -1,214 +0,0 @@
-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"))
-}

crates/speech/src/speaker.rs

@@ -1,88 +0,0 @@
-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()
-    }
-}

crates/speech/src/web.rs

@@ -1,256 +0,0 @@
-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}")
-}

crates/state/Cargo.toml

@@ -20,7 +20,6 @@ futures.workspace = true
 anyhow.workspace = true
 webbrowser.workspace = true
 serde_json.workspace = true
-log.workspace = true
 
 mime_guess = "2.0.4"
 
@@ -32,7 +31,6 @@ data-encoding.workspace = true
 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 = [
@@ -45,8 +43,6 @@ web-sys = { version = "0.3", features = [
     "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" }

crates/state/src/credentials.rs

@@ -1,13 +1,10 @@
 use anyhow::Result;
 #[cfg(target_arch = "wasm32")]
 use common::web_store;
-use gpui::{App, AppContext as _, Task};
+use gpui::{App, 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>)>>> {
@@ -52,54 +49,3 @@ pub(crate) fn delete(cx: &App) -> Task<Result<()>> {
         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)
-}

crates/state/src/lib.rs

@@ -16,18 +16,18 @@ 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 credentials;
 mod file;
 mod nip05;
 mod nip4e;
 mod signer;
 
-#[cfg(target_arch = "wasm32")]
-pub mod web_database;
 #[cfg(target_arch = "wasm32")]
 pub mod web_file;
 
@@ -114,6 +114,7 @@ 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"))
@@ -122,7 +123,7 @@ impl NostrRegistry {
         });
 
         #[cfg(target_arch = "wasm32")]
-        let database = web_database::take();
+        let database = MemoryDatabase::unbounded();
 
         // Construct the nostr client
         let client = ClientBuilder::default()
@@ -476,13 +477,16 @@ impl NostrRegistry {
         cx.notify();
     }
 
-    /// Connect the browser extension signer (NIP-07).
+    /// Connect the browser extension signer (NIP-07), remembering the choice so
+    /// reloads reconnect automatically
     #[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::error(format!(
+                    "No Nostr extension found: {e}. Install a NIP-07 extension like Alby or nos2x."
+                )));
                 cx.emit(StateEvent::NoSigner);
                 return;
             }
@@ -491,6 +495,7 @@ impl NostrRegistry {
         self.tasks.push(cx.spawn(async move |this, cx| {
             match signer.get_public_key_async().await {
                 Ok(public_key) => {
+                    // Remember the choice so reloads reconnect automatically
                     this.update(cx, |this, cx| {
                         credentials::write(cx, "extension", b"extension").detach_and_log_err(cx);
                         this.signer.swap_inner(signer);
@@ -502,6 +507,8 @@ impl NostrRegistry {
                     })?;
                 }
                 Err(e) => {
+                    // Drop the remembered choice so the next visit does not
+                    // retry a signer that is no longer answering
                     this.update(cx, |_, cx| {
                         credentials::delete(cx).detach_and_log_err(cx);
                         cx.emit(StateEvent::error(e.to_string()));

crates/state/src/nip4e.rs

@@ -5,10 +5,6 @@ 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 {
@@ -20,20 +16,11 @@ impl Announcement {
             .and_then(|tag| tag.content())
             .and_then(|c| PublicKey::parse(c).ok())?;
 
-        Some(Self {
+        Some(Self { public_key })
-            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)
-    }
 }

crates/state/src/web_database.rs

@@ -1,62 +0,0 @@
-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
-        }
-    }
-}

crates/ui/src/icon.rs

@@ -20,17 +20,14 @@ pub enum IconName {
     Link,
     Lock,
     Message,
-    Paperclip,
     PaperPlaneFill,
     Plus,
     PlusChat,
     Profile,
     Relay,
-    Speech,
     Search,
     Settings,
     Settings2,
-    Unlock,
     Upload,
     Warning,
 }
@@ -54,17 +51,14 @@ impl IconNamed for IconName {
             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",
         }

crates/ui/src/message.rs

@@ -1,21 +1,18 @@
 use std::collections::BTreeMap;
 use std::rc::Rc;
-use std::time::Duration;
 
 use gpui::prelude::FluentBuilder as _;
 use gpui::{
-    Animation, AnimationExt as _, AnyElement, App, ClickEvent, Context, ElementId,
+    AnyElement, App, ClickEvent, Context, ElementId, InteractiveElement as _, IntoElement,
-    InteractiveElement as _, IntoElement, MouseButton, MouseDownEvent, ObjectFit,
+    MouseButton, MouseDownEvent, ObjectFit, ParentElement as _, RenderOnce, SharedString,
-    ParentElement as _, RenderOnce, SharedString, SharedUri, StatefulInteractiveElement as _,
+    SharedUri, StatefulInteractiveElement as _, StyleRefinement, Styled, StyledImage, Window, div,
-    StyleRefinement, Styled, StyledImage, Window, div, img, px,
+    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, Disableable, InteractiveElementExt as _, Sizable as _, StyledExt as _, h_flex,
+    ActiveTheme, InteractiveElementExt as _, Sizable as _, StyledExt as _, h_flex, v_flex,
-    v_flex,
 };
 use smallvec::SmallVec;
 
@@ -599,14 +596,13 @@ pub fn react_menu(
     })
 }
 
-/// A hovered message's action bar: quick reactions, reply, copy, read aloud, and an overflow menu.
+/// A hovered message's action bar: quick reactions, reply, copy, and an overflow menu.
 #[derive(IntoElement)]
 pub struct MessageActions {
     style: StyleRefinement,
     reactions: SmallVec<[(&'static str, SharedClickListener); 4]>,
     reply: Option<SharedClickListener>,
-    copy: Option<(ElementId, SharedString)>,
+    copy: Option<SharedClickListener>,
-    speech: Option<(bool, SharedClickListener)>,
     dropdown: Option<DropdownBuilder>,
 }
 
@@ -618,7 +614,6 @@ impl MessageActions {
             reactions: SmallVec::new(),
             reply: None,
             copy: None,
-            speech: None,
             dropdown: None,
         }
     }
@@ -639,20 +634,9 @@ impl MessageActions {
         self
     }
 
-    /// Add the copy button for the given value.
+    /// Add the copy button.
-    /// The id must be unique per bar, the clipboard component keys its copied state on it.
+    pub fn copy(mut self, handler: impl Fn(&ClickEvent, &mut Window, &mut App) + 'static) -> Self {
-    pub fn copy(mut self, id: impl Into<ElementId>, value: impl Into<SharedString>) -> Self {
+        self.copy = Some(Rc::new(handler));
-        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
     }
 
@@ -685,13 +669,10 @@ impl RenderOnce for MessageActions {
             reactions,
             reply,
             copy,
-            speech,
             dropdown,
         } = self;
 
-        // The leading separator only separates reactions from the center buttons
+        let has_center = reply.is_some() || copy.is_some();
-        let has_center =
-            !reactions.is_empty() && (reply.is_some() || copy.is_some() || speech.is_some());
 
         h_flex()
             .p_0p5()
@@ -726,18 +707,14 @@ impl RenderOnce for MessageActions {
                         .on_click(move |event, window, cx| reply(event, window, cx)),
                 )
             })
-            .when_some(copy, |this, (id, value)| {
+            .when_some(copy, |this, copy| {
-                this.child(Clipboard::new(id).value(value).tooltip("Copy").small())
-            })
-            .when_some(speech, |this, (disabled, speech)| {
                 this.child(
-                    Button::new("speech")
+                    Button::new("copy")
-                        .icon(crate::IconName::Speech)
+                        .icon(IconName::Copy)
-                        .tooltip("Read aloud")
+                        .tooltip("Copy")
                         .small()
                         .ghost()
-                        .disabled(disabled)
+                        .on_click(move |event, window, cx| copy(event, window, cx)),
-                        .on_click(move |event, window, cx| speech(event, window, cx)),
                 )
             })
             .when_some(dropdown, |this, dropdown| {
@@ -754,44 +731,3 @@ impl RenderOnce for MessageActions {
             .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())
-                }))
-            },
-        )
-    }
-}

crates/workspace/Cargo.toml

@@ -15,7 +15,6 @@ 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" }
 
@@ -28,5 +27,4 @@ nostr-connect.workspace = true
 anyhow.workspace = true
 serde.workspace = true
 log.workspace = true
-rand.workspace = true
 smallvec.workspace = true

crates/workspace/src/dialogs/import.rs

@@ -1,18 +1,15 @@
 use anyhow::Error;
 use gpui::prelude::FluentBuilder;
 use gpui::{
-    App, AppContext, Context, Div, Entity, IntoElement, ParentElement, Render, SharedString,
+    App, AppContext, Context, Entity, IntoElement, ParentElement, Render, SharedString, Styled,
-    Styled, Subscription, Task, Window, div, px, relative,
+    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, StateEvent};
-use ui::IconName;
 
 pub fn open(window: &mut Window, cx: &mut App) {
     let import = cx.new(|cx| ImportIdentity::new(window, cx));
@@ -32,9 +29,11 @@ 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.close_button(false)
+        this.width(px(450.))
+            .close_button(false)
             .overlay_closable(false)
             .keyboard(false)
+            .title("Unlock your identity")
             .child(import.clone())
     });
 }
@@ -76,15 +75,7 @@ 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| {
+        let pass_input = cx.new(|cx| InputState::new(window, cx).masked(true));
-            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);
 
@@ -245,59 +236,15 @@ 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_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");
@@ -311,19 +258,25 @@ impl Render for ImportIdentity {
             .child(
                 v_flex()
                     .gap_2()
-                    .child(
+                    .when(!is_unlock, |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(require_password, |this| {
+                    })
+                    .when(is_unlock || require_password, |this| {
                         this.child(
                             v_flex()
                                 .gap_1()
                                 .text_color(cx.theme().muted_foreground)
-                                .child("Decrypt Password:")
+                                .child(if is_unlock {
+                                    "Passphrase to unlock your identity:"
+                                } else {
+                                    "Decrypt Password:"
+                                })
                                 .child(Input::new(&self.pass_input)),
                         )
                     })
@@ -369,9 +322,9 @@ impl Render for ImportIdentity {
                     }),
             )
             .child({
-                let content = v_flex().gap_1().child(
+                let content = v_flex().child(
                     Button::new("login")
-                        .label("Continue")
+                        .label(if is_unlock { "Unlock" } else { "Continue" })
                         .primary()
                         .loading(self.loading)
                         .disabled(self.loading)
@@ -381,26 +334,30 @@ impl Render for ImportIdentity {
                 );
 
                 #[cfg(not(target_arch = "wasm32"))]
-                let content = content.child(
+                let content = content.when(!is_unlock, |this| {
+                    this.child(
                         Button::new("proxy")
-                        .label("Connect via Web Extension")
+                            .label("Connect via Web Extension (Experimental)")
                             .ghost()
                             .disabled(self.loading)
                             .on_click(cx.listener(move |this, _ev, _window, cx| {
                                 this.proxy(cx);
                             })),
-                );
+                    )
+                });
 
                 #[cfg(target_arch = "wasm32")]
-                let content = content.child(
+                let content = content.when(!is_unlock, |this| {
+                    this.child(
                         Button::new("extension")
-                        .label("Continue with Browser Extension")
+                            .label("Continue with Browser Extension (NIP-07)")
                             .ghost()
                             .disabled(self.loading)
                             .on_click(cx.listener(move |this, _ev, _window, cx| {
                                 this.extension(cx);
                             })),
-                );
+                    )
+                });
 
                 content
             })

crates/workspace/src/dialogs/new_chat.rs

@@ -10,6 +10,7 @@ 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};
@@ -204,7 +205,6 @@ impl NewChat {
 
                 Ok(())
             }));
-
             return;
         }
 
@@ -369,13 +369,15 @@ 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().text_xs().child(profile.name()))
+                    .child(div().max_w_32().truncate().child(profile.name()))
                     .on_click(cx.listener(move |this, _event, _window, cx| {
                         this.toggle_member(&public_key, cx);
                     }))

crates/workspace/src/dialogs/profile.rs

@@ -4,17 +4,17 @@ use anyhow::Error;
 use chat::{ChatRegistry, Room, RoomKind};
 use gpui::prelude::FluentBuilder;
 use gpui::{
-    App, AppContext, Context, Div, Entity, IntoElement, ParentElement, Render, SharedString,
+    App, AppContext, ClipboardItem, Context, Div, Entity, IntoElement, ParentElement, Render,
-    Styled, Task, Window, div, retain_all,
+    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;
@@ -49,6 +49,8 @@ struct ProfileDialog {
     website_input: Entity<InputState>,
     /// Uploading state
     uploading: bool,
+    /// Copied states
+    copied: bool,
     /// Updating state
     updating: bool,
     /// Tasks
@@ -90,6 +92,7 @@ impl ProfileDialog {
             bio_input,
             website_input,
             uploading: false,
+            copied: false,
             updating: false,
             tasks: vec![],
         }
@@ -138,6 +141,35 @@ 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();
@@ -336,8 +368,7 @@ impl Render for ProfileDialog {
                     .w_full()
                     .items_center()
                     .justify_center()
-                    .rounded(cx.theme().radius_lg)
+                    .bg(cx.theme().sidebar)
-                    .bg(cx.theme().muted)
                     .child(Avatar::new(avatar).seed(profile.avatar_seed()).large())
                     .when(self.editing, |this| {
                         this.child(
@@ -362,14 +393,26 @@ impl Render for ProfileDialog {
                         .justify_center()
                         .gap_3()
                         .rounded(cx.theme().radius)
-                        .bg(cx.theme().muted)
+                        .bg(cx.theme().sidebar)
                         .text_xs()
                         .child(shorten_pkey)
-                        .child(Clipboard::new("copy").value_fn({
+                        .child(
-                            let public_key = self.public_key;
+                            Button::new("copy")
-                            move |_, _| public_key.to_bech32().unwrap_or_default().into()
+                                .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)
                                 })),
                         ),
+                ),
             )
             .when(self.editing, |this| {
                 this.child(
@@ -501,7 +544,7 @@ fn field(
     };
 
     v_flex()
-        .gap_1()
+        .gap_1p5()
         .child(label(text, cx))
-        .child(div().text_sm().text_color(color).child(content))
+        .child(div().text_xs().text_color(color).child(content))
 }

crates/workspace/src/dialogs/relays.rs

@@ -264,7 +264,7 @@ impl RelayManager {
 
     fn render_tab_bar(&self, cx: &mut Context<Self>) -> impl IntoElement {
         TabBar::new("relays-tabs")
-            .pill()
+            .segmented()
             .selected_index(self.active_tab)
             .on_click(cx.listener(|this, ix: &usize, _window, cx| {
                 this.active_tab = *ix;

crates/workspace/src/dialogs/settings.rs

@@ -1,30 +1,19 @@
 #[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::{
-    AnyElement, App, AppContext, Context, Entity, IntoElement, ParentElement, Render, Styled,
+    App, AppContext, Context, Entity, IntoElement, ParentElement, Render, Styled, Subscription,
-    Subscription, Window, div,
+    Window, div,
 };
 use gpui_kit::assets::IconName;
 use gpui_kit::component::button::{Button, ButtonVariants};
 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::{Disableable, Sizable, WindowExt, h_flex, v_flex};
-use settings::{AppSettings, AppearanceMode, NIP4E_ROTATION_DEFAULT_DAYS};
+use settings::{AppSettings, AppearanceMode};
-#[cfg(not(target_arch = "wasm32"))]
-use speech::model::{self as speech_model};
 use ui::{settings_block, settings_row};
 
 /// Bounds for the theme number inputs
@@ -40,8 +29,6 @@ pub struct Preferences {
     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>,
 }
@@ -107,40 +94,11 @@ impl Preferences {
             }),
         ];
 
-        #[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,
         }
     }
@@ -230,102 +188,10 @@ impl Preferences {
             .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.";
@@ -337,7 +203,6 @@ impl Render for Preferences {
             "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.";
 
@@ -345,7 +210,6 @@ impl Render for Preferences {
         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);
@@ -357,7 +221,7 @@ impl Render for Preferences {
         };
 
         v_flex()
-            .my_2()
+            .mt_2()
             .gap_4()
             .w_full()
             .child(
@@ -509,25 +373,6 @@ impl Render for Preferences {
                     }),
                 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",

crates/workspace/src/dock/skin.rs

@@ -1,4 +1,5 @@
 use std::cell::Cell;
+use std::ops::Deref as _;
 use std::rc::Rc;
 use std::sync::Arc;
 
@@ -165,7 +166,7 @@ impl CoopDockSkin {
             .on_drag(ResizePanel, move |info, _, _, cx| {
                 cx.stop_propagation();
                 shared.resizing_dock().set(Some(placement));
-                cx.new(|_| info.clone())
+                cx.new(|_| info.deref().clone())
             })
     }
 }

crates/workspace/src/dock/tab_panel.rs

@@ -54,7 +54,6 @@ 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)

crates/workspace/src/lib.rs

@@ -91,12 +91,11 @@ impl Workspace {
         let workspace = cx.entity().downgrade();
         let mut subscriptions = smallvec![];
 
-        subscriptions.push(cx.observe_window_appearance(window, |_this, window, cx| {
         if AppSettings::get_appearance_mode(cx) == AppearanceMode::System {
+            subscriptions.push(cx.observe_window_appearance(window, |_this, window, cx| {
                 Theme::sync_system_appearance(Some(window), cx);
-                AppSettings::apply_theme_style(cx);
-            }
             }));
+        }
 
         subscriptions.push(
             // Subscribe to the nostr events

crates/workspace/src/panels/backup.rs

@@ -1,14 +1,16 @@
 use anyhow::Error;
 use gpui::{
-    App, AppContext, Context, Entity, EventEmitter, FocusHandle, Focusable, IntoElement,
+    App, AppContext, ClipboardItem, Context, Entity, EventEmitter, FocusHandle, Focusable,
-    ParentElement, Render, SharedString, Styled, Task, Window, div,
+    IntoElement, ParentElement, Render, SharedString, Styled, Task, Window, div,
 };
+use gpui_kit::assets::IconName;
 use gpui_kit::base::StyledExt as _;
-use gpui_kit::component::clipboard::Clipboard;
+use gpui_kit::component::button::{Button, ButtonVariants};
 use gpui_kit::component::dock::{Panel, PanelEvent};
 use gpui_kit::component::input::{Input, InputState};
 use gpui_kit::component::separator::Separator;
-use gpui_kit::component::{ActiveTheme, v_flex};
+use gpui_kit::component::{ActiveTheme, Sizable, v_flex};
+use instant::Duration;
 use nostr_sdk::prelude::*;
 use state::USER_KEYRING;
 
@@ -30,6 +32,9 @@ pub struct BackupPanel {
     /// Secret key input
     nsec_input: Entity<InputState>,
 
+    /// Copied status
+    copied: bool,
+
     /// Background tasks
     tasks: Vec<Task<Result<(), Error>>>,
 }
@@ -49,6 +54,7 @@ impl BackupPanel {
             focus_handle: cx.focus_handle(),
             npub_input,
             nsec_input,
+            copied: false,
             tasks: vec![],
         }
     }
@@ -75,6 +81,31 @@ impl BackupPanel {
             Ok(())
         }));
     }
+
+    fn copy_secret(&mut self, cx: &mut Context<Self>) {
+        let value = self.nsec_input.read(cx).value();
+        let item = ClipboardItem::new_string(value.to_string());
+        cx.write_to_clipboard(item);
+
+        // Set the copied status to true
+        self.set_copied(true, cx);
+    }
+
+    fn set_copied(&mut self, status: bool, cx: &mut Context<Self>) {
+        self.copied = status;
+        cx.notify();
+
+        self.tasks.push(cx.spawn(async move |this, cx| {
+            cx.background_executor().timer(Duration::from_secs(2)).await;
+
+            // Clear the error message after a delay
+            this.update(cx, |this, cx| {
+                this.set_copied(false, cx);
+            })?;
+
+            Ok(())
+        }));
+    }
 }
 
 impl gpui_kit::component::dock::BasePanel for BackupPanel {
@@ -143,12 +174,20 @@ impl Render for BackupPanel {
                             .child(Input::new(&self.nsec_input).disabled(true)),
                     )
                     .child(
-                        Clipboard::new("copy-secret")
+                        Button::new("copy")
-                            .accessibility_label("Copy secret key")
+                            .icon(IconName::Copy)
-                            .value_fn({
+                            .label({
-                                let nsec_input = self.nsec_input.clone();
+                                if self.copied {
-                                move |_, cx| nsec_input.read(cx).value()
+                                    "Copied"
-                            }),
+                                } else {
+                                    "Copy secret key"
+                                }
+                            })
+                            .primary()
+                            .small()
+                            .on_click(cx.listener(move |this, _ev, _window, cx| {
+                                this.copy_secret(cx);
+                            })),
                     ),
             )
     }

crates/workspace/src/sidebar/header.rs

@@ -1,26 +1,19 @@
 #[cfg(not(target_arch = "wasm32"))]
 use auto_update::AutoUpdater;
 use gpui::prelude::FluentBuilder;
-use gpui::{
-    Anchor, App, Context, Div, InteractiveElement, IntoElement, ParentElement, SharedString,
-    Stateful, Styled, Window, div, px,
-};
 #[cfg(not(target_arch = "wasm32"))]
-use gpui::{AnyElement, Entity};
+use gpui::{AnyElement, Entity, IntoElement};
-use gpui_kit::base::StyledExt as _;
+use gpui::{
+    App, Context, Div, InteractiveElement, ParentElement, Stateful, Styled, Window, div, px,
+};
 #[cfg(not(target_arch = "wasm32"))]
 use gpui_kit::component::Disableable;
 use gpui_kit::component::button::{Button, ButtonVariant, ButtonVariants};
-use gpui_kit::component::clipboard::Clipboard;
 use gpui_kit::component::dialog::DialogButtonProps;
 use gpui_kit::component::menu::{DropdownMenu, PopupMenuItem};
-use gpui_kit::component::popover::Popover;
-use gpui_kit::component::separator::Separator;
 use gpui_kit::component::{ActiveTheme, Icon, Selectable, Sizable, WindowExt, h_flex, v_flex};
 use nostr_sdk::prelude::*;
-use person::shorten_pubkey;
+use state::NostrRegistry;
-use settings::AppSettings;
-use state::{CLIENT_NAME, NostrRegistry};
 use ui::{Avatar, IconName};
 
 use super::Sidebar;
@@ -38,10 +31,6 @@ impl Sidebar {
         let updater = AutoUpdater::try_global(cx);
         let profile = self.directory.read(cx).person(current_user, cx);
         let avatar = profile.avatar();
-        let encryption_key = profile
-            .announcement()
-            .map(|announcement| announcement.public_key());
-        let encryption_enabled = AppSettings::get_nip4e(cx);
 
         h_flex()
             .id("sidebar-user")
@@ -49,20 +38,23 @@ impl Sidebar {
             .h(TAB_BAR_HEIGHT)
             .flex_shrink_0()
             .justify_between()
-            .px_2p5()
+            .px_2()
             .when(cfg!(target_os = "macos"), |this| this.pl(px(80.)))
             .child(
-                Button::new("user")
+                Button::new("current-user")
                     .text()
                     .dropdown_caret(true)
                     .min_w_0()
                     .flex_shrink_1()
                     .child(Avatar::new(avatar).seed(profile.avatar_seed()).small())
                     .dropdown_menu(move |this, _window, _cx| {
-                        this.menu("Profile", Box::new(Command::ShowProfile))
+                        this.menu_with_icon(
-                            .menu("Relays", Box::new(Command::ShowRelayList))
+                            "Profile",
+                            IconName::Profile,
+                            Box::new(Command::ShowProfile),
+                        )
+                        .menu_with_icon("Relays", IconName::Relay, Box::new(Command::ShowRelayList))
                         .separator()
-                            .label(format!("{CLIENT_NAME} {}", env!("CARGO_PKG_VERSION")))
                         .item(
                             PopupMenuItem::element(|_, cx| {
                                 div().text_color(cx.theme().danger).child("Log out")
@@ -82,11 +74,6 @@ impl Sidebar {
                 });
 
                 actions
-                    .when(encryption_enabled, |actions| {
-                        actions.when_some(encryption_key, |actions, encryption_key| {
-                            actions.child(self.render_encryption(encryption_key))
-                        })
-                    })
                     .child(
                         Button::new("sidebar-search")
                             .icon(IconName::Search)
@@ -127,99 +114,16 @@ impl Sidebar {
             })
     }
 
-    /// The encryption key popover: public key with copy, backup and reset
+    /// The bottom navigation, pinned below the list like signed's sidebar.
-    fn render_encryption(&self, encryption_key: PublicKey) -> impl IntoElement {
+    pub(super) fn render_footer(&self, _cx: &mut Context<Self>) -> Div {
-        Popover::new("sidebar-encryption")
-            .anchor(Anchor::TopRight)
-            .trigger(
-                Button::new("encryption-key")
-                    .icon(IconName::Lock)
-                    .tooltip("Encryption Key")
-                    .ghost()
-                    .small(),
-            )
-            .content(move |_, _, cx| {
-                let popover = cx.entity();
-                let Ok(npub) = encryption_key.to_bech32();
-
-                v_flex()
-                    .w_64()
-                    .gap_2()
-                    .text_sm()
-                    .child(
-                        div()
-                            .text_xs()
-                            .font_semibold()
-                            .text_color(cx.theme().muted_foreground)
-                            .child("Public key"),
-                    )
-                    .child(
-                        h_flex()
-                            .items_center()
-                            .gap_1()
-                            .child(
-                                div()
-                                    .flex_1()
-                                    .min_w_0()
-                                    .truncate()
-                                    .text_color(cx.theme().muted_foreground)
-                                    .child(SharedString::from(shorten_pubkey(encryption_key, 12))),
-                            )
-                            .child(
-                                Clipboard::new("encryption-key-copy")
-                                    .tooltip("Copy public key")
-                                    .value(npub),
-                            ),
-                    )
-                    .child(Separator::horizontal())
-                    .child(
-                        h_flex()
-                            .justify_end()
-                            .gap_2()
-                            .child(
-                                Button::new("encryption-backup")
-                                    .label("Backup")
-                                    .outline()
-                                    .small()
-                                    .on_click({
-                                        let popover = popover.clone();
-                                        move |_, window, cx| {
-                                            popover
-                                                .update(cx, |state, cx| state.dismiss(window, cx));
-                                            window.dispatch_action(
-                                                Box::new(Command::BackupEncryption),
-                                                cx,
-                                            );
-                                        }
-                                    }),
-                            )
-                            .child(
-                                Button::new("encryption-reset")
-                                    .label("Reset")
-                                    .ghost()
-                                    .small()
-                                    .on_click(move |_, window, cx| {
-                                        popover.update(cx, |state, cx| state.dismiss(window, cx));
-                                        window.dispatch_action(
-                                            Box::new(Command::ResetEncryption),
-                                            cx,
-                                        );
-                                    }),
-                            ),
-                    )
-            })
-    }
-
-    pub(super) fn render_footer(&self, loading: bool, _cx: &mut Context<Self>) -> Div {
         v_flex()
             .p_2()
             .flex_shrink_0()
             .gap_1()
             .items_start()
             .justify_start()
-            .when(!loading, |this| {
+            .child(
-                this.child(
+                Nav::new("sidebar-settings")
-                    Nav::new("settings")
                     .prefix(Icon::new(IconName::Settings).small())
                     .center_prefix(true)
                     .label("Settings")
@@ -228,7 +132,6 @@ impl Sidebar {
                         window.dispatch_action(Box::new(Command::ShowSettings), cx)
                     }),
             )
-            })
     }
 
     #[cfg(not(target_arch = "wasm32"))]

crates/workspace/src/sidebar/mod.rs

@@ -5,23 +5,20 @@ use chat::{ChatEvent, ChatRegistry};
 use common::DebouncedDelay;
 use gpui::prelude::FluentBuilder;
 use gpui::{
-    App, AppContext, Context, Div, Entity, EventEmitter, FocusHandle, Focusable,
+    App, AppContext, Context, Entity, EventEmitter, FocusHandle, Focusable, InteractiveElement,
-    InteractiveElement, IntoElement, ObjectFit, ParentElement, Render, SharedString, Styled,
+    IntoElement, ObjectFit, ParentElement, Render, SharedString, Styled, StyledImage, Subscription,
-    StyledImage, Subscription, Task, WeakEntity, Window, div, img, retain_all,
+    Task, WeakEntity, Window, div, img, retain_all,
 };
-use gpui_kit::base::{Presence, Transition};
+use gpui_kit::base::StyledExt as _;
 use gpui_kit::component::dock::{DockArea, Panel, PanelEvent};
 use gpui_kit::component::input::{InputEvent, InputState};
 use gpui_kit::component::notification::Notification;
-use gpui_kit::component::progress::ProgressCircle;
+use gpui_kit::component::spinner::Spinner;
-use gpui_kit::component::{ActiveTheme, WindowExt, h_flex, v_flex};
+use gpui_kit::component::{ActiveTheme, Sizable, WindowExt, h_flex, v_flex};
 use instant::Duration;
 use nip29::{Group, GroupKey, GroupsEvent, GroupsRegistry};
 use nostr_sdk::prelude::*;
 use person::{Directory, PersonRegistry};
-pub(crate) use rows::open_room;
-use search::SearchResult;
-use settings::AppSettings;
 use smallvec::{SmallVec, smallvec};
 use state::{FIND_DELAY, NostrRegistry, StateEvent};
 use ui::title_bar_drag_handlers;
@@ -36,8 +33,8 @@ mod onboarding;
 mod rows;
 mod search;
 
-const PROGRESS_TICK_MS: u64 = 500;
+pub(crate) use rows::open_room;
-const PROGRESS_CAP: f32 = 95.0;
+use search::SearchResult;
 
 pub struct Sidebar {
     focus_handle: FocusHandle,
@@ -91,11 +88,6 @@ pub struct Sidebar {
     /// The async global profile search.
     global_task: Option<Task<()>>,
 
-    /// Simulated gift wrap processing progress, shown while the backlog loads
-    chat_progress: f32,
-    /// Simulated web of trust sync progress
-    sync_progress: f32,
-
     tasks: SmallVec<[Task<Result<(), Error>>; 1]>,
     _subscriptions: SmallVec<[Subscription; 4]>,
 }
@@ -105,8 +97,7 @@ impl Sidebar {
         let chat = ChatRegistry::global(cx);
         let groups = GroupsRegistry::global(cx);
         let nostr = NostrRegistry::global(cx);
-        let settings = AppSettings::global(cx);
+        let wot = PersonRegistry::global(cx).read(cx).wot();
-        let directory = Directory::new(cx);
 
         let find_input = cx.new(|cx| {
             InputState::new(window, cx)
@@ -114,30 +105,28 @@ impl Sidebar {
                 .clean_on_escape()
         });
 
-        let mut tasks = smallvec![];
         let mut subscriptions = smallvec![];
 
         subscriptions.push(
-            cx.subscribe_in(&chat, window, move |this, _, event, _, cx| {
+            cx.subscribe_in(&chat, window, move |this, _s, event, _window, cx| {
-                match event {
+                if event == &ChatEvent::Ping {
-                    ChatEvent::Ping => {
                     this.new_requests = true;
                     cx.notify();
-                    }
-                    ChatEvent::Loaded => {
-                        this.chat_progress = 0.0;
-                        cx.notify();
-                    }
-                    _ => {}
                 };
             }),
         );
 
+        subscriptions.push(
+            cx.subscribe_in(&wot, window, |_this, _wot, _event, _window, cx| {
+                cx.notify();
+            }),
+        );
+
         subscriptions.push(
             cx.subscribe_in(&groups, window, |_this, _, event, window, cx| {
                 match event {
                     GroupsEvent::Updated => {
-                        // TODO: we must not trigger re-render directly like this
+                        // TODO: find a better way?
                         cx.notify();
                     }
                     GroupsEvent::Error(error) => {
@@ -209,21 +198,6 @@ impl Sidebar {
             },
         ));
 
-        // The user header reads settings and the tracked profiles on render, so
-        // the encryption button reacts to toggles and announcement arrivals
-        subscriptions.push(cx.observe(&settings, |_, _, cx| cx.notify()));
-        subscriptions.push(cx.observe(&directory, |_, _, cx| cx.notify()));
-
-        tasks.push(cx.spawn(async move |this, cx| {
-            let timer = Duration::from_millis(PROGRESS_TICK_MS);
-            loop {
-                cx.background_executor().timer(timer).await;
-                this.update(cx, |this, cx| {
-                    this.tick_progress(cx);
-                })?;
-            }
-        }));
-
         Self {
             focus_handle: cx.focus_handle(),
             dock,
@@ -237,7 +211,7 @@ impl Sidebar {
             chats_open: None,
             contacts_open: false,
             contacts: None,
-            directory,
+            directory: Directory::new(cx),
             selected_contacts: HashSet::new(),
             requests_open: false,
             new_requests: false,
@@ -249,9 +223,7 @@ impl Sidebar {
             global_finding: false,
             global_results: None,
             global_task: None,
-            chat_progress: 0.0,
+            tasks: smallvec![],
-            sync_progress: 0.0,
-            tasks,
             _subscriptions: subscriptions,
         }
     }
@@ -279,80 +251,6 @@ impl Sidebar {
             self.hide_group(cx);
         }
     }
-
-    /// Advance the simulated loading progress of any active background work.
-    fn tick_progress(&mut self, cx: &mut Context<Self>) {
-        let logged_in = NostrRegistry::global(cx).read(cx).current_user().is_some();
-        let chat = ChatRegistry::global(cx);
-        let wot = PersonRegistry::global(cx).read(cx).wot();
-
-        let chat_loading = logged_in && chat.read(cx).loading();
-        let syncing = logged_in && wot.read(cx).is_syncing();
-
-        let mut changed = false;
-
-        if chat_loading {
-            let next = self.advance_progress(self.chat_progress);
-            if next > self.chat_progress {
-                self.chat_progress = next;
-                changed = true;
-            }
-        } else if self.chat_progress != 0.0 {
-            self.chat_progress = 0.0;
-            changed = true;
-        }
-
-        if syncing {
-            let next = self.advance_progress(self.sync_progress);
-            if next > self.sync_progress {
-                self.sync_progress = next;
-                changed = true;
-            }
-        } else if self.sync_progress != 0.0 {
-            self.sync_progress = 0.0;
-            changed = true;
-        }
-
-        if changed {
-            cx.notify();
-        }
-    }
-
-    /// Bump simulated progress by a random step
-    fn advance_progress(&self, progress: f32) -> f32 {
-        (progress + rand::random::<f32>() * 8.0 + 1.0).min(PROGRESS_CAP)
-    }
-
-    /// A floating pill showing simulated progress for a background operation.
-    fn render_loading_pill(
-        &self,
-        id: &'static str,
-        label: &'static str,
-        progress: f32,
-        opacity: f32,
-        cx: &Context<Self>,
-    ) -> Div {
-        h_flex()
-            .opacity(opacity)
-            .h_9()
-            .w_full()
-            .px_5()
-            .gap_2p5()
-            .border_t_1()
-            .border_color(cx.theme().border)
-            .child(
-                ProgressCircle::new(id)
-                    .value(progress)
-                    .color(cx.theme().primary)
-                    .accessibility_label(label),
-            )
-            .child(
-                div()
-                    .text_xs()
-                    .text_color(cx.theme().sidebar_foreground)
-                    .child(label),
-            )
-    }
 }
 
 impl gpui_kit::component::dock::BasePanel for Sidebar {
@@ -392,9 +290,6 @@ impl Render for Sidebar {
         let chat = ChatRegistry::global(cx);
         let loading = chat.read(cx).loading();
 
-        let wot = PersonRegistry::global(cx).read(cx).wot();
-        let syncing = wot.read(cx).is_syncing();
-
         let group = self.group.clone().and_then(|group| group.upgrade());
         let searching = self.search_open && !self.find_input.read(cx).value().is_empty();
         let picking_contacts = self.contacts_open && !self.requests_open;
@@ -448,46 +343,32 @@ impl Render for Sidebar {
                     }),
             )
             .when(logged_in && !picking_contacts, |this| {
-                this.child(self.render_footer(loading || syncing, cx))
+                this.child(self.render_footer(cx))
             })
-            .when(logged_in, |this| {
+            .when(loading && logged_in, |this| {
-                let pill_motion = Transition::new(cx.theme().motion_tokens().duration_normal)
-                    .easing(cx.theme().motion_tokens().easing_move.clone());
-
-                let chat_presence = Presence::new("chat-presence", loading)
-                    .transition(pill_motion.clone())
-                    .sample(window, cx);
-
-                let wot_presence = Presence::new("wot-presence", syncing)
-                    .transition(pill_motion)
-                    .sample(window, cx);
-
                 this.child(
-                    v_flex()
+                    div()
                         .absolute()
-                        .bottom_0()
+                        .bottom_4()
                         .left_0()
+                        .h_9()
                         .w_full()
-                        .bg(cx.theme().sidebar)
+                        .px_8()
-                        .text_color(cx.theme().sidebar_foreground)
+                        .child(
-                        .children(chat_presence.should_render().then(|| {
+                            h_flex()
-                            self.render_loading_pill(
+                                .gap_2()
-                                "chat-sync",
+                                .w_full()
-                                "Syncing messages",
+                                .h_9()
-                                self.chat_progress,
+                                .justify_center()
-                                chat_presence.progress,
+                                .bg(cx.theme().background.opacity(0.85))
-                                cx,
+                                .when(cx.theme().shadow, |this| this.shadow_md())
-                            )
+                                .rounded_full()
-                        }))
+                                .text_xs()
-                        .children(wot_presence.should_render().then(|| {
+                                .font_semibold()
-                            self.render_loading_pill(
+                                .text_color(cx.theme().muted_foreground)
-                                "wot-sync",
+                                .child(Spinner::new().small().color(cx.theme().primary))
-                                "Syncing contacts",
+                                .child("Getting messages..."),
-                                self.sync_progress,
+                        ),
-                                wot_presence.progress,
-                                cx,
-                            )
-                        })),
                 )
             })
             .into_any_element()

desktop/Cargo.toml

@@ -14,7 +14,7 @@ product-name = "Coop"
 description = "Chat Freely, Stay Private on Nostr"
 identifier = "su.reya.coop"
 category = "SocialNetworking"
-version = "2.0.0-alpha3"
+version = "2.0.0-alpha2"
 out-dir = "../dist"
 before-packaging-command = "cargo build --release"
 resources = ["Cargo.toml", "src"]
@@ -26,11 +26,6 @@ icons = [
     "resources/icon.ico",
 ]
 
-# Merged over the generated Info.plist; required for the speech input to
-# request microphone and speech recognition access on macOS.
-[package.metadata.packager.macos]
-info_plist_path = "resources/Info.plist"
-
 [dependencies]
 assets = { path = "../crates/assets" }
 workspace = { path = "../crates/workspace" }
@@ -38,7 +33,6 @@ ui = { path = "../crates/ui" }
 state = { path = "../crates/state" }
 nip4e = { path = "../crates/nip4e" }
 chat = { path = "../crates/chat" }
-chat_ui = { path = "../crates/chat_ui" }
 nip29 = { path = "../crates/nip29" }
 settings = { path = "../crates/settings" }
 auto_update = { path = "../crates/auto_update" }

desktop/resources/Info.plist

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-  <dict>
-    <key>NSMicrophoneUsageDescription</key>
-    <string>Dictate text into messages.</string>
-    <key>NSSpeechRecognitionUsageDescription</key>
-    <string>Turn your speech into text.</string>
-  </dict>
-</plist>

desktop/src/main.rs

@@ -1,6 +1,5 @@
 use std::sync::{Arc, Mutex};
 
-use chat_ui::ToggleDictation;
 use gpui::{
     App, Bounds, Global, KeyBinding, Menu, MenuItem, SharedString, TitlebarOptions,
     WindowBackgroundAppearance, WindowBounds, WindowDecorations, WindowKind, WindowOptions,
@@ -46,19 +45,13 @@ fn main() {
             // Register the `quit` function
             cx.on_action(quit);
 
-            // Register the `quit` function with CMD+Q (macOS) and dictation with CMD+D
+            // Register the `quit` function with CMD+Q (macOS)
             #[cfg(target_os = "macos")]
-            cx.bind_keys([
+            cx.bind_keys([KeyBinding::new("cmd-q", Quit, None)]);
-                KeyBinding::new("cmd-q", Quit, None),
-                KeyBinding::new("cmd-d", ToggleDictation, None),
-            ]);
 
-            // Register the `quit` function with Super+Q (others) and dictation with Ctrl+D
+            // Register the `quit` function with Super+Q (others)
             #[cfg(not(target_os = "macos"))]
-            cx.bind_keys([
+            cx.bind_keys([KeyBinding::new("super-q", Quit, None)]);
-                KeyBinding::new("super-q", Quit, None),
-                KeyBinding::new("ctrl-d", ToggleDictation, None),
-            ]);
 
             // Set menu items
             cx.set_menus(vec![Menu {
@@ -72,13 +65,14 @@ fn main() {
 
             let appearance = settings::persisted_appearance_mode();
             let font_size = settings::persisted_theme().font_size;
-
+            match apply_native_theme(appearance, font_size, cx) {
-            if let Err(error) = apply_native_theme(appearance, font_size, cx) {
+                Ok(()) => start_theme_watcher(appearance, cx),
+                Err(error) => {
                     log::warn!("native theme unavailable ({error})");
                     apply_appearance(appearance, cx);
                     AppSettings::apply_theme_style(cx);
                 }
-            start_theme_watcher(cx);
+            }
 
             // Initialize the nostr client
             state::init(cx, cli_key);
@@ -212,12 +206,14 @@ fn apply_appearance(appearance: AppearanceMode, cx: &mut App) {
 /// Holds the watcher subscription so it lives as long as the app.
 struct ThemeWatcher {
     _subscription: ThemeSubscription,
+    /// The appearance mode the observer in `workspace` was registered with.
+    appearance: std::cell::Cell<AppearanceMode>,
 }
 
 impl Global for ThemeWatcher {}
 
 /// Start a background task to watch for OS theme changes and re-apply the native theme.
-fn start_theme_watcher(cx: &mut App) {
+fn start_theme_watcher(initial_appearance: AppearanceMode, cx: &mut App) {
     let (sender, receiver) = flume::unbounded();
     match native_theme::watch::on_theme_change(move |event| {
         if let Err(error) = sender.send(event) {
@@ -227,6 +223,7 @@ fn start_theme_watcher(cx: &mut App) {
         Ok(subscription) => {
             cx.set_global(ThemeWatcher {
                 _subscription: subscription,
+                appearance: std::cell::Cell::new(initial_appearance),
             });
             cx.spawn(async move |cx| {
                 while receiver.recv_async().await.is_ok() {
@@ -234,6 +231,9 @@ fn start_theme_watcher(cx: &mut App) {
                     cx.update(|cx| {
                         let appearance = AppSettings::get_appearance_mode(cx);
                         let font_size = AppSettings::get_theme(cx).font_size;
+                        if let Some(watcher) = cx.try_global::<ThemeWatcher>() {
+                            watcher.appearance.set(appearance);
+                        }
                         if let Err(error) = apply_native_theme(appearance, font_size, cx) {
                             log::warn!("failed to apply updated OS theme ({error})");
                         }

rust-toolchain.toml

@@ -3,6 +3,7 @@ channel = "1.98"
 profile = "minimal"
 components = ["rustfmt", "clippy"]
 targets = [
+    "x86_64-apple-darwin",
     "aarch64-apple-darwin",
     "x86_64-unknown-linux-gnu",
     "x86_64-pc-windows-msvc",

web/Cargo.toml

@@ -14,7 +14,6 @@ ui = { path = "../crates/ui" }
 state = { path = "../crates/state" }
 nip4e = { path = "../crates/nip4e" }
 chat = { path = "../crates/chat" }
-chat_ui = { path = "../crates/chat_ui" }
 nip29 = { path = "../crates/nip29" }
 settings = { path = "../crates/settings" }
 person = { path = "../crates/person" }
@@ -31,7 +30,6 @@ console_error_panic_hook = "0.1"
 tracing-wasm = "0.2"
 console_log = "1.0"
 wasm-bindgen = "0.2"
-wasm-bindgen-futures = "0.4"
 js-sys = "0.3"
 universal-time = { git = "https://github.com/shadowylab/universal-time" }
 

web/script/build-wasm.sh

@@ -21,12 +21,12 @@ if [[ "$1" == "--release" ]]; then
     echo -e "${YELLOW}Building in release mode${NC}"
 fi
 
-NIGHTLY="nightly-2026-10-31"
+# wasm_thread requires a nightly compiler for its atomics features
-CARGO="cargo +$NIGHTLY"
+CARGO="cargo +nightly"
 
 # Step 0: Toolchain prerequisites
 echo -e "${GREEN}Step 0: Checking toolchain...${NC}"
-rustup target add wasm32-unknown-unknown --toolchain "$NIGHTLY"
+rustup target add wasm32-unknown-unknown --toolchain nightly
 
 if [[ "$(uname)" == "Darwin" ]]; then
     # secp256k1-sys compiles C for wasm; Apple clang has the wasm32 target and
@@ -35,7 +35,7 @@ if [[ "$(uname)" == "Darwin" ]]; then
         echo -e "${RED}Apple clang not found. Install the Xcode command line tools: xcode-select --install${NC}"
         exit 1
     fi
-    rustup component add llvm-tools-preview --toolchain "$NIGHTLY"
+    rustup component add llvm-tools-preview --toolchain nightly
 
     RUSTUP_HOME=$(rustup show home)
     if [[ "$(uname -m)" == "arm64" ]]; then
@@ -43,7 +43,7 @@ if [[ "$(uname)" == "Darwin" ]]; then
     else
         HOST_ARCH="x86_64-apple-darwin"
     fi
-    LLVM_BIN="$RUSTUP_HOME/toolchains/$NIGHTLY-$HOST_ARCH/lib/rustlib/$HOST_ARCH/bin"
+    LLVM_BIN="$RUSTUP_HOME/toolchains/nightly-$HOST_ARCH/lib/rustlib/$HOST_ARCH/bin"
 
     export CC_wasm32_unknown_unknown=clang
     export AR_wasm32_unknown_unknown="$LLVM_BIN/llvm-ar"

web/script/deploy-cloudflare.sh

@@ -1,70 +0,0 @@
-#!/bin/bash
-set -e
-
-# Deploy the web build to Cloudflare Pages (direct upload via wrangler).
-# Auth: run `npx wrangler login` once, or export CLOUDFLARE_API_TOKEN
-# (and CLOUDFLARE_ACCOUNT_ID if the token has access to multiple accounts).
-# One-time project setup: npx wrangler pages project create coop-web --production-branch master
-
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-YELLOW='\033[1;33m'
-NC='\033[0m'
-
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-PROJECT_ROOT="$SCRIPT_DIR/../.."
-WWW_DIR="$SCRIPT_DIR/../www"
-DIST_DIR="$WWW_DIR/dist"
-
-PROJECT_NAME="coop-web"
-PRODUCTION_BRANCH="master"
-
-BRANCH=""
-while [[ $# -gt 0 ]]; do
-    case "$1" in
-        --branch)
-            BRANCH="$2"
-            shift 2
-            ;;
-        *)
-            echo -e "${RED}Unknown argument: $1${NC}"
-            echo "Usage: $0 [--branch <name>]"
-            exit 1
-            ;;
-    esac
-done
-
-if [[ -z "$BRANCH" ]]; then
-    BRANCH="$(git -C "$PROJECT_ROOT" rev-parse --abbrev-ref HEAD)"
-fi
-
-echo -e "${GREEN}Building Coop Web for deploy (branch: $BRANCH)...${NC}"
-
-"$SCRIPT_DIR/build-wasm.sh" --release
-
-echo -e "${GREEN}Building frontend...${NC}"
-(cd "$WWW_DIR" && npm install --no-fund --no-audit && npm run build)
-
-# Cloudflare Pages rejects files over 25 MiB
-MAX_FILE_BYTES=$((25 * 1024 * 1024))
-while IFS= read -r -d '' file; do
-    SIZE=$(stat -f%z "$file")
-    if [[ "$SIZE" -gt "$MAX_FILE_BYTES" ]]; then
-        echo -e "${RED}Error: $file is $((SIZE / 1024 / 1024)) MiB, over Cloudflare's 25 MiB per-file limit.${NC}"
-        echo "Shrink the wasm (wasm-opt -Oz, font subsetting) before deploying."
-        exit 1
-    fi
-done < <(find "$DIST_DIR" -type f -print0)
-
-echo -e "${GREEN}Deploying to Cloudflare Pages project '$PROJECT_NAME'...${NC}"
-npx wrangler pages deploy "$DIST_DIR" \
-    --project-name "$PROJECT_NAME" \
-    --branch "$BRANCH" \
-    --commit-dirty=true
-
-if [[ "$BRANCH" == "$PRODUCTION_BRANCH" ]]; then
-    echo -e "${GREEN}✓ Deployed to production.${NC}"
-else
-    echo -e "${YELLOW}✓ Deployed as preview for branch '$BRANCH'.${NC}"
-    echo -e "${YELLOW}Pass --branch $PRODUCTION_BRANCH to deploy to production.${NC}"
-fi

web/src/lib.rs

@@ -1,8 +1,5 @@
-#![cfg(target_arch = "wasm32")]
-
 use std::cell::RefCell;
 use std::rc::Rc;
-use std::sync::Arc;
 
 use gpui::*;
 use universal_time::{Instant, MonotonicClock, SystemTime, WallClock, define_time_provider};
@@ -32,65 +29,49 @@ impl MonotonicClock for BrowserTimeProvider {
 
 define_time_provider!(BrowserTimeProvider);
 
-fn init_logging() {
+#[wasm_bindgen]
-    // Called from both entry points; the first one wins
+pub fn run() -> Result<(), JsValue> {
-    static ONCE: std::sync::OnceLock<()> = std::sync::OnceLock::new();
-
-    ONCE.get_or_init(|| {
     console_error_panic_hook::set_once();
 
     // Initialize logging to browser console
-        console_log::init_with_level(log::Level::Info).ok();
+    console_log::init_with_level(log::Level::Info).expect("Failed to initialize logger");
 
     // Also initialize tracing for WASM
     tracing_wasm::set_as_global_default();
-    });
-}
-
-/// Open the persistent nostr database before the app starts.
-#[wasm_bindgen]
-pub async fn open_database() -> Result<(), JsValue> {
-    init_logging();
-
-    state::web_database::open().await;
-
-    Ok(())
-}
-
-#[wasm_bindgen]
-pub fn run() -> Result<(), JsValue> {
-    init_logging();
 
     // Sets the panic hook and GPUI's console logger
     gpui_platform::web_init();
 
+    // A single-threaded platform that draws emoji and CJK graphemes missing
+    // from the bundled fonts with the browser's own fonts, plus a fetch-based
+    // HTTP client so remote images and content work like on desktop
     let platform = std::rc::Rc::new(gpui_web::WebPlatform::new_with_backend_and_font_fallback(
         false,
         gpui_web::WebBackendPreference::Auto,
         gpui_web::CanvasFontFallback::EmojiAndCjk,
     ));
-
+    let http_client = std::sync::Arc::new(platform.fetch_http_client());
-    let http_client = Arc::new(platform.fetch_http_client());
-
     let app = Application::with_platform(platform)
         .with_http_client(http_client)
         .with_assets(assets::CombinedAssets);
 
     APPLICATION.with(|application| {
         *application.borrow_mut() = Some(app.run_embedded(|cx| {
-            cx.bind_keys([
+            // Initialize the framework before anything renders
-                KeyBinding::new("cmd-d", chat_ui::ToggleDictation, None),
-                KeyBinding::new("ctrl-d", chat_ui::ToggleDictation, None),
-            ]);
-
             gpui_kit::init(cx);
 
+            // The web text system starts with no fonts, and GPUI panics when
+            // it lays out text in a family that does not exist. Inter is both
+            // bundled and named on the theme (including both mode configs, so
+            // theme reloads keep it) before any text is laid out
             load_embedded_fonts(cx);
             apply_web_fonts(cx);
 
             // Initialize settings
             settings::init(cx);
 
+            // There is no native theme on the web; apply the persisted
+            // appearance directly, then the user's theme tuning
             apply_appearance(settings::persisted_appearance_mode(), cx);
             settings::AppSettings::apply_theme_style(cx);
 
@@ -140,6 +121,10 @@ fn load_embedded_fonts(cx: &mut App) {
         .expect("Failed to load bundled fonts");
 }
 
+/// Name Inter on the theme and both mode configs so every text run renders in
+/// it and theme reloads keep it. Without an explicit family the theme falls
+/// back to `.SystemUIFont`, which the web platform resolves to a family that
+/// is not bundled
 fn apply_web_fonts(cx: &mut App) {
     use gpui_kit::component::Theme;
 

web/www/main.js

@@ -7,9 +7,6 @@ async function init() {
     const wasm = await import('./wasm/coop_web.js');
     await wasm.default();
 
-    // Open the persistent nostr database before the app starts
-    await wasm.open_database();
-
     // Initialize the story gallery
     await wasm.run();
 

web/www/public/_headers

@@ -1,9 +0,0 @@
-/*
-  X-Content-Type-Options: nosniff
-  Referrer-Policy: no-referrer
-
-/index.html
-  Cache-Control: no-cache
-
-/assets/*
-  Cache-Control: public, max-age=31536000, immutable