.

.github/workflows/release.yml

@@ -45,7 +45,7 @@ jobs:
       # Windows and macOS builds using cargo-packager
       - name: Build with cargo-packager (Windows/macOS)
         if: runner.os != 'Linux'
-        working-directory: desktop
+        working-directory: crates/coop
         run: |
           cargo install cargo-packager --locked
           cargo packager --release
@@ -154,13 +154,13 @@ jobs:
 
       - name: Create draft release
         id: create_release
-        uses: akkuman/gitea-release-action@v1
+        uses: softprops/action-gh-release@v2
         with:
-          server_url: "https://git.reya.su/"
+          tag_name: ${{ steps.version.outputs.tag }}
-          repository: "reya/coop"
+          name: ${{ steps.version.outputs.tag }}
-          token: ${{ secrets.GITEA_TOKEN }}
           draft: true
           prerelease: false
+          generate_release_notes: true
           files: |
             artifacts/**/*
 

Cargo.toml

@@ -1,10 +1,10 @@
 [workspace]
 resolver = "2"
-members = ["crates/*", "desktop", "web"]
+members = ["crates/*"]
-default-members = ["desktop"]
+default-members = ["crates/coop"]
 
 [workspace.package]
-version = "1.0.0-beta5"
+version = "1.0.0-beta2"
 edition = "2024"
 publish = false
 
@@ -15,16 +15,17 @@ gpui_platform = { git = "https://github.com/zed-industries/zed", features = ["fo
 gpui_linux = { git = "https://github.com/zed-industries/zed" }
 gpui_windows = { git = "https://github.com/zed-industries/zed" }
 gpui_macos = { git = "https://github.com/zed-industries/zed" }
+gpui_web = { git = "https://github.com/zed-industries/zed" }
 gpui_tokio = { git = "https://github.com/zed-industries/zed" }
 reqwest_client = { git = "https://github.com/zed-industries/zed" }
 
 # Nostr
-nostr-lmdb = { git = "https://github.com/rust-nostr/nostr", }
+nostr-lmdb = { git = "https://github.com/rust-nostr/nostr" }
 nostr-connect = { git = "https://github.com/rust-nostr/nostr" }
 nostr-blossom = { git = "https://github.com/rust-nostr/nostr" }
 nostr-gossip-memory = { git = "https://github.com/rust-nostr/nostr" }
 nostr-sdk = { git = "https://github.com/rust-nostr/nostr" }
-nostr = { git = "https://github.com/rust-nostr/nostr", features = [ "nip59", "nip49", "nip44" ] }
+nostr = { git = "https://github.com/rust-nostr/nostr", features = [ "nip96", "nip59", "nip49", "nip44" ] }
 
 # Others
 anyhow = "1.0.44"
@@ -42,7 +43,6 @@ smallvec = "1.14.0"
 smol = "2"
 tracing = "0.1.40"
 webbrowser = "1.0.4"
-tracing-subscriber = { version = "0.3.18", features = ["fmt", "env-filter"] }
 
 [profile.release]
 strip = true

README.md

@@ -1,12 +1,12 @@
 ![Coop](/docs/coop.png)
 
 <p>
-    <a href="https://github.com/reyakov/coop/actions/workflows/rust.yml">
+    <a href="https://github.com/lumehq/coop/actions/workflows/rust.yml">
-      <img alt="Actions" src="https://github.com/reyakov/coop/actions/workflows/rust.yml/badge.svg">
+      <img alt="Actions" src="https://github.com/lumehq/coop/actions/workflows/rust.yml/badge.svg">
     </a>
-    <img alt="GitHub repo size" src="https://img.shields.io/github/repo-size/reyakov/coop">
+    <img alt="GitHub repo size" src="https://img.shields.io/github/repo-size/lumehq/coop">
-    <img alt="GitHub issues" src="https://img.shields.io/github/issues-raw/reyakov/coop">
+    <img alt="GitHub issues" src="https://img.shields.io/github/issues-raw/lumehq/coop">
-    <img alt="GitHub pull requests" src="https://img.shields.io/github/issues-pr/reyakov/coop">
+    <img alt="GitHub pull requests" src="https://img.shields.io/github/issues-pr/lumehq/coop">
 </p>
 
 Coop is a simple, fast, and reliable nostr client for secure messaging across all platforms.
@@ -36,7 +36,7 @@ To install Coop, follow these steps:
 
 1. **Download the Latest Release**:
 
-   - Visit the [Coop Releases page on GitHub](https://github.com/reyakov/coop/releases).
+   - Visit the [Coop Releases page on GitHub](https://github.com/lumehq/coop/releases).
    - Download the package that matches your operating system (Windows, macOS, or Linux).
 
 2. **Install**:
@@ -65,7 +65,7 @@ Coop is built using Rust and GPUI. All Nostr related stuffs handled by [Rust Nos
 1. Clone the repository:
 
    ```bash
-   git clone https://github.com/reyakov/coop.git
+   git clone https://github.com/lumehq/coop.git
    cd coop
    ```
 
@@ -118,7 +118,7 @@ For more information, see the [Contributing](#contributing) section.
 - [Rust Nostr](https://github.com/rust-nostr/nostr/)
 - [GPUI](https://www.gpui.rs/)
 - [GPUI Components](https://github.com/longbridge/gpui-component/)
-- [Coop Issue Tracker](https://github.com/reyakov/coop/issues/)
+- [Coop Issue Tracker](https://github.com/lumehq/coop/issues/)
 
 ### License
 

crates/chat/src/lib.rs

@@ -7,6 +7,7 @@ use std::time::Duration;
 
 use anyhow::{Context as AnyhowContext, Error, anyhow};
 use common::EventExt;
+use device::{DeviceEvent, DeviceRegistry};
 use fuzzy_matcher::FuzzyMatcher;
 use fuzzy_matcher::skim::SkimMatcherV2;
 use gpui::{
@@ -16,7 +17,7 @@ use gpui::{
 use nostr_sdk::prelude::*;
 use smallvec::{SmallVec, smallvec};
 use smol::lock::RwLock;
-use state::{DEVICE_GIFTWRAP, NostrRegistry, USER_GIFTWRAP};
+use state::{CoopSigner, DEVICE_GIFTWRAP, NostrRegistry, StateEvent, TIMEOUT, USER_GIFTWRAP};
 
 mod message;
 mod room;
@@ -41,8 +42,6 @@ pub enum ChatEvent {
     CloseRoom(u64),
     /// An event to notify UI about a new chat request
     Ping,
-    /// No Inbox Relays found, the app is not ready to subscribe messages
-    InboxRelayNotFound,
     /// An error occurred
     Error(SharedString),
 }
@@ -50,10 +49,6 @@ pub enum ChatEvent {
 /// Channel signal.
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
 enum Signal {
-    /// Inbox Relays found, the app is ready to subscribe messages
-    InboxReady(Box<Event>),
-    /// No Inbox Relays found, the app is not ready to subscribe messages
-    InboxRelayNotFound,
     /// Message received from relay pool
     Message(NewMessage),
     /// Eose received from relay pool
@@ -67,14 +62,6 @@ impl Signal {
         Self::Message(NewMessage::new(gift_wrap, rumor))
     }
 
-    pub fn inbox_ready(event: &Event) -> Self {
-        Self::InboxReady(Box::new(event.to_owned()))
-    }
-
-    pub fn inbox_relay_not_found() -> Self {
-        Self::InboxRelayNotFound
-    }
-
     pub fn eose() -> Self {
         Self::Eose
     }
@@ -90,6 +77,9 @@ impl Signal {
 /// Chat Registry
 #[derive(Debug)]
 pub struct ChatRegistry {
+    /// Whether the chat registry is currently initializing.
+    pub initializing: bool,
+
     /// Chat rooms
     rooms: Vec<Entity<Room>>,
 
@@ -103,10 +93,7 @@ pub struct ChatRegistry {
     event_map: Arc<RwLock<HashMap<EventId, EventId>>>,
 
     /// Tracking the status of unwrapping gift wrap events.
-    tracking: Arc<AtomicBool>,
+    tracking_flag: Arc<AtomicBool>,
-
-    /// Whether the messaging relays have been found.
-    msg_relays_existed: Arc<AtomicBool>,
 
     /// Channel for sending signals to the UI.
     signal_tx: flume::Sender<Signal>,
@@ -137,36 +124,66 @@ impl ChatRegistry {
     /// Create a new chat registry instance
     fn new(window: &mut Window, cx: &mut Context<Self>) -> Self {
         let nostr = NostrRegistry::global(cx);
-        let user_signer = nostr.read(cx).signer.clone();
+        let device = DeviceRegistry::global(cx);
 
         let (tx, rx) = flume::unbounded::<Signal>();
         let mut subscriptions = smallvec![];
 
         subscriptions.push(
             // Subscribe to the signer event
-            cx.observe(&user_signer, |this, signer, cx| {
+            cx.subscribe_in(&nostr, window, |this, state, event, window, cx| {
-                if let Some(keys) = signer.read(cx).clone() {
+                if event == &StateEvent::SignerSet {
                     this.reset(cx);
-                    this.handle_notifications(keys, cx);
+                    this.get_contact_list(cx);
-                    this.get_metadata(cx);
                     this.get_rooms(cx);
+
+                    let signer = state.read(cx).signer();
+                    cx.spawn_in(window, async move |this, cx| {
+                        let user_signer = signer.get().await;
+                        this.update(cx, |this, cx| {
+                            this.get_messages(user_signer, cx);
+                        })
+                        .ok();
+                    })
+                    .detach();
+                };
+            }),
+        );
+
+        subscriptions.push(
+            // Subscribe to the device event
+            cx.subscribe_in(&device, window, |_this, _s, event, window, cx| {
+                if event == &DeviceEvent::Set {
+                    let nostr = NostrRegistry::global(cx);
+                    let signer = nostr.read(cx).signer();
+
+                    cx.spawn_in(window, async move |this, cx| {
+                        if let Some(device_signer) = signer.get_encryption_signer().await {
+                            this.update(cx, |this, cx| {
+                                this.get_messages(device_signer, cx);
+                            })
+                            .ok();
+                        }
+                    })
+                    .detach();
                 };
             }),
         );
 
         // Run at the end of the current cycle
         cx.defer_in(window, |this, _window, cx| {
-            this.tracking(cx);
             this.get_rooms(cx);
+            this.handle_notifications(cx);
+            this.tracking(cx);
         });
 
         Self {
+            initializing: true,
             rooms: vec![],
             trashes: cx.new(|_| BTreeSet::default()),
             seens: Arc::new(RwLock::new(HashMap::default())),
             event_map: Arc::new(RwLock::new(HashMap::default())),
-            tracking: Arc::new(AtomicBool::new(false)),
+            tracking_flag: Arc::new(AtomicBool::new(false)),
-            msg_relays_existed: Arc::new(AtomicBool::new(false)),
             signal_rx: rx,
             signal_tx: tx,
             tasks: smallvec![],
@@ -175,13 +192,11 @@ impl ChatRegistry {
     }
 
     /// Handle nostr notifications
-    fn handle_notifications(&mut self, signer: Keys, cx: &mut Context<Self>) {
+    fn handle_notifications(&mut self, cx: &mut Context<Self>) {
         let nostr = NostrRegistry::global(cx);
         let client = nostr.read(cx).client();
-
+        let signer = nostr.read(cx).signer();
-        let tracking = self.tracking.clone();
+        let status = self.tracking_flag.clone();
-        let msg_relays_existed = self.msg_relays_existed.clone();
-
         let seens = self.seens.clone();
         let event_map = self.event_map.clone();
         let trashes = self.trashes.downgrade();
@@ -217,18 +232,6 @@ impl ChatRegistry {
                             continue;
                         }
 
-                        // Handle msg relays event to determine when the app is ready to subscribe
-                        if event.kind == Kind::InboxRelays {
-                            let current_user = signer.get_public_key_async().await?;
-
-                            if event.pubkey == current_user {
-                                // Mark that the msg relays have been found
-                                msg_relays_existed.store(true, Ordering::Release);
-                                // Emit the inbox ready signal
-                                tx.send_async(Signal::inbox_ready(&event)).await?;
-                            }
-                        }
-
                         // Skip non-gift wrap events
                         if event.kind != Kind::GiftWrap {
                             continue;
@@ -245,8 +248,11 @@ impl ChatRegistry {
 
                                 // Check if the rumor has a recipient
                                 if rumor.tags.is_empty() {
-                                    let signal = Signal::error(&event, "Recipient is missing");
+                                    let signal =
+                                        Signal::error(event.as_ref(), "Recipient is missing");
                                     tx.send_async(signal).await?;
+
+                                    continue;
                                 }
 
                                 // Check if the rumor was created after the chat was initialized (for detecting new messages)
@@ -254,8 +260,7 @@ impl ChatRegistry {
                                     let signal = Signal::message(event.id, rumor);
                                     tx.send_async(signal).await?;
                                 } else {
-                                    // Mark the chat still processing new messages
+                                    status.store(true, Ordering::Release);
-                                    tracking.store(true, Ordering::Release);
                                 }
                             }
                             Err(e) => {
@@ -265,10 +270,10 @@ impl ChatRegistry {
                             }
                         }
                     }
-                    RelayMessage::EndOfStoredEvents(id)
+                    RelayMessage::EndOfStoredEvents(id) => {
-                        if (id.as_ref() == &sub_id1 || id.as_ref() == &sub_id2) =>
+                        if id.as_ref() == &sub_id1 || id.as_ref() == &sub_id2 {
-                    {
+                            tx.send_async(Signal::eose()).await?;
-                        tx.send_async(Signal::eose()).await?;
+                        }
                     }
                     _ => {}
                 }
@@ -285,16 +290,6 @@ impl ChatRegistry {
                             this.new_message(message, cx);
                         })?;
                     }
-                    Signal::InboxReady(event) => {
-                        this.update(cx, |this, cx| {
-                            this.get_messages(&event, cx);
-                        })?;
-                    }
-                    Signal::InboxRelayNotFound => {
-                        this.update(cx, |_this, cx| {
-                            cx.emit(ChatEvent::InboxRelayNotFound);
-                        })?;
-                    }
                     Signal::Eose => {
                         this.update(cx, |this, cx| {
                             this.get_rooms(cx);
@@ -315,7 +310,7 @@ impl ChatRegistry {
 
     /// Tracking the status of unwrapping gift wrap events.
     fn tracking(&mut self, cx: &mut Context<Self>) {
-        let status = self.tracking.clone();
+        let status = self.tracking_flag.clone();
         let tx = self.signal_tx.clone();
 
         self.tasks.push(cx.background_spawn(async move {
@@ -333,71 +328,107 @@ impl ChatRegistry {
         }));
     }
 
-    /// Get all necessary metadata from relays for current user
+    /// Get contact list from relays
-    pub fn get_metadata(&mut self, cx: &mut Context<Self>) {
+    fn get_contact_list(&mut self, cx: &mut Context<Self>) {
         let nostr = NostrRegistry::global(cx);
         let client = nostr.read(cx).client();
+        let signer = nostr.read(cx).signer();
 
-        let Some(public_key) = nostr.read(cx).signer_pubkey(cx) else {
+        let Some(public_key) = signer.public_key() else {
             return;
         };
 
-        self.tasks.push(cx.background_spawn(async move {
+        let task: Task<Result<(), Error>> = cx.background_spawn(async move {
-            let opts = SubscribeAutoCloseOptions::default().exit_policy(ReqExitPolicy::ExitOnEOSE);
+            let id = SubscriptionId::new("contact-list");
+            let opts = SubscribeAutoCloseOptions::default()
+                .exit_policy(ReqExitPolicy::ExitOnEOSE)
+                .timeout(Some(Duration::from_secs(TIMEOUT)));
 
-            // Construct filter for msg relays
+            // Construct filter for inbox relays
-            let msg_relays = Filter::new()
+            let filter = Filter::new()
-                .kind(Kind::InboxRelays)
-                .author(public_key)
-                .limit(1);
-
-            // Construct filter for contact list
-            let contact_list = Filter::new()
                 .kind(Kind::ContactList)
                 .author(public_key)
                 .limit(1);
 
             // Subscribe
-            client
+            client.subscribe(filter).close_on(opts).with_id(id).await?;
-                .subscribe(vec![msg_relays, contact_list])
-                .close_on(opts)
-                .await?;
 
             Ok(())
-        }));
+        });
 
-        let tx = self.signal_tx.clone();
+        self.tasks.push(task);
-        let msg_relays_existed = self.msg_relays_existed.clone();
+    }
 
-        // Reset the status flag
+    /// Get all messages for the provided signer
-        msg_relays_existed.store(false, Ordering::Release);
+    fn get_messages<T>(&mut self, signer: T, cx: &mut Context<Self>)
+    where
+        T: NostrSigner + 'static,
+    {
+        let task = self.subscribe_gift_wrap_events(signer, cx);
 
-        // Wait for the msg relays to be found or timeout
+        self.tasks.push(cx.spawn(async move |this, cx| {
-        self.tasks.push(cx.background_spawn(async move {
+            match task.await {
-            // Wait for 5 seconds
+                Ok(_) => {
-            smol::Timer::after(Duration::from_secs(5)).await;
+                    this.update(cx, |this, cx| {
-
+                        this.set_initializing(false, cx);
-            // Then check if the msg relays have been found
+                    })?;
-            if !msg_relays_existed.load(Ordering::Acquire) {
+                }
-                tx.send_async(Signal::inbox_relay_not_found()).await?;
+                Err(e) => {
+                    this.update(cx, |_this, cx| {
+                        cx.emit(ChatEvent::Error(SharedString::from(e.to_string())));
+                    })?;
+                }
             }
-
             Ok(())
         }));
     }
 
-    /// Get all messages for the provided signer
+    // Get messaging relay list for current user
-    fn get_messages(&mut self, msg_relays: &Event, cx: &mut Context<Self>) {
+    fn get_messaging_relays(&self, cx: &App) -> Task<Result<Vec<RelayUrl>, Error>> {
         let nostr = NostrRegistry::global(cx);
         let client = nostr.read(cx).client();
-        let urls: Vec<RelayUrl> = nip17::extract_relay_list(msg_relays).collect();
+        let signer = nostr.read(cx).signer();
 
-        let Some(signer) = nostr.read(cx).signer(cx) else {
+        cx.background_spawn(async move {
-            return;
+            let public_key = signer.get_public_key().await?;
-        };
+            let id = SubscriptionId::new("inbox-relay");
 
-        let task: Task<Result<(), Error>> = cx.background_spawn(async move {
+            // Construct filter for inbox relays
-            let public_key = signer.get_public_key_async().await?;
+            let filter = Filter::new()
+                .kind(Kind::InboxRelays)
+                .author(public_key)
+                .limit(1);
+
+            // Stream events from user's write relays
+            let mut stream = client
+                .stream_events(filter)
+                .with_id(id)
+                .timeout(Duration::from_secs(TIMEOUT))
+                .await?;
+
+            while let Some((_url, res)) = stream.next().await {
+                if let Ok(event) = res {
+                    let urls: Vec<RelayUrl> = nip17::extract_owned_relay_list(event).collect();
+                    return Ok(urls);
+                }
+            }
+
+            Err(anyhow!("Messaging Relays not found"))
+        })
+    }
+
+    /// Continuously get gift wrap events for the signer
+    fn subscribe_gift_wrap_events<T>(&self, signer: T, cx: &App) -> Task<Result<(), Error>>
+    where
+        T: NostrSigner + 'static,
+    {
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+        let urls = self.get_messaging_relays(cx);
+
+        cx.background_spawn(async move {
+            let urls = urls.await?;
+            let public_key = signer.get_public_key().await?;
             let filter = Filter::new().kind(Kind::GiftWrap).pubkey(public_key);
             let id = SubscriptionId::new(format!("{}-msg", public_key.to_hex()));
 
@@ -420,28 +451,43 @@ impl ChatRegistry {
             );
 
             Ok(())
-        });
+        })
-
-        self.tasks.push(cx.spawn(async move |this, cx| {
-            if let Err(e) = task.await {
-                this.update(cx, |_this, cx| {
-                    cx.emit(ChatEvent::Error(SharedString::from(e.to_string())));
-                })?;
-            }
-            Ok(())
-        }));
     }
 
     /// Refresh the chat registry, fetching messages and contact list from relays.
-    pub fn refresh(&mut self, cx: &mut Context<Self>) {
+    pub fn refresh(&mut self, window: &mut Window, cx: &mut Context<Self>) {
         self.reset(cx);
-        self.get_metadata(cx);
+        self.get_contact_list(cx);
         self.get_rooms(cx);
+
+        let nostr = NostrRegistry::global(cx);
+        let signer = nostr.read(cx).signer();
+
+        cx.spawn_in(window, async move |this, cx| {
+            let user_signer = signer.get().await;
+            let device_signer = signer.get_encryption_signer().await;
+
+            this.update(cx, |this, cx| {
+                this.get_messages(user_signer, cx);
+
+                if let Some(device_signer) = device_signer {
+                    this.get_messages(device_signer, cx);
+                }
+            })
+            .ok();
+        })
+        .detach();
+    }
+
+    /// Set the initializing status of the chat registry
+    fn set_initializing(&mut self, initializing: bool, cx: &mut Context<Self>) {
+        self.initializing = initializing;
+        cx.notify();
     }
 
     /// Get the loading status of the chat registry
     pub fn loading(&self) -> bool {
-        self.tracking.load(Ordering::Acquire)
+        self.tracking_flag.load(Ordering::Acquire)
     }
 
     /// Get a weak reference to a room by its ID.
@@ -511,12 +557,11 @@ impl ChatRegistry {
         I: Into<Room> + 'static,
     {
         let nostr = NostrRegistry::global(cx);
-
+        let client = nostr.read(cx).client();
-        let Some(public_key) = nostr.read(cx).signer_pubkey(cx) else {
-            return;
-        };
 
         cx.spawn(async move |this, cx| {
+            let signer = client.signer()?;
+            let public_key = signer.get_public_key().await.ok()?;
             let room: Room = room.into().organize(&public_key);
 
             this.update(cx, |this, cx| {
@@ -583,6 +628,7 @@ impl ChatRegistry {
 
     /// Reset the registry.
     pub fn reset(&mut self, cx: &mut Context<Self>) {
+        self.initializing = true;
         self.rooms.clear();
         self.trashes.update(cx, |this, cx| {
             this.clear();
@@ -621,13 +667,7 @@ impl ChatRegistry {
 
     /// Load all rooms from the database.
     pub fn get_rooms(&mut self, cx: &mut Context<Self>) {
-        let nostr = NostrRegistry::global(cx);
+        let task = self.get_rooms_from_database(cx);
-
-        let Some(public_key) = nostr.read(cx).signer_pubkey(cx) else {
-            return;
-        };
-
-        let task = self.get_rooms_from_database(public_key, cx);
 
         self.tasks.push(cx.spawn(async move |this, cx| {
             match task.await {
@@ -647,15 +687,14 @@ impl ChatRegistry {
     }
 
     /// Create a task to load rooms from the database
-    fn get_rooms_from_database(
+    fn get_rooms_from_database(&self, cx: &App) -> Task<Result<HashSet<Room>, Error>> {
-        &self,
-        public_key: PublicKey,
-        cx: &App,
-    ) -> Task<Result<HashSet<Room>, Error>> {
         let nostr = NostrRegistry::global(cx);
         let client = nostr.read(cx).client();
 
         cx.background_spawn(async move {
+            let signer = client.signer().context("Signer not found")?;
+            let public_key = signer.get_public_key().await?;
+
             // Get contacts
             let contacts = client
                 .database()
@@ -732,15 +771,15 @@ impl ChatRegistry {
     /// Updates room ordering based on the most recent messages.
     pub fn new_message(&mut self, message: NewMessage, cx: &mut Context<Self>) {
         let nostr = NostrRegistry::global(cx);
-
+        let signer = nostr.read(cx).signer();
-        let Some(public_key) = nostr.read(cx).signer_pubkey(cx) else {
-            return;
-        };
 
         match self.rooms.iter().find(|e| e.read(cx).id == message.room) {
             Some(room) => {
                 room.update(cx, |this, cx| {
-                    if this.kind == RoomKind::Request && message.rumor.pubkey == public_key {
+                    if this.kind == RoomKind::Request
+                        && let Some(public_key) = signer.public_key()
+                        && message.rumor.pubkey == public_key
+                    {
                         this.set_ongoing(cx);
                     }
                     this.push_message(message, cx);
@@ -769,7 +808,7 @@ impl ChatRegistry {
 /// Unwraps a gift-wrapped event and processes its contents.
 async fn extract_rumor(
     client: &Client,
-    signer: &Keys,
+    signer: &Arc<CoopSigner>,
     gift_wrap: &Event,
 ) -> Result<UnsignedEvent, Error> {
     // Try to get cached rumor first
@@ -793,9 +832,8 @@ async fn extract_rumor(
 }
 
 /// Helper method to try unwrapping with different signers
-async fn try_unwrap(signer: &Keys, gift_wrap: &Event) -> Result<UnwrappedGift, Error> {
+async fn try_unwrap(signer: &Arc<CoopSigner>, gift_wrap: &Event) -> Result<UnwrappedGift, Error> {
-    /*
+    // Try with the device signer first
-    *  // Try with the device signer first
     if let Some(signer) = signer.get_encryption_signer().await {
         log::info!("trying with encryption key");
         if let Ok(unwrapped) = try_unwrap_with(gift_wrap, &signer).await {
@@ -805,17 +843,19 @@ async fn try_unwrap(signer: &Keys, gift_wrap: &Event) -> Result<UnwrappedGift, E
 
     // Fallback to the user's signer
     let user_signer = signer.get().await;
-    */
+    let unwrapped = try_unwrap_with(gift_wrap, &user_signer).await?;
-    let unwrapped = try_unwrap_with(gift_wrap, signer).await?;
 
     Ok(unwrapped)
 }
 
 /// Attempts to unwrap a gift wrap event with a given signer.
-async fn try_unwrap_with(gift_wrap: &Event, signer: &Keys) -> Result<UnwrappedGift, Error> {
+async fn try_unwrap_with<T>(gift_wrap: &Event, signer: &T) -> Result<UnwrappedGift, Error>
+where
+    T: NostrSigner + 'static,
+{
     // Get the sealed event
     let seal = signer
-        .nip44_decrypt_async(&gift_wrap.pubkey, &gift_wrap.content)
+        .nip44_decrypt(&gift_wrap.pubkey, &gift_wrap.content)
         .await?;
 
     // Verify the sealed event
@@ -823,10 +863,7 @@ async fn try_unwrap_with(gift_wrap: &Event, signer: &Keys) -> Result<UnwrappedGi
     seal.verify_with_ctx(&SECP256K1)?;
 
     // Get the rumor event
-    let rumor = signer
+    let rumor = signer.nip44_decrypt(&seal.pubkey, &seal.content).await?;
-        .nip44_decrypt_async(&seal.pubkey, &seal.content)
-        .await?;
-
     let rumor = UnsignedEvent::from_json(rumor)?;
 
     Ok(UnwrappedGift {
@@ -847,17 +884,26 @@ async fn set_rumor(client: &Client, id: EventId, rumor: &UnsignedEvent) -> Resul
     tags.push(Tag::identifier(id));
 
     // Add a reference to the rumor's author
-    tags.push(Tag::custom("a", [author]));
+    tags.push(Tag::custom(
+        TagKind::SingleLetter(SingleLetterTag::lowercase(Alphabet::A)),
+        [author],
+    ));
 
     // Add a conversation id
-    tags.push(Tag::custom("c", [conversation.to_string()]));
+    tags.push(Tag::custom(
+        TagKind::SingleLetter(SingleLetterTag::lowercase(Alphabet::C)),
+        [conversation.to_string()],
+    ));
 
     // Add a reference to the rumor's id
     tags.push(Tag::event(rumor_id));
 
     // Add references to the rumor's participants
-    for receiver in rumor.tags.public_keys() {
+    for receiver in rumor.tags.public_keys().copied() {
-        tags.push(Tag::custom("P", [receiver]));
+        tags.push(Tag::custom(
+            TagKind::SingleLetter(SingleLetterTag::lowercase(Alphabet::P)),
+            [receiver],
+        ));
     }
 
     // Convert rumor to json
@@ -866,7 +912,7 @@ async fn set_rumor(client: &Client, id: EventId, rumor: &UnsignedEvent) -> Resul
     // Construct the event
     let event = EventBuilder::new(Kind::ApplicationSpecificData, content)
         .tags(tags)
-        .finalize_async(&Keys::generate())
+        .sign(&Keys::generate())
         .await?;
 
     // Save the event to the database
@@ -892,7 +938,7 @@ async fn get_rumor(client: &Client, gift_wrap: EventId) -> Result<UnsignedEvent,
 /// Get the conversation ID for a given rumor (message).
 fn conversation_id(rumor: &UnsignedEvent) -> u64 {
     let mut hasher = DefaultHasher::new();
-    let mut pubkeys: Vec<PublicKey> = rumor.tags.public_keys().collect();
+    let mut pubkeys: Vec<PublicKey> = rumor.tags.public_keys().copied().collect();
     pubkeys.push(rumor.pubkey);
     pubkeys.sort();
     pubkeys.dedup();

crates/chat/src/message.rs

@@ -1,110 +1,10 @@
 use std::hash::Hash;
 use std::ops::Range;
 
-use common::{EventExt, NostrParser, extract_and_remove_media_urls};
+use common::{EventExt, NostrParser};
-use gpui::{SharedString, SharedUri};
+use gpui::SharedString;
 use nostr_sdk::prelude::*;
 
-/// Rendered message.
-#[derive(Debug, Clone)]
-pub struct Message {
-    pub id: EventId,
-    /// Author's public key
-    pub author: PublicKey,
-    /// The content/text of the message
-    pub content: String,
-    /// List of media URLs in the message
-    pub media: Vec<SharedUri>,
-    /// Message created time as unix timestamp
-    pub created_at: Timestamp,
-    /// List of mentioned public keys in the message
-    pub mentions: Vec<Mention>,
-    /// List of event of the message this message is a reply to
-    pub replies_to: Vec<EventId>,
-}
-
-impl From<&Event> for Message {
-    fn from(val: &Event) -> Self {
-        let mentions = extract_mentions(&val.content);
-        let replies_to = extract_reply_ids(&val.tags);
-        let (media, string) = extract_and_remove_media_urls(&val.content);
-
-        Self {
-            id: val.id,
-            author: val.pubkey,
-            content: string,
-            media,
-            created_at: val.created_at,
-            mentions,
-            replies_to,
-        }
-    }
-}
-
-impl From<&UnsignedEvent> for Message {
-    fn from(val: &UnsignedEvent) -> Self {
-        let mentions = extract_mentions(&val.content);
-        let replies_to = extract_reply_ids(&val.tags);
-        let (media, string) = extract_and_remove_media_urls(&val.content);
-
-        Self {
-            // Event ID must be known
-            id: val.id.unwrap(),
-            author: val.pubkey,
-            content: string,
-            media,
-            created_at: val.created_at,
-            mentions,
-            replies_to,
-        }
-    }
-}
-
-impl From<&NewMessage> for Message {
-    fn from(val: &NewMessage) -> Self {
-        let mentions = extract_mentions(&val.rumor.content);
-        let replies_to = extract_reply_ids(&val.rumor.tags);
-        let (media, string) = extract_and_remove_media_urls(&val.rumor.content);
-
-        Self {
-            // Event ID must be known
-            id: val.rumor.id.unwrap(),
-            author: val.rumor.pubkey,
-            content: string,
-            media,
-            created_at: val.rumor.created_at,
-            mentions,
-            replies_to,
-        }
-    }
-}
-
-impl Eq for Message {}
-
-impl PartialEq for Message {
-    fn eq(&self, other: &Self) -> bool {
-        self.id == other.id
-    }
-}
-
-impl Ord for Message {
-    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
-        self.created_at.cmp(&other.created_at)
-    }
-}
-
-impl PartialOrd for Message {
-    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-impl Hash for Message {
-    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
-        self.id.hash(state);
-    }
-}
-
 /// New message.
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
 pub struct NewMessage {
@@ -144,6 +44,74 @@ impl FailedMessage {
     }
 }
 
+/// Message.
+#[derive(Debug, Clone, Hash, PartialEq, Eq)]
+pub enum Message {
+    User(RenderedMessage),
+    Warning(String, Timestamp),
+    System(Timestamp),
+}
+
+impl Message {
+    pub fn user<I>(user: I) -> Self
+    where
+        I: Into<RenderedMessage>,
+    {
+        Self::User(user.into())
+    }
+
+    pub fn warning<I>(content: I) -> Self
+    where
+        I: Into<String>,
+    {
+        Self::Warning(content.into(), Timestamp::now())
+    }
+
+    pub fn system() -> Self {
+        Self::System(Timestamp::default())
+    }
+
+    fn timestamp(&self) -> &Timestamp {
+        match self {
+            Message::User(msg) => &msg.created_at,
+            Message::Warning(_, ts) => ts,
+            Message::System(ts) => ts,
+        }
+    }
+}
+
+impl From<&NewMessage> for Message {
+    fn from(val: &NewMessage) -> Self {
+        Self::User(val.into())
+    }
+}
+
+impl From<&UnsignedEvent> for Message {
+    fn from(val: &UnsignedEvent) -> Self {
+        Self::User(val.into())
+    }
+}
+
+impl Ord for Message {
+    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
+        match (self, other) {
+            // System always comes first
+            (Message::System(_), Message::System(_)) => self.timestamp().cmp(other.timestamp()),
+            (Message::System(_), _) => std::cmp::Ordering::Less,
+            (_, Message::System(_)) => std::cmp::Ordering::Greater,
+
+            // For non-system messages, compare by timestamp
+            _ => self.timestamp().cmp(other.timestamp()),
+        }
+    }
+}
+
+impl PartialOrd for Message {
+    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
+        Some(self.cmp(other))
+    }
+}
+
 #[derive(Debug, Clone)]
 pub struct Mention {
     pub public_key: PublicKey,
@@ -156,6 +124,98 @@ impl Mention {
     }
 }
 
+/// Rendered message.
+#[derive(Debug, Clone)]
+pub struct RenderedMessage {
+    pub id: EventId,
+    /// Author's public key
+    pub author: PublicKey,
+    /// The content/text of the message
+    pub content: String,
+    /// Message created time as unix timestamp
+    pub created_at: Timestamp,
+    /// List of mentioned public keys in the message
+    pub mentions: Vec<Mention>,
+    /// List of event of the message this message is a reply to
+    pub replies_to: Vec<EventId>,
+}
+
+impl From<&Event> for RenderedMessage {
+    fn from(val: &Event) -> Self {
+        let mentions = extract_mentions(&val.content);
+        let replies_to = extract_reply_ids(&val.tags);
+
+        Self {
+            id: val.id,
+            author: val.pubkey,
+            content: val.content.clone(),
+            created_at: val.created_at,
+            mentions,
+            replies_to,
+        }
+    }
+}
+
+impl From<&UnsignedEvent> for RenderedMessage {
+    fn from(val: &UnsignedEvent) -> Self {
+        let mentions = extract_mentions(&val.content);
+        let replies_to = extract_reply_ids(&val.tags);
+
+        Self {
+            // Event ID must be known
+            id: val.id.unwrap(),
+            author: val.pubkey,
+            content: val.content.clone(),
+            created_at: val.created_at,
+            mentions,
+            replies_to,
+        }
+    }
+}
+
+impl From<&NewMessage> for RenderedMessage {
+    fn from(val: &NewMessage) -> Self {
+        let mentions = extract_mentions(&val.rumor.content);
+        let replies_to = extract_reply_ids(&val.rumor.tags);
+
+        Self {
+            // Event ID must be known
+            id: val.rumor.id.unwrap(),
+            author: val.rumor.pubkey,
+            content: val.rumor.content.clone(),
+            created_at: val.rumor.created_at,
+            mentions,
+            replies_to,
+        }
+    }
+}
+
+impl Eq for RenderedMessage {}
+
+impl PartialEq for RenderedMessage {
+    fn eq(&self, other: &Self) -> bool {
+        self.id == other.id
+    }
+}
+
+impl Ord for RenderedMessage {
+    fn cmp(&self, other: &Self) -> std::cmp::Ordering {
+        self.created_at.cmp(&other.created_at)
+    }
+}
+
+impl PartialOrd for RenderedMessage {
+    fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
+        Some(self.cmp(other))
+    }
+}
+
+impl Hash for RenderedMessage {
+    fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
+        self.id.hash(state);
+    }
+}
+
 /// Extracts all mentions (public keys) from a content string.
 fn extract_mentions(content: &str) -> Vec<Mention> {
     let parser = NostrParser::new();
@@ -174,13 +234,13 @@ fn extract_mentions(content: &str) -> Vec<Mention> {
 fn extract_reply_ids(inner: &Tags) -> Vec<EventId> {
     let mut replies_to = vec![];
 
-    for tag in inner.iter().filter(|tag| tag.kind() == "e") {
+    for tag in inner.filter(TagKind::e()) {
         if let Some(id) = tag.content().and_then(|id| EventId::parse(id).ok()) {
             replies_to.push(id);
         }
     }
 
-    for tag in inner.iter().filter(|tag| tag.kind() == "q") {
+    for tag in inner.filter(TagKind::q()) {
         if let Some(id) = tag.content().and_then(|id| EventId::parse(id).ok()) {
             replies_to.push(id);
         }

crates/chat/src/room.rs

@@ -4,7 +4,6 @@ use std::time::Duration;
 
 use anyhow::{Error, anyhow};
 use common::EventExt;
-use device::DeviceRegistry;
 use gpui::{App, AppContext, Context, EventEmitter, SharedString, Task};
 use itertools::Itertools;
 use nostr_sdk::prelude::*;
@@ -22,7 +21,7 @@ pub struct SendReport {
     pub receiver: PublicKey,
     pub gift_wrap_id: Option<EventId>,
     pub error: Option<SharedString>,
-    pub output: Option<Output<EventId, EventSendStatus>>,
+    pub output: Option<Output<EventId>>,
 }
 
 impl SendReport {
@@ -42,7 +41,7 @@ impl SendReport {
     }
 
     /// Set the output.
-    pub fn output(mut self, output: Output<EventId, EventSendStatus>) -> Self {
+    pub fn output(mut self, output: Output<EventId>) -> Self {
         self.output = Some(output);
         self
     }
@@ -172,8 +171,7 @@ impl From<&UnsignedEvent> for Room {
         let members = val.extract_public_keys();
         let subject = val
             .tags
-            .iter()
+            .find(TagKind::Subject)
-            .find(|tag| tag.kind() == "subject")
             .and_then(|tag| tag.content().map(|s| s.to_owned().into()));
 
         Room {
@@ -207,7 +205,7 @@ impl Room {
         // WARNING: never sign this event
         let mut event = EventBuilder::new(Kind::PrivateDirectMessage, "")
             .tags(tags)
-            .finalize_unsigned(author);
+            .build(author);
 
         // Ensure that the ID is set
         event.ensure_id();
@@ -402,10 +400,6 @@ impl Room {
                 .await?
                 .into_iter()
                 .filter_map(|event| UnsignedEvent::from_json(&event.content).ok())
-                .filter(|event| {
-                    // Only process private direct messages and file messages
-                    event.kind == Kind::PrivateDirectMessage || event.kind == Kind::Custom(15)
-                })
                 .sorted_by_key(|message| message.created_at)
                 .collect();
 
@@ -427,7 +421,7 @@ impl Room {
         let nostr = NostrRegistry::global(cx);
 
         // Get current user's public key
-        let sender = nostr.read(cx).signer_pubkey(cx)?;
+        let sender = nostr.read(cx).signer().public_key()?;
 
         // Get all members, excluding the sender
         let members: Vec<Person> = self
@@ -442,7 +436,9 @@ impl Room {
 
         // Add subject tag if present
         if let Some(value) = self.subject.as_ref() {
-            tags.push(Tag::custom("subject", vec![value.to_string()]));
+            tags.push(Tag::from_standardized_without_cell(TagStandard::Subject(
+                value.to_string(),
+            )));
         }
 
         // Add all reply tags
@@ -452,20 +448,19 @@ impl Room {
 
         // Add all receiver tags
         for member in members.into_iter() {
-            tags.push(
+            tags.push(Tag::from_standardized_without_cell(
-                Nip01Tag::PublicKey {
+                TagStandard::PublicKey {
                     public_key: member.public_key(),
-                    relay_hint: member.messaging_relay_hint(),
+                    relay_url: member.messaging_relay_hint(),
-                }
+                    alias: None,
-                .to_tag(),
+                    uppercase: false,
-            );
+                },
+            ));
         }
 
         // Construct a direct message rumor event
         // WARNING: never sign and send this event to relays
-        let mut event = EventBuilder::new(kind, content)
+        let mut event = EventBuilder::new(kind, content).tags(tags).build(sender);
-            .tags(tags)
-            .finalize_unsigned(sender);
 
         // Ensure that the ID is set
         event.ensure_id();
@@ -476,18 +471,13 @@ impl Room {
     /// Send rumor event to all members's messaging relays
     pub fn send(&self, rumor: UnsignedEvent, cx: &App) -> Option<Task<Vec<SendReport>>> {
         let config = self.config.clone();
-
+        let persons = PersonRegistry::global(cx);
-        let device = DeviceRegistry::global(cx);
-        let encryption_signer = device.read(cx).signer(cx);
-
         let nostr = NostrRegistry::global(cx);
         let client = nostr.read(cx).client();
+        let signer = nostr.read(cx).signer();
 
         // Get current user's public key
-        let user_signer = nostr.read(cx).signer(cx)?;
+        let public_key = nostr.read(cx).signer().public_key()?;
-        let public_key = nostr.read(cx).signer_pubkey(cx)?;
-
-        let persons = PersonRegistry::global(cx);
         let sender = persons.read(cx).get(&public_key, cx);
 
         // Get all members (excluding sender)
@@ -502,6 +492,9 @@ impl Room {
             let signer_kind = config.signer_kind();
             let backup = config.backup();
 
+            let user_signer = signer.get().await;
+            let encryption_signer = signer.get_encryption_signer().await;
+
             let mut sents = 0;
             let mut reports = Vec::new();
 
@@ -595,15 +588,17 @@ impl Room {
 }
 
 // Helper function to send a gift-wrapped event
-async fn send_gift_wrap(
+async fn send_gift_wrap<T>(
     client: &Client,
-    signer: &Keys,
+    signer: &T,
     receiver: &Person,
     rumor: &UnsignedEvent,
     config: &SignerKind,
-) -> Result<SendReport, Error> {
+) -> Result<SendReport, Error>
-    let k_tag = Tag::custom("k", vec!["14"]);
+where
-    let mut extra_tags = vec![k_tag];
+    T: NostrSigner + 'static,
+{
+    let mut extra_tags = vec![];
 
     // Determine the receiver public key based on the config
     let receiver = match config {
@@ -627,10 +622,7 @@ async fn send_gift_wrap(
     };
 
     // Construct the gift wrap event
-    let event = nip59::GiftWrapBuilder::new(receiver, rumor.clone())
+    let event = EventBuilder::gift_wrap(signer, &receiver, rumor.clone(), extra_tags).await?;
-        .extra_tags(extra_tags)
-        .finalize_async(signer)
-        .await?;
 
     // Send the gift wrap event and collect the report
     let report = client

crates/chat_ui/src/lib.rs

@@ -3,15 +3,15 @@ use std::sync::Arc;
 
 pub use actions::*;
 use anyhow::{Context as AnyhowContext, Error};
-use chat::{ChatRegistry, Message, Room, RoomEvent, SendReport, SendStatus};
+use chat::{ChatRegistry, Message, RenderedMessage, Room, RoomEvent, SendReport, SendStatus};
-use common::{TimestampExt, coop_cache};
+use common::TimestampExt;
 use gpui::prelude::FluentBuilder;
 use gpui::{
     AnyElement, App, AppContext, ClipboardItem, Context, Entity, EventEmitter, FocusHandle,
     Focusable, InteractiveElement, IntoElement, ListAlignment, ListOffset, ListState, MouseButton,
-    ObjectFit, ParentElement, PathPromptOptions, Render, SharedString, SharedUri,
+    ObjectFit, ParentElement, PathPromptOptions, Render, SharedString, StatefulInteractiveElement,
-    StatefulInteractiveElement, Styled, StyledImage, Subscription, Task, WeakEntity, Window, div,
+    Styled, StyledImage, Subscription, Task, WeakEntity, Window, deferred, div, img, list, px, red,
-    img, list, px, red, relative, svg, white,
+    relative, svg, white,
 };
 use itertools::Itertools;
 use nostr_sdk::prelude::*;
@@ -24,7 +24,7 @@ use theme::ActiveTheme;
 use ui::avatar::Avatar;
 use ui::button::{Button, ButtonVariants};
 use ui::dock::{Panel, PanelEvent};
-use ui::input::{Input, InputEvent, InputState};
+use ui::input::{InputEvent, InputState, TextInput};
 use ui::menu::DropdownMenu;
 use ui::notification::Notification;
 use ui::scroll::Scrollbar;
@@ -38,6 +38,9 @@ use crate::text::RenderedText;
 mod actions;
 mod text;
 
+const ANNOUNCEMENT: &str =
+    "This conversation is private. Only members can see each other's messages.";
+
 pub fn init(room: WeakEntity<Room>, window: &mut Window, cx: &mut App) -> Entity<ChatPanel> {
     cx.new(|cx| ChatPanel::new(room, window, cx))
 }
@@ -98,7 +101,7 @@ impl ChatPanel {
         let reports_by_id = cx.new(|_| BTreeMap::new());
 
         // Define list of messages
-        let messages = BTreeSet::default();
+        let messages = BTreeSet::from([Message::system()]);
         let list_state = ListState::new(messages.len(), ListAlignment::Bottom, px(1024.));
 
         // Get room id and name
@@ -116,6 +119,7 @@ impl ChatPanel {
             InputState::new(window, cx)
                 .placeholder(format!("Message {}", name))
                 .auto_grow(1, 20)
+                .prevent_new_line_on_enter()
                 .clean_on_escape()
         });
 
@@ -231,7 +235,7 @@ impl ChatPanel {
                             match &*status {
                                 SendStatus::Ok { id, relay } => {
                                     if output.id() == id {
-                                        output.success.insert(relay.clone(), EventSendStatus::Sent);
+                                        output.success.insert(relay.clone());
                                     }
                                 }
                                 SendStatus::Failed { id, relay, message } => {
@@ -473,13 +477,25 @@ impl ChatPanel {
     }
 
     /// Get a message by its ID
-    fn message(&self, id: &EventId) -> Option<&Message> {
+    fn message(&self, id: &EventId) -> Option<&RenderedMessage> {
-        self.messages.iter().find(|msg| &msg.id == id)
+        self.messages.iter().find_map(|msg| {
+            if let Message::User(rendered) = msg
+                && &rendered.id == id
+            {
+                return Some(rendered);
+            }
+            None
+        })
     }
 
-    /// Scroll to a message by its ID
+    fn scroll_to(&self, id: EventId) {
-    fn scroll_to(&self, id: &EventId) {
+        if let Some(ix) = self.messages.iter().position(|m| {
-        if let Some(ix) = self.messages.iter().position(|msg| &msg.id == id) {
+            if let Message::User(msg) = m {
+                msg.id == id
+            } else {
+                false
+            }
+        }) {
             self.list_state.scroll_to_reveal_item(ix);
         }
     }
@@ -599,19 +615,13 @@ impl ChatPanel {
                     })
                     .is_err()
                 {
-                    window.push_notification(Notification::error("Failed to change subject"), cx);
+                    window.push_notification(
+                        Notification::error("Failed to change subject").autohide(false),
+                        cx,
+                    );
                 }
             }
             Command::ChangeSigner(kind) => {
-                let settings = AppSettings::global(cx);
-                let is_nip4e_enabled = settings.read(cx).is_nip4e_enabled(cx);
-                let is_force_nip4e = *kind == SignerKind::Encryption || *kind == SignerKind::Auto;
-
-                if !is_nip4e_enabled && is_force_nip4e {
-                    window.push_notification("Decoupling Encryption Key is not enabled", cx);
-                    return;
-                }
-
                 if self
                     .room
                     .update(cx, |this, cx| {
@@ -619,7 +629,10 @@ impl ChatPanel {
                     })
                     .is_err()
                 {
-                    window.push_notification(Notification::error("Failed to change signer"), cx);
+                    window.push_notification(
+                        Notification::error("Failed to change signer").autohide(false),
+                        cx,
+                    );
                 }
             }
             Command::ToggleBackup => {
@@ -630,7 +643,10 @@ impl ChatPanel {
                     })
                     .is_err()
                 {
-                    window.push_notification(Notification::error("Failed to toggle backup"), cx);
+                    window.push_notification(
+                        Notification::error("Failed to toggle backup").autohide(false),
+                        cx,
+                    );
                 }
             }
             Command::Copy(public_key) => {
@@ -727,11 +743,9 @@ impl ChatPanel {
         cx.open_url(&content);
     }
 
-    fn render_announcement(&self, cx: &Context<Self>) -> AnyElement {
+    fn render_announcement(&self, ix: usize, cx: &Context<Self>) -> AnyElement {
-        const MSG: &str =
-            "This conversation is private. Only members can see each other's messages.";
-
         v_flex()
+            .id(ix)
             .h_40()
             .w_full()
             .gap_3()
@@ -748,7 +762,7 @@ impl ChatPanel {
                     .size_12()
                     .text_color(cx.theme().ghost_element_active),
             )
-            .child(MSG)
+            .child(SharedString::from(ANNOUNCEMENT))
             .into_any_element()
     }
 
@@ -785,34 +799,6 @@ impl ChatPanel {
             .into_any_element()
     }
 
-    fn is_group_start(&self, ix: usize) -> bool {
-        // 5 minutes
-        const GROUP_WINDOW: u64 = 300;
-
-        if ix == 0 {
-            return true;
-        }
-
-        let mut iter = self.messages.iter();
-
-        if let Some(previous) = iter.nth(ix - 1)
-            && let Some(current) = iter.next()
-        {
-            if current.author != previous.author {
-                return true;
-            }
-
-            let gap = current
-                .created_at
-                .as_secs()
-                .saturating_sub(previous.created_at.as_secs());
-
-            return gap > GROUP_WINDOW;
-        }
-
-        false
-    }
-
     fn render_message(
         &mut self,
         ix: usize,
@@ -820,17 +806,24 @@ impl ChatPanel {
         cx: &mut Context<Self>,
     ) -> AnyElement {
         if let Some(message) = self.messages.iter().nth(ix) {
-            let persons = PersonRegistry::global(cx);
+            match message {
-            let show_author = self.is_group_start(ix);
+                Message::User(rendered) => {
-            let text = self
+                    let persons = PersonRegistry::global(cx);
-                .rendered_texts_by_id
+                    let text = self
-                .entry(message.id)
+                        .rendered_texts_by_id
-                .or_insert_with(|| {
+                        .entry(rendered.id)
-                    RenderedText::new(&message.content, &message.mentions, &persons, cx)
+                        .or_insert_with(|| {
-                })
+                            RenderedText::new(&rendered.content, &rendered.mentions, &persons, cx)
-                .element(ix.into(), window, cx);
+                        })
+                        .element(ix.into(), window, cx);
 
-            self.render_text_message(ix, message, text, show_author, cx)
+                    self.render_text_message(ix, rendered, text, cx)
+                }
+                Message::Warning(content, _timestamp) => {
+                    self.render_warning(ix, SharedString::from(content), cx)
+                }
+                Message::System(_timestamp) => self.render_announcement(ix, cx),
+            }
         } else {
             self.render_warning(ix, SharedString::from("Message not found"), cx)
         }
@@ -839,9 +832,8 @@ impl ChatPanel {
     fn render_text_message(
         &self,
         ix: usize,
-        message: &Message,
+        message: &RenderedMessage,
         rendered_text: AnyElement,
-        show_author: bool,
         cx: &Context<Self>,
     ) -> AnyElement {
         let id = message.id;
@@ -867,21 +859,17 @@ impl ChatPanel {
                     .flex()
                     .gap_3()
                     .when(!hide_avatar, |this| {
-                        if show_author {
+                        this.child(
-                            this.child(
+                            Avatar::new(author.avatar())
-                                Avatar::new(author.avatar())
+                                .flex_shrink_0()
-                                    .flex_shrink_0()
+                                .relative()
-                                    .relative()
+                                .dropdown_menu(move |this, _window, _cx| {
-                                    .dropdown_menu(move |this, _window, _cx| {
+                                    this.menu("Public Key", Box::new(Command::Copy(pk)))
-                                        this.menu("Public Key", Box::new(Command::Copy(pk)))
+                                        .menu("View Relays", Box::new(Command::Relays(pk)))
-                                            .menu("View Relays", Box::new(Command::Relays(pk)))
+                                        .separator()
-                                            .separator()
+                                        .menu("View on njump.me", Box::new(Command::Njump(pk)))
-                                            .menu("View on njump.me", Box::new(Command::Njump(pk)))
+                                }),
-                                    }),
+                        )
-                            )
-                        } else {
-                            this.child(div().flex_shrink_0().w(px(32.)))
-                        }
                     })
                     .child(
                         v_flex()
@@ -889,29 +877,26 @@ impl ChatPanel {
                             .w_full()
                             .flex_initial()
                             .overflow_hidden()
-                            .when(show_author, |this| {
+                            .child(
-                                this.child(
+                                h_flex()
-                                    h_flex()
+                                    .gap_2()
-                                        .gap_2()
+                                    .text_sm()
-                                        .text_sm()
+                                    .text_color(cx.theme().text_placeholder)
-                                        .text_color(cx.theme().text_placeholder)
+                                    .child(
-                                        .child(
+                                        div()
-                                            div()
+                                            .font_semibold()
-                                                .font_semibold()
+                                            .text_color(cx.theme().text)
-                                                .text_color(cx.theme().text)
+                                            .child(author.name()),
-                                                .child(author.name()),
+                                    )
-                                        )
+                                    .child(message.created_at.to_human_time())
-                                        .child(message.created_at.to_human_time())
+                                    .when(has_reports, |this| {
-                                        .when(has_reports, |this| {
+                                        this.child(deferred(self.render_sent_reports(&id, cx)))
-                                            this.child(self.render_sent_reports(&id, cx))
+                                    }),
-                                        }),
+                            )
-                                )
-                            })
                             .when(has_replies, |this| {
                                 this.children(self.render_message_replies(replies, cx))
                             })
-                            .child(rendered_text)
+                            .child(rendered_text),
-                            .child(self.render_media(&message.media, cx)),
                     ),
             )
             .child(
@@ -938,55 +923,6 @@ impl ChatPanel {
             .into_any_element()
     }
 
-    fn render_media(&self, media: &[SharedUri], cx: &Context<Self>) -> impl IntoElement {
-        // No media: return empty div
-        if media.is_empty() {
-            return div();
-        };
-
-        // Single media item: render full-width image
-        if media.len() == 1 {
-            return div().child(
-                img(media[0].clone())
-                    .border_1()
-                    .border_color(cx.theme().border_variant)
-                    .h(px(250.))
-                    .object_fit(ObjectFit::Cover)
-                    .rounded(cx.theme().radius),
-            );
-        }
-
-        // Multiple media items: render in a row
-        div()
-            .w_full()
-            .flex_1()
-            .flex()
-            .flex_row()
-            .flex_wrap()
-            .gap_2()
-            .children({
-                let mut items = vec![];
-
-                for (ix, item) in media.iter().enumerate() {
-                    items.push(
-                        div()
-                            .id(format!("media-{ix}"))
-                            .flex_grow_0()
-                            .flex_shrink_0()
-                            .child(
-                                img(item.clone())
-                                    .h_32()
-                                    .border_1()
-                                    .border_color(cx.theme().border_variant)
-                                    .rounded(cx.theme().radius),
-                            ),
-                    );
-                }
-
-                items
-            })
-    }
-
     fn render_message_replies(
         &self,
         replies: &[EventId],
@@ -1024,7 +960,7 @@ impl ChatPanel {
                     .on_click({
                         let id = *id;
                         cx.listener(move |this, _event, _window, _cx| {
-                            this.scroll_to(&id);
+                            this.scroll_to(id);
                         })
                     }),
             );
@@ -1173,7 +1109,7 @@ impl ChatPanel {
                                                 .text_xs()
                                                 .font_semibold()
                                                 .line_height(relative(1.25))
-                                                .child(SharedString::from(url.0.to_string())),
+                                                .child(SharedString::from(url.to_string())),
                                         )
                                         .child(
                                             div()
@@ -1417,7 +1353,7 @@ impl ChatPanel {
             .icon(IconName::Emoji)
             .ghost()
             .large()
-            .dropdown_menu_with_anchor(gpui::Anchor::BottomLeft, move |this, _window, _cx| {
+            .dropdown_menu_with_anchor(gpui::Corner::BottomLeft, move |this, _window, _cx| {
                 this.horizontal()
                     .menu("👍", Box::new(Command::Insert("👍")))
                     .menu("👎", Box::new(Command::Insert("👎")))
@@ -1481,7 +1417,6 @@ impl Focusable for ChatPanel {
 impl Render for ChatPanel {
     fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         v_flex()
-            .image_cache(coop_cache(self.id.clone(), 100))
             .on_action(cx.listener(Self::on_command))
             .size_full()
             .when(*self.subject_bar.read(cx), |this| {
@@ -1494,7 +1429,7 @@ impl Render for ChatPanel {
                         .border_b_1()
                         .border_color(cx.theme().border)
                         .child(
-                            Input::new(&self.subject_input)
+                            TextInput::new(&self.subject_input)
                                 .text_sm()
                                 .small()
                                 .bordered(false),
@@ -1515,28 +1450,15 @@ impl Render for ChatPanel {
                 v_flex()
                     .flex_1()
                     .relative()
-                    .map(|this| {
+                    .child(
-                        if self.messages.is_empty() {
+                        list(
-                            this.child(
+                            self.list_state.clone(),
-                                div()
+                            cx.processor(move |this, ix, window, cx| {
-                                    .size_full()
+                                this.render_message(ix, window, cx)
-                                    .flex()
+                            }),
-                                    .items_center()
+                        )
-                                    .justify_end()
+                        .size_full(),
-                                    .child(self.render_announcement(cx)),
+                    )
-                            )
-                        } else {
-                            this.child(
-                                list(
-                                    self.list_state.clone(),
-                                    cx.processor(move |this, ix, window, cx| {
-                                        this.render_message(ix, window, cx)
-                                    }),
-                                )
-                                .size_full(),
-                            )
-                        }
-                    })
                     .child(Scrollbar::vertical(&self.list_state)),
             )
             .child(
@@ -1562,7 +1484,12 @@ impl Render for ChatPanel {
                                         this.upload(window, cx);
                                     })),
                             )
-                            .child(Input::new(&self.input).appearance(false).flex_1())
+                            .child(
+                                TextInput::new(&self.input)
+                                    .appearance(false)
+                                    .text_sm()
+                                    .flex_1(),
+                            )
                             .child(
                                 h_flex()
                                     .pl_1()

crates/chat_ui/src/text.rs

@@ -69,7 +69,6 @@ impl RenderedText {
 
     pub fn element(&self, id: ElementId, window: &Window, cx: &App) -> AnyElement {
         let code_background = cx.theme().elevated_surface_background;
-        let color = cx.theme().text_accent;
 
         InteractiveText::new(
             id,
@@ -101,7 +100,6 @@ impl RenderedText {
                                 }
                             }
                             Highlight::Mention => HighlightStyle {
-                                color: Some(color),
                                 underline: Some(UnderlineStyle {
                                     thickness: 1.0.into(),
                                     ..Default::default()

crates/common/Cargo.toml

@@ -20,4 +20,3 @@ log.workspace = true
 dirs = "5.0"
 qrcode = "0.14.1"
 bech32 = "0.11.1"
-regex = "1.10"

crates/common/src/caching.rs

@@ -1,135 +0,0 @@
-use std::collections::{HashMap, VecDeque};
-use std::mem::take;
-
-use futures::FutureExt;
-use gpui::{
-    App, AppContext, Asset, AssetLogger, ElementId, Entity, ImageAssetLoader, ImageCache,
-    ImageCacheItem, ImageCacheProvider, ImageSource, Resource, hash,
-};
-
-pub fn coop_cache(id: impl Into<ElementId>, max_items: usize) -> CoopImageCacheProvider {
-    CoopImageCacheProvider {
-        id: id.into(),
-        max_items,
-    }
-}
-
-pub struct CoopImageCacheProvider {
-    id: ElementId,
-    max_items: usize,
-}
-
-impl ImageCacheProvider for CoopImageCacheProvider {
-    fn provide(&mut self, window: &mut gpui::Window, cx: &mut App) -> gpui::AnyImageCache {
-        window
-            .with_global_id(self.id.clone(), |id, window| {
-                window.with_element_state(id, |cache, _| {
-                    let cache = cache.unwrap_or_else(|| CoopImageCache::new(self.max_items, cx));
-                    (cache.clone(), cache)
-                })
-            })
-            .into()
-    }
-}
-
-pub struct CoopImageCache {
-    max_items: usize,
-    usage_list: VecDeque<u64>,
-    cache: HashMap<u64, (ImageCacheItem, Resource)>,
-}
-
-impl CoopImageCache {
-    pub fn new(max_items: usize, cx: &mut App) -> Entity<Self> {
-        cx.new(|cx| {
-            log::info!("Creating CoopImageCache");
-            cx.on_release(|this: &mut Self, cx| {
-                for (ix, (mut image, resource)) in take(&mut this.cache) {
-                    if let Some(Ok(image)) = image.get() {
-                        log::info!("Dropping image {ix}");
-                        cx.drop_image(image, None);
-                    }
-                    ImageSource::Resource(resource).remove_asset(cx);
-                }
-            })
-            .detach();
-
-            CoopImageCache {
-                max_items,
-                usage_list: VecDeque::with_capacity(max_items),
-                cache: HashMap::with_capacity(max_items),
-            }
-        })
-    }
-}
-
-impl ImageCache for CoopImageCache {
-    fn load(
-        &mut self,
-        resource: &Resource,
-        window: &mut gpui::Window,
-        cx: &mut gpui::App,
-    ) -> Option<Result<std::sync::Arc<gpui::RenderImage>, gpui::ImageCacheError>> {
-        let hash = hash(resource);
-
-        if let Some(item) = self.cache.get_mut(&hash) {
-            let current_idx = self
-                .usage_list
-                .iter()
-                .position(|item| *item == hash)
-                .expect("cache has an item usage_list doesn't");
-
-            self.usage_list.remove(current_idx);
-            self.usage_list.push_front(hash);
-
-            return item.0.get();
-        }
-
-        let load_future = AssetLogger::<ImageAssetLoader>::load(resource.clone(), cx);
-        let task = cx.background_executor().spawn(load_future).shared();
-
-        if self.usage_list.len() >= self.max_items {
-            log::info!("Image cache is full, evicting oldest item");
-
-            if let Some(oldest) = self.usage_list.pop_back() {
-                let mut image = self
-                    .cache
-                    .remove(&oldest)
-                    .expect("usage_list has an item cache doesn't");
-
-                if let Some(Ok(image)) = image.0.get() {
-                    log::info!("requesting image to be dropped");
-                    cx.drop_image(image, Some(window));
-                }
-
-                ImageSource::Resource(image.1).remove_asset(cx);
-            }
-        }
-
-        self.cache.insert(
-            hash,
-            (
-                gpui::ImageCacheItem::Loading(task.clone()),
-                resource.clone(),
-            ),
-        );
-        self.usage_list.push_front(hash);
-
-        let entity = window.current_view();
-
-        window
-            .spawn(cx, async move |cx| {
-                let result = task.await;
-
-                if let Err(err) = result {
-                    log::error!("error loading image into cache: {:?}", err);
-                }
-
-                cx.on_next_frame(move |_, cx| {
-                    cx.notify(entity);
-                });
-            })
-            .detach();
-
-        None
-    }
-}

crates/common/src/event.rs

@@ -18,7 +18,7 @@ impl EventExt for Event {
     }
 
     fn extract_public_keys(&self) -> Vec<PublicKey> {
-        let mut public_keys: Vec<PublicKey> = self.tags.public_keys().collect();
+        let mut public_keys: Vec<PublicKey> = self.tags.public_keys().copied().collect();
         public_keys.push(self.pubkey);
 
         public_keys.into_iter().unique().collect()
@@ -46,7 +46,7 @@ impl EventExt for UnsignedEvent {
     }
 
     fn extract_public_keys(&self) -> Vec<PublicKey> {
-        let mut public_keys: Vec<PublicKey> = self.tags.public_keys().collect();
+        let mut public_keys: Vec<PublicKey> = self.tags.public_keys().copied().collect();
         public_keys.push(self.pubkey);
         public_keys.into_iter().unique().sorted().collect()
     }

crates/common/src/lib.rs

@@ -1,17 +1,13 @@
-pub use caching::*;
 pub use debounced_delay::*;
 pub use display::*;
 pub use event::*;
-pub use media_extractor::*;
 pub use parser::*;
 pub use paths::*;
 pub use range::*;
 
-mod caching;
 mod debounced_delay;
 mod display;
 mod event;
-mod media_extractor;
 mod parser;
 mod paths;
 mod range;

crates/common/src/media_extractor.rs

@@ -1,117 +0,0 @@
-use gpui::SharedUri;
-use regex::Regex;
-
-/// Extracts media URLs from a string and returns both the extracted URLs
-/// and the string with media URLs removed
-pub struct MediaExtractor {
-    image_regex: Regex,
-    video_regex: Regex,
-}
-
-impl MediaExtractor {
-    /// Creates a new MediaExtractor with compiled regex patterns
-    pub fn new() -> Self {
-        MediaExtractor {
-            // Match common image extensions
-            image_regex: Regex::new(
-                r#"(?i)\bhttps?://[^\s<>"']+\.(?:jpg|jpeg|png|gif|bmp|webp|svg|ico)(?:\?[^\s<>"']*)?\b"#,
-            ).unwrap(),
-            // Match common video extensions
-            video_regex: Regex::new(
-                r#"(?i)\bhttps?://[^\s<>"']+\.(?:mp4|mov|avi|mkv|webm|flv|wmv|m4v|3gp)(?:\?[^\s<>"']*)?\b"#,
-            ).unwrap(),
-        }
-    }
-
-    /// Extracts all media URLs from a string
-    pub fn extract_media_urls(&self, text: &str) -> Vec<SharedUri> {
-        let mut urls = Vec::new();
-
-        // Extract image URLs
-        for capture in self.image_regex.find_iter(text) {
-            urls.push(capture.as_str().to_string().into());
-        }
-
-        // Extract video URLs
-        // for capture in self.video_regex.find_iter(text) {
-        //     urls.push(capture.as_str().to_string().into());
-        // }
-
-        urls
-    }
-
-    /// Removes all media URLs from a string and returns the cleaned text
-    pub fn remove_media_urls(&self, text: &str) -> String {
-        let mut result = text.to_string();
-
-        // Remove image URLs
-        result = self.image_regex.replace_all(&result, "").to_string();
-
-        // Remove video URLs
-        // result = self.video_regex.replace_all(&result, "").to_string();
-
-        // Clean up extra whitespace that might result from removal
-        self.cleanup_text(&result)
-    }
-
-    /// Extracts media URLs and removes them from the string, returning both
-    pub fn extract_and_remove(&self, text: &str) -> (Vec<SharedUri>, String) {
-        let urls = self.extract_media_urls(text);
-        let cleaned_text = self.remove_media_urls(text);
-        (urls, cleaned_text)
-    }
-
-    /// Helper function to clean up text after URL removal
-    fn cleanup_text(&self, text: &str) -> String {
-        let text = text.trim();
-
-        // Remove multiple consecutive spaces
-        let re = Regex::new(r"\s+").unwrap();
-        re.replace_all(text, " ").trim().to_string()
-    }
-
-    /// Validates if a URL is a valid media URL
-    pub fn is_media_url(&self, url: &str) -> bool {
-        self.image_regex.is_match(url) || self.video_regex.is_match(url)
-    }
-
-    /// Categorizes extracted URLs into images and videos
-    pub fn categorize_urls(&self, urls: &[SharedUri]) -> (Vec<SharedUri>, Vec<SharedUri>) {
-        let mut images = Vec::new();
-        let mut videos = Vec::new();
-
-        for url in urls {
-            if self.image_regex.is_match(url) {
-                images.push(url.clone());
-            } else if self.video_regex.is_match(url) {
-                videos.push(url.clone());
-            }
-        }
-
-        (images, videos)
-    }
-}
-
-impl Default for MediaExtractor {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-/// Convenience function for one-time extraction and removal
-pub fn extract_and_remove_media_urls(text: &str) -> (Vec<SharedUri>, String) {
-    let extractor = MediaExtractor::new();
-    extractor.extract_and_remove(text)
-}
-
-/// Convenience function for just extracting media URLs
-pub fn extract_media_urls(text: &str) -> Vec<SharedUri> {
-    let extractor = MediaExtractor::new();
-    extractor.extract_media_urls(text)
-}
-
-/// Convenience function for just removing media URLs
-pub fn remove_media_urls(text: &str) -> String {
-    let extractor = MediaExtractor::new();
-    extractor.remove_media_urls(text)
-}

crates/coop/Cargo.toml

@@ -14,8 +14,8 @@ product-name = "Coop"
 description = "Chat Freely, Stay Private on Nostr"
 identifier = "su.reya.coop"
 category = "SocialNetworking"
-version = "1.0.0-beta5"
+version = "1.0.0-beta2"
-out-dir = "../dist"
+out-dir = "../../dist"
 before-packaging-command = "cargo build --release"
 resources = ["Cargo.toml", "src"]
 icons = [
@@ -27,19 +27,19 @@ icons = [
 ]
 
 [dependencies]
-assets = { path = "../crates/assets" }
+assets = { path = "../assets" }
-ui = { path = "../crates/ui" }
+ui = { path = "../ui" }
-title_bar = { path = "../crates/title_bar" }
+title_bar = { path = "../title_bar" }
-theme = { path = "../crates/theme" }
+theme = { path = "../theme" }
-common = { path = "../crates/common" }
+common = { path = "../common" }
-state = { path = "../crates/state" }
+state = { path = "../state" }
-device = { path = "../crates/device" }
+device = { path = "../device" }
-chat = { path = "../crates/chat" }
+chat = { path = "../chat" }
-chat_ui = { path = "../crates/chat_ui" }
+chat_ui = { path = "../chat_ui" }
-settings = { path = "../crates/settings" }
+settings = { path = "../settings" }
-auto_update = { path = "../crates/auto_update" }
+auto_update = { path = "../auto_update" }
-person = { path = "../crates/person" }
+person = { path = "../person" }
-relay_auth = { path = "../crates/relay_auth" }
+relay_auth = { path = "../relay_auth" }
 
 gpui.workspace = true
 gpui_platform.workspace = true
@@ -62,9 +62,9 @@ smol.workspace = true
 futures.workspace = true
 oneshot.workspace = true
 webbrowser.workspace = true
-tracing-subscriber.workspace = true
 
 indexset = "0.12.3"
+tracing-subscriber = { version = "0.3.18", features = ["fmt", "env-filter"] }
 
 [target.'cfg(target_os = "macos")'.dependencies]
 # Temporary workaround https://github.com/zed-industries/zed/issues/47168

crates/coop/resources/flatpak/manifest-template.json

@@ -50,7 +50,7 @@
         },
         {
           "type": "dir",
-          "path": "./desktop/resources"
+          "path": "./crates/coop/resources"
         }
       ]
     }

crates/coop/src/dialogs/accounts.rs

@@ -0,0 +1,257 @@
+use anyhow::Error;
+use gpui::prelude::FluentBuilder;
+use gpui::{
+    App, AppContext, Context, Entity, InteractiveElement, IntoElement, ParentElement, Render,
+    SharedString, StatefulInteractiveElement, Styled, Subscription, Task, Window, div, px,
+};
+use nostr_sdk::prelude::*;
+use person::PersonRegistry;
+use state::{NostrRegistry, StateEvent};
+use theme::ActiveTheme;
+use ui::avatar::Avatar;
+use ui::button::{Button, ButtonVariants};
+use ui::indicator::Indicator;
+use ui::{Disableable, Icon, IconName, Sizable, WindowExtension, h_flex, v_flex};
+
+use crate::dialogs::connect::ConnectSigner;
+use crate::dialogs::import::ImportKey;
+
+pub fn init(window: &mut Window, cx: &mut App) -> Entity<AccountSelector> {
+    cx.new(|cx| AccountSelector::new(window, cx))
+}
+
+/// Account selector
+pub struct AccountSelector {
+    /// Public key currently being chosen for login
+    logging_in: Entity<Option<PublicKey>>,
+
+    /// The error message displayed when an error occurs.
+    error: Entity<Option<SharedString>>,
+
+    /// Async tasks
+    tasks: Vec<Task<Result<(), Error>>>,
+
+    /// Subscription to the signer events
+    _subscription: Option<Subscription>,
+}
+
+impl AccountSelector {
+    pub fn new(window: &mut Window, cx: &mut Context<Self>) -> Self {
+        let logging_in = cx.new(|_| None);
+        let error = cx.new(|_| None);
+
+        // Subscribe to the signer events
+        let nostr = NostrRegistry::global(cx);
+        let subscription = cx.subscribe_in(&nostr, window, |this, _state, event, window, cx| {
+            match event {
+                StateEvent::SignerSet => {
+                    window.close_all_modals(cx);
+                    window.refresh();
+                }
+                StateEvent::Error(e) => {
+                    this.set_error(e.to_string(), cx);
+                }
+                _ => {}
+            };
+        });
+
+        Self {
+            logging_in,
+            error,
+            tasks: vec![],
+            _subscription: Some(subscription),
+        }
+    }
+
+    fn logging_in(&self, public_key: &PublicKey, cx: &App) -> bool {
+        self.logging_in.read(cx) == &Some(*public_key)
+    }
+
+    fn set_logging_in(&mut self, public_key: PublicKey, cx: &mut Context<Self>) {
+        self.logging_in.update(cx, |this, cx| {
+            *this = Some(public_key);
+            cx.notify();
+        });
+    }
+
+    fn set_error<T>(&mut self, error: T, cx: &mut Context<Self>)
+    where
+        T: Into<SharedString>,
+    {
+        self.error.update(cx, |this, cx| {
+            *this = Some(error.into());
+            cx.notify();
+        });
+
+        self.logging_in.update(cx, |this, cx| {
+            *this = None;
+            cx.notify();
+        })
+    }
+
+    fn login(&mut self, public_key: PublicKey, window: &mut Window, cx: &mut Context<Self>) {
+        let nostr = NostrRegistry::global(cx);
+        let task = nostr.read(cx).get_secret(public_key, cx);
+
+        // Mark the public key as being logged in
+        self.set_logging_in(public_key, cx);
+
+        self.tasks.push(cx.spawn_in(window, async move |this, cx| {
+            match task.await {
+                Ok(signer) => {
+                    nostr.update(cx, |this, cx| {
+                        this.set_signer(signer, cx);
+                    });
+                }
+                Err(e) => {
+                    this.update(cx, |this, cx| {
+                        this.set_error(e.to_string(), cx);
+                    })?;
+                }
+            };
+            Ok(())
+        }));
+    }
+
+    fn remove(&mut self, public_key: PublicKey, cx: &mut Context<Self>) {
+        let nostr = NostrRegistry::global(cx);
+
+        nostr.update(cx, |this, cx| {
+            this.remove_secret(&public_key, cx);
+        });
+    }
+
+    fn open_import(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let import = cx.new(|cx| ImportKey::new(window, cx));
+
+        window.open_modal(cx, move |this, _window, _cx| {
+            this.width(px(460.))
+                .title("Import a Secret Key or Bunker Connection")
+                .show_close(true)
+                .pb_2()
+                .child(import.clone())
+        });
+    }
+
+    fn open_connect(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let connect = cx.new(|cx| ConnectSigner::new(window, cx));
+
+        window.open_modal(cx, move |this, _window, _cx| {
+            this.width(px(460.))
+                .title("Scan QR Code to Connect")
+                .show_close(true)
+                .pb_2()
+                .child(connect.clone())
+        });
+    }
+}
+
+impl Render for AccountSelector {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let persons = PersonRegistry::global(cx);
+        let nostr = NostrRegistry::global(cx);
+        let npubs = nostr.read(cx).npubs();
+        let loading = self.logging_in.read(cx).is_some();
+
+        v_flex()
+            .size_full()
+            .gap_2()
+            .when_some(self.error.read(cx).as_ref(), |this, error| {
+                this.child(
+                    div()
+                        .italic()
+                        .text_xs()
+                        .text_center()
+                        .text_color(cx.theme().text_danger)
+                        .child(error.clone()),
+                )
+            })
+            .children({
+                let mut items = vec![];
+
+                for (ix, public_key) in npubs.read(cx).iter().enumerate() {
+                    let profile = persons.read(cx).get(public_key, cx);
+                    let logging_in = self.logging_in(public_key, cx);
+
+                    items.push(
+                        h_flex()
+                            .id(ix)
+                            .group("")
+                            .px_2()
+                            .h_10()
+                            .justify_between()
+                            .w_full()
+                            .rounded(cx.theme().radius)
+                            .bg(cx.theme().ghost_element_background)
+                            .hover(|this| this.bg(cx.theme().ghost_element_hover))
+                            .child(
+                                h_flex()
+                                    .gap_2()
+                                    .child(Avatar::new(profile.avatar()).small())
+                                    .child(div().text_sm().child(profile.name())),
+                            )
+                            .when(logging_in, |this| this.child(Indicator::new().small()))
+                            .when(!logging_in, |this| {
+                                this.child(
+                                    h_flex()
+                                        .gap_1()
+                                        .invisible()
+                                        .group_hover("", |this| this.visible())
+                                        .child(
+                                            Button::new(format!("del-{ix}"))
+                                                .icon(IconName::Close)
+                                                .ghost()
+                                                .small()
+                                                .disabled(logging_in)
+                                                .on_click(cx.listener({
+                                                    let public_key = *public_key;
+                                                    move |this, _ev, _window, cx| {
+                                                        cx.stop_propagation();
+                                                        this.remove(public_key, cx);
+                                                    }
+                                                })),
+                                        ),
+                                )
+                            })
+                            .when(!logging_in, |this| {
+                                let public_key = *public_key;
+                                this.on_click(cx.listener(move |this, _ev, window, cx| {
+                                    this.login(public_key, window, cx);
+                                }))
+                            }),
+                    );
+                }
+
+                items
+            })
+            .child(div().w_full().h_px().bg(cx.theme().border_variant))
+            .child(
+                h_flex()
+                    .gap_1()
+                    .justify_end()
+                    .w_full()
+                    .child(
+                        Button::new("input")
+                            .icon(Icon::new(IconName::Usb))
+                            .label("Import")
+                            .ghost()
+                            .small()
+                            .disabled(loading)
+                            .on_click(cx.listener(move |this, _ev, window, cx| {
+                                this.open_import(window, cx);
+                            })),
+                    )
+                    .child(
+                        Button::new("qr")
+                            .icon(Icon::new(IconName::Scan))
+                            .label("Scan QR to connect")
+                            .ghost()
+                            .small()
+                            .disabled(loading)
+                            .on_click(cx.listener(move |this, _ev, window, cx| {
+                                this.open_connect(window, cx);
+                            })),
+                    ),
+            )
+    }
+}

crates/coop/src/dialogs/connect.rs

@@ -0,0 +1,115 @@
+use std::sync::Arc;
+use std::time::Duration;
+
+use common::StringExt;
+use gpui::prelude::FluentBuilder;
+use gpui::{
+    AppContext, Context, Entity, Image, IntoElement, ParentElement, Render, SharedString, Styled,
+    Subscription, Window, div, img, px,
+};
+use nostr_connect::prelude::*;
+use state::{
+    CLIENT_NAME, CoopAuthUrlHandler, NOSTR_CONNECT_RELAY, NOSTR_CONNECT_TIMEOUT, NostrRegistry,
+    StateEvent,
+};
+use theme::ActiveTheme;
+use ui::v_flex;
+
+pub struct ConnectSigner {
+    /// QR Code
+    qr_code: Option<Arc<Image>>,
+
+    /// Error message
+    error: Entity<Option<SharedString>>,
+
+    /// Subscription to the signer event
+    _subscription: Option<Subscription>,
+}
+
+impl ConnectSigner {
+    pub fn new(window: &mut Window, cx: &mut Context<Self>) -> Self {
+        let error = cx.new(|_| None);
+
+        let nostr = NostrRegistry::global(cx);
+        let app_keys = nostr.read(cx).keys();
+
+        let timeout = Duration::from_secs(NOSTR_CONNECT_TIMEOUT);
+        let relay = RelayUrl::parse(NOSTR_CONNECT_RELAY).unwrap();
+
+        // Generate the nostr connect uri
+        let uri = NostrConnectUri::client(app_keys.public_key(), vec![relay], CLIENT_NAME);
+
+        // Generate the nostr connect
+        let mut signer = NostrConnect::new(uri.clone(), app_keys.clone(), timeout, None).unwrap();
+
+        // Handle the auth request
+        signer.auth_url_handler(CoopAuthUrlHandler);
+
+        // Generate a QR code for quick connection
+        let qr_code = uri.to_string().to_qr();
+
+        // Set signer in the background
+        nostr.update(cx, |this, cx| {
+            this.add_nip46_signer(&signer, cx);
+        });
+
+        // Subscribe to the signer event
+        let subscription = cx.subscribe_in(&nostr, window, |this, _state, event, _window, cx| {
+            if let StateEvent::Error(e) = event {
+                this.set_error(e, cx);
+            }
+        });
+
+        Self {
+            qr_code,
+            error,
+            _subscription: Some(subscription),
+        }
+    }
+
+    fn set_error<S>(&mut self, message: S, cx: &mut Context<Self>)
+    where
+        S: Into<SharedString>,
+    {
+        self.error.update(cx, |this, cx| {
+            *this = Some(message.into());
+            cx.notify();
+        });
+    }
+}
+
+impl Render for ConnectSigner {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        const MSG: &str = "Scan with any Nostr Connect-compatible app to connect";
+
+        v_flex()
+            .size_full()
+            .items_center()
+            .justify_center()
+            .p_4()
+            .when_some(self.qr_code.as_ref(), |this, qr| {
+                this.child(
+                    img(qr.clone())
+                        .size(px(256.))
+                        .rounded(cx.theme().radius_lg)
+                        .border_1()
+                        .border_color(cx.theme().border),
+                )
+            })
+            .when_some(self.error.read(cx).as_ref(), |this, error| {
+                this.child(
+                    div()
+                        .text_xs()
+                        .text_center()
+                        .text_color(cx.theme().text_danger)
+                        .child(error.clone()),
+                )
+            })
+            .child(
+                div()
+                    .text_xs()
+                    .text_color(cx.theme().text_muted)
+                    .child(SharedString::from(MSG)),
+            )
+    }
+}

crates/coop/src/dialogs/import.rs

@@ -7,14 +7,15 @@ use gpui::{
     Subscription, Task, Window, div,
 };
 use nostr_connect::prelude::*;
-use state::NostrRegistry;
+use smallvec::{SmallVec, smallvec};
+use state::{CoopAuthUrlHandler, NostrRegistry, StateEvent};
 use theme::ActiveTheme;
 use ui::button::{Button, ButtonVariants};
-use ui::input::{Input, InputEvent, InputState};
+use ui::input::{InputEvent, InputState, TextInput};
-use ui::{Disableable, WindowExtension, v_flex};
+use ui::{Disableable, v_flex};
 
 #[derive(Debug)]
-pub struct ImportIdentity {
+pub struct ImportKey {
     /// Secret key input
     key_input: Entity<InputState>,
 
@@ -24,43 +25,73 @@ pub struct ImportIdentity {
     /// Error message
     error: Entity<Option<SharedString>>,
 
+    /// Countdown timer for nostr connect
+    countdown: Entity<Option<u64>>,
+
     /// Whether the user is currently loading
     loading: bool,
 
     /// Async tasks
     tasks: Vec<Task<Result<(), Error>>>,
 
-    /// Input subscription
+    /// Event subscriptions
-    _subscription: Option<Subscription>,
+    _subscriptions: SmallVec<[Subscription; 2]>,
 }
 
-impl ImportIdentity {
+impl ImportKey {
     pub fn new(window: &mut Window, cx: &mut Context<Self>) -> Self {
+        let nostr = NostrRegistry::global(cx);
         let key_input = cx.new(|cx| InputState::new(window, cx).masked(true));
         let pass_input = cx.new(|cx| InputState::new(window, cx).masked(true));
         let error = cx.new(|_| None);
+        let countdown = cx.new(|_| None);
 
-        let input_subscription =
+        let mut subscriptions = smallvec![];
+
+        subscriptions.push(
+            // Subscribe to key input events and process login when the user presses enter
             cx.subscribe_in(&key_input, window, |this, _input, event, window, cx| {
                 if let InputEvent::PressEnter { .. } = event {
                     this.login(window, cx);
                 };
-            });
+            }),
+        );
+
+        subscriptions.push(
+            // Subscribe to the nostr signer event
+            cx.subscribe_in(&nostr, window, |this, _state, event, _window, cx| {
+                if let StateEvent::Error(e) = event {
+                    this.set_error(e, cx);
+                }
+            }),
+        );
 
         Self {
             key_input,
             pass_input,
             error,
+            countdown,
             loading: false,
             tasks: vec![],
-            _subscription: Some(input_subscription),
+            _subscriptions: subscriptions,
         }
     }
 
     fn login(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        if self.loading {
+            return;
+        };
+        // Prevent duplicate login requests
+        self.set_loading(true, cx);
+
         let value = self.key_input.read(cx).value();
         let password = self.pass_input.read(cx).value();
 
+        if value.starts_with("bunker://") {
+            self.bunker(&value, window, cx);
+            return;
+        }
+
         if value.starts_with("ncryptsec1") {
             self.ncryptsec(value, password, window, cx);
             return;
@@ -72,14 +103,52 @@ impl ImportIdentity {
 
             // Update the signer
             nostr.update(cx, |this, cx| {
-                this.set_signer(keys, cx);
+                this.add_key_signer(&keys, cx);
             });
-            window.close_modal(cx);
         } else {
             self.set_error("Invalid key", cx);
         }
     }
 
+    fn bunker(&mut self, content: &str, window: &mut Window, cx: &mut Context<Self>) {
+        let Ok(uri) = NostrConnectUri::parse(content) else {
+            self.set_error("Bunker is not valid", cx);
+            return;
+        };
+
+        let nostr = NostrRegistry::global(cx);
+        let app_keys = nostr.read(cx).keys();
+        let timeout = Duration::from_secs(30);
+
+        // Construct the nostr connect signer
+        let mut signer = NostrConnect::new(uri, app_keys.clone(), timeout, None).unwrap();
+
+        // Handle auth url with the default browser
+        signer.auth_url_handler(CoopAuthUrlHandler);
+
+        // Set signer in the background
+        nostr.update(cx, |this, cx| {
+            this.add_nip46_signer(&signer, cx);
+        });
+
+        // Start countdown
+        self.tasks.push(cx.spawn_in(window, async move |this, cx| {
+            for i in (0..=30).rev() {
+                if i == 0 {
+                    this.update(cx, |this, cx| {
+                        this.set_countdown(None, cx);
+                    })?;
+                } else {
+                    this.update(cx, |this, cx| {
+                        this.set_countdown(Some(i), cx);
+                    })?;
+                }
+                cx.background_executor().timer(Duration::from_secs(1)).await;
+            }
+            Ok(())
+        }));
+    }
+
     fn ncryptsec<S>(&mut self, content: S, pwd: S, window: &mut Window, cx: &mut Context<Self>)
     where
         S: Into<String>,
@@ -110,10 +179,9 @@ impl ImportIdentity {
         self.tasks.push(cx.spawn_in(window, async move |this, cx| {
             match task.await {
                 Ok(keys) => {
-                    nostr.update_in(cx, |this, window, cx| {
+                    nostr.update(cx, |this, cx| {
-                        this.set_signer(keys, cx);
+                        this.add_key_signer(&keys, cx);
-                        window.close_modal(cx);
+                    });
-                    })?;
                 }
                 Err(e) => {
                     this.update(cx, |this, cx| {
@@ -130,6 +198,12 @@ impl ImportIdentity {
     where
         S: Into<SharedString>,
     {
+        // Reset the log in state
+        self.set_loading(false, cx);
+
+        // Reset the countdown
+        self.set_countdown(None, cx);
+
         // Update error message
         self.error.update(cx, |this, cx| {
             *this = Some(message.into());
@@ -150,12 +224,22 @@ impl ImportIdentity {
             Ok(())
         }));
     }
+
+    fn set_loading(&mut self, status: bool, cx: &mut Context<Self>) {
+        self.loading = status;
+        cx.notify();
+    }
+
+    fn set_countdown(&mut self, i: Option<u64>, cx: &mut Context<Self>) {
+        self.countdown.update(cx, |this, cx| {
+            *this = i;
+            cx.notify();
+        });
+    }
 }
 
-impl Render for ImportIdentity {
+impl Render for ImportKey {
     fn render(&mut self, _window: &mut gpui::Window, cx: &mut Context<Self>) -> impl IntoElement {
-        const MSG: &str = "Coop isn't stored your identity secret in local device. Everything will be reset on the next login.";
-
         v_flex()
             .size_full()
             .gap_2()
@@ -165,8 +249,8 @@ impl Render for ImportIdentity {
                     .gap_1()
                     .text_sm()
                     .text_color(cx.theme().text_muted)
-                    .child("nsec or ncryptsec://")
+                    .child("nsec or bunker://")
-                    .child(Input::new(&self.key_input)),
+                    .child(TextInput::new(&self.key_input)),
             )
             .when(
                 self.key_input.read(cx).value().starts_with("ncryptsec1"),
@@ -177,11 +261,10 @@ impl Render for ImportIdentity {
                             .text_sm()
                             .text_color(cx.theme().text_muted)
                             .child("Password:")
-                            .child(Input::new(&self.pass_input)),
+                            .child(TextInput::new(&self.pass_input)),
                     )
                 },
             )
-            .child(div().text_xs().text_color(cx.theme().text_muted).child(MSG))
             .child(
                 Button::new("login")
                     .label("Continue")
@@ -192,6 +275,18 @@ impl Render for ImportIdentity {
                         this.login(window, cx);
                     })),
             )
+            .when_some(self.countdown.read(cx).as_ref(), |this, i| {
+                this.child(
+                    div()
+                        .text_xs()
+                        .text_center()
+                        .text_color(cx.theme().text_muted)
+                        .child(SharedString::from(format!(
+                            "Approve connection request from your signer in {} seconds",
+                            i
+                        ))),
+                )
+            })
             .when_some(self.error.read(cx).as_ref(), |this, error| {
                 this.child(
                     div()

crates/coop/src/dialogs/mod.rs

@@ -1,3 +1,5 @@
+pub mod accounts;
+pub mod connect;
 pub mod import;
 pub mod restore;
 pub mod screening;

crates/coop/src/dialogs/restore.rs

@@ -10,7 +10,7 @@ use gpui::{
 use nostr_connect::prelude::*;
 use theme::ActiveTheme;
 use ui::button::{Button, ButtonVariants};
-use ui::input::{Input, InputEvent, InputState};
+use ui::input::{InputEvent, InputState, TextInput};
 use ui::{WindowExtension, v_flex};
 
 #[derive(Debug)]
@@ -107,7 +107,7 @@ impl Render for RestoreEncryption {
                     .text_sm()
                     .text_color(cx.theme().text_muted)
                     .child("Secret Key")
-                    .child(Input::new(&self.key_input)),
+                    .child(TextInput::new(&self.key_input)),
             )
             .child(
                 Button::new("restore")

crates/coop/src/dialogs/screening.rs

@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 use std::time::Duration;
 
-use anyhow::Error;
+use anyhow::{Context as AnyhowContext, Error};
 use common::TimestampExt;
 use gpui::prelude::FluentBuilder;
 use gpui::{
@@ -78,13 +78,12 @@ impl Screening {
         let client = nostr.read(cx).client();
         let public_key = self.public_key;
 
-        let Some(current_user) = nostr.read(cx).signer_pubkey(cx) else {
-            return;
-        };
-
         let task: Task<Result<bool, Error>> = cx.background_spawn(async move {
+            let signer = client.signer().context("Signer not found")?;
+            let signer_pubkey = signer.get_public_key().await?;
+
             // Check if user is in contact list
-            let contacts = client.database().contacts_public_keys(current_user).await;
+            let contacts = client.database().contacts_public_keys(signer_pubkey).await;
             let followed = contacts.unwrap_or_default().contains(&public_key);
 
             Ok(followed)
@@ -106,17 +105,16 @@ impl Screening {
         let client = nostr.read(cx).client();
         let public_key = self.public_key;
 
-        let Some(current_user) = nostr.read(cx).signer_pubkey(cx) else {
-            return;
-        };
-
         let task: Task<Result<Vec<PublicKey>, Error>> = cx.background_spawn(async move {
+            let signer = client.signer().context("Signer not found")?;
+            let signer_pubkey = signer.get_public_key().await?;
+
             // Check mutual contacts
             let filter = Filter::new().kind(Kind::ContactList).pubkey(public_key);
             let mut mutual_contacts = vec![];
 
             if let Ok(events) = client.database().query(filter).await {
-                for event in events.into_iter().filter(|ev| ev.pubkey != current_user) {
+                for event in events.into_iter().filter(|ev| ev.pubkey != signer_pubkey) {
                     mutual_contacts.push(event.pubkey);
                 }
             }
@@ -226,20 +224,10 @@ impl Screening {
         let client = nostr.read(cx).client();
         let public_key = self.public_key;
 
-        let Some(signer) = nostr.read(cx).signer(cx) else {
-            return;
-        };
-
         let task: Task<Result<(), Error>> = cx.background_spawn(async move {
-            let tag = Nip56Tag::PublicKey {
+            let tag = Tag::public_key_report(public_key, Report::Impersonation);
-                public_key,
+            let builder = EventBuilder::report(vec![tag], "");
-                report: Report::Impersonation,
+            let event = client.sign_event_builder(builder).await?;
-            }
-            .to_tag();
-
-            let event = EventBuilder::report(vec![tag], "")
-                .finalize_async(&signer)
-                .await?;
 
             // Send the report to the public relays
             client.send_event(&event).to(BOOTSTRAP_RELAYS).await?;

crates/coop/src/dialogs/settings.rs

@@ -7,7 +7,7 @@ use settings::{AppSettings, AuthMode};
 use theme::{ActiveTheme, Theme, ThemeMode};
 use ui::button::{Button, ButtonVariants};
 use ui::group_box::{GroupBox, GroupBoxVariants};
-use ui::input::{Input, InputState};
+use ui::input::{InputState, TextInput};
 use ui::menu::{DropdownMenu, PopupMenuItem};
 use ui::notification::Notification;
 use ui::switch::Switch;
@@ -56,16 +56,17 @@ impl Preferences {
 
 impl Render for Preferences {
     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 SCREENING: &str =
-        const AVATAR: &str = "Hide all avatar pictures to improve performance.";
+            "When opening a request, a popup will appear to help you identify the sender.";
-        const MODE: &str = "Use the selected light or dark theme, or to follow the OS.";
+        const AVATAR: &str =
-        const NIP4E: &str = "Use a dedicated key to encrypt and decrypt messages.";
+            "Hide all avatar pictures to improve performance and protect your privacy.";
+        const MODE: &str =
+            "Choose whether to use the selected light or dark theme, or to follow the OS.";
         const AUTH: &str = "Choose the authentication behavior for relays.";
         const RESET: &str = "Reset the theme to the default one.";
 
         let screening = AppSettings::get_screening(cx);
         let hide_avatar = AppSettings::get_hide_avatar(cx);
-        let nip4e = AppSettings::get_nip4e(cx);
         let auth_mode = AppSettings::get_auth_mode(cx);
         let theme_mode = AppSettings::get_theme_mode(cx);
 
@@ -206,21 +207,6 @@ impl Render for Preferences {
                             ),
                     ),
             )
-            .child(
-                GroupBox::new()
-                    .id("experiments")
-                    .title("Experiments")
-                    .fill()
-                    .child(
-                        Switch::new("nip4e")
-                            .label("Decoupling Encryption Key")
-                            .description(NIP4E)
-                            .checked(nip4e)
-                            .on_click(move |_, _window, cx| {
-                                AppSettings::update_nip4e(!nip4e, cx);
-                            }),
-                    ),
-            )
             .child(
                 GroupBox::new()
                     .id("media")
@@ -232,7 +218,7 @@ impl Render for Preferences {
                             .child(
                                 h_flex()
                                     .gap_1()
-                                    .child(Input::new(&self.file_input).text_xs().small())
+                                    .child(TextInput::new(&self.file_input).text_xs().small())
                                     .child(
                                         Button::new("update-file-server")
                                             .icon(IconName::Check)

crates/coop/src/panels/backup.rs

@@ -10,7 +10,7 @@ use state::KEYRING;
 use theme::ActiveTheme;
 use ui::button::{Button, ButtonVariants};
 use ui::dock::{Panel, PanelEvent};
-use ui::input::{Input, InputState};
+use ui::input::{InputState, TextInput};
 use ui::{IconName, Sizable, StyledExt, divider, v_flex};
 
 const MSG: &str = "Store your account keys in a safe location. \
@@ -40,8 +40,8 @@ pub struct BackupPanel {
 
 impl BackupPanel {
     pub fn new(window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let npub_input = cx.new(|cx| InputState::new(window, cx));
+        let npub_input = cx.new(|cx| InputState::new(window, cx).disabled(true));
-        let nsec_input = cx.new(|cx| InputState::new(window, cx).masked(true));
+        let nsec_input = cx.new(|cx| InputState::new(window, cx).disabled(true).masked(true));
 
         // Run at the end of current cycle
         cx.defer_in(window, |this, window, cx| {
@@ -156,7 +156,7 @@ impl Render for BackupPanel {
                                     .child(SharedString::from("Public Key:")),
                             )
                             .child(
-                                Input::new(&self.npub_input)
+                                TextInput::new(&self.npub_input)
                                     .small()
                                     .bordered(false)
                                     .disabled(true),
@@ -174,7 +174,7 @@ impl Render for BackupPanel {
                                     .child(SharedString::from("Secret Key:")),
                             )
                             .child(
-                                Input::new(&self.nsec_input)
+                                TextInput::new(&self.nsec_input)
                                     .small()
                                     .bordered(false)
                                     .disabled(true),

crates/coop/src/panels/contact_list.rs

@@ -1,7 +1,7 @@
 use std::collections::HashSet;
 use std::time::Duration;
 
-use anyhow::Error;
+use anyhow::{Context as AnyhowContext, Error};
 use gpui::prelude::FluentBuilder;
 use gpui::{
     AnyElement, App, AppContext, Context, Entity, EventEmitter, FocusHandle, Focusable,
@@ -16,7 +16,7 @@ use theme::ActiveTheme;
 use ui::avatar::Avatar;
 use ui::button::{Button, ButtonVariants};
 use ui::dock::{Panel, PanelEvent};
-use ui::input::{Input, InputEvent, InputState};
+use ui::input::{InputEvent, InputState, TextInput};
 use ui::{Disableable, IconName, Sizable, StyledExt, WindowExtension, h_flex, v_flex};
 
 pub fn init(window: &mut Window, cx: &mut App) -> Entity<ContactListPanel> {
@@ -82,12 +82,11 @@ impl ContactListPanel {
         let nostr = NostrRegistry::global(cx);
         let client = nostr.read(cx).client();
 
-        let Some(public_key) = nostr.read(cx).signer_pubkey(cx) else {
-            return;
-        };
-
         let task: Task<Result<HashSet<PublicKey>, Error>> = cx.background_spawn(async move {
+            let signer = client.signer().context("Signer not found")?;
+            let public_key = signer.get_public_key().await?;
             let contact_list = client.database().contacts_public_keys(public_key).await?;
+
             Ok(contact_list)
         });
 
@@ -158,10 +157,6 @@ impl ContactListPanel {
         let nostr = NostrRegistry::global(cx);
         let client = nostr.read(cx).client();
 
-        let Some(signer) = nostr.read(cx).signer(cx) else {
-            return;
-        };
-
         // Get contacts
         let contacts: Vec<Contact> = self
             .contacts
@@ -174,9 +169,8 @@ impl ContactListPanel {
 
         let task: Task<Result<(), Error>> = cx.background_spawn(async move {
             // Construct contact list event builder
-            let event = ContactListBuilder::new(contacts)
+            let builder = EventBuilder::contact_list(contacts);
-                .finalize_async(&signer)
+            let event = client.sign_event_builder(builder).await?;
-                .await?;
 
             // Set contact list
             client.send_event(&event).to_nip65().await?;
@@ -307,10 +301,10 @@ impl Render for ContactListPanel {
                                 .gap_1()
                                 .w_full()
                                 .child(
-                                    Input::new(&self.input)
+                                    TextInput::new(&self.input)
                                         .small()
                                         .bordered(false)
-                                        .cleanable(true),
+                                        .cleanable(),
                                 )
                                 .child(
                                     Button::new("add")

crates/coop/src/panels/greeter.rs

@@ -30,8 +30,9 @@ impl GreeterPanel {
 
     fn add_profile_panel(&mut self, window: &mut Window, cx: &mut Context<Self>) {
         let nostr = NostrRegistry::global(cx);
+        let signer = nostr.read(cx).signer();
 
-        if let Some(public_key) = nostr.read(cx).signer_pubkey(cx) {
+        if let Some(public_key) = signer.public_key() {
             cx.spawn_in(window, async move |_this, cx| {
                 cx.update(|window, cx| {
                     Workspace::add_panel(

crates/coop/src/panels/messaging_relays.rs

@@ -1,7 +1,7 @@
 use std::collections::HashSet;
 use std::time::Duration;
 
-use anyhow::{Error, anyhow};
+use anyhow::{Context as AnyhowContext, Error, anyhow};
 use gpui::prelude::FluentBuilder;
 use gpui::{
     AnyElement, App, AppContext, Context, Entity, EventEmitter, FocusHandle, Focusable,
@@ -14,7 +14,7 @@ use state::NostrRegistry;
 use theme::ActiveTheme;
 use ui::button::{Button, ButtonVariants};
 use ui::dock::{Panel, PanelEvent};
-use ui::input::{Input, InputEvent, InputState};
+use ui::input::{InputEvent, InputState, TextInput};
 use ui::{Disableable, IconName, Sizable, StyledExt, WindowExtension, divider, h_flex, v_flex};
 
 const MSG: &str = "Messaging Relays are relays that hosted all your messages. \
@@ -83,18 +83,17 @@ impl MessagingRelayPanel {
         let nostr = NostrRegistry::global(cx);
         let client = nostr.read(cx).client();
 
-        let Some(public_key) = nostr.read(cx).signer_pubkey(cx) else {
-            return;
-        };
-
         let task: Task<Result<Vec<RelayUrl>, Error>> = cx.background_spawn(async move {
+            let signer = client.signer().context("Signer not found")?;
+            let public_key = signer.get_public_key().await?;
+
             let filter = Filter::new()
                 .kind(Kind::InboxRelays)
                 .author(public_key)
                 .limit(1);
 
             if let Some(event) = client.database().query(filter).await?.first_owned() {
-                Ok(nip17::extract_relay_list(&event).collect())
+                Ok(nip17::extract_owned_relay_list(event).collect())
             } else {
                 Err(anyhow!("Not found."))
             }
@@ -172,15 +171,11 @@ impl MessagingRelayPanel {
         let nostr = NostrRegistry::global(cx);
         let client = nostr.read(cx).client();
 
-        let Some(signer) = nostr.read(cx).signer(cx) else {
-            return;
-        };
-
         // Construct event tags
         let tags: Vec<Tag> = self
             .relays
             .iter()
-            .map(|relay| Nip17Tag::Relay(relay.to_owned()).to_tag())
+            .map(|relay| Tag::relay(relay.clone()))
             .collect();
 
         // Set updating state
@@ -188,10 +183,8 @@ impl MessagingRelayPanel {
 
         let task: Task<Result<(), Error>> = cx.background_spawn(async move {
             // Construct nip17 event builder
-            let event = EventBuilder::new(Kind::InboxRelays, "")
+            let builder = EventBuilder::new(Kind::InboxRelays, "").tags(tags);
-                .tags(tags)
+            let event = client.sign_event_builder(builder).await?;
-                .finalize_async(&signer)
-                .await?;
 
             // Set messaging relays
             client.send_event(&event).to_nip65().await?;
@@ -324,10 +317,10 @@ impl Render for MessagingRelayPanel {
                                     .gap_1()
                                     .w_full()
                                     .child(
-                                        Input::new(&self.input)
+                                        TextInput::new(&self.input)
                                             .small()
                                             .bordered(false)
-                                            .cleanable(true),
+                                            .cleanable(),
                                     )
                                     .child(
                                         Button::new("add")

crates/coop/src/panels/profile.rs

@@ -1,7 +1,7 @@
 use std::str::FromStr;
 use std::time::Duration;
 
-use anyhow::{Context as AnyhowContext, Error, anyhow};
+use anyhow::{Context as AnyhowContext, Error};
 use gpui::{
     AnyElement, App, AppContext, ClipboardItem, Context, Entity, EventEmitter, FocusHandle,
     Focusable, IntoElement, ParentElement, PathPromptOptions, Render, SharedString, Styled, Task,
@@ -15,7 +15,7 @@ use theme::ActiveTheme;
 use ui::avatar::Avatar;
 use ui::button::{Button, ButtonVariants};
 use ui::dock::{Panel, PanelEvent};
-use ui::input::{Input, InputState};
+use ui::input::{InputState, TextInput};
 use ui::notification::Notification;
 use ui::{Disableable, IconName, Sizable, StyledExt, WindowExtension, h_flex, v_flex};
 
@@ -65,7 +65,7 @@ impl ProfilePanel {
         // Use multi-line input for bio
         let bio_input = cx.new(|cx| {
             InputState::new(window, cx)
-                .multi_line(true)
+                .multi_line()
                 .auto_grow(3, 8)
                 .placeholder("A short introduce about you.")
         });
@@ -209,15 +209,10 @@ impl ProfilePanel {
         let client = nostr.read(cx).client();
         let metadata = metadata.clone();
 
-        let Some(signer) = nostr.read(cx).signer(cx) else {
-            return Task::ready(Err(anyhow!("Signer is required")));
-        };
-
         cx.background_spawn(async move {
             // Build and sign the metadata event
-            let event = EventBuilder::metadata(&metadata)
+            let builder = EventBuilder::metadata(&metadata);
-                .finalize_async(&signer)
+            let event = client.sign_event_builder(builder).await?;
-                .await?;
 
             // Send event to user's relays
             client.send_event(&event).await?;
@@ -357,7 +352,7 @@ impl Render for ProfilePanel {
                             .text_color(cx.theme().text_muted)
                             .child(SharedString::from("What should people call you?")),
                     )
-                    .child(Input::new(&self.name_input).bordered(false).small()),
+                    .child(TextInput::new(&self.name_input).bordered(false).small()),
             )
             .child(
                 v_flex()
@@ -368,7 +363,7 @@ impl Render for ProfilePanel {
                             .text_color(cx.theme().text_muted)
                             .child(SharedString::from("A short introduction about you:")),
                     )
-                    .child(Input::new(&self.bio_input).bordered(false).small()),
+                    .child(TextInput::new(&self.bio_input).bordered(false).small()),
             )
             .child(
                 v_flex()
@@ -379,7 +374,7 @@ impl Render for ProfilePanel {
                             .text_color(cx.theme().text_muted)
                             .child(SharedString::from("Website:")),
                     )
-                    .child(Input::new(&self.website_input).bordered(false).small()),
+                    .child(TextInput::new(&self.website_input).bordered(false).small()),
             )
             .child(
                 v_flex()

crates/coop/src/panels/relay_list.rs

@@ -1,7 +1,7 @@
 use std::collections::HashSet;
 use std::time::Duration;
 
-use anyhow::{Error, anyhow};
+use anyhow::{Context as AnyhowContext, Error, anyhow};
 use gpui::prelude::FluentBuilder;
 use gpui::{
     Action, AnyElement, App, AppContext, Context, Entity, EventEmitter, FocusHandle, Focusable,
@@ -15,7 +15,7 @@ use state::NostrRegistry;
 use theme::ActiveTheme;
 use ui::button::{Button, ButtonVariants};
 use ui::dock::{Panel, PanelEvent};
-use ui::input::{Input, InputEvent, InputState};
+use ui::input::{InputEvent, InputState, TextInput};
 use ui::menu::DropdownMenu;
 use ui::{Disableable, IconName, Sizable, StyledExt, WindowExtension, divider, h_flex, v_flex};
 
@@ -100,19 +100,18 @@ impl RelayListPanel {
         let nostr = NostrRegistry::global(cx);
         let client = nostr.read(cx).client();
 
-        let Some(public_key) = nostr.read(cx).signer_pubkey(cx) else {
-            return;
-        };
-
         let task: Task<Result<Vec<(RelayUrl, Option<RelayMetadata>)>, Error>> = cx
             .background_spawn(async move {
+                let signer = client.signer().context("Signer not found")?;
+                let public_key = signer.get_public_key().await?;
+
                 let filter = Filter::new()
                     .kind(Kind::RelayList)
                     .author(public_key)
                     .limit(1);
 
                 if let Some(event) = client.database().query(filter).await?.first_owned() {
-                    Ok(nip65::extract_relay_list(&event).collect())
+                    Ok(nip65::extract_owned_relay_list(event).collect())
                 } else {
                     Err(anyhow!("Not found."))
                 }
@@ -208,10 +207,6 @@ impl RelayListPanel {
         let nostr = NostrRegistry::global(cx);
         let client = nostr.read(cx).client();
 
-        let Some(signer) = nostr.read(cx).signer(cx) else {
-            return;
-        };
-
         // Get all relays
         let relays = self.relays.clone();
 
@@ -219,9 +214,8 @@ impl RelayListPanel {
         self.set_updating(true, cx);
 
         let task: Task<Result<(), Error>> = cx.background_spawn(async move {
-            let event = EventBuilder::relay_list(relays)
+            let builder = EventBuilder::relay_list(relays);
-                .finalize_async(&signer)
+            let event = client.sign_event_builder(builder).await?;
-                .await?;
 
             // Set relay list for current user
             client.send_event(&event).await?;
@@ -375,10 +369,10 @@ impl Render for RelayListPanel {
                                     .gap_1()
                                     .w_full()
                                     .child(
-                                        Input::new(&self.input)
+                                        TextInput::new(&self.input)
                                             .small()
                                             .bordered(false)
-                                            .cleanable(true),
+                                            .cleanable(),
                                     )
                                     .child(
                                         Button::new("metadata")

crates/coop/src/sidebar/mod.rs

@@ -2,25 +2,25 @@ use std::collections::HashSet;
 use std::ops::Range;
 use std::time::Duration;
 
-use anyhow::Error;
+use anyhow::{Context as AnyhowContext, Error};
 use chat::{ChatEvent, ChatRegistry, Room, RoomKind};
-use common::{DebouncedDelay, TimestampExt, coop_cache};
+use common::{DebouncedDelay, TimestampExt};
 use entry::RoomEntry;
 use gpui::prelude::FluentBuilder;
 use gpui::{
     App, AppContext, Context, Entity, EventEmitter, FocusHandle, Focusable, IntoElement,
-    ParentElement, Render, SharedString, Styled, Subscription, Task, UniformListScrollHandle,
+    ParentElement, Render, RetainAllImageCache, SharedString, Styled, Subscription, Task,
-    Window, div, uniform_list,
+    UniformListScrollHandle, Window, div, uniform_list,
 };
 use nostr_sdk::prelude::*;
 use person::PersonRegistry;
 use smallvec::{SmallVec, smallvec};
-use state::{FIND_DELAY, IMAGE_CACHE_SIZE, NostrRegistry};
+use state::{FIND_DELAY, NostrRegistry};
 use theme::{ActiveTheme, SIDEBAR_WIDTH, TABBAR_HEIGHT};
 use ui::button::{Button, ButtonVariants};
 use ui::dock::{Panel, PanelEvent};
 use ui::indicator::Indicator;
-use ui::input::{Input, InputEvent, InputState};
+use ui::input::{InputEvent, InputState, TextInput};
 use ui::notification::Notification;
 use ui::scroll::Scrollbar;
 use ui::{Icon, IconName, Selectable, Sizable, StyledExt, WindowExtension, h_flex, v_flex};
@@ -39,6 +39,9 @@ pub struct Sidebar {
     focus_handle: FocusHandle,
     scroll_handle: UniformListScrollHandle,
 
+    /// Image cache
+    image_cache: Entity<RetainAllImageCache>,
+
     /// Find input state
     find_input: Entity<InputState>,
 
@@ -138,6 +141,7 @@ impl Sidebar {
             name: "Sidebar".into(),
             focus_handle: cx.focus_handle(),
             scroll_handle: UniformListScrollHandle::new(),
+            image_cache: RetainAllImageCache::new(cx),
             find_input,
             find_debouncer: DebouncedDelay::new(),
             find_results,
@@ -159,12 +163,11 @@ impl Sidebar {
         let nostr = NostrRegistry::global(cx);
         let client = nostr.read(cx).client();
 
-        let Some(public_key) = nostr.read(cx).signer_pubkey(cx) else {
-            return;
-        };
-
         let task: Task<Result<HashSet<PublicKey>, Error>> = cx.background_spawn(async move {
+            let signer = client.signer().context("Signer not found")?;
+            let public_key = signer.get_public_key().await?;
             let contacts = client.database().contacts_public_keys(public_key).await?;
+
             Ok(contacts)
         });
 
@@ -253,6 +256,7 @@ impl Sidebar {
     fn set_finding(&mut self, status: bool, _window: &mut Window, cx: &mut Context<Self>) {
         // Disable the input to prevent duplicate requests
         self.find_input.update(cx, |this, cx| {
+            this.set_disabled(status, cx);
             this.set_loading(status, cx);
         });
         // Set the search status
@@ -320,14 +324,14 @@ impl Sidebar {
         let async_chat = chat.downgrade();
 
         let nostr = NostrRegistry::global(cx);
-        let Some(public_key) = nostr.read(cx).signer_pubkey(cx) else {
+        let signer = nostr.read(cx).signer();
-            return;
-        };
 
         // Get all selected public keys
         let receivers = self.get_selected(cx);
 
         self.tasks.push(cx.spawn_in(window, async move |this, cx| {
+            let public_key = signer.get_public_key().await?;
+
             // Create a new room and emit it
             async_chat.update_in(cx, |this, _window, cx| {
                 let room = cx.new(|_| {
@@ -503,7 +507,7 @@ impl Render for Sidebar {
         };
 
         v_flex()
-            .image_cache(coop_cache("sidebar", IMAGE_CACHE_SIZE))
+            .image_cache(self.image_cache.clone())
             .size_full()
             .gap_2()
             .child(
@@ -513,7 +517,7 @@ impl Render for Sidebar {
                     .border_color(cx.theme().border)
                     .bg(cx.theme().tab_background)
                     .child(
-                        Input::new(&self.find_input)
+                        TextInput::new(&self.find_input)
                             .appearance(false)
                             .bordered(false)
                             .small()

crates/coop/src/workspace.rs

@@ -2,19 +2,19 @@ use std::sync::Arc;
 
 use ::settings::AppSettings;
 use chat::{ChatEvent, ChatRegistry};
-use common::{CoopImageCache, download_dir};
+use common::download_dir;
 use device::{DeviceEvent, DeviceRegistry};
 use gpui::prelude::FluentBuilder;
 use gpui::{
     Action, App, AppContext, Axis, Context, Entity, InteractiveElement, IntoElement, ParentElement,
-    Render, SharedString, StatefulInteractiveElement, Styled, Subscription, Window, div,
+    Render, SharedString, StatefulInteractiveElement, Styled, Subscription, Window, div, px,
-    image_cache, px, relative,
+    relative,
 };
 use nostr_sdk::prelude::*;
 use person::{PersonRegistry, shorten_pubkey};
 use serde::Deserialize;
 use smallvec::{SmallVec, smallvec};
-use state::{IMAGE_CACHE_SIZE, NostrRegistry, StateEvent};
+use state::{NostrRegistry, StateEvent};
 use theme::{ActiveTheme, SIDEBAR_WIDTH, Theme, ThemeRegistry};
 use title_bar::TitleBar;
 use ui::avatar::Avatar;
@@ -24,24 +24,30 @@ use ui::menu::{DropdownMenu, PopupMenuItem};
 use ui::notification::{Notification, NotificationKind};
 use ui::{Icon, IconName, Root, Sizable, WindowExtension, h_flex, v_flex};
 
-use crate::dialogs::import::ImportIdentity;
 use crate::dialogs::restore::RestoreEncryption;
-use crate::dialogs::settings;
+use crate::dialogs::{accounts, settings};
 use crate::panels::{backup, contact_list, greeter, messaging_relays, profile, relay_list, trash};
 use crate::sidebar;
 
+const PREPARE_MSG: &str = "Coop is preparing a new identity for you. This may take a moment...";
+const ENC_MSG: &str = "Encryption Key is a special key that used to encrypt and decrypt your messages. \
+                       Your identity is completely decoupled from all encryption processes to protect your privacy.";
+const ENC_WARN: &str = "By resetting your encryption key, you will lose access to \
+                        all your encrypted messages before. This action cannot be undone.";
+
 pub fn init(window: &mut Window, cx: &mut App) -> Entity<Workspace> {
     cx.new(|cx| Workspace::new(window, cx))
 }
 
 struct DeviceNotifcation;
+struct SignerNotifcation;
 struct RelayNotifcation;
-struct MsgRelayNotification;
 
 #[derive(Action, Clone, PartialEq, Eq, Deserialize)]
 #[action(namespace = workspace, no_json)]
 enum Command {
     ToggleTheme,
+    ToggleAccount,
 
     RefreshMessagingRelays,
     BackupEncryption,
@@ -64,11 +70,8 @@ pub struct Workspace {
     /// App's Dock Area
     dock: Entity<DockArea>,
 
-    /// App's Image Cache
-    image_cache: Entity<CoopImageCache>,
-
     /// Event subscriptions
-    _subscriptions: SmallVec<[Subscription; 6]>,
+    _subscriptions: SmallVec<[Subscription; 5]>,
 }
 
 impl Workspace {
@@ -76,11 +79,9 @@ impl Workspace {
         let chat = ChatRegistry::global(cx);
         let device = DeviceRegistry::global(cx);
         let nostr = NostrRegistry::global(cx);
-        let signer = nostr.read(cx).signer.clone();
 
         let titlebar = cx.new(|_| TitleBar::new());
         let dock = cx.new(|cx| DockArea::new(window, cx));
-        let image_cache = CoopImageCache::new(IMAGE_CACHE_SIZE, cx);
 
         let mut subscriptions = smallvec![];
 
@@ -92,20 +93,19 @@ impl Workspace {
         );
 
         subscriptions.push(
-            // Observe the signer
+            // Subscribe to the signer events
-            cx.observe_in(&signer, window, |this, signer, window, cx| {
+            cx.subscribe_in(&nostr, window, move |this, _state, event, window, cx| {
-                if signer.read(cx).is_some() {
-                    this.set_center_layout(window, cx);
-                } else {
-                    this.import_identity(window, cx);
-                }
-            }),
-        );
-
-        subscriptions.push(
-            // Subscribe to the nostr events
-            cx.subscribe_in(&nostr, window, move |this, state, event, window, cx| {
                 match event {
+                    StateEvent::Creating => {
+                        let note = Notification::new()
+                            .id::<SignerNotifcation>()
+                            .title("Preparing a new identity")
+                            .message(PREPARE_MSG)
+                            .autohide(false)
+                            .with_kind(NotificationKind::Info);
+
+                        window.push_notification(note, cx);
+                    }
                     StateEvent::Connecting => {
                         let note = Notification::new()
                             .id::<RelayNotifcation>()
@@ -121,10 +121,14 @@ impl Workspace {
                             .with_kind(NotificationKind::Success);
 
                         window.push_notification(note, cx);
-
+                    }
-                        if state.read(cx).signer.read(cx).is_none() {
+                    StateEvent::SignerSet => {
-                            this.import_identity(window, cx);
+                        this.set_center_layout(window, cx);
-                        }
+                        // Clear the signer notification
+                        window.clear_notification::<SignerNotifcation>(cx);
+                    }
+                    StateEvent::Show => {
+                        this.account_selector(window, cx);
                     }
                     _ => {}
                 };
@@ -137,7 +141,7 @@ impl Workspace {
                 match event {
                     DeviceEvent::Requesting => {
                         const MSG: &str =
-                            "Please open other client and approve the request for encryption key.";
+                            "Coop has sent a request for an encryption key. Please open the other client then approve the request.";
 
                         let note = Notification::new()
                             .id::<DeviceNotifcation>()
@@ -148,25 +152,12 @@ impl Workspace {
 
                         window.push_notification(note, cx);
                     }
-                    DeviceEvent::NotSet => {
+                    DeviceEvent::Creating => {
-                        const MSG: &str =
-                            "User're not setup encryption key yet. Do you want to create one?";
-
                         let note = Notification::new()
                             .id::<DeviceNotifcation>()
-                            .message(MSG)
+                            .autohide(false)
-                            .with_kind(NotificationKind::Info)
+                            .message("Creating encryption key")
-                            .action(|_this, _window, _cx| {
+                            .with_kind(NotificationKind::Info);
-                                Button::new("retry").label("Retry").on_click(
-                                    move |_this, window, cx| {
-                                        let device = DeviceRegistry::global(cx);
-                                        device.update(cx, |this, cx| {
-                                            this.set_announcement(Keys::generate(), cx);
-                                        });
-                                        window.clear_notification::<DeviceNotifcation>(cx);
-                                    },
-                                )
-                            });
 
                         window.push_notification(note, cx);
                     }
@@ -189,27 +180,6 @@ impl Workspace {
             // Observe all events emitted by the chat registry
             cx.subscribe_in(&chat, window, move |this, chat, ev, window, cx| {
                 match ev {
-                    ChatEvent::InboxRelayNotFound => {
-                        const MSG: &str = "Messaging Relays not found. Cannot receive messages.";
-
-                        window.push_notification(
-                            Notification::warning(MSG)
-                                .id::<MsgRelayNotification>()
-                                .autohide(false)
-                                .action(|_this, _window, _cx| {
-                                    Button::new("retry").label("Retry").on_click(
-                                        move |_this, window, cx| {
-                                            let chat = ChatRegistry::global(cx);
-                                            chat.update(cx, |this, cx| {
-                                                this.get_metadata(cx);
-                                            });
-                                            window.clear_notification::<MsgRelayNotification>(cx);
-                                        },
-                                    )
-                                }),
-                            cx,
-                        );
-                    }
                     ChatEvent::OpenRoom(id) => {
                         if let Some(room) = chat.read(cx).room(id, cx) {
                             this.dock.update(cx, |this, cx| {
@@ -261,7 +231,6 @@ impl Workspace {
         Self {
             titlebar,
             dock,
-            image_cache,
             _subscriptions: subscriptions,
         }
     }
@@ -332,8 +301,9 @@ impl Workspace {
             }
             Command::ShowProfile => {
                 let nostr = NostrRegistry::global(cx);
+                let signer = nostr.read(cx).signer();
 
-                if let Some(public_key) = nostr.read(cx).signer_pubkey(cx) {
+                if let Some(public_key) = signer.public_key() {
                     self.dock.update(cx, |this, cx| {
                         this.add_panel(
                             Arc::new(profile::init(public_key, window, cx)),
@@ -378,7 +348,7 @@ impl Workspace {
                 let chat = ChatRegistry::global(cx);
                 // Trigger a refresh of the chat registry
                 chat.update(cx, |this, cx| {
-                    this.refresh(cx);
+                    this.refresh(window, cx);
                 });
             }
             Command::ShowRelayList => {
@@ -403,6 +373,9 @@ impl Workspace {
             Command::ToggleTheme => {
                 self.theme_selector(window, cx);
             }
+            Command::ToggleAccount => {
+                self.account_selector(window, cx);
+            }
             Command::BackupEncryption => {
                 let device = DeviceRegistry::global(cx).downgrade();
                 let save_dialog = cx.prompt_for_new_path(download_dir(), Some("encryption.txt"));
@@ -445,12 +418,6 @@ impl Workspace {
     }
 
     fn confirm_reset_encryption(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        const ENC_MSG: &str = "Encryption Key is a special key that used to encrypt and decrypt your messages. \
-                               Your identity is completely decoupled from all encryption processes to protect your privacy.";
-
-        const ENC_WARN: &str = "By resetting your encryption key, you will lose access to \
-                                all your encrypted messages before. This action cannot be undone.";
-
         let device = DeviceRegistry::global(cx);
         let ent = device.downgrade();
 
@@ -485,21 +452,24 @@ impl Workspace {
 
     fn import_encryption(&mut self, window: &mut Window, cx: &mut Context<Self>) {
         let restore = cx.new(|cx| RestoreEncryption::new(window, cx));
+
         window.open_modal(cx, move |this, _window, _cx| {
-            this.width(px(420.))
+            this.width(px(520.))
                 .title("Restore Encryption")
                 .child(restore.clone())
         });
     }
 
-    fn import_identity(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+    fn account_selector(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let import = cx.new(|cx| ImportIdentity::new(window, cx));
+        let accounts = accounts::init(window, cx);
 
         window.open_modal(cx, move |this, _window, _cx| {
-            this.width(px(420.))
+            this.width(px(520.))
+                .title("Continue with")
                 .show_close(false)
-                .title("Import Identity")
+                .keyboard(false)
-                .child(import.clone())
+                .overlay_closable(false)
+                .child(accounts.clone())
         });
     }
 
@@ -585,7 +555,8 @@ impl Workspace {
 
     fn titlebar_left(&mut self, cx: &mut Context<Self>) -> impl IntoElement {
         let nostr = NostrRegistry::global(cx);
-        let current_user = nostr.read(cx).signer_pubkey(cx);
+        let signer = nostr.read(cx).signer();
+        let current_user = signer.public_key();
 
         h_flex()
             .flex_shrink_0()
@@ -595,7 +566,7 @@ impl Workspace {
                     div()
                         .text_xs()
                         .text_color(cx.theme().text_muted)
-                        .child(SharedString::from("Import your identity to continue")),
+                        .child(SharedString::from("Choose an account to continue...")),
                 )
             })
             .when_some(current_user.as_ref(), |this, public_key| {
@@ -646,6 +617,11 @@ impl Workspace {
                                     Box::new(Command::ToggleTheme),
                                 )
                                 .separator()
+                                .menu_with_icon(
+                                    "Accounts",
+                                    IconName::Group,
+                                    Box::new(Command::ToggleAccount),
+                                )
                                 .menu_with_icon(
                                     "Settings",
                                     IconName::Settings,
@@ -658,12 +634,16 @@ impl Workspace {
 
     fn titlebar_right(&mut self, cx: &mut Context<Self>) -> impl IntoElement {
         let chat = ChatRegistry::global(cx);
+        let initializing = chat.read(cx).initializing;
         let trash_messages = chat.read(cx).count_trash_messages(cx);
 
-        let is_nip4e_enabled = AppSettings::get_nip4e(cx);
+        let device = DeviceRegistry::global(cx);
-        let nostr = NostrRegistry::global(cx);
+        let device_initializing = device.read(cx).initializing;
 
-        let Some(public_key) = nostr.read(cx).signer_pubkey(cx) else {
+        let nostr = NostrRegistry::global(cx);
+        let signer = nostr.read(cx).signer();
+
+        let Some(public_key) = signer.public_key() else {
             return div();
         };
 
@@ -706,75 +686,83 @@ impl Workspace {
                         }),
                 )
             })
-            .when(is_nip4e_enabled, |this| {
+            .child(
-                this.child(
+                Button::new("key")
-                    Button::new("key")
+                    .icon(IconName::UserKey)
-                        .icon(IconName::UserKey)
+                    .tooltip("Decoupled encryption key")
-                        .tooltip("Decoupled encryption key")
+                    .small()
-                        .small()
+                    .ghost()
-                        .ghost()
+                    .loading(device_initializing)
-                        .dropdown_menu(move |this, _window, _cx| {
+                    .when(device_initializing, |this| {
-                            this.min_w(px(260.))
+                        this.label("Dekey")
-                                .label("Encryption Key")
+                            .xsmall()
-                                .when_some(announcement.as_ref(), |this, announcement| {
+                            .tooltip("Loading decoupled encryption key...")
-                                    let name = announcement.client_name();
+                    })
-                                    let pkey = shorten_pubkey(announcement.public_key(), 8);
+                    .dropdown_menu(move |this, _window, _cx| {
+                        this.min_w(px(260.))
+                            .label("Encryption Key")
+                            .when_some(announcement.as_ref(), |this, announcement| {
+                                let name = announcement.client_name();
+                                let pkey = shorten_pubkey(announcement.public_key(), 8);
 
-                                    this.item(PopupMenuItem::element(move |_window, cx| {
+                                this.item(PopupMenuItem::element(move |_window, cx| {
-                                        h_flex()
+                                    h_flex()
-                                            .gap_1()
+                                        .gap_1()
-                                            .text_sm()
+                                        .text_sm()
-                                            .child(
+                                        .child(
-                                                Icon::new(IconName::Device)
+                                            Icon::new(IconName::Device)
-                                                    .small()
+                                                .small()
-                                                    .text_color(cx.theme().icon_muted),
+                                                .text_color(cx.theme().icon_muted),
-                                            )
+                                        )
-                                            .child(name.clone())
+                                        .child(name.clone())
-                                    }))
+                                }))
-                                    .item(
+                                .item(PopupMenuItem::element(move |_window, cx| {
-                                        PopupMenuItem::element(move |_window, cx| {
+                                    h_flex()
-                                            h_flex()
+                                        .gap_1()
-                                                .gap_1()
+                                        .text_sm()
-                                                .text_sm()
+                                        .child(
-                                                .child(
+                                            Icon::new(IconName::UserKey)
-                                                    Icon::new(IconName::UserKey)
+                                                .small()
-                                                        .small()
+                                                .text_color(cx.theme().icon_muted),
-                                                        .text_color(cx.theme().icon_muted),
+                                        )
-                                                )
+                                        .child(SharedString::from(pkey.clone()))
-                                                .child(SharedString::from(pkey.clone()))
+                                }))
-                                        }),
+                            })
-                                    )
+                            .separator()
-                                })
+                            .menu_with_icon(
-                                .separator()
+                                "Backup",
-                                .menu_with_icon(
+                                IconName::Shield,
-                                    "Backup",
+                                Box::new(Command::BackupEncryption),
-                                    IconName::Shield,
+                            )
-                                    Box::new(Command::BackupEncryption),
+                            .menu_with_icon(
-                                )
+                                "Restore from secret key",
-                                .menu_with_icon(
+                                IconName::Usb,
-                                    "Restore from secret key",
+                                Box::new(Command::ImportEncryption),
-                                    IconName::Usb,
+                            )
-                                    Box::new(Command::ImportEncryption),
+                            .separator()
-                                )
+                            .menu_with_icon(
-                                .separator()
+                                "Reload",
-                                .menu_with_icon(
+                                IconName::Refresh,
-                                    "Reload",
+                                Box::new(Command::RefreshEncryption),
-                                    IconName::Refresh,
+                            )
-                                    Box::new(Command::RefreshEncryption),
+                            .menu_with_icon(
-                                )
+                                "Reset",
-                                .menu_with_icon(
+                                IconName::Warning,
-                                    "Reset",
+                                Box::new(Command::ResetEncryption),
-                                    IconName::Warning,
+                            )
-                                    Box::new(Command::ResetEncryption),
+                    }),
-                                )
+            )
-                        }),
-                )
-            })
             .child(
                 Button::new("inbox")
                     .icon(IconName::Inbox)
                     .small()
                     .ghost()
+                    .loading(initializing)
+                    .when(initializing, |this| {
+                        this.label("Inbox")
+                            .xsmall()
+                            .tooltip("Getting inbox messages...")
+                    })
                     .dropdown_menu(move |this, _window, cx| {
                         let urls: Vec<(SharedString, SharedString)> = profile
                             .messaging_relays()
@@ -860,17 +848,13 @@ impl Render for Workspace {
             .relative()
             .size_full()
             .child(
-                image_cache(self.image_cache.clone())
+                v_flex()
                     .relative()
                     .size_full()
-                    .child(
+                    // Title Bar
-                        v_flex()
+                    .child(self.titlebar.clone())
-                            .size_full()
+                    // Dock
-                            // Title Bar
+                    .child(self.dock.clone()),
-                            .child(self.titlebar.clone())
-                            // Dock
-                            .child(self.dock.clone()),
-                    ),
             )
             // Notifications
             .children(notification_layer)

crates/coop_web/Cargo.toml

@@ -5,21 +5,22 @@ edition.workspace = true
 publish.workspace = true
 
 [dependencies]
-assets = { path = "../crates/assets" }
+assets = { path = "../assets" }
-ui = { path = "../crates/ui" }
+ui = { path = "../ui" }
-theme = { path = "../crates/theme" }
+theme = { path = "../theme" }
-common = { path = "../crates/common" }
+common = { path = "../common" }
-state = { path = "../crates/state" }
+state = { path = "../state" }
-device = { path = "../crates/device" }
+device = { path = "../device" }
-chat = { path = "../crates/chat" }
+chat = { path = "../chat" }
-settings = { path = "../crates/settings" }
+chat_ui = { path = "../chat_ui" }
-person = { path = "../crates/person" }
+settings = { path = "../settings" }
-relay_auth = { path = "../crates/relay_auth" }
+person = { path = "../person" }
+relay_auth = { path = "../relay_auth" }
 
 gpui.workspace = true
+gpui_web.workspace = true
 gpui_platform.workspace = true
 gpui_tokio.workspace = true
-gpui_web = { git = "https://github.com/zed-industries/zed" }
 
 nostr-connect.workspace = true
 nostr-sdk.workspace = true
@@ -34,8 +35,8 @@ smol.workspace = true
 futures.workspace = true
 oneshot.workspace = true
 webbrowser.workspace = true
-tracing-subscriber.workspace = true
 
+tracing-subscriber = { version = "0.3.18", features = ["fmt", "env-filter"] }
 console_error_panic_hook = "0.1"
 tracing-wasm = "0.2"
 console_log = "1.0"

crates/device/Cargo.toml

@@ -10,7 +10,6 @@ state = { path = "../state" }
 person = { path = "../person" }
 ui = { path = "../ui" }
 theme = { path = "../theme" }
-settings = { path = "../settings" }
 
 gpui.workspace = true
 nostr-sdk.workspace = true

crates/device/src/lib.rs

@@ -2,8 +2,6 @@ use std::cell::Cell;
 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};
@@ -13,9 +11,7 @@ use gpui::{
 };
 use nostr_sdk::prelude::*;
 use person::PersonRegistry;
-use settings::AppSettings;
+use state::{Announcement, NostrRegistry, StateEvent, TIMEOUT, app_name};
-use smallvec::{SmallVec, smallvec};
-use state::{Announcement, CLIENT_NAME, NostrRegistry};
 use theme::ActiveTheme;
 use ui::avatar::Avatar;
 use ui::button::Button;
@@ -23,6 +19,8 @@ use ui::notification::{Notification, NotificationKind};
 use ui::{Disableable, Sizable, StyledExt, WindowExtension, h_flex, v_flex};
 
 const IDENTIFIER: &str = "coop:device";
+const MSG: &str = "You've requested an encryption key from another device. \
+                   Approve to allow Coop to share with it.";
 
 pub fn init(window: &mut Window, cx: &mut App) {
     DeviceRegistry::set_global(cx.new(|cx| DeviceRegistry::new(window, cx)), cx);
@@ -37,10 +35,10 @@ impl Global for GlobalDeviceRegistry {}
 pub enum DeviceEvent {
     /// A new encryption signer has been set
     Set,
-    /// User have not setup encryption key
-    NotSet,
     /// The device is requesting an encryption key
     Requesting,
+    /// The device is creating a new encryption key
+    Creating,
     /// An error occurred
     Error(SharedString),
 }
@@ -59,20 +57,17 @@ impl DeviceEvent {
 /// NIP-4e: https://github.com/nostr-protocol/nips/blob/per-device-keys/4e.md
 #[derive(Debug)]
 pub struct DeviceRegistry {
+    /// Whether the registry is currently initializing
+    pub initializing: bool,
+
     /// Whether there is a pending request for encryption key approval
     pub pending_request: bool,
 
-    /// Whether an announcement has been made for this device
-    pub announcement_existed: Arc<AtomicBool>,
-
-    /// Signer
-    signer: Entity<Option<Keys>>,
-
     /// Async tasks
     tasks: Vec<Task<Result<(), Error>>>,
 
     /// Event subscription
-    _subscriptions: SmallVec<[Subscription; 2]>,
+    _subscription: Option<Subscription>,
 }
 
 impl EventEmitter<DeviceEvent> for DeviceRegistry {}
@@ -90,53 +85,31 @@ impl DeviceRegistry {
 
     /// Create a new device registry instance
     fn new(window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let signer = cx.new(|_| None);
-
         let nostr = NostrRegistry::global(cx);
-        let user_signer = nostr.read(cx).signer.clone();
 
-        let settings = AppSettings::global(cx);
+        // Subscribe to nostr state events
-        let is_nip4e_enabled = settings.read(cx).is_nip4e_enabled(cx);
+        let subscription = cx.subscribe_in(&nostr, window, |this, _e, event, _window, cx| {
-
+            if event == &StateEvent::SignerSet {
-        let mut subscriptions = smallvec![];
+                this.set_initializing(true, cx);
-
+                this.get_announcement(cx);
-        subscriptions.push(
+            };
-            // Subscribe to nostr state events
+        });
-            cx.observe(&settings, move |this, settings, cx| {
-                if settings.read(cx).is_nip4e_enabled(cx) {
-                    this.get_announcement(cx);
-                };
-            }),
-        );
-
-        subscriptions.push(
-            // Observe the user signer
-            cx.observe(&user_signer, move |this, signer, cx| {
-                if signer.read(cx).is_some() && is_nip4e_enabled {
-                    this.get_announcement(cx);
-                };
-            }),
-        );
 
         cx.defer_in(window, |this, window, cx| {
             this.handle_notifications(window, cx);
         });
 
         Self {
-            signer,
+            initializing: true,
             pending_request: false,
-            announcement_existed: Arc::new(AtomicBool::new(false)),
             tasks: vec![],
-            _subscriptions: subscriptions,
+            _subscription: Some(subscription),
         }
     }
 
     fn handle_notifications(&mut self, window: &mut Window, cx: &mut Context<Self>) {
         let nostr = NostrRegistry::global(cx);
         let client = nostr.read(cx).client();
-        let current_user = nostr.read(cx).signer_pubkey(cx);
-
-        let announcement_existed = self.announcement_existed.clone();
         let (tx, rx) = flume::bounded::<Event>(100);
 
         self.tasks.push(cx.background_spawn(async move {
@@ -153,15 +126,15 @@ impl DeviceRegistry {
                     }
 
                     match event.kind {
-                        Kind::Custom(10044) if current_user == Some(event.pubkey) => {
+                        Kind::Custom(4454) => {
-                            announcement_existed.store(true, Ordering::Relaxed);
+                            if verify_author(&client, event.as_ref()).await {
-                            tx.send_async(event.into_owned()).await?;
+                                tx.send_async(event.into_owned()).await?;
+                            }
                         }
-                        Kind::Custom(4454) if current_user == Some(event.pubkey) => {
+                        Kind::Custom(4455) => {
-                            tx.send_async(event.into_owned()).await?;
+                            if verify_author(&client, event.as_ref()).await {
-                        }
+                                tx.send_async(event.into_owned()).await?;
-                        Kind::Custom(4455) if current_user == Some(event.pubkey) => {
+                            }
-                            tx.send_async(event.into_owned()).await?;
                         }
                         _ => {}
                     }
@@ -174,11 +147,6 @@ impl DeviceRegistry {
         self.tasks.push(cx.spawn_in(window, async move |this, cx| {
             while let Ok(event) = rx.recv_async().await {
                 match event.kind {
-                    Kind::Custom(10044) => {
-                        this.update_in(cx, |this, _window, cx| {
-                            this.set_encryption(&event, cx);
-                        })?;
-                    }
                     // New request event from other device
                     Kind::Custom(4454) => {
                         this.update_in(cx, |this, window, cx| {
@@ -198,24 +166,37 @@ impl DeviceRegistry {
         }));
     }
 
+    /// Set whether the registry is currently initializing
+    fn set_initializing(&mut self, initializing: bool, cx: &mut Context<Self>) {
+        self.initializing = initializing;
+        cx.notify();
+    }
+
     /// Set whether there is a pending request for encryption key approval
     fn set_pending_request(&mut self, pending: bool, cx: &mut Context<Self>) {
         self.pending_request = pending;
         cx.notify();
     }
 
-    /// Get the signer
-    pub fn signer(&self, cx: &App) -> Option<Keys> {
-        self.signer.read(cx).clone()
-    }
-
     /// Set the decoupled encryption key for the current user
-    fn set_signer(&mut self, new: Keys, cx: &mut Context<Self>) {
+    fn set_signer<S>(&mut self, new: S, cx: &mut Context<Self>)
-        self.signer.update(cx, |this, cx| {
+    where
-            *this = Some(new);
+        S: NostrSigner + 'static,
-            cx.notify();
+    {
-        });
+        let nostr = NostrRegistry::global(cx);
-        cx.emit(DeviceEvent::Set);
+        let signer = nostr.read(cx).signer();
+
+        self.tasks.push(cx.spawn(async move |this, cx| {
+            signer.set_encryption_signer(new).await;
+
+            // Update state
+            this.update(cx, |this, cx| {
+                this.set_initializing(false, cx);
+                cx.emit(DeviceEvent::Set);
+            })?;
+
+            Ok(())
+        }));
     }
 
     /// Backup the encryption's secret key to a file
@@ -223,12 +204,8 @@ impl DeviceRegistry {
         let nostr = NostrRegistry::global(cx);
         let client = nostr.read(cx).client();
 
-        let Some(signer) = nostr.read(cx).signer(cx) else {
-            return Task::ready(Err(anyhow!("Signer is required")));
-        };
-
         cx.background_spawn(async move {
-            let keys = get_keys(&client, &signer).await?;
+            let keys = get_keys(&client).await?;
             let content = keys.secret_key().to_bech32()?;
 
             smol::fs::write(path, &content).await?;
@@ -242,48 +219,45 @@ impl DeviceRegistry {
         let nostr = NostrRegistry::global(cx);
         let client = nostr.read(cx).client();
 
-        let Some(current_user) = nostr.read(cx).signer_pubkey(cx) else {
+        let task: Task<Result<Event, Error>> = cx.background_spawn(async move {
-            return;
+            let signer = client.signer().context("Signer not found")?;
-        };
+            let public_key = signer.get_public_key().await?;
-
-        self.tasks.push(cx.background_spawn(async move {
-            let opts = SubscribeAutoCloseOptions::default().exit_policy(ReqExitPolicy::ExitOnEOSE);
 
             // Construct the filter for the device announcement event
             let filter = Filter::new()
                 .kind(Kind::Custom(10044))
-                .author(current_user)
+                .author(public_key)
                 .limit(1);
 
-            client
+            // Stream events from user's write relays
-                .subscribe(filter)
+            let mut stream = client
-                .close_on(opts)
+                .stream_events(filter)
-                .with_id(SubscriptionId::new("nip4e"))
+                .timeout(Duration::from_secs(TIMEOUT))
                 .await?;
 
-            Ok(())
+            while let Some((_url, res)) = stream.next().await {
-        }));
+                if let Ok(event) = res {
+                    return Ok(event);
+                }
+            }
 
-        let announcement_existed = self.announcement_existed.clone();
+            Err(anyhow!("Announcement not found"))
+        });
 
         self.tasks.push(cx.spawn(async move |this, cx| {
-            if !cx
+            match task.await {
-                .background_spawn(async move {
+                Ok(event) => {
-                    // Wait for 5 seconds
+                    // Set encryption key from the announcement event
-                    smol::Timer::after(Duration::from_secs(5)).await;
+                    this.update(cx, |this, cx| {
-
+                        this.set_encryption(&event, cx);
-                    // Then check if the msg relays have been found
+                    })?;
-                    if !announcement_existed.load(Ordering::Acquire) {
+                }
-                        return true;
+                Err(_) => {
-                    }
+                    // User has no announcement, create a new one
-
+                    this.update(cx, |this, cx| {
-                    false
+                        this.set_announcement(Keys::generate(), cx);
-                })
+                    })?;
-                .await
+                }
-            {
-                this.update(cx, |_this, cx| {
-                    cx.emit(DeviceEvent::NotSet);
-                })?;
             }
 
             Ok(())
@@ -294,6 +268,9 @@ impl DeviceRegistry {
     pub fn set_announcement(&mut self, keys: Keys, cx: &mut Context<Self>) {
         let task = self.create_encryption(keys, cx);
 
+        // Notify that we're creating a new encryption key
+        cx.emit(DeviceEvent::Creating);
+
         self.tasks.push(cx.spawn(async move |this, cx| {
             match task.await {
                 Ok(keys) => {
@@ -320,19 +297,15 @@ impl DeviceRegistry {
         let secret = keys.secret_key().to_secret_hex();
         let n = keys.public_key();
 
-        let Some(signer) = nostr.read(cx).signer(cx) else {
-            return Task::ready(Err(anyhow!("Signer is required")));
-        };
-
         cx.background_spawn(async move {
             // Construct an announcement event
-            let event = EventBuilder::new(Kind::Custom(10044), "")
+            let builder = EventBuilder::new(Kind::Custom(10044), "").tags(vec![
-                .tags(vec![
+                Tag::custom(TagKind::custom("n"), vec![n]),
-                    Tag::custom("n", vec![n]),
+                Tag::client(app_name()),
-                    Tag::custom("client", vec![CLIENT_NAME]),
+            ]);
-                ])
+
-                .finalize_async(&signer)
+            // Sign the event with user's signer
-                .await?;
+            let event = client.sign_event_builder(builder).await?;
 
             // Publish announcement
             client
@@ -342,7 +315,7 @@ impl DeviceRegistry {
                 .await?;
 
             // Save device keys to the database
-            set_keys(&client, &signer, &secret).await?;
+            set_keys(&client, &secret).await?;
 
             Ok(keys)
         })
@@ -353,16 +326,12 @@ impl DeviceRegistry {
         let nostr = NostrRegistry::global(cx);
         let client = nostr.read(cx).client();
 
-        let Some(signer) = nostr.read(cx).signer(cx) else {
-            return;
-        };
-
         let announcement = Announcement::from(event);
         let device_pubkey = announcement.public_key();
 
         // Get encryption key from the database and compare with the announcement
         let task: Task<Result<Keys, Error>> = cx.background_spawn(async move {
-            let keys = get_keys(&client, &signer).await?;
+            let keys = get_keys(&client).await?;
 
             // Compare the public key from the announcement with the one from the database
             if keys.public_key() != device_pubkey {
@@ -391,13 +360,10 @@ impl DeviceRegistry {
     fn wait_for_request(&mut self, cx: &mut Context<Self>) {
         let nostr = NostrRegistry::global(cx);
         let client = nostr.read(cx).client();
-
+        let signer = nostr.read(cx).signer();
-        let Some(signer) = nostr.read(cx).signer(cx) else {
-            return;
-        };
 
         self.tasks.push(cx.background_spawn(async move {
-            let public_key = signer.get_public_key_async().await?;
+            let public_key = signer.get_public_key().await?;
             let id = SubscriptionId::new("dekey-requests");
 
             // Construct a filter for encryption key requests
@@ -417,18 +383,13 @@ impl DeviceRegistry {
     pub fn request(&mut self, cx: &mut Context<Self>) {
         let nostr = NostrRegistry::global(cx);
         let client = nostr.read(cx).client();
+        let signer = nostr.read(cx).signer();
 
-        let Some(signer) = nostr.read(cx).signer(cx) else {
+        let app_keys = nostr.read(cx).keys();
-            return;
+        let app_pubkey = app_keys.public_key();
-        };
-
-        let Ok(app_keys) = get_or_init_app_keys(cx) else {
-            return;
-        };
 
         let task: Task<Result<Option<Event>, Error>> = cx.background_spawn(async move {
-            let app_pubkey = app_keys.public_key();
+            let public_key = signer.get_public_key().await?;
-            let public_key = signer.get_public_key_async().await?;
 
             // Construct a filter to get the latest approval event
             let filter = Filter::new()
@@ -443,13 +404,13 @@ impl DeviceRegistry {
                 // No approval event found, construct a request event
                 None => {
                     // Construct an event for device key request
-                    let event = EventBuilder::new(Kind::Custom(4454), "")
+                    let builder = EventBuilder::new(Kind::Custom(4454), "").tags(vec![
-                        .tags(vec![
+                        Tag::custom(TagKind::custom("P"), vec![app_pubkey]),
-                            Tag::custom("P", vec![app_pubkey]),
+                        Tag::client(app_name()),
-                            Tag::custom("client", vec![CLIENT_NAME]),
+                    ]);
-                        ])
+
-                        .finalize_async(&signer)
+                    // Sign the event with user's signer
-                        .await?;
+                    let event = client.sign_event_builder(builder).await?;
 
                     // Send the event to write relays
                     client.send_event(&event).to_nip65().await?;
@@ -468,7 +429,10 @@ impl DeviceRegistry {
                 }
                 Ok(None) => {
                     this.update(cx, |this, cx| {
+                        this.set_initializing(false, cx);
                         this.wait_for_approval(cx);
+
+                        cx.emit(DeviceEvent::Requesting);
                     })?;
                 }
                 Err(e) => {
@@ -485,15 +449,10 @@ impl DeviceRegistry {
     fn wait_for_approval(&mut self, cx: &mut Context<Self>) {
         let nostr = NostrRegistry::global(cx);
         let client = nostr.read(cx).client();
-
+        let signer = nostr.read(cx).signer();
-        let Some(signer) = nostr.read(cx).signer(cx) else {
-            return;
-        };
-
-        cx.emit(DeviceEvent::Requesting);
 
         self.tasks.push(cx.background_spawn(async move {
-            let public_key = signer.get_public_key_async().await?;
+            let public_key = signer.get_public_key().await?;
 
             // Construct a filter for device key requests
             let filter = Filter::new()
@@ -510,21 +469,19 @@ 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 Ok(app_keys) = get_or_init_app_keys(cx) else {
+        let nostr = NostrRegistry::global(cx);
-            return;
+        let app_keys = nostr.read(cx).keys();
-        };
 
         let task: Task<Result<Keys, Error>> = cx.background_spawn(async move {
             let master = event
                 .tags
-                .iter()
+                .find(TagKind::custom("P"))
-                .find(|tag| tag.kind() == "P")
                 .and_then(|tag| tag.content())
                 .and_then(|content| PublicKey::parse(content).ok())
                 .context("Invalid event's tags")?;
 
             let payload = event.content.as_str();
-            let decrypted = app_keys.nip44_decrypt_async(&master, payload).await?;
+            let decrypted = app_keys.nip44_decrypt(&master, payload).await?;
 
             let secret = SecretKey::from_hex(&decrypted)?;
             let keys = Keys::new(secret);
@@ -554,42 +511,37 @@ impl DeviceRegistry {
         let nostr = NostrRegistry::global(cx);
         let client = nostr.read(cx).client();
 
-        let Some(signer) = nostr.read(cx).signer(cx) else {
-            return;
-        };
-
         // Get user's write relays
         let event = event.clone();
         let id: SharedString = event.id.to_hex().into();
 
         let task: Task<Result<(), Error>> = cx.background_spawn(async move {
             // Get device keys
-            let keys = get_keys(&client, &signer).await?;
+            let keys = get_keys(&client).await?;
             let secret = keys.secret_key().to_secret_hex();
 
             // Extract the target public key from the event tags
             let target = event
                 .tags
-                .iter()
+                .find(TagKind::custom("P"))
-                .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")?;
 
             // Encrypt the device keys with the user's signer
-            let payload = keys.nip44_encrypt_async(&target, &secret).await?;
+            let payload = keys.nip44_encrypt(&target, &secret).await?;
 
             // Construct the response event
             //
             // P tag: the current device's public key
             // p tag: the requester's public key
-            let event = EventBuilder::new(Kind::Custom(4455), payload)
+            let builder = EventBuilder::new(Kind::Custom(4455), payload).tags(vec![
-                .tags(vec![
+                Tag::custom(TagKind::custom("P"), vec![keys.public_key().to_hex()]),
-                    Tag::custom("P", vec![keys.public_key().to_hex()]),
+                Tag::public_key(target),
-                    Tag::public_key(target),
+            ]);
-                ])
+
-                .finalize_async(&signer)
+            // Sign the builder
-                .await?;
+            let event = client.sign_event_builder(builder).await?;
 
             // Send the response event to the user's relay list
             client.send_event(&event).to_nip65().await?;
@@ -634,9 +586,6 @@ impl DeviceRegistry {
 
     /// Build a notification for the encryption request.
     fn notification(&self, event: Event, cx: &Context<Self>) -> Notification {
-        const MSG: &str = "You've requested an encryption key from another device. \
-                           Approve to allow Coop to share with it.";
-
         let request = Announcement::from(&event);
         let persons = PersonRegistry::global(cx);
         let profile = persons.read(cx).get(&request.public_key(), cx);
@@ -739,44 +688,29 @@ impl DeviceRegistry {
 
 struct DeviceNotification;
 
-/// Get or create new app keys
+/// Verify the author of an event
-fn get_or_init_app_keys(cx: &App) -> Result<Keys, Error> {
+async fn verify_author(client: &Client, event: &Event) -> bool {
-    let read = cx.read_credentials(CLIENT_NAME);
+    if let Some(signer) = client.signer()
-    let stored_keys: Option<Keys> = cx.foreground_executor().block_on(async move {
+        && let Ok(public_key) = signer.get_public_key().await
-        if let Ok(Some((_, secret))) = read.await {
+    {
-            SecretKey::from_slice(&secret).map(Keys::new).ok()
+        return public_key == event.pubkey;
-        } else {
-            None
-        }
-    });
-
-    if let Some(keys) = stored_keys {
-        Ok(keys)
-    } else {
-        let keys = Keys::generate();
-        let user = keys.public_key().to_hex();
-        let secret = keys.secret_key().to_secret_bytes();
-        let write = cx.write_credentials(CLIENT_NAME, &user, &secret);
-
-        cx.foreground_executor().block_on(async move {
-            if let Err(e) = write.await {
-                log::error!("Keyring not available or panic: {e}")
-            }
-        });
-
-        Ok(keys)
     }
+    false
 }
 
 /// Encrypt and store device keys in the local database.
-async fn set_keys(client: &Client, signer: &Keys, secret: &str) -> Result<(), Error> {
+async fn set_keys(client: &Client, secret: &str) -> Result<(), Error> {
-    let public_key = signer.get_public_key_async().await?;
+    let signer = client.signer().context("Signer not found")?;
-    let content = signer.nip44_encrypt_async(&public_key, secret).await?;
+    let public_key = signer.get_public_key().await?;
+
+    // Encrypt the value
+    let content = signer.nip44_encrypt(&public_key, secret).await?;
 
     // Construct the application data event
     let event = EventBuilder::new(Kind::ApplicationSpecificData, content)
         .tag(Tag::identifier(IDENTIFIER))
-        .finalize_async(signer)
+        .build(public_key)
+        .sign(&Keys::generate())
         .await?;
 
     // Save the event to the database
@@ -786,8 +720,9 @@ async fn set_keys(client: &Client, signer: &Keys, secret: &str) -> Result<(), Er
 }
 
 /// Get device keys from the local database.
-async fn get_keys(client: &Client, signer: &Keys) -> Result<Keys, Error> {
+async fn get_keys(client: &Client) -> Result<Keys, Error> {
-    let public_key = signer.get_public_key_async().await?;
+    let signer = client.signer().context("Signer not found")?;
+    let public_key = signer.get_public_key().await?;
 
     let filter = Filter::new()
         .kind(Kind::ApplicationSpecificData)
@@ -795,10 +730,7 @@ async fn get_keys(client: &Client, signer: &Keys) -> Result<Keys, Error> {
         .author(public_key);
 
     if let Some(event) = client.database().query(filter).await?.first() {
-        let content = signer
+        let content = signer.nip44_decrypt(&public_key, &event.content).await?;
-            .nip44_decrypt_async(&public_key, &event.content)
-            .await?;
-
         let secret = SecretKey::parse(&content)?;
         let keys = Keys::new(secret);
 

crates/person/src/lib.rs

@@ -242,7 +242,7 @@ impl PersonRegistry {
 
     /// Set messaging relays for a person
     fn set_messaging_relays(&mut self, event: &Event, cx: &mut App) {
-        let urls: Vec<RelayUrl> = nip17::extract_relay_list(event).collect();
+        let urls: Vec<RelayUrl> = nip17::extract_relay_list(event).cloned().collect();
 
         if let Some(person) = self.persons.get(&event.pubkey) {
             person.update(cx, |person, cx| {

crates/relay_auth/src/lib.rs

@@ -193,20 +193,15 @@ impl RelayAuth {
     fn auth(&self, req: &Arc<AuthRequest>, cx: &App) -> Task<Result<(), Error>> {
         let nostr = NostrRegistry::global(cx);
         let client = nostr.read(cx).client();
-
+        let req = req.clone();
-        let Some(signer) = nostr.read(cx).signer(cx) else {
-            return Task::ready(Err(anyhow!("Signer is required")));
-        };
 
         // Get all pending events for the relay
-        let req = req.clone();
         let pending_events = self.get_pending_events(req.url(), cx);
 
         cx.background_spawn(async move {
             // Construct event
-            let event = EventBuilder::auth(req.challenge(), req.url().clone())
+            let builder = EventBuilder::auth(req.challenge(), req.url().clone());
-                .finalize_async(&signer)
+            let event = client.sign_event_builder(builder).await?;
-                .await?;
 
             // Get the event ID
             let id = event.id;
@@ -222,6 +217,8 @@ impl RelayAuth {
                 .send_msg(ClientMessage::Auth(Cow::Borrowed(&event)))
                 .await?;
 
+            log::info!("Sending AUTH event");
+
             while let Some(notification) = notifications.next().await {
                 match notification {
                     RelayNotification::Message { message } => {
@@ -275,22 +272,30 @@ impl RelayAuth {
             this.update_in(cx, |this, window, cx| {
                 window.clear_notification_by_id::<AuthNotification>(challenge, cx);
 
-                if let Err(e) = result {
+                match result {
-                    window
+                    Ok(_) => {
-                        .push_notification(Notification::error(e.to_string()).autohide(false), cx);
+                        // Clear pending events for the authenticated relay
-                } else {
+                        this.clear_pending_events(url, cx);
-                    // Clear pending events for the authenticated relay
-                    this.clear_pending_events(url, cx);
 
-                    let domain = url.domain().unwrap_or_default();
+                        // Save the authenticated relay to automatically authenticate future requests
-                    let msg = format!("Relay {} has been authenticated", domain);
+                        settings.update(cx, |this, cx| {
+                            this.add_trusted_relay(url, cx);
+                        });
 
-                    window.push_notification(Notification::success(msg), cx);
+                        window.push_notification(
-
+                            Notification::success(format!(
-                    // Save the authenticated relay to automatically authenticate future requests
+                                "Relay {} has been authenticated",
-                    settings.update(cx, |this, cx| {
+                                url.domain().unwrap_or_default()
-                        this.add_trusted_relay(url, cx);
+                            )),
-                    });
+                            cx,
+                        );
+                    }
+                    Err(e) => {
+                        window.push_notification(
+                            Notification::error(e.to_string()).autohide(false),
+                            cx,
+                        );
+                    }
                 }
             })
             .ok();

crates/settings/src/lib.rs

@@ -1,3 +1,4 @@
+use std::collections::{HashMap, HashSet};
 use std::fmt::Display;
 use std::rc::Rc;
 
@@ -19,15 +20,13 @@ macro_rules! setting_accessors {
             $(
                 paste::paste! {
                     pub fn [<get_ $field>](cx: &App) -> $type {
-                        Self::global(cx).read(cx).inner.read(cx).$field.clone()
+                        Self::global(cx).read(cx).values.$field.clone()
                     }
 
                     pub fn [<update_ $field>](value: $type, cx: &mut App) {
                         Self::global(cx).update(cx, |this, cx| {
-                            this.inner.update(cx, |inner, cx| {
+                            this.values.$field = value;
-                                inner.$field = value;
+                            cx.notify();
-                                cx.notify();
-                            });
                         });
                     }
                 }
@@ -41,9 +40,9 @@ setting_accessors! {
     pub theme_mode: ThemeMode,
     pub hide_avatar: bool,
     pub screening: bool,
-    pub nip4e: bool,
     pub auth_mode: AuthMode,
-    pub trusted_relays: Vec<String>,
+    pub trusted_relays: HashSet<RelayUrl>,
+    pub room_configs: HashMap<u64, RoomConfig>,
     pub file_server: Url,
 }
 
@@ -67,10 +66,10 @@ impl Display for AuthMode {
 /// Signer kind
 #[derive(Debug, Clone, Default, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)]
 pub enum SignerKind {
-    Auto,
-    Encryption,
     #[default]
+    Auto,
     User,
+    Encryption,
 }
 
 impl SignerKind {
@@ -98,7 +97,7 @@ impl RoomConfig {
     pub fn new() -> Self {
         Self {
             backup: true,
-            signer_kind: SignerKind::default(),
+            signer_kind: SignerKind::Auto,
         }
     }
 
@@ -138,14 +137,14 @@ pub struct Settings {
     /// Enable screening for unknown chat requests
     pub screening: bool,
 
-    /// Enable decoupling encryption key
-    pub nip4e: bool,
-
     /// Authentication mode
     pub auth_mode: AuthMode,
 
     /// Trusted relays; Coop will automatically authenticate with these relays
-    pub trusted_relays: Vec<String>,
+    pub trusted_relays: HashSet<RelayUrl>,
+
+    /// Configuration for each chat room
+    pub room_configs: HashMap<u64, RoomConfig>,
 
     /// Server for blossom media attachments
     pub file_server: Url,
@@ -158,9 +157,9 @@ impl Default for Settings {
             theme_mode: ThemeMode::default(),
             hide_avatar: false,
             screening: true,
-            nip4e: false,
             auth_mode: AuthMode::default(),
-            trusted_relays: vec![],
+            trusted_relays: HashSet::default(),
+            room_configs: HashMap::default(),
             file_server: Url::parse("https://blossom.band/").unwrap(),
         }
     }
@@ -179,7 +178,7 @@ impl Global for GlobalAppSettings {}
 /// Application settings
 pub struct AppSettings {
     /// Settings
-    inner: Entity<Settings>,
+    values: Settings,
 
     /// Event subscriptions
     _subscriptions: SmallVec<[Subscription; 2]>,
@@ -197,12 +196,11 @@ impl AppSettings {
     }
 
     fn new(window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let inner = cx.new(|_| Settings::default());
         let mut subscriptions = smallvec![];
 
         subscriptions.push(
             // Observe and automatically save settings on changes
-            cx.observe(&inner, |this, _inner, cx| {
+            cx.observe_self(|this, cx| {
                 this.save(cx);
             }),
         );
@@ -213,17 +211,15 @@ impl AppSettings {
         });
 
         Self {
-            inner,
+            values: Settings::default(),
             _subscriptions: subscriptions,
         }
     }
 
     /// Update settings
     fn set_settings(&mut self, settings: Settings, cx: &mut Context<Self>) {
-        self.inner.update(cx, |this, cx| {
+        self.values = settings;
-            *this = settings;
+        cx.notify();
-            cx.notify();
-        });
     }
 
     /// Load settings
@@ -253,16 +249,19 @@ impl AppSettings {
 
     /// Save settings
     pub fn save(&mut self, cx: &mut Context<Self>) {
-        let settings = self.inner.read(cx);
+        let settings = self.values.clone();
 
-        if let Ok(content) = serde_json::to_string(&settings) {
+        let task: Task<Result<(), Error>> = cx.background_spawn(async move {
-            cx.background_spawn(async move {
+            let path = config_dir().join(".settings");
-                let path = config_dir().join(".settings");
+            let content = serde_json::to_string(&settings)?;
-                // Write settings to file
+
-                smol::fs::write(&path, content).await.ok();
+            // Write settings to file
-            })
+            smol::fs::write(&path, content).await?;
-            .detach();
+
-        }
+            Ok(())
+        });
+
+        task.detach();
     }
 
     /// Set theme
@@ -271,10 +270,8 @@ impl AppSettings {
         T: Into<String>,
     {
         // Update settings
-        self.inner.update(cx, |this, cx| {
+        self.values.theme = Some(theme.into());
-            this.theme = Some(theme.into());
+        cx.notify();
-            cx.notify();
-        });
 
         // Apply the new theme
         self.apply_theme(window, cx);
@@ -282,17 +279,16 @@ impl AppSettings {
 
     /// Reset theme
     pub fn reset_theme(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.inner.update(cx, |this, cx| {
+        self.values.theme = None;
-            this.theme = None;
+        cx.notify();
-            cx.notify();
+
-        });
         self.apply_theme(window, cx);
     }
 
     /// Apply theme
     pub fn apply_theme(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        if let Some(name) = self.inner.read(cx).theme.as_ref() {
+        if let Some(name) = self.values.theme.as_ref() {
-            let mode = self.inner.read(cx).theme_mode;
+            let mode = self.values.theme_mode;
 
             if let Ok(new_theme) = ThemeFamily::from_assets(name) {
                 Theme::apply_theme(Rc::new(new_theme), Some(window), cx);
@@ -305,32 +301,26 @@ impl AppSettings {
         }
     }
 
-    /// Check if decoupling encryption key is enabled
-    pub fn is_nip4e_enabled(&self, cx: &App) -> bool {
-        self.inner.read(cx).nip4e
-    }
-
     /// Check if the given relay is already authenticated
-    pub fn trusted_relay(&self, url: &RelayUrl, cx: &App) -> bool {
+    pub fn trusted_relay(&self, url: &RelayUrl, _cx: &App) -> bool {
-        self.inner
+        self.values.trusted_relays.iter().any(|relay| {
-            .read(cx)
+            relay.as_str_without_trailing_slash() == url.as_str_without_trailing_slash()
-            .trusted_relays
+        })
-            .iter()
-            .any(|relay| relay == url.as_str_without_trailing_slash())
     }
 
     /// Add a relay to the trusted list
     pub fn add_trusted_relay(&mut self, url: &RelayUrl, cx: &mut Context<Self>) {
-        self.inner.update(cx, |this, cx| {
+        self.values.trusted_relays.insert(url.clone());
-            if !this
+        cx.notify();
-                .trusted_relays
+    }
-                .iter()
+
-                .any(|relay| relay == url.as_str_without_trailing_slash())
+    /// Add a room configuration
-            {
+    pub fn add_room_config(&mut self, id: u64, config: RoomConfig, cx: &mut Context<Self>) {
-                this.trusted_relays
+        self.values
-                    .push(url.as_str_without_trailing_slash().to_string());
+            .room_configs
-                cx.notify();
+            .entry(id)
-            }
+            .and_modify(|this| *this = config)
-        });
+            .or_default();
+        cx.notify();
     }
 }

crates/state/src/constants.rs

@@ -1,3 +1,5 @@
+use std::sync::OnceLock;
+
 /// Client name (Application name)
 pub const CLIENT_NAME: &str = "Coop";
 
@@ -13,9 +15,6 @@ pub const KEYRING: &str = "Coop Safe Storage";
 /// Default timeout for subscription
 pub const TIMEOUT: u64 = 2;
 
-/// Default image cache size
-pub const IMAGE_CACHE_SIZE: usize = 20;
-
 /// Default delay for searching
 pub const FIND_DELAY: u64 = 600;
 
@@ -49,3 +48,15 @@ pub const BOOTSTRAP_RELAYS: [&str; 3] = [
     "wss://relay.primal.net",
     "wss://user.kindpag.es",
 ];
+
+static APP_NAME: OnceLock<String> = OnceLock::new();
+
+/// Get the app name
+pub fn app_name() -> &'static String {
+    APP_NAME.get_or_init(|| {
+        let devicename = whoami::devicename();
+        let platform = whoami::platform();
+
+        format!("{CLIENT_NAME} on {platform} ({devicename})")
+    })
+}

crates/state/src/device.rs

@@ -16,15 +16,14 @@ impl From<&Event> for Announcement {
         let public_key = val
             .tags
             .iter()
-            .find(|tag| tag.kind() == "n")
+            .find(|tag| tag.kind().as_str() == "n")
             .and_then(|tag| tag.content())
             .and_then(|c| PublicKey::parse(c).ok())
             .unwrap_or(val.pubkey);
 
         let client_name = val
             .tags
-            .iter()
+            .find(TagKind::Client)
-            .find(|tag| tag.kind() == "client")
             .and_then(|tag| tag.content())
             .map(|c| c.to_string());
 

crates/state/src/lib.rs

@@ -1,7 +1,9 @@
 use std::collections::HashMap;
+use std::path::PathBuf;
+use std::sync::Arc;
 use std::time::Duration;
 
-use anyhow::{Error, anyhow};
+use anyhow::{Context as AnyhowContext, Error, anyhow};
 use common::config_dir;
 use gpui::{App, AppContext, Context, Entity, EventEmitter, Global, SharedString, Task, Window};
 use nostr_connect::prelude::*;
@@ -11,13 +13,15 @@ use nostr_sdk::prelude::*;
 
 mod blossom;
 mod constants;
+mod device;
 mod nip05;
-mod nip4e;
+mod signer;
 
 pub use blossom::*;
 pub use constants::*;
-pub use nip4e::*;
+pub use device::*;
 pub use nip05::*;
+pub use signer::*;
 
 pub fn init(window: &mut Window, cx: &mut App) {
     // rustls uses the `aws_lc_rs` provider by default
@@ -44,6 +48,12 @@ pub enum StateEvent {
     Connecting,
     /// Connected to the bootstrapping relay
     Connected,
+    /// Creating the signer
+    Creating,
+    /// Show the identity dialog
+    Show,
+    /// A new signer has been set
+    SignerSet,
     /// An error occurred
     Error(SharedString),
 }
@@ -63,8 +73,19 @@ pub struct NostrRegistry {
     /// Nostr client
     client: Client,
 
-    /// Currently active signer
+    /// Nostr signer
-    pub signer: Entity<Option<Keys>>,
+    signer: Arc<CoopSigner>,
+
+    /// All local stored identities
+    npubs: Entity<Vec<PublicKey>>,
+
+    /// Keys directory
+    key_dir: PathBuf,
+
+    /// Master app keys used for various operations.
+    ///
+    /// Example: Nostr Connect and NIP-4e operations
+    app_keys: Keys,
 
     /// Tasks for asynchronous operations
     tasks: Vec<Task<Result<(), Error>>>,
@@ -85,7 +106,20 @@ impl NostrRegistry {
 
     /// Create a new nostr instance
     fn new(window: &mut Window, cx: &mut Context<Self>) -> Self {
-        let signer = cx.new(|_| None);
+        let key_dir = config_dir().join("keys");
+        let app_keys = get_or_init_app_keys(cx).unwrap_or(Keys::generate());
+
+        // Construct the nostr signer
+        let signer = Arc::new(CoopSigner::new(app_keys.clone()));
+
+        // Get all local stored npubs
+        let npubs = cx.new(|_| match Self::discover(&key_dir) {
+            Ok(npubs) => npubs,
+            Err(e) => {
+                log::error!("Failed to discover npubs: {e}");
+                vec![]
+            }
+        });
 
         // Construct the nostr lmdb instance
         let lmdb = cx.foreground_executor().block_on(async move {
@@ -96,9 +130,10 @@ impl NostrRegistry {
 
         // Construct the nostr client
         let client = ClientBuilder::default()
+            .signer(signer.clone())
             .database(lmdb)
             .gossip(NostrGossipMemory::unbounded())
-            .gossip_config(GossipConfig::default().no_background_refresh())
+            .automatic_authentication(false)
             .connect_timeout(Duration::from_secs(10))
             .sleep_when_idle(SleepWhenIdle::Enabled {
                 timeout: Duration::from_secs(600),
@@ -108,11 +143,21 @@ impl NostrRegistry {
         // Run at the end of current cycle
         cx.defer_in(window, |this, _window, cx| {
             this.connect(cx);
+            // Create an identity if none exists
+            if this.npubs.read(cx).is_empty() {
+                this.create_identity(cx);
+            } else {
+                // Show the identity dialog
+                cx.emit(StateEvent::Show);
+            }
         });
 
         Self {
             client,
             signer,
+            npubs,
+            key_dir,
+            app_keys,
             tasks: vec![],
         }
     }
@@ -122,22 +167,46 @@ impl NostrRegistry {
         self.client.clone()
     }
 
-    /// Get the signer
+    /// Get the nostr signer
-    pub fn signer(&self, cx: &App) -> Option<Keys> {
+    pub fn signer(&self) -> Arc<CoopSigner> {
-        self.signer.read(cx).clone()
+        self.signer.clone()
     }
 
-    /// Get the public key of the signer
+    /// Get the npubs entity
-    pub fn signer_pubkey(&self, cx: &App) -> Option<PublicKey> {
+    pub fn npubs(&self) -> Entity<Vec<PublicKey>> {
-        self.signer.read(cx).as_ref().map(|s| s.public_key())
+        self.npubs.clone()
     }
 
-    /// Set the signer to the given keys
+    /// Get the app keys
-    pub fn set_signer(&mut self, new_keys: Keys, cx: &mut Context<Self>) {
+    pub fn keys(&self) -> Keys {
-        self.signer.update(cx, |this, cx| {
+        self.app_keys.clone()
-            *this = Some(new_keys);
+    }
-            cx.notify();
+
-        });
+    /// Discover all npubs in the keys directory
+    fn discover(dir: &PathBuf) -> Result<Vec<PublicKey>, Error> {
+        // Ensure keys directory exists
+        std::fs::create_dir_all(dir)?;
+
+        let files = std::fs::read_dir(dir)?;
+        let mut entries = Vec::new();
+        let mut npubs: Vec<PublicKey> = Vec::new();
+
+        for file in files.flatten() {
+            let metadata = file.metadata()?;
+            let modified_time = metadata.modified()?;
+            let name = file.file_name().into_string().unwrap().replace(".npub", "");
+            entries.push((modified_time, name));
+        }
+
+        // Sort by modification time (most recent first)
+        entries.sort_by(|a, b| b.0.cmp(&a.0));
+
+        for (_, name) in entries {
+            let public_key = PublicKey::parse(&name)?;
+            npubs.push(public_key);
+        }
+
+        Ok(npubs)
     }
 
     /// Connect to the bootstrapping relays
@@ -145,6 +214,14 @@ impl NostrRegistry {
         let client = self.client();
 
         let task: Task<Result<(), Error>> = cx.background_spawn(async move {
+            // Add search relay to the relay pool
+            for url in SEARCH_RELAYS.into_iter() {
+                client
+                    .add_relay(url)
+                    .capabilities(RelayCapabilities::READ)
+                    .await?;
+            }
+
             // Add indexer relay to the relay pool
             for url in INDEXER_RELAYS.into_iter() {
                 client
@@ -159,7 +236,10 @@ impl NostrRegistry {
             }
 
             // Connect to all added relays
-            client.connect().await;
+            client
+                .connect()
+                .and_wait(Duration::from_secs(TIMEOUT))
+                .await;
 
             Ok(())
         });
@@ -182,8 +262,319 @@ impl NostrRegistry {
         }));
     }
 
+    /// Get the secret for a given npub.
+    pub fn get_secret(
+        &self,
+        public_key: PublicKey,
+        cx: &App,
+    ) -> Task<Result<Arc<dyn NostrSigner>, Error>> {
+        let npub = public_key.to_bech32().unwrap();
+        let key_path = self.key_dir.join(format!("{}.npub", npub));
+        let app_keys = self.app_keys.clone();
+
+        if let Ok(payload) = std::fs::read_to_string(key_path) {
+            if !payload.is_empty() {
+                cx.background_spawn(async move {
+                    let decrypted = app_keys.nip44_decrypt(&public_key, &payload).await?;
+                    let secret = SecretKey::parse(&decrypted)?;
+                    let keys = Keys::new(secret);
+
+                    Ok(keys.into_nostr_signer())
+                })
+            } else {
+                self.get_secret_keyring(&npub, cx)
+            }
+        } else {
+            self.get_secret_keyring(&npub, cx)
+        }
+    }
+
+    /// Get the secret for a given npub in the OS credentials store.
+    #[deprecated = "Use get_secret instead"]
+    fn get_secret_keyring(
+        &self,
+        user: &str,
+        cx: &App,
+    ) -> Task<Result<Arc<dyn NostrSigner>, Error>> {
+        let read = cx.read_credentials(user);
+        let app_keys = self.app_keys.clone();
+
+        cx.background_spawn(async move {
+            let (_, secret) = read
+                .await
+                .map_err(|_| anyhow!("Failed to get signer. Please re-import the secret key"))?
+                .ok_or_else(|| anyhow!("Failed to get signer. Please re-import the secret key"))?;
+
+            // Try to parse as a direct secret key first
+            if let Ok(secret_key) = SecretKey::from_slice(&secret) {
+                return Ok(Keys::new(secret_key).into_nostr_signer());
+            }
+
+            // Convert the secret into string
+            let sec = String::from_utf8(secret)
+                .map_err(|_| anyhow!("Failed to parse secret as UTF-8"))?;
+
+            // Try to parse as a NIP-46 URI
+            let uri =
+                NostrConnectUri::parse(&sec).map_err(|_| anyhow!("Failed to parse NIP-46 URI"))?;
+
+            let timeout = Duration::from_secs(NOSTR_CONNECT_TIMEOUT);
+            let mut nip46 = NostrConnect::new(uri, app_keys, timeout, None)?;
+
+            // Set the auth URL handler
+            nip46.auth_url_handler(CoopAuthUrlHandler);
+
+            Ok(nip46.into_nostr_signer())
+        })
+    }
+
+    /// Add a new npub to the keys directory
+    fn write_secret(
+        &self,
+        public_key: PublicKey,
+        secret: String,
+        cx: &App,
+    ) -> Task<Result<(), Error>> {
+        let npub = public_key.to_bech32().unwrap();
+        let key_path = self.key_dir.join(format!("{}.npub", npub));
+        let app_keys = self.app_keys.clone();
+
+        cx.background_spawn(async move {
+            // If the secret starts with "bunker://" (nostr connect), use it directly; otherwise, encrypt it
+            let content = if secret.starts_with("bunker://") {
+                secret
+            } else {
+                app_keys.nip44_encrypt(&public_key, &secret).await?
+            };
+
+            // Write the encrypted secret to the keys directory
+            smol::fs::write(key_path, &content).await?;
+
+            Ok(())
+        })
+    }
+
+    /// Remove a secret
+    pub fn remove_secret(&mut self, public_key: &PublicKey, cx: &mut Context<Self>) {
+        let public_key = public_key.to_owned();
+        let npub = public_key.to_bech32().unwrap();
+
+        let keys_dir = config_dir().join("keys");
+        let key_path = keys_dir.join(format!("{}.npub", npub));
+
+        // Remove the secret file from the keys directory
+        std::fs::remove_file(key_path).ok();
+
+        self.npubs.update(cx, |this, cx| {
+            this.retain(|k| k != &public_key);
+            cx.notify();
+        });
+    }
+
+    /// Create a new identity
+    pub fn create_identity(&mut self, cx: &mut Context<Self>) {
+        let client = self.client();
+        let keys = Keys::generate();
+        let async_keys = keys.clone();
+
+        // Emit creating event
+        cx.emit(StateEvent::Creating);
+
+        // Create the write secret task
+        let write_secret =
+            self.write_secret(keys.public_key(), keys.secret_key().to_secret_hex(), cx);
+
+        // Run async tasks in background
+        let task: Task<Result<(), Error>> = cx.background_spawn(async move {
+            let signer = async_keys.into_nostr_signer();
+
+            // Construct relay list event
+            let relay_list = default_relay_list();
+            let event = EventBuilder::relay_list(relay_list).sign(&signer).await?;
+
+            // Publish relay list
+            client
+                .send_event(&event)
+                .to(BOOTSTRAP_RELAYS)
+                .ack_policy(AckPolicy::none())
+                .await?;
+
+            // Construct the default metadata
+            let name = petname::petname(2, "-").unwrap_or("Cooper".to_string());
+            let avatar = Url::parse(&format!("https://avatar.vercel.sh/{name}")).unwrap();
+            let metadata = Metadata::new().display_name(&name).picture(avatar);
+            let event = EventBuilder::metadata(&metadata).sign(&signer).await?;
+
+            // Publish metadata event
+            client
+                .send_event(&event)
+                .to_nip65()
+                .ack_policy(AckPolicy::none())
+                .await?;
+
+            // Construct the default contact list
+            let contacts = vec![Contact::new(PublicKey::parse(COOP_PUBKEY).unwrap())];
+            let event = EventBuilder::contact_list(contacts).sign(&signer).await?;
+
+            // Publish contact list event
+            client
+                .send_event(&event)
+                .to_nip65()
+                .ack_policy(AckPolicy::none())
+                .await?;
+
+            // Construct the default messaging relay list
+            let relays = default_messaging_relays();
+            let event = EventBuilder::nip17_relay_list(relays).sign(&signer).await?;
+
+            // Publish messaging relay list event
+            client.send_event(&event).to_nip65().await?;
+
+            // Write user's credentials to the system keyring
+            write_secret.await?;
+
+            Ok(())
+        });
+
+        self.tasks.push(cx.spawn(async move |this, cx| {
+            match task.await {
+                Ok(_) => {
+                    this.update(cx, |this, cx| {
+                        this.set_signer(keys, cx);
+                    })?;
+                }
+                Err(e) => {
+                    this.update(cx, |_this, cx| {
+                        cx.emit(StateEvent::error(e.to_string()));
+                    })?;
+                }
+            };
+
+            Ok(())
+        }));
+    }
+
+    /// Set the signer for the nostr client and verify the public key
+    pub fn set_signer<T>(&mut self, new: T, cx: &mut Context<Self>)
+    where
+        T: NostrSigner + 'static,
+    {
+        let client = self.client();
+        let signer = self.signer();
+
+        // Create a task to update the signer and verify the public key
+        let task: Task<Result<PublicKey, Error>> = cx.background_spawn(async move {
+            // Update signer and unsubscribe
+            signer.switch(new).await;
+            client.unsubscribe_all().await?;
+
+            // Verify and get public key
+            let signer = client.signer().context("Signer not found")?;
+            let public_key = signer.get_public_key().await?;
+
+            log::info!("Signer's public key: {}", public_key);
+            Ok(public_key)
+        });
+
+        self.tasks.push(cx.spawn(async move |this, cx| {
+            match task.await {
+                Ok(public_key) => {
+                    this.update(cx, |this, cx| {
+                        // Add public key to npubs if not already present
+                        this.npubs.update(cx, |this, cx| {
+                            if !this.contains(&public_key) {
+                                this.push(public_key);
+                                cx.notify();
+                            }
+                        });
+
+                        // Emit signer changed event
+                        cx.emit(StateEvent::SignerSet);
+                    })?;
+                }
+                Err(e) => {
+                    this.update(cx, |_this, cx| {
+                        cx.emit(StateEvent::error(e.to_string()));
+                    })?;
+                }
+            };
+
+            Ok(())
+        }));
+    }
+
+    /// Add a key signer to keyring
+    pub fn add_key_signer(&mut self, keys: &Keys, cx: &mut Context<Self>) {
+        let keys = keys.clone();
+        let write_secret =
+            self.write_secret(keys.public_key(), keys.secret_key().to_secret_hex(), cx);
+
+        self.tasks.push(cx.spawn(async move |this, cx| {
+            match write_secret.await {
+                Ok(_) => {
+                    this.update(cx, |this, cx| {
+                        this.set_signer(keys, cx);
+                    })?;
+                }
+                Err(e) => {
+                    this.update(cx, |_this, cx| {
+                        cx.emit(StateEvent::error(e.to_string()));
+                    })?;
+                }
+            };
+
+            Ok(())
+        }));
+    }
+
+    /// Add a nostr connect signer to keyring
+    pub fn add_nip46_signer(&mut self, nip46: &NostrConnect, cx: &mut Context<Self>) {
+        let nip46 = nip46.clone();
+        let async_nip46 = nip46.clone();
+
+        // Connect and verify the remote signer
+        let task: Task<Result<(PublicKey, NostrConnectUri), Error>> =
+            cx.background_spawn(async move {
+                let uri = async_nip46.bunker_uri().await?;
+                let public_key = async_nip46.get_public_key().await?;
+
+                Ok((public_key, uri))
+            });
+
+        self.tasks.push(cx.spawn(async move |this, cx| {
+            match task.await {
+                Ok((public_key, uri)) => {
+                    // Create the write secret task
+                    let write_secret = this.read_with(cx, |this, cx| {
+                        this.write_secret(public_key, uri.to_string(), cx)
+                    })?;
+
+                    match write_secret.await {
+                        Ok(_) => {
+                            this.update(cx, |this, cx| {
+                                this.set_signer(nip46, cx);
+                            })?;
+                        }
+                        Err(e) => {
+                            this.update(cx, |_this, cx| {
+                                cx.emit(StateEvent::error(e.to_string()));
+                            })?;
+                        }
+                    }
+                }
+                Err(e) => {
+                    this.update(cx, |_this, cx| {
+                        cx.emit(StateEvent::error(e.to_string()));
+                    })?;
+                }
+            };
+
+            Ok(())
+        }));
+    }
+
     /// Get the public key of a NIP-05 address
-    pub fn query_address(&self, addr: Nip05Address, cx: &App) -> Task<Result<PublicKey, Error>> {
+    pub fn get_address(&self, addr: Nip05Address, cx: &App) -> Task<Result<PublicKey, Error>> {
         let client = self.client();
         let http_client = cx.http_client();
 
@@ -220,7 +611,7 @@ impl NostrRegistry {
 
         // Get the address task if the query is a valid NIP-05 address
         let address_task = if let Ok(addr) = Nip05Address::parse(&query) {
-            Some(self.query_address(addr, cx))
+            Some(self.get_address(addr, cx))
         } else {
             None
         };
@@ -236,18 +627,6 @@ impl NostrRegistry {
                 return Ok(results);
             }
 
-            // Add search relay to the relay pool
-            for url in SEARCH_RELAYS.into_iter() {
-                if client.relay(url).await.is_ok() {
-                    client
-                        .add_relay(url)
-                        .capabilities(RelayCapabilities::READ)
-                        .await?;
-                } else {
-                    return Err(anyhow!("Failed to add search relay: {}", url));
-                }
-            }
-
             // Return early if the query is a valid public key
             if let Ok(public_key) = PublicKey::parse(&query) {
                 results.push(public_key);
@@ -292,19 +671,13 @@ impl NostrRegistry {
         let client = self.client();
         let query = query.to_string();
 
-        let Some(signer) = self.signer.read(cx).clone() else {
-            return Task::ready(Err(anyhow!("Signer is required")));
-        };
-
         cx.background_spawn(async move {
             // Construct a vertex request event
-            let event = EventBuilder::new(Kind::Custom(5315), "")
+            let builder = EventBuilder::new(Kind::Custom(5315), "").tags(vec![
-                .tags(vec![
+                Tag::custom(TagKind::custom("param"), vec!["search", &query]),
-                    Tag::custom("param", vec!["search", &query]),
+                Tag::custom(TagKind::custom("param"), vec!["limit", "10"]),
-                    Tag::custom("param", vec!["limit", "10"]),
+            ]);
-                ])
+            let event = client.sign_event_builder(builder).await?;
-                .finalize_async(&signer)
-                .await?;
 
             // Send the event to vertex relays
             let output = client.send_event(&event).to(WOT_RELAYS).await?;
@@ -354,3 +727,78 @@ impl NostrRegistry {
         })
     }
 }
+
+/// Get or create new app keys
+fn get_or_init_app_keys(cx: &App) -> Result<Keys, Error> {
+    let read = cx.read_credentials(CLIENT_NAME);
+    let stored_keys: Option<Keys> = cx.foreground_executor().block_on(async move {
+        if let Ok(Some((_, secret))) = read.await {
+            SecretKey::from_slice(&secret).map(Keys::new).ok()
+        } else {
+            None
+        }
+    });
+
+    if let Some(keys) = stored_keys {
+        Ok(keys)
+    } else {
+        let keys = Keys::generate();
+        let user = keys.public_key().to_hex();
+        let secret = keys.secret_key().to_secret_bytes();
+        let write = cx.write_credentials(CLIENT_NAME, &user, &secret);
+
+        cx.foreground_executor().block_on(async move {
+            if let Err(e) = write.await {
+                log::error!("Keyring not available or panic: {e}")
+            }
+        });
+
+        Ok(keys)
+    }
+}
+
+fn default_relay_list() -> Vec<(RelayUrl, Option<RelayMetadata>)> {
+    vec![
+        (
+            RelayUrl::parse("wss://relay.nostr.net").unwrap(),
+            Some(RelayMetadata::Write),
+        ),
+        (
+            RelayUrl::parse("wss://relay.primal.net").unwrap(),
+            Some(RelayMetadata::Write),
+        ),
+        (
+            RelayUrl::parse("wss://relay.damus.io").unwrap(),
+            Some(RelayMetadata::Read),
+        ),
+        (
+            RelayUrl::parse("wss://nos.lol").unwrap(),
+            Some(RelayMetadata::Read),
+        ),
+        (
+            RelayUrl::parse("wss://nostr.superfriends.online").unwrap(),
+            None,
+        ),
+    ]
+}
+
+fn default_messaging_relays() -> Vec<RelayUrl> {
+    vec![
+        RelayUrl::parse("wss://nos.lol").unwrap(),
+        RelayUrl::parse("wss://nip17.com").unwrap(),
+        RelayUrl::parse("wss://auth.nostr1.com").unwrap(),
+    ]
+}
+
+#[derive(Debug, Clone)]
+pub struct CoopAuthUrlHandler;
+
+impl AuthUrlHandler for CoopAuthUrlHandler {
+    #[allow(mismatched_lifetime_syntaxes)]
+    fn on_auth_url(&self, auth_url: Url) -> BoxedFuture<Result<()>> {
+        Box::pin(async move {
+            webbrowser::open(auth_url.as_str())?;
+            Ok(())
+        })
+    }
+}

crates/state/src/signer.rs

@@ -0,0 +1,134 @@
+use std::borrow::Cow;
+use std::result::Result;
+use std::sync::Arc;
+
+use nostr_sdk::prelude::*;
+use smol::lock::RwLock;
+
+#[derive(Debug)]
+pub struct CoopSigner {
+    /// User's signer
+    signer: RwLock<Arc<dyn NostrSigner>>,
+
+    /// User's signer public key
+    signer_pkey: RwLock<Option<PublicKey>>,
+
+    /// Specific signer for encryption purposes
+    encryption_signer: RwLock<Option<Arc<dyn NostrSigner>>>,
+}
+
+impl CoopSigner {
+    pub fn new<T>(signer: T) -> Self
+    where
+        T: IntoNostrSigner,
+    {
+        Self {
+            signer: RwLock::new(signer.into_nostr_signer()),
+            signer_pkey: RwLock::new(None),
+            encryption_signer: RwLock::new(None),
+        }
+    }
+
+    /// Get the current signer.
+    pub async fn get(&self) -> Arc<dyn NostrSigner> {
+        self.signer.read().await.clone()
+    }
+
+    /// Get the encryption signer.
+    pub async fn get_encryption_signer(&self) -> Option<Arc<dyn NostrSigner>> {
+        self.encryption_signer.read().await.clone()
+    }
+
+    /// Get public key
+    ///
+    /// Ensure to call this method after the signer has been initialized.
+    /// Otherwise, it will panic.
+    pub fn public_key(&self) -> Option<PublicKey> {
+        *self.signer_pkey.read_blocking()
+    }
+
+    /// Switch the current signer to a new signer.
+    pub async fn switch<T>(&self, new: T)
+    where
+        T: IntoNostrSigner,
+    {
+        let new_signer = new.into_nostr_signer();
+        let public_key = new_signer.get_public_key().await.ok();
+        let mut signer = self.signer.write().await;
+        let mut signer_pkey = self.signer_pkey.write().await;
+        let mut encryption_signer = self.encryption_signer.write().await;
+
+        // Switch to the new signer
+        *signer = new_signer;
+
+        // Update the public key
+        *signer_pkey = public_key;
+
+        // Reset the encryption signer
+        *encryption_signer = None;
+    }
+
+    /// Set the encryption signer.
+    pub async fn set_encryption_signer<T>(&self, new: T)
+    where
+        T: IntoNostrSigner,
+    {
+        let mut encryption_signer = self.encryption_signer.write().await;
+        *encryption_signer = Some(new.into_nostr_signer());
+    }
+}
+
+impl NostrSigner for CoopSigner {
+    #[allow(mismatched_lifetime_syntaxes)]
+    fn backend(&self) -> SignerBackend {
+        SignerBackend::Custom(Cow::Borrowed("custom"))
+    }
+
+    fn get_public_key<'a>(&'a self) -> BoxedFuture<'a, Result<PublicKey, SignerError>> {
+        Box::pin(async move { self.get().await.get_public_key().await })
+    }
+
+    fn sign_event<'a>(
+        &'a self,
+        unsigned: UnsignedEvent,
+    ) -> BoxedFuture<'a, Result<Event, SignerError>> {
+        Box::pin(async move { self.get().await.sign_event(unsigned).await })
+    }
+
+    fn nip04_encrypt<'a>(
+        &'a self,
+        public_key: &'a PublicKey,
+        content: &'a str,
+    ) -> BoxedFuture<'a, Result<String, SignerError>> {
+        Box::pin(async move { self.get().await.nip04_encrypt(public_key, content).await })
+    }
+
+    fn nip04_decrypt<'a>(
+        &'a self,
+        public_key: &'a PublicKey,
+        encrypted_content: &'a str,
+    ) -> BoxedFuture<'a, Result<String, SignerError>> {
+        Box::pin(async move {
+            self.get()
+                .await
+                .nip04_decrypt(public_key, encrypted_content)
+                .await
+        })
+    }
+
+    fn nip44_encrypt<'a>(
+        &'a self,
+        public_key: &'a PublicKey,
+        content: &'a str,
+    ) -> BoxedFuture<'a, Result<String, SignerError>> {
+        Box::pin(async move { self.get().await.nip44_encrypt(public_key, content).await })
+    }
+
+    fn nip44_decrypt<'a>(
+        &'a self,
+        public_key: &'a PublicKey,
+        payload: &'a str,
+    ) -> BoxedFuture<'a, Result<String, SignerError>> {
+        Box::pin(async move { self.get().await.nip44_decrypt(public_key, payload).await })
+    }
+}

crates/theme/src/geometry.rs

@@ -1,6 +1,6 @@
 use std::fmt::{self, Debug, Display, Formatter};
 
-use gpui::{AbsoluteLength, Axis, Length, Pixels};
+use gpui::{AbsoluteLength, Axis, Corner, Length, Pixels};
 use serde::{Deserialize, Serialize};
 
 /// A enum for defining the placement of the element.
@@ -49,6 +49,141 @@ impl Placement {
     }
 }
 
+/// The anchor position of an element.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Default, Serialize, Deserialize)]
+pub enum Anchor {
+    #[default]
+    #[serde(rename = "top-left")]
+    TopLeft,
+    #[serde(rename = "top-center")]
+    TopCenter,
+    #[serde(rename = "top-right")]
+    TopRight,
+    #[serde(rename = "bottom-left")]
+    BottomLeft,
+    #[serde(rename = "bottom-center")]
+    BottomCenter,
+    #[serde(rename = "bottom-right")]
+    BottomRight,
+}
+
+impl Display for Anchor {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        match self {
+            Anchor::TopLeft => write!(f, "TopLeft"),
+            Anchor::TopCenter => write!(f, "TopCenter"),
+            Anchor::TopRight => write!(f, "TopRight"),
+            Anchor::BottomLeft => write!(f, "BottomLeft"),
+            Anchor::BottomCenter => write!(f, "BottomCenter"),
+            Anchor::BottomRight => write!(f, "BottomRight"),
+        }
+    }
+}
+
+impl Anchor {
+    /// Returns true if the anchor is at the top.
+    #[inline]
+    pub fn is_top(&self) -> bool {
+        matches!(self, Self::TopLeft | Self::TopCenter | Self::TopRight)
+    }
+
+    /// Returns true if the anchor is at the bottom.
+    #[inline]
+    pub fn is_bottom(&self) -> bool {
+        matches!(
+            self,
+            Self::BottomLeft | Self::BottomCenter | Self::BottomRight
+        )
+    }
+
+    /// Returns true if the anchor is at the left.
+    #[inline]
+    pub fn is_left(&self) -> bool {
+        matches!(self, Self::TopLeft | Self::BottomLeft)
+    }
+
+    /// Returns true if the anchor is at the right.
+    #[inline]
+    pub fn is_right(&self) -> bool {
+        matches!(self, Self::TopRight | Self::BottomRight)
+    }
+
+    /// Returns true if the anchor is at the center.
+    #[inline]
+    pub fn is_center(&self) -> bool {
+        matches!(self, Self::TopCenter | Self::BottomCenter)
+    }
+
+    /// Swaps the vertical position of the anchor.
+    pub fn swap_vertical(&self) -> Self {
+        match self {
+            Anchor::TopLeft => Anchor::BottomLeft,
+            Anchor::TopCenter => Anchor::BottomCenter,
+            Anchor::TopRight => Anchor::BottomRight,
+            Anchor::BottomLeft => Anchor::TopLeft,
+            Anchor::BottomCenter => Anchor::TopCenter,
+            Anchor::BottomRight => Anchor::TopRight,
+        }
+    }
+
+    /// Swaps the horizontal position of the anchor.
+    pub fn swap_horizontal(&self) -> Self {
+        match self {
+            Anchor::TopLeft => Anchor::TopRight,
+            Anchor::TopCenter => Anchor::TopCenter,
+            Anchor::TopRight => Anchor::TopLeft,
+            Anchor::BottomLeft => Anchor::BottomRight,
+            Anchor::BottomCenter => Anchor::BottomCenter,
+            Anchor::BottomRight => Anchor::BottomLeft,
+        }
+    }
+
+    pub fn other_side_corner_along(&self, axis: Axis) -> Anchor {
+        match axis {
+            Axis::Vertical => match self {
+                Self::TopLeft => Self::BottomLeft,
+                Self::TopCenter => Self::BottomCenter,
+                Self::TopRight => Self::BottomRight,
+                Self::BottomLeft => Self::TopLeft,
+                Self::BottomCenter => Self::TopCenter,
+                Self::BottomRight => Self::TopRight,
+            },
+            Axis::Horizontal => match self {
+                Self::TopLeft => Self::TopRight,
+                Self::TopCenter => Self::TopCenter,
+                Self::TopRight => Self::TopLeft,
+                Self::BottomLeft => Self::BottomRight,
+                Self::BottomCenter => Self::BottomCenter,
+                Self::BottomRight => Self::BottomLeft,
+            },
+        }
+    }
+}
+
+impl From<Corner> for Anchor {
+    fn from(corner: Corner) -> Self {
+        match corner {
+            Corner::TopLeft => Anchor::TopLeft,
+            Corner::TopRight => Anchor::TopRight,
+            Corner::BottomLeft => Anchor::BottomLeft,
+            Corner::BottomRight => Anchor::BottomRight,
+        }
+    }
+}
+
+impl From<Anchor> for Corner {
+    fn from(anchor: Anchor) -> Self {
+        match anchor {
+            Anchor::TopLeft => Corner::TopLeft,
+            Anchor::TopRight => Corner::TopRight,
+            Anchor::BottomLeft => Corner::BottomLeft,
+            Anchor::BottomRight => Corner::BottomRight,
+            Anchor::TopCenter => Corner::TopLeft,
+            Anchor::BottomCenter => Corner::BottomLeft,
+        }
+    }
+}
+
 /// A enum for defining the side of the element.
 ///
 /// See also: [`Placement`] if you need to define the 4 edges.

crates/theme/src/notification.rs

@@ -1,9 +1,10 @@
-use gpui::{Anchor, Pixels, px};
+use gpui::{Pixels, px};
+use serde::{Deserialize, Serialize};
 
-use crate::{Edges, TITLEBAR_HEIGHT};
+use crate::{Anchor, Edges, TITLEBAR_HEIGHT};
 
 /// The settings for notifications.
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct NotificationSettings {
     /// The placement of the notification, default: [`Anchor::TopRight`]
     pub placement: Anchor,

crates/ui/Cargo.toml

@@ -22,6 +22,5 @@ uuid = "1.10"
 regex = "1"
 image = "0.25.1"
 lsp-types = "0.97.0"
-ropey = { version = "=2.0.0-beta.1", features = ["metric_lines_lf", "metric_utf16"] }
+rope = { git = "https://github.com/zed-industries/zed" }
 sum_tree = { git = "https://github.com/zed-industries/zed" }
-tree-sitter = "0.26"

crates/ui/LICENSE

@@ -0,0 +1,191 @@
+Copyright 2024 Longbridge <https://longbridge.com>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS

crates/ui/src/anchored.rs

@@ -0,0 +1,332 @@
+//! This is a fork of gpui's anchored element that adds support for offsetting
+//! https://github.com/zed-industries/zed/blob/b06f4088a3565c5e30663106ff79c1ced645d87a/crates/gpui/src/elements/anchored.rs
+use gpui::{
+    AnyElement, App, Axis, Bounds, Display, Edges, Element, GlobalElementId, Half,
+    InspectorElementId, IntoElement, LayoutId, ParentElement, Pixels, Point, Position, Size, Style,
+    Window, point, px,
+};
+use smallvec::SmallVec;
+use theme::Anchor;
+
+/// The state that the anchored element element uses to track its children.
+pub struct AnchoredState {
+    child_layout_ids: SmallVec<[LayoutId; 4]>,
+}
+
+/// An anchored element that can be used to display UI that
+/// will avoid overflowing the window bounds.
+pub(crate) struct Anchored {
+    children: SmallVec<[AnyElement; 2]>,
+    anchor_corner: Anchor,
+    fit_mode: AnchoredFitMode,
+    anchor_position: Option<Point<Pixels>>,
+    position_mode: AnchoredPositionMode,
+    offset: Option<Point<Pixels>>,
+}
+
+/// anchored gives you an element that will avoid overflowing the window bounds.
+/// Its children should have no margin to avoid measurement issues.
+pub(crate) fn anchored() -> Anchored {
+    Anchored {
+        children: SmallVec::new(),
+        anchor_corner: Anchor::TopLeft,
+        fit_mode: AnchoredFitMode::SwitchAnchor,
+        anchor_position: None,
+        position_mode: AnchoredPositionMode::Window,
+        offset: None,
+    }
+}
+
+#[allow(dead_code)]
+impl Anchored {
+    /// Sets which corner of the anchored element should be anchored to the current position.
+    pub fn anchor(mut self, anchor: Anchor) -> Self {
+        self.anchor_corner = anchor;
+        self
+    }
+
+    /// Sets the position in window coordinates
+    /// (otherwise the location the anchored element is rendered is used)
+    pub fn position(mut self, anchor: Point<Pixels>) -> Self {
+        self.anchor_position = Some(anchor);
+        self
+    }
+
+    /// Offset the final position by this amount.
+    /// Useful when you want to anchor to an element but offset from it, such as in PopoverMenu.
+    pub fn offset(mut self, offset: Point<Pixels>) -> Self {
+        self.offset = Some(offset);
+        self
+    }
+
+    /// Sets the position mode for this anchored element. Local will have this
+    /// interpret its [`Anchored::position`] as relative to the parent element.
+    /// While Window will have it interpret the position as relative to the window.
+    pub fn position_mode(mut self, mode: AnchoredPositionMode) -> Self {
+        self.position_mode = mode;
+        self
+    }
+
+    /// Snap to window edge instead of switching anchor corner when an overflow would occur.
+    pub fn snap_to_window(mut self) -> Self {
+        self.fit_mode = AnchoredFitMode::SnapToWindow;
+        self
+    }
+
+    /// Snap to window edge and leave some margins.
+    pub fn snap_to_window_with_margin(mut self, edges: impl Into<Edges<Pixels>>) -> Self {
+        self.fit_mode = AnchoredFitMode::SnapToWindowWithMargin(edges.into());
+        self
+    }
+}
+
+impl ParentElement for Anchored {
+    fn extend(&mut self, elements: impl IntoIterator<Item = AnyElement>) {
+        self.children.extend(elements)
+    }
+}
+
+impl Element for Anchored {
+    type PrepaintState = ();
+    type RequestLayoutState = AnchoredState;
+
+    fn id(&self) -> Option<gpui::ElementId> {
+        None
+    }
+
+    fn source_location(&self) -> Option<&'static core::panic::Location<'static>> {
+        None
+    }
+
+    fn request_layout(
+        &mut self,
+        _id: Option<&GlobalElementId>,
+        _inspector_id: Option<&InspectorElementId>,
+        window: &mut Window,
+        cx: &mut App,
+    ) -> (gpui::LayoutId, Self::RequestLayoutState) {
+        let child_layout_ids = self
+            .children
+            .iter_mut()
+            .map(|child| child.request_layout(window, cx))
+            .collect::<SmallVec<_>>();
+
+        let anchored_style = Style {
+            position: Position::Absolute,
+            display: Display::Flex,
+            ..Style::default()
+        };
+
+        let layout_id = window.request_layout(anchored_style, child_layout_ids.iter().copied(), cx);
+
+        (layout_id, AnchoredState { child_layout_ids })
+    }
+
+    fn prepaint(
+        &mut self,
+        _id: Option<&GlobalElementId>,
+        _inspector_id: Option<&InspectorElementId>,
+        bounds: Bounds<Pixels>,
+        request_layout: &mut Self::RequestLayoutState,
+        window: &mut Window,
+        cx: &mut App,
+    ) {
+        if request_layout.child_layout_ids.is_empty() {
+            return;
+        }
+
+        let mut child_min = point(Pixels::MAX, Pixels::MAX);
+        let mut child_max = Point::default();
+        for child_layout_id in &request_layout.child_layout_ids {
+            let child_bounds = window.layout_bounds(*child_layout_id);
+            child_min = child_min.min(&child_bounds.origin);
+            child_max = child_max.max(&child_bounds.bottom_right());
+        }
+        let size: Size<Pixels> = (child_max - child_min).into();
+
+        let (origin, mut desired) = self.position_mode.get_position_and_bounds(
+            self.anchor_position,
+            self.anchor_corner,
+            size,
+            bounds,
+            self.offset,
+        );
+
+        let limits = Bounds {
+            origin: Point::default(),
+            size: window.viewport_size(),
+        };
+
+        if self.fit_mode == AnchoredFitMode::SwitchAnchor {
+            let mut anchor_corner = self.anchor_corner;
+
+            if desired.left() < limits.left() || desired.right() > limits.right() {
+                let switched = Bounds::from_corner_and_size(
+                    anchor_corner
+                        .other_side_corner_along(Axis::Horizontal)
+                        .into(),
+                    origin,
+                    size,
+                );
+                if !(switched.left() < limits.left() || switched.right() > limits.right()) {
+                    anchor_corner = anchor_corner.other_side_corner_along(Axis::Horizontal);
+                    desired = switched
+                }
+            }
+
+            if desired.top() < limits.top() || desired.bottom() > limits.bottom() {
+                let switched = Bounds::from_corner_and_size(
+                    anchor_corner.other_side_corner_along(Axis::Vertical).into(),
+                    origin,
+                    size,
+                );
+                if !(switched.top() < limits.top() || switched.bottom() > limits.bottom()) {
+                    desired = switched;
+                }
+            }
+        }
+
+        let client_inset = window.client_inset().unwrap_or(px(0.));
+        let edges = match self.fit_mode {
+            AnchoredFitMode::SnapToWindowWithMargin(edges) => edges,
+            _ => Edges::default(),
+        }
+        .map(|edge| *edge + client_inset);
+
+        // Snap the horizontal edges of the anchored element to the horizontal edges of the window if
+        // its horizontal bounds overflow, aligning to the left if it is wider than the limits.
+        if desired.right() > limits.right() {
+            desired.origin.x -= desired.right() - limits.right() + edges.right;
+        }
+        if desired.left() < limits.left() {
+            desired.origin.x = limits.origin.x + edges.left;
+        }
+
+        // Snap the vertical edges of the anchored element to the vertical edges of the window if
+        // its vertical bounds overflow, aligning to the top if it is taller than the limits.
+        if desired.bottom() > limits.bottom() {
+            desired.origin.y -= desired.bottom() - limits.bottom() + edges.bottom;
+        }
+        if desired.top() < limits.top() {
+            desired.origin.y = limits.origin.y + edges.top;
+        }
+
+        let offset = desired.origin - bounds.origin;
+        let offset = point(offset.x.round(), offset.y.round());
+
+        window.with_element_offset(offset, |window| {
+            for child in &mut self.children {
+                child.prepaint(window, cx);
+            }
+        })
+    }
+
+    fn paint(
+        &mut self,
+        _id: Option<&GlobalElementId>,
+        _inspector_id: Option<&InspectorElementId>,
+        _bounds: Bounds<Pixels>,
+        _request_layout: &mut Self::RequestLayoutState,
+        _prepaint: &mut Self::PrepaintState,
+        window: &mut Window,
+        cx: &mut App,
+    ) {
+        for child in &mut self.children {
+            child.paint(window, cx);
+        }
+    }
+}
+
+impl IntoElement for Anchored {
+    type Element = Self;
+
+    fn into_element(self) -> Self::Element {
+        self
+    }
+}
+
+/// Which algorithm to use when fitting the anchored element to be inside the window.
+#[allow(dead_code)]
+#[derive(Copy, Clone, PartialEq)]
+pub enum AnchoredFitMode {
+    /// Snap the anchored element to the window edge.
+    SnapToWindow,
+    /// Snap to window edge and leave some margins.
+    SnapToWindowWithMargin(Edges<Pixels>),
+    /// Switch which corner anchor this anchored element is attached to.
+    SwitchAnchor,
+}
+
+/// Which algorithm to use when positioning the anchored element.
+#[allow(dead_code)]
+#[derive(Copy, Clone, PartialEq)]
+pub enum AnchoredPositionMode {
+    /// Position the anchored element relative to the window.
+    Window,
+    /// Position the anchored element relative to its parent.
+    Local,
+}
+
+impl AnchoredPositionMode {
+    fn get_position_and_bounds(
+        &self,
+        anchor_position: Option<Point<Pixels>>,
+        anchor_corner: Anchor,
+        size: Size<Pixels>,
+        bounds: Bounds<Pixels>,
+        offset: Option<Point<Pixels>>,
+    ) -> (Point<Pixels>, Bounds<Pixels>) {
+        let offset = offset.unwrap_or_default();
+
+        match self {
+            AnchoredPositionMode::Window => {
+                let anchor_position = anchor_position.unwrap_or(bounds.origin);
+                let bounds =
+                    Self::from_corner_and_size(anchor_corner, anchor_position + offset, size);
+                (anchor_position, bounds)
+            }
+            AnchoredPositionMode::Local => {
+                let anchor_position = anchor_position.unwrap_or_default();
+                let bounds = Self::from_corner_and_size(
+                    anchor_corner,
+                    bounds.origin + anchor_position + offset,
+                    size,
+                );
+                (anchor_position, bounds)
+            }
+        }
+    }
+
+    // Ref https://github.com/zed-industries/zed/blob/b06f4088a3565c5e30663106ff79c1ced645d87a/crates/gpui/src/geometry.rs#L863
+    fn from_corner_and_size(
+        anchor: Anchor,
+        origin: Point<Pixels>,
+        size: Size<Pixels>,
+    ) -> Bounds<Pixels> {
+        let origin = match anchor {
+            Anchor::TopLeft => origin,
+            Anchor::TopCenter => Point {
+                x: origin.x - size.width.half(),
+                y: origin.y,
+            },
+            Anchor::TopRight => Point {
+                x: origin.x - size.width,
+                y: origin.y,
+            },
+            Anchor::BottomLeft => Point {
+                x: origin.x,
+                y: origin.y - size.height,
+            },
+            Anchor::BottomCenter => Point {
+                x: origin.x - size.width.half(),
+                y: origin.y - size.height,
+            },
+            Anchor::BottomRight => Point {
+                x: origin.x - size.width,
+                y: origin.y - size.height,
+            },
+        };
+
+        Bounds { origin, size }
+    }
+}

crates/ui/src/dock/tab_panel.rs

@@ -2,7 +2,7 @@ use std::sync::Arc;
 
 use gpui::prelude::FluentBuilder;
 use gpui::{
-    Anchor, App, AppContext, Context, DefiniteLength, DismissEvent, DragMoveEvent, Empty, Entity,
+    App, AppContext, Context, Corner, DefiniteLength, DismissEvent, DragMoveEvent, Empty, Entity,
     EventEmitter, FocusHandle, Focusable, InteractiveElement as _, IntoElement, MouseButton,
     ParentElement, Pixels, Render, ScrollHandle, SharedString, StatefulInteractiveElement, Styled,
     WeakEntity, Window, div, px, rems,
@@ -460,7 +460,7 @@ impl TabPanel {
                                 })
                         }
                     })
-                    .anchor(Anchor::TopRight),
+                    .anchor(Corner::TopRight),
             )
     }
 
@@ -750,7 +750,7 @@ impl TabPanel {
                 div()
                     .id("tab-bar-empty-space")
                     .h_full()
-                    .flex_grow_1()
+                    .flex_grow()
                     .min_w_16()
                     .when(state.droppable, |this| {
                         let view = cx.entity();

crates/ui/src/history.rs

@@ -1,8 +1,6 @@
 use std::fmt::Debug;
 use std::time::{Duration, Instant};
 
-/// A HistoryItem represents a single change in the history.
-/// It must implement Clone and PartialEq to be used in the History.
 pub trait HistoryItem: Clone + PartialEq {
     fn version(&self) -> usize;
     fn set_version(&mut self, version: usize);
@@ -24,11 +22,10 @@ pub struct History<I: HistoryItem> {
     redos: Vec<I>,
     last_changed_at: Instant,
     version: usize,
-    pub(crate) ignore: bool,
+    max_undo: usize,
-    max_undos: usize,
     group_interval: Option<Duration>,
-    grouping: bool,
     unique: bool,
+    pub ignore: bool,
 }
 
 impl<I> History<I>
@@ -42,16 +39,15 @@ where
             ignore: false,
             last_changed_at: Instant::now(),
             version: 0,
-            max_undos: 1000,
+            max_undo: 1000,
             group_interval: None,
-            grouping: false,
             unique: false,
         }
     }
 
     /// Set the maximum number of undo steps to keep, defaults to 1000.
-    pub fn max_undos(mut self, max_undos: usize) -> Self {
+    pub fn max_undo(mut self, max_undo: usize) -> Self {
-        self.max_undos = max_undos;
+        self.max_undo = max_undo;
         self
     }
 
@@ -68,20 +64,10 @@ where
         self
     }
 
-    /// Start grouping changes, this will prevent the version from being incremented until `end_grouping` is called.
-    pub fn start_grouping(&mut self) {
-        self.grouping = true;
-    }
-
-    /// End grouping changes, this will allow the version to be incremented again.
-    pub fn end_grouping(&mut self) {
-        self.grouping = false;
-    }
-
     /// Increment the version number if the last change was made more than `GROUP_INTERVAL` milliseconds ago.
     fn inc_version(&mut self) -> usize {
         let t = Instant::now();
-        if !self.grouping && Some(self.last_changed_at.elapsed()) > self.group_interval {
+        if Some(self.last_changed_at.elapsed()) > self.group_interval {
             self.version += 1;
         }
 
@@ -94,11 +80,10 @@ where
         self.version
     }
 
-    /// Push a new change to the history.
     pub fn push(&mut self, item: I) {
         let version = self.inc_version();
 
-        if self.undos.len() >= self.max_undos {
+        if self.undos.len() >= self.max_undo {
             self.undos.remove(0);
         }
 
@@ -128,7 +113,6 @@ where
         self.redos.clear();
     }
 
-    /// Undo the last change and return the changes that were undone.
     pub fn undo(&mut self) -> Option<Vec<I>> {
         if let Some(first_change) = self.undos.pop() {
             let mut changes = vec![first_change.clone()];
@@ -151,7 +135,6 @@ where
         }
     }
 
-    /// Redo the last undone change and return the changes that were redone.
     pub fn redo(&mut self) -> Option<Vec<I>> {
         if let Some(first_change) = self.redos.pop() {
             let mut changes = vec![first_change.clone()];

crates/ui/src/input/blink_cursor.rs

@@ -1,14 +1,9 @@
 use std::time::Duration;
 
-use gpui::{Context, Pixels, Task, px};
+use gpui::{px, Context, Pixels};
 
 static INTERVAL: Duration = Duration::from_millis(500);
 static PAUSE_DELAY: Duration = Duration::from_millis(300);
-
-// On Windows, Linux, we should use integer to avoid blurry cursor.
-#[cfg(not(target_os = "macos"))]
-pub(super) const CURSOR_WIDTH: Pixels = px(2.);
-#[cfg(target_os = "macos")]
 pub(super) const CURSOR_WIDTH: Pixels = px(1.5);
 
 /// To manage the Input cursor blinking.
@@ -17,12 +12,10 @@ pub(super) const CURSOR_WIDTH: Pixels = px(1.5);
 /// Every loop will notify the view to update the `visible`, and Input will observe this update to touch repaint.
 ///
 /// The input painter will check if this in visible state, then it will draw the cursor.
-pub(crate) struct BlinkCursor {
+pub struct BlinkCursor {
     visible: bool,
     paused: bool,
     epoch: usize,
-
-    _task: Task<()>,
 }
 
 impl BlinkCursor {
@@ -31,7 +24,6 @@ impl BlinkCursor {
             visible: false,
             paused: false,
             epoch: 0,
-            _task: Task::ready(()),
         }
     }
 
@@ -61,12 +53,14 @@ impl BlinkCursor {
 
         // Schedule the next blink
         let epoch = self.next_epoch();
-        self._task = cx.spawn(async move |this, cx| {
+        cx.spawn(async move |this, cx| {
             cx.background_executor().timer(INTERVAL).await;
+
             if let Some(this) = this.upgrade() {
                 this.update(cx, |this, cx| this.blink(epoch, cx));
             }
-        });
+        })
+        .detach();
     }
 
     pub fn visible(&self) -> bool {
@@ -82,7 +76,7 @@ impl BlinkCursor {
 
         // delay 500ms to start the blinking
         let epoch = self.next_epoch();
-        self._task = cx.spawn(async move |this, cx| {
+        cx.spawn(async move |this, cx| {
             cx.background_executor().timer(PAUSE_DELAY).await;
 
             if let Some(this) = this.upgrade() {
@@ -91,6 +85,13 @@ impl BlinkCursor {
                     this.blink(epoch, cx);
                 });
             }
-        });
+        })
+        .detach();
+    }
+}
+
+impl Default for BlinkCursor {
+    fn default() -> Self {
+        Self::new()
     }
 }

crates/ui/src/input/change.rs

@@ -1,6 +1,7 @@
 use std::fmt::Debug;
 
-use crate::{history::HistoryItem, input::Selection};
+use crate::history::HistoryItem;
+use crate::input::cursor::Selection;
 
 #[derive(Debug, PartialEq, Clone)]
 pub struct Change {

crates/ui/src/input/clear_button.rs

@@ -1,15 +1,15 @@
 use gpui::{App, Styled};
 use theme::ActiveTheme;
 
-use crate::button::{Button, ButtonVariants as _};
+use crate::button::{Button, ButtonVariants};
-use crate::{Icon, IconName, Sizable as _};
+use crate::{Icon, IconName, Sizable};
 
 #[inline]
 pub(crate) fn clear_button(cx: &App) -> Button {
     Button::new("clean")
         .icon(Icon::new(IconName::CloseCircle))
-        .ghost()
+        .tooltip("Clear")
-        .xsmall()
+        .small()
-        .tab_stop(false)
+        .transparent()
-        .text_color(cx.theme().icon_muted)
+        .text_color(cx.theme().text_muted)
 }

crates/ui/src/input/cursor.rs

@@ -1,4 +1,4 @@
-use std::ops::{Range, RangeBounds};
+use std::ops::Range;
 
 /// A selection in the text, represented by start and end byte indices.
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Default)]
@@ -42,12 +42,5 @@ impl From<Selection> for Range<usize> {
         value.start..value.end
     }
 }
-impl RangeBounds<usize> for Selection {
-    fn start_bound(&self) -> std::ops::Bound<&usize> {
-        std::ops::Bound::Included(&self.start)
-    }
 
-    fn end_bound(&self) -> std::ops::Bound<&usize> {
+pub type Position = lsp_types::Position;
-        std::ops::Bound::Excluded(&self.end)
-    }
-}

crates/ui/src/input/display_map/display_map.rs

@@ -1,336 +0,0 @@
-/// DisplayMap: Public facade for Editor/Input display mapping.
-///
-/// This combines WrapMap and FoldMap to provide a unified API:
-/// - BufferPoint ↔ DisplayPoint conversion
-/// - Fold management (candidates, toggle, query)
-/// - Automatic projection updates on text/layout changes
-use std::ops::Range;
-
-use gpui::{App, Font, Pixels};
-use ropey::Rope;
-
-use super::fold_map::FoldMap;
-use super::folding::FoldRange;
-use super::text_wrapper::{LineItem, WrapDisplayPoint};
-use super::wrap_map::WrapMap;
-use super::{BufferPoint, DisplayPoint};
-use crate::input::display_map::WrapPoint;
-use crate::input::rope_ext::RopeExt as _;
-use crate::input::Point as TreeSitterPoint;
-
-/// DisplayMap is the main interface for Editor/Input coordinate mapping.
-///
-/// It manages the two-layer projection:
-/// 1. Buffer → Wrap (soft-wrapping)
-/// 2. Wrap → Display (folding)
-///
-/// Editor/Input only needs to work with BufferPoint and DisplayPoint.
-pub struct DisplayMap {
-    wrap_map: WrapMap,
-    fold_map: FoldMap,
-}
-
-impl DisplayMap {
-    pub fn new(font: Font, font_size: Pixels, wrap_width: Option<Pixels>) -> Self {
-        Self {
-            wrap_map: WrapMap::new(font, font_size, wrap_width),
-            fold_map: FoldMap::new(),
-        }
-    }
-
-    // ==================== Core Coordinate Mapping ====================
-
-    /// Convert buffer position to display position
-    pub fn buffer_pos_to_display_pos(&self, pos: BufferPoint) -> DisplayPoint {
-        // Buffer → Wrap
-        let wrap_pos = self.wrap_map.buffer_pos_to_wrap_pos(pos);
-
-        // Wrap → Display
-        if let Some(display_row) = self.fold_map.wrap_row_to_display_row(wrap_pos.row) {
-            DisplayPoint::new(display_row, wrap_pos.col)
-        } else {
-            // Cursor is in a folded region, find nearest visible row
-            let display_row = self.fold_map.nearest_visible_display_row(wrap_pos.row);
-            DisplayPoint::new(display_row, 0) // Column 0 at fold boundary
-        }
-    }
-
-    /// Convert display position to buffer position
-    pub fn display_pos_to_buffer_pos(&self, pos: DisplayPoint) -> BufferPoint {
-        // Display → Wrap
-        let wrap_row = self.fold_map.display_row_to_wrap_row(pos.row).unwrap_or(0);
-
-        // Wrap → Buffer
-        let wrap_pos = WrapPoint::new(wrap_row, pos.col);
-        self.wrap_map.wrap_pos_to_buffer_pos(wrap_pos)
-    }
-
-    /// Get total number of visible display rows
-    #[inline]
-    pub fn display_row_count(&self) -> usize {
-        self.fold_map.display_row_count()
-    }
-
-    /// Get the buffer line for a given display row
-    pub fn display_row_to_buffer_line(&self, display_row: usize) -> usize {
-        // Display → Wrap
-        let wrap_row = self
-            .fold_map
-            .display_row_to_wrap_row(display_row)
-            .unwrap_or(0);
-
-        // Wrap → Buffer line
-        self.wrap_map.wrap_row_to_buffer_line(wrap_row)
-    }
-
-    /// Get the display row range for a buffer line: [start, end)
-    /// Returns None if the buffer line is completely hidden
-    pub fn buffer_line_to_display_row_range(&self, line: usize) -> Option<Range<usize>> {
-        // Buffer line → Wrap row range
-        let wrap_row_range = self.wrap_map.buffer_line_to_wrap_row_range(line);
-
-        // Find first and last visible display rows in this range
-        let mut first_display_row = None;
-        let mut last_display_row = None;
-
-        for wrap_row in wrap_row_range {
-            if let Some(display_row) = self.fold_map.wrap_row_to_display_row(wrap_row) {
-                if first_display_row.is_none() {
-                    first_display_row = Some(display_row);
-                }
-                last_display_row = Some(display_row);
-            }
-        }
-
-        if let (Some(start), Some(end)) = (first_display_row, last_display_row) {
-            Some(start..end + 1)
-        } else {
-            None // Completely folded
-        }
-    }
-
-    /// Check if a buffer line is completely hidden
-    #[inline]
-    pub fn is_buffer_line_hidden(&self, line: usize) -> bool {
-        self.buffer_line_to_display_row_range(line).is_none()
-    }
-
-    /// Set fold candidates (from tree-sitter/LSP)
-    pub fn set_fold_candidates(&mut self, candidates: Vec<FoldRange>) {
-        self.fold_map.set_candidates(candidates);
-        self.rebuild_fold_projection();
-    }
-
-    /// Set a fold at the given start_line (must be in candidates)
-    pub fn set_folded(&mut self, start_line: usize, folded: bool) {
-        self.fold_map.set_folded(start_line, folded);
-        self.rebuild_fold_projection();
-    }
-
-    /// Toggle fold at the given start_line
-    pub fn toggle_fold(&mut self, start_line: usize) {
-        self.fold_map.toggle_fold(start_line);
-        self.rebuild_fold_projection();
-    }
-
-    /// Check if a line is currently folded
-    #[inline]
-    pub fn is_folded_at(&self, start_line: usize) -> bool {
-        self.fold_map.is_folded_at(start_line)
-    }
-
-    /// Check if a line is a fold candidate
-    #[inline]
-    pub fn is_fold_candidate(&self, start_line: usize) -> bool {
-        self.fold_map.is_fold_candidate(start_line)
-    }
-
-    /// Get all currently folded ranges
-    #[inline]
-    pub fn folded_ranges(&self) -> &[FoldRange] {
-        self.fold_map.folded_ranges()
-    }
-
-    /// Clear all folds
-    pub fn clear_folds(&mut self) {
-        self.fold_map.clear_folds();
-        self.rebuild_fold_projection();
-    }
-
-    // ==================== Text and Layout Updates ====================
-
-    /// Adjust folds and candidates for a text edit before updating the wrap map.
-    ///
-    /// Must be called with the OLD text (before replacement) and the edit range/new_text
-    /// so we can compute which old lines were affected.
-    pub fn adjust_folds_for_edit(&mut self, old_text: &Rope, range: &Range<usize>, new_text: &str) {
-        if self.fold_map.folded_ranges().is_empty() && self.fold_map.fold_candidates().is_empty() {
-            return;
-        }
-
-        let edit_start_line = old_text.offset_to_point(range.start).row;
-        let edit_end_line = old_text.offset_to_point(range.end.min(old_text.len())).row;
-
-        let old_lines_in_range = edit_end_line.saturating_sub(edit_start_line);
-        let new_lines_in_range = new_text.chars().filter(|c| *c == '\n').count();
-        let line_delta = new_lines_in_range as isize - old_lines_in_range as isize;
-
-        self.fold_map
-            .adjust_folds_for_edit(edit_start_line, edit_end_line, line_delta);
-    }
-
-    /// Incrementally update fold candidates after a text edit.
-    ///
-    /// Extracts new fold candidates only within the edited byte range
-    /// and merges them with existing (already adjusted) candidates.
-    pub fn update_fold_candidates_for_edit(
-        &mut self,
-        tree: &super::folding::Tree,
-        edit_byte_range: Range<usize>,
-        new_text: &Rope,
-    ) {
-        let new_start_line = new_text.offset_to_point(edit_byte_range.start).row;
-        let new_end_line = new_text
-            .offset_to_point(edit_byte_range.end.min(new_text.len()))
-            .row;
-
-        let new_candidates = super::folding::extract_fold_ranges_in_range(tree, edit_byte_range);
-        self.fold_map
-            .merge_candidates_for_edit(new_start_line, new_end_line, new_candidates);
-    }
-
-    /// Update text (incremental or full)
-    pub fn on_text_changed(
-        &mut self,
-        changed_text: &Rope,
-        range: &Range<usize>,
-        new_text: &Rope,
-        cx: &mut App,
-    ) {
-        self.wrap_map
-            .on_text_changed(changed_text, range, new_text, cx);
-        self.rebuild_fold_projection();
-    }
-
-    /// Update layout parameters (wrap width or font)
-    pub fn on_layout_changed(&mut self, wrap_width: Option<Pixels>, cx: &mut App) {
-        self.wrap_map.on_layout_changed(wrap_width, cx);
-        self.rebuild_fold_projection();
-    }
-
-    /// Set font parameters
-    pub fn set_font(&mut self, font: Font, font_size: Pixels, cx: &mut App) {
-        self.wrap_map.set_font(font, font_size, cx);
-        self.rebuild_fold_projection();
-    }
-
-    /// Ensure text is prepared (initializes wrapper if needed)
-    pub fn ensure_text_prepared(&mut self, text: &Rope, cx: &mut App) {
-        let did_initialize = self.wrap_map.ensure_text_prepared(text, cx);
-        if did_initialize {
-            self.rebuild_fold_projection();
-        }
-    }
-
-    /// Initialize with text
-    pub fn set_text(&mut self, text: &Rope, cx: &mut App) {
-        self.wrap_map.set_text(text, cx);
-        self.rebuild_fold_projection();
-    }
-
-    // ==================== Internal Helpers ====================
-
-    /// Rebuild fold projection after wrap_map or fold state changes
-    /// Only rebuilds if there are actually folded ranges
-    fn rebuild_fold_projection(&mut self) {
-        if !self.fold_map.folded_ranges().is_empty() {
-            self.fold_map.rebuild(&self.wrap_map);
-        } else {
-            // No active folds: identity mapping (wrap_row == display_row).
-            // Just update cached count so query methods work without Vec allocation.
-            self.fold_map
-                .mark_dirty_with_wrap_count(self.wrap_map.wrap_row_count());
-        }
-    }
-
-    // ==================== Wrap Display Point Operations ====================
-
-    /// Convert byte offset to wrap display point (with soft wrap info).
-    #[inline]
-    pub(crate) fn offset_to_wrap_display_point(&self, offset: usize) -> WrapDisplayPoint {
-        self.wrap_map.wrapper().offset_to_display_point(offset)
-    }
-
-    /// Convert wrap display point to byte offset.
-    #[inline]
-    pub(crate) fn wrap_display_point_to_offset(&self, point: WrapDisplayPoint) -> usize {
-        self.wrap_map.wrapper().display_point_to_offset(point)
-    }
-
-    /// Convert wrap display point to TreeSitterPoint (buffer line/col).
-    #[inline]
-    pub(crate) fn wrap_display_point_to_point(
-        &self,
-        point: WrapDisplayPoint,
-    ) -> TreeSitterPoint {
-        self.wrap_map.wrapper().display_point_to_point(point)
-    }
-
-    /// Convert a wrap row to a display row (skipping folded rows).
-    /// Returns None if the wrap row is folded.
-    #[inline]
-    pub fn wrap_row_to_display_row(&self, wrap_row: usize) -> Option<usize> {
-        self.fold_map.wrap_row_to_display_row(wrap_row)
-    }
-
-    /// Find the nearest visible display row for a given wrap row.
-    #[inline]
-    pub fn nearest_visible_display_row(&self, wrap_row: usize) -> usize {
-        self.fold_map.nearest_visible_display_row(wrap_row)
-    }
-
-    /// Convert a display row to a wrap row.
-    #[inline]
-    pub fn display_row_to_wrap_row(&self, display_row: usize) -> Option<usize> {
-        self.fold_map.display_row_to_wrap_row(display_row)
-    }
-
-    /// Get the longest row index (by byte length).
-    #[inline]
-    pub(crate) fn longest_row(&self) -> usize {
-        self.wrap_map.wrapper().longest_row.row
-    }
-
-    // ==================== Access Methods ====================
-
-    /// Get access to line items (for rendering)
-    #[inline]
-    pub(crate) fn lines(&self) -> &[LineItem] {
-        self.wrap_map.lines()
-    }
-
-    /// Get the rope text
-    #[inline]
-    pub fn text(&self) -> &Rope {
-        self.wrap_map.text()
-    }
-
-    /// Calculate how many wrap rows of a buffer line are visible (not folded)
-    #[inline]
-    pub fn visible_wrap_row_count_for_buffer_line(&self, line: usize) -> usize {
-        self.wrap_map
-            .visible_wrap_row_count_for_line(line, &self.fold_map)
-    }
-
-    /// Get the wrap row count (before folding)
-    #[inline]
-    pub fn wrap_row_count(&self) -> usize {
-        self.wrap_map.wrap_row_count()
-    }
-
-    /// Get the buffer line count (logical lines)
-    #[inline]
-    pub fn buffer_line_count(&self) -> usize {
-        self.wrap_map.buffer_line_count()
-    }
-}

crates/ui/src/input/display_map/fold_map.rs

@@ -1,343 +0,0 @@
-/// FoldMap: Folding projection layer (Wrap rows → Display rows).
-///
-/// This module manages code folding by:
-/// - Filtering out wrap rows that belong to folded regions
-/// - Maintaining bidirectional mapping: wrap_row ↔ display_row
-/// - Handling fold state changes and rebuilding the projection
-use super::folding::FoldRange;
-use super::wrap_map::WrapMap;
-
-/// FoldMap projects wrap rows to display rows by hiding folded regions.
-pub struct FoldMap {
-    /// Mapping: display_row → wrap_row
-    /// index = display_row, value = actual wrap_row
-    visible_wrap_rows: Vec<usize>,
-
-    /// Reverse mapping: wrap_row → display_row
-    /// index = wrap_row, value = Some(display_row) if visible, None if folded
-    wrap_row_to_display_row: Vec<Option<usize>>,
-
-    /// Candidate fold ranges (from tree-sitter/LSP)
-    /// Sorted by start_line, unique start_line
-    candidates: Vec<FoldRange>,
-
-    /// Currently folded ranges
-    /// Subset of candidates, sorted by start_line
-    folded: Vec<FoldRange>,
-
-    /// Flag indicating if the fold projection needs rebuilding
-    /// Used for lazy evaluation to avoid expensive rebuilds on every text change
-    needs_rebuild: bool,
-
-    /// Cached wrap_row_count from last rebuild
-    /// Used to detect if WrapMap changed and rebuild is needed
-    cached_wrap_row_count: usize,
-}
-
-impl FoldMap {
-    pub fn new() -> Self {
-        Self {
-            visible_wrap_rows: Vec::new(),
-            wrap_row_to_display_row: Vec::new(),
-            candidates: Vec::new(),
-            folded: Vec::new(),
-            needs_rebuild: true,
-            cached_wrap_row_count: 0,
-        }
-    }
-
-    /// Update cached wrap_row_count without full rebuild.
-    /// Used when no folds are active (identity mapping assumed).
-    pub(super) fn mark_dirty_with_wrap_count(&mut self, wrap_row_count: usize) {
-        self.needs_rebuild = true;
-        self.cached_wrap_row_count = wrap_row_count;
-    }
-
-    /// Get total number of visible display rows
-    pub fn display_row_count(&self) -> usize {
-        if self.folded.is_empty() {
-            return self.cached_wrap_row_count;
-        }
-        self.visible_wrap_rows.len()
-    }
-
-    /// Convert wrap_row to display_row
-    /// Returns None if the wrap_row is hidden by folding
-    pub fn wrap_row_to_display_row(&self, wrap_row: usize) -> Option<usize> {
-        if self.folded.is_empty() {
-            return if wrap_row < self.cached_wrap_row_count {
-                Some(wrap_row)
-            } else {
-                None
-            };
-        }
-        self.wrap_row_to_display_row
-            .get(wrap_row)
-            .copied()
-            .flatten()
-    }
-
-    /// Convert display_row to wrap_row
-    pub fn display_row_to_wrap_row(&self, display_row: usize) -> Option<usize> {
-        if self.folded.is_empty() {
-            return if display_row < self.cached_wrap_row_count {
-                Some(display_row)
-            } else {
-                None
-            };
-        }
-        self.visible_wrap_rows.get(display_row).copied()
-    }
-
-    /// Find the nearest visible display_row for a given wrap_row
-    pub fn nearest_visible_display_row(&self, wrap_row: usize) -> usize {
-        if self.folded.is_empty() {
-            return wrap_row.min(self.cached_wrap_row_count.saturating_sub(1));
-        }
-
-        if let Some(dr) = self.wrap_row_to_display_row(wrap_row) {
-            return dr;
-        }
-
-        match self.visible_wrap_rows.binary_search(&wrap_row) {
-            Ok(idx) => idx,
-            Err(insert_pos) => insert_pos.saturating_sub(1),
-        }
-    }
-
-    /// Set fold candidates (from tree-sitter/LSP), full replacement.
-    pub fn set_candidates(&mut self, mut candidates: Vec<FoldRange>) {
-        // Sort and deduplicate by start_line
-        candidates.sort_by_key(|r| r.start_line);
-        candidates.dedup_by_key(|r| r.start_line);
-        self.candidates = candidates;
-
-        // Remove any folded ranges that are no longer in candidates
-        self.folded.retain(|fold| {
-            self.candidates
-                .iter()
-                .any(|c| c.start_line == fold.start_line)
-        });
-    }
-
-    /// Merge new candidates extracted from an edited region into existing candidates.
-    ///
-    /// Replaces candidates within [edit_start_line, edit_end_line] with `new_candidates`,
-    /// keeping candidates outside the edit range intact.
-    pub fn merge_candidates_for_edit(
-        &mut self,
-        edit_start_line: usize,
-        edit_end_line: usize,
-        new_candidates: Vec<FoldRange>,
-    ) {
-        // Remove old candidates within the edit range (already done by adjust_folds_for_edit)
-        // But do it again in case adjust wasn't called or range differs
-        self.candidates
-            .retain(|c| c.start_line < edit_start_line || c.start_line > edit_end_line);
-
-        // Add new candidates
-        self.candidates.extend(new_candidates);
-        self.candidates.sort_by_key(|r| r.start_line);
-        self.candidates.dedup_by_key(|r| r.start_line);
-    }
-
-    /// Set a fold at the given start_line (must be in candidates)
-    pub fn set_folded(&mut self, start_line: usize, folded: bool) {
-        if folded {
-            // Find the candidate range for this start_line
-            if let Some(candidate) = self.candidates.iter().find(|c| c.start_line == start_line) {
-                // Add to folded if not already present
-                if !self.folded.iter().any(|f| f.start_line == start_line) {
-                    self.folded.push(*candidate);
-                    self.folded.sort_by_key(|r| r.start_line);
-                    self.needs_rebuild = true;
-                }
-            }
-        } else {
-            // Remove from folded
-            self.folded.retain(|f| f.start_line != start_line);
-            self.needs_rebuild = true;
-        }
-    }
-
-    /// Toggle fold at the given start_line
-    pub fn toggle_fold(&mut self, start_line: usize) {
-        let is_folded = self.is_folded_at(start_line);
-        self.set_folded(start_line, !is_folded);
-    }
-
-    /// Check if a line is currently folded
-    pub fn is_folded_at(&self, start_line: usize) -> bool {
-        self.folded.iter().any(|f| f.start_line == start_line)
-    }
-
-    /// Check if a line is a fold candidate
-    pub fn is_fold_candidate(&self, start_line: usize) -> bool {
-        self.candidates.iter().any(|c| c.start_line == start_line)
-    }
-
-    /// Get all fold candidates
-    #[inline]
-    pub fn fold_candidates(&self) -> &[FoldRange] {
-        &self.candidates
-    }
-
-    /// Get all currently folded ranges
-    #[inline]
-    pub fn folded_ranges(&self) -> &[FoldRange] {
-        &self.folded
-    }
-
-    /// Clear all folds
-    #[inline]
-    pub fn clear_folds(&mut self) {
-        self.folded.clear();
-    }
-
-    /// Adjust folds and candidates after a text edit.
-    ///
-    /// - Folds/candidates overlapping the edited line range are removed
-    /// - Folds/candidates after the edit are shifted by line_delta
-    ///
-    /// This avoids expensive full tree traversal on every keystroke.
-    pub fn adjust_folds_for_edit(
-        &mut self,
-        edit_start_line: usize,
-        edit_end_line: usize,
-        line_delta: isize,
-    ) {
-        // Adjust folded ranges
-        if !self.folded.is_empty() {
-            self.folded.retain(|fold| {
-                !(fold.start_line <= edit_end_line && fold.end_line >= edit_start_line)
-            });
-
-            if line_delta != 0 {
-                for fold in &mut self.folded {
-                    if fold.start_line > edit_end_line {
-                        fold.start_line = (fold.start_line as isize + line_delta).max(0) as usize;
-                        fold.end_line = (fold.end_line as isize + line_delta).max(0) as usize;
-                    }
-                }
-            }
-        }
-
-        // Adjust candidates the same way
-        if !self.candidates.is_empty() {
-            self.candidates
-                .retain(|c| !(c.start_line <= edit_end_line && c.end_line >= edit_start_line));
-
-            if line_delta != 0 {
-                for c in &mut self.candidates {
-                    if c.start_line > edit_end_line {
-                        c.start_line = (c.start_line as isize + line_delta).max(0) as usize;
-                        c.end_line = (c.end_line as isize + line_delta).max(0) as usize;
-                    }
-                }
-            }
-        }
-
-        self.needs_rebuild = true;
-    }
-
-    /// Rebuild the fold mapping after wrap_map or fold state changes
-    ///
-    /// This is the core algorithm that projects wrap rows to display rows.
-    pub fn rebuild(&mut self, wrap_map: &WrapMap) {
-        let wrap_row_count = wrap_map.wrap_row_count();
-
-        // Performance optimization: skip rebuild if nothing changed
-        if !self.needs_rebuild && wrap_row_count == self.cached_wrap_row_count {
-            return;
-        }
-
-        self.cached_wrap_row_count = wrap_row_count;
-
-        self.visible_wrap_rows.clear();
-        self.wrap_row_to_display_row = vec![None; wrap_row_count];
-
-        if self.folded.is_empty() {
-            // Fast path: no folds, all wrap rows are visible
-            self.visible_wrap_rows = (0..wrap_row_count).collect();
-            for (display_row, &wrap_row) in self.visible_wrap_rows.iter().enumerate() {
-                self.wrap_row_to_display_row[wrap_row] = Some(display_row);
-            }
-            self.needs_rebuild = false;
-            return;
-        }
-
-        // Build set of hidden wrap_row ranges from folded buffer lines
-        let mut hidden_ranges = Vec::new();
-        for fold in &self.folded {
-            // Hide wrap rows from (start_line + 1) to (end_line - 1) (inclusive)
-            // Both the first line and last line of the fold remain visible
-            let hide_start_line = fold.start_line + 1;
-            let hide_end_line = fold.end_line.saturating_sub(1);
-
-            if hide_start_line > hide_end_line {
-                continue; // No middle lines to hide (0 or 1 lines between start and end)
-            }
-
-            // Get wrap_row ranges for the hidden buffer lines
-            let start_wrap_row = wrap_map.buffer_line_to_first_wrap_row(hide_start_line);
-            let end_wrap_row = if hide_end_line + 1 < wrap_map.buffer_line_count() {
-                wrap_map.buffer_line_to_first_wrap_row(hide_end_line + 1)
-            } else {
-                wrap_row_count
-            };
-
-            if start_wrap_row < end_wrap_row {
-                hidden_ranges.push(start_wrap_row..end_wrap_row);
-            }
-        }
-
-        // Merge overlapping hidden ranges
-        hidden_ranges.sort_by_key(|r| r.start);
-        let mut merged_hidden = Vec::new();
-        for range in hidden_ranges {
-            if let Some(last) = merged_hidden.last_mut() {
-                if range.start <= *last {
-                    // Overlapping or adjacent, merge
-                    *last = (*last).max(range.end);
-                } else {
-                    merged_hidden.push(range.start);
-                    merged_hidden.push(range.end);
-                }
-            } else {
-                merged_hidden.push(range.start);
-                merged_hidden.push(range.end);
-            }
-        }
-
-        // Scan all wrap rows and filter out hidden ones
-        let mut display_row = 0;
-        let mut hidden_iter = merged_hidden.chunks_exact(2);
-        let mut current_hidden = hidden_iter.next();
-
-        for wrap_row in 0..wrap_row_count {
-            // Check if wrap_row is in current hidden range
-            let is_hidden = if let Some(&[start, end]) = current_hidden {
-                if wrap_row >= end {
-                    current_hidden = hidden_iter.next();
-                    if let Some(&[new_start, new_end]) = current_hidden {
-                        wrap_row >= new_start && wrap_row < new_end
-                    } else {
-                        false
-                    }
-                } else {
-                    wrap_row >= start && wrap_row < end
-                }
-            } else {
-                false
-            };
-
-            if !is_hidden {
-                self.visible_wrap_rows.push(wrap_row);
-                self.wrap_row_to_display_row[wrap_row] = Some(display_row);
-                display_row += 1;
-            }
-        }
-
-        self.needs_rebuild = false;
-    }
-}

crates/ui/src/input/display_map/folding.rs

@@ -1,96 +0,0 @@
-use std::ops::Range;
-
-#[cfg(not(target_family = "wasm"))]
-use tree_sitter::Node;
-#[cfg(not(target_family = "wasm"))]
-pub use tree_sitter::Tree;
-
-#[cfg(target_family = "wasm")]
-/// Stub type for tree-sitter Tree on WASM (tree-sitter not available).
-pub struct Tree;
-
-#[cfg(not(target_family = "wasm"))]
-/// Minimum line span for a node to be considered foldable.
-const MIN_FOLD_LINES: usize = 2;
-
-/// A fold range representing a foldable code region.
-///
-/// The fold range spans from start_line to end_line (inclusive).
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub struct FoldRange {
-    /// Start line (inclusive)
-    pub start_line: usize,
-    /// End line (inclusive)
-    pub end_line: usize,
-}
-
-impl FoldRange {
-    pub fn new(start_line: usize, end_line: usize) -> Self {
-        assert!(
-            start_line <= end_line,
-            "fold start_line must be <= end_line"
-        );
-        Self {
-            start_line,
-            end_line,
-        }
-    }
-}
-
-#[cfg(not(target_family = "wasm"))]
-/// Check if a named node qualifies as a fold candidate.
-///
-/// Uses a structural heuristic: any **named** node spanning ≥ MIN_FOLD_LINES
-/// is foldable. tree-sitter already parses code into semantic units (functions,
-/// classes, blocks, etc.), so named nodes naturally correspond to meaningful
-/// foldable regions across all languages without a per-language node-type list.
-fn is_foldable_node(node: &Node) -> bool {
-    let start = node.start_position().row;
-    let end = node.end_position().row;
-    end.saturating_sub(start) >= MIN_FOLD_LINES
-}
-
-#[cfg(not(target_family = "wasm"))]
-/// Extract fold ranges only within a byte range (for incremental updates after edits).
-///
-/// Skips subtrees entirely outside the range, making it O(nodes in range)
-/// instead of O(all nodes in tree).
-pub fn extract_fold_ranges_in_range(tree: &Tree, byte_range: Range<usize>) -> Vec<FoldRange> {
-    let mut ranges = Vec::new();
-    let root = tree.root_node();
-    let mut cursor = root.walk();
-    // Skip the root, it's not foldable. Use named_children to skip literal tokens.
-    for child in root.named_children(&mut cursor) {
-        collect_foldable_nodes_in_range(child, &byte_range, &mut ranges);
-    }
-
-    ranges.sort_by_key(|r| r.start_line);
-    ranges.dedup_by_key(|r| r.start_line);
-    ranges
-}
-
-#[cfg(not(target_family = "wasm"))]
-/// Recursively collect foldable nodes, skipping subtrees outside byte_range.
-fn collect_foldable_nodes_in_range(
-    node: Node,
-    byte_range: &Range<usize>,
-    ranges: &mut Vec<FoldRange>,
-) {
-    if node.end_byte() <= byte_range.start || node.start_byte() >= byte_range.end {
-        return;
-    }
-
-    if !is_foldable_node(&node) {
-        return;
-    }
-
-    ranges.push(FoldRange {
-        start_line: node.start_position().row,
-        end_line: node.end_position().row,
-    });
-
-    let mut cursor = node.walk();
-    for child in node.named_children(&mut cursor) {
-        collect_foldable_nodes_in_range(child, byte_range, ranges);
-    }
-}

crates/ui/src/input/display_map/mod.rs

@@ -1,61 +0,0 @@
-#[allow(clippy::module_inception)]
-mod display_map;
-mod fold_map;
-#[cfg(not(target_family = "wasm"))]
-mod folding;
-#[cfg(target_family = "wasm")]
-pub mod folding;
-mod text_wrapper;
-mod wrap_map;
-
-// Re-export public API
-// Re-export FoldRange and extract_fold_ranges
-pub use folding::FoldRange;
-
-pub use self::display_map::DisplayMap;
-pub(crate) use self::text_wrapper::LineLayout;
-
-/// Position in the buffer (logical text).
-///
-/// - `line`: 0-based logical line number (split by `\n`)
-/// - `col`: 0-based column offset (byte offset)
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub struct BufferPoint {
-    pub line: usize,
-    pub col: usize,
-}
-
-impl BufferPoint {
-    pub fn new(line: usize, col: usize) -> Self {
-        Self { line, col }
-    }
-}
-
-/// Position after soft-wrapping but before folding (internal).
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub(super) struct WrapPoint {
-    pub row: usize,
-    pub col: usize,
-}
-
-impl WrapPoint {
-    pub fn new(row: usize, col: usize) -> Self {
-        Self { row, col }
-    }
-}
-
-/// Final display position (after soft-wrapping and folding).
-///
-/// - `row`: 0-based display row (final visible row)
-/// - `col`: 0-based display column
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
-pub struct DisplayPoint {
-    pub row: usize,
-    pub col: usize,
-}
-
-impl DisplayPoint {
-    pub fn new(row: usize, col: usize) -> Self {
-        Self { row, col }
-    }
-}

crates/ui/src/input/display_map/text_wrapper.rs

@@ -1,582 +0,0 @@
-use std::ops::Range;
-
-use gpui::{
-    App, Font, Half, LineFragment, Pixels, Point, ShapedLine, Size, TextAlign, Window, point, px,
-    size,
-};
-use ropey::Rope;
-use smallvec::SmallVec;
-
-use crate::input::{LastLayout, Point as TreeSitterPoint, RopeExt, WhitespaceIndicators};
-
-/// A line with soft wrapped lines info.
-#[derive(Debug, Clone)]
-pub(crate) struct LineItem {
-    /// The original line text, without end `\n`.
-    line: Rope,
-    /// The soft wrapped lines relative byte range (0..line.len) of this line (Include first line).
-    ///
-    /// Not contains the line end `\n`.
-    pub(crate) wrapped_lines: Vec<Range<usize>>,
-}
-
-impl LineItem {
-    /// Get the bytes length of this line.
-    #[inline]
-    pub(crate) fn len(&self) -> usize {
-        self.line.len()
-    }
-
-    /// Get number of soft wrapped lines of this line (include the first line).
-    #[inline]
-    pub(crate) fn lines_len(&self) -> usize {
-        self.wrapped_lines.len()
-    }
-}
-
-#[derive(Debug, Default)]
-pub(crate) struct LongestRow {
-    /// The 0-based row index.
-    pub row: usize,
-    /// The bytes length of the longest line.
-    pub len: usize,
-}
-
-/// Used to prepare the text with soft wrap to be get lines to displayed in the Editor.
-///
-/// After use lines to calculate the scroll size of the Editor.
-pub(crate) struct TextWrapper {
-    text: Rope,
-    /// Total wrapped lines (Inlucde the first line), value is start and end index of the line.
-    soft_lines: usize,
-    font: Font,
-    font_size: Pixels,
-    /// If is none, it means the text is not wrapped
-    wrap_width: Option<Pixels>,
-    /// The longest (row, bytes len) in characters, used to calculate the horizontal scroll width.
-    pub(crate) longest_row: LongestRow,
-    /// The lines by split \n
-    pub(crate) lines: Vec<LineItem>,
-
-    _initialized: bool,
-}
-
-#[allow(unused)]
-impl TextWrapper {
-    pub(crate) fn new(font: Font, font_size: Pixels, wrap_width: Option<Pixels>) -> Self {
-        Self {
-            text: Rope::new(),
-            font,
-            font_size,
-            wrap_width,
-            soft_lines: 0,
-            longest_row: LongestRow::default(),
-            lines: Vec::new(),
-            _initialized: false,
-        }
-    }
-
-    #[inline]
-    pub(crate) fn set_default_text(&mut self, text: &Rope) {
-        self.text = text.clone();
-    }
-
-    /// Get reference to the rope text.
-    #[inline]
-    pub(crate) fn text(&self) -> &Rope {
-        &self.text
-    }
-
-    /// Get the total number of lines including wrapped lines.
-    #[inline]
-    pub(crate) fn len(&self) -> usize {
-        self.soft_lines
-    }
-
-    /// Get the line item by row index.
-    #[inline]
-    pub(crate) fn line(&self, row: usize) -> Option<&LineItem> {
-        self.lines.get(row)
-    }
-
-    pub(crate) fn set_wrap_width(&mut self, wrap_width: Option<Pixels>, cx: &mut App) {
-        if wrap_width == self.wrap_width {
-            return;
-        }
-
-        self.wrap_width = wrap_width;
-        self.update_all(&self.text.clone(), cx);
-    }
-
-    pub(crate) fn set_font(&mut self, font: Font, font_size: Pixels, cx: &mut App) {
-        if self.font.eq(&font) && self.font_size == font_size {
-            return;
-        }
-
-        self.font = font;
-        self.font_size = font_size;
-        self.update_all(&self.text.clone(), cx);
-    }
-
-    pub(crate) fn prepare_if_need(&mut self, text: &Rope, cx: &mut App) -> bool {
-        if self._initialized {
-            return false;
-        }
-        self._initialized = true;
-        self.update_all(text, cx);
-        true
-    }
-
-    /// Update the text wrapper and recalculate the wrapped lines.
-    ///
-    /// If the `text` is the same as the current text, do nothing.
-    ///
-    /// - `changed_text`: The text [`Rope`] that has changed.
-    /// - `range`: The `selected_range` before change.
-    /// - `new_text`: The inserted text.
-    /// - `force`: Whether to force the update, if false, the update will be skipped if the text is the same.
-    /// - `cx`: The application context.
-    pub(crate) fn update(
-        &mut self,
-        changed_text: &Rope,
-        range: &Range<usize>,
-        new_text: &Rope,
-        cx: &mut App,
-    ) {
-        let mut line_wrapper = cx
-            .text_system()
-            .line_wrapper(self.font.clone(), self.font_size);
-        self._update(
-            changed_text,
-            range,
-            new_text,
-            &mut |line_str, wrap_width| {
-                line_wrapper
-                    .wrap_line(&[LineFragment::text(line_str)], wrap_width)
-                    .collect()
-            },
-        );
-    }
-
-    fn _update<F>(
-        &mut self,
-        changed_text: &Rope,
-        range: &Range<usize>,
-        new_text: &Rope,
-        wrap_line: &mut F,
-    ) where
-        F: FnMut(&str, Pixels) -> Vec<gpui::Boundary>,
-    {
-        // Remove the old changed lines.
-        let start_row = self.text.offset_to_point(range.start).row;
-        let start_row = start_row.min(self.lines.len().saturating_sub(1));
-        let end_row = self.text.offset_to_point(range.end).row;
-        let end_row = end_row.min(self.lines.len().saturating_sub(1));
-        let rows_range = start_row..=end_row;
-
-        if rows_range.contains(&self.longest_row.row) {
-            self.longest_row = LongestRow::default();
-        }
-
-        let mut longest_row_ix = self.longest_row.row;
-        let mut longest_row_len = self.longest_row.len;
-
-        // To add the new lines.
-        let new_start_row = changed_text.offset_to_point(range.start).row;
-        let new_start_offset = changed_text.line_start_offset(new_start_row);
-        let new_end_row = changed_text
-            .offset_to_point(range.start + new_text.len())
-            .row;
-        let new_end_offset = changed_text.line_end_offset(new_end_row);
-        let new_range = new_start_offset..new_end_offset;
-
-        let mut new_lines = vec![];
-        let wrap_width = self.wrap_width;
-
-        // line not contains `\n`.
-        for (ix, line) in Rope::from(changed_text.slice(new_range))
-            .iter_lines()
-            .enumerate()
-        {
-            let line_str = line.to_string();
-            let mut wrapped_lines = vec![];
-            let mut prev_boundary_ix = 0;
-
-            if line_str.len() > longest_row_len {
-                longest_row_ix = new_start_row + ix;
-                longest_row_len = line_str.len();
-            }
-
-            // If wrap_width is Pixels::MAX, skip wrapping to disable word wrap
-            if let Some(wrap_width) = wrap_width {
-                // Here only have wrapped line, if there is no wrap meet, the `line_wraps` result will empty.
-                for boundary in wrap_line(&line_str, wrap_width) {
-                    wrapped_lines.push(prev_boundary_ix..boundary.ix);
-                    prev_boundary_ix = boundary.ix;
-                }
-            }
-
-            // Reset of the line
-            if !line_str[prev_boundary_ix..].is_empty() || prev_boundary_ix == 0 {
-                wrapped_lines.push(prev_boundary_ix..line.len());
-            }
-
-            new_lines.push(LineItem {
-                line: Rope::from(line),
-                wrapped_lines,
-            });
-        }
-
-        if self.lines.is_empty() {
-            self.lines = new_lines;
-        } else {
-            self.lines.splice(rows_range, new_lines);
-        }
-
-        self.text = changed_text.clone();
-        self.soft_lines = self.lines.iter().map(|l| l.lines_len()).sum();
-        self.longest_row = LongestRow {
-            row: longest_row_ix,
-            len: longest_row_len,
-        }
-    }
-
-    /// Update the text wrapper and recalculate the wrapped lines.
-    ///
-    /// If the `text` is the same as the current text, do nothing.
-    fn update_all(&mut self, text: &Rope, cx: &mut App) {
-        self.update(text, &(0..text.len()), text, cx);
-    }
-
-    /// Return display point (with soft wrap) from the given byte offset in the text.
-    ///
-    /// Panics if the `offset` is out of bounds.
-    pub(crate) fn offset_to_display_point(&self, offset: usize) -> WrapDisplayPoint {
-        let row = self.text.offset_to_point(offset).row;
-        let start = self.text.line_start_offset(row);
-        let line = &self.lines[row];
-
-        let mut wrapped_row = self
-            .lines
-            .iter()
-            .take(row)
-            .map(|l| l.lines_len())
-            .sum::<usize>();
-
-        let local_offset = offset.saturating_sub(start);
-        for (ix, range) in line.wrapped_lines.iter().enumerate() {
-            if range.contains(&local_offset) {
-                return WrapDisplayPoint::new(
-                    wrapped_row + ix,
-                    ix,
-                    local_offset.saturating_sub(range.start),
-                );
-            }
-        }
-
-        // Otherwise return the eof of the line.
-        let last_range = line.wrapped_lines.last().unwrap_or(&(0..0));
-        let ix = line.lines_len().saturating_sub(1);
-
-        WrapDisplayPoint::new(wrapped_row + ix, ix, last_range.len())
-    }
-
-    /// Return byte offset in the text from the given display point (with soft wrap).
-    ///
-    /// Panics if the `point.row` is out of bounds.
-    pub(crate) fn display_point_to_offset(&self, point: WrapDisplayPoint) -> usize {
-        let mut wrapped_row = 0;
-        for (row, line) in self.lines.iter().enumerate() {
-            if wrapped_row + line.lines_len() > point.row {
-                let line_start = self.text.line_start_offset(row);
-                let local_row = point.row.saturating_sub(wrapped_row);
-                if let Some(range) = line.wrapped_lines.get(local_row) {
-                    return line_start + (range.start + point.column).min(range.end);
-                } else {
-                    // If not found, return the end of the line.
-                    return line_start + line.len();
-                }
-            }
-
-            wrapped_row += line.lines_len();
-        }
-
-        self.text.len()
-    }
-
-    pub(crate) fn display_point_to_point(&self, point: WrapDisplayPoint) -> TreeSitterPoint {
-        let offset = self.display_point_to_offset(point);
-        self.text.offset_to_point(offset)
-    }
-
-    pub(crate) fn point_to_display_point(&self, point: TreeSitterPoint) -> WrapDisplayPoint {
-        let offset = self.text.point_to_offset(point);
-        self.offset_to_display_point(offset)
-    }
-}
-
-/// A display point within the soft-wrapped text.
-///
-/// This represents a position in the text after soft-wrapping,
-/// with an additional `local_row` field tracking the wrap line
-/// within the original buffer line.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub(crate) struct WrapDisplayPoint {
-    /// The 0-based soft wrapped row index in the text.
-    pub row: usize,
-    /// The 0-based row index in local line (include first line).
-    ///
-    /// This value only valid when return from [`TextWrapper::offset_to_display_point`], otherwise it will be ignored.
-    pub local_row: usize,
-    /// The 0-based column byte index in the display line (with soft wrap).
-    pub column: usize,
-}
-
-impl WrapDisplayPoint {
-    pub fn new(row: usize, local_row: usize, column: usize) -> Self {
-        Self {
-            row,
-            local_row,
-            column,
-        }
-    }
-}
-
-/// The layout info of a line with soft wrapped lines.
-pub(crate) struct LineLayout {
-    /// Total bytes length of this line.
-    len: usize,
-    /// The soft wrapped lines of this line (Include the first line).
-    pub(crate) wrapped_lines: SmallVec<[ShapedLine; 1]>,
-    pub(crate) longest_width: Pixels,
-    pub(crate) whitespace_indicators: Option<WhitespaceIndicators>,
-    /// Whitespace indicators: (line_index, x_position, is_tab)
-    pub(crate) whitespace_chars: Vec<(usize, Pixels, bool)>,
-}
-
-impl LineLayout {
-    pub(crate) fn new() -> Self {
-        Self {
-            len: 0,
-            longest_width: px(0.),
-            wrapped_lines: SmallVec::new(),
-            whitespace_chars: Vec::new(),
-            whitespace_indicators: None,
-        }
-    }
-
-    pub(crate) fn lines(mut self, wrapped_lines: SmallVec<[ShapedLine; 1]>) -> Self {
-        self.set_wrapped_lines(wrapped_lines);
-        self
-    }
-
-    pub(crate) fn set_wrapped_lines(&mut self, wrapped_lines: SmallVec<[ShapedLine; 1]>) {
-        self.len = wrapped_lines.iter().map(|l| l.len).sum();
-        let width = wrapped_lines
-            .iter()
-            .map(|l| l.width)
-            .max()
-            .unwrap_or_default();
-        self.longest_width = width;
-        self.wrapped_lines = wrapped_lines;
-    }
-
-    pub(crate) fn with_whitespaces(mut self, indicators: Option<WhitespaceIndicators>) -> Self {
-        self.whitespace_indicators = indicators;
-        let Some(indicators) = self.whitespace_indicators.as_ref() else {
-            return self;
-        };
-
-        let space_indicator_offset = indicators.space.width.half();
-
-        for (line_index, wrapped_line) in self.wrapped_lines.iter().enumerate() {
-            for (relative_offset, c) in wrapped_line.text.char_indices() {
-                if matches!(c, ' ' | '\t') {
-                    let is_tab = c == '\t';
-                    let start_x = wrapped_line.x_for_index(relative_offset);
-                    let end_x = wrapped_line.x_for_index(relative_offset + c.len_utf8());
-                    // Center the indicator in the actual character's space
-                    let x_position = if c == ' ' {
-                        (start_x + end_x).half() - space_indicator_offset
-                    } else {
-                        start_x
-                    };
-
-                    self.whitespace_chars.push((line_index, x_position, is_tab));
-                }
-            }
-        }
-        self
-    }
-
-    #[inline]
-    pub(crate) fn len(&self) -> usize {
-        self.len
-    }
-
-    /// Get the position (x, y) for the given index in this line layout.
-    ///
-    /// - The `offset` is a local byte index in this line layout.
-    /// - When `line_end_affinity` is true, an offset at a soft wrap boundary is placed at
-    ///   the end of the current visual line rather than the start of the next one.
-    /// - The return value is relative to the top-left corner of this line layout, start from (0, 0)
-    pub(crate) fn position_for_index(
-        &self,
-        offset: usize,
-        last_layout: &LastLayout,
-        line_end_affinity: bool,
-    ) -> Option<Point<Pixels>> {
-        let mut acc_len = 0;
-        let mut offset_y = px(0.);
-
-        let x_offset = last_layout.alignment_offset(self.longest_width);
-
-        for (i, line) in self.wrapped_lines.iter().enumerate() {
-            let is_last = i + 1 == self.wrapped_lines.len();
-
-            let matches = if line.len == 0 {
-                // Empty visual lines still own their boundary offset.
-                offset == acc_len
-            } else if is_last || line_end_affinity {
-                // Inclusive: cursor can sit at end of this visual line.
-                offset >= acc_len && offset <= acc_len + line.len
-            } else {
-                // Exclusive: boundary offset belongs to the next visual line.
-                offset >= acc_len && offset < acc_len + line.len
-            };
-
-            if matches {
-                let x = line.x_for_index(offset.saturating_sub(acc_len)) + x_offset;
-                return Some(point(x, offset_y));
-            }
-
-            // Always advance by actual line length. The last line gets +1 so the
-            // cursor can be placed after the final character.
-            acc_len += if is_last { line.len + 1 } else { line.len };
-            offset_y += last_layout.line_height;
-        }
-
-        None
-    }
-
-    /// Get the closest index for the given x in this line layout.
-    pub(crate) fn closest_index_for_x(&self, x: Pixels, last_layout: &LastLayout) -> usize {
-        let mut acc_len = 0;
-        let x_offset = last_layout.alignment_offset(self.longest_width);
-        let x = x - x_offset;
-
-        for (i, line) in self.wrapped_lines.iter().enumerate() {
-            let is_last = i + 1 == self.wrapped_lines.len();
-            if x <= line.width {
-                let mut ix = line.closest_index_for_x(x);
-                if !is_last && ix == line.text.len() {
-                    // For soft wrap line, we can't put the cursor at the end of the line.
-                    let c_len = line.text.chars().last().map(|c| c.len_utf8()).unwrap_or(0);
-                    ix = ix.saturating_sub(c_len);
-                }
-
-                return acc_len + ix;
-            }
-            acc_len += line.text.len();
-        }
-
-        acc_len
-    }
-
-    /// Get the index for the given position (x, y) in this line layout.
-    ///
-    /// The `pos` is relative to the top-left corner of this line layout, start from (0, 0)
-    /// The return value is a local byte index in this line layout, start from 0.
-    pub(crate) fn closest_index_for_position(
-        &self,
-        pos: Point<Pixels>,
-        last_layout: &LastLayout,
-    ) -> Option<usize> {
-        let mut offset = 0;
-        let mut line_top = px(0.);
-        let x_offset = last_layout.alignment_offset(self.longest_width);
-        for (i, line) in self.wrapped_lines.iter().enumerate() {
-            let is_last = i + 1 == self.wrapped_lines.len();
-            let line_bottom = line_top + last_layout.line_height;
-            if pos.y >= line_top && pos.y < line_bottom {
-                let mut ix = line.closest_index_for_x(pos.x - x_offset);
-                if !is_last && ix == line.text.len() {
-                    // For soft wrap line, we can't put the cursor at the end of the line.
-                    let c_len = line.text.chars().last().map(|c| c.len_utf8()).unwrap_or(0);
-                    ix = ix.saturating_sub(c_len);
-                }
-                return Some(offset + ix);
-            }
-
-            offset += line.text.len();
-            line_top = line_bottom;
-        }
-
-        None
-    }
-
-    pub(crate) fn index_for_position(
-        &self,
-        pos: Point<Pixels>,
-        last_layout: &LastLayout,
-    ) -> Option<usize> {
-        let mut offset = 0;
-        let mut line_top = px(0.);
-        let x_offset = last_layout.alignment_offset(self.longest_width);
-        for line in self.wrapped_lines.iter() {
-            let line_bottom = line_top + last_layout.line_height;
-            if pos.y >= line_top && pos.y < line_bottom {
-                let ix = line.index_for_x(pos.x - x_offset)?;
-                return Some(offset + ix);
-            }
-
-            offset += line.text.len();
-            line_top = line_bottom;
-        }
-
-        None
-    }
-
-    pub(crate) fn size(&self, line_height: Pixels) -> Size<Pixels> {
-        size(self.longest_width, self.wrapped_lines.len() * line_height)
-    }
-
-    pub(crate) fn paint(
-        &self,
-        pos: Point<Pixels>,
-        line_height: Pixels,
-        text_align: TextAlign,
-        align_width: Option<Pixels>,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        for (ix, line) in self.wrapped_lines.iter().enumerate() {
-            _ = line.paint(
-                pos + point(px(0.), ix * line_height),
-                line_height,
-                text_align,
-                align_width,
-                window,
-                cx,
-            );
-        }
-
-        // Paint whitespace indicators
-        if let Some(indicators) = self.whitespace_indicators.as_ref() {
-            for (line_index, x_position, is_tab) in &self.whitespace_chars {
-                let invisible = if *is_tab {
-                    indicators.tab.clone()
-                } else {
-                    indicators.space.clone()
-                };
-
-                let origin = point(
-                    pos.x + *x_position,
-                    pos.y + *line_index as f32 * line_height,
-                );
-
-                _ = invisible.paint(origin, line_height, text_align, align_width, window, cx);
-            }
-        }
-    }
-}

crates/ui/src/input/display_map/wrap_map.rs

@@ -1,222 +0,0 @@
-/// WrapMap: Soft-wrapping layer (Buffer → Wrap rows).
-///
-/// This module wraps the existing TextWrapper and provides:
-/// - BufferPoint ↔ WrapPoint mapping
-/// - Efficient buffer_line → wrap_row queries via prefix sum cache
-/// - Incremental updates when text or layout changes
-use std::ops::Range;
-
-use gpui::{App, Font, Pixels};
-use ropey::Rope;
-
-use super::fold_map::FoldMap;
-use super::text_wrapper::{LineItem, TextWrapper, WrapDisplayPoint};
-use super::{BufferPoint, WrapPoint};
-use crate::input::rope_ext::RopeExt;
-
-/// WrapMap manages soft-wrapping and provides buffer ↔ wrap coordinate mapping.
-pub struct WrapMap {
-    /// The underlying text wrapper (reuses existing implementation)
-    wrapper: TextWrapper,
-
-    /// Prefix sum cache: buffer_line_starts[line] = first wrap_row for buffer line `line`
-    /// This allows O(1) lookup of buffer_line → wrap_row
-    buffer_line_starts: Vec<usize>,
-
-    /// Cached line count from last rebuild
-    cached_line_count: usize,
-
-    /// Cached total wrap row count from last rebuild.
-    /// Used together with `cached_line_count` to detect if the cache is stale.
-    /// When soft wrap changes a line's wrap count without changing buffer line count,
-    /// this catches the staleness.
-    cached_wrap_row_count: usize,
-}
-
-impl WrapMap {
-    pub fn new(font: Font, font_size: Pixels, wrap_width: Option<Pixels>) -> Self {
-        Self {
-            wrapper: TextWrapper::new(font, font_size, wrap_width),
-            buffer_line_starts: Vec::new(),
-            cached_line_count: 0,
-            cached_wrap_row_count: 0,
-        }
-    }
-
-    /// Get total number of wrap rows (visual rows after soft-wrapping)
-    #[inline]
-    pub fn wrap_row_count(&self) -> usize {
-        self.wrapper.len()
-    }
-
-    /// Get total number of buffer lines (logical lines)
-    #[inline]
-    pub fn buffer_line_count(&self) -> usize {
-        self.wrapper.lines.len()
-    }
-
-    /// Convert buffer position to wrap position
-    pub(super) fn buffer_pos_to_wrap_pos(&self, pos: BufferPoint) -> WrapPoint {
-        let BufferPoint { line, col } = pos;
-
-        // Clamp to valid range
-        let line = line.min(self.buffer_line_count().saturating_sub(1));
-        let line_item = self.wrapper.lines.get(line);
-
-        let col = if let Some(line_item) = line_item {
-            col.min(line_item.len())
-        } else {
-            0
-        };
-
-        // Calculate offset in rope
-        let line_start_offset = self.wrapper.text().line_start_offset(line);
-        let offset = line_start_offset + col;
-
-        // Use TextWrapper's existing conversion
-        let display_point = self.wrapper.offset_to_display_point(offset);
-
-        WrapPoint::new(display_point.row, display_point.column)
-    }
-
-    /// Convert wrap position to buffer position
-    pub(super) fn wrap_pos_to_buffer_pos(&self, pos: WrapPoint) -> BufferPoint {
-        let WrapPoint { row, col } = pos;
-
-        // Clamp wrap_row to valid range
-        let row = row.min(self.wrap_row_count().saturating_sub(1));
-
-        // Use TextWrapper's existing conversion
-        let display_point = WrapDisplayPoint::new(row, 0, col);
-        let offset = self.wrapper.display_point_to_offset(display_point);
-
-        // Convert offset to buffer position
-        let point = self.wrapper.text().offset_to_point(offset);
-        let line_start = self.wrapper.text().line_start_offset(point.row);
-        let col = offset.saturating_sub(line_start);
-
-        BufferPoint::new(point.row, col)
-    }
-
-    /// Get the buffer line for a given wrap row
-    pub fn wrap_row_to_buffer_line(&self, wrap_row: usize) -> usize {
-        if wrap_row >= self.wrap_row_count() {
-            return self.buffer_line_count().saturating_sub(1);
-        }
-
-        // Binary search in prefix sum cache
-        match self.buffer_line_starts.binary_search(&wrap_row) {
-            Ok(line) => line,
-            Err(insert_pos) => insert_pos.saturating_sub(1),
-        }
-    }
-
-    /// Get the first wrap row for a given buffer line
-    pub fn buffer_line_to_first_wrap_row(&self, line: usize) -> usize {
-        if line >= self.buffer_line_starts.len() {
-            return self.wrap_row_count();
-        }
-        self.buffer_line_starts[line]
-    }
-
-    /// Get the wrap row range for a buffer line: [start, end)
-    pub fn buffer_line_to_wrap_row_range(&self, line: usize) -> Range<usize> {
-        let start = self.buffer_line_to_first_wrap_row(line);
-        let end = if line + 1 < self.buffer_line_starts.len() {
-            self.buffer_line_starts[line + 1]
-        } else {
-            self.wrap_row_count()
-        };
-        start..end
-    }
-
-    /// Update text (incremental or full)
-    pub fn on_text_changed(
-        &mut self,
-        changed_text: &Rope,
-        range: &Range<usize>,
-        new_text: &Rope,
-        cx: &mut App,
-    ) {
-        self.wrapper.update(changed_text, range, new_text, cx);
-        self.rebuild_cache();
-    }
-
-    /// Update layout parameters (wrap width or font)
-    pub fn on_layout_changed(&mut self, wrap_width: Option<Pixels>, cx: &mut App) {
-        self.wrapper.set_wrap_width(wrap_width, cx);
-        self.rebuild_cache();
-    }
-
-    /// Set font parameters
-    pub fn set_font(&mut self, font: Font, font_size: Pixels, cx: &mut App) {
-        self.wrapper.set_font(font, font_size, cx);
-        self.rebuild_cache();
-    }
-
-    /// Ensure text is prepared (initializes wrapper if needed)
-    pub fn ensure_text_prepared(&mut self, text: &Rope, cx: &mut App) -> bool {
-        let did_initialize = self.wrapper.prepare_if_need(text, cx);
-        if did_initialize {
-            self.rebuild_cache();
-        }
-        did_initialize
-    }
-
-    /// Initialize with text
-    pub fn set_text(&mut self, text: &Rope, cx: &mut App) {
-        self.wrapper.set_default_text(text);
-        self.wrapper.prepare_if_need(text, cx);
-        self.rebuild_cache();
-    }
-
-    /// Rebuild the prefix sum cache: buffer_line_starts
-    fn rebuild_cache(&mut self) {
-        let line_count = self.wrapper.lines.len();
-        let wrap_row_count = self.wrapper.len();
-
-        // Skip if nothing changed: both buffer line count and total wrap row count must match.
-        // Checking wrap_row_count is essential because soft-wrap can change the number of
-        // wrap rows per line without changing the buffer line count.
-        if line_count == self.cached_line_count
-            && wrap_row_count == self.cached_wrap_row_count
-            && !self.buffer_line_starts.is_empty()
-        {
-            return;
-        }
-
-        self.buffer_line_starts.clear();
-
-        let mut wrap_row = 0;
-        for line_item in &self.wrapper.lines {
-            self.buffer_line_starts.push(wrap_row);
-            wrap_row += line_item.lines_len();
-        }
-
-        self.cached_line_count = line_count;
-        self.cached_wrap_row_count = wrap_row_count;
-    }
-
-    /// Get access to the underlying wrapper (for rendering/hit-testing)
-    pub(crate) fn wrapper(&self) -> &TextWrapper {
-        &self.wrapper
-    }
-
-    /// Get access to line items (for rendering)
-    pub(crate) fn lines(&self) -> &[LineItem] {
-        &self.wrapper.lines
-    }
-
-    /// Get the rope text
-    pub fn text(&self) -> &Rope {
-        self.wrapper.text()
-    }
-
-    /// Calculate how many wrap rows of a buffer line are visible (not folded)
-    pub fn visible_wrap_row_count_for_line(&self, line: usize, fold_map: &FoldMap) -> usize {
-        let wrap_range = self.buffer_line_to_wrap_row_range(line);
-        wrap_range
-            .filter(|&wr| fold_map.wrap_row_to_display_row(wr).is_some())
-            .count()
-    }
-}

crates/ui/src/input/indent.rs

@@ -1,424 +0,0 @@
-use gpui::{
-    Bounds, Context, EntityInputHandler as _, Hsla, Path, PathBuilder, Pixels, SharedString,
-    TextRun, TextStyle, Window, point, px,
-};
-use ropey::RopeSlice;
-
-use crate::input::element::TextElement;
-use crate::input::mode::InputMode;
-use crate::input::{Indent, IndentInline, InputState, LastLayout, Outdent, OutdentInline, RopeExt};
-
-#[derive(Debug, Copy, Clone)]
-pub struct TabSize {
-    /// Default is 2
-    pub tab_size: usize,
-    /// Set true to use `\t` as tab indent, default is false
-    pub hard_tabs: bool,
-}
-
-impl Default for TabSize {
-    fn default() -> Self {
-        Self {
-            tab_size: 2,
-            hard_tabs: false,
-        }
-    }
-}
-
-impl TabSize {
-    pub(super) fn to_string(self) -> SharedString {
-        if self.hard_tabs {
-            "\t".into()
-        } else {
-            " ".repeat(self.tab_size).into()
-        }
-    }
-
-    /// Count the indent size of the line in spaces.
-    pub fn indent_count(&self, line: &RopeSlice) -> usize {
-        let mut count = 0;
-        for ch in line.chars() {
-            match ch {
-                '\t' => count += self.tab_size,
-                ' ' => count += 1,
-                _ => break,
-            }
-        }
-
-        count
-    }
-}
-
-impl InputMode {
-    #[inline]
-    pub(super) fn is_indentable(&self) -> bool {
-        match self {
-            InputMode::PlainText { multi_line, .. } | InputMode::CodeEditor { multi_line, .. } => {
-                *multi_line
-            }
-            _ => false,
-        }
-    }
-
-    #[inline]
-    pub(super) fn has_indent_guides(&self) -> bool {
-        match self {
-            InputMode::CodeEditor {
-                indent_guides,
-                multi_line,
-                ..
-            } => *indent_guides && *multi_line,
-            _ => false,
-        }
-    }
-
-    #[inline]
-    pub(super) fn tab_size(&self) -> TabSize {
-        match self {
-            InputMode::PlainText { tab, .. } => *tab,
-            InputMode::CodeEditor { tab, .. } => *tab,
-            _ => TabSize::default(),
-        }
-    }
-}
-
-impl TextElement {
-    /// Measure the indent width in pixels for given column count.
-    fn measure_indent_width(&self, style: &TextStyle, column: usize, window: &Window) -> Pixels {
-        let font_size = style.font_size.to_pixels(window.rem_size());
-        let layout = window.text_system().shape_line(
-            SharedString::from(" ".repeat(column)),
-            font_size,
-            &[TextRun {
-                len: column,
-                font: style.font(),
-                color: Hsla::default(),
-                background_color: None,
-                strikethrough: None,
-                underline: None,
-            }],
-            None,
-        );
-
-        layout.width
-    }
-
-    pub(super) fn layout_indent_guides(
-        &self,
-        state: &InputState,
-        bounds: &Bounds<Pixels>,
-        last_layout: &LastLayout,
-        text_style: &TextStyle,
-        window: &mut Window,
-    ) -> Option<Path<Pixels>> {
-        if !state.mode.has_indent_guides() {
-            return None;
-        }
-
-        let indent_width =
-            self.measure_indent_width(text_style, state.mode.tab_size().tab_size, window);
-
-        let tab_size = state.mode.tab_size();
-        let line_height = last_layout.line_height;
-        let mut builder = PathBuilder::stroke(px(1.));
-        let mut offset_y = last_layout.visible_top;
-        let mut last_indents = vec![];
-
-        for (&buffer_line, line_layout) in last_layout
-            .visible_buffer_lines
-            .iter()
-            .zip(last_layout.lines.iter())
-        {
-            let line = state.text.slice_line(buffer_line);
-            let mut current_indents = vec![];
-            if line.len() > 0 {
-                let indent_count = tab_size.indent_count(&line);
-                for offset in (0..indent_count).step_by(tab_size.tab_size) {
-                    let x = if indent_count > 0 {
-                        indent_width * offset as f32 / tab_size.tab_size as f32
-                    } else {
-                        px(0.)
-                    };
-
-                    let pos = point(x + last_layout.line_number_width, offset_y);
-
-                    builder.move_to(pos);
-                    builder.line_to(point(pos.x, pos.y + line_height));
-                    current_indents.push(pos.x);
-                }
-            } else if !last_indents.is_empty() {
-                for x in &last_indents {
-                    let pos = point(*x, offset_y);
-                    builder.move_to(pos);
-                    builder.line_to(point(pos.x, pos.y + line_height));
-                }
-                current_indents = last_indents.clone();
-            }
-
-            offset_y += line_layout.wrapped_lines.len() * line_height;
-            last_indents = current_indents;
-        }
-
-        builder.translate(bounds.origin);
-        let path = builder.build().unwrap();
-        Some(path)
-    }
-}
-
-impl InputState {
-    /// Set whether to show indent guides in code editor mode, default is true.
-    ///
-    /// Only for [`InputMode::CodeEditor`] mode.
-    pub fn indent_guides(mut self, indent_guides: bool) -> Self {
-        debug_assert!(self.mode.is_code_editor() && self.mode.is_multi_line());
-        if let InputMode::CodeEditor {
-            indent_guides: l, ..
-        } = &mut self.mode
-        {
-            *l = indent_guides;
-        }
-        self
-    }
-
-    /// Set indent guides in code editor mode.
-    ///
-    /// Only for [`InputMode::CodeEditor`] mode.
-    pub fn set_indent_guides(
-        &mut self,
-        indent_guides: bool,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        debug_assert!(self.mode.is_code_editor());
-        if let InputMode::CodeEditor {
-            indent_guides: l, ..
-        } = &mut self.mode
-        {
-            *l = indent_guides;
-        }
-        cx.notify();
-    }
-
-    /// Set the tab size for the input.
-    ///
-    /// Only for [`InputMode::PlainText`] and [`InputMode::CodeEditor`] mode with multi_line.
-    pub fn tab_size(mut self, tab: TabSize) -> Self {
-        debug_assert!(self.mode.is_multi_line() || self.mode.is_code_editor());
-        match &mut self.mode {
-            InputMode::PlainText { tab: t, .. } => *t = tab,
-            InputMode::CodeEditor { tab: t, .. } => *t = tab,
-            _ => {}
-        }
-        self
-    }
-
-    pub(super) fn indent_inline(
-        &mut self,
-        _: &IndentInline,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.indent(false, window, cx);
-    }
-
-    pub(super) fn indent_block(&mut self, _: &Indent, window: &mut Window, cx: &mut Context<Self>) {
-        self.indent(true, window, cx);
-    }
-
-    pub(super) fn outdent_inline(
-        &mut self,
-        _: &OutdentInline,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.outdent(false, window, cx);
-    }
-
-    pub(super) fn outdent_block(
-        &mut self,
-        _: &Outdent,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.outdent(true, window, cx);
-    }
-
-    pub(super) fn indent(&mut self, block: bool, window: &mut Window, cx: &mut Context<Self>) {
-        if !self.mode.is_indentable() {
-            cx.propagate();
-            return;
-        };
-
-        let tab_indent = self.mode.tab_size().to_string();
-        let selected_range = self.selected_range;
-        let mut added_len = 0;
-        let is_selected = !self.selected_range.is_empty();
-
-        if is_selected || block {
-            let start_offset = self.start_of_line_of_selection(window, cx);
-            let mut offset = start_offset;
-
-            let selected_text = self
-                .text_for_range(
-                    self.range_to_utf16(&(offset..selected_range.end)),
-                    &mut None,
-                    window,
-                    cx,
-                )
-                .unwrap_or("".into());
-
-            for line in selected_text.split('\n') {
-                self.replace_text_in_range_silent(
-                    Some(self.range_to_utf16(&(offset..offset))),
-                    &tab_indent,
-                    window,
-                    cx,
-                );
-                added_len += tab_indent.len();
-                // +1 for "\n", the `\r` is included in the `line`.
-                offset += line.len() + tab_indent.len() + 1;
-            }
-
-            if is_selected {
-                self.selected_range = (start_offset..selected_range.end + added_len).into();
-            } else {
-                self.selected_range =
-                    (selected_range.start + added_len..selected_range.end + added_len).into();
-            }
-        } else {
-            // Selected none
-            let offset = self.selected_range.start;
-            self.replace_text_in_range_silent(
-                Some(self.range_to_utf16(&(offset..offset))),
-                &tab_indent,
-                window,
-                cx,
-            );
-            added_len = tab_indent.len();
-
-            self.selected_range =
-                (selected_range.start + added_len..selected_range.end + added_len).into();
-        }
-    }
-
-    pub(super) fn outdent(&mut self, block: bool, window: &mut Window, cx: &mut Context<Self>) {
-        if !self.mode.is_indentable() {
-            cx.propagate();
-            return;
-        };
-
-        let tab_indent = self.mode.tab_size().to_string();
-        let selected_range = self.selected_range;
-        let mut removed_len = 0;
-        let is_selected = !self.selected_range.is_empty();
-
-        if is_selected || block {
-            let start_offset = self.start_of_line_of_selection(window, cx);
-            let mut offset = start_offset;
-
-            let selected_text = self
-                .text_for_range(
-                    self.range_to_utf16(&(offset..selected_range.end)),
-                    &mut None,
-                    window,
-                    cx,
-                )
-                .unwrap_or("".into());
-
-            for line in selected_text.split('\n') {
-                if line.starts_with(tab_indent.as_ref()) {
-                    self.replace_text_in_range_silent(
-                        Some(self.range_to_utf16(&(offset..offset + tab_indent.len()))),
-                        "",
-                        window,
-                        cx,
-                    );
-                    removed_len += tab_indent.len();
-
-                    // +1 for "\n"
-                    offset += line.len().saturating_sub(tab_indent.len()) + 1;
-                } else {
-                    offset += line.len() + 1;
-                }
-            }
-
-            if is_selected {
-                self.selected_range =
-                    (start_offset..selected_range.end.saturating_sub(removed_len)).into();
-            } else {
-                self.selected_range = (selected_range.start.saturating_sub(removed_len)
-                    ..selected_range.end.saturating_sub(removed_len))
-                    .into();
-            }
-        } else {
-            // Selected none
-            let start_offset = self.selected_range.start;
-            let offset = self.start_of_line_of_selection(window, cx);
-            let offset = self.offset_from_utf16(self.offset_to_utf16(offset));
-            // FIXME: To improve performance
-            if self
-                .text
-                .slice(offset..self.text.len())
-                .to_string()
-                .starts_with(tab_indent.as_ref())
-            {
-                self.replace_text_in_range_silent(
-                    Some(self.range_to_utf16(&(offset..offset + tab_indent.len()))),
-                    "",
-                    window,
-                    cx,
-                );
-                removed_len = tab_indent.len();
-                let new_offset = start_offset.saturating_sub(removed_len);
-                self.selected_range = (new_offset..new_offset).into();
-            }
-        }
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use ropey::RopeSlice;
-
-    use super::TabSize;
-
-    #[test]
-    fn test_tab_size() {
-        let tab = TabSize {
-            tab_size: 2,
-            hard_tabs: false,
-        };
-        assert_eq!(tab.to_string(), "  ");
-        let tab = TabSize {
-            tab_size: 4,
-            hard_tabs: false,
-        };
-        assert_eq!(tab.to_string(), "    ");
-
-        let tab = TabSize {
-            tab_size: 2,
-            hard_tabs: true,
-        };
-        assert_eq!(tab.to_string(), "\t");
-        let tab = TabSize {
-            tab_size: 4,
-            hard_tabs: true,
-        };
-        assert_eq!(tab.to_string(), "\t");
-    }
-
-    #[test]
-    fn test_tab_size_indent_count() {
-        let tab = TabSize {
-            tab_size: 4,
-            hard_tabs: false,
-        };
-        assert_eq!(tab.indent_count(&RopeSlice::from("abc")), 0);
-        assert_eq!(tab.indent_count(&RopeSlice::from("  abc")), 2);
-        assert_eq!(tab.indent_count(&RopeSlice::from("    abc")), 4);
-        assert_eq!(tab.indent_count(&RopeSlice::from("\tabc")), 4);
-        assert_eq!(tab.indent_count(&RopeSlice::from("  \tabc")), 6);
-        assert_eq!(tab.indent_count(&RopeSlice::from(" \t abc  ")), 6);
-        assert_eq!(tab.indent_count(&RopeSlice::from("abc")), 0);
-    }
-}

crates/ui/src/input/mask_pattern.rs

@@ -319,14 +319,14 @@ impl MaskPattern {
                         if fraction == &Some(0) {
                             int_with_sep
                         } else {
-                            format!("{}.{}", int_with_sep, frac)
+                            format!("{int_with_sep}.{frac}")
                         }
                     } else {
                         int_with_sep
                     };
 
                     let final_str = if let Some(sign) = maybe_signed {
-                        format!("{}{}", sign, final_str)
+                        format!("{sign}{final_str}")
                     } else {
                         final_str
                     };

crates/ui/src/input/mod.rs

@@ -1,29 +1,15 @@
-pub(super) const MASK_CHAR: char = '*';
-
 mod blink_cursor;
 mod change;
-mod clear_button;
 mod cursor;
-mod display_map;
 mod element;
-mod indent;
-#[allow(clippy::module_inception)]
-mod input;
 mod mask_pattern;
 mod mode;
-mod movement;
 mod rope_ext;
-mod selection;
 mod state;
+mod text_input;
+mod text_wrapper;
+
+pub(crate) mod clear_button;
 
-pub(crate) use clear_button::*;
-pub use cursor::*;
-#[cfg(target_family = "wasm")]
-pub use display_map::folding::Tree;
-pub use display_map::{BufferPoint, DisplayMap, DisplayPoint, FoldRange};
-pub use indent::TabSize;
-pub use input::*;
-pub use mask_pattern::MaskPattern;
-pub use rope_ext::{InputEdit, Point, RopeExt, RopeLines};
-pub use ropey::Rope;
 pub use state::*;
+pub use text_input::*;

crates/ui/src/input/mode.rs

@@ -1,122 +1,54 @@
-use std::cell::RefCell;
+use gpui::SharedString;
-use std::rc::Rc;
 
-use gpui::{SharedString, Task};
+use super::text_wrapper::TextWrapper;
-use ropey::Rope;
 
-use super::display_map::DisplayMap;
+#[derive(Debug, Copy, Clone)]
-use crate::input::TabSize;
+pub struct TabSize {
-
+    /// Default is 2
-#[allow(dead_code)]
+    pub tab_size: usize,
-pub(super) struct PendingBackgroundParse {
+    /// Set true to use `\t` as tab indent, default is false
-    pub parse_task: Rc<RefCell<Option<Task<()>>>>,
+    pub hard_tabs: bool,
-    pub language: SharedString,
-    pub text: Rope,
-    pub is_folding: bool,
 }
 
-#[derive(Clone)]
+impl Default for TabSize {
-pub(crate) enum InputMode {
+    fn default() -> Self {
-    /// A plain text input mode.
+        Self {
-    PlainText {
+            tab_size: 2,
-        multi_line: bool,
+            hard_tabs: false,
+        }
+    }
+}
+
+impl TabSize {
+    pub(super) fn to_string(self) -> SharedString {
+        if self.hard_tabs {
+            "\t".into()
+        } else {
+            " ".repeat(self.tab_size).into()
+        }
+    }
+}
+
+#[derive(Default, Clone)]
+pub enum InputMode {
+    #[default]
+    SingleLine,
+    MultiLine {
         tab: TabSize,
         rows: usize,
     },
-    /// An auto grow input mode.
     AutoGrow {
         rows: usize,
         min_rows: usize,
         max_rows: usize,
     },
-    /// A code editor input mode.
-    CodeEditor {
-        multi_line: bool,
-        tab: TabSize,
-        rows: usize,
-        /// Show line number
-        line_number: bool,
-        language: SharedString,
-        indent_guides: bool,
-        folding: bool,
-        parse_task: Rc<RefCell<Option<Task<()>>>>,
-    },
-}
-
-impl Default for InputMode {
-    fn default() -> Self {
-        InputMode::plain_text()
-    }
 }
 
 #[allow(unused)]
 impl InputMode {
-    /// Create a plain input mode with default settings.
-    pub(super) fn plain_text() -> Self {
-        InputMode::PlainText {
-            multi_line: false,
-            tab: TabSize::default(),
-            rows: 1,
-        }
-    }
-
-    /// Create a code editor input mode with default settings.
-    pub(super) fn code_editor(language: impl Into<SharedString>) -> Self {
-        InputMode::CodeEditor {
-            rows: 2,
-            multi_line: true,
-            tab: TabSize::default(),
-            language: language.into(),
-            line_number: true,
-            indent_guides: true,
-            folding: true,
-            parse_task: Rc::new(RefCell::new(None)),
-        }
-    }
-
-    /// Create an auto grow input mode with given min and max rows.
-    pub(super) fn auto_grow(min_rows: usize, max_rows: usize) -> Self {
-        InputMode::AutoGrow {
-            rows: min_rows,
-            min_rows,
-            max_rows,
-        }
-    }
-
-    pub(super) fn multi_line(mut self, multi_line: bool) -> Self {
-        match &mut self {
-            InputMode::PlainText { multi_line: ml, .. } => *ml = multi_line,
-            InputMode::CodeEditor { multi_line: ml, .. } => *ml = multi_line,
-            InputMode::AutoGrow { .. } => {}
-        }
-        self
-    }
-
     #[inline]
     pub(super) fn is_single_line(&self) -> bool {
-        !self.is_multi_line()
+        matches!(self, InputMode::SingleLine)
-    }
-
-    #[inline]
-    pub(super) fn is_code_editor(&self) -> bool {
-        matches!(self, InputMode::CodeEditor { .. })
-    }
-
-    /// Return true if the mode is code editor and `folding: true`, `multi_line: true`.
-    #[inline]
-    pub(crate) fn is_folding(&self) -> bool {
-        if cfg!(target_family = "wasm") {
-            return false;
-        }
-
-        matches!(
-            self,
-            InputMode::CodeEditor {
-                folding: true,
-                multi_line: true,
-                ..
-            }
-        )
     }
 
     #[inline]
@@ -126,19 +58,15 @@ impl InputMode {
 
     #[inline]
     pub(super) fn is_multi_line(&self) -> bool {
-        match self {
+        matches!(
-            InputMode::PlainText { multi_line, .. } => *multi_line,
+            self,
-            InputMode::CodeEditor { multi_line, .. } => *multi_line,
+            InputMode::MultiLine { .. } | InputMode::AutoGrow { .. }
-            InputMode::AutoGrow { max_rows, .. } => *max_rows > 1,
+        )
-        }
     }
 
     pub(super) fn set_rows(&mut self, new_rows: usize) {
         match self {
-            InputMode::PlainText { rows, .. } => {
+            InputMode::MultiLine { rows, .. } => {
-                *rows = new_rows;
-            }
-            InputMode::CodeEditor { rows, .. } => {
                 *rows = new_rows;
             }
             InputMode::AutoGrow {
@@ -148,28 +76,25 @@ impl InputMode {
             } => {
                 *rows = new_rows.clamp(*min_rows, *max_rows);
             }
+            _ => {}
         }
     }
 
-    pub(super) fn update_auto_grow(&mut self, display_map: &DisplayMap) {
+    pub(super) fn update_auto_grow(&mut self, text_wrapper: &TextWrapper) {
         if self.is_single_line() {
             return;
         }
 
-        let wrapped_lines = display_map.wrap_row_count();
+        let wrapped_lines = text_wrapper.len();
         self.set_rows(wrapped_lines);
     }
 
     /// At least 1 row be return.
     pub(super) fn rows(&self) -> usize {
-        if !self.is_multi_line() {
-            return 1;
-        }
-
         match self {
-            InputMode::PlainText { rows, .. } => *rows,
+            InputMode::MultiLine { rows, .. } => *rows,
-            InputMode::CodeEditor { rows, .. } => *rows,
             InputMode::AutoGrow { rows, .. } => *rows,
+            _ => 1,
         }
         .max(1)
     }
@@ -178,6 +103,7 @@ impl InputMode {
     #[allow(unused)]
     pub(super) fn min_rows(&self) -> usize {
         match self {
+            InputMode::MultiLine { .. } => 1,
             InputMode::AutoGrow { min_rows, .. } => *min_rows,
             _ => 1,
         }
@@ -186,26 +112,18 @@ impl InputMode {
 
     #[allow(unused)]
     pub(super) fn max_rows(&self) -> usize {
-        if !self.is_multi_line() {
-            return 1;
-        }
-
         match self {
+            InputMode::MultiLine { .. } => usize::MAX,
             InputMode::AutoGrow { max_rows, .. } => *max_rows,
-            _ => usize::MAX,
+            _ => 1,
         }
     }
 
-    /// Return false if the mode is not [`InputMode::CodeEditor`].
     #[inline]
-    pub(super) fn line_number(&self) -> bool {
+    pub(super) fn tab_size(&self) -> Option<&TabSize> {
         match self {
-            InputMode::CodeEditor {
+            InputMode::MultiLine { tab, .. } => Some(tab),
-                line_number,
+            _ => None,
-                multi_line,
-                ..
-            } => *line_number && *multi_line,
-            _ => false,
         }
     }
 }

crates/ui/src/input/movement.rs

@@ -1,264 +0,0 @@
-use gpui::{Context, Point, Window};
-
-use crate::input::{
-    InputState, MoveDown, MoveEnd, MoveHome, MoveLeft, MovePageDown, MovePageUp, MoveRight,
-    MoveToEnd, MoveToNextWord, MoveToPreviousWord, MoveToStart, MoveUp, RopeExt as _,
-};
-
-#[derive(Clone, Copy, PartialEq, Eq)]
-pub(crate) enum MoveDirection {
-    Up,
-    Down,
-}
-
-impl InputState {
-    /// Called after moving the cursor. Updates preferred_column if we know where the cursor now is.
-    pub(super) fn update_preferred_column(&mut self) {
-        let Some(last_layout) = &self.last_layout else {
-            self.preferred_column = None;
-            return;
-        };
-
-        let point = self.text.offset_to_point(self.cursor());
-        let Some(line) = last_layout.line(point.row) else {
-            self.preferred_column = None;
-            return;
-        };
-
-        let Some(pos) = line.position_for_index(point.column, last_layout, false) else {
-            self.preferred_column = None;
-            return;
-        };
-
-        self.preferred_column = Some((pos.x, point.column));
-    }
-
-    /// Move the cursor to the given offset.
-    ///
-    /// The offset is the UTF-8 offset.
-    ///
-    /// Ensure the offset use self.next_boundary or self.previous_boundary to get the correct offset.
-    pub(crate) fn move_to(
-        &mut self,
-        offset: usize,
-        direction: Option<MoveDirection>,
-        cx: &mut Context<Self>,
-    ) {
-        let offset = offset.clamp(0, self.text.len());
-        self.cursor_line_end_affinity = false;
-        self.selected_range = (offset..offset).into();
-        self.scroll_to(offset, direction, cx);
-        self.pause_blink_cursor(cx);
-        self.update_preferred_column();
-        cx.notify()
-    }
-
-    /// Move the cursor vertically by one line (up or down) while preserving the column if possible.
-    ///
-    /// move_lines: Number of lines to move vertically (positive for down, negative for up).
-    pub(super) fn move_vertical(
-        &mut self,
-        move_lines: isize,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.mode.is_single_line() {
-            return;
-        }
-        let Some(last_layout) = &self.last_layout else {
-            return;
-        };
-
-        let offset = self.cursor();
-        let was_preferred_column = self.preferred_column;
-
-        let mut display_point = self.display_map.offset_to_wrap_display_point(offset);
-
-        // Convert wrap row → display row (skips folded rows), move, then convert back
-        let current_display_row = self
-            .display_map
-            .wrap_row_to_display_row(display_point.row)
-            .unwrap_or_else(|| {
-                self.display_map
-                    .nearest_visible_display_row(display_point.row)
-            });
-        let max_display_row = self.display_map.display_row_count().saturating_sub(1);
-        let target_display_row = current_display_row
-            .saturating_add_signed(move_lines)
-            .min(max_display_row);
-        let target_wrap_row = self
-            .display_map
-            .display_row_to_wrap_row(target_display_row)
-            .unwrap_or(display_point.row);
-
-        display_point.row = target_wrap_row;
-        display_point.column = 0;
-        let mut new_offset = self.display_map.wrap_display_point_to_offset(display_point);
-
-        if let Some((preferred_x, column)) = was_preferred_column {
-            // Get display point again to update local_row.
-            let mut next_display_point = self.display_map.offset_to_wrap_display_point(new_offset);
-            next_display_point.column = 0;
-            let next_point = self
-                .display_map
-                .wrap_display_point_to_point(next_display_point);
-            let line_start_offset = self.text.line_start_offset(next_point.row);
-
-            // If in visible range, prefer to use position to get column.
-            if let Some(line) = last_layout.line(next_point.row) {
-                if let Some(x) = line.closest_index_for_position(
-                    Point {
-                        x: preferred_x,
-                        y: next_display_point.local_row * last_layout.line_height,
-                    },
-                    last_layout,
-                ) {
-                    new_offset = line_start_offset + x;
-                }
-            } else {
-                // Not in visible range, use column directly.
-                let max_line_len = self.text.slice_line(next_point.row).len();
-                new_offset = line_start_offset + column.min(max_line_len);
-            }
-        }
-
-        self.pause_blink_cursor(cx);
-        let direction = if move_lines < 0 {
-            MoveDirection::Up
-        } else {
-            MoveDirection::Down
-        };
-        self.move_to(new_offset, Some(direction), cx);
-        // Set back the preferred_column
-        self.preferred_column = was_preferred_column;
-        cx.notify();
-    }
-
-    pub(super) fn left(&mut self, _: &MoveLeft, _: &mut Window, cx: &mut Context<Self>) {
-        self.pause_blink_cursor(cx);
-        if self.selected_range.is_empty() {
-            self.move_to(self.previous_boundary(self.cursor()), None, cx);
-        } else {
-            self.move_to(self.selected_range.start, None, cx)
-        }
-    }
-
-    pub(super) fn right(&mut self, _: &MoveRight, _: &mut Window, cx: &mut Context<Self>) {
-        self.pause_blink_cursor(cx);
-        if self.selected_range.is_empty() {
-            self.move_to(self.next_boundary(self.selected_range.end), None, cx);
-        } else {
-            self.move_to(self.selected_range.end, None, cx)
-        }
-    }
-
-    pub(super) fn up(&mut self, _action: &MoveUp, window: &mut Window, cx: &mut Context<Self>) {
-        if self.mode.is_single_line() {
-            return;
-        }
-
-        if !self.selected_range.is_empty() {
-            self.move_to(
-                self.previous_boundary(self.selected_range.start.saturating_sub(1)),
-                Some(MoveDirection::Up),
-                cx,
-            );
-        }
-        self.pause_blink_cursor(cx);
-        self.move_vertical(-1, window, cx);
-    }
-
-    pub(super) fn down(&mut self, _action: &MoveDown, window: &mut Window, cx: &mut Context<Self>) {
-        if self.mode.is_single_line() {
-            return;
-        }
-
-        if !self.selected_range.is_empty() {
-            self.move_to(
-                self.next_boundary(self.selected_range.end.saturating_sub(1)),
-                Some(MoveDirection::Down),
-                cx,
-            );
-        }
-
-        self.pause_blink_cursor(cx);
-        self.move_vertical(1, window, cx);
-    }
-
-    pub(super) fn page_up(&mut self, _: &MovePageUp, window: &mut Window, cx: &mut Context<Self>) {
-        if self.mode.is_single_line() {
-            return;
-        }
-
-        let Some(last_layout) = &self.last_layout else {
-            return;
-        };
-
-        let display_lines = (self.input_bounds.size.height / last_layout.line_height) as isize;
-        self.move_vertical(-display_lines, window, cx);
-    }
-
-    pub(super) fn page_down(
-        &mut self,
-        _: &MovePageDown,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        if self.mode.is_single_line() {
-            return;
-        }
-
-        let Some(last_layout) = &self.last_layout else {
-            return;
-        };
-
-        let display_lines = (self.input_bounds.size.height / last_layout.line_height) as isize;
-        self.move_vertical(display_lines, window, cx);
-    }
-
-    pub(super) fn home(&mut self, _: &MoveHome, _: &mut Window, cx: &mut Context<Self>) {
-        self.pause_blink_cursor(cx);
-        let offset = self.start_of_line();
-        self.move_to(offset, Some(MoveDirection::Up), cx);
-    }
-
-    pub(super) fn end(&mut self, _: &MoveEnd, _: &mut Window, cx: &mut Context<Self>) {
-        self.pause_blink_cursor(cx);
-        let offset = self.end_of_line();
-        self.move_to(offset, Some(MoveDirection::Down), cx);
-        self.cursor_line_end_affinity = true;
-    }
-
-    pub(super) fn move_to_start(
-        &mut self,
-        _: &MoveToStart,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        self.move_to(0, None, cx);
-    }
-
-    pub(super) fn move_to_end(&mut self, _: &MoveToEnd, _: &mut Window, cx: &mut Context<Self>) {
-        self.move_to(self.text.len(), None, cx);
-    }
-
-    pub(super) fn move_to_previous_word(
-        &mut self,
-        _: &MoveToPreviousWord,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let offset = self.previous_start_of_word();
-        self.move_to(offset, None, cx);
-    }
-
-    pub(super) fn move_to_next_word(
-        &mut self,
-        _: &MoveToNextWord,
-        _: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let offset = self.next_end_of_word();
-        self.move_to(offset, None, cx);
-    }
-}

crates/ui/src/input/popovers/code_action_menu.rs

@@ -1,337 +0,0 @@
-use std::rc::Rc;
-
-use gpui::prelude::FluentBuilder;
-use gpui::{
-    Action, AnyElement, App, AppContext, Context, DismissEvent, Empty, Entity, EventEmitter,
-    InteractiveElement as _, IntoElement, ParentElement, Pixels, Point, Render, RenderOnce,
-    SharedString, Styled, StyledText, Subscription, Window, deferred, div, px, relative,
-};
-use lsp_types::CodeAction;
-use theme::ActiveTheme;
-
-const MAX_MENU_WIDTH: Pixels = px(320.);
-const MAX_MENU_HEIGHT: Pixels = px(480.);
-
-use crate::input::popovers::editor_popover;
-use crate::input::{self, InputState};
-use crate::list::{List, ListDelegate, ListEvent, ListState};
-use crate::{IndexPath, Selectable, actions, h_flex};
-
-#[derive(Debug, Clone)]
-pub(crate) struct CodeActionItem {
-    /// The `id` of the `CodeActionProvider` that provided this item.
-    pub(crate) provider_id: SharedString,
-    pub(crate) action: CodeAction,
-}
-
-struct MenuDelegate {
-    menu: Entity<CodeActionMenu>,
-    items: Vec<Rc<CodeActionItem>>,
-    selected_ix: usize,
-}
-
-impl MenuDelegate {
-    fn set_items(&mut self, items: Vec<CodeActionItem>) {
-        self.items = items.into_iter().map(Rc::new).collect();
-        self.selected_ix = 0;
-    }
-
-    fn selected_item(&self) -> Option<&Rc<CodeActionItem>> {
-        self.items.get(self.selected_ix)
-    }
-}
-
-#[derive(IntoElement)]
-struct MenuItem {
-    ix: usize,
-    item: Rc<CodeActionItem>,
-    children: Vec<AnyElement>,
-    selected: bool,
-}
-
-impl MenuItem {
-    fn new(ix: usize, item: Rc<CodeActionItem>) -> Self {
-        Self {
-            ix,
-            item,
-            children: vec![],
-            selected: false,
-        }
-    }
-}
-impl Selectable for MenuItem {
-    fn selected(mut self, selected: bool) -> Self {
-        self.selected = selected;
-        self
-    }
-
-    fn is_selected(&self) -> bool {
-        self.selected
-    }
-}
-
-impl ParentElement for MenuItem {
-    fn extend(&mut self, elements: impl IntoIterator<Item = AnyElement>) {
-        self.children.extend(elements);
-    }
-}
-impl RenderOnce for MenuItem {
-    fn render(self, _: &mut Window, cx: &mut App) -> impl IntoElement {
-        let item = self.item;
-
-        let highlights = vec![];
-
-        h_flex()
-            .id(self.ix)
-            .gap_2()
-            .p_1()
-            .text_xs()
-            .line_height(relative(1.))
-            .rounded(cx.theme().radius)
-            .hover(|this| this.bg(cx.theme().secondary_hover))
-            .when(self.selected, |this| {
-                this.bg(cx.theme().secondary_background)
-                    .text_color(cx.theme().secondary_foreground)
-            })
-            .child(
-                div().child(StyledText::new(item.action.title.clone()).with_highlights(highlights)),
-            )
-            .children(self.children)
-    }
-}
-
-impl EventEmitter<DismissEvent> for MenuDelegate {}
-
-impl ListDelegate for MenuDelegate {
-    type Item = MenuItem;
-
-    fn items_count(&self, _: usize, _: &gpui::App) -> usize {
-        self.items.len()
-    }
-
-    fn render_item(
-        &mut self,
-        ix: crate::IndexPath,
-        _: &mut Window,
-        _: &mut Context<ListState<Self>>,
-    ) -> Option<Self::Item> {
-        let item = self.items.get(ix.row)?;
-        Some(MenuItem::new(ix.row, item.clone()))
-    }
-
-    fn set_selected_index(
-        &mut self,
-        ix: Option<crate::IndexPath>,
-        _: &mut Window,
-        cx: &mut Context<ListState<Self>>,
-    ) {
-        self.selected_ix = ix.map(|i| i.row).unwrap_or(0);
-        cx.notify();
-    }
-
-    fn confirm(&mut self, _: bool, window: &mut Window, cx: &mut Context<ListState<Self>>) {
-        let Some(item) = self.selected_item() else {
-            return;
-        };
-
-        self.menu.update(cx, |this, cx| {
-            this.select_item(&item, window, cx);
-        });
-    }
-}
-
-/// A context menu for code completions and code actions.
-pub struct CodeActionMenu {
-    offset: usize,
-    state: Entity<InputState>,
-    list: Entity<ListState<MenuDelegate>>,
-    open: bool,
-
-    _subscriptions: Vec<Subscription>,
-}
-
-impl CodeActionMenu {
-    /// Creates a new `CompletionMenu` with the given offset and completion items.
-    ///
-    /// NOTE: This element should not call from InputState::new, unless that will stack overflow.
-    pub(crate) fn new(
-        state: Entity<InputState>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Entity<Self> {
-        cx.new(|cx| {
-            let view = cx.entity();
-            let menu = MenuDelegate {
-                menu: view,
-                items: vec![],
-                selected_ix: 0,
-            };
-
-            let list = cx.new(|cx| ListState::new(menu, window, cx));
-
-            let _subscriptions =
-                vec![
-                    cx.subscribe(&list, |this: &mut Self, _, ev: &ListEvent, cx| {
-                        match ev {
-                            ListEvent::Confirm(_) => {
-                                this.hide(cx);
-                            }
-                            _ => {}
-                        }
-                        cx.notify();
-                    }),
-                ];
-
-            Self {
-                offset: 0,
-                state,
-                list,
-                open: false,
-                _subscriptions,
-            }
-        })
-    }
-
-    fn select_item(&mut self, item: &CodeActionItem, window: &mut Window, cx: &mut Context<Self>) {
-        let state = self.state.clone();
-        let item = item.clone();
-
-        cx.spawn_in(window, {
-            async move |_, cx| {
-                state.update_in(cx, |state, window, cx| {
-                    state.perform_code_action(&item, window, cx);
-                })
-            }
-        })
-        .detach();
-
-        self.hide(cx);
-    }
-
-    pub(crate) fn handle_action(
-        &mut self,
-        action: Box<dyn Action>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> bool {
-        if !self.open {
-            return false;
-        }
-
-        cx.propagate();
-        if input::Enter::is_primary(&*action) {
-            self.on_action_enter(window, cx);
-        } else if action.partial_eq(&input::Escape) {
-            self.on_action_escape(window, cx);
-        } else if action.partial_eq(&input::MoveUp) {
-            self.on_action_up(window, cx);
-        } else if action.partial_eq(&input::MoveDown) {
-            self.on_action_down(window, cx);
-        } else {
-            return false;
-        }
-
-        true
-    }
-
-    fn on_action_enter(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let Some(item) = self.list.read(cx).delegate().selected_item().cloned() else {
-            return;
-        };
-        self.select_item(&item, window, cx);
-    }
-
-    fn on_action_escape(&mut self, _: &mut Window, cx: &mut Context<Self>) {
-        self.hide(cx);
-    }
-
-    fn on_action_up(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.list.update(cx, |this, cx| {
-            this.on_action_select_prev(&actions::SelectUp, window, cx)
-        });
-    }
-
-    fn on_action_down(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.list.update(cx, |this, cx| {
-            this.on_action_select_next(&actions::SelectDown, window, cx)
-        });
-    }
-
-    pub(crate) fn is_open(&self) -> bool {
-        self.open
-    }
-
-    /// Hide the completion menu and reset the trigger start offset.
-    pub(crate) fn hide(&mut self, cx: &mut Context<Self>) {
-        self.open = false;
-        cx.notify();
-    }
-
-    pub(crate) fn show(
-        &mut self,
-        offset: usize,
-        items: impl Into<Vec<CodeActionItem>>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let items = items.into();
-        self.offset = offset;
-        self.open = true;
-        self.list.update(cx, |this, cx| {
-            this.delegate_mut().set_items(items);
-            this.set_selected_index(Some(IndexPath::new(0)), window, cx);
-        });
-
-        cx.notify();
-    }
-
-    fn origin(&self, cx: &App) -> Option<Point<Pixels>> {
-        let state = self.state.read(cx);
-        let Some(last_layout) = state.last_layout.as_ref() else {
-            return None;
-        };
-        let Some(cursor_origin) = last_layout.cursor_bounds.map(|b| b.origin) else {
-            return None;
-        };
-
-        let scroll_origin = self.state.read(cx).scroll_handle.offset();
-
-        Some(
-            scroll_origin + cursor_origin - state.input_bounds.origin
-                + Point::new(-px(4.), last_layout.line_height + px(4.)),
-        )
-    }
-}
-
-impl Render for CodeActionMenu {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        if !self.open {
-            return Empty.into_any_element();
-        }
-
-        if self.list.read(cx).delegate().items.is_empty() {
-            self.open = false;
-            return Empty.into_any_element();
-        }
-
-        let Some(pos) = self.origin(cx) else {
-            return Empty.into_any_element();
-        };
-
-        let max_width = MAX_MENU_WIDTH.min(window.bounds().size.width - pos.x);
-
-        deferred(
-            editor_popover("code-action-menu", cx)
-                .absolute()
-                .left(pos.x)
-                .top(pos.y)
-                .max_w(max_width)
-                .min_w(px(120.))
-                .child(List::new(&self.list).max_h(MAX_MENU_HEIGHT))
-                .on_mouse_down_out(cx.listener(|this, _, _, cx| {
-                    this.hide(cx);
-                })),
-        )
-        .into_any_element()
-    }
-}

crates/ui/src/input/popovers/completion_menu.rs

@@ -1,446 +0,0 @@
-use std::rc::Rc;
-
-use gpui::prelude::FluentBuilder;
-use gpui::{
-    Action, AnyElement, App, AppContext, Context, DismissEvent, Empty, Entity, EventEmitter,
-    Half as _, HighlightStyle, InteractiveElement as _, IntoElement, ParentElement, Pixels, Point,
-    Render, RenderOnce, SharedString, Styled, StyledText, Subscription, Window, deferred, div, px,
-    relative,
-};
-use lsp_types::{CompletionItem, CompletionTextEdit};
-use theme::ActiveTheme;
-
-const MAX_MENU_WIDTH: Pixels = px(320.);
-const MAX_MENU_HEIGHT: Pixels = px(240.);
-const POPOVER_GAP: Pixels = px(4.);
-
-use crate::input::popovers::{editor_popover, render_markdown};
-use crate::input::{self, InputState, RopeExt};
-use crate::list::{List, ListDelegate, ListEvent, ListState};
-use crate::{IndexPath, Selectable, actions, h_flex};
-
-struct ContextMenuDelegate {
-    query: SharedString,
-    menu: Entity<CompletionMenu>,
-    items: Vec<Rc<CompletionItem>>,
-    selected_ix: usize,
-}
-
-impl ContextMenuDelegate {
-    fn set_items(&mut self, items: Vec<CompletionItem>) {
-        self.items = items.into_iter().map(Rc::new).collect();
-        self.selected_ix = 0;
-    }
-
-    fn selected_item(&self) -> Option<&Rc<CompletionItem>> {
-        self.items.get(self.selected_ix)
-    }
-}
-
-#[derive(IntoElement)]
-struct CompletionMenuItem {
-    ix: usize,
-    item: Rc<CompletionItem>,
-    children: Vec<AnyElement>,
-    selected: bool,
-    highlight_prefix: SharedString,
-}
-
-impl CompletionMenuItem {
-    fn new(ix: usize, item: Rc<CompletionItem>) -> Self {
-        Self {
-            ix,
-            item,
-            children: vec![],
-            selected: false,
-            highlight_prefix: "".into(),
-        }
-    }
-
-    fn highlight_prefix(mut self, s: impl Into<SharedString>) -> Self {
-        self.highlight_prefix = s.into();
-        self
-    }
-}
-impl Selectable for CompletionMenuItem {
-    fn selected(mut self, selected: bool) -> Self {
-        self.selected = selected;
-        self
-    }
-
-    fn is_selected(&self) -> bool {
-        self.selected
-    }
-}
-
-impl ParentElement for CompletionMenuItem {
-    fn extend(&mut self, elements: impl IntoIterator<Item = AnyElement>) {
-        self.children.extend(elements);
-    }
-}
-
-impl RenderOnce for CompletionMenuItem {
-    fn render(self, _: &mut Window, cx: &mut App) -> impl IntoElement {
-        let item = self.item;
-
-        let matched_len = item
-            .filter_text
-            .as_ref()
-            .map(|s| s.len())
-            .unwrap_or(self.highlight_prefix.len())
-            .min(item.label.len());
-
-        let highlights = vec![(
-            0..matched_len,
-            HighlightStyle {
-                color: Some(cx.theme().selection),
-                ..Default::default()
-            },
-        )];
-
-        h_flex()
-            .id(self.ix)
-            .gap_2()
-            .p_1()
-            .text_xs()
-            .line_height(relative(1.))
-            .rounded(cx.theme().radius.half())
-            .when(item.deprecated.unwrap_or(false), |this| this.line_through())
-            .hover(|this| this.bg(cx.theme().secondary_hover))
-            .when(self.selected, |this| {
-                this.bg(cx.theme().secondary_background)
-                    .text_color(cx.theme().secondary_foreground)
-            })
-            .child(div().child(StyledText::new(item.label.clone()).with_highlights(highlights)))
-            .children(self.children)
-    }
-}
-
-impl EventEmitter<DismissEvent> for ContextMenuDelegate {}
-
-impl ListDelegate for ContextMenuDelegate {
-    type Item = CompletionMenuItem;
-
-    fn items_count(&self, _: usize, _: &gpui::App) -> usize {
-        self.items.len()
-    }
-
-    fn render_item(
-        &mut self,
-        ix: crate::IndexPath,
-        _: &mut Window,
-        _: &mut Context<ListState<Self>>,
-    ) -> Option<Self::Item> {
-        let item = self.items.get(ix.row)?;
-        Some(CompletionMenuItem::new(ix.row, item.clone()).highlight_prefix(self.query.clone()))
-    }
-
-    fn set_selected_index(
-        &mut self,
-        ix: Option<crate::IndexPath>,
-        _: &mut Window,
-        cx: &mut Context<ListState<Self>>,
-    ) {
-        self.selected_ix = ix.map(|i| i.row).unwrap_or(0);
-        cx.notify();
-    }
-
-    fn confirm(&mut self, _: bool, window: &mut Window, cx: &mut Context<ListState<Self>>) {
-        let Some(item) = self.selected_item() else {
-            return;
-        };
-
-        self.menu.update(cx, |this, cx| {
-            this.select_item(&item, window, cx);
-        });
-    }
-}
-
-/// A context menu for code completions and code actions.
-pub struct CompletionMenu {
-    offset: usize,
-    editor: Entity<InputState>,
-    list: Entity<ListState<ContextMenuDelegate>>,
-    open: bool,
-
-    /// The offset of the first character that triggered the completion.
-    pub(crate) trigger_start_offset: Option<usize>,
-    query: SharedString,
-    _subscriptions: Vec<Subscription>,
-}
-
-impl CompletionMenu {
-    /// Creates a new `CompletionMenu` with the given offset and completion items.
-    ///
-    /// NOTE: This element should not call from InputState::new, unless that will stack overflow.
-    pub(crate) fn new(
-        editor: Entity<InputState>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Entity<Self> {
-        cx.new(|cx| {
-            let view = cx.entity();
-            let menu = ContextMenuDelegate {
-                query: SharedString::default(),
-                menu: view,
-                items: vec![],
-                selected_ix: 0,
-            };
-
-            let list = cx.new(|cx| ListState::new(menu, window, cx));
-
-            let _subscriptions =
-                vec![
-                    cx.subscribe(&list, |this: &mut Self, _, ev: &ListEvent, cx| {
-                        match ev {
-                            ListEvent::Confirm(_) => {
-                                this.hide(cx);
-                            }
-                            _ => {}
-                        }
-                        cx.notify();
-                    }),
-                ];
-
-            Self {
-                offset: 0,
-                editor,
-                list,
-                open: false,
-                trigger_start_offset: None,
-                query: SharedString::default(),
-                _subscriptions,
-            }
-        })
-    }
-
-    fn select_item(&mut self, item: &CompletionItem, window: &mut Window, cx: &mut Context<Self>) {
-        let offset = self.offset;
-        let item = item.clone();
-        let mut range = self.trigger_start_offset.unwrap_or(self.offset)..self.offset;
-
-        let editor = self.editor.clone();
-
-        cx.spawn_in(window, async move |_, cx| {
-            editor.update_in(cx, |editor, window, cx| {
-                editor.completion_inserting = true;
-
-                let mut new_text = item.label.clone();
-                if let Some(text_edit) = item.text_edit.as_ref() {
-                    match text_edit {
-                        CompletionTextEdit::Edit(edit) => {
-                            new_text = edit.new_text.clone();
-                            range.start = editor.text.position_to_offset(&edit.range.start);
-                            range.end = editor.text.position_to_offset(&edit.range.end);
-                        }
-                        CompletionTextEdit::InsertAndReplace(edit) => {
-                            new_text = edit.new_text.clone();
-                            range.start = editor.text.position_to_offset(&edit.replace.start);
-                            range.end = editor.text.position_to_offset(&edit.replace.end);
-                        }
-                    }
-                } else if let Some(insert_text) = item.insert_text.clone() {
-                    new_text = insert_text;
-                    range = offset..offset;
-                }
-
-                editor.replace_text_in_range_silent(
-                    Some(editor.range_to_utf16(&range)),
-                    &new_text,
-                    window,
-                    cx,
-                );
-                editor.completion_inserting = false;
-                // FIXME: Input not get the focus
-                editor.focus(window, cx);
-            })
-        })
-        .detach();
-
-        self.hide(cx);
-    }
-
-    pub(crate) fn handle_action(
-        &mut self,
-        action: Box<dyn Action>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) -> bool {
-        if !self.open {
-            return false;
-        }
-
-        cx.propagate();
-        if input::Enter::is_primary(&*action) {
-            self.on_action_enter(window, cx);
-        } else if action.partial_eq(&input::Escape) {
-            self.on_action_escape(window, cx);
-        } else if action.partial_eq(&input::MoveUp) {
-            self.on_action_up(window, cx);
-        } else if action.partial_eq(&input::MoveDown) {
-            self.on_action_down(window, cx);
-        } else {
-            return false;
-        }
-
-        true
-    }
-
-    fn on_action_enter(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let Some(item) = self.list.read(cx).delegate().selected_item().cloned() else {
-            return;
-        };
-        self.select_item(&item, window, cx);
-    }
-
-    fn on_action_escape(&mut self, _: &mut Window, cx: &mut Context<Self>) {
-        self.hide(cx);
-    }
-
-    fn on_action_up(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.list.update(cx, |this, cx| {
-            this.on_action_select_prev(&actions::SelectUp, window, cx)
-        });
-    }
-
-    fn on_action_down(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.list.update(cx, |this, cx| {
-            this.on_action_select_next(&actions::SelectDown, window, cx)
-        });
-    }
-
-    pub(crate) fn is_open(&self) -> bool {
-        self.open
-    }
-
-    /// Hide the completion menu and reset the trigger start offset.
-    pub(crate) fn hide(&mut self, cx: &mut Context<Self>) {
-        self.open = false;
-        self.trigger_start_offset = None;
-        cx.notify();
-    }
-
-    /// Sets the trigger start offset if it is not already set.
-    pub(crate) fn update_query(&mut self, start_offset: usize, query: impl Into<SharedString>) {
-        if self.trigger_start_offset.is_none() {
-            self.trigger_start_offset = Some(start_offset);
-        }
-        self.query = query.into();
-    }
-
-    pub(crate) fn show(
-        &mut self,
-        offset: usize,
-        items: impl Into<Vec<CompletionItem>>,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        let items = items.into();
-        self.offset = offset;
-        self.open = true;
-        self.list.update(cx, |this, cx| {
-            let longest_ix = items
-                .iter()
-                .enumerate()
-                .max_by_key(|(_, item)| {
-                    item.label.len() + item.detail.as_ref().map(|d| d.len()).unwrap_or(0)
-                })
-                .map(|(ix, _)| ix)
-                .unwrap_or(0);
-
-            this.delegate_mut().query = self.query.clone();
-            this.delegate_mut().set_items(items);
-            this.set_selected_index(Some(IndexPath::new(0)), window, cx);
-            this.set_item_to_measure_index(IndexPath::new(longest_ix), window, cx);
-        });
-
-        cx.notify();
-    }
-
-    fn origin(&self, cx: &App) -> Option<Point<Pixels>> {
-        let editor = self.editor.read(cx);
-        let Some(last_layout) = editor.last_layout.as_ref() else {
-            return None;
-        };
-        let Some(cursor_origin) = last_layout.cursor_bounds.map(|b| b.origin) else {
-            return None;
-        };
-
-        let scroll_origin = self.editor.read(cx).scroll_handle.offset();
-
-        Some(
-            scroll_origin + cursor_origin - editor.input_bounds.origin
-                + Point::new(-px(4.), last_layout.line_height + px(4.)),
-        )
-    }
-}
-
-impl Render for CompletionMenu {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        if !self.open {
-            return Empty.into_any_element();
-        }
-
-        if self.list.read(cx).delegate().items.is_empty() {
-            self.open = false;
-            return Empty.into_any_element();
-        }
-
-        let Some(pos) = self.origin(cx) else {
-            return Empty.into_any_element();
-        };
-
-        let selected_documentation = self
-            .list
-            .read(cx)
-            .delegate()
-            .selected_item()
-            .and_then(|item| item.documentation.clone());
-
-        let max_width = MAX_MENU_WIDTH.min(window.bounds().size.width - pos.x);
-        let abs_pos = self.editor.read(cx).input_bounds.origin + pos;
-        let vertical_layout =
-            abs_pos.x + MAX_MENU_WIDTH + POPOVER_GAP + MAX_MENU_WIDTH + POPOVER_GAP
-                > window.bounds().size.width;
-
-        deferred(
-            div()
-                .absolute()
-                .left(pos.x)
-                .top(pos.y)
-                .flex()
-                .flex_row()
-                .gap(POPOVER_GAP)
-                .items_start()
-                .when(vertical_layout, |this| this.flex_col())
-                .child(
-                    editor_popover("completion-menu", cx)
-                        .max_w(max_width)
-                        .min_w(px(120.))
-                        .child(List::new(&self.list).max_h(MAX_MENU_HEIGHT)),
-                )
-                .when_some(selected_documentation, |this, documentation| {
-                    let mut doc = match documentation {
-                        lsp_types::Documentation::String(s) => s.clone(),
-                        lsp_types::Documentation::MarkupContent(mc) => mc.value.clone(),
-                    };
-                    if vertical_layout {
-                        doc = doc.split("\n").next().unwrap_or_default().to_string();
-                    }
-
-                    this.child(
-                        div().child(
-                            editor_popover("completion-menu", cx)
-                                .w(MAX_MENU_WIDTH)
-                                .px_2()
-                                .child(render_markdown("doc", doc, window, cx)),
-                        ),
-                    )
-                })
-                .on_mouse_down_out(cx.listener(|this, _, _, cx| {
-                    this.hide(cx);
-                })),
-        )
-        .into_any_element()
-    }
-}

crates/ui/src/input/popovers/context_menu.rs

@@ -1,142 +0,0 @@
-use gpui::prelude::FluentBuilder as _;
-use gpui::{
-    Anchor, App, AppContext as _, Context, DismissEvent, Entity, IntoElement, MouseDownEvent,
-    ParentElement as _, Pixels, Point, Render, Styled, Subscription, Window, anchored, deferred,
-    div, px,
-};
-
-use crate::input::popovers::ContextMenu;
-use crate::input::{self, InputState};
-use crate::menu::PopupMenu;
-
-/// Context menu for mouse right clicks.
-pub(crate) struct InputContextMenu {
-    editor: Entity<InputState>,
-    menu: Entity<PopupMenu>,
-    mouse_position: Point<Pixels>,
-    open: bool,
-
-    _subscriptions: Vec<Subscription>,
-}
-
-impl InputState {
-    pub(crate) fn handle_right_click_menu(
-        &mut self,
-        event: &MouseDownEvent,
-        offset: usize,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
-        // Show Mouse context menu
-        if !self.selected_range.contains(offset) {
-            self.move_to(offset, None, cx);
-        }
-
-        self.context_menu_content = Some(ContextMenu::RightClick(self.context_menu.clone()));
-
-        let is_code_editor = self.mode.is_code_editor();
-        if is_code_editor {
-            self.handle_hover_definition(offset, window, cx);
-        }
-
-        let is_enable = !self.disabled;
-        let has_goto_definition = is_enable && self.lsp.definition_provider.is_some();
-        let has_code_action = is_enable && !self.lsp.code_action_providers.is_empty();
-        let is_selected = !self.selected_range.is_empty();
-        let has_paste = is_enable && cx.read_from_clipboard().is_some();
-
-        let action_context = self.focus_handle.clone();
-        self.context_menu.update(cx, |this, cx| {
-            this.mouse_position = event.position;
-            this.menu.update(cx, |menu, cx| {
-                let new_menu = if let Some(builder) = &self.context_menu_builder {
-                    builder(PopupMenu::new(cx), window, cx)
-                } else {
-                    PopupMenu::new(cx)
-                        .when(is_code_editor, |m| {
-                            m.menu_with_enable(
-                                "Go to Definition",
-                                Box::new(input::GoToDefinition),
-                                has_goto_definition,
-                            )
-                            .menu_with_enable(
-                                "Show Code Actions",
-                                Box::new(input::ToggleCodeActions),
-                                has_code_action,
-                            )
-                            .separator()
-                        })
-                        .menu_with_enable("Cut", Box::new(input::Cut), is_enable && is_selected)
-                        .menu_with_enable("Copy", Box::new(input::Copy), is_selected)
-                        .menu_with_enable("Paste", Box::new(input::Paste), has_paste)
-                        .separator()
-                        .menu("Select All", Box::new(input::SelectAll))
-                };
-
-                menu.menu_items = new_menu.menu_items;
-                menu.action_context = Some(action_context);
-                cx.notify();
-            });
-            cx.defer_in(window, |this, _, cx| {
-                this.open = true;
-                cx.notify();
-            });
-        });
-    }
-}
-
-impl InputContextMenu {
-    pub(crate) fn new(
-        editor: Entity<InputState>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Entity<Self> {
-        cx.new(|cx| {
-            let menu = cx.new(|cx| PopupMenu::new(cx).small());
-
-            let _subscriptions = vec![cx.subscribe_in(&menu, window, {
-                move |this: &mut Self, _, _: &DismissEvent, window, cx| {
-                    this.close(window, cx);
-                }
-            })];
-
-            Self {
-                editor,
-                menu,
-                mouse_position: Point::default(),
-                open: false,
-                _subscriptions,
-            }
-        })
-    }
-
-    #[inline]
-    pub(crate) fn is_open(&self) -> bool {
-        self.open
-    }
-
-    #[inline]
-    pub(crate) fn close(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        self.open = false;
-        self.editor.update(cx, |this, cx| {
-            this.focus(window, cx);
-        });
-    }
-}
-
-impl Render for InputContextMenu {
-    fn render(&mut self, _: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
-        if !self.open {
-            return div().into_any_element();
-        }
-
-        deferred(
-            anchored()
-                .snap_to_window_with_margin(px(8.))
-                .anchor(Anchor::TopLeft)
-                .position(self.mouse_position)
-                .child(div().cursor_default().child(self.menu.clone())),
-        )
-        .into_any_element()
-    }
-}

crates/ui/src/input/popovers/diagnostic_popover.rs

@@ -1,95 +0,0 @@
-use std::rc::Rc;
-
-use gpui::{
-    prelude::FluentBuilder as _, px, App, AppContext as _, Bounds, Context, Empty, Entity,
-    IntoElement, Pixels, Point, Render, Styled, Window,
-};
-
-use crate::{
-    highlighter::DiagnosticEntry,
-    input::{
-        popovers::{render_markdown, Popover},
-        InputState,
-    },
-};
-
-pub struct DiagnosticPopover {
-    state: Entity<InputState>,
-    pub(crate) diagnostic: Rc<DiagnosticEntry>,
-    bounds: Bounds<Pixels>,
-    open: bool,
-}
-
-impl DiagnosticPopover {
-    pub fn new(
-        diagnostic: &DiagnosticEntry,
-        state: Entity<InputState>,
-        cx: &mut App,
-    ) -> Entity<Self> {
-        let diagnostic = Rc::new(diagnostic.clone());
-
-        cx.new(|_| Self {
-            diagnostic,
-            state,
-            bounds: Bounds::default(),
-            open: true,
-        })
-    }
-
-    pub(crate) fn show(&mut self, cx: &mut Context<Self>) {
-        self.open = true;
-        cx.notify();
-    }
-
-    pub(crate) fn hide(&mut self, cx: &mut Context<Self>) {
-        self.open = false;
-        cx.notify();
-    }
-
-    pub(crate) fn check_to_hide(&mut self, mouse_position: Point<Pixels>, cx: &mut Context<Self>) {
-        if !self.open {
-            return;
-        }
-
-        let padding = px(5.);
-        let bounds = Bounds {
-            origin: self.bounds.origin.map(|v| v - padding),
-            size: self.bounds.size.map(|v| v + padding * 2.),
-        };
-
-        if !bounds.contains(&mouse_position) {
-            self.hide(cx);
-        }
-    }
-}
-
-impl Render for DiagnosticPopover {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        if !self.open {
-            return Empty.into_any_element();
-        }
-
-        let message = self.diagnostic.message.clone();
-
-        let (border, bg, fg) = (
-            self.diagnostic.severity.border(cx),
-            self.diagnostic.severity.bg(cx),
-            self.diagnostic.severity.fg(cx),
-        );
-
-        Popover::new(
-            "diagnostic-popover",
-            self.state.clone(),
-            self.diagnostic.range.clone(),
-            move |window, cx| render_markdown("message", message.clone(), window, cx),
-        )
-        .when(!self.open, |this| this.invisible())
-        .px_1()
-        .py_0p5()
-        .bg(bg)
-        .text_color(fg)
-        .border_1()
-        .border_color(border)
-        .into_any_element()
-    }
-}

crates/ui/src/input/popovers/hover_popover.rs

@@ -1,292 +0,0 @@
-use std::{ops::Range, rc::Rc};
-
-use gpui::{
-    AnyElement, App, AppContext as _, AvailableSpace, Bounds, Element, ElementId, Entity,
-    InteractiveElement, IntoElement, MouseDownEvent, MouseMoveEvent, ParentElement as _, Pixels,
-    Render, StatefulInteractiveElement as _, StyleRefinement, Styled, Window, deferred, div, point,
-    px,
-};
-
-use crate::{
-    StyledExt,
-    input::{InputState, popovers::render_markdown},
-};
-
-pub struct HoverPopover {
-    editor: Entity<InputState>,
-    /// The symbol range byte of the hover trigger.
-    pub(crate) symbol_range: Range<usize>,
-    pub(crate) hover: Rc<lsp_types::Hover>,
-}
-
-impl HoverPopover {
-    pub fn new(
-        editor: Entity<InputState>,
-        symbol_range: Range<usize>,
-        hover: &lsp_types::Hover,
-        cx: &mut App,
-    ) -> Entity<Self> {
-        let hover = Rc::new(hover.clone());
-
-        cx.new(|_| Self {
-            editor,
-            symbol_range,
-            hover,
-        })
-    }
-
-    pub(crate) fn is_same(&self, offset: usize) -> bool {
-        self.symbol_range.contains(&offset)
-    }
-}
-
-impl Render for HoverPopover {
-    fn render(&mut self, _: &mut Window, _: &mut gpui::Context<Self>) -> impl IntoElement {
-        let contents = match self.hover.contents.clone() {
-            lsp_types::HoverContents::Scalar(scalar) => match scalar {
-                lsp_types::MarkedString::String(s) => s,
-                lsp_types::MarkedString::LanguageString(ls) => ls.value,
-            },
-            lsp_types::HoverContents::Array(arr) => arr
-                .into_iter()
-                .map(|item| match item {
-                    lsp_types::MarkedString::String(s) => s,
-                    lsp_types::MarkedString::LanguageString(ls) => ls.value,
-                })
-                .collect::<Vec<_>>()
-                .join("\n\n"),
-            lsp_types::HoverContents::Markup(markup) => markup.value,
-        };
-
-        Popover::new(
-            "hover-popover",
-            self.editor.clone(),
-            self.symbol_range.clone(),
-            move |window, cx| render_markdown("message", contents.clone(), window, cx),
-        )
-        .into_any_element()
-    }
-}
-
-pub(crate) struct Popover {
-    id: ElementId,
-    style: StyleRefinement,
-    editor: Entity<InputState>,
-    range: Range<usize>,
-    width_limit: Range<Pixels>,
-    content_builder: Box<dyn Fn(&mut Window, &mut App) -> AnyElement>,
-}
-
-impl Styled for Popover {
-    fn style(&mut self) -> &mut StyleRefinement {
-        &mut self.style
-    }
-}
-
-impl Popover {
-    pub fn new<F, E>(
-        id: impl Into<ElementId>,
-        editor: Entity<InputState>,
-        range: Range<usize>,
-        f: F,
-    ) -> Self
-    where
-        F: Fn(&mut Window, &mut App) -> E + 'static,
-        E: IntoElement,
-    {
-        Self {
-            id: id.into(),
-            editor,
-            range,
-            style: StyleRefinement::default(),
-            width_limit: px(200.)..px(500.),
-            content_builder: Box::new(move |window, cx| (f)(window, cx).into_any_element()),
-        }
-    }
-
-    /// Get the bounds of the range in the editor, if it is visible.
-    fn trigger_bounds(&self, cx: &App) -> Option<Bounds<Pixels>> {
-        let editor = self.editor.read(cx);
-        let Some(last_layout) = editor.last_layout.as_ref() else {
-            return None;
-        };
-
-        let Some(last_bounds) = editor.last_bounds else {
-            return None;
-        };
-
-        let (_, _, start_pos) = editor.line_and_position_for_offset(self.range.start);
-        let (_, _, end_pos) = editor.line_and_position_for_offset(self.range.end);
-
-        let Some(start_pos) = start_pos else {
-            return None;
-        };
-        let Some(end_pos) = end_pos else {
-            return None;
-        };
-
-        Some(Bounds::from_corners(
-            last_bounds.origin + start_pos,
-            last_bounds.origin + end_pos + point(px(0.), last_layout.line_height),
-        ))
-    }
-}
-
-impl IntoElement for Popover {
-    type Element = Self;
-
-    fn into_element(self) -> Self::Element {
-        self
-    }
-}
-
-pub(crate) struct PopoverLayoutState {
-    bounds: Bounds<Pixels>,
-    element: Option<AnyElement>,
-}
-
-impl Element for Popover {
-    type RequestLayoutState = PopoverLayoutState;
-    type PrepaintState = ();
-
-    fn id(&self) -> Option<ElementId> {
-        Some(self.id.clone())
-    }
-
-    fn source_location(&self) -> Option<&'static std::panic::Location<'static>> {
-        None
-    }
-
-    fn request_layout(
-        &mut self,
-        _: Option<&gpui::GlobalElementId>,
-        _: Option<&gpui::InspectorElementId>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> (gpui::LayoutId, Self::RequestLayoutState) {
-        let trigger_bounds = match self.trigger_bounds(cx) {
-            Some(bounds) => bounds,
-            None => {
-                return (
-                    div().into_any_element().request_layout(window, cx),
-                    PopoverLayoutState {
-                        bounds: Bounds::default(),
-                        element: None,
-                    },
-                );
-            }
-        };
-
-        let max_width = self
-            .width_limit
-            .end
-            .min(window.bounds().size.width - SNAP_TO_EDGE * 2)
-            .max(px(200.));
-        let max_height = (window.bounds().size.height - SNAP_TO_EDGE * 2).min(px(320.));
-
-        let mut popover = deferred(
-            div()
-                .id("hover-popover-content")
-                .flex_none()
-                .occlude()
-                .p_1()
-                .text_xs()
-                .popover_style(cx)
-                .shadow_md()
-                .max_w(max_width)
-                .max_h(max_height)
-                .overflow_y_scroll()
-                .refine_style(&self.style)
-                .child((self.content_builder)(window, cx)),
-        )
-        .into_any_element();
-
-        let popover_size = popover.layout_as_root(AvailableSpace::min_size(), window, cx);
-        const SNAP_TO_EDGE: Pixels = px(8.);
-        let top_space = trigger_bounds.top() - SNAP_TO_EDGE;
-        let right_space = window.bounds().size.width - trigger_bounds.left() - SNAP_TO_EDGE;
-
-        let mut pos = point(
-            trigger_bounds.left(),
-            trigger_bounds.top() - popover_size.height,
-        );
-        if popover_size.height > top_space {
-            pos.y = trigger_bounds.bottom();
-        }
-        if popover_size.width > right_space {
-            pos.x = trigger_bounds.right() - popover_size.width;
-        }
-
-        let mut empty = div().into_any_element();
-        let layout_id = empty.request_layout(window, cx);
-        (
-            layout_id,
-            PopoverLayoutState {
-                bounds: Bounds {
-                    origin: pos,
-                    size: popover_size,
-                },
-                element: Some(popover),
-            },
-        )
-    }
-
-    fn prepaint(
-        &mut self,
-        _: Option<&gpui::GlobalElementId>,
-        _: Option<&gpui::InspectorElementId>,
-        _: Bounds<Pixels>,
-        request_layout: &mut Self::RequestLayoutState,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Self::PrepaintState {
-        let bounds = request_layout.bounds;
-        let Some(popover) = request_layout.element.as_mut() else {
-            return;
-        };
-
-        window.with_absolute_element_offset(bounds.origin, |window| {
-            popover.prepaint(window, cx);
-        })
-    }
-
-    fn paint(
-        &mut self,
-        _: Option<&gpui::GlobalElementId>,
-        _: Option<&gpui::InspectorElementId>,
-        _: Bounds<Pixels>,
-        request_layout: &mut Self::RequestLayoutState,
-        _: &mut Self::PrepaintState,
-        window: &mut Window,
-        cx: &mut App,
-    ) {
-        let bounds = request_layout.bounds;
-        let Some(popover) = request_layout.element.as_mut() else {
-            return;
-        };
-
-        popover.paint(window, cx);
-
-        let editor = self.editor.clone();
-        // Mouse down out to hide.
-        window.on_mouse_event(move |event: &MouseDownEvent, _, _, cx| {
-            if !bounds.contains(&event.position) {
-                let _ = editor.update(cx, |editor, cx| {
-                    editor.clear_hover_state(cx);
-                });
-            }
-        });
-
-        // Mouse out of trigger + popover bounds
-        let editor = self.editor.clone();
-        let trigger_bounds = self.trigger_bounds(cx).unwrap_or(bounds);
-        let keep_open_region = trigger_bounds.union(&bounds);
-        window.on_mouse_event(move |event: &MouseMoveEvent, _, _, cx| {
-            if !keep_open_region.contains(&event.position) {
-                let _ = editor.update(cx, |editor, cx| {
-                    editor.clear_hover_state(cx);
-                });
-            }
-        })
-    }
-}

crates/ui/src/input/popovers/mod.rs

@@ -1,41 +0,0 @@
-mod code_action_menu;
-mod completion_menu;
-mod context_menu;
-mod diagnostic_popover;
-mod hover_popover;
-
-pub(crate) use code_action_menu::*;
-pub(crate) use completion_menu::*;
-pub(crate) use context_menu::*;
-pub(crate) use diagnostic_popover::*;
-use gpui::{
-    App, Div, ElementId, Entity, InteractiveElement as _, IntoElement, SharedString, Stateful,
-    StyleRefinement, Styled as _, Window, div, px, rems,
-};
-pub(crate) use hover_popover::*;
-
-use crate::StyledExt as _;
-
-pub(crate) enum ContextMenu {
-    Completion(Entity<CompletionMenu>),
-    CodeAction(Entity<CodeActionMenu>),
-    RightClick(Entity<InputContextMenu>),
-}
-
-impl ContextMenu {
-    pub(crate) fn is_open(&self, cx: &App) -> bool {
-        match self {
-            ContextMenu::Completion(menu) => menu.read(cx).is_open(),
-            ContextMenu::CodeAction(menu) => menu.read(cx).is_open(),
-            ContextMenu::RightClick(menu) => menu.read(cx).is_open(),
-        }
-    }
-
-    pub(crate) fn render(&self) -> impl IntoElement {
-        match self {
-            ContextMenu::Completion(menu) => menu.clone().into_any_element(),
-            ContextMenu::CodeAction(menu) => menu.clone().into_any_element(),
-            ContextMenu::RightClick(menu) => menu.clone().into_any_element(),
-        }
-    }
-}

crates/ui/src/input/rope_ext.rs

@@ -1,49 +1,70 @@
 use std::ops::Range;
 
-use ropey::{LineType, Rope, RopeSlice};
+use rope::{Point, Rope};
-use sum_tree::Bias;
-#[cfg(not(target_family = "wasm"))]
-pub use tree_sitter::{InputEdit, Point};
 
-#[cfg(target_family = "wasm")]
+use super::cursor::Position;
-/// Stub type for tree-sitter Point on WASM (tree-sitter not available).
+
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+/// An extension trait for `Rope` to provide additional utility methods.
-pub struct Point {
+pub trait RopeExt {
-    pub row: usize,
+    /// Get the line at the given row (0-based) index, including the `\r` at the end, but not `\n`.
-    pub column: usize,
+    ///
+    /// Return empty rope if the row (0-based) is out of bounds.
+    fn line(&self, row: usize) -> Rope;
+
+    /// Start offset of the line at the given row (0-based) index.
+    fn line_start_offset(&self, row: usize) -> usize;
+
+    /// Line the end offset (including `\n`) of the line at the given row (0-based) index.
+    ///
+    /// Return the end of the rope if the row is out of bounds.
+    fn line_end_offset(&self, row: usize) -> usize;
+
+    /// Return the number of lines in the rope.
+    fn lines_len(&self) -> usize;
+
+    /// Return the lines iterator.
+    ///
+    /// Each line is including the `\r` at the end, but not `\n`.
+    fn lines(&self) -> RopeLines;
+
+    /// Check is equal to another rope.
+    fn eq(&self, other: &Rope) -> bool;
+
+    /// Total number of characters in the rope.
+    fn chars_count(&self) -> usize;
+
+    /// Get char at the given offset (byte).
+    ///
+    /// If the offset is in the middle of a multi-byte character will panic.
+    ///
+    /// If the offset is out of bounds, return None.
+    fn char_at(&self, offset: usize) -> Option<char>;
+
+    /// Get the byte offset from the given line, column [`Position`] (0-based).
+    fn position_to_offset(&self, line_col: &Position) -> usize;
+
+    /// Get the line, column [`Position`] (0-based) from the given byte offset.
+    fn offset_to_position(&self, offset: usize) -> Position;
+
+    /// Get the word byte range at the given offset (byte).
+    #[allow(dead_code)]
+    fn word_range(&self, offset: usize) -> Option<Range<usize>>;
+
+    /// Get word at the given offset (byte).
+    #[allow(dead_code)]
+    fn word_at(&self, offset: usize) -> String;
 }
 
-#[cfg(target_family = "wasm")]
-impl Point {
-    pub fn new(row: usize, column: usize) -> Self {
-        Self { row, column }
-    }
-}
-
-#[cfg(target_family = "wasm")]
-/// Stub type for tree-sitter InputEdit on WASM (tree-sitter not available).
-#[derive(Debug, Clone, Copy)]
-pub struct InputEdit {
-    pub start_byte: usize,
-    pub old_end_byte: usize,
-    pub new_end_byte: usize,
-    pub start_position: Point,
-    pub old_end_position: Point,
-    pub new_end_position: Point,
-}
-
-pub type Position = lsp_types::Position;
-
 /// An iterator over the lines of a `Rope`.
-pub struct RopeLines<'a> {
+pub struct RopeLines {
-    rope: &'a Rope,
     row: usize,
     end_row: usize,
+    rope: Rope,
 }
 
-impl<'a> RopeLines<'a> {
+impl RopeLines {
     /// Create a new `RopeLines` iterator.
-    pub fn new(rope: &'a Rope) -> Self {
+    pub fn new(rope: Rope) -> Self {
         let end_row = rope.lines_len();
         Self {
             row: 0,
@@ -52,8 +73,9 @@ impl<'a> RopeLines<'a> {
         }
     }
 }
-impl<'a> Iterator for RopeLines<'a> {
+
-    type Item = RopeSlice<'a>;
+impl Iterator for RopeLines {
+    type Item = Rope;
 
     #[inline]
     fn next(&mut self) -> Option<Self::Item> {
@@ -61,7 +83,7 @@ impl<'a> Iterator for RopeLines<'a> {
             return None;
         }
 
-        let line = self.rope.slice_line(self.row);
+        let line = self.rope.line(self.row);
         self.row += 1;
         Some(line)
     }
@@ -79,261 +101,23 @@ impl<'a> Iterator for RopeLines<'a> {
     }
 }
 
-impl std::iter::ExactSizeIterator for RopeLines<'_> {}
+impl std::iter::ExactSizeIterator for RopeLines {}
-impl std::iter::FusedIterator for RopeLines<'_> {}
+impl std::iter::FusedIterator for RopeLines {}
-
-/// An extension trait for [`Rope`] to provide additional utility methods.
-pub trait RopeExt {
-    /// Start offset of the line at the given row (0-based) index.
-    ///
-    /// # Example
-    ///
-    /// ```
-    /// use gpui_component::{Rope, RopeExt};
-    ///
-    /// let rope = Rope::from("Hello\nWorld\r\nThis is a test 中文\nRope");
-    /// assert_eq!(rope.line_start_offset(0), 0);
-    /// assert_eq!(rope.line_start_offset(1), 6);
-    /// ```
-    fn line_start_offset(&self, row: usize) -> usize;
-
-    /// Line the end offset (including `\n`) of the line at the given row (0-based) index.
-    ///
-    /// Return the end of the rope if the row is out of bounds.
-    ///
-    /// ```
-    /// use gpui_component::{Rope, RopeExt};
-    /// let rope = Rope::from("Hello\nWorld\r\nThis is a test 中文\nRope");
-    /// assert_eq!(rope.line_end_offset(0), 5); // "Hello\n"
-    /// assert_eq!(rope.line_end_offset(1), 12); // "World\r\n"
-    /// ```
-    fn line_end_offset(&self, row: usize) -> usize;
-
-    /// Return a line slice at the given row (0-based) index. including `\r` if present, but not `\n`.
-    ///
-    /// ```
-    /// use gpui_component::{Rope, RopeExt};
-    /// let rope = Rope::from("Hello\nWorld\r\nThis is a test 中文\nRope");
-    /// assert_eq!(rope.slice_line(0).to_string(), "Hello");
-    /// assert_eq!(rope.slice_line(1).to_string(), "World\r");
-    /// assert_eq!(rope.slice_line(2).to_string(), "This is a test 中文");
-    /// assert_eq!(rope.slice_line(6).to_string(), ""); // out of bounds
-    /// ```
-    fn slice_line(&self, row: usize) -> RopeSlice<'_>;
-
-    /// Return a slice of rows in the given range (0-based, end exclusive).
-    ///
-    /// If the range is out of bounds, it will be clamped to the valid range.
-    ///
-    /// ```
-    /// use gpui_component::{Rope, RopeExt};
-    /// let rope = Rope::from("Hello\nWorld\r\nThis is a test 中文\nRope");
-    /// assert_eq!(rope.slice_lines(0..2).to_string(), "Hello\nWorld\r");
-    /// assert_eq!(rope.slice_lines(1..3).to_string(), "World\r\nThis is a test 中文");
-    /// assert_eq!(rope.slice_lines(2..5).to_string(), "This is a test 中文\nRope");
-    /// assert_eq!(rope.slice_lines(3..10).to_string(), "Rope");
-    /// assert_eq!(rope.slice_lines(5..10).to_string(), ""); // out of bounds
-    /// ```
-    fn slice_lines(&self, rows_range: Range<usize>) -> RopeSlice<'_>;
-
-    /// Return an iterator over all lines in the rope.
-    ///
-    /// Each line slice includes `\r` if present, but not `\n`.
-    ///
-    /// ```
-    /// use gpui_component::{Rope, RopeExt};
-    /// let rope = Rope::from("Hello\nWorld\r\nThis is a test 中文\nRope");
-    /// let lines: Vec<_> = rope.iter_lines().map(|r| r.to_string()).collect();
-    /// assert_eq!(lines, vec!["Hello", "World\r", "This is a test 中文", "Rope"]);
-    /// ```
-    fn iter_lines(&self) -> RopeLines<'_>;
-
-    /// Return the number of lines in the rope.
-    ///
-    /// ```
-    /// use gpui_component::{Rope, RopeExt};
-    /// let rope = Rope::from("Hello\nWorld\r\nThis is a test 中文\nRope");
-    /// assert_eq!(rope.lines_len(), 4);
-    /// ```
-    fn lines_len(&self) -> usize;
-
-    /// Return the length of the row (0-based) in characters, including `\r` if present, but not `\n`.
-    ///
-    /// If the row is out of bounds, return 0.
-    ///
-    /// ```
-    /// use gpui_component::{Rope, RopeExt};
-    /// let rope = Rope::from("Hello\nWorld\r\nThis is a test 中文\nRope");
-    /// assert_eq!(rope.line_len(0), 5); // "Hello"
-    /// assert_eq!(rope.line_len(1), 6); // "World\r"
-    /// assert_eq!(rope.line_len(2), 21); // "This is a test 中文"
-    /// assert_eq!(rope.line_len(4), 0); // out of bounds
-    /// ```
-    fn line_len(&self, row: usize) -> usize;
-
-    /// Replace the text in the given byte range with new text.
-    ///
-    /// # Panics
-    ///
-    /// - If the range is not on char boundary.
-    /// - If the range is out of bounds.
-    ///
-    /// ```
-    /// use gpui_component::{Rope, RopeExt};
-    /// let mut rope = Rope::from("Hello\nWorld\r\nThis is a test 中文\nRope");
-    /// rope.replace(6..11, "Universe");
-    /// assert_eq!(rope.to_string(), "Hello\nUniverse\r\nThis is a test 中文\nRope");
-    /// ```
-    fn replace(&mut self, range: Range<usize>, new_text: &str);
-
-    /// Get char at the given offset (byte).
-    ///
-    /// - If the offset is in the middle of a multi-byte character will panic.
-    /// - If the offset is out of bounds, return None.
-    fn char_at(&self, offset: usize) -> Option<char>;
-
-    /// Get the byte offset from the given line, column [`Position`] (0-based).
-    ///
-    /// The column is in characters.
-    fn position_to_offset(&self, line_col: &Position) -> usize;
-
-    /// Get the line, column [`Position`] (0-based) from the given byte offset.
-    ///
-    /// The column is in characters.
-    fn offset_to_position(&self, offset: usize) -> Position;
-
-    /// Get point (row, column) from the given byte offset.
-    ///
-    /// The column is in bytes.
-    fn offset_to_point(&self, offset: usize) -> Point;
-
-    /// Get byte offset from the given point (row, column).
-    ///
-    /// The column is 0-based in bytes.
-    fn point_to_offset(&self, point: Point) -> usize;
-
-    /// Get the word byte range at the given byte offset (0-based).
-    fn word_range(&self, offset: usize) -> Option<Range<usize>>;
-
-    /// Get word at the given byte offset (0-based).
-    fn word_at(&self, offset: usize) -> String;
-
-    /// Convert offset in UTF-16 to byte offset (0-based).
-    ///
-    /// Runs in O(log N) time.
-    fn offset_utf16_to_offset(&self, offset_utf16: usize) -> usize;
-
-    /// Convert byte offset (0-based) to offset in UTF-16.
-    ///
-    /// Runs in O(log N) time.
-    fn offset_to_offset_utf16(&self, offset: usize) -> usize;
-
-    /// Get a clipped offset (avoid in a char boundary).
-    ///
-    /// - If Bias::Left and inside the char boundary, return the ix - 1;
-    /// - If Bias::Right and in inside char boundary, return the ix + 1;
-    /// - Otherwise return the ix.
-    ///
-    /// ```
-    /// use gpui_component::{Rope, RopeExt};
-    /// use sum_tree::Bias;
-    ///
-    /// let rope = Rope::from("Hello 中文🎉 test\nRope");
-    /// assert_eq!(rope.clip_offset(5, Bias::Left), 5);
-    /// // Inside multi-byte character '中' (3 bytes)
-    /// assert_eq!(rope.clip_offset(7, Bias::Left), 6);
-    /// assert_eq!(rope.clip_offset(7, Bias::Right), 9);
-    /// ```
-    fn clip_offset(&self, offset: usize, bias: Bias) -> usize;
-
-    /// Convert offset in characters to byte offset (0-based).
-    ///
-    /// Run in O(n) time.
-    ///
-    /// # Example
-    ///
-    /// ```
-    /// use gpui_component::{Rope, RopeExt};
-    /// let rope = Rope::from("a 中文🎉 test\nRope");
-    /// assert_eq!(rope.char_index_to_offset(0), 0);
-    /// assert_eq!(rope.char_index_to_offset(1), 1);
-    /// assert_eq!(rope.char_index_to_offset(3), "a 中".len());
-    /// assert_eq!(rope.char_index_to_offset(5), "a 中文🎉".len());
-    /// ```
-    fn char_index_to_offset(&self, char_index: usize) -> usize;
-
-    /// Convert byte offset (0-based) to offset in characters.
-    ///
-    /// Run in O(n) time.
-    ///
-    /// # Example
-    ///
-    /// ```
-    /// use gpui_component::{Rope, RopeExt};
-    /// let rope = Rope::from("a 中文🎉 test\nRope");
-    /// assert_eq!(rope.offset_to_char_index(0), 0);
-    /// assert_eq!(rope.offset_to_char_index(1), 1);
-    /// assert_eq!(rope.offset_to_char_index(3), 3);
-    /// assert_eq!(rope.offset_to_char_index(4), 3);
-    /// ```
-    fn offset_to_char_index(&self, offset: usize) -> usize;
-}
 
 impl RopeExt for Rope {
-    fn slice_line(&self, row: usize) -> RopeSlice<'_> {
+    fn line(&self, row: usize) -> Rope {
-        let total_lines = self.lines_len();
+        let start = self.line_start_offset(row);
-        if row >= total_lines {
+        let end = start + self.line_len(row as u32) as usize;
-            return self.slice(0..0);
-        }
-
-        let line = self.line(row, LineType::LF);
-        if line.len() > 0 {
-            let line_end = line.len() - 1;
-            if line.is_char_boundary(line_end) && line.char(line_end) == '\n' {
-                return line.slice(..line_end);
-            }
-        }
-
-        line
-    }
-
-    fn slice_lines(&self, rows_range: Range<usize>) -> RopeSlice<'_> {
-        let start = self.line_start_offset(rows_range.start);
-        let end = self.line_end_offset(rows_range.end.saturating_sub(1));
         self.slice(start..end)
     }
 
-    fn iter_lines(&self) -> RopeLines<'_> {
-        RopeLines::new(self)
-    }
-
-    fn line_len(&self, row: usize) -> usize {
-        self.slice_line(row).len()
-    }
-
     fn line_start_offset(&self, row: usize) -> usize {
+        let row = row as u32;
         self.point_to_offset(Point::new(row, 0))
     }
 
-    fn offset_to_point(&self, offset: usize) -> Point {
-        let offset = self.clip_offset(offset, Bias::Left);
-        let row = self.byte_to_line_idx(offset, LineType::LF);
-        let line_start = self.line_to_byte_idx(row, LineType::LF);
-        let column = offset.saturating_sub(line_start);
-        Point::new(row, column)
-    }
-
-    fn point_to_offset(&self, point: Point) -> usize {
-        if point.row >= self.lines_len() {
-            return self.len();
-        }
-
-        let line_start = self.line_to_byte_idx(point.row, LineType::LF);
-        line_start + point.column
-    }
-
     fn position_to_offset(&self, pos: &Position) -> usize {
-        let line = self.slice_line(pos.line as usize);
+        let line = self.line(pos.line as usize);
         self.line_start_offset(pos.line as usize)
             + line
                 .chars()
@@ -344,22 +128,34 @@ impl RopeExt for Rope {
 
     fn offset_to_position(&self, offset: usize) -> Position {
         let point = self.offset_to_point(offset);
-        let line = self.slice_line(point.row);
+        let line = self.line(point.row as usize);
-        let offset = line.utf16_to_byte_idx(line.byte_to_utf16_idx(point.column));
+        let column = line.clip_offset(point.column as usize, sum_tree::Bias::Left);
-        let character = line.slice(..offset).chars().count();
+        let character = line.slice(0..column).chars().count();
-        Position::new(point.row as u32, character as u32)
+        Position::new(point.row, character as u32)
     }
 
     fn line_end_offset(&self, row: usize) -> usize {
-        if row > self.lines_len() {
+        if row > self.max_point().row as usize {
             return self.len();
         }
 
-        self.line_start_offset(row) + self.line_len(row)
+        self.line_start_offset(row) + self.line_len(row as u32) as usize
     }
 
     fn lines_len(&self) -> usize {
-        self.len_lines(LineType::LF)
+        self.max_point().row as usize + 1
+    }
+
+    fn lines(&self) -> RopeLines {
+        RopeLines::new(self.clone())
+    }
+
+    fn eq(&self, other: &Rope) -> bool {
+        self.summary() == other.summary()
+    }
+
+    fn chars_count(&self) -> usize {
+        self.chars().count()
     }
 
     fn char_at(&self, offset: usize) -> Option<char> {
@@ -367,7 +163,8 @@ impl RopeExt for Rope {
             return None;
         }
 
-        self.get_char(offset).ok()
+        let offset = self.clip_offset(offset, sum_tree::Bias::Left);
+        self.slice(offset..self.len()).chars().next()
     }
 
     fn word_range(&self, offset: usize) -> Option<Range<usize>> {
@@ -375,9 +172,10 @@ impl RopeExt for Rope {
             return None;
         }
 
+        let offset = self.clip_offset(offset, sum_tree::Bias::Left);
+
         let mut left = String::new();
-        let offset = self.clip_offset(offset, Bias::Left);
+        for c in self.reversed_chars_at(offset) {
-        for c in self.chars_at(offset).reversed() {
             if c.is_alphanumeric() || c == '_' {
                 left.insert(0, c);
             } else {
@@ -393,7 +191,11 @@ impl RopeExt for Rope {
 
         let end = offset + right.len();
 
-        if start == end { None } else { Some(start..end) }
+        if start == end {
+            None
+        } else {
+            Some(start..end)
+        }
     }
 
     fn word_at(&self, offset: usize) -> String {
@@ -403,54 +205,4 @@ impl RopeExt for Rope {
             String::new()
         }
     }
-
-    #[inline]
-    fn offset_utf16_to_offset(&self, offset_utf16: usize) -> usize {
-        if offset_utf16 > self.len_utf16() {
-            return self.len();
-        }
-
-        self.utf16_to_byte_idx(offset_utf16)
-    }
-
-    #[inline]
-    fn offset_to_offset_utf16(&self, offset: usize) -> usize {
-        if offset > self.len() {
-            return self.len_utf16();
-        }
-
-        self.byte_to_utf16_idx(offset)
-    }
-
-    fn replace(&mut self, range: Range<usize>, new_text: &str) {
-        let range =
-            self.clip_offset(range.start, Bias::Left)..self.clip_offset(range.end, Bias::Right);
-        self.remove(range.clone());
-        self.insert(range.start, new_text);
-    }
-
-    fn clip_offset(&self, offset: usize, bias: Bias) -> usize {
-        if offset > self.len() {
-            return self.len();
-        }
-
-        if self.is_char_boundary(offset) {
-            return offset;
-        }
-
-        if bias == Bias::Left {
-            self.floor_char_boundary(offset)
-        } else {
-            self.ceil_char_boundary(offset)
-        }
-    }
-
-    fn char_index_to_offset(&self, char_offset: usize) -> usize {
-        self.chars().take(char_offset).map(|c| c.len_utf8()).sum()
-    }
-
-    fn offset_to_char_index(&self, offset: usize) -> usize {
-        let offset = self.clip_offset(offset, Bias::Right);
-        self.slice(..offset).chars().count()
-    }
 }

crates/ui/src/input/selection.rs

@@ -1,140 +0,0 @@
-use std::ops::Range;
-
-use gpui::{Context, Window};
-use ropey::Rope;
-use sum_tree::Bias;
-
-use crate::input::{InputState, RopeExt};
-
-impl InputState {
-    /// Select the word at the given offset on double-click.
-    ///
-    /// The offset is the UTF-8 offset.
-    pub(super) fn select_word(&mut self, offset: usize, _: &mut Window, cx: &mut Context<Self>) {
-        let Some(range) = TextSelector::word_range(&self.text, offset) else {
-            return;
-        };
-
-        self.selected_range = (range.start..range.end).into();
-        self.selected_word_range = Some(self.selected_range);
-        cx.notify()
-    }
-
-    /// Select the line at the given offset on triple-click.
-    ///
-    /// The offset is the UTF-8 offset.
-    pub(super) fn select_line(&mut self, offset: usize, _: &mut Window, cx: &mut Context<Self>) {
-        let range = TextSelector::line_range(&self.text, offset);
-        self.selected_range = (range.start..range.end).into();
-        self.selected_word_range = None;
-        cx.notify()
-    }
-}
-
-struct TextSelector;
-impl TextSelector {
-    /// Select a line in the given text at the specified offset.
-    ///
-    /// The offset is the UTF-8 offset.
-    ///
-    /// Returns the start and end offsets of the selected line.
-    pub fn line_range(text: &Rope, offset: usize) -> Range<usize> {
-        let offset = text.clip_offset(offset, Bias::Left);
-        let row = text.offset_to_point(offset).row;
-        let start = text.line_start_offset(row);
-        let end = text.line_end_offset(row);
-
-        start..end
-    }
-
-    /// Select a word in the given text at the specified offset.
-    ///
-    /// The offset is the UTF-8 offset.
-    ///
-    /// Returns the start and end offsets of the selected word.
-    pub fn word_range(text: &Rope, offset: usize) -> Option<Range<usize>> {
-        let offset = text.clip_offset(offset, Bias::Left);
-        let char = text.char_at(offset)?;
-        let end = offset + char.len_utf8();
-        let prev_chars = text.chars_at(offset).reversed().take(128);
-        let next_chars = text.chars_at(end).take(128);
-
-        Some(word_range_from_chars(offset, char, prev_chars, next_chars))
-    }
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub(crate) enum CharType {
-    /// a-z, A-Z, 0-9, _
-    Word,
-    /// '\t', ' ', '\u{00A0}' etc.
-    Whitespace,
-    /// \n, \r
-    Newline,
-    /// . , ; : ( ) [ ] { } ... or CJK characters: `汉`, `🎉` etc.
-    Other,
-}
-
-impl From<char> for CharType {
-    fn from(c: char) -> Self {
-        match c {
-            c if is_word_char(c) => CharType::Word,
-            c if c == '\n' || c == '\r' => CharType::Newline,
-            c if c.is_whitespace() => CharType::Whitespace,
-            _ => CharType::Other,
-        }
-    }
-}
-
-impl CharType {
-    fn is_connectable(self, c: char) -> bool {
-        matches!(
-            (self, CharType::from(c)),
-            (CharType::Word, CharType::Word) | (CharType::Whitespace, CharType::Whitespace)
-        )
-    }
-}
-
-fn is_word_char(c: char) -> bool {
-    matches!(c, '_')
-        // ASCII alphanumeric characters, for English, numbers: `Hello123`, etc.
-        || c.is_ascii_alphanumeric()
-        // Latin script in Unicode for French, German, Spanish, etc.
-        || matches!(c, '\u{00C0}'..='\u{00FF}')
-        || matches!(c, '\u{0100}'..='\u{017F}')
-        || matches!(c, '\u{0180}'..='\u{024F}')
-        // Cyrillic for Russian, Ukrainian, etc.
-        || matches!(c, '\u{0400}'..='\u{04FF}')
-        // Vietnamese
-        || matches!(c, '\u{1E00}'..='\u{1EFF}')
-        || matches!(c, '\u{0300}'..='\u{036F}')
-}
-
-pub(crate) fn word_range_from_chars(
-    offset: usize,
-    c: char,
-    prev_chars: impl Iterator<Item = char>,
-    next_chars: impl Iterator<Item = char>,
-) -> Range<usize> {
-    let char_type = CharType::from(c);
-    let mut start = offset;
-    let mut end = offset + c.len_utf8();
-
-    for prev in prev_chars.take(128) {
-        if char_type.is_connectable(prev) {
-            start -= prev.len_utf8();
-        } else {
-            break;
-        }
-    }
-
-    for next in next_chars.take(128) {
-        if char_type.is_connectable(next) {
-            end += next.len_utf8();
-        } else {
-            break;
-        }
-    }
-
-    start..end
-}

crates/ui/src/input/text_input.rs

@@ -1,30 +1,19 @@
 use gpui::prelude::FluentBuilder as _;
 use gpui::{
-    AnyElement, App, DefiniteLength, Edges, EdgesRefinement, Entity, Hsla, InteractiveElement as _,
+    div, px, relative, AnyElement, App, DefiniteLength, Entity, InteractiveElement as _,
     IntoElement, MouseButton, ParentElement as _, Rems, RenderOnce, StyleRefinement, Styled,
-    TextAlign, Window, div, px, relative,
+    Window,
 };
 use theme::ActiveTheme;
 
-use super::InputState;
+use super::clear_button::clear_button;
-use super::element::EditorScrollbar;
+use super::state::{InputState, CONTEXT};
-use crate::button::{Button, ButtonVariants as _};
+use crate::button::{Button, ButtonVariants};
 use crate::indicator::Indicator;
-use crate::input::clear_button;
+use crate::{h_flex, IconName, Sizable, Size, StyleSized, StyledExt};
-use crate::{IconName, Selectable, Sizable, Size, StyleSized, StyledExt, h_flex, v_flex};
 
-/// Returns `(background, foreground)` colors for input-like components.
-pub(crate) fn input_style(disabled: bool, cx: &App) -> (Hsla, Hsla) {
-    if disabled {
-        (cx.theme().surface_background, cx.theme().text_muted)
-    } else {
-        (cx.theme().elevated_surface_background, cx.theme().text)
-    }
-}
-
-/// A text input element bind to an [`InputState`].
 #[derive(IntoElement)]
-pub struct Input {
+pub struct TextInput {
     state: Entity<InputState>,
     style: StyleRefinement,
     size: Size,
@@ -37,30 +26,17 @@ pub struct Input {
     disabled: bool,
     bordered: bool,
     focus_bordered: bool,
-    tab_index: isize,
-    selected: bool,
 }
 
-impl Sizable for Input {
+impl Sizable for TextInput {
     fn with_size(mut self, size: impl Into<Size>) -> Self {
         self.size = size.into();
         self
     }
 }
 
-impl Selectable for Input {
+impl TextInput {
-    fn selected(mut self, selected: bool) -> Self {
+    /// Create a new [`TextInput`] element bind to the [`InputState`].
-        self.selected = selected;
-        self
-    }
-
-    fn is_selected(&self) -> bool {
-        self.selected
-    }
-}
-
-impl Input {
-    /// Create a new [`Input`] element bind to the [`InputState`].
     pub fn new(state: &Entity<InputState>) -> Self {
         Self {
             state: state.clone(),
@@ -75,8 +51,6 @@ impl Input {
             disabled: false,
             bordered: true,
             focus_bordered: true,
-            tab_index: 0,
-            selected: false,
         }
     }
 
@@ -120,9 +94,9 @@ impl Input {
         self
     }
 
-    /// Set whether to show the clear button when the input field is not empty, default is false.
+    /// Set true to show the clear button when the input field is not empty.
-    pub fn cleanable(mut self, cleanable: bool) -> Self {
+    pub fn cleanable(mut self) -> Self {
-        self.cleanable = cleanable;
+        self.cleanable = true;
         self
     }
 
@@ -138,123 +112,79 @@ impl Input {
         self
     }
 
-    /// Set the tab index for the input, default is 0.
+    fn render_toggle_mask_button(state: Entity<InputState>) -> impl IntoElement {
-    pub fn tab_index(mut self, index: isize) -> Self {
-        self.tab_index = index;
-        self
-    }
-
-    fn render_toggle_mask_button(state: &Entity<InputState>, cx: &App) -> impl IntoElement {
-        let _masked = state.read(cx).masked;
         Button::new("toggle-mask")
             .icon(IconName::Eye)
             .xsmall()
             .ghost()
-            .tab_stop(false)
+            .on_mouse_down(MouseButton::Left, {
-            .on_click({
                 let state = state.clone();
                 move |_, window, cx| {
                     state.update(cx, |state, cx| {
-                        state.set_masked(!state.masked, window, cx);
+                        state.set_masked(false, window, cx);
+                    })
+                }
+            })
+            .on_mouse_up(MouseButton::Left, {
+                let state = state.clone();
+                move |_, window, cx| {
+                    state.update(cx, |state, cx| {
+                        state.set_masked(true, window, cx);
                     })
                 }
             })
     }
-
-    /// This method must after the refine_style.
-    fn render_editor(
-        paddings: EdgesRefinement<DefiniteLength>,
-        input_state: &Entity<InputState>,
-        state: &InputState,
-        window: &Window,
-    ) -> impl IntoElement {
-        let base_size = window.text_style().font_size;
-        let rem_size = window.rem_size();
-
-        let paddings = Edges {
-            left: paddings
-                .left
-                .map(|v| v.to_pixels(base_size, rem_size))
-                .unwrap_or(px(0.)),
-            right: paddings
-                .right
-                .map(|v| v.to_pixels(base_size, rem_size))
-                .unwrap_or(px(0.)),
-            top: paddings
-                .top
-                .map(|v| v.to_pixels(base_size, rem_size))
-                .unwrap_or(px(0.)),
-            bottom: paddings
-                .bottom
-                .map(|v| v.to_pixels(base_size, rem_size))
-                .unwrap_or(px(0.)),
-        };
-
-        state.editor_scrollbar_paddings.set(paddings);
-        state.editor_scrollbar_snapshot.set(None);
-
-        v_flex().size_full().child(
-            div()
-                .relative()
-                .flex_1()
-                .child(input_state.clone())
-                .child(EditorScrollbar::new(input_state.clone())),
-        )
-    }
 }
 
-impl Styled for Input {
+impl Styled for TextInput {
     fn style(&mut self) -> &mut StyleRefinement {
         &mut self.style
     }
 }
 
-impl RenderOnce for Input {
+impl RenderOnce for TextInput {
     fn render(self, window: &mut Window, cx: &mut App) -> impl IntoElement {
         const LINE_HEIGHT: Rems = Rems(1.25);
-        let text_align = self.style.text.text_align.unwrap_or(TextAlign::Left);
 
-        self.state.update(cx, |state, _| {
+        let font = window.text_style().font();
+        let font_size = window.text_style().font_size.to_pixels(window.rem_size());
+
+        self.state.update(cx, |state, cx| {
+            state.text_wrapper.set_font(font, font_size, cx);
+            state.text_wrapper.prepare_if_need(&state.text, cx);
             state.disabled = self.disabled;
-            state.size = self.size;
-            // Only for single line mode
-            if state.mode.is_single_line() {
-                state.text_align = text_align;
-            }
         });
 
         let state = self.state.read(cx);
-        let _focused = state.focus_handle.is_focused(window) && !state.disabled;
+        let focused = state.focus_handle.is_focused(window) && !state.disabled;
 
         let gap_x = match self.size {
             Size::Small => px(4.),
             Size::Large => px(8.),
-            _ => px(6.),
+            _ => px(4.),
         };
 
-        let (bg, _) = input_style(state.disabled, cx);
+        let bg = if state.disabled {
-
-        let bg = if state.mode.is_code_editor() {
             cx.theme().surface_background
         } else {
-            bg
+            cx.theme().elevated_surface_background
         };
 
         let prefix = self.prefix;
         let suffix = self.suffix;
+
         let show_clear_button = self.cleanable
-            && !state.disabled
             && !state.loading
-            && state.text.len() > 0
+            && !state.text.is_empty()
             && state.mode.is_single_line();
+
         let has_suffix = suffix.is_some() || state.loading || self.mask_toggle || show_clear_button;
 
         div()
             .id(("input", self.state.entity_id()))
             .flex()
-            .key_context(crate::input::CONTEXT)
+            .key_context(CONTEXT)
-            .track_focus(&state.focus_handle.clone())
+            .track_focus(&state.focus_handle)
-            .tab_index(self.tab_index)
             .when(!state.disabled, |this| {
                 this.on_action(window.listener_for(&self.state, InputState::backspace))
                     .on_action(window.listener_for(&self.state, InputState::delete))
@@ -275,6 +205,9 @@ impl RenderOnce for Input {
                             .on_action(window.listener_for(&self.state, InputState::outdent_inline))
                             .on_action(window.listener_for(&self.state, InputState::indent_block))
                             .on_action(window.listener_for(&self.state, InputState::outdent_block))
+                            .on_action(
+                                window.listener_for(&self.state, InputState::shift_to_new_line),
+                            )
                     })
             })
             .on_action(window.listener_for(&self.state, InputState::left))
@@ -327,8 +260,8 @@ impl RenderOnce for Input {
             .input_px(self.size)
             .input_py(self.size)
             .input_h(self.size)
-            .input_font_size(self.size)
+            .cursor_text()
-            .when(!self.disabled, |this| this.cursor_text())
+            .text_size(font_size)
             .items_center()
             .when(state.mode.is_multi_line(), |this| {
                 this.h_auto()
@@ -336,34 +269,33 @@ impl RenderOnce for Input {
             })
             .when(self.appearance, |this| {
                 this.bg(bg)
-                    .when(self.disabled, |this| this.opacity(0.5))
                     .rounded(cx.theme().radius)
                     .when(self.bordered, |this| {
                         this.border_color(cx.theme().border)
                             .border_1()
                             .when(cx.theme().shadow, |this| this.shadow_xs())
+                            .when(focused && self.focus_bordered, |this| {
+                                this.border_color(cx.theme().border_focused)
+                            })
                     })
             })
             .items_center()
             .gap(gap_x)
             .refine_style(&self.style)
             .children(prefix)
-            .when(state.mode.is_multi_line(), |mut this| {
+            .child(self.state.clone())
-                let paddings = this.style().padding.clone();
-                this.child(Self::render_editor(paddings, &self.state, state, window))
-            })
-            .when(!state.mode.is_multi_line(), |this| {
-                this.child(self.state.clone())
-            })
             .when(has_suffix, |this| {
                 this.pr_2().child(
                     h_flex()
                         .id("suffix")
                         .gap(gap_x)
+                        .when(self.appearance, |this| this.bg(bg))
                         .items_center()
-                        .when(state.loading, |this| this.child(Indicator::new()))
+                        .when(state.loading, |this| {
+                            this.child(Indicator::new().color(cx.theme().text_muted))
+                        })
                         .when(self.mask_toggle, |this| {
-                            this.child(Self::render_toggle_mask_button(&self.state, cx))
+                            this.child(Self::render_toggle_mask_button(self.state.clone()))
                         })
                         .when(show_clear_button, |this| {
                             this.child(clear_button(cx).on_click({
@@ -371,7 +303,6 @@ impl RenderOnce for Input {
                                 move |_, window, cx| {
                                     state.update(cx, |state, cx| {
                                         state.clean(window, cx);
-                                        state.focus(window, cx);
                                     })
                                 }
                             }))

crates/ui/src/input/text_wrapper.rs

@@ -0,0 +1,227 @@
+use std::ops::Range;
+
+use gpui::{App, Font, LineFragment, Pixels};
+use rope::Rope;
+
+use super::rope_ext::RopeExt;
+
+/// A line with soft wrapped lines info.
+#[derive(Clone)]
+pub(super) struct LineItem {
+    /// The original line text.
+    line: Rope,
+    /// The soft wrapped lines relative byte range (0..line.len) of this line (Include first line).
+    ///
+    /// FIXME: Here in somecase, the `line_wrapper.wrap_line` has returned different
+    /// like the `window.text_system().shape_text`. So, this value may not equal
+    /// the actual rendered lines.
+    wrapped_lines: Vec<Range<usize>>,
+}
+
+impl LineItem {
+    /// Get the bytes length of this line.
+    #[inline]
+    pub(super) fn len(&self) -> usize {
+        self.line.len()
+    }
+
+    /// Get number of soft wrapped lines of this line (include the first line).
+    #[inline]
+    pub(super) fn lines_len(&self) -> usize {
+        self.wrapped_lines.len()
+    }
+
+    /// Get the height of this line item with given line height.
+    pub(super) fn height(&self, line_height: Pixels) -> Pixels {
+        self.lines_len() as f32 * line_height
+    }
+}
+
+/// Used to prepare the text with soft wrap to be get lines to displayed in the Editor.
+///
+/// After use lines to calculate the scroll size of the Editor.
+pub(super) struct TextWrapper {
+    text: Rope,
+
+    /// Total wrapped lines (Inlucde the first line), value is start and end index of the line.
+    soft_lines: usize,
+    font: Font,
+    font_size: Pixels,
+
+    /// If is none, it means the text is not wrapped
+    wrap_width: Option<Pixels>,
+
+    /// The lines by split \n
+    pub(super) lines: Vec<LineItem>,
+
+    _initialized: bool,
+}
+
+#[allow(unused)]
+impl TextWrapper {
+    pub(super) fn new(font: Font, font_size: Pixels, wrap_width: Option<Pixels>) -> Self {
+        Self {
+            text: Rope::new(),
+            font,
+            font_size,
+            wrap_width,
+            soft_lines: 0,
+            lines: Vec::new(),
+            _initialized: false,
+        }
+    }
+
+    #[inline]
+    pub(super) fn set_default_text(&mut self, text: &Rope) {
+        self.text = text.clone();
+    }
+
+    /// Get the total number of lines including wrapped lines.
+    #[inline]
+    pub(super) fn len(&self) -> usize {
+        self.soft_lines
+    }
+
+    /// Get the line item by row index.
+    #[inline]
+    pub(super) fn line(&self, row: usize) -> Option<&LineItem> {
+        self.lines.get(row)
+    }
+
+    pub(super) fn set_wrap_width(&mut self, wrap_width: Option<Pixels>, cx: &mut App) {
+        if wrap_width == self.wrap_width {
+            return;
+        }
+        self.wrap_width = wrap_width;
+        self.update_all(&self.text.clone(), true, cx);
+    }
+
+    pub(super) fn set_font(&mut self, font: Font, font_size: Pixels, cx: &mut App) {
+        if self.font.eq(&font) && self.font_size == font_size {
+            return;
+        }
+        self.font = font;
+        self.font_size = font_size;
+        self.update_all(&self.text.clone(), true, cx);
+    }
+
+    pub(super) fn prepare_if_need(&mut self, text: &Rope, cx: &mut App) {
+        if self._initialized {
+            return;
+        }
+        self._initialized = true;
+        self.update_all(text, true, cx);
+    }
+
+    /// Update the text wrapper and recalculate the wrapped lines.
+    ///
+    /// If the `text` is the same as the current text, do nothing.
+    ///
+    /// - `changed_text`: The text [`Rope`] that has changed.
+    /// - `range`: The `selected_range` before change.
+    /// - `new_text`: The inserted text.
+    /// - `force`: Whether to force the update, if false, the update will be skipped if the text is the same.
+    /// - `cx`: The application context.
+    pub(super) fn update(
+        &mut self,
+        changed_text: &Rope,
+        range: &Range<usize>,
+        new_text: &Rope,
+        force: bool,
+        cx: &mut App,
+    ) {
+        let mut line_wrapper = cx
+            .text_system()
+            .line_wrapper(self.font.clone(), self.font_size);
+        self._update(
+            changed_text,
+            range,
+            new_text,
+            force,
+            &mut |line_str, wrap_width| {
+                line_wrapper
+                    .wrap_line(&[LineFragment::text(line_str)], wrap_width)
+                    .collect()
+            },
+        );
+    }
+
+    fn _update<F>(
+        &mut self,
+        changed_text: &Rope,
+        range: &Range<usize>,
+        new_text: &Rope,
+        force: bool,
+        wrap_line: &mut F,
+    ) where
+        F: FnMut(&str, Pixels) -> Vec<gpui::Boundary>,
+    {
+        if self.text.eq(changed_text) && !force {
+            return;
+        }
+
+        // Remove the old changed lines.
+        let start_row = self.text.offset_to_point(range.start).row as usize;
+        let start_row = start_row.min(self.lines.len().saturating_sub(1));
+        let end_row = self.text.offset_to_point(range.end).row as usize;
+        let end_row = end_row.min(self.lines.len().saturating_sub(1));
+        let rows_range = start_row..=end_row;
+
+        // To add the new lines.
+        let new_start_row = changed_text.offset_to_point(range.start).row as usize;
+        let new_start_offset = changed_text.line_start_offset(new_start_row);
+        let new_end_row = changed_text
+            .offset_to_point(range.start + new_text.len())
+            .row as usize;
+        let new_end_offset = changed_text.line_end_offset(new_end_row);
+        let new_range = new_start_offset..new_end_offset;
+
+        let mut new_lines = vec![];
+
+        let wrap_width = self.wrap_width;
+
+        for line in changed_text.slice(new_range).lines() {
+            let line_str = line.to_string();
+            let mut wrapped_lines = vec![];
+            let mut prev_boundary_ix = 0;
+
+            // If wrap_width is Pixels::MAX, skip wrapping to disable word wrap
+            if let Some(wrap_width) = wrap_width {
+                // Here only have wrapped line, if there is no wrap meet, the `line_wraps` result will empty.
+                for boundary in wrap_line(&line_str, wrap_width) {
+                    wrapped_lines.push(prev_boundary_ix..boundary.ix);
+                    prev_boundary_ix = boundary.ix;
+                }
+            }
+
+            // Reset of the line
+            if !line_str[prev_boundary_ix..].is_empty() || prev_boundary_ix == 0 {
+                wrapped_lines.push(prev_boundary_ix..line.len());
+            }
+
+            new_lines.push(LineItem {
+                line: line.clone(),
+                wrapped_lines,
+            });
+        }
+
+        // dbg!(&new_lines.len());
+        // dbg!(self.lines.len());
+        if self.lines.is_empty() {
+            self.lines = new_lines;
+        } else {
+            self.lines.splice(rows_range, new_lines);
+        }
+
+        // dbg!(self.lines.len());
+        self.text = changed_text.clone();
+        self.soft_lines = self.lines.iter().map(|l| l.lines_len()).sum();
+    }
+
+    /// Update the text wrapper and recalculate the wrapped lines.
+    ///
+    /// If the `text` is the same as the current text, do nothing.
+    pub(crate) fn update_all(&mut self, text: &Rope, force: bool, cx: &mut App) {
+        self.update(text, &(0..text.len()), text, force, cx);
+    }
+}

crates/ui/src/lib.rs

@@ -1,3 +1,4 @@
+pub use anchored::*;
 pub use element_ext::ElementExt;
 pub use event::InteractiveElementExt;
 pub use focusable::FocusableCycle;
@@ -33,6 +34,7 @@ pub mod switch;
 pub mod tab;
 pub mod tooltip;
 
+mod anchored;
 mod element_ext;
 mod event;
 mod focusable;

crates/ui/src/list/list.rs

@@ -13,7 +13,7 @@ use smol::Timer;
 use theme::ActiveTheme;
 
 use crate::actions::{Cancel, Confirm, SelectDown, SelectUp};
-use crate::input::{Input, InputEvent, InputState};
+use crate::input::{InputEvent, InputState, TextInput};
 use crate::list::ListDelegate;
 use crate::list::cache::{MeasuredEntrySize, RowEntry, RowsCache};
 use crate::scroll::{Scrollbar, ScrollbarHandle};
@@ -288,7 +288,7 @@ where
                     });
                 });
             }
-            InputEvent::PressEnter { secondary, .. } => self.on_action_confirm(
+            InputEvent::PressEnter { secondary } => self.on_action_confirm(
                 &Confirm {
                     secondary: *secondary,
                 },
@@ -498,7 +498,7 @@ where
         let scroll_handle = self.scroll_handle.clone();
 
         v_flex()
-            .flex_grow_1()
+            .flex_grow()
             .relative()
             .size_full()
             .when_some(self.options.max_height, |this, h| this.max_h(h))
@@ -632,10 +632,10 @@ where
                         .border_b_1()
                         .border_color(cx.theme().border)
                         .child(
-                            Input::new(&input)
+                            TextInput::new(&input)
                                 .with_size(self.options.size)
                                 .appearance(false)
-                                .cleanable(true)
+                                .cleanable()
                                 .p_0()
                                 .prefix(
                                     Icon::new(IconName::Search).text_color(cx.theme().text_muted),

crates/ui/src/menu/app_menu_bar.rs

@@ -1,15 +1,14 @@
 use gpui::prelude::FluentBuilder;
 use gpui::{
-    App, AppContext as _, ClickEvent, Context, DismissEvent, Entity, Focusable,
+    anchored, deferred, div, px, App, AppContext as _, ClickEvent, Context, DismissEvent, Entity,
-    InteractiveElement as _, IntoElement, KeyBinding, MouseButton, OwnedMenu, ParentElement,
+    Focusable, InteractiveElement as _, IntoElement, KeyBinding, MouseButton, OwnedMenu,
-    Render, SharedString, StatefulInteractiveElement, Styled, Subscription, Window, anchored,
+    ParentElement, Render, SharedString, StatefulInteractiveElement, Styled, Subscription, Window,
-    deferred, div, px,
 };
 
 use crate::actions::{Cancel, SelectLeft, SelectRight};
 use crate::button::{Button, ButtonVariants};
 use crate::menu::PopupMenu;
-use crate::{Selectable, Sizable, h_flex};
+use crate::{h_flex, Selectable, Sizable};
 
 const CONTEXT: &str = "AppMenuBar";
 
@@ -242,7 +241,7 @@ impl Render for AppMenu {
             .when(is_selected, |this| {
                 this.child(deferred(
                     anchored()
-                        .anchor(gpui::Anchor::TopLeft)
+                        .anchor(gpui::Corner::TopLeft)
                         .snap_to_window_with_margin(px(8.))
                         .child(
                             div()

crates/ui/src/menu/context_menu.rs

@@ -3,10 +3,10 @@ use std::rc::Rc;
 
 use gpui::prelude::FluentBuilder;
 use gpui::{
-    Anchor, AnyElement, App, Context, DismissEvent, Element, ElementId, Entity, Focusable,
+    anchored, deferred, div, px, AnyElement, App, Context, Corner, DismissEvent, Element,
-    GlobalElementId, Hitbox, HitboxBehavior, InspectorElementId, InteractiveElement, IntoElement,
+    ElementId, Entity, Focusable, GlobalElementId, Hitbox, HitboxBehavior, InspectorElementId,
-    MouseButton, MouseDownEvent, ParentElement, Pixels, Point, StyleRefinement, Styled,
+    InteractiveElement, IntoElement, MouseButton, MouseDownEvent, ParentElement, Pixels, Point,
-    Subscription, Window, anchored, deferred, div, px,
+    StyleRefinement, Styled, Subscription, Window,
 };
 
 use crate::menu::PopupMenu;
@@ -41,7 +41,7 @@ pub struct ContextMenu<E: ParentElement + Styled + Sized> {
     menu: Option<Rc<dyn Fn(PopupMenu, &mut Window, &mut Context<PopupMenu>) -> PopupMenu>>,
     // This is not in use, just for style refinement forwarding.
     _ignore_style: StyleRefinement,
-    anchor: Anchor,
+    anchor: Corner,
 }
 
 impl<E: ParentElement + Styled> ContextMenu<E> {
@@ -51,7 +51,7 @@ impl<E: ParentElement + Styled> ContextMenu<E> {
             id: id.into(),
             element: Some(element),
             menu: None,
-            anchor: Anchor::TopLeft,
+            anchor: Corner::TopLeft,
             _ignore_style: StyleRefinement::default(),
         }
     }

crates/ui/src/menu/dropdown_menu.rs

@@ -1,7 +1,7 @@
 use std::rc::Rc;
 
 use gpui::{
-    Anchor, Context, DismissEvent, ElementId, Entity, Focusable, InteractiveElement, IntoElement,
+    Context, Corner, DismissEvent, ElementId, Entity, Focusable, InteractiveElement, IntoElement,
     RenderOnce, SharedString, StyleRefinement, Styled, Window,
 };
 
@@ -18,13 +18,13 @@ pub trait DropdownMenu: Styled + Selectable + InteractiveElement + IntoElement +
         self,
         f: impl Fn(PopupMenu, &mut Window, &mut Context<PopupMenu>) -> PopupMenu + 'static,
     ) -> DropdownMenuPopover<Self> {
-        self.dropdown_menu_with_anchor(Anchor::TopLeft, f)
+        self.dropdown_menu_with_anchor(Corner::TopLeft, f)
     }
 
     /// Create a dropdown menu with the given items, anchored to the given corner
     fn dropdown_menu_with_anchor(
         mut self,
-        anchor: impl Into<Anchor>,
+        anchor: impl Into<Corner>,
         f: impl Fn(PopupMenu, &mut Window, &mut Context<PopupMenu>) -> PopupMenu + 'static,
     ) -> DropdownMenuPopover<Self> {
         let style = self.style().clone();
@@ -42,7 +42,7 @@ impl DropdownMenu for Avatar {}
 pub struct DropdownMenuPopover<T: Selectable + IntoElement + 'static> {
     id: ElementId,
     style: StyleRefinement,
-    anchor: Anchor,
+    anchor: Corner,
     trigger: T,
     #[allow(clippy::type_complexity)]
     builder: Rc<dyn Fn(PopupMenu, &mut Window, &mut Context<PopupMenu>) -> PopupMenu>,
@@ -54,7 +54,7 @@ where
 {
     fn new(
         id: ElementId,
-        anchor: impl Into<Anchor>,
+        anchor: impl Into<Corner>,
         trigger: T,
         builder: impl Fn(PopupMenu, &mut Window, &mut Context<PopupMenu>) -> PopupMenu + 'static,
     ) -> Self {
@@ -68,7 +68,7 @@ where
     }
 
     /// Set the anchor corner for the dropdown menu popover.
-    pub fn anchor(mut self, anchor: impl Into<Anchor>) -> Self {
+    pub fn anchor(mut self, anchor: impl Into<Corner>) -> Self {
         self.anchor = anchor.into();
         self
     }

crates/ui/src/menu/popup_menu.rs

@@ -2,7 +2,7 @@ use std::rc::Rc;
 
 use gpui::prelude::FluentBuilder;
 use gpui::{
-    Action, Anchor, AnyElement, App, AppContext, Axis, Bounds, ClickEvent, Context, DismissEvent,
+    Action, AnyElement, App, AppContext, Axis, Bounds, ClickEvent, Context, Corner, DismissEvent,
     Edges, Entity, EventEmitter, FocusHandle, Focusable, Half, InteractiveElement, IntoElement,
     KeyBinding, MouseDownEvent, OwnedMenuItem, ParentElement, Pixels, Point, Render, ScrollHandle,
     SharedString, StatefulInteractiveElement, Styled, Subscription, WeakEntity, Window, anchored,
@@ -299,7 +299,7 @@ pub struct PopupMenu {
     scroll_handle: ScrollHandle,
 
     /// This will update on render
-    submenu_anchor: (Anchor, Pixels),
+    submenu_anchor: (Corner, Pixels),
 
     _subscriptions: Vec<Subscription>,
 }
@@ -322,7 +322,7 @@ impl PopupMenu {
             scroll_handle: ScrollHandle::default(),
             external_link_icon: true,
             size: Size::default(),
-            submenu_anchor: (Anchor::TopLeft, Pixels::ZERO),
+            submenu_anchor: (Corner::TopLeft, Pixels::ZERO),
             _subscriptions: vec![],
         }
     }
@@ -840,7 +840,7 @@ impl PopupMenu {
     }
 
     fn select_left(&mut self, _: &SelectLeft, window: &mut Window, cx: &mut Context<Self>) {
-        let handled = if matches!(self.submenu_anchor.0, Anchor::TopLeft | Anchor::BottomLeft) {
+        let handled = if matches!(self.submenu_anchor.0, Corner::TopLeft | Corner::BottomLeft) {
             self._unselect_submenu(window, cx)
         } else {
             self._select_submenu(window, cx)
@@ -861,7 +861,7 @@ impl PopupMenu {
     }
 
     fn select_right(&mut self, _: &SelectRight, window: &mut Window, cx: &mut Context<Self>) {
-        let handled = if matches!(self.submenu_anchor.0, Anchor::TopLeft | Anchor::BottomLeft) {
+        let handled = if matches!(self.submenu_anchor.0, Corner::TopLeft | Corner::BottomLeft) {
             self._select_submenu(window, cx)
         } else {
             self._unselect_submenu(window, cx)
@@ -930,9 +930,8 @@ impl PopupMenu {
         };
 
         match parent.read(cx).submenu_anchor.0 {
-            Anchor::TopLeft | Anchor::BottomLeft => Side::Left,
+            Corner::TopLeft | Corner::BottomLeft => Side::Left,
-            Anchor::TopRight | Anchor::BottomRight => Side::Right,
+            Corner::TopRight | Corner::BottomRight => Side::Right,
-            _ => Side::Left,
         }
     }
 
@@ -1042,14 +1041,14 @@ impl PopupMenu {
         let bounds = self.bounds;
         let max_width = self.max_width();
         let (anchor, left) = if max_width + bounds.origin.x > window.bounds().size.width {
-            (Anchor::TopRight, -px(16.))
+            (Corner::TopRight, -px(16.))
         } else {
-            (Anchor::TopLeft, bounds.size.width - px(8.))
+            (Corner::TopLeft, bounds.size.width - px(8.))
         };
 
         let is_bottom_pos = bounds.origin.y + bounds.size.height > window.bounds().size.height;
         self.submenu_anchor = if is_bottom_pos {
-            (anchor.other_side_along(gpui::Axis::Vertical), left)
+            (anchor.other_side_corner_along(gpui::Axis::Vertical), left)
         } else {
             (anchor, left)
         };
@@ -1231,7 +1230,7 @@ impl PopupMenu {
                     this.child({
                         let (anchor, left) = self.submenu_anchor;
                         let is_bottom_pos =
-                            matches!(anchor, Anchor::BottomLeft | Anchor::BottomRight);
+                            matches!(anchor, Corner::BottomLeft | Corner::BottomRight);
                         anchored()
                             .anchor(anchor)
                             .child(

crates/ui/src/modal.rs

@@ -521,14 +521,12 @@ impl RenderOnce for Modal {
                                         offset: point(px(0.), px(20.)),
                                         blur_radius: px(25.),
                                         spread_radius: px(-5.),
-                                        inset: false,
                                     },
                                     BoxShadow {
                                         color: hsla(0., 0., 0., 0.1 * delta),
                                         offset: point(px(0.), px(8.)),
                                         blur_radius: px(10.),
                                         spread_radius: px(-6.),
-                                        inset: false,
                                     },
                                 ];
                                 this.top(y + y_offset).shadow(shadow)

crates/ui/src/notification.rs

@@ -5,12 +5,12 @@ use std::time::Duration;
 
 use gpui::prelude::FluentBuilder;
 use gpui::{
-    Anchor, Animation, AnimationExt, AnyElement, App, AppContext, ClickEvent, Context,
+    Animation, AnimationExt, AnyElement, App, AppContext, ClickEvent, Context, DismissEvent,
-    DismissEvent, ElementId, Entity, EventEmitter, InteractiveElement as _, IntoElement,
+    ElementId, Entity, EventEmitter, InteractiveElement as _, IntoElement, ParentElement as _,
-    ParentElement as _, Render, SharedString, StatefulInteractiveElement, StyleRefinement, Styled,
+    Render, SharedString, StatefulInteractiveElement, StyleRefinement, Styled, Subscription,
-    Subscription, Window, div, px, relative,
+    Window, div, px, relative,
 };
-use theme::ActiveTheme;
+use theme::{ActiveTheme, Anchor};
 
 use crate::animation::cubic_bezier;
 use crate::button::{Button, ButtonVariants as _};
@@ -288,7 +288,6 @@ impl Styled for Notification {
         &mut self.style
     }
 }
-
 impl Render for Notification {
     fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         let content = self
@@ -298,10 +297,10 @@ impl Render for Notification {
 
         let action = self.action_builder.clone().map(|builder| {
             builder(self, window, cx)
-                .small()
+                .xsmall()
                 .primary()
-                .px_4()
+                .px_3()
-                .font_medium()
+                .font_semibold()
         });
 
         let icon = match self.kind {
@@ -364,14 +363,8 @@ impl Render for Notification {
                     })
                     .when_some(content, |this, content| this.child(content))
                     .when_some(action, |this, action| {
-                        this.gap_2().child(
+                        this.gap_2()
-                            h_flex()
+                            .child(h_flex().w_full().flex_1().justify_end().child(action))
-                                .mt_2()
-                                .w_full()
-                                .flex_1()
-                                .justify_end()
-                                .child(action),
-                        )
                     }),
             )
             .child(
@@ -430,17 +423,12 @@ impl Render for Notification {
                                 let y_offset = px(0.) + delta * px(45.);
                                 that.top(px(0.) + y_offset)
                             }
-                            _ => that,
                         }
                     } else {
                         let opacity = delta;
                         let y_offset = match placement {
-                            Anchor::TopLeft | Anchor::TopRight | Anchor::TopCenter => {
+                            placement if placement.is_top() => px(-45.) + delta * px(45.),
-                                px(-45.) + delta * px(45.)
+                            placement if placement.is_bottom() => px(45.) - delta * px(45.),
-                            }
-                            Anchor::BottomLeft | Anchor::BottomRight | Anchor::BottomCenter => {
-                                px(45.) - delta * px(45.)
-                            }
                             _ => px(0.),
                         };
                         this.top(px(0.) + y_offset)

crates/ui/src/popover.rs

@@ -2,14 +2,15 @@ use std::rc::Rc;
 
 use gpui::prelude::FluentBuilder as _;
 use gpui::{
-    Anchor, AnyElement, App, Bounds, Context, Deferred, DismissEvent, Div, ElementId, EventEmitter,
+    AnyElement, App, Bounds, Context, Deferred, DismissEvent, Div, ElementId, EventEmitter,
-    FocusHandle, Focusable, InteractiveElement as _, IntoElement, KeyBinding, MouseButton,
+    FocusHandle, Focusable, Half, InteractiveElement as _, IntoElement, KeyBinding, MouseButton,
     ParentElement, Pixels, Point, Render, RenderOnce, Stateful, StyleRefinement, Styled,
-    Subscription, Window, anchored, deferred, div, px,
+    Subscription, Window, deferred, div, px,
 };
+use theme::Anchor;
 
 use crate::actions::Cancel;
-use crate::{ElementExt, Selectable, StyledExt as _, v_flex};
+use crate::{ElementExt, Selectable, StyledExt as _, anchored, v_flex};
 
 const CONTEXT: &str = "Popover";
 
@@ -174,26 +175,19 @@ impl Popover {
         self
     }
 
-    pub(crate) fn resolved_corner(anchor: Anchor, trigger_bounds: Bounds<Pixels>) -> Point<Pixels> {
+    fn resolved_corner(anchor: Anchor, trigger_bounds: Bounds<Pixels>) -> Point<Pixels> {
-        match anchor {
+        let offset = if anchor.is_center() {
-            Anchor::TopLeft => trigger_bounds.origin,
+            gpui::point(trigger_bounds.size.width.half(), px(0.))
-            Anchor::TopCenter => trigger_bounds.top_center(),
+        } else {
-            Anchor::TopRight => trigger_bounds.top_right(),
+            Point::default()
-            Anchor::BottomLeft => Point {
+        };
-                x: trigger_bounds.origin.x,
+
-                y: trigger_bounds.origin.y - trigger_bounds.size.height,
+        trigger_bounds.corner(anchor.swap_vertical().into())
-            },
+            + offset
-            Anchor::BottomCenter => Point {
+            + Point {
-                x: trigger_bounds.top_center().x,
+                x: px(0.),
-                y: trigger_bounds.origin.y - trigger_bounds.size.height,
+                y: -trigger_bounds.size.height,
-            },
+            }
-            Anchor::BottomRight => Point {
-                x: trigger_bounds.top_right().x,
-                y: trigger_bounds.origin.y - trigger_bounds.size.height,
-            },
-            // Fallback for LeftCenter/RightCenter – adjust as needed.
-            _ => trigger_bounds.origin,
-        }
     }
 }
 
@@ -336,7 +330,6 @@ impl Popover {
             .map(|this| match anchor {
                 Anchor::TopLeft | Anchor::TopCenter | Anchor::TopRight => this.top_1(),
                 Anchor::BottomLeft | Anchor::BottomCenter | Anchor::BottomRight => this.bottom_1(),
-                Anchor::LeftCenter | Anchor::RightCenter => this.top_1(), // Fallback for centered
             })
     }
 }