chore: refactor auto update (#8)

Reviewed-on: https://git.reya.su/reya/coop/pulls/8

.github/workflows/release.yml

@@ -21,7 +21,7 @@ jobs:
             os: windows-11-arm
             target: aarch64-pc-windows-msvc
           - platform: macos-x64
-            os: macos-15-intel
+            os: macos-13
             target: x86_64-apple-darwin
           - platform: macos-arm64
             os: macos-latest
@@ -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
@@ -130,7 +130,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
 
       - name: Make get-crate-version executable
         run: chmod +x script/get-crate-version
@@ -152,29 +152,19 @@ jobs:
           echo "Artifacts structure:"
           find artifacts -type f -exec ls -la {} \;
 
-      - name: Generate SHA256SUMS
-        run: |
-          # One `<sha256>  <path>` line per artifact. The in-app updater reads
-          # this to verify a download before installing it, so it must be
-          # published alongside every release. Written outside the directory
-          # being hashed so the checksums file never includes itself.
-          find artifacts -type f ! -name SHA256SUMS -print0 \
-            | sort -z \
-            | xargs -0 sha256sum > SHA256SUMS.raw
-          mv SHA256SUMS.raw artifacts/SHA256SUMS
-          cat artifacts/SHA256SUMS
-
       - 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.info/"
-          repository: "reya/coop"
-          token: ${{ secrets.GITEA_TOKEN }}
+          tag_name: ${{ steps.version.outputs.tag }}
+          name: ${{ steps.version.outputs.tag }}
           draft: true
           prerelease: false
+          generate_release_notes: true
           files: |
             artifacts/**/*
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Output release info
         run: |

.github/workflows/rust.yml

@@ -13,7 +13,7 @@ jobs:
   build:
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-latest]
         rustup: [stable]
 
     runs-on: ${{ matrix.os }}

.gitignore

@@ -19,8 +19,5 @@ dist/
 
 # Useless stuffs
 .DS_Store
-
-.cargo/
-vendor/
-wasm/
-node_modules/
+# Added by goreleaser init:
+.intentionally-empty-file.o

AGENTS.md

@@ -1,150 +0,0 @@
-# Rust coding guidelines
-
-* Prioritize code correctness and clarity. Speed and efficiency are secondary priorities unless otherwise specified.
-* Do not write organizational or comments that summarize the code. Comments should only be written in order to explain "why" the code is written in some way in the case there is a reason that is tricky / non-obvious.
-* Prefer implementing functionality in existing files unless it is a new logical component. Avoid creating many small files.
-* Avoid using functions that panic like `unwrap()`, instead use mechanisms like `?` to propagate errors.
-* Be careful with operations like indexing which may panic if the indexes are out of bounds.
-* Never silently discard errors with `let _ =` on fallible operations. Always handle errors appropriately:
-  - Propagate errors with `?` when the calling function should handle them
-  - Use `.log_err()` or similar when you need to ignore errors but want visibility
-  - Use explicit error handling with `match` or `if let Err(...)` when you need custom logic
-  - Example: avoid `let _ = client.request(...).await?;` - use `client.request(...).await?;` instead
-* When implementing async operations that may fail, ensure errors propagate to the UI layer so users get meaningful feedback.
-* Avoid creative additions unless explicitly requested
-* Use full words for variable names (no abbreviations like "q" for "queue")
-* Use variable shadowing to scope clones in async contexts for clarity, minimizing the lifetime of borrowed references.
-  Example:
-  ```rust
-  executor.spawn({
-      let task_ran = task_ran.clone();
-      async move {
-          *task_ran.borrow_mut() = true;
-      }
-  });
-  ```
-
-# Timers in tests
-
-* In GPUI tests, prefer GPUI executor timers over `smol::Timer::after(...)` when you need timeouts, delays, or to drive `run_until_parked()`:
-  - Use `cx.background_executor().timer(duration).await` (or `cx.background_executor.timer(duration).await` in `TestAppContext`) so the work is scheduled on GPUI's dispatcher.
-  - Avoid `smol::Timer::after(...)` for test timeouts when you rely on `run_until_parked()`, because it may not be tracked by GPUI's scheduler and can lead to "nothing left to run" when pumping.
-
-# GPUI
-
-GPUI is a UI framework which also provides primitives for state and concurrency management.
-
-## Context
-
-Context types allow interaction with global state, windows, entities, and system services. They are typically passed to functions as the argument named `cx`. When a function takes callbacks they come after the `cx` parameter.
-
-* `App` is the root context type, providing access to global state and read and update of entities.
-* `Context<T>` is provided when updating an `Entity<T>`. This context dereferences into `App`, so functions which take `&App` can also take `&Context<T>`.
-* `AsyncApp` and `AsyncWindowContext` are provided by `cx.spawn` and `cx.spawn_in`. These can be held across await points.
-
-## `Window`
-
-`Window` provides access to the state of an application window. It is passed to functions as an argument named `window` and comes before `cx` when present. It is used for managing focus, dispatching actions, directly drawing, getting user input state, etc.
-
-## Entities
-
-An `Entity<T>` is a handle to state of type `T`. With `thing: Entity<T>`:
-
-* `thing.entity_id()` returns `EntityId`
-* `thing.downgrade()` returns `WeakEntity<T>`
-* `thing.read(cx: &App)` returns `&T`.
-* `thing.read_with(cx, |thing: &T, cx: &App| ...)` returns the closure's return value.
-* `thing.update(cx, |thing: &mut T, cx: &mut Context<T>| ...)` allows the closure to mutate the state, and provides a `Context<T>` for interacting with the entity. It returns the closure's return value.
-* `thing.update_in(cx, |thing: &mut T, window: &mut Window, cx: &mut Context<T>| ...)` takes a `AsyncWindowContext` or `VisualTestContext`. It's the same as `update` while also providing the `Window`.
-
-Within the closures, the inner `cx` provided to the closure must be used instead of the outer `cx` to avoid issues with multiple borrows.
-
-Trying to update an entity while it's already being updated must be avoided as this will cause a panic.
-
-`WeakEntity<T>` is a weak handle. It has `read_with`, `update`, and `update_in` methods that work the same, but always return an `anyhow::Result` so that they can fail if the entity no longer exists. This can be useful to avoid memory leaks - if entities have mutually recursive handles to each other they will never be dropped.
-
-## Concurrency
-
-All use of entities and UI rendering occurs on a single foreground thread.
-
-`cx.spawn(async move |cx| ...)` runs an async closure on the foreground thread. Within the closure, `cx` is `&mut AsyncApp`.
-
-When the outer cx is a `Context<T>`, the use of `spawn` instead looks like `cx.spawn(async move |this, cx| ...)`, where `this: WeakEntity<T>` and `cx: &mut AsyncApp`.
-
-To do work on other threads, `cx.background_spawn(async move { ... })` is used. Often this background task is awaited on by a foreground task which uses the results to update state.
-
-Both `cx.spawn` and `cx.background_spawn` return a `Task<R>`, which is a future that can be awaited upon. If this task is dropped, then its work is cancelled. To prevent this one of the following must be done:
-
-* Awaiting the task in some other async context.
-* Detaching the task via `task.detach()` or `task.detach_and_log_err(cx)`, allowing it to run indefinitely.
-* Storing the task in a field, if the work should be halted when the struct is dropped.
-
-A task which doesn't do anything but provide a value can be created with `Task::ready(value)`.
-
-## Elements
-
-The `Render` trait is used to render some state into an element tree that is laid out using flexbox layout. An `Entity<T>` where `T` implements `Render` is sometimes called a "view".
-
-Example:
-
-```
-struct TextWithBorder(SharedString);
-
-impl Render for TextWithBorder {
-    fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
-        div().border_1().child(self.0.clone())
-    }
-}
-```
-
-Since `impl IntoElement for SharedString` exists, it can be used as an argument to `child`. `SharedString` is used to avoid copying strings, and is either an `&'static str` or `Arc<str>`.
-
-UI components that are constructed just to be turned into elements can instead implement the `RenderOnce` trait, which is similar to `Render`, but its `render` method takes ownership of `self` and receives `&mut App` instead of `&mut Context<Self>`. Types that implement this trait can use `#[derive(IntoElement)]` to use them directly as children.
-
-The style methods on elements are similar to those used by Tailwind CSS.
-
-If some attributes or children of an element tree are conditional, `.when(condition, |this| ...)` can be used to run the closure only when `condition` is true. Similarly, `.when_some(option, |this, value| ...)` runs the closure when the `Option` has a value.
-
-## Input events
-
-Input event handlers can be registered on an element via methods like `.on_click(|event, window, cx: &mut App| ...)`.
-
-Often event handlers will want to update the entity that's in the current `Context<T>`. The `cx.listener` method provides this - its use looks like `.on_click(cx.listener(|this: &mut T, event, window, cx: &mut Context<T>| ...)`.
-
-## Actions
-
-Actions are dispatched via user keyboard interaction or in code via `window.dispatch_action(SomeAction.boxed_clone(), cx)` or `focus_handle.dispatch_action(&SomeAction, window, cx)`.
-
-Actions with no data are defined with the `actions!(some_namespace, [SomeAction, AnotherAction])` macro call. Otherwise the `Action` derive macro is used. Doc comments on actions are displayed to the user.
-
-Action handlers can be registered on an element via the event handler `.on_action(|action, window, cx| ...)`. Like other event handlers, this is often used with `cx.listener`.
-
-## Notify
-
-When a view's state has changed in a way that may affect its rendering, it should call `cx.notify()`. This will cause the view to be rerendered. It will also cause any observe callbacks registered for the entity with `cx.observe` to be called.
-
-## Entity events
-
-While updating an entity (`cx: Context<T>`), it can emit an event using `cx.emit(event)`. Entities register which events they can emit by declaring `impl EventEmitter<EventType> for EntityType {}`.
-
-Other entities can then register a callback to handle these events by doing `cx.subscribe(other_entity, |this, other_entity, event, cx| ...)`. This will return a `Subscription` which deregisters the callback when dropped.  Typically `cx.subscribe` happens when creating a new entity and the subscriptions are stored in a `_subscriptions: Vec<Subscription>` field.
-
-# Pull request hygiene
-
-When an agent opens or updates a pull request, it must:
-
-- Use a clear, correctly capitalized, imperative PR title (for example, `fix crash in project panel`).
-- Avoid conventional commit prefixes in PR titles (`fix:`, `feat:`, `docs:`, etc.).
-- Avoid trailing punctuation in PR titles.
-- Optionally prefix the title with a crate name when one crate is the clear scope (for example, `workspace: add history view`).
-- Include a `Release Notes:` section as the final section in the PR body.
-- Use one bullet under `Release Notes:`:
-  - `- Added ...`, `- Fixed ...`, or `- Improved ...` for user-facing changes, or
-  - `- N/A` for docs-only and other non-user-facing changes.
-- Format release notes exactly with a blank line after the heading, for example:
-
-```
-Release Notes:
-
-- N/A
-```

Cargo.toml

@@ -1,60 +1,44 @@
 [workspace]
 resolver = "2"
-members = ["crates/*", "desktop", "web"]
-default-members = ["desktop"]
+members = ["crates/*"]
+default-members = ["crates/coop"]
 
 [workspace.package]
-version = "1.0.2"
-edition = "2024"
+version = "0.3.0"
+edition = "2021"
 publish = false
 
 [workspace.dependencies]
+
 # GPUI
 gpui = { git = "https://github.com/zed-industries/zed" }
-gpui_platform = { git = "https://github.com/zed-industries/zed", features = ["font-kit", "x11", "wayland"] }
-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_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-memory = { git = "https://github.com/rust-nostr/nostr" }
-nostr-blossom = { git = "https://github.com/rust-nostr/nostr" }
-nostr-gossip-memory = { git = "https://github.com/rust-nostr/nostr" }
-nostr-connect = { git = "https://github.com/rust-nostr/nostr" }
+nostr = { git = "https://github.com/rust-nostr/nostr",  features = [ "nip96", "nip59", "nip49", "nip44" ] }
 nostr-sdk = { git = "https://github.com/rust-nostr/nostr" }
-nostr = { git = "https://github.com/rust-nostr/nostr", features = [ "nip59", "nip49", "nip44" ] }
-
-# Crypto (NIP-17 encrypted file messages)
-aes-gcm = "0.10"
-sha2 = "0.10"
-data-encoding = "2"
+nostr-lmdb = { git = "https://github.com/rust-nostr/nostr" }
+nostr-connect = { git = "https://github.com/rust-nostr/nostr" }
+nostr-gossip-memory = { git = "https://github.com/rust-nostr/nostr" }
 
 # Others
 anyhow = "1.0.44"
-chrono = { version = "0.4.38", features = ["wasmbind"] }
+chrono = "0.4.38"
 futures = "0.3"
 itertools = "0.13.0"
 log = "0.4"
 oneshot = "0.1.10"
+reqwest = { version = "0.12", features = ["multipart", "stream", "json"] }
 flume = { version = "0.11.1", default-features = false, features = ["async", "select"] }
-rust-embed = { version = "8.5", features = ["include-exclude"] }
+rust-embed = "8.5.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 schemars = "1"
 smallvec = "1.14.0"
 smol = "2"
+tracing = "0.1.40"
 webbrowser = "1.0.4"
-tracing-subscriber = { version = "0.3.18", features = ["fmt"] }
-errno = { version = "0.3.14", default-features = false }
-instant = "0.1"
-ureq = { version = "3", default-features = false, features = ["rustls", "platform-verifier", "json"] }
-
-[patch.crates-io]
-# Use stacker's psm version which may have better WASM support
-psm = { git = "https://github.com/rust-lang/stacker", branch = "master" }
 
 [profile.release]
 strip = true

README.md

@@ -1,5 +1,125 @@
+![Coop](/docs/coop.png)
+
+<p>
+    <a href="https://github.com/lumehq/coop/actions/workflows/rust.yml">
+      <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/lumehq/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/lumehq/coop">
+</p>
+
 Coop is a simple, fast, and reliable nostr client for secure messaging across all platforms.
 
+### Screenshots
+
+<p float="left">
+  <img src="/docs/mac_01.png" width="250" />
+  <img src="/docs/mac_02.png" width="250" />
+  <img src="/docs/mac_03.png" width="250" />
+  <img src="/docs/mac_04.png" width="250" />
+  <img src="/docs/mac_05.png" width="250" />
+  <img src="/docs/mac_06.png" width="250" />
+  <img src="/docs/mac_07.png" width="250" />
+  <img src="/docs/mac_08.png" width="250" />
+  <img src="/docs/mac_09.png" width="250" />
+  <img src="/docs/linux_01.png" width="250" />
+  <img src="/docs/linux_02.png" width="250" />
+  <img src="/docs/linux_03.png" width="250" />
+  <img src="/docs/linux_04.png" width="250" />
+  <img src="/docs/linux_05.png" width="250" />
+</p>
+
+### Installation
+
+To install Coop, follow these steps:
+
+1. **Download the Latest Release**:
+
+   - 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**:
+
+   - **Windows**: Run the downloaded `.exe` installer and follow the on-screen instructions.
+   - **macOS**: Open the downloaded `.dmg` file and drag Coop to your Applications folder.
+   - **Linux**: Run the downloaded `.flatpak` or `.snap` installer and follow the on-screen instructions.
+
+3. **Run Coop**:
+   - Launch Coop from your Applications folder (macOS) or by double-clicking the executable (Windows/Linux).
+
+For more detailed instructions, refer to the [Release Notes](#) on GitHub.
+
+### Developing Coop
+
+Coop is built using Rust and GPUI. All Nostr related stuffs handled by [Rust Nostr SDK](https://github.com/rust-nostr/nostr)
+
+#### Prerequisites
+
+- **Rust Toolchain**: Ensure you have Rust installed. If not, you can install it using [rustup](https://rustup.rs/).
+- **Cargo**: Rust's package manager, which comes bundled with the Rust installation.
+- **Git**: To clone the repository and manage version control.
+
+#### Setting Up the Development Environment
+
+1. Clone the repository:
+
+   ```bash
+   git clone https://github.com/lumehq/coop.git
+   cd coop
+   ```
+
+2.1 Install Linux dependencies:
+
+   ```bash
+   ./script/linux
+   ```
+
+2.2 Install FreeBSD dependencies:
+
+   ```bash
+   ./script/freebsd
+   ```
+
+3. Install Rust dependencies:
+
+   ```bash
+   cargo build
+   ```
+
+4. Run the app:
+   ```bash
+   cargo run
+   ```
+
+#### Building for Production
+
+To build Coop for production, use the following command:
+
+```bash
+cargo build --release
+```
+
+This will generate an optimized binary in the `target/release` directory.
+
+#### Contributing Code
+
+If you'd like to contribute to Coop, please follow these steps:
+
+1. Fork the repository.
+2. Create a new branch for your feature or bugfix.
+3. Make your changes and ensure all tests pass.
+4. Submit a pull request with a detailed description of your changes.
+
+For more information, see the [Contributing](#contributing) section.
+
+#### Additional Resources
+
+- [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/lumehq/coop/issues/)
+
 ### License
 
 Copyright (C) 2025 Ren Amamiya & other Coop contributors

assets/icons/book.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
-<path d="M4.75 20V4.75C4.75 3.64543 5.64543 2.75 6.75 2.75H19.25V18.75H6C5.30964 18.75 4.75 19.3096 4.75 20ZM4.75 20C4.75 20.6904 5.30964 21.25 6 21.25H19.25" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M12 12.25C9.75 12.25 9.75 13.75 9.75 13.75H14.25C14.25 13.75 14.25 12.25 12 12.25Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M13 9.25C13 9.80228 12.5523 10.25 12 10.25C11.4477 10.25 11 9.80228 11 9.25C11 8.69772 11.4477 8.25 12 8.25C12.5523 8.25 13 8.69772 13 9.25Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M11.5 9.25H12.5" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>

assets/icons/copy.svg

@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
-<path d="M8.75 8.75V4C8.75 3.30964 9.30964 2.75 10 2.75H20C20.6904 2.75 21.25 3.30964 21.25 4V14C21.25 14.6904 20.6904 15.25 20 15.25H15.25M14 8.75H4C3.30964 8.75 2.75 9.30964 2.75 10V20C2.75 20.6904 3.30964 21.25 4 21.25H14C14.6904 21.25 15.25 20.6904 15.25 20V10C15.25 9.30964 14.6904 8.75 14 8.75Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.10352 4C7.42998 2.84575 8.49122 2 9.75 2H14.25C15.5088 2 16.57 2.84575 16.8965 4H18.25C19.7688 4 21 5.23122 21 6.75V19.25C21 20.7688 19.7688 22 18.25 22H5.75C4.23122 22 3 20.7688 3 19.25V6.75C3 5.23122 4.23122 4 5.75 4H7.10352ZM8.5 4.75V6.25C8.5 6.38807 8.61193 6.5 8.75 6.5H15.25C15.3881 6.5 15.5 6.38807 15.5 6.25V4.75C15.5 4.05964 14.9404 3.5 14.25 3.5H9.75C9.05964 3.5 8.5 4.05964 8.5 4.75Z" fill="currentColor"/>
 </svg>

assets/icons/device.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
-<path d="M14.25 10.75C14.25 9.64543 15.1454 8.75 16.25 8.75H20.25C21.3546 8.75 22.25 9.64543 22.25 10.75V19.25C22.25 20.3546 21.3546 21.25 20.25 21.25H16.25C15.1454 21.25 14.25 20.3546 14.25 19.25V10.75Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M17.25 18.25H19.5" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M20.25 8.75V5.75C20.25 4.64543 19.3546 3.75 18.25 3.75H5.75C4.64543 3.75 3.75 4.64543 3.75 5.75V14.75C3.75 15.8546 2.85457 16.75 1.75 16.75V18.25C1.75 19.3546 2.64543 20.25 3.75 20.25H14.25" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M3.75 16.75H14.25" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>

assets/icons/group.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
-<circle cx="12" cy="8.75" r="3" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><circle cx="4" cy="9.80005" r="2" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><circle cx="20" cy="9.80005" r="2" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M7.25 16.625V16.5C7.25 13.8766 9.37665 11.75 12 11.75C14.6234 11.75 16.75 13.8766 16.75 16.5V16.625C16.75 17.5225 16.0225 18.25 15.125 18.25H8.875C7.97754 18.25 7.25 17.5225 7.25 16.625Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M4.25 17.2602H2.75C1.64543 17.2602 0.706551 16.3538 0.919944 15.2701C1.25877 13.5493 2.15049 12.3257 4 11.8301" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M19.75 17.2601H21.25C22.3546 17.2601 23.2935 16.3538 23.08 15.27C22.7412 13.5493 21.8495 12.3257 20 11.8301" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>

assets/icons/input.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
-<path d="M11.75 6.75H19.25C20.3546 6.75 21.25 7.64543 21.25 8.75V15.25C21.25 16.3546 20.3546 17.25 19.25 17.25H11.75" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M5.75 6.75H4.75C3.64543 6.75 2.75 7.64543 2.75 8.75V15.25C2.75 16.3546 3.64543 17.25 4.75 17.25H5.75" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M8.75 3.75V20.25" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>

assets/icons/lock.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
-<path d="M12 8.75003C11.1716 8.75003 10.5 9.4216 10.5 10.25C10.5 11.0785 11.1716 11.75 12 11.75C12.8284 11.75 13.5 11.0785 13.5 10.25C13.5 9.4216 12.8284 8.75003 12 8.75003ZM12 8.75003V14.75M20.25 11.9124V6.94155C20.25 6.08069 19.6991 5.31641 18.8825 5.04418L12.6325 2.96085C12.2219 2.824 11.7781 2.824 11.3675 2.96085L5.11754 5.04418C4.30086 5.31641 3.75 6.08069 3.75 6.94155V11.9124C3.75 16.8848 8 19.25 12 21.4079C16 19.25 20.25 16.8848 20.25 11.9124Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>

assets/icons/panel-left-open.svg

@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M9 5.5V18.5H19.25C19.9404 18.5 20.5 17.9404 20.5 17.25V6.75C20.5 6.05964 19.9404 5.5 19.25 5.5H9ZM2 6.75C2 5.23122 3.23122 4 4.75 4H19.25C20.7688 4 22 5.23122 22 6.75V17.25C22 18.7688 20.7688 20 19.25 20H4.75C3.23122 20 2 18.7688 2 17.25V6.75Z" fill="currentColor"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M19.25 4C20.7688 4 22 5.23122 22 6.75V17.25C22 18.7688 20.7688 20 19.25 20H4.75C3.23122 20 2 18.7688 2 17.25V6.75C2 5.23122 3.23122 4 4.75 4H19.25ZM6.25 7.5C5.83579 7.5 5.5 7.83579 5.5 8.25V15.75C5.5 16.1642 5.83579 16.5 6.25 16.5C6.66421 16.5 7 16.1642 7 15.75V8.25C7 7.83579 6.66421 7.5 6.25 7.5Z" fill="currentColor"/>
 </svg>

assets/icons/panel-left.svg

@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
-<path d="M2.75 6.75C2.75 5.64543 3.64543 4.75 4.75 4.75H19.25C20.3546 4.75 21.25 5.64543 21.25 6.75V17.25C21.25 18.3546 20.3546 19.25 19.25 19.25H4.75C3.64543 19.25 2.75 18.3546 2.75 17.25V6.75Z" stroke="currentColor" stroke-width="1.5" stroke-linejoin="round"/><path d="M8.25 5V12V19" stroke="currentColor" stroke-width="1.5" stroke-linejoin="round"/>
+<path d="M2.75 6.75C2.75 5.64543 3.64543 4.75 4.75 4.75H19.25C20.3546 4.75 21.25 5.64543 21.25 6.75V17.25C21.25 18.3546 20.3546 19.25 19.25 19.25H4.75C3.64543 19.25 2.75 18.3546 2.75 17.25V6.75Z" stroke="currentColor" stroke-width="1.5" stroke-linejoin="round"/><path d="M6.25 8.25V15.75" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/>
 </svg>

assets/icons/panel-right-open.svg

@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M15 5.5V18.5H4.75C4.05964 18.5 3.5 17.9404 3.5 17.25V6.75C3.5 6.05964 4.05964 5.5 4.75 5.5H15ZM22 6.75C22 5.23122 20.7688 4 19.25 4H4.75C3.23122 4 2 5.23122 2 6.75V17.25C2 18.7688 3.23122 20 4.75 20H19.25C20.7688 20 22 18.7688 22 17.25V6.75Z" fill="currentColor"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4.75 4C3.23122 4 2 5.23122 2 6.75V17.25C2 18.7688 3.23122 20 4.75 20H19.25C20.7688 20 22 18.7688 22 17.25V6.75C22 5.23122 20.7688 4 19.25 4H4.75ZM17.75 7.5C18.1642 7.5 18.5 7.83579 18.5 8.25V15.75C18.5 16.1642 18.1642 16.5 17.75 16.5C17.3358 16.5 17 16.1642 17 15.75V8.25C17 7.83579 17.3358 7.5 17.75 7.5Z" fill="currentColor"/>
 </svg>

assets/icons/panel-right.svg

@@ -1,3 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
-<path d="M15.75 5V19" stroke="currentColor" stroke-width="1.5" stroke-linejoin="round"/><path d="M2.75 6.75C2.75 5.64543 3.64543 4.75 4.75 4.75H19.25C20.3546 4.75 21.25 5.64543 21.25 6.75V17.25C21.25 18.3546 20.3546 19.25 19.25 19.25H4.75C3.64543 19.25 2.75 18.3546 2.75 17.25V6.75Z" stroke="currentColor" stroke-width="1.5" stroke-linejoin="round"/>
+<path d="M2.75 6.75C2.75 5.64543 3.64543 4.75 4.75 4.75H19.25C20.3546 4.75 21.25 5.64543 21.25 6.75V17.25C21.25 18.3546 20.3546 19.25 19.25 19.25H4.75C3.64543 19.25 2.75 18.3546 2.75 17.25V6.75Z" stroke="currentColor" stroke-width="1.5" stroke-linejoin="round"/><path d="M17.75 8.25V15.75" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/>
 </svg>

assets/icons/refresh.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
-<path d="M13 21C13.5523 21 14 20.5523 14 20C14 19.4477 13.5523 19 13 19C12.4477 19 12 19.4477 12 20C12 20.5523 12.4477 21 13 21Z" fill="currentColor"/><path d="M21 11C21 10.4477 20.5523 9.99999 20 9.99999C19.4477 9.99999 19 10.4477 19 11C19 11.5523 19.4477 12 20 12C20.5523 12 21 11.5523 21 11Z" fill="currentColor"/><path d="M19.9295 14.2679C20.4078 14.5441 20.5716 15.1557 20.2955 15.634C20.0193 16.1123 19.4078 16.2761 18.9295 16C18.4512 15.7238 18.2873 15.1123 18.5634 14.634C18.8396 14.1557 19.4512 13.9918 19.9295 14.2679Z" fill="currentColor"/><path d="M17.3676 19.2942C17.8459 19.0181 18.0098 18.4065 17.7336 17.9282C17.4575 17.4499 16.8459 17.286 16.3676 17.5621C15.8893 17.8383 15.7254 18.4499 16.0016 18.9282C16.2777 19.4065 16.8893 19.5703 17.3676 19.2942Z" fill="currentColor"/><path d="M18.9269 7.99998C18.4487 8.27612 17.8371 8.11225 17.5609 7.63396C17.2848 7.15566 17.4487 6.54407 17.9269 6.26793C18.4052 5.99179 19.0168 6.15566 19.293 6.63396C19.5691 7.11225 19.4052 7.72384 18.9269 7.99998Z" fill="currentColor"/><path d="M9.25 14.75V20.25H3.75" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M15.2493 4.41452C14.2521 3.98683 13.1537 3.75 12 3.75C7.44365 3.75 3.75 7.44365 3.75 12C3.75 15.498 5.92698 18.4875 9 19.6876" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>

assets/icons/reset.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
-<path d="M13 17.25C16.4518 17.25 19.25 14.4518 19.25 11V10.5C19.25 6.77208 16.2279 3.75 12.5 3.75C8.77208 3.75 5.75 6.77208 5.75 10.5V20" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/><path d="M2 16.5L5.75 20.25L9.5 16.5" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>

assets/icons/scan.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
-<path d="M7.25 4.75H4.75C3.64543 4.75 2.75 5.64543 2.75 6.75V9.25M16.75 4.75H19.25C20.3546 4.75 21.25 5.64543 21.25 6.75V9.25M21.25 14.75V17.25C21.25 18.3546 20.3546 19.25 19.25 19.25H16.75M7.25 19.25H4.75C3.64543 19.25 2.75 18.3546 2.75 17.25V14.75M7.75 9.75V14.25M16.25 9.75V14.25M12 9.75V12.25" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>

assets/icons/settings2.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
-<path d="M13 19.25H5.95C4.82989 19.25 4.26984 19.25 3.84202 19.032C3.46569 18.8403 3.15973 18.5343 2.96799 18.158C2.75 17.7302 2.75 17.1701 2.75 16.05V7.95C2.75 6.82989 2.75 6.26984 2.96799 5.84202C3.15973 5.46569 3.46569 5.15973 3.84202 4.96799C4.26984 4.75 4.8299 4.75 5.95 4.75H18.05C19.1701 4.75 19.7302 4.75 20.158 4.96799C20.5343 5.15973 20.8403 5.46569 21.032 5.84202C21.25 6.26984 21.25 6.8299 21.25 7.95V11" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/><path d="M3 5.63635L10.9761 10.3898C11.6069 10.7657 12.3931 10.7657 13.0239 10.3898L21 5.63635" stroke="currentColor" stroke-width="1.5"/><path d="M21.8148 15.375L21.1669 15.7491M16.1856 18.625L16.8335 18.2509M21.8147 18.625L21.1669 18.251M16.1855 15.375L16.8335 15.7491M19.0002 20.25L19.0002 19.4375M19.0002 13.75V14.5625M21.1669 17C21.1669 16.6053 21.0613 16.2352 20.8769 15.9165C20.5022 15.269 19.8021 14.8333 19.0002 14.8333C18.1983 14.8333 17.4981 15.269 17.1235 15.9165C16.9391 16.2352 16.8335 16.6053 16.8335 17C16.8335 17.3947 16.9391 17.7648 17.1235 18.0835C17.4982 18.731 18.1983 19.1667 19.0002 19.1667C19.8021 19.1667 20.5022 18.731 20.8769 18.0835C21.0613 17.7648 21.1669 17.3947 21.1669 17Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>

assets/icons/user-key.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none">
-<path d="M12.9996 12.8145C12.675 12.7719 12.3415 12.75 11.9996 12.75C8.55174 12.75 5.94978 14.981 4.9305 18.114C4.56744 19.23 5.50919 20.25 6.68275 20.25H13.9996M15.7496 6.5C15.7496 8.57107 14.0706 10.25 11.9996 10.25C9.92851 10.25 8.24958 8.57107 8.24958 6.5C8.24958 4.42893 9.92851 2.75 11.9996 2.75C14.0706 2.75 15.7496 4.42893 15.7496 6.5ZM15.7496 14C15.7496 12.7574 16.7569 11.75 17.9996 11.75C19.2422 11.75 20.2496 12.7574 20.2496 14C20.2496 14.7801 19.8526 15.4675 19.2496 15.8711V17L18.7496 17.9356L19.2496 18.9678V20L17.9996 21L16.7496 20V15.8711C16.1466 15.4675 15.7496 14.7801 15.7496 14Z" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>

assets/themes/aurora.json

@@ -1,144 +0,0 @@
-{
-  "id": "aurora",
-  "name": "Aurora",
-  "author": "Coop",
-  "url": "https://github.com/lumehq/coop",
-  "light": {
-    "background": "#fdfcfeff",
-    "surface_background": "#f8f8ffff",
-    "elevated_surface_background": "#f0f1feff",
-    "panel_background": "#fdfcfeff",
-    "overlay": "#211f4300",
-    "title_bar": "#f0f1feff",
-    "title_bar_inactive": "#fdfcfeff",
-    "window_border": "#dadcffff",
-    "border": "#dadcffff",
-    "border_variant": "#cbcdffff",
-    "border_focused": "#5b5bd6ff",
-    "border_selected": "#5b5bd6ff",
-    "border_transparent": "#00000000",
-    "border_disabled": "#e6e7ffff",
-    "ring": "#5151cdff",
-    "text": "#1f2d5cff",
-    "text_muted": "#5753c6ff",
-    "text_placeholder": "#9b9ef0ff",
-    "text_accent": "#5b5bd6ff",
-    "text_danger": "#e54d2eff",
-    "text_warning": "#f76b15ff",
-    "icon": "#5753c6ff",
-    "icon_muted": "#9b9ef0ff",
-    "icon_accent": "#5151cdff",
-    "element_foreground": "#ffffffff",
-    "element_background": "#5b5bd6ff",
-    "element_hover": "#5151cdff",
-    "element_active": "#6e56cfff",
-    "element_selected": "#654dc4ff",
-    "element_disabled": "#5b5bd64d",
-    "secondary_foreground": "#1f2d5cff",
-    "secondary_background": "#f0f1feff",
-    "secondary_hover": "#e6e7ffff",
-    "secondary_active": "#dadcffff",
-    "secondary_selected": "#dadcffff",
-    "secondary_disabled": "#5b5bd64d",
-    "danger_foreground": "#ffffffff",
-    "danger_background": "#feebe7ff",
-    "danger_hover": "#ffcdc2ff",
-    "danger_active": "#fdbdafff",
-    "danger_selected": "#fdbdafff",
-    "danger_disabled": "#e54d2e4d",
-    "warning_foreground": "#ffffffff",
-    "warning_background": "#fff7edff",
-    "warning_hover": "#ffd19aff",
-    "warning_active": "#ffc182ff",
-    "warning_selected": "#ffc182ff",
-    "warning_disabled": "#f76b154d",
-    "ghost_element_background": "#00000000",
-    "ghost_element_background_alt": "#f0f1feff",
-    "ghost_element_hover": "#211f430d",
-    "ghost_element_active": "#211f431a",
-    "ghost_element_selected": "#211f431a",
-    "ghost_element_disabled": "#211f4305",
-    "tab_background": "#f0f1feff",
-    "tab_foreground": "#5753c6ff",
-    "tab_hover_background": "#211f430d",
-    "tab_active_background": "#fdfcfeff",
-    "tab_active_foreground": "#1f2d5cff",
-    "scrollbar_thumb_background": "#211f431a",
-    "scrollbar_thumb_hover_background": "#211f4326",
-    "scrollbar_thumb_border": "#00000000",
-    "scrollbar_track_background": "#00000000",
-    "scrollbar_track_border": "#00000000",
-    "drop_target_background": "#5b5bd61a",
-    "cursor": "#5b5bd6ff",
-    "selection": "#5b5bd640"
-  },
-  "dark": {
-    "background": "#14121fff",
-    "surface_background": "#1b1525ff",
-    "elevated_surface_background": "#291f43ff",
-    "panel_background": "#14121fff",
-    "overlay": "#baa7ff1a",
-    "title_bar": "#291f43ff",
-    "title_bar_inactive": "#14121fff",
-    "window_border": "#473876ff",
-    "border": "#473876ff",
-    "border_variant": "#3c2e69ff",
-    "border_focused": "#7d66d9ff",
-    "border_selected": "#7d66d9ff",
-    "border_transparent": "#00000000",
-    "border_disabled": "#33255bff",
-    "ring": "#6e56cfff",
-    "text": "#e2ddfeff",
-    "text_muted": "#baa7ffff",
-    "text_placeholder": "#6958adff",
-    "text_accent": "#baa7ffff",
-    "text_danger": "#ff977dff",
-    "text_warning": "#ffa057ff",
-    "icon": "#baa7ffff",
-    "icon_muted": "#6958adff",
-    "icon_accent": "#6e56cfff",
-    "element_foreground": "#14121fff",
-    "element_background": "#7d66d9ff",
-    "element_hover": "#baa7ffff",
-    "element_active": "#6e56cfff",
-    "element_selected": "#654dc4ff",
-    "element_disabled": "#7d66d94d",
-    "secondary_foreground": "#e2ddfeff",
-    "secondary_background": "#291f43ff",
-    "secondary_hover": "#33255bff",
-    "secondary_active": "#3c2e69ff",
-    "secondary_selected": "#3c2e69ff",
-    "secondary_disabled": "#7d66d94d",
-    "danger_foreground": "#181111ff",
-    "danger_background": "#391714ff",
-    "danger_hover": "#5e1c16ff",
-    "danger_active": "#6e2920ff",
-    "danger_selected": "#6e2920ff",
-    "danger_disabled": "#ff977d4d",
-    "warning_foreground": "#17120eff",
-    "warning_background": "#331e0bff",
-    "warning_hover": "#562800ff",
-    "warning_active": "#66350cff",
-    "warning_selected": "#66350cff",
-    "warning_disabled": "#ffa0574d",
-    "ghost_element_background": "#00000000",
-    "ghost_element_background_alt": "#291f43ff",
-    "ghost_element_hover": "#baa7ff0d",
-    "ghost_element_active": "#baa7ff1a",
-    "ghost_element_selected": "#baa7ff1a",
-    "ghost_element_disabled": "#baa7ff05",
-    "tab_background": "#291f43ff",
-    "tab_foreground": "#baa7ffff",
-    "tab_hover_background": "#baa7ff0d",
-    "tab_active_background": "#14121fff",
-    "tab_active_foreground": "#e2ddfeff",
-    "scrollbar_thumb_background": "#baa7ff1a",
-    "scrollbar_thumb_hover_background": "#baa7ff26",
-    "scrollbar_thumb_border": "#00000000",
-    "scrollbar_track_background": "#00000000",
-    "scrollbar_track_border": "#00000000",
-    "drop_target_background": "#baa7ff1a",
-    "cursor": "#baa7ffff",
-    "selection": "#baa7ff40"
-  }
-}

assets/themes/catppuccin-frappe.json

@@ -1,144 +0,0 @@
-{
-  "id": "catppuccin-frappe",
-  "name": "Catppuccin Frappé",
-  "author": "Catppuccin Org (ported by Coop)",
-  "url": "https://catppuccin.com",
-  "light": {
-    "background": "#303446",
-    "surface_background": "#292c3c",
-    "elevated_surface_background": "#232634",
-    "panel_background": "#303446",
-    "overlay": "#c6d0f51a",
-    "title_bar": "#232634",
-    "title_bar_inactive": "#303446",
-    "window_border": "#51576d",
-    "border": "#51576d",
-    "border_variant": "#414559",
-    "border_focused": "#8caaee",
-    "border_selected": "#8caaee",
-    "border_transparent": "#c6d0f500",
-    "border_disabled": "#292c3c",
-    "ring": "#babbf1",
-    "text": "#c6d0f5",
-    "text_muted": "#a5adce",
-    "text_placeholder": "#838ba7",
-    "text_accent": "#8caaee",
-    "text_danger": "#e78284",
-    "text_warning": "#ef9f76",
-    "icon": "#a5adce",
-    "icon_muted": "#838ba7",
-    "icon_accent": "#babbf1",
-    "element_foreground": "#303446",
-    "element_background": "#8caaee",
-    "element_hover": "#babbf1",
-    "element_active": "#99d1db",
-    "element_selected": "#85c1dc",
-    "element_disabled": "#8caaee4d",
-    "secondary_foreground": "#c6d0f5",
-    "secondary_background": "#414559",
-    "secondary_hover": "#51576d",
-    "secondary_active": "#626880",
-    "secondary_selected": "#626880",
-    "secondary_disabled": "#8caaee4d",
-    "danger_foreground": "#303446",
-    "danger_background": "#e78284",
-    "danger_hover": "#ea999c",
-    "danger_active": "#ef9f76",
-    "danger_selected": "#e5c890",
-    "danger_disabled": "#e782844d",
-    "warning_foreground": "#303446",
-    "warning_background": "#ef9f76",
-    "warning_hover": "#e5c890",
-    "warning_active": "#a6d189",
-    "warning_selected": "#81c8be",
-    "warning_disabled": "#ef9f764d",
-    "ghost_element_background": "#c6d0f500",
-    "ghost_element_background_alt": "#292c3c",
-    "ghost_element_hover": "#c6d0f50d",
-    "ghost_element_active": "#c6d0f51a",
-    "ghost_element_selected": "#c6d0f51a",
-    "ghost_element_disabled": "#c6d0f505",
-    "tab_background": "#232634",
-    "tab_foreground": "#a5adce",
-    "tab_hover_background": "#c6d0f50d",
-    "tab_active_background": "#303446",
-    "tab_active_foreground": "#c6d0f5",
-    "scrollbar_thumb_background": "#c6d0f51a",
-    "scrollbar_thumb_hover_background": "#c6d0f526",
-    "scrollbar_thumb_border": "#c6d0f500",
-    "scrollbar_track_background": "#c6d0f500",
-    "scrollbar_track_border": "#c6d0f500",
-    "drop_target_background": "#8caaee1a",
-    "cursor": "#8caaee",
-    "selection": "#8caaee40"
-  },
-  "dark": {
-    "background": "#303446",
-    "surface_background": "#292c3c",
-    "elevated_surface_background": "#232634",
-    "panel_background": "#303446",
-    "overlay": "#c6d0f51a",
-    "title_bar": "#232634",
-    "title_bar_inactive": "#303446",
-    "window_border": "#51576d",
-    "border": "#51576d",
-    "border_variant": "#414559",
-    "border_focused": "#8caaee",
-    "border_selected": "#8caaee",
-    "border_transparent": "#c6d0f500",
-    "border_disabled": "#292c3c",
-    "ring": "#babbf1",
-    "text": "#c6d0f5",
-    "text_muted": "#a5adce",
-    "text_placeholder": "#838ba7",
-    "text_accent": "#8caaee",
-    "text_danger": "#e78284",
-    "text_warning": "#ef9f76",
-    "icon": "#a5adce",
-    "icon_muted": "#838ba7",
-    "icon_accent": "#babbf1",
-    "element_foreground": "#303446",
-    "element_background": "#8caaee",
-    "element_hover": "#babbf1",
-    "element_active": "#99d1db",
-    "element_selected": "#85c1dc",
-    "element_disabled": "#8caaee4d",
-    "secondary_foreground": "#c6d0f5",
-    "secondary_background": "#414559",
-    "secondary_hover": "#51576d",
-    "secondary_active": "#626880",
-    "secondary_selected": "#626880",
-    "secondary_disabled": "#8caaee4d",
-    "danger_foreground": "#303446",
-    "danger_background": "#e78284",
-    "danger_hover": "#ea999c",
-    "danger_active": "#ef9f76",
-    "danger_selected": "#e5c890",
-    "danger_disabled": "#e782844d",
-    "warning_foreground": "#303446",
-    "warning_background": "#ef9f76",
-    "warning_hover": "#e5c890",
-    "warning_active": "#a6d189",
-    "warning_selected": "#81c8be",
-    "warning_disabled": "#ef9f764d",
-    "ghost_element_background": "#c6d0f500",
-    "ghost_element_background_alt": "#292c3c",
-    "ghost_element_hover": "#c6d0f50d",
-    "ghost_element_active": "#c6d0f51a",
-    "ghost_element_selected": "#c6d0f51a",
-    "ghost_element_disabled": "#c6d0f505",
-    "tab_background": "#232634",
-    "tab_foreground": "#a5adce",
-    "tab_hover_background": "#c6d0f50d",
-    "tab_active_background": "#303446",
-    "tab_active_foreground": "#c6d0f5",
-    "scrollbar_thumb_background": "#c6d0f51a",
-    "scrollbar_thumb_hover_background": "#c6d0f526",
-    "scrollbar_thumb_border": "#c6d0f500",
-    "scrollbar_track_background": "#c6d0f500",
-    "scrollbar_track_border": "#c6d0f500",
-    "drop_target_background": "#8caaee1a",
-    "cursor": "#8caaee",
-    "selection": "#8caaee40"
-  }
-}

assets/themes/catppuccin-latte.json

@@ -1,144 +0,0 @@
-{
-  "id": "catppuccin-latte",
-  "name": "Catppuccin Latte",
-  "author": "Catppuccin Org (ported by Coop)",
-  "url": "https://catppuccin.com",
-  "light": {
-    "background": "#eff1f5",
-    "surface_background": "#e6e9ef",
-    "elevated_surface_background": "#dce0e8",
-    "panel_background": "#eff1f5",
-    "overlay": "#4c4f691a",
-    "title_bar": "#dce0e8",
-    "title_bar_inactive": "#eff1f5",
-    "window_border": "#bcc0cc",
-    "border": "#bcc0cc",
-    "border_variant": "#ccd0da",
-    "border_focused": "#1e66f5",
-    "border_selected": "#1e66f5",
-    "border_transparent": "#4c4f6900",
-    "border_disabled": "#e6e9ef",
-    "ring": "#7287fd",
-    "text": "#4c4f69",
-    "text_muted": "#6c6f85",
-    "text_placeholder": "#8c8fa1",
-    "text_accent": "#1e66f5",
-    "text_danger": "#d20f39",
-    "text_warning": "#fe640b",
-    "icon": "#6c6f85",
-    "icon_muted": "#8c8fa1",
-    "icon_accent": "#7287fd",
-    "element_foreground": "#eff1f5",
-    "element_background": "#1e66f5",
-    "element_hover": "#7287fd",
-    "element_active": "#04a5e5",
-    "element_selected": "#209fb5",
-    "element_disabled": "#1e66f54d",
-    "secondary_foreground": "#4c4f69",
-    "secondary_background": "#ccd0da",
-    "secondary_hover": "#bcc0cc",
-    "secondary_active": "#acb0be",
-    "secondary_selected": "#acb0be",
-    "secondary_disabled": "#1e66f54d",
-    "danger_foreground": "#eff1f5",
-    "danger_background": "#d20f39",
-    "danger_hover": "#e64553",
-    "danger_active": "#fe640b",
-    "danger_selected": "#df8e1d",
-    "danger_disabled": "#d20f394d",
-    "warning_foreground": "#eff1f5",
-    "warning_background": "#fe640b",
-    "warning_hover": "#df8e1d",
-    "warning_active": "#40a02b",
-    "warning_selected": "#179299",
-    "warning_disabled": "#fe640b4d",
-    "ghost_element_background": "#4c4f6900",
-    "ghost_element_background_alt": "#e6e9ef",
-    "ghost_element_hover": "#4c4f690d",
-    "ghost_element_active": "#4c4f691a",
-    "ghost_element_selected": "#4c4f691a",
-    "ghost_element_disabled": "#4c4f6905",
-    "tab_background": "#e6e9ef",
-    "tab_foreground": "#6c6f85",
-    "tab_hover_background": "#4c4f690d",
-    "tab_active_background": "#eff1f5",
-    "tab_active_foreground": "#4c4f69",
-    "scrollbar_thumb_background": "#4c4f691a",
-    "scrollbar_thumb_hover_background": "#4c4f6926",
-    "scrollbar_thumb_border": "#4c4f6900",
-    "scrollbar_track_background": "#4c4f6900",
-    "scrollbar_track_border": "#4c4f6900",
-    "drop_target_background": "#1e66f51a",
-    "cursor": "#1e66f5",
-    "selection": "#1e66f540"
-  },
-  "dark": {
-    "background": "#eff1f5",
-    "surface_background": "#e6e9ef",
-    "elevated_surface_background": "#dce0e8",
-    "panel_background": "#eff1f5",
-    "overlay": "#4c4f691a",
-    "title_bar": "#dce0e8",
-    "title_bar_inactive": "#eff1f5",
-    "window_border": "#bcc0cc",
-    "border": "#bcc0cc",
-    "border_variant": "#ccd0da",
-    "border_focused": "#1e66f5",
-    "border_selected": "#1e66f5",
-    "border_transparent": "#4c4f6900",
-    "border_disabled": "#e6e9ef",
-    "ring": "#7287fd",
-    "text": "#4c4f69",
-    "text_muted": "#6c6f85",
-    "text_placeholder": "#8c8fa1",
-    "text_accent": "#1e66f5",
-    "text_danger": "#d20f39",
-    "text_warning": "#fe640b",
-    "icon": "#6c6f85",
-    "icon_muted": "#8c8fa1",
-    "icon_accent": "#7287fd",
-    "element_foreground": "#eff1f5",
-    "element_background": "#1e66f5",
-    "element_hover": "#7287fd",
-    "element_active": "#04a5e5",
-    "element_selected": "#209fb5",
-    "element_disabled": "#1e66f54d",
-    "secondary_foreground": "#4c4f69",
-    "secondary_background": "#ccd0da",
-    "secondary_hover": "#bcc0cc",
-    "secondary_active": "#acb0be",
-    "secondary_selected": "#acb0be",
-    "secondary_disabled": "#1e66f54d",
-    "danger_foreground": "#eff1f5",
-    "danger_background": "#d20f39",
-    "danger_hover": "#e64553",
-    "danger_active": "#fe640b",
-    "danger_selected": "#df8e1d",
-    "danger_disabled": "#d20f394d",
-    "warning_foreground": "#eff1f5",
-    "warning_background": "#fe640b",
-    "warning_hover": "#df8e1d",
-    "warning_active": "#40a02b",
-    "warning_selected": "#179299",
-    "warning_disabled": "#fe640b4d",
-    "ghost_element_background": "#4c4f6900",
-    "ghost_element_background_alt": "#e6e9ef",
-    "ghost_element_hover": "#4c4f690d",
-    "ghost_element_active": "#4c4f691a",
-    "ghost_element_selected": "#4c4f691a",
-    "ghost_element_disabled": "#4c4f6905",
-    "tab_background": "#e6e9ef",
-    "tab_foreground": "#6c6f85",
-    "tab_hover_background": "#4c4f690d",
-    "tab_active_background": "#eff1f5",
-    "tab_active_foreground": "#4c4f69",
-    "scrollbar_thumb_background": "#4c4f691a",
-    "scrollbar_thumb_hover_background": "#4c4f6926",
-    "scrollbar_thumb_border": "#4c4f6900",
-    "scrollbar_track_background": "#4c4f6900",
-    "scrollbar_track_border": "#4c4f6900",
-    "drop_target_background": "#1e66f51a",
-    "cursor": "#1e66f5",
-    "selection": "#1e66f540"
-  }
-}

assets/themes/catppuccin-macchiato.json

@@ -1,144 +0,0 @@
-{
-  "id": "catppuccin-macchiato",
-  "name": "Catppuccin Macchiato",
-  "author": "Catppuccin Org (ported by Coop)",
-  "url": "https://catppuccin.com",
-  "light": {
-    "background": "#24273a",
-    "surface_background": "#1e2030",
-    "elevated_surface_background": "#181926",
-    "panel_background": "#24273a",
-    "overlay": "#cad3f51a",
-    "title_bar": "#181926",
-    "title_bar_inactive": "#24273a",
-    "window_border": "#494d64",
-    "border": "#494d64",
-    "border_variant": "#363a4f",
-    "border_focused": "#8aadf4",
-    "border_selected": "#8aadf4",
-    "border_transparent": "#cad3f500",
-    "border_disabled": "#1e2030",
-    "ring": "#b7bdf8",
-    "text": "#cad3f5",
-    "text_muted": "#a5adcb",
-    "text_placeholder": "#8087a2",
-    "text_accent": "#8aadf4",
-    "text_danger": "#ed8796",
-    "text_warning": "#f5a97f",
-    "icon": "#a5adcb",
-    "icon_muted": "#8087a2",
-    "icon_accent": "#b7bdf8",
-    "element_foreground": "#24273a",
-    "element_background": "#8aadf4",
-    "element_hover": "#b7bdf8",
-    "element_active": "#91d7e3",
-    "element_selected": "#7dc4e4",
-    "element_disabled": "#8aadf44d",
-    "secondary_foreground": "#cad3f5",
-    "secondary_background": "#363a4f",
-    "secondary_hover": "#494d64",
-    "secondary_active": "#5b6078",
-    "secondary_selected": "#5b6078",
-    "secondary_disabled": "#8aadf44d",
-    "danger_foreground": "#24273a",
-    "danger_background": "#ed8796",
-    "danger_hover": "#ee99a0",
-    "danger_active": "#f5a97f",
-    "danger_selected": "#eed49f",
-    "danger_disabled": "#ed87964d",
-    "warning_foreground": "#24273a",
-    "warning_background": "#f5a97f",
-    "warning_hover": "#eed49f",
-    "warning_active": "#a6da95",
-    "warning_selected": "#8bd5ca",
-    "warning_disabled": "#f5a97f4d",
-    "ghost_element_background": "#cad3f500",
-    "ghost_element_background_alt": "#1e2030",
-    "ghost_element_hover": "#cad3f50d",
-    "ghost_element_active": "#cad3f51a",
-    "ghost_element_selected": "#cad3f51a",
-    "ghost_element_disabled": "#cad3f505",
-    "tab_background": "#181926",
-    "tab_foreground": "#a5adcb",
-    "tab_hover_background": "#cad3f50d",
-    "tab_active_background": "#24273a",
-    "tab_active_foreground": "#cad3f5",
-    "scrollbar_thumb_background": "#cad3f51a",
-    "scrollbar_thumb_hover_background": "#cad3f526",
-    "scrollbar_thumb_border": "#cad3f500",
-    "scrollbar_track_background": "#cad3f500",
-    "scrollbar_track_border": "#cad3f500",
-    "drop_target_background": "#8aadf41a",
-    "cursor": "#8aadf4",
-    "selection": "#8aadf440"
-  },
-  "dark": {
-    "background": "#24273a",
-    "surface_background": "#1e2030",
-    "elevated_surface_background": "#181926",
-    "panel_background": "#24273a",
-    "overlay": "#cad3f51a",
-    "title_bar": "#181926",
-    "title_bar_inactive": "#24273a",
-    "window_border": "#494d64",
-    "border": "#494d64",
-    "border_variant": "#363a4f",
-    "border_focused": "#8aadf4",
-    "border_selected": "#8aadf4",
-    "border_transparent": "#cad3f500",
-    "border_disabled": "#1e2030",
-    "ring": "#b7bdf8",
-    "text": "#cad3f5",
-    "text_muted": "#a5adcb",
-    "text_placeholder": "#8087a2",
-    "text_accent": "#8aadf4",
-    "text_danger": "#ed8796",
-    "text_warning": "#f5a97f",
-    "icon": "#a5adcb",
-    "icon_muted": "#8087a2",
-    "icon_accent": "#b7bdf8",
-    "element_foreground": "#24273a",
-    "element_background": "#8aadf4",
-    "element_hover": "#b7bdf8",
-    "element_active": "#91d7e3",
-    "element_selected": "#7dc4e4",
-    "element_disabled": "#8aadf44d",
-    "secondary_foreground": "#cad3f5",
-    "secondary_background": "#363a4f",
-    "secondary_hover": "#494d64",
-    "secondary_active": "#5b6078",
-    "secondary_selected": "#5b6078",
-    "secondary_disabled": "#8aadf44d",
-    "danger_foreground": "#24273a",
-    "danger_background": "#ed8796",
-    "danger_hover": "#ee99a0",
-    "danger_active": "#f5a97f",
-    "danger_selected": "#eed49f",
-    "danger_disabled": "#ed87964d",
-    "warning_foreground": "#24273a",
-    "warning_background": "#f5a97f",
-    "warning_hover": "#eed49f",
-    "warning_active": "#a6da95",
-    "warning_selected": "#8bd5ca",
-    "warning_disabled": "#f5a97f4d",
-    "ghost_element_background": "#cad3f500",
-    "ghost_element_background_alt": "#1e2030",
-    "ghost_element_hover": "#cad3f50d",
-    "ghost_element_active": "#cad3f51a",
-    "ghost_element_selected": "#cad3f51a",
-    "ghost_element_disabled": "#cad3f505",
-    "tab_background": "#181926",
-    "tab_foreground": "#a5adcb",
-    "tab_hover_background": "#cad3f50d",
-    "tab_active_background": "#24273a",
-    "tab_active_foreground": "#cad3f5",
-    "scrollbar_thumb_background": "#cad3f51a",
-    "scrollbar_thumb_hover_background": "#cad3f526",
-    "scrollbar_thumb_border": "#cad3f500",
-    "scrollbar_track_background": "#cad3f500",
-    "scrollbar_track_border": "#cad3f500",
-    "drop_target_background": "#8aadf41a",
-    "cursor": "#8aadf4",
-    "selection": "#8aadf440"
-  }
-}

assets/themes/catppuccin-mocha.json

@@ -1,144 +0,0 @@
-{
-  "id": "catppuccin-mocha",
-  "name": "Catppuccin Mocha",
-  "author": "Catppuccin Org (ported by Coop)",
-  "url": "https://catppuccin.com",
-  "light": {
-    "background": "#1e1e2e",
-    "surface_background": "#181825",
-    "elevated_surface_background": "#11111b",
-    "panel_background": "#1e1e2e",
-    "overlay": "#cdd6f41a",
-    "title_bar": "#11111b",
-    "title_bar_inactive": "#1e1e2e",
-    "window_border": "#45475a",
-    "border": "#45475a",
-    "border_variant": "#313244",
-    "border_focused": "#89b4fa",
-    "border_selected": "#89b4fa",
-    "border_transparent": "#cdd6f400",
-    "border_disabled": "#181825",
-    "ring": "#b4befe",
-    "text": "#cdd6f4",
-    "text_muted": "#a6adc8",
-    "text_placeholder": "#7f849c",
-    "text_accent": "#89b4fa",
-    "text_danger": "#f38ba8",
-    "text_warning": "#fab387",
-    "icon": "#a6adc8",
-    "icon_muted": "#7f849c",
-    "icon_accent": "#b4befe",
-    "element_foreground": "#1e1e2e",
-    "element_background": "#89b4fa",
-    "element_hover": "#b4befe",
-    "element_active": "#89dceb",
-    "element_selected": "#74c7ec",
-    "element_disabled": "#89b4fa4d",
-    "secondary_foreground": "#cdd6f4",
-    "secondary_background": "#313244",
-    "secondary_hover": "#45475a",
-    "secondary_active": "#585b70",
-    "secondary_selected": "#585b70",
-    "secondary_disabled": "#89b4fa4d",
-    "danger_foreground": "#1e1e2e",
-    "danger_background": "#f38ba8",
-    "danger_hover": "#eba0ac",
-    "danger_active": "#fab387",
-    "danger_selected": "#f9e2af",
-    "danger_disabled": "#f38ba84d",
-    "warning_foreground": "#1e1e2e",
-    "warning_background": "#fab387",
-    "warning_hover": "#f9e2af",
-    "warning_active": "#a6e3a1",
-    "warning_selected": "#94e2d5",
-    "warning_disabled": "#fab3874d",
-    "ghost_element_background": "#cdd6f400",
-    "ghost_element_background_alt": "#181825",
-    "ghost_element_hover": "#cdd6f40d",
-    "ghost_element_active": "#cdd6f41a",
-    "ghost_element_selected": "#cdd6f41a",
-    "ghost_element_disabled": "#cdd6f405",
-    "tab_background": "#11111b",
-    "tab_foreground": "#a6adc8",
-    "tab_hover_background": "#cdd6f40d",
-    "tab_active_background": "#1e1e2e",
-    "tab_active_foreground": "#cdd6f4",
-    "scrollbar_thumb_background": "#cdd6f41a",
-    "scrollbar_thumb_hover_background": "#cdd6f426",
-    "scrollbar_thumb_border": "#cdd6f400",
-    "scrollbar_track_background": "#cdd6f400",
-    "scrollbar_track_border": "#cdd6f400",
-    "drop_target_background": "#89b4fa1a",
-    "cursor": "#89b4fa",
-    "selection": "#89b4fa40"
-  },
-  "dark": {
-    "background": "#1e1e2e",
-    "surface_background": "#181825",
-    "elevated_surface_background": "#11111b",
-    "panel_background": "#1e1e2e",
-    "overlay": "#cdd6f41a",
-    "title_bar": "#11111b",
-    "title_bar_inactive": "#1e1e2e",
-    "window_border": "#45475a",
-    "border": "#45475a",
-    "border_variant": "#313244",
-    "border_focused": "#89b4fa",
-    "border_selected": "#89b4fa",
-    "border_transparent": "#cdd6f400",
-    "border_disabled": "#181825",
-    "ring": "#b4befe",
-    "text": "#cdd6f4",
-    "text_muted": "#a6adc8",
-    "text_placeholder": "#7f849c",
-    "text_accent": "#89b4fa",
-    "text_danger": "#f38ba8",
-    "text_warning": "#fab387",
-    "icon": "#a6adc8",
-    "icon_muted": "#7f849c",
-    "icon_accent": "#b4befe",
-    "element_foreground": "#1e1e2e",
-    "element_background": "#89b4fa",
-    "element_hover": "#b4befe",
-    "element_active": "#89dceb",
-    "element_selected": "#74c7ec",
-    "element_disabled": "#89b4fa4d",
-    "secondary_foreground": "#cdd6f4",
-    "secondary_background": "#313244",
-    "secondary_hover": "#45475a",
-    "secondary_active": "#585b70",
-    "secondary_selected": "#585b70",
-    "secondary_disabled": "#89b4fa4d",
-    "danger_foreground": "#1e1e2e",
-    "danger_background": "#f38ba8",
-    "danger_hover": "#eba0ac",
-    "danger_active": "#fab387",
-    "danger_selected": "#f9e2af",
-    "danger_disabled": "#f38ba84d",
-    "warning_foreground": "#1e1e2e",
-    "warning_background": "#fab387",
-    "warning_hover": "#f9e2af",
-    "warning_active": "#a6e3a1",
-    "warning_selected": "#94e2d5",
-    "warning_disabled": "#fab3874d",
-    "ghost_element_background": "#cdd6f400",
-    "ghost_element_background_alt": "#181825",
-    "ghost_element_hover": "#cdd6f40d",
-    "ghost_element_active": "#cdd6f41a",
-    "ghost_element_selected": "#cdd6f41a",
-    "ghost_element_disabled": "#cdd6f405",
-    "tab_background": "#11111b",
-    "tab_foreground": "#a6adc8",
-    "tab_hover_background": "#cdd6f40d",
-    "tab_active_background": "#1e1e2e",
-    "tab_active_foreground": "#cdd6f4",
-    "scrollbar_thumb_background": "#cdd6f41a",
-    "scrollbar_thumb_hover_background": "#cdd6f426",
-    "scrollbar_thumb_border": "#cdd6f400",
-    "scrollbar_track_background": "#cdd6f400",
-    "scrollbar_track_border": "#cdd6f400",
-    "drop_target_background": "#89b4fa1a",
-    "cursor": "#89b4fa",
-    "selection": "#89b4fa40"
-  }
-}

assets/themes/flexoki.json

@@ -1,144 +0,0 @@
-{
-  "id": "flexoki",
-  "name": "Flexoki",
-  "author": "Steph Ango (ported by Coop)",
-  "url": "https://stephango.com/flexoki",
-  "light": {
-    "background": "#FFFCF0",
-    "surface_background": "#F2F0E5",
-    "elevated_surface_background": "#E6E4D9",
-    "panel_background": "#FFFCF0",
-    "overlay": "#100F0F1A",
-    "title_bar": "#E6E4D9",
-    "title_bar_inactive": "#FFFCF0",
-    "window_border": "#CECDC3",
-    "border": "#CECDC3",
-    "border_variant": "#DAD8CE",
-    "border_focused": "#24837B",
-    "border_selected": "#24837B",
-    "border_transparent": "#100F0F00",
-    "border_disabled": "#E6E4D9",
-    "ring": "#3AA99F",
-    "text": "#100F0F",
-    "text_muted": "#6F6E69",
-    "text_placeholder": "#B7B5AC",
-    "text_accent": "#24837B",
-    "text_danger": "#AF3029",
-    "text_warning": "#BC5215",
-    "icon": "#6F6E69",
-    "icon_muted": "#B7B5AC",
-    "icon_accent": "#3AA99F",
-    "element_foreground": "#FFFCF0",
-    "element_background": "#24837B",
-    "element_hover": "#3AA99F",
-    "element_active": "#1C1B1A",
-    "element_selected": "#100F0F",
-    "element_disabled": "#24837B4D",
-    "secondary_foreground": "#100F0F",
-    "secondary_background": "#E6E4D9",
-    "secondary_hover": "#DAD8CE",
-    "secondary_active": "#CECDC3",
-    "secondary_selected": "#CECDC3",
-    "secondary_disabled": "#24837B4D",
-    "danger_foreground": "#FFFCF0",
-    "danger_background": "#AF3029",
-    "danger_hover": "#D14D41",
-    "danger_active": "#1C1B1A",
-    "danger_selected": "#100F0F",
-    "danger_disabled": "#AF30294D",
-    "warning_foreground": "#FFFCF0",
-    "warning_background": "#BC5215",
-    "warning_hover": "#DA702C",
-    "warning_active": "#1C1B1A",
-    "warning_selected": "#100F0F",
-    "warning_disabled": "#BC52154D",
-    "ghost_element_background": "#100F0F00",
-    "ghost_element_background_alt": "#F2F0E5",
-    "ghost_element_hover": "#100F0F0D",
-    "ghost_element_active": "#100F0F1A",
-    "ghost_element_selected": "#100F0F1A",
-    "ghost_element_disabled": "#100F0F05",
-    "tab_background": "#E6E4D9",
-    "tab_foreground": "#6F6E69",
-    "tab_hover_background": "#100F0F0D",
-    "tab_active_background": "#FFFCF0",
-    "tab_active_foreground": "#100F0F",
-    "scrollbar_thumb_background": "#100F0F1A",
-    "scrollbar_thumb_hover_background": "#100F0F26",
-    "scrollbar_thumb_border": "#100F0F00",
-    "scrollbar_track_background": "#100F0F00",
-    "scrollbar_track_border": "#100F0F00",
-    "drop_target_background": "#24837B1A",
-    "cursor": "#24837B",
-    "selection": "#24837B40"
-  },
-  "dark": {
-    "background": "#100F0F",
-    "surface_background": "#1C1B1A",
-    "elevated_surface_background": "#282726",
-    "panel_background": "#100F0F",
-    "overlay": "#FFFCF01A",
-    "title_bar": "#282726",
-    "title_bar_inactive": "#100F0F",
-    "window_border": "#403E3C",
-    "border": "#403E3C",
-    "border_variant": "#343331",
-    "border_focused": "#3AA99F",
-    "border_selected": "#3AA99F",
-    "border_transparent": "#100F0F00",
-    "border_disabled": "#282726",
-    "ring": "#24837B",
-    "text": "#CECDC3",
-    "text_muted": "#878580",
-    "text_placeholder": "#575653",
-    "text_accent": "#3AA99F",
-    "text_danger": "#D14D41",
-    "text_warning": "#DA702C",
-    "icon": "#878580",
-    "icon_muted": "#575653",
-    "icon_accent": "#24837B",
-    "element_foreground": "#100F0F",
-    "element_background": "#3AA99F",
-    "element_hover": "#24837B",
-    "element_active": "#CECDC3",
-    "element_selected": "#F2F0E5",
-    "element_disabled": "#3AA99F4D",
-    "secondary_foreground": "#CECDC3",
-    "secondary_background": "#1C1B1A",
-    "secondary_hover": "#282726",
-    "secondary_active": "#343331",
-    "secondary_selected": "#343331",
-    "secondary_disabled": "#3AA99F4D",
-    "danger_foreground": "#100F0F",
-    "danger_background": "#D14D41",
-    "danger_hover": "#AF3029",
-    "danger_active": "#CECDC3",
-    "danger_selected": "#F2F0E5",
-    "danger_disabled": "#D14D414D",
-    "warning_foreground": "#100F0F",
-    "warning_background": "#DA702C",
-    "warning_hover": "#BC5215",
-    "warning_active": "#CECDC3",
-    "warning_selected": "#F2F0E5",
-    "warning_disabled": "#DA702C4D",
-    "ghost_element_background": "#100F0F00",
-    "ghost_element_background_alt": "#1C1B1A",
-    "ghost_element_hover": "#FFFCF00D",
-    "ghost_element_active": "#FFFCF01A",
-    "ghost_element_selected": "#FFFCF01A",
-    "ghost_element_disabled": "#FFFCF005",
-    "tab_background": "#282726",
-    "tab_foreground": "#878580",
-    "tab_hover_background": "#FFFCF00D",
-    "tab_active_background": "#100F0F",
-    "tab_active_foreground": "#CECDC3",
-    "scrollbar_thumb_background": "#FFFCF01A",
-    "scrollbar_thumb_hover_background": "#FFFCF026",
-    "scrollbar_thumb_border": "#100F0F00",
-    "scrollbar_track_background": "#100F0F00",
-    "scrollbar_track_border": "#100F0F00",
-    "drop_target_background": "#3AA99F1A",
-    "cursor": "#3AA99F",
-    "selection": "#3AA99F40"
-  }
-}

assets/themes/forest.json

@@ -1,144 +0,0 @@
-{
-  "id": "forest",
-  "name": "Forest",
-  "author": "Coop",
-  "url": "https://github.com/lumehq/coop",
-  "light": {
-    "background": "#fbfefcff",
-    "surface_background": "#f4fbf6ff",
-    "elevated_surface_background": "#e9f6e9ff",
-    "panel_background": "#fbfefcff",
-    "overlay": "#193b2d1a",
-    "title_bar": "#e9f6e9ff",
-    "title_bar_inactive": "#fbfefcff",
-    "window_border": "#c4e8d1ff",
-    "border": "#c4e8d1ff",
-    "border_variant": "#b2ddb5ff",
-    "border_focused": "#30a46cff",
-    "border_selected": "#30a46cff",
-    "border_transparent": "#00000000",
-    "border_disabled": "#e0f3e6ff",
-    "ring": "#2b9a66ff",
-    "text": "#193b2dff",
-    "text_muted": "#2f7c57ff",
-    "text_placeholder": "#8eceaaff",
-    "text_accent": "#30a46cff",
-    "text_danger": "#e54d2eff",
-    "text_warning": "#f76b15ff",
-    "icon": "#2f7c57ff",
-    "icon_muted": "#8eceaaff",
-    "icon_accent": "#2b9a66ff",
-    "element_foreground": "#ffffffff",
-    "element_background": "#30a46cff",
-    "element_hover": "#2b9a66ff",
-    "element_active": "#2a7e3bff",
-    "element_selected": "#218358ff",
-    "element_disabled": "#30a46c4d",
-    "secondary_foreground": "#193b2dff",
-    "secondary_background": "#e9f6e9ff",
-    "secondary_hover": "#daf1dbff",
-    "secondary_active": "#c4e8d1ff",
-    "secondary_selected": "#c4e8d1ff",
-    "secondary_disabled": "#30a46c4d",
-    "danger_foreground": "#ffffffff",
-    "danger_background": "#feebe7ff",
-    "danger_hover": "#ffcdc2ff",
-    "danger_active": "#fdbdafff",
-    "danger_selected": "#fdbdafff",
-    "danger_disabled": "#e54d2e4d",
-    "warning_foreground": "#ffffffff",
-    "warning_background": "#fff7edff",
-    "warning_hover": "#ffd19aff",
-    "warning_active": "#ffc182ff",
-    "warning_selected": "#ffc182ff",
-    "warning_disabled": "#f76b154d",
-    "ghost_element_background": "#00000000",
-    "ghost_element_background_alt": "#e9f6e9ff",
-    "ghost_element_hover": "#193b2d0d",
-    "ghost_element_active": "#193b2d1a",
-    "ghost_element_selected": "#193b2d1a",
-    "ghost_element_disabled": "#193b2d05",
-    "tab_background": "#e9f6e9ff",
-    "tab_foreground": "#2f7c57ff",
-    "tab_hover_background": "#193b2d0d",
-    "tab_active_background": "#fbfefcff",
-    "tab_active_foreground": "#193b2dff",
-    "scrollbar_thumb_background": "#193b2d1a",
-    "scrollbar_thumb_hover_background": "#193b2d26",
-    "scrollbar_thumb_border": "#00000000",
-    "scrollbar_track_background": "#00000000",
-    "scrollbar_track_border": "#00000000",
-    "drop_target_background": "#30a46c1a",
-    "cursor": "#30a46cff",
-    "selection": "#30a46c40"
-  },
-  "dark": {
-    "background": "#0e1512ff",
-    "surface_background": "#121b17ff",
-    "elevated_surface_background": "#132d21ff",
-    "panel_background": "#0e1512ff",
-    "overlay": "#b1f1cb1a",
-    "title_bar": "#132d21ff",
-    "title_bar_inactive": "#0e1512ff",
-    "window_border": "#20573eff",
-    "border": "#20573eff",
-    "border_variant": "#174933ff",
-    "border_focused": "#33b074ff",
-    "border_selected": "#33b074ff",
-    "border_transparent": "#00000000",
-    "border_disabled": "#113b29ff",
-    "ring": "#33b074ff",
-    "text": "#b1f1cbff",
-    "text_muted": "#71d083ff",
-    "text_placeholder": "#2f7c57ff",
-    "text_accent": "#3dd68cff",
-    "text_danger": "#ff977dff",
-    "text_warning": "#ffa057ff",
-    "icon": "#71d083ff",
-    "icon_muted": "#2f7c57ff",
-    "icon_accent": "#33b074ff",
-    "element_foreground": "#0e1512ff",
-    "element_background": "#3dd68cff",
-    "element_hover": "#71d083ff",
-    "element_active": "#33b074ff",
-    "element_selected": "#30a46cff",
-    "element_disabled": "#3dd68c4d",
-    "secondary_foreground": "#b1f1cbff",
-    "secondary_background": "#132d21ff",
-    "secondary_hover": "#113b29ff",
-    "secondary_active": "#174933ff",
-    "secondary_selected": "#174933ff",
-    "secondary_disabled": "#3dd68c4d",
-    "danger_foreground": "#181111ff",
-    "danger_background": "#391714ff",
-    "danger_hover": "#5e1c16ff",
-    "danger_active": "#6e2920ff",
-    "danger_selected": "#6e2920ff",
-    "danger_disabled": "#ff977d4d",
-    "warning_foreground": "#17120eff",
-    "warning_background": "#331e0bff",
-    "warning_hover": "#562800ff",
-    "warning_active": "#66350cff",
-    "warning_selected": "#66350cff",
-    "warning_disabled": "#ffa0574d",
-    "ghost_element_background": "#00000000",
-    "ghost_element_background_alt": "#132d21ff",
-    "ghost_element_hover": "#b1f1cb0d",
-    "ghost_element_active": "#b1f1cb1a",
-    "ghost_element_selected": "#b1f1cb1a",
-    "ghost_element_disabled": "#b1f1cb05",
-    "tab_background": "#132d21ff",
-    "tab_foreground": "#71d083ff",
-    "tab_hover_background": "#b1f1cb0d",
-    "tab_active_background": "#0e1512ff",
-    "tab_active_foreground": "#b1f1cbff",
-    "scrollbar_thumb_background": "#b1f1cb1a",
-    "scrollbar_thumb_hover_background": "#b1f1cb26",
-    "scrollbar_thumb_border": "#00000000",
-    "scrollbar_track_background": "#00000000",
-    "scrollbar_track_border": "#00000000",
-    "drop_target_background": "#3dd68c1a",
-    "cursor": "#3dd68cff",
-    "selection": "#3dd68c40"
-  }
-}

assets/themes/ocean.json

@@ -1,144 +0,0 @@
-{
-  "id": "ocean",
-  "name": "Ocean",
-  "author": "Coop",
-  "url": "https://github.com/lumehq/coop",
-  "light": {
-    "background": "#fafefeff",
-    "surface_background": "#f2fbfaff",
-    "elevated_surface_background": "#e6f7f7ff",
-    "panel_background": "#fafefeff",
-    "overlay": "#00333f1a",
-    "title_bar": "#e6f7f7ff",
-    "title_bar_inactive": "#fafefeff",
-    "window_border": "#cce5e9ff",
-    "border": "#cce5e9ff",
-    "border_variant": "#b8dde3ff",
-    "border_focused": "#00a2c7ff",
-    "border_selected": "#00a2c7ff",
-    "border_transparent": "#00000000",
-    "border_disabled": "#e0f0f2ff",
-    "ring": "#0797b9ff",
-    "text": "#0d3c48ff",
-    "text_muted": "#107d98ff",
-    "text_placeholder": "#60b3d7ff",
-    "text_accent": "#00a2c7ff",
-    "text_danger": "#e54d2eff",
-    "text_warning": "#f76b15ff",
-    "icon": "#107d98ff",
-    "icon_muted": "#60b3d7ff",
-    "icon_accent": "#0797b9ff",
-    "element_foreground": "#ffffffff",
-    "element_background": "#00a2c7ff",
-    "element_hover": "#0797b9ff",
-    "element_active": "#12667eff",
-    "element_selected": "#0d4a5cff",
-    "element_disabled": "#00a2c74d",
-    "secondary_foreground": "#0d4a5cff",
-    "secondary_background": "#ddf9f2ff",
-    "secondary_hover": "#c8f4e9ff",
-    "secondary_active": "#b3ecdeff",
-    "secondary_selected": "#b3ecdeff",
-    "secondary_disabled": "#00a2c74d",
-    "danger_foreground": "#ffffffff",
-    "danger_background": "#feebe7ff",
-    "danger_hover": "#ffcdc2ff",
-    "danger_active": "#fdbdafff",
-    "danger_selected": "#fdbdafff",
-    "danger_disabled": "#e54d2e4d",
-    "warning_foreground": "#ffffffff",
-    "warning_background": "#fff7edff",
-    "warning_hover": "#ffd19aff",
-    "warning_active": "#ffc182ff",
-    "warning_selected": "#ffc182ff",
-    "warning_disabled": "#f76b154d",
-    "ghost_element_background": "#00000000",
-    "ghost_element_background_alt": "#e6f7f7ff",
-    "ghost_element_hover": "#00333f0d",
-    "ghost_element_active": "#00333f1a",
-    "ghost_element_selected": "#00333f1a",
-    "ghost_element_disabled": "#00333f05",
-    "tab_background": "#e6f7f7ff",
-    "tab_foreground": "#107d98ff",
-    "tab_hover_background": "#00333f0d",
-    "tab_active_background": "#fafefeff",
-    "tab_active_foreground": "#0d3c48ff",
-    "scrollbar_thumb_background": "#00333f1a",
-    "scrollbar_thumb_hover_background": "#00333f26",
-    "scrollbar_thumb_border": "#00000000",
-    "scrollbar_track_background": "#00000000",
-    "scrollbar_track_border": "#00000000",
-    "drop_target_background": "#00a2c71a",
-    "cursor": "#00a2c7ff",
-    "selection": "#00a2c740"
-  },
-  "dark": {
-    "background": "#0b161aff",
-    "surface_background": "#101b20ff",
-    "elevated_surface_background": "#082c36ff",
-    "panel_background": "#0b161aff",
-    "overlay": "#c2f3ff1a",
-    "title_bar": "#082c36ff",
-    "title_bar_inactive": "#0b161aff",
-    "window_border": "#1b537bff",
-    "border": "#1b537bff",
-    "border_variant": "#154467ff",
-    "border_focused": "#00a2c7ff",
-    "border_selected": "#00a2c7ff",
-    "border_transparent": "#00000000",
-    "border_disabled": "#112840ff",
-    "ring": "#23afd0ff",
-    "text": "#b6ecf7ff",
-    "text_muted": "#4ccce6ff",
-    "text_placeholder": "#197caeff",
-    "text_accent": "#7ce2feff",
-    "text_danger": "#ff977dff",
-    "text_warning": "#ffa057ff",
-    "icon": "#4ccce6ff",
-    "icon_muted": "#197caeff",
-    "icon_accent": "#23afd0ff",
-    "element_foreground": "#0b161aff",
-    "element_background": "#7ce2feff",
-    "element_hover": "#a8eeffff",
-    "element_active": "#23afd0ff",
-    "element_selected": "#00a2c7ff",
-    "element_disabled": "#7ce2fe4d",
-    "secondary_foreground": "#adf0ddff",
-    "secondary_background": "#0d2d2aff",
-    "secondary_hover": "#023b37ff",
-    "secondary_active": "#084843ff",
-    "secondary_selected": "#084843ff",
-    "secondary_disabled": "#7ce2fe4d",
-    "danger_foreground": "#181111ff",
-    "danger_background": "#391714ff",
-    "danger_hover": "#5e1c16ff",
-    "danger_active": "#6e2920ff",
-    "danger_selected": "#6e2920ff",
-    "danger_disabled": "#ff977d4d",
-    "warning_foreground": "#17120eff",
-    "warning_background": "#331e0bff",
-    "warning_hover": "#562800ff",
-    "warning_active": "#66350cff",
-    "warning_selected": "#66350cff",
-    "warning_disabled": "#ffa0574d",
-    "ghost_element_background": "#00000000",
-    "ghost_element_background_alt": "#082c36ff",
-    "ghost_element_hover": "#c2f3ff0d",
-    "ghost_element_active": "#c2f3ff1a",
-    "ghost_element_selected": "#c2f3ff1a",
-    "ghost_element_disabled": "#c2f3ff05",
-    "tab_background": "#082c36ff",
-    "tab_foreground": "#4ccce6ff",
-    "tab_hover_background": "#c2f3ff0d",
-    "tab_active_background": "#0b161aff",
-    "tab_active_foreground": "#b6ecf7ff",
-    "scrollbar_thumb_background": "#c2f3ff1a",
-    "scrollbar_thumb_hover_background": "#c2f3ff26",
-    "scrollbar_thumb_border": "#00000000",
-    "scrollbar_track_background": "#00000000",
-    "scrollbar_track_border": "#00000000",
-    "drop_target_background": "#7ce2fe1a",
-    "cursor": "#7ce2feff",
-    "selection": "#7ce2fe40"
-  }
-}

crates/auto_update/Cargo.toml

@@ -5,11 +5,18 @@ edition.workspace = true
 publish.workspace = true
 
 [dependencies]
-gpui.workspace = true
-instant.workspace = true
-log.workspace = true
-serde.workspace = true
-serde_json.workspace = true
-ureq.workspace = true
+common = { path = "../common" }
 
-gpui-updater-core = { git = "https://github.com/AprilNEA/gpui-updater" }
+gpui.workspace = true
+gpui_tokio.workspace = true
+reqwest.workspace = true
+anyhow.workspace = true
+smol.workspace = true
+log.workspace = true
+smallvec.workspace = true
+serde = { workspace = true, features = ["derive"] }
+serde_json.workspace = true
+
+semver = "1.0.27"
+tempfile = "3.23.0"
+futures.workspace = true

crates/auto_update/src/lib.rs

@@ -1,326 +1,555 @@
-#![cfg(not(target_arch = "wasm32"))]
-
+use std::ffi::OsString;
+use std::path::{Path, PathBuf};
 use std::sync::Arc;
-use std::sync::atomic::{AtomicBool, AtomicU64, Ordering};
+use std::time::Duration;
 
-use gpui::{App, AppContext, Context, Entity, Global, SharedString, Task, Window};
-use gpui_updater_core::{EngineConfig, Release, UpdateEngine, UpdateStatus, Verification, Version};
-use instant::Duration;
-
-use crate::source::{AssetFilter, GiteaSource, asset_filter_for};
-
-mod source;
-
-pub use gpui_updater_core::UpdateStatus as AutoUpdateStatus;
-
-const GITEA_API_BASE: &str = "https://git.reya.info/api/v1";
-const GITEA_REPO_OWNER: &str = "reya";
-const GITEA_REPO_NAME: &str = "coop";
-
-/// Delay before the automatic check that runs on startup.
-const AUTO_CHECK_DELAY: Duration = Duration::from_secs(120);
-/// How long a failure stays visible before the status reverts to "Up to date".
-const ERROR_DISPLAY_DURATION: Duration = Duration::from_secs(5);
+use anyhow::{anyhow, Context as AnyhowContext, Error};
+use gpui::http_client::{AsyncBody, HttpClient};
+use gpui::{
+    App, AppContext, AsyncApp, BackgroundExecutor, Context, Entity, Global, Subscription, Task,
+};
+use semver::Version;
+use serde::Deserialize;
+use smallvec::{smallvec, SmallVec};
+use smol::fs::File;
+use smol::process::Command;
 
+const GITHUB_API_URL: &str = "https://api.github.com";
 const COOP_UPDATE_EXPLANATION: &str = "COOP_UPDATE_EXPLANATION";
-const COOP_BUNDLE_TYPE: &str = "COOP_BUNDLE_TYPE";
 
-fn uses_managed_updates() -> bool {
-    // The Flatpak runtime exports `FLATPAK_ID` inside the sandbox.
-    std::env::var("FLATPAK_ID").is_ok()
-        // Allow opting out of in-app updates via an explicit environment variable.
-        || std::env::var(COOP_UPDATE_EXPLANATION).is_ok()
-        // The Snap package sets `COOP_BUNDLE_TYPE=snap` (see snapcraft.yaml.in).
-        || std::env::var(COOP_BUNDLE_TYPE).is_ok_and(|value| value == "snap")
+fn get_github_repo_owner() -> String {
+    std::env::var("COOP_GITHUB_REPO_OWNER").unwrap_or_else(|_| "your-username".to_string())
 }
 
-/// Initialize the auto-update system.
-pub fn init(window: &mut Window, cx: &mut App) {
-    if uses_managed_updates() {
-        log::info!(
-            "Skipping auto-update initialization: updates are managed by the installed distribution channel (Flatpak/Snap)"
-        );
+fn get_github_repo_name() -> String {
+    std::env::var("COOP_GITHUB_REPO_NAME").unwrap_or_else(|_| "your-repo".to_string())
+}
+
+fn is_flatpak_installation() -> bool {
+    // Check if app is installed via Flatpak
+    std::env::var("FLATPAK_ID").is_ok() || std::env::var(COOP_UPDATE_EXPLANATION).is_ok()
+}
+
+pub fn init(cx: &mut App) {
+    // Skip auto-update initialization if installed via Flatpak
+    if is_flatpak_installation() {
+        log::info!("Skipping auto-update initialization: App is installed via Flatpak");
         return;
     }
 
-    let (os, arch) = (std::env::consts::OS, std::env::consts::ARCH);
-
-    let Some(filter) = asset_filter_for(os, arch) else {
-        log::info!(
-            "Skipping auto-update initialization: no installable release artifact is published for {os}/{arch}"
-        );
-        return;
-    };
-
-    let Ok(version) = Version::parse(env!("CARGO_PKG_VERSION")) else {
-        log::error!(
-            "Skipping auto-update initialization: crate version {:?} is not valid semver",
-            env!("CARGO_PKG_VERSION")
-        );
-        return;
-    };
-
-    AutoUpdater::set_global(
-        cx.new(|cx| AutoUpdater::new(window, version, filter, cx)),
-        cx,
-    );
+    AutoUpdater::set_global(cx.new(AutoUpdater::new), cx);
 }
 
 struct GlobalAutoUpdater(Entity<AutoUpdater>);
 
 impl Global for GlobalAutoUpdater {}
 
+#[cfg(not(target_os = "windows"))]
+struct InstallerDir(tempfile::TempDir);
+
+#[cfg(not(target_os = "windows"))]
+impl InstallerDir {
+    async fn new() -> Result<Self, Error> {
+        Ok(Self(
+            tempfile::Builder::new()
+                .prefix("coop-auto-update")
+                .tempdir()?,
+        ))
+    }
+
+    fn path(&self) -> &Path {
+        self.0.path()
+    }
+}
+
+#[cfg(target_os = "windows")]
+struct InstallerDir(PathBuf);
+
+#[cfg(target_os = "windows")]
+impl InstallerDir {
+    async fn new() -> Result<Self, Error> {
+        let installer_dir = std::env::current_exe()?
+            .parent()
+            .context("No parent dir for Coop.exe")?
+            .join("updates");
+
+        if smol::fs::metadata(&installer_dir).await.is_ok() {
+            smol::fs::remove_dir_all(&installer_dir).await?;
+        }
+
+        smol::fs::create_dir(&installer_dir).await?;
+
+        Ok(Self(installer_dir))
+    }
+
+    fn path(&self) -> &Path {
+        self.0.as_path()
+    }
+}
+
+struct MacOsUnmounter<'a> {
+    mount_path: PathBuf,
+    background_executor: &'a BackgroundExecutor,
+}
+
+impl Drop for MacOsUnmounter<'_> {
+    fn drop(&mut self) {
+        let mount_path = std::mem::take(&mut self.mount_path);
+
+        self.background_executor
+            .spawn(async move {
+                let unmount_output = Command::new("hdiutil")
+                    .args(["detach", "-force"])
+                    .arg(&mount_path)
+                    .output()
+                    .await;
+
+                match unmount_output {
+                    Ok(output) if output.status.success() => {
+                        log::info!("Successfully unmounted the disk image");
+                    }
+                    Ok(output) => {
+                        log::error!(
+                            "Failed to unmount disk image: {:?}",
+                            String::from_utf8_lossy(&output.stderr)
+                        );
+                    }
+                    Err(error) => {
+                        log::error!("Error while trying to unmount disk image: {:?}", error);
+                    }
+                }
+            })
+            .detach();
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
+pub enum AutoUpdateStatus {
+    Idle,
+    Checking,
+    Checked { download_url: String },
+    Installing,
+    Updated,
+    Errored { msg: Box<String> },
+}
+
+impl AsRef<AutoUpdateStatus> for AutoUpdateStatus {
+    fn as_ref(&self) -> &AutoUpdateStatus {
+        self
+    }
+}
+
+impl AutoUpdateStatus {
+    pub fn is_updating(&self) -> bool {
+        matches!(self, Self::Checked { .. } | Self::Installing)
+    }
+
+    pub fn is_updated(&self) -> bool {
+        matches!(self, Self::Updated)
+    }
+
+    pub fn checked(download_url: String) -> Self {
+        Self::Checked { download_url }
+    }
+
+    pub fn error(e: String) -> Self {
+        Self::Errored { msg: Box::new(e) }
+    }
+}
+
+#[derive(Debug, Deserialize)]
+pub struct GitHubRelease {
+    pub tag_name: String,
+    pub assets: Vec<GitHubAsset>,
+}
+
+#[derive(Debug, Deserialize)]
+pub struct GitHubAsset {
+    pub name: String,
+    pub browser_download_url: String,
+}
+
+#[derive(Debug)]
 pub struct AutoUpdater {
-    /// The blocking engine, driven on the background executor.
-    engine: Arc<UpdateEngine<GiteaSource>>,
-    status: UpdateStatus,
-    /// The newer release found by the last successful check, if any.
-    available: Option<Release>,
-    /// Currently running app version.
+    /// Current status of the auto updater
+    pub status: AutoUpdateStatus,
+
+    /// Current version of the application
     pub version: Version,
-    /// The in-flight check or download, if any.
-    task: Option<Task<()>>,
+
+    /// Event subscriptions
+    _subscriptions: SmallVec<[Subscription; 1]>,
+
+    /// Background tasks
+    _tasks: SmallVec<[Task<()>; 2]>,
 }
 
 impl AutoUpdater {
-    /// Whether auto-update is available for this installation.
-    pub fn is_available(cx: &App) -> bool {
-        cx.try_global::<GlobalAutoUpdater>().is_some()
-    }
-
-    /// Retrieve the global auto updater instance, if one was initialized.
-    pub fn try_global(cx: &App) -> Option<Entity<Self>> {
-        cx.try_global::<GlobalAutoUpdater>()
-            .map(|global| global.0.clone())
-    }
-
-    /// Retrieve the global auto updater instance.
+    /// Retrieve the global auto updater instance
     pub fn global(cx: &App) -> Entity<Self> {
         cx.global::<GlobalAutoUpdater>().0.clone()
     }
 
+    /// Set the global auto updater instance
     fn set_global(state: Entity<Self>, cx: &mut App) {
         cx.set_global(GlobalAutoUpdater(state));
     }
 
-    fn new(
-        window: &mut Window,
-        version: Version,
-        filter: AssetFilter,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        let source = GiteaSource::new(GITEA_API_BASE, GITEA_REPO_OWNER, GITEA_REPO_NAME, filter);
-        let config = EngineConfig::new(version.clone()).verification(Verification::Checksum);
-        let engine = Arc::new(UpdateEngine::new(source, config));
+    fn new(cx: &mut Context<Self>) -> Self {
+        let version = Version::parse(env!("CARGO_PKG_VERSION")).unwrap();
+        let async_version = version.clone();
 
-        // Schedule an auto-check after a 2-minute delay
-        cx.defer_in(window, |_this, _window, cx| {
+        let mut subscriptions = smallvec![];
+        let mut tasks = smallvec![];
+
+        tasks.push(
+            // Check for updates after 2 minutes
             cx.spawn(async move |this, cx| {
-                cx.background_executor().timer(AUTO_CHECK_DELAY).await;
-                this.update(cx, |this, cx| this.check(cx)).ok();
-            })
-            .detach();
-        });
+                cx.background_executor()
+                    .timer(Duration::from_secs(120))
+                    .await;
 
-        Self {
-            engine,
-            status: UpdateStatus::Idle,
-            available: None,
-            version,
-            task: None,
-        }
-    }
+                // Update the status to checking
+                this.update(cx, |this, cx| {
+                    this.set_status(AutoUpdateStatus::Checking, cx);
+                })
+                .ok();
 
-    /// Whether nothing is happening, so the UI can hide the status line.
-    pub fn idle(&self) -> bool {
-        matches!(self.status, UpdateStatus::Idle)
-    }
-
-    /// Whether a verified update is installed and waiting for a restart.
-    pub fn staged(&self) -> bool {
-        matches!(self.status, UpdateStatus::Staged(_))
-    }
-
-    /// A short, human-readable description of the current status.
-    pub fn status(&self) -> SharedString {
-        match &self.status {
-            UpdateStatus::Idle | UpdateStatus::UpToDate => "Up to date".into(),
-            UpdateStatus::Checking => "Checking for updates…".into(),
-            UpdateStatus::Available(version) => format!("Version {version} available").into(),
-            UpdateStatus::Downloading { downloaded, total } => {
-                let total_mb = total.map(|t| t as f64 / 1_048_576.0);
-                let downloaded_mb = *downloaded as f64 / 1_048_576.0;
-                match total_mb {
-                    Some(t) => format!("Downloading {downloaded_mb:.1} / {t:.1} MB").into(),
-                    None => format!("Downloading {downloaded_mb:.1} MB").into(),
-                }
-            }
-            UpdateStatus::Installing => "Installing update…".into(),
-            UpdateStatus::Staged(version) => {
-                format!("Version {version} ready — restart to apply").into()
-            }
-            UpdateStatus::Errored(message) => format!("Update failed: {message}").into(),
-        }
-    }
-
-    /// Check the release host for a newer version, then download and install it.
-    pub fn check(&mut self, cx: &mut Context<Self>) {
-        if self.status.is_busy() {
-            return;
-        }
-        self.set_status(UpdateStatus::Checking, cx);
-
-        let engine = self.engine.clone();
-
-        self.task = Some(cx.spawn(async move |this, cx| {
-            let result = cx
-                .background_executor()
-                .spawn(async move { engine.check() })
-                .await;
-
-            this.update(cx, |this, cx| {
-                this.task = None;
-                match result {
-                    Ok(Some(release)) => {
-                        log::info!("Update {} is available", release.version);
-                        let version = release.version.clone();
-                        this.available = Some(release);
-                        this.set_status(UpdateStatus::Available(version), cx);
-                        this.download_and_install(cx);
+                match Self::check_for_updates(async_version, cx).await {
+                    Ok(download_url) => {
+                        // Update the status to checked with download URL
+                        this.update(cx, |this, cx| {
+                            this.set_status(AutoUpdateStatus::checked(download_url), cx);
+                        })
+                        .ok();
                     }
-                    Ok(None) => this.set_status(UpdateStatus::UpToDate, cx),
-                    Err(error) => {
-                        log::warn!("Update check failed: {error}");
-                        this.set_status(UpdateStatus::Errored(error.to_string()), cx);
+                    Err(e) => {
+                        log::warn!("Failed to check for updates: {e}");
+                        this.update(cx, |this, cx| {
+                            this.set_status(AutoUpdateStatus::Idle, cx);
+                        })
+                        .ok();
                     }
                 }
-            })
-            .ok();
-        }));
-    }
-
-    /// Download the available update, verify it, and swap it into place.
-    fn download_and_install(&mut self, cx: &mut Context<Self>) {
-        if self.status.is_busy() {
-            return;
-        }
-        let Some(release) = self.available.clone() else {
-            return;
-        };
-
-        let engine = self.engine.clone();
-        self.set_status(
-            UpdateStatus::Downloading {
-                downloaded: 0,
-                total: None,
-            },
-            cx,
+            }),
         );
 
-        self.task = Some(cx.spawn(async move |this, cx| {
-            let downloaded = Arc::new(AtomicU64::new(0));
-            let total = Arc::new(AtomicU64::new(0)); // 0 = unknown
-            let done = Arc::new(AtomicBool::new(false));
-
-            let download_task = {
-                let (engine, release) = (engine.clone(), release.clone());
-                let (downloaded, total, done) = (downloaded.clone(), total.clone(), done.clone());
-                cx.background_executor().spawn(async move {
-                    let result = engine.download(&release, |got, expected| {
-                        downloaded.store(got, Ordering::Relaxed);
-                        total.store(expected.unwrap_or(0), Ordering::Relaxed);
-                    });
-                    done.store(true, Ordering::Relaxed);
-                    result
-                })
-            };
-
-            loop {
-                let got = downloaded.load(Ordering::Relaxed);
-                let total = total.load(Ordering::Relaxed);
-                this.update(cx, |this, cx| {
-                    this.set_status(
-                        UpdateStatus::Downloading {
-                            downloaded: got,
-                            total: (total != 0).then_some(total),
-                        },
-                        cx,
-                    );
-                })
-                .ok();
-                if done.load(Ordering::Relaxed) {
-                    break;
+        subscriptions.push(
+            // Observe the status
+            cx.observe_self(|this, cx| {
+                if let AutoUpdateStatus::Checked { download_url } = this.status.clone() {
+                    this.download_and_install(&download_url, cx);
                 }
-                cx.background_executor()
-                    .timer(Duration::from_millis(120))
-                    .await;
-            }
+            }),
+        );
 
-            let artifact = match download_task.await {
-                Ok(artifact) => artifact,
-                Err(error) => {
-                    log::warn!("Update download failed: {error}");
-                    this.update(cx, |this, cx| {
-                        this.task = None;
-                        this.set_status(UpdateStatus::Errored(error.to_string()), cx);
-                    })
-                    .ok();
-                    return;
-                }
-            };
-
-            let _ = this.update(cx, |this, cx| this.set_status(UpdateStatus::Installing, cx));
-
-            let installed = {
-                let engine = engine.clone();
-                cx.background_executor()
-                    .spawn(async move { engine.install(&artifact) })
-                    .await
-            };
-
-            this.update(cx, |this, cx| {
-                this.task = None;
-                match installed {
-                    Ok(installed) => {
-                        if let Some(path) = installed.restart_path {
-                            cx.set_restart_path(path);
-                        }
-                        let version = release.version.clone();
-                        this.set_status(UpdateStatus::Staged(version), cx);
-                    }
-                    Err(error) => {
-                        this.set_status(UpdateStatus::Errored(error.to_string()), cx);
-                    }
-                }
-            })
-            .ok();
-        }));
-    }
-
-    /// Relaunch into the staged update.
-    pub fn restart(&mut self, cx: &mut Context<Self>) {
-        if !self.staged() {
-            log::warn!("Ignoring restart request: no update is staged");
-            return;
+        Self {
+            status: AutoUpdateStatus::Idle,
+            version,
+            _subscriptions: subscriptions,
+            _tasks: tasks,
         }
-        cx.restart();
     }
 
-    fn set_status(&mut self, status: UpdateStatus, cx: &mut Context<Self>) {
-        let errored = matches!(status, UpdateStatus::Errored(_));
+    fn set_status(&mut self, status: AutoUpdateStatus, cx: &mut Context<Self>) {
         self.status = status;
-
-        if errored {
-            cx.spawn(async move |this, cx| {
-                cx.background_executor().timer(ERROR_DISPLAY_DURATION).await;
-                this.update(cx, |this, cx| {
-                    this.set_status(UpdateStatus::Idle, cx);
-                })
-                .ok();
-            })
-            .detach();
-        }
-
         cx.notify();
     }
+
+    fn check_for_updates(version: Version, cx: &AsyncApp) -> Task<Result<String, Error>> {
+        cx.background_spawn(async move {
+            let client = reqwest::Client::new();
+            let repo_owner = get_github_repo_owner();
+            let repo_name = get_github_repo_name();
+            let url = format!(
+                "{}/repos/{}/{}/releases/latest",
+                GITHUB_API_URL, repo_owner, repo_name
+            );
+
+            let response = client
+                .get(&url)
+                .header("User-Agent", "Coop-Auto-Updater")
+                .send()
+                .await
+                .context("Failed to fetch GitHub releases")?;
+
+            if !response.status().is_success() {
+                return Err(anyhow!("GitHub API returned error: {}", response.status()));
+            }
+
+            let release: GitHubRelease = response
+                .json()
+                .await
+                .context("Failed to parse GitHub release")?;
+
+            // Parse version from tag (remove 'v' prefix if present)
+            let tag_version = release.tag_name.trim_start_matches('v');
+            let new_version = Version::parse(tag_version).context(format!(
+                "Failed to parse version from tag: {}",
+                release.tag_name
+            ))?;
+
+            if new_version > version {
+                // Find the appropriate asset for the current platform
+                let current_os = std::env::consts::OS;
+                let asset_name = match current_os {
+                    "macos" => "Coop.dmg",
+                    "linux" => "coop.tar.gz",
+                    "windows" => "Coop.exe",
+                    _ => return Err(anyhow!("Unsupported OS: {}", current_os)),
+                };
+
+                let download_url = release
+                    .assets
+                    .iter()
+                    .find(|asset| asset.name == asset_name)
+                    .map(|asset| asset.browser_download_url.clone())
+                    .context(format!(
+                        "No {} asset found in release {}",
+                        asset_name, release.tag_name
+                    ))?;
+
+                Ok(download_url)
+            } else {
+                Err(anyhow!(
+                    "No update available. Current: {}, Latest: {}",
+                    version,
+                    new_version
+                ))
+            }
+        })
+    }
+
+    fn download_and_install(&mut self, download_url: &str, cx: &mut Context<Self>) {
+        let http_client = cx.http_client();
+        let download_url = download_url.to_string();
+
+        let task: Task<Result<(InstallerDir, PathBuf), Error>> = cx.background_spawn(async move {
+            let installer_dir = InstallerDir::new().await?;
+            let target_path = Self::target_path(&installer_dir).await?;
+
+            // Download the release
+            download(&download_url, &target_path, http_client).await?;
+
+            Ok((installer_dir, target_path))
+        });
+
+        self._tasks.push(
+            // Install the new release
+            cx.spawn(async move |this, cx| {
+                _ = this.update(cx, |this, cx| {
+                    this.set_status(AutoUpdateStatus::Installing, cx);
+                });
+
+                match task.await {
+                    Ok((installer_dir, target_path)) => {
+                        if Self::install(installer_dir, target_path, cx).await.is_ok() {
+                            // Update the status to updated
+                            _ = this.update(cx, |this, cx| {
+                                this.set_status(AutoUpdateStatus::Updated, cx);
+                            });
+                        }
+                    }
+                    Err(e) => {
+                        // Update the status to error including the error message
+                        _ = this.update(cx, |this, cx| {
+                            this.set_status(AutoUpdateStatus::error(e.to_string()), cx);
+                        });
+                    }
+                }
+            }),
+        );
+    }
+
+    async fn target_path(installer_dir: &InstallerDir) -> Result<PathBuf, Error> {
+        let filename = match std::env::consts::OS {
+            "macos" => anyhow::Ok("Coop.dmg"),
+            "linux" => Ok("coop.tar.gz"),
+            "windows" => Ok("Coop.exe"),
+            unsupported_os => anyhow::bail!("not supported: {unsupported_os}"),
+        }?;
+
+        Ok(installer_dir.path().join(filename))
+    }
+
+    async fn install(
+        installer_dir: InstallerDir,
+        target_path: PathBuf,
+        cx: &AsyncApp,
+    ) -> Result<(), Error> {
+        match std::env::consts::OS {
+            "macos" => install_release_macos(&installer_dir, target_path, cx).await,
+            "linux" => install_release_linux(&installer_dir, target_path, cx).await,
+            "windows" => install_release_windows(target_path).await,
+            unsupported_os => anyhow::bail!("Not supported: {unsupported_os}"),
+        }
+    }
+}
+
+async fn download(
+    url: &str,
+    target_path: &std::path::Path,
+    client: Arc<dyn HttpClient>,
+) -> Result<(), Error> {
+    let body = AsyncBody::default();
+    let mut target_file = File::create(&target_path).await?;
+    let mut response = client.get(url, body, true).await?;
+
+    // Copy the response body to the target file
+    smol::io::copy(response.body_mut(), &mut target_file).await?;
+
+    Ok(())
+}
+
+async fn install_release_macos(
+    temp_dir: &InstallerDir,
+    downloaded_dmg: PathBuf,
+    cx: &AsyncApp,
+) -> Result<(), Error> {
+    let running_app_path = cx.update(|cx| cx.app_path())?;
+    let running_app_filename = running_app_path
+        .file_name()
+        .with_context(|| format!("invalid running app path {running_app_path:?}"))?;
+
+    let mount_path = temp_dir.path().join("Coop");
+    let mut mounted_app_path: OsString = mount_path.join(running_app_filename).into();
+
+    mounted_app_path.push("/");
+
+    let output = Command::new("hdiutil")
+        .args(["attach", "-nobrowse"])
+        .arg(&downloaded_dmg)
+        .arg("-mountroot")
+        .arg(temp_dir.path())
+        .output()
+        .await?;
+
+    anyhow::ensure!(
+        output.status.success(),
+        "failed to mount: {:?}",
+        String::from_utf8_lossy(&output.stderr)
+    );
+
+    // Create an MacOsUnmounter that will be dropped (and thus unmount the disk) when this function exits
+    let _unmounter = MacOsUnmounter {
+        mount_path: mount_path.clone(),
+        background_executor: cx.background_executor(),
+    };
+
+    let output = Command::new("rsync")
+        .args(["-av", "--delete"])
+        .arg(&mounted_app_path)
+        .arg(&running_app_path)
+        .output()
+        .await?;
+
+    anyhow::ensure!(
+        output.status.success(),
+        "failed to copy app: {:?}",
+        String::from_utf8_lossy(&output.stderr)
+    );
+
+    Ok(())
+}
+
+async fn install_release_linux(
+    temp_dir: &InstallerDir,
+    downloaded_tar_gz: PathBuf,
+    cx: &AsyncApp,
+) -> Result<(), Error> {
+    let running_app_path = cx.update(|cx| cx.app_path())?;
+
+    // Extract the tar.gz file
+    let extracted = temp_dir.path().join("coop");
+    smol::fs::create_dir_all(&extracted)
+        .await
+        .context("failed to create directory to extract update")?;
+
+    let output = Command::new("tar")
+        .arg("-xzf")
+        .arg(&downloaded_tar_gz)
+        .arg("-C")
+        .arg(&extracted)
+        .output()
+        .await?;
+
+    anyhow::ensure!(
+        output.status.success(),
+        "failed to extract {:?} to {:?}: {:?}",
+        downloaded_tar_gz,
+        extracted,
+        String::from_utf8_lossy(&output.stderr)
+    );
+
+    // Find the extracted app directory
+    let mut entries = smol::fs::read_dir(&extracted).await?;
+    let mut app_dir = None;
+
+    use smol::stream::StreamExt;
+
+    while let Some(entry) = entries.next().await {
+        let entry = entry?;
+        let path = entry.path();
+        if path.is_dir() {
+            app_dir = Some(path);
+            break;
+        }
+    }
+
+    let from = app_dir.context("No app directory found in archive")?;
+
+    // Copy to the current installation directory
+    let output = Command::new("rsync")
+        .args(["-av", "--delete"])
+        .arg(&from)
+        .arg(
+            running_app_path
+                .parent()
+                .context("No parent directory for app")?,
+        )
+        .output()
+        .await?;
+
+    anyhow::ensure!(
+        output.status.success(),
+        "failed to copy app from {:?} to {:?}: {:?}",
+        from,
+        running_app_path.parent(),
+        String::from_utf8_lossy(&output.stderr)
+    );
+
+    Ok(())
+}
+
+async fn install_release_windows(downloaded_installer: PathBuf) -> Result<(), Error> {
+    //const CREATE_NO_WINDOW: u32 = 0x08000000;
+
+    let system_root = std::env::var("SYSTEMROOT");
+    let powershell_path = system_root.as_ref().map_or_else(
+        |_| "powershell.exe".to_string(),
+        |p| format!("{p}\\System32\\WindowsPowerShell\\v1.0\\powershell.exe"),
+    );
+
+    let mut installer_path = std::ffi::OsString::new();
+    installer_path.push("\"");
+    installer_path.push(&downloaded_installer);
+    installer_path.push("\"");
+
+    let output = Command::new(powershell_path)
+        //.creation_flags(CREATE_NO_WINDOW)
+        .args(["-NoProfile", "-WindowStyle", "Hidden"])
+        .args(["Start-Process"])
+        .arg(installer_path)
+        .arg("-ArgumentList")
+        .args(["/P", "/R"])
+        .output()
+        .await?;
+
+    anyhow::ensure!(
+        output.status.success(),
+        "failed to start installer: {:?}",
+        String::from_utf8_lossy(&output.stderr)
+    );
+
+    Ok(())
 }

crates/auto_update/src/source.rs

@@ -1,369 +0,0 @@
-use gpui_updater_core::{Asset, Error, Release, Result, UpdateSource, parse_tag};
-use serde::Deserialize;
-
-const CHECKSUMS_ASSET: &str = "SHA256SUMS";
-const RELEASE_PAGE_SIZE: usize = 20;
-
-/// Which published artifact belongs to a target platform.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub struct AssetFilter {
-    extension: &'static str,
-    arch: &'static str,
-}
-
-impl AssetFilter {
-    /// Whether `name` is the installable artifact for this target.
-    fn matches(&self, name: &str) -> bool {
-        let name = name.to_ascii_lowercase();
-        name.ends_with(self.extension) && name.contains(self.arch)
-    }
-}
-
-pub fn asset_filter_for(os: &str, arch: &str) -> Option<AssetFilter> {
-    let extension = match os {
-        "macos" => ".dmg",
-        "linux" => ".tar.gz",
-        _ => return None,
-    };
-
-    let arch = match (os, arch) {
-        // cargo-packager names the disk images `aarch64`/`x64`.
-        ("macos", "aarch64") => "aarch64",
-        ("macos", "x86_64") => "x64",
-        // `script/bundle-linux` names the tarballs `aarch64`/`x86_64`.
-        ("linux", "aarch64") => "aarch64",
-        ("linux", "x86_64") => "x86_64",
-        _ => return None,
-    };
-
-    Some(AssetFilter { extension, arch })
-}
-
-/// Reads releases from a Gitea repository's Releases.
-pub struct GiteaSource {
-    api_base: String,
-    owner: String,
-    repo: String,
-    filter: AssetFilter,
-}
-
-impl GiteaSource {
-    /// Build a source for `owner/repo` on the Gitea instance at `api_base`
-    /// (e.g. `https://git.reya.info/api/v1`).
-    pub fn new(
-        api_base: impl Into<String>,
-        owner: impl Into<String>,
-        repo: impl Into<String>,
-        filter: AssetFilter,
-    ) -> Self {
-        Self {
-            api_base: api_base.into().trim_end_matches('/').to_string(),
-            owner: owner.into(),
-            repo: repo.into(),
-            filter,
-        }
-    }
-
-    fn releases_url(&self) -> String {
-        format!(
-            "{}/repos/{}/{}/releases?limit={RELEASE_PAGE_SIZE}",
-            self.api_base, self.owner, self.repo
-        )
-    }
-}
-
-impl UpdateSource for GiteaSource {
-    fn fetch_latest(&self) -> Result<Release> {
-        let releases: Vec<GiteaRelease> = http::get_json(&self.releases_url())?;
-        let release = newest_published(&releases)
-            .ok_or_else(|| Error::Parse("repository has no published releases".to_string()))?;
-
-        let asset = release
-            .assets
-            .iter()
-            .find(|asset| self.filter.matches(&asset.name))
-            .ok_or(Error::NoMatchingAsset {
-                target_os: std::env::consts::OS,
-                target_arch: std::env::consts::ARCH,
-            })?;
-
-        // Resolve the published checksum so the engine can reject a truncated or substituted download.
-        let sha256 = release
-            .assets
-            .iter()
-            .find(|candidate| candidate.name.eq_ignore_ascii_case(CHECKSUMS_ASSET))
-            .map(|sums| http::get_string(&sums.browser_download_url))
-            .transpose()?
-            .and_then(|sums| sha256_for(&sums, &asset.name));
-
-        Ok(Release {
-            version: parse_tag(&release.tag_name)?,
-            notes: release
-                .body
-                .clone()
-                .filter(|body| !body.trim().is_empty())
-                .or_else(|| release.name.clone()),
-            asset: Asset {
-                name: asset.name.clone(),
-                url: asset.browser_download_url.clone(),
-                size: asset.size,
-            },
-            signature: None,
-            signature_url: None,
-            sha256,
-        })
-    }
-}
-
-fn newest_published(releases: &[GiteaRelease]) -> Option<&GiteaRelease> {
-    releases
-        .iter()
-        .filter(|release| !release.draft && !release.prerelease)
-        .filter_map(|release| {
-            parse_tag(&release.tag_name)
-                .ok()
-                .map(|version| (version, release))
-        })
-        .max_by(|(left, _), (right, _)| left.cmp(right))
-        .map(|(_, release)| release)
-}
-
-/// The SHA-256 recorded for `asset_name` in a `shasum`-style checksums file.
-fn sha256_for(sums: &str, asset_name: &str) -> Option<String> {
-    sums.lines().find_map(|line| {
-        let mut parts = line.split_whitespace();
-        let (hash, path) = (parts.next()?, parts.next()?);
-        let path = path.strip_prefix('*').unwrap_or(path);
-        let base = path.rsplit(['/', '\\']).next().unwrap_or(path);
-        (base == asset_name).then(|| hash.to_ascii_lowercase())
-    })
-}
-
-/// A release as returned by the Gitea API.
-#[derive(Debug, Deserialize)]
-struct GiteaRelease {
-    tag_name: String,
-    #[serde(default)]
-    name: Option<String>,
-    #[serde(default)]
-    body: Option<String>,
-    #[serde(default)]
-    draft: bool,
-    #[serde(default)]
-    prerelease: bool,
-    #[serde(default)]
-    assets: Vec<GiteaAsset>,
-}
-
-/// A release asset as returned by the Gitea API.
-#[derive(Debug, Deserialize)]
-struct GiteaAsset {
-    name: String,
-    browser_download_url: String,
-    #[serde(default)]
-    size: u64,
-}
-
-/// Blocking HTTP helpers for release metadata.
-mod http {
-    use std::time::Duration;
-
-    use gpui_updater_core::{Error, Result};
-    use serde::de::DeserializeOwned;
-    use ureq::Agent;
-    use ureq::tls::{RootCerts, TlsConfig};
-
-    const USER_AGENT: &str = concat!("coop-updater/", env!("CARGO_PKG_VERSION"));
-    const CONNECT_TIMEOUT: Duration = Duration::from_secs(15);
-    const RESPONSE_TIMEOUT: Duration = Duration::from_secs(30);
-
-    fn agent() -> Agent {
-        Agent::config_builder()
-            .user_agent(USER_AGENT)
-            .tls_config(
-                TlsConfig::builder()
-                    .root_certs(RootCerts::PlatformVerifier)
-                    .build(),
-            )
-            .timeout_resolve(Some(CONNECT_TIMEOUT))
-            .timeout_connect(Some(CONNECT_TIMEOUT))
-            .timeout_recv_response(Some(RESPONSE_TIMEOUT))
-            .build()
-            .into()
-    }
-
-    fn get_bytes(url: &str) -> Result<Vec<u8>> {
-        let mut response = agent().get(url).call().map_err(|error| match error {
-            ureq::Error::StatusCode(code) => Error::Http(format!("GET {url} -> {code}")),
-            other => Error::Http(other.to_string()),
-        })?;
-
-        response
-            .body_mut()
-            .read_to_vec()
-            .map_err(|error| Error::Http(format!("GET {url} -> {error}")))
-    }
-
-    pub(super) fn get_json<T: DeserializeOwned>(url: &str) -> Result<T> {
-        serde_json::from_slice(&get_bytes(url)?).map_err(|error| Error::Parse(error.to_string()))
-    }
-
-    pub(super) fn get_string(url: &str) -> Result<String> {
-        String::from_utf8(get_bytes(url)?).map_err(|error| Error::Parse(error.to_string()))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use gpui_updater_core::Version;
-
-    use super::*;
-
-    const PUBLISHED: &[&str] = &[
-        "Coop_1.0.1_aarch64.dmg",
-        "Coop_1.0.1_x64.dmg",
-        "coop-linux-aarch64.tar.gz",
-        "coop-linux-x86_64.tar.gz",
-        "coop_1.0.1_aarch64.snap",
-        "coop_1.0.1_arm64-setup.exe",
-        "coop_1.0.1_x64-setup.exe",
-        "coop_1.0.1_x86_64.snap",
-        "su.reya.coop_aarch64.flatpak",
-        "su.reya.coop_x86_64.flatpak",
-    ];
-
-    fn selected(os: &str, arch: &str) -> Option<&'static str> {
-        let filter = asset_filter_for(os, arch)?;
-        PUBLISHED.iter().copied().find(|name| filter.matches(name))
-    }
-
-    #[test]
-    fn picks_the_artifact_matching_os_and_architecture() {
-        assert_eq!(selected("macos", "aarch64"), Some("Coop_1.0.1_aarch64.dmg"));
-        assert_eq!(selected("macos", "x86_64"), Some("Coop_1.0.1_x64.dmg"));
-        assert_eq!(
-            selected("linux", "aarch64"),
-            Some("coop-linux-aarch64.tar.gz")
-        );
-        assert_eq!(
-            selected("linux", "x86_64"),
-            Some("coop-linux-x86_64.tar.gz")
-        );
-    }
-
-    #[test]
-    fn has_no_target_for_windows_or_unknown_platforms() {
-        assert_eq!(asset_filter_for("windows", "x86_64"), None);
-        assert_eq!(asset_filter_for("freebsd", "x86_64"), None);
-        assert_eq!(asset_filter_for("macos", "riscv64"), None);
-    }
-
-    #[test]
-    fn ignores_package_formats_and_sidecars_that_are_not_the_artifact() {
-        let macos = asset_filter_for("macos", "aarch64").unwrap();
-        assert!(!macos.matches("coop_1.0.1_aarch64.snap"));
-        assert!(!macos.matches("su.reya.coop_aarch64.flatpak"));
-        assert!(!macos.matches("Coop_1.0.1_aarch64.dmg.minisig"));
-
-        let linux = asset_filter_for("linux", "x86_64").unwrap();
-        assert!(!linux.matches("coop_1.0.1_x64-setup.exe"));
-        assert!(!linux.matches("coop_1.0.1_x86_64.snap"));
-    }
-
-    #[test]
-    fn reads_checksums_by_basename_ignoring_directory_prefix() {
-        let sums = "\
-abcdef  macos-arm64-artifacts/Coop_1.0.1_aarch64.dmg
-123456  *linux-x64-artifacts/coop-linux-x86_64.tar.gz
-789abc  SHA256SUMS
-";
-        assert_eq!(
-            sha256_for(sums, "Coop_1.0.1_aarch64.dmg").as_deref(),
-            Some("abcdef")
-        );
-        assert_eq!(
-            sha256_for(sums, "coop-linux-x86_64.tar.gz").as_deref(),
-            Some("123456")
-        );
-        assert_eq!(sha256_for(sums, "coop_1.0.1_x64-setup.exe"), None);
-    }
-
-    #[test]
-    fn newest_published_skips_drafts_prereleases_and_bad_tags() {
-        let releases: Vec<GiteaRelease> = serde_json::from_str(
-            r#"[
-                {
-                    "tag_name": "v1.0.2",
-                    "draft": true,
-                    "assets": []
-                },
-                {
-                    "tag_name": "v2.0.0-rc.1",
-                    "prerelease": true,
-                    "assets": []
-                },
-                {
-                    "tag_name": "nightly",
-                    "assets": []
-                },
-                {
-                    "tag_name": "v1.0.0",
-                    "assets": [
-                        {
-                            "name": "coop-linux-x86_64.tar.gz",
-                            "browser_download_url": "https://git.reya.info/reya/coop/releases/download/v1.0.0/coop-linux-x86_64.tar.gz",
-                            "size": 26160329
-                        }
-                    ]
-                },
-                {
-                    "tag_name": "v1.0.1",
-                    "name": "v1.0.1",
-                    "body": "Fixed app panic on flatpak installations",
-                    "assets": [
-                        {
-                            "name": "coop-linux-x86_64.tar.gz",
-                            "browser_download_url": "https://git.reya.info/reya/coop/releases/download/v1.0.1/coop-linux-x86_64.tar.gz",
-                            "size": 26160329
-                        }
-                    ]
-                }
-            ]"#,
-        )
-        .unwrap();
-
-        let newest = newest_published(&releases).unwrap();
-        assert_eq!(newest.tag_name, "v1.0.1");
-        assert_eq!(parse_tag(&newest.tag_name).unwrap().to_string(), "1.0.1");
-        assert_eq!(newest.assets.len(), 1);
-        assert_eq!(newest.assets[0].size, 26160329);
-    }
-
-    #[test]
-    #[ignore = "requires network access to the release host"]
-    fn live_release_source_resolves_the_running_platform() {
-        let filter = asset_filter_for(std::env::consts::OS, std::env::consts::ARCH)
-            .expect("this platform should be supported");
-        let source = GiteaSource::new("https://git.reya.info/api/v1", "reya", "coop", filter);
-
-        let release = source
-            .fetch_latest()
-            .expect("release lookup should succeed");
-
-        assert!(
-            release.version >= Version::new(1, 0, 0),
-            "unexpected version {}",
-            release.version
-        );
-        assert!(
-            source.filter.matches(&release.asset.name),
-            "unexpected artifact {}",
-            release.asset.name
-        );
-        assert!(
-            release.asset.url.starts_with("https://"),
-            "{} ",
-            release.asset.url
-        );
-    }
-}

crates/browser-signer-proxy/Cargo.toml

@@ -1,19 +0,0 @@
-[package]
-name = "browser-signer-proxy"
-version = "0.1.0"
-edition.workspace = true
-description = "Nostr browser signer (NIP-07) proxy using smol async runtime"
-license = "MIT"
-repository = "https://github.com/nostrdevkit/nostr"
-publish = false
-
-[dependencies]
-atomic-destructor = "0.2"
-event-listener = "5"
-nostr.workspace = true
-opaquerr = { version = "0.1", features = ["alloc"] }
-serde.workspace = true
-serde_json.workspace = true
-smol.workspace = true
-tracing = { version = "0.1", features = ["std"] }
-uuid = { version = "1.23", features = ["serde", "v4"] }

crates/browser-signer-proxy/README.md

@@ -1,55 +0,0 @@
-# browser-signer-proxy
-
-Proxy to use Nostr Browser signer ([NIP-07](https://github.com/nostr-protocol/nips/blob/master/07.md)) in native applications.
-
-This is a re-implementation of [`nostr-browser-signer-proxy`](https://github.com/nostrdevkit/nostr/tree/master/signer/nostr-browser-signer-proxy)
-using the [`smol`](https://github.com/smol-rs/smol) async runtime instead of tokio.
-
-## Description
-
-This crate provides a local HTTP proxy that communicates with a NIP-07 browser extension
-(e.g., Alby, nos2x) running in a browser tab. Native applications can use this proxy to
-request public keys, sign events, and perform NIP-04/NIP-44 encryption/decryption through
-the browser extension.
-
-The HTTP server is implemented with a minimal, dependency-free approach using `smol::net::TcpListener`
-and manual HTTP/1.1 parsing — avoiding heavy HTTP framework dependencies entirely.
-
-## Usage
-
-```rust
-use browser_signer_proxy::prelude::*;
-
-async fn example() -> Result<(), Error> {
-    // Create the proxy with default options (localhost:7400)
-    let proxy = BrowserSignerProxy::new(BrowserSignerProxyOptions::default());
-
-    // Open the proxy URL in a browser
-    webbrowser::open(&proxy.url())?;
-
-    // Start the proxy server
-    proxy.start().await?;
-
-    // Use it as an async Nostr signer
-    let public_key = proxy.get_public_key_async().await?;
-    println!("Connected with public key: {public_key}");
-
-    Ok(())
-}
-```
-
-## Differences from the tokio-based version
-
-| Feature | tokio (original) | smol (this crate) |
-|---|---|---|
-| Async runtime | `tokio` | `smol` |
-| HTTP server | `hyper` | `smol::net::TcpListener` + manual HTTP/1.1 |
-| Mutex | `tokio::sync::Mutex` | `smol::lock::Mutex` |
-| Shutdown signal | `tokio::sync::Notify` | `event_listener::Event` |
-| Request-response channel | `tokio::sync::oneshot` | `smol::channel::bounded(1)` |
-| Timeout | `tokio::time::timeout` | `smol::future::or` + `smol::Timer` |
-| Task spawning | `tokio::spawn` | `smol::spawn` |
-
-## License
-
-This project is distributed under the MIT software license.

crates/browser-signer-proxy/index.html

@@ -1,185 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Coop — Web Signer Proxy</title>
-    <link rel="preconnect" href="https://fonts.googleapis.com">
-    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-    <link href="https://fonts.googleapis.com/css2?family=Nunito:wght@800;900&display=swap" rel="stylesheet">
-    <style>
-        :root {
-            --brand: #F8FF37;
-            --ink: #111111;
-            --ink-soft: #333333;
-            --muted: #666666;
-            --paper: #FFFFFF;
-            --edge: rgba(17, 17, 17, 0.14);
-            --radius-sm: 1rem;
-            --radius-md: 1.5rem;
-            --radius-lg: 2.5rem;
-            --green: #2E8B57;
-            --red: #D32F2F;
-        }
-
-        * {
-            box-sizing: border-box;
-        }
-
-        html, body {
-            margin: 0;
-            min-height: 100%;
-        }
-
-        body {
-            font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
-            color: var(--ink);
-            background: var(--brand);
-            -webkit-font-smoothing: antialiased;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            min-height: 100vh;
-            padding: 2rem;
-        }
-
-        .card {
-            background: var(--paper);
-            border-radius: var(--radius-md);
-            padding: 2.5rem;
-            max-width: 440px;
-            width: 100%;
-            box-shadow: 0 8px 0 rgba(17, 17, 17, 0.12), 0 2px 20px rgba(17, 17, 17, 0.06);
-        }
-
-        .logo {
-            display: flex;
-            align-items: center;
-            gap: 0.6rem;
-            margin-bottom: 1.75rem;
-        }
-
-        .logo__mark {
-            width: 2.5rem;
-            height: 2.5rem;
-            background: var(--ink);
-            border-radius: var(--radius-sm);
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            font-family: "Nunito", system-ui, sans-serif;
-            font-weight: 900;
-            font-size: 1.2rem;
-            color: var(--brand);
-            letter-spacing: -0.02em;
-        }
-
-        .logo__text {
-            font-family: "Nunito", system-ui, sans-serif;
-            font-weight: 900;
-            font-size: 1.3rem;
-            letter-spacing: -0.02em;
-        }
-
-        .heading {
-            font-family: "Nunito", system-ui, sans-serif;
-            font-weight: 900;
-            font-size: 1.6rem;
-            letter-spacing: -0.03em;
-            line-height: 1.15;
-            margin: 0 0 0.6rem;
-        }
-
-        .subtitle {
-            font-size: 0.95rem;
-            color: var(--ink-soft);
-            margin: 0 0 1.75rem;
-            line-height: 1.5;
-        }
-
-        .status {
-            display: flex;
-            align-items: center;
-            gap: 0.75rem;
-            padding: 1rem 1.25rem;
-            border-radius: var(--radius-sm);
-            font-weight: 600;
-            font-size: 0.95rem;
-            transition: background 300ms ease, color 300ms ease;
-        }
-
-        .status--checking {
-            background: rgba(17, 17, 17, 0.05);
-            color: var(--muted);
-        }
-
-        .status--connected {
-            background: rgba(46, 139, 87, 0.1);
-            color: var(--green);
-        }
-
-        .status--error {
-            background: rgba(211, 47, 47, 0.08);
-            color: var(--red);
-        }
-
-        .status__dot {
-            width: 0.7rem;
-            height: 0.7rem;
-            border-radius: 50%;
-            flex-shrink: 0;
-        }
-
-        .status--checking .status__dot {
-            background: var(--muted);
-            animation: pulse 1.2s ease-in-out infinite;
-        }
-
-        .status--connected .status__dot {
-            background: var(--green);
-        }
-
-        .status--error .status__dot {
-            background: var(--red);
-        }
-
-        @keyframes pulse {
-            0%, 100% { opacity: 0.4; transform: scale(0.85); }
-            50%      { opacity: 1;   transform: scale(1); }
-        }
-
-        .hint {
-            margin-top: 1.5rem;
-            padding-top: 1.25rem;
-            border-top: 1px solid var(--edge);
-            font-size: 0.8rem;
-            color: var(--muted);
-            line-height: 1.5;
-        }
-
-        .hint strong {
-            color: var(--ink-soft);
-        }
-    </style>
-</head>
-<body>
-    <div class="card">
-        <h1 class="heading">Web Signer</h1>
-
-        <p class="subtitle">
-            This page connects the app to your Nostr Web Signer extension so you can sign in and use Coop securely.
-        </p>
-
-        <div id="nip07-status" class="status status--checking">
-            <div class="status__dot"></div>
-            <span id="nip07-status-text">Checking extension…</span>
-        </div>
-
-        <div class="hint">
-            <strong>Keep this tab open</strong> while using the app — it automatically handles sign-in requests in the background.
-        </div>
-    </div>
-
-    <script src="proxy.js"></script>
-</body>
-</html>

crates/browser-signer-proxy/proxy.js

@@ -1,156 +0,0 @@
-let isPolling = false;
-
-async function pollForRequests() {
-    if (isPolling) return;
-    isPolling = true;
-
-    try {
-        const response = await fetch('/api/pending');
-        const data = await response.json();
-
-        console.log('Polled for requests, got:', data);
-
-        // Process any new requests
-        if (data.requests && data.requests.length > 0) {
-            console.log(`Processing ${data.requests.length} requests`);
-            for (const request of data.requests) {
-                await handleNip07Request(request);
-            }
-        }
-    } catch (error) {
-        console.error('Polling error:', error);
-        updateStatus('Error: ' + error.message, 'error');
-    }
-
-    isPolling = false;
-}
-
-async function handleNip07Request(request) {
-    console.log('Handling request:', request);
-
-    try {
-        let result;
-
-        if (!window.nostr) {
-            throw new Error('NIP-07 extension not available');
-        }
-
-        switch (request.method) {
-            case 'get_public_key':
-                console.log('Calling nostr.getPublicKey()');
-                result = await window.nostr.getPublicKey();
-                console.log('Got public key:', result);
-                break;
-
-            case 'sign_event':
-                console.log('Calling nostr.signEvent() with:', request.params);
-                result = await window.nostr.signEvent(request.params);
-                console.log('Got signed event:', result);
-                break;
-
-            case 'nip04_encrypt':
-                console.log('Calling nostr.nip04.encrypt()');
-                result = await window.nostr.nip04.encrypt(
-                    request.params.public_key,
-                    request.params.content
-                );
-                break;
-
-            case 'nip04_decrypt':
-                console.log('Calling nostr.nip04.decrypt()');
-                result = await window.nostr.nip04.decrypt(
-                    request.params.public_key,
-                    request.params.content
-                );
-                break;
-
-            case 'nip44_encrypt':
-                console.log('Calling nostr.nip44.encrypt()');
-                result = await window.nostr.nip44.encrypt(
-                    request.params.public_key,
-                    request.params.content
-                );
-                break;
-
-            case 'nip44_decrypt':
-                console.log('Calling nostr.nip44.decrypt()');
-                result = await window.nostr.nip44.decrypt(
-                    request.params.public_key,
-                    request.params.content
-                );
-                break;
-
-
-            default:
-                throw new Error(`Unknown method: ${request.method}`);
-        }
-
-        // Send response back to server
-        const responsePayload = {
-            id: request.id,
-            result: result,
-            error: null
-        };
-
-        console.log('Sending response:', responsePayload);
-
-        await fetch('/api/response', {
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/json',
-            },
-            body: JSON.stringify(responsePayload)
-        });
-
-        console.log('Response sent successfully');
-        updateStatus('Request processed successfully', 'connected');
-
-    } catch (error) {
-        console.error('Error handling request:', error);
-
-        // Send error response back to server
-        const errorPayload = {
-            id: request.id,
-            result: null,
-            error: error.message
-        };
-
-        console.log('Sending error response:', errorPayload);
-
-        await fetch('/api/response', {
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/json',
-            },
-            body: JSON.stringify(errorPayload)
-        });
-
-        updateStatus('Error: ' + error.message, 'error');
-    }
-}
-
-function updateStatus(message, state) {
-    const container = document.getElementById('nip07-status');
-    const textEl = document.getElementById('nip07-status-text');
-    if (container && textEl) {
-        container.className = 'status status--' + state;
-        textEl.textContent = message;
-    }
-}
-
-// Start polling when page loads
-window.addEventListener('load', () => {
-    console.log('NIP-07 Proxy loaded');
-
-    // Check if NIP-07 extension is available
-    if (window.nostr) {
-        console.log('NIP-07 extension detected');
-        updateStatus('Connected — ready', 'connected');
-    } else {
-        console.log('NIP-07 extension not found');
-        updateStatus('No NIP-07 extension found', 'error');
-    }
-
-    // Start polling every 500 ms
-    setInterval(pollForRequests, 500);
-});

crates/browser-signer-proxy/src/error.rs

@@ -1,51 +0,0 @@
-// Copyright (c) 2022-2023 Yuki Kishimoto
-// Copyright (c) 2023-2025 Rust Nostr Developers
-// Distributed under the MIT software license
-
-//! Error types for the browser signer proxy.
-
-opaquerr::define_kind! {
-    /// Nostr browser signer proxy error kind.
-    pub ErrorKind {
-        /// Nostr protocol error.
-        Protocol => "nostr protocol error",
-        /// I/O error.
-        IO => "I/O error",
-        /// JSON error.
-        Json => "JSON error",
-        /// The operation timed out.
-        Timeout => "timeout",
-        /// The operation cannot be completed in the current state.
-        State => "invalid state",
-        /// Anything not covered by the stable categories above.
-        Other => "other error",
-    }
-}
-
-opaquerr::define_error! {
-    /// Nostr browser signer proxy error.
-    pub Error(ErrorKind)
-
-    from {
-        nostr::error::Error => ErrorKind::Protocol,
-        std::io::Error => ErrorKind::IO,
-        serde_json::Error => ErrorKind::Json,
-    }
-}
-
-impl Error {
-    pub(crate) fn generic<S>(message: S) -> Self
-    where
-        S: Into<String>,
-    {
-        Self::new(ErrorKind::Other, message.into())
-    }
-
-    pub(crate) fn timeout() -> Self {
-        Self::simple(ErrorKind::Timeout)
-    }
-
-    pub(crate) fn shutdown() -> Self {
-        Self::with_static_message(ErrorKind::State, "server is shutdown")
-    }
-}

crates/browser-signer-proxy/src/lib.rs

@@ -1,764 +0,0 @@
-use std::collections::HashMap;
-use std::future::Future;
-use std::net::{IpAddr, Ipv4Addr, SocketAddr, SocketAddrV4};
-use std::pin::Pin;
-use std::sync::Arc;
-use std::sync::atomic::{AtomicBool, AtomicU64, Ordering};
-use std::time::{Duration, SystemTime, UNIX_EPOCH};
-
-use atomic_destructor::{AtomicDestroyer, AtomicDestructor};
-use event_listener::Event as ShutdownEvent;
-use nostr::prelude::*;
-use serde::de::DeserializeOwned;
-use serde::{Deserialize, Serialize, Serializer};
-use serde_json::{Value, json};
-use smol::channel;
-use smol::io::{AsyncBufReadExt, AsyncReadExt, AsyncWriteExt, BufReader};
-use smol::lock::Mutex;
-use smol::net::{TcpListener, TcpStream};
-use uuid::Uuid;
-
-mod error;
-pub mod prelude;
-
-pub use self::error::Error;
-
-const DEFAULT_HTML: &str = include_str!("../index.html");
-const JS: &str = include_str!("../proxy.js");
-
-type PendingResponseMap = HashMap<Uuid, channel::Sender<Result<Value, String>>>;
-
-#[derive(Debug, Deserialize)]
-struct Message {
-    id: Uuid,
-    error: Option<String>,
-    result: Option<Value>,
-}
-
-impl Message {
-    fn into_result(self) -> Result<Value, String> {
-        if let Some(error) = self.error {
-            Err(error)
-        } else {
-            Ok(self.result.unwrap_or(Value::Null))
-        }
-    }
-}
-
-#[derive(Debug, Clone, Copy)]
-enum RequestMethod {
-    GetPublicKey,
-    SignEvent,
-    Nip04Encrypt,
-    Nip04Decrypt,
-    Nip44Encrypt,
-    Nip44Decrypt,
-}
-
-impl RequestMethod {
-    fn as_str(&self) -> &str {
-        match self {
-            Self::GetPublicKey => "get_public_key",
-            Self::SignEvent => "sign_event",
-            Self::Nip04Encrypt => "nip04_encrypt",
-            Self::Nip04Decrypt => "nip04_decrypt",
-            Self::Nip44Encrypt => "nip44_encrypt",
-            Self::Nip44Decrypt => "nip44_decrypt",
-        }
-    }
-}
-
-impl Serialize for RequestMethod {
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        serializer.serialize_str(self.as_str())
-    }
-}
-
-#[derive(Debug, Clone, Serialize)]
-struct RequestData {
-    id: Uuid,
-    method: RequestMethod,
-    params: Value,
-}
-
-impl RequestData {
-    #[inline]
-    fn new(method: RequestMethod, params: Value) -> Self {
-        Self {
-            id: Uuid::new_v4(),
-            method,
-            params,
-        }
-    }
-}
-
-#[derive(Serialize)]
-struct Requests<'a> {
-    requests: &'a [RequestData],
-}
-
-impl<'a> Requests<'a> {
-    #[inline]
-    fn new(requests: &'a [RequestData]) -> Self {
-        Self { requests }
-    }
-
-    #[inline]
-    fn len(&self) -> usize {
-        self.requests.len()
-    }
-}
-
-/// Params for NIP-04 and NIP-44 encryption/decryption
-#[derive(Serialize)]
-struct CryptoParams<'a> {
-    public_key: &'a PublicKey,
-    content: &'a str,
-}
-
-impl<'a> CryptoParams<'a> {
-    #[inline]
-    fn new(public_key: &'a PublicKey, content: &'a str) -> Self {
-        Self {
-            public_key,
-            content,
-        }
-    }
-}
-
-#[derive(Debug)]
-struct ProxyState {
-    /// Requests waiting to be picked up by browser
-    pub outgoing_requests: Mutex<Vec<RequestData>>,
-    /// Map of request ID to response sender
-    pub pending_responses: Mutex<PendingResponseMap>,
-    /// Last time the client asked for the pending requests
-    pub last_pending_request: Arc<AtomicU64>,
-}
-
-/// Configuration options for [`BrowserSignerProxy`].
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct BrowserSignerProxyOptions {
-    /// Request timeout for the signer extension. Default is 30 seconds.
-    pub timeout: Duration,
-    /// Proxy server IP address and port. Default is `127.0.0.1:7400`.
-    pub addr: SocketAddr,
-    /// Custom HTML page.
-    // NOTE: not `Option` to move it between threads without reference counter
-    pub custom_html: &'static str,
-}
-
-#[derive(Debug, Clone)]
-struct InnerBrowserSignerProxy {
-    /// Configuration options for the proxy
-    options: BrowserSignerProxyOptions,
-    /// Internal state of the proxy including request queues
-    state: Arc<ProxyState>,
-    /// Notification trigger for graceful shutdown
-    shutdown: Arc<ShutdownEvent>,
-    /// Flag to indicate if the server is shutdown
-    is_shutdown: Arc<AtomicBool>,
-    /// Flag indicating if the server is started
-    is_started: Arc<AtomicBool>,
-}
-
-impl AtomicDestroyer for InnerBrowserSignerProxy {
-    fn on_destroy(&self) {
-        self.shutdown();
-    }
-}
-
-impl InnerBrowserSignerProxy {
-    #[inline]
-    fn is_shutdown(&self) -> bool {
-        self.is_shutdown.load(Ordering::SeqCst)
-    }
-
-    fn shutdown(&self) {
-        // Mark the server as shutdown
-        self.is_shutdown.store(true, Ordering::SeqCst);
-
-        // Notify all waiters that the proxy is shutting down
-        self.shutdown.notify(usize::MAX);
-    }
-}
-
-/// Nostr Browser Signer Proxy
-///
-/// Proxy to use Nostr Browser signer (NIP-07) in native applications.
-#[derive(Debug, Clone)]
-pub struct BrowserSignerProxy {
-    inner: AtomicDestructor<InnerBrowserSignerProxy>,
-}
-
-impl Default for BrowserSignerProxyOptions {
-    fn default() -> Self {
-        Self {
-            timeout: Duration::from_secs(30),
-            // 7 for NIP-07 and 400 because the NIP title is 40 bytes :)
-            addr: SocketAddr::V4(SocketAddrV4::new(Ipv4Addr::LOCALHOST, 7400)),
-            custom_html: "",
-        }
-    }
-}
-
-impl BrowserSignerProxyOptions {
-    /// Sets the timeout duration.
-    pub const fn timeout(mut self, timeout: Duration) -> Self {
-        self.timeout = timeout;
-        self
-    }
-
-    /// Sets the IP address.
-    pub const fn ip_addr(mut self, new_ip: IpAddr) -> Self {
-        self.addr = SocketAddr::new(new_ip, self.addr.port());
-        self
-    }
-
-    /// Sets the port number.
-    pub const fn port(mut self, new_port: u16) -> Self {
-        self.addr = SocketAddr::new(self.addr.ip(), new_port);
-        self
-    }
-
-    /// Sets a custom html page.
-    ///
-    /// The page must include `/proxy.js` script (`<script src="/proxy.js"></script>`)
-    /// which will handle communication with the server and update the element
-    /// with id `nip07-proxy-status` with the status.
-    pub const fn custom_html_page(mut self, custom_html: &'static str) -> Self {
-        self.custom_html = custom_html;
-        self
-    }
-}
-
-impl BrowserSignerProxy {
-    /// Construct a new browser signer proxy
-    pub fn new(options: BrowserSignerProxyOptions) -> Self {
-        let state = ProxyState {
-            outgoing_requests: Mutex::new(Vec::new()),
-            pending_responses: Mutex::new(HashMap::new()),
-            last_pending_request: Arc::new(AtomicU64::new(0)),
-        };
-
-        Self {
-            inner: AtomicDestructor::new(InnerBrowserSignerProxy {
-                options,
-                state: Arc::new(state),
-                shutdown: Arc::new(ShutdownEvent::new()),
-                is_shutdown: Arc::new(AtomicBool::new(false)),
-                is_started: Arc::new(AtomicBool::new(false)),
-            }),
-        }
-    }
-
-    /// Indicates whether the server is currently running.
-    #[inline]
-    pub fn is_started(&self) -> bool {
-        self.inner.is_started.load(Ordering::SeqCst)
-    }
-
-    /// Checks if there is an open browser tab ready to respond to requests by
-    /// verifying the time since the last pending request.
-    #[inline]
-    pub fn is_session_active(&self) -> bool {
-        current_time() - self.inner.state.last_pending_request.load(Ordering::SeqCst) < 2
-    }
-
-    /// Get the signer proxy webpage URL
-    #[inline]
-    pub fn url(&self) -> String {
-        format!("http://{}", self.inner.options.addr)
-    }
-
-    /// Start the proxy server.
-    ///
-    /// If this is not called explicitly, the server will be automatically
-    /// started on the first interaction with the signer.
-    pub async fn start(&self) -> Result<(), Error> {
-        // Ensure is not shutdown
-        if self.inner.is_shutdown() {
-            return Err(Error::shutdown());
-        }
-
-        // Mark the proxy as started and check if was already started
-        let is_started: bool = self.inner.is_started.swap(true, Ordering::SeqCst);
-
-        // Immediately return if already started
-        if is_started {
-            return Ok(());
-        }
-
-        let listener: TcpListener = match TcpListener::bind(self.inner.options.addr).await {
-            Ok(listener) => listener,
-            Err(e) => {
-                // Undo the started flag if binding fails
-                self.inner.is_started.store(false, Ordering::SeqCst);
-                return Err(Error::from(e));
-            }
-        };
-
-        let addr: SocketAddr = self.inner.options.addr;
-        let state: Arc<ProxyState> = self.inner.state.clone();
-        let custom_html: &'static str = self.inner.options.custom_html;
-        let shutdown: Arc<ShutdownEvent> = self.inner.shutdown.clone();
-
-        smol::spawn(async move {
-            tracing::info!("Starting proxy server on {addr}");
-
-            loop {
-                // Race between accepting a new connection and shutdown signal
-                let shutdown_listener = shutdown.listen();
-
-                enum AcceptEvent {
-                    Connection(Result<(TcpStream, SocketAddr), std::io::Error>),
-                    Shutdown,
-                }
-
-                let event = smol::future::or(
-                    async { AcceptEvent::Connection(listener.accept().await) },
-                    async {
-                        shutdown_listener.await;
-                        AcceptEvent::Shutdown
-                    },
-                )
-                .await;
-
-                match event {
-                    AcceptEvent::Connection(Ok((stream, _))) => {
-                        let state: Arc<ProxyState> = state.clone();
-                        let shutdown: Arc<ShutdownEvent> = shutdown.clone();
-
-                        smol::spawn(async move {
-                            let shutdown_listener = shutdown.listen();
-
-                            smol::future::or(
-                                async {
-                                    handle_connection(stream, state, custom_html).await;
-                                },
-                                async {
-                                    shutdown_listener.await;
-                                    tracing::debug!(
-                                        "Closing connection, proxy server is shutting down."
-                                    );
-                                },
-                            )
-                            .await;
-                        })
-                        .detach();
-                    }
-                    AcceptEvent::Connection(Err(e)) => {
-                        tracing::error!("Failed to accept connection: {e}");
-                    }
-                    AcceptEvent::Shutdown => break,
-                }
-            }
-
-            tracing::info!("Proxy server shut down.");
-        })
-        .detach();
-
-        Ok(())
-    }
-
-    #[inline]
-    async fn store_pending_response(&self, id: Uuid, tx: channel::Sender<Result<Value, String>>) {
-        let mut pending_responses = self.inner.state.pending_responses.lock().await;
-        pending_responses.insert(id, tx);
-    }
-
-    #[inline]
-    async fn store_outgoing_request(&self, request: RequestData) {
-        let mut outgoing_requests = self.inner.state.outgoing_requests.lock().await;
-        outgoing_requests.push(request);
-    }
-
-    async fn request<T>(&self, method: RequestMethod, params: Value) -> Result<T, Error>
-    where
-        T: DeserializeOwned,
-    {
-        // Start the proxy if not already started
-        self.start().await?;
-
-        // Construct the request
-        let request: RequestData = RequestData::new(method, params);
-
-        // Create a bounded channel of size 1 as a oneshot replacement
-        let (tx, rx) = channel::bounded::<Result<Value, String>>(1);
-
-        // Store the response sender
-        self.store_pending_response(request.id, tx).await;
-
-        // Add to outgoing requests queue
-        self.store_outgoing_request(request).await;
-
-        // Wait for response with timeout
-        let response = race_timeout(self.inner.options.timeout, rx.recv()).await;
-
-        match response {
-            Ok(Ok(res)) => Ok(serde_json::from_value(res)?),
-            Ok(Err(error)) => Err(Error::generic(error)),
-            Err(TimeoutError) => Err(Error::timeout()),
-        }
-    }
-
-    #[inline]
-    async fn _get_public_key(&self) -> Result<PublicKey, Error> {
-        self.request(RequestMethod::GetPublicKey, json!({})).await
-    }
-
-    #[inline]
-    async fn _sign_event(&self, event: UnsignedEvent) -> Result<Event, Error> {
-        let event: Event = self
-            .request(RequestMethod::SignEvent, serde_json::to_value(event)?)
-            .await?;
-        event.verify()?;
-        Ok(event)
-    }
-
-    #[inline]
-    async fn _nip04_encrypt(&self, public_key: &PublicKey, content: &str) -> Result<String, Error> {
-        let params = CryptoParams::new(public_key, content);
-        self.request(RequestMethod::Nip04Encrypt, serde_json::to_value(params)?)
-            .await
-    }
-
-    #[inline]
-    async fn _nip04_decrypt(&self, public_key: &PublicKey, content: &str) -> Result<String, Error> {
-        let params = CryptoParams::new(public_key, content);
-        self.request(RequestMethod::Nip04Decrypt, serde_json::to_value(params)?)
-            .await
-    }
-
-    #[inline]
-    async fn _nip44_encrypt(&self, public_key: &PublicKey, content: &str) -> Result<String, Error> {
-        let params = CryptoParams::new(public_key, content);
-        self.request(RequestMethod::Nip44Encrypt, serde_json::to_value(params)?)
-            .await
-    }
-
-    #[inline]
-    async fn _nip44_decrypt(&self, public_key: &PublicKey, content: &str) -> Result<String, Error> {
-        let params = CryptoParams::new(public_key, content);
-        self.request(RequestMethod::Nip44Decrypt, serde_json::to_value(params)?)
-            .await
-    }
-}
-
-impl AsyncGetPublicKey for BrowserSignerProxy {
-    type Error = Error;
-
-    #[inline]
-    fn get_public_key_async(
-        &self,
-    ) -> Pin<Box<dyn Future<Output = Result<PublicKey, Self::Error>> + Send + '_>> {
-        Box::pin(async move { self._get_public_key().await })
-    }
-}
-
-impl AsyncSignEvent for BrowserSignerProxy {
-    type Error = Error;
-
-    #[inline]
-    fn sign_event_async(
-        &self,
-        unsigned: UnsignedEvent,
-    ) -> Pin<Box<dyn Future<Output = Result<Event, Self::Error>> + Send + '_>> {
-        Box::pin(async move { self._sign_event(unsigned).await })
-    }
-}
-
-impl AsyncNip04 for BrowserSignerProxy {
-    type Error = Error;
-
-    fn nip04_encrypt_async<'a>(
-        &'a self,
-        public_key: &'a PublicKey,
-        content: &'a str,
-    ) -> Pin<Box<dyn Future<Output = Result<String, Self::Error>> + Send + 'a>> {
-        Box::pin(async move { self._nip04_encrypt(public_key, content).await })
-    }
-
-    fn nip04_decrypt_async<'a>(
-        &'a self,
-        public_key: &'a PublicKey,
-        encrypted_content: &'a str,
-    ) -> Pin<Box<dyn Future<Output = Result<String, Self::Error>> + Send + 'a>> {
-        Box::pin(async move { self._nip04_decrypt(public_key, encrypted_content).await })
-    }
-}
-
-impl AsyncNip44 for BrowserSignerProxy {
-    type Error = Error;
-
-    fn nip44_encrypt_async<'a>(
-        &'a self,
-        public_key: &'a PublicKey,
-        content: &'a str,
-    ) -> Pin<Box<dyn Future<Output = Result<String, Self::Error>> + Send + 'a>> {
-        Box::pin(async move { self._nip44_encrypt(public_key, content).await })
-    }
-
-    fn nip44_decrypt_async<'a>(
-        &'a self,
-        public_key: &'a PublicKey,
-        payload: &'a str,
-    ) -> Pin<Box<dyn Future<Output = Result<String, Self::Error>> + Send + 'a>> {
-        Box::pin(async move { self._nip44_decrypt(public_key, payload).await })
-    }
-}
-
-// ── Minimal HTTP server ──────────────────────────────────────────────────
-
-/// Handle a single HTTP connection.
-async fn handle_connection(stream: TcpStream, state: Arc<ProxyState>, custom_html: &'static str) {
-    let mut reader = BufReader::new(stream);
-
-    // Read the request line
-    let mut request_line = String::new();
-    if reader.read_line(&mut request_line).await.is_err() {
-        return;
-    }
-    let request_line = request_line.trim_end().to_string();
-
-    // Parse method, path, and HTTP version from request line
-    let parts: Vec<&str> = request_line.split_whitespace().collect();
-    if parts.len() < 2 {
-        send_response(&mut reader, 400, "Bad Request", "", "").await;
-        return;
-    }
-    let method = parts[0].to_uppercase();
-    let path = parts[1].to_string();
-
-    // Read headers until empty line
-    let mut headers = Vec::new();
-    let mut content_length: usize = 0;
-    loop {
-        let mut line = String::new();
-        if reader.read_line(&mut line).await.is_err() {
-            return;
-        }
-        let line = line.trim_end().to_string();
-        if line.is_empty() {
-            break;
-        }
-        if let Some(value) = line.strip_prefix("content-length:") {
-            content_length = value.trim().parse().unwrap_or(0);
-        } else if let Some(value) = line.strip_prefix("Content-Length:") {
-            content_length = value.trim().parse().unwrap_or(0);
-        }
-        headers.push(line);
-    }
-
-    match (method.as_str(), path.as_str()) {
-        // Serve the HTML proxy page
-        ("GET", "/") => {
-            let html = if custom_html.is_empty() {
-                DEFAULT_HTML
-            } else {
-                custom_html
-            };
-            send_response(&mut reader, 200, "OK", "text/html", html).await;
-        }
-        // Serve the JS proxy script
-        ("GET", "/proxy.js") => {
-            send_response(&mut reader, 200, "OK", "application/javascript", JS).await;
-        }
-        // Browser polls this endpoint to get pending requests
-        ("GET", "/api/pending") => {
-            state
-                .last_pending_request
-                .store(current_time(), Ordering::SeqCst);
-
-            let mut outgoing = state.outgoing_requests.lock().await;
-
-            let requests = Requests::new(&outgoing);
-            let json = match serde_json::to_string(&requests) {
-                Ok(j) => j,
-                Err(e) => {
-                    tracing::error!("Failed to serialize pending requests: {e}");
-                    send_response(&mut reader, 500, "Internal Server Error", "", "").await;
-                    return;
-                }
-            };
-
-            tracing::debug!("Sending {} pending requests to browser", requests.len());
-
-            // Clear the outgoing requests after sending them
-            outgoing.clear();
-
-            send_response_cors_json(&mut reader, 200, "OK", &json).await;
-        }
-        // Receive response from browser extension
-        ("POST", "/api/response") => {
-            let mut body_bytes = vec![0u8; content_length];
-            if content_length > 0 && reader.read_exact(&mut body_bytes).await.is_err() {
-                send_response(&mut reader, 400, "Bad Request", "", "").await;
-                return;
-            }
-
-            let message: Message = match serde_json::from_slice(&body_bytes) {
-                Ok(json) => json,
-                Err(e) => {
-                    tracing::error!("Failed to parse response body: {e}");
-                    send_response(&mut reader, 400, "Invalid JSON", "", "").await;
-                    return;
-                }
-            };
-
-            tracing::debug!("Received response from browser: {message:?}");
-
-            let id: Uuid = message.id;
-            let mut pending = state.pending_responses.lock().await;
-
-            match pending.remove(&id) {
-                Some(sender) => {
-                    // Use try_send since we already hold the lock
-                    let _ = sender.try_send(message.into_result());
-                    tracing::info!("Forwarded response for request {id}");
-                }
-                None => tracing::warn!("No pending request found for {id}"),
-            }
-
-            send_response_cors(&mut reader, 200, "OK", "text/plain", "OK").await;
-        }
-        // CORS preflight
-        ("OPTIONS", _) => {
-            let response = "HTTP/1.1 200 OK\r\n\
-                Access-Control-Allow-Origin: *\r\n\
-                Access-Control-Allow-Methods: GET, POST, OPTIONS\r\n\
-                Access-Control-Allow-Headers: Content-Type\r\n\
-                Content-Length: 0\r\n\
-                Connection: close\r\n\
-                \r\n";
-            let _ = reader.get_mut().write_all(response.as_bytes()).await;
-            let _ = reader.get_mut().flush().await;
-        }
-        // 404 - not found
-        _ => {
-            send_response(&mut reader, 404, "Not Found", "", "").await;
-        }
-    }
-}
-
-/// Write an HTTP response to the stream.
-async fn send_response(
-    stream: &mut (impl AsyncWriteExt + Unpin),
-    status: u16,
-    status_text: &str,
-    content_type: &str,
-    body: &str,
-) {
-    let mut response = format!("HTTP/1.1 {status} {status_text}\r\n");
-
-    if !content_type.is_empty() {
-        response.push_str(&format!("Content-Type: {content_type}\r\n"));
-    }
-
-    response.push_str(&format!("Content-Length: {}\r\n", body.len()));
-    response.push_str("Access-Control-Allow-Origin: *\r\n");
-    response.push_str("Connection: close\r\n");
-    response.push_str("\r\n");
-    response.push_str(body);
-
-    let _ = stream.write_all(response.as_bytes()).await;
-    let _ = stream.flush().await;
-}
-
-/// Write a response with CORS headers and JSON content type.
-async fn send_response_cors_json(
-    stream: &mut (impl AsyncWriteExt + Unpin),
-    status: u16,
-    status_text: &str,
-    body: &str,
-) {
-    let mut response = format!("HTTP/1.1 {status} {status_text}\r\n");
-    response.push_str("Content-Type: application/json\r\n");
-    response.push_str(&format!("Content-Length: {}\r\n", body.len()));
-    response.push_str("Access-Control-Allow-Origin: *\r\n");
-    response.push_str("Connection: close\r\n");
-    response.push_str("\r\n");
-    response.push_str(body);
-
-    let _ = stream.write_all(response.as_bytes()).await;
-    let _ = stream.flush().await;
-}
-
-/// Write a response with CORS headers.
-async fn send_response_cors(
-    stream: &mut (impl AsyncWriteExt + Unpin),
-    status: u16,
-    status_text: &str,
-    content_type: &str,
-    body: &str,
-) {
-    let mut response = format!("HTTP/1.1 {status} {status_text}\r\n");
-
-    if !content_type.is_empty() {
-        response.push_str(&format!("Content-Type: {content_type}\r\n"));
-    }
-
-    response.push_str(&format!("Content-Length: {}\r\n", body.len()));
-    response.push_str("Access-Control-Allow-Origin: *\r\n");
-    response.push_str("Connection: close\r\n");
-    response.push_str("\r\n");
-    response.push_str(body);
-
-    let _ = stream.write_all(response.as_bytes()).await;
-    let _ = stream.flush().await;
-}
-
-// ── Timeout helper ───────────────────────────────────────────────────────
-
-/// An error indicating that an operation timed out.
-#[derive(Debug)]
-struct TimeoutError;
-
-/// Races a channel receive against a duration.
-///
-/// Returns the channel value on success, or [`TimeoutError`] if the duration
-/// elapses first or the channel is closed.
-async fn race_timeout<T>(
-    duration: Duration,
-    recv: impl Future<Output = Result<T, channel::RecvError>>,
-) -> Result<T, TimeoutError> {
-    enum Event<T> {
-        Value(T),
-        ChannelClosed,
-        Timeout,
-    }
-
-    let event = smol::future::or(
-        async {
-            match recv.await {
-                Ok(value) => Event::Value(value),
-                Err(_) => Event::ChannelClosed,
-            }
-        },
-        async {
-            smol::Timer::after(duration).await;
-            Event::Timeout
-        },
-    )
-    .await;
-
-    match event {
-        Event::Value(value) => Ok(value),
-        Event::ChannelClosed | Event::Timeout => Err(TimeoutError),
-    }
-}
-
-// ── Utility ──────────────────────────────────────────────────────────────
-
-/// Gets the current time in seconds since the Unix epoch (1970-01-01). If the
-/// time is before the epoch, returns 0.
-#[inline]
-fn current_time() -> u64 {
-    SystemTime::now()
-        .duration_since(UNIX_EPOCH)
-        .map(|d| d.as_secs())
-        .unwrap_or_default()
-}

crates/browser-signer-proxy/src/prelude.rs

@@ -1,14 +0,0 @@
-// Copyright (c) 2022-2023 Yuki Kishimoto
-// Copyright (c) 2023-2025 Rust Nostr Developers
-// Distributed under the MIT software license
-
-//! Prelude
-
-#![allow(unknown_lints)]
-#![allow(ambiguous_glob_reexports)]
-#![doc(hidden)]
-
-pub use nostr::prelude::*;
-
-pub use crate::error::{Error, ErrorKind};
-pub use crate::*;

crates/chat/Cargo.toml

@@ -13,16 +13,15 @@ settings = { path = "../settings" }
 
 gpui.workspace = true
 nostr-sdk.workspace = true
-instant.workspace = true
 
 anyhow.workspace = true
 itertools.workspace = true
 smallvec.workspace = true
-log.workspace = true
-flume.workspace = true
-
-futures.workspace = true
-fuzzy-matcher = "0.3.7"
-
-[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 smol.workspace = true
+log.workspace = true
+futures.workspace = true
+flume.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+
+fuzzy-matcher = "0.3.7"

crates/chat/src/message.rs

@@ -1,152 +1,7 @@
 use std::hash::Hash;
-use std::ops::Range;
 
-use common::{EventExt, NostrParser, extract_and_remove_media_urls};
-use gpui::{SharedString, SharedUri};
+use common::EventUtils;
 use nostr_sdk::prelude::*;
-use state::FileAttachment;
-
-pub const KIND_FILE_MESSAGE: Kind = Kind::Custom(15);
-
-/// 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>,
-    /// Encrypted file attachment
-    pub file: Option<FileAttachment>,
-}
-
-impl From<&Event> for Message {
-    fn from(val: &Event) -> Self {
-        from_parts(
-            val.id,
-            val.pubkey,
-            val.created_at,
-            val.kind,
-            &val.content,
-            &val.tags,
-        )
-    }
-}
-
-impl From<&UnsignedEvent> for Message {
-    fn from(val: &UnsignedEvent) -> Self {
-        from_parts(
-            // Event ID must be known
-            val.id.unwrap(),
-            val.pubkey,
-            val.created_at,
-            val.kind,
-            &val.content,
-            &val.tags,
-        )
-    }
-}
-
-impl From<&NewMessage> for Message {
-    fn from(val: &NewMessage) -> Self {
-        from_parts(
-            // Event ID must be known
-            val.rumor.id.unwrap(),
-            val.rumor.pubkey,
-            val.rumor.created_at,
-            val.rumor.kind,
-            &val.rumor.content,
-            &val.rumor.tags,
-        )
-    }
-}
-
-fn from_parts(
-    id: EventId,
-    author: PublicKey,
-    created_at: Timestamp,
-    kind: Kind,
-    content: &str,
-    tags: &Tags,
-) -> Message {
-    let file = if kind == KIND_FILE_MESSAGE {
-        FileAttachment::from_tags(content, tags)
-    } else {
-        None
-    };
-    let has_file = file.is_some();
-
-    let replies_to = extract_reply_ids(tags);
-
-    // For file messages `.content` is the encrypted blob URL, not text or media
-    let mentions = if has_file {
-        Vec::new()
-    } else {
-        extract_mentions(content)
-    };
-
-    let (media, content) = if has_file {
-        (Vec::new(), String::new())
-    } else {
-        extract_and_remove_media_urls(content)
-    };
-
-    Message {
-        id,
-        author,
-        content,
-        media,
-        created_at,
-        mentions,
-        replies_to,
-        file,
-    }
-}
-
-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);
-    }
-}
-
-impl Message {
-    /// Single-line representation for reply previews, notifications and copy.
-    pub fn preview(&self) -> SharedString {
-        if let Some(file) = &self.file {
-            return format!("[File] {}", file.display_name()).into();
-        }
-
-        self.content.clone().into()
-    }
-}
 
 /// New message.
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
@@ -168,62 +23,194 @@ impl NewMessage {
     }
 }
 
-/// Trash message.
-#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
-pub struct FailedMessage {
-    pub raw_event: SharedString,
-    pub reason: SharedString,
+/// Message.
+#[derive(Debug, Clone, Hash, PartialEq, Eq)]
+pub enum Message {
+    User(RenderedMessage),
+    Warning(String, Timestamp),
+    System(Timestamp),
 }
 
-impl FailedMessage {
-    pub fn new<T>(event: &Event, reason: T) -> Self
+impl Message {
+    pub fn user<I>(user: I) -> Self
     where
-        T: Into<SharedString>,
+        I: Into<RenderedMessage>,
     {
-        Self {
-            raw_event: SharedString::from(event.as_json()),
-            reason: reason.into(),
+        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,
         }
     }
 }
 
-#[derive(Debug, Clone)]
-pub struct Mention {
-    pub public_key: PublicKey,
-    pub range: Range<usize>,
+impl From<&NewMessage> for Message {
+    fn from(val: &NewMessage) -> Self {
+        Self::User(val.into())
+    }
 }
 
-impl Mention {
-    pub fn new(public_key: PublicKey, range: Range<usize>) -> Self {
-        Self { public_key, range }
+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))
+    }
+}
+
+/// 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<PublicKey>,
+    /// 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> {
+fn extract_mentions(content: &str) -> Vec<PublicKey> {
     let parser = NostrParser::new();
     let tokens = parser.parse(content);
 
     tokens
-        .filter_map(|token| match token.value {
-            Nip21::Pubkey(public_key) => Some(Mention::new(public_key, token.range)),
-            Nip21::Profile(profile) => Some(Mention::new(profile.public_key, token.range)),
+        .filter_map(|token| match token {
+            Token::Nostr(nip21) => match nip21 {
+                Nip21::Pubkey(pubkey) => Some(pubkey),
+                Nip21::Profile(profile) => Some(profile.public_key),
+                _ => None,
+            },
             _ => None,
         })
-        .collect()
+        .collect::<Vec<_>>()
 }
 
 /// Extracts all reply (ids) from the event tags.
 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

@@ -1,28 +1,24 @@
 use std::cmp::Ordering;
 use std::hash::{Hash, Hasher};
+use std::time::Duration;
 
-use anyhow::{Error, anyhow};
-use common::EventExt;
-use device::DeviceRegistry;
+use anyhow::{Context as AnyhowContext, Error};
+use common::EventUtils;
 use gpui::{App, AppContext, Context, EventEmitter, SharedString, Task};
-use instant::Duration;
 use itertools::Itertools;
 use nostr_sdk::prelude::*;
 use person::{Person, PersonRegistry};
 use settings::{RoomConfig, SignerKind};
-use state::{NostrRegistry, TIMEOUT, UniversalSigner};
+use state::{NostrRegistry, TIMEOUT};
 
-use crate::{FileAttachment, KIND_FILE_MESSAGE, NewMessage};
-
-const NO_DEKEY: &str = "User hasn't set up a decoupled encryption key yet.";
-const USER_NO_DEKEY: &str = "You haven't set up a decoupled encryption key or it's not available.";
+use crate::{ChatRegistry, NewMessage};
 
 #[derive(Debug, Clone)]
 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 +38,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
     }
@@ -58,44 +54,16 @@ impl SendReport {
 
     /// Returns true if the send is pending.
     pub fn pending(&self) -> bool {
-        self.error.is_none()
-            && self
-                .output
-                .as_ref()
-                .is_some_and(|o| o.success.is_empty() && o.failed.is_empty())
+        self.output.is_none() && self.error.is_none()
     }
 
     /// Returns true if the send was successful.
     pub fn success(&self) -> bool {
-        self.error.is_none() && self.output.as_ref().is_some_and(|o| !o.success.is_empty())
-    }
-
-    /// Returns true if the send failed.
-    pub fn failed(&self) -> bool {
-        self.error.is_some() && self.output.as_ref().is_some_and(|o| !o.failed.is_empty())
-    }
-}
-
-#[derive(Debug, Clone)]
-pub enum SendStatus {
-    Ok {
-        id: EventId,
-        relay: RelayUrl,
-    },
-    Failed {
-        id: EventId,
-        relay: RelayUrl,
-        message: String,
-    },
-}
-
-impl SendStatus {
-    pub fn ok(id: EventId, relay: RelayUrl) -> Self {
-        Self::Ok { id, relay }
-    }
-
-    pub fn failed(id: EventId, relay: RelayUrl, message: String) -> Self {
-        Self::Failed { id, relay, message }
+        if let Some(output) = self.output.as_ref() {
+            !output.failed.is_empty()
+        } else {
+            false
+        }
     }
 }
 
@@ -172,8 +140,7 @@ impl From<&UnsignedEvent> for Room {
         let members = val.extract_public_keys();
         let subject = val
             .tags
-            .iter()
-            .find(|tag| tag.kind() == "subject")
+            .find(TagKind::Subject)
             .and_then(|tag| tag.content().map(|s| s.to_owned().into()));
 
         Room {
@@ -182,7 +149,7 @@ impl From<&UnsignedEvent> for Room {
             subject,
             members,
             kind: RoomKind::default(),
-            config: RoomConfig::new(),
+            config: RoomConfig::default(),
         }
     }
 }
@@ -207,7 +174,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();
@@ -234,8 +201,10 @@ impl Room {
 
     /// Sets this room is ongoing conversation
     pub fn set_ongoing(&mut self, cx: &mut Context<Self>) {
-        self.kind = RoomKind::Ongoing;
-        cx.notify();
+        if self.kind != RoomKind::Ongoing {
+            self.kind = RoomKind::Ongoing;
+            cx.notify();
+        }
     }
 
     /// Updates the creation timestamp of the room
@@ -253,26 +222,9 @@ impl Room {
         cx.notify();
     }
 
-    /// Updates the signer kind config for the room
-    pub fn set_signer_kind(&mut self, kind: &SignerKind, cx: &mut Context<Self>) {
-        self.config.set_signer_kind(kind);
-        cx.notify();
-    }
-
-    /// Updates the backup config for the room
-    pub fn set_backup(&mut self, cx: &mut Context<Self>) {
-        self.config.toggle_backup();
-        cx.notify();
-    }
-
-    /// Returns the config of the room
-    pub fn config(&self) -> &RoomConfig {
-        &self.config
-    }
-
     /// Returns the members of the room
-    pub fn members(&self) -> &[PublicKey] {
-        &self.members
+    pub fn members(&self) -> Vec<PublicKey> {
+        self.members.clone()
     }
 
     /// Checks if the room has more than two members (group)
@@ -344,6 +296,10 @@ impl Room {
 
         if new_message {
             self.set_created_at(created_at, cx);
+            // Sort chats after emitting a new message
+            ChatRegistry::global(cx).update(cx, |this, cx| {
+                this.sort(cx);
+            });
         }
     }
 
@@ -353,41 +309,44 @@ impl Room {
     }
 
     /// Get gossip relays for each member
-    pub fn connect(&self, cx: &App) -> Task<Result<(), Error>> {
+    pub fn early_connect(&self, cx: &App) -> Task<Result<(), Error>> {
         let nostr = NostrRegistry::global(cx);
         let client = nostr.read(cx).client();
-        let members = self.members().to_vec();
+
+        let members = self.members();
+        let subscription_id = SubscriptionId::new(format!("room-{}", self.id));
 
         cx.background_spawn(async move {
-            let opts = SubscribeAutoCloseOptions::default()
-                .exit_policy(ReqExitPolicy::ExitOnEOSE)
-                .timeout(Some(Duration::from_secs(TIMEOUT)));
+            let signer = client.signer().context("Signer not found")?;
+            let public_key = signer.get_public_key().await?;
 
-            let tasks: Vec<_> = members
-                .into_iter()
-                .map(|public_key| {
-                    let client = client.clone();
-                    async move {
-                        let inbox = Filter::new()
-                            .author(public_key)
-                            .kind(Kind::InboxRelays)
-                            .limit(1);
+            for member in members.into_iter() {
+                if member == public_key {
+                    continue;
+                };
 
-                        let announcement = Filter::new()
-                            .author(public_key)
-                            .kind(Kind::Custom(10044))
-                            .limit(1);
+                // Construct a filter for messaging relays
+                let inbox = Filter::new()
+                    .kind(Kind::InboxRelays)
+                    .author(member)
+                    .limit(1);
 
-                        client
-                            .subscribe(vec![inbox, announcement])
-                            .close_on(opts)
-                            .await
-                    }
-                })
-                .collect();
+                // Construct a filter for announcement
+                let announcement = Filter::new()
+                    .kind(Kind::Custom(10044))
+                    .author(member)
+                    .limit(1);
 
-            for result in futures::future::join_all(tasks).await {
-                result?;
+                // Subscribe to get member's gossip relays
+                client
+                    .subscribe(vec![inbox, announcement])
+                    .with_id(subscription_id.clone())
+                    .close_on(
+                        SubscribeAutoCloseOptions::default()
+                            .timeout(Some(Duration::from_secs(TIMEOUT)))
+                            .exit_policy(ReqExitPolicy::ExitOnEOSE),
+                    )
+                    .await?;
             }
 
             Ok(())
@@ -398,12 +357,12 @@ impl Room {
     pub fn get_messages(&self, cx: &App) -> Task<Result<Vec<UnsignedEvent>, Error>> {
         let nostr = NostrRegistry::global(cx);
         let client = nostr.read(cx).client();
-        let room_id = self.id.to_string();
+        let conversation_id = self.id.to_string();
 
         cx.background_spawn(async move {
             let filter = Filter::new()
                 .kind(Kind::ApplicationSpecificData)
-                .custom_tag(SingleLetterTag::LOWERCASE_R, room_id);
+                .custom_tag(SingleLetterTag::lowercase(Alphabet::C), conversation_id);
 
             let messages = client
                 .database()
@@ -419,210 +378,183 @@ impl Room {
     }
 
     // Construct a rumor event for direct message
-    pub fn rumor<S, I>(
-        &self,
-        content: S,
-        replies: I,
-        reaction: bool,
-        cx: &App,
-    ) -> Option<UnsignedEvent>
+    pub fn rumor<S, I>(&self, content: S, replies: I, cx: &App) -> Option<UnsignedEvent>
     where
         S: Into<String>,
         I: IntoIterator<Item = EventId>,
     {
-        let kind = if reaction {
-            Kind::Reaction
-        } else {
-            Kind::PrivateDirectMessage
-        };
-
+        let kind = Kind::PrivateDirectMessage;
         let content: String = content.into();
         let replies: Vec<EventId> = replies.into_iter().collect();
 
-        // Get current user's public key
-        let nostr = NostrRegistry::global(cx);
-        let sender = nostr.read(cx).current_user()?;
-
-        // Construct a direct message rumor event
-        // WARNING: never sign and send this event to relays
-        let mut event = EventBuilder::new(kind, content)
-            .tags(self.conversation_tags(&replies, sender, cx))
-            .finalize_unsigned(sender);
-
-        // Ensure that the ID is set
-        event.ensure_id();
-
-        Some(event)
-    }
-
-    // Construct a rumor event for an encrypted file message (NIP-17 kind 15)
-    pub fn file_rumor<I>(&self, file: FileAttachment, replies: I, cx: &App) -> Option<UnsignedEvent>
-    where
-        I: IntoIterator<Item = EventId>,
-    {
-        let replies: Vec<EventId> = replies.into_iter().collect();
-
-        // Get current user's public key
-        let nostr = NostrRegistry::global(cx);
-        let sender = nostr.read(cx).current_user()?;
-
-        let mut tags = self.conversation_tags(&replies, sender, cx);
-        tags.extend(file.tags());
-
-        // Construct a file message rumor event
-        // WARNING: never sign and send this event to relays
-        let mut event = EventBuilder::new(KIND_FILE_MESSAGE, file.url.to_string())
-            .tags(tags)
-            .finalize_unsigned(sender);
-
-        // Ensure that the ID is set
-        event.ensure_id();
-
-        Some(event)
-    }
-
-    // Build the `subject` + reply `e` tags + receiver `p` tags (excluding `sender`)
-    fn conversation_tags(&self, replies: &[EventId], sender: PublicKey, cx: &App) -> Vec<Tag> {
         let persons = PersonRegistry::global(cx);
+        let nostr = NostrRegistry::global(cx);
+
+        // Get current user's public key
+        let sender = nostr.read(cx).signer().public_key()?;
+
+        // Get all members
+        let members: Vec<Person> = self
+            .members
+            .iter()
+            .filter(|public_key| public_key != &&sender)
+            .map(|member| persons.read(cx).get(member, cx))
+            .collect();
 
         // Construct event's tags
         let mut tags = vec![];
 
         // 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
-        for id in replies {
-            tags.push(Tag::event(*id))
+        for id in replies.into_iter() {
+            tags.push(Tag::event(id))
         }
 
-        // Add all receiver tags (no intermediate allocation)
-        for public_key in self.members.iter().filter(|pk| *pk != &sender) {
-            let member = persons.read(cx).get(public_key, cx);
-            tags.push(Tag::from(Nip01Tag::PublicKey {
-                public_key: member.public_key(),
-                relay_hint: member.messaging_relay_hint(),
-            }));
-        }
-
-        tags
-    }
-
-    /// Select the appropriate signer based on signer kind and available keys.
-    fn select_signer(
-        signer_kind: &SignerKind,
-        has_announcement: bool,
-        encryption_signer: &Option<UniversalSigner>,
-        user_signer: &UniversalSigner,
-    ) -> UniversalSigner {
-        match signer_kind {
-            SignerKind::Auto => {
-                if has_announcement {
-                    encryption_signer
-                        .clone()
-                        .unwrap_or_else(|| user_signer.clone())
-                } else {
-                    user_signer.clone()
-                }
+        // Add all receiver tags
+        for member in members.into_iter() {
+            // Skip current user
+            if member.public_key() == sender {
+                continue;
             }
-            SignerKind::Encryption => encryption_signer
-                .clone()
-                .expect("encryption signer must be set"),
-            SignerKind::User => user_signer.clone(),
+
+            tags.push(Tag::from_standardized_without_cell(
+                TagStandard::PublicKey {
+                    public_key: member.public_key(),
+                    relay_url: member.messaging_relay_hint(),
+                    alias: None,
+                    uppercase: false,
+                },
+            ));
         }
+
+        // Construct a direct message rumor event
+        // WARNING: never sign and send this event to relays
+        let mut event = EventBuilder::new(kind, content).tags(tags).build(sender);
+
+        // Ensure that the ID is set
+        event.ensure_id();
+
+        Some(event)
     }
 
     /// 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 device = DeviceRegistry::global(cx);
-        let encryption_signer = device.read(cx).signer(cx);
-
+        let persons = PersonRegistry::global(cx);
         let nostr = NostrRegistry::global(cx);
         let client = nostr.read(cx).client();
-        let user_signer = nostr.read(cx).signer();
-        let current_user = nostr.read(cx).current_user()?;
+        let signer = nostr.read(cx).signer();
 
-        // Get sender's profile
-        let persons = PersonRegistry::global(cx);
-        let sender = persons.read(cx).get(&current_user, cx);
+        // Get room's config
+        let config = self.config.clone();
+
+        // Get current user's public key
+        let sender = nostr.read(cx).signer().public_key()?;
 
         // Get all members (excluding sender)
         let members: Vec<Person> = self
             .members
             .iter()
-            .filter(|public_key| public_key != &&sender.public_key())
+            .filter(|public_key| public_key != &&sender)
             .map(|member| persons.read(cx).get(member, cx))
             .collect();
 
         Some(cx.background_spawn(async move {
             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();
 
-            // Process each member
             for member in members {
+                let relays = member.messaging_relays();
                 let announcement = member.announcement();
-                let public_key = member.public_key();
 
-                // Handle encryption signer requirements
-                if signer_kind.encryption() {
-                    // Receiver didn't set up a decoupled encryption key
-                    if announcement.is_none() {
-                        reports.push(SendReport::new(public_key).error(NO_DEKEY));
-                        continue;
-                    }
-
-                    // Sender didn't set up a decoupled encryption key
-                    if encryption_signer.is_none() {
-                        reports.push(SendReport::new(sender.public_key()).error(USER_NO_DEKEY));
-                        continue;
-                    }
+                // Skip if member has no messaging relays
+                if relays.is_empty() {
+                    reports.push(SendReport::new(member.public_key()).error("No messaging relays"));
+                    continue;
                 }
 
-                // Determine the signer to use
-                let signer = Self::select_signer(
-                    signer_kind,
-                    announcement.is_some(),
-                    &encryption_signer,
-                    &user_signer,
-                );
-
-                // Send the gift wrap event and collect the report
-                match send_gift_wrap(&client, &signer, &member, &rumor, signer_kind).await {
-                    Ok(report) => {
-                        reports.push(report);
-                        sents += 1;
-                    }
-                    Err(error) => {
-                        let report = SendReport::new(public_key).error(error.to_string());
-                        reports.push(report);
-                    }
+                // Ensure relay connections
+                for url in relays.iter() {
+                    client
+                        .add_relay(url)
+                        .and_connect()
+                        .capabilities(RelayCapabilities::GOSSIP)
+                        .await
+                        .ok();
                 }
-            }
 
-            // Send backup to current user if needed
-            if backup && sents >= 1 {
-                let public_key = sender.public_key();
+                // When forced to use encryption signer, skip if receiver has no announcement
+                if signer_kind.encryption() && announcement.is_none() {
+                    reports
+                        .push(SendReport::new(member.public_key()).error("Encryption not found"));
+                    continue;
+                }
 
-                // Determine the signer to use
-                let signer = Self::select_signer(
-                    signer_kind,
-                    sender.announcement().is_some(),
-                    &encryption_signer,
-                    &user_signer,
-                );
+                // Determine receiver and signer based on signer kind
+                let (receiver, signer_to_use) = match signer_kind {
+                    SignerKind::Auto => {
+                        if let Some(announcement) = announcement {
+                            if let Some(enc_signer) = encryption_signer.as_ref() {
+                                (announcement.public_key(), enc_signer.clone())
+                            } else {
+                                (member.public_key(), user_signer.clone())
+                            }
+                        } else {
+                            (member.public_key(), user_signer.clone())
+                        }
+                    }
+                    SignerKind::Encryption => {
+                        let Some(encryption_signer) = encryption_signer.as_ref() else {
+                            reports.push(
+                                SendReport::new(member.public_key()).error("Encryption not found"),
+                            );
+                            continue;
+                        };
+                        let Some(announcement) = announcement else {
+                            reports.push(
+                                SendReport::new(member.public_key())
+                                    .error("Announcement not found"),
+                            );
+                            continue;
+                        };
+                        (announcement.public_key(), encryption_signer.clone())
+                    }
+                    SignerKind::User => (member.public_key(), user_signer.clone()),
+                };
 
-                match send_gift_wrap(&client, &signer, &sender, &rumor, signer_kind).await {
-                    Ok(report) => reports.push(report),
-                    Err(error) => {
-                        let report = SendReport::new(public_key).error(error.to_string());
-                        reports.push(report);
+                // Create and send gift-wrapped event
+                match EventBuilder::gift_wrap(&signer_to_use, &receiver, rumor.clone(), []).await {
+                    Ok(event) => {
+                        match client
+                            .send_event(&event)
+                            .to(relays)
+                            .ack_policy(AckPolicy::none())
+                            .await
+                        {
+                            Ok(output) => {
+                                reports.push(
+                                    SendReport::new(member.public_key())
+                                        .gift_wrap_id(event.id)
+                                        .output(output),
+                                );
+                            }
+                            Err(e) => {
+                                reports.push(
+                                    SendReport::new(member.public_key()).error(e.to_string()),
+                                );
+                            }
+                        }
+                    }
+                    Err(e) => {
+                        reports.push(SendReport::new(member.public_key()).error(e.to_string()));
                     }
                 }
             }
@@ -630,57 +562,222 @@ impl Room {
             reports
         }))
     }
-}
 
-// Helper function to send a gift-wrapped event
-async fn send_gift_wrap(
-    client: &Client,
-    signer: &UniversalSigner,
-    receiver: &Person,
-    rumor: &UnsignedEvent,
-    config: &SignerKind,
-) -> Result<SendReport, Error> {
-    let k_tag = Tag::custom("k", [rumor.kind.to_string()]);
-    let mut extra_tags = vec![k_tag];
+    /*
+    * /// Create a new unsigned message event
+    pub fn create_message(
+        &self,
+        content: &str,
+        replies: Vec<EventId>,
+        cx: &App,
+    ) -> Task<Result<UnsignedEvent, Error>> {
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
 
-    // Determine the receiver public key based on the config
-    let receiver = match config {
-        SignerKind::Auto => {
-            if let Some(announcement) = receiver.announcement().as_ref() {
-                extra_tags.push(Tag::public_key(receiver.public_key()));
-                announcement.public_key()
-            } else {
-                receiver.public_key()
-            }
+        let subject = self.subject.clone();
+        let content = content.to_string();
+
+        let mut member_and_relay_hints = HashMap::new();
+
+        // Populate the hashmap with member and relay hint tasks
+        for member in self.members.iter() {
+            let hint = nostr.read(cx).relay_hint(member, cx);
+            member_and_relay_hints.insert(member.to_owned(), hint);
         }
-        SignerKind::Encryption => {
-            if let Some(announcement) = receiver.announcement().as_ref() {
-                extra_tags.push(Tag::public_key(receiver.public_key()));
-                announcement.public_key()
-            } else {
-                return Err(anyhow!("User has no encryption announcement"));
+
+        cx.background_spawn(async move {
+            let signer = client.signer().context("Signer not found")?;
+            let public_key = signer.get_public_key().await?;
+
+            // List of event tags for each receiver
+            let mut tags = vec![];
+
+            for (member, task) in member_and_relay_hints.into_iter() {
+                // Skip current user
+                if member == public_key {
+                    continue;
+                }
+
+                // Get relay hint if available
+                let relay_url = task.await;
+
+                // Construct a public key tag with relay hint
+                let tag = TagStandard::PublicKey {
+                    public_key: member,
+                    relay_url,
+                    alias: None,
+                    uppercase: false,
+                };
+
+                tags.push(Tag::from_standardized_without_cell(tag));
             }
-        }
-        SignerKind::User => receiver.public_key(),
-    };
 
-    // Construct the gift wrap event
-    let event = nip59::GiftWrapBuilder::new(receiver, rumor.clone())
-        .extra_tags(extra_tags)
-        .finalize_async(signer)
-        .await?;
+            // Add subject tag if present
+            if let Some(value) = subject {
+                tags.push(Tag::from_standardized_without_cell(TagStandard::Subject(
+                    value.to_string(),
+                )));
+            }
 
-    // Send the gift wrap event and collect the report
-    let report = client
-        .send_event(&event)
-        .to_nip17()
-        .ack_policy(AckPolicy::none())
-        .await
-        .map(|output| {
-            SendReport::new(receiver)
-                .gift_wrap_id(event.id)
-                .output(output)
-        })?;
+            // Add all reply tags
+            for id in replies {
+                tags.push(Tag::event(id))
+            }
 
-    Ok(report)
+            // Construct a direct message event
+            //
+            // WARNING: never sign and send this event to relays
+            let mut event = EventBuilder::new(Kind::PrivateDirectMessage, content)
+                .tags(tags)
+                .build(public_key);
+
+            // Ensure the event ID has been generated
+            event.ensure_id();
+
+            Ok(event)
+        })
+    }
+
+    /// Create a task to send a message to all room members
+    pub fn send_message(
+        &self,
+        rumor: &UnsignedEvent,
+        cx: &App,
+    ) -> Task<Result<Vec<SendReport>, Error>> {
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+
+        let mut members = self.members();
+        let rumor = rumor.to_owned();
+
+        cx.background_spawn(async move {
+            let signer = client.signer().context("Signer not found")?;
+            let current_user = signer.get_public_key().await?;
+
+            // Remove the current user's public key from the list of receivers
+            // the current user will be handled separately
+            members.retain(|this| this != &current_user);
+
+            // Collect the send reports
+            let mut reports: Vec<SendReport> = vec![];
+
+            for receiver in members.into_iter() {
+                // Construct the gift wrap event
+                let event =
+                    EventBuilder::gift_wrap(signer, &receiver, rumor.clone(), vec![]).await?;
+
+                // Send the gift wrap event to the messaging relays
+                match client.send_event(&event).to_nip17().await {
+                    Ok(output) => {
+                        let id = output.id().to_owned();
+                        let auth = output.failed.iter().any(|(_, s)| s.starts_with("auth-"));
+                        let report = SendReport::new(receiver).status(output);
+                        let tracker = tracker().read().await;
+
+                        if auth {
+                            // Wait for authenticated and resent event successfully
+                            for attempt in 0..=SEND_RETRY {
+                                // Check if event was successfully resent
+                                if tracker.is_sent_by_coop(&id) {
+                                    let output = Output::new(id);
+                                    let report = SendReport::new(receiver).status(output);
+                                    reports.push(report);
+                                    break;
+                                }
+
+                                // Check if retry limit exceeded
+                                if attempt == SEND_RETRY {
+                                    reports.push(report);
+                                    break;
+                                }
+
+                                smol::Timer::after(Duration::from_millis(1200)).await;
+                            }
+                        } else {
+                            reports.push(report);
+                        }
+                    }
+                    Err(e) => {
+                        reports.push(SendReport::new(receiver).error(e.to_string()));
+                    }
+                }
+            }
+
+            // Construct the gift-wrapped event
+            let event =
+                EventBuilder::gift_wrap(signer, &current_user, rumor.clone(), vec![]).await?;
+
+            // Only send a backup message to current user if sent successfully to others
+            if reports.iter().all(|r| r.is_sent_success()) {
+                // Send the event to the messaging relays
+                match client.send_event(&event).to_nip17().await {
+                    Ok(output) => {
+                        reports.push(SendReport::new(current_user).status(output));
+                    }
+                    Err(e) => {
+                        reports.push(SendReport::new(current_user).error(e.to_string()));
+                    }
+                }
+            } else {
+                reports.push(SendReport::new(current_user).on_hold(event));
+            }
+
+            Ok(reports)
+        })
+    }
+
+    /// Create a task to resend a failed message
+    pub fn resend_message(
+        &self,
+        reports: Vec<SendReport>,
+        cx: &App,
+    ) -> Task<Result<Vec<SendReport>, Error>> {
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+
+        cx.background_spawn(async move {
+            let mut resend_reports = vec![];
+
+            for report in reports.into_iter() {
+                let receiver = report.receiver;
+
+                // Process failed events
+                if let Some(output) = report.status {
+                    let id = output.id();
+                    let urls: Vec<&RelayUrl> = output.failed.keys().collect();
+
+                    if let Some(event) = client.database().event_by_id(id).await? {
+                        for url in urls.into_iter() {
+                            let relay = client.relay(url).await?.context("Relay not found")?;
+                            let id = relay.send_event(&event).await?;
+
+                            let resent: Output<EventId> = Output {
+                                val: id,
+                                success: HashSet::from([url.to_owned()]),
+                                failed: HashMap::new(),
+                            };
+
+                            resend_reports.push(SendReport::new(receiver).status(resent));
+                        }
+                    }
+                }
+
+                // Process the on hold event if it exists
+                if let Some(event) = report.on_hold {
+                    // Send the event to the messaging relays
+                    match client.send_event(&event).await {
+                        Ok(output) => {
+                            resend_reports.push(SendReport::new(receiver).status(output));
+                        }
+                        Err(e) => {
+                            resend_reports.push(SendReport::new(receiver).error(e.to_string()));
+                        }
+                    }
+                }
+            }
+
+            Ok(resend_reports)
+        })
+    }
+    */
 }

crates/chat_ui/Cargo.toml

@@ -7,6 +7,7 @@ publish.workspace = true
 [dependencies]
 state = { path = "../state" }
 ui = { path = "../ui" }
+dock = { path = "../dock" }
 theme = { path = "../theme" }
 common = { path = "../common" }
 person = { path = "../person" }
@@ -14,16 +15,17 @@ chat = { path = "../chat" }
 settings = { path = "../settings" }
 
 gpui.workspace = true
+gpui_tokio.workspace = true
+
 nostr-sdk.workspace = true
 anyhow.workspace = true
 itertools.workspace = true
 smallvec.workspace = true
+smol.workspace = true
 flume.workspace = true
-futures.workspace = true
 log.workspace = true
 serde.workspace = true
+serde_json.workspace = true
 
-linkify = "0.10.0"
-pulldown-cmark = "0.13.1"
+once_cell = "1.19.0"
 regex = "1"
-

crates/chat_ui/src/actions.rs

@@ -1,17 +1,24 @@
 use gpui::Action;
 use nostr_sdk::prelude::*;
 use serde::Deserialize;
-use settings::SignerKind;
 
 #[derive(Action, Clone, PartialEq, Eq, Deserialize)]
 #[action(namespace = chat, no_json)]
 pub enum Command {
     Insert(&'static str),
-    ChangeSubject(String),
-    ChangeSigner(SignerKind),
-    ToggleBackup,
-    Copy(PublicKey),
-    Relays(PublicKey),
-    Njump(PublicKey),
-    Trace(EventId),
+    ChangeSubject(&'static str),
 }
+
+#[derive(Action, Clone, PartialEq, Eq, Deserialize)]
+#[action(namespace = chat, no_json)]
+pub struct SeenOn(pub EventId);
+
+/// Define a open public key action
+#[derive(Action, Clone, PartialEq, Eq, Deserialize, Debug)]
+#[action(namespace = pubkey, no_json)]
+pub struct OpenPublicKey(pub PublicKey);
+
+/// Define a copy inline public key action
+#[derive(Action, Clone, PartialEq, Eq, Deserialize, Debug)]
+#[action(namespace = pubkey, no_json)]
+pub struct CopyPublicKey(pub PublicKey);

crates/chat_ui/src/file.rs

@@ -1,32 +0,0 @@
-use std::path::{Path, PathBuf};
-
-use chat::FileAttachment;
-use gpui::SharedString;
-use nostr_sdk::prelude::*;
-
-/// A file attachment that has been uploaded, but not sent yet.
-///
-/// The local `path` is kept around so the composer can preview
-/// the file without downloading and decrypting it again.
-pub(crate) struct PendingFile {
-    pub file: FileAttachment,
-    pub path: PathBuf,
-}
-
-/// State of the encrypted file attachment of a message
-pub(crate) enum DecryptedFile {
-    Loading,
-    Ready(PathBuf),
-    Failed(SharedString),
-}
-
-/// Result of an upload, either plain or encrypted
-pub(crate) enum Uploaded {
-    Url(Url),
-    File(FileAttachment, PathBuf),
-}
-
-/// A `file://` url for a decrypted file, so it can be opened by the OS
-pub(crate) fn file_url(path: &Path) -> String {
-    format!("file://{}", path.display())
-}

crates/chat_ui/src/subject.rs

@@ -0,0 +1,60 @@
+use gpui::{
+    div, App, AppContext, Context, Entity, IntoElement, ParentElement, Render, SharedString,
+    Styled, Window,
+};
+use theme::ActiveTheme;
+use ui::input::{InputState, TextInput};
+use ui::{v_flex, Sizable};
+
+pub fn init(subject: Option<String>, window: &mut Window, cx: &mut App) -> Entity<Subject> {
+    cx.new(|cx| Subject::new(subject, window, cx))
+}
+
+pub struct Subject {
+    input: Entity<InputState>,
+}
+
+impl Subject {
+    pub fn new(subject: Option<String>, window: &mut Window, cx: &mut Context<Self>) -> Self {
+        let input = cx.new(|cx| InputState::new(window, cx).placeholder("Plan for holiday"));
+
+        if let Some(value) = subject {
+            input.update(cx, |this, cx| {
+                this.set_value(value, window, cx);
+            });
+        };
+
+        Self { input }
+    }
+
+    pub fn new_subject(&self, cx: &App) -> SharedString {
+        self.input.read(cx).value()
+    }
+}
+
+impl Render for Subject {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        v_flex()
+            .gap_2()
+            .child(
+                v_flex()
+                    .gap_1()
+                    .child(
+                        div()
+                            .text_sm()
+                            .text_color(cx.theme().text_muted)
+                            .child(SharedString::from("Subject:")),
+                    )
+                    .child(TextInput::new(&self.input).small()),
+            )
+            .child(
+                div()
+                    .text_xs()
+                    .italic()
+                    .text_color(cx.theme().text_placeholder)
+                    .child(SharedString::from(
+                        "Subject will be updated when you send a new message.",
+                    )),
+            )
+    }
+}

crates/chat_ui/src/text.rs

@@ -1,31 +1,29 @@
 use std::ops::Range;
-use std::sync::{Arc, LazyLock};
+use std::sync::Arc;
 
-use chat::Mention;
 use gpui::{
-    AnyElement, App, ElementId, Entity, FontStyle, FontWeight, HighlightStyle, InteractiveText,
-    IntoElement, SharedString, StrikethroughStyle, StyledText, UnderlineStyle, Window,
+    AnyElement, App, ElementId, HighlightStyle, InteractiveText, IntoElement, SharedString,
+    StyledText, UnderlineStyle, Window,
 };
+use nostr_sdk::prelude::*;
+use once_cell::sync::Lazy;
 use person::PersonRegistry;
 use regex::Regex;
 use theme::ActiveTheme;
 
-/// Matches `http://` and `https://` URLs. Only these are treated as clickable links.
-static WEB_URL: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"(?i)^https?://").unwrap());
+use crate::actions::OpenPublicKey;
+
+static URL_REGEX: Lazy<Regex> = Lazy::new(|| {
+    Regex::new(r"(?i)(?:^|\s)(?:https?://)?(?:[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?\.)+[a-z]{2,}(?::\d+)?(?:/[^\s]*)?(?:\s|$)").unwrap()
+});
+
+static NOSTR_URI_REGEX: Lazy<Regex> =
+    Lazy::new(|| Regex::new(r"nostr:(npub|note|nprofile|nevent|naddr)[a-zA-Z0-9]+").unwrap());
 
-#[allow(clippy::enum_variant_names)]
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum Highlight {
-    Code,
-    InlineCode(bool),
-    Highlight(HighlightStyle),
-    Mention,
-}
-
-impl From<HighlightStyle> for Highlight {
-    fn from(style: HighlightStyle) -> Self {
-        Self::Highlight(style)
-    }
+    Link,
+    Nostr,
 }
 
 #[derive(Default)]
@@ -37,65 +35,22 @@ pub struct RenderedText {
 }
 
 impl RenderedText {
-    pub fn new(
-        content: &str,
-        mentions: &[Mention],
-        persons: &Entity<PersonRegistry>,
-        markdown: bool,
-        cx: &App,
-    ) -> Self {
-        Self::render(content, mentions, markdown, |mention| {
-            format!("@{}", persons.read(cx).get(&mention.public_key, cx).name())
-        })
-    }
-
-    fn render(
-        content: &str,
-        mentions: &[Mention],
-        markdown: bool,
-        resolve_mention: impl Fn(&Mention) -> String,
-    ) -> Self {
+    pub fn new(content: &str, cx: &App) -> Self {
         let mut text = String::new();
         let mut highlights = Vec::new();
         let mut link_ranges = Vec::new();
         let mut link_urls = Vec::new();
 
-        render_text_mut(
+        render_plain_text_mut(
             content,
-            mentions,
             &mut text,
             &mut highlights,
             &mut link_ranges,
             &mut link_urls,
-            markdown,
-            resolve_mention,
+            cx,
         );
 
-        // Trim trailing whitespace and adjust highlight and link ranges.
-        let trimmed_len = text.trim_end().len();
-
-        // Retain highlights and link ranges that are within the trimmed text.
-        if trimmed_len < text.len() {
-            highlights.retain_mut(|(range, _)| {
-                range.end = range.end.min(trimmed_len);
-                range.start < range.end
-            });
-
-            let mut ix = 0;
-
-            while ix < link_ranges.len() {
-                let range = &mut link_ranges[ix];
-                range.end = range.end.min(trimmed_len);
-                if range.start < range.end {
-                    ix += 1;
-                } else {
-                    link_ranges.remove(ix);
-                    link_urls.remove(ix);
-                }
-            }
-
-            text.truncate(trimmed_len);
-        }
+        text.truncate(text.trim_end().len());
 
         RenderedText {
             text: SharedString::from(text),
@@ -106,74 +61,48 @@ 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;
-        let code_font = if cfg!(target_os = "macos") {
-            "Menlo"
-        } else if cfg!(target_os = "windows") {
-            "Consolas"
-        } else {
-            "monospace"
-        };
+        let link_color = cx.theme().text_accent;
 
         InteractiveText::new(
             id,
-            StyledText::new(self.text.clone())
-                .with_default_highlights(
-                    &window.text_style(),
-                    self.highlights.iter().map(|(range, highlight)| {
-                        (
-                            range.clone(),
-                            match highlight {
-                                Highlight::Code => HighlightStyle {
-                                    background_color: Some(code_background),
-                                    ..Default::default()
-                                },
-                                Highlight::InlineCode(link) => {
-                                    if *link {
-                                        HighlightStyle {
-                                            background_color: Some(code_background),
-                                            underline: Some(UnderlineStyle {
-                                                thickness: 1.0.into(),
-                                                ..Default::default()
-                                            }),
-                                            ..Default::default()
-                                        }
-                                    } else {
-                                        HighlightStyle {
-                                            background_color: Some(code_background),
-                                            ..Default::default()
-                                        }
-                                    }
-                                }
-                                Highlight::Mention => HighlightStyle {
-                                    color: Some(color),
-                                    underline: Some(UnderlineStyle {
-                                        thickness: 1.0.into(),
-                                        ..Default::default()
-                                    }),
-                                    ..Default::default()
-                                },
-                                Highlight::Highlight(highlight) => *highlight,
+            StyledText::new(self.text.clone()).with_default_highlights(
+                &window.text_style(),
+                self.highlights.iter().map(|(range, highlight)| {
+                    (
+                        range.clone(),
+                        match highlight {
+                            Highlight::Link => HighlightStyle {
+                                color: Some(link_color),
+                                underline: Some(UnderlineStyle::default()),
+                                ..Default::default()
                             },
-                        )
-                    }),
-                )
-                .with_font_family_overrides(self.highlights.iter().filter_map(
-                    |(range, highlight)| match highlight {
-                        Highlight::Code | Highlight::InlineCode(_) => {
-                            Some((range.clone(), code_font.into()))
-                        }
-                        _ => None,
-                    },
-                )),
+                            Highlight::Nostr => HighlightStyle {
+                                color: Some(link_color),
+                                ..Default::default()
+                            },
+                        },
+                    )
+                }),
+            ),
         )
         .on_click(self.link_ranges.clone(), {
             let link_urls = self.link_urls.clone();
-            move |ix, _, cx| {
-                let url = &link_urls[ix];
-                if WEB_URL.is_match(url) {
-                    cx.open_url(url);
+            move |ix, window, cx| {
+                let token = link_urls[ix].as_str();
+
+                if let Some(clean_url) = token.strip_prefix("nostr:") {
+                    if let Ok(public_key) = PublicKey::parse(clean_url) {
+                        window.dispatch_action(Box::new(OpenPublicKey(public_key)), cx);
+                    }
+                } else if is_url(token) {
+                    let url = if token.starts_with("http") {
+                        token.to_string()
+                    } else {
+                        format!("https://{token}")
+                    };
+                    cx.open_url(&url);
+                } else {
+                    log::warn!("Unrecognized token {token}")
                 }
             }
         })
@@ -181,308 +110,214 @@ impl RenderedText {
     }
 }
 
-#[allow(clippy::too_many_arguments)]
-fn render_text_mut(
-    block: &str,
-    mut mentions: &[Mention],
+fn render_plain_text_mut(
+    content: &str,
     text: &mut String,
     highlights: &mut Vec<(Range<usize>, Highlight)>,
     link_ranges: &mut Vec<Range<usize>>,
     link_urls: &mut Vec<String>,
-    markdown: bool,
-    resolve_mention: impl Fn(&Mention) -> String,
+    cx: &App,
 ) {
-    use pulldown_cmark::{Event, Options, Parser, Tag, TagEnd};
+    // Copy the content directly
+    text.push_str(content);
 
-    let mut bold_depth = 0;
-    let mut italic_depth = 0;
-    let mut strikethrough_depth = 0;
-    let mut link_url = None;
-    let mut list_stack = Vec::new();
-    let mut code_block = false;
+    // Collect all URLs
+    let mut url_matches: Vec<(Range<usize>, String)> = Vec::new();
 
-    // Only enable the extensions that make sense for chat messages. Notably this leaves
-    // out smart punctuation, tables, math and footnotes: they rewrite or swallow text.
-    let events: Box<dyn Iterator<Item = (Event<'_>, Range<usize>)> + '_> = if markdown {
-        Box::new(Parser::new_ext(block, Options::ENABLE_STRIKETHROUGH).into_offset_iter())
-    } else {
-        Box::new(std::iter::once((Event::Text(block.into()), 0..block.len())))
-    };
+    for link in URL_REGEX.find_iter(content) {
+        let range = link.start()..link.end();
+        let url = link.as_str().to_string();
 
-    for (event, source_range) in events {
-        let prev_len = text.len();
+        url_matches.push((range, url));
+    }
 
-        match event {
-            Event::Text(t) => {
-                if code_block {
-                    text.push_str(t.as_ref());
-                    highlights.push((prev_len..text.len(), Highlight::Code));
-                    continue;
-                }
+    // Collect all nostr entities with nostr: prefix
+    let mut nostr_matches: Vec<(Range<usize>, String)> = Vec::new();
 
-                let t_str = t.as_ref();
-                let mut last_processed = 0;
+    for nostr_match in NOSTR_URI_REGEX.find_iter(content) {
+        let range = nostr_match.start()..nostr_match.end();
+        let nostr_uri = nostr_match.as_str().to_string();
 
-                while let Some(mention) = mentions.first() {
-                    if mention.range.start >= source_range.end {
-                        break;
-                    }
+        // Check if this nostr URI overlaps with any already processed URL
+        if !url_matches
+            .iter()
+            .any(|(url_range, _)| url_range.start < range.end && range.start < url_range.end)
+        {
+            nostr_matches.push((range, nostr_uri));
+        }
+    }
 
-                    mentions = &mentions[1..];
-                    if mention.range.start < source_range.start
-                        || mention.range.end > source_range.end
-                    {
-                        continue;
-                    }
+    // Combine all matches for processing from end to start
+    let mut all_matches = Vec::new();
+    all_matches.extend(url_matches);
+    all_matches.extend(nostr_matches);
 
-                    let Some(token) = block.get(mention.range.clone()) else {
-                        continue;
-                    };
+    // Sort by position (end to start) to avoid changing positions when replacing text
+    all_matches.sort_by(|(range_a, _), (range_b, _)| range_b.start.cmp(&range_a.start));
 
-                    let Some(offset) = t_str[last_processed..].find(token) else {
-                        continue;
-                    };
+    // Process all matches
+    for (range, entity) in all_matches {
+        // Handle URL token
+        if is_url(&entity) {
+            highlights.push((range.clone(), Highlight::Link));
+            link_ranges.push(range);
+            link_urls.push(entity);
+            continue;
+        };
 
-                    let mention_start_in_text = last_processed + offset;
-                    let mention_end_in_text = mention_start_in_text + token.len();
-
-                    // Add text before this mention
-                    if mention_start_in_text > last_processed {
-                        let before_mention = &t_str[last_processed..mention_start_in_text];
-                        process_text_segment(
-                            before_mention,
-                            bold_depth,
-                            italic_depth,
-                            strikethrough_depth,
-                            link_url.clone(),
-                            text,
-                            highlights,
-                            link_ranges,
-                            link_urls,
-                        );
-                    }
-
-                    // Process the mention replacement
-                    let replacement_text = resolve_mention(mention);
-                    let replacement_start = text.len();
-                    text.push_str(&replacement_text);
-                    let replacement_end = text.len();
-
-                    highlights.push((replacement_start..replacement_end, Highlight::Mention));
-
-                    last_processed = mention_end_in_text;
-                }
-
-                // Add any remaining text after the last mention
-                if last_processed < t_str.len() {
-                    let remaining_text = &t_str[last_processed..];
-                    process_text_segment(
-                        remaining_text,
-                        bold_depth,
-                        italic_depth,
-                        strikethrough_depth,
-                        link_url.clone(),
+        if let Ok(nip21) = Nip21::parse(&entity) {
+            match nip21 {
+                Nip21::Pubkey(public_key) => {
+                    render_pubkey(
+                        public_key,
                         text,
+                        &range,
+                        highlights,
+                        link_ranges,
+                        link_urls,
+                        cx,
+                    );
+                }
+                Nip21::Profile(nip19_profile) => {
+                    render_pubkey(
+                        nip19_profile.public_key,
+                        text,
+                        &range,
+                        highlights,
+                        link_ranges,
+                        link_urls,
+                        cx,
+                    );
+                }
+                Nip21::EventId(event_id) => {
+                    render_bech32(
+                        event_id.to_bech32().unwrap(),
+                        text,
+                        &range,
+                        highlights,
+                        link_ranges,
+                        link_urls,
+                    );
+                }
+                Nip21::Event(nip19_event) => {
+                    render_bech32(
+                        nip19_event.to_bech32().unwrap(),
+                        text,
+                        &range,
+                        highlights,
+                        link_ranges,
+                        link_urls,
+                    );
+                }
+                Nip21::Coordinate(nip19_coordinate) => {
+                    render_bech32(
+                        nip19_coordinate.to_bech32().unwrap(),
+                        text,
+                        &range,
                         highlights,
                         link_ranges,
                         link_urls,
                     );
                 }
             }
-            Event::Code(t) => {
-                text.push_str(t.as_ref());
-                let is_link = link_url.is_some();
-
-                if let Some(link_url) = link_url.clone() {
-                    link_ranges.push(prev_len..text.len());
-                    link_urls.push(link_url);
-                }
-
-                highlights.push((prev_len..text.len(), Highlight::InlineCode(is_link)))
-            }
-            Event::Start(tag) => match tag {
-                Tag::Paragraph => new_paragraph(text, &mut list_stack),
-                Tag::Heading { .. } => {
-                    new_paragraph(text, &mut list_stack);
-                    bold_depth += 1;
-                }
-                Tag::CodeBlock(_kind) => {
-                    new_paragraph(text, &mut list_stack);
-                    code_block = true;
-                }
-                Tag::Emphasis => italic_depth += 1,
-                Tag::Strong => bold_depth += 1,
-                Tag::Strikethrough => strikethrough_depth += 1,
-                Tag::Link { dest_url, .. } => {
-                    link_url = WEB_URL.is_match(&dest_url).then(|| dest_url.to_string());
-                }
-                Tag::List(number) => {
-                    list_stack.push((number, false));
-                }
-                Tag::Item => {
-                    let len = list_stack.len();
-                    if let Some((list_number, has_content)) = list_stack.last_mut() {
-                        *has_content = false;
-                        if !text.is_empty() && !text.ends_with('\n') {
-                            text.push('\n');
-                        }
-                        for _ in 0..len - 1 {
-                            text.push_str("  ");
-                        }
-                        if let Some(number) = list_number {
-                            text.push_str(&format!("{}. ", number));
-                            *number += 1;
-                            *has_content = false;
-                        } else {
-                            text.push_str("- ");
-                        }
-                    }
-                }
-                _ => {}
-            },
-            Event::End(tag) => match tag {
-                TagEnd::CodeBlock => code_block = false,
-                TagEnd::Heading(_) => bold_depth -= 1,
-                TagEnd::Emphasis => italic_depth -= 1,
-                TagEnd::Strong => bold_depth -= 1,
-                TagEnd::Strikethrough => strikethrough_depth -= 1,
-                TagEnd::Link => link_url = None,
-                TagEnd::List(_) => drop(list_stack.pop()),
-                _ => {}
-            },
-            Event::Html(t) | Event::InlineHtml(t) => text.push_str(t.as_ref()),
-            Event::Rule => {
-                new_paragraph(text, &mut list_stack);
-                text.push_str("────────\n");
-            }
-            Event::HardBreak => text.push('\n'),
-            Event::SoftBreak => text.push('\n'),
-            _ => {}
         }
     }
 }
 
-#[allow(clippy::too_many_arguments)]
-fn process_text_segment(
-    segment: &str,
-    bold_depth: i32,
-    italic_depth: i32,
-    strikethrough_depth: i32,
-    link_url: Option<String>,
+/// Check if a string is a URL
+fn is_url(s: &str) -> bool {
+    URL_REGEX.is_match(s)
+}
+
+/// Format a bech32 entity with ellipsis and last 4 characters
+fn format_shortened_entity(entity: &str) -> String {
+    let prefix_end = entity.find('1').unwrap_or(0);
+
+    if prefix_end > 0 && entity.len() > prefix_end + 5 {
+        let prefix = &entity[0..=prefix_end]; // Include the '1'
+        let suffix = &entity[entity.len() - 4..]; // Last 4 chars
+
+        format!("{prefix}...{suffix}")
+    } else {
+        entity.to_string()
+    }
+}
+
+fn render_pubkey(
+    public_key: PublicKey,
     text: &mut String,
+    range: &Range<usize>,
+    highlights: &mut Vec<(Range<usize>, Highlight)>,
+    link_ranges: &mut Vec<Range<usize>>,
+    link_urls: &mut Vec<String>,
+    cx: &App,
+) {
+    let persons = PersonRegistry::global(cx);
+    let profile = persons.read(cx).get(&public_key, cx);
+    let display_name = format!("@{}", profile.name());
+
+    text.replace_range(range.clone(), &display_name);
+
+    let new_length = display_name.len();
+    let length_diff = new_length as isize - (range.end - range.start) as isize;
+    let new_range = range.start..(range.start + new_length);
+
+    highlights.push((new_range.clone(), Highlight::Nostr));
+    link_ranges.push(new_range);
+    link_urls.push(format!("nostr:{}", profile.public_key().to_hex()));
+
+    if length_diff != 0 {
+        adjust_ranges(highlights, link_ranges, range.end, length_diff);
+    }
+}
+
+fn render_bech32(
+    bech32: String,
+    text: &mut String,
+    range: &Range<usize>,
     highlights: &mut Vec<(Range<usize>, Highlight)>,
     link_ranges: &mut Vec<Range<usize>>,
     link_urls: &mut Vec<String>,
 ) {
-    // Build the style for this segment
-    let mut style = HighlightStyle::default();
-    if bold_depth > 0 {
-        style.font_weight = Some(FontWeight::BOLD);
-    }
-    if italic_depth > 0 {
-        style.font_style = Some(FontStyle::Italic);
-    }
-    if strikethrough_depth > 0 {
-        style.strikethrough = Some(StrikethroughStyle {
-            thickness: 1.0.into(),
-            ..Default::default()
-        });
-    }
+    let njump_url = format!("https://njump.me/{bech32}");
+    let shortened_entity = format_shortened_entity(&bech32);
+    let display_text = format!("https://njump.me/{shortened_entity}");
 
-    // Ranges always refer to the rendered text, including replaced mentions.
-    let segment_start = text.len();
-    text.push_str(segment);
-    let text_end = text.len();
+    text.replace_range(range.clone(), &display_text);
 
-    if let Some(link_url) = link_url {
-        // Handle as a markdown link
-        link_ranges.push(segment_start..text_end);
-        link_urls.push(link_url);
-        style.underline = Some(UnderlineStyle {
-            thickness: 1.0.into(),
-            ..Default::default()
-        });
+    let new_length = display_text.len();
+    let length_diff = new_length as isize - (range.end - range.start) as isize;
+    let new_range = range.start..(range.start + new_length);
 
-        // Add highlight for the entire linked segment
-        if style != HighlightStyle::default() {
-            highlights.push((segment_start..text_end, Highlight::Highlight(style)));
-        }
-    } else {
-        // Handle link detection within the segment
-        let mut finder = linkify::LinkFinder::new();
-        finder.kinds(&[linkify::LinkKind::Url]);
-        let mut last_link_pos = 0;
+    highlights.push((new_range.clone(), Highlight::Link));
+    link_ranges.push(new_range);
+    link_urls.push(njump_url);
 
-        for link in finder
-            .links(segment)
-            .filter(|link| WEB_URL.is_match(link.as_str()))
-        {
-            let start = link.start();
-            let end = link.end();
-
-            // Add non-link text before this link
-            if start > last_link_pos {
-                let non_link_start = segment_start + last_link_pos;
-                let non_link_end = segment_start + start;
-
-                if style != HighlightStyle::default() {
-                    highlights.push((non_link_start..non_link_end, Highlight::Highlight(style)));
-                }
-            }
-
-            // Add the link
-            let range = (segment_start + start)..(segment_start + end);
-            link_ranges.push(range.clone());
-            link_urls.push(link.as_str().to_string());
-
-            // Apply link styling (underline + existing style)
-            let mut link_style = style;
-            link_style.underline = Some(UnderlineStyle {
-                thickness: 1.0.into(),
-                ..Default::default()
-            });
-
-            highlights.push((range, Highlight::Highlight(link_style)));
-
-            last_link_pos = end;
-        }
-
-        // Add any remaining text after the last link
-        if last_link_pos < segment.len() {
-            let remaining_start = segment_start + last_link_pos;
-            let remaining_end = segment_start + segment.len();
-
-            if style != HighlightStyle::default() {
-                highlights.push((remaining_start..remaining_end, Highlight::Highlight(style)));
-            }
-        }
+    if length_diff != 0 {
+        adjust_ranges(highlights, link_ranges, range.end, length_diff);
     }
 }
 
-fn new_paragraph(text: &mut String, list_stack: &mut [(Option<u64>, bool)]) {
-    let mut is_subsequent_paragraph_of_list = false;
-
-    if let Some((_, has_content)) = list_stack.last_mut() {
-        if *has_content {
-            is_subsequent_paragraph_of_list = true;
-        } else {
-            *has_content = true;
-            return;
+// Helper function to adjust ranges when text length changes
+fn adjust_ranges(
+    highlights: &mut [(Range<usize>, Highlight)],
+    link_ranges: &mut [Range<usize>],
+    position: usize,
+    length_diff: isize,
+) {
+    // Adjust highlight ranges
+    for (range, _) in highlights.iter_mut() {
+        if range.start > position {
+            range.start = (range.start as isize + length_diff) as usize;
+            range.end = (range.end as isize + length_diff) as usize;
         }
     }
 
-    if !text.is_empty() {
-        if !text.ends_with('\n') {
-            text.push('\n');
+    // Adjust link ranges
+    for range in link_ranges.iter_mut() {
+        if range.start > position {
+            range.start = (range.start as isize + length_diff) as usize;
+            range.end = (range.end as isize + length_diff) as usize;
         }
-        text.push('\n');
-    }
-
-    for _ in 0..list_stack.len().saturating_sub(1) {
-        text.push_str("  ");
-    }
-
-    if is_subsequent_paragraph_of_list {
-        text.push_str("  ");
     }
 }

crates/common/Cargo.toml

@@ -7,14 +7,16 @@ publish.workspace = true
 [dependencies]
 gpui.workspace = true
 nostr.workspace = true
-instant.workspace = true
 nostr-sdk.workspace = true
 
+anyhow.workspace = true
 itertools.workspace = true
 chrono.workspace = true
+smallvec.workspace = true
+smol.workspace = true
 futures.workspace = true
+reqwest.workspace = true
 log.workspace = true
 
 dirs = "5.0"
 qrcode = "0.14.1"
-regex = "1.10"

crates/common/src/debounced_delay.rs

@@ -1,5 +1,5 @@
 use std::marker::PhantomData;
-use instant::Duration;
+use std::time::Duration;
 
 use futures::channel::oneshot;
 use futures::FutureExt;

crates/common/src/display.rs

@@ -1,10 +1,11 @@
 use std::sync::Arc;
 
+use anyhow::{anyhow, Error};
 use chrono::{Local, TimeZone};
 use gpui::{Image, ImageFormat, SharedString};
 use nostr_sdk::prelude::*;
-use qrcode::QrCode;
 use qrcode::render::svg;
+use qrcode::QrCode;
 
 const NOW: &str = "now";
 const SECONDS_IN_MINUTE: i64 = 60;
@@ -12,12 +13,12 @@ const MINUTES_IN_HOUR: i64 = 60;
 const HOURS_IN_DAY: i64 = 24;
 const DAYS_IN_MONTH: i64 = 30;
 
-pub trait TimestampExt {
+pub trait RenderedTimestamp {
     fn to_human_time(&self) -> SharedString;
     fn to_ago(&self) -> SharedString;
 }
 
-impl TimestampExt for Timestamp {
+impl RenderedTimestamp for Timestamp {
     fn to_human_time(&self) -> SharedString {
         let input_time = match Local.timestamp_opt(self.as_secs() as i64, 0) {
             chrono::LocalResult::Single(time) => time,
@@ -60,11 +61,23 @@ impl TimestampExt for Timestamp {
     }
 }
 
-pub trait StringExt {
+pub trait TextUtils {
+    fn to_public_key(&self) -> Result<PublicKey, Error>;
     fn to_qr(&self) -> Option<Arc<Image>>;
 }
 
-impl<T: AsRef<str>> StringExt for T {
+impl<T: AsRef<str>> TextUtils for T {
+    fn to_public_key(&self) -> Result<PublicKey, Error> {
+        let s = self.as_ref();
+        if s.starts_with("nprofile1") {
+            Ok(Nip19Profile::from_bech32(s)?.public_key)
+        } else if s.starts_with("npub1") {
+            Ok(PublicKey::parse(s)?)
+        } else {
+            Err(anyhow!("Invalid public key"))
+        }
+    }
+
     fn to_qr(&self) -> Option<Arc<Image>> {
         let s = self.as_ref();
         let code = QrCode::new(s).unwrap();
@@ -81,3 +94,13 @@ impl<T: AsRef<str>> StringExt for T {
         )))
     }
 }
+
+pub fn shorten_pubkey(public_key: PublicKey, len: usize) -> String {
+    let Ok(pubkey) = public_key.to_bech32();
+
+    format!(
+        "{}:{}",
+        &pubkey[0..(len + 1)],
+        &pubkey[pubkey.len() - len..]
+    )
+}

crates/common/src/event.rs

@@ -3,12 +3,12 @@ use std::hash::{DefaultHasher, Hash, Hasher};
 use itertools::Itertools;
 use nostr_sdk::prelude::*;
 
-pub trait EventExt {
+pub trait EventUtils {
     fn uniq_id(&self) -> u64;
     fn extract_public_keys(&self) -> Vec<PublicKey>;
 }
 
-impl EventExt for Event {
+impl EventUtils for Event {
     fn uniq_id(&self) -> u64 {
         let mut hasher = DefaultHasher::new();
         let mut pubkeys: Vec<PublicKey> = self.extract_public_keys();
@@ -18,14 +18,14 @@ 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()
     }
 }
 
-impl EventExt for UnsignedEvent {
+impl EventUtils for UnsignedEvent {
     fn uniq_id(&self) -> u64 {
         let mut hasher = DefaultHasher::new();
         let mut pubkeys: Vec<PublicKey> = vec![];
@@ -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,15 +1,11 @@
 pub use debounced_delay::*;
 pub use display::*;
 pub use event::*;
-pub use media_extractor::*;
-pub use parser::*;
+pub use nip96::*;
 pub use paths::*;
-pub use range::*;
 
 mod debounced_delay;
 mod display;
 mod event;
-mod media_extractor;
-mod parser;
+mod nip96;
 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/common/src/nip96.rs

@@ -0,0 +1,83 @@
+use anyhow::anyhow;
+use nostr::hashes::sha256::Hash as Sha256Hash;
+use nostr::hashes::Hash;
+use nostr::prelude::*;
+use nostr_sdk::prelude::*;
+use reqwest::{multipart, Client as ReqClient, Response};
+
+pub(crate) fn make_multipart_form(
+    file_data: Vec<u8>,
+    mime_type: Option<&str>,
+) -> Result<multipart::Form, anyhow::Error> {
+    let form_file_part = multipart::Part::bytes(file_data).file_name("filename");
+
+    // Set the part's MIME type, or leave it as is if mime_type is None
+
+    let part = match mime_type {
+        Some(mime) => form_file_part.mime_str(mime)?,
+        None => form_file_part,
+    };
+
+    Ok(multipart::Form::new().part("file", part))
+}
+
+pub(crate) async fn upload<T>(
+    signer: &T,
+    desc: &ServerConfig,
+    file_data: Vec<u8>,
+    mime_type: Option<&str>,
+) -> Result<Url, anyhow::Error>
+where
+    T: NostrSigner,
+{
+    let payload: Sha256Hash = Sha256Hash::hash(&file_data);
+    let data: HttpData = HttpData::new(desc.api_url.clone(), HttpMethod::POST).payload(payload);
+    let nip98_auth: String = data.to_authorization(signer).await?;
+
+    // Make form
+    let form: multipart::Form = make_multipart_form(file_data, mime_type)?;
+
+    // Make req client
+    let req_client = ReqClient::new();
+
+    // Send
+    let response: Response = req_client
+        .post(desc.api_url.clone())
+        .header("Authorization", nip98_auth)
+        .multipart(form)
+        .send()
+        .await?;
+
+    // Parse response
+    let json: Value = response.json().await?;
+    let upload_response = nip96::UploadResponse::from_json(json.to_string())?;
+
+    if upload_response.status == UploadResponseStatus::Error {
+        return Err(anyhow!(upload_response.message));
+    }
+
+    Ok(upload_response.download_url()?.to_owned())
+}
+
+pub async fn nip96_upload(
+    client: &Client,
+    server: &Url,
+    file: Vec<u8>,
+) -> Result<Url, anyhow::Error> {
+    let req_client = ReqClient::new();
+    let config_url = nip96::get_server_config_url(server)?;
+
+    // Get
+    let res = req_client.get(config_url.to_string()).send().await?;
+    let json: Value = res.json().await?;
+
+    let config = nip96::ServerConfig::from_json(json.to_string())?;
+    let signer = client
+        .signer()
+        .cloned()
+        .unwrap_or(Keys::generate().into_nostr_signer());
+
+    let url = upload(&signer, &config, file, None).await?;
+
+    Ok(url)
+}

crates/common/src/parser.rs

@@ -1,210 +0,0 @@
-use std::ops::Range;
-
-use nostr::prelude::*;
-
-const BECH32_SEPARATOR: u8 = b'1';
-const SCHEME_WITH_COLON: &str = "nostr:";
-
-/// Nostr parsed token with its range in the original text
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct Token {
-    /// The parsed NIP-21 URI
-    ///
-    /// <https://github.com/nostr-protocol/nips/blob/master/21.md>
-    pub value: Nip21,
-    /// The range of this token in the original text
-    pub range: Range<usize>,
-}
-
-#[derive(Debug, Clone, Copy)]
-struct Match {
-    start: usize,
-    end: usize,
-}
-
-/// Nostr parser
-#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct NostrParser;
-
-impl Default for NostrParser {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl NostrParser {
-    /// Create new parser
-    pub const fn new() -> Self {
-        Self
-    }
-
-    /// Parse text
-    pub fn parse<'a>(&self, text: &'a str) -> NostrParserIter<'a> {
-        NostrParserIter::new(text)
-    }
-}
-
-struct FindMatches<'a> {
-    bytes: &'a [u8],
-    pos: usize,
-}
-
-impl<'a> FindMatches<'a> {
-    fn new(text: &'a str) -> Self {
-        Self {
-            bytes: text.as_bytes(),
-            pos: 0,
-        }
-    }
-
-    fn try_parse_nostr_uri(&mut self) -> Option<Match> {
-        let start = self.pos;
-        let bytes = self.bytes;
-        let len = bytes.len();
-
-        // Check if we have "nostr:" prefix
-        if len - start < SCHEME_WITH_COLON.len() {
-            return None;
-        }
-
-        // Check for "nostr:" prefix (case-insensitive)
-        let scheme_prefix = &bytes[start..start + SCHEME_WITH_COLON.len()];
-        if !scheme_prefix.eq_ignore_ascii_case(SCHEME_WITH_COLON.as_bytes()) {
-            return None;
-        }
-
-        // Skip the scheme
-        let pos = start + SCHEME_WITH_COLON.len();
-
-        // Parse bech32 entity
-        let mut has_separator = false;
-        let mut end = pos;
-
-        while end < len {
-            let byte = bytes[end];
-
-            // Check for bech32 separator
-            if byte == BECH32_SEPARATOR && !has_separator {
-                has_separator = true;
-                end += 1;
-                continue;
-            }
-
-            // Check if character is valid for bech32
-            if !byte.is_ascii_alphanumeric() {
-                break;
-            }
-
-            end += 1;
-        }
-
-        // Must have at least one character after separator
-        if !has_separator || end <= pos + 1 {
-            return None;
-        }
-
-        // Update position
-        self.pos = end;
-
-        Some(Match { start, end })
-    }
-}
-
-impl Iterator for FindMatches<'_> {
-    type Item = Match;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        while self.pos < self.bytes.len() {
-            // Try to parse nostr URI
-            if let Some(mat) = self.try_parse_nostr_uri() {
-                return Some(mat);
-            }
-
-            // Skip one character if no match found
-            self.pos += 1;
-        }
-
-        None
-    }
-}
-
-enum HandleMatch {
-    Token(Token),
-    Recursion,
-}
-
-pub struct NostrParserIter<'a> {
-    /// The original text
-    text: &'a str,
-    /// Matches found
-    matches: FindMatches<'a>,
-    /// A pending match
-    pending_match: Option<Match>,
-    /// Last match end index
-    last_match_end: usize,
-}
-
-impl<'a> NostrParserIter<'a> {
-    fn new(text: &'a str) -> Self {
-        Self {
-            text,
-            matches: FindMatches::new(text),
-            pending_match: None,
-            last_match_end: 0,
-        }
-    }
-
-    fn handle_match(&mut self, mat: Match) -> HandleMatch {
-        // Update last match end
-        self.last_match_end = mat.end;
-
-        // Extract the matched string
-        let data: &str = &self.text[mat.start..mat.end];
-
-        // Parse NIP-21 URI
-        match Nip21::parse(data) {
-            Ok(uri) => HandleMatch::Token(Token {
-                value: uri,
-                range: mat.start..mat.end,
-            }),
-            // If the nostr URI parsing is invalid, skip it
-            Err(_) => HandleMatch::Recursion,
-        }
-    }
-}
-
-impl<'a> Iterator for NostrParserIter<'a> {
-    type Item = Token;
-
-    fn next(&mut self) -> Option<Self::Item> {
-        // Handle a pending match
-        if let Some(pending_match) = self.pending_match.take() {
-            return match self.handle_match(pending_match) {
-                HandleMatch::Token(token) => Some(token),
-                HandleMatch::Recursion => self.next(),
-            };
-        }
-
-        match self.matches.next() {
-            Some(mat) => {
-                // Skip any text before this match
-                if mat.start > self.last_match_end {
-                    // Update pending match
-                    // This will be handled at next iteration, in `handle_match` method.
-                    self.pending_match = Some(mat);
-
-                    // Skip the text before the match
-                    self.last_match_end = mat.start;
-                    return self.next();
-                }
-
-                // Handle match
-                match self.handle_match(mat) {
-                    HandleMatch::Token(token) => Some(token),
-                    HandleMatch::Recursion => self.next(),
-                }
-            }
-            None => None,
-        }
-    }
-}

crates/common/src/paths.rs

@@ -7,13 +7,6 @@ pub fn home_dir() -> &'static PathBuf {
     HOME_DIR.get_or_init(|| dirs::home_dir().expect("failed to determine home directory"))
 }
 
-/// Returns the path to the user's download directory.
-pub fn download_dir() -> &'static PathBuf {
-    static DOWNLOAD_DIR: OnceLock<PathBuf> = OnceLock::new();
-    DOWNLOAD_DIR
-        .get_or_init(|| dirs::download_dir().expect("failed to determine download directory"))
-}
-
 /// Returns the path to the configuration directory used by Coop.
 pub fn config_dir() -> &'static PathBuf {
     static CONFIG_DIR: OnceLock<PathBuf> = OnceLock::new();
@@ -63,3 +56,9 @@ pub fn support_dir() -> &'static PathBuf {
         config_dir().clone()
     })
 }
+
+/// Returns the path to the `nostr` file.
+pub fn nostr_file() -> &'static PathBuf {
+    static NOSTR_FILE: OnceLock<PathBuf> = OnceLock::new();
+    NOSTR_FILE.get_or_init(|| support_dir().join("nostr-db"))
+}

crates/common/src/range.rs

@@ -1,45 +0,0 @@
-use std::cmp::{self};
-use std::ops::{Range, RangeInclusive};
-
-pub trait RangeExt<T> {
-    fn sorted(&self) -> Self;
-    fn to_inclusive(&self) -> RangeInclusive<T>;
-    fn overlaps(&self, other: &Range<T>) -> bool;
-    fn contains_inclusive(&self, other: &Range<T>) -> bool;
-}
-
-impl<T: Ord + Clone> RangeExt<T> for Range<T> {
-    fn sorted(&self) -> Self {
-        cmp::min(&self.start, &self.end).clone()..cmp::max(&self.start, &self.end).clone()
-    }
-
-    fn to_inclusive(&self) -> RangeInclusive<T> {
-        self.start.clone()..=self.end.clone()
-    }
-
-    fn overlaps(&self, other: &Range<T>) -> bool {
-        self.start < other.end && other.start < self.end
-    }
-
-    fn contains_inclusive(&self, other: &Range<T>) -> bool {
-        self.start <= other.start && other.end <= self.end
-    }
-}
-
-impl<T: Ord + Clone> RangeExt<T> for RangeInclusive<T> {
-    fn sorted(&self) -> Self {
-        cmp::min(self.start(), self.end()).clone()..=cmp::max(self.start(), self.end()).clone()
-    }
-
-    fn to_inclusive(&self) -> RangeInclusive<T> {
-        self.clone()
-    }
-
-    fn overlaps(&self, other: &Range<T>) -> bool {
-        self.start() < &other.end && &other.start <= self.end()
-    }
-
-    fn contains_inclusive(&self, other: &Range<T>) -> bool {
-        self.start() <= &other.start && &other.end <= self.end()
-    }
-}

crates/coop/Cargo.toml

@@ -0,0 +1,63 @@
+[package]
+name = "coop"
+version.workspace = true
+edition.workspace = true
+publish.workspace = true
+
+[[bin]]
+name = "coop"
+path = "src/main.rs"
+
+[package.metadata.packager]
+name = "Coop"
+product-name = "Coop"
+description = "Chat Freely, Stay Private on Nostr"
+identifier = "su.reya.coop"
+category = "SocialNetworking"
+version = "0.3.0"
+out-dir = "../../dist"
+before-packaging-command = "cargo build --release"
+resources = ["Cargo.toml", "src"]
+icons = [
+    "resources/32x32.png",
+    "resources/128x128.png",
+    "resources/128x128@2x.png",
+    "resources/icon.icns",
+    "resources/icon.ico",
+]
+
+[dependencies]
+assets = { path = "../assets" }
+ui = { path = "../ui" }
+titlebar = { path = "../titlebar" }
+dock = { path = "../dock" }
+theme = { path = "../theme" }
+common = { path = "../common" }
+state = { path = "../state" }
+device = { path = "../device" }
+chat = { path = "../chat" }
+chat_ui = { path = "../chat_ui" }
+settings = { path = "../settings" }
+auto_update = { path = "../auto_update" }
+person = { path = "../person" }
+relay_auth = { path = "../relay_auth" }
+
+gpui.workspace = true
+gpui_tokio.workspace = true
+reqwest_client.workspace = true
+
+nostr-connect.workspace = true
+nostr-sdk.workspace = true
+
+anyhow.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+itertools.workspace = true
+log.workspace = true
+smallvec.workspace = true
+smol.workspace = true
+futures.workspace = true
+oneshot.workspace = true
+
+indexset = "0.12.3"
+tracing-subscriber = { version = "0.3.18", features = ["fmt", "env-filter"] }

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

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

crates/coop/resources/snap/snapcraft.yaml.in

@@ -1,7 +1,3 @@
-# Snaps built by snapcraft without Snap Store credentials are unsigned and
-# cannot be installed without bypassing signature checks. Use:
-#   sudo snap install --dangerous ./coop_<version>_<arch>.snap
-# For signed installs (`snap install coop`), publish via the Snap Store.
 name: coop
 title: Coop
 base: core24

crates/coop/src/dialogs/mod.rs

@@ -0,0 +1 @@
+pub mod screening;

crates/coop/src/dialogs/profile.rs

@@ -0,0 +1,266 @@
+use std::time::Duration;
+
+use anyhow::Error;
+use common::shorten_pubkey;
+use gpui::prelude::FluentBuilder;
+use gpui::{
+    div, relative, rems, App, AppContext, ClipboardItem, Context, Entity, IntoElement,
+    ParentElement, Render, SharedString, Styled, Task, Window,
+};
+use nostr_sdk::prelude::*;
+use person::PersonRegistry;
+use smallvec::{smallvec, SmallVec};
+use state::{NostrAddress, NostrRegistry};
+use theme::ActiveTheme;
+use ui::avatar::Avatar;
+use ui::button::{Button, ButtonVariants};
+use ui::{h_flex, v_flex, Icon, IconName, Sizable, StyledExt};
+
+pub fn init(public_key: PublicKey, window: &mut Window, cx: &mut App) -> Entity<ProfileDialog> {
+    cx.new(|cx| ProfileDialog::new(public_key, window, cx))
+}
+
+#[derive(Debug)]
+pub struct ProfileDialog {
+    public_key: PublicKey,
+
+    /// Follow status
+    followed: bool,
+
+    /// Verification status
+    verified: bool,
+
+    /// Copy status
+    copied: bool,
+
+    /// Async operations
+    _tasks: SmallVec<[Task<()>; 1]>,
+}
+
+impl ProfileDialog {
+    pub fn new(public_key: PublicKey, window: &mut Window, cx: &mut Context<Self>) -> Self {
+        let http_client = cx.http_client();
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+
+        let persons = PersonRegistry::global(cx);
+        let profile = persons.read(cx).get(&public_key, cx);
+
+        let mut tasks = smallvec![];
+
+        // Check if the user is following
+        let check_follow: Task<Result<bool, Error>> = cx.background_spawn(async move {
+            let signer = client.signer().await?;
+            let public_key = signer.get_public_key().await?;
+            let contact_list = client.database().contacts_public_keys(public_key).await?;
+
+            Ok(contact_list.contains(&public_key))
+        });
+
+        // Verify the NIP05 address if available
+        let verify_nip05 = profile.metadata().nip05.and_then(|address| {
+            Nip05Address::parse(&address).ok().map(|addr| {
+                cx.background_spawn(async move { addr.verify(&http_client, &public_key).await })
+            })
+        });
+
+        tasks.push(
+            // Load user profile data
+            cx.spawn_in(window, async move |this, cx| {
+                let followed = check_follow.await.unwrap_or(false);
+
+                // Update the followed status
+                this.update(cx, |this, cx| {
+                    this.followed = followed;
+                    cx.notify();
+                })
+                .ok();
+
+                // Update the NIP05 verification status if user has NIP05 address
+                if let Some(task) = verify_nip05 {
+                    if let Ok(verified) = task.await {
+                        this.update(cx, |this, cx| {
+                            this.verified = verified;
+                            cx.notify();
+                        })
+                        .ok();
+                    }
+                }
+            }),
+        );
+
+        Self {
+            public_key,
+            followed: false,
+            verified: false,
+            copied: false,
+            _tasks: tasks,
+        }
+    }
+
+    fn address(&self, cx: &Context<Self>) -> Option<String> {
+        let persons = PersonRegistry::global(cx);
+        let profile = persons.read(cx).get(&self.public_key, cx);
+
+        profile.metadata().nip05
+    }
+
+    fn copy_pubkey(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let persons = PersonRegistry::global(cx);
+        let profile = persons.read(cx).get(&self.public_key, cx);
+
+        let Ok(bech32) = profile.public_key().to_bech32();
+        let item = ClipboardItem::new_string(bech32);
+        cx.write_to_clipboard(item);
+
+        self.set_copied(true, window, cx);
+    }
+
+    fn set_copied(&mut self, status: bool, window: &mut Window, cx: &mut Context<Self>) {
+        self.copied = status;
+        cx.notify();
+
+        if status {
+            self._tasks.push(
+                // Reset the copied state after a delay
+                cx.spawn_in(window, async move |this, cx| {
+                    cx.background_executor().timer(Duration::from_secs(2)).await;
+                    cx.update(|window, cx| {
+                        this.update(cx, |this, cx| {
+                            this.set_copied(false, window, cx);
+                        })
+                        .ok();
+                    })
+                    .ok();
+                }),
+            );
+        }
+    }
+}
+
+impl Render for ProfileDialog {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let persons = PersonRegistry::global(cx);
+        let profile = persons.read(cx).get(&self.public_key, cx);
+        let bech32 = shorten_pubkey(profile.public_key(), 16);
+        let shared_bech32 = SharedString::from(bech32);
+
+        v_flex()
+            .gap_4()
+            .text_sm()
+            .child(
+                v_flex()
+                    .gap_3()
+                    .items_center()
+                    .justify_center()
+                    .text_center()
+                    .child(Avatar::new(profile.avatar()).size(rems(4.)))
+                    .child(
+                        v_flex()
+                            .child(
+                                div()
+                                    .font_semibold()
+                                    .line_height(relative(1.25))
+                                    .child(profile.name()),
+                            )
+                            .when_some(self.address(cx), |this, address| {
+                                this.child(
+                                    h_flex()
+                                        .justify_center()
+                                        .gap_1()
+                                        .text_xs()
+                                        .text_color(cx.theme().text_muted)
+                                        .child(address)
+                                        .when(self.verified, |this| {
+                                            this.child(
+                                                div()
+                                                    .relative()
+                                                    .text_color(cx.theme().text_accent)
+                                                    .child(
+                                                        Icon::new(IconName::CheckCircle)
+                                                            .small()
+                                                            .block(),
+                                                    ),
+                                            )
+                                        }),
+                                )
+                            }),
+                    )
+                    .when(!self.followed, |this| {
+                        this.child(
+                            div()
+                                .flex_none()
+                                .w_32()
+                                .p_1()
+                                .rounded_full()
+                                .bg(cx.theme().elevated_surface_background)
+                                .text_xs()
+                                .font_semibold()
+                                .child(SharedString::from("Unknown contact")),
+                        )
+                    }),
+            )
+            .child(
+                v_flex()
+                    .gap_1()
+                    .text_sm()
+                    .child(
+                        div()
+                            .text_color(cx.theme().text_muted)
+                            .child(SharedString::from("Bio:")),
+                    )
+                    .child(
+                        div()
+                            .p_2()
+                            .min_h_16()
+                            .rounded(cx.theme().radius)
+                            .bg(cx.theme().elevated_surface_background)
+                            .child(
+                                profile
+                                    .metadata()
+                                    .about
+                                    .map(SharedString::from)
+                                    .unwrap_or(SharedString::from("No bio.")),
+                            ),
+                    ),
+            )
+            .child(div().my_1().h_px().w_full().bg(cx.theme().border))
+            .child(
+                v_flex()
+                    .gap_1()
+                    .child(
+                        div()
+                            .text_xs()
+                            .text_color(cx.theme().text_placeholder)
+                            .font_semibold()
+                            .child(SharedString::from("Public Key:")),
+                    )
+                    .child(
+                        h_flex()
+                            .gap_2()
+                            .w_full()
+                            .h_12()
+                            .justify_center()
+                            .bg(cx.theme().surface_background)
+                            .rounded(cx.theme().radius)
+                            .text_sm()
+                            .child(shared_bech32)
+                            .child(
+                                Button::new("copy")
+                                    .icon({
+                                        if self.copied {
+                                            IconName::CheckCircle
+                                        } else {
+                                            IconName::Copy
+                                        }
+                                    })
+                                    .xsmall()
+                                    .ghost()
+                                    .on_click(cx.listener(move |this, _e, window, cx| {
+                                        this.copy_pubkey(window, cx);
+                                    })),
+                            ),
+                    ),
+            )
+    }
+}

crates/coop/src/main.rs

@@ -0,0 +1,139 @@
+use std::sync::{Arc, Mutex};
+
+use assets::Assets;
+use gpui::{
+    actions, point, px, size, App, AppContext, Application, Bounds, KeyBinding, Menu, MenuItem,
+    SharedString, Size, TitlebarOptions, WindowBackgroundAppearance, WindowBounds,
+    WindowDecorations, WindowKind, WindowOptions,
+};
+use state::{APP_ID, CLIENT_NAME};
+use ui::Root;
+
+mod dialogs;
+mod panels;
+mod sidebar;
+mod workspace;
+
+actions!(coop, [Quit]);
+
+fn main() {
+    // Initialize logging
+    tracing_subscriber::fmt::init();
+
+    // Initialize the Application
+    let app = Application::new()
+        .with_assets(Assets)
+        .with_http_client(Arc::new(reqwest_client::ReqwestClient::new()));
+
+    // Run application
+    app.run(move |cx| {
+        // Load embedded fonts in assets/fonts
+        load_embedded_fonts(cx);
+
+        // Register the `quit` function
+        cx.on_action(quit);
+
+        // Register the `quit` function with CMD+Q (macOS)
+        #[cfg(target_os = "macos")]
+        cx.bind_keys([KeyBinding::new("cmd-q", Quit, None)]);
+
+        // Register the `quit` function with Super+Q (others)
+        #[cfg(not(target_os = "macos"))]
+        cx.bind_keys([KeyBinding::new("super-q", Quit, None)]);
+
+        // Set menu items
+        cx.set_menus(vec![Menu {
+            name: "Coop".into(),
+            items: vec![MenuItem::action("Quit", Quit)],
+        }]);
+
+        // Set up the window bounds
+        let bounds = Bounds::centered(None, size(px(920.0), px(700.0)), cx);
+
+        // Set up the window options
+        let opts = WindowOptions {
+            window_background: WindowBackgroundAppearance::Opaque,
+            window_decorations: Some(WindowDecorations::Client),
+            window_bounds: Some(WindowBounds::Windowed(bounds)),
+            window_min_size: Some(Size::new(px(640.), px(480.))),
+            kind: WindowKind::Normal,
+            app_id: Some(APP_ID.to_owned()),
+            titlebar: Some(TitlebarOptions {
+                title: Some(SharedString::new_static(CLIENT_NAME)),
+                traffic_light_position: Some(point(px(9.0), px(9.0))),
+                appears_transparent: true,
+            }),
+            ..Default::default()
+        };
+
+        // Open a window with default options
+        cx.open_window(opts, |window, cx| {
+            // Bring the app to the foreground
+            cx.activate(true);
+
+            cx.new(|cx| {
+                // Initialize components
+                ui::init(cx);
+
+                // Initialize theme registry
+                theme::init(cx);
+
+                // Initialize settings
+                settings::init(cx);
+
+                // Initialize the nostr client
+                state::init(window, cx);
+
+                // Initialize relay auth registry
+                relay_auth::init(window, cx);
+
+                // Initialize person registry
+                person::init(cx);
+
+                // Initialize device signer
+                //
+                // NIP-4e: https://github.com/nostr-protocol/nips/blob/per-device-keys/4e.md
+                device::init(window, cx);
+
+                // Initialize app registry
+                chat::init(window, cx);
+
+                // Initialize auto update
+                auto_update::init(cx);
+
+                // Root Entity
+                Root::new(workspace::init(window, cx).into(), window, cx)
+            })
+        })
+        .expect("Failed to open window. Please restart the application.");
+    });
+}
+
+fn load_embedded_fonts(cx: &App) {
+    let asset_source = cx.asset_source();
+    let font_paths = asset_source.list("fonts").unwrap();
+    let embedded_fonts = Mutex::new(vec![]);
+    let executor = cx.background_executor();
+
+    cx.foreground_executor().block_on(executor.scoped(|scope| {
+        for font_path in &font_paths {
+            if !font_path.ends_with(".ttf") {
+                continue;
+            }
+
+            scope.spawn(async {
+                let font_bytes = asset_source.load(font_path.as_str()).unwrap().unwrap();
+                embedded_fonts.lock().unwrap().push(font_bytes);
+            });
+        }
+    }));
+
+    cx.text_system()
+        .add_fonts(embedded_fonts.into_inner().unwrap())
+        .unwrap();
+}
+
+fn quit(_ev: &Quit, cx: &mut App) {
+    log::info!("Gracefully quitting the application . . .");
+    cx.quit();
+}

crates/coop/src/panels/connect.rs

@@ -0,0 +1,127 @@
+use std::sync::Arc;
+
+use common::TextUtils;
+use dock::panel::{Panel, PanelEvent};
+use dock::ClosePanel;
+use gpui::prelude::FluentBuilder;
+use gpui::{
+    div, img, px, relative, AnyElement, App, AppContext, Context, Entity, EventEmitter,
+    FocusHandle, Focusable, Image, IntoElement, ParentElement, Render, SharedString, Styled, Task,
+    Window,
+};
+use smallvec::{smallvec, SmallVec};
+use state::NostrRegistry;
+use theme::ActiveTheme;
+use ui::notification::Notification;
+use ui::{v_flex, StyledExt, WindowExtension};
+
+pub fn init(window: &mut Window, cx: &mut App) -> Entity<ConnectPanel> {
+    cx.new(|cx| ConnectPanel::new(window, cx))
+}
+
+pub struct ConnectPanel {
+    name: SharedString,
+    focus_handle: FocusHandle,
+
+    /// QR Code
+    qr_code: Option<Arc<Image>>,
+
+    /// Background tasks
+    _tasks: SmallVec<[Task<()>; 1]>,
+}
+
+impl ConnectPanel {
+    fn new(window: &mut Window, cx: &mut Context<Self>) -> Self {
+        let nostr = NostrRegistry::global(cx);
+        let weak_state = nostr.downgrade();
+        let (signer, uri) = nostr.read(cx).client_connect(None);
+
+        // Generate a QR code for quick connection
+        let qr_code = uri.to_string().to_qr();
+
+        let mut tasks = smallvec![];
+
+        tasks.push(
+            // Wait for nostr connect
+            cx.spawn_in(window, async move |_this, cx| {
+                let result = signer.bunker_uri().await;
+
+                weak_state
+                    .update_in(cx, |this, window, cx| {
+                        match result {
+                            Ok(uri) => {
+                                this.persist_bunker(uri, cx);
+                                this.set_signer(signer, true, cx);
+                                // Close the current panel after setting the signer
+                                window.dispatch_action(Box::new(ClosePanel), cx);
+                            }
+                            Err(e) => {
+                                window.push_notification(Notification::error(e.to_string()), cx);
+                            }
+                        };
+                    })
+                    .ok();
+            }),
+        );
+
+        Self {
+            name: "Nostr Connect".into(),
+            focus_handle: cx.focus_handle(),
+            qr_code,
+            _tasks: tasks,
+        }
+    }
+}
+
+impl Panel for ConnectPanel {
+    fn panel_id(&self) -> SharedString {
+        self.name.clone()
+    }
+
+    fn title(&self, _cx: &App) -> AnyElement {
+        self.name.clone().into_any_element()
+    }
+}
+
+impl EventEmitter<PanelEvent> for ConnectPanel {}
+
+impl Focusable for ConnectPanel {
+    fn focus_handle(&self, _: &App) -> gpui::FocusHandle {
+        self.focus_handle.clone()
+    }
+}
+
+impl Render for ConnectPanel {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        v_flex()
+            .size_full()
+            .items_center()
+            .justify_center()
+            .p_2()
+            .gap_10()
+            .child(
+                v_flex()
+                    .justify_center()
+                    .items_center()
+                    .text_center()
+                    .child(
+                        div()
+                            .font_semibold()
+                            .line_height(relative(1.25))
+                            .child(SharedString::from("Continue with Nostr Connect")),
+                    )
+                    .child(div().text_sm().text_color(cx.theme().text_muted).child(
+                        SharedString::from("Use Nostr Connect apps to scan the code"),
+                    )),
+            )
+            .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),
+                )
+            })
+    }
+}

crates/coop/src/panels/greeter.rs

@@ -0,0 +1,294 @@
+use dock::dock::DockPlacement;
+use dock::panel::{Panel, PanelEvent};
+use gpui::prelude::FluentBuilder;
+use gpui::{
+    div, relative, svg, AnyElement, App, AppContext, Context, Entity, EventEmitter, FocusHandle,
+    Focusable, IntoElement, ParentElement, Render, SharedString, Styled, Window,
+};
+use state::{NostrRegistry, RelayState};
+use theme::ActiveTheme;
+use ui::button::{Button, ButtonVariants};
+use ui::{h_flex, v_flex, Icon, IconName, Sizable, StyledExt};
+
+use crate::panels::{connect, import, messaging_relays, profile, relay_list};
+use crate::workspace::Workspace;
+
+pub fn init(window: &mut Window, cx: &mut App) -> Entity<GreeterPanel> {
+    cx.new(|cx| GreeterPanel::new(window, cx))
+}
+
+pub struct GreeterPanel {
+    name: SharedString,
+    focus_handle: FocusHandle,
+}
+
+impl GreeterPanel {
+    fn new(_window: &mut Window, cx: &mut App) -> Self {
+        Self {
+            name: "Onboarding".into(),
+            focus_handle: cx.focus_handle(),
+        }
+    }
+
+    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) = signer.public_key() {
+            cx.spawn_in(window, async move |_this, cx| {
+                cx.update(|window, cx| {
+                    Workspace::add_panel(
+                        profile::init(public_key, window, cx),
+                        DockPlacement::Center,
+                        window,
+                        cx,
+                    );
+                })
+                .ok();
+            })
+            .detach();
+        }
+    }
+}
+
+impl Panel for GreeterPanel {
+    fn panel_id(&self) -> SharedString {
+        self.name.clone()
+    }
+
+    fn title(&self, cx: &App) -> AnyElement {
+        div()
+            .child(
+                svg()
+                    .path("brand/coop.svg")
+                    .size_4()
+                    .text_color(cx.theme().text_muted),
+            )
+            .into_any_element()
+    }
+}
+
+impl EventEmitter<PanelEvent> for GreeterPanel {}
+
+impl Focusable for GreeterPanel {
+    fn focus_handle(&self, _: &App) -> gpui::FocusHandle {
+        self.focus_handle.clone()
+    }
+}
+
+impl Render for GreeterPanel {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        const TITLE: &str = "Welcome to Coop!";
+        const DESCRIPTION: &str = "Chat Freely, Stay Private on Nostr.";
+
+        let nostr = NostrRegistry::global(cx);
+        let nip65_state = nostr.read(cx).nip65_state();
+        let nip17_state = nostr.read(cx).nip17_state();
+        let signer = nostr.read(cx).signer();
+        let owned = signer.owned();
+
+        let required_actions = nip65_state.read(cx) == &RelayState::NotConfigured
+            || nip17_state.read(cx) == &RelayState::NotConfigured;
+
+        h_flex()
+            .size_full()
+            .items_center()
+            .justify_center()
+            .p_2()
+            .child(
+                v_flex()
+                    .h_full()
+                    .w_112()
+                    .gap_6()
+                    .items_center()
+                    .justify_center()
+                    .child(
+                        h_flex()
+                            .mb_4()
+                            .gap_2()
+                            .w_full()
+                            .child(
+                                svg()
+                                    .path("brand/coop.svg")
+                                    .size_12()
+                                    .text_color(cx.theme().icon_muted),
+                            )
+                            .child(
+                                v_flex()
+                                    .child(
+                                        div()
+                                            .font_semibold()
+                                            .line_height(relative(1.25))
+                                            .child(SharedString::from(TITLE)),
+                                    )
+                                    .child(
+                                        div()
+                                            .text_sm()
+                                            .text_color(cx.theme().text_muted)
+                                            .line_height(relative(1.25))
+                                            .child(SharedString::from(DESCRIPTION)),
+                                    ),
+                            ),
+                    )
+                    .when(required_actions, |this| {
+                        this.child(
+                            v_flex()
+                                .gap_2()
+                                .w_full()
+                                .child(
+                                    h_flex()
+                                        .gap_1()
+                                        .w_full()
+                                        .text_sm()
+                                        .font_semibold()
+                                        .text_color(cx.theme().text_muted)
+                                        .child(SharedString::from("Required Actions"))
+                                        .child(div().flex_1().h_px().bg(cx.theme().border)),
+                                )
+                                .child(
+                                    v_flex()
+                                        .gap_2()
+                                        .w_full()
+                                        .when(nip65_state.read(cx).not_configured(), |this| {
+                                            this.child(
+                                                Button::new("relaylist")
+                                                    .icon(Icon::new(IconName::Relay))
+                                                    .label("Set up relay list")
+                                                    .ghost()
+                                                    .small()
+                                                    .justify_start()
+                                                    .on_click(move |_ev, window, cx| {
+                                                        Workspace::add_panel(
+                                                            relay_list::init(window, cx),
+                                                            DockPlacement::Center,
+                                                            window,
+                                                            cx,
+                                                        );
+                                                    }),
+                                            )
+                                        })
+                                        .when(nip17_state.read(cx).not_configured(), |this| {
+                                            this.child(
+                                                Button::new("import")
+                                                    .icon(Icon::new(IconName::Relay))
+                                                    .label("Set up messaging relays")
+                                                    .ghost()
+                                                    .small()
+                                                    .justify_start()
+                                                    .on_click(move |_ev, window, cx| {
+                                                        Workspace::add_panel(
+                                                            messaging_relays::init(window, cx),
+                                                            DockPlacement::Center,
+                                                            window,
+                                                            cx,
+                                                        );
+                                                    }),
+                                            )
+                                        }),
+                                ),
+                        )
+                    })
+                    .when(!owned, |this| {
+                        this.child(
+                            v_flex()
+                                .gap_2()
+                                .w_full()
+                                .child(
+                                    h_flex()
+                                        .gap_1()
+                                        .w_full()
+                                        .text_sm()
+                                        .font_semibold()
+                                        .text_color(cx.theme().text_muted)
+                                        .child(SharedString::from("Use your own identity"))
+                                        .child(div().flex_1().h_px().bg(cx.theme().border)),
+                                )
+                                .child(
+                                    v_flex()
+                                        .gap_2()
+                                        .w_full()
+                                        .child(
+                                            Button::new("connect")
+                                                .icon(Icon::new(IconName::Door))
+                                                .label("Connect account via Nostr Connect")
+                                                .ghost()
+                                                .small()
+                                                .justify_start()
+                                                .on_click(move |_ev, window, cx| {
+                                                    Workspace::add_panel(
+                                                        connect::init(window, cx),
+                                                        DockPlacement::Center,
+                                                        window,
+                                                        cx,
+                                                    );
+                                                }),
+                                        )
+                                        .child(
+                                            Button::new("import")
+                                                .icon(Icon::new(IconName::Usb))
+                                                .label("Import a secret key or bunker")
+                                                .ghost()
+                                                .small()
+                                                .justify_start()
+                                                .on_click(move |_ev, window, cx| {
+                                                    Workspace::add_panel(
+                                                        import::init(window, cx),
+                                                        DockPlacement::Center,
+                                                        window,
+                                                        cx,
+                                                    );
+                                                }),
+                                        ),
+                                ),
+                        )
+                    })
+                    .child(
+                        v_flex()
+                            .gap_2()
+                            .w_full()
+                            .child(
+                                h_flex()
+                                    .gap_1()
+                                    .w_full()
+                                    .text_sm()
+                                    .font_semibold()
+                                    .text_color(cx.theme().text_muted)
+                                    .child(SharedString::from("Get Started"))
+                                    .child(div().flex_1().h_px().bg(cx.theme().border)),
+                            )
+                            .child(
+                                v_flex()
+                                    .gap_2()
+                                    .w_full()
+                                    .child(
+                                        Button::new("backup")
+                                            .icon(Icon::new(IconName::Shield))
+                                            .label("Backup account")
+                                            .ghost()
+                                            .small()
+                                            .justify_start(),
+                                    )
+                                    .child(
+                                        Button::new("profile")
+                                            .icon(Icon::new(IconName::Profile))
+                                            .label("Update profile")
+                                            .ghost()
+                                            .small()
+                                            .justify_start()
+                                            .on_click(cx.listener(move |this, _ev, window, cx| {
+                                                this.add_profile_panel(window, cx)
+                                            })),
+                                    )
+                                    .child(
+                                        Button::new("invite")
+                                            .icon(Icon::new(IconName::Invite))
+                                            .label("Invite friends")
+                                            .ghost()
+                                            .small()
+                                            .justify_start(),
+                                    ),
+                            ),
+                    ),
+            )
+    }
+}

crates/coop/src/panels/import.rs

@@ -0,0 +1,371 @@
+use std::time::Duration;
+
+use anyhow::anyhow;
+use dock::panel::{Panel, PanelEvent};
+use dock::ClosePanel;
+use gpui::prelude::FluentBuilder;
+use gpui::{
+    div, relative, AnyElement, App, AppContext, Context, Entity, EventEmitter, FocusHandle,
+    Focusable, IntoElement, ParentElement, Render, SharedString, Styled, Subscription, Window,
+};
+use nostr_connect::prelude::*;
+use smallvec::{smallvec, SmallVec};
+use state::{CoopAuthUrlHandler, NostrRegistry};
+use theme::ActiveTheme;
+use ui::button::{Button, ButtonVariants};
+use ui::input::{InputEvent, InputState, TextInput};
+use ui::notification::Notification;
+use ui::{v_flex, Disableable, StyledExt, WindowExtension};
+
+pub fn init(window: &mut Window, cx: &mut App) -> Entity<ImportPanel> {
+    cx.new(|cx| ImportPanel::new(window, cx))
+}
+
+#[derive(Debug)]
+pub struct ImportPanel {
+    name: SharedString,
+    focus_handle: FocusHandle,
+
+    /// Secret key input
+    key_input: Entity<InputState>,
+
+    /// Password input (if required)
+    pass_input: Entity<InputState>,
+
+    /// Error message
+    error: Entity<Option<SharedString>>,
+
+    /// Countdown timer for nostr connect
+    countdown: Entity<Option<u64>>,
+
+    /// Whether the user is currently logging in
+    logging_in: bool,
+
+    /// Event subscriptions
+    _subscriptions: SmallVec<[Subscription; 1]>,
+}
+
+impl ImportPanel {
+    fn new(window: &mut Window, cx: &mut Context<Self>) -> Self {
+        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 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);
+                };
+            }),
+        );
+
+        Self {
+            key_input,
+            pass_input,
+            error,
+            countdown,
+            name: "Import".into(),
+            focus_handle: cx.focus_handle(),
+            logging_in: false,
+            _subscriptions: subscriptions,
+        }
+    }
+
+    fn login(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        if self.logging_in {
+            return;
+        };
+        // Prevent duplicate login requests
+        self.set_logging_in(true, cx);
+
+        let value = self.key_input.read(cx).value();
+        let password = self.pass_input.read(cx).value();
+
+        if value.starts_with("bunker://") {
+            self.login_with_bunker(&value, window, cx);
+            return;
+        }
+
+        if value.starts_with("ncryptsec1") {
+            self.login_with_password(&value, &password, window, cx);
+            return;
+        }
+
+        if let Ok(secret) = SecretKey::parse(&value) {
+            let keys = Keys::new(secret);
+            let nostr = NostrRegistry::global(cx);
+            // Update the signer
+            nostr.update(cx, |this, cx| {
+                this.set_signer(keys, true, cx);
+            });
+            // Close the current panel after setting the signer
+            window.dispatch_action(Box::new(ClosePanel), cx);
+        } else {
+            self.set_error("Invalid", cx);
+        }
+    }
+
+    fn login_with_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 weak_state = nostr.downgrade();
+
+        let app_keys = nostr.read(cx).app_keys();
+        let timeout = Duration::from_secs(30);
+        let mut signer = NostrConnect::new(uri, app_keys.clone(), timeout, None).unwrap();
+
+        // Handle auth url with the default browser
+        signer.auth_url_handler(CoopAuthUrlHandler);
+
+        // Start countdown
+        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);
+                    })
+                    .ok();
+                } else {
+                    this.update(cx, |this, cx| {
+                        this.set_countdown(Some(i), cx);
+                    })
+                    .ok();
+                }
+                cx.background_executor().timer(Duration::from_secs(1)).await;
+            }
+        })
+        .detach();
+
+        // Handle connection
+        cx.spawn_in(window, async move |_this, cx| {
+            let result = signer.bunker_uri().await;
+
+            weak_state
+                .update_in(cx, |this, window, cx| {
+                    match result {
+                        Ok(uri) => {
+                            this.persist_bunker(uri, cx);
+                            this.set_signer(signer, true, cx);
+                            // Close the current panel after setting the signer
+                            window.dispatch_action(Box::new(ClosePanel), cx);
+                        }
+                        Err(e) => {
+                            window.push_notification(Notification::error(e.to_string()), cx);
+                        }
+                    };
+                })
+                .ok();
+        })
+        .detach();
+    }
+
+    pub fn login_with_password(
+        &mut self,
+        content: &str,
+        pwd: &str,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        if pwd.is_empty() {
+            self.set_error("Password is required", cx);
+            return;
+        }
+
+        let Ok(enc) = EncryptedSecretKey::from_bech32(content) else {
+            self.set_error("Secret Key is invalid", cx);
+            return;
+        };
+
+        let password = pwd.to_owned();
+
+        // Decrypt in the background to ensure it doesn't block the UI
+        let task = cx.background_spawn(async move {
+            if let Ok(content) = enc.decrypt(&password) {
+                Ok(Keys::new(content))
+            } else {
+                Err(anyhow!("Invalid password"))
+            }
+        });
+
+        cx.spawn_in(window, async move |this, cx| {
+            let result = task.await;
+
+            this.update_in(cx, |this, window, cx| {
+                match result {
+                    Ok(keys) => {
+                        let nostr = NostrRegistry::global(cx);
+                        // Update the signer
+                        nostr.update(cx, |this, cx| {
+                            this.set_signer(keys, true, cx);
+                        });
+                        // Close the current panel after setting the signer
+                        window.dispatch_action(Box::new(ClosePanel), cx);
+                    }
+                    Err(e) => {
+                        this.set_error(e.to_string(), cx);
+                    }
+                };
+            })
+            .ok();
+        })
+        .detach();
+    }
+
+    fn set_error<S>(&mut self, message: S, cx: &mut Context<Self>)
+    where
+        S: Into<SharedString>,
+    {
+        // Reset the log in state
+        self.set_logging_in(false, cx);
+
+        // Reset the countdown
+        self.set_countdown(None, cx);
+
+        // Update error message
+        self.error.update(cx, |this, cx| {
+            *this = Some(message.into());
+            cx.notify();
+        });
+
+        // Clear the error message after 3 secs
+        cx.spawn(async move |this, cx| {
+            cx.background_executor().timer(Duration::from_secs(3)).await;
+
+            this.update(cx, |this, cx| {
+                this.error.update(cx, |this, cx| {
+                    *this = None;
+                    cx.notify();
+                });
+            })
+            .ok();
+        })
+        .detach();
+    }
+
+    fn set_logging_in(&mut self, status: bool, cx: &mut Context<Self>) {
+        self.logging_in = 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 Panel for ImportPanel {
+    fn panel_id(&self) -> SharedString {
+        self.name.clone()
+    }
+
+    fn title(&self, _cx: &App) -> AnyElement {
+        self.name.clone().into_any_element()
+    }
+}
+
+impl EventEmitter<PanelEvent> for ImportPanel {}
+
+impl Focusable for ImportPanel {
+    fn focus_handle(&self, _: &App) -> gpui::FocusHandle {
+        self.focus_handle.clone()
+    }
+}
+
+impl Render for ImportPanel {
+    fn render(&mut self, _window: &mut gpui::Window, cx: &mut Context<Self>) -> impl IntoElement {
+        const SECRET_WARN: &str = "* Coop doesn't store your secret key. \
+            It will be cleared when you close the app. \
+            To persist your identity, please connect via Nostr Connect.";
+
+        v_flex()
+            .size_full()
+            .items_center()
+            .justify_center()
+            .p_2()
+            .gap_10()
+            .child(
+                div()
+                    .text_center()
+                    .font_semibold()
+                    .line_height(relative(1.25))
+                    .child(SharedString::from("Import a Secret Key or Bunker")),
+            )
+            .child(
+                v_flex()
+                    .w_112()
+                    .gap_2()
+                    .text_sm()
+                    .child(
+                        v_flex()
+                            .gap_1()
+                            .text_sm()
+                            .text_color(cx.theme().text_muted)
+                            .child("nsec or bunker://")
+                            .child(TextInput::new(&self.key_input)),
+                    )
+                    .when(
+                        self.key_input.read(cx).value().starts_with("ncryptsec1"),
+                        |this| {
+                            this.child(
+                                v_flex()
+                                    .gap_1()
+                                    .text_sm()
+                                    .text_color(cx.theme().text_muted)
+                                    .child("Password:")
+                                    .child(TextInput::new(&self.pass_input)),
+                            )
+                        },
+                    )
+                    .child(
+                        Button::new("login")
+                            .label("Continue")
+                            .primary()
+                            .loading(self.logging_in)
+                            .disabled(self.logging_in)
+                            .on_click(cx.listener(move |this, _, window, cx| {
+                                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()
+                                .text_xs()
+                                .text_center()
+                                .text_color(cx.theme().danger_foreground)
+                                .child(error.clone()),
+                        )
+                    })
+                    .child(
+                        div()
+                            .mt_2()
+                            .italic()
+                            .text_xs()
+                            .text_color(cx.theme().text_muted)
+                            .child(SharedString::from(SECRET_WARN)),
+                    ),
+            )
+    }
+}

crates/coop/src/panels/messaging_relays.rs

@@ -1,24 +1,21 @@
 use std::collections::HashSet;
+use std::time::Duration;
 
-use anyhow::{Error, anyhow};
+use anyhow::{anyhow, Context as AnyhowContext, Error};
+use dock::panel::{Panel, PanelEvent};
 use gpui::prelude::FluentBuilder;
 use gpui::{
-    AnyElement, App, AppContext, Context, Entity, EventEmitter, FocusHandle, Focusable,
-    InteractiveElement, IntoElement, ParentElement, Render, SharedString, Styled, Subscription,
-    Task, TextAlign, Window, div, rems,
+    div, relative, uniform_list, AnyElement, App, AppContext, Context, Entity, EventEmitter,
+    FocusHandle, Focusable, InteractiveElement, IntoElement, ParentElement, Render, SharedString,
+    Styled, Subscription, Task, TextAlign, UniformList, Window,
 };
-use instant::Duration;
 use nostr_sdk::prelude::*;
-use smallvec::{SmallVec, smallvec};
+use smallvec::{smallvec, SmallVec};
 use state::NostrRegistry;
 use theme::ActiveTheme;
 use ui::button::{Button, ButtonVariants};
-use ui::dock::{Panel, PanelEvent};
-use ui::input::{Input, InputEvent, InputState};
-use ui::{Disableable, IconName, Sizable, StyledExt, WindowExtension, divider, h_flex, v_flex};
-
-const MSG: &str = "Messaging Relays are relays that hosted all your messages. \
-                   Other users will find your relays and send messages to it.";
+use ui::input::{InputEvent, InputState, TextInput};
+use ui::{divider, h_flex, v_flex, IconName, Sizable, StyledExt};
 
 pub fn init(window: &mut Window, cx: &mut App) -> Entity<MessagingRelayPanel> {
     cx.new(|cx| MessagingRelayPanel::new(window, cx))
@@ -32,26 +29,44 @@ pub struct MessagingRelayPanel {
     /// Relay URL input
     input: Entity<InputState>,
 
-    /// Whether the panel is updating
-    updating: bool,
-
     /// Error message
     error: Option<SharedString>,
 
-    /// All relays
+    // All relays
     relays: HashSet<RelayUrl>,
 
-    /// Event subscriptions
+    // Event subscriptions
     _subscriptions: SmallVec<[Subscription; 1]>,
 
-    /// Background tasks
-    tasks: Vec<Task<Result<(), Error>>>,
+    // Background tasks
+    _tasks: SmallVec<[Task<()>; 1]>,
 }
 
 impl MessagingRelayPanel {
     pub fn new(window: &mut Window, cx: &mut Context<Self>) -> Self {
         let input = cx.new(|cx| InputState::new(window, cx).placeholder("wss://example.com"));
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+
         let mut subscriptions = smallvec![];
+        let mut tasks = smallvec![];
+
+        tasks.push(
+            // Load user's relays in the local database
+            cx.spawn_in(window, async move |this, cx| {
+                let result = cx
+                    .background_spawn(async move { Self::load(&client).await })
+                    .await;
+
+                if let Ok(relays) = result {
+                    this.update(cx, |this, cx| {
+                        this.relays.extend(relays);
+                        cx.notify();
+                    })
+                    .ok();
+                }
+            }),
+        );
 
         subscriptions.push(
             // Subscribe to user's input events
@@ -62,55 +77,31 @@ impl MessagingRelayPanel {
             }),
         );
 
-        // Run at the end of current cycle
-        cx.defer_in(window, |this, window, cx| {
-            this.load(window, cx);
-        });
-
         Self {
             name: "Update Messaging Relays".into(),
             focus_handle: cx.focus_handle(),
             input,
-            updating: false,
             relays: HashSet::new(),
             error: None,
             _subscriptions: subscriptions,
-            tasks: vec![],
+            _tasks: tasks,
         }
     }
 
-    fn load(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let nostr = NostrRegistry::global(cx);
-        let client = nostr.read(cx).client();
+    async fn load(client: &Client) -> Result<Vec<RelayUrl>, Error> {
+        let signer = client.signer().context("Signer not found")?;
+        let public_key = signer.get_public_key().await?;
 
-        let Some(public_key) = nostr.read(cx).current_user() else {
-            return;
-        };
+        let filter = Filter::new()
+            .kind(Kind::InboxRelays)
+            .author(public_key)
+            .limit(1);
 
-        let task: Task<Result<Vec<RelayUrl>, Error>> = cx.background_spawn(async move {
-            let filter = Filter::new()
-                .kind(Kind::InboxRelays)
-                .author(public_key)
-                .limit(1);
-
-            if let Some(event) = client.database().query(filter).await?.into_iter().next() {
-                Ok(nip17::extract_relay_list(&event).collect())
-            } else {
-                Err(anyhow!("Not found."))
-            }
-        });
-
-        self.tasks.push(cx.spawn_in(window, async move |this, cx| {
-            let relays = task.await?;
-
-            // Update state
-            this.update(cx, |this, cx| {
-                this.relays.extend(relays);
-                cx.notify();
-            })?;
-
-            Ok(())
-        }));
+        if let Some(event) = client.database().query(filter).await?.first_owned() {
+            Ok(nip17::extract_owned_relay_list(event).collect())
+        } else {
+            Err(anyhow!("Not found."))
+        }
     }
 
     fn add(&mut self, window: &mut Window, cx: &mut Context<Self>) {
@@ -122,7 +113,7 @@ impl MessagingRelayPanel {
         }
 
         if let Ok(url) = RelayUrl::parse(&value) {
-            if self.relays.insert(url) {
+            if !self.relays.insert(url) {
                 self.input.update(cx, |this, cx| {
                     this.set_value("", window, cx);
                 });
@@ -145,22 +136,16 @@ impl MessagingRelayPanel {
         self.error = Some(error.into());
         cx.notify();
 
-        self.tasks.push(cx.spawn_in(window, async move |this, cx| {
+        cx.spawn_in(window, async move |this, cx| {
             cx.background_executor().timer(Duration::from_secs(2)).await;
-
             // Clear the error message after a delay
             this.update(cx, |this, cx| {
                 this.error = None;
                 cx.notify();
-            })?;
-
-            Ok(())
-        }));
-    }
-
-    fn set_updating(&mut self, updating: bool, cx: &mut Context<Self>) {
-        self.updating = updating;
-        cx.notify();
+            })
+            .ok();
+        })
+        .detach();
     }
 
     pub fn set_relays(&mut self, window: &mut Window, cx: &mut Context<Self>) {
@@ -171,24 +156,17 @@ impl MessagingRelayPanel {
 
         let nostr = NostrRegistry::global(cx);
         let client = nostr.read(cx).client();
-        let signer = nostr.read(cx).signer();
 
-        // Construct event tags
         let tags: Vec<Tag> = self
             .relays
             .iter()
-            .map(|relay| Tag::from(Nip17Tag::Relay(relay.to_owned())))
+            .map(|relay| Tag::relay(relay.clone()))
             .collect();
 
-        // Set updating state
-        self.set_updating(true, cx);
-
         let task: Task<Result<(), Error>> = cx.background_spawn(async move {
             // Construct nip17 event builder
-            let event = EventBuilder::new(Kind::InboxRelays, "")
-                .tags(tags)
-                .finalize_async(&signer)
-                .await?;
+            let builder = EventBuilder::new(Kind::InboxRelays, "").tags(tags);
+            let event = client.sign_event_builder(builder).await?;
 
             // Set messaging relays
             client.send_event(&event).to_nip65().await?;
@@ -196,67 +174,81 @@ impl MessagingRelayPanel {
             Ok(())
         });
 
-        self.tasks.push(cx.spawn_in(window, async move |this, cx| {
+        cx.spawn_in(window, async move |this, cx| {
             match task.await {
                 Ok(_) => {
-                    this.update_in(cx, |this, window, cx| {
-                        this.set_updating(false, cx);
-                        this.load(window, cx);
-
-                        window.push_notification("Update successful", cx);
-                    })?;
+                    // TODO
                 }
                 Err(e) => {
                     this.update_in(cx, |this, window, cx| {
-                        this.set_updating(false, cx);
                         this.set_error(e.to_string(), window, cx);
-                    })?;
+                    })
+                    .ok();
                 }
             };
-
-            Ok(())
-        }));
+        })
+        .detach();
     }
 
-    fn render_list_items(&mut self, cx: &mut Context<Self>) -> Vec<impl IntoElement> {
-        let mut items = Vec::new();
+    fn render_list(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> UniformList {
+        let relays = self.relays.clone();
+        let total = relays.len();
 
-        for url in self.relays.iter() {
-            items.push(
-                h_flex()
-                    .id(SharedString::from(url.to_string()))
-                    .group("")
-                    .flex_1()
-                    .w_full()
-                    .h_8()
-                    .px_2()
-                    .justify_between()
-                    .rounded(cx.theme().radius)
-                    .bg(cx.theme().secondary_background)
-                    .text_color(cx.theme().secondary_foreground)
-                    .child(div().text_sm().child(SharedString::from(url.to_string())))
-                    .child(
-                        Button::new("remove_{ix}")
-                            .icon(IconName::Close)
-                            .xsmall()
-                            .ghost()
-                            .invisible()
-                            .group_hover("", |this| this.visible())
-                            .on_click({
-                                let url = url.to_owned();
-                                cx.listener(move |this, _ev, _window, cx| {
-                                    this.remove(&url, cx);
-                                })
-                            }),
-                    ),
-            )
-        }
+        uniform_list(
+            "relays",
+            total,
+            cx.processor(move |_v, range, _window, cx| {
+                let mut items = Vec::new();
 
-        items
+                for ix in range {
+                    let Some(url) = relays.iter().nth(ix) else {
+                        continue;
+                    };
+
+                    items.push(
+                        div()
+                            .id(SharedString::from(url.to_string()))
+                            .group("")
+                            .w_full()
+                            .h_9()
+                            .py_0p5()
+                            .child(
+                                h_flex()
+                                    .px_2()
+                                    .flex()
+                                    .justify_between()
+                                    .rounded(cx.theme().radius)
+                                    .bg(cx.theme().elevated_surface_background)
+                                    .child(
+                                        div().text_sm().child(SharedString::from(url.to_string())),
+                                    )
+                                    .child(
+                                        Button::new("remove_{ix}")
+                                            .icon(IconName::Close)
+                                            .xsmall()
+                                            .ghost()
+                                            .invisible()
+                                            .group_hover("", |this| this.visible())
+                                            .on_click({
+                                                let url = url.to_owned();
+                                                cx.listener(move |this, _ev, _window, cx| {
+                                                    this.remove(&url, cx);
+                                                })
+                                            }),
+                                    ),
+                            ),
+                    )
+                }
+
+                items
+            }),
+        )
+        .h_full()
     }
 
     fn render_empty(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         h_flex()
+            .mt_2()
             .h_20()
             .justify_center()
             .border_2()
@@ -290,43 +282,36 @@ impl Focusable for MessagingRelayPanel {
 impl Render for MessagingRelayPanel {
     fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         v_flex()
-            .p_3()
-            .gap_3()
-            .w_full()
+            .size_full()
+            .items_center()
+            .justify_center()
+            .p_2()
+            .gap_10()
             .child(
                 div()
-                    .text_xs()
-                    .text_color(cx.theme().text_muted)
-                    .child(SharedString::from(MSG)),
+                    .text_center()
+                    .font_semibold()
+                    .line_height(relative(1.25))
+                    .child(SharedString::from("Update Messaging Relays")),
             )
-            .child(divider(cx))
             .child(
                 v_flex()
+                    .w_112()
                     .gap_2()
-                    .flex_1()
-                    .w_full()
                     .text_sm()
-                    .child(
-                        div()
-                            .text_xs()
-                            .font_semibold()
-                            .text_color(cx.theme().text_muted)
-                            .child(SharedString::from("Relays:")),
-                    )
                     .child(
                         v_flex()
-                            .gap_1()
+                            .gap_1p5()
                             .child(
                                 h_flex()
                                     .gap_1()
                                     .w_full()
-                                    .child(Input::new(&self.input).small().cleanable(true))
+                                    .child(TextInput::new(&self.input).small())
                                     .child(
                                         Button::new("add")
                                             .icon(IconName::Plus)
-                                            .tooltip("Add relay")
+                                            .label("Add")
                                             .ghost()
-                                            .size(rems(2.))
                                             .on_click(cx.listener(move |this, _, window, cx| {
                                                 this.add(window, cx);
                                             })),
@@ -337,32 +322,23 @@ impl Render for MessagingRelayPanel {
                                     div()
                                         .italic()
                                         .text_xs()
-                                        .text_color(cx.theme().text_danger)
+                                        .text_color(cx.theme().danger_foreground)
                                         .child(error.clone()),
                                 )
                             }),
                     )
                     .map(|this| {
-                        if self.relays.is_empty() {
-                            this.child(self.render_empty(window, cx))
+                        if !self.relays.is_empty() {
+                            this.child(self.render_list(window, cx))
                         } else {
-                            this.child(
-                                v_flex()
-                                    .gap_1()
-                                    .flex_1()
-                                    .w_full()
-                                    .children(self.render_list_items(cx)),
-                            )
+                            this.child(self.render_empty(window, cx))
                         }
                     })
+                    .child(divider(cx))
                     .child(
                         Button::new("submit")
-                            .icon(IconName::CheckCircle)
                             .label("Update")
                             .primary()
-                            .font_semibold()
-                            .loading(self.updating)
-                            .disabled(self.updating)
                             .on_click(cx.listener(move |this, _ev, window, cx| {
                                 this.set_relays(window, cx);
                             })),

crates/coop/src/panels/mod.rs

@@ -1,6 +1,6 @@
-pub mod backup;
-pub mod contact_list;
+pub mod connect;
 pub mod greeter;
+pub mod import;
 pub mod messaging_relays;
 pub mod profile;
 pub mod relay_list;

crates/coop/src/panels/profile.rs

@@ -1,23 +1,26 @@
 use std::str::FromStr;
+use std::time::Duration;
 
-use anyhow::Error;
+use anyhow::anyhow;
+use common::{nip96_upload, shorten_pubkey};
+use dock::panel::{Panel, PanelEvent};
 use gpui::{
-    AnyElement, App, AppContext, ClipboardItem, Context, Entity, EventEmitter, FocusHandle,
-    Focusable, IntoElement, ParentElement, PathPromptOptions, Render, SharedString, Styled, Task,
-    Window, div, retain_all,
+    div, rems, AnyElement, App, AppContext, ClipboardItem, Context, Entity, EventEmitter,
+    FocusHandle, Focusable, IntoElement, ParentElement, PathPromptOptions, Render, SharedString,
+    Styled, Window,
 };
-use instant::Duration;
+use gpui_tokio::Tokio;
 use nostr_sdk::prelude::*;
-use person::{Person, PersonRegistry, shorten_pubkey};
+use person::{Person, PersonRegistry};
 use settings::AppSettings;
-use state::{NostrRegistry, upload};
+use smol::fs;
+use state::NostrRegistry;
 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};
+use ui::{divider, h_flex, v_flex, Disableable, IconName, Sizable, StyledExt, WindowExtension};
 
 pub fn init(public_key: PublicKey, window: &mut Window, cx: &mut App) -> Entity<ProfilePanel> {
     cx.new(|cx| ProfilePanel::new(public_key, window, cx))
@@ -48,12 +51,6 @@ pub struct ProfilePanel {
 
     /// Copied states
     copied: bool,
-
-    /// Updating state
-    updating: bool,
-
-    /// Tasks
-    tasks: Vec<Task<Result<(), Error>>>,
 }
 
 impl ProfilePanel {
@@ -61,18 +58,20 @@ impl ProfilePanel {
         let name_input = cx.new(|cx| InputState::new(window, cx).placeholder("Alice"));
         let website_input = cx.new(|cx| InputState::new(window, cx).placeholder("alice.me"));
         let avatar_input = cx.new(|cx| InputState::new(window, cx).placeholder("alice.me/a.jpg"));
-
         // 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.")
         });
 
         // Get user's profile and update inputs
         cx.defer_in(window, move |this, window, cx| {
-            this.set_profile(window, cx);
+            let persons = PersonRegistry::global(cx);
+            let profile = persons.read(cx).get(&public_key, cx);
+            // Set all input's values with current profile
+            this.set_profile(profile, window, cx);
         });
 
         Self {
@@ -85,15 +84,11 @@ impl ProfilePanel {
             website_input,
             uploading: false,
             copied: false,
-            updating: false,
-            tasks: vec![],
         }
     }
 
-    fn set_profile(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let persons = PersonRegistry::global(cx);
-        let profile = persons.read(cx).get(&self.public_key, cx);
-        let metadata = profile.metadata();
+    fn set_profile(&mut self, person: Person, window: &mut Window, cx: &mut Context<Self>) {
+        let metadata = person.metadata();
 
         self.avatar_input.update(cx, |this, cx| {
             if let Some(avatar) = metadata.picture.as_ref() {
@@ -132,7 +127,7 @@ impl ProfilePanel {
         cx.notify();
 
         if status {
-            self.tasks.push(cx.spawn_in(window, async move |this, cx| {
+            cx.spawn_in(window, async move |this, cx| {
                 cx.background_executor().timer(Duration::from_secs(2)).await;
 
                 // Reset the copied state after a delay
@@ -143,90 +138,79 @@ impl ProfilePanel {
                     .ok();
                 })
                 .ok();
-
-                Ok(())
-            }));
+            })
+            .detach();
         }
     }
 
-    fn set_uploading(&mut self, status: bool, cx: &mut Context<Self>) {
+    fn uploading(&mut self, status: bool, cx: &mut Context<Self>) {
         self.uploading = status;
         cx.notify();
     }
 
     fn upload(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        // Get the user's configured blossom server
-        let server = AppSettings::get_file_server(cx);
+        self.uploading(true, cx);
 
-        // Ask user for file upload
-        let path = cx.prompt_for_paths(PathPromptOptions {
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+
+        // Get the user's configured NIP96 server
+        let nip96_server = AppSettings::get_file_server(cx);
+
+        // Open native file dialog
+        let paths = cx.prompt_for_paths(PathPromptOptions {
             files: true,
             directories: false,
             multiple: false,
             prompt: None,
         });
 
-        self.tasks.push(cx.spawn_in(window, async move |this, cx| {
-            // Selecting no file means the prompt was cancelled
-            let Some(path) = path.await??.and_then(|mut paths| paths.pop()) else {
-                return Ok(());
-            };
+        let task = Tokio::spawn(cx, async move {
+            match paths.await {
+                Ok(Ok(Some(mut paths))) => {
+                    if let Some(path) = paths.pop() {
+                        let file = fs::read(path).await?;
+                        let url = nip96_upload(&client, &nip96_server, file).await?;
 
-            this.update(cx, |this, cx| {
-                this.set_uploading(true, cx);
-            })?;
+                        Ok(url)
+                    } else {
+                        Err(anyhow!("Path not found"))
+                    }
+                }
+                _ => Err(anyhow!("Error")),
+            }
+        });
 
-            // Upload via blossom client
-            match upload(server, path, cx).await {
-                Ok(url) => {
-                    this.update_in(cx, |this, window, cx| {
+        cx.spawn_in(window, async move |this, cx| {
+            let result = task.await;
+
+            this.update_in(cx, |this, window, cx| {
+                match result {
+                    Ok(Ok(url)) => {
                         this.avatar_input.update(cx, |this, cx| {
                             this.set_value(url.to_string(), window, cx);
                         });
-                        this.set_uploading(false, cx);
-                    })?;
-                }
-                Err(e) => {
-                    this.update_in(cx, |this, window, cx| {
-                        this.set_uploading(false, cx);
-                        window.push_notification(
-                            Notification::error(e.to_string()).autohide(false),
-                            cx,
-                        );
-                    })?;
-                }
-            }
-
-            Ok(())
-        }));
-    }
-
-    fn set_updating(&mut self, updating: bool, cx: &mut Context<Self>) {
-        self.updating = updating;
-        cx.notify();
-    }
-
-    /// Set the metadata for the current user
-    fn publish(&self, metadata: &Metadata, cx: &App) -> Task<Result<(), Error>> {
-        let nostr = NostrRegistry::global(cx);
-        let client = nostr.read(cx).client();
-        let signer = nostr.read(cx).signer();
-        let metadata = metadata.clone();
-
-        cx.background_spawn(async move {
-            // Build and sign the metadata event
-            let event = metadata.finalize_async(&signer).await?;
-
-            // Send event to user's relays
-            client.send_event(&event).await?;
-
-            Ok(())
+                    }
+                    Ok(Err(e)) => {
+                        window.push_notification(e.to_string(), cx);
+                    }
+                    Err(e) => {
+                        log::warn!("Failed to upload avatar: {e}");
+                    }
+                };
+                this.uploading(false, cx);
+            })
+            .expect("Entity has been released");
         })
+        .detach();
     }
 
-    fn update(&mut self, window: &mut Window, cx: &mut Context<Self>) {
-        let persons = PersonRegistry::global(cx);
+    fn set_metadata(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let nostr = NostrRegistry::global(cx);
         let public_key = self.public_key;
+
+        // Get the old metadata
+        let persons = PersonRegistry::global(cx);
         let old_metadata = persons.read(cx).get(&public_key, cx).metadata();
 
         // Extract all new metadata fields
@@ -252,39 +236,34 @@ impl ProfilePanel {
         }
 
         // Set the metadata
-        let task = self.publish(&new_metadata, cx);
+        let task = nostr.read(cx).set_metadata(&new_metadata, cx);
 
-        // Set the updating state
-        self.set_updating(true, cx);
-
-        self.tasks.push(cx.spawn_in(window, async move |this, cx| {
+        cx.spawn_in(window, async move |this, cx| {
             match task.await {
-                Ok(_) => {
-                    this.update_in(cx, |this, window, cx| {
-                        // Update the registry
+                Ok(()) => {
+                    cx.update(|window, cx| {
                         persons.update(cx, |this, cx| {
                             this.insert(Person::new(public_key, new_metadata), cx);
                         });
 
-                        // Update current panel
-                        this.set_updating(false, cx);
-                        this.set_profile(window, cx);
+                        this.update(cx, |this, cx| {
+                            this.set_metadata(window, cx);
+                        })
+                        .ok();
 
                         window.push_notification("Profile updated successfully", cx);
-                    })?;
+                    })
+                    .ok();
                 }
                 Err(e) => {
                     cx.update(|window, cx| {
-                        window.push_notification(
-                            Notification::error(e.to_string()).autohide(false),
-                            cx,
-                        );
-                    })?;
+                        window.push_notification(Notification::error(e.to_string()), cx);
+                    })
+                    .ok();
                 }
             };
-
-            Ok(())
-        }));
+        })
+        .detach();
     }
 }
 
@@ -308,126 +287,123 @@ impl Focusable for ProfilePanel {
 
 impl Render for ProfilePanel {
     fn render(&mut self, _window: &mut gpui::Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let avatar_input = self.avatar_input.read(cx).value();
+        let shorten_pkey = SharedString::from(shorten_pubkey(self.public_key, 8));
 
         // Get the avatar
+        let avatar_input = self.avatar_input.read(cx).value();
         let avatar = if avatar_input.is_empty() {
             "brand/avatar.png"
         } else {
             avatar_input.as_str()
         };
 
-        // Get the public key as short string
-        let shorten_pkey = SharedString::from(shorten_pubkey(self.public_key, 8));
-
         v_flex()
-            .image_cache(retain_all("profile-panel"))
-            .p_3()
-            .gap_3()
-            .w_full()
+            .size_full()
+            .items_center()
+            .justify_center()
+            .p_2()
             .child(
                 v_flex()
-                    .h_40()
-                    .w_full()
-                    .items_center()
-                    .justify_center()
-                    .gap_4()
-                    .child(Avatar::new(avatar).large())
+                    .gap_2()
+                    .w_112()
                     .child(
-                        Button::new("upload")
-                            .icon(IconName::PlusCircle)
-                            .label("Add an avatar")
-                            .xsmall()
-                            .ghost()
-                            .rounded()
+                        v_flex()
+                            .h_40()
+                            .w_full()
+                            .items_center()
+                            .justify_center()
+                            .gap_4()
+                            .child(Avatar::new(avatar).size(rems(4.25)))
+                            .child(
+                                Button::new("upload")
+                                    .icon(IconName::PlusCircle)
+                                    .label("Add an avatar")
+                                    .xsmall()
+                                    .ghost()
+                                    .rounded()
+                                    .disabled(self.uploading)
+                                    .loading(self.uploading)
+                                    .on_click(cx.listener(move |this, _, window, cx| {
+                                        this.upload(window, cx);
+                                    })),
+                            ),
+                    )
+                    .child(
+                        v_flex()
+                            .gap_1()
+                            .text_sm()
+                            .text_color(cx.theme().text_muted)
+                            .child(SharedString::from("What should people call you?"))
+                            .child(TextInput::new(&self.name_input).small()),
+                    )
+                    .child(
+                        v_flex()
+                            .gap_1()
+                            .text_sm()
+                            .text_color(cx.theme().text_muted)
+                            .child(SharedString::from("A short introduction about you:"))
+                            .child(TextInput::new(&self.bio_input).small()),
+                    )
+                    .child(
+                        v_flex()
+                            .gap_1()
+                            .text_sm()
+                            .text_color(cx.theme().text_muted)
+                            .child(SharedString::from("Website:"))
+                            .child(TextInput::new(&self.website_input).small()),
+                    )
+                    .child(divider(cx))
+                    .child(
+                        v_flex()
+                            .gap_1()
+                            .child(
+                                div()
+                                    .font_semibold()
+                                    .text_xs()
+                                    .text_color(cx.theme().text_placeholder)
+                                    .child(SharedString::from("Public Key:")),
+                            )
+                            .child(
+                                h_flex()
+                                    .h_8()
+                                    .w_full()
+                                    .justify_center()
+                                    .gap_2()
+                                    .bg(cx.theme().surface_background)
+                                    .rounded(cx.theme().radius)
+                                    .text_sm()
+                                    .child(shorten_pkey)
+                                    .child(
+                                        Button::new("copy")
+                                            .icon({
+                                                if self.copied {
+                                                    IconName::CheckCircle
+                                                } else {
+                                                    IconName::Copy
+                                                }
+                                            })
+                                            .xsmall()
+                                            .ghost()
+                                            .on_click(cx.listener(move |this, _ev, window, cx| {
+                                                this.copy(
+                                                    this.public_key.to_bech32().unwrap(),
+                                                    window,
+                                                    cx,
+                                                );
+                                            })),
+                                    ),
+                            ),
+                    )
+                    .child(divider(cx))
+                    .child(
+                        Button::new("submit")
+                            .label("Update")
+                            .primary()
                             .disabled(self.uploading)
-                            .loading(self.uploading)
-                            .on_click(cx.listener(move |this, _, window, cx| {
-                                this.upload(window, cx);
+                            .on_click(cx.listener(move |this, _ev, window, cx| {
+                                this.set_metadata(window, cx);
                             })),
                     ),
             )
-            .child(
-                v_flex()
-                    .gap_1p5()
-                    .child(
-                        div()
-                            .text_sm()
-                            .text_color(cx.theme().text_muted)
-                            .child(SharedString::from("What should people call you?")),
-                    )
-                    .child(Input::new(&self.name_input).small()),
-            )
-            .child(
-                v_flex()
-                    .gap_1p5()
-                    .child(
-                        div()
-                            .text_sm()
-                            .text_color(cx.theme().text_muted)
-                            .child(SharedString::from("A short introduction about you:")),
-                    )
-                    .child(Input::new(&self.bio_input).small()),
-            )
-            .child(
-                v_flex()
-                    .gap_1p5()
-                    .child(
-                        div()
-                            .text_sm()
-                            .text_color(cx.theme().text_muted)
-                            .child(SharedString::from("Website:")),
-                    )
-                    .child(Input::new(&self.website_input).small()),
-            )
-            .child(
-                v_flex()
-                    .gap_1p5()
-                    .child(
-                        div()
-                            .text_sm()
-                            .text_color(cx.theme().text_muted)
-                            .child(SharedString::from("Public Key:")),
-                    )
-                    .child(
-                        h_flex()
-                            .h_8()
-                            .w_full()
-                            .justify_center()
-                            .gap_3()
-                            .rounded(cx.theme().radius)
-                            .bg(cx.theme().secondary_background)
-                            .text_sm()
-                            .text_color(cx.theme().secondary_foreground)
-                            .child(shorten_pkey)
-                            .child(
-                                Button::new("copy")
-                                    .icon({
-                                        if self.copied {
-                                            IconName::CheckCircle
-                                        } else {
-                                            IconName::Copy
-                                        }
-                                    })
-                                    .xsmall()
-                                    .secondary()
-                                    .on_click(cx.listener(move |this, _ev, window, cx| {
-                                        this.copy(this.public_key.to_bech32().unwrap(), window, cx);
-                                    })),
-                            ),
-                    ),
-            )
-            .child(
-                Button::new("submit")
-                    .icon(IconName::CheckCircle)
-                    .label("Update")
-                    .primary()
-                    .font_semibold()
-                    .loading(self.updating)
-                    .disabled(self.updating)
-                    .on_click(cx.listener(move |this, _ev, window, cx| {
-                        this.update(window, cx);
-                    })),
-            )
     }
 }

crates/coop/src/panels/relay_list.rs

@@ -0,0 +1,365 @@
+use std::collections::HashSet;
+use std::time::Duration;
+
+use anyhow::{anyhow, Context as AnyhowContext, Error};
+use dock::panel::{Panel, PanelEvent};
+use gpui::prelude::FluentBuilder;
+use gpui::{
+    div, relative, uniform_list, AnyElement, App, AppContext, Context, Entity, EventEmitter,
+    FocusHandle, Focusable, InteractiveElement, IntoElement, ParentElement, Render, SharedString,
+    Styled, Subscription, Task, TextAlign, UniformList, Window,
+};
+use nostr_sdk::prelude::*;
+use smallvec::{smallvec, SmallVec};
+use state::{NostrRegistry, BOOTSTRAP_RELAYS};
+use theme::ActiveTheme;
+use ui::button::{Button, ButtonVariants};
+use ui::input::{InputEvent, InputState, TextInput};
+use ui::{divider, h_flex, v_flex, IconName, Sizable, StyledExt};
+
+pub fn init(window: &mut Window, cx: &mut App) -> Entity<RelayListPanel> {
+    cx.new(|cx| RelayListPanel::new(window, cx))
+}
+
+#[derive(Debug)]
+pub struct RelayListPanel {
+    name: SharedString,
+    focus_handle: FocusHandle,
+
+    /// Relay URL input
+    input: Entity<InputState>,
+
+    /// Relay metadata input
+    metadata: Entity<Option<RelayMetadata>>,
+
+    /// Error message
+    error: Option<SharedString>,
+
+    // All relays
+    relays: HashSet<(RelayUrl, Option<RelayMetadata>)>,
+
+    // Event subscriptions
+    _subscriptions: SmallVec<[Subscription; 1]>,
+
+    // Background tasks
+    _tasks: SmallVec<[Task<()>; 1]>,
+}
+
+impl RelayListPanel {
+    pub fn new(window: &mut Window, cx: &mut Context<Self>) -> Self {
+        let input = cx.new(|cx| InputState::new(window, cx).placeholder("wss://example.com"));
+        let metadata = cx.new(|_| None);
+
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+
+        let mut subscriptions = smallvec![];
+        let mut tasks = smallvec![];
+
+        tasks.push(
+            // Load user's relays in the local database
+            cx.spawn_in(window, async move |this, cx| {
+                let result = cx
+                    .background_spawn(async move { Self::load(&client).await })
+                    .await;
+
+                if let Ok(relays) = result {
+                    this.update(cx, |this, cx| {
+                        this.relays.extend(relays);
+                        cx.notify();
+                    })
+                    .ok();
+                }
+            }),
+        );
+
+        subscriptions.push(
+            // Subscribe to user's input events
+            cx.subscribe_in(&input, window, move |this, _input, event, window, cx| {
+                if let InputEvent::PressEnter { .. } = event {
+                    this.add(window, cx);
+                }
+            }),
+        );
+
+        Self {
+            name: "Update Relay List".into(),
+            focus_handle: cx.focus_handle(),
+            input,
+            metadata,
+            relays: HashSet::new(),
+            error: None,
+            _subscriptions: subscriptions,
+            _tasks: tasks,
+        }
+    }
+
+    async fn load(client: &Client) -> Result<Vec<(RelayUrl, Option<RelayMetadata>)>, Error> {
+        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_owned_relay_list(event).collect())
+        } else {
+            Err(anyhow!("Not found."))
+        }
+    }
+
+    fn add(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let value = self.input.read(cx).value().to_string();
+        let metadata = self.metadata.read(cx);
+
+        if !value.starts_with("ws") {
+            self.set_error("Relay URl is invalid", window, cx);
+            return;
+        }
+
+        if let Ok(url) = RelayUrl::parse(&value) {
+            if !self.relays.insert((url, metadata.to_owned())) {
+                self.input.update(cx, |this, cx| {
+                    this.set_value("", window, cx);
+                });
+                cx.notify();
+            }
+        } else {
+            self.set_error("Relay URl is invalid", window, cx);
+        }
+    }
+
+    fn remove(&mut self, url: &RelayUrl, cx: &mut Context<Self>) {
+        self.relays.retain(|(relay, _)| relay != url);
+        cx.notify();
+    }
+
+    fn set_error<E>(&mut self, error: E, window: &mut Window, cx: &mut Context<Self>)
+    where
+        E: Into<SharedString>,
+    {
+        self.error = Some(error.into());
+        cx.notify();
+
+        cx.spawn_in(window, async move |this, cx| {
+            cx.background_executor().timer(Duration::from_secs(2)).await;
+            // Clear the error message after a delay
+            this.update(cx, |this, cx| {
+                this.error = None;
+                cx.notify();
+            })
+            .ok();
+        })
+        .detach();
+    }
+
+    pub fn set_relays(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        if self.relays.is_empty() {
+            self.set_error("You need to add at least 1 relay", window, cx);
+            return;
+        };
+
+        let nostr = NostrRegistry::global(cx);
+        let client = nostr.read(cx).client();
+        let relays = self.relays.clone();
+
+        let task: Task<Result<(), Error>> = cx.background_spawn(async move {
+            let builder = EventBuilder::relay_list(relays);
+            let event = client.sign_event_builder(builder).await?;
+
+            // Set relay list for current user
+            client.send_event(&event).to(BOOTSTRAP_RELAYS).await?;
+
+            Ok(())
+        });
+
+        cx.spawn_in(window, async move |this, cx| {
+            match task.await {
+                Ok(_) => {
+                    // TODO
+                }
+                Err(e) => {
+                    this.update_in(cx, |this, window, cx| {
+                        this.set_error(e.to_string(), window, cx);
+                    })
+                    .ok();
+                }
+            };
+        })
+        .detach();
+    }
+
+    fn render_list(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> UniformList {
+        let relays = self.relays.clone();
+        let total = relays.len();
+
+        uniform_list(
+            "relays",
+            total,
+            cx.processor(move |_v, range, _window, cx| {
+                let mut items = Vec::new();
+
+                for ix in range {
+                    let Some((url, metadata)) = relays.iter().nth(ix) else {
+                        continue;
+                    };
+
+                    items.push(
+                        div()
+                            .id(SharedString::from(url.to_string()))
+                            .group("")
+                            .w_full()
+                            .h_9()
+                            .py_0p5()
+                            .child(
+                                h_flex()
+                                    .px_2()
+                                    .flex()
+                                    .justify_between()
+                                    .rounded(cx.theme().radius)
+                                    .bg(cx.theme().elevated_surface_background)
+                                    .child(
+                                        div().text_sm().child(SharedString::from(url.to_string())),
+                                    )
+                                    .child(
+                                        h_flex()
+                                            .gap_1()
+                                            .text_xs()
+                                            .map(|this| {
+                                                if let Some(metadata) = metadata {
+                                                    this.child(SharedString::from(
+                                                        metadata.to_string(),
+                                                    ))
+                                                } else {
+                                                    this.child(SharedString::from("Read+Write"))
+                                                }
+                                            })
+                                            .child(
+                                                Button::new("remove_{ix}")
+                                                    .icon(IconName::Close)
+                                                    .xsmall()
+                                                    .ghost()
+                                                    .invisible()
+                                                    .group_hover("", |this| this.visible())
+                                                    .on_click({
+                                                        let url = url.to_owned();
+                                                        cx.listener(
+                                                            move |this, _ev, _window, cx| {
+                                                                this.remove(&url, cx);
+                                                            },
+                                                        )
+                                                    }),
+                                            ),
+                                    ),
+                            ),
+                    )
+                }
+
+                items
+            }),
+        )
+        .h_full()
+    }
+
+    fn render_empty(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        h_flex()
+            .mt_2()
+            .h_20()
+            .justify_center()
+            .border_2()
+            .border_dashed()
+            .border_color(cx.theme().border)
+            .rounded(cx.theme().radius_lg)
+            .text_sm()
+            .text_align(TextAlign::Center)
+            .child(SharedString::from("Please add some relays."))
+    }
+}
+
+impl Panel for RelayListPanel {
+    fn panel_id(&self) -> SharedString {
+        self.name.clone()
+    }
+
+    fn title(&self, _cx: &App) -> AnyElement {
+        self.name.clone().into_any_element()
+    }
+}
+
+impl EventEmitter<PanelEvent> for RelayListPanel {}
+
+impl Focusable for RelayListPanel {
+    fn focus_handle(&self, _: &App) -> gpui::FocusHandle {
+        self.focus_handle.clone()
+    }
+}
+
+impl Render for RelayListPanel {
+    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        v_flex()
+            .size_full()
+            .items_center()
+            .justify_center()
+            .p_2()
+            .gap_10()
+            .child(
+                div()
+                    .text_center()
+                    .font_semibold()
+                    .line_height(relative(1.25))
+                    .child(SharedString::from("Update Relay List")),
+            )
+            .child(
+                v_flex()
+                    .w_112()
+                    .gap_2()
+                    .text_sm()
+                    .child(
+                        v_flex()
+                            .gap_1p5()
+                            .child(
+                                h_flex()
+                                    .gap_1()
+                                    .w_full()
+                                    .child(TextInput::new(&self.input).small())
+                                    .child(
+                                        Button::new("add")
+                                            .icon(IconName::Plus)
+                                            .label("Add")
+                                            .ghost()
+                                            .on_click(cx.listener(move |this, _, window, cx| {
+                                                this.add(window, cx);
+                                            })),
+                                    ),
+                            )
+                            .when_some(self.error.as_ref(), |this, error| {
+                                this.child(
+                                    div()
+                                        .italic()
+                                        .text_xs()
+                                        .text_color(cx.theme().danger_foreground)
+                                        .child(error.clone()),
+                                )
+                            }),
+                    )
+                    .map(|this| {
+                        if !self.relays.is_empty() {
+                            this.child(self.render_list(window, cx))
+                        } else {
+                            this.child(self.render_empty(window, cx))
+                        }
+                    })
+                    .child(divider(cx))
+                    .child(
+                        Button::new("submit")
+                            .label("Update")
+                            .primary()
+                            .on_click(cx.listener(move |this, _ev, window, cx| {
+                                this.set_relays(window, cx);
+                            })),
+                    ),
+            )
+    }
+}

crates/coop/src/sidebar/entry.rs

@@ -1,18 +1,18 @@
 use std::rc::Rc;
 
 use chat::RoomKind;
+use dock::ClosePanel;
 use gpui::prelude::FluentBuilder;
 use gpui::{
-    App, ClickEvent, InteractiveElement, IntoElement, ParentElement as _, RenderOnce, SharedString,
-    StatefulInteractiveElement, Styled, Window, div,
+    div, rems, App, ClickEvent, InteractiveElement, IntoElement, ParentElement as _, RenderOnce,
+    SharedString, StatefulInteractiveElement, Styled, Window,
 };
 use nostr_sdk::prelude::*;
 use settings::AppSettings;
 use theme::ActiveTheme;
 use ui::avatar::Avatar;
-use ui::dock::ClosePanel;
 use ui::modal::ModalButtonProps;
-use ui::{Icon, IconName, Selectable, Sizable, StyledExt, WindowExtension, h_flex};
+use ui::{h_flex, Icon, IconName, Selectable, Sizable, StyledExt, WindowExtension};
 
 use crate::dialogs::screening;
 
@@ -106,7 +106,14 @@ impl RenderOnce for RoomEntry {
             .rounded(cx.theme().radius)
             .when(!hide_avatar, |this| {
                 this.when_some(self.avatar, |this, avatar| {
-                    this.child(Avatar::new(avatar).small().flex_shrink_0())
+                    this.child(
+                        div()
+                            .flex_shrink_0()
+                            .size_6()
+                            .rounded_full()
+                            .overflow_hidden()
+                            .child(Avatar::new(avatar).size(rems(1.5))),
+                    )
                 })
             })
             .child(
@@ -148,25 +155,26 @@ impl RenderOnce for RoomEntry {
                 this.on_click(move |event, window, cx| {
                     handler(event, window, cx);
 
-                    if let Some(public_key) = public_key
-                        && self.kind != Some(RoomKind::Ongoing)
-                        && screening
-                    {
-                        let screening = screening::init(public_key, window, cx);
+                    if let Some(public_key) = public_key {
+                        if self.kind != Some(RoomKind::Ongoing) && screening {
+                            let screening = screening::init(public_key, window, cx);
 
-                        window.open_modal(cx, move |this, _window, _cx| {
-                            this.confirm()
-                                .child(screening.clone())
-                                .button_props(
-                                    ModalButtonProps::default()
-                                        .cancel_text("Ignore")
-                                        .ok_text("Response"),
-                                )
-                                .on_cancel(move |_event, window, cx| {
-                                    window.dispatch_action(Box::new(ClosePanel), cx);
-                                    true
-                                })
-                        });
+                            window.open_modal(cx, move |this, _window, _cx| {
+                                this.confirm()
+                                    .child(screening.clone())
+                                    .button_props(
+                                        ModalButtonProps::default()
+                                            .cancel_text("Ignore")
+                                            .ok_text("Response"),
+                                    )
+                                    .on_cancel(move |_event, window, cx| {
+                                        window.dispatch_action(Box::new(ClosePanel), cx);
+                                        // Prevent closing the modal on click
+                                        // modal will be automatically closed after closing panel
+                                        false
+                                    })
+                            });
+                        }
                     }
                 })
             })

crates/coop/src/sidebar/mod.rs

@@ -1,39 +1,50 @@
 use std::collections::HashSet;
 use std::ops::Range;
+use std::time::Duration;
 
 use anyhow::Error;
 use chat::{ChatEvent, ChatRegistry, Room, RoomKind};
-use common::{DebouncedDelay, TimestampExt};
+use common::{DebouncedDelay, RenderedTimestamp};
+use dock::panel::{Panel, PanelEvent};
 use entry::RoomEntry;
 use gpui::prelude::FluentBuilder;
 use gpui::{
-    App, AppContext, Context, Entity, EventEmitter, FocusHandle, Focusable, IntoElement,
-    ParentElement, Render, SharedString, Styled, Subscription, Task, UniformListScrollHandle,
-    Window, div, retain_all, uniform_list,
+    div, uniform_list, App, AppContext, Context, Entity, EventEmitter, FocusHandle, Focusable,
+    IntoElement, ParentElement, Render, RetainAllImageCache, SharedString, Styled, Subscription,
+    Task, UniformListScrollHandle, Window,
 };
-use instant::Duration;
 use nostr_sdk::prelude::*;
 use person::PersonRegistry;
-use smallvec::{SmallVec, smallvec};
-use state::{FIND_DELAY, NostrRegistry};
-use theme::{ActiveTheme, SIDEBAR_WIDTH};
+use smallvec::{smallvec, SmallVec};
+use state::{NostrRegistry, FIND_DELAY};
+use theme::{ActiveTheme, TABBAR_HEIGHT};
 use ui::button::{Button, ButtonVariants};
-use ui::dock::{Panel, PanelEvent};
+use ui::divider::Divider;
 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};
+use ui::{
+    h_flex, v_flex, Disableable, Icon, IconName, Selectable, Sizable, StyledExt, WindowExtension,
+};
 
 mod entry;
 
 const INPUT_PLACEHOLDER: &str = "Find or start a conversation";
 
+pub fn init(window: &mut Window, cx: &mut App) -> Entity<Sidebar> {
+    cx.new(|cx| Sidebar::new(window, cx))
+}
+
 /// Sidebar.
 pub struct Sidebar {
+    name: SharedString,
     focus_handle: FocusHandle,
     scroll_handle: UniformListScrollHandle,
 
+    /// Image cache
+    image_cache: Entity<RetainAllImageCache>,
+
     /// Find input state
     find_input: Entity<InputState>,
 
@@ -75,7 +86,7 @@ pub struct Sidebar {
 }
 
 impl Sidebar {
-    pub fn new(window: &mut Window, cx: &mut Context<Self>) -> Self {
+    fn new(window: &mut Window, cx: &mut Context<Self>) -> Self {
         let chat = ChatRegistry::global(cx);
         let filter = cx.new(|_| RoomKind::Ongoing);
         let contact_list = cx.new(|_| None);
@@ -111,10 +122,12 @@ impl Sidebar {
                         }
                     }
                     InputEvent::Focus => {
-                        this.set_input_focus(true, window, cx);
+                        this.set_input_focus(window, cx);
                         this.get_contact_list(window, cx);
                     }
-                    _ => {}
+                    InputEvent::Blur => {
+                        this.set_input_focus(window, cx);
+                    }
                 };
             }),
         );
@@ -130,8 +143,10 @@ impl Sidebar {
         );
 
         Self {
+            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,
@@ -151,29 +166,7 @@ impl Sidebar {
     /// Get the contact list.
     fn get_contact_list(&mut self, window: &mut Window, cx: &mut Context<Self>) {
         let nostr = NostrRegistry::global(cx);
-        let client = nostr.read(cx).client();
-
-        let Some(public_key) = nostr.read(cx).current_user() else {
-            return;
-        };
-
-        let task: Task<Result<HashSet<PublicKey>, Error>> = cx.background_spawn(async move {
-            let filter = Filter::new()
-                .author(public_key)
-                .kind(Kind::ContactList)
-                .limit(1);
-
-            let contacts: HashSet<PublicKey> = client
-                .database()
-                .query(filter)
-                .await?
-                .into_iter()
-                .next()
-                .map(|event| event.tags.public_keys().collect())
-                .unwrap_or_default();
-
-            Ok(contacts)
-        });
+        let task = nostr.read(cx).get_contact_list(cx);
 
         self.tasks.push(cx.spawn_in(window, async move |this, cx| {
             match task.await {
@@ -184,10 +177,7 @@ impl Sidebar {
                 }
                 Err(e) => {
                     cx.update(|window, cx| {
-                        window.push_notification(
-                            Notification::error(e.to_string()).autohide(false),
-                            cx,
-                        );
+                        window.push_notification(Notification::error(e.to_string()), cx);
                     })?;
                 }
             };
@@ -248,7 +238,6 @@ impl Sidebar {
         }));
     }
 
-    /// Set the results of the search
     fn set_results(&mut self, results: Vec<PublicKey>, cx: &mut Context<Self>) {
         self.find_results.update(cx, |this, cx| {
             *this = Some(results);
@@ -256,10 +245,10 @@ impl Sidebar {
         });
     }
 
-    /// Set the finding status
     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
@@ -267,14 +256,13 @@ impl Sidebar {
         cx.notify();
     }
 
-    /// Set the focus status of the input element.
-    fn set_input_focus(&mut self, status: bool, window: &mut Window, cx: &mut Context<Self>) {
-        self.find_focused = status;
+    fn set_input_focus(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        self.find_focused = !self.find_focused;
         cx.notify();
 
-        // Focus to the input element
-        if !status {
-            window.focus_prev(cx);
+        // Reset the find panel
+        if !self.find_focused {
+            self.reset(window, cx);
         }
     }
 
@@ -327,14 +315,14 @@ impl Sidebar {
         let async_chat = chat.downgrade();
 
         let nostr = NostrRegistry::global(cx);
-        let Some(public_key) = nostr.read(cx).current_user() else {
-            return;
-        };
+        let signer = nostr.read(cx).signer();
 
         // 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(|_| {
@@ -342,7 +330,7 @@ impl Sidebar {
                         .organize(&public_key)
                         .kind(RoomKind::Ongoing)
                 });
-                this.emit_room(&room, _window, cx);
+                this.emit_room(&room, cx);
             })?;
 
             // Reset the find panel
@@ -360,28 +348,15 @@ impl Sidebar {
     }
 
     /// Set the active filter for the sidebar.
-    fn set_filter(&mut self, kind: RoomKind, window: &mut Window, cx: &mut Context<Self>) {
-        self.set_input_focus(false, window, cx);
+    fn set_filter(&mut self, kind: RoomKind, cx: &mut Context<Self>) {
         self.filter.update(cx, |this, cx| {
             *this = kind;
             cx.notify();
         });
         self.new_requests = false;
-
-        // Reset search state when switching to inbox/requests
-        self.reset(window, cx);
-
-        // Clear the find input value
-        self.find_input.update(cx, |this, cx| {
-            this.set_value("", window, cx);
-        });
     }
 
-    fn render_list_items(
-        &self,
-        range: Range<usize>,
-        cx: &Context<Self>,
-    ) -> Vec<impl IntoElement + use<>> {
+    fn render_list_items(&self, range: Range<usize>, cx: &Context<Self>) -> Vec<impl IntoElement> {
         let chat = ChatRegistry::global(cx);
         let rooms = chat.read(cx).rooms(self.filter.read(cx), cx);
 
@@ -394,9 +369,9 @@ impl Sidebar {
                 let room = item.read(cx);
                 let room_clone = item.clone();
                 let public_key = room.display_member(cx).public_key();
-                let handler = cx.listener(move |_this, _ev, window, cx| {
+                let handler = cx.listener(move |_this, _ev, _window, cx| {
                     ChatRegistry::global(cx).update(cx, |s, cx| {
-                        s.emit_room(&room_clone, window, cx);
+                        s.emit_room(&room_clone, cx);
                     });
                 });
 
@@ -413,11 +388,7 @@ impl Sidebar {
     }
 
     /// Render the contact list
-    fn render_results(
-        &self,
-        range: Range<usize>,
-        cx: &Context<Self>,
-    ) -> Vec<impl IntoElement + use<>> {
+    fn render_results(&self, range: Range<usize>, cx: &Context<Self>) -> Vec<impl IntoElement> {
         let persons = PersonRegistry::global(cx);
 
         // Get the contact list
@@ -450,11 +421,7 @@ impl Sidebar {
     }
 
     /// Render the contact list
-    fn render_contacts(
-        &self,
-        range: Range<usize>,
-        cx: &Context<Self>,
-    ) -> Vec<impl IntoElement + use<>> {
+    fn render_contacts(&self, range: Range<usize>, cx: &Context<Self>) -> Vec<impl IntoElement> {
         let persons = PersonRegistry::global(cx);
 
         // Get the contact list
@@ -477,7 +444,7 @@ impl Sidebar {
                 });
 
                 RoomEntry::new(range.start + ix)
-                    .name(profile.name().trim())
+                    .name(profile.name())
                     .avatar(profile.avatar())
                     .on_click(handler)
                     .selected(selected)
@@ -489,7 +456,7 @@ impl Sidebar {
 
 impl Panel for Sidebar {
     fn panel_id(&self) -> SharedString {
-        "Sidebar".into()
+        self.name.clone()
     }
 }
 
@@ -503,11 +470,8 @@ impl Focusable for Sidebar {
 
 impl Render for Sidebar {
     fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let nostr = NostrRegistry::global(cx);
         let chat = ChatRegistry::global(cx);
-        let logged_in = nostr.read(cx).current_user().is_some();
-        let loading = chat.read(cx).loading() && logged_in;
-
+        let loading = chat.read(cx).loading();
         let total_rooms = chat.read(cx).count(self.filter.read(cx), cx);
 
         // Whether the find panel should be shown
@@ -521,38 +485,49 @@ impl Render for Sidebar {
         };
 
         v_flex()
-            .image_cache(retain_all("sidebar"))
+            .image_cache(self.image_cache.clone())
             .size_full()
-            .gap_2()
+            .relative()
             .child(
-                h_flex().px_2().py_1().child(
-                    Input::new(&self.find_input)
-                        .small()
-                        .text_xs()
-                        .disabled(loading)
-                        .when(!self.find_input.read(cx).loading, |this| {
-                            this.suffix(
-                                Button::new("find-icon")
-                                    .icon(IconName::Search)
-                                    .tooltip("Press Enter to search")
-                                    .transparent()
-                                    .small(),
-                            )
-                        }),
-                ),
+                h_flex()
+                    .h(TABBAR_HEIGHT)
+                    .border_b_1()
+                    .border_color(cx.theme().border)
+                    .child(
+                        TextInput::new(&self.find_input)
+                            .appearance(false)
+                            .bordered(false)
+                            .small()
+                            .text_xs()
+                            .when(!self.find_input.read(cx).loading, |this| {
+                                this.suffix(
+                                    Button::new("find-icon")
+                                        .icon(IconName::Search)
+                                        .tooltip("Press Enter to search")
+                                        .transparent()
+                                        .small(),
+                                )
+                            }),
+                    ),
             )
             .child(
                 h_flex()
-                    .px_2()
-                    .gap_2()
+                    .h(TABBAR_HEIGHT)
                     .justify_center()
+                    .border_b_1()
+                    .border_color(cx.theme().border)
                     .when(show_find_panel, |this| {
                         this.child(
                             Button::new("search-results")
                                 .icon(IconName::Search)
+                                .label("Search")
                                 .tooltip("All search results")
-                                .ghost_alt()
+                                .small()
+                                .underline()
+                                .ghost()
                                 .font_semibold()
+                                .rounded_none()
+                                .h_full()
                                 .flex_1()
                                 .selected(true),
                         )
@@ -566,18 +541,24 @@ impl Render for Sidebar {
                                     this.icon(IconName::Inbox)
                                 }
                             })
-                            .when(!show_find_panel, |this| this.label("Inbox").small())
+                            .when(!show_find_panel, |this| this.label("Inbox"))
                             .tooltip("All ongoing conversations")
-                            .ghost_alt()
+                            .small()
+                            .underline()
+                            .ghost()
                             .font_semibold()
+                            .rounded_none()
+                            .h_full()
                             .flex_1()
+                            .disabled(show_find_panel)
                             .selected(
                                 !show_find_panel && self.current_filter(&RoomKind::Ongoing, cx),
                             )
-                            .on_click(cx.listener(|this, _ev, window, cx| {
-                                this.set_filter(RoomKind::Ongoing, window, cx);
+                            .on_click(cx.listener(|this, _ev, _window, cx| {
+                                this.set_filter(RoomKind::Ongoing, cx);
                             })),
                     )
+                    .child(Divider::vertical())
                     .child(
                         Button::new("requests")
                             .map(|this| {
@@ -587,25 +568,30 @@ impl Render for Sidebar {
                                     this.icon(IconName::Fistbump)
                                 }
                             })
-                            .when(!show_find_panel, |this| this.label("Requests").small())
+                            .when(!show_find_panel, |this| this.label("Requests"))
                             .tooltip("Incoming new conversations")
-                            .ghost_alt()
+                            .small()
+                            .ghost()
+                            .underline()
                             .font_semibold()
+                            .rounded_none()
+                            .h_full()
                             .flex_1()
+                            .disabled(show_find_panel)
                             .selected(
                                 !show_find_panel && !self.current_filter(&RoomKind::Ongoing, cx),
                             )
                             .when(self.new_requests, |this| {
                                 this.child(div().size_1().rounded_full().bg(cx.theme().cursor))
                             })
-                            .on_click(cx.listener(|this, _ev, window, cx| {
-                                this.set_filter(RoomKind::default(), window, cx);
+                            .on_click(cx.listener(|this, _ev, _window, cx| {
+                                this.set_filter(RoomKind::default(), cx);
                             })),
                     ),
             )
             .when(!show_find_panel && !loading && total_rooms == 0, |this| {
                 this.child(
-                    div().w(SIDEBAR_WIDTH).px_2().child(
+                    div().mt_2().px_2().child(
                         v_flex()
                             .p_3()
                             .h_24()
@@ -617,21 +603,28 @@ impl Render for Sidebar {
                             .items_center()
                             .justify_center()
                             .text_center()
-                            .child(div().text_sm().font_semibold().child("No conversations"))
                             .child(
                                 div()
-                                    .text_xs()
-                                    .text_color(cx.theme().text_muted)
-                                    .child("Start a conversation with someone to get started."),
-                            ),
+                                    .text_sm()
+                                    .font_semibold()
+                                    .child(SharedString::from("No conversations")),
+                            )
+                            .child(div().text_xs().text_color(cx.theme().text_muted).child(
+                                SharedString::from(
+                                    "Start a conversation with someone to get started.",
+                                ),
+                            )),
                     ),
                 )
             })
             .child(
                 v_flex()
-                    .size_full()
+                    .h_full()
+                    .px_1p5()
+                    .mt_2()
                     .flex_1()
                     .gap_1()
+                    .overflow_y_hidden()
                     .when(show_find_panel, |this| {
                         this.gap_3()
                             .when_some(self.find_results.read(cx).as_ref(), |this, results| {
@@ -648,13 +641,13 @@ impl Render for Sidebar {
                                                 .font_semibold()
                                                 .text_color(cx.theme().text_muted)
                                                 .child(Icon::new(IconName::ChevronDown))
-                                                .child("Results"),
+                                                .child(SharedString::from("Results")),
                                         )
                                         .child(
                                             uniform_list(
                                                 "rooms",
                                                 results.len(),
-                                                cx.processor(move |this, range, _window, cx| {
+                                                cx.processor(|this, range, _window, cx| {
                                                     this.render_results(range, cx)
                                                 }),
                                             )
@@ -674,14 +667,14 @@ impl Render for Sidebar {
                                                 .text_xs()
                                                 .font_semibold()
                                                 .text_color(cx.theme().text_muted)
-                                                .child(Icon::new(IconName::ChevronDown).small())
-                                                .child("Contacts"),
+                                                .child(Icon::new(IconName::ChevronDown))
+                                                .child(SharedString::from("Suggestions")),
                                         )
                                         .child(
                                             uniform_list(
                                                 "contacts",
                                                 contacts.len(),
-                                                cx.processor(|this, range, _window, cx| {
+                                                cx.processor(move |this, range, _window, cx| {
                                                     this.render_contacts(range, cx)
                                                 }),
                                             )
@@ -702,8 +695,7 @@ impl Render for Sidebar {
                             )
                             .track_scroll(&self.scroll_handle)
                             .flex_1()
-                            .h_full()
-                            .px_2(),
+                            .h_full(),
                         )
                         .child(Scrollbar::vertical(&self.scroll_handle))
                     }),
@@ -712,17 +704,17 @@ impl Render for Sidebar {
                 this.child(
                     div()
                         .absolute()
-                        .bottom_2()
+                        .bottom_0()
                         .left_0()
                         .h_9()
                         .w_full()
-                        .px_4()
+                        .px_2()
                         .child(
                             Button::new("create")
                                 .label(button_label)
                                 .primary()
-                                .rounded()
-                                .shadow_md()
+                                .small()
+                                .shadow_lg()
                                 .on_click(cx.listener(move |this, _ev, window, cx| {
                                     this.create_room(window, cx);
                                 })),
@@ -745,13 +737,15 @@ impl Render for Sidebar {
                                 .h_9()
                                 .justify_center()
                                 .bg(cx.theme().background.opacity(0.85))
-                                .when(cx.theme().shadow, |this| this.shadow_md())
+                                .border_color(cx.theme().border_disabled)
+                                .border_1()
+                                .when(cx.theme().shadow, |this| this.shadow_sm())
                                 .rounded_full()
                                 .text_xs()
                                 .font_semibold()
                                 .text_color(cx.theme().text_muted)
                                 .child(Indicator::new().small().color(cx.theme().icon_accent))
-                                .child("Getting messages..."),
+                                .child(SharedString::from("Getting messages...")),
                         ),
                 )
             })

crates/coop/src/workspace.rs

@@ -0,0 +1,290 @@
+use std::sync::Arc;
+
+use chat::{ChatEvent, ChatRegistry};
+use dock::dock::DockPlacement;
+use dock::panel::{PanelStyle, PanelView};
+use dock::{ClosePanel, DockArea, DockItem};
+use gpui::prelude::FluentBuilder;
+use gpui::{
+    div, rems, App, AppContext, Axis, Context, Entity, InteractiveElement, IntoElement,
+    ParentElement, Render, SharedString, Styled, Subscription, Window,
+};
+use person::PersonRegistry;
+use smallvec::{smallvec, SmallVec};
+use state::{NostrRegistry, RelayState};
+use theme::{ActiveTheme, SIDEBAR_WIDTH, TITLEBAR_HEIGHT};
+use titlebar::TitleBar;
+use ui::avatar::Avatar;
+use ui::button::{Button, ButtonVariants};
+use ui::menu::DropdownMenu;
+use ui::{h_flex, v_flex, Root, Sizable, WindowExtension};
+
+use crate::panels::greeter;
+use crate::sidebar;
+
+pub fn init(window: &mut Window, cx: &mut App) -> Entity<Workspace> {
+    cx.new(|cx| Workspace::new(window, cx))
+}
+
+pub struct Workspace {
+    /// App's Title Bar
+    titlebar: Entity<TitleBar>,
+
+    /// App's Dock Area
+    dock: Entity<DockArea>,
+
+    /// Event subscriptions
+    _subscriptions: SmallVec<[Subscription; 3]>,
+}
+
+impl Workspace {
+    fn new(window: &mut Window, cx: &mut Context<Self>) -> Self {
+        let chat = ChatRegistry::global(cx);
+        let titlebar = cx.new(|_| TitleBar::new());
+        let dock = cx.new(|cx| DockArea::new(window, cx).style(PanelStyle::TabBar));
+
+        let mut subscriptions = smallvec![];
+
+        subscriptions.push(
+            // Observe all events emitted by the chat registry
+            cx.subscribe_in(&chat, window, move |this, chat, ev, window, cx| {
+                match ev {
+                    ChatEvent::OpenRoom(id) => {
+                        if let Some(room) = chat.read(cx).room(id, cx) {
+                            this.dock.update(cx, |this, cx| {
+                                this.add_panel(
+                                    Arc::new(chat_ui::init(room, window, cx)),
+                                    DockPlacement::Center,
+                                    window,
+                                    cx,
+                                );
+                            });
+                        }
+                    }
+                    ChatEvent::CloseRoom(..) => {
+                        this.dock.update(cx, |this, cx| {
+                            // Force focus to the tab panel
+                            this.focus_tab_panel(window, cx);
+
+                            // Dispatch the close panel action
+                            cx.defer_in(window, |_, window, cx| {
+                                window.dispatch_action(Box::new(ClosePanel), cx);
+                                window.close_all_modals(cx);
+                            });
+                        });
+                    }
+                    _ => {}
+                };
+            }),
+        );
+
+        subscriptions.push(
+            // Observe the chat registry
+            cx.observe(&chat, move |this, chat, cx| {
+                let ids = this.panel_ids(cx);
+
+                chat.update(cx, |this, cx| {
+                    this.refresh_rooms(ids, cx);
+                });
+            }),
+        );
+
+        // Set the default layout for app's dock
+        cx.defer_in(window, |this, window, cx| {
+            this.set_layout(window, cx);
+        });
+
+        Self {
+            titlebar,
+            dock,
+            _subscriptions: subscriptions,
+        }
+    }
+
+    /// Add panel to the dock
+    pub fn add_panel<P>(panel: P, placement: DockPlacement, window: &mut Window, cx: &mut App)
+    where
+        P: PanelView,
+    {
+        if let Some(root) = window.root::<Root>().flatten() {
+            if let Ok(workspace) = root.read(cx).view().clone().downcast::<Self>() {
+                workspace.update(cx, |this, cx| {
+                    this.dock.update(cx, |this, cx| {
+                        this.add_panel(Arc::new(panel), placement, window, cx);
+                    });
+                });
+            }
+        }
+    }
+
+    /// Get all panel ids
+    fn panel_ids(&self, cx: &App) -> Option<Vec<u64>> {
+        let ids: Vec<u64> = self
+            .dock
+            .read(cx)
+            .items
+            .panel_ids(cx)
+            .into_iter()
+            .filter_map(|panel| panel.parse::<u64>().ok())
+            .collect();
+
+        Some(ids)
+    }
+
+    /// Set the dock layout
+    fn set_layout(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let weak_dock = self.dock.downgrade();
+
+        // Sidebar
+        let left = DockItem::panel(Arc::new(sidebar::init(window, cx)));
+
+        // Main workspace
+        let center = DockItem::split_with_sizes(
+            Axis::Vertical,
+            vec![DockItem::tabs(
+                vec![Arc::new(greeter::init(window, cx))],
+                None,
+                &weak_dock,
+                window,
+                cx,
+            )],
+            vec![None],
+            &weak_dock,
+            window,
+            cx,
+        );
+
+        // Update the dock layout
+        self.dock.update(cx, |this, cx| {
+            this.set_left_dock(left, Some(SIDEBAR_WIDTH), true, window, cx);
+            this.set_center(center, window, cx);
+        });
+    }
+
+    fn titlebar_left(&mut self, _window: &mut Window, cx: &Context<Self>) -> impl IntoElement {
+        let nostr = NostrRegistry::global(cx);
+        let nip65 = nostr.read(cx).nip65_state();
+        let nip17 = nostr.read(cx).nip17_state();
+        let signer = nostr.read(cx).signer();
+        let current_user = signer.public_key();
+
+        h_flex()
+            .h(TITLEBAR_HEIGHT)
+            .flex_shrink_0()
+            .justify_between()
+            .gap_2()
+            .when_some(current_user.as_ref(), |this, public_key| {
+                let persons = PersonRegistry::global(cx);
+                let profile = persons.read(cx).get(public_key, cx);
+
+                this.child(
+                    Button::new("current-user")
+                        .child(Avatar::new(profile.avatar()).size(rems(1.25)))
+                        .small()
+                        .caret()
+                        .compact()
+                        .transparent()
+                        .dropdown_menu(move |this, _window, _cx| {
+                            this.label(profile.name())
+                                .separator()
+                                .menu("Profile", Box::new(ClosePanel))
+                                .menu("Backup", Box::new(ClosePanel))
+                                .menu("Themes", Box::new(ClosePanel))
+                                .menu("Settings", Box::new(ClosePanel))
+                        }),
+                )
+            })
+            .when(nostr.read(cx).creating_signer(), |this| {
+                this.child(div().text_xs().text_color(cx.theme().text_muted).child(
+                    SharedString::from("Coop is creating a new identity for you..."),
+                ))
+            })
+            .when(!nostr.read(cx).connected(), |this| {
+                this.child(
+                    div()
+                        .text_xs()
+                        .text_color(cx.theme().text_muted)
+                        .child(SharedString::from("Connecting...")),
+                )
+            })
+            .map(|this| match nip65.read(cx) {
+                RelayState::Checking => this.child(
+                    div()
+                        .text_xs()
+                        .text_color(cx.theme().text_muted)
+                        .child(SharedString::from("Fetching user's relay list...")),
+                ),
+                RelayState::NotConfigured => this.child(
+                    h_flex()
+                        .h_6()
+                        .w_full()
+                        .px_1()
+                        .text_xs()
+                        .text_color(cx.theme().warning_foreground)
+                        .bg(cx.theme().warning_background)
+                        .rounded_sm()
+                        .child(SharedString::from("User hasn't configured a relay list")),
+                ),
+                _ => this,
+            })
+            .map(|this| match nip17.read(cx) {
+                RelayState::Checking => {
+                    this.child(div().text_xs().text_color(cx.theme().text_muted).child(
+                        SharedString::from("Fetching user's messaging relay list..."),
+                    ))
+                }
+                RelayState::NotConfigured => this.child(
+                    h_flex()
+                        .h_6()
+                        .w_full()
+                        .px_1()
+                        .text_xs()
+                        .text_color(cx.theme().warning_foreground)
+                        .bg(cx.theme().warning_background)
+                        .rounded_sm()
+                        .child(SharedString::from(
+                            "User hasn't configured a messaging relay list",
+                        )),
+                ),
+                _ => this,
+            })
+    }
+
+    fn titlebar_right(&mut self, _window: &mut Window, _cx: &Context<Self>) -> impl IntoElement {
+        h_flex().h(TITLEBAR_HEIGHT).flex_shrink_0()
+    }
+}
+
+impl Render for Workspace {
+    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let modal_layer = Root::render_modal_layer(window, cx);
+        let notification_layer = Root::render_notification_layer(window, cx);
+
+        // Titlebar elements
+        let left = self.titlebar_left(window, cx).into_any_element();
+        let right = self.titlebar_right(window, cx).into_any_element();
+
+        // Update title bar children
+        self.titlebar.update(cx, |this, _cx| {
+            this.set_children(vec![left, right]);
+        });
+
+        div()
+            .id(SharedString::from("workspace"))
+            .relative()
+            .size_full()
+            .child(
+                v_flex()
+                    .relative()
+                    .size_full()
+                    // Title Bar
+                    .child(self.titlebar.clone())
+                    // Dock
+                    .child(self.dock.clone()),
+            )
+            // Notifications
+            .children(notification_layer)
+            // Modals
+            .children(modal_layer)
+    }
+}

crates/device/Cargo.toml

@@ -7,18 +7,15 @@ publish.workspace = true
 [dependencies]
 common = { path = "../common" }
 state = { path = "../state" }
-person = { path = "../person" }
-ui = { path = "../ui" }
-theme = { path = "../theme" }
-settings = { path = "../settings" }
 
 gpui.workspace = true
 nostr-sdk.workspace = true
-instant.workspace = true
+
 anyhow.workspace = true
+itertools.workspace = true
 smallvec.workspace = true
+smol.workspace = true
 log.workspace = true
 flume.workspace = true
-
-[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-smol.workspace = true
+serde.workspace = true
+serde_json.workspace = true

crates/device/src/device.rs

@@ -1,6 +1,28 @@
 use gpui::SharedString;
 use nostr_sdk::prelude::*;
 
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Default)]
+pub enum DeviceState {
+    #[default]
+    Initial,
+    Requesting,
+    Set,
+}
+
+impl DeviceState {
+    pub fn initial(&self) -> bool {
+        matches!(self, DeviceState::Initial)
+    }
+
+    pub fn requesting(&self) -> bool {
+        matches!(self, DeviceState::Requesting)
+    }
+
+    pub fn set(&self) -> bool {
+        matches!(self, DeviceState::Set)
+    }
+}
+
 /// Announcement
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub struct Announcement {
@@ -16,15 +38,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(|tag| tag.kind() == "client")
+            .find(TagKind::Client)
             .and_then(|tag| tag.content())
             .map(|c| c.to_string());
 

crates/dock/Cargo.toml

@@ -0,0 +1,18 @@
+[package]
+name = "dock"
+version.workspace = true
+edition.workspace = true
+publish.workspace = true
+
+[dependencies]
+common = { path = "../common" }
+theme = { path = "../theme" }
+ui = { path = "../ui" }
+
+gpui.workspace = true
+smallvec.workspace = true
+anyhow.workspace = true
+log.workspace = true
+
+[target.'cfg(target_os = "linux")'.dependencies]
+linicon = "2.3.0"

crates/dock/src/dock.rs

@@ -3,26 +3,20 @@ use std::sync::Arc;
 
 use gpui::prelude::FluentBuilder as _;
 use gpui::{
-    App, AppContext, Axis, Context, Element, Empty, Entity, IntoElement, MouseMoveEvent,
-    MouseUpEvent, ParentElement as _, Pixels, Point, Render, Style, StyleRefinement, Styled as _,
-    WeakEntity, Window, div, px,
+    div, px, App, AppContext, Axis, Context, Element, Entity, IntoElement, MouseMoveEvent,
+    MouseUpEvent, ParentElement as _, Pixels, Point, Render, Style, Styled as _, WeakEntity,
+    Window,
 };
+use ui::StyledExt;
 
 use super::{DockArea, DockItem};
-use crate::StyledExt;
-use crate::dock::panel::PanelView;
-use crate::dock::tab_panel::TabPanel;
-use crate::resizable::{PANEL_MIN_SIZE, resize_handle};
+use crate::panel::PanelView;
+use crate::resizable::{resize_handle, PANEL_MIN_SIZE};
+use crate::tab_panel::TabPanel;
 
-#[derive(Clone)]
+#[derive(Clone, Render)]
 struct ResizePanel;
 
-impl Render for ResizePanel {
-    fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
-        Empty
-    }
-}
-
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum DockPlacement {
     Center,
@@ -214,8 +208,6 @@ impl Dock {
     pub fn set_open(&mut self, open: bool, window: &mut Window, cx: &mut Context<Self>) {
         self.open = open;
         let item = self.panel.clone();
-        // Use defer_in (not window.defer) so the callback is cancelled
-        // if this Dock entity is dropped before the deferred frame runs.
         cx.defer_in(window, move |_, window, cx| {
             item.set_collapsed(!open, window, cx);
         });
@@ -273,22 +265,22 @@ impl Dock {
         let mut right_dock_size = px(0.0);
 
         // Get the size of the left dock if it's open and not the current dock
-        if let Some(left_dock) = &dock_area.left_dock
-            && left_dock.entity_id() != cx.entity().entity_id()
-        {
-            let left_dock_read = left_dock.read(cx);
-            if left_dock_read.is_open() {
-                left_dock_size = left_dock_read.size;
+        if let Some(left_dock) = &dock_area.left_dock {
+            if left_dock.entity_id() != cx.entity().entity_id() {
+                let left_dock_read = left_dock.read(cx);
+                if left_dock_read.is_open() {
+                    left_dock_size = left_dock_read.size;
+                }
             }
         }
 
         // Get the size of the right dock if it's open and not the current dock
-        if let Some(right_dock) = &dock_area.right_dock
-            && right_dock.entity_id() != cx.entity().entity_id()
-        {
-            let right_dock_read = right_dock.read(cx);
-            if right_dock_read.is_open() {
-                right_dock_size = right_dock_read.size;
+        if let Some(right_dock) = &dock_area.right_dock {
+            if right_dock.entity_id() != cx.entity().entity_id() {
+                let right_dock_read = right_dock.read(cx);
+                if right_dock_read.is_open() {
+                    right_dock_size = right_dock_read.size;
+                }
             }
         }
 
@@ -329,8 +321,6 @@ impl Render for Dock {
             return div();
         }
 
-        let cache_style = StyleRefinement::default().absolute().size_full();
-
         div()
             .relative()
             .overflow_hidden()
@@ -346,7 +336,7 @@ impl Render for Dock {
             .map(|this| match &self.panel {
                 DockItem::Split { view, .. } => this.child(view.clone()),
                 DockItem::Tabs { view, .. } => this.child(view.clone()),
-                DockItem::Panel { view, .. } => this.child(view.clone().view().cached(cache_style)),
+                DockItem::Panel { view, .. } => this.child(view.clone().view()),
             })
             .child(self.render_resize_handle(window, cx))
             .child(DockElement {

crates/dock/src/lib.rs

@@ -2,23 +2,23 @@ use std::sync::Arc;
 
 use gpui::prelude::FluentBuilder;
 use gpui::{
-    AnyElement, AnyView, App, AppContext, Axis, Bounds, Context, Edges, Entity, EntityId,
-    EventEmitter, Focusable, InteractiveElement as _, IntoElement, ParentElement as _, Pixels,
-    Render, SharedString, Styled, Subscription, WeakEntity, Window, actions, div, px,
+    actions, div, px, AnyElement, AnyView, App, AppContext, Axis, Bounds, Context, Edges, Entity,
+    EntityId, EventEmitter, Focusable, InteractiveElement as _, IntoElement, ParentElement as _,
+    Pixels, Render, SharedString, Styled, Subscription, WeakEntity, Window,
 };
+use ui::ElementExt;
 
-use crate::ElementExt;
+use crate::dock::{Dock, DockPlacement};
+use crate::panel::{Panel, PanelEvent, PanelStyle, PanelView};
+use crate::stack_panel::StackPanel;
+use crate::tab_panel::TabPanel;
 
-#[allow(clippy::module_inception)]
-mod dock;
-mod panel;
-mod stack_panel;
-mod tab_panel;
-
-pub use dock::*;
-pub use panel::*;
-pub use stack_panel::*;
-pub use tab_panel::*;
+pub mod dock;
+pub mod panel;
+pub mod resizable;
+pub mod stack_panel;
+pub mod tab;
+pub mod tab_panel;
 
 actions!(dock, [ToggleZoom, ClosePanel]);
 
@@ -109,8 +109,15 @@ impl DockItem {
         window: &mut Window,
         cx: &mut App,
     ) -> Self {
+        let mut items = items;
+
         let stack_panel = cx.new(|cx| {
             let mut stack_panel = StackPanel::new(axis, window, cx);
+            for (i, item) in items.iter_mut().enumerate() {
+                let view = item.view();
+                let size = sizes.get(i).copied().flatten();
+                stack_panel.add_panel(view.clone(), size, dock_area.clone(), window, cx)
+            }
 
             for (i, item) in items.iter().enumerate() {
                 let view = item.view();
@@ -197,16 +204,19 @@ impl DockItem {
     /// Returns all panel ids
     pub fn panel_ids(&self, cx: &App) -> Vec<SharedString> {
         match self {
-            Self::Panel { .. } => vec![],
             Self::Tabs { view, .. } => view.read(cx).panel_ids(cx),
-            Self::Split { items, .. } => items
-                .iter()
-                .filter_map(|item| match item {
-                    DockItem::Tabs { view, .. } => Some(view.read(cx).panel_ids(cx)),
-                    _ => None,
-                })
-                .flatten()
-                .collect(),
+            Self::Split { items, .. } => {
+                let mut total = vec![];
+
+                for item in items.iter() {
+                    if let DockItem::Tabs { view, .. } = item {
+                        total.extend(view.read(cx).panel_ids(cx));
+                    }
+                }
+
+                total
+            }
+            Self::Panel { .. } => vec![],
         }
     }
 
@@ -582,13 +592,17 @@ impl DockArea {
                 }
             }
             DockPlacement::Right => {
-                self.set_right_dock(
-                    DockItem::tabs(vec![panel], None, &weak_self, window, cx),
-                    Some(px(320.)),
-                    true,
-                    window,
-                    cx,
-                );
+                if let Some(dock) = self.right_dock.as_ref() {
+                    dock.update(cx, |dock, cx| dock.add_panel(panel, window, cx))
+                } else {
+                    self.set_right_dock(
+                        DockItem::tabs(vec![panel], None, &weak_self, window, cx),
+                        Some(px(320.)),
+                        true,
+                        window,
+                        cx,
+                    );
+                }
             }
             DockPlacement::Center => {
                 self.items
@@ -742,6 +756,7 @@ impl Render for DockArea {
             .id("dock-area")
             .relative()
             .size_full()
+            .overflow_hidden()
             .on_prepaint(move |bounds, _, cx| view.update(cx, |r, _| r.bounds = bounds))
             .map(|this| {
                 if let Some(zoom_view) = self.zoom_view.clone() {
@@ -752,7 +767,7 @@ impl Render for DockArea {
                         div()
                             .flex()
                             .flex_row()
-                            .size_full()
+                            .h_full()
                             // Left dock
                             .when_some(self.left_dock.clone(), |this, dock| {
                                 this.child(div().flex().flex_none().child(dock))
@@ -763,8 +778,14 @@ impl Render for DockArea {
                                     .flex()
                                     .flex_1()
                                     .flex_col()
+                                    .overflow_hidden()
                                     // Top center
-                                    .child(div().flex_1().child(self.render_items(window, cx)))
+                                    .child(
+                                        div()
+                                            .flex_1()
+                                            .overflow_hidden()
+                                            .child(self.render_items(window, cx)),
+                                    )
                                     // Bottom Dock
                                     .when_some(self.bottom_dock.clone(), |this, dock| {
                                         this.child(dock)

crates/dock/src/panel.rs

@@ -1,10 +1,9 @@
 use gpui::{
-    AnyElement, AnyView, App, Element, Entity, EventEmitter, FocusHandle, Focusable, Render,
+    AnyElement, AnyView, App, Element, Entity, EventEmitter, FocusHandle, Focusable, Hsla, Render,
     SharedString, Window,
 };
-
-use crate::button::Button;
-use crate::menu::PopupMenu;
+use ui::button::Button;
+use ui::menu::PopupMenu;
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum PanelEvent {
@@ -21,6 +20,12 @@ pub enum PanelStyle {
     TabBar,
 }
 
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub struct TitleStyle {
+    pub background: Hsla,
+    pub foreground: Hsla,
+}
+
 pub trait Panel: EventEmitter<PanelEvent> + Render + Focusable {
     /// The name of the panel used to serialize, deserialize and identify the panel.
     ///

crates/dock/src/resizable/mod.rs

@@ -1,7 +1,7 @@
 use std::ops::Range;
 
 use gpui::{
-    Along, App, Axis, Bounds, Context, ElementId, EventEmitter, IsZero, Pixels, Window, px,
+    px, Along, App, Axis, Bounds, Context, ElementId, EventEmitter, IsZero, Pixels, Window,
 };
 
 mod panel;
@@ -142,10 +142,10 @@ impl ResizableState {
     pub(crate) fn remove_panel(&mut self, panel_ix: usize, cx: &mut Context<Self>) {
         self.panels.remove(panel_ix);
         self.sizes.remove(panel_ix);
-        if let Some(resizing_panel_ix) = self.resizing_panel_ix
-            && resizing_panel_ix > panel_ix
-        {
-            self.resizing_panel_ix = Some(resizing_panel_ix - 1);
+        if let Some(resizing_panel_ix) = self.resizing_panel_ix {
+            if resizing_panel_ix > panel_ix {
+                self.resizing_panel_ix = Some(resizing_panel_ix - 1);
+            }
         }
         self.adjust_to_container_size(cx);
     }

crates/dock/src/resizable/panel.rs

@@ -3,15 +3,14 @@ use std::rc::Rc;
 
 use gpui::prelude::FluentBuilder;
 use gpui::{
-    Along, AnyElement, App, AppContext, Axis, Bounds, Context, Element, ElementId, Empty, Entity,
-    EventEmitter, InteractiveElement as _, IntoElement, IsZero as _, MouseMoveEvent, MouseUpEvent,
-    ParentElement, Pixels, Render, RenderOnce, Style, Styled, Window, div,
+    div, Along, AnyElement, App, AppContext, Axis, Bounds, Context, Element, ElementId, Empty,
+    Entity, EventEmitter, InteractiveElement as _, IntoElement, IsZero as _, MouseMoveEvent,
+    MouseUpEvent, ParentElement, Pixels, Render, RenderOnce, Style, Styled, Window,
 };
-use theme::AxisExt;
+use ui::{h_flex, v_flex, AxisExt, ElementExt};
 
-use super::{ResizableState, resizable_panel, resize_handle};
+use super::{resizable_panel, resize_handle, ResizableState};
 use crate::resizable::PANEL_MIN_SIZE;
-use crate::{ElementExt, h_flex, v_flex};
 
 pub enum ResizablePanelEvent {
     Resized,
@@ -241,19 +240,17 @@ impl RenderOnce for ResizablePanel {
         let state = self
             .state
             .expect("BUG: The `state` in ResizablePanel should be present.");
-
         let panel_state = state
             .read(cx)
             .panels
             .get(self.panel_ix)
             .expect("BUG: The `index` of ResizablePanel should be one of in `state`.");
-
         let size_range = self.size_range.clone();
 
         div()
             .id(("resizable-panel", self.panel_ix))
             .flex()
-            .flex_grow_1()
+            .flex_grow()
             .size_full()
             .relative()
             .when(self.axis.is_vertical(), |this| {
@@ -265,7 +262,7 @@ impl RenderOnce for ResizablePanel {
             // 1. initial_size is None, to use auto size.
             // 2. initial_size is Some and size is none, to use the initial size of the panel for first time render.
             // 3. initial_size is Some and size is Some, use `size`.
-            .when(self.initial_size.is_none(), |this| this.flex_shrink_1())
+            .when(self.initial_size.is_none(), |this| this.flex_shrink())
             .when_some(self.initial_size, |this, initial_size| {
                 // The `self.size` is None, that mean the initial size for the panel,
                 // so we need set `flex_shrink_0` To let it keep the initial size.

crates/dock/src/resizable/resize_handle.rs

@@ -3,11 +3,12 @@ use std::rc::Rc;
 
 use gpui::prelude::FluentBuilder as _;
 use gpui::{
-    AnyElement, App, Axis, Element, ElementId, Entity, GlobalElementId, InteractiveElement,
-    IntoElement, MouseDownEvent, MouseUpEvent, ParentElement as _, Pixels, Point, Render,
-    StatefulInteractiveElement, Styled as _, Window, div, px,
+    div, px, AnyElement, App, Axis, Element, ElementId, Entity, GlobalElementId,
+    InteractiveElement, IntoElement, MouseDownEvent, MouseUpEvent, ParentElement as _, Pixels,
+    Point, Render, StatefulInteractiveElement, Styled as _, Window,
 };
-use theme::{ActiveTheme, AxisExt};
+use theme::ActiveTheme;
+use ui::AxisExt;
 
 use crate::dock::DockPlacement;
 
@@ -112,12 +113,12 @@ impl<T: 'static, E: 'static + Render> Element for ResizeHandle<T, E> {
             let state = state.unwrap_or(ResizeHandleState::default());
 
             let bg_color = if state.is_active() {
-                cx.theme().border_selected
+                cx.theme().border_variant
             } else {
                 cx.theme().border
             };
 
-            let mut ele = div()
+            let mut el = div()
                 .id(self.id.clone())
                 .occlude()
                 .absolute()
@@ -160,15 +161,16 @@ impl<T: 'static, E: 'static + Render> Element for ResizeHandle<T, E> {
                 })
                 .child(
                     div()
+                        .bg(bg_color)
                         .group_hover("handle", |this| this.bg(bg_color))
                         .when(axis.is_horizontal(), |this| this.h_full().w(HANDLE_SIZE))
                         .when(axis.is_vertical(), |this| this.w_full().h(HANDLE_SIZE)),
                 )
                 .into_any_element();
 
-            let layout_id = ele.request_layout(window, cx);
+            let layout_id = el.request_layout(window, cx);
 
-            ((layout_id, ele), state)
+            ((layout_id, el), state)
         })
     }
 

crates/dock/src/stack_panel.rs

@@ -1,21 +1,22 @@
 use std::sync::Arc;
 
+use gpui::prelude::FluentBuilder;
 use gpui::{
     App, AppContext, Axis, Context, DismissEvent, Entity, EventEmitter, FocusHandle, Focusable,
     IntoElement, ParentElement, Pixels, Render, SharedString, Styled, Subscription, WeakEntity,
     Window,
 };
 use smallvec::SmallVec;
-use theme::{AxisExt as _, Placement};
+use theme::{ActiveTheme, CLIENT_SIDE_DECORATION_ROUNDING};
+use ui::{h_flex, AxisExt as _, Placement};
 
 use super::{DockArea, PanelEvent};
-use crate::dock::panel::{Panel, PanelView};
-use crate::dock::tab_panel::TabPanel;
-use crate::h_flex;
+use crate::panel::{Panel, PanelView};
 use crate::resizable::{
-    PANEL_MIN_SIZE, ResizablePanelEvent, ResizablePanelGroup, ResizablePanelState, ResizableState,
-    resizable_panel,
+    resizable_panel, ResizablePanelEvent, ResizablePanelGroup, ResizablePanelState, ResizableState,
+    PANEL_MIN_SIZE,
 };
+use crate::tab_panel::TabPanel;
 
 pub struct StackPanel {
     pub(super) parent: Option<WeakEntity<StackPanel>>,
@@ -69,10 +70,10 @@ impl StackPanel {
             return false;
         }
 
-        if let Some(parent) = &self.parent
-            && let Some(parent) = parent.upgrade()
-        {
-            return parent.read(cx).is_last_panel(cx);
+        if let Some(parent) = &self.parent {
+            if let Some(parent) = parent.upgrade() {
+                return parent.read(cx).is_last_panel(cx);
+            }
         }
 
         true
@@ -296,11 +297,12 @@ impl StackPanel {
 
     /// Find the first top left in the stack.
     pub fn left_top_tab_panel(&self, check_parent: bool, cx: &App) -> Option<Entity<TabPanel>> {
-        if check_parent
-            && let Some(parent) = self.parent.as_ref().and_then(|parent| parent.upgrade())
-            && let Some(panel) = parent.read(cx).left_top_tab_panel(true, cx)
-        {
-            return Some(panel);
+        if check_parent {
+            if let Some(parent) = self.parent.as_ref().and_then(|parent| parent.upgrade()) {
+                if let Some(panel) = parent.read(cx).left_top_tab_panel(true, cx) {
+                    return Some(panel);
+                }
+            }
         }
 
         let first_panel = self.panels.first();
@@ -319,11 +321,12 @@ impl StackPanel {
 
     /// Find the first top right in the stack.
     pub fn right_top_tab_panel(&self, check_parent: bool, cx: &App) -> Option<Entity<TabPanel>> {
-        if check_parent
-            && let Some(parent) = self.parent.as_ref().and_then(|parent| parent.upgrade())
-            && let Some(panel) = parent.read(cx).right_top_tab_panel(true, cx)
-        {
-            return Some(panel);
+        if check_parent {
+            if let Some(parent) = self.parent.as_ref().and_then(|parent| parent.upgrade()) {
+                if let Some(panel) = parent.read(cx).right_top_tab_panel(true, cx) {
+                    return Some(panel);
+                }
+            }
         }
 
         let panel = if self.axis.is_vertical() {
@@ -373,15 +376,22 @@ impl EventEmitter<DismissEvent> for StackPanel {}
 
 impl Render for StackPanel {
     fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        h_flex().size_full().overflow_hidden().child(
-            ResizablePanelGroup::new("stack-panel-group")
-                .with_state(&self.state)
-                .axis(self.axis)
-                .children(self.panels.clone().into_iter().map(|panel| {
-                    resizable_panel()
-                        .child(panel.view())
-                        .visible(panel.visible(cx))
-                })),
-        )
+        h_flex()
+            .size_full()
+            .overflow_hidden()
+            .bg(cx.theme().panel_background)
+            .when(cx.theme().platform.is_linux(), |this| {
+                this.rounded_br(CLIENT_SIDE_DECORATION_ROUNDING)
+            })
+            .child(
+                ResizablePanelGroup::new("stack-panel-group")
+                    .with_state(&self.state)
+                    .axis(self.axis)
+                    .children(self.panels.clone().into_iter().map(|panel| {
+                        resizable_panel()
+                            .child(panel.view())
+                            .visible(panel.visible(cx))
+                    })),
+            )
     }
 }

crates/dock/src/tab/mod.rs

@@ -0,0 +1,165 @@
+use gpui::prelude::FluentBuilder;
+use gpui::{
+    div, px, AnyElement, App, Div, InteractiveElement, IntoElement, MouseButton, ParentElement,
+    RenderOnce, StatefulInteractiveElement, Styled, Window,
+};
+use theme::{ActiveTheme, TABBAR_HEIGHT};
+use ui::{Selectable, Sizable, Size};
+
+pub mod tab_bar;
+
+#[derive(IntoElement)]
+pub struct Tab {
+    ix: usize,
+    base: Div,
+    label: Option<AnyElement>,
+    prefix: Option<AnyElement>,
+    suffix: Option<AnyElement>,
+    disabled: bool,
+    selected: bool,
+    size: Size,
+}
+
+impl Tab {
+    pub fn new() -> Self {
+        Self {
+            ix: 0,
+            base: div(),
+            label: None,
+            disabled: false,
+            selected: false,
+            prefix: None,
+            suffix: None,
+            size: Size::default(),
+        }
+    }
+
+    /// Set label for the tab.
+    pub fn label(mut self, label: impl Into<AnyElement>) -> Self {
+        self.label = Some(label.into());
+        self
+    }
+
+    /// Set the left side of the tab
+    pub fn prefix(mut self, prefix: impl Into<AnyElement>) -> Self {
+        self.prefix = Some(prefix.into());
+        self
+    }
+
+    /// Set the right side of the tab
+    pub fn suffix(mut self, suffix: impl Into<AnyElement>) -> Self {
+        self.suffix = Some(suffix.into());
+        self
+    }
+
+    /// Set disabled state to the tab
+    pub fn disabled(mut self, disabled: bool) -> Self {
+        self.disabled = disabled;
+        self
+    }
+
+    /// Set index to the tab.
+    pub fn ix(mut self, ix: usize) -> Self {
+        self.ix = ix;
+        self
+    }
+}
+
+impl Default for Tab {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl Selectable for Tab {
+    fn selected(mut self, selected: bool) -> Self {
+        self.selected = selected;
+        self
+    }
+
+    fn is_selected(&self) -> bool {
+        self.selected
+    }
+}
+
+impl InteractiveElement for Tab {
+    fn interactivity(&mut self) -> &mut gpui::Interactivity {
+        self.base.interactivity()
+    }
+}
+
+impl StatefulInteractiveElement for Tab {}
+
+impl Styled for Tab {
+    fn style(&mut self) -> &mut gpui::StyleRefinement {
+        self.base.style()
+    }
+}
+
+impl Sizable for Tab {
+    fn with_size(mut self, size: impl Into<Size>) -> Self {
+        self.size = size.into();
+        self
+    }
+}
+
+impl RenderOnce for Tab {
+    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
+        let (text_color, hover_text_color, bg_color, border_color) =
+            match (self.selected, self.disabled) {
+                (true, false) => (
+                    cx.theme().tab_active_foreground,
+                    cx.theme().tab_hover_foreground,
+                    cx.theme().tab_active_background,
+                    cx.theme().border,
+                ),
+                (false, false) => (
+                    cx.theme().tab_inactive_foreground,
+                    cx.theme().tab_hover_foreground,
+                    cx.theme().ghost_element_background,
+                    cx.theme().border_transparent,
+                ),
+                (true, true) => (
+                    cx.theme().tab_inactive_foreground,
+                    cx.theme().tab_hover_foreground,
+                    cx.theme().ghost_element_background,
+                    cx.theme().border_disabled,
+                ),
+                (false, true) => (
+                    cx.theme().tab_inactive_foreground,
+                    cx.theme().tab_hover_foreground,
+                    cx.theme().ghost_element_background,
+                    cx.theme().border_disabled,
+                ),
+            };
+
+        self.base
+            .id(self.ix)
+            .h(TABBAR_HEIGHT)
+            .px_4()
+            .relative()
+            .flex()
+            .items_center()
+            .flex_shrink_0()
+            .cursor_pointer()
+            .overflow_hidden()
+            .text_xs()
+            .text_ellipsis()
+            .text_color(text_color)
+            .bg(bg_color)
+            .border_l(px(1.))
+            .border_r(px(1.))
+            .border_color(border_color)
+            .when(!self.selected && !self.disabled, |this| {
+                this.hover(|this| this.text_color(hover_text_color))
+            })
+            .when_some(self.prefix, |this, prefix| {
+                this.child(prefix).text_color(text_color)
+            })
+            .when_some(self.label, |this, label| this.child(label))
+            .when_some(self.suffix, |this, suffix| this.child(suffix))
+            .on_mouse_down(MouseButton::Left, |_ev, _window, cx| {
+                cx.stop_propagation();
+            })
+    }
+}

crates/dock/src/tab/tab_bar.rs

@@ -0,0 +1,127 @@
+use gpui::prelude::FluentBuilder as _;
+#[cfg(not(target_os = "windows"))]
+use gpui::Pixels;
+use gpui::{
+    div, px, AnyElement, App, Div, InteractiveElement, IntoElement, ParentElement, RenderOnce,
+    ScrollHandle, StatefulInteractiveElement as _, StyleRefinement, Styled, Window,
+};
+use smallvec::SmallVec;
+use theme::ActiveTheme;
+use ui::{h_flex, Sizable, Size, StyledExt};
+
+#[derive(IntoElement)]
+pub struct TabBar {
+    base: Div,
+    style: StyleRefinement,
+    scroll_handle: Option<ScrollHandle>,
+    prefix: Option<AnyElement>,
+    suffix: Option<AnyElement>,
+    last_empty_space: AnyElement,
+    children: SmallVec<[AnyElement; 2]>,
+    size: Size,
+}
+
+impl TabBar {
+    pub fn new() -> Self {
+        Self {
+            base: h_flex().px(px(-1.)),
+            style: StyleRefinement::default(),
+            scroll_handle: None,
+            children: SmallVec::new(),
+            prefix: None,
+            suffix: None,
+            size: Size::default(),
+            last_empty_space: div().w_3().into_any_element(),
+        }
+    }
+
+    /// Track the scroll of the TabBar.
+    pub fn track_scroll(mut self, scroll_handle: &ScrollHandle) -> Self {
+        self.scroll_handle = Some(scroll_handle.clone());
+        self
+    }
+
+    /// Set the prefix element of the TabBar
+    pub fn prefix(mut self, prefix: impl IntoElement) -> Self {
+        self.prefix = Some(prefix.into_any_element());
+        self
+    }
+
+    /// Set the suffix element of the TabBar
+    pub fn suffix(mut self, suffix: impl IntoElement) -> Self {
+        self.suffix = Some(suffix.into_any_element());
+        self
+    }
+
+    /// Set the last empty space element of the TabBar.
+    pub fn last_empty_space(mut self, last_empty_space: impl IntoElement) -> Self {
+        self.last_empty_space = last_empty_space.into_any_element();
+        self
+    }
+
+    #[cfg(not(target_os = "windows"))]
+    pub fn height(window: &mut Window) -> Pixels {
+        (1.75 * window.rem_size()).max(px(36.))
+    }
+}
+
+impl Default for TabBar {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl ParentElement for TabBar {
+    fn extend(&mut self, elements: impl IntoIterator<Item = AnyElement>) {
+        self.children.extend(elements)
+    }
+}
+
+impl Styled for TabBar {
+    fn style(&mut self) -> &mut StyleRefinement {
+        &mut self.style
+    }
+}
+
+impl Sizable for TabBar {
+    fn with_size(mut self, size: impl Into<Size>) -> Self {
+        self.size = size.into();
+        self
+    }
+}
+
+impl RenderOnce for TabBar {
+    fn render(self, _window: &mut Window, cx: &mut App) -> impl IntoElement {
+        self.base
+            .group("tab-bar")
+            .relative()
+            .refine_style(&self.style)
+            .bg(cx.theme().surface_background)
+            .child(
+                div()
+                    .id("border-bottom")
+                    .absolute()
+                    .left_0()
+                    .bottom_0()
+                    .size_full()
+                    .border_b_1()
+                    .border_color(cx.theme().border),
+            )
+            .text_color(cx.theme().text)
+            .when_some(self.prefix, |this, prefix| this.child(prefix))
+            .child(
+                h_flex()
+                    .id("tabs")
+                    .flex_grow()
+                    .overflow_x_scroll()
+                    .when_some(self.scroll_handle, |this, scroll_handle| {
+                        this.track_scroll(&scroll_handle)
+                    })
+                    .children(self.children)
+                    .when(self.suffix.is_some(), |this| {
+                        this.child(self.last_empty_space)
+                    }),
+            )
+            .when_some(self.suffix, |this, suffix| this.child(suffix))
+    }
+}