clean up

Reviewed-on: #33

.github/workflows/release.yml

@@ -159,7 +159,7 @@ jobs:
         id: create_release
         uses: akkuman/gitea-release-action@v1
         with:
-          server_url: "https://git.reya.su/"
+          server_url: "https://git.reya.info/"
           repository: "reya/signed"
           token: ${{ secrets.GITEA_TOKEN }}
           draft: true

.gitignore

@@ -6,7 +6,7 @@ dist/
 
 # Snap and Flatpak local build output
 /snap
-/su.reya.signed.json
+/info.reya.signed.json
 /linux-artifacts
 
 # Vendored dependencies + cargo config generated by script/prepare-flathub

.rules

@@ -1,174 +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, `git_ui: 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
-```
-
-# Rules Hygiene
-
-These `.rules` files are read by every agent session. Keep them high-signal.
-
-## After any agentic session
-If you discover a non-obvious pattern that would help future sessions, include a **"Suggested .rules additions"** heading in your PR description with the proposed text. Do **not** edit `.rules` inline during normal feature/fix work. Reviewers decide what gets merged.
-
-## High bar for new rules
-Editing or clarifying existing rules is always welcome. New rules must meet **all three** criteria:
-1. **Non-obvious** — someone familiar with the codebase would still get it wrong without the rule.
-2. **Repeatedly encountered** — it came up more than once (multiple hits in one session counts).
-3. **Specific enough to act on** — a concrete instruction, not a vague principle.
-
-Rules that apply to a single crate belong in that crate's own `.rules` file, not the repo root.
-
-## What NOT to put in `.rules`
-Avoid architectural descriptions of a crate (module layout, data flow, key types). These go stale fast and the agent can gather them by reading the code. Rules should be **traps to avoid**, not **maps to follow**.
-
-## No drive-by additions
-Rules emerge from validated patterns, not one-off observations. The workflow is:
-1. Agent notes a pattern during a session.
-2. Team validates the pattern in code review.
-3. A dedicated commit adds the rule with context on *why* it exists.

AGENTS.md

@@ -1 +1,162 @@
-.rules
+# 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.
+* Keep doc comments and comments simple, one line, straightforward, and unbloated.
+* Prefer implementing functionality in existing files unless it is a new logical component. Avoid creating many small files.
+* Prefer `impl` blocks over standalone functions: place functionality as methods or associated functions on the relevant type, extending the type's existing `impl` block instead of creating a duplicate one in another file.
+* Do not wrap clients or SDK dependencies in project structs or pass-through helper functions, call their methods directly where needed. Extract a helper only when it holds real logic that is used in more than one place.
+* Bind a global store handle to a local before using it (`let state = GlobalState::global(cx);` then `state.update(...)`) instead of chaining on `CheckoutsStore::global(cx)` inline.
+* 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)`.
+
+Prefer keeping a task in a field over `.detach()` when the work belongs to a view or store. A detached task outlives the view that started it (for example, a repository panel the user has closed), while a task stored in a field is cancelled when that struct drops. A finished `Task` held in a container is not reaped by GPUI - it stays alive until its handle is dropped - so if the container can accumulate many runs, either drop the finished handles before pushing a new one, or hold a single `Option<Task<_>>` and replace it.
+
+## 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.
+
+GPUI also tracks the entities a window reads while rendering. When an entity notifies, every view that read that entity during the previous frame is rerendered automatically.
+
+* A view that reads an entity in render (e.g. `state.read(cx).profile(...)`) does not need `cx.observe(&entity, ...)` to pick up its changes - the read itself is the dependency. Reserve `cx.observe` and `cx.subscribe` for when the view must run logic in response to a change (rebuild derived state, re-query, dedupe), not to trigger a re-render.
+* Notify the narrowest entity holding the change. Notifying a global store rerenders every view that ever read it; notifying a per-panel entity rerenders only the panels reading it.
+* This works with cached panels (`panel.cached(...)`): a cached subtree repaints when the view it belongs to is invalidated.
+
+## 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
+```

CHANGELOG.md

@@ -0,0 +1,90 @@
+# Changelog
+
+## v0.2.0 - 2026/10/21
+
+### Added
+
+- Follow the operating system's native theme on macOS, Windows and Linux (KDE, GNOME), applying the OS colors, fonts, radii and accessibility preferences.
+- Add an identity import dialog, importing an existing identity by pasting its `nsec` secret key (encrypted with a new passphrase), NIP-49 `ncryptsec` (unlocked with its passphrase), or `bunker://` NIP-46 URI
+- Add a dropdown menu on the signed-in user button in the sidebar
+- Add sign-out feature, confirmed by an alert dialog before deleting the stored session credential
+- Add a quit action, bound to `secondary-q` (cmd on macOS, ctrl on others)
+- Allow choosing the default branch when publishing a repository
+- Detect when local commits are not on Nostr yet, showing an unsynced count badge on sidebar repository rows and a Sync now banner on the repository view
+- Add a step-by-step push checklist while publishing and syncing a repository
+- Add a `Reset remote to local` action that republishes the mirror and deletes grasp refs the mirror does not have
+
+### Changed
+
+- Use the built-in light/dark syntax highlighting palette instead of the Signed palette bundled in `signed.json` when the native theme is active
+- Increase the default theme corner radii from 2 to 4 and large radii from 6 to 8
+- Surface backend errors as error notifications in the workspace instead of silently dropping them
+- Break ties in repository activity lists by event id, so same-second events order deterministically
+- Restructure the backend around domain types: git operations behind a `Repo` type, the grasp push pipeline behind `GraspPush`, nostr connectivity behind `NostrBackend`, and shared helpers consolidated into `utils`
+- Fetch the logged-in user's grasp list, code follows, followed repositories, contacts, profile metadata, mute list, and blossom servers via gossip at login instead of the bootstrap relays
+- Connect to grasp relays and load the inbox only after the user's grasp list event arrives
+- Refresh the checkouts store only when the checkouts settings change
+- Restructure the core crate into focused modules for announcements, pull requests, git events, inbox, and upstream state
+- Publish nostr events directly through the client with relay acceptance required, removing the grasp push helper and its per-server retry loop so failures surface immediately
+- Poll the repository sync drift check every 180 seconds instead of 60
+- Track sync status per view instead of globally
+- Merge the `PixelAvatar` into the `Avatar` component. Seed user pixel avatars from the public key instead of the display name, so avatars stay stable when a user renames
+
+### Fixed
+
+- Fix the repository view refreshing its mirror from the network while a push is in progress, so the refresh no longer races the push
+- Fix opening a repository failing with a `destination already exists` error when two loads raced to clone its mirror, clones are now serialized and later loads reuse the finished clone
+- Fix a repository never opening again after an interrupted clone left an unusable mirror directory behind, which is now removed and re-cloned
+- Fix signing in with a `bunker://` URI silently generating a new identity instead of erroring when its master key cannot be parsed
+- Fix repository sync failing with `state event in purgatory ... doesn't match push` when grasp servers hold branches or tags the local repository lacks
+- Fix sync failing with `could not fetch refs/tags/...^{}` on repositories with annotated tags, where the peel entries `git ls-remote` reports for annotated tags were mistaken for missing refs
+
+### Removed
+
+- Remove the light/dark theme pickers and the font size, corner radius, focus ring and shadow settings from the settings dialog; colors and geometry now come from the native theme
+- Remove dead code: the unused `login`/`logout` family, the unwired `SyncProgress` pipeline, `merge_pull_request`, inbox mark-read/archive APIs and the wasm32-only code paths
+
+## v0.2.0-alpha - 2026/09/27
+
+### Added
+
+- Show an avatar in each panel's tab, using the repository owner's profile picture when set and a pixel avatar otherwise
+- Add a Tab Bar setting to hide the previous/next tab buttons, hidden by default
+- Add an Event Fetching Strategy setting, fetching a repository's activity from its announced relays only (Curated) or from every maintainer's relays as well (Uncensored, the default)
+
+### Changed
+
+- Migrate the GPUI foundation to the published `gpui-pre` crates and GPUI Kit 0.6, off the zed and gpui-component git pins
+- Use the pixel avatar as the single fallback for a missing picture, sized and rounded to match the other avatars
+- Redesign the dock tab bar, using muted grey active tab, added close buttons, double-click to zoom, and removed panel toolbar
+- Connect to bootstrap relays on demand instead of at startup
+- Fetch profile metadata in batches of 100 authors, applying every requested profile in a single database query
+- Prefetch the 500 most recent profiles at startup instead of 200
+
+### Fixed
+
+- Render every avatar at one consistent size, where a surrounding border had shrunk pictures by two pixels and the pixel avatar ignored an explicit size
+- Date repositories from their repository state event, so the explore list and open repository views show the latest push instead of the announcement date
+- Fix background tasks outliving their view, so a closed repository panel or pull request view stops fetching and publishing on its own
+
+### Removed
+
+- Remove cover note support, the kind-1624 GitWorkshop and `ngit` extension outside the NIP-34
+
+## v0.1.0-alpha - 2026/09/14
+
+Initial alpha release.
+
+### Added
+
+- Create and unlock a passphrase-protected Nostr identity
+- Browse and search NIP-34 repositories with All, Popular and Recent filters
+- Scan local Git repositories and detect their NIP-34 and GRASP bindings
+- Create, publish, clone and open repositories
+- Repository view with files, commit history, branches and tags
+- Colour-coded commit diffs
+- Issues and pull requests with discussions
+- Send patches and push branches
+- Inbox for repository activity
+- Settings for appearance, theme, GRASP servers and repository scan paths
+- Release and packaging infrastructure

Cargo.toml

@@ -4,33 +4,28 @@ members = ["crates/*", "desktop"]
 default-members = ["desktop"]
 
 [workspace.package]
-version = "0.1.0-alpha"
+version = "0.2.0"
 edition = "2024"
 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_tokio = { git = "https://github.com/zed-industries/zed" }
-reqwest_client = { git = "https://github.com/zed-industries/zed" }
+gpui = { git = "https://github.com/zed-industries/zed", rev = "f8cfc7ed9e57503def9479138894f3139f5400cc" }
+gpui_platform = { git = "https://github.com/zed-industries/zed", rev = "f8cfc7ed9e57503def9479138894f3139f5400cc", features = ["font-kit"] }
+reqwest_client = { git = "https://github.com/zed-industries/zed", rev = "f8cfc7ed9e57503def9479138894f3139f5400cc" }
 
-# GPUI Kit
-gpui-component = { git = "https://github.com/longbridge/gpui-component", rev = "39c2c86dbee7ad445591462f8675f74082e10828", features = ["tree-sitter-languages"], }
-gpui-base = { git = "https://github.com/longbridge/gpui-component", rev = "39c2c86dbee7ad445591462f8675f74082e10828" }
+gpui-native-kit = { git = "https://git.reya.info/reya/gpui-native-kit", rev = "6667c812597bd2adf415d29a4e50355bb3bf06ee", features = ["layout", "editor"] }
 
-dock = { path = "crates/dock" }
 settings = { path = "crates/settings" }
+signed_app = { path = "crates/signed_app" }
 
 nostr = { git = "https://github.com/rust-nostr/nostr", features = ["nip59", "nip49", "nip44", "os-rng"] }
 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-sdk = { git = "https://github.com/rust-nostr/nostr" }
 
-gix = { version = "0.87.1", default-features = false, features = ["sha1", "blocking-network-client", "blocking-http-transport-reqwest-rust-tls", "worktree-mutation", "status"] }
+gix = { version = "0.88", default-features = false, features = ["sha1", "blocking-network-client", "blocking-http-transport-reqwest-rust-tls", "worktree-mutation", "status"] }
 
 smol = "2"
 futures = "0.3"
@@ -47,10 +42,6 @@ tracing = "0.1"
 errno = { version = "0.3.14", default-features = false }
 instant = "0.1"
 
-[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
 opt-level = "z"

crates/assets/Cargo.toml

@@ -6,8 +6,7 @@ publish.workspace = true
 
 [dependencies]
 gpui.workspace = true
-gpui-component.workspace = true
-anyhow.workspace = true
+gpui-native-kit.workspace = true
 rust-embed.workspace = true
 
 [dev-dependencies]

crates/assets/assets/icons/trash.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M3 6h18"/><path d="M8 6V4h8v2"/><path d="M19 6l-1 14H6L5 6"/></svg>

crates/assets/assets/themes/signed.json

@@ -1,433 +0,0 @@
-{
-  "$schema": "https://github.com/longbridge/gpui-component/raw/refs/heads/main/.theme-schema.json",
-  "name": "Signed",
-  "author": "Signed",
-  "themes": [
-    {
-      "is_default": true,
-      "name": "Signed Light",
-      "mode": "light",
-      "colors": {
-        "accent.background": "#F0F0F0",
-        "accent.foreground": "#202020",
-        "accordion.background": "#FFFFFF",
-        "background": "#FFFFFF",
-        "border": "#E4E4E7",
-        "caret": "#202020",
-        "chart.1": "#93C5FD",
-        "chart.2": "#3B82F6",
-        "chart.3": "#2563EB",
-        "chart.4": "#1D4ED8",
-        "chart.5": "#1E40AF",
-        "chart_bullish": "green-600",
-        "chart_bearish": "red-600",
-        "danger.background": "red-500",
-        "danger.foreground": "neutral-50",
-        "description_list.label.foreground": "#202020",
-        "drag.border": "#65A30D",
-        "drop_target.background": "#C6FF4D40",
-        "foreground": "#18181B",
-        "group_box.background": "#F0F0F0",
-        "group_box.foreground": "#202020",
-        "info.background": "cyan-500",
-        "info.foreground": "neutral-50",
-        "input.border": "#E4E4E7",
-        "link": "#3F6212",
-        "link.active": "#3F6212",
-        "link.hover": "#65A30D",
-        "list.background": "#FFFFFF",
-        "list.active.background": "#C6FF4D33",
-        "list.active.border": "#65A30D",
-        "list.even.background": "#F9F9F9",
-        "list.head.background": "#F9F9F9",
-        "list.hover.background": "#F0F0F0",
-        "muted.background": "#F9F9F9",
-        "muted.foreground": "#646464",
-        "overlay": "#0000000D",
-        "popover.background": "#FFFFFF",
-        "popover.foreground": "#18181B",
-        "primary.background": "#C6FF4D",
-        "primary.active.background": "#65A30D",
-        "primary.active.foreground": "#F7FEE7",
-        "primary.foreground": "#1A2E05",
-        "primary.hover.background": "#B7F03E",
-        "progress.bar.background": "#18181B",
-        "ring": "#BBBBBB",
-        "scrollbar.background": "#F9F9F900",
-        "scrollbar.thumb.background": "#BBBBBBE6",
-        "scrollbar.thumb.hover.background": "#BBBBBB",
-        "secondary.background": "#F0F0F0",
-        "secondary.active.background": "#E0E0E0",
-        "secondary.foreground": "#202020",
-        "secondary.hover.background": "#E8E8E8",
-        "selection.background": "#55A0FC",
-        "sidebar.background": "#F9F9F9",
-        "sidebar.accent.background": "#F0F0F0",
-        "sidebar.accent.foreground": "#202020",
-        "sidebar.border": "#E8E8E8",
-        "sidebar.foreground": "#202020",
-        "sidebar.primary.background": "#C6FF4D",
-        "sidebar.primary.foreground": "#1A2E05",
-        "skeleton.background": "#F0F0F0",
-        "slider.background": "#18181B",
-        "slider.thumb.background": "#FFFFFF",
-        "status_bar.background": "#F9F9F9",
-        "status_bar.border": "#E8E8E8",
-        "success.background": "#2FBF71",
-        "success.foreground": "#052E16",
-        "switch.background": "#CECECE",
-        "switch.thumb.background": "#FFFFFF",
-        "tab.background": "#00000000",
-        "tab.active.background": "#EBFFC1",
-        "tab.active.foreground": "#3F6212",
-        "tab.foreground": "#646464",
-        "tab_bar.background": "#F0F0F0",
-        "tab_bar.segmented.background": "#F0F0F0",
-        "table.background": "#FFFFFF",
-        "table.active.background": "#C6FF4D33",
-        "table.active.border": "#65A30D",
-        "table.even.background": "#F9F9F9",
-        "table.head.background": "#F9F9F9",
-        "table.head.foreground": "#838383",
-        "table.hover.background": "#F0F0F0",
-        "table.row.border": "#E8E8E8B3",
-        "tiles.background": "#F9F9F9",
-        "title_bar.background": "#F9F9F9",
-        "title_bar.border": "#E8E8E8",
-        "warning.background": "yellow-500",
-        "warning.foreground": "neutral-50",
-        "window.border": "#E8E8E8",
-        "base.red": "red-600",
-        "base.red.light": "red-400",
-        "base.green": "#16A34A",
-        "base.green.light": "green-400",
-        "base.blue": "blue-600",
-        "base.blue.light": "blue-400",
-        "base.yellow": "yellow-600",
-        "base.yellow.light": "yellow-400",
-        "base.magenta": "purple-600",
-        "base.magenta.light": "purple-400",
-        "base.cyan": "cyan-600",
-        "base.cyan.light": "cyan-400"
-      },
-      "highlight": {
-        "editor.foreground": "#000000",
-        "editor.background": "#ffffff",
-        "editor.active_line.background": "#F5F5F5",
-        "editor.line_number": "#929292",
-        "editor.active_line_number": "#000000",
-        "editor.invisible": "#73737366",
-        "conflict": "#C5060B",
-        "created": "#1642FF",
-        "hidden": "#6D6D6D",
-        "hint": "#9e5dff",
-        "modified": "#9e7008",
-        "predictive": "#A4ABB6",
-        "warning": "#C99401",
-        "syntax": {
-          "attribute": {
-            "color": "#957931"
-          },
-          "boolean": {
-            "color": "#C5060B"
-          },
-          "comment": {
-            "color": "#007fff"
-          },
-          "comment.doc": {
-            "color": "#007fff"
-          },
-          "constant": {
-            "color": "#C5060B"
-          },
-          "constructor": {
-            "color": "#0433ff"
-          },
-          "embedded": {
-            "color": "#333333"
-          },
-          "emphasis": {
-            "font_style": "italic"
-          },
-          "emphasis.strong": {
-            "font_weight": 700
-          },
-          "function": {
-            "color": "#0000A2"
-          },
-          "keyword": {
-            "color": "#0433ff"
-          },
-          "link_text": {
-            "color": "#0000A2",
-            "font_style": "normal"
-          },
-          "link_uri": {
-            "color": "#6A7293",
-            "font_style": "italic"
-          },
-          "number": {
-            "color": "#0433ff"
-          },
-          "string": {
-            "color": "#036A07"
-          },
-          "string.escape": {
-            "color": "#036A07"
-          },
-          "string.regex": {
-            "color": "#036A07"
-          },
-          "string.special": {
-            "color": "#d21f07"
-          },
-          "string.special.symbol": {
-            "color": "#d21f07"
-          },
-          "tag": {
-            "color": "#0433ff"
-          },
-          "text.literal": {
-            "color": "#6F42C1"
-          },
-          "text.code.span": {
-            "color": "#6F42C1"
-          },
-          "title": {
-            "color": "#0433FF"
-          },
-          "type": {
-            "color": "#6f42c1"
-          },
-          "property": {
-            "color": "#333333"
-          },
-          "variable": {
-            "color": "#333333"
-          },
-          "variable.special": {
-            "color": "#C5060B"
-          }
-        }
-      }
-    },
-    {
-      "is_default": true,
-      "name": "Signed Dark",
-      "mode": "dark",
-      "colors": {
-        "accent.background": "#222222",
-        "accent.foreground": "#EEEEEE",
-        "accordion.background": "#0A0A0A",
-        "background": "#0A0A0A",
-        "border": "#27272A",
-        "caret": "#EEEEEE",
-        "chart.1": "#93C5FD",
-        "chart.2": "#3B82F6",
-        "chart.3": "#2563EB",
-        "chart.4": "#1D4ED8",
-        "chart.5": "#1E40AF",
-        "chart_bullish": "green-600",
-        "chart_bearish": "red-600",
-        "danger.background": "red-400",
-        "danger.foreground": "red-600",
-        "description_list.label.background": "#191919",
-        "description_list.label.foreground": "#EEEEEE",
-        "drag.border": "#C6FF4D",
-        "drop_target.background": "#C6FF4D2E",
-        "foreground": "#FAFAFA",
-        "group_box.background": "#191919",
-        "group_box.foreground": "#EEEEEE",
-        "info.background": "cyan-400",
-        "info.foreground": "cyan-600",
-        "input.border": "#2F2F2F",
-        "link": "#A3E635",
-        "link.active": "#A3E635",
-        "link.hover": "#C6FF4D",
-        "list.background": "#0A0A0A",
-        "list.active.background": "#C6FF4D33",
-        "list.active.border": "#C6FF4D",
-        "list.even.background": "#191919",
-        "list.head.background": "#191919",
-        "list.hover.background": "#222222",
-        "muted.background": "#191919",
-        "muted.foreground": "#B4B4B4",
-        "overlay": "#00000033",
-        "popover.background": "#0A0A0A",
-        "popover.foreground": "#FAFAFA",
-        "primary.background": "#C6FF4D",
-        "primary.active.background": "#65A30D",
-        "primary.active.foreground": "#F7FEE7",
-        "primary.foreground": "#1A2E05",
-        "primary.hover.background": "#D6FF7A",
-        "progress.bar.background": "#FAFAFA",
-        "ring": "#606060",
-        "scrollbar.background": "#19191900",
-        "scrollbar.thumb.background": "#606060E6",
-        "scrollbar.thumb.hover.background": "#606060",
-        "secondary.background": "#222222",
-        "secondary.active.background": "#313131",
-        "secondary.foreground": "#EEEEEE",
-        "secondary.hover.background": "#2A2A2A",
-        "selection.background": "#1D4ED8",
-        "sidebar.background": "#111111",
-        "sidebar.accent.background": "#222222",
-        "sidebar.accent.foreground": "#EEEEEE",
-        "sidebar.border": "#2A2A2A",
-        "sidebar.foreground": "#EEEEEE",
-        "sidebar.primary.background": "#C6FF4D",
-        "sidebar.primary.foreground": "#1A2E05",
-        "skeleton.background": "#222222",
-        "slider.background": "#FAFAFA",
-        "slider.thumb.background": "#0A0A0A",
-        "status_bar.background": "#191919",
-        "status_bar.border": "#2A2A2A",
-        "success.background": "#2FBF71",
-        "success.foreground": "#052E16",
-        "switch.background": "#484848",
-        "switch.thumb.background": "#0A0A0A",
-        "tab.background": "#00000000",
-        "tab.active.background": "#19200A",
-        "tab.active.foreground": "#C6FF4D",
-        "tab.foreground": "#B4B4B4",
-        "tab_bar.background": "#191919",
-        "tab_bar.segmented.background": "#191919",
-        "table.background": "#0A0A0A",
-        "table.active.background": "#C6FF4D33",
-        "table.active.border": "#C6FF4D",
-        "table.even.background": "#191919",
-        "table.head.background": "#191919",
-        "table.head.foreground": "#7B7B7B",
-        "table.hover.background": "#222222",
-        "table.row.border": "#2A2A2AB3",
-        "tiles.background": "#191919",
-        "title_bar.background": "#191919",
-        "title_bar.border": "#2A2A2A",
-        "warning.background": "yellow-400",
-        "warning.foreground": "yellow-600",
-        "window.border": "#2A2A2A",
-        "base.red": "red-400",
-        "base.red.light": "red-300",
-        "base.green": "#22C55E",
-        "base.green.light": "green-300",
-        "base.blue": "blue-400",
-        "base.blue.light": "blue-300",
-        "base.yellow": "yellow-400",
-        "base.yellow.light": "yellow-300",
-        "base.magenta": "purple-400",
-        "base.magenta.light": "purple-300",
-        "base.cyan": "cyan-400",
-        "base.cyan.light": "cyan-300"
-      },
-      "highlight": {
-        "editor.foreground": "#CACCCA",
-        "editor.background": "#0a0a0a",
-        "editor.active_line.background": "#171717",
-        "editor.line_number": "#8F8F8F",
-        "editor.active_line_number": "#DDDDDD",
-        "editor.invisible": "#73737366",
-        "conflict": "#D2602D",
-        "created": "#3f72e2",
-        "created.background": "#0C4619",
-        "deleted.background": "#46190C",
-        "error.background": "#46190C",
-        "error.border": "#E44A4F",
-        "hidden": "#9E9E9E",
-        "hint": "#b283f8",
-        "hint.background": "#250c4b",
-        "hint.border": "#3f0891",
-        "info.background": "#0059D1",
-        "info.border": "#0059D1",
-        "modified": "#B0A878",
-        "modified.background": "#3A310E",
-        "predictive": "#5D5945",
-        "success.background": "#0C4619",
-        "warning.background": "#3A310E",
-        "warning.border": "#7B6508",
-        "syntax": {
-          "attribute": {
-            "color": "#7FAEF9"
-          },
-          "boolean": {
-            "color": "#CC9E00"
-          },
-          "comment": {
-            "color": "#9D9D9D"
-          },
-          "comment.doc": {
-            "color": "#9D9D9D"
-          },
-          "constant": {
-            "color": "#CC9E00"
-          },
-          "constructor": {
-            "color": "#CBA6F7"
-          },
-          "embedded": {
-            "color": "#CACCCA"
-          },
-          "emphasis": {
-            "font_style": "italic"
-          },
-          "emphasis.strong": {
-            "font_weight": 700
-          },
-          "function": {
-            "color": "#B3C5F3"
-          },
-          "keyword": {
-            "color": "#87B1F6"
-          },
-          "link_text": {
-            "color": "#419CFF",
-            "font_style": "normal"
-          },
-          "link_uri": {
-            "color": "#7faef9",
-            "font_style": "italic"
-          },
-          "number": {
-            "color": "#CC9E00"
-          },
-          "string": {
-            "color": "#A3E09F"
-          },
-          "string.escape": {
-            "color": "#68DC7C"
-          },
-          "string.regex": {
-            "color": "#68DC7C"
-          },
-          "string.special": {
-            "color": "#A3E09F"
-          },
-          "string.special.symbol": {
-            "color": "#A3E09F"
-          },
-          "tag": {
-            "color": "#419CFF"
-          },
-          "text.literal": {
-            "color": "#A3E09F"
-          },
-          "text.code.span": {
-            "color": "#A3E09F"
-          },
-          "title": {
-            "color": "#CC9E00",
-            "font_weight": 600
-          },
-          "type": {
-            "color": "#CBA6F7"
-          },
-          "property": {
-            "color": "#BCC4E0"
-          },
-          "variable.special": {
-            "color": "#419CFF"
-          }
-        }
-      }
-    }
-  ]
-}

crates/assets/src/lib.rs

@@ -1,12 +1,10 @@
-use anyhow::Context;
 use gpui::{AssetSource, Result, SharedString};
-use gpui_component::IconNamed;
+use gpui_native_kit::icons::IconNamed;
 use rust_embed::RustEmbed;
 
 #[derive(RustEmbed)]
 #[folder = "assets"]
 #[include = "icons/**/*.svg"]
-#[include = "themes/**/*.json"]
 #[include = "backgrounds/**/*.jpg"]
 #[include = "backgrounds/**/*.png"]
 #[exclude = "*.DS_Store"]
@@ -14,35 +12,19 @@ pub struct Assets;
 
 impl AssetSource for Assets {
     fn load(&self, path: &str) -> Result<Option<std::borrow::Cow<'static, [u8]>>> {
-        Self::get(path)
-            .map(|f| Some(f.data))
-            .with_context(|| format!("loading asset at path {path:?}"))
+        if let Some(file) = Self::get(path) {
+            return Ok(Some(file.data));
+        }
+        gpui_native_kit::icons::IconAssets.load(path)
     }
 
     fn list(&self, path: &str) -> Result<Vec<SharedString>> {
-        Ok(Self::iter()
-            .filter_map(|p| {
-                if p.starts_with(path) {
-                    Some(p.into())
-                } else {
-                    None
-                }
-            })
-            .collect())
-    }
-}
-
-impl Assets {
-    pub fn themes(&self) -> Vec<(String, String)> {
-        Self::iter()
-            .filter(|path| path.starts_with("themes/"))
-            .filter_map(|path| {
-                let data = Self::get(path.as_ref())?;
-                let name = path.strip_prefix("themes/").unwrap_or(path.as_ref());
-                let content = std::str::from_utf8(data.data.as_ref()).ok()?.to_owned();
-                Some((name.to_owned(), content))
-            })
-            .collect()
+        let mut paths: Vec<SharedString> = Self::iter()
+            .filter(|p| p.starts_with(path))
+            .map(Into::into)
+            .collect();
+        paths.extend(gpui_native_kit::icons::IconAssets.list(path)?);
+        Ok(paths)
     }
 }
 
@@ -72,6 +54,11 @@ pub enum CustomIconName {
     Refresh,
     Grid,
     Init,
+    EllipsisVertical,
+    ArrowUp,
+    Trash,
+    Globe,
+    Inbox,
 }
 
 impl IconNamed for CustomIconName {
@@ -102,6 +89,11 @@ impl IconNamed for CustomIconName {
             CustomIconName::Recent => "icons/recent.svg",
             CustomIconName::Grid => "icons/grid.svg",
             CustomIconName::Init => "icons/init.svg",
+            CustomIconName::EllipsisVertical => "icons/ellipsis-vertical.svg",
+            CustomIconName::ArrowUp => "icons/arrow-up.svg",
+            CustomIconName::Trash => "icons/trash.svg",
+            CustomIconName::Globe => "icons/globe.svg",
+            CustomIconName::Inbox => "icons/inbox.svg",
         }
         .into()
     }

crates/dock/Cargo.toml

@@ -1,15 +0,0 @@
-[package]
-name = "dock"
-description = "The Signed dock skin over gpui-component's upstream dock (gpui_base::dock engine + renderer traits)."
-version.workspace = true
-edition.workspace = true
-publish.workspace = true
-
-[dependencies]
-gpui.workspace = true
-gpui-component.workspace = true
-gpui-base.workspace = true
-signed_ui = { path = "../signed_ui" }
-
-[dev-dependencies]
-gpui = { workspace = true, features = ["test-support"] }

crates/dock/src/dock_area.rs

@@ -1,314 +0,0 @@
-use std::cell::Cell;
-use std::ops::Deref as _;
-use std::rc::Rc;
-use std::sync::Arc;
-
-use gpui::prelude::FluentBuilder as _;
-use gpui::{
-    AnyElement, App, AppContext as _, Axis, Context, Div, Element, Empty, InteractiveElement as _,
-    IntoElement, MouseMoveEvent, MouseUpEvent, ParentElement as _, Pixels, Render, Stateful, Style,
-    Styled as _, WeakEntity, Window, div, px,
-};
-use gpui_base::dock::{
-    DockArea, DockAreaRenderer, DockContext, DockEvent, DockPlacement, NodeId, PanelState,
-    PanelView, TabGroupRenderer, TilesRenderer,
-};
-use gpui_base::resize_handle;
-use gpui_component::scroll::ScrollbarMode;
-use gpui_component::{ActiveTheme as _, Side};
-
-use crate::invalid_panel::InvalidPanel;
-use crate::tab_panel::SignedTabGroupSkin;
-use crate::tiles::SignedTilesSkin;
-use crate::{TAB_BAR_HEIGHT, panel_handle};
-
-/// State the skin shares with its per-container renderers.
-pub(crate) struct SkinShared {
-    area: WeakEntity<DockArea>,
-    toggle_button_visible: Cell<bool>,
-    tiles_scrollbar_mode: Cell<Option<ScrollbarMode>>,
-    /// The dock whose resize handle is being dragged, if any. Only one can be.
-    resizing_dock: Cell<Option<DockPlacement>>,
-}
-
-impl SkinShared {
-    pub(crate) fn area(&self) -> &WeakEntity<DockArea> {
-        &self.area
-    }
-
-    pub(crate) fn is_toggle_button_visible(&self) -> bool {
-        self.toggle_button_visible.get()
-    }
-
-    pub(crate) fn tiles_scrollbar_mode(&self) -> Option<ScrollbarMode> {
-        self.tiles_scrollbar_mode.get()
-    }
-
-    pub(crate) fn resizing_dock(&self) -> &Cell<Option<DockPlacement>> {
-        &self.resizing_dock
-    }
-
-    /// Redraw the area after a setting changed. The skin is not an entity, so nothing else would.
-    pub(crate) fn notify(&self, cx: &mut App) {
-        _ = self.area.update(cx, |_, cx| cx.notify());
-    }
-}
-
-/// The Signed appearance for a [`DockArea`].
-/// Install it in the constructor, the only place the area's weak handle is available.
-///
-/// ```ignore
-/// let dock = cx.new(|cx| {
-///     let skin = SignedDockSkin::new(cx);
-///     DockArea::new("dock", Some(1), window, cx).with_renderer(skin)
-/// });
-/// ```
-pub struct SignedDockSkin {
-    shared: Rc<SkinShared>,
-}
-
-impl SignedDockSkin {
-    pub fn new(cx: &mut Context<DockArea>) -> Rc<Self> {
-        Rc::new(Self {
-            shared: Rc::new(SkinShared {
-                area: cx.weak_entity(),
-                toggle_button_visible: Cell::new(true),
-                tiles_scrollbar_mode: Cell::new(None),
-                resizing_dock: Cell::new(None),
-            }),
-        })
-    }
-
-    pub(crate) fn shared(&self) -> &Rc<SkinShared> {
-        &self.shared
-    }
-
-    /// Whether tab bars offer the affordance that collapses a neighbouring dock.
-    pub fn is_toggle_button_visible(&self) -> bool {
-        self.shared.is_toggle_button_visible()
-    }
-
-    pub fn set_toggle_button_visible(&self, visible: bool, cx: &mut App) {
-        self.shared.toggle_button_visible.set(visible);
-        self.shared.notify(cx);
-    }
-
-    /// When a tiles canvas shows its scrollbar. `None` follows the theme.
-    pub fn tiles_scrollbar_mode(&self) -> Option<ScrollbarMode> {
-        self.shared.tiles_scrollbar_mode()
-    }
-
-    pub fn set_tiles_scrollbar_mode(&self, mode: Option<ScrollbarMode>, cx: &mut App) {
-        self.shared.tiles_scrollbar_mode.set(mode);
-        self.shared.notify(cx);
-    }
-}
-
-/// Payload a dock's resize handle drags.
-///
-/// It draws nothing, the handle element is the visible affordance.
-#[derive(Clone)]
-struct ResizePanel;
-
-impl Render for ResizePanel {
-    fn render(&mut self, _: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
-        Empty
-    }
-}
-
-impl DockAreaRenderer for SignedDockSkin {
-    fn frame(&self, _: &mut Window, _: &mut App) -> Stateful<Div> {
-        div()
-            .id("dock-area")
-            .relative()
-            .size_full()
-            .overflow_hidden()
-            .flex()
-            .flex_row()
-    }
-
-    fn center_frame(&self, _: &mut Window, _: &mut App) -> Stateful<Div> {
-        div()
-            .id("dock-area-center")
-            .flex()
-            .flex_1()
-            .flex_col()
-            .overflow_hidden()
-    }
-
-    fn split_frame(&self, node: NodeId, _: Axis, _: &mut Window, cx: &mut App) -> Stateful<Div> {
-        // `size_full` and `flex_1` stop the frame collapsing in an unsizing parent.
-        div()
-            .id(("dock-split-frame", node.as_u64()))
-            .size_full()
-            .flex_1()
-            .min_h(px(0.))
-            .overflow_hidden()
-            .bg(cx.theme().tokens.tab_bar)
-    }
-
-    fn render_dock(
-        &self,
-        dock: &DockContext,
-        content: AnyElement,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> AnyElement {
-        let placement = dock.placement();
-
-        div()
-            .flex()
-            .size_full()
-            .relative()
-            // A closed bottom dock keeps a strip, and that strip is the tab bar.
-            .when(!dock.is_open() && placement.is_bottom(), |this| {
-                this.h(TAB_BAR_HEIGHT)
-            })
-            .child(content)
-            .child(self.render_resize_handle(dock, window, cx))
-            .child(DockResizeTracker {
-                dock: dock.clone(),
-                shared: self.shared().clone(),
-            })
-            .into_any_element()
-    }
-
-    /// Placeholder for a panel this build cannot construct.
-    /// It dumps the state it was handed, so the layout survives a load and save.
-    fn build_placeholder(
-        &self,
-        state: &PanelState,
-        _: &mut Window,
-        cx: &mut App,
-    ) -> Option<Arc<dyn PanelView>> {
-        let state = state.clone();
-        Some(panel_handle(cx.new(|cx| {
-            InvalidPanel::new(state.panel_name.clone(), state, cx)
-        })))
-    }
-
-    fn tab_group_renderer(&self) -> Rc<dyn TabGroupRenderer> {
-        Rc::new(SignedTabGroupSkin::new(self.shared().clone()))
-    }
-
-    fn tiles_renderer(&self) -> Rc<dyn TilesRenderer> {
-        Rc::new(SignedTilesSkin::new(self.shared().clone()))
-    }
-}
-
-impl SignedDockSkin {
-    fn render_resize_handle(
-        &self,
-        dock: &DockContext,
-        _: &mut Window,
-        _: &mut App,
-    ) -> impl IntoElement {
-        let placement = dock.placement();
-        let shared = self.shared().clone();
-
-        resize_handle("resize-handle", placement.axis())
-            .when(placement.is_left(), |this| this.placement(Side::Left))
-            .on_drag(ResizePanel, move |info, _, _, cx| {
-                cx.stop_propagation();
-                shared.resizing_dock().set(Some(placement));
-                cx.new(|_| info.deref().clone())
-            })
-    }
-}
-
-/// Turns the window's mouse stream into dock resizing.
-/// It draws nothing, the `paint` hook is the only window listener registration point.
-struct DockResizeTracker {
-    dock: DockContext,
-    shared: Rc<SkinShared>,
-}
-
-impl IntoElement for DockResizeTracker {
-    type Element = Self;
-
-    fn into_element(self) -> Self::Element {
-        self
-    }
-}
-
-impl Element for DockResizeTracker {
-    type PrepaintState = ();
-    type RequestLayoutState = ();
-
-    fn id(&self) -> Option<gpui::ElementId> {
-        None
-    }
-
-    fn source_location(&self) -> Option<&'static std::panic::Location<'static>> {
-        None
-    }
-
-    fn request_layout(
-        &mut self,
-        _: Option<&gpui::GlobalElementId>,
-        _: Option<&gpui::InspectorElementId>,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> (gpui::LayoutId, Self::RequestLayoutState) {
-        (window.request_layout(Style::default(), None, cx), ())
-    }
-
-    fn prepaint(
-        &mut self,
-        _: Option<&gpui::GlobalElementId>,
-        _: Option<&gpui::InspectorElementId>,
-        _: gpui::Bounds<Pixels>,
-        _: &mut Self::RequestLayoutState,
-        _: &mut Window,
-        _: &mut App,
-    ) -> Self::PrepaintState {
-    }
-
-    fn paint(
-        &mut self,
-        _: Option<&gpui::GlobalElementId>,
-        _: Option<&gpui::InspectorElementId>,
-        _: gpui::Bounds<Pixels>,
-        _: &mut Self::RequestLayoutState,
-        _: &mut Self::PrepaintState,
-        window: &mut Window,
-        _: &mut App,
-    ) {
-        let placement = self.dock.placement();
-
-        window.on_mouse_event({
-            let dock = self.dock.clone();
-            let shared = self.shared.clone();
-            move |event: &MouseMoveEvent, phase, window, cx| {
-                if !phase.bubble() || shared.resizing_dock().get() != Some(placement) {
-                    return;
-                }
-                // Dragging a closed dock's handle reopens it.
-                // Read the live state, the snapshot in `dock` would toggle it shut again.
-                let open = shared
-                    .area()
-                    .upgrade()
-                    .is_some_and(|area| area.read(cx).is_dock_open(placement));
-                if !open {
-                    dock.toggle(window, cx);
-                }
-                dock.resize_to(event.position, window, cx);
-            }
-        });
-
-        window.on_mouse_event({
-            let shared = self.shared.clone();
-            move |_: &MouseUpEvent, phase, _, cx| {
-                if !phase.bubble() || shared.resizing_dock().get() != Some(placement) {
-                    return;
-                }
-                shared.resizing_dock().set(None);
-                // The size lives on the dock, not the layout tree.
-                // Nothing else tells a subscriber to persist it.
-                _ = shared
-                    .area()
-                    .update(cx, |_, cx| cx.emit(DockEvent::LayoutChanged));
-            }
-        });
-    }
-}

crates/dock/src/invalid_panel.rs

@@ -1,67 +0,0 @@
-use gpui::{
-    App, Context, EventEmitter, FocusHandle, Focusable, IntoElement, ParentElement as _, Render,
-    SharedString, Styled as _, Window, div,
-};
-use gpui_base::dock::{PanelEvent, PanelState};
-use gpui_component::ActiveTheme as _;
-
-use crate::Panel;
-
-/// Stands in for a panel this build cannot construct.
-/// It returns the state it was handed, so the layout survives a load and save.
-pub(crate) struct InvalidPanel {
-    name: SharedString,
-    focus_handle: FocusHandle,
-    old_state: PanelState,
-}
-
-impl InvalidPanel {
-    pub(crate) fn new(
-        name: impl Into<SharedString>,
-        state: PanelState,
-        cx: &mut Context<Self>,
-    ) -> Self {
-        Self {
-            focus_handle: cx.focus_handle(),
-            name: name.into(),
-            old_state: state,
-        }
-    }
-}
-
-impl gpui_base::dock::Panel for InvalidPanel {
-    fn panel_name(&self) -> &'static str {
-        "InvalidPanel"
-    }
-
-    fn dump(&self, _: &App) -> PanelState {
-        self.old_state.clone()
-    }
-}
-
-impl Panel for InvalidPanel {}
-
-impl EventEmitter<PanelEvent> for InvalidPanel {}
-
-impl Focusable for InvalidPanel {
-    fn focus_handle(&self, _: &App) -> FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl Render for InvalidPanel {
-    fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        div()
-            .size_full()
-            .my_6()
-            .flex()
-            .flex_col()
-            .items_center()
-            .justify_center()
-            .text_color(cx.theme().muted_foreground)
-            .child(format!(
-                "The `{}` panel type is not registered in PanelRegistry.",
-                self.name.clone()
-            ))
-    }
-}

crates/dock/src/lib.rs

@@ -1,55 +0,0 @@
-use std::sync::Arc;
-
-use gpui::{Context, Pixels, Window, px};
-use gpui_base::dock::PanelView;
-
-mod dock_area;
-mod invalid_panel;
-mod tab_panel;
-mod tiles;
-mod window_controls;
-
-pub use dock_area::SignedDockSkin;
-pub use gpui_component::dock::{
-    BasePanel, DockArea, DockEvent, DockLayout, DockPlacement, Panel, PanelEvent, panel_handle,
-};
-
-/// Add an already-wrapped panel handle to the center of `area`.
-///
-/// Every panel entry point opens its panel there.
-pub fn add_center_panel(
-    area: &mut DockArea,
-    panel: Arc<dyn PanelView>,
-    window: &mut Window,
-    cx: &mut Context<DockArea>,
-) {
-    area.add_panel_view(panel, DockPlacement::Center, None, window, cx);
-}
-
-/// Add an already-wrapped panel handle to the bottom dock of `area`.
-///
-/// Used for sub-views that hang under the center, such as the inbox's Unread
-/// and Archived lists.
-pub fn add_bottom_panel(
-    area: &mut DockArea,
-    panel: Arc<dyn PanelView>,
-    window: &mut Window,
-    cx: &mut Context<DockArea>,
-) {
-    area.add_panel_view(panel, DockPlacement::Bottom, None, window, cx);
-}
-
-/// The fixed height of the tab bar, which doubles as the window title bar.
-pub const TAB_BAR_HEIGHT: Pixels = px(44.);
-
-/// i18n shim resolving `Dock.*` keys to English, so the crate has no i18n dependency.
-pub(crate) fn t(key: &'static str) -> &'static str {
-    match key {
-        "Dock.Close" => "Close",
-        "Dock.Zoom In" => "Zoom In",
-        "Dock.Zoom Out" => "Zoom Out",
-        "Dock.Collapse" => "Collapse",
-        "Dock.Expand" => "Expand",
-        _ => key,
-    }
-}

crates/dock/src/tab_panel.rs

@@ -1,835 +0,0 @@
-use std::cell::Cell;
-use std::rc::Rc;
-use std::sync::Arc;
-use std::time::Duration;
-
-use gpui::prelude::FluentBuilder as _;
-use gpui::{
-    Anchor, Animation, AnimationExt as _, AnyElement, AnyView, App, AppContext as _, Bounds,
-    Context, Div, Empty, InteractiveElement as _, IntoElement, ParentElement as _, Pixels, Point,
-    Render, ScrollHandle, SharedString, Stateful, StatefulInteractiveElement as _, StyleRefinement,
-    Styled as _, Window, div, px, size,
-};
-use gpui_base::dock::{
-    AnyDrag, DockPlacement, DragPanel, DropIndicator, NodeId, PaneNode, PaneRef,
-    PanelView as BasePanelView, TabGroupContext, TabGroupRenderer,
-};
-use gpui_base::{ElementExt, InteractiveElementExt, Tab, Tabs};
-use gpui_component::animation::{Lerp as _, ease_out_cubic};
-use gpui_component::button::{Button, ButtonVariants as _};
-use gpui_component::dock::{ClosePanel, PanelControl, PanelHandle, ToggleZoom};
-use gpui_component::menu::DropdownMenu as _;
-use gpui_component::{
-    ActiveTheme as _, Disableable as _, IconName, Selectable as _, Sizable as _, h_flex, v_flex,
-};
-use signed_ui::title_bar_drag_handlers;
-
-use crate::dock_area::SkinShared;
-use crate::{TAB_BAR_HEIGHT, t, window_controls};
-
-/// The drag preview's size, reported to base for the drop placeholder.
-const DRAG_PREVIEW_SIZE: gpui::Size<gpui::Pixels> = size(px(96.), px(30.));
-
-/// A panel's title, or its registered name when the panel has no handle.
-pub(crate) fn panel_title(
-    panel: &Arc<dyn BasePanelView>,
-    window: &mut Window,
-    cx: &mut App,
-) -> AnyElement {
-    match PanelHandle::of(panel) {
-        Some(handle) => handle.title(window, cx),
-        None => SharedString::from(panel.panel_name(cx)).into_any_element(),
-    }
-}
-
-/// The preview that follows the cursor while a panel is dragged.
-/// Base's `DragPanel` is the payload and draws nothing, this is the appearance half.
-struct DragPanelPreview {
-    panel: Arc<dyn BasePanelView>,
-}
-
-impl Render for DragPanelPreview {
-    fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        div()
-            .id("drag-panel")
-            .cursor_grab()
-            .py_1()
-            .px_3()
-            .w_24()
-            .overflow_hidden()
-            .whitespace_nowrap()
-            .border_1()
-            .border_color(cx.theme().border)
-            .rounded(cx.theme().radius)
-            .text_color(cx.theme().tab_foreground)
-            .bg(cx.theme().tokens.tab_active)
-            .opacity(0.75)
-            .child(panel_title(&self.panel, window, cx))
-    }
-}
-
-/// The zoom affordance for the group's displayed panel, if it offers one.
-/// The panel must offer a control and be zoomable, base refuses a zoom otherwise.
-fn zoom_control(group: &TabGroupContext, cx: &App) -> Option<PanelControl> {
-    let panel = group.active_panel()?;
-    panel
-        .zoomable(cx)
-        .then(|| PanelHandle::of(panel).and_then(|handle| handle.zoom_control(cx)))
-        .flatten()
-}
-
-/// The left-most, top-most tab group in a container.
-/// A left dock's collapse button lives in this group.
-fn left_top_group(node: &PaneNode) -> Option<NodeId> {
-    match node.kind() {
-        PaneRef::Tabs { .. } => Some(node.id()),
-        PaneRef::Split { children, .. } => children.first().and_then(left_top_group),
-        PaneRef::Tiles { .. } => None,
-    }
-}
-
-/// The right-most, top-most tab group.
-/// A vertical split picks its first child, a horizontal split picks its last.
-fn right_top_group(node: &PaneNode) -> Option<NodeId> {
-    match node.kind() {
-        PaneRef::Tabs { .. } => Some(node.id()),
-        PaneRef::Split { axis, children, .. } => match axis {
-            gpui::Axis::Vertical => children.first(),
-            gpui::Axis::Horizontal => children.last(),
-        }
-        .and_then(right_top_group),
-        PaneRef::Tiles { .. } => None,
-    }
-}
-
-/// One tab group's appearance, built once per container so its geometry is its own.
-pub(crate) struct SignedTabGroupSkin {
-    shared: Rc<SkinShared>,
-    scroll_handle: ScrollHandle,
-    /// The tab shown last frame, so a change scrolls the new one into view.
-    last_active_ix: Cell<Option<usize>>,
-    /// Bounds of the title bar row, measured to place the title-bar drag overlay.
-    title_bar_bounds: Rc<Cell<Option<Bounds<Pixels>>>>,
-    /// Bounds of the empty strip after the last tab, where the drag region starts.
-    title_bar_strip_bounds: Rc<Cell<Option<Bounds<Pixels>>>>,
-    /// Bounds of the suffix area, where the drag region ends.
-    title_bar_suffix_bounds: Rc<Cell<Option<Bounds<Pixels>>>>,
-}
-
-impl SignedTabGroupSkin {
-    pub(crate) fn new(shared: Rc<SkinShared>) -> Self {
-        Self {
-            shared,
-            scroll_handle: ScrollHandle::default(),
-            last_active_ix: Cell::new(None),
-            title_bar_bounds: Rc::new(Cell::new(None)),
-            title_bar_strip_bounds: Rc::new(Cell::new(None)),
-            title_bar_suffix_bounds: Rc::new(Cell::new(None)),
-        }
-    }
-
-    /// A group that is the left dock's only group, with one panel, draws no chrome.
-    /// The vendored dock rendered such a panel bare and the sidebar is one.
-    fn is_plain_sidebar_group(&self, group: &TabGroupContext, cx: &mut App) -> bool {
-        let Some(area) = self.shared.area().upgrade() else {
-            return false;
-        };
-        let area = area.read(cx);
-        let Some(left) = area
-            .layout(DockPlacement::Left)
-            .map(|tree| tree.root().id())
-        else {
-            return false;
-        };
-        left == group.node() && group.panels().len() == 1
-    }
-
-    /// The bottom or right dock whose root tab group is this one, if any.
-    /// Base keeps a dock's last group, so the skin removes these docks as a whole.
-    fn is_dock_root_group(&self, group: &TabGroupContext, cx: &App) -> Option<DockPlacement> {
-        let area = self.shared.area().upgrade()?;
-        let area = area.read(cx);
-        [DockPlacement::Bottom, DockPlacement::Right]
-            .into_iter()
-            .find(|placement| {
-                area.layout(*placement)
-                    .is_some_and(|tree| tree.root().id() == group.node())
-            })
-    }
-
-    /// The tab's drag payload, or `None` when the group must not be rearranged.
-    /// A locked group never is, a bottom or right dock root always is.
-    fn tab_drag(&self, group: &TabGroupContext, ix: usize, cx: &App) -> Option<DragPanel> {
-        if group.is_locked() {
-            return None;
-        }
-        if !group.is_draggable() && self.is_dock_root_group(group, cx).is_none() {
-            return None;
-        }
-        group.drag_panel(ix, cx)
-    }
-
-    /// A dock's collapse button for this group's bar, or `None` when it does not belong.
-    /// The icon direction depends on whether the dock is open.
-    fn dock_toggle_button(
-        &self,
-        placement: DockPlacement,
-        group: &TabGroupContext,
-        cx: &mut App,
-    ) -> Option<Button> {
-        if group.is_zoomed() || !self.shared.is_toggle_button_visible() {
-            return None;
-        }
-
-        let area = self.shared.area().upgrade()?;
-        let area = area.read(cx);
-        // A missing dock is not collapsible, this also covers the old `left_dock.is_some()` test.
-        if !area.is_dock_collapsible(placement) {
-            return None;
-        }
-
-        let designated = match placement {
-            DockPlacement::Left => area
-                .layout(DockPlacement::Center)
-                .and_then(|tree| left_top_group(tree.root())),
-            DockPlacement::Right => area
-                .layout(DockPlacement::Center)
-                .and_then(|tree| right_top_group(tree.root())),
-            DockPlacement::Bottom => area
-                .layout(DockPlacement::Bottom)
-                .and_then(|tree| left_top_group(tree.root())),
-            DockPlacement::Center => return None,
-        };
-        if designated != Some(group.node()) {
-            return None;
-        }
-
-        let is_open = area.is_dock_open(placement);
-        let icon = match (placement, is_open) {
-            (DockPlacement::Left, true) => IconName::PanelLeft,
-            (DockPlacement::Left, false) => IconName::PanelLeftOpen,
-            (DockPlacement::Right, true) => IconName::PanelRight,
-            (DockPlacement::Right, false) => IconName::PanelRightOpen,
-            (DockPlacement::Bottom, true) => IconName::PanelBottom,
-            (DockPlacement::Bottom, false) => IconName::PanelBottomOpen,
-            (DockPlacement::Center, _) => return None,
-        };
-
-        let area = self.shared.area().clone();
-        Some(
-            Button::new(SharedString::from(format!("toggle-dock:{placement:?}")))
-                .icon(icon)
-                .small()
-                .ghost()
-                .tab_stop(false)
-                .tooltip(match is_open {
-                    true => t("Dock.Collapse"),
-                    false => t("Dock.Expand"),
-                })
-                .on_click(move |_, window, cx| {
-                    _ = area.update(cx, |area, cx| area.toggle_dock(placement, window, cx));
-                }),
-        )
-    }
-
-    /// The previous and next tab buttons in the tab bar's leading prefix.
-    /// Always rendered, disabled at the strip ends or when collapsed.
-    fn render_prev_next_tab_buttons(
-        &self,
-        group: &TabGroupContext,
-        _cx: &mut App,
-    ) -> impl IntoElement {
-        let collapsed = group.is_collapsed();
-        let active_ix = group.active_ix();
-        let panels_len = group.panels().len();
-        let prev_enabled = !collapsed && active_ix > 0;
-        let next_enabled = !collapsed && active_ix + 1 < panels_len;
-
-        h_flex()
-            .gap_1()
-            .child(
-                Button::new("tab:prev")
-                    .icon(IconName::ArrowLeft)
-                    .small()
-                    .ghost()
-                    .tab_stop(false)
-                    .tooltip("Previous tab")
-                    .disabled(!prev_enabled)
-                    .on_click({
-                        let group = group.clone();
-                        move |_, window, cx| group.select_tab(active_ix - 1, window, cx)
-                    }),
-            )
-            .child(
-                Button::new("tab:next")
-                    .icon(IconName::ArrowRight)
-                    .small()
-                    .ghost()
-                    .tab_stop(false)
-                    .tooltip("Next tab")
-                    .disabled(!next_enabled)
-                    .on_click({
-                        let group = group.clone();
-                        move |_, window, cx| group.select_tab(active_ix + 1, window, cx)
-                    }),
-            )
-    }
-
-    /// The trailing controls, the panel's own buttons, zoom and the ellipsis menu.
-    fn render_toolbar(
-        &self,
-        group: &TabGroupContext,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> impl IntoElement {
-        if group.is_collapsed() {
-            return div();
-        }
-
-        let zoomed = group.is_zoomed();
-        let handle = group.active_panel().and_then(PanelHandle::of);
-        let control = zoom_control(group, cx);
-        let toolbar_zoom = control.is_some_and(|control| control.toolbar_visible());
-        let menu_zoom = control.is_some_and(|control| control.menu_visible());
-        // A bottom or right dock's only panel cannot close through the group.
-        // The close item is offered, the skin removes the whole dock instead.
-        let closable = group.is_closable()
-            || (self.is_dock_root_group(group, cx).is_some()
-                && group.active_panel().is_some_and(|panel| panel.closable(cx)));
-        let buttons = handle.and_then(|handle| handle.toolbar_buttons(window, cx));
-        let panel = handle.map(|handle| handle.panel());
-
-        h_flex()
-            .gap_1()
-            .occlude()
-            .when_some(buttons, |this, buttons| {
-                this.children(
-                    buttons
-                        .into_iter()
-                        .map(|button| button.small().ghost().tab_stop(false)),
-                )
-            })
-            .map(|this| {
-                let value = if zoomed {
-                    Some(("zoom-out", IconName::Minimize, t("Dock.Zoom Out")))
-                } else if toolbar_zoom {
-                    Some(("zoom-in", IconName::Maximize, t("Dock.Zoom In")))
-                } else {
-                    None
-                };
-
-                if let Some((id, icon, tooltip)) = value {
-                    this.child(
-                        Button::new(id)
-                            .icon(icon)
-                            .small()
-                            .ghost()
-                            .tab_stop(false)
-                            .tooltip_with_action(tooltip, &ToggleZoom, None)
-                            .selected(zoomed)
-                            .on_click({
-                                let group = group.clone();
-                                move |_, window, cx| group.toggle_zoom(window, cx)
-                            }),
-                    )
-                } else {
-                    this
-                }
-            })
-            .child(
-                Button::new("menu")
-                    .icon(IconName::Ellipsis)
-                    .small()
-                    .ghost()
-                    .tab_stop(false)
-                    .dropdown_menu(move |menu, window, cx| {
-                        menu.when_some(panel.clone(), |menu, panel| {
-                            panel.dropdown_menu(menu, window, cx)
-                        })
-                        .separator()
-                        .menu_with_disabled(
-                            if zoomed {
-                                t("Dock.Zoom Out")
-                            } else {
-                                t("Dock.Zoom In")
-                            },
-                            Box::new(ToggleZoom),
-                            !menu_zoom,
-                        )
-                        .when(closable, |menu| {
-                            menu.separator().menu(t("Dock.Close"), Box::new(ClosePanel))
-                        })
-                    })
-                    .anchor(Anchor::TopRight),
-            )
-    }
-
-    /// One tab of the pill strip.
-    /// While collapsed, tabs lose the active style and all interactions.
-    /// The strip is also how a closed bottom dock is opened again.
-    #[allow(clippy::too_many_arguments)]
-    fn render_tab(
-        &self,
-        group: &TabGroupContext,
-        ix: usize,
-        panel: Arc<dyn BasePanelView>,
-        active: bool,
-        is_bottom_dock: bool,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> Tab {
-        let collapsed = group.is_collapsed();
-        let droppable = group.is_droppable();
-        let drag = self.tab_drag(group, ix, cx);
-        let handle = PanelHandle::of(&panel);
-
-        Tab::new(ix)
-            .h_6()
-            .px_3()
-            .text_sm()
-            .whitespace_nowrap()
-            .flex()
-            .items_center()
-            .justify_center()
-            .gap_1()
-            .flex_shrink_0()
-            .overflow_hidden()
-            .rounded(cx.theme().radius)
-            .text_color(cx.theme().foreground)
-            .map(|this| match handle.and_then(|handle| handle.tab_name(cx)) {
-                Some(tab_name) => this.child(tab_name),
-                None => this.child(panel_title(&panel, window, cx)),
-            })
-            // Pill style, the selected tab is the filled pill, others show only on hover.
-            .styles(|styles| {
-                styles.selected(|style| {
-                    style
-                        .text_color(cx.theme().tab_active_foreground)
-                        .bg(cx.theme().tab_active)
-                })
-            })
-            .hover(|this| {
-                if active {
-                    this
-                } else {
-                    this.text_color(cx.theme().secondary_foreground)
-                        .bg(cx.theme().secondary_hover)
-                }
-            })
-            .selected(active)
-            .on_click({
-                let group = group.clone();
-                let area = self.shared.area().clone();
-                move |_, window, cx| {
-                    group.select_tab(ix, window, cx);
-
-                    // Clicking the strip of a collapsed bottom dock reopens it.
-                    if is_bottom_dock && collapsed {
-                        _ = area.update(cx, |area, cx| {
-                            area.toggle_dock(DockPlacement::Bottom, window, cx);
-                        });
-                    }
-                }
-            })
-            .when(!collapsed, |this| {
-                this.when_some(drag, |this, drag| {
-                    this.on_drag(drag, {
-                        let panel = panel.clone();
-                        move |drag, offset, _, cx| {
-                            cx.stop_propagation();
-                            drag.set_drag_offset(offset);
-                            drag.set_preview_size(DRAG_PREVIEW_SIZE);
-                            cx.new(|_| DragPanelPreview {
-                                panel: panel.clone(),
-                            })
-                        }
-                    })
-                })
-                .when(droppable, |this| {
-                    this.drag_over::<DragPanel>(|this, _, _, cx| {
-                        this.rounded_l_none()
-                            .border_l_2()
-                            .border_r_0()
-                            .border_color(cx.theme().drag_border)
-                    })
-                    .on_drop({
-                        let group = group.clone();
-                        move |drag: &DragPanel, window, cx| {
-                            group.drop_panel(drag.clone(), Some(ix), true, window, cx);
-                        }
-                    })
-                    .drag_over::<AnyDrag>(|this, _, _, cx| {
-                        this.rounded_l_none()
-                            .border_l_2()
-                            .border_r_0()
-                            .border_color(cx.theme().drag_border)
-                    })
-                    .on_drop({
-                        let group = group.clone();
-                        move |item: &AnyDrag, window, cx| {
-                            group.drop_item(item.clone(), None, window, cx);
-                        }
-                    })
-                })
-            })
-    }
-
-    /// The strip after the last tab, a drop target for panels and other drag items.
-    /// Its left edge marks where the title-bar drag overlay starts.
-    fn render_empty_space(
-        &self,
-        group: &TabGroupContext,
-        tabs_count: usize,
-        _cx: &mut App,
-    ) -> AnyElement {
-        let strip_bounds = self.title_bar_strip_bounds.clone();
-        let shared = self.shared.clone();
-        let droppable = group.is_droppable();
-
-        let mut empty = div()
-            .id("tab-bar-empty-space")
-            .h_full()
-            .flex_grow_1()
-            .min_w_16()
-            .on_prepaint(move |bounds, _, cx| {
-                if strip_bounds.get() != Some(bounds) {
-                    strip_bounds.set(Some(bounds));
-                    _ = shared.area().update(cx, |_, cx| cx.notify());
-                }
-            });
-
-        if droppable {
-            empty = empty
-                .drag_over::<DragPanel>(|this, _, _, cx| this.bg(cx.theme().tokens.drop_target))
-                .on_drop({
-                    let group = group.clone();
-                    let node = group.node();
-                    move |drag: &DragPanel, window, cx| {
-                        // A panel dropped past its own last tab lands in the final slot.
-                        // A panel from elsewhere is appended in the background.
-                        let ix = (drag.source() == node).then(|| tabs_count - 1);
-                        group.drop_panel(drag.clone(), ix, false, window, cx);
-                    }
-                })
-                .drag_over::<AnyDrag>(|this, _, _, cx| this.bg(cx.theme().tokens.drop_target))
-                .on_drop({
-                    let group = group.clone();
-                    move |item: &AnyDrag, window, cx| {
-                        group.drop_item(item.clone(), None, window, cx);
-                    }
-                });
-        }
-
-        empty.into_any_element()
-    }
-}
-
-impl TabGroupRenderer for SignedTabGroupSkin {
-    fn frame(&self, group: &TabGroupContext, _: &mut Window, cx: &mut App) -> Stateful<Div> {
-        let control = zoom_control(group, cx);
-        // An emptied group draws nothing, so no bare tab bar is left behind.
-        if group.panels().is_empty() {
-            return div().id("tab-panel");
-        }
-        // Base refuses an empty dock, so closing its only panel removes the dock.
-        let dock_to_remove = (group.panels().len() <= 1)
-            .then(|| self.is_dock_root_group(group, cx))
-            .flatten();
-        let shared = self.shared.clone();
-
-        // `v_flex`, a plain `div` ignores `flex_grow` and the content would collapse.
-        v_flex()
-            .id("tab-panel")
-            .size_full()
-            .overflow_hidden()
-            .bg(cx.theme().tokens.background)
-            // A collapsed group has no content, so these actions are not registered.
-            .when(!group.is_collapsed(), |this| {
-                this.on_action({
-                    let group = group.clone();
-                    move |_: &ToggleZoom, window, cx| {
-                        // A panel with no zoom control is not zoomed in by the keybinding.
-                        // Zooming out is never refused.
-                        // Otherwise a zoomed panel that lost its control would strand the user.
-                        if !group.is_zoomed() && control.is_none() {
-                            return;
-                        }
-                        group.toggle_zoom(window, cx);
-                    }
-                })
-                .on_action({
-                    let group = group.clone();
-                    let shared = shared.clone();
-                    move |_: &ClosePanel, window, cx| {
-                        let Some(panel) = group.active_panel() else {
-                            return;
-                        };
-                        if !panel.closable(cx) {
-                            return;
-                        }
-                        let panel = panel.panel_id(cx);
-                        match dock_to_remove {
-                            Some(placement) => {
-                                _ = shared.area().update(cx, |area, cx| {
-                                    area.remove_dock(placement, window, cx);
-                                });
-                            }
-                            None => group.close(panel, window, cx),
-                        }
-                    }
-                })
-            })
-    }
-
-    fn content_frame(&self, group: &TabGroupContext, _: &mut Window, _: &mut App) -> Stateful<Div> {
-        v_flex()
-            .id("active-panel")
-            // A collapsed group draws its tab strip only, so the content claims no space.
-            .when(!group.is_collapsed(), |this| this.flex_1())
-    }
-
-    fn render_tab_bar(
-        &self,
-        group: &TabGroupContext,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> AnyElement {
-        // An emptied group draws no tab bar, the app prunes the emptied dock later.
-        if group.panels().is_empty() {
-            return Empty.into_any_element();
-        }
-
-        // The sidebar group draws no chrome, like the vendored `DockItem::Panel`.
-        if self.is_plain_sidebar_group(group, cx) {
-            return Empty.into_any_element();
-        }
-
-        let collapsed = group.is_collapsed();
-        let active_ix = group.active_ix();
-        let tabs_count = group.panels().len();
-
-        let left_dock_button = self.dock_toggle_button(DockPlacement::Left, group, cx);
-        let bottom_dock_button = self.dock_toggle_button(DockPlacement::Bottom, group, cx);
-        let right_dock_button = self.dock_toggle_button(DockPlacement::Right, group, cx);
-        let is_bottom_dock = bottom_dock_button.is_some();
-
-        // On macOS the traffic lights overlay the window's top-left corner.
-        // Only the tab bar that sits under them reserves the space.
-        // That is the center's top-left group when the left dock is closed or absent.
-        let needs_traffic_light_padding = cfg!(target_os = "macos")
-            && self.shared.area().upgrade().is_some_and(|area| {
-                let area = area.read(cx);
-                !area.is_dock_open(DockPlacement::Left)
-                    && area
-                        .layout(DockPlacement::Center)
-                        .and_then(|tree| left_top_group(tree.root()))
-                        == Some(group.node())
-            });
-
-        // Bring a newly displayed tab into view.
-        // The group owns selection, so the skin watches for the change itself.
-        let displayed = group.active_panel().map(|panel| panel.panel_id(cx));
-        let visible: Vec<usize> = group
-            .panels()
-            .iter()
-            .enumerate()
-            .filter(|(_, panel)| panel.visible(cx))
-            .map(|(ix, _)| ix)
-            .collect();
-        if self.last_active_ix.replace(Some(active_ix)) != Some(active_ix)
-            && let Some(visible_ix) = visible.iter().position(|ix| *ix == active_ix)
-        {
-            self.scroll_handle.scroll_to_item(visible_ix);
-        }
-
-        // The tab strip ends at the last tab, the bar has no element after it.
-        // Cover that dead zone with an overlay so it can drag the window.
-        let drag_overlay = match (
-            self.title_bar_bounds.get(),
-            self.title_bar_strip_bounds.get(),
-            self.title_bar_suffix_bounds.get(),
-        ) {
-            (Some(title), Some(strip), Some(suffix)) => {
-                let left = strip.left() - title.left();
-                let right = title.right() - suffix.left();
-                (left + right < title.size.width).then(|| {
-                    title_bar_drag_handlers(
-                        div()
-                            .id(("title-bar-drag", group.node().as_u64()))
-                            .absolute()
-                            .top_0()
-                            .bottom_0()
-                            .left(left)
-                            .right(right),
-                        window,
-                        cx,
-                    )
-                })
-            }
-            _ => None,
-        };
-
-        let tabs: Vec<_> = group
-            .panels()
-            .iter()
-            .enumerate()
-            .filter_map(|(ix, panel)| {
-                let mut active = displayed == Some(panel.panel_id(cx));
-                if !panel.visible(cx) {
-                    return None;
-                }
-                // Collapsed tabs never show as active, the strip only reopens the dock.
-                if collapsed {
-                    active = false;
-                }
-                Some(self.render_tab(group, ix, panel.clone(), active, is_bottom_dock, window, cx))
-            })
-            .collect();
-
-        let empty_space = self.render_empty_space(group, tabs_count, cx);
-        let title_bar_bounds = self.title_bar_bounds.clone();
-        let title_bar_suffix_bounds = self.title_bar_suffix_bounds.clone();
-        let shared = self.shared.clone();
-        let suffix_shared = self.shared.clone();
-
-        div()
-            .flex()
-            .flex_row()
-            .child(
-                div()
-                    .relative()
-                    .flex_1()
-                    .min_w_0()
-                    .on_prepaint(move |bounds, _, cx| {
-                        if title_bar_bounds.get() != Some(bounds) {
-                            title_bar_bounds.set(Some(bounds));
-                            _ = shared.area().update(cx, |_, cx| cx.notify());
-                        }
-                    })
-                    .child(
-                        Tabs::new("tab-bar")
-                            .px(px(-1.))
-                            .h(TAB_BAR_HEIGHT)
-                            .flex()
-                            .items_center()
-                            .text_color(cx.theme().tab_foreground)
-                            .child(
-                                h_flex()
-                                    .items_center()
-                                    .top_0()
-                                    // -1 px so the border does not overlap the first tab.
-                                    .right(-px(1.))
-                                    .h_full()
-                                    .gap_2()
-                                    .px_2()
-                                    .when(needs_traffic_light_padding, |this| this.pl(px(80.)))
-                                    .children(left_dock_button)
-                                    .children(bottom_dock_button)
-                                    .child(self.render_prev_next_tab_buttons(group, cx)),
-                            )
-                            .child(
-                                h_flex().id("tabs").flex_1().overflow_x_hidden().child(
-                                    h_flex()
-                                        .id("tabs-inner")
-                                        .relative()
-                                        .gap(px(4.))
-                                        .overflow_x_scroll()
-                                        .lock_scroll_axis()
-                                        .track_scroll(&self.scroll_handle)
-                                        .children(tabs)
-                                        .when(!collapsed, |this| this.child(empty_space)),
-                                ),
-                            )
-                            .when(!collapsed, |this| {
-                                this.child(
-                                    h_flex()
-                                        .items_center()
-                                        .top_0()
-                                        .right_0()
-                                        .h_full()
-                                        .px_2()
-                                        .gap_1()
-                                        .on_prepaint(move |bounds, _, cx| {
-                                            if title_bar_suffix_bounds.get() != Some(bounds) {
-                                                title_bar_suffix_bounds.set(Some(bounds));
-                                                _ = suffix_shared
-                                                    .area()
-                                                    .update(cx, |_, cx| cx.notify());
-                                            }
-                                        })
-                                        .children(
-                                            group
-                                                .active_panel()
-                                                .and_then(PanelHandle::of)
-                                                .and_then(|handle| handle.title_suffix(window, cx)),
-                                        )
-                                        .child(self.render_toolbar(group, window, cx))
-                                        .children(right_dock_button),
-                                )
-                            }),
-                    )
-                    .when_some(drag_overlay, |this, overlay| this.child(overlay)),
-            )
-            .child(window_controls::window_controls(window, cx))
-            .into_any_element()
-    }
-
-    fn render_active_panel(
-        &self,
-        panel: AnyView,
-        group: &TabGroupContext,
-        _: &mut Window,
-        _: &mut App,
-    ) -> AnyElement {
-        if group.is_collapsed() {
-            return Empty.into_any_element();
-        }
-
-        div()
-            .id("tab-content")
-            .overflow_y_scroll()
-            .overflow_x_hidden()
-            .flex_1()
-            .child(panel.cached(StyleRefinement::default().absolute().size_full()))
-            .into_any_element()
-    }
-
-    fn render_drop_indicator(
-        &self,
-        indicator: DropIndicator,
-        _: &mut Window,
-        cx: &mut App,
-    ) -> Option<AnyElement> {
-        let (from, to) = (indicator.from(), indicator.to());
-        // The element sits at the drop target, the animation walks back from the source.
-        let offset = from.origin() - to.origin();
-
-        Some(
-            div()
-                .absolute()
-                .left(to.origin().x)
-                .top(to.origin().y)
-                .w(to.size().width)
-                .h(to.size().height)
-                .child(
-                    div()
-                        .absolute()
-                        .bg(cx.theme().tokens.drop_target)
-                        .with_animation(
-                            gpui::ElementId::NamedInteger(
-                                "drop-placeholder".into(),
-                                indicator.epoch(),
-                            ),
-                            Animation::new(Duration::from_millis(150)).with_easing(ease_out_cubic),
-                            move |this, delta| {
-                                let origin = offset.lerp(&Point::default(), delta);
-                                let width = from.size().width.lerp(&to.size().width, delta);
-                                let height = from.size().height.lerp(&to.size().height, delta);
-                                this.left(origin.x).top(origin.y).w(width).h(height)
-                            },
-                        ),
-                )
-                .into_any_element(),
-        )
-    }
-}

crates/dock/src/tiles.rs

@@ -1,388 +0,0 @@
-use std::rc::Rc;
-
-use gpui::prelude::FluentBuilder as _;
-use gpui::{
-    AnyElement, App, AppContext as _, Context, Div, DragMoveEvent, Empty, InteractiveElement as _,
-    IntoElement, MouseButton, MouseDownEvent, ParentElement as _, Pixels, Render, ScrollHandle,
-    Size, Stateful, StatefulInteractiveElement as _, Styled as _, Window, div, px,
-};
-use gpui_base::dock::{
-    DRAG_BAR_HEIGHT, HANDLE_SIZE, NodeId, ResizeSide, TileContext, TilesRenderer,
-};
-use gpui_component::button::{Button, ButtonVariants as _};
-use gpui_component::dock::PanelHandle;
-use gpui_component::menu::{DropdownMenu as _, PopupMenuItem};
-use gpui_component::scroll::Scrollbar;
-use gpui_component::{
-    ActiveTheme as _, Icon, IconName, Selectable as _, Sizable as _, h_flex, v_flex,
-};
-
-use crate::dock_area::SkinShared;
-use crate::t;
-use crate::tab_panel::panel_title;
-
-/// How far a resize handle sticks out past the tile's edge.
-const HANDLE_OFFSET: Pixels = px(-4.);
-
-/// The payload a tile drag carries, so one canvas ignores another's drags.
-#[derive(Clone)]
-struct DragMoving(NodeId);
-
-impl Render for DragMoving {
-    fn render(&mut self, _: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
-        Empty
-    }
-}
-
-/// The payload a tile resize carries, for the same reason.
-#[derive(Clone)]
-struct DragResizing(NodeId);
-
-impl Render for DragResizing {
-    fn render(&mut self, _: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
-        Empty
-    }
-}
-
-/// One tiles canvas's appearance.
-/// Built once per container, so its scroll position belongs to the canvas it scrolls.
-pub(crate) struct SignedTilesSkin {
-    shared: Rc<SkinShared>,
-    scroll_handle: ScrollHandle,
-}
-
-impl SignedTilesSkin {
-    pub(crate) fn new(shared: Rc<SkinShared>) -> Self {
-        Self {
-            shared,
-            scroll_handle: ScrollHandle::default(),
-        }
-    }
-
-    fn resize_handle(
-        &self,
-        tile: &TileContext,
-        id: &'static str,
-        side: ResizeSide,
-        build: impl FnOnce(Stateful<Div>) -> Stateful<Div>,
-    ) -> Stateful<Div> {
-        let node = tile.node();
-
-        build(div().id(id).absolute())
-            .on_mouse_down(MouseButton::Left, {
-                let tile = tile.clone();
-                move |event: &MouseDownEvent, window, cx| {
-                    tile.begin_resize(side, event.position, window, cx);
-                    cx.stop_propagation();
-                }
-            })
-            .on_drag(DragResizing(node), |drag, _, _, cx| {
-                cx.stop_propagation();
-                cx.new(|_| drag.clone())
-            })
-            .on_drag_move({
-                let tile = tile.clone();
-                move |event: &DragMoveEvent<DragResizing>, window, cx| {
-                    if event.drag(cx).0 != node {
-                        return;
-                    }
-                    tile.resize_to(event.event.position, window, cx);
-                }
-            })
-    }
-
-    /// The trailing controls of a tile's title bar, zoom, close and the ellipsis menu.
-    /// They use click handlers, the zoom and close actions target a focused tab group.
-    fn render_tile_controls(
-        &self,
-        tile: &TileContext,
-        window: &mut Window,
-        cx: &mut App,
-    ) -> impl IntoElement {
-        let handle = PanelHandle::of(tile.panel());
-        let control = handle.and_then(|handle| handle.zoom_control(cx));
-        let zoomed = tile.is_zoomed();
-        let toolbar_zoom =
-            tile.is_zoomable() && control.is_some_and(|control| control.toolbar_visible());
-        let menu_zoom = tile.is_zoomable() && control.is_some_and(|control| control.menu_visible());
-        let closable = tile.is_closable();
-        let buttons = handle.and_then(|handle| handle.toolbar_buttons(window, cx));
-        let panel = handle.map(|handle| handle.panel());
-
-        h_flex()
-            .gap_1()
-            .flex_shrink_0()
-            .occlude()
-            .when_some(buttons, |this, buttons| {
-                this.children(
-                    buttons
-                        .into_iter()
-                        .map(|button| button.xsmall().ghost().tab_stop(false)),
-                )
-            })
-            .when_some(
-                match (zoomed, toolbar_zoom) {
-                    (true, _) => Some(("zoom-out", IconName::Minimize, t("Dock.Zoom Out"))),
-                    (false, true) => Some(("zoom-in", IconName::Maximize, t("Dock.Zoom In"))),
-                    (false, false) => None,
-                },
-                |this, (id, icon, tooltip)| {
-                    this.child(
-                        Button::new(id)
-                            .icon(icon)
-                            .xsmall()
-                            .ghost()
-                            .tab_stop(false)
-                            .tooltip(tooltip)
-                            .selected(zoomed)
-                            .on_click({
-                                let tile = tile.clone();
-                                move |_, window, cx| tile.toggle_zoom(window, cx)
-                            }),
-                    )
-                },
-            )
-            .child(
-                Button::new("menu")
-                    .icon(IconName::Ellipsis)
-                    .xsmall()
-                    .ghost()
-                    .tab_stop(false)
-                    .dropdown_menu({
-                        let tile = tile.clone();
-                        move |menu, window, cx| {
-                            menu.when_some(panel.clone(), |menu, panel| {
-                                panel.dropdown_menu(menu, window, cx)
-                            })
-                            .separator()
-                            .item(
-                                PopupMenuItem::new(match zoomed {
-                                    true => t("Dock.Zoom Out"),
-                                    false => t("Dock.Zoom In"),
-                                })
-                                .disabled(!menu_zoom && !zoomed)
-                                .on_click({
-                                    let tile = tile.clone();
-                                    move |_, window, cx| tile.toggle_zoom(window, cx)
-                                }),
-                            )
-                            .when(closable, |menu| {
-                                menu.separator()
-                                    .item(PopupMenuItem::new(t("Dock.Close")).on_click({
-                                        let tile = tile.clone();
-                                        move |_, window, cx| tile.close(window, cx)
-                                    }))
-                            })
-                        }
-                    })
-                    .anchor(gpui::Anchor::TopRight),
-            )
-    }
-}
-
-impl TilesRenderer for SignedTilesSkin {
-    fn frame(&self, _: &mut Window, cx: &mut App) -> Stateful<Div> {
-        div()
-            .id("tiles")
-            .relative()
-            .size_full()
-            .bg(cx.theme().tokens.tiles)
-            .track_scroll(&self.scroll_handle)
-            .overflow_scroll()
-    }
-
-    fn tile_frame(&self, tile: &TileContext, _: &mut Window, cx: &mut App) -> Stateful<Div> {
-        v_flex()
-            .id(("tile", tile.panel_id().as_u64()))
-            .occlude()
-            .overflow_hidden()
-            .bg(cx.theme().tokens.background)
-            .border_1()
-            .border_color(cx.theme().border)
-            .rounded(cx.theme().tile_radius)
-            // Room for the title bar, which overlays the top padding.
-            // Base draws the panel as a plain child, this keeps them apart.
-            .pt(DRAG_BAR_HEIGHT)
-            // Base stores no bounds on a zoomed tile, the skin decides how it fills the dock.
-            .when(tile.is_zoomed(), |this| this.size_full())
-            .on_mouse_down(MouseButton::Left, {
-                let tile = tile.clone();
-                move |_, window, cx| tile.bring_to_front(window, cx)
-            })
-            // A gesture can end anywhere, so both mouse-up hooks run.
-            // Each is a no-op unless this tile is the one that moved.
-            .on_mouse_up(MouseButton::Left, {
-                let tile = tile.clone();
-                move |_, window, cx| {
-                    tile.end_move(window, cx);
-                    tile.end_resize(window, cx);
-                }
-            })
-            .on_mouse_up_out(MouseButton::Left, {
-                let tile = tile.clone();
-                move |_, window, cx| {
-                    tile.end_move(window, cx);
-                    tile.end_resize(window, cx);
-                }
-            })
-    }
-
-    fn render_drag_bar(&self, tile: &TileContext, window: &mut Window, cx: &mut App) -> AnyElement {
-        let node = tile.node();
-        let handle = PanelHandle::of(tile.panel());
-        let title_style = handle.and_then(|handle| handle.title_style(cx));
-
-        h_flex()
-            .id("drag-bar")
-            .absolute()
-            .top_0()
-            .left_0()
-            .w_full()
-            .h(DRAG_BAR_HEIGHT)
-            .items_center()
-            .gap_1()
-            .pl_3()
-            .pr_2()
-            .when_some(title_style, |this, style| {
-                this.bg(style.background).text_color(style.foreground)
-            })
-            .child(
-                div()
-                    .flex_1()
-                    .min_w_16()
-                    .overflow_hidden()
-                    .text_ellipsis()
-                    .whitespace_nowrap()
-                    .child(panel_title(tile.panel(), window, cx)),
-            )
-            .children(handle.and_then(|handle| handle.title_suffix(window, cx)))
-            .child(self.render_tile_controls(tile, window, cx))
-            // A zoomed tile is not at its stored bounds, so moving it would mean nothing.
-            .when(!tile.is_zoomed(), |this| {
-                this.cursor_grab()
-                    .on_mouse_down(MouseButton::Left, {
-                        let tile = tile.clone();
-                        move |event: &MouseDownEvent, window, cx| {
-                            tile.begin_move(event.position, window, cx);
-                        }
-                    })
-                    .on_drag(DragMoving(node), |drag, _, _, cx| {
-                        cx.stop_propagation();
-                        cx.new(|_| drag.clone())
-                    })
-                    .on_drag_move({
-                        let tile = tile.clone();
-                        move |event: &DragMoveEvent<DragMoving>, window, cx| {
-                            if event.drag(cx).0 != node {
-                                return;
-                            }
-                            tile.move_to(event.event.position, window, cx);
-                        }
-                    })
-            })
-            .into_any_element()
-    }
-
-    fn render_resize_handles(
-        &self,
-        tile: &TileContext,
-        _: &mut Window,
-        cx: &mut App,
-    ) -> AnyElement {
-        let bounds = tile.bounds();
-
-        // A passive full-tile box, so handles sit against the tile, not its flow neighbours.
-        // It registers no interaction, so it does not shadow the panel underneath.
-        div()
-            .absolute()
-            .top_0()
-            .left_0()
-            .size_full()
-            .child(
-                self.resize_handle(tile, "left-resize-handle", ResizeSide::Left, |this| {
-                    this.cursor_ew_resize()
-                        .top_0()
-                        .left(HANDLE_OFFSET)
-                        .w(HANDLE_SIZE)
-                        .h(bounds.size.height)
-                }),
-            )
-            .child(
-                self.resize_handle(tile, "right-resize-handle", ResizeSide::Right, |this| {
-                    this.cursor_ew_resize()
-                        .top_0()
-                        .right(HANDLE_OFFSET)
-                        .w(HANDLE_SIZE)
-                        .h(bounds.size.height)
-                }),
-            )
-            .child(
-                self.resize_handle(tile, "top-resize-handle", ResizeSide::Top, |this| {
-                    this.cursor_ns_resize()
-                        .left_0()
-                        .top(HANDLE_OFFSET)
-                        .w(bounds.size.width)
-                        .h(HANDLE_SIZE)
-                }),
-            )
-            .child(
-                self.resize_handle(tile, "bottom-resize-handle", ResizeSide::Bottom, |this| {
-                    this.cursor_ns_resize()
-                        .left_0()
-                        .bottom(HANDLE_OFFSET)
-                        .w(bounds.size.width)
-                        .h(HANDLE_SIZE)
-                }),
-            )
-            .child(
-                Icon::new(IconName::ResizeCorner)
-                    .size_3()
-                    .absolute()
-                    .right(px(1.))
-                    .bottom(px(1.))
-                    .text_color(cx.theme().muted_foreground.opacity(0.5)),
-            )
-            .child(self.resize_handle(
-                tile,
-                "corner-resize-handle",
-                ResizeSide::BottomRight,
-                |this| {
-                    this.cursor_nwse_resize()
-                        .right(HANDLE_OFFSET)
-                        .bottom(HANDLE_OFFSET)
-                        .size_3()
-                },
-            ))
-            .into_any_element()
-    }
-
-    /// Gives the tile's panel `size_full`, base draws it as a plain child otherwise.
-    fn panel_frame(&self, tile: &TileContext, _: &mut Window, _: &mut App) -> Stateful<Div> {
-        h_flex()
-            .id(("tile-panel", tile.panel_id().as_u64()))
-            .overflow_hidden()
-            .size_full()
-    }
-
-    /// The canvas scrollbar, as an overlay.
-    /// Placed inside the frame it would end up underneath every tile.
-    fn render_overlay(
-        &self,
-        content: Size<Pixels>,
-        _: &mut Window,
-        _: &mut App,
-    ) -> Option<AnyElement> {
-        Some(
-            Scrollbar::new(&self.scroll_handle)
-                .scroll_size(content)
-                .when_some(self.shared.tiles_scrollbar_mode(), |this, mode| {
-                    this.mode(mode)
-                })
-                .into_any_element(),
-        )
-    }
-
-    fn grid_size(&self, cx: &App) -> Pixels {
-        cx.theme().tile_grid_size
-    }
-}

crates/dock/src/window_controls.rs

@@ -1,168 +0,0 @@
-use gpui::prelude::FluentBuilder as _;
-use gpui::{
-    App, Hsla, InteractiveElement, IntoElement, MouseButton, ParentElement, RenderOnce,
-    StatefulInteractiveElement, Styled, Window, div, px,
-};
-use gpui_component::{ActiveTheme, Icon, IconName, Sizable as _, h_flex};
-
-use crate::TAB_BAR_HEIGHT;
-
-const CONTROL_WIDTH: f32 = 34.;
-
-#[derive(IntoElement, Clone)]
-enum ControlIcon {
-    Minimize,
-    Restore,
-    Maximize,
-    Close,
-}
-
-impl ControlIcon {
-    fn minimize() -> Self {
-        Self::Minimize
-    }
-
-    fn restore() -> Self {
-        Self::Restore
-    }
-
-    fn maximize() -> Self {
-        Self::Maximize
-    }
-
-    fn close() -> Self {
-        Self::Close
-    }
-
-    fn id(&self) -> &'static str {
-        match self {
-            Self::Minimize => "minimize",
-            Self::Restore => "restore",
-            Self::Maximize => "maximize",
-            Self::Close => "close",
-        }
-    }
-
-    fn icon(&self) -> IconName {
-        match self {
-            Self::Minimize => IconName::WindowMinimize,
-            Self::Restore => IconName::WindowRestore,
-            Self::Maximize => IconName::WindowMaximize,
-            Self::Close => IconName::WindowClose,
-        }
-    }
-
-    fn window_control_area(&self) -> gpui::WindowControlArea {
-        match self {
-            Self::Minimize => gpui::WindowControlArea::Min,
-            Self::Restore | Self::Maximize => gpui::WindowControlArea::Max,
-            Self::Close => gpui::WindowControlArea::Close,
-        }
-    }
-
-    fn is_close(&self) -> bool {
-        matches!(self, Self::Close)
-    }
-
-    #[inline]
-    fn hover_fg(&self, cx: &App) -> Hsla {
-        if self.is_close() {
-            cx.theme().danger_foreground
-        } else {
-            cx.theme().secondary_foreground
-        }
-    }
-
-    #[inline]
-    fn hover_bg(&self, cx: &App) -> Hsla {
-        if self.is_close() {
-            cx.theme().danger
-        } else {
-            cx.theme().secondary_hover
-        }
-    }
-
-    #[inline]
-    fn active_bg(&self, cx: &mut App) -> Hsla {
-        if self.is_close() {
-            cx.theme().danger_active
-        } else {
-            cx.theme().secondary_active
-        }
-    }
-}
-
-impl RenderOnce for ControlIcon {
-    fn render(self, _: &mut Window, cx: &mut App) -> impl IntoElement {
-        let is_linux = cfg!(target_os = "linux");
-        let is_windows = cfg!(target_os = "windows");
-        let hover_fg = self.hover_fg(cx);
-        let hover_bg = self.hover_bg(cx);
-        let active_bg = self.active_bg(cx);
-        let icon = self.clone();
-
-        div()
-            .id(self.id())
-            .flex()
-            .w(px(CONTROL_WIDTH))
-            .h_full()
-            .flex_shrink_0()
-            .justify_center()
-            .content_center()
-            .items_center()
-            .text_color(cx.theme().foreground)
-            .hover(|style| style.bg(hover_bg).text_color(hover_fg))
-            .active(|style| style.bg(active_bg).text_color(hover_fg))
-            .when(is_windows, |this| {
-                this.window_control_area(self.window_control_area())
-            })
-            .when(is_linux, |this| {
-                this.on_mouse_down(MouseButton::Left, move |_, window, cx| {
-                    window.prevent_default();
-                    cx.stop_propagation();
-                })
-                .on_click(move |_, window, cx| {
-                    cx.stop_propagation();
-                    match icon {
-                        Self::Minimize => window.minimize_window(),
-                        Self::Restore | Self::Maximize => window.zoom_window(),
-                        Self::Close => window.remove_window(),
-                    }
-                })
-            })
-            .child(Icon::new(self.icon()).small())
-    }
-}
-
-pub(crate) fn window_controls(window: &mut Window, cx: &mut App) -> impl IntoElement {
-    if cfg!(target_os = "macos") || cfg!(target_family = "wasm") {
-        return div().id("window-controls");
-    }
-
-    let supported = window.window_controls();
-
-    h_flex()
-        .id("window-controls")
-        .items_center()
-        .flex_shrink_0()
-        .h_full()
-        // The controls span the title bar but never grow past the tab bar height.
-        .when(cfg!(target_os = "windows"), |this| {
-            this.max_h(TAB_BAR_HEIGHT)
-        })
-        .border_l_1()
-        .border_b_1()
-        .border_color(cx.theme().border)
-        .bg(cx.theme().tokens.tab_bar)
-        .when(supported.minimize, |this| {
-            this.child(ControlIcon::minimize())
-        })
-        .when(supported.maximize, |this| {
-            this.child(if window.is_maximized() {
-                ControlIcon::restore()
-            } else {
-                ControlIcon::maximize()
-            })
-        })
-        .child(ControlIcon::close())
-}

crates/dock/tests/render_smoke.rs

@@ -1,92 +0,0 @@
-use dock::{BasePanel, Panel, SignedDockSkin, panel_handle};
-use gpui::{
-    App, AppContext, Context, Empty, EventEmitter, FocusHandle, Focusable, IntoElement, Render,
-    TestAppContext, Window,
-};
-use gpui_base::dock::{DockArea, DockLayout, DockPlacement, PanelEvent};
-
-struct Probe {
-    focus_handle: FocusHandle,
-}
-
-impl Probe {
-    fn new(cx: &mut Context<Self>) -> Self {
-        Self {
-            focus_handle: cx.focus_handle(),
-        }
-    }
-}
-
-impl BasePanel for Probe {
-    fn panel_name(&self) -> &'static str {
-        "Probe"
-    }
-}
-
-impl Panel for Probe {
-    fn title(&mut self, _: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
-        "Probe"
-    }
-}
-
-impl EventEmitter<PanelEvent> for Probe {}
-
-impl Focusable for Probe {
-    fn focus_handle(&self, _: &App) -> FocusHandle {
-        self.focus_handle.clone()
-    }
-}
-
-impl Render for Probe {
-    fn render(&mut self, _: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
-        Empty
-    }
-}
-
-#[gpui::test]
-fn the_first_frame_renders_the_area_and_its_docks(cx: &mut TestAppContext) {
-    cx.update(|cx| {
-        gpui_component::init(cx);
-    });
-    let (area, cx) = cx.add_window_view(|window, cx| {
-        let skin = SignedDockSkin::new(cx);
-        DockArea::new("test", None, window, cx).with_renderer(skin)
-    });
-
-    let bottom = cx.update(|_, cx| cx.new(Probe::new));
-    cx.update(|window, cx| {
-        let left = cx.new(Probe::new);
-        let center = cx.new(Probe::new);
-
-        area.update(cx, |area, cx| {
-            area.set_dock(
-                DockPlacement::Left,
-                DockLayout::tabs().panel_view(panel_handle(left), cx),
-                window,
-                cx,
-            );
-            area.set_center(
-                DockLayout::tabs().panel_view(panel_handle(center), cx),
-                window,
-                cx,
-            );
-            area.set_dock(
-                DockPlacement::Bottom,
-                DockLayout::tabs().panel_view(panel_handle(bottom.clone()), cx),
-                window,
-                cx,
-            );
-        });
-    });
-
-    // The first frame walks every render hook, all of which read the dock area.
-    cx.update(|window, cx| window.draw(cx).clear(cx));
-
-    // Emptying a dock leaves an empty group, its render must also be safe.
-    cx.update(|window, cx| {
-        area.update(cx, |area, cx| {
-            area.remove_panel(bottom, window, cx);
-        });
-    });
-    cx.update(|window, cx| window.draw(cx).clear(cx));
-}

crates/metadata/Cargo.toml

@@ -0,0 +1,16 @@
+[package]
+name = "metadata"
+version.workspace = true
+edition.workspace = true
+publish.workspace = true
+
+[dependencies]
+signed_state = { path = "../signed_state" }
+utils = { path = "../utils" }
+
+nostr-sdk.workspace = true
+flume.workspace = true
+futures.workspace = true
+anyhow.workspace = true
+gpui.workspace = true
+log.workspace = true

crates/metadata/src/lib.rs

@@ -0,0 +1,9 @@
+mod profile;
+
+use gpui::{App, AppContext};
+pub use profile::{Profile, ProfileDirectory, ProfileEvent, ProfileStore};
+
+/// Initialize the global profile store.
+pub fn init(cx: &mut App) {
+    ProfileStore::set_global(cx.new(ProfileStore::new), cx);
+}

crates/metadata/src/profile.rs

@@ -0,0 +1,374 @@
+use std::cell::RefCell;
+use std::collections::{HashMap, HashSet};
+use std::time::{Duration, Instant};
+
+use flume::Sender;
+use gpui::{
+    App, AppContext, Context, Entity, EventEmitter, Global, SharedString, Subscription, Task,
+};
+use nostr_sdk::prelude::*;
+use signed_state::{Backend, BackendEvent, sync_bootstrap_only};
+use utils::shorten_pubkey;
+
+const BATCH_TIMEOUT: Duration = Duration::from_millis(500);
+const REQUEST_CHUNK: usize = 100;
+
+#[derive(Debug, Clone)]
+pub struct Profile {
+    public_key: PublicKey,
+    metadata: Metadata,
+}
+
+impl Profile {
+    pub fn new(public_key: PublicKey, metadata: Metadata) -> Self {
+        Self {
+            public_key,
+            metadata,
+        }
+    }
+
+    pub fn public_key(&self) -> PublicKey {
+        self.public_key
+    }
+
+    pub fn metadata(&self) -> &Metadata {
+        &self.metadata
+    }
+
+    // Falls back to `name`, then a shortened npub.
+    pub fn name(&self) -> SharedString {
+        if let Some(display_name) = self.metadata.display_name.as_ref()
+            && !display_name.is_empty()
+        {
+            return SharedString::from(display_name.trim().to_owned());
+        }
+
+        if let Some(name) = self.metadata.name.as_ref()
+            && !name.is_empty()
+        {
+            return SharedString::from(name.trim().to_owned());
+        }
+
+        SharedString::from(shorten_pubkey(self.public_key))
+    }
+
+    pub fn picture(&self) -> Option<SharedString> {
+        self.metadata
+            .picture
+            .as_ref()
+            .filter(|p| !p.is_empty())
+            .map(|p| SharedString::from(p.clone()))
+    }
+
+    /// The newest profile per author from metadata events.
+    fn latest_profiles(events: impl IntoIterator<Item = Event>) -> Vec<Self> {
+        let mut latest: HashMap<PublicKey, (Timestamp, Metadata)> = HashMap::new();
+
+        for event in events {
+            match latest.get(&event.pubkey) {
+                Some((created_at, _)) if *created_at >= event.created_at => {}
+                _ => {
+                    let metadata = Metadata::from_json(&event.content).unwrap_or_default();
+                    latest.insert(event.pubkey, (event.created_at, metadata));
+                }
+            }
+        }
+
+        latest
+            .into_iter()
+            .map(|(public_key, (_, metadata))| Profile::new(public_key, metadata))
+            .collect()
+    }
+}
+
+/// Metadata for these authors may have changed in the local database.
+#[derive(Debug, Clone)]
+pub enum ProfileEvent {
+    Updated(Vec<PublicKey>),
+}
+
+/// Batches metadata requests into relay syncs feeding the local database.
+pub struct ProfileStore {
+    in_flight: RefCell<HashSet<PublicKey>>,
+    sender: Sender<PublicKey>,
+    _task: Task<Result<(), anyhow::Error>>,
+    _subscription: Subscription,
+}
+
+struct GlobalProfileStore(Entity<ProfileStore>);
+
+impl Global for GlobalProfileStore {}
+
+impl EventEmitter<ProfileEvent> for ProfileStore {}
+
+impl ProfileStore {
+    pub(crate) fn global(cx: &App) -> Entity<Self> {
+        cx.global::<GlobalProfileStore>().0.clone()
+    }
+
+    pub(crate) fn set_global(entity: Entity<Self>, cx: &mut App) {
+        cx.set_global(GlobalProfileStore(entity));
+    }
+
+    pub(crate) fn new(cx: &mut Context<Self>) -> Self {
+        let backend = Backend::global(cx);
+        let client = backend.read(cx).client();
+
+        let (sender, receiver) = flume::unbounded::<PublicKey>();
+
+        let subscription = cx.subscribe(&backend, |this, _backend, event, cx| {
+            if let BackendEvent::ProfileUpdates(authors) = event {
+                this.emit_updated(authors.clone(), cx);
+            }
+        });
+
+        let task = cx.spawn(async move |this, cx| {
+            let mut batch: HashSet<PublicKey> = HashSet::new();
+
+            loop {
+                match receiver.recv_async().await {
+                    Ok(public_key) => {
+                        batch.insert(public_key);
+                    }
+                    Err(_) => return Ok(()),
+                }
+
+                // The channel has no async timeout, race the receive against a timer.
+                let deadline = Instant::now() + BATCH_TIMEOUT;
+
+                loop {
+                    let now = Instant::now();
+
+                    if now >= deadline {
+                        break;
+                    }
+
+                    let timer = cx.background_executor().timer(deadline - now);
+                    futures::pin_mut!(timer);
+
+                    let recv = receiver.recv_async();
+                    futures::pin_mut!(recv);
+
+                    match futures::future::select(recv, timer).await {
+                        futures::future::Either::Left((Ok(public_key), _)) => {
+                            batch.insert(public_key);
+                        }
+                        futures::future::Either::Left((Err(_), _)) => return Ok(()),
+                        futures::future::Either::Right(_) => break,
+                    }
+                }
+
+                let authors: Vec<PublicKey> = batch.drain().collect();
+
+                for chunk in authors.chunks(REQUEST_CHUNK) {
+                    let opts = SyncOptions::default();
+                    let filter = Filter::new()
+                        .kind(Kind::Metadata)
+                        .authors(chunk.iter().copied());
+
+                    if let Err(e) = sync_bootstrap_only(&client, filter, opts).await {
+                        log::warn!("profile fetch failed: {e}");
+                    }
+                }
+
+                // Emit even when the sync failed, the database may hold newer data.
+                this.update(cx, |this, cx| {
+                    this.emit_updated(authors, cx);
+                })?;
+            }
+        });
+
+        Self {
+            in_flight: RefCell::new(HashSet::new()),
+            sender,
+            _task: task,
+            _subscription: subscription,
+        }
+    }
+
+    /// Queue a batched relay sync for keys without one in flight.
+    pub fn fetch(&self, keys: impl IntoIterator<Item = PublicKey>) {
+        let mut queue = Vec::new();
+        {
+            let mut in_flight = self.in_flight.borrow_mut();
+
+            for key in keys {
+                if in_flight.insert(key) {
+                    queue.push(key);
+                }
+            }
+        }
+        for public_key in queue {
+            if let Err(e) = self.sender.send(public_key) {
+                log::warn!("failed to queue profile fetch: {e}");
+            }
+        }
+    }
+
+    // Releases the in-flight keys so future fetches can be queued again.
+    fn emit_updated(&mut self, authors: Vec<PublicKey>, cx: &mut Context<Self>) {
+        if authors.is_empty() {
+            return;
+        }
+
+        {
+            let mut in_flight = self.in_flight.borrow_mut();
+            for author in &authors {
+                in_flight.remove(author);
+            }
+        }
+
+        cx.emit(ProfileEvent::Updated(authors));
+    }
+}
+
+/// Profile cache bound to one panel or screen.
+pub struct ProfileDirectory {
+    profiles: HashMap<PublicKey, Profile>,
+    pending: RefCell<HashSet<PublicKey>>,
+    tasks: Vec<Task<()>>,
+    _subscriptions: Vec<Subscription>,
+}
+
+impl ProfileDirectory {
+    pub fn new(cx: &mut App) -> Entity<Self> {
+        let store = ProfileStore::global(cx);
+
+        cx.new(|cx| {
+            let subscription =
+                cx.subscribe(&store, |this: &mut Self, _store, event, cx| match event {
+                    ProfileEvent::Updated(authors) => this.refresh(authors, cx),
+                });
+
+            Self {
+                profiles: HashMap::new(),
+                pending: RefCell::new(HashSet::new()),
+                tasks: Vec::new(),
+                _subscriptions: vec![subscription],
+            }
+        })
+    }
+
+    /// Resolve keys from the local database, queue the rest for a relay sync.
+    pub fn track<K>(&mut self, keys: K, cx: &mut Context<Self>)
+    where
+        K: IntoIterator<Item = PublicKey>,
+    {
+        let missing: Vec<PublicKey> = keys
+            .into_iter()
+            .filter(|key| {
+                !self.profiles.contains_key(key)
+                    && !self.with_pending(|pending| pending.contains(key))
+            })
+            .collect();
+
+        if missing.is_empty() {
+            return;
+        }
+
+        self.load(missing, true, cx);
+    }
+
+    /// The profile for a key, or a placeholder that queues a relay sync.
+    pub fn profile(&self, public_key: &PublicKey, cx: &App) -> Profile {
+        if let Some(profile) = self.profiles.get(public_key) {
+            return profile.clone();
+        }
+
+        if self.with_pending(|pending| pending.insert(*public_key)) {
+            let store = ProfileStore::global(cx);
+            store.read(cx).fetch([*public_key]);
+        }
+
+        Profile::new(*public_key, Metadata::default())
+    }
+
+    /// Refreshes profiles for keys that are already tracked.
+    fn refresh(&mut self, authors: &[PublicKey], cx: &mut Context<Self>) {
+        let tracked: Vec<PublicKey> = authors
+            .iter()
+            .copied()
+            .filter(|key| {
+                self.profiles.contains_key(key)
+                    || self.with_pending(|pending| pending.contains(key))
+            })
+            .collect();
+
+        if tracked.is_empty() {
+            return;
+        }
+
+        self.load(tracked, false, cx);
+    }
+
+    /// Loads profiles from the local database, queueing a relay sync for any missing keys.
+    fn load(&mut self, keys: Vec<PublicKey>, queue_sync: bool, cx: &mut Context<Self>) {
+        // Accept events that arrive while the database query is running.
+        self.with_pending(|pending| {
+            pending.extend(keys.iter().copied());
+        });
+
+        let backend = Backend::global(cx);
+        let client = backend.read(cx).client();
+        let query_keys = keys.clone();
+
+        let work = cx.background_spawn(async move {
+            let authors = query_keys.iter().copied();
+            let filter = Filter::new().kind(Kind::Metadata).authors(authors);
+            let events = client.database().query(filter).await?;
+
+            Ok::<_, anyhow::Error>(Profile::latest_profiles(events))
+        });
+
+        self.tasks.push(cx.spawn(async move |this, cx| {
+            let loaded = work.await;
+
+            this.update(cx, |this, cx| {
+                let remaining = match loaded {
+                    Ok(profiles) => {
+                        let found: HashSet<PublicKey> =
+                            profiles.iter().map(Profile::public_key).collect();
+                        this.insert_loaded(profiles, cx);
+                        keys.into_iter()
+                            .filter(|key| !found.contains(key))
+                            .collect()
+                    }
+                    Err(e) => {
+                        log::warn!("failed to load profiles from the database: {e}");
+                        keys
+                    }
+                };
+
+                if queue_sync && !remaining.is_empty() {
+                    let store = ProfileStore::global(cx);
+                    store.read(cx).fetch(remaining);
+                }
+            })
+            .ok();
+        }));
+    }
+
+    // Inserts database results, replacing anything loaded earlier.
+    fn insert_loaded(&mut self, profiles: Vec<Profile>, cx: &mut Context<Self>) {
+        let mut inserted = false;
+
+        for profile in profiles {
+            let public_key = profile.public_key();
+            self.profiles.insert(public_key, profile);
+            self.with_pending(|pending| pending.remove(&public_key));
+            inserted = true;
+        }
+
+        if inserted {
+            cx.notify();
+        }
+    }
+
+    fn with_pending<R, T>(&self, then: T) -> R
+    where
+        T: FnOnce(&mut HashSet<PublicKey>) -> R,
+    {
+        let mut pending = self.pending.borrow_mut();
+        then(&mut pending)
+    }
+}

crates/paths/src/lib.rs

@@ -23,7 +23,7 @@ static CURRENT_DATA_DIR: OnceLock<PathBuf> = OnceLock::new();
 /// On Windows, this is `%APPDATA%\Signed`.
 static CONFIG_DIR: OnceLock<PathBuf> = OnceLock::new();
 
-pub fn home_dir() -> PathBuf {
+fn home_dir() -> PathBuf {
     dirs::home_dir().expect("failed to determine home directory")
 }
 
@@ -41,7 +41,7 @@ pub fn documents_dir() -> PathBuf {
     dirs::document_dir().unwrap_or_else(|| dirs::home_dir().unwrap_or_default())
 }
 
-pub fn config_dir() -> &'static PathBuf {
+fn config_dir() -> &'static PathBuf {
     CONFIG_DIR.get_or_init(|| {
         if cfg!(target_os = "windows") {
             dirs::config_dir()
@@ -60,7 +60,7 @@ pub fn config_dir() -> &'static PathBuf {
     })
 }
 
-pub fn data_dir() -> &'static PathBuf {
+fn data_dir() -> &'static PathBuf {
     CURRENT_DATA_DIR.get_or_init(|| {
         if cfg!(target_os = "macos") {
             home_dir()

crates/settings/Cargo.toml

@@ -13,6 +13,3 @@ serde.workspace = true
 serde_json.workspace = true
 anyhow.workspace = true
 log.workspace = true
-
-[dev-dependencies]
-gpui = { workspace = true, features = ["test-support"] }

crates/settings/src/settings.rs

@@ -18,40 +18,14 @@ pub enum AppearanceMode {
     Dark,
 }
 
-/// Fields mirror the gpui-component `Theme` surface customized at startup.
-#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
-#[serde(default)]
-pub struct ThemeSettings {
-    /// Name of the light theme in the theme registry.
-    pub light_theme: String,
-    /// Name of the dark theme in the theme registry.
-    pub dark_theme: String,
-    /// The base font size in pixels.
-    pub font_size: f32,
-    /// The monospace font size in pixels.
-    pub mono_font_size: f32,
-    /// Corner radius for general elements in pixels.
-    pub radius: f32,
-    /// Corner radius for large elements, dialogs and notifications, in pixels.
-    pub radius_lg: f32,
-    /// Whether focused controls draw a ring outside their border.
-    pub focus_ring: bool,
-    pub shadow: bool,
-}
-
-impl Default for ThemeSettings {
-    fn default() -> Self {
-        Self {
-            light_theme: "Signed Light".into(),
-            dark_theme: "Signed Dark".into(),
-            font_size: 16.0,
-            mono_font_size: 13.0,
-            radius: 2.0,
-            radius_lg: 6.0,
-            focus_ring: false,
-            shadow: false,
-        }
-    }
+#[derive(Debug, Clone, Copy, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
+pub enum EventFetchingStrategy {
+    /// Only the relays declared in the repository announcement.
+    Curated,
+    /// Repository relays plus every maintainer's NIP-65 relays.
+    #[default]
+    Uncensored,
 }
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
@@ -76,18 +50,17 @@ impl Default for GraspServersSettings {
 #[serde(default)]
 pub struct LocalReposSettings {
     /// The directories scanned for local git repositories,
-    /// defaults to the user's Desktop and Documents folders.
+    /// Defaults:
+    ///
+    /// - `~/Desktop`
+    /// - `~/Documents`
     pub scan_paths: Vec<PathBuf>,
 }
 
-fn default_scan_paths() -> Vec<PathBuf> {
-    vec![paths::desktop_dir(), paths::documents_dir()]
-}
-
 impl Default for LocalReposSettings {
     fn default() -> Self {
         Self {
-            scan_paths: default_scan_paths(),
+            scan_paths: vec![paths::desktop_dir(), paths::documents_dir()],
         }
     }
 }
@@ -125,7 +98,7 @@ pub struct CreateRepositorySettings {
 #[serde(default)]
 pub struct Settings {
     pub appearance: AppearanceMode,
-    pub theme: ThemeSettings,
+    pub event_fetching: EventFetchingStrategy,
     pub grasp_servers: GraspServersSettings,
     pub local_repos: LocalReposSettings,
     pub checkouts: CheckoutsSettings,
@@ -140,10 +113,7 @@ mod tests {
     fn json_roundtrip_preserves_everything() {
         let settings = Settings {
             appearance: AppearanceMode::Dark,
-            theme: ThemeSettings {
-                radius: 8.0,
-                ..Default::default()
-            },
+            event_fetching: EventFetchingStrategy::Curated,
             create_repository: CreateRepositorySettings {
                 default_folder: Some(PathBuf::from("/tmp/repos")),
             },
@@ -157,13 +127,39 @@ mod tests {
 
     #[test]
     fn partial_json_merges_with_defaults() {
-        let settings: Settings =
-            serde_json::from_str(r#"{"appearance": "dark", "theme": {"radius": 4.0}}"#).unwrap();
+        let settings: Settings = serde_json::from_str(
+            r#"{"appearance": "dark", "grasp_servers": {"default_servers": []}}"#,
+        )
+        .unwrap();
         assert_eq!(settings.appearance, AppearanceMode::Dark);
-        assert_eq!(settings.theme.radius, 4.0);
-        // The rest of the theme and the other groups keep their defaults.
-        assert_eq!(settings.theme.light_theme, "Signed Light");
-        assert_eq!(settings.grasp_servers, GraspServersSettings::default());
+        assert_eq!(settings.grasp_servers.default_servers, Vec::<String>::new());
+        // Unset fields fall back to their defaults, including the fetching strategy.
+        assert_eq!(settings.event_fetching, EventFetchingStrategy::Uncensored);
+        assert_eq!(settings.local_repos, LocalReposSettings::default());
         assert_eq!(settings.create_repository.default_folder, None);
     }
+
+    #[test]
+    fn legacy_theme_keys_are_ignored() {
+        let settings: Settings = serde_json::from_str(
+            r#"{"appearance": "light", "theme": {"radius": 8.0}, "tab_bar": {"hide_navigation_buttons": false}}"#,
+        )
+        .unwrap();
+        assert_eq!(settings.appearance, AppearanceMode::Light);
+        assert_eq!(
+            settings,
+            Settings {
+                appearance: AppearanceMode::Light,
+                ..Default::default()
+            }
+        );
+    }
+
+    #[test]
+    fn event_fetching_uses_snake_case() {
+        let json = serde_json::to_string(&EventFetchingStrategy::Curated).unwrap();
+        assert_eq!(json, r#""curated""#);
+        let parsed: EventFetchingStrategy = serde_json::from_str(r#""uncensored""#).unwrap();
+        assert_eq!(parsed, EventFetchingStrategy::Uncensored);
+    }
 }

crates/settings/src/store.rs

@@ -24,6 +24,12 @@ impl SettingsStore {
         cx.global::<GlobalSettingsStore>().0.clone()
     }
 
+    /// Retrieve the global settings store if one has been installed.
+    pub fn try_global(cx: &App) -> Option<Entity<Self>> {
+        cx.try_global::<GlobalSettingsStore>()
+            .map(|store| store.0.clone())
+    }
+
     pub fn set_global(entity: Entity<Self>, cx: &mut App) {
         cx.set_global(GlobalSettingsStore(entity));
     }

crates/signed_app/Cargo.toml

@@ -1,26 +1,23 @@
 [package]
-name = "workspace"
+name = "signed_app"
 version.workspace = true
 edition.workspace = true
 publish.workspace = true
 
 [dependencies]
 assets = { path = "../assets" }
-dock = { workspace = true }
+metadata = { path = "../metadata" }
 paths = { path = "../paths" }
 settings = { path = "../settings" }
 signed_core = { path = "../signed_core" }
 signed_git = { path = "../signed_git" }
+signed_nostr = { path = "../signed_nostr" }
 signed_state = { path = "../signed_state" }
-signed_ui = { path = "../signed_ui" }
 utils = { path = "../utils" }
 
 gpui.workspace = true
-gpui-component.workspace = true
-gpui-base.workspace = true
-gix.workspace = true
+gpui-native-kit.workspace = true
 nostr.workspace = true
-
 anyhow.workspace = true
 futures.workspace = true
 log.workspace = true

crates/signed_app/src/app/helpers.rs

@@ -0,0 +1,17 @@
+use gpui::App;
+use gpui_native_kit::theme::{ThemeVariant, follow_system, set_mode_override};
+use settings::{AppearanceMode, Settings};
+
+/// Applies the persisted light/dark/system preference to the kit theme.
+pub fn apply_appearance(settings: &Settings, cx: &mut App) {
+    apply_appearance_mode(settings.appearance, cx);
+}
+
+/// Applies one appearance mode to the kit theme.
+pub fn apply_appearance_mode(mode: AppearanceMode, cx: &mut App) {
+    match mode {
+        AppearanceMode::System => follow_system(cx),
+        AppearanceMode::Light => set_mode_override(Some(ThemeVariant::Light), cx),
+        AppearanceMode::Dark => set_mode_override(Some(ThemeVariant::Dark), cx),
+    }
+}

crates/signed_app/src/app/mod.rs

@@ -0,0 +1,111 @@
+pub mod helpers;
+mod placeholder;
+
+use gpui::{
+    AppContext as _, Context, Entity, IntoElement, ParentElement as _, Render, Styled as _,
+    Subscription, Window, div,
+};
+use gpui_native_kit::icons::IconRole;
+use gpui_native_kit::layout::dock::{Dock, DockState};
+use gpui_native_kit::layout::shell::{LayoutState, Shell, SidebarToggles};
+use gpui_native_kit::theme::ActiveTheme as _;
+use gpui_native_kit::toast::Toast;
+use helpers::apply_appearance;
+use settings::SettingsStore;
+use signed_state::{Backend, BackendEvent};
+
+use crate::app::placeholder::PlaceholderView;
+use crate::identity;
+use crate::shared::dialogs::DialogHost;
+use crate::sidebar::SidebarView;
+
+pub struct AppRoot {
+    layout: Entity<LayoutState>,
+    dock: Entity<DockState>,
+    sidebar: Entity<SidebarView>,
+    dialogs: Entity<DialogHost>,
+    _subscriptions: Vec<Subscription>,
+}
+
+impl AppRoot {
+    pub fn new(window: &mut Window, cx: &mut Context<Self>) -> Self {
+        let dock = DockState::new(cx);
+        let layout = LayoutState::new(cx);
+
+        layout.update(cx, |layout, cx| {
+            layout.set_sidebar_toggles(SidebarToggles::Hidden, cx);
+        });
+
+        dock.update(cx, |dock, cx| {
+            dock.register_panel("welcome", |_, cx| {
+                cx.new(|_| PlaceholderView::new("Welcome"))
+            });
+            dock.register_panel("profile", |_, cx| {
+                cx.new(|_| PlaceholderView::new("Profile"))
+            });
+            dock.register_panel("relays", |_, cx| cx.new(|_| PlaceholderView::new("Relays")));
+            dock.open_panel("welcome", window, cx);
+        });
+
+        let sidebar = cx.new(|cx| SidebarView::new(dock.downgrade(), cx));
+        let dialogs = cx.new(DialogHost::new);
+        DialogHost::set_global(dialogs.clone(), cx);
+
+        let backend = Backend::global(cx);
+        let settings = SettingsStore::global(cx);
+
+        let mut subscriptions = Vec::new();
+
+        subscriptions.push(
+            cx.subscribe(&backend, |this, _backend, event, cx| match event {
+                BackendEvent::PassphraseRequired => identity::helpers::open_passphrase(cx),
+                BackendEvent::Error(message) => {
+                    this.layout.update(cx, |layout, cx| {
+                        layout.push_toast(Toast::new(message.clone()).icon(IconRole::Warning), cx);
+                    });
+                }
+                _ => {}
+            }),
+        );
+
+        subscriptions.push(cx.observe(&settings, |_this, store, cx| {
+            let settings = store.read(cx).settings().clone();
+            apply_appearance(&settings, cx);
+        }));
+
+        window.defer(cx, move |_window, cx| {
+            if backend.read(cx).passphrase_required() {
+                identity::helpers::open_passphrase(cx);
+            }
+        });
+
+        Self {
+            layout,
+            dock,
+            sidebar,
+            dialogs,
+            _subscriptions: subscriptions,
+        }
+    }
+}
+
+impl Render for AppRoot {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let theme = cx.theme();
+        div()
+            .size_full()
+            .font_family(".SystemUIFont")
+            .text_color(theme.colors.foreground)
+            .child(
+                Shell::new("signed-shell", self.layout.clone())
+                    .left_sidebar(self.sidebar.read(cx).build(cx))
+                    .center(
+                        Dock::new("signed-dock", self.dock.clone())
+                            .window_controls(true)
+                            .traffic_light_pad(!self.layout.read(cx).is_left_sidebar_visible())
+                            .sidebar_toggles(self.layout.clone()),
+                    ),
+            )
+            .child(self.dialogs.clone())
+    }
+}

crates/signed_app/src/app/placeholder.rs

@@ -0,0 +1,30 @@
+use gpui::{
+    App, Context, IntoElement, ParentElement as _, Render, SharedString, Styled as _, Window, div,
+};
+use gpui_native_kit::empty_state::EmptyState;
+use gpui_native_kit::layout::dock::Panel;
+
+/// A tab that stands in for a screen that is not ported yet.
+pub struct PlaceholderView {
+    title: SharedString,
+}
+
+impl PlaceholderView {
+    pub fn new(title: impl Into<SharedString>) -> Self {
+        Self {
+            title: title.into(),
+        }
+    }
+}
+
+impl Panel for PlaceholderView {
+    fn title(&self, _cx: &App) -> Option<SharedString> {
+        Some(self.title.clone())
+    }
+}
+
+impl Render for PlaceholderView {
+    fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
+        div().size_full().child(EmptyState::new(self.title.clone()))
+    }
+}

crates/signed_app/src/explore/helpers.rs

@@ -0,0 +1,191 @@
+use assets::CustomIconName;
+use gpui::prelude::FluentBuilder as _;
+use gpui::{
+    AnyElement, Entity, InteractiveElement as _, IntoElement, ParentElement as _, SharedString,
+    StatefulInteractiveElement as _, Styled as _, WeakEntity, div, px,
+};
+use gpui_native_kit::avatar::Avatar;
+use gpui_native_kit::common::{Sizable as _, h_flex, v_flex};
+use gpui_native_kit::icons::Icon;
+use gpui_native_kit::layout::dock::DockState;
+use gpui_native_kit::theme::ActiveTheme as _;
+use metadata::ProfileDirectory;
+use signed_core::Announcement;
+use signed_state::{RepoListStore, Timestamp};
+use utils::relative_time;
+
+use crate::repo::actions::open_repo_panel;
+
+const RECENT_COUNT: usize = 10;
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
+pub(super) enum RepoFilter {
+    All,
+    #[default]
+    Popular,
+    Recent,
+}
+
+impl RepoFilter {
+    /// Indices into the store's `announcements` this filter includes, in display order.
+    pub(super) fn visible(self, store: &RepoListStore, query: &str) -> Vec<usize> {
+        let announcements = &store.announcements;
+        let mut indices: Vec<usize> = (0..announcements.len()).collect();
+        let query = query.trim().to_lowercase();
+
+        if !query.is_empty() {
+            indices.retain(|&ix| {
+                let announcement = &announcements[ix];
+                let name = announcement.name.as_deref().unwrap_or(&announcement.id);
+                name.to_lowercase().contains(&query)
+            });
+        }
+
+        match self {
+            Self::All => {}
+            Self::Recent => indices.truncate(RECENT_COUNT),
+            Self::Popular => {
+                let counts = &store.counts;
+                let scores: Vec<u32> = announcements
+                    .iter()
+                    .map(|a| counts.get(&a.addr()).map_or(0, |c| c.score()))
+                    .collect();
+                indices.sort_by(|&a, &b| scores[b].cmp(&scores[a]));
+            }
+        }
+
+        indices
+    }
+}
+
+pub(super) fn render_card(
+    ix: usize,
+    announcement: &Announcement,
+    last_activity: Option<Timestamp>,
+    announcements: &[Announcement],
+    directory: &Entity<ProfileDirectory>,
+    dock: &WeakEntity<DockState>,
+    cx: &mut gpui::App,
+) -> AnyElement {
+    let owner = directory.read(cx).profile(&announcement.owner, cx);
+    let owner_name = owner.name();
+    let dock = dock.clone();
+    let announcement = announcement.clone();
+
+    let name = announcement
+        .name
+        .as_deref()
+        .map(SharedString::from)
+        .unwrap_or_else(|| SharedString::from(announcement.id.clone()));
+
+    let description = announcement
+        .description
+        .as_deref()
+        .map(SharedString::from)
+        .unwrap_or_else(|| SharedString::from("No description"));
+
+    let activity = last_activity
+        .map(relative_time)
+        .map(|label| SharedString::from(format!("Updated {label}")))
+        .unwrap_or_default();
+
+    let fork_label: Option<SharedString> = announcement.upstream.as_ref().and_then(|upstream| {
+        let addr = upstream.addr.as_ref()?;
+        let name = announcements
+            .iter()
+            .find(|a| a.addr() == *addr)
+            .map(|a| {
+                a.name
+                    .as_deref()
+                    .map(SharedString::from)
+                    .unwrap_or_else(|| SharedString::from(a.id.clone()))
+            })
+            .unwrap_or_else(|| SharedString::from(addr.identifier().to_owned()));
+        Some(SharedString::from(format!("forked from {name}")))
+    });
+
+    v_flex()
+        .id(ix)
+        .flex_1()
+        .h_full()
+        .min_w_0()
+        .px_3()
+        .rounded(cx.theme().radius.control)
+        .border_1()
+        .border_color(cx.theme().colors.border)
+        .hover(|this| this.bg(cx.theme().colors.muted_hover))
+        .child(
+            h_flex()
+                .h_10()
+                .gap_2()
+                .child(
+                    div()
+                        .min_w_0()
+                        .text_sm()
+                        .font_weight(gpui::FontWeight::SEMIBOLD)
+                        .whitespace_nowrap()
+                        .text_ellipsis()
+                        .child(name),
+                )
+                .when_some(fork_label, |this, label| {
+                    this.child(
+                        h_flex()
+                            .gap_1()
+                            .text_xs()
+                            .text_color(cx.theme().colors.muted_foreground)
+                            .whitespace_nowrap()
+                            .child(
+                                Icon::named(CustomIconName::GitBranch)
+                                    .size(px(12.))
+                                    .color(cx.theme().colors.muted_foreground),
+                            )
+                            .child(label),
+                    )
+                }),
+        )
+        .child(
+            div()
+                .h_16()
+                .min_w_0()
+                .text_xs()
+                .text_color(cx.theme().colors.muted_foreground)
+                .line_clamp(2)
+                .child(description),
+        )
+        .child(
+            h_flex()
+                .h_12()
+                .gap_2()
+                .overflow_hidden()
+                .child(
+                    h_flex()
+                        .gap_2()
+                        .child(
+                            Avatar::new(announcement.owner)
+                                .name(owner_name.clone())
+                                .picture(owner.picture())
+                                .small(),
+                        )
+                        .child(
+                            div()
+                                .text_xs()
+                                .text_color(cx.theme().colors.muted_foreground)
+                                .whitespace_nowrap()
+                                .child(owner_name),
+                        ),
+                )
+                .child(
+                    h_flex()
+                        .flex_1()
+                        .justify_end()
+                        .text_xs()
+                        .text_color(cx.theme().colors.muted_foreground)
+                        .whitespace_nowrap()
+                        .child(activity),
+                ),
+        )
+        .on_click(move |_, window, cx| {
+            open_repo_panel(&dock, &announcement.addr(), Some(&announcement), window, cx);
+        })
+        .into_any_element()
+}

crates/signed_app/src/explore/mod.rs

@@ -0,0 +1,255 @@
+mod helpers;
+
+use assets::CustomIconName;
+use gpui::prelude::FluentBuilder as _;
+use gpui::{
+    AnyElement, App, Context, Entity, InteractiveElement as _, IntoElement, ParentElement as _,
+    Render, SharedString, Styled as _, Subscription, UniformListScrollHandle, WeakEntity, Window,
+    div, px, uniform_list,
+};
+use gpui_native_kit::common::{h_flex, v_flex};
+use gpui_native_kit::empty_state::EmptyState;
+use gpui_native_kit::icons::{Icon, IconRole};
+use gpui_native_kit::input::{Input, InputState, InputStateEvent};
+use gpui_native_kit::layout::dock::{DockState, Panel};
+use gpui_native_kit::scrollbar::Scrollbar;
+use gpui_native_kit::segmented::{Segmented, SegmentedOption};
+use gpui_native_kit::theme::ActiveTheme as _;
+use helpers::{RepoFilter, render_card};
+use metadata::ProfileDirectory;
+use nostr::prelude::PublicKey;
+use signed_state::RepoListStore;
+
+const COLUMNS: usize = 2;
+const CARD_HEIGHT: f32 = 40. + 64. + 48. + 2. + 6.;
+
+pub struct ExploreView {
+    store: Entity<RepoListStore>,
+    dock: WeakEntity<DockState>,
+    scroll_handle: UniformListScrollHandle,
+    filter: RepoFilter,
+    /// Indices matching [`Self::filter`] into the store's `announcements`.
+    visible: Vec<usize>,
+    search: Entity<InputState>,
+    /// Profiles for the card owners.
+    directory: Entity<ProfileDirectory>,
+    _search_subscription: Subscription,
+    _store_subscription: Subscription,
+}
+
+impl ExploreView {
+    pub fn new(dock: WeakEntity<DockState>, cx: &mut Context<Self>) -> Self {
+        let store = RepoListStore::global(cx);
+        let directory = ProfileDirectory::new(cx);
+
+        let weak = cx.entity().downgrade();
+        let search = InputState::new(cx);
+
+        let search_subscription = cx.subscribe(&search, |this, _search, event, cx| {
+            if matches!(event, InputStateEvent::TextChanged) {
+                this.rebuild_rows(cx);
+            }
+        });
+
+        let store_subscription = cx.observe(&store, |this, _store, cx| {
+            this.rebuild_rows(cx);
+        });
+
+        cx.defer(move |cx| {
+            if let Err(error) = weak.update(cx, |this, cx| this.rebuild_rows(cx)) {
+                log::warn!("failed to load explore rows: {error}");
+            }
+        });
+
+        Self {
+            store,
+            dock,
+            scroll_handle: UniformListScrollHandle::new(),
+            filter: RepoFilter::default(),
+            visible: Vec::new(),
+            search,
+            directory,
+            _search_subscription: search_subscription,
+            _store_subscription: store_subscription,
+        }
+    }
+
+    fn rebuild_rows(&mut self, cx: &mut Context<Self>) {
+        let filter = self.filter;
+        let query = self.search.read(cx).value().to_string();
+        let store = self.store.read(cx);
+
+        self.visible = filter.visible(store, &query);
+
+        let owners: Vec<PublicKey> = self
+            .visible
+            .iter()
+            .filter_map(|ix| store.announcements.get(*ix))
+            .map(|announcement| announcement.owner)
+            .collect();
+
+        self.directory.update(cx, |directory, cx| {
+            directory.track(owners, cx);
+        });
+
+        cx.notify();
+    }
+
+    fn render_header(&self, count: usize, cx: &mut Context<Self>) -> AnyElement {
+        let muted = cx.theme().colors.muted_foreground;
+        let weak = cx.entity().downgrade();
+
+        h_flex()
+            .px_4()
+            .py_2()
+            .w_full()
+            .gap_3()
+            .child(
+                v_flex()
+                    .gap_1()
+                    .child(
+                        div()
+                            .font_weight(gpui::FontWeight::SEMIBOLD)
+                            .text_xs()
+                            .child("Repositories"),
+                    )
+                    .child(
+                        div()
+                            .text_size(px(10.))
+                            .text_color(muted)
+                            .child(SharedString::from(format!("Total: {count}"))),
+                    ),
+            )
+            .child(
+                div().w(px(180.)).child(
+                    Input::new("explore-search", self.search.clone())
+                        .placeholder("Search...")
+                        .prefix(Icon::named(IconRole::Search).size(px(14.)).color(muted)),
+                ),
+            )
+            .child(div().flex_1())
+            .child(
+                Segmented::new("explore-filter", self.filter)
+                    .options(vec![
+                        SegmentedOption::new(RepoFilter::All, "All")
+                            .icon(Icon::named(CustomIconName::Grid).size(px(14.)).color(muted)),
+                        SegmentedOption::new(RepoFilter::Popular, "Popular").icon(
+                            Icon::named(CustomIconName::Trending)
+                                .size(px(14.))
+                                .color(muted),
+                        ),
+                        SegmentedOption::new(RepoFilter::Recent, "Recent").icon(
+                            Icon::named(CustomIconName::Recent)
+                                .size(px(14.))
+                                .color(muted),
+                        ),
+                    ])
+                    .on_change(move |filter, _, cx| {
+                        if let Err(error) = weak.update(cx, |this, cx| {
+                            this.filter = filter;
+                            this.rebuild_rows(cx);
+                        }) {
+                            log::warn!("failed to change explore filter: {error}");
+                        }
+                    }),
+            )
+            .into_any_element()
+    }
+}
+
+impl Panel for ExploreView {
+    fn title(&self, _cx: &App) -> Option<SharedString> {
+        Some(SharedString::from("Explore"))
+    }
+
+    fn lead(&self, cx: &App) -> Option<AnyElement> {
+        Some(
+            Icon::named(CustomIconName::Globe)
+                .size(px(14.))
+                .color(cx.theme().colors.muted_foreground)
+                .into_any_element(),
+        )
+    }
+}
+
+impl Render for ExploreView {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let store = self.store.read(cx);
+        let announcements = store.announcements.clone();
+        let last_activity = store.last_activity.clone();
+        let count = self.visible.len();
+        let visible = self.visible.clone();
+        let directory = self.directory.clone();
+        let dock = self.dock.clone();
+        let has_repos = count > 0;
+        let rows = visible.len().div_ceil(COLUMNS);
+
+        v_flex()
+            .relative()
+            .size_full()
+            .child(self.render_header(count, cx))
+            .when(!has_repos, |this| {
+                this.child(
+                    v_flex()
+                        .size_full()
+                        .items_center()
+                        .justify_center()
+                        .child(EmptyState::new("No repositories match your search")),
+                )
+            })
+            .when(has_repos, |this| {
+                this.child(
+                    uniform_list("explore-repos", rows, move |range, _, cx| {
+                        range
+                            .map(|row| {
+                                let mut cards = Vec::with_capacity(COLUMNS);
+
+                                for col in 0..COLUMNS {
+                                    let Some(&ix) = visible.get(row * COLUMNS + col) else {
+                                        break;
+                                    };
+                                    let Some(announcement) = announcements.get(ix) else {
+                                        break;
+                                    };
+                                    let activity = last_activity.get(&announcement.addr()).copied();
+                                    cards.push(render_card(
+                                        ix,
+                                        announcement,
+                                        activity,
+                                        &announcements,
+                                        &directory,
+                                        &dock,
+                                        cx,
+                                    ));
+                                }
+
+                                h_flex()
+                                    .id(row)
+                                    .w_full()
+                                    .h(px(CARD_HEIGHT))
+                                    .gap_3()
+                                    .px_4()
+                                    .pt_4()
+                                    .children(cards)
+                                    .into_any_element()
+                            })
+                            .collect()
+                    })
+                    .track_scroll(&self.scroll_handle)
+                    .size_full(),
+                )
+            })
+            .child(
+                div()
+                    .absolute()
+                    .top_0()
+                    .left_0()
+                    .right_0()
+                    .bottom_0()
+                    .child(Scrollbar::vertical(
+                        "explore-scroll",
+                        self.scroll_handle.clone(),
+                    )),
+            )
+    }
+}

crates/signed_app/src/identity/exit.rs

@@ -0,0 +1,56 @@
+use gpui::{
+    AnyElement, Context, IntoElement, ParentElement as _, Render, Styled as _, Window, div,
+};
+use gpui_native_kit::button::{Button, ButtonVariant};
+use gpui_native_kit::common::v_flex;
+use gpui_native_kit::dialog::Dialog;
+use gpui_native_kit::theme::ActiveTheme as _;
+use signed_state::Backend;
+
+use crate::shared::dialogs::close_global;
+
+pub struct ExitDialog;
+
+impl Render for ExitDialog {
+    fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
+        Dialog::new("exit-dialog")
+            .open(true)
+            .on_change(|open, _, cx| {
+                if !open {
+                    close_global(cx);
+                }
+            })
+            .title("Exit Signed?")
+            .content(|_, cx| {
+                v_flex()
+                    .child(
+                        div()
+                            .text_sm()
+                            .text_color(cx.theme().colors.muted_foreground)
+                            .child(
+                                "You will be signed out on this device and will need to sign in again on the next session.",
+                            ),
+                    )
+                    .into_any_element()
+            })
+            .actions(|_, _| {
+                let cancel: AnyElement = Button::new("cancel-exit")
+                    .label("Cancel")
+                    .variant(ButtonVariant::Secondary)
+                    .on_click(|_, _, cx| close_global(cx))
+                    .into_any_element();
+
+                let exit: AnyElement = Button::new("confirm-exit")
+                    .label("Exit")
+                    .variant(ButtonVariant::Destructive)
+                    .on_click(|_, _, cx| {
+                        let backend = Backend::global(cx);
+                        backend.update(cx, |backend, cx| backend.sign_out(cx));
+                        close_global(cx);
+                    })
+                    .into_any_element();
+
+                vec![cancel, exit]
+            })
+    }
+}

crates/signed_app/src/identity/helpers.rs

@@ -0,0 +1,23 @@
+use gpui::{App, AppContext as _};
+
+use super::exit::ExitDialog;
+use super::import::ImportDialog;
+use super::onboarding::OnboardingDialog;
+use super::passphrase::PassphraseDialog;
+use crate::shared::dialogs::open_global;
+
+pub fn open_passphrase(cx: &mut App) {
+    open_global(PassphraseDialog::new(cx), cx);
+}
+
+pub fn open_onboarding(cx: &mut App) {
+    open_global(OnboardingDialog::new(cx), cx);
+}
+
+pub fn open_import(cx: &mut App) {
+    open_global(ImportDialog::new(cx), cx);
+}
+
+pub fn open_exit(cx: &mut App) {
+    open_global(cx.new(|_| ExitDialog), cx);
+}

crates/signed_app/src/identity/import.rs

@@ -0,0 +1,342 @@
+use gpui::prelude::FluentBuilder as _;
+use gpui::{
+    AnyElement, App, AppContext as _, Context, Entity, IntoElement, ParentElement as _, Render,
+    Styled as _, Subscription, Task, Window, div, px,
+};
+use gpui_native_kit::button::Button;
+use gpui_native_kit::common::v_flex;
+use gpui_native_kit::dialog::Dialog;
+use gpui_native_kit::field::Field;
+use gpui_native_kit::input::{Input, InputState, InputStateEvent};
+use gpui_native_kit::theme::ActiveTheme as _;
+use signed_state::Backend;
+
+use crate::shared::dialogs::close_global;
+use crate::shared::progress::{DialogProgress, error_row};
+
+#[derive(Clone, Copy, Default, PartialEq, Eq)]
+enum Stage {
+    #[default]
+    Credential,
+    /// An `nsec` was entered; ask for a passphrase to encrypt it with.
+    Encrypt,
+    /// An `ncryptsec` was entered; ask for its passphrase to decrypt it.
+    Decrypt,
+}
+
+/// The credential entered on the first step.
+enum Credential {
+    Nsec(String),
+    Ncryptsec(String),
+    Bunker(String),
+}
+
+impl Credential {
+    fn parse(input: &str) -> Option<Self> {
+        let input = input.trim();
+
+        if input.starts_with("nsec1") {
+            Some(Self::Nsec(input.to_owned()))
+        } else if input.starts_with("ncryptsec1") {
+            Some(Self::Ncryptsec(input.to_owned()))
+        } else if input.starts_with("bunker://") {
+            Some(Self::Bunker(input.to_owned()))
+        } else {
+            None
+        }
+    }
+}
+
+/// State of the import dialog, so the current step and async results can be rendered.
+#[derive(Default)]
+pub struct ImportState {
+    stage: Stage,
+    credential: String,
+    progress: DialogProgress,
+}
+
+pub struct ImportDialog {
+    secret_input: Entity<InputState>,
+    pass_input: Entity<InputState>,
+    repass_input: Entity<InputState>,
+    state: Entity<ImportState>,
+    _subscriptions: Vec<Subscription>,
+}
+
+impl ImportDialog {
+    pub fn new(cx: &mut App) -> Entity<Self> {
+        let state = cx.new(|_| ImportState::default());
+        let secret_input = InputState::new(cx);
+        let pass_input = InputState::builder().password().build(cx);
+        let repass_input = InputState::builder().password().build(cx);
+
+        cx.new(|cx| {
+            let mut subscriptions = Vec::new();
+
+            for input in [&secret_input, &pass_input, &repass_input] {
+                let secret_input = secret_input.clone();
+                let pass_input = pass_input.clone();
+                let repass_input = repass_input.clone();
+                let state = state.clone();
+
+                subscriptions.push(cx.subscribe(input, move |_this, _input, event, cx| {
+                    if matches!(event, InputStateEvent::Submitted) {
+                        submit(&secret_input, &pass_input, &repass_input, &state, cx);
+                    }
+                }));
+            }
+
+            Self {
+                secret_input,
+                pass_input,
+                repass_input,
+                state,
+                _subscriptions: subscriptions,
+            }
+        })
+    }
+}
+
+impl Render for ImportDialog {
+    fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
+        let state = self.state.clone();
+
+        let secret_input = self.secret_input.clone();
+        let pass_input = self.pass_input.clone();
+        let repass_input = self.repass_input.clone();
+
+        let action_state = state.clone();
+        let action_secret = secret_input.clone();
+
+        let action_pass = pass_input.clone();
+        let action_repass = repass_input.clone();
+
+        Dialog::new("import-dialog")
+            .open(true)
+            .min_width(px(520.))
+            .on_change(|open, _, cx| {
+                if !open {
+                    close_global(cx);
+                }
+            })
+            .title("Import identity")
+            .content(move |_window, cx| {
+                let state = state.read(cx);
+                let stage = state.stage;
+
+                let description = match stage {
+                    Stage::Credential => {
+                        "Paste the secret key or bunker URI of an existing identity."
+                    }
+                    Stage::Encrypt => "Choose a passphrase to encrypt your key on this device.",
+                    Stage::Decrypt => "Enter the passphrase used to encrypt this key.",
+                };
+
+                let form = match stage {
+                    Stage::Credential => v_flex().gap_3().child(
+                        Field::new("secret-field", "Secret key or bunker URI")
+                            .child(Input::new("secret-input", secret_input.clone())),
+                    ),
+                    Stage::Encrypt => v_flex()
+                        .gap_3()
+                        .child(
+                            Field::new("passphrase-field", "Passphrase")
+                                .child(Input::new("passphrase-input", pass_input.clone())),
+                        )
+                        .child(
+                            Field::new("repeat-field", "Repeat passphrase")
+                                .child(Input::new("repeat-input", repass_input.clone())),
+                        ),
+                    Stage::Decrypt => v_flex().gap_3().child(
+                        Field::new("passphrase-field", "Passphrase")
+                            .child(Input::new("passphrase-input", pass_input.clone())),
+                    ),
+                };
+
+                v_flex()
+                    .gap_3()
+                    .child(
+                        div()
+                            .text_sm()
+                            .text_color(cx.theme().colors.muted_foreground)
+                            .child(description),
+                    )
+                    .child(form)
+                    .when_some(error_row(&state.progress.error, cx), |el, error| {
+                        el.child(error)
+                    })
+                    .into_any_element()
+            })
+            .actions(move |_, cx| {
+                let state = action_state.read(cx);
+                let busy = state.progress.busy;
+
+                let label = match state.stage {
+                    Stage::Credential => "Continue",
+                    Stage::Encrypt => "Import identity",
+                    Stage::Decrypt => "Unlock",
+                };
+
+                let secret = action_secret.clone();
+                let pass = action_pass.clone();
+                let repass = action_repass.clone();
+                let state = action_state.clone();
+
+                let import: AnyElement = Button::new("import-identity")
+                    .label(label)
+                    .loading(busy)
+                    .disabled(busy)
+                    .on_click(move |_, _, cx| {
+                        submit(&secret, &pass, &repass, &state, cx);
+                    })
+                    .into_any_element();
+
+                vec![import]
+            })
+    }
+}
+
+fn submit(
+    secret_input: &Entity<InputState>,
+    pass_input: &Entity<InputState>,
+    repass_input: &Entity<InputState>,
+    state: &Entity<ImportState>,
+    cx: &mut App,
+) {
+    if state.read(cx).progress.busy {
+        return;
+    }
+
+    match state.read(cx).stage {
+        Stage::Credential => start_import(secret_input, state, cx),
+        Stage::Encrypt => import_nsec(pass_input, repass_input, state, cx),
+        Stage::Decrypt => import_ncryptsec(pass_input, state, cx),
+    }
+}
+
+/// Parses the entered credential and either moves to the passphrase step or connects to a bunker.
+fn start_import(secret_input: &Entity<InputState>, state: &Entity<ImportState>, cx: &mut App) {
+    let credential = match Credential::parse(secret_input.read(cx).value()) {
+        Some(credential) => credential,
+        None => {
+            state.update(cx, |state, cx| {
+                state
+                    .progress
+                    .fail("Enter an nsec, ncryptsec or bunker:// URI");
+                cx.notify();
+            });
+            return;
+        }
+    };
+
+    match credential {
+        Credential::Nsec(secret) => {
+            state.update(cx, |state, cx| {
+                state.credential = secret;
+                state.stage = Stage::Encrypt;
+                state.progress.error = None;
+                cx.notify();
+            });
+        }
+        Credential::Ncryptsec(secret) => {
+            state.update(cx, |state, cx| {
+                state.credential = secret;
+                state.stage = Stage::Decrypt;
+                state.progress.error = None;
+                cx.notify();
+            });
+        }
+        Credential::Bunker(uri) => {
+            state.update(cx, |state, cx| {
+                state.progress.begin();
+                cx.notify();
+            });
+
+            let backend = Backend::global(cx);
+            let task = backend.update(cx, |backend, cx| backend.import_bunker(&uri, cx));
+            finish_import(task, state, cx);
+        }
+    }
+}
+
+/// Encrypts the entered `nsec` with the passphrase and signs in with it.
+fn import_nsec(
+    pass_input: &Entity<InputState>,
+    repass_input: &Entity<InputState>,
+    state: &Entity<ImportState>,
+    cx: &mut App,
+) {
+    let backend = Backend::global(cx);
+    let nsec = state.read(cx).credential.clone();
+    let pass = pass_input.read(cx).value().to_string();
+    let repass = repass_input.read(cx).value().to_string();
+
+    if pass.is_empty() {
+        state.update(cx, |state, cx| {
+            state.progress.fail("Passphrase must not be empty");
+            cx.notify();
+        });
+        return;
+    }
+
+    if pass != repass {
+        state.update(cx, |state, cx| {
+            state.progress.fail("Passphrases do not match");
+            cx.notify();
+        });
+        return;
+    }
+
+    state.update(cx, |state, cx| {
+        state.progress.begin();
+        cx.notify();
+    });
+
+    let task = backend.update(cx, |backend, cx| backend.import_nsec(&nsec, &pass, cx));
+    finish_import(task, state, cx);
+}
+
+/// Decrypts the entered `ncryptsec` with the passphrase and signs in with it.
+fn import_ncryptsec(pass_input: &Entity<InputState>, state: &Entity<ImportState>, cx: &mut App) {
+    let backend = Backend::global(cx);
+    let ncryptsec = state.read(cx).credential.clone();
+    let pass = pass_input.read(cx).value().to_string();
+
+    if pass.is_empty() {
+        state.update(cx, |state, cx| {
+            state.progress.fail("Passphrase must not be empty");
+            cx.notify();
+        });
+        return;
+    }
+
+    state.update(cx, |state, cx| {
+        state.progress.begin();
+        cx.notify();
+    });
+
+    let task = backend.update(cx, |backend, cx| {
+        backend.import_ncryptsec(&ncryptsec, &pass, cx)
+    });
+    finish_import(task, state, cx);
+}
+
+/// Runs the import task to completion, closing the dialog on success.
+fn finish_import<T: 'static>(
+    task: Task<Result<T, anyhow::Error>>,
+    state: &Entity<ImportState>,
+    cx: &mut App,
+) {
+    let state = state.clone();
+
+    cx.spawn(async move |cx| match task.await {
+        Ok(_) => cx.update(close_global),
+        Err(error) => {
+            state.update(cx, |state, cx| {
+                state.progress.fail(error.to_string());
+                cx.notify();
+            });
+        }
+    })
+    .detach();
+}

crates/signed_app/src/identity/mod.rs

@@ -0,0 +1,5 @@
+pub mod exit;
+pub mod helpers;
+pub mod import;
+pub mod onboarding;
+pub mod passphrase;

crates/signed_app/src/identity/onboarding.rs

@@ -0,0 +1,140 @@
+use gpui::prelude::FluentBuilder as _;
+use gpui::{
+    AnyElement, App, AppContext as _, Context, Entity, IntoElement, ParentElement as _, Render,
+    Styled as _, Window, div, px,
+};
+use gpui_native_kit::button::Button;
+use gpui_native_kit::common::v_flex;
+use gpui_native_kit::dialog::Dialog;
+use gpui_native_kit::field::Field;
+use gpui_native_kit::input::{Input, InputState};
+use gpui_native_kit::theme::ActiveTheme as _;
+use signed_state::Backend;
+
+use crate::shared::dialogs::close_global;
+use crate::shared::progress::{DialogProgress, error_row};
+
+pub struct OnboardingDialog {
+    name_input: Entity<InputState>,
+    pass_input: Entity<InputState>,
+    repass_input: Entity<InputState>,
+    state: Entity<DialogProgress>,
+}
+
+impl OnboardingDialog {
+    pub fn new(cx: &mut App) -> Entity<Self> {
+        let state = cx.new(|_| DialogProgress::default());
+        let name_input = InputState::new(cx);
+        let pass_input = InputState::builder().password().build(cx);
+        let repass_input = InputState::builder().password().build(cx);
+
+        cx.new(|_| Self {
+            name_input,
+            pass_input,
+            repass_input,
+            state,
+        })
+    }
+
+    fn create_identity(&mut self, cx: &mut Context<Self>) {
+        if self.state.read(cx).busy {
+            return;
+        }
+
+        let name = self.name_input.read(cx).value().to_string();
+        let pass = self.pass_input.read(cx).value().to_string();
+        let repass = self.repass_input.read(cx).value().to_string();
+
+        if pass != repass {
+            self.state.update(cx, |state, cx| {
+                state.fail("Passphrases do not match");
+                cx.notify();
+            });
+            return;
+        }
+
+        self.state.update(cx, |state, cx| {
+            state.begin();
+            cx.notify();
+        });
+
+        let backend = Backend::global(cx);
+        let task = backend.update(cx, |backend, cx| backend.create_identity(&name, &pass, cx));
+        let state = self.state.clone();
+
+        cx.spawn(async move |_this, cx| match task.await {
+            Ok(_) => cx.update(close_global),
+            Err(error) => {
+                state.update(cx, |state, cx| {
+                    state.fail(error.to_string());
+                    cx.notify();
+                });
+            }
+        })
+        .detach();
+    }
+}
+
+impl Render for OnboardingDialog {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let name_input = self.name_input.clone();
+        let pass_input = self.pass_input.clone();
+        let repass_input = self.repass_input.clone();
+        let state = self.state.clone();
+        let action_state = state.clone();
+        let this = cx.entity().downgrade();
+
+        Dialog::new("onboarding-dialog")
+            .open(true)
+            .min_width(px(520.))
+            .on_change(|open, _, cx| {
+                if !open {
+                    close_global(cx);
+                }
+            })
+            .title("Create identity")
+            .content(move |_window, cx| {
+                let progress = state.read(cx);
+                v_flex()
+                    .gap_3()
+                    .child(
+                        div()
+                            .text_sm()
+                            .text_color(cx.theme().colors.muted_foreground)
+                            .child("Set up your Signed identity to get started."),
+                    )
+                    .child(
+                        Field::new("name-field", "Name")
+                            .description("Max 255 characters")
+                            .child(Input::new("name-input", name_input.clone())),
+                    )
+                    .child(
+                        Field::new("passphrase-field", "Passphrase")
+                            .child(Input::new("passphrase-input", pass_input.clone())),
+                    )
+                    .child(
+                        Field::new("repeat-field", "Repeat passphrase")
+                            .child(Input::new("repeat-input", repass_input.clone())),
+                    )
+                    .when_some(error_row(&progress.error, cx), |el, error| el.child(error))
+                    .into_any_element()
+            })
+            .actions(move |_, cx| {
+                let busy = action_state.read(cx).busy;
+                let this = this.clone();
+
+                let create: AnyElement = Button::new("create-identity")
+                    .label("Create new identity")
+                    .loading(busy)
+                    .disabled(busy)
+                    .on_click(move |_, _, cx| {
+                        crate::shared::log_dropped(
+                            this.update(cx, |this, cx| this.create_identity(cx)),
+                        );
+                    })
+                    .into_any_element();
+
+                vec![create]
+            })
+    }
+}

crates/signed_app/src/identity/passphrase.rs

@@ -0,0 +1,133 @@
+use assets::CustomIconName;
+use gpui::prelude::FluentBuilder as _;
+use gpui::{
+    AnyElement, App, AppContext as _, Context, Entity, IntoElement, ParentElement as _, Render,
+    Styled as _, Subscription, Window, div,
+};
+use gpui_native_kit::button::Button;
+use gpui_native_kit::common::v_flex;
+use gpui_native_kit::dialog::Dialog;
+use gpui_native_kit::field::Field;
+use gpui_native_kit::icons::Icon;
+use gpui_native_kit::input::{Input, InputState, InputStateEvent};
+use gpui_native_kit::theme::ActiveTheme as _;
+use signed_state::Backend;
+
+use crate::shared::dialogs::close_global;
+use crate::shared::progress::{DialogProgress, error_row, push_steps_row};
+
+pub struct PassphraseDialog {
+    pass_input: Entity<InputState>,
+    state: Entity<DialogProgress>,
+    _enter_subscription: Subscription,
+}
+
+impl PassphraseDialog {
+    pub fn new(cx: &mut App) -> Entity<Self> {
+        let state = cx.new(|_| DialogProgress::default());
+        let pass_input = InputState::builder().password().build(cx);
+
+        cx.new(|cx| {
+            let enter_subscription =
+                cx.subscribe(&pass_input, |this: &mut Self, _input, event, cx| {
+                    if matches!(event, InputStateEvent::Submitted) {
+                        this.unlock(cx);
+                    }
+                });
+
+            Self {
+                pass_input,
+                state,
+                _enter_subscription: enter_subscription,
+            }
+        })
+    }
+
+    fn unlock(&mut self, cx: &mut Context<Self>) {
+        if self.state.read(cx).busy {
+            return;
+        }
+
+        let pass = self.pass_input.read(cx).value().to_string();
+
+        if pass.is_empty() {
+            self.state.update(cx, |state, cx| {
+                state.fail("Passphrase must not be empty");
+                cx.notify();
+            });
+            return;
+        }
+
+        self.state.update(cx, |state, cx| {
+            state.begin();
+            cx.notify();
+        });
+
+        let backend = Backend::global(cx);
+        let task = backend.update(cx, |backend, cx| backend.restore_with_passphrase(&pass, cx));
+        let state = self.state.clone();
+
+        cx.spawn(async move |_this, cx| match task.await {
+            Ok(_) => {
+                cx.update(close_global);
+            }
+            Err(error) => {
+                state.update(cx, |state, cx| {
+                    state.fail(error.to_string());
+                    cx.notify();
+                });
+            }
+        })
+        .detach();
+    }
+}
+
+impl Render for PassphraseDialog {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let pass_input = self.pass_input.clone();
+        let state = self.state.clone();
+        let action_state = state.clone();
+        let this = cx.entity().downgrade();
+
+        Dialog::new("passphrase-dialog")
+            .open(true)
+            .on_change(|_open, _, _| {})
+            .title("Unlock your identity")
+            .content(move |_window, cx| {
+                let progress = state.read(cx);
+                v_flex()
+                    .gap_3()
+                    .child(
+                        div()
+                            .text_sm()
+                            .text_color(cx.theme().colors.muted_foreground)
+                            .child("Enter the passphrase used to encrypt this identity."),
+                    )
+                    .child(
+                        Field::new("passphrase-field", "Passphrase")
+                            .child(Input::new("passphrase-input", pass_input.clone())),
+                    )
+                    .when_some(error_row(&progress.error, cx), |el, error| el.child(error))
+                    .when_some(push_steps_row(&progress.push_steps, cx), |el, steps| {
+                        el.child(steps)
+                    })
+                    .into_any_element()
+            })
+            .actions(move |_, cx| {
+                let busy = action_state.read(cx).busy;
+                let this = this.clone();
+
+                let unlock: AnyElement = Button::new("unlock")
+                    .label("Unlock")
+                    .icon(Icon::named(CustomIconName::Unlock))
+                    .loading(busy)
+                    .disabled(busy)
+                    .on_click(move |_, _, cx| {
+                        crate::shared::log_dropped(this.update(cx, |this, cx| this.unlock(cx)));
+                    })
+                    .into_any_element();
+
+                vec![unlock]
+            })
+    }
+}

crates/signed_app/src/inbox/helpers.rs

@@ -0,0 +1,193 @@
+use assets::CustomIconName;
+use gpui::prelude::FluentBuilder as _;
+use gpui::{
+    AnyElement, App, Div, Entity, InteractiveElement as _, IntoElement, ParentElement as _,
+    SharedString, Stateful, Styled as _, div, px,
+};
+use gpui_native_kit::avatar::Avatar;
+use gpui_native_kit::badge::Badge;
+use gpui_native_kit::common::{Sizable as _, h_flex, v_flex};
+use gpui_native_kit::icons::Icon;
+use gpui_native_kit::theme::ActiveTheme as _;
+use metadata::ProfileDirectory;
+use nostr::prelude::{Event, Kind, PublicKey};
+use utils::relative_time;
+
+pub fn repo_header(id: SharedString, name: SharedString, unread: usize) -> AnyElement {
+    h_flex()
+        .h_12()
+        .w_full()
+        .gap_2()
+        .child(
+            div()
+                .min_w_0()
+                .text_sm()
+                .whitespace_nowrap()
+                .text_ellipsis()
+                .child(name),
+        )
+        .when(unread > 0, |this| {
+            this.child(Badge::new(id.clone(), unread.to_string()))
+        })
+        .into_any_element()
+}
+
+pub fn empty_section_row(cx: &App) -> AnyElement {
+    h_flex()
+        .h_12()
+        .w_full()
+        .px_3()
+        .text_xs()
+        .text_color(cx.theme().colors.muted_foreground)
+        .bg(cx.theme().colors.secondary)
+        .rounded(cx.theme().radius.control)
+        .child(SharedString::from("No activity yet."))
+        .into_any_element()
+}
+
+#[allow(clippy::too_many_arguments)]
+pub fn thread(
+    prefix: &'static str,
+    ix: usize,
+    title: SharedString,
+    unread: bool,
+    first: bool,
+    last: bool,
+    events: Vec<Event>,
+    me: Option<PublicKey>,
+    directory: &Entity<ProfileDirectory>,
+    cx: &App,
+) -> Stateful<Div> {
+    let mut timeline = v_flex().gap_2().w_full();
+    for event in events {
+        timeline = timeline.child(sub_activity(&event, me, directory, cx));
+    }
+
+    v_flex()
+        .id((prefix, ix))
+        .w_full()
+        .px_3()
+        .py_2()
+        .gap_2()
+        .bg(cx.theme().colors.secondary)
+        .when(first, |this| this.rounded_t(cx.theme().radius.control))
+        .when(last, |this| this.rounded_b(cx.theme().radius.control))
+        .when(!last, |this| {
+            this.border_b_1().border_color(cx.theme().colors.background)
+        })
+        .hover(|this| this.bg(cx.theme().colors.muted_hover))
+        .child(
+            h_flex()
+                .gap_2()
+                .text_sm()
+                .child(
+                    h_flex()
+                        .size_6()
+                        .flex_shrink_0()
+                        .items_center()
+                        .justify_center()
+                        .child(
+                            Icon::named(CustomIconName::Inbox)
+                                .size(px(14.))
+                                .color(cx.theme().colors.muted_foreground),
+                        ),
+                )
+                .child(
+                    div()
+                        .min_w_0()
+                        .whitespace_nowrap()
+                        .text_ellipsis()
+                        .child(title),
+                )
+                .child(div().flex_1())
+                .when(unread, |this| {
+                    this.child(
+                        div()
+                            .flex_shrink_0()
+                            .size_2()
+                            .rounded_full()
+                            .bg(cx.theme().colors.primary),
+                    )
+                }),
+        )
+        .child(timeline)
+}
+
+fn sub_activity(
+    event: &Event,
+    me: Option<PublicKey>,
+    directory: &Entity<ProfileDirectory>,
+    cx: &App,
+) -> AnyElement {
+    let profile = directory.read(cx).profile(&event.pubkey, cx);
+    let name = if Some(event.pubkey) == me {
+        SharedString::from("You")
+    } else {
+        profile.name()
+    };
+
+    h_flex()
+        .w_full()
+        .gap_2()
+        .child(div().w_6().flex_shrink_0())
+        .child(
+            h_flex()
+                .flex_1()
+                .min_w_0()
+                .gap_1()
+                .text_xs()
+                .child(
+                    Avatar::new(event.pubkey)
+                        .name(name.clone())
+                        .picture(profile.picture())
+                        .small(),
+                )
+                .child(name)
+                .child(SharedString::from(activity_phrase(event.kind)))
+                .child(div().flex_1())
+                .child(
+                    div()
+                        .text_color(cx.theme().colors.muted_foreground)
+                        .child(SharedString::from(relative_time(event.created_at))),
+                ),
+        )
+        .into_any_element()
+}
+
+fn activity_phrase(kind: Kind) -> &'static str {
+    match kind {
+        Kind::GitIssue => "opened an issue",
+        Kind::GitPullRequest => "opened a PR",
+        Kind::GitPullRequestUpdate => "updated a PR",
+        Kind::GitPatch => "created a patch",
+        Kind::Comment => "commented",
+        Kind::GitStatusOpen => "opened a status",
+        Kind::GitStatusApplied => "applied a status",
+        Kind::GitStatusClosed => "closed a status",
+        Kind::GitStatusDraft => "drafted a status",
+        _ => "did something",
+    }
+}
+
+pub fn empty_state(message: &'static str, cx: &App) -> AnyElement {
+    v_flex()
+        .w_full()
+        .flex_1()
+        .min_h_0()
+        .items_center()
+        .justify_center()
+        .gap_2()
+        .py_8()
+        .child(
+            Icon::named(CustomIconName::Inbox)
+                .size(px(24.))
+                .color(cx.theme().colors.muted_foreground),
+        )
+        .child(
+            div()
+                .text_sm()
+                .text_color(cx.theme().colors.muted_foreground)
+                .child(SharedString::from(message)),
+        )
+        .into_any_element()
+}

crates/signed_app/src/inbox/mod.rs

@@ -2,37 +2,31 @@ use std::collections::HashMap;
 use std::sync::Arc;
 
 use anyhow::Error;
-use dock::{BasePanel, DockArea, Panel, PanelEvent};
-use gpui::prelude::*;
+use assets::CustomIconName;
 use gpui::{
-    AnyElement, App, Context, Div, EventEmitter, FocusHandle, Focusable, ListAlignment, ListState,
-    Pixels, Render, SharedString, Stateful, Subscription, Task, WeakEntity, Window, div, list, px,
+    AnyElement, App, AppContext as _, Context, Entity, IntoElement, ParentElement as _, Render,
+    SharedString, StatefulInteractiveElement as _, Styled as _, Subscription, Task, WeakEntity,
+    Window, div,
 };
-use gpui_component::button::{Button, ButtonVariants};
-use gpui_component::{ActiveTheme, Icon, IconName, IconNamed, Sizable, StyledExt, h_flex, v_flex};
+use gpui_native_kit::button::Button;
+use gpui_native_kit::common::{h_flex, v_flex};
+use gpui_native_kit::icons::{Icon, IconRole};
+use gpui_native_kit::layout::dock::{DockState, Panel};
+use gpui_native_kit::scroll_area::ScrollArea;
+use gpui_native_kit::theme::ActiveTheme as _;
+use metadata::ProfileDirectory;
 use nostr::prelude::{Event, EventId, Kind, PublicKey, Timestamp};
-use signed_core::{COVER_NOTE_KIND, InboxItem, InboxReadState, RepoAddr, filters};
-use signed_state::{
-    Backend, BackendEvent, ProfileStore, RefreshGate, RefreshRequest, RepoListStore, query_inbox,
-};
-use signed_ui::{CountBadge, UserAvatar};
-use utils::relative_time;
+use signed_core::{InboxItem, InboxReadState, RepoAddr};
+use signed_state::{Backend, BackendEvent, Inbox, RefreshGate, RefreshRequest, RepoListStore};
 
-use super::{RepoItem, open_repo_item};
+mod helpers;
+
+use helpers::{empty_section_row, empty_state, repo_header, thread};
+
+use crate::repo::actions::{RepoItem, open_repo_item};
 
-const LIST_OVERDRAW: Pixels = px(400.);
 const MAX_SUB_ACTIVITIES: usize = 5;
 
-struct InboxSection {
-    /// `None` for items without a repository.
-    address: Option<RepoAddr>,
-    unread: usize,
-    /// Indices into the threads, newest activity first.
-    entries: Vec<usize>,
-    /// Timestamp of the newest entry, used to order the sections.
-    latest: Timestamp,
-}
-
 #[derive(Clone, Copy)]
 enum InboxRow {
     Repo(usize),
@@ -40,31 +34,34 @@ enum InboxRow {
     Empty,
 }
 
+struct InboxSection {
+    address: Option<RepoAddr>,
+    unread: usize,
+    entries: Vec<usize>,
+    latest: Timestamp,
+}
+
 pub struct InboxView {
-    focus_handle: FocusHandle,
-    dock_area: WeakEntity<DockArea>,
-    /// One row per thread, merging notifications and own activity, newest first.
+    dock: WeakEntity<DockState>,
     threads: Arc<Vec<InboxItem>>,
     sections: Arc<Vec<InboxSection>>,
     rows: Arc<Vec<InboxRow>>,
-    unread_count: usize,
-    /// Copy of the global read state the current lists were derived with.
     state: InboxReadState,
     state_loaded: bool,
     refresh: RefreshGate,
-    list: ListState,
     tasks: Vec<Task<Result<(), Error>>>,
+    directory: Entity<ProfileDirectory>,
     _subscriptions: Vec<Subscription>,
 }
 
 impl InboxView {
-    pub fn new(dock_area: WeakEntity<DockArea>, cx: &mut Context<Self>) -> Self {
+    pub fn new(dock: WeakEntity<DockState>, cx: &mut Context<Self>) -> Self {
         let backend = Backend::global(cx);
         let inbox = backend.read(cx).inbox();
+
         let repos = RepoListStore::global(cx);
         let weak = cx.entity().downgrade();
 
-        let list = ListState::new(0, ListAlignment::Top, LIST_OVERDRAW);
         let mut subscriptions = vec![];
 
         subscriptions.push(cx.observe(&inbox, |this, _inbox, cx| {
@@ -75,14 +72,11 @@ impl InboxView {
             this.handle_backend_event(event, cx);
         }));
 
-        // Rebuild when the user's own repositories load or change,
-        // so a repository without any activity still gets an empty section.
         subscriptions.push(cx.observe(&repos, |this, _repos, cx| {
             this.rebuild(cx);
             cx.notify();
         }));
 
-        // Derive the sections once the panel exists.
         cx.defer(move |cx| {
             if let Err(error) = weak.update(cx, |this, cx| this.sync_state(cx)) {
                 log::warn!("inbox dropped before bootstrap could run: {error}");
@@ -90,17 +84,15 @@ impl InboxView {
         });
 
         Self {
-            focus_handle: cx.focus_handle(),
-            dock_area,
+            dock,
             threads: Arc::new(Vec::new()),
             sections: Arc::new(Vec::new()),
             rows: Arc::new(Vec::new()),
-            unread_count: 0,
             state: InboxReadState::default(),
             state_loaded: false,
             refresh: RefreshGate::default(),
-            list,
             tasks: vec![],
+            directory: ProfileDirectory::new(cx),
             _subscriptions: subscriptions,
         }
     }
@@ -109,23 +101,19 @@ impl InboxView {
         let Some(me) = Backend::global(cx).read(cx).current_user() else {
             return;
         };
-
         let all: Vec<Event> = self
             .threads
             .iter()
             .flat_map(|item| item.events.iter().cloned())
             .collect();
-
         let backend = Backend::global(cx);
         let inbox = backend.read(cx).inbox();
-
         inbox.update(cx, |inbox, cx| inbox.mark_all_read(&all, me, cx));
     }
 
     pub fn sync_state(&mut self, cx: &mut Context<Self>) {
         let backend = Backend::global(cx);
         let inbox = backend.read(cx).inbox();
-
         let (loaded, state) = {
             let inbox = inbox.read(cx);
             (inbox.is_loaded(), inbox.state().clone())
@@ -157,21 +145,7 @@ impl InboxView {
 
     fn handle_backend_event(&mut self, event: &BackendEvent, cx: &mut Context<Self>) {
         match event {
-            BackendEvent::NostrUpdate(updates) => {
-                let relevant = updates.iter().any(|update| {
-                    let is_notification = filters::NOTIFICATION_KINDS.contains(&update.kind);
-                    let is_comment = update.kind == Kind::Comment;
-                    let is_event_deletion = update.kind == Kind::EventDeletion;
-                    let is_request_to_vanish = update.kind == Kind::RequestToVanish;
-
-                    is_notification || is_comment || is_event_deletion || is_request_to_vanish
-                });
-
-                if relevant {
-                    self.refresh(cx);
-                }
-            }
-            BackendEvent::Synced | BackendEvent::Published(_) => self.refresh(cx),
+            BackendEvent::RepoUpdates(_) | BackendEvent::Synced => self.refresh(cx),
             _ => {}
         }
     }
@@ -185,33 +159,28 @@ impl InboxView {
     }
 
     fn refresh(&mut self, cx: &mut Context<Self>) {
-        if !self.state_loaded {
+        if !self.state_loaded || self.refresh.request() != RefreshRequest::Schedule {
             return;
         }
-
-        if self.refresh.request() != RefreshRequest::Schedule {
-            return;
-        }
-
         self.run_refresh(cx);
     }
 
     fn run_refresh(&mut self, cx: &mut Context<Self>) {
         self.refresh.begin();
-
         let backend = Backend::global(cx);
-        let Some(me) = backend.read(cx).current_user() else {
+        let (me, client) = {
+            let backend = backend.read(cx);
+            (backend.current_user(), backend.client())
+        };
+        let Some(me) = me else {
             self.refresh.abort();
             return;
         };
-
-        let client = backend.read(cx).client();
         let state = self.state.clone();
-
-        let work = cx.background_spawn(async move { query_inbox(&client, me, &state).await });
+        let work = cx.background_spawn(async move { Inbox::query(&client, me, &state).await });
 
         self.tasks.push(cx.spawn(async move |this, cx| {
-            let (threads, unread_count) = match work.await {
+            let (threads, _unread_count) = match work.await {
                 Ok(results) => results,
                 Err(error) => {
                     log::warn!("inbox refresh failed: {error}");
@@ -224,31 +193,24 @@ impl InboxView {
                     this.refresh.abort();
                     return false;
                 }
-
                 this.threads = Arc::new(threads);
-                this.unread_count = unread_count;
                 this.rebuild(cx);
                 cx.notify();
-
                 this.refresh.finish()
             })?;
 
             if again {
                 this.update(cx, |this, cx| this.refresh(cx))?;
             }
-
             Ok(())
         }));
     }
 
     fn regroup(&mut self, cx: &mut Context<Self>) {
         let mut items = (*self.threads).clone();
-
         for item in items.iter_mut() {
             item.apply_state(&self.state);
         }
-
-        self.unread_count = items.iter().filter(|item| item.is_unread()).count();
         self.threads = Arc::new(items);
         self.rebuild(cx);
     }
@@ -264,7 +226,6 @@ impl InboxView {
                 let known = sections
                     .iter()
                     .any(|section| section.address.as_ref() == Some(&address));
-
                 if !known {
                     sections.push(InboxSection {
                         address: Some(address),
@@ -277,20 +238,27 @@ impl InboxView {
         }
 
         sections.sort_by_key(|section| std::cmp::Reverse(section.latest));
-
         let rows = self.flatten_rows(&sections);
         self.sections = Arc::new(sections);
         self.rows = Arc::new(rows);
+
+        let mut keys: Vec<PublicKey> = self
+            .threads
+            .iter()
+            .flat_map(|item| item.events.iter().map(|event| event.pubkey))
+            .collect();
+        keys.sort_by_key(PublicKey::to_hex);
+        keys.dedup();
+        self.directory
+            .update(cx, |directory, cx| directory.track(keys, cx));
     }
 
     fn group_sections(&self) -> Vec<InboxSection> {
         let mut by_repo: HashMap<Option<RepoAddr>, InboxSection> = HashMap::new();
-
         for (ix, item) in self.threads.iter().enumerate() {
             if item.archived {
                 continue;
             }
-
             let address = item.address.clone();
             let section = by_repo
                 .entry(address.clone())
@@ -300,17 +268,14 @@ impl InboxView {
                     entries: Vec::new(),
                     latest: Timestamp::default(),
                 });
-
             if item.is_unread() {
                 section.unread += 1;
             }
-
             section.latest = section.latest.max(item.latest_activity());
             section.entries.push(ix);
         }
 
         let mut sections: Vec<InboxSection> = by_repo.into_values().collect();
-
         for section in &mut sections {
             section.entries.sort_by(|a, b| {
                 self.threads[*b]
@@ -318,27 +283,22 @@ impl InboxView {
                     .cmp(&self.threads[*a].latest_activity())
             });
         }
-
         sections.sort_by_key(|section| std::cmp::Reverse(section.latest));
         sections
     }
 
     fn flatten_rows(&self, sections: &[InboxSection]) -> Vec<InboxRow> {
         let mut rows = Vec::new();
-
         for (section_ix, section) in sections.iter().enumerate() {
             rows.push(InboxRow::Repo(section_ix));
-
             if section.entries.is_empty() {
                 rows.push(InboxRow::Empty);
                 continue;
             }
-
             rows.extend(
                 (0..section.entries.len()).map(|entry_ix| InboxRow::Entry(section_ix, entry_ix)),
             );
         }
-
         rows
     }
 
@@ -346,10 +306,8 @@ impl InboxView {
         self.threads = Arc::new(Vec::new());
         self.sections = Arc::new(Vec::new());
         self.rows = Arc::new(Vec::new());
-        self.unread_count = 0;
         self.state = InboxReadState::default();
         self.state_loaded = false;
-        // Drop any in-flight or pending run belonging to the previous user.
         self.refresh = RefreshGate::default();
     }
 
@@ -364,18 +322,16 @@ impl InboxView {
         let Some(address) = address else {
             return;
         };
-
         let item = match kind {
             Some(Kind::GitIssue) => RepoItem::Issue(root),
             Some(Kind::GitPullRequest) => RepoItem::PullRequest(root),
             Some(Kind::GitPatch) => RepoItem::Patch,
             _ => return,
         };
-
-        open_repo_item(&self.dock_area, &address, None, item, window, cx);
+        open_repo_item(&self.dock, &address, None, item, window, cx);
     }
 
-    fn render_entry(&self, ix: usize, cx: &Context<Self>) -> AnyElement {
+    fn render_entry(&self, ix: usize, cx: &mut Context<Self>) -> AnyElement {
         let Some(row) = self.rows.get(ix) else {
             return div().into_any_element();
         };
@@ -386,17 +342,24 @@ impl InboxView {
                 let Some(section) = self.sections.get(section_ix) else {
                     return div().into_any_element();
                 };
-                repo_header(section, cx)
+                let name = repo_name(section.address.as_ref(), cx);
+                let id = SharedString::from(format!(
+                    "inbox-unread:{}",
+                    section
+                        .address
+                        .as_ref()
+                        .map(ToString::to_string)
+                        .unwrap_or_default()
+                ));
+                repo_header(id, name, section.unread)
             }
             InboxRow::Entry(section_ix, entry_ix) => {
                 let Some(section) = self.sections.get(section_ix) else {
                     return div().into_any_element();
                 };
-
                 let Some(&thread_ix) = section.entries.get(entry_ix) else {
                     return div().into_any_element();
                 };
-
                 let Some(item) = self.threads.get(thread_ix) else {
                     return div().into_any_element();
                 };
@@ -406,265 +369,72 @@ impl InboxView {
                 let address = section.address.clone();
                 let first = entry_ix == 0;
                 let last = entry_ix + 1 == section.entries.len();
+                let me = Backend::global(cx).read(cx).current_user();
 
-                thread("inbox-row", ix, item, first, last, cx)
-                    .on_click(cx.listener(move |this, _ev, window, cx| {
-                        this.open(root, kind, address.clone(), window, cx)
-                    }))
-                    .into_any_element()
+                thread(
+                    "inbox-row",
+                    ix,
+                    SharedString::from(item.title()),
+                    item.is_unread(),
+                    first,
+                    last,
+                    item.timeline(MAX_SUB_ACTIVITIES),
+                    me,
+                    &self.directory,
+                    cx,
+                )
+                .on_click(cx.listener(move |this, _ev, window, cx| {
+                    this.open(root, kind, address.clone(), window, cx)
+                }))
+                .into_any_element()
             }
         }
     }
 }
 
-fn repo_name(addr: Option<&RepoAddr>, cx: &App) -> Option<SharedString> {
-    let repo_list = RepoListStore::global(cx);
-    let addr = addr?;
-    repo_list
-        .read(cx)
-        .announcements
-        .iter()
-        .find(|announcement| announcement.addr() == *addr)
-        .map(|announcement| announcement.name().map(SharedString::from))
-}
-
-fn repo_header(section: &InboxSection, cx: &App) -> AnyElement {
-    let name =
-        repo_name(section.address.as_ref(), cx).unwrap_or_else(|| SharedString::from("Untitled"));
-
-    h_flex()
-        .h_12()
-        .w_full()
-        .gap_1()
-        .items_center()
-        .child(
-            div()
-                .min_w_0()
-                .text_sm()
-                .whitespace_nowrap()
-                .text_ellipsis()
-                .child(name),
-        )
-        .when(section.unread > 0, |this| {
-            this.child(CountBadge::new(section.unread))
-        })
-        .into_any_element()
-}
-
-fn empty_section_row(cx: &App) -> AnyElement {
-    h_flex()
-        .h_12()
-        .w_full()
-        .px_3()
-        .text_xs()
-        .text_color(cx.theme().secondary_foreground)
-        .bg(cx.theme().secondary.alpha(0.6))
-        .rounded(cx.theme().radius)
-        .child(SharedString::from("No activity yet."))
-        .into_any_element()
-}
-
-fn thread(
-    prefix: &'static str,
-    ix: usize,
-    item: &InboxItem,
-    first: bool,
-    last: bool,
-    cx: &App,
-) -> Stateful<Div> {
-    let title = SharedString::from(item.title());
-    let unread = item.is_unread();
-
-    let backend = Backend::global(cx);
-    let me = backend.read(cx).current_user();
-
-    let mut timeline = v_flex().gap_2().w_full();
-
-    for event in item.timeline(MAX_SUB_ACTIVITIES) {
-        timeline = timeline.child(sub_activity(&event, me, cx));
-    }
-
-    v_flex()
-        .id((prefix, ix))
-        .w_full()
-        .px_3()
-        .py_2()
-        .gap_2()
-        .bg(cx.theme().secondary.alpha(0.6))
-        .when(first, |this| this.rounded_t(cx.theme().radius))
-        .when(last, |this| this.rounded_b(cx.theme().radius))
-        .when(!last, |this| {
-            this.border_b_1().border_color(cx.theme().background)
-        })
-        .hover(|this| this.bg(cx.theme().secondary_hover.alpha(0.8)))
-        .child(
-            h_flex()
-                .gap_2()
-                .text_sm()
-                .child(
-                    h_flex()
-                        .size_6()
-                        .flex_shrink_0()
-                        .items_center()
-                        .justify_center()
-                        .child(Icon::new(IconName::Bell)),
-                )
-                .child(
-                    div()
-                        .min_w_0()
-                        .whitespace_nowrap()
-                        .text_ellipsis()
-                        .child(title),
-                )
-                .child(div().flex_1())
-                .when(unread, |this| {
-                    this.child(
-                        div()
-                            .flex_shrink_0()
-                            .size_2()
-                            .rounded_full()
-                            .bg(cx.theme().primary),
-                    )
-                }),
-        )
-        .child(timeline)
-}
-
-fn sub_activity(event: &Event, me: Option<PublicKey>, cx: &App) -> AnyElement {
-    let profile_store = ProfileStore::global(cx).read(cx);
-    let profile = profile_store.get(&event.pubkey);
-
-    let name = if Some(event.pubkey) == me {
-        SharedString::from("You")
-    } else {
-        profile.name()
-    };
-
-    h_flex()
-        .w_full()
-        .gap_2()
-        .items_center()
-        .child(div().w_6().flex_shrink_0())
-        .child(
-            h_flex()
-                .flex_1()
-                .min_w_0()
-                .gap_1()
-                .items_center()
-                .text_xs()
-                .child(
-                    UserAvatar::new(name.clone())
-                        .picture(profile.picture())
-                        .xsmall(),
-                )
-                .child(name)
-                .child(SharedString::from(activity_phrase(event.kind)))
-                .child(div().flex_1())
-                .child(
-                    div()
-                        .text_color(cx.theme().muted_foreground)
-                        .child(SharedString::from(relative_time(event.created_at))),
-                ),
-        )
-        .into_any_element()
-}
-
-fn activity_phrase(kind: Kind) -> &'static str {
-    if kind == COVER_NOTE_KIND {
-        return "added a note";
-    }
-
-    match kind {
-        Kind::GitIssue => "opened an issue",
-        Kind::GitPullRequest => "opened a PR",
-        Kind::GitPullRequestUpdate => "updated a PR",
-        Kind::GitPatch => "created a patch",
-        Kind::Comment => "commented",
-        Kind::GitStatusOpen => "opened a status",
-        Kind::GitStatusApplied => "applied a status",
-        Kind::GitStatusClosed => "closed a status",
-        Kind::GitStatusDraft => "drafted a status",
-        _ => "did something",
-    }
-}
-
-fn empty_state(icon: impl IconNamed, message: &str, cx: &App) -> AnyElement {
-    v_flex()
-        .w_full()
-        .flex_1()
-        .min_h_0()
-        .items_center()
-        .justify_center()
-        .gap_2()
-        .py_8()
-        .child(
-            Icon::new(icon)
-                .large()
-                .text_color(cx.theme().muted_foreground),
-        )
-        .child(
-            div()
-                .text_sm()
-                .text_color(cx.theme().muted_foreground)
-                .child(SharedString::from(message)),
-        )
-        .into_any_element()
-}
-
-impl BasePanel for InboxView {
-    fn panel_name(&self) -> &'static str {
-        "inbox"
-    }
-}
-
 impl Panel for InboxView {
-    fn title(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
-        div().text_sm().child(SharedString::from("Inbox"))
+    fn title(&self, _cx: &App) -> Option<SharedString> {
+        Some(SharedString::from("Inbox"))
     }
-}
 
-impl EventEmitter<PanelEvent> for InboxView {}
-
-impl Focusable for InboxView {
-    fn focus_handle(&self, _cx: &App) -> FocusHandle {
-        self.focus_handle.clone()
+    fn lead(&self, cx: &App) -> Option<AnyElement> {
+        Some(
+            Icon::named(CustomIconName::Inbox)
+                .size(gpui::px(14.))
+                .color(cx.theme().colors.muted_foreground)
+                .into_any_element(),
+        )
     }
 }
 
 impl Render for InboxView {
     fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
         let rows = self.rows.clone();
-
-        if self.list.item_count() != rows.len() {
-            self.list.reset(rows.len());
+        let mut children = Vec::with_capacity(rows.len());
+        for ix in 0..rows.len() {
+            children.push(self.render_entry(ix, cx));
         }
 
         v_flex()
-            .image_cache(gpui::retain_all("inbox"))
             .size_full()
-            .gap_2()
             .child(
                 h_flex()
                     .px_4()
                     .h_12()
                     .w_full()
-                    .gap_1()
-                    .items_center()
+                    .gap_2()
                     .child(
                         div()
                             .text_sm()
-                            .font_semibold()
+                            .font_weight(gpui::FontWeight::SEMIBOLD)
                             .child(SharedString::from("Inbox")),
                     )
                     .child(div().flex_1())
                     .child(
                         Button::new("mark-all")
-                            .icon(IconName::CircleCheck)
-                            .secondary()
-                            .tooltip("Mark all as read")
-                            .on_click(cx.listener(move |this, _ev, _window, cx| {
-                                this.mark_all_read(cx);
-                            })),
+                            .icon(Icon::named(IconRole::Check))
+                            .label("Mark all read")
+                            .on_click(cx.listener(|this, _, _, cx| this.mark_all_read(cx))),
                     ),
             )
             .child(
@@ -673,24 +443,34 @@ impl Render for InboxView {
                     .flex_1()
                     .min_h_0()
                     .px_4()
-                    .when_else(
-                        rows.is_empty(),
-                        |this| {
-                            this.child(empty_state(IconName::Inbox, "You're all caught up.", cx))
-                        },
-                        |this| {
-                            this.child(
-                                list(
-                                    self.list.clone(),
-                                    cx.processor(|this, ix, _window, cx| this.render_entry(ix, cx)),
-                                )
-                                .size_full()
-                                .min_h_0()
-                                .into_any_element(),
-                            )
-                        },
-                    )
-                    .child(div().h_6().w_full().flex_shrink_0()),
+                    .child(if rows.is_empty() {
+                        empty_state("You're all caught up.", cx)
+                    } else {
+                        ScrollArea::new("inbox-scroll")
+                            .flex_1()
+                            .child(v_flex().gap_2().py_2().children(children))
+                            .into_any_element()
+                    }),
             )
+            .into_any_element()
     }
 }
+
+fn repo_name(addr: Option<&RepoAddr>, cx: &App) -> SharedString {
+    let Some(addr) = addr else {
+        return SharedString::from("Untitled");
+    };
+    RepoListStore::global(cx)
+        .read(cx)
+        .announcements
+        .iter()
+        .find(|announcement| announcement.addr() == *addr)
+        .map(|announcement| {
+            announcement
+                .name
+                .as_deref()
+                .map(SharedString::from)
+                .unwrap_or_else(|| SharedString::from(announcement.id.clone()))
+        })
+        .unwrap_or_else(|| SharedString::from("Untitled"))
+}

crates/signed_app/src/issues/detail.rs

@@ -0,0 +1,229 @@
+use gpui::{
+    AnyElement, Context, Entity, InteractiveElement as _, IntoElement, ParentElement as _, Render,
+    ScrollHandle, SharedString, Styled as _, Subscription, Window, div,
+};
+use gpui_native_kit::avatar::Avatar;
+use gpui_native_kit::common::{Sizable as _, h_flex, v_flex};
+use gpui_native_kit::empty_state::EmptyState;
+use gpui_native_kit::input::InputState;
+use gpui_native_kit::layout::dock::Panel;
+use gpui_native_kit::scroll_area::ScrollArea;
+use gpui_native_kit::theme::ActiveTheme as _;
+use metadata::ProfileDirectory;
+use nostr::prelude::{EventId, PublicKey};
+use signed_core::GitEvent;
+use signed_state::RepoStore;
+use utils::relative_time;
+
+use crate::issues::helpers::{comment_form, comments_section, issue_roots, sidebar_section};
+use crate::shared::widgets::{repo_tab_avatar, status_badge};
+
+pub struct IssueDetailView {
+    store: Entity<RepoStore>,
+    issue_id: EventId,
+    comment_input: Entity<InputState>,
+    /// Profiles for the author, commenters and the repository owner.
+    directory: Entity<ProfileDirectory>,
+    scroll_handle: ScrollHandle,
+    _subscription: Subscription,
+}
+
+impl IssueDetailView {
+    pub fn new(store: Entity<RepoStore>, issue_id: EventId, cx: &mut Context<Self>) -> Self {
+        let comment_input = InputState::builder().multiline().build(cx);
+
+        let subscription = cx.observe(&store, |this, _store, cx| {
+            this.track_participants(cx);
+            cx.notify();
+        });
+
+        let directory = ProfileDirectory::new(cx);
+        let weak = cx.entity().downgrade();
+        cx.defer(move |cx| {
+            crate::shared::log_dropped(weak.update(cx, |this, cx| this.track_participants(cx)));
+        });
+
+        Self {
+            store,
+            issue_id,
+            comment_input,
+            directory,
+            scroll_handle: ScrollHandle::new(),
+            _subscription: subscription,
+        }
+    }
+
+    /// Track the issue author, everyone who commented and the repository owner.
+    fn track_participants(&mut self, cx: &mut Context<Self>) {
+        let store = self.store.read(cx);
+        let mut keys: Vec<PublicKey> = store
+            .issues
+            .iter()
+            .find(|issue| issue.id == self.issue_id)
+            .map(|issue| issue.pubkey)
+            .into_iter()
+            .collect();
+
+        keys.extend(
+            store
+                .comments_of(&self.issue_id)
+                .map(|comment| comment.pubkey),
+        );
+
+        if let Some(owner) = store.announcement.as_ref().map(|a| a.owner) {
+            keys.push(owner);
+        }
+
+        self.directory.update(cx, |directory, cx| {
+            directory.track(keys, cx);
+        });
+    }
+}
+
+impl Panel for IssueDetailView {
+    fn title(&self, cx: &gpui::App) -> Option<SharedString> {
+        let short_id = self
+            .store
+            .read(cx)
+            .issues
+            .iter()
+            .find(|issue| issue.id == self.issue_id)
+            .map(|issue| {
+                let hex = issue.id.to_hex();
+                SharedString::from(&hex[..8])
+            })
+            .unwrap_or_else(|| SharedString::from("Issue"));
+
+        Some(short_id)
+    }
+
+    fn lead(&self, cx: &gpui::App) -> Option<AnyElement> {
+        Some(repo_tab_avatar(self.store.read(cx), &self.directory, cx))
+    }
+}
+
+impl Render for IssueDetailView {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let store = self.store.read(cx);
+
+        let Some(issue) = store.issues.iter().find(|issue| issue.id == self.issue_id) else {
+            let message = if store.loaded {
+                "Issue not found"
+            } else {
+                "Loading issue..."
+            };
+            return v_flex()
+                .size_full()
+                .items_center()
+                .justify_center()
+                .child(EmptyState::new(message))
+                .into_any_element();
+        };
+
+        let (title, author, status, age, issue_id, content, pubkey) = {
+            let profile = self.directory.read(cx).profile(&issue.pubkey, cx);
+            let content = if issue.content.is_empty() {
+                SharedString::from("No description provided.")
+            } else {
+                SharedString::from(&issue.content)
+            };
+
+            (
+                issue.activity_subject(),
+                profile.name(),
+                store.status_of(issue),
+                relative_time(issue.created_at),
+                issue.id,
+                content,
+                issue.pubkey,
+            )
+        };
+        let picture = self.directory.read(cx).profile(&pubkey, cx).picture();
+
+        h_flex()
+            .id("issue-detail")
+            .size_full()
+            .child(
+                ScrollArea::new("issue-detail-scroll")
+                    .handle(self.scroll_handle.clone())
+                    .flex_1()
+                    .min_w_0()
+                    .child(
+                        v_flex()
+                            .p_4()
+                            .gap_6()
+                            .child(
+                                h_flex().gap_2().child(status_badge(status)).child(
+                                    div()
+                                        .flex_1()
+                                        .min_w_0()
+                                        .font_weight(gpui::FontWeight::SEMIBOLD)
+                                        .child(title),
+                                ),
+                            )
+                            .child(
+                                v_flex()
+                                    .gap_8()
+                                    .child(
+                                        v_flex()
+                                            .gap_4()
+                                            .child(
+                                                h_flex()
+                                                    .gap_2()
+                                                    .text_sm()
+                                                    .child(
+                                                        h_flex()
+                                                            .gap_1()
+                                                            .child(
+                                                                Avatar::new(pubkey)
+                                                                    .name(author.clone())
+                                                                    .picture(picture)
+                                                                    .small(),
+                                                            )
+                                                            .child(author),
+                                                    )
+                                                    .child(
+                                                        div()
+                                                            .text_color(
+                                                                cx.theme().colors.muted_foreground,
+                                                            )
+                                                            .child("opened"),
+                                                    )
+                                                    .child(
+                                                        div()
+                                                            .text_color(
+                                                                cx.theme().colors.muted_foreground,
+                                                            )
+                                                            .child(SharedString::from(age)),
+                                                    ),
+                                            )
+                                            .child(div().text_sm().child(content)),
+                                    )
+                                    .child(comments_section(
+                                        &self.store,
+                                        issue_id,
+                                        &self.directory,
+                                        cx,
+                                    ))
+                                    .child(comment_form(
+                                        &self.store,
+                                        issue_id,
+                                        issue_roots,
+                                        &self.comment_input,
+                                        "comment",
+                                        cx,
+                                    )),
+                            ),
+                    ),
+            )
+            .child(sidebar_section(
+                &self.store,
+                issue_id,
+                issue_roots,
+                true,
+                &self.directory,
+                cx,
+            ))
+            .into_any_element()
+    }
+}

crates/signed_app/src/issues/helpers.rs

@@ -0,0 +1,280 @@
+use assets::CustomIconName;
+use gpui::prelude::FluentBuilder as _;
+use gpui::{
+    AnyElement, App, Entity, IntoElement, ParentElement as _, SharedString, Styled as _, div, px,
+};
+use gpui_native_kit::avatar::Avatar;
+use gpui_native_kit::badge::{Badge, BadgeVariant};
+use gpui_native_kit::button::Button;
+use gpui_native_kit::common::{Sizable as _, h_flex, v_flex};
+use gpui_native_kit::icons::Icon;
+use gpui_native_kit::input::{Input, InputState};
+use gpui_native_kit::theme::ActiveTheme as _;
+use gpui_native_kit::tooltip::Tooltip;
+use metadata::ProfileDirectory;
+use nostr::prelude::{Event, EventId, PublicKey};
+use signed_core::RepoStatus;
+use signed_state::RepoStore;
+use utils::relative_time;
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub(crate) enum IssueFilter {
+    All,
+    Open,
+    Closed,
+}
+
+impl IssueFilter {
+    pub(crate) fn matches(self, status: RepoStatus) -> bool {
+        match self {
+            Self::All => true,
+            Self::Open => status == RepoStatus::Open,
+            Self::Closed => matches!(status, RepoStatus::Closed | RepoStatus::Applied),
+        }
+    }
+}
+
+/// Root events counted by their resolved status.
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
+pub(crate) struct StatusCounts {
+    pub(crate) total: usize,
+    pub(crate) open: usize,
+    pub(crate) closed: usize,
+    pub(crate) draft: usize,
+    pub(crate) applied: usize,
+}
+
+impl StatusCounts {
+    fn record(&mut self, status: RepoStatus) {
+        self.total += 1;
+        match status {
+            RepoStatus::Open => self.open += 1,
+            RepoStatus::Closed => self.closed += 1,
+            RepoStatus::Draft => self.draft += 1,
+            RepoStatus::Applied => self.applied += 1,
+        }
+    }
+}
+
+/// Indices of `roots` whose status `keep` accepts, counting every root's status.
+pub(crate) fn filter_by_status<'a>(
+    roots: impl IntoIterator<Item = &'a Event>,
+    status_of: impl Fn(&Event) -> RepoStatus,
+    keep: impl Fn(RepoStatus) -> bool,
+) -> (Vec<usize>, StatusCounts) {
+    let mut counts = StatusCounts::default();
+
+    let visible = roots
+        .into_iter()
+        .enumerate()
+        .filter_map(|(index, root)| {
+            let status = status_of(root);
+            counts.record(status);
+            keep(status).then_some(index)
+        })
+        .collect();
+
+    (visible, counts)
+}
+
+pub(crate) fn issue_roots(store: &RepoStore) -> &[Event] {
+    &store.issues
+}
+
+pub(crate) fn pr_roots(store: &RepoStore) -> &[Event] {
+    &store.pull_requests
+}
+
+pub(crate) fn sidebar_section(
+    store: &Entity<RepoStore>,
+    id: EventId,
+    roots: fn(&RepoStore) -> &[Event],
+    top_gap: bool,
+    directory: &Entity<ProfileDirectory>,
+    cx: &App,
+) -> AnyElement {
+    let store = store.read(cx);
+    let Some(root) = roots(store).iter().find(|event| event.id == id) else {
+        return div().into_any_element();
+    };
+
+    let mut participants: Vec<PublicKey> = vec![root.pubkey];
+    participants.extend(store.comments_of(&root.id).map(|comment| comment.pubkey));
+    participants.sort_by_key(PublicKey::to_hex);
+    participants.dedup();
+
+    let labels: Vec<String> = root.tags.hashtags().map(|tag| tag.to_string()).collect();
+
+    v_flex()
+        .w(px(240.))
+        .h_full()
+        .flex_none()
+        .px_4()
+        .gap_4()
+        .border_l_1()
+        .border_color(cx.theme().colors.border)
+        .child(
+            v_flex()
+                .when(top_gap, |this| this.mt_4())
+                .gap_2()
+                .child(crate::shared::widgets::section_label("Participants", cx))
+                .children(participants.iter().map(|pubkey| {
+                    let profile = directory.read(cx).profile(pubkey, cx);
+                    let name = profile.name();
+
+                    h_flex()
+                        .gap_1()
+                        .child(
+                            Avatar::new(*pubkey)
+                                .name(name.clone())
+                                .picture(profile.picture())
+                                .small(),
+                        )
+                        .child(div().text_sm().text_ellipsis().child(name))
+                        .into_any_element()
+                })),
+        )
+        .child(
+            v_flex()
+                .gap_2()
+                .child(crate::shared::widgets::section_label("Labels", cx))
+                .map(|this| {
+                    if labels.is_empty() {
+                        this.child(
+                            div()
+                                .text_sm()
+                                .text_color(cx.theme().colors.muted_foreground)
+                                .child("None yet."),
+                        )
+                    } else {
+                        this.child(v_flex().gap_1().children(labels.iter().map(|label| {
+                            Badge::new(SharedString::from(format!("label:{label}")), label.clone())
+                                .variant(BadgeVariant::Outline)
+                        })))
+                    }
+                }),
+        )
+        .into_any_element()
+}
+
+pub(crate) fn comments_section(
+    store: &Entity<RepoStore>,
+    root: EventId,
+    directory: &Entity<ProfileDirectory>,
+    cx: &App,
+) -> AnyElement {
+    let store = store.read(cx);
+    let comments: Vec<&Event> = store.comments_of(&root).collect();
+    let title = SharedString::from(format!("Discussions {}", comments.len()));
+
+    v_flex()
+        .gap_4()
+        .child(
+            div()
+                .text_xs()
+                .font_weight(gpui::FontWeight::SEMIBOLD)
+                .child(title),
+        )
+        .children(comments.iter().map(|comment| {
+            let profile = directory.read(cx).profile(&comment.pubkey, cx);
+            let author = profile.name();
+            let age = relative_time(comment.created_at);
+            let content = SharedString::from(comment.content.as_str());
+
+            v_flex()
+                .gap_1()
+                .p_3()
+                .border_1()
+                .border_color(cx.theme().colors.border)
+                .rounded(cx.theme().radius.control)
+                .child(
+                    h_flex()
+                        .gap_2()
+                        .text_sm()
+                        .child(
+                            h_flex()
+                                .gap_1()
+                                .child(
+                                    Avatar::new(comment.pubkey)
+                                        .name(author.clone())
+                                        .picture(profile.picture())
+                                        .small(),
+                                )
+                                .child(author),
+                        )
+                        .child(
+                            div()
+                                .text_color(cx.theme().colors.muted_foreground)
+                                .child("commented"),
+                        )
+                        .child(
+                            div()
+                                .text_color(cx.theme().colors.muted_foreground)
+                                .child(SharedString::from(age)),
+                        ),
+                )
+                .child(div().text_sm().child(content))
+        }))
+        .into_any_element()
+}
+
+pub(crate) fn comment_form(
+    store: &Entity<RepoStore>,
+    root: EventId,
+    roots: fn(&RepoStore) -> &[Event],
+    comment_input: &Entity<InputState>,
+    button_id: &'static str,
+    cx: &App,
+) -> AnyElement {
+    let comment_input = comment_input.clone();
+    let store = store.clone();
+
+    v_flex()
+        .gap_2()
+        .child(
+            Input::new("comment-input", comment_input.clone())
+                .rows(4)
+                .placeholder("Leave a comment..."),
+        )
+        .child(
+            h_flex()
+                .justify_between()
+                .child(
+                    h_flex()
+                        .gap_1()
+                        .text_xs()
+                        .text_color(cx.theme().colors.muted_foreground)
+                        .child(
+                            Icon::named(CustomIconName::Markdown)
+                                .size(px(12.))
+                                .color(cx.theme().colors.muted_foreground),
+                        )
+                        .child("Markdown is supported"),
+                )
+                .child(
+                    Button::new(button_id)
+                        .label("Comment")
+                        .tooltip(Tooltip::text("Post comment"))
+                        .on_click(move |_, window, cx| {
+                            let content = comment_input.read(cx).value().trim().to_string();
+                            if content.is_empty() {
+                                return;
+                            }
+                            let Some(root) = roots(store.read(cx))
+                                .iter()
+                                .find(|event| event.id == root)
+                                .cloned()
+                            else {
+                                return;
+                            };
+                            store.update(cx, |store, cx| {
+                                store.comment(&root, content, cx);
+                            });
+                            comment_input.update(cx, |input, cx| {
+                                input.set_value("", window, cx);
+                            });
+                        }),
+                ),
+        )
+        .into_any_element()
+}

crates/signed_app/src/issues/mod.rs

@@ -0,0 +1,325 @@
+use assets::CustomIconName;
+use gpui::prelude::FluentBuilder as _;
+use gpui::{
+    AnyElement, App, AppContext as _, Context, Entity, InteractiveElement as _, IntoElement,
+    ParentElement as _, Render, SharedString, StatefulInteractiveElement as _, Styled as _,
+    Subscription, UniformListScrollHandle, WeakEntity, Window, div, px, uniform_list,
+};
+use gpui_native_kit::avatar::Avatar;
+use gpui_native_kit::button::Button;
+use gpui_native_kit::common::{Sizable as _, h_flex, v_flex};
+use gpui_native_kit::empty_state::EmptyState;
+use gpui_native_kit::icons::Icon;
+use gpui_native_kit::layout::dock::{DockState, Panel};
+use gpui_native_kit::scrollbar::Scrollbar;
+use gpui_native_kit::segmented::{Segmented, SegmentedOption};
+use gpui_native_kit::theme::ActiveTheme as _;
+use metadata::ProfileDirectory;
+use nostr::prelude::PublicKey;
+use signed_core::GitEvent;
+use signed_state::RepoStore;
+use utils::relative_time;
+
+use self::detail::IssueDetailView;
+use helpers::{IssueFilter, StatusCounts, filter_by_status};
+
+use crate::shared::panels;
+use crate::shared::widgets::{repo_tab_avatar, status_badge};
+
+pub mod detail;
+pub(crate) mod helpers;
+pub mod new_issue;
+
+const ISSUE_ROW_HEIGHT: f32 = 73.;
+
+pub struct IssuesView {
+    dock: WeakEntity<DockState>,
+    store: Entity<RepoStore>,
+    repo_name: SharedString,
+    filter: IssueFilter,
+    visible_issues: Vec<usize>,
+    counts: StatusCounts,
+    // A filter change notifies even when the visible rows are unchanged.
+    synced_filter: IssueFilter,
+    scroll_handle: UniformListScrollHandle,
+    /// Profiles for issue authors and the repository owner.
+    directory: Entity<ProfileDirectory>,
+    _subscription: Subscription,
+}
+
+impl IssuesView {
+    pub fn new(
+        dock: WeakEntity<DockState>,
+        store: Entity<RepoStore>,
+        cx: &mut Context<Self>,
+    ) -> Self {
+        let repo_name = store.read(cx).name();
+
+        let subscription = cx.observe(&store, |this, _store, cx| {
+            this.rebuild(cx);
+        });
+        let weak = cx.entity().downgrade();
+        cx.defer(move |cx| {
+            crate::shared::log_dropped(weak.update(cx, |this, cx| this.rebuild(cx)));
+        });
+
+        Self {
+            dock,
+            store,
+            repo_name,
+            filter: IssueFilter::Open,
+            visible_issues: Vec::new(),
+            counts: StatusCounts::default(),
+            synced_filter: IssueFilter::Open,
+            scroll_handle: UniformListScrollHandle::new(),
+            directory: ProfileDirectory::new(cx),
+            _subscription: subscription,
+        }
+    }
+
+    fn rebuild(&mut self, cx: &mut Context<Self>) {
+        let filter = self.filter;
+
+        let (visible_issues, counts) = {
+            let store = self.store.read(cx);
+            filter_by_status(
+                &store.issues,
+                |issue| store.status_of(issue),
+                |status| filter.matches(status),
+            )
+        };
+
+        let store = self.store.read(cx);
+        let mut keys: Vec<PublicKey> = store.issues.iter().map(|issue| issue.pubkey).collect();
+
+        if let Some(owner) = store
+            .announcement
+            .as_ref()
+            .map(|announcement| announcement.owner)
+        {
+            keys.push(owner);
+        }
+
+        self.directory.update(cx, |directory, cx| {
+            directory.track(keys, cx);
+        });
+
+        let filter_changed = self.synced_filter != filter;
+        let visible_issues_changed = self.visible_issues != visible_issues;
+        let counts_changed = self.counts != counts;
+
+        if !filter_changed && !visible_issues_changed && !counts_changed {
+            return;
+        }
+
+        self.synced_filter = filter;
+        self.visible_issues = visible_issues;
+        self.counts = counts;
+
+        cx.notify();
+    }
+
+    fn render_header(&self, cx: &mut Context<Self>) -> AnyElement {
+        let counts = self.counts;
+        let muted = cx.theme().colors.muted_foreground;
+        let weak = cx.entity().downgrade();
+
+        h_flex()
+            .px_4()
+            .w_full()
+            .gap_3()
+            .border_b_1()
+            .border_color(cx.theme().colors.border)
+            .bg(cx.theme().colors.muted)
+            .child(
+                Segmented::new("issue-filter", self.filter)
+                    .options(vec![
+                        SegmentedOption::new(IssueFilter::All, format!("All ({})", counts.total))
+                            .icon(Icon::named(CustomIconName::GitIssueDone).color(muted)),
+                        SegmentedOption::new(IssueFilter::Open, format!("Open ({})", counts.open))
+                            .icon(Icon::named(CustomIconName::GitIssueOpen).color(muted)),
+                        SegmentedOption::new(
+                            IssueFilter::Closed,
+                            format!("Closed ({})", counts.closed),
+                        )
+                        .icon(Icon::named(CustomIconName::GitIssueClosed).color(muted)),
+                    ])
+                    .on_change(move |filter, _, cx| {
+                        if let Err(error) = weak.update(cx, |this, cx| {
+                            this.filter = filter;
+                            this.rebuild(cx);
+                        }) {
+                            log::warn!("failed to switch issue filter: {error}");
+                        }
+                    }),
+            )
+            .child(div().flex_1())
+            .child(
+                Button::new("new-issue")
+                    .label("New issue")
+                    .icon(Icon::named(CustomIconName::CirclePlus))
+                    .on_click(cx.listener(|this, _, _, cx| {
+                        new_issue::open(this.store.clone(), cx);
+                    })),
+            )
+            .into_any_element()
+    }
+}
+
+impl Panel for IssuesView {
+    fn title(&self, _cx: &App) -> Option<SharedString> {
+        Some(SharedString::from(format!("{}/issues", self.repo_name)))
+    }
+
+    fn lead(&self, cx: &App) -> Option<AnyElement> {
+        Some(repo_tab_avatar(self.store.read(cx), &self.directory, cx))
+    }
+}
+
+impl Render for IssuesView {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let filter = self.filter;
+        let count = self.visible_issues.len();
+        let visible_issues = self.visible_issues.clone();
+        let directory = self.directory.clone();
+        let store = self.store.clone();
+        let dock = self.dock.clone();
+
+        v_flex()
+            .size_full()
+            .child(self.render_header(cx))
+            .child(
+                v_flex()
+                    .relative()
+                    .flex_1()
+                    .min_h_0()
+                    .w_full()
+                    .when(count > 0, |this| {
+                        this.child(
+                            uniform_list("issues", count, move |range, _, cx| {
+                                range
+                                    .map(|ix| {
+                                        let issue_ix = visible_issues[ix];
+                                        let issue = &store.read(cx).issues[issue_ix];
+                                        let title = issue.activity_subject();
+                                        let id_hex = issue.id.to_hex();
+                                        let profile = directory.read(cx).profile(&issue.pubkey, cx);
+                                        let author = profile.name();
+                                        let age = relative_time(issue.created_at);
+                                        let status = store.read(cx).status_of(issue);
+                                        let issue_id = issue.id;
+                                        let dock = dock.clone();
+                                        let store = store.clone();
+
+                                        h_flex()
+                                            .id(ix)
+                                            .w_full()
+                                            .h(px(ISSUE_ROW_HEIGHT))
+                                            .gap_4()
+                                            .px_4()
+                                            .border_b_1()
+                                            .border_color(cx.theme().colors.border)
+                                            .hover(|this| this.bg(cx.theme().colors.muted_hover))
+                                            .on_click(move |_, window, cx| {
+                                                let id =
+                                                    SharedString::from(format!("issue:{issue_id}"));
+                                                let store = store.clone();
+                                                panels::open(
+                                                    &dock,
+                                                    id,
+                                                    move |_, cx| {
+                                                        cx.new(|cx| {
+                                                            IssueDetailView::new(
+                                                                store.clone(),
+                                                                issue_id,
+                                                                cx,
+                                                            )
+                                                        })
+                                                    },
+                                                    window,
+                                                    cx,
+                                                );
+                                            })
+                                            .child(status_badge(status))
+                                            .child(
+                                                v_flex()
+                                                    .flex_1()
+                                                    .min_w_0()
+                                                    .gap_1()
+                                                    .child(
+                                                        div()
+                                                            .text_sm()
+                                                            .text_ellipsis()
+                                                            .whitespace_nowrap()
+                                                            .child(title),
+                                                    )
+                                                    .child(
+                                                        h_flex()
+                                                            .gap_2()
+                                                            .text_xs()
+                                                            .child(
+                                                                h_flex()
+                                                                    .gap_1()
+                                                                    .child(
+                                                                        Avatar::new(issue.pubkey)
+                                                                            .name(author.clone())
+                                                                            .picture(
+                                                                                profile.picture(),
+                                                                            )
+                                                                            .small(),
+                                                                    )
+                                                                    .child(div().child(author)),
+                                                            )
+                                                            .child(SharedString::from("opened"))
+                                                            .child(
+                                                                div()
+                                                                    .text_color(
+                                                                        cx.theme()
+                                                                            .colors
+                                                                            .muted_foreground,
+                                                                    )
+                                                                    .child(SharedString::from(
+                                                                        &id_hex[..8],
+                                                                    )),
+                                                            )
+                                                            .child(SharedString::from(age)),
+                                                    ),
+                                            )
+                                            .into_any_element()
+                                    })
+                                    .collect()
+                            })
+                            .track_scroll(&self.scroll_handle)
+                            .size_full(),
+                        )
+                        .child(
+                            div()
+                                .absolute()
+                                .top_0()
+                                .left_0()
+                                .right_0()
+                                .bottom_0()
+                                .child(Scrollbar::vertical(
+                                    "issues-scroll",
+                                    self.scroll_handle.clone(),
+                                )),
+                        )
+                    })
+                    .when(count == 0, |this| {
+                        let message = match filter {
+                            IssueFilter::All => "No issues",
+                            IssueFilter::Open => "No open issues",
+                            IssueFilter::Closed => "No closed issues",
+                        };
+                        this.child(
+                            v_flex()
+                                .size_full()
+                                .items_center()
+                                .justify_center()
+                                .child(EmptyState::new(message)),
+                        )
+                    }),
+            )
+            .into_any_element()
+    }
+}

crates/signed_app/src/issues/new_issue.rs

@@ -0,0 +1,97 @@
+use gpui::{
+    AnyElement, App, AppContext as _, Context, Entity, IntoElement, ParentElement as _, Render,
+    Styled as _, Window, div,
+};
+use gpui_native_kit::button::Button;
+use gpui_native_kit::common::v_flex;
+use gpui_native_kit::dialog::Dialog;
+use gpui_native_kit::field::Field;
+use gpui_native_kit::input::{Input, InputState};
+use gpui_native_kit::theme::ActiveTheme as _;
+use signed_state::RepoStore;
+
+use crate::shared::dialogs::{close_global, open_global};
+
+pub struct NewIssueDialog {
+    store: Entity<RepoStore>,
+    subject: Entity<InputState>,
+    content: Entity<InputState>,
+}
+
+impl NewIssueDialog {
+    pub fn new(store: Entity<RepoStore>, cx: &mut App) -> Entity<Self> {
+        let subject = InputState::new(cx);
+        let content = InputState::builder().multiline().build(cx);
+
+        cx.new(|_| Self {
+            store,
+            subject,
+            content,
+        })
+    }
+
+    fn submit(&mut self, cx: &mut Context<Self>) {
+        let subject = self.subject.read(cx).value().to_string();
+        let content = self.content.read(cx).value().to_string();
+        let subject = (!subject.trim().is_empty()).then_some(subject);
+
+        self.store.update(cx, |store, cx| {
+            store.open_issue(subject, content, cx);
+        });
+
+        close_global(cx);
+    }
+}
+
+impl Render for NewIssueDialog {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let subject = self.subject.clone();
+        let content = self.content.clone();
+        let this = cx.entity().downgrade();
+
+        Dialog::new("new-issue-dialog")
+            .open(true)
+            .min_width(gpui::px(520.))
+            .on_change(|open, _, cx| {
+                if !open {
+                    close_global(cx);
+                }
+            })
+            .title("New issue")
+            .content(move |_, cx| {
+                v_flex()
+                    .gap_3()
+                    .child(
+                        div()
+                            .text_sm()
+                            .text_color(cx.theme().colors.muted_foreground)
+                            .child("Report a bug, ask a question, or propose a change."),
+                    )
+                    .child(
+                        Field::new("issue-title", "Title")
+                            .child(Input::new("issue-title-input", subject.clone())),
+                    )
+                    .child(
+                        Field::new("issue-content", "Content")
+                            .child(Input::new("issue-content-input", content.clone()).rows(6)),
+                    )
+                    .into_any_element()
+            })
+            .actions(move |_, _| {
+                let this = this.clone();
+                vec![
+                    Button::new("create-issue")
+                        .label("Create issue")
+                        .on_click(move |_, _, cx| {
+                            crate::shared::log_dropped(this.update(cx, |this, cx| this.submit(cx)));
+                        })
+                        .into_any_element() as AnyElement,
+                ]
+            })
+    }
+}
+
+/// Opens the new-issue form for `store`.
+pub fn open(store: Entity<RepoStore>, cx: &mut App) {
+    open_global(NewIssueDialog::new(store, cx), cx);
+}

crates/signed_app/src/lib.rs

@@ -0,0 +1,19 @@
+mod app;
+mod explore;
+mod identity;
+mod inbox;
+mod issues;
+mod pull_requests;
+mod repo;
+mod settings;
+mod shared;
+mod sidebar;
+
+pub use app::AppRoot;
+pub use app::helpers::{apply_appearance, apply_appearance_mode};
+
+use gpui::{App, AppContext as _, Entity, Window};
+
+pub fn root(window: &mut Window, cx: &mut App) -> Entity<AppRoot> {
+    cx.new(|cx| AppRoot::new(window, cx))
+}

crates/signed_app/src/pull_requests/detail.rs

@@ -0,0 +1,623 @@
+use std::path::PathBuf;
+
+use assets::CustomIconName;
+use gpui::prelude::FluentBuilder as _;
+use gpui::{
+    AnyElement, App, AppContext as _, Context, Entity, InteractiveElement as _, IntoElement,
+    ParentElement as _, Render, SharedString, Styled as _, Subscription, UniformListScrollHandle,
+    WeakEntity, Window, div, uniform_list,
+};
+use gpui_native_kit::avatar::Avatar;
+use gpui_native_kit::button::Button;
+use gpui_native_kit::clipboard::ClipboardButton;
+use gpui_native_kit::common::{Sizable as _, h_flex, v_flex};
+use gpui_native_kit::data::tabs::{Tab, Tabs};
+use gpui_native_kit::icons::Icon;
+use gpui_native_kit::input::InputState;
+use gpui_native_kit::layout::dock::{DockState, Panel};
+use gpui_native_kit::scroll_area::ScrollArea;
+use gpui_native_kit::scrollbar::Scrollbar;
+use gpui_native_kit::spinner::Spinner;
+use gpui_native_kit::theme::ActiveTheme as _;
+use metadata::ProfileDirectory;
+use nostr::prelude::{EventId, Kind, PublicKey, Url};
+use signed_core::{GitEvent, PullRequest, RepoAddr};
+use signed_git::{FileCommit, PatchParser};
+use signed_state::{Backend, Mirrors, RepoStore};
+use utils::relative_time;
+
+use super::dialogs;
+use crate::issues::helpers::{comment_form, comments_section, pr_roots, sidebar_section};
+use crate::repo::commit_diff::{CommitDiffView, DiffPane};
+use crate::repo::helpers::commit_row;
+use crate::shared::widgets::{empty_state, repo_tab_avatar, status_badge};
+
+const NOT_FOUND: &str = "Pull request not found";
+
+#[derive(Clone, PartialEq, Eq)]
+struct PrBinding {
+    description: String,
+    patch: String,
+    tip: Option<String>,
+    base: Option<String>,
+    clone_urls: Vec<Url>,
+    addr: RepoAddr,
+    has_patch_link: bool,
+}
+
+pub struct PullRequestDetailView {
+    dock: WeakEntity<DockState>,
+    store: Entity<RepoStore>,
+    pr_id: EventId,
+    comment_input: Entity<InputState>,
+    repo_name: SharedString,
+    worktree: Option<PathBuf>,
+    description: SharedString,
+    current_commit: Option<SharedString>,
+    commits: Vec<FileCommit>,
+    loading: bool,
+    error: Option<SharedString>,
+    bound: Option<PrBinding>,
+    load_generation: u64,
+    active_tab: usize,
+    pane: Entity<DiffPane>,
+    commit_scroll_handle: UniformListScrollHandle,
+    tasks: Vec<gpui::Task<Result<(), anyhow::Error>>>,
+    directory: Entity<ProfileDirectory>,
+    _subscription: Subscription,
+}
+
+impl PullRequestDetailView {
+    pub fn new(
+        dock: WeakEntity<DockState>,
+        store: Entity<RepoStore>,
+        pr_id: EventId,
+        _window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Self {
+        let pane = cx.new(DiffPane::new);
+        let comment_input = InputState::builder().multiline().build(cx);
+        let weak = cx.entity().downgrade();
+        let repo_name = store.read(cx).name();
+
+        let subscription = cx.observe(&store, |this, _store, cx| {
+            this.sync(cx);
+        });
+
+        cx.defer(move |cx| {
+            crate::shared::log_dropped(weak.update(cx, |this, cx| this.sync(cx)));
+        });
+
+        Self {
+            dock,
+            store,
+            pr_id,
+            comment_input,
+            repo_name,
+            worktree: None,
+            description: SharedString::default(),
+            current_commit: None,
+            commits: Vec::new(),
+            loading: true,
+            error: None,
+            bound: None,
+            load_generation: 0,
+            active_tab: 0,
+            pane,
+            commit_scroll_handle: UniformListScrollHandle::new(),
+            tasks: Vec::new(),
+            directory: ProfileDirectory::new(cx),
+            _subscription: subscription,
+        }
+    }
+
+    fn track_participants(&mut self, cx: &mut Context<Self>) {
+        let store = self.store.read(cx);
+        let mut keys: Vec<PublicKey> = store
+            .pull_requests
+            .iter()
+            .find(|pr| pr.id == self.pr_id && pr.kind == Kind::GitPullRequest)
+            .map(|root| vec![root.pubkey])
+            .unwrap_or_default();
+        keys.extend(store.comments_of(&self.pr_id).map(|comment| comment.pubkey));
+        if let Some(owner) = store.announcement.as_ref().map(|a| a.owner) {
+            keys.push(owner);
+        }
+        self.directory
+            .update(cx, |directory, cx| directory.track(keys, cx));
+    }
+
+    fn sync(&mut self, cx: &mut Context<Self>) {
+        self.track_participants(cx);
+        let loaded = self.store.read(cx).loaded;
+        let binding = {
+            let store = self.store.read(cx);
+            store.addr().and_then(|addr| {
+                store
+                    .pull_requests
+                    .iter()
+                    .find(|pr| pr.id == self.pr_id && pr.kind == Kind::GitPullRequest)
+                    .map(|root| {
+                        let update = PullRequest::latest_update(store.pull_requests.iter(), root);
+                        let tip = update
+                            .and_then(GitEvent::current_commit)
+                            .or_else(|| root.current_commit());
+                        let base = update
+                            .and_then(GitEvent::merge_base)
+                            .or_else(|| root.merge_base());
+                        let clone_urls = root
+                            .clone_urls()
+                            .or_else(|| store.announcement.as_ref().map(|a| a.clone.clone()))
+                            .unwrap_or_default();
+                        PrBinding {
+                            description: root.content.clone(),
+                            patch: PullRequest::new(root).patch(store.patches.iter()),
+                            tip,
+                            base,
+                            clone_urls,
+                            addr: addr.clone(),
+                            has_patch_link: root.tags.event_ids().next().is_some(),
+                        }
+                    })
+            })
+        };
+
+        let Some(binding) = binding else {
+            self.bound = None;
+            if !loaded {
+                self.loading = true;
+                self.error = None;
+            } else if self.error.as_deref() != Some(NOT_FOUND) {
+                self.loading = false;
+                self.error = Some(NOT_FOUND.into());
+            }
+            cx.notify();
+            return;
+        };
+
+        if self.bound.as_ref() == Some(&binding) {
+            return;
+        }
+        self.bound = Some(binding.clone());
+        self.load_diff(binding, cx);
+    }
+
+    fn load_diff(&mut self, binding: PrBinding, cx: &mut Context<Self>) {
+        self.loading = true;
+        self.error = None;
+        self.description = binding.description.clone().into();
+        self.current_commit = binding.tip.clone().map(SharedString::from);
+        cx.notify();
+
+        self.load_generation = self.load_generation.wrapping_add(1);
+        let generation = self.load_generation;
+        let PrBinding {
+            patch,
+            tip,
+            base,
+            clone_urls,
+            addr,
+            has_patch_link,
+            ..
+        } = binding;
+
+        let task: gpui::Task<Result<(), anyhow::Error>> = cx.spawn(async move |this, cx| {
+            let nostr_diff = cx
+                .background_spawn({
+                    let patch = patch.clone();
+                    async move { PatchParser::patch_diffs(&patch) }
+                })
+                .await;
+            let nostr_commits = cx
+                .background_spawn({
+                    let patch = patch.clone();
+                    async move { PatchParser::patch_commits(&patch) }
+                })
+                .await;
+
+            let use_nostr = match &nostr_diff {
+                Ok(diff) => has_patch_link || !diff.files.is_empty(),
+                Err(_) => true,
+            };
+
+            let git = if use_nostr {
+                None
+            } else {
+                let addr = addr.clone();
+                let clone_urls = clone_urls.clone();
+                let base = base.clone();
+                let tip = tip.clone();
+                Some(
+                    cx.background_spawn(async move {
+                        let repo = Mirrors::ensure(&addr, &clone_urls)?;
+                        let gix_repo = repo.inner();
+                        let workdir = gix_repo
+                            .workdir()
+                            .ok_or_else(|| anyhow::anyhow!("repository has no worktree"))?
+                            .to_path_buf();
+                        let tip =
+                            tip.ok_or_else(|| anyhow::anyhow!("pull request has no tip commit"))?;
+                        let base = match base {
+                            Some(base) => base,
+                            None => {
+                                let head = gix_repo
+                                    .head_id()
+                                    .map_err(|_| anyhow::anyhow!("repository has no HEAD"))?;
+                                let tip_id = gix_repo.rev_parse_single(tip.as_bytes())?;
+                                gix_repo.merge_base(tip_id, head)?.to_string()
+                            }
+                        };
+                        let diff = repo.range_diff(&base, &tip)?;
+                        let commits = repo.commit_range(&base, &tip)?;
+                        Ok::<_, anyhow::Error>((diff, commits, workdir))
+                    })
+                    .await,
+                )
+            };
+
+            let (diff, commits, worktree) = match git {
+                Some(Ok((diff, commits, worktree))) => (Ok(diff), commits, Some(worktree)),
+                Some(Err(error)) => (Err(error), Vec::new(), None),
+                None => (nostr_diff, nostr_commits, None),
+            };
+
+            this.update(cx, |this, cx| {
+                if this.load_generation != generation {
+                    return;
+                }
+                this.loading = false;
+                this.worktree = worktree;
+                this.commits = commits;
+                match diff {
+                    Ok(diff) => this.pane.update(cx, |pane, cx| pane.set_diff(diff, cx)),
+                    Err(error) => this.error = Some(error.to_string().into()),
+                }
+                cx.notify();
+            })?;
+            Ok(())
+        });
+        self.tasks.push(task);
+    }
+
+    fn open_commit_diff(
+        &mut self,
+        worktree: PathBuf,
+        commit_id: &str,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let id = match self.store.read(cx).addr() {
+            Some(addr) => SharedString::from(format!("commit:{addr}:{commit_id}")),
+            None => SharedString::from(format!("commit:{}:{commit_id}", worktree.display())),
+        };
+        let dock = self.dock.clone();
+        let store = self.store.clone();
+        let repo_name = self.repo_name.clone();
+        let commit_id = commit_id.to_owned();
+        crate::shared::panels::open(
+            &dock,
+            id,
+            move |window, cx| {
+                cx.new(|cx| {
+                    CommitDiffView::new(
+                        store.clone(),
+                        worktree.clone(),
+                        repo_name.clone(),
+                        commit_id.clone(),
+                        window,
+                        cx,
+                    )
+                })
+            },
+            window,
+            cx,
+        );
+    }
+
+    fn render_tabs(&self, cx: &mut Context<Self>) -> AnyElement {
+        let files = self.pane.read(cx).diff().map(|diff| diff.files.len());
+        let commits = (!self.commits.is_empty()).then_some(self.commits.len());
+        let weak = cx.entity().downgrade();
+        let files_label = match files {
+            Some(count) => format!("Files ({count})"),
+            None => "Files".to_owned(),
+        };
+        let commits_label = match commits {
+            Some(count) => format!("Commits ({count})"),
+            None => "Commits".to_owned(),
+        };
+
+        Tabs::new("pr-tabs")
+            .selected(self.active_tab)
+            .tabs(move |_, _| {
+                vec![
+                    Tab::new("discussion", "Discussion"),
+                    Tab::new("files", files_label.clone()),
+                    Tab::new("commits", commits_label.clone()),
+                ]
+            })
+            .on_change(move |index, _, cx| {
+                crate::shared::log_dropped(weak.update(cx, |this, cx| {
+                    this.active_tab = index;
+                    cx.notify();
+                }));
+            })
+            .into_any_element()
+    }
+
+    fn render_discussion(&mut self, cx: &mut Context<Self>) -> AnyElement {
+        if self.loading {
+            return centered_spinner();
+        }
+        if let Some(error) = self.error.clone() {
+            return empty_state(error);
+        }
+        let (author, picture, age, root_id, pubkey) = {
+            let store = self.store.read(cx);
+            let Some(root) = store
+                .pull_requests
+                .iter()
+                .find(|pr| pr.id == self.pr_id && pr.kind == Kind::GitPullRequest)
+            else {
+                return empty_state(NOT_FOUND);
+            };
+            let profile = self.directory.read(cx).profile(&root.pubkey, cx);
+            (
+                profile.name(),
+                profile.picture(),
+                relative_time(root.created_at),
+                root.id,
+                root.pubkey,
+            )
+        };
+
+        h_flex()
+            .size_full()
+            .min_h_0()
+            .child(
+                ScrollArea::new("pr-discussion-scroll")
+                    .flex_1()
+                    .min_w_0()
+                    .child(
+                        v_flex()
+                            .p_4()
+                            .gap_6()
+                            .child(
+                                v_flex()
+                                    .gap_4()
+                                    .child(
+                                        h_flex()
+                                            .gap_2()
+                                            .text_sm()
+                                            .child(
+                                                h_flex()
+                                                    .gap_1()
+                                                    .child(
+                                                        Avatar::new(pubkey)
+                                                            .name(author.clone())
+                                                            .picture(picture)
+                                                            .small(),
+                                                    )
+                                                    .child(author),
+                                            )
+                                            .child(SharedString::from("commented"))
+                                            .child(
+                                                div()
+                                                    .text_color(cx.theme().colors.muted_foreground)
+                                                    .child(SharedString::from(age)),
+                                            ),
+                                    )
+                                    .when(!self.description.is_empty(), |this| {
+                                        this.child(div().text_sm().child(self.description.clone()))
+                                    }),
+                            )
+                            .child(comments_section(&self.store, root_id, &self.directory, cx))
+                            .child(comment_form(
+                                &self.store,
+                                root_id,
+                                pr_roots,
+                                &self.comment_input,
+                                "pr-comment",
+                                cx,
+                            )),
+                    ),
+            )
+            .child(sidebar_section(
+                &self.store,
+                root_id,
+                pr_roots,
+                true,
+                &self.directory,
+                cx,
+            ))
+            .into_any_element()
+    }
+
+    fn render_files(&self, _cx: &mut Context<Self>) -> AnyElement {
+        if self.loading {
+            return centered_spinner();
+        }
+        if let Some(error) = self.error.clone() {
+            return empty_state(error);
+        }
+        self.pane.clone().into_any_element()
+    }
+
+    fn render_commits(&self, cx: &mut Context<Self>) -> AnyElement {
+        if self.loading {
+            return centered_spinner();
+        }
+        if let Some(error) = self.error.clone() {
+            return empty_state(error);
+        }
+        if self.commits.is_empty() {
+            return empty_state("No commits found");
+        }
+        let commits = self.commits.clone();
+        let worktree = self.worktree.clone();
+        let view = cx.entity().downgrade();
+
+        v_flex()
+            .relative()
+            .flex_1()
+            .min_h_0()
+            .child(
+                uniform_list("pr-commits", commits.len(), move |range, _, cx| {
+                    range
+                        .map(|ix| {
+                            let commit = commits[ix].clone();
+                            let id = commit.id.clone();
+                            let worktree = worktree.clone();
+                            let view = view.clone();
+                            commit_row(
+                                ix,
+                                &commit,
+                                move |window, cx| {
+                                    if let Some(worktree) = worktree.clone() {
+                                        crate::shared::log_dropped(view.update(cx, |this, cx| {
+                                            this.open_commit_diff(worktree, &id, window, cx);
+                                        }));
+                                    }
+                                },
+                                cx,
+                            )
+                        })
+                        .collect()
+                })
+                .track_scroll(&self.commit_scroll_handle)
+                .size_full(),
+            )
+            .child(
+                div()
+                    .absolute()
+                    .top_0()
+                    .left_0()
+                    .right_0()
+                    .bottom_0()
+                    .child(Scrollbar::vertical(
+                        "pr-commits-scroll",
+                        self.commit_scroll_handle.clone(),
+                    )),
+            )
+            .into_any_element()
+    }
+
+    fn render_header(&self, cx: &mut Context<Self>) -> AnyElement {
+        let current_commit = self.current_commit.clone();
+        let (title, status, branch, author) = {
+            let store = self.store.read(cx);
+            let Some(root) = store
+                .pull_requests
+                .iter()
+                .find(|pr| pr.id == self.pr_id && pr.kind == Kind::GitPullRequest)
+            else {
+                return div().into_any_element();
+            };
+            (
+                root.activity_subject(),
+                store.status_of(root),
+                root.branch_name(),
+                root.pubkey,
+            )
+        };
+
+        let can_update = Backend::global(cx).read(cx).current_user() == Some(author);
+        let weak = cx.entity().downgrade();
+
+        v_flex()
+            .flex_none()
+            .px_4()
+            .py_2()
+            .gap_2()
+            .child(
+                h_flex().gap_2().child(status_badge(status)).child(
+                    div()
+                        .flex_1()
+                        .min_w_0()
+                        .font_weight(gpui::FontWeight::SEMIBOLD)
+                        .text_ellipsis()
+                        .child(title),
+                ),
+            )
+            .child(
+                h_flex()
+                    .gap_3()
+                    .when_some(branch, |this, branch| {
+                        this.child(
+                            Button::new("branch")
+                                .label(branch)
+                                .icon(Icon::named(CustomIconName::GitBranch))
+                                .small(),
+                        )
+                    })
+                    .when(can_update, |this| {
+                        this.child(Button::new("update-pr").label("Update").small().on_click(
+                            move |_, _, cx| {
+                                crate::shared::log_dropped(weak.update(cx, |this, cx| {
+                                    let root = this
+                                        .store
+                                        .read(cx)
+                                        .pull_requests
+                                        .iter()
+                                        .find(|pr| {
+                                            pr.id == this.pr_id && pr.kind == Kind::GitPullRequest
+                                        })
+                                        .cloned();
+                                    if let Some(root) = root {
+                                        dialogs::update::open(this.store.clone(), root, cx);
+                                    }
+                                }));
+                            },
+                        ))
+                    })
+                    .when_some(current_commit, |this, id| {
+                        this.child(
+                            h_flex()
+                                .gap_1()
+                                .font_family(cx.theme().mono_font)
+                                .text_xs()
+                                .text_color(cx.theme().colors.muted_foreground)
+                                .child(id.clone())
+                                .child(ClipboardButton::new("pr-commit", &id)),
+                        )
+                    }),
+            )
+            .into_any_element()
+    }
+}
+
+impl Panel for PullRequestDetailView {
+    fn title(&self, _cx: &App) -> Option<SharedString> {
+        let hex = self.pr_id.to_hex();
+        Some(super::helpers::pr_label(&self.repo_name, &hex[..8]))
+    }
+
+    fn lead(&self, cx: &App) -> Option<AnyElement> {
+        Some(repo_tab_avatar(self.store.read(cx), &self.directory, cx))
+    }
+}
+
+impl Render for PullRequestDetailView {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        v_flex()
+            .id("pull-request-detail")
+            .size_full()
+            .min_h_0()
+            .child(self.render_header(cx))
+            .child(self.render_tabs(cx))
+            .map(|this| match self.active_tab {
+                0 => this.child(self.render_discussion(cx)),
+                1 => this.child(self.render_files(cx)),
+                _ => this.child(self.render_commits(cx)),
+            })
+    }
+}
+
+fn centered_spinner() -> AnyElement {
+    v_flex()
+        .size_full()
+        .items_center()
+        .justify_center()
+        .child(Spinner::new("pr-loading"))
+        .into_any_element()
+}

crates/signed_app/src/pull_requests/dialogs/mod.rs

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

crates/signed_app/src/pull_requests/dialogs/update.rs

@@ -0,0 +1,85 @@
+use gpui::{
+    AnyElement, App, AppContext as _, Context, Entity, IntoElement, ParentElement as _, Render,
+    Styled as _, Window, div,
+};
+use gpui_native_kit::button::Button;
+use gpui_native_kit::common::v_flex;
+use gpui_native_kit::dialog::Dialog;
+use gpui_native_kit::field::Field;
+use gpui_native_kit::input::{Input, InputState};
+use gpui_native_kit::theme::ActiveTheme as _;
+use nostr::prelude::Event;
+use signed_state::RepoStore;
+
+use crate::shared::dialogs::{close_global, open_global};
+
+pub struct UpdatePrDialog {
+    store: Entity<RepoStore>,
+    root: Event,
+    patch: Entity<InputState>,
+}
+
+impl UpdatePrDialog {
+    pub fn new(store: Entity<RepoStore>, root: Event, cx: &mut App) -> Entity<Self> {
+        let patch = InputState::builder().multiline().build(cx);
+        cx.new(|_| Self { store, root, patch })
+    }
+
+    fn submit(&mut self, cx: &mut Context<Self>) {
+        let patch = self.patch.read(cx).value().to_string();
+        if patch.trim().is_empty() {
+            return;
+        }
+        self.store.update(cx, |store, cx| {
+            store.update_pull_request(&self.root, patch, cx);
+        });
+        close_global(cx);
+    }
+}
+
+impl Render for UpdatePrDialog {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let patch = self.patch.clone();
+        let this = cx.entity().downgrade();
+
+        Dialog::new("update-pr-dialog")
+            .open(true)
+            .min_width(gpui::px(520.))
+            .on_change(|open, _, cx| {
+                if !open {
+                    close_global(cx);
+                }
+            })
+            .title("Update pull request")
+            .content(move |_, cx| {
+                v_flex()
+                    .gap_3()
+                    .child(
+                        div()
+                            .text_sm()
+                            .text_color(cx.theme().colors.muted_foreground)
+                            .child("Publish a new revision with the output of `git format-patch`."),
+                    )
+                    .child(
+                        Field::new("update-patch", "Patch")
+                            .child(Input::new("update-patch-input", patch.clone()).rows(6)),
+                    )
+                    .into_any_element()
+            })
+            .actions(move |_, _| {
+                let this = this.clone();
+                vec![
+                    Button::new("submit-update")
+                        .label("Update pull request")
+                        .on_click(move |_, _, cx| {
+                            crate::shared::log_dropped(this.update(cx, |this, cx| this.submit(cx)));
+                        })
+                        .into_any_element() as AnyElement,
+                ]
+            })
+    }
+}
+
+pub fn open(store: Entity<RepoStore>, root: Event, cx: &mut App) {
+    open_global(UpdatePrDialog::new(store, root, cx), cx);
+}

crates/signed_app/src/pull_requests/helpers.rs

@@ -0,0 +1,151 @@
+use std::path::PathBuf;
+
+use gpui::{SharedString, WeakEntity};
+use gpui_native_kit::menu::MenuItem;
+use nostr::prelude::PublicKey;
+use signed_core::{Announcement, RepoAddr, RepoStatus};
+use utils::middle_truncate;
+
+use super::NewPullRequestView;
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum PullRequestFilter {
+    All,
+    Open,
+    Closed,
+    Draft,
+    Merged,
+}
+
+impl PullRequestFilter {
+    pub fn matches(self, status: RepoStatus) -> bool {
+        match self {
+            Self::All => true,
+            Self::Open => status == RepoStatus::Open,
+            Self::Closed => status == RepoStatus::Closed,
+            Self::Draft => status == RepoStatus::Draft,
+            Self::Merged => status == RepoStatus::Applied,
+        }
+    }
+
+    pub fn empty_message(self) -> &'static str {
+        match self {
+            Self::All => "No pull requests",
+            Self::Open => "No open pull requests",
+            Self::Closed => "No closed pull requests",
+            Self::Draft => "No draft pull requests",
+            Self::Merged => "No merged pull requests",
+        }
+    }
+}
+
+pub struct ForkCompare {
+    pub announcement: Announcement,
+    pub namespace: String,
+    pub mirror_path: PathBuf,
+}
+
+impl ForkCompare {
+    pub fn base_ref(name: &str) -> String {
+        format!("refs/remotes/origin/{name}")
+    }
+
+    pub fn compare_ref(&self, name: &str) -> String {
+        format!("refs/fork/{}/{}", self.namespace, name)
+    }
+}
+
+pub fn pr_label(repo_name: &SharedString, pr_id: &str) -> SharedString {
+    if repo_name.is_empty() {
+        SharedString::from(pr_id)
+    } else {
+        SharedString::from(format!("{repo_name}/{pr_id}"))
+    }
+}
+
+pub fn fork_display_name(announcement: &Announcement) -> SharedString {
+    announcement
+        .name
+        .as_deref()
+        .map(SharedString::from)
+        .unwrap_or_else(|| SharedString::from(announcement.id.clone()))
+}
+
+pub fn shorten_owner(owner: &PublicKey) -> String {
+    owner.to_hex().chars().take(10).collect()
+}
+
+pub fn truncate_label(label: &str) -> SharedString {
+    SharedString::from(middle_truncate(label, 18, 0))
+}
+
+pub fn source_menu_items(
+    view: WeakEntity<NewPullRequestView>,
+    associated: Vec<PathBuf>,
+    active_path: Option<PathBuf>,
+    candidates: Vec<Announcement>,
+    user: Option<PublicKey>,
+    active_fork: Option<RepoAddr>,
+) -> Vec<MenuItem> {
+    let mut items = Vec::new();
+    for path in associated {
+        let label = path
+            .file_name()
+            .map(|name| name.to_string_lossy().into_owned())
+            .unwrap_or_else(|| path.display().to_string());
+        let target = view.clone();
+        let path_for_action = path.clone();
+        items.push(
+            MenuItem::new(truncate_label(&label))
+                .checked(active_path.as_ref() == Some(&path))
+                .handler(move |window, cx| {
+                    let path = path_for_action.clone();
+                    if let Err(error) =
+                        target.update(cx, |this, cx| this.apply_folder_path(path, window, cx))
+                    {
+                        log::warn!("failed to apply checkout: {error}");
+                    }
+                }),
+        );
+    }
+
+    let folder_view = view.clone();
+    items.push(
+        MenuItem::new("Choose another folder…").handler(move |window, cx| {
+            if let Err(error) = folder_view.update(cx, |this, cx| this.choose_checkout(window, cx))
+            {
+                log::warn!("failed to choose checkout: {error}");
+            }
+        }),
+    );
+    items.push(MenuItem::separator());
+
+    if candidates.is_empty() {
+        items.push(MenuItem::new("No announced forks of this repository").disabled(true));
+    } else {
+        for candidate in candidates {
+            let subtitle = if Some(candidate.owner) == user {
+                SharedString::from("Your fork")
+            } else {
+                SharedString::from(format!("by {}", shorten_owner(&candidate.owner)))
+            };
+            let title = format!("{} — {}", fork_display_name(&candidate), subtitle);
+            let target = view.clone();
+            let checked = active_fork == Some(candidate.addr());
+            let announcement = candidate;
+            items.push(
+                MenuItem::new(truncate_label(&title))
+                    .checked(checked)
+                    .handler(move |window, cx| {
+                        let announcement = announcement.clone();
+                        if let Err(error) =
+                            target.update(cx, |this, cx| this.choose_fork(announcement, window, cx))
+                        {
+                            log::warn!("failed to choose fork: {error}");
+                        }
+                    }),
+            );
+        }
+    }
+    items
+}

crates/signed_app/src/pull_requests/mod.rs

@@ -0,0 +1,455 @@
+use assets::CustomIconName;
+use gpui::prelude::FluentBuilder as _;
+use gpui::{
+    AnyElement, App, AppContext as _, Context, Entity, InteractiveElement as _, IntoElement,
+    ParentElement as _, Render, SharedString, StatefulInteractiveElement as _, Styled as _,
+    Subscription, UniformListScrollHandle, WeakEntity, Window, div, px, uniform_list,
+};
+use gpui_native_kit::alert::{Alert, AlertSeverity};
+use gpui_native_kit::avatar::Avatar;
+use gpui_native_kit::common::{Sizable as _, h_flex, v_flex};
+use gpui_native_kit::dropdown_menu::DropdownMenu;
+use gpui_native_kit::icons::Icon;
+use gpui_native_kit::layout::dock::{DockState, Panel};
+use gpui_native_kit::menu::MenuItem;
+use gpui_native_kit::scrollbar::Scrollbar;
+use gpui_native_kit::segmented::{Segmented, SegmentedOption};
+use gpui_native_kit::theme::ActiveTheme as _;
+use metadata::ProfileDirectory;
+use nostr::prelude::{Kind, PublicKey};
+use signed_core::GitEvent;
+use signed_state::RepoStore;
+use utils::relative_time;
+
+mod detail;
+mod dialogs;
+mod helpers;
+mod new;
+mod send_patch;
+
+pub use detail::PullRequestDetailView;
+use helpers::PullRequestFilter;
+pub use new::NewPullRequestView;
+pub use send_patch::SendPatchView;
+
+use crate::issues::helpers::{StatusCounts, filter_by_status};
+use crate::shared::widgets::{empty_state, repo_tab_avatar, status_badge};
+
+const ROW_HEIGHT: f32 = 73.;
+
+pub struct PullRequestsView {
+    dock: WeakEntity<DockState>,
+    store: Entity<RepoStore>,
+    repo_name: SharedString,
+    filter: PullRequestFilter,
+    visible_prs: Vec<usize>,
+    counts: StatusCounts,
+    synced_filter: PullRequestFilter,
+    scroll_handle: UniformListScrollHandle,
+    directory: Entity<ProfileDirectory>,
+    new_pr_menu_open: bool,
+    _subscription: Subscription,
+}
+
+impl PullRequestsView {
+    pub fn new(
+        dock: WeakEntity<DockState>,
+        store: Entity<RepoStore>,
+        cx: &mut Context<Self>,
+    ) -> Self {
+        let weak = cx.entity().downgrade();
+        let repo_name = store.read(cx).name();
+        let subscription = cx.observe(&store, |this, _store, cx| {
+            this.rebuild(cx);
+        });
+
+        cx.defer(move |cx| {
+            crate::shared::log_dropped(weak.update(cx, |this, cx| {
+                this.rebuild(cx);
+            }));
+        });
+
+        Self {
+            dock,
+            store,
+            repo_name,
+            filter: PullRequestFilter::Open,
+            visible_prs: Vec::new(),
+            counts: StatusCounts::default(),
+            synced_filter: PullRequestFilter::Open,
+            scroll_handle: UniformListScrollHandle::new(),
+            directory: ProfileDirectory::new(cx),
+            new_pr_menu_open: false,
+            _subscription: subscription,
+        }
+    }
+
+    fn rebuild(&mut self, cx: &mut Context<Self>) {
+        let store = self.store.read(cx);
+        let filter = self.filter;
+
+        let (visible_prs, counts) = {
+            let roots = store
+                .pull_requests
+                .iter()
+                .filter(|pr| pr.kind == Kind::GitPullRequest);
+
+            filter_by_status(
+                roots,
+                |pr| store.status_of(pr),
+                |status| filter.matches(status),
+            )
+        };
+
+        let mut keys: Vec<PublicKey> = store
+            .pull_requests
+            .iter()
+            .filter(|pr| pr.kind == Kind::GitPullRequest)
+            .map(|pr| pr.pubkey)
+            .collect();
+
+        if let Some(owner) = store
+            .announcement
+            .as_ref()
+            .map(|announcement| announcement.owner)
+        {
+            keys.push(owner);
+        }
+
+        self.directory.update(cx, |directory, cx| {
+            directory.track(keys, cx);
+        });
+
+        let filter_changed = self.synced_filter != filter;
+        if !filter_changed && self.visible_prs == visible_prs && self.counts == counts {
+            return;
+        }
+        self.synced_filter = filter;
+        self.visible_prs = visible_prs;
+        self.counts = counts;
+        cx.notify();
+    }
+
+    fn open_new(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let Some(addr) = self.store.read(cx).addr().cloned() else {
+            return;
+        };
+
+        let id = SharedString::from(format!("new-pr:{addr}"));
+        let dock = self.dock.clone();
+        let dock_for_build = dock.clone();
+        let store = self.store.clone();
+
+        crate::shared::panels::open(
+            &dock,
+            id.clone(),
+            move |window, cx| {
+                cx.new(|cx| {
+                    NewPullRequestView::new(
+                        dock_for_build.clone(),
+                        id.clone(),
+                        store.clone(),
+                        window,
+                        cx,
+                    )
+                })
+            },
+            window,
+            cx,
+        );
+    }
+
+    fn open_send_patch(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let Some(addr) = self.store.read(cx).addr().cloned() else {
+            return;
+        };
+
+        let id = SharedString::from(format!("send-patch:{addr}"));
+        let dock = self.dock.clone();
+        let dock_for_build = dock.clone();
+        let store = self.store.clone();
+
+        crate::shared::panels::open(
+            &dock,
+            id.clone(),
+            move |window, cx| {
+                cx.new(|cx| {
+                    SendPatchView::new(
+                        dock_for_build.clone(),
+                        id.clone(),
+                        store.clone(),
+                        window,
+                        cx,
+                    )
+                })
+            },
+            window,
+            cx,
+        );
+    }
+
+    fn render_header(&self, cx: &mut Context<Self>) -> AnyElement {
+        let counts = self.counts;
+        let muted = cx.theme().colors.muted_foreground;
+        let weak = cx.entity().downgrade();
+        let open_weak = cx.entity().downgrade();
+        let menu_open_weak = cx.entity().downgrade();
+        let patch_weak = cx.entity().downgrade();
+
+        h_flex()
+            .px_4()
+            .w_full()
+            .gap_3()
+            .border_b_1()
+            .border_color(cx.theme().colors.border)
+            .bg(cx.theme().colors.muted)
+            .child(
+                Segmented::new("pr-filter", self.filter)
+                    .options(vec![
+                        SegmentedOption::new(
+                            PullRequestFilter::All,
+                            format!("All ({})", counts.total),
+                        )
+                        .icon(Icon::named(CustomIconName::GitPullRequest).color(muted)),
+                        SegmentedOption::new(
+                            PullRequestFilter::Open,
+                            format!("Open ({})", counts.open),
+                        )
+                        .icon(Icon::named(CustomIconName::GitPullRequest).color(muted)),
+                        SegmentedOption::new(
+                            PullRequestFilter::Closed,
+                            format!("Closed ({})", counts.closed),
+                        )
+                        .icon(Icon::named(CustomIconName::GitPullRequestClosed).color(muted)),
+                        SegmentedOption::new(
+                            PullRequestFilter::Draft,
+                            format!("Draft ({})", counts.draft),
+                        )
+                        .icon(Icon::named(CustomIconName::GitPullRequestDraft).color(muted)),
+                        SegmentedOption::new(
+                            PullRequestFilter::Merged,
+                            format!("Merged ({})", counts.applied),
+                        )
+                        .icon(Icon::named(CustomIconName::GitPullRequestMerged).color(muted)),
+                    ])
+                    .on_change(move |filter, _, cx| {
+                        if let Err(error) = weak.update(cx, |this, cx| {
+                            this.filter = filter;
+                            this.rebuild(cx);
+                        }) {
+                            log::warn!("failed to switch PR filter: {error}");
+                        }
+                    }),
+            )
+            .child(div().flex_1())
+            .child(
+                DropdownMenu::new("new-pr-actions")
+                    .label("New")
+                    .icon(Icon::named(CustomIconName::GitPullRequest))
+                    .open(self.new_pr_menu_open)
+                    .on_click(move |_, window, cx| {
+                        if let Err(error) =
+                            open_weak.update(cx, |this, cx| this.open_new(window, cx))
+                        {
+                            log::warn!("failed to open new PR: {error}");
+                        }
+                    })
+                    .on_open_change(move |open, _, cx| {
+                        crate::shared::log_dropped(menu_open_weak.update(cx, |this, cx| {
+                            this.new_pr_menu_open = open;
+                            cx.notify();
+                        }));
+                    })
+                    .items(move |_, _| {
+                        vec![MenuItem::new("Send Patch").handler({
+                            let weak = patch_weak.clone();
+                            move |window, cx| {
+                                crate::shared::log_dropped(weak.update(cx, |this, cx| {
+                                    this.open_send_patch(window, cx);
+                                }));
+                            }
+                        })]
+                    }),
+            )
+            .into_any_element()
+    }
+}
+
+impl Panel for PullRequestsView {
+    fn title(&self, _cx: &App) -> Option<SharedString> {
+        Some(SharedString::from(format!("{}/pulls", self.repo_name)))
+    }
+
+    fn lead(&self, cx: &App) -> Option<AnyElement> {
+        Some(repo_tab_avatar(self.store.read(cx), &self.directory, cx))
+    }
+}
+
+impl Render for PullRequestsView {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let filter = self.filter;
+        let count = self.visible_prs.len();
+        let visible = self.visible_prs.clone();
+        let directory = self.directory.clone();
+        let store = self.store.clone();
+        let dock = self.dock.clone();
+
+        let (last_error, last_warning) = {
+            let store = self.store.read(cx);
+            (store.last_error.clone(), store.last_warning.clone())
+        };
+
+        let dismiss_warning_store = self.store.clone();
+        let dismiss_error_store = self.store.clone();
+
+        v_flex()
+            .size_full()
+            .child(self.render_header(cx))
+            .when_some(last_warning, |this, warning| {
+                this.child(
+                    Alert::new("pr-warning")
+                        .severity(AlertSeverity::Warning)
+                        .title("Pull request warning")
+                        .message(warning)
+                        .on_dismiss(move |cx| {
+                            dismiss_warning_store.update(cx, |store, _| store.last_warning = None);
+                        }),
+                )
+            })
+            .when_some(last_error, |this, error| {
+                this.child(
+                    Alert::new("pr-error")
+                        .severity(AlertSeverity::Danger)
+                        .title("Pull request error")
+                        .message(error)
+                        .on_dismiss(move |cx| {
+                            dismiss_error_store.update(cx, |store, _| store.last_error = None);
+                        }),
+                )
+            })
+            .child(
+                v_flex()
+                    .relative()
+                    .flex_1()
+                    .min_h_0()
+                    .w_full()
+                    .when(count > 0, |this| {
+                        this.child(
+                            uniform_list("prl", count, move |range, _, cx| {
+                                range
+                                    .map(|ix| {
+                                        let pr_ix = visible[ix];
+                                        let pr = &store.read(cx).pull_requests[pr_ix];
+                                        let pr_id = pr.id;
+                                        let title = pr.activity_subject();
+                                        let id_hex = pr.id.to_hex();
+                                        let age = relative_time(pr.created_at);
+                                        let status = store.read(cx).status_of(pr);
+                                        let profile = directory.read(cx).profile(&pr.pubkey, cx);
+                                        let author = profile.name();
+                                        let dock = dock.clone();
+                                        let store = store.clone();
+
+                                        h_flex()
+                                            .id(ix)
+                                            .w_full()
+                                            .h(px(ROW_HEIGHT))
+                                            .gap_4()
+                                            .px_4()
+                                            .border_b_1()
+                                            .border_color(cx.theme().colors.border)
+                                            .hover(|this| this.bg(cx.theme().colors.muted_hover))
+                                            .on_click(move |_, window, cx| {
+                                                let id = SharedString::from(format!("pr:{pr_id}"));
+                                                let dock_for_build = dock.clone();
+                                                let store = store.clone();
+                                                crate::shared::panels::open(
+                                                    &dock,
+                                                    id,
+                                                    move |window, cx| {
+                                                        cx.new(|cx| {
+                                                            PullRequestDetailView::new(
+                                                                dock_for_build.clone(),
+                                                                store.clone(),
+                                                                pr_id,
+                                                                window,
+                                                                cx,
+                                                            )
+                                                        })
+                                                    },
+                                                    window,
+                                                    cx,
+                                                );
+                                            })
+                                            .child(status_badge(status))
+                                            .child(
+                                                v_flex()
+                                                    .flex_1()
+                                                    .min_w_0()
+                                                    .gap_1()
+                                                    .child(
+                                                        div()
+                                                            .text_sm()
+                                                            .text_ellipsis()
+                                                            .whitespace_nowrap()
+                                                            .child(title),
+                                                    )
+                                                    .child(
+                                                        h_flex()
+                                                            .gap_2()
+                                                            .text_xs()
+                                                            .child(
+                                                                h_flex()
+                                                                    .gap_1()
+                                                                    .child(
+                                                                        Avatar::new(pr.pubkey)
+                                                                            .name(author.clone())
+                                                                            .picture(
+                                                                                profile.picture(),
+                                                                            )
+                                                                            .small(),
+                                                                    )
+                                                                    .child(div().child(author)),
+                                                            )
+                                                            .child(SharedString::from("opened"))
+                                                            .child(
+                                                                div()
+                                                                    .text_color(
+                                                                        cx.theme()
+                                                                            .colors
+                                                                            .muted_foreground,
+                                                                    )
+                                                                    .child(SharedString::from(
+                                                                        &id_hex[..8],
+                                                                    )),
+                                                            )
+                                                            .child(SharedString::from(age)),
+                                                    ),
+                                            )
+                                            .into_any_element()
+                                    })
+                                    .collect()
+                            })
+                            .track_scroll(&self.scroll_handle)
+                            .size_full(),
+                        )
+                        .child(
+                            div()
+                                .absolute()
+                                .top_0()
+                                .left_0()
+                                .right_0()
+                                .bottom_0()
+                                .child(Scrollbar::vertical(
+                                    "prl-scroll",
+                                    self.scroll_handle.clone(),
+                                )),
+                        )
+                    })
+                    .when(count == 0, |this| {
+                        this.child(empty_state(filter.empty_message()))
+                    }),
+            )
+            .into_any_element()
+    }
+}

crates/signed_app/src/pull_requests/new.rs

@@ -0,0 +1,529 @@
+use std::path::PathBuf;
+
+use assets::CustomIconName;
+use gpui::prelude::FluentBuilder as _;
+use gpui::{
+    AnyElement, App, AppContext as _, Context, Entity, InteractiveElement as _, IntoElement,
+    ParentElement as _, Render, SharedString, Styled as _, Subscription, UniformListScrollHandle,
+    WeakEntity, Window, div, px, uniform_list,
+};
+use gpui_native_kit::button::Button;
+use gpui_native_kit::combobox::{Combobox, ComboboxState};
+use gpui_native_kit::common::{h_flex, v_flex};
+use gpui_native_kit::data::tabs::{Tab, Tabs};
+use gpui_native_kit::icons::{Icon, IconRole};
+use gpui_native_kit::input::{Input, InputState};
+use gpui_native_kit::layout::dock::{DockState, Panel};
+use gpui_native_kit::menu::Menu;
+use gpui_native_kit::scrollbar::Scrollbar;
+use gpui_native_kit::spinner::Spinner;
+use gpui_native_kit::theme::ActiveTheme as _;
+use metadata::ProfileDirectory;
+use signed_state::{CheckoutsStore, RepoStore};
+
+use super::helpers::{ForkCompare, fork_display_name, truncate_label};
+use crate::repo::commit_diff::{CommitDiffView, DiffPane};
+use crate::repo::helpers::commit_row;
+use crate::shared::widgets::empty_state;
+
+mod source;
+
+pub struct NewPullRequestView {
+    dock: WeakEntity<DockState>,
+    panel_id: SharedString,
+    pub(super) store: Entity<RepoStore>,
+    repo_name: SharedString,
+    pub(super) repo_path: Option<PathBuf>,
+    pub(super) branches: Vec<SharedString>,
+    pub(super) fork: Option<ForkCompare>,
+    pub(super) base: SharedString,
+    pub(super) compare: SharedString,
+    pub(super) base_select: Entity<ComboboxState<SharedString>>,
+    pub(super) compare_select: Entity<ComboboxState<SharedString>>,
+    subject: Entity<InputState>,
+    description: Entity<InputState>,
+    pub(super) merge_base: Option<String>,
+    pub(super) commits: Option<Vec<signed_git::FileCommit>>,
+    pub(super) loading: bool,
+    pub(super) error: Option<SharedString>,
+    submitting: bool,
+    pub(super) compare_generation: u64,
+    pub(super) fork_generation: u64,
+    active_tab: usize,
+    pub(super) pane: Entity<DiffPane>,
+    scroll_handle: UniformListScrollHandle,
+    pub(super) tasks: Vec<gpui::Task<Result<(), anyhow::Error>>>,
+    directory: Entity<ProfileDirectory>,
+    source_open: bool,
+    _subscriptions: Vec<Subscription>,
+}
+
+impl NewPullRequestView {
+    pub fn new(
+        dock: WeakEntity<DockState>,
+        panel_id: SharedString,
+        store: Entity<RepoStore>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Self {
+        let directory = ProfileDirectory::new(cx);
+        let repo_name = store.read(cx).name();
+        let pane = cx.new(DiffPane::new);
+
+        let weak = cx.entity().downgrade();
+        let subject = InputState::new(cx);
+        let description = InputState::builder().multiline().build(cx);
+
+        let base_select = cx.new(|cx| {
+            ComboboxState::new(
+                Combobox::new("pr-base", "Base", Vec::new()).on_change({
+                    let weak = weak.clone();
+                    move |value, _window, cx| {
+                        if let Some(base) = value {
+                            crate::shared::log_dropped(weak.update(cx, |this, cx| {
+                                if this.base == base {
+                                    return;
+                                }
+                                this.base = base;
+                                this.reload_compare(cx);
+                            }));
+                        }
+                    }
+                }),
+                window,
+                cx,
+            )
+        });
+
+        let compare_select = cx.new(|cx| {
+            ComboboxState::new(
+                Combobox::new("pr-compare", "Compare", Vec::new()).on_change({
+                    let weak = weak.clone();
+                    move |value, _window, cx| {
+                        if let Some(compare) = value {
+                            crate::shared::log_dropped(weak.update(cx, |this, cx| {
+                                if this.compare == compare {
+                                    return;
+                                }
+                                this.compare = compare;
+                                this.reload_compare(cx);
+                            }));
+                        }
+                    }
+                }),
+                window,
+                cx,
+            )
+        });
+
+        if let Some(owner) = store.read(cx).announcement.as_ref().map(|a| a.owner) {
+            directory.update(cx, |directory, cx| directory.track([owner], cx));
+        }
+
+        window.defer(cx, move |window, cx| {
+            crate::shared::log_dropped(weak.update(cx, |this, cx| {
+                let Some(addr) = this.store.read(cx).addr().cloned() else {
+                    return;
+                };
+
+                let Some(path) = CheckoutsStore::global(cx)
+                    .read(cx)
+                    .associations_of(&addr)
+                    .into_iter()
+                    .next()
+                else {
+                    return;
+                };
+
+                this.apply_folder_path(path, window, cx);
+            }));
+        });
+
+        Self {
+            dock,
+            panel_id,
+            store,
+            repo_name,
+            repo_path: None,
+            branches: Vec::new(),
+            fork: None,
+            base: SharedString::default(),
+            compare: SharedString::default(),
+            base_select,
+            compare_select,
+            subject,
+            description,
+            merge_base: None,
+            commits: None,
+            loading: false,
+            error: None,
+            submitting: false,
+            compare_generation: 0,
+            fork_generation: 0,
+            active_tab: 0,
+            pane,
+            scroll_handle: UniformListScrollHandle::new(),
+            tasks: Vec::new(),
+            directory,
+            source_open: false,
+            _subscriptions: Vec::new(),
+        }
+    }
+
+    fn submit(&mut self, _window: &mut Window, cx: &mut Context<Self>) {
+        if self.submitting || self.loading {
+            return;
+        }
+        let Some(merge_base) = self.merge_base.clone() else {
+            return;
+        };
+        let Some(repo_path) = self.work_path() else {
+            return;
+        };
+        let subject = self.subject.read(cx).value().to_string();
+        let description = self.description.read(cx).value().to_string();
+        let branch_name = self.compare.to_string();
+        let compare_ref = self.compare_ref();
+        let store = self.store.clone();
+        let dock = self.dock.clone();
+        let panel_id = self.panel_id.clone();
+
+        self.submitting = true;
+        self.error = None;
+        cx.notify();
+
+        let task: gpui::Task<Result<(), anyhow::Error>> = cx.spawn(async move |this, cx| {
+            let publish = store.update(cx, |store, cx| {
+                store.open_pull_request_from_refs(
+                    repo_path,
+                    merge_base,
+                    compare_ref,
+                    (!subject.is_empty()).then_some(subject),
+                    description,
+                    Some(branch_name),
+                    false,
+                    cx,
+                )
+            });
+            if let Err(error) = publish.await {
+                this.update(cx, |this, cx| {
+                    this.submitting = false;
+                    this.error = Some(error.to_string().into());
+                    cx.notify();
+                })?;
+                return Ok(());
+            }
+            this.update(cx, |this, _cx| {
+                this.submitting = false;
+            })?;
+            crate::shared::log_dropped(dock.update(cx, |dock, cx| dock.close_panel(&panel_id, cx)));
+            Ok(())
+        });
+        self.tasks.push(task);
+    }
+
+    fn open_commit_diff(&mut self, commit_id: &str, window: &mut Window, cx: &mut Context<Self>) {
+        let Some(repo_path) = self.work_path() else {
+            return;
+        };
+        let id = match self.store.read(cx).addr() {
+            Some(addr) => SharedString::from(format!("commit:{addr}:{commit_id}")),
+            None => SharedString::from(format!("commit:{}:{commit_id}", repo_path.display())),
+        };
+        let dock = self.dock.clone();
+        let store = self.store.clone();
+        let repo_name = self.repo_name.clone();
+        let commit_id = commit_id.to_owned();
+        crate::shared::panels::open(
+            &dock,
+            id,
+            move |window, cx| {
+                cx.new(|cx| {
+                    CommitDiffView::new(
+                        store.clone(),
+                        repo_path.clone(),
+                        repo_name.clone(),
+                        commit_id.clone(),
+                        window,
+                        cx,
+                    )
+                })
+            },
+            window,
+            cx,
+        );
+    }
+
+    fn submit_enabled(&self, cx: &App) -> bool {
+        self.has_source()
+            && !self.loading
+            && !self.submitting
+            && self.merge_base.is_some()
+            && self
+                .commits
+                .as_ref()
+                .is_some_and(|commits| !commits.is_empty())
+            && !self.subject.read(cx).value().is_empty()
+    }
+
+    fn render_compare_bar(&self, cx: &mut Context<Self>) -> AnyElement {
+        let weak = cx.entity().downgrade();
+        let weak_menu = cx.entity().downgrade();
+        let source_view = cx.entity().downgrade();
+        let associated = self
+            .store
+            .read(cx)
+            .addr()
+            .map(|addr| CheckoutsStore::global(cx).read(cx).associations_of(addr))
+            .unwrap_or_default();
+        let active_path = (self.fork.is_none())
+            .then(|| self.repo_path.clone())
+            .flatten();
+        let candidates = self.fork_candidates(cx);
+        let user = signed_state::Backend::global(cx).read(cx).current_user();
+        let active_fork = self.fork.as_ref().map(|fork| fork.announcement.addr());
+        let can_submit = self.submit_enabled(cx);
+        let source_label = match &self.fork {
+            Some(fork) => truncate_label(&fork_display_name(&fork.announcement)),
+            None => self.repo_path.as_ref().map_or_else(
+                || SharedString::from("No source"),
+                |path| truncate_label(&path.display().to_string()),
+            ),
+        };
+        let refresh_fork = self.fork.as_ref().map(|fork| fork.announcement.clone());
+
+        h_flex()
+            .px_4()
+            .py_2()
+            .w_full()
+            .gap_3()
+            .items_end()
+            .child(
+                v_flex()
+                    .gap_1()
+                    .child(label("Merge Into"))
+                    .child(div().w(px(160.)).child(self.base_select.clone())),
+            )
+            .child(
+                v_flex()
+                    .gap_1()
+                    .child(label("Pull From"))
+                    .child(div().w(px(160.)).child(self.compare_select.clone())),
+            )
+            .child(
+                v_flex().gap_1().child(label("Source")).child(
+                    Menu::new("pr-source")
+                        .open(self.source_open)
+                        .on_change(move |open, _, cx| {
+                            crate::shared::log_dropped(weak_menu.update(cx, |this, cx| {
+                                this.source_open = open;
+                                cx.notify();
+                            }));
+                        })
+                        .trigger(move |_, _| {
+                            Button::new("compare-source")
+                                .label(source_label.clone())
+                                .variant(gpui_native_kit::button::ButtonVariant::Secondary)
+                                .into_any_element()
+                        })
+                        .items(move |_, _| {
+                            super::helpers::source_menu_items(
+                                source_view.clone(),
+                                associated.clone(),
+                                active_path.clone(),
+                                candidates.clone(),
+                                user,
+                                active_fork.clone(),
+                            )
+                        }),
+                ),
+            )
+            .when_some(refresh_fork, |this, fork| {
+                this.child(
+                    Button::new("refresh-fork")
+                        .icon(Icon::named(CustomIconName::Refresh))
+                        .on_click(cx.listener(move |this, _, window, cx| {
+                            this.choose_fork(fork.clone(), window, cx);
+                        })),
+                )
+            })
+            .child(div().flex_1())
+            .child(
+                Button::new("create-pr")
+                    .label("Create pull request")
+                    .icon(Icon::named(IconRole::Plus))
+                    .loading(self.submitting)
+                    .disabled(!can_submit)
+                    .on_click(move |_, window, cx| {
+                        crate::shared::log_dropped(
+                            weak.update(cx, |this, cx| this.submit(window, cx)),
+                        );
+                    }),
+            )
+            .into_any_element()
+    }
+
+    fn render_tabs(&self, cx: &mut Context<Self>) -> AnyElement {
+        let files = self.pane.read(cx).diff().map_or(0, |diff| diff.files.len());
+        let commits = self.commits.as_ref().map_or(0, |commits| commits.len());
+        let weak = cx.entity().downgrade();
+
+        Tabs::new("new-pr-tabs")
+            .selected(self.active_tab)
+            .tabs(move |_, _| {
+                vec![
+                    Tab::new("files", format!("Files ({files})"))
+                        .lead(Icon::named(CustomIconName::GitFile)),
+                    Tab::new("commits", format!("Commits ({commits})"))
+                        .lead(Icon::named(CustomIconName::GitCommit)),
+                ]
+            })
+            .on_change(move |index, _, cx| {
+                crate::shared::log_dropped(weak.update(cx, |this, cx| {
+                    this.active_tab = index;
+                    cx.notify();
+                }));
+            })
+            .into_any_element()
+    }
+
+    fn render_content(&self, cx: &mut Context<Self>) -> AnyElement {
+        if self.loading {
+            return v_flex()
+                .size_full()
+                .items_center()
+                .justify_center()
+                .child(Spinner::new("new-pr-loading"))
+                .into_any_element();
+        }
+        if !self.has_source() {
+            return empty_state("Choose a local checkout or an announced fork to compare");
+        }
+        if self.commits.is_none() && self.error.is_some() {
+            return empty_state("Nothing to compare");
+        }
+        match self.active_tab {
+            0 => self.pane.clone().into_any_element(),
+            _ => self.render_commits(cx),
+        }
+    }
+
+    fn render_commits(&self, cx: &mut Context<Self>) -> AnyElement {
+        let Some(commits) = self.commits.as_ref() else {
+            return empty_state("No commits");
+        };
+        if commits.is_empty() {
+            return empty_state("No commits between the branches");
+        }
+        let commits = commits.clone();
+        let view = cx.entity().downgrade();
+
+        v_flex()
+            .relative()
+            .flex_1()
+            .min_h_0()
+            .child(
+                uniform_list("new-pr-commits", commits.len(), move |range, _, cx| {
+                    range
+                        .map(|ix| {
+                            let commit = commits[ix].clone();
+                            let id = commit.id.clone();
+                            let view = view.clone();
+                            commit_row(
+                                ix,
+                                &commit,
+                                move |window, cx| {
+                                    crate::shared::log_dropped(view.update(cx, |this, cx| {
+                                        this.open_commit_diff(&id, window, cx);
+                                    }));
+                                },
+                                cx,
+                            )
+                        })
+                        .collect()
+                })
+                .track_scroll(&self.scroll_handle)
+                .size_full(),
+            )
+            .child(
+                div()
+                    .absolute()
+                    .top_0()
+                    .left_0()
+                    .right_0()
+                    .bottom_0()
+                    .child(Scrollbar::vertical(
+                        "new-pr-commits-scroll",
+                        self.scroll_handle.clone(),
+                    )),
+            )
+            .into_any_element()
+    }
+}
+
+impl Panel for NewPullRequestView {
+    fn title(&self, _cx: &gpui::App) -> Option<SharedString> {
+        Some(SharedString::from(format!(
+            "{}/new-pull-request",
+            self.repo_name
+        )))
+    }
+
+    fn lead(&self, cx: &gpui::App) -> Option<AnyElement> {
+        Some(crate::shared::widgets::repo_tab_avatar(
+            self.store.read(cx),
+            &self.directory,
+            cx,
+        ))
+    }
+}
+
+impl Render for NewPullRequestView {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        v_flex()
+            .id("new-pr")
+            .size_full()
+            .child(
+                v_flex()
+                    .gap_3()
+                    .child(self.render_compare_bar(cx))
+                    .child(
+                        v_flex()
+                            .px_4()
+                            .gap_2()
+                            .child(
+                                Input::new("pr-title", self.subject.clone()).placeholder("Title"),
+                            )
+                            .child(
+                                Input::new("pr-description", self.description.clone())
+                                    .rows(3)
+                                    .placeholder("Describe..."),
+                            )
+                            .when_some(self.error.clone(), |this, error| {
+                                this.child(
+                                    div()
+                                        .text_xs()
+                                        .text_color(cx.theme().ramps.destructive.base)
+                                        .child(error),
+                                )
+                            }),
+                    )
+                    .child(self.render_tabs(cx)),
+            )
+            .child(
+                v_flex()
+                    .flex_1()
+                    .min_h_0()
+                    .w_full()
+                    .child(self.render_content(cx)),
+            )
+    }
+}
+
+fn label(text: &'static str) -> AnyElement {
+    div()
+        .text_xs()
+        .font_weight(gpui::FontWeight::SEMIBOLD)
+        .child(text)
+        .into_any_element()
+}

crates/signed_app/src/pull_requests/new/source.rs

@@ -0,0 +1,397 @@
+use std::path::{Path, PathBuf};
+
+use gpui::{App, AppContext as _, Context, PathPromptOptions, SharedString, Window};
+use nostr::prelude::Url;
+use signed_core::Announcement;
+use signed_git::{GitCache, Repo};
+use signed_state::{Backend, CheckoutsStore, Mirrors, RepoListStore};
+
+use super::NewPullRequestView;
+use crate::pull_requests::helpers::ForkCompare;
+
+impl NewPullRequestView {
+    pub(super) fn has_source(&self) -> bool {
+        self.repo_path.is_some() || self.fork.is_some()
+    }
+
+    pub(super) fn work_path(&self) -> Option<PathBuf> {
+        match &self.fork {
+            Some(fork) => Some(fork.mirror_path.clone()),
+            None => self.repo_path.clone(),
+        }
+    }
+
+    pub(super) fn base_ref(&self) -> String {
+        match &self.fork {
+            Some(_) => ForkCompare::base_ref(&self.base),
+            None => self.base.to_string(),
+        }
+    }
+
+    pub(super) fn compare_ref(&self) -> String {
+        match &self.fork {
+            Some(fork) => fork.compare_ref(&self.compare),
+            None => self.compare.to_string(),
+        }
+    }
+
+    pub(crate) fn choose_checkout(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let prompt = cx.prompt_for_paths(PathPromptOptions {
+            files: false,
+            directories: true,
+            multiple: false,
+            prompt: Some("Choose local checkout".into()),
+        });
+        let task: gpui::Task<Result<(), anyhow::Error>> =
+            cx.spawn_in(window, async move |this, cx| {
+                let picked = match prompt.await {
+                    Ok(Ok(Some(mut paths))) => paths.pop(),
+                    _ => None,
+                };
+                let Some(path) = picked else {
+                    return Ok(());
+                };
+                this.update_in(cx, |this, window, cx| {
+                    this.apply_folder_path(path, window, cx)
+                })?;
+                Ok(())
+            });
+        self.tasks.push(task);
+    }
+
+    pub(crate) fn apply_folder_path(
+        &mut self,
+        path: PathBuf,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.fork_generation = self.fork_generation.wrapping_add(1);
+        let generation = self.fork_generation;
+        let path_string = path.to_string_lossy().to_string();
+        let task: gpui::Task<Result<(), anyhow::Error>> =
+            cx.spawn_in(window, async move |this, cx| {
+                let info = cx
+                    .background_spawn({
+                        let path = path.clone();
+                        async move {
+                            let repo = Repo::try_open(&path)?;
+                            match repo.branches() {
+                                Ok(branches) => Some((branches, repo.current_branch())),
+                                Err(error) => {
+                                    log::warn!("failed to list branches: {error}");
+                                    None
+                                }
+                            }
+                        }
+                    })
+                    .await;
+                this.update_in(cx, |this, window, cx| {
+                    if generation != this.fork_generation {
+                        return;
+                    }
+                    this.apply_checkout(path_string, info, window, cx);
+                })?;
+                Ok(())
+            });
+        self.tasks.push(task);
+    }
+
+    fn apply_checkout(
+        &mut self,
+        path: String,
+        info: Option<(Vec<String>, Option<String>)>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.fork = None;
+        let Some((branches, current)) = info else {
+            self.error = Some("The chosen folder is not a git repository".into());
+            self.repo_path = None;
+            self.branches.clear();
+            self.merge_base = None;
+            self.commits = None;
+            self.pane.update(cx, |pane, cx| pane.clear(cx));
+            cx.notify();
+            return;
+        };
+        if branches.is_empty() {
+            self.error = Some("The repository has no branches yet".into());
+            self.repo_path = None;
+            self.branches.clear();
+            self.merge_base = None;
+            self.commits = None;
+            self.pane.update(cx, |pane, cx| pane.clear(cx));
+            cx.notify();
+            return;
+        }
+
+        let announced = self.store.read(cx).head.clone();
+        let base = announced
+            .as_ref()
+            .filter(|branch| branches.contains(branch))
+            .cloned()
+            .or_else(|| branches.iter().find(|branch| *branch == "main").cloned())
+            .unwrap_or_else(|| branches[0].clone());
+        let compare = current
+            .filter(|branch| branches.contains(branch))
+            .unwrap_or_else(|| base.clone());
+
+        self.repo_path = Some(PathBuf::from(&path));
+        self.error = None;
+        self.branches = branches.into_iter().map(SharedString::from).collect();
+
+        if let Some(addr) = self.store.read(cx).addr().cloned() {
+            CheckoutsStore::global(cx).update(cx, |store, cx| {
+                store.record(PathBuf::from(&path), addr, cx);
+            });
+        }
+
+        self.base = SharedString::from(base);
+        self.compare = SharedString::from(compare);
+        self.sync_selectors(window, cx);
+        self.reload_compare(cx);
+    }
+
+    fn sync_selectors(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let options: Vec<(SharedString, SharedString)> = self
+            .branches
+            .iter()
+            .map(|branch| (branch.clone(), branch.clone()))
+            .collect();
+        let base = self.base.clone();
+        let compare = self.compare.clone();
+
+        self.base_select.update(cx, |state, cx| {
+            state.set_options(options.clone(), cx);
+            state.set_selected(Some(base), window, cx);
+        });
+        self.compare_select.update(cx, |state, cx| {
+            state.set_options(options, cx);
+            state.set_selected(Some(compare), window, cx);
+        });
+    }
+
+    pub(super) fn fork_candidates(&self, cx: &App) -> Vec<Announcement> {
+        let Some(addr) = self.store.read(cx).addr().cloned() else {
+            return Vec::new();
+        };
+        let euc = self
+            .store
+            .read(cx)
+            .announcement
+            .as_ref()
+            .and_then(|a| a.euc.clone());
+        let user = Backend::global(cx).read(cx).current_user();
+        let announcements = RepoListStore::global(cx).read(cx).announcements.clone();
+        Announcement::forks_in(&announcements, &addr, euc.as_deref(), user)
+            .into_iter()
+            .cloned()
+            .collect()
+    }
+
+    pub(crate) fn choose_fork(
+        &mut self,
+        announcement: Announcement,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let Some(base) = self.store.read(cx).addr().cloned() else {
+            return;
+        };
+        let mirror_path = Mirrors::path(&base);
+        let namespace = GitCache::fork_namespace(&announcement);
+        let clone_urls: Vec<Url> = announcement.clone.clone();
+        let base_clone_urls: Vec<Url> = self
+            .store
+            .read(cx)
+            .announcement
+            .as_ref()
+            .map(|a| a.clone.clone())
+            .unwrap_or_default();
+        self.fork_generation = self.fork_generation.wrapping_add(1);
+        let generation = self.fork_generation;
+        let handle = window.window_handle();
+
+        self.loading = true;
+        self.error = None;
+        cx.notify();
+
+        let task: gpui::Task<Result<(), anyhow::Error>> = cx.spawn(async move |this, cx| {
+            let result = cx
+                .background_spawn({
+                    let namespace = namespace.clone();
+                    let mirror_path = mirror_path.clone();
+                    async move {
+                        Mirrors::ensure(&base, &base_clone_urls)?;
+                        let repo = Repo::open(&mirror_path)?;
+                        repo.delete_refs_with_prefix("refs/fork")?;
+                        repo.fetch_refs(
+                            &clone_urls,
+                            &format!("+refs/heads/*:refs/fork/{namespace}/*"),
+                        )?;
+                        let strip = |refs: Vec<String>, prefix: &str| {
+                            let mut names: Vec<String> = refs
+                                .into_iter()
+                                .filter_map(|name| {
+                                    name.strip_prefix(prefix)
+                                        .map(|rest| rest.trim_start_matches('/').to_owned())
+                                })
+                                .filter(|name| !name.is_empty())
+                                .collect();
+                            names.sort();
+                            names
+                        };
+                        let base_branches = strip(
+                            repo.refs_with_prefix("refs/remotes/origin")?,
+                            "refs/remotes/origin",
+                        );
+                        let compare_branches = strip(
+                            repo.refs_with_prefix(&format!("refs/fork/{namespace}"))?,
+                            &format!("refs/fork/{namespace}"),
+                        );
+                        Ok::<_, anyhow::Error>((base_branches, compare_branches))
+                    }
+                })
+                .await;
+
+            if let Err(error) = cx.update_window(handle, |_, window, cx| {
+                this.update(cx, |this, cx| {
+                    if generation != this.fork_generation {
+                        return;
+                    }
+                    this.apply_fork(announcement, mirror_path, namespace, result, window, cx);
+                })
+            }) {
+                log::warn!("failed to apply fork: {error}");
+            }
+            Ok(())
+        });
+        self.tasks.push(task);
+    }
+
+    fn apply_fork(
+        &mut self,
+        announcement: Announcement,
+        mirror_path: PathBuf,
+        namespace: String,
+        result: Result<(Vec<String>, Vec<String>), anyhow::Error>,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        self.loading = false;
+        let (base_branches, compare_branches) = match result {
+            Ok(branches) => branches,
+            Err(error) => {
+                self.error = Some(format!("Could not compare against the fork: {error}").into());
+                cx.notify();
+                return;
+            }
+        };
+        if compare_branches.is_empty() {
+            self.error = Some("The fork has no branches to compare".into());
+            cx.notify();
+            return;
+        }
+        if base_branches.is_empty() {
+            self.error = Some("Could not list the target repository's branches.".into());
+            cx.notify();
+            return;
+        }
+
+        let announced = self.store.read(cx).head.clone();
+        let base = announced
+            .filter(|branch| base_branches.contains(branch))
+            .map(SharedString::from)
+            .or_else(|| {
+                base_branches
+                    .iter()
+                    .find(|branch| branch.as_str() == "main")
+                    .map(|branch| SharedString::from(branch.clone()))
+            })
+            .unwrap_or_else(|| SharedString::from(base_branches[0].clone()));
+        let compare = compare_branches
+            .iter()
+            .find(|branch| branch.as_str() == "main")
+            .map(|branch| SharedString::from(branch.clone()))
+            .unwrap_or_else(|| SharedString::from(compare_branches[0].clone()));
+
+        self.fork = Some(ForkCompare {
+            announcement,
+            namespace,
+            mirror_path,
+        });
+        self.error = None;
+        self.base = base;
+        self.compare = compare;
+        self.branches = base_branches.into_iter().map(SharedString::from).collect();
+        self.sync_selectors(window, cx);
+        self.reload_compare(cx);
+    }
+
+    pub(super) fn reload_compare(&mut self, cx: &mut Context<Self>) {
+        let Some(repo_path) = self.work_path() else {
+            return;
+        };
+        let base = self.base_ref();
+        let compare = self.compare_ref();
+        let base_name = self.base.to_string();
+        let compare_name = self.compare.to_string();
+
+        self.loading = true;
+        self.error = None;
+        self.compare_generation += 1;
+        let generation = self.compare_generation;
+        cx.notify();
+
+        if base == compare {
+            self.loading = false;
+            self.merge_base = None;
+            self.commits = None;
+            self.pane.update(cx, |pane, cx| pane.clear(cx));
+            self.error = Some("Choose different base and compare branches".into());
+            cx.notify();
+            return;
+        }
+
+        let task: gpui::Task<Result<(), anyhow::Error>> = cx.spawn(async move |this, cx| {
+            let result = cx
+                .background_spawn({
+                    async move {
+                        let repo = Repo::open(Path::new(&repo_path))?;
+                        let merge_base = repo.merge_base(&base, &compare)?.ok_or_else(|| {
+                            anyhow::anyhow!(
+                                "{base_name} and {compare_name} share no common ancestor"
+                            )
+                        })?;
+                        let commits = repo.commit_range(&merge_base, &compare)?;
+                        let diff = repo.range_diff(&merge_base, &compare)?;
+                        Ok::<_, anyhow::Error>((merge_base, commits, diff))
+                    }
+                })
+                .await;
+
+            this.update(cx, |this, cx| {
+                if generation != this.compare_generation {
+                    return;
+                }
+                this.loading = false;
+                match result {
+                    Ok((merge_base, commits, diff)) => {
+                        this.merge_base = Some(merge_base);
+                        this.commits = Some(commits);
+                        this.pane.update(cx, |pane, cx| pane.set_diff(diff, cx));
+                    }
+                    Err(error) => {
+                        this.merge_base = None;
+                        this.commits = None;
+                        this.pane.update(cx, |pane, cx| pane.clear(cx));
+                        this.error = Some(error.to_string().into());
+                    }
+                }
+                cx.notify();
+            })?;
+            Ok(())
+        });
+        self.tasks.push(task);
+    }
+}

crates/signed_app/src/pull_requests/send_patch.rs

@@ -0,0 +1,188 @@
+use assets::CustomIconName;
+use gpui::prelude::FluentBuilder as _;
+use gpui::{
+    AnyElement, App, Context, Entity, InteractiveElement as _, IntoElement, ParentElement as _,
+    Render, SharedString, Styled as _, WeakEntity, Window, div,
+};
+use gpui_native_kit::button::Button;
+use gpui_native_kit::common::{h_flex, v_flex};
+use gpui_native_kit::icons::Icon;
+use gpui_native_kit::input::{Input, InputState};
+use gpui_native_kit::layout::dock::{DockState, Panel};
+use gpui_native_kit::theme::ActiveTheme as _;
+use metadata::ProfileDirectory;
+use signed_state::RepoStore;
+
+use crate::shared::widgets::repo_tab_avatar;
+
+pub struct SendPatchView {
+    dock: WeakEntity<DockState>,
+    panel_id: SharedString,
+    store: Entity<RepoStore>,
+    repo_name: SharedString,
+    subject: Entity<InputState>,
+    description: Entity<InputState>,
+    patch: Entity<InputState>,
+    submitting: bool,
+    error: Option<SharedString>,
+    directory: Entity<ProfileDirectory>,
+}
+
+impl SendPatchView {
+    pub fn new(
+        dock: WeakEntity<DockState>,
+        panel_id: SharedString,
+        store: Entity<RepoStore>,
+        _window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Self {
+        let subject = InputState::new(cx);
+        let description = InputState::builder().multiline().build(cx);
+        let patch = InputState::builder().multiline().build(cx);
+
+        let repo_name = store.read(cx).name();
+        let directory = ProfileDirectory::new(cx);
+
+        if let Some(owner) = store.read(cx).announcement.as_ref().map(|a| a.owner) {
+            directory.update(cx, |directory, cx| {
+                directory.track([owner], cx);
+            });
+        }
+
+        Self {
+            dock,
+            panel_id,
+            store,
+            repo_name,
+            subject,
+            description,
+            patch,
+            submitting: false,
+            error: None,
+            directory,
+        }
+    }
+
+    fn submit(&mut self, cx: &mut Context<Self>) {
+        if self.submitting {
+            return;
+        }
+
+        let subject = self.subject.read(cx).value().to_string();
+        let description = self.description.read(cx).value().to_string();
+
+        let patch = self.patch.read(cx).value().to_string();
+        if patch.is_empty() {
+            return;
+        }
+
+        self.submitting = true;
+        self.error = None;
+        cx.notify();
+
+        let sync_error = self.store.update(cx, |store, cx| {
+            store.open_pull_request(
+                (!subject.is_empty()).then_some(subject),
+                description,
+                None,
+                patch,
+                false,
+                None,
+                None,
+                cx,
+            );
+            store.last_error.clone()
+        });
+
+        if let Some(error) = sync_error {
+            self.submitting = false;
+            self.error = Some(error.into());
+            cx.notify();
+            return;
+        }
+
+        let panel_id = self.panel_id.clone();
+        crate::shared::log_dropped(
+            self.dock
+                .update(cx, |dock, cx| dock.close_panel(&panel_id, cx)),
+        );
+    }
+
+    fn render_footer(&self, cx: &Context<Self>) -> AnyElement {
+        let can_submit = !self.submitting
+            && !self.subject.read(cx).value().is_empty()
+            && !self.patch.read(cx).value().is_empty();
+        let weak = cx.entity().downgrade();
+
+        h_flex()
+            .px_4()
+            .py_2()
+            .w_full()
+            .justify_end()
+            .border_t_1()
+            .border_color(cx.theme().colors.border)
+            .child(
+                Button::new("send-patch")
+                    .label("Send patch")
+                    .icon(Icon::named(CustomIconName::ArrowUp))
+                    .loading(self.submitting)
+                    .disabled(!can_submit)
+                    .on_click(move |_, _, cx| {
+                        crate::shared::log_dropped(weak.update(cx, |this, cx| this.submit(cx)));
+                    }),
+            )
+            .into_any_element()
+    }
+}
+
+impl Panel for SendPatchView {
+    fn title(&self, _cx: &App) -> Option<SharedString> {
+        Some(SharedString::from(format!("{}/send-patch", self.repo_name)))
+    }
+
+    fn lead(&self, cx: &App) -> Option<AnyElement> {
+        Some(repo_tab_avatar(self.store.read(cx), &self.directory, cx))
+    }
+}
+
+impl Render for SendPatchView {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        v_flex()
+            .id("send-patch")
+            .size_full()
+            .child(
+                v_flex()
+                    .p_4()
+                    .flex_1()
+                    .gap_2()
+                    .child(Input::new("patch-subject", self.subject.clone()).placeholder("Title"))
+                    .child(
+                        Input::new("patch-description", self.description.clone())
+                            .rows(2)
+                            .placeholder("Describe the change"),
+                    )
+                    .child(
+                        div()
+                            .text_xs()
+                            .text_color(cx.theme().colors.muted_foreground)
+                            .child(
+                                "You can paste a git diff or a git format-patch patch series here.",
+                            ),
+                    )
+                    .child(
+                        Input::new("patch-body", self.patch.clone())
+                            .rows(12)
+                            .placeholder("diff --git a/file.txt b/file.txt"),
+                    )
+                    .when_some(self.error.clone(), |this, error| {
+                        this.child(
+                            div()
+                                .text_xs()
+                                .text_color(cx.theme().ramps.destructive.base)
+                                .child(error),
+                        )
+                    }),
+            )
+            .child(self.render_footer(cx))
+    }
+}

crates/signed_app/src/repo/actions.rs

@@ -0,0 +1,93 @@
+use gpui::{App, AppContext as _, SharedString, WeakEntity, Window};
+use gpui_native_kit::layout::dock::DockState;
+use nostr::prelude::EventId;
+use signed_core::{Announcement, RepoAddr};
+use signed_state::RepoStore;
+
+use crate::repo::RepoDetailView;
+use crate::shared::panels;
+
+/// An item of a repository to open from outside its detail panel.
+pub enum RepoItem {
+    Issue(EventId),
+    PullRequest(EventId),
+    Patch,
+}
+
+/// Opens a repository as a dock panel, keyed by its address.
+pub fn open_repo_panel(
+    dock: &WeakEntity<DockState>,
+    addr: &RepoAddr,
+    hint: Option<&Announcement>,
+    window: &mut Window,
+    cx: &mut App,
+) {
+    let id = SharedString::from(format!("repo:{addr}"));
+    let addr = addr.clone();
+    let hint = hint.cloned();
+    let dock_for_build = dock.clone();
+
+    panels::open(
+        dock,
+        id,
+        move |window, cx| {
+            let addr = addr.clone();
+            let hint = hint.clone();
+            cx.new(|cx| RepoDetailView::new(dock_for_build.clone(), addr, hint, window, cx))
+        },
+        window,
+        cx,
+    );
+}
+
+/// Opens an issue or pull request using a store built here.
+pub fn open_repo_item(
+    dock: &WeakEntity<DockState>,
+    addr: &RepoAddr,
+    hint: Option<&Announcement>,
+    item: RepoItem,
+    window: &mut Window,
+    cx: &mut App,
+) {
+    let store = cx.new(|cx| RepoStore::new(addr.clone(), hint.cloned(), cx));
+    match item {
+        RepoItem::Issue(issue_id) => {
+            let id = SharedString::from(format!("issue:{issue_id}"));
+            let store = store.clone();
+            panels::open(
+                dock,
+                id,
+                move |_, cx| {
+                    cx.new(|cx| {
+                        crate::issues::detail::IssueDetailView::new(store.clone(), issue_id, cx)
+                    })
+                },
+                window,
+                cx,
+            );
+        }
+        RepoItem::PullRequest(pr_id) => {
+            let id = SharedString::from(format!("pr:{pr_id}"));
+            let dock_for_build = dock.clone();
+            let store = store.clone();
+            panels::open(
+                dock,
+                id,
+                move |window, cx| {
+                    cx.new(|cx| {
+                        crate::pull_requests::PullRequestDetailView::new(
+                            dock_for_build.clone(),
+                            store.clone(),
+                            pr_id,
+                            window,
+                            cx,
+                        )
+                    })
+                },
+                window,
+                cx,
+            );
+        }
+        RepoItem::Patch => {}
+    }
+}

crates/signed_app/src/repo/banners.rs

@@ -1,13 +1,13 @@
 use std::collections::HashSet;
 use std::path::PathBuf;
 
-use signed_state::CheckoutStatus;
+use signed_state::{CheckoutStatus, CheckoutSyncStatus};
 
 #[derive(Default)]
 pub(super) struct Banners {
     dismissed: HashSet<(PathBuf, String)>,
+    sync_dismissed: HashSet<PathBuf>,
     ready_requested: bool,
-    /// Re-requested only when the announced HEAD or the base default changes.
     ready_head: Option<String>,
     ready_statuses: Vec<CheckoutStatus>,
     push_statuses: Vec<CheckoutStatus>,
@@ -24,6 +24,14 @@ impl Banners {
             .insert((status.path.clone(), status.branch.clone()));
     }
 
+    pub(super) fn sync_dismissal(&self, checkout: &CheckoutSyncStatus) -> bool {
+        self.sync_dismissed.contains(&checkout.path)
+    }
+
+    pub(super) fn sync_dismiss(&mut self, checkout: &CheckoutSyncStatus) {
+        self.sync_dismissed.insert(checkout.path.clone());
+    }
+
     pub(super) fn ready_requested_at(&self) -> (bool, &Option<String>) {
         (self.ready_requested, &self.ready_head)
     }

crates/signed_app/src/repo/commit_diff.rs

@@ -0,0 +1,553 @@
+use std::collections::HashSet;
+use std::path::PathBuf;
+
+use gpui::prelude::FluentBuilder as _;
+use gpui::{
+    AnyElement, App, AppContext as _, Axis, Context, Entity, IntoElement, ParentElement as _,
+    Render, ScrollStrategy, SharedString, Styled as _, Task, UniformListScrollHandle, Window, div,
+    px, uniform_list,
+};
+use gpui_native_kit::badge::{Badge, BadgeVariant};
+use gpui_native_kit::clipboard::ClipboardButton;
+use gpui_native_kit::common::{h_flex, v_flex};
+use gpui_native_kit::data::tree::{Tree, TreeItem};
+use gpui_native_kit::icons::{Icon, IconRole};
+use gpui_native_kit::layout::dock::Panel;
+use gpui_native_kit::layout::resizable::{Resizable, ResizableState};
+use gpui_native_kit::scrollbar::Scrollbar;
+use gpui_native_kit::spinner::Spinner;
+use gpui_native_kit::theme::ActiveTheme as _;
+use metadata::ProfileDirectory;
+use signed_git::{CommitDiff, DiffStatus, FileCommit, FileDiff, Repo};
+use signed_state::RepoStore;
+use utils::relative_time_secs;
+
+use super::helpers::{DiffRow, diff_rows, render_diff_row};
+use crate::shared::tree::{TreeItemSeed, TreeRow, build_tree_items, collect_expanded, flatten};
+use crate::shared::widgets::{empty_state, repo_tab_avatar};
+
+pub struct DiffPane {
+    diff: Option<CommitDiff>,
+    seeds: Vec<TreeItemSeed>,
+    expanded: HashSet<String>,
+    rows: Vec<TreeRow>,
+    selected_file: Option<SharedString>,
+    selected_index: Option<usize>,
+    /// Rows of the selected file's diff, hunk headers and lines.
+    diff_rows: Vec<DiffRow>,
+    scroll_handle: UniformListScrollHandle,
+    split: Entity<ResizableState>,
+}
+
+impl DiffPane {
+    pub fn new(cx: &mut Context<Self>) -> Self {
+        Self {
+            diff: None,
+            seeds: Vec::new(),
+            expanded: HashSet::new(),
+            rows: Vec::new(),
+            selected_file: None,
+            selected_index: None,
+            diff_rows: Vec::new(),
+            scroll_handle: UniformListScrollHandle::new(),
+            split: {
+                let split = ResizableState::new(cx);
+                split.update(cx, |split, cx| split.set_sizes([px(260.)], cx));
+                split
+            },
+        }
+    }
+
+    pub fn diff(&self) -> Option<&CommitDiff> {
+        self.diff.as_ref()
+    }
+
+    pub fn set_diff(&mut self, diff: CommitDiff, cx: &mut Context<Self>) {
+        let mut paths: Vec<PathBuf> = diff
+            .files
+            .iter()
+            .map(|file| PathBuf::from(&file.path))
+            .collect();
+        paths.sort();
+        self.seeds = build_tree_items(&paths);
+        self.expanded = collect_expanded(&self.seeds);
+        self.rows = flatten(&self.seeds, &self.expanded);
+
+        let first = diff
+            .files
+            .first()
+            .map(|file| SharedString::from(file.path.as_str()));
+
+        self.selected_file = first.clone();
+        self.selected_index = first
+            .as_ref()
+            .and_then(|path| self.rows.iter().position(|row| row.id == path.as_ref()));
+        self.diff = Some(diff);
+
+        if let Some(path) = first {
+            self.set_diff_rows(path.as_ref());
+        } else {
+            self.diff_rows.clear();
+        }
+        cx.notify();
+    }
+
+    pub fn clear(&mut self, cx: &mut Context<Self>) {
+        self.diff = None;
+        self.seeds.clear();
+        self.expanded.clear();
+        self.rows.clear();
+        self.selected_file = None;
+        self.selected_index = None;
+        self.diff_rows.clear();
+        cx.notify();
+    }
+
+    fn select_file(&mut self, path: &str, cx: &mut Context<Self>) {
+        self.selected_file = Some(path.into());
+        self.selected_index = self.rows.iter().position(|row| row.id == path);
+        self.set_diff_rows(path);
+        cx.notify();
+    }
+
+    fn set_diff_rows(&mut self, path: &str) {
+        let Some(diff) = self.diff.as_ref() else {
+            return;
+        };
+        let Some(file) = diff.files.iter().find(|file| file.path == path) else {
+            return;
+        };
+        self.diff_rows = diff_rows(file);
+        self.scroll_handle.scroll_to_item(0, ScrollStrategy::Top);
+    }
+
+    fn toggle_folder(&mut self, id: &str, cx: &mut Context<Self>) {
+        if !self.expanded.remove(id) {
+            self.expanded.insert(id.to_owned());
+        }
+        self.rows = flatten(&self.seeds, &self.expanded);
+        self.selected_index = self
+            .selected_file
+            .as_ref()
+            .and_then(|path| self.rows.iter().position(|row| row.id == path.as_ref()));
+        cx.notify();
+    }
+
+    fn render_tree_column(&self, cx: &mut Context<Self>) -> AnyElement {
+        let rows = self.rows.clone();
+        let selected = self.selected_index;
+        let view = cx.entity().downgrade();
+        let change_view = view.clone();
+
+        v_flex()
+            .h_full()
+            .min_h_0()
+            .p_2()
+            .child(
+                Tree::new("commit-diff-tree")
+                    .selected(selected)
+                    .items(move |_, _| {
+                        rows.iter()
+                            .map(|row| {
+                                let item = TreeItem::new(row.id.clone(), row.label.clone())
+                                    .depth(row.depth)
+                                    .expandable(row.expandable)
+                                    .expanded(row.expanded);
+
+                                if row.expandable {
+                                    item.icon(Icon::named(IconRole::Folder))
+                                } else {
+                                    item
+                                }
+                            })
+                            .collect()
+                    })
+                    .on_change(move |index, window, cx| {
+                        if let Some(index) = index
+                            && let Err(error) = change_view.update(cx, |this, cx| {
+                                this.activate_row(index, window, cx);
+                            })
+                        {
+                            log::warn!("failed to activate diff tree row: {error}");
+                        }
+                    })
+                    .on_disclosure({
+                        let view = view;
+                        move |index, _, cx| {
+                            if let Err(error) = view.update(cx, |this, cx| {
+                                let id = this.rows.get(index).map(|row| row.id.clone());
+                                if let Some(id) = id {
+                                    this.toggle_folder(&id, cx);
+                                }
+                            }) {
+                                log::warn!("failed to toggle diff folder: {error}");
+                            }
+                        }
+                    }),
+            )
+            .into_any_element()
+    }
+
+    fn activate_row(&mut self, index: usize, _window: &mut Window, cx: &mut Context<Self>) {
+        let Some(row) = self.rows.get(index) else {
+            return;
+        };
+        let id = row.id.clone();
+        let expandable = row.expandable;
+        self.selected_index = Some(index);
+
+        if expandable {
+            self.toggle_folder(&id, cx);
+        } else {
+            self.select_file(&id, cx);
+        }
+    }
+
+    fn render_detail_column(&self, cx: &mut Context<Self>) -> AnyElement {
+        let Some(diff) = self.diff.as_ref() else {
+            return empty_state("No changes");
+        };
+        let Some(path) = self.selected_file.clone() else {
+            return if diff.files.is_empty() {
+                empty_state("No files changed")
+            } else {
+                empty_state("Select a file")
+            };
+        };
+        let Some(file) = diff.files.iter().find(|file| file.path == path.as_ref()) else {
+            return empty_state("File not found");
+        };
+        self.render_file_diff(file, cx)
+    }
+
+    fn render_file_diff(&self, file: &FileDiff, cx: &App) -> AnyElement {
+        let status_label = match file.status {
+            DiffStatus::Added => "A",
+            DiffStatus::Modified => "M",
+            DiffStatus::Deleted => "D",
+            DiffStatus::Renamed => "R",
+            DiffStatus::Copied => "C",
+        };
+        let status_color = match file.status {
+            DiffStatus::Added => cx.theme().ramps.success.base,
+            DiffStatus::Modified => cx.theme().ramps.info.base,
+            DiffStatus::Deleted => cx.theme().ramps.destructive.base,
+            DiffStatus::Renamed | DiffStatus::Copied => cx.theme().colors.muted_foreground,
+        };
+        let title = match &file.old_path {
+            Some(old) => format!("{old} → {}", file.path),
+            None => file.path.clone(),
+        };
+
+        let body: AnyElement = if file.binary {
+            empty_state("Diff not available")
+        } else if file.hunks.is_empty() {
+            empty_state("No content changes")
+        } else {
+            let hunks = file.hunks.clone();
+            let rows = self.diff_rows.clone();
+
+            v_flex()
+                .size_full()
+                .relative()
+                .child(
+                    uniform_list("commit-diff-rows", rows.len(), move |range, _, cx| {
+                        range
+                            .map(|ix| render_diff_row(&hunks, rows[ix], cx))
+                            .collect()
+                    })
+                    .track_scroll(&self.scroll_handle)
+                    .size_full(),
+                )
+                .child(
+                    div()
+                        .absolute()
+                        .top_0()
+                        .left_0()
+                        .right_0()
+                        .bottom_0()
+                        .child(Scrollbar::vertical(
+                            "commit-diff-scroll",
+                            self.scroll_handle.clone(),
+                        )),
+                )
+                .into_any_element()
+        };
+
+        v_flex()
+            .flex_1()
+            .min_w_0()
+            .h_full()
+            .child(
+                h_flex()
+                    .px_3()
+                    .h_9()
+                    .gap_2()
+                    .child(
+                        div()
+                            .text_xs()
+                            .font_weight(gpui::FontWeight::SEMIBOLD)
+                            .text_color(status_color)
+                            .child(status_label),
+                    )
+                    .child(
+                        div()
+                            .flex_1()
+                            .min_w_0()
+                            .text_xs()
+                            .font_weight(gpui::FontWeight::SEMIBOLD)
+                            .text_ellipsis()
+                            .whitespace_nowrap()
+                            .child(title),
+                    )
+                    .when(!file.binary, |this| {
+                        this.child(
+                            h_flex()
+                                .gap_2()
+                                .text_xs()
+                                .child(
+                                    div()
+                                        .text_color(cx.theme().ramps.success.base)
+                                        .child(format!("+{}", file.insertions)),
+                                )
+                                .child(
+                                    div()
+                                        .text_color(cx.theme().ramps.destructive.base)
+                                        .child(format!("-{}", file.deletions)),
+                                ),
+                        )
+                    }),
+            )
+            .child(div().flex_1().min_h_0().child(body))
+            .into_any_element()
+    }
+}
+
+impl Render for DiffPane {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let tree = self.render_tree_column(cx);
+        let detail = self.render_detail_column(cx);
+
+        h_flex()
+            .size_full()
+            .min_h_0()
+            .bg(cx.theme().colors.background)
+            .child(
+                Resizable::new("commit-diff-split", self.split.clone())
+                    .axis(Axis::Horizontal)
+                    .pane_with_min(tree, px(120.))
+                    .pane_with_min(detail, px(240.)),
+            )
+    }
+}
+
+pub struct CommitDiffView {
+    store: Entity<RepoStore>,
+    worktree: PathBuf,
+    repo_name: SharedString,
+    commit: FileCommit,
+    /// The diff is being computed on a background task.
+    loading: bool,
+    error: Option<SharedString>,
+    pane: Entity<DiffPane>,
+    /// Profile for the repository owner in the tab title.
+    directory: Entity<ProfileDirectory>,
+    tasks: Vec<Task<Result<(), anyhow::Error>>>,
+}
+
+impl CommitDiffView {
+    pub fn new(
+        store: Entity<RepoStore>,
+        worktree: PathBuf,
+        repo_name: SharedString,
+        commit_id: String,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) -> Self {
+        let pane = cx.new(DiffPane::new);
+        let directory = ProfileDirectory::new(cx);
+
+        if let Some(owner) = store.read(cx).announcement.as_ref().map(|a| a.owner) {
+            directory.update(cx, |directory, cx| {
+                directory.track([owner], cx);
+            });
+        }
+
+        let weak = cx.entity().downgrade();
+        window.defer(cx, move |window, cx| {
+            if let Err(error) = weak.update(cx, |this, cx| this.load(window, cx)) {
+                log::warn!("failed to load commit diff: {error}");
+            }
+        });
+
+        Self {
+            store,
+            worktree,
+            repo_name,
+            commit: FileCommit {
+                id: commit_id,
+                summary: String::new(),
+                description: None,
+                author: String::new(),
+                time: 0,
+            },
+            loading: true,
+            error: None,
+            pane,
+            directory,
+            tasks: Vec::new(),
+        }
+    }
+
+    fn load(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        self.loading = true;
+        self.error = None;
+        cx.notify();
+
+        let worktree = self.worktree.clone();
+        let id = self.commit.id.clone();
+
+        let task: Task<Result<(), anyhow::Error>> = cx.spawn_in(window, async move |this, cx| {
+            let commit = cx
+                .background_spawn({
+                    let worktree = worktree.clone();
+                    let id = id.clone();
+                    async move { Repo::open(&worktree).and_then(|repo| repo.commit(&id)) }
+                })
+                .await;
+            let diff = cx
+                .background_spawn({
+                    let worktree = worktree.clone();
+                    let id = id.clone();
+                    async move { Repo::open(&worktree).and_then(|repo| repo.commit_diff(&id)) }
+                })
+                .await;
+
+            this.update_in(cx, |this, _window, cx| {
+                this.loading = false;
+                if let Ok(Some(commit)) = commit {
+                    this.commit = commit;
+                }
+                match diff {
+                    Ok(diff) => {
+                        this.pane.update(cx, |pane, cx| pane.set_diff(diff, cx));
+                    }
+                    Err(error) => {
+                        this.error = Some(error.to_string().into());
+                    }
+                }
+                cx.notify();
+            })?;
+
+            Ok(())
+        });
+
+        self.tasks.push(task);
+    }
+
+    fn render_header(&self, cx: &mut Context<Self>) -> AnyElement {
+        let commit = &self.commit;
+        let (files, insertions, deletions) = self.pane.read(cx).diff().map_or((0, 0, 0), |diff| {
+            (
+                diff.files.len(),
+                diff.files.iter().map(|file| file.insertions).sum(),
+                diff.files.iter().map(|file| file.deletions).sum(),
+            )
+        });
+
+        v_flex()
+            .flex_none()
+            .px_4()
+            .py_3()
+            .w_full()
+            .gap_2()
+            .border_b_1()
+            .border_color(cx.theme().colors.border)
+            .child(
+                v_flex()
+                    .child(
+                        div()
+                            .font_weight(gpui::FontWeight::SEMIBOLD)
+                            .text_ellipsis()
+                            .whitespace_nowrap()
+                            .child(commit.summary.clone()),
+                    )
+                    .child(
+                        h_flex()
+                            .gap_2()
+                            .text_sm()
+                            .child(SharedString::from(format!("{} committed", commit.author)))
+                            .child(
+                                h_flex()
+                                    .gap_1()
+                                    .text_color(cx.theme().colors.muted_foreground)
+                                    .child(SharedString::from(&commit.id))
+                                    .child(ClipboardButton::new("commit-id", &commit.id)),
+                            )
+                            .child(
+                                div()
+                                    .text_color(cx.theme().colors.muted_foreground)
+                                    .child(relative_time_secs(commit.time)),
+                            ),
+                    ),
+            )
+            .when_some(commit.description.as_ref(), |this, description| {
+                this.child(div().text_sm().child(SharedString::from(description)))
+            })
+            .child(
+                h_flex()
+                    .gap_2()
+                    .text_xs()
+                    .child(Badge::new("commit-files", format!("{files} files changed")))
+                    .when(insertions > 0, |this| {
+                        this.child(
+                            Badge::new("commit-insertions", format!("+ {insertions}"))
+                                .variant(BadgeVariant::Success),
+                        )
+                    })
+                    .when(deletions > 0, |this| {
+                        this.child(
+                            Badge::new("commit-deletions", format!("- {deletions}"))
+                                .variant(BadgeVariant::Danger),
+                        )
+                    }),
+            )
+            .into_any_element()
+    }
+}
+
+impl Panel for CommitDiffView {
+    fn title(&self, _cx: &App) -> Option<SharedString> {
+        Some(SharedString::from(format!(
+            "{}/{}",
+            self.repo_name, self.commit.id
+        )))
+    }
+
+    fn lead(&self, cx: &App) -> Option<AnyElement> {
+        Some(repo_tab_avatar(self.store.read(cx), &self.directory, cx))
+    }
+}
+
+impl Render for CommitDiffView {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let body: AnyElement = if self.loading {
+            v_flex()
+                .size_full()
+                .items_center()
+                .justify_center()
+                .child(Spinner::new("commit-diff-loading"))
+                .into_any_element()
+        } else if let Some(error) = self.error.clone() {
+            empty_state(error)
+        } else {
+            self.pane.clone().into_any_element()
+        };
+
+        v_flex()
+            .size_full()
+            .min_h_0()
+            .child(self.render_header(cx))
+            .child(div().flex_1().min_h_0().child(body))
+    }
+}

crates/signed_app/src/repo/dialogs/about.rs

@@ -1,26 +1,61 @@
-use gpui::prelude::*;
-use gpui::{AnyElement, App, SharedString, Window, div, px};
-use gpui_component::clipboard::Clipboard;
-use gpui_component::{ActiveTheme, StyledExt, WindowExt, h_flex, v_flex};
+use gpui::{
+    AnyElement, App, AppContext as _, Context, Entity, IntoElement, ParentElement as _, Render,
+    SharedString, Styled as _, Window, div, px,
+};
+use gpui_native_kit::avatar::Avatar;
+use gpui_native_kit::clipboard::ClipboardButton;
+use gpui_native_kit::common::{Sizable as _, h_flex, v_flex};
+use gpui_native_kit::dialog::Dialog;
+use gpui_native_kit::theme::ActiveTheme as _;
+use metadata::ProfileDirectory;
 use nostr::prelude::PublicKey;
 use signed_core::Announcement;
-use signed_state::ProfileStore;
-use signed_ui::{UserAvatar, middle_truncate};
+use utils::middle_truncate;
 
-pub(super) fn open_about_dialog(announcement: Announcement, window: &mut Window, cx: &mut App) {
-    window.open_dialog(cx, move |dialog, _window, cx| {
-        let announcement = announcement.clone();
-        dialog
-            .w(px(500.))
-            .h(px(600.))
-            .keyboard(true)
-            .close_button(true)
-            .title("About")
-            .child(announcement_rows(&announcement, cx))
-    });
+use crate::shared::dialogs::{close_global, open_global};
+
+pub struct AboutDialog {
+    announcement: Announcement,
+    directory: Entity<ProfileDirectory>,
 }
 
-fn announcement_rows(announcement: &Announcement, cx: &App) -> AnyElement {
+impl AboutDialog {
+    pub fn new(
+        announcement: Announcement,
+        directory: Entity<ProfileDirectory>,
+        cx: &mut App,
+    ) -> Entity<Self> {
+        cx.new(|_| Self {
+            announcement,
+            directory,
+        })
+    }
+}
+
+impl Render for AboutDialog {
+    fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
+        let announcement = self.announcement.clone();
+        let directory = self.directory.clone();
+
+        Dialog::new("about-dialog")
+            .open(true)
+            .min_width(px(500.))
+            .on_change(|open, _, cx| {
+                if !open {
+                    close_global(cx);
+                }
+            })
+            .title("About")
+            .content(move |_, cx| announcement_rows(&announcement, &directory, cx))
+            .into_any_element()
+    }
+}
+
+fn announcement_rows(
+    announcement: &Announcement,
+    directory: &Entity<ProfileDirectory>,
+    cx: &App,
+) -> AnyElement {
     let mut rows: Vec<AnyElement> = Vec::new();
 
     rows.push(row(
@@ -34,7 +69,6 @@ fn announcement_rows(announcement: &Announcement, cx: &App) -> AnyElement {
         ),
         cx,
     ));
-
     rows.push(row(
         "Description",
         text(
@@ -106,7 +140,7 @@ fn announcement_rows(announcement: &Announcement, cx: &App) -> AnyElement {
     if !announcement.maintainers.is_empty() {
         rows.push(row(
             "Maintainers",
-            maintainers(&announcement.maintainers, cx),
+            maintainers(&announcement.maintainers, directory, cx),
             cx,
         ));
     }
@@ -121,8 +155,8 @@ fn row(label: &'static str, value: AnyElement, cx: &App) -> AnyElement {
         .child(
             div()
                 .text_xs()
-                .font_semibold()
-                .text_color(cx.theme().muted_foreground)
+                .font_weight(gpui::FontWeight::SEMIBOLD)
+                .text_color(cx.theme().colors.muted_foreground)
                 .child(label),
         )
         .child(value)
@@ -133,13 +167,11 @@ fn text<T>(value: T) -> AnyElement
 where
     T: Into<SharedString>,
 {
-    let value = value.into();
-
     div()
         .text_sm()
         .w_full()
         .min_w_0()
-        .child(value)
+        .child(value.into())
         .into_any_element()
 }
 
@@ -150,30 +182,37 @@ fn copy_value(id: &'static str, value: String, cx: &App) -> AnyElement {
         .min_w_0()
         .child(
             div()
-                .font_family(cx.theme().mono_font_family.clone())
+                .font_family(cx.theme().mono_font)
                 .text_xs()
                 .min_w_0()
                 .child(SharedString::from(value.clone())),
         )
-        .child(Clipboard::new(id).tooltip("Copy").value(value))
+        .child(ClipboardButton::new(id, value))
         .into_any_element()
 }
 
-fn maintainers(maintainers: &[PublicKey], cx: &App) -> AnyElement {
-    let profile_store = ProfileStore::global(cx);
+fn maintainers(
+    maintainers: &[PublicKey],
+    directory: &Entity<ProfileDirectory>,
+    cx: &App,
+) -> AnyElement {
     v_flex()
         .gap_2()
         .min_w_0()
         .children(maintainers.iter().map(|pubkey| {
-            let profile = profile_store.read(cx).get(pubkey);
+            let profile = directory.read(cx).profile(pubkey, cx);
             let name = profile.name();
-            let picture = profile.picture();
 
             h_flex()
                 .gap_2()
                 .items_center()
                 .min_w_0()
-                .child(UserAvatar::new(name.clone()).picture(picture))
+                .child(
+                    Avatar::new(*pubkey)
+                        .name(name.clone())
+                        .picture(profile.picture())
+                        .small(),
+                )
                 .child(
                     div()
                         .flex_1()
@@ -184,6 +223,7 @@ fn maintainers(maintainers: &[PublicKey], cx: &App) -> AnyElement {
                         .text_sm()
                         .child(name),
                 )
+                .into_any_element()
         }))
         .into_any_element()
 }
@@ -194,15 +234,13 @@ fn list(id: &'static str, items: impl IntoIterator<Item = String>, cx: &App) ->
         .min_w_0()
         .children(items.into_iter().enumerate().map(|(ix, item)| {
             h_flex()
-                .id(ix)
                 .h_8()
                 .px_2()
                 .gap_2()
                 .min_w_0()
-                .bg(cx.theme().secondary)
-                .hover(|this| this.bg(cx.theme().secondary_hover))
-                .rounded(cx.theme().radius)
-                .text_color(cx.theme().secondary_foreground)
+                .bg(cx.theme().colors.secondary)
+                .rounded(cx.theme().radius.control)
+                .text_color(cx.theme().colors.secondary_foreground)
                 .child(
                     div()
                         .flex_1()
@@ -212,12 +250,16 @@ fn list(id: &'static str, items: impl IntoIterator<Item = String>, cx: &App) ->
                         .text_sm()
                         .child(SharedString::from(middle_truncate(&item, 28, 16))),
                 )
-                .child(
-                    Clipboard::new(format!("{id}-{ix}"))
-                        .tooltip("Copy")
-                        .value(item),
-                )
+                .child(ClipboardButton::new(
+                    SharedString::from(format!("{id}-{ix}")),
+                    item,
+                ))
                 .into_any_element()
         }))
         .into_any_element()
 }
+
+/// Opens the read-only repository metadata dialog.
+pub fn open(announcement: Announcement, directory: Entity<ProfileDirectory>, cx: &mut App) {
+    open_global(AboutDialog::new(announcement, directory, cx), cx);
+}

crates/signed_app/src/repo/dialogs/create.rs

@@ -0,0 +1,272 @@
+use std::path::PathBuf;
+
+use gpui::prelude::FluentBuilder as _;
+use gpui::{
+    AnyElement, App, AppContext as _, Context, Entity, IntoElement, ParentElement as _,
+    PathPromptOptions, Render, Styled as _, WeakEntity, Window, div, px,
+};
+use gpui_native_kit::button::{Button, ButtonVariant};
+use gpui_native_kit::common::{h_flex, v_flex};
+use gpui_native_kit::dialog::Dialog;
+use gpui_native_kit::field::Field;
+use gpui_native_kit::icons::{Icon, IconRole};
+use gpui_native_kit::input::{Input, InputState};
+use gpui_native_kit::layout::dock::DockState;
+use gpui_native_kit::theme::ActiveTheme as _;
+use gpui_native_kit::tooltip::Tooltip;
+use settings::SettingsStore;
+use signed_state::{Backend, CheckoutsStore};
+
+use super::grasp_servers::{GraspServersState, grasp_servers_field, load_user_grasp_servers};
+use crate::repo::actions::open_repo_panel;
+use crate::shared::dialogs::{close_global, open_global};
+use crate::shared::progress::{DialogProgress, error_row, push_steps_row};
+
+/// Progress of the create-repository flow, so async results can be rendered.
+pub struct CreateRepoDialog {
+    name_input: Entity<InputState>,
+    desc_input: Entity<InputState>,
+    folder_input: Entity<InputState>,
+    relay_input: Entity<InputState>,
+    state: Entity<DialogProgress>,
+    grasp_state: Entity<GraspServersState>,
+    dock: WeakEntity<DockState>,
+}
+
+impl CreateRepoDialog {
+    pub fn new(dock: WeakEntity<DockState>, window: &mut Window, cx: &mut App) -> Entity<Self> {
+        let settings = SettingsStore::global(cx);
+        let default_folder = settings
+            .read(cx)
+            .settings()
+            .create_repository
+            .default_folder
+            .clone()
+            .unwrap_or_else(paths::desktop_dir);
+        let grasp_settings = settings.read(cx).settings().grasp_servers.clone();
+
+        let name_input = InputState::new(cx);
+        let desc_input = InputState::builder().multiline().build(cx);
+        let folder_input = InputState::builder()
+            .text(default_folder.to_string_lossy())
+            .build(cx);
+        folder_input.update(cx, |state, cx| state.set_read_only(true, cx));
+
+        let relay_input = InputState::new(cx);
+        let state = cx.new(|_| DialogProgress::default());
+        let grasp_state = cx.new(|_| GraspServersState::new_default(&grasp_settings));
+
+        load_user_grasp_servers(grasp_state.clone(), window, cx);
+
+        cx.new(|_| Self {
+            name_input,
+            desc_input,
+            folder_input,
+            relay_input,
+            state,
+            grasp_state,
+            dock,
+        })
+    }
+
+    fn create(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        if self.state.read(cx).busy {
+            return;
+        }
+
+        let name = self.name_input.read(cx).value().trim().to_owned();
+        let description = self.desc_input.read(cx).value().trim().to_owned();
+        let folder = PathBuf::from(self.folder_input.read(cx).value().trim());
+        let servers = self.grasp_state.read(cx).grasp_servers.clone();
+
+        if name.is_empty() {
+            self.fail("Repository name is required", cx);
+            return;
+        }
+        if servers.is_empty() {
+            self.fail("Add at least one grasp server", cx);
+            return;
+        }
+
+        let backend = Backend::global(cx);
+        let Some(user) = backend.read(cx).current_user() else {
+            self.fail("Sign in to create a repository", cx);
+            return;
+        };
+
+        let addr =
+            signed_core::RepoAddr::new(user, signed_core::RepoAddr::identifier_from_name(&name));
+        self.state.update(cx, |state, cx| {
+            state.begin_push(addr, cx);
+            cx.notify();
+        });
+
+        let task = backend.update(cx, |backend, cx| {
+            backend.create_repository(&name, &description, folder, servers, cx)
+        });
+        let state = self.state.clone();
+        let dock = self.dock.clone();
+        let handle = window.window_handle();
+
+        cx.spawn(async move |_this, cx| match task.await {
+            Ok((announcement, local_path)) => {
+                cx.update_window(handle, |_, window, cx| {
+                    let checkouts = CheckoutsStore::global(cx);
+                    checkouts.update(cx, |store, cx| {
+                        store.record(local_path.clone(), announcement.addr(), cx);
+                    });
+                    cx.open_with_system(&local_path);
+                    open_repo_panel(&dock, &announcement.addr(), Some(&announcement), window, cx);
+                    close_global(cx);
+                })
+                .ok();
+            }
+            Err(error) => {
+                state.update(cx, |state, cx| {
+                    state.fail(error.to_string());
+                    cx.notify();
+                });
+            }
+        })
+        .detach();
+    }
+
+    fn fail(&mut self, message: impl Into<gpui::SharedString>, cx: &mut Context<Self>) {
+        self.state.update(cx, |state, cx| {
+            state.fail(message);
+            cx.notify();
+        });
+    }
+}
+
+impl Render for CreateRepoDialog {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let name_input = self.name_input.clone();
+        let desc_input = self.desc_input.clone();
+        let folder_input = self.folder_input.clone();
+        let relay_input = self.relay_input.clone();
+        let state = self.state.clone();
+        let grasp_state = self.grasp_state.clone();
+        let action_state = state.clone();
+        let this = cx.entity().downgrade();
+
+        Dialog::new("create-repo-dialog")
+            .open(true)
+            .min_width(px(520.))
+            .on_change(|open, _, cx| {
+                if !open {
+                    close_global(cx);
+                }
+            })
+            .title("Create repository")
+            .content(move |_window, cx| {
+                let progress = state.read(cx);
+
+                v_flex()
+                    .gap_3()
+                    .child(
+                        div()
+                            .text_sm()
+                            .text_color(cx.theme().colors.muted_foreground)
+                            .child("Publish a new repository to your grasp servers."),
+                    )
+                    .child(
+                        Field::new("repo-name", "Repository name")
+                            .description("Max 100 characters")
+                            .child(Input::new("repo-name-input", name_input.clone())),
+                    )
+                    .child(
+                        Field::new("repo-description", "Description").child(
+                            Input::new("repo-description-input", desc_input.clone()).rows(3),
+                        ),
+                    )
+                    .child(
+                        Field::new("repo-folder", "Folder")
+                            .description("Where the repository's working copy is created.")
+                            .child(
+                                h_flex()
+                                    .gap_1()
+                                    .items_center()
+                                    .child(div().flex_1().child(Input::new(
+                                        "repo-folder-input",
+                                        folder_input.clone(),
+                                    )))
+                                    .child(
+                                        Button::new("choose-folder")
+                                            .icon(Icon::named(IconRole::Folder))
+                                            .variant(ButtonVariant::Ghost)
+                                            .tooltip(Tooltip::text("Choose folder"))
+                                            .on_click({
+                                                let folder_input = folder_input.clone();
+                                                move |_, window, cx| {
+                                                    choose_folder(&folder_input, window, cx);
+                                                }
+                                            }),
+                                    ),
+                            ),
+                    )
+                    .child(grasp_servers_field(&grasp_state, &relay_input, cx))
+                    .when_some(push_steps_row(&progress.push_steps, cx), |el, steps| {
+                        el.child(steps)
+                    })
+                    .when_some(error_row(&progress.error, cx), |el, error| el.child(error))
+                    .into_any_element()
+            })
+            .actions(move |_, cx| {
+                let busy = action_state.read(cx).busy;
+                let this = this.clone();
+
+                let create: AnyElement = Button::new("create-repository")
+                    .label("Create repository")
+                    .icon(Icon::named(IconRole::Plus))
+                    .loading(busy)
+                    .disabled(busy)
+                    .on_click(move |_, window, cx| {
+                        crate::shared::log_dropped(
+                            this.update(cx, |this, cx| this.create(window, cx)),
+                        );
+                    })
+                    .into_any_element();
+
+                vec![create]
+            })
+    }
+}
+
+fn choose_folder(folder_input: &Entity<InputState>, window: &mut Window, cx: &mut App) {
+    let store = SettingsStore::global(cx);
+    let prompt = cx.prompt_for_paths(PathPromptOptions {
+        files: false,
+        directories: true,
+        multiple: false,
+        prompt: Some("Choose folder".into()),
+    });
+    let handle = window.window_handle();
+    let folder_input = folder_input.clone();
+
+    cx.spawn(async move |cx| {
+        if let Ok(Ok(Some(mut paths))) = prompt.await
+            && let Some(path) = paths.pop()
+            && let Err(error) = cx.update_window(handle, |_, window, cx| {
+                let text = path.to_string_lossy().to_string();
+                store.update(cx, |store, cx| {
+                    store.edit(
+                        |settings| {
+                            settings.create_repository.default_folder = Some(path.clone());
+                        },
+                        cx,
+                    );
+                });
+                folder_input.update(cx, |input, cx| input.set_value(text, window, cx));
+            })
+        {
+            log::warn!("failed to apply selected folder: {error}");
+        }
+    })
+    .detach();
+}
+
+/// Opens the create-repository form.
+pub fn open(dock: WeakEntity<DockState>, window: &mut Window, cx: &mut App) {
+    open_global(CreateRepoDialog::new(dock, window, cx), cx);
+}

crates/signed_app/src/repo/dialogs/grasp_servers.rs

@@ -0,0 +1,271 @@
+use gpui::prelude::FluentBuilder as _;
+use gpui::{
+    AnyElement, App, AppContext as _, Entity, IntoElement, ParentElement as _, SharedString,
+    Styled as _, Window, div,
+};
+use gpui_native_kit::button::{Button, ButtonVariant};
+use gpui_native_kit::common::{h_flex, v_flex};
+use gpui_native_kit::icons::{Icon, IconRole};
+use gpui_native_kit::input::{Input, InputState};
+use gpui_native_kit::switch::Switch;
+use gpui_native_kit::theme::ActiveTheme as _;
+use gpui_native_kit::tooltip::Tooltip;
+use nostr::prelude::RelayUrl;
+use settings::{DEFAULT_GRASP_SERVERS, GraspServersSettings};
+use signed_state::Backend;
+
+/// State of the grasp-server section of a publish dialog, so async results can be rendered.
+#[derive(Default)]
+pub struct GraspServersState {
+    /// Set while the user's kind `10317` grasp list loads.
+    pub loading_servers: bool,
+    pub grasp_servers: Vec<RelayUrl>,
+    pub servers_enabled: bool,
+    /// Error from the last grasp-server edit, such as an invalid relay URL.
+    pub error: Option<SharedString>,
+}
+
+impl GraspServersState {
+    /// Defaults used until the user's grasp list loads and replaces them.
+    pub fn new_default(settings: &GraspServersSettings) -> Self {
+        let urls: Vec<String> = if settings.default_servers.is_empty() {
+            DEFAULT_GRASP_SERVERS
+                .iter()
+                .map(|url| (*url).to_owned())
+                .collect()
+        } else {
+            settings.default_servers.clone()
+        };
+        Self {
+            loading_servers: true,
+            servers_enabled: false,
+            grasp_servers: urls
+                .iter()
+                .filter_map(|url| RelayUrl::parse(url).ok())
+                .collect(),
+            ..Default::default()
+        }
+    }
+}
+
+/// The Grasp servers section shared by the publish dialogs.
+pub fn grasp_servers_field(
+    state: &Entity<GraspServersState>,
+    relay_input: &Entity<InputState>,
+    cx: &App,
+) -> AnyElement {
+    let state = state.clone();
+    let relay_input = relay_input.clone();
+
+    let servers = state.read(cx).grasp_servers.clone();
+    let loading_servers = state.read(cx).loading_servers;
+    let servers_enabled = state.read(cx).servers_enabled;
+    let error = state.read(cx).error.clone();
+
+    let add_state = state.clone();
+    let add_input = relay_input.clone();
+    let toggle_state = state.clone();
+
+    v_flex()
+        .gap_2()
+        .child(
+            h_flex()
+                .justify_between()
+                .items_center()
+                .child(div().text_sm().child("Grasp servers"))
+                .child(
+                    Switch::new("grasp-servers-toggle")
+                        .checked(servers_enabled)
+                        .on_change(move |checked, _, cx| {
+                            toggle_state.update(cx, |state, cx| {
+                                state.servers_enabled = checked;
+                                cx.notify();
+                            });
+                        }),
+                ),
+        )
+        .when(servers_enabled, |section| {
+            section
+                .child(
+                    div()
+                        .text_xs()
+                        .text_color(cx.theme().colors.muted_foreground)
+                        .child("Where the repository is hosted"),
+                )
+                .child(
+                    v_flex().gap_1().children(
+                        servers
+                            .iter()
+                            .enumerate()
+                            .map(|(ix, relay)| render_server_row(ix, relay, state.clone(), cx)),
+                    ),
+                )
+                .child(
+                    h_flex()
+                        .gap_1()
+                        .items_center()
+                        .child(
+                            div()
+                                .flex_1()
+                                .child(Input::new("grasp-relay-input", relay_input.clone())),
+                        )
+                        .child(
+                            Button::new("add-relay")
+                                .icon(Icon::named(IconRole::Plus))
+                                .variant(ButtonVariant::Ghost)
+                                .tooltip(Tooltip::text("Add grasp server"))
+                                .on_click(move |_, window, cx| {
+                                    add_relay(&add_state, &add_input, window, cx);
+                                }),
+                        ),
+                )
+                .when(loading_servers, |section| {
+                    section.child(
+                        div()
+                            .text_xs()
+                            .text_color(cx.theme().colors.muted_foreground)
+                            .child("Loading your grasp servers..."),
+                    )
+                })
+                .when_some(error, |section, error| {
+                    section.child(
+                        div()
+                            .text_xs()
+                            .text_color(cx.theme().ramps.destructive.base)
+                            .child(error),
+                    )
+                })
+        })
+        .into_any_element()
+}
+
+fn render_server_row(
+    ix: usize,
+    relay: &RelayUrl,
+    state: Entity<GraspServersState>,
+    cx: &App,
+) -> AnyElement {
+    h_flex()
+        .w_full()
+        .gap_1()
+        .items_center()
+        .child(
+            div()
+                .flex_1()
+                .h_8()
+                .px_2()
+                .bg(cx.theme().colors.muted)
+                .text_color(cx.theme().colors.muted_foreground)
+                .text_sm()
+                .rounded(cx.theme().radius.control)
+                .child(server_host(relay)),
+        )
+        .child(
+            Button::new(SharedString::from(format!("remove-relay:{ix}")))
+                .icon(Icon::named(IconRole::Close))
+                .variant(ButtonVariant::Ghost)
+                .tooltip(Tooltip::text("Remove"))
+                .on_click(move |_, _, cx| {
+                    state.update(cx, |state, cx| {
+                        if ix < state.grasp_servers.len() {
+                            state.grasp_servers.remove(ix);
+                            cx.notify();
+                        }
+                    });
+                }),
+        )
+        .into_any_element()
+}
+
+/// Accepts a bare host as well as a full URL.
+fn add_relay(
+    state: &Entity<GraspServersState>,
+    input: &Entity<InputState>,
+    window: &mut Window,
+    cx: &mut App,
+) {
+    let value = input.read(cx).value().trim().to_owned();
+    if value.is_empty() {
+        return;
+    }
+
+    match normalize_server(&value) {
+        Some((_, relay)) => {
+            state.update(cx, |state, cx| {
+                state.error = None;
+                if !state.grasp_servers.contains(&relay) {
+                    state.grasp_servers.push(relay);
+                }
+                cx.notify();
+            });
+            input.update(cx, |input, cx| input.set_value("", window, cx));
+        }
+        None => {
+            state.update(cx, |state, cx| {
+                state.error = Some(format!("Invalid grasp server URL: {value}").into());
+                cx.notify();
+            });
+        }
+    }
+}
+
+/// Loads the user's kind `10317` grasp list from the local database.
+pub fn load_user_grasp_servers(
+    state: Entity<GraspServersState>,
+    window: &mut Window,
+    cx: &mut App,
+) {
+    let backend = Backend::global(cx);
+    let (user, client) = {
+        let backend = backend.read(cx);
+        (backend.current_user(), backend.client())
+    };
+
+    let Some(user) = user else {
+        state.update(cx, |state, _| state.loading_servers = false);
+        return;
+    };
+
+    let task =
+        cx.background_spawn(
+            async move { signed_state::user_grasp_list_servers(&client, user).await },
+        );
+    let handle = window.window_handle();
+
+    cx.spawn(async move |cx| {
+        let result = task.await;
+
+        if let Err(error) = cx.update_window(handle, |_, _window, cx| {
+            state.update(cx, |state, cx| {
+                state.loading_servers = false;
+                if let Ok(servers) = result
+                    && !servers.is_empty()
+                {
+                    state.grasp_servers = servers;
+                }
+                cx.notify();
+            });
+        }) {
+            log::warn!("failed to apply grasp servers: {error}");
+        }
+    })
+    .detach();
+}
+
+/// Normalize a user-typed grasp server, adding a `wss://` scheme when none is given.
+pub fn normalize_server(input: &str) -> Option<(String, RelayUrl)> {
+    let text = if input.contains("://") {
+        input.to_owned()
+    } else {
+        format!("wss://{input}")
+    };
+    RelayUrl::parse(&text).ok().map(|relay| (text, relay))
+}
+
+/// The host of a relay URL, which is what the server lists show; the scheme is implied.
+pub fn server_host(relay: &RelayUrl) -> SharedString {
+    relay
+        .domain()
+        .map(SharedString::from)
+        .unwrap_or_else(|| SharedString::from(relay.to_string()))
+}

crates/signed_app/src/repo/dialogs/init.rs

@@ -0,0 +1,291 @@
+use std::path::PathBuf;
+
+use gpui::prelude::FluentBuilder as _;
+use gpui::{
+    AnyElement, App, AppContext as _, Context, Entity, IntoElement, ParentElement as _, Render,
+    SharedString, Styled as _, WeakEntity, Window, div, px,
+};
+use gpui_native_kit::button::Button;
+use gpui_native_kit::common::v_flex;
+use gpui_native_kit::dialog::Dialog;
+use gpui_native_kit::field::Field;
+use gpui_native_kit::icons::{Icon, IconRole};
+use gpui_native_kit::input::{Input, InputState};
+use gpui_native_kit::select::{Select, SelectOption};
+use gpui_native_kit::theme::ActiveTheme as _;
+use settings::SettingsStore;
+use signed_core::RepoAddr;
+use signed_git::Repo;
+use signed_state::Backend;
+
+use super::grasp_servers::{GraspServersState, grasp_servers_field, load_user_grasp_servers};
+use crate::repo::RepoDetailView;
+use crate::shared::dialogs::{close_global, open_global};
+use crate::shared::progress::{DialogProgress, error_row, push_steps_row};
+
+pub struct InitRepoDialog {
+    local_path: PathBuf,
+    name_input: Entity<InputState>,
+    desc_input: Entity<InputState>,
+    relay_input: Entity<InputState>,
+    state: Entity<DialogProgress>,
+    grasp_state: Entity<GraspServersState>,
+    branches: Vec<SharedString>,
+    selected_branch: Option<SharedString>,
+    view: WeakEntity<RepoDetailView>,
+}
+
+impl InitRepoDialog {
+    pub fn new(
+        local_path: PathBuf,
+        view: WeakEntity<RepoDetailView>,
+        window: &mut Window,
+        cx: &mut App,
+    ) -> Entity<Self> {
+        let default_name = local_path
+            .file_name()
+            .map(|name| name.to_string_lossy().into_owned())
+            .unwrap_or_default();
+        let grasp_settings = SettingsStore::global(cx)
+            .read(cx)
+            .settings()
+            .grasp_servers
+            .clone();
+
+        let state = cx.new(|_| DialogProgress::default());
+        let grasp_state = cx.new(|_| GraspServersState::new_default(&grasp_settings));
+
+        let name_input = InputState::builder()
+            .text(default_name)
+            .read_only()
+            .build(cx);
+
+        let desc_input = InputState::builder().multiline().build(cx);
+        let relay_input = InputState::new(cx);
+
+        load_user_grasp_servers(grasp_state.clone(), window, cx);
+
+        let dialog = cx.new(|_| Self {
+            local_path,
+            name_input,
+            desc_input,
+            relay_input,
+            state,
+            grasp_state,
+            branches: Vec::new(),
+            selected_branch: None,
+            view,
+        });
+
+        load_branches(dialog.clone(), cx);
+        dialog
+    }
+
+    fn init_repository(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        if self.state.read(cx).busy {
+            return;
+        }
+
+        let name = self.name_input.read(cx).value().trim().to_owned();
+        let description = self.desc_input.read(cx).value().trim().to_owned();
+        let servers = self.grasp_state.read(cx).grasp_servers.clone();
+        let default_branch = self
+            .selected_branch
+            .as_ref()
+            .map(|branch| branch.trim().to_owned())
+            .filter(|branch| !branch.is_empty());
+
+        if name.is_empty() {
+            self.fail("Repository name is required", cx);
+            return;
+        }
+        if servers.is_empty() {
+            self.fail("Add at least one grasp server", cx);
+            return;
+        }
+
+        let backend = Backend::global(cx);
+        let Some(user) = backend.read(cx).current_user() else {
+            self.fail("Sign in to publish a repository", cx);
+            return;
+        };
+
+        let addr = RepoAddr::new(user, RepoAddr::identifier_from_name(&name));
+        self.state.update(cx, |state, cx| {
+            state.begin_push(addr, cx);
+            cx.notify();
+        });
+
+        let local_path = self.local_path.clone();
+        let task = backend.update(cx, |backend, cx| {
+            backend.publish_local_repo(local_path, &name, &description, servers, default_branch, cx)
+        });
+        let state = self.state.clone();
+        let view = self.view.clone();
+        let handle = window.window_handle();
+
+        cx.spawn(async move |_this, cx| match task.await {
+            Ok(announcement) => {
+                cx.update_window(handle, |_, _window, cx| {
+                    close_global(cx);
+                    if let Some(view) = view.upgrade() {
+                        view.update(cx, |this, cx| this.apply_announcement(announcement, cx));
+                    }
+                })
+                .ok();
+            }
+            Err(error) => {
+                state.update(cx, |state, cx| {
+                    state.fail(error.to_string());
+                    cx.notify();
+                });
+            }
+        })
+        .detach();
+    }
+
+    fn fail(&mut self, message: impl Into<SharedString>, cx: &mut Context<Self>) {
+        self.state.update(cx, |state, cx| {
+            state.fail(message);
+            cx.notify();
+        });
+    }
+}
+
+impl Render for InitRepoDialog {
+    fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
+        let name_input = self.name_input.clone();
+        let desc_input = self.desc_input.clone();
+        let relay_input = self.relay_input.clone();
+        let state = self.state.clone();
+        let grasp_state = self.grasp_state.clone();
+        let action_state = state.clone();
+        let this = cx.entity().downgrade();
+        let folder = self.local_path.display().to_string();
+        let branches = self.branches.clone();
+        let selected_branch = self.selected_branch.clone();
+
+        Dialog::new("init-repo-dialog")
+            .open(true)
+            .min_width(px(520.))
+            .on_change(|open, _, cx| {
+                if !open {
+                    close_global(cx);
+                }
+            })
+            .title("Initialize repository")
+            .content(move |_, cx| {
+                let progress = state.read(cx);
+
+                v_flex()
+                    .gap_3()
+                    .child(
+                        div()
+                            .text_sm()
+                            .text_color(cx.theme().colors.muted_foreground)
+                            .child("Publish this local repository to Nostr."),
+                    )
+                    .child(
+                        Field::new("init-name", "Repository name")
+                            .description("Max 100 characters")
+                            .child(Input::new("init-name-input", name_input.clone())),
+                    )
+                    .child(
+                        Field::new("init-description", "Description").child(
+                            Input::new("init-description-input", desc_input.clone()).rows(3),
+                        ),
+                    )
+                    .child(
+                        Field::new("init-folder", "Folder")
+                            .description("The local repository being published")
+                            .child(
+                                div()
+                                    .h_8()
+                                    .w_full()
+                                    .px_2()
+                                    .bg(cx.theme().colors.muted)
+                                    .text_sm()
+                                    .text_color(cx.theme().colors.muted_foreground)
+                                    .rounded(cx.theme().radius.control)
+                                    .child(folder.clone()),
+                            ),
+                    )
+                    .child(
+                        Field::new("init-branch", "Default branch")
+                            .description("The local branch to announce as the default")
+                            .child(
+                                Select::new("init-branch-select")
+                                    .options(
+                                        branches
+                                            .iter()
+                                            .cloned()
+                                            .map(|branch| SelectOption::new(branch.clone(), branch))
+                                            .collect::<Vec<_>>(),
+                                    )
+                                    .selected(selected_branch.clone())
+                                    .placeholder("Select branch"),
+                            ),
+                    )
+                    .child(grasp_servers_field(&grasp_state, &relay_input, cx))
+                    .when_some(push_steps_row(&progress.push_steps, cx), |el, steps| {
+                        el.child(steps)
+                    })
+                    .when_some(error_row(&progress.error, cx), |el, error| el.child(error))
+                    .into_any_element()
+            })
+            .actions(move |_, cx| {
+                let busy = action_state.read(cx).busy;
+                let this = this.clone();
+
+                let init: AnyElement = Button::new("initialize-repository")
+                    .label("Initialize")
+                    .icon(Icon::named(IconRole::Plus))
+                    .loading(busy)
+                    .disabled(busy)
+                    .on_click(move |_, window, cx| {
+                        crate::shared::log_dropped(
+                            this.update(cx, |this, cx| this.init_repository(window, cx)),
+                        );
+                    })
+                    .into_any_element();
+
+                vec![init]
+            })
+    }
+}
+
+fn load_branches(dialog: Entity<InitRepoDialog>, cx: &mut App) {
+    let local_path = dialog.read(cx).local_path.clone();
+
+    cx.spawn(async move |cx| {
+        let loaded = cx
+            .background_spawn(async move {
+                let repo = Repo::open(&local_path)?;
+                let current: Option<SharedString> = repo.current_branch().map(Into::into);
+                Ok::<_, anyhow::Error>((repo.branches()?, current))
+            })
+            .await;
+
+        let Ok((branches, current)) = loaded else {
+            log::warn!("failed to list branches for the default branch selector");
+            return;
+        };
+
+        dialog.update(cx, |dialog, cx| {
+            dialog.branches = branches.into_iter().map(Into::into).collect();
+            dialog.selected_branch = current;
+            cx.notify();
+        });
+    })
+    .detach();
+}
+
+/// Opens the initialize form for `local_path`.
+pub fn open(
+    local_path: PathBuf,
+    view: WeakEntity<RepoDetailView>,
+    window: &mut Window,
+    cx: &mut App,
+) {
+    open_global(InitRepoDialog::new(local_path, view, window, cx), cx);
+}

crates/signed_app/src/repo/dialogs/mod.rs

@@ -0,0 +1,5 @@
+pub mod about;
+pub mod create;
+pub mod grasp_servers;
+pub mod init;
+pub mod reset;

crates/signed_app/src/repo/dialogs/reset.rs

@@ -0,0 +1,99 @@
+use gpui::{
+    AnyElement, App, AppContext as _, Context, Entity, IntoElement, ParentElement as _, Render,
+    Styled as _, Window, div, px,
+};
+use gpui_native_kit::button::{Button, ButtonVariant};
+use gpui_native_kit::common::v_flex;
+use gpui_native_kit::dialog::Dialog;
+use gpui_native_kit::theme::ActiveTheme as _;
+use signed_state::RepoStore;
+
+use crate::shared::dialogs::{close_global, open_global};
+
+pub struct ResetRemoteDialog {
+    store: Entity<RepoStore>,
+    deleted: Vec<String>,
+}
+
+impl ResetRemoteDialog {
+    pub fn new(store: Entity<RepoStore>, deleted: Vec<String>, cx: &mut App) -> Entity<Self> {
+        cx.new(|_| Self { store, deleted })
+    }
+}
+
+impl Render for ResetRemoteDialog {
+    fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
+        let deleted = self.deleted.clone();
+        let store = self.store.clone();
+
+        Dialog::new("reset-remote-dialog")
+            .open(true)
+            .min_width(px(480.))
+            .on_change(|open, _, cx| {
+                if !open {
+                    close_global(cx);
+                }
+            })
+            .title("Reset remote to local")
+            .content(move |_, cx| {
+                v_flex()
+                    .gap_2()
+                    .child(
+                        div()
+                            .text_sm()
+                            .text_color(cx.theme().colors.muted_foreground)
+                            .child(
+                                "Grasp servers are overwritten to match the local mirror. Refs that do not exist locally are deleted from the servers. This cannot be undone.",
+                            ),
+                    )
+                    .child(if deleted.is_empty() {
+                        div()
+                            .text_sm()
+                            .text_color(cx.theme().colors.muted_foreground)
+                            .child("No server refs will be deleted.")
+                            .into_any_element()
+                    } else {
+                        v_flex()
+                            .gap_1()
+                            .children(deleted.iter().map(|name| {
+                                div()
+                                    .text_sm()
+                                    .font_family(cx.theme().mono_font)
+                                    .child(name.clone())
+                            }))
+                            .into_any_element()
+                    })
+                    .into_any_element()
+            })
+            .actions(move |_, _| {
+                let store = store.clone();
+                let cancel: AnyElement = Button::new("cancel-reset-remote")
+                    .label("Cancel")
+                    .variant(ButtonVariant::Secondary)
+                    .on_click(|_, _, cx| close_global(cx))
+                    .into_any_element();
+
+                let confirm: AnyElement = Button::new("confirm-reset-remote")
+                    .label("Reset remote")
+                    .variant(ButtonVariant::Destructive)
+                    .on_click(move |_, _, cx| {
+                        let task = store.update(cx, |store, cx| store.reset_repository(cx));
+                        cx.spawn(async move |_cx| {
+                            if let Err(error) = task.await {
+                                log::error!("failed to reset remote: {error:#}");
+                            }
+                        })
+                        .detach();
+                        close_global(cx);
+                    })
+                    .into_any_element();
+
+                vec![cancel, confirm]
+            })
+    }
+}
+
+/// Opens the reset confirmation listing the refs the reset deletes.
+pub fn open(store: Entity<RepoStore>, deleted: Vec<String>, cx: &mut App) {
+    open_global(ResetRemoteDialog::new(store, deleted, cx), cx);
+}

crates/signed_app/src/repo/files.rs

@@ -2,19 +2,22 @@ use std::collections::{HashMap, HashSet, VecDeque};
 use std::path::{Component, Path, PathBuf};
 
 use anyhow::Error;
-use gpui::prelude::*;
-use gpui::{AnyElement, Context, Entity, Render, SharedString, Task, WeakEntity, Window, div, px};
-use gpui_component::button::{Button, ButtonVariants};
-use gpui_component::input::{Editor, EditorState};
-use gpui_component::list::ListItem;
-use gpui_component::spinner::Spinner;
-use gpui_component::text::{TextView, TextViewState};
-use gpui_component::tree::{TreeEntry, TreeState, tree};
-use gpui_component::{ActiveTheme, Sizable, StyledExt, h_flex, v_flex};
-use signed_git::{FileCommit, WorktreeSnapshot};
-use signed_ui::{placeholder, tree_row};
+use gpui::prelude::FluentBuilder as _;
+use gpui::{
+    AnyElement, AppContext as _, Context, Entity, IntoElement, ParentElement as _, Render,
+    SharedString, Styled as _, Task, WeakEntity, Window, div, px,
+};
+use gpui_native_kit::common::{h_flex, v_flex};
+use gpui_native_kit::data::tree::{Tree, TreeItem};
+use gpui_native_kit::editor::code::CodeViewState;
+use gpui_native_kit::editor::markdown::MarkdownViewState;
+use gpui_native_kit::icons::{Icon, IconRole};
+use gpui_native_kit::theme::ActiveTheme as _;
+use signed_git::{FileCommit, Repo, WorktreeSnapshot};
 
-use crate::views::tree::{TreeItemSeed, tree_items};
+use super::helpers::{code_language, is_markdown_path, preview_spinner, source_hash};
+use crate::shared::tree::{TreeItemSeed, TreeRow, collect_expanded, flatten};
+use crate::shared::widgets::empty_state;
 
 const TREE_WIDTH: f32 = 240.;
 const MAX_PREVIEW_BYTES: usize = 1024 * 1024;
@@ -31,7 +34,7 @@ enum FileContent {
 struct MarkdownView {
     /// `None` means the repository README.
     path: Option<SharedString>,
-    state: Entity<TextViewState>,
+    state: Entity<MarkdownViewState>,
     /// Hash of the source, so the same document is not re-parsed on a refresh.
     source_hash: u64,
 }
@@ -39,13 +42,16 @@ struct MarkdownView {
 struct CodeView {
     /// Source path, relative to the worktree root.
     path: SharedString,
-    state: Entity<EditorState>,
+    state: Entity<CodeViewState>,
     /// Hash of the source, so the same document is not re-parsed on a refresh.
     source_hash: u64,
 }
 
-pub(super) struct RepoFilesView {
-    tree_state: Entity<TreeState>,
+pub struct RepoFilesView {
+    seeds: Vec<TreeItemSeed>,
+    expanded: HashSet<String>,
+    rows: Vec<TreeRow>,
+    selected_index: Option<usize>,
     worktree: Option<PathBuf>,
     worktree_paths: Vec<String>,
     md: Option<MarkdownView>,
@@ -63,9 +69,12 @@ pub(super) struct RepoFilesView {
 }
 
 impl RepoFilesView {
-    pub(super) fn new(cx: &mut Context<Self>) -> Self {
+    pub fn new(_cx: &mut Context<Self>) -> Self {
         Self {
-            tree_state: cx.new(|cx| TreeState::new(cx)),
+            seeds: Vec::new(),
+            expanded: HashSet::new(),
+            rows: Vec::new(),
+            selected_index: None,
             worktree: None,
             worktree_paths: Vec::new(),
             md: None,
@@ -83,26 +92,41 @@ impl RepoFilesView {
         }
     }
 
-    pub(super) fn set_worktree(&mut self, path: PathBuf) {
+    pub fn set_worktree(&mut self, path: PathBuf) {
         self.worktree = Some(path);
     }
 
-    pub(super) fn apply_entries(
+    pub fn apply_entries(
         &mut self,
         tree: Vec<TreeItemSeed>,
         paths: Vec<String>,
         cx: &mut Context<Self>,
     ) {
         self.worktree_paths = paths;
-        self.tree_state.update(cx, |state, cx| {
-            state.set_items(tree_items(tree, false), cx);
-        });
+        self.seeds = tree;
+        let folder_ids = collect_expanded(&self.seeds);
+        self.expanded.retain(|id| folder_ids.contains(id));
+        self.rebuild_rows();
+        cx.notify();
+    }
+
+    fn rebuild_rows(&mut self) {
+        self.rows = flatten(&self.seeds, &self.expanded);
+        self.selected_index = self
+            .selected_file
+            .as_ref()
+            .and_then(|path| self.rows.iter().position(|row| row.id == path.as_ref()));
+    }
+
+    fn toggle_folder(&mut self, id: &str) {
+        if !self.expanded.remove(id) {
+            self.expanded.insert(id.to_owned());
+        }
+        self.rebuild_rows();
     }
 
     /// Point the README pane at `path`/`bytes`, or clear it when absent.
-    ///
-    /// Returns whether the pane changed.
-    pub(super) fn set_readme(
+    pub fn set_readme(
         &mut self,
         path: Option<PathBuf>,
         bytes: Option<Vec<u8>>,
@@ -128,8 +152,9 @@ impl RepoFilesView {
     }
 
     /// Drop every cached preview and the README, e.g. on a branch switch.
-    pub(super) fn clear_previews(&mut self) {
+    pub fn clear_previews(&mut self) {
         self.selected_file = None;
+        self.selected_index = None;
         self.files.clear();
         self.file_order.clear();
         self.preview_bytes = 0;
@@ -143,13 +168,7 @@ impl RepoFilesView {
     }
 
     /// Refresh after the mirror caught up with the remote.
-    ///
-    /// Unlike a branch switch this keeps the selection and previews: it rebuilds
-    /// the tree, drops previews of files the refresh removed and re-renders the
-    /// README when it is on screen.
-    ///
-    /// Returns whether the tree, a preview or the README changed.
-    pub(super) fn catch_up(
+    pub fn catch_up(
         &mut self,
         snapshot: &WorktreeSnapshot,
         tree: Vec<TreeItemSeed>,
@@ -170,14 +189,12 @@ impl RepoFilesView {
             .collect();
 
         let mut previewed: Vec<String> = Vec::new();
-
         previewed.extend(self.files.keys().cloned());
         previewed.extend(self.selected_file.clone().map(|path| path.to_string()));
 
         if let Some(path) = self.md.as_ref().and_then(|md| md.path.clone()) {
             previewed.push(path.to_string());
         }
-
         if let Some(path) = self.code.as_ref().map(|code| code.path.clone()) {
             previewed.push(path.to_string());
         }
@@ -206,40 +223,88 @@ impl RepoFilesView {
             .unwrap_or_else(|| "Overview".into())
     }
 
-    fn render_tree_item(
-        ix: usize,
-        entry: &TreeEntry,
-        selected: bool,
-        view: &WeakEntity<Self>,
-    ) -> ListItem {
-        let view = view.clone();
-        let id = entry.item().id.clone();
+    fn activate_row(&mut self, index: usize, window: &mut Window, cx: &mut Context<Self>) {
+        let Some(row) = self.rows.get(index) else {
+            return;
+        };
+        let id = row.id.clone();
+        let expandable = row.expandable;
 
-        tree_row(ix, entry, selected, move |window, cx| {
-            if let Some(view) = view.upgrade() {
-                view.update(cx, |this, cx| this.open_file(&id, window, cx));
-            }
-        })
+        self.selected_index = Some(index);
+
+        if expandable {
+            self.toggle_folder(&id);
+        } else {
+            self.open_file(&id, window, cx);
+        }
+        cx.notify();
     }
 
     fn render_tree_column(
-        tree_state: Entity<TreeState>,
+        &self,
+        rows: Vec<TreeRow>,
+        selected: Option<usize>,
         view: WeakEntity<Self>,
         cx: &mut Context<Self>,
     ) -> impl IntoElement {
+        let change_view = view.clone();
+        let disclosure_view = view;
+
         v_flex()
             .h_full()
             .w(px(TREE_WIDTH))
             .p_2()
             .flex_none()
             .border_r_1()
-            .border_color(cx.theme().border)
-            .child(div().flex_1().min_h_0().child(tree(
-                &tree_state,
-                move |ix, entry, selected, _window, _cx| {
-                    Self::render_tree_item(ix, entry, selected, &view)
-                },
-            )))
+            .border_color(cx.theme().colors.border)
+            .child(
+                div().flex_1().min_h_0().child(
+                    Tree::new("repo-tree")
+                        .selected(selected)
+                        .items(move |_, _| {
+                            rows.iter()
+                                .map(|row| {
+                                    let item = TreeItem::new(row.id.clone(), row.label.clone())
+                                        .depth(row.depth)
+                                        .expandable(row.expandable)
+                                        .expanded(row.expanded);
+
+                                    if row.expandable {
+                                        item.icon(Icon::named(IconRole::Folder))
+                                    } else {
+                                        item
+                                    }
+                                })
+                                .collect()
+                        })
+                        .on_change({
+                            let view = change_view;
+                            move |index, window, cx| {
+                                if let Some(index) = index
+                                    && let Err(error) = view.update(cx, |this, cx| {
+                                        this.activate_row(index, window, cx);
+                                    })
+                                {
+                                    log::warn!("failed to activate tree row: {error}");
+                                }
+                            }
+                        })
+                        .on_disclosure({
+                            let view = disclosure_view;
+                            move |index, _, cx| {
+                                if let Err(error) = view.update(cx, |this, cx| {
+                                    let id = this.rows.get(index).map(|row| row.id.clone());
+                                    if let Some(id) = id {
+                                        this.toggle_folder(&id);
+                                        cx.notify();
+                                    }
+                                }) {
+                                    log::warn!("failed to toggle folder: {error}");
+                                }
+                            }
+                        }),
+                ),
+            )
     }
 
     fn render_content_column(
@@ -251,23 +316,22 @@ impl RepoFilesView {
             match self.files.get(path.as_ref()) {
                 Some(FileContent::Text(_)) => {
                     if is_markdown_path(path.as_ref()) {
-                        self.markdown_element(Some(path.as_ref()), cx)
+                        self.markdown_element(Some(path.as_ref()))
                     } else {
-                        self.code_element(path.as_ref(), cx)
+                        self.code_element(path.as_ref())
                     }
                 }
-                Some(FileContent::Binary) => placeholder("Binary file - preview not supported", cx),
-                Some(FileContent::TooLarge) => placeholder("File is too large to preview", cx),
-                Some(FileContent::Failed(message)) => placeholder(message, cx),
+                Some(FileContent::Binary) => empty_state("Binary file - preview not supported"),
+                Some(FileContent::TooLarge) => empty_state("File is too large to preview"),
+                Some(FileContent::Failed(message)) => empty_state(message),
                 None => preview_spinner(),
             }
         } else if self.readme_name.is_some() {
-            self.markdown_element(None, cx)
+            self.markdown_element(None)
         } else {
-            placeholder("No README found", cx)
+            empty_state("No README found")
         };
 
-        // Latest commit for the current pane, the selected file or the README.
         let commit = match &self.selected_file {
             Some(path) => self.commits.get(path.as_ref()),
             None => self
@@ -285,14 +349,14 @@ impl RepoFilesView {
                     .px_3()
                     .h_9()
                     .gap_2()
-                    .bg(cx.theme().muted)
-                    .border_b(px(1.))
-                    .border_color(cx.theme().border)
-                    .text_color(cx.theme().muted_foreground)
+                    .bg(cx.theme().colors.muted)
+                    .border_b_1()
+                    .border_color(cx.theme().colors.border)
+                    .text_color(cx.theme().colors.muted_foreground)
                     .child(
                         div()
                             .text_xs()
-                            .font_semibold()
+                            .font_weight(gpui::FontWeight::SEMIBOLD)
                             .text_ellipsis()
                             .whitespace_nowrap()
                             .child(pane_title),
@@ -303,10 +367,10 @@ impl RepoFilesView {
                                 .flex_1()
                                 .gap_1()
                                 .child(
-                                    Button::new("commit")
-                                        .xsmall()
-                                        .text()
-                                        .label(commit.id.clone()),
+                                    div()
+                                        .text_xs()
+                                        .font_family(cx.theme().mono_font)
+                                        .child(commit.id.clone()),
                                 )
                                 .child(
                                     div()
@@ -319,7 +383,7 @@ impl RepoFilesView {
                         )
                     }),
             )
-            .child(div().id("repo-content").flex_1().min_h_0().child(body))
+            .child(div().flex_1().min_h_0().child(body))
     }
 
     fn set_markdown(
@@ -337,9 +401,21 @@ impl RepoFilesView {
             return false;
         }
 
-        let state = cx.new(|cx| TextViewState::markdown("", cx));
-        state.update(cx, |state, cx| state.push_str(text, cx));
+        if let Some(md) = self.md.take()
+            && md.path == path
+        {
+            md.state.update(cx, |state, cx| {
+                state.set_source(text, cx);
+            });
+            self.md = Some(MarkdownView {
+                path,
+                state: md.state,
+                source_hash: hash,
+            });
+            return true;
+        }
 
+        let state = cx.new(|_| MarkdownViewState::new("repo-readme", text));
         self.md = Some(MarkdownView {
             path,
             state,
@@ -349,7 +425,7 @@ impl RepoFilesView {
         true
     }
 
-    fn markdown_element(&self, path: Option<&str>, _cx: &mut Context<Self>) -> AnyElement {
+    fn markdown_element(&self, path: Option<&str>) -> AnyElement {
         let Some(md) = &self.md else {
             return preview_spinner();
         };
@@ -363,22 +439,17 @@ impl RepoFilesView {
             return preview_spinner();
         }
 
-        TextView::new(&md.state)
-            .selectable(true)
-            .scrollable(true)
+        div()
             .p_4()
-            .text_sm()
+            .size_full()
+            .overflow_hidden()
+            .child(md.state.clone())
             .into_any_element()
     }
 
-    fn set_code(
-        &mut self,
-        path: SharedString,
-        text: &str,
-        window: &mut Window,
-        cx: &mut Context<Self>,
-    ) {
+    fn set_code(&mut self, path: SharedString, text: &str, cx: &mut Context<Self>) {
         let hash = source_hash(text);
+        let language = code_language(path.as_ref());
 
         if let Some(code) = &self.code
             && code.path == path
@@ -387,15 +458,21 @@ impl RepoFilesView {
             return;
         }
 
-        let language = code_language(path.as_ref()).unwrap_or("text");
-        let state = cx.new(|cx| {
-            EditorState::new(window, cx)
-                .language(language)
-                .default_value(text)
-                .line_number(true)
-                .folding(true)
-        });
+        if let Some(code) = self.code.take()
+            && code.path == path
+        {
+            code.state.update(cx, |state, cx| {
+                state.set_source(text, language, cx);
+            });
+            self.code = Some(CodeView {
+                path,
+                state: code.state,
+                source_hash: hash,
+            });
+            return;
+        }
 
+        let state = cx.new(|cx| CodeViewState::new("repo-code", text, language, cx));
         self.code = Some(CodeView {
             path,
             state,
@@ -403,7 +480,7 @@ impl RepoFilesView {
         });
     }
 
-    fn code_element(&self, path: &str, _cx: &mut Context<Self>) -> AnyElement {
+    fn code_element(&self, path: &str) -> AnyElement {
         let Some(code) = &self.code else {
             return preview_spinner();
         };
@@ -411,12 +488,10 @@ impl RepoFilesView {
             return preview_spinner();
         }
 
-        Editor::new(&code.state)
-            .readonly(true)
-            .bordered(false)
-            .rounded_none()
-            .h_full()
-            .text_sm()
+        div()
+            .size_full()
+            .overflow_hidden()
+            .child(code.state.clone())
             .into_any_element()
     }
 
@@ -431,7 +506,7 @@ impl RepoFilesView {
                         self.set_markdown(Some(path.into()), &text, cx);
                     }
                 } else if self.code.as_ref().map(|code| code.path.as_str()) != Some(path) {
-                    self.set_code(path.into(), &text, window, cx);
+                    self.set_code(path.into(), &text, cx);
                 }
             }
             cx.notify();
@@ -491,7 +566,7 @@ impl RepoFilesView {
                 })
                 .await;
 
-            this.update_in(cx, |this, window, cx| {
+            this.update_in(cx, |this, _window, cx| {
                 this.loading_files.remove(&path);
 
                 match content {
@@ -507,7 +582,7 @@ impl RepoFilesView {
                                 let same = this.code.as_ref().map(|code| code.path.as_str())
                                     == Some(path.as_str());
                                 if !same {
-                                    this.set_code(path.clone().into(), text, window, cx);
+                                    this.set_code(path.clone().into(), text, cx);
                                 }
                             }
                             this.preview_bytes += text.len();
@@ -540,11 +615,9 @@ impl RepoFilesView {
         if self.selected_file.as_deref() == Some(path) {
             self.selected_file = None;
         }
-
         if self.md.as_ref().and_then(|md| md.path.as_deref()) == Some(path) {
             self.md = None;
         }
-
         if self.code.as_ref().map(|code| code.path.as_ref()) == Some(path) {
             self.code = None;
         }
@@ -555,7 +628,9 @@ impl RepoFilesView {
             || self.preview_bytes > MAX_PREVIEW_CACHE_BYTES)
             && self.file_order.len() > 1
         {
-            let path = self.file_order.pop_front().expect("non-empty");
+            let Some(path) = self.file_order.pop_front() else {
+                break;
+            };
 
             if Some(path.as_str()) == self.selected_file.as_deref() {
                 self.file_order.push_back(path);
@@ -565,11 +640,9 @@ impl RepoFilesView {
             if let Some(FileContent::Text(text)) = self.files.remove(&path) {
                 self.preview_bytes -= text.len();
             }
-
-            if self.md.as_ref().map(|md| md.path.as_deref()) == Some(Some(path.as_str())) {
+            if self.md.as_ref().and_then(|md| md.path.as_deref()) == Some(path.as_str()) {
                 self.md = None;
             }
-
             if self
                 .code
                 .as_ref()
@@ -577,7 +650,6 @@ impl RepoFilesView {
             {
                 self.code = None;
             }
-
             self.commits.remove(&path);
         }
     }
@@ -605,15 +677,14 @@ impl RepoFilesView {
         };
 
         self.loading_commits = true;
-
         let paths = std::mem::take(&mut self.pending_commits);
 
         let task: Task<Result<(), Error>> = cx.spawn(async move |this, cx| {
             let rels: Vec<PathBuf> = paths.iter().map(PathBuf::from).collect();
             let result = cx
-                .background_spawn(
-                    async move { signed_git::worktree_last_commits(&worktree, &rels) },
-                )
+                .background_spawn(async move {
+                    Repo::open_cached(&worktree).and_then(|repo| repo.last_commits(&rels))
+                })
                 .await;
 
             this.update(cx, |this, cx| {
@@ -642,7 +713,8 @@ impl RepoFilesView {
 
 impl Render for RepoFilesView {
     fn render(&mut self, _window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
-        let tree_state = self.tree_state.clone();
+        let rows = self.rows.clone();
+        let selected = self.selected_index;
         let view = cx.entity().downgrade();
         let pane_title = self.pane_title();
 
@@ -650,88 +722,7 @@ impl Render for RepoFilesView {
             .flex_1()
             .w_full()
             .overflow_hidden()
-            .child(Self::render_tree_column(tree_state, view, cx))
+            .child(self.render_tree_column(rows, selected, view, cx))
             .child(self.render_content_column(pane_title, cx))
     }
 }
-
-fn source_hash(text: &str) -> u64 {
-    use std::hash::{Hash, Hasher};
-
-    let mut hasher = std::collections::hash_map::DefaultHasher::new();
-    text.hash(&mut hasher);
-    hasher.finish()
-}
-
-fn preview_spinner() -> AnyElement {
-    v_flex()
-        .size_full()
-        .items_center()
-        .justify_center()
-        .child(Spinner::new().small())
-        .into_any_element()
-}
-
-/// The markdown fence language for a file path, or `None` for plain text.
-fn code_language(path: &str) -> Option<&'static str> {
-    let name = Path::new(path)
-        .file_name()
-        .and_then(|name| name.to_str())
-        .unwrap_or_default();
-
-    // Some common files are recognized by name rather than extension.
-    match name {
-        "Makefile" | "makefile" => return Some("make"),
-        "CMakeLists.txt" => return Some("cmake"),
-        _ => {}
-    }
-
-    let ext = Path::new(path).extension()?.to_str()?.to_ascii_lowercase();
-    Some(match ext.as_str() {
-        "rs" => "rust",
-        "toml" => "toml",
-        "json" | "jsonc" => "json",
-        "py" => "python",
-        "js" | "mjs" | "cjs" => "javascript",
-        "ts" | "mts" | "cts" => "typescript",
-        "tsx" | "jsx" => "tsx",
-        "go" => "go",
-        "c" | "h" => "c",
-        "cc" | "cpp" | "cxx" | "hh" | "hpp" | "hxx" => "cpp",
-        "cs" => "csharp",
-        "java" => "java",
-        "kt" | "kts" | "ktm" => "kotlin",
-        "swift" => "swift",
-        "php" | "phtml" => "php",
-        "rb" => "ruby",
-        "sh" | "bash" | "zsh" => "bash",
-        "yml" | "yaml" => "yaml",
-        "css" | "scss" | "sass" => "css",
-        "html" | "htm" => "html",
-        "lua" => "lua",
-        "sql" => "sql",
-        "proto" | "protobuf" => "proto",
-        "cmake" => "cmake",
-        "zig" => "zig",
-        "ex" | "exs" => "elixir",
-        "graphql" | "gql" => "graphql",
-        "diff" | "patch" => "diff",
-        "svelte" => "svelte",
-        "astro" => "astro",
-        "scala" => "scala",
-        _ => return None,
-    })
-}
-
-/// Whether a file path has a markdown extension.
-fn is_markdown_path(path: &str) -> bool {
-    Path::new(path)
-        .extension()
-        .and_then(|ext| ext.to_str())
-        .is_some_and(|ext| {
-            matches!(
-                ext.to_ascii_lowercase().as_str(),
-                "md" | "markdown" | "mdown" | "mkdn"
-            )
-        })
-}

crates/signed_app/src/repo/header.rs

@@ -0,0 +1,667 @@
+use std::collections::HashSet;
+
+use assets::CustomIconName;
+use gpui::prelude::FluentBuilder as _;
+use gpui::{
+    AnyElement, AppContext as _, ClipboardItem, Context, IntoElement, ParentElement as _,
+    SharedString, Styled as _, Window, div, px,
+};
+use gpui_native_kit::avatar::Avatar;
+use gpui_native_kit::button::{Button, ButtonVariant};
+use gpui_native_kit::clipboard::ClipboardButton;
+use gpui_native_kit::common::{Sizable as _, h_flex, v_flex};
+use gpui_native_kit::data::tabs::{Tab, Tabs};
+use gpui_native_kit::dropdown_menu::DropdownMenu;
+use gpui_native_kit::icons::{Icon, IconRole};
+use gpui_native_kit::menu::MenuItem;
+use gpui_native_kit::popover::Popover;
+use gpui_native_kit::theme::ActiveTheme as _;
+use gpui_native_kit::tooltip::Tooltip;
+use signed_state::{Backend, Nip34Kind};
+
+use super::RepoDetailView;
+use super::actions;
+use super::dialogs;
+use super::helpers::{
+    ShareTargets, bound_repo_label, clone_group, fork_row, nostr_clone_url, repo_display_name,
+};
+use crate::issues::IssuesView;
+use crate::pull_requests::{NewPullRequestView, PullRequestsView, SendPatchView};
+
+impl RepoDetailView {
+    pub(super) fn open_upstream(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let Some(addr) = self
+            .announcement(cx)
+            .and_then(|announcement| announcement.upstream.as_ref())
+            .and_then(|upstream| upstream.addr.clone())
+        else {
+            return;
+        };
+
+        actions::open_repo_panel(&self.dock, &addr, None, window, cx);
+    }
+
+    /// Open the dialog that publishes the local repository to NIP-34.
+    fn open_init_dialog(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let Some(local_path) = self.store.read(cx).path.clone() else {
+            return;
+        };
+        dialogs::init::open(local_path, cx.entity().downgrade(), window, cx);
+    }
+
+    fn open_pulls(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let Some(addr) = self.store.read(cx).addr().cloned() else {
+            return;
+        };
+
+        let id = SharedString::from(format!("pulls:{addr}"));
+        let dock = self.dock.clone();
+        let dock_for_build = dock.clone();
+        let store = self.store.clone();
+
+        crate::shared::panels::open(
+            &dock,
+            id,
+            move |_, cx| {
+                cx.new(|cx| PullRequestsView::new(dock_for_build.clone(), store.clone(), cx))
+            },
+            window,
+            cx,
+        );
+    }
+
+    pub(super) fn open_new_pull_request(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let Some(addr) = self.store.read(cx).addr().cloned() else {
+            return;
+        };
+
+        let id = SharedString::from(format!("new-pr:{addr}"));
+        let dock = self.dock.clone();
+        let dock_for_build = dock.clone();
+        let store = self.store.clone();
+
+        crate::shared::panels::open(
+            &dock,
+            id.clone(),
+            move |window, cx| {
+                cx.new(|cx| {
+                    NewPullRequestView::new(
+                        dock_for_build.clone(),
+                        id.clone(),
+                        store.clone(),
+                        window,
+                        cx,
+                    )
+                })
+            },
+            window,
+            cx,
+        );
+    }
+
+    fn open_send_patch(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let Some(addr) = self.store.read(cx).addr().cloned() else {
+            return;
+        };
+
+        let id = SharedString::from(format!("send-patch:{addr}"));
+        let dock = self.dock.clone();
+        let dock_for_build = dock.clone();
+        let store = self.store.clone();
+
+        crate::shared::panels::open(
+            &dock,
+            id.clone(),
+            move |window, cx| {
+                cx.new(|cx| {
+                    SendPatchView::new(
+                        dock_for_build.clone(),
+                        id.clone(),
+                        store.clone(),
+                        window,
+                        cx,
+                    )
+                })
+            },
+            window,
+            cx,
+        );
+    }
+
+    fn open_issues(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let Some(addr) = self.store.read(cx).addr().cloned() else {
+            return;
+        };
+        let id = SharedString::from(format!("issues:{addr}"));
+        let dock = self.dock.clone();
+        let dock_for_build = dock.clone();
+        let store = self.store.clone();
+
+        crate::shared::panels::open(
+            &dock,
+            id,
+            move |_, cx| cx.new(|cx| IssuesView::new(dock_for_build.clone(), store.clone(), cx)),
+            window,
+            cx,
+        );
+    }
+
+    pub(super) fn render_header(&mut self, cx: &mut Context<Self>) -> AnyElement {
+        if self.store.read(cx).addr().is_none() {
+            return self.render_local_header(cx);
+        }
+
+        let store = self.store.read(cx);
+        let pushing = store.pushing;
+        let cloning = store.cloning;
+
+        let Some(announcement) = store.announcement.clone() else {
+            return div().into_any_element();
+        };
+
+        let nip05 = self
+            .directory
+            .read(cx)
+            .profile(&announcement.owner, cx)
+            .metadata()
+            .nip05
+            .clone()
+            .filter(|nip05| !nip05.trim().is_empty());
+
+        let share = ShareTargets::from_announcement(&announcement);
+        let nostr_url = nostr_clone_url(&announcement, nip05.as_deref());
+        let ngit_command = SharedString::from(format!("git clone {nostr_url}"));
+        let nak_command = SharedString::from(format!("nak git clone {nostr_url}"));
+        let git_commands: Vec<String> = announcement.clone_urls();
+
+        let name = repo_display_name(self.store.read(cx));
+        let description = announcement.description();
+        let avatar = Avatar::new(format!("{}:{}", announcement.owner, announcement.id));
+
+        let share_naddr = share.naddr.clone();
+        let share_for_menu = share.clone();
+        let announcement_for_menu = announcement.clone();
+        let weak_share = cx.entity().downgrade();
+        let weak_menu_open = cx.entity().downgrade();
+        let weak_menu_items = cx.entity().downgrade();
+        let weak_clone = cx.entity().downgrade();
+        let weak_download = cx.entity().downgrade();
+        let ngit_for_popover = ngit_command.clone();
+        let nak_for_popover = nak_command.clone();
+        let git_for_popover = git_commands.clone();
+
+        v_flex()
+            .flex_none()
+            .p_4()
+            .w_full()
+            .gap_6()
+            .border_b_1()
+            .border_color(cx.theme().colors.border)
+            .child(
+                h_flex()
+                    .w_full()
+                    .gap_4()
+                    .items_start()
+                    .justify_between()
+                    .child(
+                        v_flex()
+                            .flex_1()
+                            .min_w_0()
+                            .gap_1()
+                            .child(
+                                h_flex()
+                                    .gap_2()
+                                    .font_weight(gpui::FontWeight::SEMIBOLD)
+                                    .child(avatar)
+                                    .child(name),
+                            )
+                            .child(
+                                div()
+                                    .min_w_0()
+                                    .text_sm()
+                                    .text_color(cx.theme().colors.muted_foreground)
+                                    .line_clamp(2)
+                                    .child(description),
+                            )
+                            .when_some(fork_row(&announcement, cx), |this, row| this.child(row))
+                            .child(
+                                h_flex()
+                                    .mt_2()
+                                    .w_full()
+                                    .gap_1()
+                                    .child(
+                                        div()
+                                            .text_xs()
+                                            .text_color(cx.theme().colors.muted_foreground)
+                                            .font_weight(gpui::FontWeight::SEMIBOLD)
+                                            .child("Maintainers:"),
+                                    )
+                                    .child(self.render_maintainers(cx)),
+                            ),
+                    )
+                    .child(
+                        h_flex()
+                            .flex_none()
+                            .gap_2()
+                            .justify_end()
+                            .child({
+                                let weak_pulls = cx.entity().downgrade();
+                                let weak_pulls_open = cx.entity().downgrade();
+                                let _store_for_pulls = self.store.clone();
+                                let pulls_count = self.store.read(cx).pull_request_count();
+
+                                DropdownMenu::new("pulls")
+                                    .label(format!("Pull requests {pulls_count}"))
+                                    .icon(Icon::named(CustomIconName::GitPullRequest))
+                                    .variant(ButtonVariant::Secondary)
+                                    .open(self.pulls_menu_open)
+                                    .on_click(move |_, window, cx| {
+                                        if let Err(error) = weak_pulls.update(cx, |this, cx| {
+                                            this.open_pulls(window, cx);
+                                        }) {
+                                            log::warn!("failed to open pull requests: {error}");
+                                        }
+                                    })
+                                    .on_open_change(move |open, _, cx| {
+                                        if let Err(error) = weak_pulls_open.update(cx, |this, cx| {
+                                            this.pulls_menu_open = open;
+                                            cx.notify();
+                                        }) {
+                                            log::warn!("failed to update pulls menu: {error}");
+                                        }
+                                    })
+                                    .items({
+                                        let weak_new = cx.entity().downgrade();
+                                        let weak_patch = cx.entity().downgrade();
+                                        move |_, _| {
+                                            let weak_new = weak_new.clone();
+                                            let weak_patch = weak_patch.clone();
+                                            vec![
+                                                MenuItem::new("New pull request").handler(move |window, cx| {
+                                                    crate::shared::log_dropped(weak_new.update(cx, |this, cx| {
+                                                        this.open_new_pull_request(window, cx);
+                                                    }));
+                                                }),
+                                                MenuItem::new("Send patch").handler(move |window, cx| {
+                                                    crate::shared::log_dropped(weak_patch.update(cx, |this, cx| {
+                                                        this.open_send_patch(window, cx);
+                                                    }));
+                                                }),
+                                            ]
+                                        }
+                                    })
+                            })
+                            .child({
+                                let weak_issues = cx.entity().downgrade();
+                                let weak_issues_open = cx.entity().downgrade();
+                                let store_for_issues = self.store.clone();
+                                let issues_count = self.store.read(cx).issue_count();
+
+                                DropdownMenu::new("issues")
+                                    .label(format!("Issues {issues_count}"))
+                                    .icon(Icon::named(CustomIconName::GitIssueDone))
+                                    .variant(ButtonVariant::Secondary)
+                                    .open(self.issues_menu_open)
+                                    .on_click(move |_, window, cx| {
+                                        if let Err(error) = weak_issues.update(cx, |this, cx| {
+                                            this.open_issues(window, cx);
+                                        }) {
+                                            log::warn!("failed to open issues: {error}");
+                                        }
+                                    })
+                                    .on_open_change(move |open, _, cx| {
+                                        if let Err(error) =
+                                            weak_issues_open.update(cx, |this, cx| {
+                                                this.issues_menu_open = open;
+                                                cx.notify();
+                                            })
+                                        {
+                                            log::warn!("failed to update issues menu: {error}");
+                                        }
+                                    })
+                                    .items(move |_, _| {
+                                        vec![MenuItem::new("New issue").handler({
+                                            let store = store_for_issues.clone();
+                                            move |_, cx| {
+                                                crate::issues::new_issue::open(store.clone(), cx);
+                                            }
+                                        })]
+                                    })
+                            })
+                            .child(
+                                DropdownMenu::new("share")
+                                    .icon(Icon::named(IconRole::Copy))
+                                    .variant(ButtonVariant::Secondary)
+                                    .open(self.share_open)
+                                    .on_click(move |_, _, cx| {
+                                        cx.write_to_clipboard(ClipboardItem::new_string(
+                                            share_naddr.clone(),
+                                        ));
+                                    })
+                                    .on_open_change(move |open, _, cx| {
+                                        if let Err(error) = weak_share.update(cx, |this, cx| {
+                                            this.share_open = open;
+                                            cx.notify();
+                                        }) {
+                                            log::warn!("failed to update share menu: {error}");
+                                        }
+                                    })
+                                    .items(move |_, _| share_for_menu.menu()),
+                            )
+                            .child(
+                                DropdownMenu::new("repo-menu")
+                                    .icon(Icon::named(CustomIconName::EllipsisVertical))
+                                    .variant(ButtonVariant::Secondary)
+                                    .loading(pushing)
+                                    .disabled(pushing)
+                                    .open(self.repo_menu_open)
+                                    .on_open_change(move |open, _, cx| {
+                                        if let Err(error) = weak_menu_open.update(cx, |this, cx| {
+                                            this.repo_menu_open = open;
+                                            cx.notify();
+                                        }) {
+                                            log::warn!("failed to update repo menu: {error}");
+                                        }
+                                    })
+                                    .items(move |_, cx| {
+                                        let owner = Backend::global(cx)
+                                            .read(cx)
+                                            .current_user()
+                                            == Some(announcement_for_menu.owner);
+
+                                        let mut items = vec![MenuItem::new("About").handler({
+                                            let weak = weak_menu_items.clone();
+                                            let announcement = announcement_for_menu.clone();
+                                            move |_, cx| {
+                                                if let Err(error) = weak.update(cx, |this, cx| {
+                                                    dialogs::about::open(
+                                                        announcement.clone(),
+                                                        this.directory.clone(),
+                                                        cx,
+                                                    );
+                                                }) {
+                                                    log::warn!("failed to open about: {error}");
+                                                }
+                                            }
+                                        })];
+
+                                        if owner {
+                                            items.push(MenuItem::new("Republish").handler({
+                                                let weak = weak_menu_items.clone();
+                                                move |window, cx| {
+                                                    if let Err(error) = weak.update(cx, |this, cx| {
+                                                        this.push_repository(window, cx);
+                                                    }) {
+                                                        log::warn!("failed to republish: {error}");
+                                                    }
+                                                }
+                                            }));
+                                            items.push(MenuItem::new("Reset remote to local").handler({
+                                                let weak = weak_menu_items.clone();
+                                                move |window, cx| {
+                                                    if let Err(error) = weak.update(cx, |this, cx| {
+                                                        this.reset_remote(window, cx);
+                                                    }) {
+                                                        log::warn!("failed to reset remote: {error}");
+                                                    }
+                                                }
+                                            }));
+                                            items.push(MenuItem::separator());
+                                            items.push(
+                                                MenuItem::new("Delete")
+                                                    .destructive(true)
+                                                    .handler({
+                                                        let weak = weak_menu_items.clone();
+                                                        move |window, cx| {
+                                                            if let Err(error) =
+                                                                weak.update(cx, |this, cx| {
+                                                                    this.delete_repository(window, cx);
+                                                                })
+                                                            {
+                                                                log::warn!(
+                                                                    "failed to delete repository: {error}"
+                                                                );
+                                                            }
+                                                        }
+                                                    }),
+                                            );
+                                        }
+
+                                        items
+                                    }),
+                            )
+                            .child(
+                                Popover::new("clone")
+                                    .open(self.clone_open)
+                                    .on_change(move |open, _, cx| {
+                                        if let Err(error) = weak_clone.update(cx, |this, cx| {
+                                            this.clone_open = open;
+                                            cx.notify();
+                                        }) {
+                                            log::warn!("failed to update clone popover: {error}");
+                                        }
+                                    })
+                                    .trigger(move |_, _| {
+                                        Button::new("clone")
+                                            .icon(Icon::named(CustomIconName::GitClone))
+                                            .tooltip(Tooltip::text("Clone"))
+                                            .loading(cloning)
+                                            .disabled(cloning)
+                                            .into_any_element()
+                                    })
+                                    .content(move |_, cx| {
+                                        v_flex()
+                                            .w(px(440.))
+                                            .p_3()
+                                            .gap_4()
+                                            .child(clone_group(
+                                                "Clone with ngit",
+                                                "copy-ngit",
+                                                &ngit_for_popover,
+                                            ))
+                                            .child(clone_group(
+                                                "Clone with nak",
+                                                "copy-nak",
+                                                &nak_for_popover,
+                                            ))
+                                            .child(
+                                                v_flex()
+                                                    .gap_1()
+                                                    .child(
+                                                        div()
+                                                            .text_xs()
+                                                            .text_color(
+                                                                cx.theme().colors.muted_foreground,
+                                                            )
+                                                            .child("Grasp Servers"),
+                                                    )
+                                                    .when(git_for_popover.is_empty(), |this| {
+                                                        this.child(
+                                                            div()
+                                                                .text_xs()
+                                                                .child("No git clone urls."),
+                                                        )
+                                                    })
+                                                    .children(git_for_popover.iter().enumerate().map(
+                                                        |(ix, command)| {
+                                                            ClipboardButton::new(
+                                                                SharedString::from(format!(
+                                                                    "copy-git-{ix}"
+                                                                )),
+                                                                command.clone(),
+                                                            )
+                                                        },
+                                                    )),
+                                            )
+                                            .child(
+                                                h_flex().justify_end().child(
+                                                    Button::new("download")
+                                                        .icon(Icon::named(CustomIconName::GitClone))
+                                                        .label("Download")
+                                                        .on_click({
+                                                            let weak = weak_download.clone();
+                                                            move |_, window, cx| {
+                                                                if let Err(error) =
+                                                                    weak.update(cx, |this, cx| {
+                                                                        this.clone_to_folder(window, cx);
+                                                                    })
+                                                                {
+                                                                    log::warn!(
+                                                                        "failed to clone: {error}"
+                                                                    );
+                                                                }
+                                                            }
+                                                        }),
+                                                ),
+                                            )
+                                            .into_any_element()
+                                    }),
+                            ),
+                    ),
+            )
+            .child(self.render_tabs(cx))
+            .into_any_element()
+    }
+
+    fn render_local_header(&self, cx: &mut Context<Self>) -> AnyElement {
+        let name = repo_display_name(self.store.read(cx));
+        let path = self
+            .store
+            .read(cx)
+            .path
+            .as_ref()
+            .map(|path| path.display().to_string())
+            .unwrap_or_default();
+        let avatar = Avatar::new(path.clone());
+
+        let bound = self.store.read(cx).nip34.clone();
+        let action = match bound
+            .as_ref()
+            .filter(|binding| binding.kind == Nip34Kind::Initialized)
+        {
+            Some(binding) => bound_repo_label(binding, &self.directory, cx),
+            None => Button::new("init")
+                .icon(Icon::named(CustomIconName::Init))
+                .label("Initialize on Nostr")
+                .tooltip(Tooltip::text("Publish this repository to Nostr"))
+                .on_click(cx.listener(|this, _, window, cx| {
+                    this.open_init_dialog(window, cx);
+                }))
+                .into_any_element(),
+        };
+
+        v_flex()
+            .flex_none()
+            .px_4()
+            .pb_4()
+            .w_full()
+            .gap_6()
+            .border_b_1()
+            .border_color(cx.theme().colors.border)
+            .child(
+                h_flex()
+                    .w_full()
+                    .gap_4()
+                    .items_start()
+                    .justify_between()
+                    .child(
+                        v_flex()
+                            .flex_1()
+                            .min_w_0()
+                            .gap_1()
+                            .child(
+                                h_flex()
+                                    .gap_2()
+                                    .font_weight(gpui::FontWeight::SEMIBOLD)
+                                    .child(avatar)
+                                    .child(name),
+                            )
+                            .child(
+                                div()
+                                    .min_w_0()
+                                    .text_sm()
+                                    .text_color(cx.theme().colors.muted_foreground)
+                                    .child(path),
+                            ),
+                    )
+                    .child(action),
+            )
+            .child(self.render_tabs(cx))
+            .into_any_element()
+    }
+
+    fn render_tabs(&self, cx: &mut Context<Self>) -> AnyElement {
+        let count = self.history.read(cx).commit_count();
+        let muted = cx.theme().colors.muted_foreground;
+        let weak = cx.entity().downgrade();
+        let commits_label = match count {
+            Some(count) => SharedString::from(format!("Commits ({count})")),
+            None => SharedString::from("Commits"),
+        };
+
+        Tabs::new("repo-tabs")
+            .selected(self.active_tab)
+            .tabs(move |_, _| {
+                vec![
+                    Tab::new("files", "Files")
+                        .lead(Icon::named(CustomIconName::GitFile).color(muted)),
+                    Tab::new("commits", commits_label.clone())
+                        .lead(Icon::named(CustomIconName::GitCommit).color(muted)),
+                ]
+            })
+            .on_change(move |index, _, cx| {
+                if let Err(error) = weak.update(cx, |this, cx| {
+                    this.active_tab = index;
+                    cx.notify();
+                }) {
+                    log::warn!("failed to switch repo tab: {error}");
+                }
+            })
+            .into_any_element()
+    }
+
+    fn render_maintainers(&self, cx: &mut Context<Self>) -> AnyElement {
+        let Some(announcement) = self.announcement(cx) else {
+            return div().into_any_element();
+        };
+
+        let mut seen = HashSet::new();
+        let rest: Vec<_> = announcement
+            .maintainers
+            .iter()
+            .copied()
+            .filter(|key| key != &announcement.owner && seen.insert(*key))
+            .collect();
+
+        let owner = self.directory.read(cx).profile(&announcement.owner, cx);
+        let owner_name = owner.name();
+
+        h_flex()
+            .w_full()
+            .gap_3()
+            .child(
+                h_flex()
+                    .gap_2()
+                    .child(
+                        h_flex()
+                            .gap_1()
+                            .child(
+                                Avatar::new(announcement.owner)
+                                    .name(owner_name.clone())
+                                    .picture(owner.picture())
+                                    .small(),
+                            )
+                            .child(div().text_xs().whitespace_nowrap().child(owner_name)),
+                    )
+                    .when(!rest.is_empty(), |this| {
+                        this.child(
+                            div()
+                                .text_xs()
+                                .text_color(cx.theme().colors.muted_foreground)
+                                .child(SharedString::from(format!("+{}", rest.len()))),
+                        )
+                    }),
+            )
+            .into_any_element()
+    }
+}

crates/signed_app/src/repo/helpers.rs

@@ -0,0 +1,514 @@
+use std::path::{Path, PathBuf};
+
+use anyhow::Error;
+use assets::CustomIconName;
+use gpui::prelude::FluentBuilder as _;
+use gpui::{
+    AnyElement, App, ClipboardItem, Context, Entity, InteractiveElement as _, IntoElement,
+    ParentElement as _, SharedString, StatefulInteractiveElement as _, Styled as _, Window, div,
+    px,
+};
+use gpui_native_kit::avatar::Avatar;
+use gpui_native_kit::clipboard::ClipboardButton;
+use gpui_native_kit::combobox::ComboboxState;
+use gpui_native_kit::common::{Sizable as _, h_flex, v_flex};
+use gpui_native_kit::icons::Icon;
+use gpui_native_kit::menu::MenuItem;
+use gpui_native_kit::theme::ActiveTheme as _;
+use metadata::ProfileDirectory;
+use nostr::nips::nip19::Nip19Coordinate;
+use nostr::prelude::{RelayUrl, ToBech32};
+use signed_core::Announcement;
+use signed_git::{DiffHunk, DiffLine, DiffLineKind, FileCommit, FileDiff, Repo};
+use signed_state::{Nip34Binding, RepoListStore, RepoStore};
+use utils::{middle_truncate, relative_time_secs};
+
+use super::RepoDetailView;
+use crate::shared::tree::{TreeItemSeed, build_tree_items};
+
+const GUTTER_WIDTH: f32 = 44.;
+pub const DIFF_ROW_HEIGHT: f32 = 20.;
+pub const COMMIT_ROW_HEIGHT: f32 = 56.;
+
+#[derive(Clone, Copy)]
+pub(super) enum DiffRow {
+    Hunk {
+        old_start: u32,
+        old_lines: u32,
+        new_start: u32,
+        new_lines: u32,
+    },
+    Line {
+        hunk: usize,
+        line: usize,
+    },
+}
+
+pub(super) struct RepoData {
+    pub(super) tree: Vec<TreeItemSeed>,
+    pub(super) entries: Vec<PathBuf>,
+    pub(super) readme_path: Option<PathBuf>,
+    pub(super) readme: Option<Vec<u8>>,
+    pub(super) worktree: Option<PathBuf>,
+    pub(super) branches: Vec<String>,
+    pub(super) tags: Vec<String>,
+    pub(super) current_branch: Option<String>,
+    pub(super) head_commit: Option<FileCommit>,
+}
+
+#[derive(Clone)]
+pub(super) struct ShareTargets {
+    /// NIP-19 `naddr1...` of the announcement, with its announced relays.
+    pub(super) naddr: String,
+    /// Hex ID of the announcement event itself.
+    event_id: String,
+    /// NIP-34 coordinate `30617:<pubkey>:<repo-id>`.
+    coordinate: String,
+    gitworkshop: String,
+    ditto: String,
+}
+
+impl ShareTargets {
+    pub(super) fn from_announcement(announcement: &Announcement) -> Self {
+        let addr = announcement.addr();
+        let coordinate = addr.to_string();
+        let naddr = Nip19Coordinate::new(addr.into(), announcement.relays.iter().cloned())
+            .to_bech32()
+            .unwrap_or_else(|_| coordinate.clone());
+
+        Self {
+            naddr: naddr.clone(),
+            event_id: announcement
+                .event_id
+                .to_bech32()
+                .unwrap_or_else(|_| announcement.event_id.to_string()),
+            coordinate,
+            gitworkshop: format!("https://gitworkshop.dev/{naddr}"),
+            ditto: format!("https://ditto.pub/{naddr}"),
+        }
+    }
+
+    pub(super) fn menu(&self) -> Vec<MenuItem> {
+        let items = [
+            ("GitWorkshop", truncate_naddr_link(&self.gitworkshop, 4)),
+            ("Ditto", truncate_naddr_link(&self.ditto, 4)),
+            ("Event ID", middle_truncate(&self.event_id, 10, 10)),
+            ("Coordinate", middle_truncate(&self.coordinate, 10, 10)),
+        ];
+
+        let values = [
+            self.gitworkshop.clone(),
+            self.ditto.clone(),
+            self.event_id.clone(),
+            self.coordinate.clone(),
+        ];
+
+        items
+            .into_iter()
+            .zip(values)
+            .map(|((label, detail), value)| {
+                MenuItem::new(SharedString::from(format!("{label}  {detail}"))).handler(
+                    move |_, cx| {
+                        cx.write_to_clipboard(ClipboardItem::new_string(value.clone()));
+                    },
+                )
+            })
+            .collect()
+    }
+}
+
+pub(super) fn clone_group(label: &str, id: &'static str, command: &SharedString) -> AnyElement {
+    v_flex()
+        .gap_1()
+        .child(div().text_xs().child(SharedString::from(label)))
+        .child(ClipboardButton::new(id, command.clone()))
+        .into_any_element()
+}
+
+pub(super) fn nostr_clone_url(announcement: &Announcement, nip05: Option<&str>) -> SharedString {
+    let owner = announcement.owner;
+    let user = nip05
+        .map(str::to_owned)
+        .unwrap_or_else(|| owner.to_bech32().unwrap_or_else(|_| owner.to_string()));
+
+    let mut url = format!("nostr://{user}");
+    if let Some(hint) = announcement.relays.first().and_then(RelayUrl::domain) {
+        url.push('/');
+        url.push_str(hint);
+    }
+    url.push('/');
+    url.push_str(&announcement.id);
+
+    SharedString::from(url)
+}
+
+pub(super) fn fork_row(
+    announcement: &Announcement,
+    cx: &mut Context<RepoDetailView>,
+) -> Option<AnyElement> {
+    let upstream = announcement.upstream.as_ref()?;
+
+    let (label, clickable) = match &upstream.addr {
+        Some(addr) => {
+            let name = RepoListStore::global(cx)
+                .read(cx)
+                .announcements
+                .iter()
+                .find(|a| a.addr() == *addr)
+                .map(|a| {
+                    a.name
+                        .as_deref()
+                        .map(SharedString::from)
+                        .unwrap_or_else(|| SharedString::from(a.id.clone()))
+                })
+                .unwrap_or_else(|| SharedString::from(addr.identifier().to_owned()));
+            (SharedString::from(format!("Forked from {name}")), true)
+        }
+        None => (SharedString::from(upstream.display().as_str()), false),
+    };
+
+    let row = h_flex()
+        .gap_1()
+        .min_w_0()
+        .text_sm()
+        .text_color(cx.theme().colors.muted_foreground)
+        .child(Icon::named(CustomIconName::GitBranch).size(px(14.)))
+        .child(div().whitespace_nowrap().text_ellipsis().child(label));
+
+    Some(if clickable {
+        row.id("fork-upstream")
+            .cursor_pointer()
+            .on_click(cx.listener(|this, _, window, cx| this.open_upstream(window, cx)))
+            .into_any_element()
+    } else {
+        row.into_any_element()
+    })
+}
+
+pub(super) fn truncate_naddr_link(url: &str, tail: usize) -> String {
+    let Some(end) = url.find("naddr1").map(|i| i + "naddr1".len()) else {
+        return url.to_string();
+    };
+    if url.len() - end <= tail + 3 {
+        return url.to_string();
+    }
+    format!("{}...{}", &url[..end], &url[url.len() - tail..])
+}
+
+pub(super) fn load_repo_data(repo: &Repo) -> Result<RepoData, Error> {
+    let snapshot = repo.snapshot()?;
+    let worktree = repo.workdir().map(Path::to_path_buf);
+    let tree = build_tree_items(&snapshot.entries);
+
+    Ok(RepoData {
+        tree,
+        entries: snapshot.entries,
+        readme_path: snapshot.readme_path,
+        readme: snapshot.readme,
+        worktree,
+        branches: snapshot.branches,
+        tags: snapshot.tags,
+        current_branch: snapshot.current_branch,
+        head_commit: snapshot.head_commit,
+    })
+}
+
+/// The announcement's name or ID for announced repositories, the directory name for local ones.
+pub fn repo_display_name(store: &RepoStore) -> SharedString {
+    if store.addr().is_none() {
+        return store
+            .path
+            .as_ref()
+            .map(|path| {
+                SharedString::from(
+                    path.file_name()
+                        .map(|name| name.to_string_lossy().into_owned())
+                        .unwrap_or_else(|| path.display().to_string()),
+                )
+            })
+            .unwrap_or_default();
+    }
+
+    store
+        .announcement
+        .as_ref()
+        .map(|announcement| {
+            announcement
+                .name
+                .as_deref()
+                .map(SharedString::from)
+                .unwrap_or_else(|| SharedString::from(announcement.id.clone()))
+        })
+        .unwrap_or_default()
+}
+
+/// The owner and identifier a local repository is already bound to.
+pub(super) fn bound_repo_label(
+    binding: &Nip34Binding,
+    directory: &Entity<ProfileDirectory>,
+    cx: &App,
+) -> AnyElement {
+    let profile = binding.owner.map(|pk| directory.read(cx).profile(&pk, cx));
+
+    h_flex()
+        .flex_shrink_0()
+        .gap_2()
+        .text_sm()
+        .child("Initialized by")
+        .text_color(cx.theme().colors.muted_foreground)
+        .when_some(profile, |this, profile| {
+            let name = profile.name();
+            this.child(
+                h_flex()
+                    .gap_1()
+                    .text_color(cx.theme().colors.foreground)
+                    .child(
+                        Avatar::new(profile.public_key())
+                            .name(name.clone())
+                            .picture(profile.picture())
+                            .small(),
+                    )
+                    .child(name),
+            )
+        })
+        .when_some(binding.identifier.as_deref(), |this, ident| {
+            this.child(
+                div()
+                    .text_xs()
+                    .font_weight(gpui::FontWeight::SEMIBOLD)
+                    .child(SharedString::from(format!("/{ident}"))),
+            )
+        })
+        .into_any_element()
+}
+
+/// Computes a source hash from the given text.
+pub(super) fn source_hash(text: &str) -> u64 {
+    use std::hash::{Hash, Hasher};
+
+    let mut hasher = std::collections::hash_map::DefaultHasher::new();
+    text.hash(&mut hasher);
+    hasher.finish()
+}
+
+pub(super) fn preview_spinner() -> AnyElement {
+    v_flex()
+        .size_full()
+        .items_center()
+        .justify_center()
+        .child(gpui_native_kit::spinner::Spinner::new(
+            "repo-preview-spinner",
+        ))
+        .into_any_element()
+}
+
+/// The kit grammar for a path; only four languages are supported.
+pub(super) fn code_language(path: &str) -> gpui_native_kit::editor::highlight::Language {
+    use gpui_native_kit::editor::highlight::Language;
+    match Path::new(path)
+        .extension()
+        .and_then(|ext| ext.to_str())
+        .map(|ext| ext.to_ascii_lowercase())
+        .as_deref()
+    {
+        Some("rs") => Language::Rust,
+        Some("ts" | "mts" | "cts" | "tsx") => Language::TypeScript,
+        Some("js" | "mjs" | "cjs" | "jsx") => Language::JavaScript,
+        Some("py") => Language::Python,
+        _ => Language::Plain,
+    }
+}
+
+/// Whether a file path has a markdown extension.
+pub(super) fn is_markdown_path(path: &str) -> bool {
+    Path::new(path)
+        .extension()
+        .and_then(|ext| ext.to_str())
+        .is_some_and(|ext| {
+            matches!(
+                ext.to_ascii_lowercase().as_str(),
+                "md" | "markdown" | "mdown" | "mkdn"
+            )
+        })
+}
+
+pub(super) fn diff_rows(file: &FileDiff) -> Vec<DiffRow> {
+    let mut rows = Vec::new();
+    for (hunk_ix, hunk) in file.hunks.iter().enumerate() {
+        rows.push(DiffRow::Hunk {
+            old_start: hunk.old_start,
+            old_lines: hunk.old_lines,
+            new_start: hunk.new_start,
+            new_lines: hunk.new_lines,
+        });
+        rows.extend((0..hunk.lines.len()).map(|line| DiffRow::Line {
+            hunk: hunk_ix,
+            line,
+        }));
+    }
+    rows
+}
+
+pub(super) fn render_diff_row(hunks: &[DiffHunk], row: DiffRow, cx: &App) -> AnyElement {
+    match row {
+        DiffRow::Hunk {
+            old_start,
+            old_lines,
+            new_start,
+            new_lines,
+        } => div()
+            .px_2()
+            .w_full()
+            .h(px(DIFF_ROW_HEIGHT))
+            .font_family(cx.theme().mono_font)
+            .text_xs()
+            .bg(cx.theme().colors.muted)
+            .border_y_1()
+            .border_color(cx.theme().colors.border)
+            .text_color(cx.theme().colors.muted_foreground)
+            .child(SharedString::from(format!(
+                "@@ -{},{} +{},{} @@",
+                old_start, old_lines, new_start, new_lines
+            )))
+            .into_any_element(),
+        DiffRow::Line { hunk, line } => render_diff_line(&hunks[hunk].lines[line], cx),
+    }
+}
+
+fn render_diff_line(line: &DiffLine, cx: &App) -> AnyElement {
+    let bg = match line.kind {
+        DiffLineKind::Addition => Some(cx.theme().ramps.success.base.opacity(0.2)),
+        DiffLineKind::Deletion => Some(cx.theme().ramps.destructive.base.opacity(0.2)),
+        DiffLineKind::Context => None,
+    };
+    let gutter = cx.theme().colors.muted_foreground;
+
+    h_flex()
+        .w_full()
+        .h(px(DIFF_ROW_HEIGHT))
+        .font_family(cx.theme().mono_font)
+        .text_xs()
+        .when_some(bg, |this, bg| this.bg(bg))
+        .child(
+            div()
+                .w(px(GUTTER_WIDTH))
+                .flex_none()
+                .pr_2()
+                .text_right()
+                .text_color(gutter)
+                .child(line.old.map(|n| n.to_string()).unwrap_or_default()),
+        )
+        .child(
+            div()
+                .w(px(GUTTER_WIDTH))
+                .flex_none()
+                .pr_2()
+                .text_right()
+                .text_color(gutter)
+                .child(line.new.map(|n| n.to_string()).unwrap_or_default()),
+        )
+        .child(
+            div()
+                .flex_1()
+                .min_w_0()
+                .overflow_hidden()
+                .whitespace_nowrap()
+                .text_color(cx.theme().colors.foreground)
+                .child(line.text.clone()),
+        )
+        .into_any_element()
+}
+
+pub(crate) fn commit_row(
+    ix: usize,
+    commit: &FileCommit,
+    on_click: impl Fn(&mut Window, &mut gpui::App) + 'static,
+    cx: &gpui::App,
+) -> gpui::AnyElement {
+    h_flex()
+        .id(ix)
+        .px_4()
+        .h(px(COMMIT_ROW_HEIGHT))
+        .w_full()
+        .gap_3()
+        .border_b_1()
+        .border_color(cx.theme().colors.border)
+        .hover(|this| this.bg(cx.theme().colors.muted_hover))
+        .child(
+            v_flex()
+                .flex_1()
+                .min_w_0()
+                .gap_1()
+                .justify_center()
+                .child(
+                    h_flex()
+                        .gap_2()
+                        .overflow_hidden()
+                        .child(
+                            div()
+                                .font_family(cx.theme().mono_font)
+                                .text_xs()
+                                .text_color(cx.theme().colors.muted_foreground)
+                                .child(commit.id.clone()),
+                        )
+                        .child(
+                            div()
+                                .flex_1()
+                                .min_w_0()
+                                .text_sm()
+                                .text_ellipsis()
+                                .whitespace_nowrap()
+                                .child(commit.summary.clone()),
+                        ),
+                )
+                .child(
+                    h_flex()
+                        .gap_2()
+                        .text_xs()
+                        .text_color(cx.theme().colors.muted_foreground)
+                        .child(commit.author.clone())
+                        .child(relative_time_secs(commit.time)),
+                ),
+        )
+        .on_click(move |_, window, cx| on_click(window, cx))
+        .into_any_element()
+}
+
+pub(super) fn sync_selector(
+    select: &Entity<ComboboxState<SharedString>>,
+    cached: &mut Vec<SharedString>,
+    items: Vec<SharedString>,
+    selected: Option<SharedString>,
+    window: &mut Window,
+    cx: &mut App,
+) -> bool {
+    let items_changed = *cached != items;
+
+    let selection_changed = selected
+        .as_ref()
+        .is_some_and(|value| select.read(cx).selected() != Some(value));
+
+    if !items_changed && !selection_changed {
+        return false;
+    }
+
+    select.update(cx, |state, cx| {
+        if items_changed {
+            state.set_options(
+                items
+                    .iter()
+                    .map(|item| (item.clone(), item.clone()))
+                    .collect(),
+                cx,
+            );
+        }
+        if let Some(value) = selected
+            && (items_changed || selection_changed)
+        {
+            state.set_selected(Some(value), window, cx);
+        }
+    });
+    *cached = items;
+
+    true
+}

crates/signed_app/src/repo/history.rs

@@ -1,56 +1,58 @@
 use std::path::PathBuf;
-use std::rc::Rc;
 
 use anyhow::Error;
-use dock::{DockArea, add_center_panel, panel_handle};
-use gpui::prelude::*;
-use gpui::{Context, Entity, Pixels, Render, Size, Task, WeakEntity, Window, div, px, size};
-use gpui_component::scroll::Scrollbar;
-use gpui_component::spinner::Spinner;
-use gpui_component::{ActiveTheme, Sizable, VirtualListScrollHandle, v_flex, v_virtual_list};
-use signed_git::CommitList;
+use gpui::prelude::FluentBuilder as _;
+use gpui::{
+    AppContext as _, Context, Entity, IntoElement, ParentElement as _, Render, SharedString,
+    Styled as _, Task, UniformListScrollHandle, WeakEntity, Window, div, uniform_list,
+};
+use gpui_native_kit::common::v_flex;
+use gpui_native_kit::layout::dock::DockState;
+use gpui_native_kit::scrollbar::Scrollbar;
+use gpui_native_kit::spinner::Spinner;
+use gpui_native_kit::theme::ActiveTheme as _;
+use signed_git::{CommitList, Repo};
 use signed_state::RepoStore;
-use signed_ui::placeholder;
 
-use super::repo_display_name;
-use crate::views::commit_diff::{COMMIT_ROW_HEIGHT, CommitDiffView, commit_row};
+use super::commit_diff::CommitDiffView;
+use super::helpers::commit_row;
+use super::helpers::repo_display_name;
+use crate::shared::panels;
 
-pub(super) struct RepoHistoryView {
+pub struct RepoHistoryView {
     store: Entity<RepoStore>,
-    dock_area: WeakEntity<DockArea>,
+    dock: WeakEntity<DockState>,
     worktree: Option<PathBuf>,
     all_commits: Option<CommitList>,
     loading_all_commits: bool,
-    scroll_handle: VirtualListScrollHandle,
-    item_sizes: Rc<Vec<Size<Pixels>>>,
+    scroll_handle: UniformListScrollHandle,
     tasks: Vec<Task<Result<(), Error>>>,
 }
 
 impl RepoHistoryView {
-    pub(super) fn new(store: Entity<RepoStore>, dock_area: WeakEntity<DockArea>) -> Self {
+    pub fn new(store: Entity<RepoStore>, dock: WeakEntity<DockState>) -> Self {
         Self {
             store,
-            dock_area,
+            dock,
             worktree: None,
             all_commits: None,
             loading_all_commits: false,
-            scroll_handle: VirtualListScrollHandle::new(),
-            item_sizes: Rc::new(Vec::new()),
+            scroll_handle: UniformListScrollHandle::new(),
             tasks: Vec::new(),
         }
     }
 
-    pub(super) fn set_worktree(&mut self, path: Option<PathBuf>) {
+    pub fn set_worktree(&mut self, path: Option<PathBuf>) {
         self.worktree = path;
     }
 
-    /// Number of commits reachable from HEAD, for the Commits tab badge.
-    pub(super) fn commit_count(&self) -> Option<usize> {
+    /// Number of commits reachable from HEAD, for the Commits tab label.
+    pub fn commit_count(&self) -> Option<usize> {
         self.all_commits.as_ref().map(|list| list.total)
     }
 
     /// Drop the current list and walk HEAD again.
-    pub(super) fn reload(&mut self, cx: &mut Context<Self>) {
+    pub fn reload(&mut self, cx: &mut Context<Self>) {
         self.all_commits = None;
         self.loading_all_commits = false;
         self.load(cx);
@@ -69,16 +71,15 @@ impl RepoHistoryView {
 
         let task: Task<Result<(), Error>> = cx.spawn(async move |this, cx| {
             let result = cx
-                .background_spawn(async move { signed_git::worktree_all_commits(&worktree) })
+                .background_spawn(async move {
+                    Repo::open_cached(&worktree).and_then(|repo| repo.all_commits())
+                })
                 .await;
 
             this.update(cx, |this, cx| {
                 if let Ok(list) = result {
-                    let count = list.commits.len();
-                    this.item_sizes = Rc::new(vec![size(px(0.), px(COMMIT_ROW_HEIGHT)); count]);
                     this.all_commits = Some(list);
                 }
-
                 this.loading_all_commits = false;
                 cx.notify();
             })?;
@@ -89,7 +90,7 @@ impl RepoHistoryView {
         self.tasks.push(task);
     }
 
-    pub(super) fn open_commit_diff(
+    pub fn open_commit_diff(
         &mut self,
         commit_id: &str,
         window: &mut Window,
@@ -99,19 +100,34 @@ impl RepoHistoryView {
             return;
         };
 
-        let Some(dock_area) = self.dock_area.upgrade() else {
-            return;
-        };
-
         // Same display name as the repo detail panel's title.
         let repo_name = repo_display_name(self.store.read(cx));
+        let store = self.store.clone();
+        let commit_id = commit_id.to_owned();
+        let id = match store.read(cx).addr() {
+            Some(addr) => SharedString::from(format!("commit:{addr}:{commit_id}")),
+            None => SharedString::from(format!("commit:{}:{}", worktree.display(), commit_id)),
+        };
+        let dock = self.dock.clone();
 
-        let panel =
-            cx.new(|cx| CommitDiffView::new(worktree, repo_name, commit_id.into(), window, cx));
-
-        dock_area.update(cx, |dock_area, cx| {
-            add_center_panel(dock_area, panel_handle(panel), window, cx);
-        });
+        panels::open(
+            &dock,
+            id,
+            move |window, cx| {
+                cx.new(|cx| {
+                    CommitDiffView::new(
+                        store.clone(),
+                        worktree.clone(),
+                        repo_name.clone(),
+                        commit_id.clone(),
+                        window,
+                        cx,
+                    )
+                })
+            },
+            window,
+            cx,
+        );
     }
 }
 
@@ -123,22 +139,21 @@ impl Render for RepoHistoryView {
                     .size_full()
                     .items_center()
                     .justify_center()
-                    .child(Spinner::new().small())
+                    .child(Spinner::new("commits-loading"))
                     .into_any_element()
             } else {
-                placeholder("Failed to load commits", cx)
+                crate::shared::widgets::empty_state("Failed to load commits")
             };
         };
 
         if list.commits.is_empty() {
-            return placeholder("No commits found", cx);
+            return crate::shared::widgets::empty_state("No commits found");
         }
 
-        let view = cx.entity().clone();
-        let sizes = self.item_sizes.clone();
-        let scroll_handle = self.scroll_handle.clone();
-        let shown = list.commits.len();
+        let commits = list.commits.clone();
+        let shown = commits.len();
         let total = list.total;
+        let view = cx.entity().downgrade();
 
         v_flex()
             .relative()
@@ -146,27 +161,20 @@ impl Render for RepoHistoryView {
             .w_full()
             .min_h_0()
             .child(
-                v_virtual_list(view, "commits", sizes, move |this, range, _window, cx| {
-                    let view = cx.entity().downgrade();
-                    let commits = this
-                        .all_commits
-                        .as_ref()
-                        .map(|list| list.commits.as_slice())
-                        .unwrap_or(&[]);
-
+                uniform_list("commits", shown, move |range, _, cx| {
                     range
                         .map(|ix| {
-                            let id = commits[ix].id.clone();
+                            let commit = commits[ix].clone();
+                            let id = commit.id.clone();
                             let view = view.clone();
-
                             commit_row(
                                 ix,
-                                &commits[ix],
+                                &commit,
                                 move |window, cx| {
-                                    if let Some(view) = view.upgrade() {
-                                        view.update(cx, |this, cx| {
-                                            this.open_commit_diff(&id, window, cx)
-                                        });
+                                    if let Err(error) = view.update(cx, |this, cx| {
+                                        this.open_commit_diff(&id, window, cx);
+                                    }) {
+                                        log::warn!("failed to open commit diff: {error}");
                                     }
                                 },
                                 cx,
@@ -174,7 +182,7 @@ impl Render for RepoHistoryView {
                         })
                         .collect()
                 })
-                .track_scroll(&scroll_handle)
+                .track_scroll(&self.scroll_handle)
                 .size_full(),
             )
             .when(shown < total, |this| {
@@ -183,7 +191,7 @@ impl Render for RepoHistoryView {
                         .py_2()
                         .w_full()
                         .text_xs()
-                        .text_color(cx.theme().muted_foreground)
+                        .text_color(cx.theme().colors.muted_foreground)
                         .child(format!("Showing {shown} of {total} commits")),
                 )
             })
@@ -194,7 +202,10 @@ impl Render for RepoHistoryView {
                     .left_0()
                     .right_0()
                     .bottom_0()
-                    .child(Scrollbar::vertical(&self.scroll_handle)),
+                    .child(Scrollbar::vertical(
+                        "commits-scroll",
+                        self.scroll_handle.clone(),
+                    )),
             )
             .into_any_element()
     }

crates/signed_app/src/repo/refs.rs

@@ -0,0 +1,101 @@
+use gpui::{App, AppContext as _, Entity, SharedString, WeakEntity, Window};
+use gpui_native_kit::combobox::{Combobox, ComboboxState};
+
+use super::RepoDetailView;
+use super::helpers::sync_selector;
+
+pub(super) struct RefSwitcher {
+    pub(super) branch_select: Entity<ComboboxState<SharedString>>,
+    pub(super) tag_select: Entity<ComboboxState<SharedString>>,
+    ref_branches: Vec<SharedString>,
+    ref_tags: Vec<SharedString>,
+    pub(super) switching_ref: bool,
+}
+
+impl RefSwitcher {
+    pub(super) fn new(view: WeakEntity<RepoDetailView>, window: &mut Window, cx: &mut App) -> Self {
+        let branch_view = view.clone();
+        let branch_select = cx.new(|cx| {
+            ComboboxState::new(
+                Combobox::new("branch-select", "Branch", Vec::new())
+                    .placeholder("Branch")
+                    .on_change(move |value, window, cx| {
+                        if let Some(name) = value
+                            && let Err(error) = branch_view.update(cx, |this, cx| {
+                                this.switch_ref(super::RefKind::Branch, name, window, cx);
+                            })
+                        {
+                            log::warn!("failed to switch branch: {error}");
+                        }
+                    }),
+                window,
+                cx,
+            )
+        });
+
+        let tag_view = view;
+        let tag_select = cx.new(|cx| {
+            ComboboxState::new(
+                Combobox::new("tag-select", "Tag", Vec::new())
+                    .placeholder("Tag")
+                    .on_change(move |value, window, cx| {
+                        if let Some(name) = value
+                            && let Err(error) = tag_view.update(cx, |this, cx| {
+                                this.switch_ref(super::RefKind::Tag, name, window, cx);
+                            })
+                        {
+                            log::warn!("failed to switch tag: {error}");
+                        }
+                    }),
+                window,
+                cx,
+            )
+        });
+
+        Self {
+            branch_select,
+            tag_select,
+            ref_branches: Vec::new(),
+            ref_tags: Vec::new(),
+            switching_ref: false,
+        }
+    }
+
+    pub(super) fn set_branches(
+        &mut self,
+        branches: Vec<SharedString>,
+        selected: Option<SharedString>,
+        window: &mut Window,
+        cx: &mut App,
+    ) -> bool {
+        sync_selector(
+            &self.branch_select,
+            &mut self.ref_branches,
+            branches,
+            selected,
+            window,
+            cx,
+        )
+    }
+
+    pub(super) fn set_tags(
+        &mut self,
+        tags: Vec<SharedString>,
+        window: &mut Window,
+        cx: &mut App,
+    ) -> bool {
+        sync_selector(&self.tag_select, &mut self.ref_tags, tags, None, window, cx)
+    }
+
+    pub(super) fn restore_selection(
+        &self,
+        select: &Entity<ComboboxState<SharedString>>,
+        previous: &Option<SharedString>,
+        window: &mut Window,
+        cx: &mut App,
+    ) {
+        select.update(cx, |state, cx| {
+            state.set_selected(previous.clone(), window, cx)
+        });
+    }
+}

crates/signed_app/src/settings/helpers.rs

@@ -0,0 +1,358 @@
+use std::path::PathBuf;
+
+use gpui::{
+    AnyElement, App, AppContext as _, Entity, IntoElement, ParentElement as _, PathPromptOptions,
+    SharedString, Styled as _, Window, div, px,
+};
+use gpui_native_kit::button::Button;
+use gpui_native_kit::common::{h_flex, v_flex};
+use gpui_native_kit::icons::{Icon, IconRole};
+use gpui_native_kit::input::{Input, InputState};
+use gpui_native_kit::select::{Select, SelectOption};
+use gpui_native_kit::theme::ActiveTheme as _;
+use gpui_native_kit::tooltip::Tooltip;
+use settings::{AppearanceMode, EventFetchingStrategy, SettingsStore};
+
+use crate::repo::dialogs::grasp_servers::{normalize_server, server_host};
+
+/// A settings row with the label and description on the left and the control on the right.
+pub fn setting_row(
+    cx: &App,
+    title: impl Into<SharedString>,
+    description: impl Into<SharedString>,
+    control: impl IntoElement,
+) -> AnyElement {
+    h_flex()
+        .w_full()
+        .justify_between()
+        .gap_4()
+        .child(
+            v_flex()
+                .flex_1()
+                .min_w_0()
+                .gap_1()
+                .child(
+                    div()
+                        .text_sm()
+                        .font_weight(gpui::FontWeight::SEMIBOLD)
+                        .child(title.into()),
+                )
+                .child(
+                    div()
+                        .text_xs()
+                        .text_color(cx.theme().colors.muted_foreground)
+                        .child(description.into()),
+                ),
+        )
+        .child(div().w(px(200.)).flex_shrink_0().child(control))
+        .into_any_element()
+}
+
+/// A full-width settings block with title and subtitle in one header.
+pub fn setting_block(
+    cx: &App,
+    title: impl Into<SharedString>,
+    description: impl Into<SharedString>,
+    control: impl IntoElement,
+) -> AnyElement {
+    v_flex()
+        .w_full()
+        .gap_3()
+        .child(
+            v_flex()
+                .gap_1()
+                .child(
+                    div()
+                        .text_sm()
+                        .font_weight(gpui::FontWeight::SEMIBOLD)
+                        .child(title.into()),
+                )
+                .child(
+                    div()
+                        .text_xs()
+                        .text_color(cx.theme().colors.muted_foreground)
+                        .child(description.into()),
+                ),
+        )
+        .child(control)
+        .into_any_element()
+}
+
+pub fn appearance_select(cx: &App) -> Select<AppearanceMode> {
+    let current = SettingsStore::global(cx).read(cx).settings().appearance;
+    Select::new("settings-appearance")
+        .options(vec![
+            SelectOption::new(AppearanceMode::System, "System"),
+            SelectOption::new(AppearanceMode::Light, "Light"),
+            SelectOption::new(AppearanceMode::Dark, "Dark"),
+        ])
+        .selected(Some(current))
+        .on_change(|value, _, cx| {
+            let Some(mode) = value else {
+                return;
+            };
+            SettingsStore::global(cx).update(cx, |store, cx| {
+                store.edit(|settings| settings.appearance = mode, cx);
+            });
+            crate::apply_appearance_mode(mode, cx);
+        })
+}
+
+pub fn event_fetching_select(cx: &App) -> Select<EventFetchingStrategy> {
+    let current = SettingsStore::global(cx).read(cx).settings().event_fetching;
+    Select::new("settings-event-fetching")
+        .options(vec![
+            SelectOption::new(EventFetchingStrategy::Curated, "Curated"),
+            SelectOption::new(EventFetchingStrategy::Uncensored, "Uncensored"),
+        ])
+        .selected(Some(current))
+        .on_change(|value, _, cx| {
+            let Some(strategy) = value else {
+                return;
+            };
+            SettingsStore::global(cx).update(cx, |store, cx| {
+                store.edit(|settings| settings.event_fetching = strategy, cx);
+            });
+        })
+}
+
+pub fn grasp_servers_editor(input: &Entity<InputState>, cx: &App) -> AnyElement {
+    let servers = SettingsStore::global(cx)
+        .read(cx)
+        .settings()
+        .grasp_servers
+        .default_servers
+        .clone();
+
+    v_flex()
+        .gap_2()
+        .children(servers.iter().enumerate().map(|(ix, server)| {
+            let store = SettingsStore::global(cx);
+            h_flex()
+                .gap_1()
+                .child(
+                    div()
+                        .flex_1()
+                        .h_8()
+                        .px_2()
+                        .bg(cx.theme().colors.muted)
+                        .text_color(cx.theme().colors.muted_foreground)
+                        .text_sm()
+                        .rounded(cx.theme().radius.control)
+                        .child(display_server(server)),
+                )
+                .child(
+                    Button::new(format!("settings-remove-server:{ix}"))
+                        .icon(Icon::named(IconRole::Close))
+                        .variant(gpui_native_kit::button::ButtonVariant::Ghost)
+                        .tooltip(Tooltip::text("Remove"))
+                        .on_click({
+                            let store = store.clone();
+                            move |_, _, cx| {
+                                store.update(cx, |store, cx| {
+                                    store.edit(
+                                        |settings| {
+                                            settings.grasp_servers.default_servers.remove(ix);
+                                        },
+                                        cx,
+                                    );
+                                });
+                            }
+                        }),
+                )
+                .into_any_element()
+        }))
+        .child(
+            h_flex()
+                .gap_1()
+                .child(
+                    div()
+                        .flex_1()
+                        .child(Input::new("settings-grasp-input", input.clone())),
+                )
+                .child(
+                    Button::new("settings-add-server")
+                        .icon(Icon::named(IconRole::Plus))
+                        .variant(gpui_native_kit::button::ButtonVariant::Ghost)
+                        .tooltip(Tooltip::text("Add grasp server"))
+                        .on_click({
+                            let input = input.clone();
+                            move |_, window, cx| add_server(&input, window, cx)
+                        }),
+                ),
+        )
+        .into_any_element()
+}
+
+fn display_server(server: &str) -> SharedString {
+    match normalize_server(server) {
+        Some((_, relay)) => server_host(&relay),
+        None => SharedString::from(server.to_owned()),
+    }
+}
+
+fn add_server(input: &Entity<InputState>, window: &mut Window, cx: &mut App) {
+    let value = input.read(cx).value().trim().to_owned();
+    if value.is_empty() {
+        return;
+    }
+    let Some((normalized, _)) = normalize_server(&value) else {
+        return;
+    };
+    SettingsStore::global(cx).update(cx, |store, cx| {
+        store.edit(
+            |settings| {
+                if !settings.grasp_servers.default_servers.contains(&normalized) {
+                    settings
+                        .grasp_servers
+                        .default_servers
+                        .push(normalized.clone());
+                }
+            },
+            cx,
+        );
+    });
+    input.update(cx, |input, cx| input.set_value("", window, cx));
+}
+
+pub fn scan_paths_editor(cx: &App) -> AnyElement {
+    let scan_paths = SettingsStore::global(cx)
+        .read(cx)
+        .settings()
+        .local_repos
+        .scan_paths
+        .clone();
+    let store = SettingsStore::global(cx);
+
+    v_flex()
+        .gap_2()
+        .children(scan_paths.iter().enumerate().map(|(ix, path)| {
+            let store = store.clone();
+            h_flex()
+                .gap_1()
+                .child(
+                    div()
+                        .flex_1()
+                        .h_8()
+                        .px_2()
+                        .bg(cx.theme().colors.muted)
+                        .text_color(cx.theme().colors.muted_foreground)
+                        .text_sm()
+                        .rounded(cx.theme().radius.control)
+                        .child(path.display().to_string()),
+                )
+                .child(
+                    Button::new(format!("settings-remove-path:{ix}"))
+                        .icon(Icon::named(IconRole::Close))
+                        .variant(gpui_native_kit::button::ButtonVariant::Ghost)
+                        .tooltip(Tooltip::text("Remove"))
+                        .on_click(move |_, _, cx| {
+                            store.update(cx, |store, cx| {
+                                store.edit(
+                                    |settings| {
+                                        settings.local_repos.scan_paths.remove(ix);
+                                    },
+                                    cx,
+                                );
+                            });
+                        }),
+                )
+                .into_any_element()
+        }))
+        .child(
+            h_flex().justify_end().child(
+                Button::new("settings-add-path")
+                    .icon(Icon::named(IconRole::Plus))
+                    .label("Add directory")
+                    .on_click(|_, _, cx| add_scan_path(cx)),
+            ),
+        )
+        .into_any_element()
+}
+
+fn add_scan_path(cx: &mut App) {
+    let prompt = cx.prompt_for_paths(PathPromptOptions {
+        files: false,
+        directories: true,
+        multiple: true,
+        prompt: Some("Choose directories".into()),
+    });
+    cx.spawn(async move |cx| {
+        if let Ok(Ok(Some(paths))) = prompt.await {
+            cx.update(|cx| {
+                let store = SettingsStore::global(cx);
+                store.update(cx, |store, cx| {
+                    store.edit(
+                        |settings| {
+                            for path in paths {
+                                let path = path.to_string_lossy().to_string();
+                                if !settings
+                                    .local_repos
+                                    .scan_paths
+                                    .iter()
+                                    .any(|existing| existing.to_string_lossy() == path)
+                                {
+                                    settings.local_repos.scan_paths.push(PathBuf::from(path));
+                                }
+                            }
+                        },
+                        cx,
+                    );
+                });
+            });
+        }
+    })
+    .detach();
+}
+
+pub fn default_folder_selector(default_folder: &Entity<InputState>) -> AnyElement {
+    let folder = default_folder.clone();
+    h_flex()
+        .gap_1()
+        .child(
+            div()
+                .flex_1()
+                .child(Input::new("settings-default-folder", folder.clone())),
+        )
+        .child(
+            Button::new("settings-choose-folder")
+                .icon(Icon::named(IconRole::Folder))
+                .variant(gpui_native_kit::button::ButtonVariant::Ghost)
+                .tooltip(Tooltip::text("Choose folder"))
+                .on_click(move |_, window, cx| {
+                    choose_default_folder(&folder, window, cx);
+                }),
+        )
+        .into_any_element()
+}
+
+fn choose_default_folder(default_folder: &Entity<InputState>, window: &mut Window, cx: &mut App) {
+    let handle = window.window_handle();
+    let default_folder = default_folder.clone();
+    let prompt = cx.prompt_for_paths(PathPromptOptions {
+        files: false,
+        directories: true,
+        multiple: false,
+        prompt: Some("Choose default folder".into()),
+    });
+    cx.spawn(async move |cx| {
+        if let Ok(Ok(Some(mut paths))) = prompt.await
+            && let Some(path) = paths.pop()
+        {
+            let text = path.to_string_lossy().to_string();
+            if let Err(error) = cx.update_window(handle, |_, window, cx| {
+                let store = SettingsStore::global(cx);
+                store.update(cx, |store, cx| {
+                    store.edit(
+                        |settings| settings.create_repository.default_folder = Some(path.clone()),
+                        cx,
+                    );
+                });
+                default_folder.update(cx, |input, cx| input.set_value(text, window, cx));
+            }) {
+                log::warn!("failed to apply default folder: {error}");
+            }
+        }
+    })
+    .detach();
+}

crates/signed_app/src/settings/mod.rs

@@ -0,0 +1,107 @@
+mod helpers;
+
+use gpui::{
+    App, AppContext as _, Context, Entity, IntoElement, ParentElement as _, Render, Styled as _,
+    Window, px,
+};
+use gpui_native_kit::common::v_flex;
+use gpui_native_kit::dialog::Dialog;
+use gpui_native_kit::input::InputState;
+use gpui_native_kit::separator::Separator;
+use helpers::{
+    appearance_select, default_folder_selector, event_fetching_select, grasp_servers_editor,
+    scan_paths_editor, setting_block, setting_row,
+};
+use settings::SettingsStore;
+
+use crate::shared::dialogs::open_global;
+
+pub struct SettingsDialog {
+    grasp_input: Entity<InputState>,
+    default_folder: Entity<InputState>,
+}
+
+impl SettingsDialog {
+    pub fn new(cx: &mut App) -> Entity<Self> {
+        let store = SettingsStore::global(cx);
+        let settings = store.read(cx).settings().clone();
+        let grasp_input = InputState::new(cx);
+
+        let folder = settings
+            .create_repository
+            .default_folder
+            .clone()
+            .unwrap_or_else(paths::desktop_dir);
+
+        let default_folder = InputState::builder()
+            .text(folder.to_string_lossy())
+            .read_only()
+            .build(cx);
+
+        cx.new(|_| Self {
+            grasp_input,
+            default_folder,
+        })
+    }
+}
+
+impl Render for SettingsDialog {
+    fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
+        let grasp_input = self.grasp_input.clone();
+        let default_folder = self.default_folder.clone();
+
+        Dialog::new("settings-dialog")
+            .open(true)
+            .min_width(px(650.))
+            .height(px(560.))
+            .on_change(|open, _, cx| {
+                if !open {
+                    crate::shared::dialogs::close_global(cx);
+                }
+            })
+            .title("Settings")
+            .content(move |_, cx| {
+                v_flex()
+                            .gap_4()
+                            .child(setting_row(
+                                cx,
+                                "Appearance",
+                                "Choose whether the app follows the system theme or uses a light/dark theme.",
+                                appearance_select(cx),
+                            ))
+                            .child(Separator::horizontal())
+                            .child(setting_row(
+                                cx,
+                                "Event Fetching Strategy",
+                                "Curated fetches events from relays in the repository's announcement. Uncensored also fetches from every maintainer's relays.",
+                                event_fetching_select(cx),
+                            ))
+                            .child(Separator::horizontal())
+                            .child(setting_block(
+                                cx,
+                                "Grasp Servers",
+                                "Servers used to host your git repositories via the Grasp protocol",
+                                grasp_servers_editor(&grasp_input, cx),
+                            ))
+                            .child(Separator::horizontal())
+                            .child(setting_block(
+                                cx,
+                                "Scan Directories",
+                                "Directories scanned for local git repositories.",
+                                scan_paths_editor(cx),
+                            ))
+                            .child(setting_block(
+                                cx,
+                                "Default Folder",
+                                "The folder for newly created repositories.",
+                                default_folder_selector(&default_folder),
+                            ))
+                    .into_any_element()
+            })
+    }
+}
+
+/// Opens the settings dialog.
+pub fn open(cx: &mut App) {
+    open_global(SettingsDialog::new(cx), cx);
+}

crates/signed_app/src/shared/dialogs.rs

@@ -0,0 +1,59 @@
+use gpui::prelude::FluentBuilder as _;
+use gpui::{
+    AnyView, App, Context, Entity, Global, IntoElement, ParentElement as _, Render, Styled as _,
+    Window, div,
+};
+
+struct GlobalDialogHost(Entity<DialogHost>);
+
+impl Global for GlobalDialogHost {}
+
+/// Owns the modal currently mounted at the window root.
+pub struct DialogHost {
+    open: Option<AnyView>,
+}
+
+impl DialogHost {
+    pub fn new(_cx: &mut Context<Self>) -> Self {
+        Self { open: None }
+    }
+
+    pub fn set_global(entity: Entity<Self>, cx: &mut App) {
+        cx.set_global(GlobalDialogHost(entity));
+    }
+
+    pub fn global(cx: &App) -> Entity<Self> {
+        cx.global::<GlobalDialogHost>().0.clone()
+    }
+
+    pub fn open(&mut self, view: AnyView, cx: &mut Context<Self>) {
+        self.open = Some(view);
+        cx.notify();
+    }
+
+    pub fn close(&mut self, cx: &mut Context<Self>) {
+        self.open = None;
+        cx.notify();
+    }
+}
+
+impl Render for DialogHost {
+    fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
+        div()
+            .absolute()
+            .inset_0()
+            .when_some(self.open.clone(), |host, view| host.child(view))
+    }
+}
+
+/// Replaces the mounted modal with `view`.
+pub fn open_global(view: impl Into<AnyView>, cx: &mut App) {
+    let host = DialogHost::global(cx);
+    host.update(cx, |host, cx| host.open(view.into(), cx));
+}
+
+/// Unmounts the current modal, if any.
+pub fn close_global(cx: &mut App) {
+    let host = DialogHost::global(cx);
+    host.update(cx, |host, cx| host.close(cx));
+}

crates/signed_app/src/shared/mod.rs

@@ -0,0 +1,18 @@
+pub mod dialogs;
+pub mod panels;
+pub mod progress;
+pub mod tree;
+pub mod widgets;
+
+/// Logs a discarded `Result` with its source location instead of dropping it silently.
+#[track_caller]
+pub fn log_dropped<T>(result: Result<T, anyhow::Error>) {
+    if let Err(error) = result {
+        let location = std::panic::Location::caller();
+        log::warn!(
+            "{}:{}: dropped result: {error}",
+            location.file(),
+            location.line()
+        );
+    }
+}

crates/signed_app/src/shared/panels.rs

@@ -0,0 +1,23 @@
+use gpui::{App, Entity, SharedString, WeakEntity, Window};
+use gpui_native_kit::layout::dock::{DockState, Panel};
+
+/// Registers a panel builder under `id` and opens it in the dock.
+pub fn open<P, F>(
+    dock: &WeakEntity<DockState>,
+    id: impl Into<SharedString>,
+    build: F,
+    window: &mut Window,
+    cx: &mut App,
+) where
+    P: Panel + 'static,
+    F: Fn(&mut Window, &mut App) -> Entity<P> + 'static,
+{
+    let id = id.into();
+
+    if let Err(error) = dock.update(cx, |dock, cx| {
+        dock.register_panel(id.clone(), build);
+        dock.open_panel(&id, window, cx);
+    }) {
+        log::warn!("failed to open panel {id}: {error}");
+    }
+}

crates/signed_app/src/shared/progress.rs

@@ -0,0 +1,128 @@
+use gpui::{
+    AnyElement, App, Context, IntoElement as _, ParentElement as _, SharedString, Styled as _,
+    Subscription, div, px,
+};
+use gpui_native_kit::common::{h_flex, v_flex};
+use gpui_native_kit::icons::{Icon, IconRole};
+use gpui_native_kit::spinner::Spinner;
+use gpui_native_kit::theme::ActiveTheme as _;
+use signed_core::RepoAddr;
+use signed_state::{Backend, BackendEvent, PushStepStatus};
+
+/// Progress of an async dialog action: a busy flag that disables the form and an error shown below it.
+#[derive(Debug, Default)]
+pub struct DialogProgress {
+    pub busy: bool,
+    pub error: Option<SharedString>,
+    // The repository whose push checklist is shown; `None` outside a publish.
+    push_addr: Option<RepoAddr>,
+    pub push_steps: Vec<PushStepStatus>,
+    _push_subscription: Option<Subscription>,
+}
+
+impl DialogProgress {
+    /// Marks an action as started, disabling the form and clearing the previous error.
+    pub fn begin(&mut self) {
+        self.busy = true;
+        self.error = None;
+    }
+
+    /// Starts a publish for the repository at `addr` and listens for its push steps.
+    pub fn begin_push(&mut self, addr: RepoAddr, cx: &mut Context<Self>) {
+        self.begin();
+        self.push_addr = Some(addr);
+        self.push_steps.clear();
+
+        if self._push_subscription.is_none() {
+            let backend = Backend::global(cx);
+            self._push_subscription = Some(cx.subscribe(&backend, |this, _backend, event, cx| {
+                let BackendEvent::PushProgress { addr, status } = event else {
+                    return;
+                };
+
+                if this.push_addr.as_ref() != Some(addr) {
+                    return;
+                }
+
+                match this
+                    .push_steps
+                    .iter_mut()
+                    .find(|step| step.step() == status.step())
+                {
+                    Some(step) => *step = status.clone(),
+                    None => this.push_steps.push(status.clone()),
+                }
+
+                cx.notify();
+            }));
+        }
+    }
+
+    /// Marks an action as failed, enabling the form and showing `message`.
+    pub fn fail(&mut self, message: impl Into<SharedString>) {
+        self.busy = false;
+        self.error = Some(message.into());
+    }
+}
+
+/// The shared error line under a dialog form, `None` when there is no error.
+pub fn error_row(error: &Option<SharedString>, cx: &App) -> Option<AnyElement> {
+    error.as_ref().map(|message| {
+        div()
+            .text_sm()
+            .text_color(cx.theme().ramps.destructive.base)
+            .child(message.clone())
+            .into_any_element()
+    })
+}
+
+/// The push checklist of a running publish, `None` before any step is reported.
+pub fn push_steps_row(steps: &[PushStepStatus], cx: &App) -> Option<AnyElement> {
+    if steps.is_empty() {
+        return None;
+    }
+
+    let rows = steps
+        .iter()
+        .map(|status| {
+            let label = SharedString::from(status.step().label());
+
+            match status {
+                PushStepStatus::Running(_) => h_flex()
+                    .gap_2()
+                    .text_sm()
+                    .text_color(cx.theme().colors.muted_foreground)
+                    .child(Spinner::new("push-step"))
+                    .child(label)
+                    .into_any_element(),
+                PushStepStatus::Done(_) => h_flex()
+                    .gap_2()
+                    .text_sm()
+                    .text_color(cx.theme().colors.foreground)
+                    .child(
+                        Icon::named(IconRole::Check)
+                            .size(px(14.))
+                            .color(cx.theme().colors.foreground),
+                    )
+                    .child(label)
+                    .into_any_element(),
+                PushStepStatus::Failed(_, reason) => h_flex()
+                    .gap_2()
+                    .text_sm()
+                    .text_color(cx.theme().ramps.destructive.base)
+                    .child(
+                        Icon::named(IconRole::Close)
+                            .size(px(14.))
+                            .color(cx.theme().ramps.destructive.base),
+                    )
+                    .child(SharedString::from(format!(
+                        "{}: {reason}",
+                        status.step().label()
+                    )))
+                    .into_any_element(),
+            }
+        })
+        .collect::<Vec<_>>();
+
+    Some(v_flex().gap_1().children(rows).into_any_element())
+}

crates/signed_app/src/shared/tree.rs

@@ -0,0 +1,188 @@
+use std::collections::{HashMap, HashSet};
+use std::path::PathBuf;
+
+pub struct TreeItemSeed {
+    /// Path of the node, relative to the worktree root.
+    pub id: String,
+    pub label: String,
+    pub children: Vec<TreeItemSeed>,
+}
+
+/// One visible row of the flattened tree.
+#[derive(Clone)]
+pub struct TreeRow {
+    pub id: String,
+    pub label: String,
+    pub depth: usize,
+    pub expandable: bool,
+    pub expanded: bool,
+}
+
+/// Flattens the seeds into the rows a flat tree renders, honoring `expanded`.
+pub fn flatten(seeds: &[TreeItemSeed], expanded: &HashSet<String>) -> Vec<TreeRow> {
+    fn push(
+        seed: &TreeItemSeed,
+        depth: usize,
+        expanded: &HashSet<String>,
+        rows: &mut Vec<TreeRow>,
+    ) {
+        let is_expanded = expanded.contains(&seed.id);
+        rows.push(TreeRow {
+            id: seed.id.clone(),
+            label: seed.label.clone(),
+            depth,
+            expandable: !seed.children.is_empty(),
+            expanded: is_expanded,
+        });
+
+        if is_expanded {
+            for child in &seed.children {
+                push(child, depth + 1, expanded, rows);
+            }
+        }
+    }
+
+    let mut rows = Vec::new();
+    for seed in seeds {
+        push(seed, 0, expanded, &mut rows);
+    }
+    rows
+}
+
+/// Every folder id, for starting with the tree fully expanded.
+pub fn collect_expanded(seeds: &[TreeItemSeed]) -> HashSet<String> {
+    fn push(seed: &TreeItemSeed, expanded: &mut HashSet<String>) {
+        if !seed.children.is_empty() {
+            expanded.insert(seed.id.clone());
+            for child in &seed.children {
+                push(child, expanded);
+            }
+        }
+    }
+
+    let mut expanded = HashSet::new();
+    for seed in seeds {
+        push(seed, &mut expanded);
+    }
+    expanded
+}
+
+/// Build nested tree items from a flat entry list sorted dirs-first.
+pub fn build_tree_items(entries: &[PathBuf]) -> Vec<TreeItemSeed> {
+    // Node indices by full path, so parents resolve in constant time while inserting.
+    let mut index: HashMap<String, usize> = HashMap::new();
+    let mut nodes: Vec<(String, String, Vec<usize>)> = Vec::new();
+    let mut roots: Vec<usize> = Vec::new();
+
+    for entry in entries {
+        let mut parent: Option<usize> = None;
+        let mut path = String::new();
+        for part in entry.components() {
+            let label = part.as_os_str().to_string_lossy().into_owned();
+            path = if path.is_empty() {
+                label.clone()
+            } else {
+                format!("{path}/{label}")
+            };
+            let ix = *index.entry(path.clone()).or_insert_with(|| {
+                let ix = nodes.len();
+                nodes.push((path.clone(), label.clone(), Vec::new()));
+                match parent {
+                    Some(parent) => nodes[parent].2.push(ix),
+                    None => roots.push(ix),
+                }
+                ix
+            });
+            parent = Some(ix);
+        }
+    }
+
+    fn assemble(ix: usize, nodes: &[(String, String, Vec<usize>)]) -> TreeItemSeed {
+        let (id, label, children) = &nodes[ix];
+        TreeItemSeed {
+            id: id.clone(),
+            label: label.clone(),
+            children: children
+                .iter()
+                .map(|child| assemble(*child, nodes))
+                .collect(),
+        }
+    }
+
+    roots.iter().map(|root| assemble(*root, &nodes)).collect()
+}
+
+/// Sorted relative paths of a worktree snapshot.
+pub fn sorted_worktree_paths(entries: &[PathBuf]) -> Vec<String> {
+    let mut paths: Vec<String> = entries
+        .iter()
+        .map(|path| path.to_string_lossy().into_owned())
+        .collect();
+    paths.sort();
+    paths
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn ids(rows: &[TreeRow]) -> Vec<(&str, usize)> {
+        rows.iter()
+            .map(|row| (row.id.as_str(), row.depth))
+            .collect()
+    }
+
+    #[test]
+    fn collapsed_folders_hide_children() {
+        let seeds = build_tree_items(&[
+            PathBuf::from("src"),
+            PathBuf::from("src/lib.rs"),
+            PathBuf::from("README.md"),
+        ]);
+
+        let rows = flatten(&seeds, &HashSet::new());
+
+        assert_eq!(ids(&rows), vec![("src", 0), ("README.md", 0)]);
+        assert!(rows[0].expandable);
+        assert!(!rows[0].expanded);
+    }
+
+    #[test]
+    fn expanding_a_folder_shows_children_in_order() {
+        let seeds = build_tree_items(&[
+            PathBuf::from("src"),
+            PathBuf::from("src/lib.rs"),
+            PathBuf::from("src/views/mod.rs"),
+            PathBuf::from("README.md"),
+        ]);
+        let expanded = HashSet::from(["src".to_owned(), "src/views".to_owned()]);
+
+        let rows = flatten(&seeds, &expanded);
+
+        assert_eq!(
+            ids(&rows),
+            vec![
+                ("src", 0),
+                ("src/lib.rs", 1),
+                ("src/views", 1),
+                ("src/views/mod.rs", 2),
+                ("README.md", 0),
+            ]
+        );
+    }
+
+    #[test]
+    fn indices_map_to_row_ids() {
+        let seeds = build_tree_items(&[
+            PathBuf::from("docs"),
+            PathBuf::from("docs/guide.md"),
+            PathBuf::from("README.md"),
+        ]);
+        let expanded = HashSet::from(["docs".to_owned()]);
+        let rows = flatten(&seeds, &expanded);
+
+        assert_eq!(rows[0].id, "docs");
+        assert_eq!(rows[1].id, "docs/guide.md");
+        assert_eq!(rows[2].id, "README.md");
+    }
+}

crates/signed_app/src/shared/widgets.rs

@@ -0,0 +1,98 @@
+use assets::CustomIconName;
+use gpui::{
+    AnyElement, App, Entity, IntoElement, ParentElement as _, SharedString, Styled as _, div,
+};
+use gpui_native_kit::avatar::Avatar;
+use gpui_native_kit::badge::{Badge, BadgeVariant};
+use gpui_native_kit::common::Sizable as _;
+use gpui_native_kit::empty_state::EmptyState;
+use gpui_native_kit::icons::Icon;
+use gpui_native_kit::theme::ActiveTheme as _;
+use gpui_native_kit::tooltip::Tooltip;
+use metadata::ProfileDirectory;
+use signed_core::RepoStatus;
+use signed_state::RepoStore;
+
+/// The status pill shown on issue and pull-request rows.
+pub fn status_badge(status: RepoStatus) -> Badge {
+    let (label, variant, icon) = match status {
+        RepoStatus::Open => ("Open", BadgeVariant::Neutral, CustomIconName::GitIssueOpen),
+        RepoStatus::Closed => (
+            "Closed",
+            BadgeVariant::Danger,
+            CustomIconName::GitIssueClosed,
+        ),
+        RepoStatus::Draft => (
+            "Draft",
+            BadgeVariant::Warning,
+            CustomIconName::GitIssueOngoing,
+        ),
+        RepoStatus::Applied => (
+            "Applied",
+            BadgeVariant::Success,
+            CustomIconName::GitIssueDone,
+        ),
+    };
+
+    Badge::new(format!("status-{label}"), label)
+        .variant(variant)
+        .icon(Icon::named(icon))
+        .tooltip(Tooltip::text(label))
+}
+
+/// A centered empty-state message filling the available space.
+pub fn empty_state(message: impl Into<SharedString>) -> AnyElement {
+    let message = message.into();
+    gpui_native_kit::common::v_flex()
+        .size_full()
+        .items_center()
+        .justify_center()
+        .child(EmptyState::new(message))
+        .into_any_element()
+}
+
+/// The profile avatar shown on a repository's panel tab.
+pub fn repo_tab_avatar(
+    store: &RepoStore,
+    directory: &Entity<ProfileDirectory>,
+    cx: &App,
+) -> AnyElement {
+    let seed = store
+        .announcement
+        .as_ref()
+        .map(|announcement| format!("{}:{}", announcement.owner, announcement.id))
+        .or_else(|| store.addr().map(|addr| addr.to_string()))
+        .or_else(|| {
+            store
+                .path
+                .as_ref()
+                .map(|path| path.to_string_lossy().into_owned())
+        })
+        .unwrap_or_default();
+
+    let owner = store
+        .announcement
+        .as_ref()
+        .map(|announcement| directory.read(cx).profile(&announcement.owner, cx));
+
+    let (name, picture) = owner
+        .map(|profile| (Some(profile.name()), profile.picture()))
+        .unwrap_or((None, None));
+
+    let avatar = match name {
+        Some(name) => Avatar::new(seed).name(name),
+        None => Avatar::new(seed),
+    };
+
+    avatar.picture(picture).small().into_any_element()
+}
+
+/// A one-line muted label used by section headers.
+pub fn section_label(text: impl Into<SharedString>, cx: &App) -> AnyElement {
+    div()
+        .text_xs()
+        .font_weight(gpui::FontWeight::SEMIBOLD)
+        .text_color(cx.theme().colors.muted_foreground)
+        .child(text.into())
+        .into_any_element()
+}

crates/signed_app/src/sidebar/helpers.rs

@@ -0,0 +1,51 @@
+use std::time::{SystemTime, UNIX_EPOCH};
+
+use gpui::{AnyElement, App, IntoElement, SharedString};
+use gpui_native_kit::avatar::Avatar;
+use gpui_native_kit::common::Sizable as _;
+use metadata::ProfileDirectory;
+use signed_state::{Nip34Binding, ResolvedLocalRepo};
+
+pub(super) fn pick_banner() -> SharedString {
+    let num = SystemTime::now()
+        .duration_since(UNIX_EPOCH)
+        .map(|duration| duration.subsec_nanos())
+        .unwrap_or(1)
+        % 3
+        + 1;
+    format!("backgrounds/banner{num}.jpg").into()
+}
+
+/// The platform that bound a repository, `"nak"` or `"ngit"`.
+pub(super) fn local_platform(binding: &Nip34Binding) -> Option<&'static str> {
+    let signals = &binding.signals;
+
+    if signals.nip34_json || signals.nip34_grasp_remote || signals.nip34_state_refs {
+        Some("nak")
+    } else if signals.nostr_repo_config {
+        Some("ngit")
+    } else {
+        None
+    }
+}
+
+/// The bound owner's avatar, falling back to the path's pixel avatar when unowned.
+pub(super) fn local_avatar(
+    entry: &ResolvedLocalRepo,
+    directory: &gpui::Entity<ProfileDirectory>,
+    cx: &App,
+) -> AnyElement {
+    let Some(owner) = entry.nip34.as_ref().and_then(|binding| binding.owner) else {
+        return Avatar::new(entry.path.to_string_lossy())
+            .small()
+            .into_any_element();
+    };
+
+    let profile = directory.read(cx).profile(&owner, cx);
+
+    Avatar::new(owner)
+        .name(profile.name())
+        .picture(profile.picture())
+        .small()
+        .into_any_element()
+}

crates/signed_app/src/sidebar/mod.rs

@@ -0,0 +1,683 @@
+use std::collections::HashMap;
+use std::sync::Arc;
+
+use assets::CustomIconName;
+use gpui::{
+    AnyElement, App, AppContext as _, Context, FontWeight, IntoElement, ObjectFit,
+    ParentElement as _, SharedString, Styled as _, StyledImage as _, Subscription, WeakEntity,
+    Window, div, img, px,
+};
+use gpui_native_kit::avatar::Avatar;
+use gpui_native_kit::badge::{Badge, BadgeVariant};
+use gpui_native_kit::button::{Button, ButtonVariant};
+use gpui_native_kit::common::{Sizable as _, h_flex, v_flex};
+use gpui_native_kit::data::sidebar::{Sidebar, SidebarEntry};
+use gpui_native_kit::icons::{Icon, IconRole};
+use gpui_native_kit::layout::dock::DockState;
+use gpui_native_kit::menu::{Menu, MenuItem};
+use gpui_native_kit::theme::ActiveTheme as _;
+use gpui_native_kit::tooltip::Tooltip;
+use helpers::{local_avatar, local_platform, pick_banner};
+use metadata::{Profile, ProfileDirectory};
+use nostr::prelude::PublicKey;
+use signed_core::{Announcement, RepoAddr};
+use signed_state::{
+    Backend, BackendEvent, CheckoutsStore, LocalReposStore, Nip34Kind, RepoListStore,
+    ResolvedLocalRepo, SyncStatusDirectory,
+};
+
+use crate::explore::ExploreView;
+use crate::identity;
+use crate::inbox::InboxView;
+use crate::repo::dialogs;
+use crate::settings;
+
+mod helpers;
+
+#[derive(Clone, Copy)]
+enum SidebarSlot {
+    Inbox,
+    Browse,
+    Search,
+    Header,
+    Repo(usize),
+    Local(usize),
+}
+
+pub struct SidebarView {
+    weak: WeakEntity<Self>,
+    dock: WeakEntity<DockState>,
+    banner: SharedString,
+    scanning: bool,
+    /// User's announced repositories.
+    announcements: Arc<Vec<Announcement>>,
+    /// Local repositories found by the scan that are not announced yet.
+    local_repos: Arc<Vec<ResolvedLocalRepo>>,
+    /// Unpushed commit counts per announced repository.
+    unpushed: HashMap<RepoAddr, usize>,
+    /// Profiles rendered by the sidebar.
+    directory: gpui::Entity<ProfileDirectory>,
+    /// Sync statuses for the announced repositories.
+    sync_directory: gpui::Entity<SyncStatusDirectory>,
+    user_menu_open: bool,
+    _subscriptions: Vec<Subscription>,
+}
+
+impl SidebarView {
+    pub fn new(dock: WeakEntity<DockState>, cx: &mut Context<Self>) -> Self {
+        let backend = Backend::global(cx);
+        let repos = RepoListStore::global(cx);
+        let local = LocalReposStore::global(cx);
+        let checkouts = CheckoutsStore::global(cx);
+
+        let mut subscriptions = Vec::new();
+
+        // Identity changes swap the whole sidebar between the sign-in screen and the signed-in content.
+        subscriptions.push(cx.subscribe(&backend, |this, _backend, event, cx| {
+            let signer_changed = matches!(event, BackendEvent::SignerChanged);
+            let signer_required = matches!(event, BackendEvent::SignerRequired);
+
+            if signer_required {
+                this.banner = pick_banner();
+                cx.notify();
+            }
+
+            if this.refresh(cx) || signer_changed {
+                cx.notify();
+            }
+        }));
+
+        subscriptions.push(cx.observe(&repos, |this, _repos, cx| {
+            if this.refresh(cx) {
+                cx.notify();
+            }
+        }));
+
+        subscriptions.push(cx.observe(&local, |this, _local, cx| {
+            if this.refresh(cx) {
+                cx.notify();
+            }
+        }));
+
+        // Push statuses are recomputed in the background, so only the badge counts change.
+        subscriptions.push(cx.observe(&checkouts, |this, _checkouts, cx| {
+            if this.refresh_unpushed(cx) {
+                cx.notify();
+            }
+        }));
+
+        Self {
+            weak: cx.entity().downgrade(),
+            dock,
+            banner: pick_banner(),
+            announcements: Arc::new(Vec::new()),
+            local_repos: Arc::new(Vec::new()),
+            scanning: false,
+            unpushed: HashMap::new(),
+            directory: ProfileDirectory::new(cx),
+            sync_directory: SyncStatusDirectory::new(cx),
+            user_menu_open: false,
+            _subscriptions: subscriptions,
+        }
+    }
+
+    fn refresh(&mut self, cx: &mut Context<Self>) -> bool {
+        let backend = Backend::global(cx);
+        let user = backend.read(cx).current_user();
+
+        let (announcements, local_repos, scanning) = {
+            let repo_list = RepoListStore::global(cx).read(cx);
+
+            let announcements = user
+                .as_ref()
+                .map(|user| repo_list.announcements_of(user))
+                .unwrap_or_default();
+
+            let local = LocalReposStore::global(cx).read(cx);
+            let local_repos =
+                LocalReposStore::resolve(&local.repos, &repo_list.announcements, &announcements);
+
+            (announcements, local_repos, local.scanning)
+        };
+
+        let announcements_changed = *self.announcements != announcements;
+        let local_changed = *self.local_repos != local_repos;
+        let scanning_changed = self.scanning != scanning;
+
+        self.announcements = Arc::new(announcements);
+        self.local_repos = Arc::new(local_repos);
+        self.scanning = scanning;
+
+        let mut profiles: Vec<PublicKey> = user.into_iter().collect();
+        let owners: Vec<PublicKey> = self
+            .local_repos
+            .iter()
+            .filter_map(|entry| {
+                entry
+                    .nip34
+                    .as_ref()
+                    .and_then(|binding| binding.owner)
+                    .filter(|owner| !profiles.contains(owner))
+            })
+            .collect();
+
+        profiles.extend(owners);
+
+        self.directory.update(cx, |directory, cx| {
+            directory.track(profiles, cx);
+        });
+
+        let addrs: Vec<RepoAddr> = self
+            .announcements
+            .iter()
+            .map(|announcement| announcement.addr())
+            .collect();
+
+        self.sync_directory.update(cx, |directory, cx| {
+            directory.track(addrs, cx);
+        });
+
+        if announcements_changed {
+            self.request_push_watches(cx);
+            self.unpushed.clear();
+        }
+
+        announcements_changed || local_changed || scanning_changed
+    }
+
+    fn refresh_unpushed(&mut self, cx: &mut Context<Self>) -> bool {
+        let checkouts = CheckoutsStore::global(cx);
+        let mut unpushed = HashMap::with_capacity(self.announcements.len());
+
+        for announcement in self.announcements.iter() {
+            let addr = announcement.addr();
+            let count = checkouts.read(cx).unpushed(&addr);
+            if count > 0 {
+                unpushed.insert(addr, count);
+            }
+        }
+
+        if unpushed == self.unpushed {
+            return false;
+        }
+
+        self.unpushed = unpushed;
+        true
+    }
+
+    fn request_push_watches(&self, cx: &mut Context<Self>) {
+        let checkouts = CheckoutsStore::global(cx);
+        checkouts.update(cx, |checkouts, cx| {
+            for announcement in self.announcements.iter() {
+                checkouts.request_push_statuses(&announcement.addr(), cx);
+            }
+        });
+    }
+
+    /// Renders the sidebar for the current identity state.
+    pub fn build(&self, cx: &App) -> Sidebar {
+        let backend = Backend::global(cx);
+
+        let profile = backend
+            .read(cx)
+            .current_user()
+            .map(|public_key| self.directory.read(cx).profile(&public_key, cx));
+
+        let Some(profile) = profile else {
+            return Sidebar::new("signed-sidebar").content(self.render_sign_in(cx));
+        };
+
+        let weak = self.weak.clone();
+        let announcements = self.announcements.clone();
+        let local_repos = self.local_repos.clone();
+        let unpushed = self.unpushed.clone();
+        let directory = self.directory.clone();
+        let sync_directory = self.sync_directory.clone();
+
+        Sidebar::new("signed-sidebar")
+            .transparent(true)
+            .header(self.render_user(&profile, self.scanning, cx))
+            .footer(self.render_footer(cx))
+            .entries(move |_, cx| {
+                let muted = cx.theme().colors.muted_foreground;
+                let mut entries = vec![
+                    SidebarEntry::row("inbox", "Inbox").prefix(
+                        Icon::named(CustomIconName::Inbox)
+                            .size(px(14.))
+                            .color(muted),
+                    ),
+                    SidebarEntry::row("browse", "Browse").prefix(
+                        Icon::named(CustomIconName::Globe)
+                            .size(px(14.))
+                            .color(muted),
+                    ),
+                    SidebarEntry::row("search", "Search")
+                        .prefix(Icon::named(IconRole::Search).size(px(14.)).color(muted)),
+                    SidebarEntry::header("All Repositories"),
+                ];
+
+                for announcement in announcements.iter() {
+                    let owner = directory.read(cx).profile(&announcement.owner, cx);
+                    let name = announcement
+                        .name
+                        .as_deref()
+                        .map(SharedString::from)
+                        .unwrap_or_else(|| SharedString::from(announcement.id.clone()));
+                    let addr = announcement.addr();
+                    let mut row = SidebarEntry::row(
+                        SharedString::from(format!("repo:{}", announcement.id)),
+                        name,
+                    )
+                    .prefix(
+                        Avatar::new(announcement.owner)
+                            .name(owner.name())
+                            .picture(owner.picture())
+                            .small(),
+                    );
+
+                    let count = unpushed.get(&addr).copied().unwrap_or(0);
+                    let unsynced = sync_directory.read(cx).unsynced(&addr, cx);
+
+                    if count > 0 || unsynced > 0 {
+                        let mut badges = h_flex().gap_1();
+                        if count > 0 {
+                            badges = badges.child(
+                                Badge::new(
+                                    SharedString::from(format!("unpushed:{addr}")),
+                                    count.to_string(),
+                                )
+                                .variant(BadgeVariant::Danger),
+                            );
+                        }
+                        if unsynced > 0 {
+                            badges = badges.child(
+                                Badge::new(
+                                    SharedString::from(format!("unsynced:{addr}")),
+                                    unsynced.to_string(),
+                                )
+                                .variant(BadgeVariant::Accent),
+                            );
+                        }
+                        row = row.suffix(badges);
+                    }
+
+                    entries.push(row);
+                }
+
+                for entry in local_repos.iter() {
+                    let suffix: AnyElement = match entry.nip34.as_ref() {
+                        Some(binding) => {
+                            let (label, note) = match binding.kind {
+                                Nip34Kind::Initialized => {
+                                    let platform = local_platform(binding).unwrap_or("Grasp");
+                                    (platform, "Initialized for NIP-34")
+                                }
+                                Nip34Kind::Cloned => ("Cloned", "Cloned but not initialized"),
+                                Nip34Kind::ToolingOnly => ("Tooling", "Grasp tooling only"),
+                            };
+                            Badge::new(
+                                SharedString::from(format!("local-badge:{}", entry.path.display())),
+                                label,
+                            )
+                            .tooltip(Tooltip::text(note))
+                            .into_any_element()
+                        }
+                        None => Badge::new(
+                            SharedString::from(format!(
+                                "local-unpublished:{}",
+                                entry.path.display()
+                            )),
+                            "Unpublished",
+                        )
+                        .variant(BadgeVariant::Warning)
+                        .into_any_element(),
+                    };
+
+                    entries.push(
+                        SidebarEntry::row(
+                            SharedString::from(format!("local-repo:{}", entry.path.display())),
+                            entry.name(),
+                        )
+                        .prefix(local_avatar(entry, &directory, cx))
+                        .suffix(suffix),
+                    );
+                }
+
+                debug_assert_eq!(
+                    entries.len(),
+                    slots(announcements.len(), local_repos.len()).len()
+                );
+                entries
+            })
+            .on_change(move |index, window, cx| {
+                if let Err(error) = weak.update(cx, |this, cx| this.activate(index, window, cx)) {
+                    log::warn!("failed to activate sidebar row: {error}");
+                }
+            })
+    }
+
+    fn activate(&mut self, index: Option<usize>, window: &mut Window, cx: &mut Context<Self>) {
+        let Some(index) = index else {
+            return;
+        };
+        let Some(slot) = slots(self.announcements.len(), self.local_repos.len())
+            .get(index)
+            .copied()
+        else {
+            return;
+        };
+
+        match slot {
+            SidebarSlot::Inbox => self.open_inbox(window, cx),
+            SidebarSlot::Browse | SidebarSlot::Search => self.open_explore(window, cx),
+            SidebarSlot::Header => {}
+            SidebarSlot::Repo(ix) => {
+                if let Some(announcement) = self.announcements.get(ix).cloned() {
+                    let addr = announcement.addr();
+                    crate::repo::actions::open_repo_panel(
+                        &self.dock,
+                        &addr,
+                        Some(&announcement),
+                        window,
+                        cx,
+                    );
+                }
+            }
+            SidebarSlot::Local(ix) => {
+                if let Some(entry) = self.local_repos.get(ix).cloned() {
+                    self.open_local_entry(entry, window, cx);
+                }
+            }
+        }
+    }
+
+    /// A local repository opens as the announced repository when its binding matches one.
+    fn open_local_entry(
+        &mut self,
+        entry: ResolvedLocalRepo,
+        window: &mut Window,
+        cx: &mut Context<Self>,
+    ) {
+        let ResolvedLocalRepo {
+            path,
+            nip34,
+            announcement,
+        } = entry;
+
+        if let Some(announcement) = announcement {
+            let id = SharedString::from(format!("repo:{}", announcement.addr()));
+            let dock = self.dock.clone();
+            let dock_for_build = dock.clone();
+            crate::shared::panels::open(
+                &dock,
+                id,
+                move |window, cx| {
+                    cx.new(|cx| {
+                        crate::repo::RepoDetailView::new_local_announced(
+                            dock_for_build.clone(),
+                            announcement.clone(),
+                            path.clone(),
+                            window,
+                            cx,
+                        )
+                    })
+                },
+                window,
+                cx,
+            );
+            return;
+        }
+
+        let id = SharedString::from(format!("repo-local:{}", path.display()));
+        let dock = self.dock.clone();
+        let dock_for_build = dock.clone();
+        crate::shared::panels::open(
+            &dock,
+            id,
+            move |window, cx| {
+                cx.new(|cx| {
+                    crate::repo::RepoDetailView::new_local(
+                        dock_for_build.clone(),
+                        path.clone(),
+                        nip34.clone(),
+                        window,
+                        cx,
+                    )
+                })
+            },
+            window,
+            cx,
+        );
+    }
+
+    fn render_footer(&self, _cx: &App) -> impl IntoElement {
+        let guide_weak = self.weak.clone();
+        let settings_click = |_: &gpui::ClickEvent, _: &mut Window, cx: &mut gpui::App| {
+            settings::open(cx);
+        };
+
+        v_flex()
+            .p_2()
+            .gap_1()
+            .w_full()
+            .child(
+                Button::new("guide")
+                    .label("Guide")
+                    .variant(ButtonVariant::Ghost)
+                    .on_click(move |_, window, cx| {
+                        crate::shared::log_dropped(guide_weak.update(cx, |this, cx| {
+                            this.open_explore(window, cx);
+                        }));
+                    }),
+            )
+            .child(
+                Button::new("settings")
+                    .label("Settings")
+                    .variant(ButtonVariant::Ghost)
+                    .on_click(settings_click),
+            )
+    }
+
+    fn open_inbox(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let dock = self.dock.clone();
+        let dock_for_build = dock.clone();
+
+        crate::shared::panels::open(
+            &dock,
+            "inbox",
+            move |_, cx| cx.new(|cx| InboxView::new(dock_for_build.clone(), cx)),
+            window,
+            cx,
+        );
+    }
+
+    fn open_explore(&mut self, window: &mut Window, cx: &mut Context<Self>) {
+        let dock = self.dock.clone();
+        let dock_for_build = dock.clone();
+
+        crate::shared::panels::open(
+            &dock,
+            "explore",
+            move |_window, cx| cx.new(|cx| ExploreView::new(dock_for_build.clone(), cx)),
+            window,
+            cx,
+        );
+    }
+
+    fn open_panel(&mut self, id: &str, window: &mut Window, cx: &mut Context<Self>) {
+        if let Err(error) = self
+            .dock
+            .update(cx, |dock, cx| dock.open_panel(id, window, cx))
+        {
+            log::warn!("failed to open panel {id}: {error}");
+        }
+    }
+
+    fn render_user(&self, profile: &Profile, scanning: bool, cx: &App) -> impl IntoElement {
+        let name = profile.name();
+        let picture = profile.picture();
+        let public_key = profile.public_key();
+        let weak = self.weak.clone();
+        let weak_for_open = self.weak.clone();
+        let muted = cx.theme().colors.muted_foreground;
+        let dock = self.dock.clone();
+
+        let menu = Menu::new("user-menu")
+            .open(self.user_menu_open)
+            .on_change({
+                let weak = weak_for_open.clone();
+                move |open, _, cx| {
+                    if let Err(error) = weak.update(cx, |this, cx| {
+                        this.user_menu_open = open;
+                        cx.notify();
+                    }) {
+                        log::warn!("failed to update user menu: {error}");
+                    }
+                }
+            })
+            .trigger({
+                let name = name.clone();
+                let picture = picture.clone();
+                move |_, _| {
+                    h_flex()
+                        .gap_1()
+                        .items_center()
+                        .child(
+                            Avatar::new(public_key)
+                                .name(name.clone())
+                                .picture(picture.clone()),
+                        )
+                        .child(
+                            div()
+                                .text_xs()
+                                .font_weight(FontWeight::SEMIBOLD)
+                                .child(name.clone()),
+                        )
+                        .child(
+                            Icon::named(IconRole::ChevronDown)
+                                .size(px(12.))
+                                .color(muted),
+                        )
+                        .into_any_element()
+                }
+            })
+            .items(move |_, _| {
+                let profile_weak = weak.clone();
+                let relays_weak = weak.clone();
+
+                vec![
+                    MenuItem::new("View Profile").handler(move |window, cx| {
+                        if let Err(error) = profile_weak.update(cx, |this, cx| {
+                            this.open_panel("profile", window, cx);
+                        }) {
+                            log::warn!("failed to open profile: {error}");
+                        }
+                    }),
+                    MenuItem::new("View Relays").handler(move |window, cx| {
+                        if let Err(error) = relays_weak.update(cx, |this, cx| {
+                            this.open_panel("relays", window, cx);
+                        }) {
+                            log::warn!("failed to open relays: {error}");
+                        }
+                    }),
+                    MenuItem::separator(),
+                    MenuItem::new("Exit")
+                        .destructive(true)
+                        .handler(|_, cx| identity::helpers::open_exit(cx)),
+                ]
+            });
+
+        h_flex().w_full().justify_between().child(menu).child(
+            h_flex()
+                .gap_1()
+                .child(
+                    Button::new("rescan-repos")
+                        .icon(Icon::named(IconRole::Loader))
+                        .variant(ButtonVariant::Ghost)
+                        .loading(scanning)
+                        .disabled(scanning)
+                        .tooltip(Tooltip::text("Rescan for local repositories"))
+                        .on_click(move |_, _, cx| {
+                            let local_repos = LocalReposStore::global(cx);
+                            local_repos.update(cx, |store, cx| store.rescan(cx));
+                        }),
+                )
+                .child(
+                    Button::new("add-repo")
+                        .icon(Icon::named(IconRole::Plus))
+                        .variant(ButtonVariant::Ghost)
+                        .tooltip(Tooltip::text("Create repository"))
+                        .on_click({
+                            let dock = dock.clone();
+                            move |_, window, cx| {
+                                dialogs::create::open(dock.clone(), window, cx);
+                            }
+                        }),
+                ),
+        )
+    }
+
+    /// Shown while no identity is signed in.
+    fn render_sign_in(&self, _cx: &App) -> impl IntoElement {
+        let weak = self.weak.clone();
+        let import_weak = self.weak.clone();
+
+        v_flex()
+            .size_full()
+            .relative()
+            .child(
+                div().absolute().inset_0().child(
+                    img(self.banner.clone())
+                        .size_full()
+                        .object_fit(ObjectFit::Cover),
+                ),
+            )
+            .child(
+                v_flex()
+                    .size_full()
+                    .justify_end()
+                    .p_4()
+                    .gap_4()
+                    .child(img("backgrounds/headline.png").max_w_48())
+                    .child(
+                        v_flex()
+                            .gap_1()
+                            .w_full()
+                            .child(Button::new("onboarding").label("Join now").on_click(
+                                move |_, window, cx| {
+                                    if let Err(error) = weak.update(cx, |this, cx| {
+                                        this.open_panel("welcome", window, cx);
+                                        identity::helpers::open_onboarding(cx);
+                                    }) {
+                                        log::warn!("failed to open onboarding: {error}");
+                                    }
+                                },
+                            ))
+                            .child(
+                                Button::new("import")
+                                    .label("Import identity")
+                                    .variant(ButtonVariant::Secondary)
+                                    .on_click(move |_, _, cx| {
+                                        if let Err(error) = import_weak
+                                            .update(cx, |_, cx| identity::helpers::open_import(cx))
+                                        {
+                                            log::warn!("failed to open import: {error}");
+                                        }
+                                    }),
+                            ),
+                    ),
+            )
+    }
+}
+
+fn slots(announcements: usize, local_repos: usize) -> Vec<SidebarSlot> {
+    let mut slots = vec![
+        SidebarSlot::Inbox,
+        SidebarSlot::Browse,
+        SidebarSlot::Search,
+        SidebarSlot::Header,
+    ];
+    slots.extend((0..announcements).map(SidebarSlot::Repo));
+    slots.extend((0..local_repos).map(SidebarSlot::Local));
+    slots
+}

crates/signed_core/Cargo.toml

@@ -7,3 +7,4 @@ publish.workspace = true
 [dependencies]
 nostr.workspace = true
 serde.workspace = true
+utils = { path = "../utils" }

crates/signed_core/src/addr.rs

@@ -1,23 +1,98 @@
+use std::fmt;
+use std::str::FromStr;
+
 use nostr::prelude::*;
+use serde::{Deserialize, Serialize};
 
-/// Address of a NIP-34 repository announcement, `30617:<owner-pubkey>:<repo-id>`.
-///
-/// The Rust Nostr SDK's [`Coordinate`] parses, formats and hashes this,
-/// the alias reuses the SDK type while keeping repository-specific vocabulary.
-pub type RepoAddr = Coordinate;
+#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
+#[serde(transparent)]
+pub struct RepoAddr(Coordinate);
 
-pub fn repo_addr(owner: PublicKey, id: impl Into<String>) -> RepoAddr {
-    Coordinate::new(Kind::GitRepoAnnouncement, owner).identifier(id)
+impl RepoAddr {
+    pub fn new(owner: PublicKey, identifier: impl Into<String>) -> Self {
+        Self(Coordinate::new(Kind::GitRepoAnnouncement, owner).identifier(identifier))
+    }
+
+    pub fn identifier_from_name(name: &str) -> String {
+        name.chars()
+            .map(|c| {
+                if c.is_ascii_alphanumeric() || c == '/' {
+                    c
+                } else {
+                    '-'
+                }
+            })
+            .collect()
+    }
+
+    pub fn kind(&self) -> Kind {
+        self.0.kind
+    }
+
+    pub fn public_key(&self) -> PublicKey {
+        self.0.public_key
+    }
+
+    pub fn identifier(&self) -> &str {
+        &self.0.identifier
+    }
+
+    pub fn coordinate(&self) -> &Coordinate {
+        &self.0
+    }
+
+    pub fn announcement_filter(&self) -> Filter {
+        Filter::new()
+            .kind(Kind::GitRepoAnnouncement)
+            .author(self.public_key())
+            .identifier(self.identifier())
+    }
+
+    pub fn state_filter(&self) -> Filter {
+        Filter::new()
+            .kind(Kind::RepoState)
+            .author(self.public_key())
+            .identifier(self.identifier())
+    }
+
+    pub fn activity_filter(&self) -> Filter {
+        Filter::new()
+            .kinds(crate::filters::ACTIVITY_KINDS)
+            .coordinate(&self.0)
+    }
+
+    pub fn deletion_filters(&self) -> Vec<Filter> {
+        vec![
+            Filter::new()
+                .kinds([Kind::EventDeletion, Kind::RequestToVanish])
+                .author(self.public_key()),
+            Filter::new().kind(Kind::EventDeletion).coordinate(&self.0),
+        ]
+    }
 }
 
-pub fn identifier_from_name(name: &str) -> String {
-    name.chars()
-        .map(|c| {
-            if c.is_ascii_alphanumeric() || c == '/' {
-                c
-            } else {
-                '-'
-            }
-        })
-        .collect()
+impl fmt::Display for RepoAddr {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::Display::fmt(&self.0, f)
+    }
+}
+
+impl FromStr for RepoAddr {
+    type Err = <Coordinate as FromStr>::Err;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        Coordinate::from_str(s).map(RepoAddr)
+    }
+}
+
+impl From<Coordinate> for RepoAddr {
+    fn from(coordinate: Coordinate) -> Self {
+        RepoAddr(coordinate)
+    }
+}
+
+impl From<RepoAddr> for Coordinate {
+    fn from(addr: RepoAddr) -> Self {
+        addr.0
+    }
 }

crates/signed_core/src/annotations.rs

@@ -1,7 +0,0 @@
-use nostr::prelude::*;
-
-/// GitWorkshop and `ngit` cover-note extension, kind 1624.
-///
-/// A markdown note attached to an issue, patch or PR by its author or a maintainer,
-/// not part of the NIP-34 draft, read support for interop.
-pub const COVER_NOTE_KIND: Kind = Kind::Custom(1624);

crates/signed_core/src/announcement.rs

@@ -0,0 +1,492 @@
+use std::collections::HashSet;
+
+use nostr::prelude::*;
+
+use crate::RepoAddr;
+use crate::upstream::Upstream;
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct Announcement {
+    pub event_id: EventId,
+    pub id: String,
+    pub owner: PublicKey,
+    pub created_at: Timestamp,
+    pub name: Option<String>,
+    pub description: Option<String>,
+    pub web: Vec<Url>,
+    pub clone: Vec<Url>,
+    pub relays: Vec<RelayUrl>,
+    pub euc: Option<String>,
+    pub maintainers: Vec<PublicKey>,
+    pub upstream: Option<Upstream>,
+    pub hashtags: Vec<String>,
+}
+
+impl Announcement {
+    /// Lists forks of the base, the user's own first.
+    pub fn forks_in<'a>(
+        announcements: &'a [Announcement],
+        base: &RepoAddr,
+        base_euc: Option<&str>,
+        user: Option<PublicKey>,
+    ) -> Vec<&'a Announcement> {
+        let (mut own, mut others) = (Vec::new(), Vec::new());
+        for announcement in announcements {
+            if announcement.clone.is_empty() || !announcement.is_fork_of(base, base_euc) {
+                continue;
+            }
+            if Some(announcement.owner) == user {
+                own.push(announcement);
+            } else {
+                others.push(announcement);
+            }
+        }
+        own.into_iter().chain(others).collect()
+    }
+
+    /// Parses a kind 30617 event, rejecting other kinds and missing `d` tags.
+    pub fn from_event(event: &Event) -> Option<Self> {
+        if event.kind != Kind::GitRepoAnnouncement {
+            return None;
+        }
+
+        let id = event.tags.identifier()?;
+
+        let mut hashtags: Vec<String> = Vec::new();
+        hashtags.extend(event.tags.hashtags().map(|t| t.to_string()));
+
+        let mut name: Option<String> = None;
+        let mut description: Option<String> = None;
+        let mut web: Vec<Url> = Vec::new();
+        let mut clone: Vec<Url> = Vec::new();
+        let mut relays: Vec<RelayUrl> = Vec::new();
+        let mut euc: Option<String> = None;
+        let mut maintainers: Vec<PublicKey> = Vec::new();
+        let mut upstream: Option<Upstream> = None;
+
+        for tag in event.tags.iter() {
+            match Nip34Tag::parse(tag.as_slice()) {
+                Ok(Nip34Tag::Name(value)) => name = Some(value),
+                Ok(Nip34Tag::Description(value)) => description = Some(value),
+                Ok(Nip34Tag::Web(urls)) => web.extend(urls),
+                Ok(Nip34Tag::Clone(urls)) => clone.extend(urls),
+                Ok(Nip34Tag::Relays(urls)) => relays.extend(urls),
+                Ok(Nip34Tag::EarliestUniqueCommitId(commit)) => euc = Some(commit.to_string()),
+                Ok(Nip34Tag::Maintainers(keys)) => maintainers.extend(keys),
+                _ => {}
+            }
+
+            if upstream.is_none() && tag.kind() == "u" {
+                let values = tag.as_slice();
+                let raw = values.get(1).map(String::as_str).unwrap_or_default();
+                if !raw.is_empty() {
+                    upstream = Some(Upstream::parse(raw));
+                }
+            }
+        }
+
+        Some(Self {
+            event_id: event.id,
+            owner: event.pubkey,
+            created_at: event.created_at,
+            id,
+            name,
+            description,
+            web,
+            clone,
+            relays,
+            euc,
+            maintainers,
+            upstream,
+            hashtags,
+        })
+    }
+
+    /// Returns the owner and identifier as a repository address.
+    pub fn addr(&self) -> RepoAddr {
+        RepoAddr::new(self.owner, self.id.clone())
+    }
+
+    /// Returns the name, defaulting to "Untitled".
+    pub fn name(&self) -> String {
+        self.name.clone().unwrap_or("Untitled".into())
+    }
+
+    /// Matches a `u` tag pointing at the base or a shared earliest unique commit.
+    pub fn is_fork_of(&self, base: &RepoAddr, base_euc: Option<&str>) -> bool {
+        if self.addr() == *base {
+            return false;
+        }
+        if self.upstream.as_ref().and_then(|u| u.addr.as_ref()) == Some(base) {
+            return true;
+        }
+        base_euc.is_some_and(|euc| self.euc.as_deref() == Some(euc))
+    }
+
+    /// Returns the description, defaulting to "No description".
+    pub fn description(&self) -> String {
+        self.description
+            .clone()
+            .unwrap_or("No description".to_string())
+    }
+
+    /// Adds the owner to the maintainers unless a `u` tag marks this a subordinate fork.
+    pub fn effective_maintainers(&self) -> Vec<PublicKey> {
+        let mut maintainers = self.maintainers.clone();
+        if self.upstream.is_none() && !maintainers.contains(&self.owner) {
+            maintainers.push(self.owner);
+        }
+        maintainers
+    }
+
+    /// Returns deduplicated `git clone` commands for the advertised URLs.
+    pub fn clone_urls(&self) -> Vec<String> {
+        let mut seen = HashSet::new();
+        self.clone
+            .iter()
+            .map(|url| format!("git clone {url}"))
+            .filter(|command| seen.insert(command.clone()))
+            .collect()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    const MAINTAINER_HEX: &str = "68d81165918100b7da43fc28f7d1fc12554466e1115886b9e7bb326f65ec4272";
+
+    /// Returns the test signer keys.
+    fn keys() -> Keys {
+        Keys::new(
+            SecretKey::from_hex("0000000000000000000000000000000000000000000000000000000000000001")
+                .expect("valid secret key"),
+        )
+    }
+
+    /// Builds a signed repo announcement event from raw tags.
+    fn announcement_event(tags: &[&[&str]]) -> Event {
+        let tags: Vec<Tag> = tags
+            .iter()
+            .map(|t| Tag::parse(t.to_vec()).expect("valid tag"))
+            .collect();
+
+        EventBuilder::new(Kind::GitRepoAnnouncement, "")
+            .tags(tags)
+            .finalize(&keys())
+            .expect("signed event")
+    }
+
+    /// Parses an event carrying every supported tag.
+    #[test]
+    fn parses_full_announcement() {
+        let event = announcement_event(&[
+            &["d", "my-repo"],
+            &["name", "My Repo"],
+            &["description", "A test repository"],
+            &["web", "https://example.com/repo"],
+            &["clone", "https://example.com/repo.git"],
+            &["relays", "wss://relay.example.com"],
+            &["r", "aa231c4c6a5777dc89b42207b499891a344add5c", "euc"],
+            &["maintainers", MAINTAINER_HEX],
+            &["t", "rust"],
+            &["t", "nostr"],
+        ]);
+
+        let announcement = Announcement::from_event(&event).expect("parses");
+
+        assert_eq!(announcement.owner, keys().public_key());
+        assert_eq!(announcement.id, "my-repo");
+        assert_eq!(announcement.name.as_deref(), Some("My Repo"));
+        assert_eq!(
+            announcement.description.as_deref(),
+            Some("A test repository")
+        );
+        assert_eq!(
+            announcement.web,
+            vec![Url::parse("https://example.com/repo").unwrap()]
+        );
+        assert_eq!(
+            announcement.clone,
+            vec![Url::parse("https://example.com/repo.git").unwrap()]
+        );
+        assert_eq!(
+            announcement.relays,
+            vec![RelayUrl::parse("wss://relay.example.com").unwrap()]
+        );
+        assert_eq!(
+            announcement.euc.as_deref(),
+            Some("aa231c4c6a5777dc89b42207b499891a344add5c")
+        );
+        assert_eq!(
+            announcement.maintainers,
+            vec![PublicKey::from_hex(MAINTAINER_HEX).expect("valid pubkey")]
+        );
+        assert_eq!(announcement.hashtags, vec!["rust", "nostr"]);
+    }
+
+    /// Skips malformed clone, relay, and maintainer values.
+    #[test]
+    fn drops_malformed_values() {
+        let event = announcement_event(&[
+            &["d", "my-repo"],
+            &["clone", "not a url"],
+            &["relays", "wss://good.example.com"],
+            &["maintainers", "not-a-pubkey"],
+        ]);
+
+        let announcement = Announcement::from_event(&event).expect("parses");
+
+        assert!(announcement.clone.is_empty());
+        assert_eq!(
+            announcement.relays,
+            vec![RelayUrl::parse("wss://good.example.com").unwrap()]
+        );
+        assert!(announcement.maintainers.is_empty());
+    }
+
+    /// Parses the `u` tag into an upstream coordinate.
+    #[test]
+    fn parses_upstream_tag() {
+        let event = announcement_event(&[
+            &["d", "my-fork"],
+            &[
+                "u",
+                "30617:68d81165918100b7da43fc28f7d1fc12554466e1115886b9e7bb326f65ec4272:upstream|https://example.com/upstream.git",
+                "wss://relay.example.com",
+            ],
+        ]);
+
+        let announcement = Announcement::from_event(&event).expect("parses");
+        let upstream = announcement.upstream.expect("parses the u tag");
+
+        assert_eq!(
+            upstream.addr,
+            Some(RepoAddr::new(
+                PublicKey::from_hex(MAINTAINER_HEX).expect("valid pubkey"),
+                "upstream"
+            ))
+        );
+        assert_eq!(
+            upstream.raw,
+            "30617:68d81165918100b7da43fc28f7d1fc12554466e1115886b9e7bb326f65ec4272:upstream|https://example.com/upstream.git"
+        );
+        assert_eq!(
+            upstream.display().to_string(),
+            "30617:68d81165918100b7da43fc28f7d1fc12554466e1115886b9e7bb326f65ec4272:upstream"
+        );
+    }
+
+    /// Matches a fork through its `u` tag coordinate.
+    #[test]
+    fn is_fork_of_matches_the_u_tag_coordinate() {
+        let base = RepoAddr::new(
+            PublicKey::from_hex(MAINTAINER_HEX).expect("valid pubkey"),
+            "upstream",
+        );
+        let event = announcement_event(&[&["d", "my-fork"], &["u", &base.to_string()]]);
+        let fork = Announcement::from_event(&event).expect("parses");
+
+        assert!(fork.is_fork_of(&base, None));
+    }
+
+    /// Matches forks sharing the base's earliest unique commit.
+    #[test]
+    fn is_fork_of_matches_a_shared_euc() {
+        let euc = "aa231c4c6a5777dc89b42207b499891a344add5c";
+        let base_event = announcement_event(&[&["d", "upstream"], &["r", euc, "euc"]]);
+        let base = Announcement::from_event(&base_event).expect("parses");
+        let base_addr = base.addr();
+
+        let fork_event = announcement_event(&[&["d", "mirror"], &["r", euc, "euc"]]);
+        let fork = Announcement::from_event(&fork_event).expect("parses");
+        assert!(fork.is_fork_of(&base_addr, base.euc.as_deref()));
+
+        let other_event = announcement_event(&[
+            &["d", "other"],
+            &["r", "bb231c4c6a5777dc89b42207b499891a344add5c", "euc"],
+        ]);
+        let other = Announcement::from_event(&other_event).expect("parses");
+        assert!(!other.is_fork_of(&base_addr, base.euc.as_deref()));
+
+        assert!(!fork.is_fork_of(&base_addr, None));
+    }
+
+    /// Matches permanent forks whose `u` tag points at the base despite a diverged EUC.
+    #[test]
+    fn is_fork_of_matches_permanent_forks_with_a_diverged_euc() {
+        let base = RepoAddr::new(
+            PublicKey::from_hex(MAINTAINER_HEX).expect("valid pubkey"),
+            "upstream",
+        );
+        let base_euc = "aa231c4c6a5777dc89b42207b499891a344add5c";
+        let event = announcement_event(&[
+            &["d", "my-fork"],
+            &["u", &base.to_string()],
+            &["r", "cc231c4c6a5777dc89b42207b499891a344add5c", "euc"],
+        ]);
+        let fork = Announcement::from_event(&event).expect("parses");
+
+        assert!(fork.is_fork_of(&base, Some(base_euc)));
+    }
+
+    /// Includes the owner among maintainers for primary repositories.
+    #[test]
+    fn effective_maintainers_include_owner_for_primary_repos() {
+        let event = announcement_event(&[&["d", "my-repo"], &["maintainers", MAINTAINER_HEX]]);
+
+        let announcement = Announcement::from_event(&event).expect("parses");
+        let maintainers = announcement.effective_maintainers();
+
+        assert_eq!(maintainers.len(), 2);
+        assert!(maintainers.contains(&announcement.owner));
+        assert!(maintainers.contains(&PublicKey::from_hex(MAINTAINER_HEX).expect("valid pubkey")));
+    }
+
+    /// Excludes the owner from maintainers for subordinate forks.
+    #[test]
+    fn effective_maintainers_exclude_owner_for_subordinate_forks() {
+        let event = announcement_event(&[
+            &["d", "my-fork"],
+            &["u", "30617:abc:upstream|https://example.com/upstream.git"],
+            &["maintainers", MAINTAINER_HEX],
+        ]);
+
+        let announcement = Announcement::from_event(&event).expect("parses");
+        let maintainers = announcement.effective_maintainers();
+
+        assert!(!maintainers.contains(&announcement.owner));
+        assert_eq!(
+            maintainers,
+            vec![PublicKey::from_hex(MAINTAINER_HEX).expect("valid pubkey")]
+        );
+    }
+
+    const OWNER_KEYS: [&str; 3] = [
+        "0000000000000000000000000000000000000000000000000000000000000001",
+        "0000000000000000000000000000000000000000000000000000000000000002",
+        "0000000000000000000000000000000000000000000000000000000000000003",
+    ];
+
+    /// Builds an announcement event signed by the given owner key.
+    fn owned_announcement_event(owner: &str, tags: &[&[&str]]) -> Event {
+        let keys = Keys::new(SecretKey::from_hex(owner).expect("valid secret key"));
+        let tags: Vec<Tag> = tags
+            .iter()
+            .map(|t| Tag::parse(t.to_vec()).expect("valid tag"))
+            .collect();
+        EventBuilder::new(Kind::GitRepoAnnouncement, "")
+            .tags(tags)
+            .finalize(&keys)
+            .expect("signed event")
+    }
+
+    /// Builds one announcement owned by the owner key at the given index.
+    fn owned_announcements(owner_ix: usize, tags: &[&[&str]]) -> Vec<Announcement> {
+        vec![
+            Announcement::from_event(&owned_announcement_event(OWNER_KEYS[owner_ix], tags))
+                .expect("parses"),
+        ]
+    }
+
+    /// Places the user's own forks before everyone else's.
+    #[test]
+    fn fork_candidates_orders_own_forks_first() {
+        let euc = "aa231c4c6a5777dc89b42207b499891a344add5c";
+        let clone = "https://grasp.example/npub1x/my-fork.git";
+
+        let base_addr = RepoAddr::new(
+            PublicKey::from_hex(OWNER_KEYS[0]).expect("pubkey"),
+            "upstream",
+        );
+        let all = vec![
+            owned_announcements(
+                2,
+                &[
+                    &["d", "other-project"],
+                    &["r", "bb231c4c6a5777dc89b42207b499891a344add5c", "euc"],
+                ],
+            )
+            .pop()
+            .unwrap(),
+            owned_announcements(
+                1,
+                &[&["d", "my-fork"], &["r", euc, "euc"], &["clone", clone]],
+            )
+            .pop()
+            .unwrap(),
+            owned_announcements(
+                2,
+                &[
+                    &["d", "their-fork"],
+                    &["u", &base_addr.to_string()],
+                    &["clone", clone],
+                ],
+            )
+            .pop()
+            .unwrap(),
+        ];
+
+        let user = PublicKey::from_hex(OWNER_KEYS[1]).expect("pubkey");
+        let forks = Announcement::forks_in(&all, &base_addr, Some(euc), Some(user));
+
+        let ids: Vec<&str> = forks.iter().map(|a| a.id.as_str()).collect();
+        assert_eq!(ids, vec!["my-fork", "their-fork"]);
+    }
+
+    /// Excludes the base itself, unrelated repos, and repos without clone URLs.
+    #[test]
+    fn fork_candidates_excludes_base_unrelated_and_unfetchable() {
+        let euc = "aa231c4c6a5777dc89b42207b499891a344add5c";
+        let base_owner = PublicKey::from_hex(OWNER_KEYS[0]).expect("pubkey");
+        let base_addr = RepoAddr::new(base_owner, "upstream");
+
+        let mut all = vec![
+            owned_announcements(0, &[&["d", "upstream"], &["r", euc, "euc"]])
+                .pop()
+                .unwrap(),
+            owned_announcements(1, &[&["d", "no-clone-fork"], &["r", euc, "euc"]])
+                .pop()
+                .unwrap(),
+            owned_announcements(
+                2,
+                &[
+                    &["d", "other"],
+                    &["r", "cc231c4c6a5777dc89b42207b499891a344add5c", "euc"],
+                ],
+            )
+            .pop()
+            .unwrap(),
+            owned_announcements(
+                2,
+                &[
+                    &["d", "mirror"],
+                    &["r", euc, "euc"],
+                    &["clone", "https://grasp.example/x/mirror.git"],
+                ],
+            )
+            .pop()
+            .unwrap(),
+        ];
+
+        let forks = Announcement::forks_in(&all, &base_addr, Some(euc), Some(base_owner));
+        assert_eq!(forks.len(), 1);
+        assert_eq!(forks[0].id, "mirror");
+
+        all.push(
+            owned_announcements(
+                2,
+                &[
+                    &["d", "u-fork"],
+                    &["u", &base_addr.to_string()],
+                    &["clone", "https://grasp.example/x/u-fork.git"],
+                ],
+            )
+            .pop()
+            .unwrap(),
+        );
+        let forks = Announcement::forks_in(&all, &base_addr, None, Some(base_owner));
+        let ids: Vec<&str> = forks.iter().map(|a| a.id.as_str()).collect();
+        assert_eq!(ids, vec!["u-fork"]);
+    }
+}

crates/signed_core/src/deletions.rs

@@ -2,26 +2,18 @@ use std::collections::HashSet;
 
 use nostr::prelude::*;
 
-/// NIP-09 deletion requests and NIP-62 vanish requests,
-/// built from the kind-5 and kind-62 events in the local database.
-///
-/// Deleted events are hidden before they reach the UI.
-///
-/// Pass any event through [`Deletions::is_deleted`] before showing it.
 pub struct Deletions {
-    /// `(deleted event id, expected author)` from `e` tags of kind-5 events.
     ids: HashSet<(EventId, PublicKey)>,
-    /// `(coordinate, expected author, cutoff)` from `a` tags of kind-5 events.
-    ///
-    /// All versions of the addressable event up to `cutoff` are deleted.
     coords: Vec<(Coordinate, PublicKey, Timestamp)>,
-    /// `(author, cutoff)` from kind-62 vanish requests.
     vanished: Vec<(PublicKey, Timestamp)>,
 }
 
 impl Deletions {
-    /// Build the deletion index from raw kind-5 and kind-62 events.
-    pub fn from_events(events: impl IntoIterator<Item = Event>) -> Self {
+    /// Builds a [`Deletions`] instance from a collection of events.
+    pub fn from_events<E>(events: E) -> Self
+    where
+        E: IntoIterator<Item = Event>,
+    {
         let mut ids = HashSet::new();
         let mut coords = Vec::new();
         let mut vanished = Vec::new();
@@ -36,8 +28,6 @@ impl Deletions {
                         .map(|c| (c, event.pubkey, event.created_at)),
                 );
             } else if event.kind == Kind::RequestToVanish {
-                // Client-side we can't verify which relay the request targeted.
-                // Any vanish request is then honored for the author's events.
                 vanished.push((event.pubkey, event.created_at));
             }
         }
@@ -49,10 +39,7 @@ impl Deletions {
         }
     }
 
-    /// Whether the event is covered by a valid deletion or vanish request.
-    /// A request is valid when its author matches the deleted event's author, per NIP-09.
-    ///
-    /// Addressable events are deleted up to the request's `created_at`.
+    /// Returns whether the given event is deleted.
     pub fn is_deleted(&self, event: &Event) -> bool {
         if self
             .vanished

crates/signed_core/src/filters.rs

@@ -2,9 +2,6 @@ use std::time::Duration;
 
 use nostr::prelude::*;
 
-use crate::{COVER_NOTE_KIND, RepoAddr};
-
-/// Kinds that make up the activity of a repository.
 pub const ACTIVITY_KINDS: [Kind; 9] = [
     Kind::Comment,
     Kind::GitPatch,
@@ -17,20 +14,17 @@ pub const ACTIVITY_KINDS: [Kind; 9] = [
     Kind::GitStatusDraft,
 ];
 
-/// Kinds that notify a user when they tag them via their `p` tag.
-pub const NOTIFICATION_KINDS: [Kind; 9] = [
+const NOTIFICATION_KINDS: [Kind; 8] = [
     Kind::GitIssue,
     Kind::GitPullRequest,
     Kind::GitPatch,
     Kind::GitPullRequestUpdate,
-    COVER_NOTE_KIND,
     Kind::GitStatusOpen,
     Kind::GitStatusApplied,
     Kind::GitStatusClosed,
     Kind::GitStatusDraft,
 ];
 
-/// Git root kinds that make a comment or cover note count as git activity.
 const GIT_ROOT_KINDS: [Kind; 4] = [
     Kind::GitIssue,
     Kind::GitPatch,
@@ -38,191 +32,148 @@ const GIT_ROOT_KINDS: [Kind; 4] = [
     Kind::GitRepoAnnouncement,
 ];
 
-/// Value of the first tag named `name` on `event`.
-fn tag_value<'a>(event: &'a Event, name: &str) -> Option<&'a str> {
+pub fn is_repo_kind(kind: Kind) -> bool {
+    kind == Kind::GitRepoAnnouncement
+        || kind == Kind::RepoState
+        || kind == Kind::EventDeletion
+        || kind == Kind::RequestToVanish
+        || ACTIVITY_KINDS.contains(&kind)
+}
+
+fn tag_kind(event: &Event, name: &str) -> Option<Kind> {
     event
         .tags
         .iter()
         .find(|tag| tag.kind() == name)
         .and_then(|tag| tag.content())
+        .and_then(|value| value.parse::<Kind>().ok())
 }
 
-/// Kind named by the first tag `name` on `event`.
-fn tag_kind(event: &Event, name: &str) -> Option<Kind> {
-    tag_value(event, name)?.parse::<Kind>().ok()
-}
+pub struct Filters;
 
-/// Latest announcement event for a repository.
-pub fn announcement(addr: &RepoAddr) -> Filter {
-    Filter::new()
-        .kind(Kind::GitRepoAnnouncement)
-        .author(addr.public_key)
-        .identifier(addr.identifier.clone())
-}
+impl Filters {
+    const DELETIONS_LOOKBACK: Duration = Duration::from_secs(3 * 365 * 86_400);
 
-/// Latest state event for a repository, carrying refs and HEAD.
-pub fn state(addr: &RepoAddr) -> Filter {
-    Filter::new()
-        .kind(Kind::RepoState)
-        .author(addr.public_key)
-        .identifier(addr.identifier.clone())
-}
-
-/// All NIP-34 activity addressed to a repository via its `#a` tag.
-/// Covers issues, PRs, patches, statuses and kind-1111 comments.
-/// The `a` tag is optional on status events per NIP-34.
-/// Statuses published without it are not matched here.
-pub fn activity(addr: &RepoAddr) -> Filter {
-    Filter::new().kinds(ACTIVITY_KINDS).coordinate(addr)
-}
-
-/// Status events, kinds `1630..=1633`, referencing any of the given root events.
-/// They are matched via the `#e` tag. One filter covers all roots.
-///
-/// A negentropy sync reconciles them in a single session, not one per root.
-pub fn statuses_for(roots: impl IntoIterator<Item = EventId>) -> Filter {
-    Filter::new()
-        .kinds([
-            Kind::GitStatusOpen,
-            Kind::GitStatusApplied,
-            Kind::GitStatusClosed,
-            Kind::GitStatusDraft,
-        ])
-        .events(roots)
-}
-
-/// A user's grasp list, kind `10317`.
-pub fn grasp_list(public_key: PublicKey) -> Filter {
-    Filter::new()
-        .kind(Kind::GitUserGraspList)
-        .author(public_key)
-}
-
-/// NIP-22 comments, kind `1111`, referencing any of the given root events.
-/// The roots are issues, patches and PRs.
-///
-/// Returns two filters, since combining `#E` and `#e` would AND the conditions.
-pub fn comments_for(roots: impl IntoIterator<Item = EventId>) -> Vec<Filter> {
-    let roots: Vec<String> = roots.into_iter().map(|id| id.to_hex()).collect();
-    if roots.is_empty() {
-        return Vec::new();
+    pub fn statuses_for(roots: impl IntoIterator<Item = EventId>) -> Filter {
+        Filter::new()
+            .kinds([
+                Kind::GitStatusOpen,
+                Kind::GitStatusApplied,
+                Kind::GitStatusClosed,
+                Kind::GitStatusDraft,
+            ])
+            .events(roots)
     }
-    vec![
+
+    pub fn grasp_list(public_key: PublicKey) -> Filter {
+        Filter::new()
+            .kind(Kind::GitUserGraspList)
+            .author(public_key)
+    }
+
+    /// NIP-51: code (people who produce NIP-34 events) follow list
+    pub fn git_authors(public_key: PublicKey) -> Filter {
+        Filter::new().kind(Kind::Custom(10017)).author(public_key)
+    }
+
+    /// NIP-51: NIP-34 followed repositories
+    pub fn git_repos(public_key: PublicKey) -> Filter {
+        Filter::new().kind(Kind::Custom(10018)).author(public_key)
+    }
+
+    /// Replaceable events, so the latest of each kind is all we need.
+    pub fn user_metadata(public_key: PublicKey) -> Vec<Filter> {
+        vec![
+            Self::grasp_list(public_key).limit(1),
+            Self::git_authors(public_key).limit(1),
+            Self::git_repos(public_key).limit(1),
+            Filter::new()
+                .kind(Kind::ContactList)
+                .author(public_key)
+                .limit(1),
+            Filter::new()
+                .kind(Kind::Metadata)
+                .author(public_key)
+                .limit(1),
+            Filter::new()
+                .kind(Kind::MuteList)
+                .author(public_key)
+                .limit(1),
+            Filter::new()
+                .kind(Kind::BlossomServerList)
+                .author(public_key)
+                .limit(1),
+        ]
+    }
+
+    pub fn comments_for(roots: impl IntoIterator<Item = EventId>) -> Vec<Filter> {
+        let roots: Vec<String> = roots.into_iter().map(|id| id.to_hex()).collect();
+
+        if roots.is_empty() {
+            return Vec::new();
+        }
+
+        vec![
+            Filter::new()
+                .kind(Kind::Comment)
+                .custom_tags(SingleLetterTag::UPPERCASE_E, roots.clone()),
+            Filter::new()
+                .kind(Kind::Comment)
+                .custom_tags(SingleLetterTag::LOWERCASE_E, roots),
+        ]
+    }
+
+    fn notification_comments(me: PublicKey) -> Filter {
         Filter::new()
             .kind(Kind::Comment)
-            .custom_tags(SingleLetterTag::UPPERCASE_E, roots.clone()),
+            .custom_tags(SingleLetterTag::UPPERCASE_P, [me.to_hex()])
+            .custom_tags(SingleLetterTag::UPPERCASE_K, ["1621", "1617", "1618"])
+    }
+
+    pub fn notifications(me: PublicKey) -> Vec<Filter> {
+        vec![
+            Self::notification_comments(me),
+            Filter::new().kinds(NOTIFICATION_KINDS).pubkey(me),
+        ]
+    }
+
+    pub fn authored_activity(me: PublicKey) -> Filter {
+        Filter::new().kinds(ACTIVITY_KINDS).author(me)
+    }
+
+    pub fn all_announcements() -> Filter {
+        Filter::new().kind(Kind::GitRepoAnnouncement)
+    }
+
+    pub fn all_states() -> Filter {
+        Filter::new().kind(Kind::RepoState)
+    }
+
+    fn deletions_since() -> Timestamp {
+        let now = Timestamp::now().as_secs();
+        Timestamp::from_secs(now - now % 86_400) - Self::DELETIONS_LOOKBACK
+    }
+
+    pub fn deletions() -> Filter {
         Filter::new()
-            .kind(Kind::Comment)
-            .custom_tags(SingleLetterTag::LOWERCASE_E, roots),
-    ]
+            .kinds([Kind::EventDeletion, Kind::RequestToVanish])
+            .since(Self::deletions_since())
+    }
 }
 
-/// NIP-22 comments on our issues, patches and pull requests.
-/// They are matched via the uppercase `P` and `K` tags, not authorship.
-pub fn notification_comments(me: PublicKey) -> Filter {
-    Filter::new()
-        .kind(Kind::Comment)
-        .custom_tags(SingleLetterTag::UPPERCASE_P, [me.to_hex()])
-        .custom_tags(SingleLetterTag::UPPERCASE_K, ["1621", "1617", "1618"])
-}
-
-/// Activity directed at us: comments on our roots, and git events tagging us
-/// via their lowercase `p` tag. `Filter::pubkey` sets that `p` tag.
-pub fn notifications(me: PublicKey) -> Vec<Filter> {
-    vec![
-        notification_comments(me),
-        Filter::new().kinds(NOTIFICATION_KINDS).pubkey(me),
-    ]
-}
-
-/// Git activity authored by `me`, for "Continue where you left off".
-///
-/// A comment on an unrelated kind is matched too, so results must be filtered
-/// through [`is_git_activity`] before display.
-pub fn authored_activity(me: PublicKey) -> Filter {
-    Filter::new()
-        .kinds(
-            ACTIVITY_KINDS
-                .into_iter()
-                .chain(std::iter::once(COVER_NOTE_KIND)),
-        )
-        .author(me)
-}
-
-/// Whether a kind-1111 comment targets a git root, checked via its `K` tag.
-fn is_git_comment(event: &Event) -> bool {
+pub(crate) fn is_git_comment(event: &Event) -> bool {
     event.kind == Kind::Comment
         && tag_kind(event, "K").is_some_and(|kind| GIT_ROOT_KINDS.contains(&kind))
 }
 
-/// Whether a kind-1624 cover note targets a git root, checked via its `k` tag.
-fn is_git_cover_note(event: &Event) -> bool {
-    event.kind == COVER_NOTE_KIND
-        && tag_kind(event, "k").is_some_and(|kind| GIT_ROOT_KINDS.contains(&kind))
-}
-
-/// Whether a status event references a git root, checked via its `k` tag.
-fn is_git_status(event: &Event) -> bool {
+pub(crate) fn is_git_status(event: &Event) -> bool {
     tag_kind(event, "k").is_some_and(|kind| GIT_ROOT_KINDS.contains(&kind))
 }
 
-/// Whether `event` is git activity worth showing in the activity list.
-pub fn is_git_activity(event: &Event) -> bool {
-    match event.kind {
-        Kind::GitIssue | Kind::GitPatch | Kind::GitPullRequest => true,
-        Kind::Comment => is_git_comment(event),
-        Kind::GitStatusOpen
-        | Kind::GitStatusApplied
-        | Kind::GitStatusClosed
-        | Kind::GitStatusDraft => is_git_status(event),
-        kind => kind == COVER_NOTE_KIND && is_git_cover_note(event),
-    }
-}
-
-/// All repository announcements, for global discovery.
-pub fn all_announcements() -> Filter {
-    Filter::new().kind(Kind::GitRepoAnnouncement)
-}
-
-/// How far back deletion requests are fetched and stored.
-const DELETIONS_LOOKBACK: Duration = Duration::from_secs(3 * 365 * 86_400);
-
-/// `now` minus [`DELETIONS_LOOKBACK`].
-/// Quantized to whole days so identical filters hash the same.
-///
-/// This lets the backend's sync dedup match identical filters.
-fn deletions_since() -> Timestamp {
-    let now = Timestamp::now().as_secs();
-    Timestamp::from_secs(now - now % 86_400) - DELETIONS_LOOKBACK
-}
-
-/// All deletion-related events within [`DELETIONS_LOOKBACK`].
-/// These are NIP-09 kind `5` and NIP-62 kind `62`.
-///
-/// Deletion requests must be known before any other event is shown.
-pub fn deletions() -> Filter {
-    Filter::new()
-        .kinds([Kind::EventDeletion, Kind::RequestToVanish])
-        .since(deletions_since())
-}
-
-/// Deletion events relevant to a single repository.
-///
-/// Requests authored by the repository owner.
-///
-/// Requests addressed to the repository coordinate via its `#a` tag.
-pub fn deletions_for_repo(addr: &RepoAddr) -> Vec<Filter> {
-    vec![
-        Filter::new()
-            .kinds([Kind::EventDeletion, Kind::RequestToVanish])
-            .author(addr.public_key),
-        Filter::new().kind(Kind::EventDeletion).coordinate(addr),
-    ]
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
+    use crate::GitEvent;
 
     fn keys(seed: u8) -> Keys {
         let mut hex = "00000000000000000000000000000000000000000000000000000000000000".to_string();
@@ -251,41 +202,27 @@ mod tests {
         );
         let on_note = signed(&keys(1), Kind::Comment, vec![kind_tag("K", Kind::TextNote)]);
 
-        assert!(is_git_activity(&on_git));
-        assert!(is_git_activity(&on_repo));
-        assert!(!is_git_activity(&on_note));
-        assert!(!is_git_activity(&signed(
-            &keys(1),
-            Kind::Comment,
-            Vec::new()
-        )));
+        assert!(on_git.is_git_activity());
+        assert!(on_repo.is_git_activity());
+        assert!(!on_note.is_git_activity());
+        assert!(!signed(&keys(1), Kind::Comment, Vec::new()).is_git_activity());
     }
 
     #[test]
-    fn status_and_cover_note_activity_depend_on_the_lowercase_k_tag() {
+    fn status_activity_depends_on_the_lowercase_k_tag() {
         let status = signed(
             &keys(1),
             Kind::GitStatusClosed,
             vec![kind_tag("k", Kind::GitPullRequest)],
         );
-        let cover = signed(
-            &keys(1),
-            COVER_NOTE_KIND,
-            vec![kind_tag("k", Kind::GitPatch)],
-        );
         let unrelated = signed(
             &keys(1),
             Kind::GitStatusClosed,
             vec![kind_tag("k", Kind::Metadata)],
         );
 
-        assert!(is_git_activity(&status));
-        assert!(is_git_activity(&cover));
-        assert!(!is_git_activity(&unrelated));
-        assert!(!is_git_activity(&signed(
-            &keys(1),
-            Kind::GitStatusClosed,
-            Vec::new()
-        )));
+        assert!(status.is_git_activity());
+        assert!(!unrelated.is_git_activity());
+        assert!(!signed(&keys(1), Kind::GitStatusClosed, Vec::new()).is_git_activity());
     }
 }

crates/signed_core/src/git_event.rs

@@ -0,0 +1,145 @@
+use nostr::prelude::*;
+
+pub trait GitEvent {
+    /// Returns the NIP-34 subject or the first non-empty content line.
+    fn activity_subject(&self) -> String;
+
+    /// Returns the current commit id.
+    fn current_commit(&self) -> Option<String>;
+
+    /// Returns the merge base commit id.
+    fn merge_base(&self) -> Option<String>;
+
+    /// Returns the advertised clone URLs.
+    fn clone_urls(&self) -> Option<Vec<Url>>;
+
+    /// Returns the branch name.
+    fn branch_name(&self) -> Option<String>;
+
+    /// Returns whether the event is git activity.
+    fn is_git_activity(&self) -> bool;
+
+    /// Returns whether an `e` or `E` tag points at the root event.
+    fn references_root(&self, root: &EventId) -> bool;
+}
+
+impl GitEvent for Event {
+    /// Reads the subject tag, then the first content line, then "Untitled".
+    fn activity_subject(&self) -> String {
+        let subject = self
+            .tags
+            .iter()
+            .find_map(|tag| match Nip34Tag::parse(tag.as_slice()) {
+                Ok(Nip34Tag::Subject(subject)) => Some(subject),
+                _ => None,
+            });
+
+        subject
+            .or_else(|| {
+                self.content
+                    .lines()
+                    .map(str::trim)
+                    .find(|line| !line.is_empty())
+                    .map(|value| value.to_string())
+            })
+            .unwrap_or("Untitled".to_string())
+    }
+
+    /// Reads the `commit` tag.
+    fn current_commit(&self) -> Option<String> {
+        self.tags
+            .iter()
+            .find_map(|tag| match Nip34Tag::parse(tag.as_slice()) {
+                Ok(Nip34Tag::CurrentCommit(commit)) => Some(commit.to_string()),
+                _ => None,
+            })
+    }
+
+    /// Reads the `merge-base` tag.
+    fn merge_base(&self) -> Option<String> {
+        self.tags
+            .iter()
+            .find_map(|tag| match Nip34Tag::parse(tag.as_slice()) {
+                Ok(Nip34Tag::MergeBase(commit)) => Some(commit.to_string()),
+                _ => None,
+            })
+    }
+
+    /// Reads the `clone` tag.
+    fn clone_urls(&self) -> Option<Vec<Url>> {
+        self.tags
+            .iter()
+            .find_map(|tag| match Nip34Tag::parse(tag.as_slice()) {
+                Ok(Nip34Tag::Clone(urls)) => Some(urls),
+                _ => None,
+            })
+    }
+
+    /// Reads the `branch-name` tag.
+    fn branch_name(&self) -> Option<String> {
+        self.tags
+            .iter()
+            .find_map(|tag| match Nip34Tag::parse(tag.as_slice()) {
+                Ok(Nip34Tag::BranchName(name)) => Some(name),
+                _ => None,
+            })
+    }
+
+    /// Classifies git issue, patch, pull request, comment, and status kinds.
+    fn is_git_activity(&self) -> bool {
+        match self.kind {
+            Kind::GitIssue | Kind::GitPatch | Kind::GitPullRequest => true,
+            Kind::Comment => crate::filters::is_git_comment(self),
+            Kind::GitStatusOpen
+            | Kind::GitStatusApplied
+            | Kind::GitStatusClosed
+            | Kind::GitStatusDraft => crate::filters::is_git_status(self),
+            _ => false,
+        }
+    }
+
+    /// Compares `e` and `E` tag contents against the root id.
+    fn references_root(&self, root: &EventId) -> bool {
+        let root = root.to_hex();
+        self.tags
+            .iter()
+            .any(|tag| matches!(tag.kind(), "e" | "E") && tag.content() == Some(root.as_str()))
+    }
+}
+
+impl<T: GitEvent + ?Sized> GitEvent for &T {
+    /// Delegates to the referenced event.
+    fn activity_subject(&self) -> String {
+        (*self).activity_subject()
+    }
+
+    /// Delegates to the referenced event.
+    fn current_commit(&self) -> Option<String> {
+        (*self).current_commit()
+    }
+
+    /// Delegates to the referenced event.
+    fn merge_base(&self) -> Option<String> {
+        (*self).merge_base()
+    }
+
+    /// Delegates to the referenced event.
+    fn clone_urls(&self) -> Option<Vec<Url>> {
+        (*self).clone_urls()
+    }
+
+    /// Delegates to the referenced event.
+    fn branch_name(&self) -> Option<String> {
+        (*self).branch_name()
+    }
+
+    /// Delegates to the referenced event.
+    fn is_git_activity(&self) -> bool {
+        (*self).is_git_activity()
+    }
+
+    /// Delegates to the referenced event.
+    fn references_root(&self, root: &EventId) -> bool {
+        (*self).references_root(root)
+    }
+}

crates/signed_core/src/inbox.rs

@@ -1,675 +0,0 @@
-use std::collections::{HashMap, HashSet};
-use std::time::Duration;
-
-use nostr::prelude::*;
-use serde::{Deserialize, Serialize};
-
-use crate::{COVER_NOTE_KIND, RepoAddr, activity_subject};
-
-/// Window before `now` that an advanced cutoff retreats to.
-const ADVANCE_WINDOW: Duration = Duration::from_secs(3 * 24 * 60 * 60);
-
-/// Window before `now` that a mark-all cutoff retreats to.
-const MARK_ALL_WINDOW: Duration = Duration::from_secs(10 * 24 * 60 * 60);
-
-/// A thread of notification and own-activity events sharing one root.
-#[derive(Debug, Clone)]
-pub struct InboxItem {
-    /// The root issue, patch or pull request the events belong to.
-    pub root: EventId,
-    /// The root event itself, when it is known locally.
-    pub root_event: Option<Event>,
-    /// Repository the root belongs to, from the root's `a` tag.
-    pub address: Option<RepoAddr>,
-    /// Notification events directed at the user, newest first.
-    pub events: Vec<Event>,
-    /// The user's own events in the thread, newest first.
-    pub own_events: Vec<Event>,
-    /// Unread event ids, oldest first.
-    pub unread_ids: Vec<EventId>,
-    /// Whether every notification event in the thread is archived.
-    pub archived: bool,
-}
-
-impl InboxItem {
-    /// Title of the thread, read from its root issue/patch/PR when known.
-    pub fn title(&self) -> String {
-        self.root_event
-            .as_ref()
-            .or_else(|| self.own_events.first())
-            .or_else(|| self.events.first())
-            .map(activity_subject)
-            .unwrap_or_else(|| "Untitled".to_string())
-    }
-
-    pub fn kind(&self) -> Option<Kind> {
-        self.root_event
-            .as_ref()
-            .or_else(|| self.own_events.first())
-            .or_else(|| self.events.first())
-            .map(|event| event.kind)
-    }
-
-    /// Timestamp of the newest event in the thread.
-    pub fn latest_activity(&self) -> Timestamp {
-        self.root_event
-            .as_ref()
-            .into_iter()
-            .chain(self.own_events.first())
-            .chain(self.events.first())
-            .map(|event| event.created_at)
-            .max()
-            .unwrap_or_default()
-    }
-
-    /// Up to `limit` events of the thread, oldest first.
-    pub fn timeline(&self, limit: usize) -> Vec<Event> {
-        let mut seen: HashSet<EventId> = HashSet::new();
-        let mut events: Vec<Event> = Vec::new();
-
-        if let Some(root) = &self.root_event {
-            seen.insert(root.id);
-            events.push(root.clone());
-        }
-
-        let mut rest: Vec<Event> = self
-            .own_events
-            .iter()
-            .chain(self.events.iter())
-            .filter(|event| seen.insert(event.id))
-            .cloned()
-            .collect();
-
-        rest.sort_by(|a, b| {
-            b.created_at
-                .cmp(&a.created_at)
-                .then_with(|| b.id.to_hex().cmp(&a.id.to_hex()))
-        });
-        rest.truncate(limit.saturating_sub(events.len()));
-        events.extend(rest);
-
-        events.sort_by_key(|event| event.created_at);
-        events
-    }
-
-    /// Whether the thread has an unread event still visible in the inbox.
-    pub fn is_unread(&self) -> bool {
-        !self.archived && !self.unread_ids.is_empty()
-    }
-
-    pub fn apply_state(&mut self, state: &InboxReadState) {
-        self.unread_ids = self
-            .events
-            .iter()
-            .rev()
-            .filter(|event| !state.is_read(event))
-            .map(|event| event.id)
-            .collect();
-
-        // A thread without notification events is never archived.
-        self.archived =
-            !self.events.is_empty() && self.events.iter().all(|event| state.is_archived(event));
-    }
-}
-
-/// Root issue, patch or pull request of a notification event.
-///
-/// Returns `None` when the event is not git-related, or when its root is a
-/// coordinate rather than an event.
-///
-/// - issue (1621) / PR (1618): itself
-/// - patch (1617): its `e` parent patch, else itself
-/// - NIP-22 comment (1111): uppercase `E` root pointer
-/// - PR update (1619): uppercase `E`
-/// - statuses (1630-1633) / cover note (1624): NIP-10 root `e`
-pub fn notification_root<L>(event: &Event, lookup: &L) -> Option<EventId>
-where
-    L: Fn(EventId) -> Option<Event>,
-{
-    if event.kind == COVER_NOTE_KIND {
-        return nip10_root_id(event).map(|root| resolve_thread_root(root, lookup));
-    }
-    match event.kind {
-        Kind::GitIssue | Kind::GitPullRequest => Some(event.id),
-        Kind::GitPatch => Some(match first_e_id(event) {
-            Some(parent) => resolve_thread_root(parent, lookup),
-            None => event.id,
-        }),
-        Kind::Comment => match nip22::extract_root(event) {
-            Some(CommentTarget::Event { id, .. }) => Some(resolve_thread_root(id, lookup)),
-            _ => None,
-        },
-        Kind::GitPullRequestUpdate => {
-            first_uppercase_e_id(event).map(|root| resolve_thread_root(root, lookup))
-        }
-        Kind::GitStatusOpen
-        | Kind::GitStatusApplied
-        | Kind::GitStatusClosed
-        | Kind::GitStatusDraft => {
-            nip10_root_id(event).map(|root| resolve_thread_root(root, lookup))
-        }
-        _ => None,
-    }
-}
-
-/// Group notification events and the user's own events into one item per thread.
-pub fn group<E, O, L>(
-    events: E,
-    own: O,
-    me: PublicKey,
-    state: &InboxReadState,
-    lookup: &L,
-) -> Vec<InboxItem>
-where
-    E: IntoIterator<Item = Event>,
-    O: IntoIterator<Item = Event>,
-    L: Fn(EventId) -> Option<Event>,
-{
-    let mut groups: HashMap<EventId, Vec<Event>> = HashMap::new();
-    for event in events {
-        if event.pubkey == me {
-            continue;
-        }
-        let Some(root) = notification_root(&event, lookup) else {
-            continue;
-        };
-        groups.entry(root).or_default().push(event);
-    }
-
-    let mut own_groups: HashMap<EventId, Vec<Event>> = HashMap::new();
-    for event in own {
-        let root = notification_root(&event, lookup).unwrap_or(event.id);
-        own_groups.entry(root).or_default().push(event);
-    }
-
-    let mut roots: Vec<EventId> = groups.keys().chain(own_groups.keys()).copied().collect();
-    roots.sort();
-    roots.dedup();
-
-    let mut items: Vec<InboxItem> = roots
-        .into_iter()
-        .map(|root| {
-            let mut events = groups.remove(&root).unwrap_or_default();
-            let mut own_events = own_groups.remove(&root).unwrap_or_default();
-            sort_newest_first(&mut events);
-            sort_newest_first(&mut own_events);
-
-            let root_event = lookup(root);
-
-            let mut item = InboxItem {
-                root,
-                address: root_event
-                    .as_ref()
-                    .and_then(|event| event.tags.coordinates().next()),
-                root_event,
-                events,
-                own_events,
-                unread_ids: Vec::new(),
-                archived: false,
-            };
-            item.apply_state(state);
-            item
-        })
-        .collect();
-
-    items.sort_by(|a, b| {
-        b.latest_activity()
-            .cmp(&a.latest_activity())
-            .then_with(|| b.root.to_hex().cmp(&a.root.to_hex()))
-    });
-
-    items
-}
-
-/// Sort thread events newest first, ties broken by id.
-fn sort_newest_first(events: &mut [Event]) {
-    events.sort_by(|a, b| {
-        b.created_at
-            .cmp(&a.created_at)
-            .then_with(|| b.id.to_hex().cmp(&a.id.to_hex()))
-    });
-}
-
-/// Read and archive state of the inbox, a high-water-mark model.
-#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-pub struct InboxReadState {
-    #[serde(default)]
-    pub read_before: Timestamp,
-    #[serde(default)]
-    pub read_ids: HashSet<EventId>,
-    #[serde(default)]
-    pub archived_before: Timestamp,
-    #[serde(default)]
-    pub archived_ids: HashSet<EventId>,
-}
-
-impl InboxReadState {
-    /// Whether `event` is at or before the read cutoff, or marked read.
-    pub fn is_read(&self, event: &Event) -> bool {
-        event.created_at <= self.read_before || self.read_ids.contains(&event.id)
-    }
-
-    /// Whether `event` is at or before the archived cutoff, or marked archived.
-    pub fn is_archived(&self, event: &Event) -> bool {
-        event.created_at <= self.archived_before || self.archived_ids.contains(&event.id)
-    }
-
-    /// Mark one event read. Events at or before the cutoff are already read.
-    pub fn mark_read(&mut self, event: &Event) {
-        if event.created_at > self.read_before {
-            self.read_ids.insert(event.id);
-        }
-    }
-
-    /// Mark one event archived. Events at or before the cutoff are already archived.
-    pub fn mark_archived(&mut self, event: &Event) {
-        if event.created_at > self.archived_before {
-            self.archived_ids.insert(event.id);
-        }
-    }
-
-    /// Mark every non-self event read, anchoring the cutoff ten days back.
-    pub fn mark_all_read(&mut self, all: &[Event], me: PublicKey, now: Timestamp) {
-        let cutoff = now - MARK_ALL_WINDOW;
-        self.read_before = cutoff;
-        self.read_ids = all
-            .iter()
-            .filter(|event| event.pubkey != me && event.created_at > cutoff)
-            .map(|event| event.id)
-            .collect();
-    }
-
-    /// Advance the read cutoff to the newest point that keeps unread events
-    /// unread, then prune the id set.
-    pub fn advance_read(&mut self, all: &[Event], me: PublicKey, now: Timestamp) {
-        let cutoff = advance_cutoff(all, me, now, self.read_before, |event| self.is_read(event));
-        self.read_before = cutoff;
-        prune_ids(&mut self.read_ids, all, cutoff);
-    }
-
-    /// Advance the archived cutoff, mirroring [`Self::advance_read`].
-    pub fn advance_archived(&mut self, all: &[Event], me: PublicKey, now: Timestamp) {
-        let cutoff = advance_cutoff(all, me, now, self.archived_before, |event| {
-            self.is_archived(event)
-        });
-        self.archived_before = cutoff;
-        prune_ids(&mut self.archived_ids, all, cutoff);
-    }
-}
-
-/// Newest cutoff that keeps unread events unread, never earlier than `current`.
-fn advance_cutoff<M>(
-    all: &[Event],
-    me: PublicKey,
-    now: Timestamp,
-    current: Timestamp,
-    is_marked: M,
-) -> Timestamp
-where
-    M: Fn(&Event) -> bool,
-{
-    let fallback = now - ADVANCE_WINDOW;
-
-    let oldest = all
-        .iter()
-        .filter(|event| event.pubkey != me && !is_marked(event))
-        .map(|event| event.created_at)
-        .min();
-
-    let candidate = match oldest {
-        Some(at) if at < fallback => at - 1,
-        _ => fallback,
-    };
-
-    candidate.max(current)
-}
-
-/// Drop ids whose event is unknown or now covered by the cutoff.
-fn prune_ids(ids: &mut HashSet<EventId>, all: &[Event], cutoff: Timestamp) {
-    let created_at: HashMap<EventId, Timestamp> = all
-        .iter()
-        .map(|event| (event.id, event.created_at))
-        .collect();
-    ids.retain(|id| created_at.get(id).is_some_and(|at| *at >= cutoff));
-}
-
-/// Follow NIP-10/NIP-22 parent pointers until a root item is reached.
-fn resolve_thread_root(id: EventId, lookup: &impl Fn(EventId) -> Option<Event>) -> EventId {
-    let mut seen = HashSet::new();
-    let mut root = id;
-
-    loop {
-        if !seen.insert(root) {
-            return id;
-        }
-
-        let Some(event) = lookup(root) else {
-            return root;
-        };
-
-        if matches!(event.kind, Kind::GitIssue | Kind::GitPullRequest) {
-            return root;
-        }
-
-        match parent_id(&event) {
-            Some(parent) => root = parent,
-            None => return root,
-        }
-    }
-}
-
-/// Parent of a thread event, mirroring gitworkshop's `getParentId`.
-fn parent_id(event: &Event) -> Option<EventId> {
-    for marker in ["reply", "root"] {
-        if let Some(id) = event
-            .tags
-            .iter()
-            .find_map(|tag| e_tag_with_marker(tag, marker))
-        {
-            return Some(id);
-        }
-    }
-
-    if let Some(id) = event.tags.iter().find_map(|tag| {
-        if tag.kind() != "e" {
-            return None;
-        }
-
-        let slice = tag.as_slice();
-        let is_mention = slice.len() == 4 && slice[3] == "mention";
-
-        if is_mention {
-            return None;
-        }
-
-        tag.content()
-            .and_then(|content| EventId::from_hex(content).ok())
-    }) {
-        return Some(id);
-    }
-
-    first_uppercase_e_id(event)
-}
-
-/// NIP-10 root of an event: the `e` tag marked `root`, else the first `e` tag.
-fn nip10_root_id(event: &Event) -> Option<EventId> {
-    event
-        .tags
-        .iter()
-        .find_map(|tag| e_tag_with_marker(tag, "root"))
-        .or_else(|| first_e_id(event))
-}
-
-/// First `e` tag id, in document order.
-fn first_e_id(event: &Event) -> Option<EventId> {
-    first_tag_id(event, "e")
-}
-
-/// First uppercase `E` tag id, in document order.
-fn first_uppercase_e_id(event: &Event) -> Option<EventId> {
-    first_tag_id(event, "E")
-}
-
-fn first_tag_id(event: &Event, name: &str) -> Option<EventId> {
-    event.tags.iter().find_map(|tag| {
-        if tag.kind() != name {
-            return None;
-        }
-        tag.content()
-            .and_then(|content| EventId::from_hex(content).ok())
-    })
-}
-
-/// Event id from a four-element `e` tag carrying `marker`.
-fn e_tag_with_marker(tag: &Tag, marker: &str) -> Option<EventId> {
-    let slice = tag.as_slice();
-    if tag.kind() != "e" || slice.len() != 4 || slice[3] != marker {
-        return None;
-    }
-    tag.content()
-        .and_then(|content| EventId::from_hex(content).ok())
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn keys(seed: u8) -> Keys {
-        let mut hex = "00000000000000000000000000000000000000000000000000000000000000".to_string();
-        hex.push_str(&format!("{seed:02x}"));
-        Keys::new(SecretKey::from_hex(&hex).expect("valid secret key"))
-    }
-
-    fn signed(author: &Keys, kind: Kind, tags: Vec<Tag>, created_at: u64) -> Event {
-        EventBuilder::new(kind, "")
-            .tags(tags)
-            .custom_created_at(Timestamp::from_secs(created_at))
-            .finalize(author)
-            .expect("signed event")
-    }
-
-    fn e_tag(event: &Event) -> Tag {
-        Tag::parse(["e", &event.id.to_hex()]).expect("valid e tag")
-    }
-
-    fn marked_e_tag(event: &Event, marker: &str) -> Tag {
-        Tag::parse(["e", &event.id.to_hex(), "wss://relay.example.com", marker])
-            .expect("valid e tag")
-    }
-
-    fn uppercase_e_tag(event: &Event) -> Tag {
-        Tag::parse(["E", &event.id.to_hex()]).expect("valid E tag")
-    }
-
-    fn lookup(events: &[Event]) -> impl Fn(EventId) -> Option<Event> + '_ {
-        move |id| events.iter().find(|event| event.id == id).cloned()
-    }
-
-    fn issue(author: &Keys, at: u64) -> Event {
-        signed(author, Kind::GitIssue, Vec::new(), at)
-    }
-
-    fn titled_issue(author: &Keys, title: &str, at: u64) -> Event {
-        signed(
-            author,
-            Kind::GitIssue,
-            vec![Tag::parse(["subject", title]).expect("valid subject tag")],
-            at,
-        )
-    }
-
-    #[test]
-    fn comment_resolves_to_its_uppercase_root() {
-        let issue = issue(&keys(1), 100);
-        let comment = signed(
-            &keys(2),
-            Kind::Comment,
-            vec![
-                uppercase_e_tag(&issue),
-                Tag::parse(["K", "1621"]).expect("valid K tag"),
-            ],
-            200,
-        );
-        let events = [issue.clone(), comment.clone()];
-        assert_eq!(
-            notification_root(&comment, &lookup(&events)),
-            Some(issue.id)
-        );
-    }
-
-    #[test]
-    fn child_patch_resolves_to_the_root_patch() {
-        let root_patch = signed(&keys(1), Kind::GitPatch, Vec::new(), 100);
-        let child_patch = signed(&keys(1), Kind::GitPatch, vec![e_tag(&root_patch)], 200);
-        let events = [root_patch.clone(), child_patch.clone()];
-        assert_eq!(
-            notification_root(&child_patch, &lookup(&events)),
-            Some(root_patch.id)
-        );
-    }
-
-    #[test]
-    fn status_resolves_via_the_root_marker() {
-        let issue = issue(&keys(1), 100);
-        let status = signed(
-            &keys(2),
-            Kind::GitStatusClosed,
-            vec![marked_e_tag(&issue, "root")],
-            200,
-        );
-        let events = [issue.clone(), status.clone()];
-        assert_eq!(notification_root(&status, &lookup(&events)), Some(issue.id));
-    }
-
-    #[test]
-    fn nested_comment_chain_follows_to_the_root() {
-        let issue = issue(&keys(1), 100);
-        let reply = signed(&keys(2), Kind::Comment, vec![uppercase_e_tag(&issue)], 200);
-        let nested = signed(&keys(3), Kind::Comment, vec![uppercase_e_tag(&reply)], 300);
-        let events = [issue.clone(), reply, nested.clone()];
-        assert_eq!(notification_root(&nested, &lookup(&events)), Some(issue.id));
-    }
-
-    #[test]
-    fn group_merges_own_events_into_the_matching_thread() {
-        let me = keys(1);
-        let issue = titled_issue(&me, "Add retry logic", 100);
-        let mine = signed(
-            &me,
-            Kind::Comment,
-            vec![
-                uppercase_e_tag(&issue),
-                Tag::parse(["K", "1621"]).expect("K tag"),
-            ],
-            150,
-        );
-        let reply = signed(
-            &keys(2),
-            Kind::Comment,
-            vec![
-                uppercase_e_tag(&issue),
-                Tag::parse(["K", "1621"]).expect("K tag"),
-            ],
-            200,
-        );
-
-        let context = [issue.clone(), mine.clone(), reply.clone()];
-        let items = group(
-            [reply.clone()],
-            [issue.clone(), mine.clone()],
-            me.public_key(),
-            &InboxReadState::default(),
-            &lookup(&context),
-        );
-
-        assert_eq!(items.len(), 1);
-        assert_eq!(items[0].root, issue.id);
-        assert_eq!(
-            items[0].root_event.as_ref().map(|event| event.id),
-            Some(issue.id)
-        );
-        assert_eq!(items[0].kind(), Some(Kind::GitIssue));
-        assert_eq!(items[0].title(), "Add retry logic");
-        assert_eq!(items[0].events, vec![reply.clone()]);
-        // The own events are kept apart from the notifications, newest first.
-        assert_eq!(items[0].own_events, vec![mine.clone(), issue.clone()]);
-        assert_eq!(
-            items[0]
-                .timeline(5)
-                .iter()
-                .map(|event| event.id)
-                .collect::<Vec<_>>(),
-            vec![issue.id, mine.id, reply.id]
-        );
-    }
-
-    #[test]
-    fn mark_all_read_marks_known_recent_events() {
-        let me = keys(1);
-        let now = Timestamp::from_secs(1_000_000_000);
-        let recent = issue(&keys(2), now.as_secs() - 1000);
-        let old = issue(&keys(2), now.as_secs() - 5 * 24 * 60 * 60);
-        let ancient = issue(&keys(2), now.as_secs() - 20 * 24 * 60 * 60);
-        let mine = issue(&keys(1), now.as_secs() - 100);
-
-        let mut state = InboxReadState::default();
-        state.mark_all_read(
-            &[recent.clone(), old.clone(), ancient.clone(), mine.clone()],
-            me.public_key(),
-            now,
-        );
-
-        assert_eq!(state.read_before, now - MARK_ALL_WINDOW);
-        assert_eq!(state.read_ids, HashSet::from([recent.id, old.id]));
-        assert!(state.is_read(&recent));
-        assert!(state.is_read(&ancient));
-        assert!(!state.is_read(&mine));
-    }
-
-    #[test]
-    fn advance_read_never_moves_the_cutoff_backwards() {
-        let me = keys(1);
-        let unread = issue(&keys(2), 1_000);
-        let all = [unread];
-        let now = Timestamp::from_secs(1_000_000_000);
-
-        let mut state = InboxReadState {
-            read_before: Timestamp::from_secs(999_999_999),
-            ..Default::default()
-        };
-        state.advance_read(&all, me.public_key(), now);
-
-        assert_eq!(state.read_before, Timestamp::from_secs(999_999_999));
-    }
-
-    #[test]
-    fn advance_read_moves_before_the_oldest_unread_and_prunes_ids() {
-        let me = keys(1);
-        let now = Timestamp::from_secs(1_000_000_000);
-        let five_days = 5 * 24 * 60 * 60;
-        let old_unread = issue(&keys(2), now.as_secs() - five_days);
-        // Read ids that fall before and after the new cutoff.
-        let stale = signed(
-            &keys(2),
-            Kind::GitIssue,
-            Vec::new(),
-            now.as_secs() - five_days - 1000,
-        );
-        let fresh = signed(
-            &keys(2),
-            Kind::GitIssue,
-            Vec::new(),
-            now.as_secs() - 100_000,
-        );
-
-        let mut state = InboxReadState {
-            read_ids: HashSet::from([stale.id, fresh.id]),
-            ..Default::default()
-        };
-        state.advance_read(
-            &[old_unread.clone(), stale.clone(), fresh.clone()],
-            me.public_key(),
-            now,
-        );
-
-        assert_eq!(state.read_before, old_unread.created_at - 1);
-        assert_eq!(state.read_ids, HashSet::from([fresh.id]));
-    }
-
-    #[test]
-    fn mark_archived_skips_events_at_or_before_the_cutoff() {
-        let now = Timestamp::from_secs(1_000_000_000);
-        let event = issue(&keys(2), now.as_secs() - 1000);
-
-        let mut state = InboxReadState {
-            archived_before: now,
-            ..Default::default()
-        };
-        state.mark_archived(&event);
-        assert!(state.archived_ids.is_empty());
-
-        let mut state = InboxReadState::default();
-        state.mark_archived(&event);
-        assert_eq!(state.archived_ids, HashSet::from([event.id]));
-    }
-}

crates/signed_core/src/inbox/group.rs

@@ -0,0 +1,172 @@
+use std::collections::HashMap;
+
+use nostr::prelude::*;
+use utils::sort_newest_first;
+
+use super::{InboxItem, InboxReadState, ThreadResolver};
+use crate::RepoAddr;
+
+/// Groups events into inbox threads, merging the user's own events.
+pub fn group<E, O, L>(
+    events: E,
+    own: O,
+    me: PublicKey,
+    state: &InboxReadState,
+    lookup: &L,
+) -> Vec<InboxItem>
+where
+    E: IntoIterator<Item = Event>,
+    O: IntoIterator<Item = Event>,
+    L: Fn(EventId) -> Option<Event>,
+{
+    let resolver = ThreadResolver::new(lookup);
+    let mut groups: HashMap<EventId, Vec<Event>> = HashMap::new();
+    for event in events {
+        if event.pubkey == me {
+            continue;
+        }
+        let Some(root) = resolver.notification_root(&event) else {
+            continue;
+        };
+        groups.entry(root).or_default().push(event);
+    }
+
+    let mut own_groups: HashMap<EventId, Vec<Event>> = HashMap::new();
+    for event in own {
+        let root = resolver.notification_root(&event).unwrap_or(event.id);
+        own_groups.entry(root).or_default().push(event);
+    }
+
+    let mut roots: Vec<EventId> = groups.keys().chain(own_groups.keys()).copied().collect();
+    roots.sort();
+    roots.dedup();
+
+    let mut items: Vec<InboxItem> = roots
+        .into_iter()
+        .map(|root| {
+            let mut events = groups.remove(&root).unwrap_or_default();
+            let mut own_events = own_groups.remove(&root).unwrap_or_default();
+            sort_newest_first(&mut events);
+            sort_newest_first(&mut own_events);
+
+            let root_event = lookup(root);
+
+            let mut item = InboxItem {
+                root,
+                address: root_event
+                    .as_ref()
+                    .and_then(|event| event.tags.coordinates().next())
+                    .map(RepoAddr::from),
+                root_event,
+                events,
+                own_events,
+                unread_ids: Vec::new(),
+                archived: false,
+            };
+            item.apply_state(state);
+            item
+        })
+        .collect();
+
+    items.sort_by(|a, b| {
+        b.latest_activity()
+            .cmp(&a.latest_activity())
+            .then_with(|| b.root.to_hex().cmp(&a.root.to_hex()))
+    });
+
+    items
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    /// Derives deterministic signer keys from a seed byte.
+    fn keys(seed: u8) -> Keys {
+        let mut hex = "00000000000000000000000000000000000000000000000000000000000000".to_string();
+        hex.push_str(&format!("{seed:02x}"));
+        Keys::new(SecretKey::from_hex(&hex).expect("valid secret key"))
+    }
+
+    /// Builds a signed event with a fixed timestamp.
+    fn signed(author: &Keys, kind: Kind, tags: Vec<Tag>, created_at: u64) -> Event {
+        EventBuilder::new(kind, "")
+            .tags(tags)
+            .custom_created_at(Timestamp::from_secs(created_at))
+            .finalize(author)
+            .expect("signed event")
+    }
+
+    /// Builds an uppercase `E` tag for the event.
+    fn uppercase_e_tag(event: &Event) -> Tag {
+        Tag::parse(["E", &event.id.to_hex()]).expect("valid E tag")
+    }
+
+    /// Builds an event lookup closure over a slice.
+    fn lookup(events: &[Event]) -> impl Fn(EventId) -> Option<Event> + '_ {
+        move |id| events.iter().find(|event| event.id == id).cloned()
+    }
+
+    /// Builds a git issue event with a subject tag.
+    fn titled_issue(author: &Keys, title: &str, at: u64) -> Event {
+        signed(
+            author,
+            Kind::GitIssue,
+            vec![Tag::parse(["subject", title]).expect("valid subject tag")],
+            at,
+        )
+    }
+
+    /// Merges the user's own events into the matching thread.
+    #[test]
+    fn group_merges_own_events_into_the_matching_thread() {
+        let me = keys(1);
+        let issue = titled_issue(&me, "Add retry logic", 100);
+        let mine = signed(
+            &me,
+            Kind::Comment,
+            vec![
+                uppercase_e_tag(&issue),
+                Tag::parse(["K", "1621"]).expect("K tag"),
+            ],
+            150,
+        );
+        let reply = signed(
+            &keys(2),
+            Kind::Comment,
+            vec![
+                uppercase_e_tag(&issue),
+                Tag::parse(["K", "1621"]).expect("K tag"),
+            ],
+            200,
+        );
+
+        let context = [issue.clone(), mine.clone(), reply.clone()];
+        let items = group(
+            [reply.clone()],
+            [issue.clone(), mine.clone()],
+            me.public_key(),
+            &InboxReadState::default(),
+            &lookup(&context),
+        );
+
+        assert_eq!(items.len(), 1);
+        assert_eq!(items[0].root, issue.id);
+        assert_eq!(
+            items[0].root_event.as_ref().map(|event| event.id),
+            Some(issue.id)
+        );
+        assert_eq!(items[0].kind(), Some(Kind::GitIssue));
+        assert_eq!(items[0].title(), "Add retry logic");
+        assert_eq!(items[0].events, vec![reply.clone()]);
+        assert_eq!(items[0].own_events, vec![mine.clone(), issue.clone()]);
+        assert_eq!(
+            items[0]
+                .timeline(5)
+                .iter()
+                .map(|event| event.id)
+                .collect::<Vec<_>>(),
+            vec![issue.id, mine.id, reply.id]
+        );
+    }
+}

crates/signed_core/src/inbox/item.rs

@@ -0,0 +1,99 @@
+use std::collections::HashSet;
+
+use nostr::prelude::*;
+
+use super::InboxReadState;
+use crate::{GitEvent, RepoAddr};
+
+#[derive(Debug, Clone)]
+pub struct InboxItem {
+    pub root: EventId,
+    pub root_event: Option<Event>,
+    pub address: Option<RepoAddr>,
+    pub events: Vec<Event>,
+    pub own_events: Vec<Event>,
+    pub unread_ids: Vec<EventId>,
+    pub archived: bool,
+}
+
+impl InboxItem {
+    /// Returns the thread title from the root, own events, or events.
+    pub fn title(&self) -> String {
+        self.root_event
+            .as_ref()
+            .or_else(|| self.own_events.first())
+            .or_else(|| self.events.first())
+            .map(|event| event.activity_subject())
+            .unwrap_or_else(|| "Untitled".to_string())
+    }
+
+    /// Returns the kind of the thread's primary event.
+    pub fn kind(&self) -> Option<Kind> {
+        self.root_event
+            .as_ref()
+            .or_else(|| self.own_events.first())
+            .or_else(|| self.events.first())
+            .map(|event| event.kind)
+    }
+
+    /// Returns the newest timestamp among the root, own, and other events.
+    pub fn latest_activity(&self) -> Timestamp {
+        self.root_event
+            .as_ref()
+            .into_iter()
+            .chain(self.own_events.first())
+            .chain(self.events.first())
+            .map(|event| event.created_at)
+            .max()
+            .unwrap_or_default()
+    }
+
+    /// Builds a chronological timeline capped at `limit` events, root first.
+    pub fn timeline(&self, limit: usize) -> Vec<Event> {
+        let mut seen: HashSet<EventId> = HashSet::new();
+        let mut events: Vec<Event> = Vec::new();
+
+        if let Some(root) = &self.root_event {
+            seen.insert(root.id);
+            events.push(root.clone());
+        }
+
+        let mut rest: Vec<Event> = self
+            .own_events
+            .iter()
+            .chain(self.events.iter())
+            .filter(|event| seen.insert(event.id))
+            .cloned()
+            .collect();
+
+        rest.sort_by(|a, b| {
+            b.created_at
+                .cmp(&a.created_at)
+                .then_with(|| b.id.to_hex().cmp(&a.id.to_hex()))
+        });
+        rest.truncate(limit.saturating_sub(events.len()));
+        events.extend(rest);
+
+        events.sort_by_key(|event| event.created_at);
+        events
+    }
+
+    /// Returns whether the thread has unread events and is not archived.
+    pub fn is_unread(&self) -> bool {
+        !self.archived && !self.unread_ids.is_empty()
+    }
+
+    /// Recomputes unread ids and the archived flag from the read state.
+    pub fn apply_state(&mut self, state: &InboxReadState) {
+        self.unread_ids = self
+            .events
+            .iter()
+            .rev()
+            .filter(|event| !state.is_read(event))
+            .map(|event| event.id)
+            .collect();
+
+        self.archived =
+            !self.events.is_empty() && self.events.iter().all(|event| state.is_archived(event));
+    }
+}

crates/signed_core/src/inbox/mod.rs

@@ -0,0 +1,9 @@
+mod group;
+mod item;
+mod read_state;
+mod resolver;
+
+pub use group::group;
+pub use item::InboxItem;
+pub use read_state::InboxReadState;
+pub use resolver::ThreadResolver;

crates/signed_core/src/inbox/read_state.rs

@@ -0,0 +1,109 @@
+use std::collections::{HashMap, HashSet};
+use std::time::Duration;
+
+use nostr::prelude::*;
+use serde::{Deserialize, Serialize};
+
+const ADVANCE_WINDOW: Duration = Duration::from_secs(3 * 24 * 60 * 60);
+const MARK_ALL_WINDOW: Duration = Duration::from_secs(10 * 24 * 60 * 60);
+
+#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+pub struct InboxReadState {
+    #[serde(default)]
+    pub read_before: Timestamp,
+    #[serde(default)]
+    pub read_ids: HashSet<EventId>,
+    #[serde(default)]
+    pub archived_before: Timestamp,
+    #[serde(default)]
+    pub archived_ids: HashSet<EventId>,
+}
+
+impl InboxReadState {
+    /// Returns whether the event falls under the read high-water mark or id set.
+    pub fn is_read(&self, event: &Event) -> bool {
+        event.created_at <= self.read_before || self.read_ids.contains(&event.id)
+    }
+
+    /// Returns whether the event falls under the archived high-water mark or id set.
+    pub fn is_archived(&self, event: &Event) -> bool {
+        event.created_at <= self.archived_before || self.archived_ids.contains(&event.id)
+    }
+
+    /// Records the event as read when it is past the current cutoff.
+    pub fn mark_read(&mut self, event: &Event) {
+        if event.created_at > self.read_before {
+            self.read_ids.insert(event.id);
+        }
+    }
+
+    /// Records the event as archived when it is past the current cutoff.
+    pub fn mark_archived(&mut self, event: &Event) {
+        if event.created_at > self.archived_before {
+            self.archived_ids.insert(event.id);
+        }
+    }
+
+    /// Marks all events from other authors within the window as read.
+    pub fn mark_all_read(&mut self, all: &[Event], me: PublicKey, now: Timestamp) {
+        let cutoff = now - MARK_ALL_WINDOW;
+        self.read_before = cutoff;
+        self.read_ids = all
+            .iter()
+            .filter(|event| event.pubkey != me && event.created_at > cutoff)
+            .map(|event| event.id)
+            .collect();
+    }
+
+    /// Advances the read cutoff as far as possible, then prunes the id set.
+    pub fn advance_read(&mut self, all: &[Event], me: PublicKey, now: Timestamp) {
+        let cutoff = advance_cutoff(all, me, now, self.read_before, |event| self.is_read(event));
+        self.read_before = cutoff;
+        prune_ids(&mut self.read_ids, all, cutoff);
+    }
+
+    /// Advances the archived cutoff as far as possible, then prunes the id set.
+    pub fn advance_archived(&mut self, all: &[Event], me: PublicKey, now: Timestamp) {
+        let cutoff = advance_cutoff(all, me, now, self.archived_before, |event| {
+            self.is_archived(event)
+        });
+        self.archived_before = cutoff;
+        prune_ids(&mut self.archived_ids, all, cutoff);
+    }
+}
+
+/// Computes the newest cutoff that leaves unmarked events uncovered.
+fn advance_cutoff<M>(
+    all: &[Event],
+    me: PublicKey,
+    now: Timestamp,
+    current: Timestamp,
+    is_marked: M,
+) -> Timestamp
+where
+    M: Fn(&Event) -> bool,
+{
+    let fallback = now - ADVANCE_WINDOW;
+
+    let oldest = all
+        .iter()
+        .filter(|event| event.pubkey != me && !is_marked(event))
+        .map(|event| event.created_at)
+        .min();
+
+    let candidate = match oldest {
+        Some(at) if at < fallback => at - 1,
+        _ => fallback,
+    };
+
+    candidate.max(current)
+}
+
+/// Drops ids whose events predate the cutoff.
+fn prune_ids(ids: &mut HashSet<EventId>, all: &[Event], cutoff: Timestamp) {
+    let created_at: HashMap<EventId, Timestamp> = all
+        .iter()
+        .map(|event| (event.id, event.created_at))
+        .collect();
+    ids.retain(|id| created_at.get(id).is_some_and(|at| *at >= cutoff));
+}

crates/signed_core/src/inbox/resolver.rs

@@ -0,0 +1,249 @@
+use std::collections::HashSet;
+
+use nostr::prelude::*;
+
+pub struct ThreadResolver<'a, L: ?Sized> {
+    lookup: &'a L,
+}
+
+impl<'a, L> ThreadResolver<'a, L>
+where
+    L: Fn(EventId) -> Option<Event> + ?Sized,
+{
+    /// Creates a resolver over the given event lookup.
+    pub fn new(lookup: &'a L) -> Self {
+        Self { lookup }
+    }
+
+    /// Maps a git event kind to the thread root it notifies about.
+    pub fn notification_root(&self, event: &Event) -> Option<EventId> {
+        match event.kind {
+            Kind::GitIssue | Kind::GitPullRequest => Some(event.id),
+            Kind::GitPatch => Some(match self.first_e_id(event) {
+                Some(parent) => self.resolve_thread_root(parent),
+                None => event.id,
+            }),
+            Kind::Comment => match nip22::extract_root(event) {
+                Some(CommentTarget::Event { id, .. }) => Some(self.resolve_thread_root(id)),
+                _ => None,
+            },
+            Kind::GitPullRequestUpdate => self
+                .first_uppercase_e_id(event)
+                .map(|root| self.resolve_thread_root(root)),
+            Kind::GitStatusOpen
+            | Kind::GitStatusApplied
+            | Kind::GitStatusClosed
+            | Kind::GitStatusDraft => self
+                .nip10_root_id(event)
+                .map(|root| self.resolve_thread_root(root)),
+            _ => None,
+        }
+    }
+
+    /// Follows parent pointers until a git issue or pull request root is reached.
+    pub fn resolve_thread_root(&self, id: EventId) -> EventId {
+        let mut seen = HashSet::new();
+        let mut root = id;
+
+        loop {
+            if !seen.insert(root) {
+                return id;
+            }
+
+            let Some(event) = (self.lookup)(root) else {
+                return root;
+            };
+
+            if matches!(event.kind, Kind::GitIssue | Kind::GitPullRequest) {
+                return root;
+            }
+
+            match self.parent_id(&event) {
+                Some(parent) => root = parent,
+                None => return root,
+            }
+        }
+    }
+
+    /// Mirrors gitworkshop's `getParentId` parent resolution.
+    fn parent_id(&self, event: &Event) -> Option<EventId> {
+        for marker in ["reply", "root"] {
+            if let Some(id) = event
+                .tags
+                .iter()
+                .find_map(|tag| self.e_tag_with_marker(tag, marker))
+            {
+                return Some(id);
+            }
+        }
+
+        if let Some(id) = event.tags.iter().find_map(|tag| {
+            if tag.kind() != "e" {
+                return None;
+            }
+
+            let slice = tag.as_slice();
+            let is_mention = slice.len() == 4 && slice[3] == "mention";
+
+            if is_mention {
+                return None;
+            }
+
+            tag.content()
+                .and_then(|content| EventId::from_hex(content).ok())
+        }) {
+            return Some(id);
+        }
+
+        self.first_uppercase_e_id(event)
+    }
+
+    /// Reads the NIP-10 `root` marker, falling back to the first `e` tag.
+    fn nip10_root_id(&self, event: &Event) -> Option<EventId> {
+        event
+            .tags
+            .iter()
+            .find_map(|tag| self.e_tag_with_marker(tag, "root"))
+            .or_else(|| self.first_e_id(event))
+    }
+
+    /// Reads the first lowercase `e` tag id.
+    fn first_e_id(&self, event: &Event) -> Option<EventId> {
+        self.first_tag_id(event, "e")
+    }
+
+    /// Reads the first uppercase `E` tag id.
+    fn first_uppercase_e_id(&self, event: &Event) -> Option<EventId> {
+        self.first_tag_id(event, "E")
+    }
+
+    /// Reads the first event id from tags of the given kind.
+    fn first_tag_id(&self, event: &Event, name: &str) -> Option<EventId> {
+        event.tags.iter().find_map(|tag| {
+            if tag.kind() != name {
+                return None;
+            }
+            tag.content()
+                .and_then(|content| EventId::from_hex(content).ok())
+        })
+    }
+
+    /// Parses a four-value `e` tag carrying the given marker.
+    fn e_tag_with_marker(&self, tag: &Tag, marker: &str) -> Option<EventId> {
+        let slice = tag.as_slice();
+        if tag.kind() != "e" || slice.len() != 4 || slice[3] != marker {
+            return None;
+        }
+        tag.content()
+            .and_then(|content| EventId::from_hex(content).ok())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    /// Derives deterministic signer keys from a seed byte.
+    fn keys(seed: u8) -> Keys {
+        let mut hex = "00000000000000000000000000000000000000000000000000000000000000".to_string();
+        hex.push_str(&format!("{seed:02x}"));
+        Keys::new(SecretKey::from_hex(&hex).expect("valid secret key"))
+    }
+
+    /// Builds a signed event with a fixed timestamp.
+    fn signed(author: &Keys, kind: Kind, tags: Vec<Tag>, created_at: u64) -> Event {
+        EventBuilder::new(kind, "")
+            .tags(tags)
+            .custom_created_at(Timestamp::from_secs(created_at))
+            .finalize(author)
+            .expect("signed event")
+    }
+
+    /// Builds a plain lowercase `e` tag for the event.
+    fn e_tag(event: &Event) -> Tag {
+        Tag::parse(["e", &event.id.to_hex()]).expect("valid e tag")
+    }
+
+    /// Builds a four-value `e` tag with the given marker.
+    fn marked_e_tag(event: &Event, marker: &str) -> Tag {
+        Tag::parse(["e", &event.id.to_hex(), "wss://relay.example.com", marker])
+            .expect("valid e tag")
+    }
+
+    /// Builds an uppercase `E` tag for the event.
+    fn uppercase_e_tag(event: &Event) -> Tag {
+        Tag::parse(["E", &event.id.to_hex()]).expect("valid E tag")
+    }
+
+    /// Builds an event lookup closure over a slice.
+    fn lookup(events: &[Event]) -> impl Fn(EventId) -> Option<Event> + '_ {
+        move |id| events.iter().find(|event| event.id == id).cloned()
+    }
+
+    /// Builds a git issue event.
+    fn issue(author: &Keys, at: u64) -> Event {
+        signed(author, Kind::GitIssue, Vec::new(), at)
+    }
+
+    /// Resolves a comment to its uppercase `E` root.
+    #[test]
+    fn comment_resolves_to_its_uppercase_root() {
+        let issue = issue(&keys(1), 100);
+        let comment = signed(
+            &keys(2),
+            Kind::Comment,
+            vec![
+                uppercase_e_tag(&issue),
+                Tag::parse(["K", "1621"]).expect("valid K tag"),
+            ],
+            200,
+        );
+        let events = [issue.clone(), comment.clone()];
+        assert_eq!(
+            ThreadResolver::new(&lookup(&events)).notification_root(&comment),
+            Some(issue.id)
+        );
+    }
+
+    /// Resolves a child patch to its root patch.
+    #[test]
+    fn child_patch_resolves_to_the_root_patch() {
+        let root_patch = signed(&keys(1), Kind::GitPatch, Vec::new(), 100);
+        let child_patch = signed(&keys(1), Kind::GitPatch, vec![e_tag(&root_patch)], 200);
+        let events = [root_patch.clone(), child_patch.clone()];
+        assert_eq!(
+            ThreadResolver::new(&lookup(&events)).notification_root(&child_patch),
+            Some(root_patch.id)
+        );
+    }
+
+    /// Resolves a status through its `root` marker tag.
+    #[test]
+    fn status_resolves_via_the_root_marker() {
+        let issue = issue(&keys(1), 100);
+        let status = signed(
+            &keys(2),
+            Kind::GitStatusClosed,
+            vec![marked_e_tag(&issue, "root")],
+            200,
+        );
+        let events = [issue.clone(), status.clone()];
+        assert_eq!(
+            ThreadResolver::new(&lookup(&events)).notification_root(&status),
+            Some(issue.id)
+        );
+    }
+
+    /// Follows a nested comment chain to the issue root.
+    #[test]
+    fn nested_comment_chain_follows_to_the_root() {
+        let issue = issue(&keys(1), 100);
+        let reply = signed(&keys(2), Kind::Comment, vec![uppercase_e_tag(&issue)], 200);
+        let nested = signed(&keys(3), Kind::Comment, vec![uppercase_e_tag(&reply)], 300);
+        let events = [issue.clone(), reply, nested.clone()];
+        assert_eq!(
+            ThreadResolver::new(&lookup(&events)).notification_root(&nested),
+            Some(issue.id)
+        );
+    }
+}

crates/signed_core/src/lib.rs

@@ -1,22 +1,19 @@
 pub mod addr;
-pub mod annotations;
+pub mod announcement;
 pub mod deletions;
 pub mod filters;
+pub mod git_event;
 pub mod inbox;
-pub mod model;
-pub mod state;
+pub mod pull_request;
 pub mod status;
+pub mod upstream;
 
-pub use addr::{RepoAddr, identifier_from_name, repo_addr};
-pub use annotations::COVER_NOTE_KIND;
+pub use addr::RepoAddr;
+pub use announcement::Announcement;
 pub use deletions::Deletions;
-pub use filters::{
-    NOTIFICATION_KINDS, authored_activity, is_git_activity, notification_comments, notifications,
-};
-pub use inbox::{InboxItem, InboxReadState, group, notification_root};
-pub use model::{
-    Announcement, activity_subject, branch_name_of, clone_urls_of, current_commit_of,
-    fork_candidates, latest_update, merge_base_of, pull_request_patch, pull_request_patches,
-};
-pub use state::{build_state, parse_state};
-pub use status::{RepoStatus, references_root, resolve_status};
+pub use filters::Filters;
+pub use git_event::GitEvent;
+pub use inbox::{InboxItem, InboxReadState, ThreadResolver};
+pub use pull_request::PullRequest;
+pub use status::RepoStatus;
+pub use upstream::Upstream;

crates/signed_core/src/model.rs

@@ -1,883 +0,0 @@
-use std::collections::HashSet;
-
-use nostr::prelude::*;
-
-use crate::{RepoAddr, repo_addr};
-
-/// Parsed NIP-34 repository announcement, plain data ready for the UI.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct Announcement {
-    /// ID of the announcement event itself.
-    pub event_id: EventId,
-    /// Repository ID, the `d` tag.
-    pub id: String,
-    /// Author of the announcement event.
-    pub owner: PublicKey,
-    /// When the announcement was published, used for latest-wins resolution.
-    pub created_at: Timestamp,
-    pub name: Option<String>,
-    pub description: Option<String>,
-    /// Webpage URLs for browsing.
-    pub web: Vec<Url>,
-    /// URLs for `git clone`.
-    pub clone: Vec<Url>,
-    /// Relays the repository monitors for patches and issues.
-    pub relays: Vec<RelayUrl>,
-    /// Earliest unique commit ID, the `r` tag with `euc` marker.
-    pub euc: Option<String>,
-    /// Other recognized maintainers.
-    pub maintainers: Vec<PublicKey>,
-    /// Marks the repository as a subordinate fork of the upstream, per NIP-34.
-    pub upstream: Option<Upstream>,
-    /// Hashtags labelling the repository, the `t` tags.
-    pub hashtags: Vec<String>,
-}
-
-/// The `u` tag of a fork announcement, per NIP-34.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct Upstream {
-    /// Raw first value of the `u` tag, a coordinate or git URL.
-    pub raw: String,
-    /// Upstream repository coordinate when the `u` tag names a NIP-34 repository.
-    /// `None` for the git-URL form.
-    pub addr: Option<RepoAddr>,
-}
-
-impl Upstream {
-    fn parse(raw: &str) -> Self {
-        let coordinate = raw.split('|').next().unwrap_or(raw);
-        let addr = coordinate
-            .parse::<Coordinate>()
-            .ok()
-            .filter(|c| c.kind == Kind::GitRepoAnnouncement);
-        Self {
-            raw: raw.to_owned(),
-            addr,
-        }
-    }
-
-    pub fn display(&self) -> String {
-        match &self.addr {
-            Some(addr) => addr.to_string(),
-            None => self.raw.clone(),
-        }
-    }
-}
-
-/// Subject of a NIP-34 issue or pull request event.
-/// Taken from the `subject` tag, else the first non-empty line of the content.
-pub fn activity_subject(event: &Event) -> String {
-    let subject = event
-        .tags
-        .iter()
-        .find_map(|tag| match Nip34Tag::parse(tag.as_slice()) {
-            Ok(Nip34Tag::Subject(subject)) => Some(subject),
-            _ => None,
-        });
-
-    subject
-        .or_else(|| {
-            event
-                .content
-                .lines()
-                .map(str::trim)
-                .find(|line| !line.is_empty())
-                .map(|value| value.to_string())
-        })
-        .unwrap_or("Untitled".to_string())
-}
-
-/// The patch set of a pull request.
-///
-/// Returns an empty list when no patch event can be linked to the PR.
-pub fn pull_request_patches<'a>(
-    pr: &Event,
-    patches: impl IntoIterator<Item = &'a Event>,
-) -> Vec<&'a Event> {
-    let patches: Vec<&'a Event> = patches.into_iter().collect();
-
-    // The PR references its root patch via an `e` tag.
-    // Follow the NIP-10 reply chain forward from there.
-    // Each patch replies to the previous one, and among several replies the newest wins.
-    if let Some(root_id) = pr.tags.event_ids().next()
-        && let Some(root) = patches.iter().find(|patch| patch.id == root_id)
-    {
-        return forward_series(root, &patches);
-    }
-
-    // The PR has no `e` tag.
-    // The last patch of the set carries the tip commit in its `commit` or `r` tag.
-    // Walk the reply chain backward to the root.
-    let Some(tip) = current_commit_of(pr) else {
-        return Vec::new();
-    };
-    let Some(last) = patches
-        .iter()
-        .filter(|patch| patch_produces_commit(patch, &tip))
-        .max_by_key(|patch| patch.created_at)
-        .copied()
-    else {
-        return Vec::new();
-    };
-
-    let mut series = vec![last];
-    loop {
-        let Some(prev_id) = series.last().unwrap().tags.event_ids().next() else {
-            break;
-        };
-        let Some(prev) = patches
-            .iter()
-            .find(|patch| patch.id == prev_id && !series.contains(patch))
-            .copied()
-        else {
-            break;
-        };
-        series.push(prev);
-    }
-    series.reverse();
-    series
-}
-
-pub fn pull_request_patch<'a>(pr: &Event, patches: impl IntoIterator<Item = &'a Event>) -> String {
-    let patches: Vec<&'a Event> = patches.into_iter().collect();
-    let series = pull_request_patches(pr, patches.iter().copied());
-    if series.is_empty() {
-        return pr.content.clone();
-    }
-    series
-        .iter()
-        .map(|patch| patch.content.as_str())
-        .collect::<Vec<_>>()
-        .join("\n")
-}
-
-/// The chain of patches replying to `root` via NIP-10 `e` tags, oldest first.
-fn forward_series<'a>(root: &'a Event, patches: &[&'a Event]) -> Vec<&'a Event> {
-    let mut series = vec![root];
-    loop {
-        let next = patches
-            .iter()
-            .filter(|patch| !series.contains(patch))
-            .filter(|patch| {
-                patch
-                    .tags
-                    .event_ids()
-                    .any(|id| id == series.last().unwrap().id)
-            })
-            .max_by_key(|patch| patch.created_at);
-        let Some(next) = next else {
-            break;
-        };
-        series.push(next);
-    }
-    series
-}
-
-/// The `c` tag of an event, the tip of the proposed branch, as hex.
-pub fn current_commit_of(event: &Event) -> Option<String> {
-    event
-        .tags
-        .iter()
-        .find_map(|tag| match Nip34Tag::parse(tag.as_slice()) {
-            Ok(Nip34Tag::CurrentCommit(commit)) => Some(commit.to_string()),
-            _ => None,
-        })
-}
-
-/// The `merge-base` tag of an event, the base commit a pull request diffs against.
-pub fn merge_base_of(event: &Event) -> Option<String> {
-    event
-        .tags
-        .iter()
-        .find_map(|tag| match Nip34Tag::parse(tag.as_slice()) {
-            Ok(Nip34Tag::MergeBase(commit)) => Some(commit.to_string()),
-            _ => None,
-        })
-}
-
-/// The `clone` tag of an event, URLs the tip commit can be fetched from.
-pub fn clone_urls_of(event: &Event) -> Option<Vec<Url>> {
-    event
-        .tags
-        .iter()
-        .find_map(|tag| match Nip34Tag::parse(tag.as_slice()) {
-            Ok(Nip34Tag::Clone(urls)) => Some(urls),
-            _ => None,
-        })
-}
-
-/// The `branch-name` tag of an event, the proposed branch's name.
-pub fn branch_name_of(event: &Event) -> Option<String> {
-    event
-        .tags
-        .iter()
-        .find_map(|tag| match Nip34Tag::parse(tag.as_slice()) {
-            Ok(Nip34Tag::BranchName(name)) => Some(name),
-            _ => None,
-        })
-}
-
-/// The newest `GitPullRequestUpdate` revising `root`, from the root's own author.
-///
-/// A pull request's tip is only mutable by its author, per NIP-34; updates
-/// from anyone else are ignored even if they are newer.
-pub fn latest_update<'a>(
-    events: impl Iterator<Item = &'a Event>,
-    root: &Event,
-) -> Option<&'a Event> {
-    let root_hex = root.id.to_hex();
-    events
-        .filter(|e| e.kind == Kind::GitPullRequestUpdate)
-        .filter(|e| e.pubkey == root.pubkey)
-        .filter(|e| {
-            e.tags
-                .iter()
-                .any(|t| t.kind() == "E" && t.content() == Some(root_hex.as_str()))
-        })
-        .max_by_key(|e| e.created_at)
-}
-
-/// The announced forks of `base` a new pull request compare can be built from.
-///
-/// The user's own forks are listed first.
-pub fn fork_candidates<'a>(
-    announcements: &'a [Announcement],
-    base: &RepoAddr,
-    base_euc: Option<&str>,
-    user: Option<PublicKey>,
-) -> Vec<&'a Announcement> {
-    let (mut own, mut others) = (Vec::new(), Vec::new());
-    for announcement in announcements {
-        if announcement.clone.is_empty() || !announcement.is_fork_of(base, base_euc) {
-            continue;
-        }
-        if Some(announcement.owner) == user {
-            own.push(announcement);
-        } else {
-            others.push(announcement);
-        }
-    }
-    own.into_iter().chain(others).collect()
-}
-
-/// Whether `patch` produces `commit`, found via its `commit` or `r` tag.
-///
-/// It lets clients find existing patches for a specific commit.
-fn patch_produces_commit(patch: &Event, commit: &str) -> bool {
-    patch
-        .tags
-        .iter()
-        .any(|tag| match Nip34Tag::parse(tag.as_slice()) {
-            Ok(Nip34Tag::Commit(c) | Nip34Tag::Reference(c)) => c.to_string() == commit,
-            _ => false,
-        })
-}
-
-impl Announcement {
-    /// Parse a kind `30617` event.
-    ///
-    /// Returns `None` when the kind is wrong or the `d` tag is missing.
-    pub fn from_event(event: &Event) -> Option<Self> {
-        if event.kind != Kind::GitRepoAnnouncement {
-            return None;
-        }
-
-        let id = event.tags.identifier()?;
-
-        let mut hashtags: Vec<String> = Vec::new();
-        hashtags.extend(event.tags.hashtags().map(|t| t.to_string()));
-
-        let mut name: Option<String> = None;
-        let mut description: Option<String> = None;
-        let mut web: Vec<Url> = Vec::new();
-        let mut clone: Vec<Url> = Vec::new();
-        let mut relays: Vec<RelayUrl> = Vec::new();
-        let mut euc: Option<String> = None;
-        let mut maintainers: Vec<PublicKey> = Vec::new();
-        let mut upstream: Option<Upstream> = None;
-
-        for tag in event.tags.iter() {
-            match Nip34Tag::parse(tag.as_slice()) {
-                Ok(Nip34Tag::Name(value)) => name = Some(value),
-                Ok(Nip34Tag::Description(value)) => description = Some(value),
-                Ok(Nip34Tag::Web(urls)) => web.extend(urls),
-                Ok(Nip34Tag::Clone(urls)) => clone.extend(urls),
-                Ok(Nip34Tag::Relays(urls)) => relays.extend(urls),
-                Ok(Nip34Tag::EarliestUniqueCommitId(commit)) => euc = Some(commit.to_string()),
-                Ok(Nip34Tag::Maintainers(keys)) => maintainers.extend(keys),
-                _ => {}
-            }
-
-            // The SDK's `Nip34Tag` does not model the `u` tag, so parse it manually.
-            // Only the first `u` tag is used.
-            if upstream.is_none() && tag.kind() == "u" {
-                let values = tag.as_slice();
-                let raw = values.get(1).map(String::as_str).unwrap_or_default();
-                if !raw.is_empty() {
-                    upstream = Some(Upstream::parse(raw));
-                }
-            }
-        }
-
-        Some(Self {
-            event_id: event.id,
-            owner: event.pubkey,
-            created_at: event.created_at,
-            id,
-            name,
-            description,
-            web,
-            clone,
-            relays,
-            euc,
-            maintainers,
-            upstream,
-            hashtags,
-        })
-    }
-
-    pub fn addr(&self) -> RepoAddr {
-        repo_addr(self.owner, self.id.clone())
-    }
-
-    /// The name of the repository, or a default if none is provided.
-    pub fn name(&self) -> String {
-        self.name.clone().unwrap_or("Untitled".into())
-    }
-
-    /// Whether this announcement is a fork of the repository at `base`.
-    /// Its `u` tag points at `base`, which also covers permanent forks whose EUC diverged.
-    ///
-    /// Or it shares `base`'s earliest unique commit and is not the base itself.
-    pub fn is_fork_of(&self, base: &RepoAddr, base_euc: Option<&str>) -> bool {
-        if self.addr() == *base {
-            return false;
-        }
-        if self.upstream.as_ref().and_then(|u| u.addr.as_ref()) == Some(base) {
-            return true;
-        }
-        base_euc.is_some_and(|euc| self.euc.as_deref() == Some(euc))
-    }
-
-    /// The description of the repository, or a default if none is provided.
-    pub fn description(&self) -> String {
-        self.description
-            .clone()
-            .unwrap_or("No description".to_string())
-    }
-
-    /// The effective maintainers of this repository,
-    /// the announced `maintainers` plus the announcement author.
-    ///
-    /// A `u` tag that marks the repository as a subordinate fork excludes them, per NIP-34.
-    pub fn effective_maintainers(&self) -> Vec<PublicKey> {
-        let mut maintainers = self.maintainers.clone();
-        if self.upstream.is_none() && !maintainers.contains(&self.owner) {
-            maintainers.push(self.owner);
-        }
-        maintainers
-    }
-
-    /// The `git clone` URLs for this repository, deduplicated.
-    pub fn clone_urls(&self) -> Vec<String> {
-        let mut seen = HashSet::new();
-        self.clone
-            .iter()
-            .map(|url| format!("git clone {url}"))
-            .filter(|command| seen.insert(command.clone()))
-            .collect()
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    const MAINTAINER_HEX: &str = "68d81165918100b7da43fc28f7d1fc12554466e1115886b9e7bb326f65ec4272";
-
-    fn keys() -> Keys {
-        Keys::new(
-            SecretKey::from_hex("0000000000000000000000000000000000000000000000000000000000000001")
-                .expect("valid secret key"),
-        )
-    }
-
-    fn announcement_event(tags: &[&[&str]]) -> Event {
-        let tags: Vec<Tag> = tags
-            .iter()
-            .map(|t| Tag::parse(t.to_vec()).expect("valid tag"))
-            .collect();
-
-        EventBuilder::new(Kind::GitRepoAnnouncement, "")
-            .tags(tags)
-            .finalize(&keys())
-            .expect("signed event")
-    }
-
-    #[test]
-    fn parses_full_announcement() {
-        let event = announcement_event(&[
-            &["d", "my-repo"],
-            &["name", "My Repo"],
-            &["description", "A test repository"],
-            &["web", "https://example.com/repo"],
-            &["clone", "https://example.com/repo.git"],
-            &["relays", "wss://relay.example.com"],
-            &["r", "aa231c4c6a5777dc89b42207b499891a344add5c", "euc"],
-            &["maintainers", MAINTAINER_HEX],
-            &["t", "rust"],
-            &["t", "nostr"],
-        ]);
-
-        let announcement = Announcement::from_event(&event).expect("parses");
-
-        assert_eq!(announcement.owner, keys().public_key());
-        assert_eq!(announcement.id, "my-repo");
-        assert_eq!(announcement.name.as_deref(), Some("My Repo"));
-        assert_eq!(
-            announcement.description.as_deref(),
-            Some("A test repository")
-        );
-        assert_eq!(
-            announcement.web,
-            vec![Url::parse("https://example.com/repo").unwrap()]
-        );
-        assert_eq!(
-            announcement.clone,
-            vec![Url::parse("https://example.com/repo.git").unwrap()]
-        );
-        assert_eq!(
-            announcement.relays,
-            vec![RelayUrl::parse("wss://relay.example.com").unwrap()]
-        );
-        assert_eq!(
-            announcement.euc.as_deref(),
-            Some("aa231c4c6a5777dc89b42207b499891a344add5c")
-        );
-        assert_eq!(
-            announcement.maintainers,
-            vec![PublicKey::from_hex(MAINTAINER_HEX).expect("valid pubkey")]
-        );
-        assert_eq!(announcement.hashtags, vec!["rust", "nostr"]);
-    }
-
-    #[test]
-    fn drops_malformed_values() {
-        let event = announcement_event(&[
-            &["d", "my-repo"],
-            &["clone", "not a url"],
-            &["relays", "wss://good.example.com"],
-            &["maintainers", "not-a-pubkey"],
-        ]);
-
-        let announcement = Announcement::from_event(&event).expect("parses");
-
-        // An invalid URL keeps the whole clone tag from being parsed.
-        assert!(announcement.clone.is_empty());
-        assert_eq!(
-            announcement.relays,
-            vec![RelayUrl::parse("wss://good.example.com").unwrap()]
-        );
-        assert!(announcement.maintainers.is_empty());
-    }
-
-    #[test]
-    fn parses_upstream_tag() {
-        let event = announcement_event(&[
-            &["d", "my-fork"],
-            &[
-                "u",
-                "30617:68d81165918100b7da43fc28f7d1fc12554466e1115886b9e7bb326f65ec4272:upstream|https://example.com/upstream.git",
-                "wss://relay.example.com",
-            ],
-        ]);
-
-        let announcement = Announcement::from_event(&event).expect("parses");
-        let upstream = announcement.upstream.expect("parses the u tag");
-
-        // The coordinate part resolves to a repository address.
-        // The raw value keeps the `|git-url` suffix.
-        assert_eq!(
-            upstream.addr,
-            Some(crate::repo_addr(
-                PublicKey::from_hex(MAINTAINER_HEX).expect("valid pubkey"),
-                "upstream"
-            ))
-        );
-        assert_eq!(
-            upstream.raw,
-            "30617:68d81165918100b7da43fc28f7d1fc12554466e1115886b9e7bb326f65ec4272:upstream|https://example.com/upstream.git"
-        );
-        assert_eq!(
-            upstream.display().to_string(),
-            "30617:68d81165918100b7da43fc28f7d1fc12554466e1115886b9e7bb326f65ec4272:upstream"
-        );
-    }
-
-    #[test]
-    fn is_fork_of_matches_the_u_tag_coordinate() {
-        // The base repository, announced by the `u` tag's owner.
-        let base = crate::repo_addr(
-            PublicKey::from_hex(MAINTAINER_HEX).expect("valid pubkey"),
-            "upstream",
-        );
-        let event = announcement_event(&[&["d", "my-fork"], &["u", &base.to_string()]]);
-        let fork = Announcement::from_event(&event).expect("parses");
-
-        // A `u` tag pointing at the base address marks a fork.
-        // This holds even when neither side announces an EUC.
-        assert!(fork.is_fork_of(&base, None));
-    }
-
-    #[test]
-    fn is_fork_of_matches_a_shared_euc() {
-        let euc = "aa231c4c6a5777dc89b42207b499891a344add5c";
-        // The base repo has no `u` tag. It announces the family EUC.
-        let base_event = announcement_event(&[&["d", "upstream"], &["r", euc, "euc"]]);
-        let base = Announcement::from_event(&base_event).expect("parses");
-        let base_addr = base.addr();
-
-        // A fork with no `u` tag, a pure mirror or cross-hosted clone, shares the EUC.
-        // Clients of the family can then find it.
-        let fork_event = announcement_event(&[&["d", "mirror"], &["r", euc, "euc"]]);
-        let fork = Announcement::from_event(&fork_event).expect("parses");
-        assert!(fork.is_fork_of(&base_addr, base.euc.as_deref()));
-
-        // An unrelated repository with a different EUC is not a fork.
-        let other_event = announcement_event(&[
-            &["d", "other"],
-            &["r", "bb231c4c6a5777dc89b42207b499891a344add5c", "euc"],
-        ]);
-        let other = Announcement::from_event(&other_event).expect("parses");
-        assert!(!other.is_fork_of(&base_addr, base.euc.as_deref()));
-
-        // Without a base EUC there is nothing to compare against.
-        assert!(!fork.is_fork_of(&base_addr, None));
-    }
-
-    #[test]
-    fn is_fork_of_matches_permanent_forks_with_a_diverged_euc() {
-        // A permanent fork re-announces its EUC, the first commit after the fork.
-        // Only the `u` tag still relates it to the base.
-        let base = crate::repo_addr(
-            PublicKey::from_hex(MAINTAINER_HEX).expect("valid pubkey"),
-            "upstream",
-        );
-        let base_euc = "aa231c4c6a5777dc89b42207b499891a344add5c";
-        let event = announcement_event(&[
-            &["d", "my-fork"],
-            &["u", &base.to_string()],
-            &["r", "cc231c4c6a5777dc89b42207b499891a344add5c", "euc"],
-        ]);
-        let fork = Announcement::from_event(&event).expect("parses");
-
-        assert!(fork.is_fork_of(&base, Some(base_euc)));
-    }
-
-    #[test]
-    fn effective_maintainers_include_owner_for_primary_repos() {
-        let event = announcement_event(&[&["d", "my-repo"], &["maintainers", MAINTAINER_HEX]]);
-
-        let announcement = Announcement::from_event(&event).expect("parses");
-        let maintainers = announcement.effective_maintainers();
-
-        // The owner asserts themselves as a maintainer of the primary project, per NIP-34.
-        // Announced co-maintainers are included too.
-        assert_eq!(maintainers.len(), 2);
-        assert!(maintainers.contains(&announcement.owner));
-        assert!(maintainers.contains(&PublicKey::from_hex(MAINTAINER_HEX).expect("valid pubkey")));
-    }
-
-    #[test]
-    fn effective_maintainers_exclude_owner_for_subordinate_forks() {
-        let event = announcement_event(&[
-            &["d", "my-fork"],
-            &["u", "30617:abc:upstream|https://example.com/upstream.git"],
-            &["maintainers", MAINTAINER_HEX],
-        ]);
-
-        let announcement = Announcement::from_event(&event).expect("parses");
-        let maintainers = announcement.effective_maintainers();
-
-        // A `u` tag marks the repository as a subordinate fork.
-        // The author is then not a maintainer of the primary project, per NIP-34.
-        assert!(!maintainers.contains(&announcement.owner));
-        assert_eq!(
-            maintainers,
-            vec![PublicKey::from_hex(MAINTAINER_HEX).expect("valid pubkey")]
-        );
-    }
-
-    fn pr_event(content: &str, tags: Vec<Tag>) -> Event {
-        EventBuilder::new(Kind::GitPullRequest, content)
-            .tags(tags)
-            .finalize(&keys())
-            .expect("signed event")
-    }
-
-    fn patch_event(content: &str, tags: Vec<Tag>, created_at: u64) -> Event {
-        EventBuilder::new(Kind::GitPatch, content)
-            .tags(tags)
-            .custom_created_at(Timestamp::from(created_at))
-            .finalize(&keys())
-            .expect("signed event")
-    }
-
-    #[test]
-    fn pull_request_patch_joins_the_whole_patch_set() {
-        // A PR references the root patch, per NIP-34.
-        // Later patches of the set reply to the previous one via NIP-10 `e` tags.
-        let root = patch_event("patch-one", vec![], 100);
-        let second = patch_event("patch-two", vec![Tag::event(root.id)], 200);
-        let pr = pr_event("description", vec![Tag::event(root.id)]);
-
-        assert_eq!(
-            pull_request_patch(&pr, [&root, &second]),
-            "patch-one\npatch-two"
-        );
-        assert_eq!(
-            pull_request_patches(&pr, [&root, &second]),
-            vec![&root, &second]
-        );
-    }
-
-    #[test]
-    fn pull_request_patches_walks_the_reply_chain_in_order() {
-        let root = patch_event("patch-one", vec![], 100);
-        let second = patch_event("patch-two", vec![Tag::event(root.id)], 200);
-        let third = patch_event("patch-three", vec![Tag::event(second.id)], 300);
-        let pr = pr_event("description", vec![Tag::event(root.id)]);
-
-        let series = pull_request_patches(&pr, [&third, &root, &second]);
-        assert_eq!(
-            series
-                .iter()
-                .map(|p| p.content.as_str())
-                .collect::<Vec<_>>(),
-            vec!["patch-one", "patch-two", "patch-three"]
-        );
-    }
-
-    #[test]
-    fn pull_request_patches_finds_the_set_via_the_tip_commit() {
-        // PRs without an `e` tag fall back to the patch producing the tip commit.
-        // Walk the reply chain backward to the root.
-        let root = patch_event("patch-one", vec![], 100);
-        let tip = "1111111111111111111111111111111111111111";
-        let last = patch_event(
-            "patch-two",
-            vec![
-                Tag::event(root.id),
-                Tag::parse(["r", tip]).expect("valid tag"),
-            ],
-            200,
-        );
-        let pr = pr_event(
-            "description",
-            vec![Tag::parse(["c", tip]).expect("valid tag")],
-        );
-
-        let series = pull_request_patches(&pr, [&root, &last]);
-        assert_eq!(
-            series
-                .iter()
-                .map(|p| p.content.as_str())
-                .collect::<Vec<_>>(),
-            vec!["patch-one", "patch-two"]
-        );
-    }
-
-    const COMMIT_HEX: &str = "1111111111111111111111111111111111111111";
-    const OTHER_ROOT_HEX: &str = "2222222222222222222222222222222222222222";
-
-    fn signed_at(kind: Kind, tags: Vec<Tag>, created_at: u64) -> Event {
-        EventBuilder::new(kind, "")
-            .tags(tags)
-            .custom_created_at(Timestamp::from(created_at))
-            .finalize(&keys())
-            .expect("signed event")
-    }
-
-    fn pr_root() -> Event {
-        signed_at(
-            Kind::GitPullRequest,
-            vec![
-                Tag::parse(["c", COMMIT_HEX]).expect("valid tag"),
-                Tag::parse(["branch-name", "feature/x"]).expect("valid tag"),
-            ],
-            100,
-        )
-    }
-
-    #[test]
-    fn latest_update_picks_newest_revision_of_the_root() {
-        let root = pr_root();
-        let root_hex = root.id.to_hex();
-
-        let revision = |created_at: u64| {
-            signed_at(
-                Kind::GitPullRequestUpdate,
-                vec![Tag::parse(["E", &root_hex]).expect("valid tag")],
-                created_at,
-            )
-        };
-        // An update revising a different PR must be ignored even though it is newer.
-        let unrelated = signed_at(
-            Kind::GitPullRequestUpdate,
-            vec![Tag::parse(["E", OTHER_ROOT_HEX]).expect("valid tag")],
-            999,
-        );
-
-        let events = [unrelated, revision(200), root.clone(), revision(300)];
-        let latest = latest_update(events.iter(), &root).expect("an update");
-
-        assert_eq!(latest.created_at.as_secs(), 300);
-        assert_eq!(latest.kind, Kind::GitPullRequestUpdate);
-    }
-
-    #[test]
-    fn latest_update_ignores_other_authors() {
-        let root = pr_root();
-        let root_hex = root.id.to_hex();
-        let other = Keys::new(
-            SecretKey::from_hex("0000000000000000000000000000000000000000000000000000000000000002")
-                .expect("valid secret key"),
-        );
-        let stranger = EventBuilder::new(Kind::GitPullRequestUpdate, "")
-            .tags([Tag::parse(["E", &root_hex]).expect("valid tag")])
-            .custom_created_at(Timestamp::from(999))
-            .finalize(&other)
-            .expect("signed event");
-
-        // The tip of a PR is only mutable by its author.
-        // A newer update from anyone else must not win.
-        assert!(latest_update([&stranger, &root].into_iter(), &root).is_none());
-    }
-
-    const OWNER_KEYS: [&str; 3] = [
-        "0000000000000000000000000000000000000000000000000000000000000001",
-        "0000000000000000000000000000000000000000000000000000000000000002",
-        "0000000000000000000000000000000000000000000000000000000000000003",
-    ];
-
-    fn owned_announcement_event(owner: &str, tags: &[&[&str]]) -> Event {
-        let keys = Keys::new(SecretKey::from_hex(owner).expect("valid secret key"));
-        let tags: Vec<Tag> = tags
-            .iter()
-            .map(|t| Tag::parse(t.to_vec()).expect("valid tag"))
-            .collect();
-        EventBuilder::new(Kind::GitRepoAnnouncement, "")
-            .tags(tags)
-            .finalize(&keys)
-            .expect("signed event")
-    }
-
-    fn owned_announcements(owner_ix: usize, tags: &[&[&str]]) -> Vec<Announcement> {
-        vec![
-            Announcement::from_event(&owned_announcement_event(OWNER_KEYS[owner_ix], tags))
-                .expect("parses"),
-        ]
-    }
-
-    #[test]
-    fn fork_candidates_orders_own_forks_first() {
-        let euc = "aa231c4c6a5777dc89b42207b499891a344add5c";
-        let clone = "https://grasp.example/npub1x/my-fork.git";
-
-        let base_addr = crate::repo_addr(
-            PublicKey::from_hex(OWNER_KEYS[0]).expect("pubkey"),
-            "upstream",
-        );
-        // Newest first, as RepoListStore keeps them.
-        // Unrelated repo, the user's fork with the shared EUC, another fork with a `u` tag.
-        let all = vec![
-            owned_announcements(
-                2,
-                &[
-                    &["d", "other-project"],
-                    &["r", "bb231c4c6a5777dc89b42207b499891a344add5c", "euc"],
-                ],
-            )
-            .pop()
-            .unwrap(),
-            owned_announcements(
-                1,
-                &[&["d", "my-fork"], &["r", euc, "euc"], &["clone", clone]],
-            )
-            .pop()
-            .unwrap(),
-            owned_announcements(
-                2,
-                &[
-                    &["d", "their-fork"],
-                    &["u", &base_addr.to_string()],
-                    &["clone", clone],
-                ],
-            )
-            .pop()
-            .unwrap(),
-        ];
-
-        let user = PublicKey::from_hex(OWNER_KEYS[1]).expect("pubkey");
-        let forks = fork_candidates(&all, &base_addr, Some(euc), Some(user));
-
-        let ids: Vec<&str> = forks.iter().map(|a| a.id.as_str()).collect();
-        assert_eq!(ids, vec!["my-fork", "their-fork"]);
-    }
-
-    #[test]
-    fn fork_candidates_excludes_base_unrelated_and_unfetchable() {
-        let euc = "aa231c4c6a5777dc89b42207b499891a344add5c";
-        let base_owner = PublicKey::from_hex(OWNER_KEYS[0]).expect("pubkey");
-        let base_addr = crate::repo_addr(base_owner, "upstream");
-
-        let mut all = vec![
-            owned_announcements(0, &[&["d", "upstream"], &["r", euc, "euc"]])
-                .pop()
-                .unwrap(),
-            owned_announcements(1, &[&["d", "no-clone-fork"], &["r", euc, "euc"]])
-                .pop()
-                .unwrap(),
-            owned_announcements(
-                2,
-                &[
-                    &["d", "other"],
-                    &["r", "cc231c4c6a5777dc89b42207b499891a344add5c", "euc"],
-                ],
-            )
-            .pop()
-            .unwrap(),
-            owned_announcements(
-                2,
-                &[
-                    &["d", "mirror"],
-                    &["r", euc, "euc"],
-                    &["clone", "https://grasp.example/x/mirror.git"],
-                ],
-            )
-            .pop()
-            .unwrap(),
-        ];
-
-        let forks = fork_candidates(&all, &base_addr, Some(euc), Some(base_owner));
-        assert_eq!(forks.len(), 1);
-        assert_eq!(forks[0].id, "mirror");
-
-        // Without a base EUC only `u`-tag forks match.
-        all.push(
-            owned_announcements(
-                2,
-                &[
-                    &["d", "u-fork"],
-                    &["u", &base_addr.to_string()],
-                    &["clone", "https://grasp.example/x/u-fork.git"],
-                ],
-            )
-            .pop()
-            .unwrap(),
-        );
-        let forks = fork_candidates(&all, &base_addr, None, Some(base_owner));
-        let ids: Vec<&str> = forks.iter().map(|a| a.id.as_str()).collect();
-        assert_eq!(ids, vec!["u-fork"]);
-    }
-}

crates/signed_core/src/pull_request.rs

@@ -0,0 +1,279 @@
+use nostr::prelude::*;
+
+use crate::git_event::GitEvent;
+
+pub struct PullRequest<'a>(pub &'a Event);
+
+impl<'a> PullRequest<'a> {
+    /// Wraps a pull request root event.
+    pub fn new(event: &'a Event) -> Self {
+        Self(event)
+    }
+
+    /// Returns the ordered patch series, found via the root reference or the tip commit.
+    pub fn patches(&self, patches: impl IntoIterator<Item = &'a Event>) -> Vec<&'a Event> {
+        let pr = self.0;
+        let patches: Vec<&'a Event> = patches.into_iter().collect();
+
+        if let Some(root_id) = pr.tags.event_ids().next()
+            && let Some(root) = patches.iter().find(|patch| patch.id == root_id)
+        {
+            return Self::forward_series(root, &patches);
+        }
+
+        let Some(tip) = pr.current_commit() else {
+            return Vec::new();
+        };
+        let Some(last) = patches
+            .iter()
+            .filter(|patch| Self::patch_produces_commit(patch, &tip))
+            .max_by_key(|patch| patch.created_at)
+            .copied()
+        else {
+            return Vec::new();
+        };
+
+        let mut series = vec![last];
+        loop {
+            let Some(prev_id) = series.last().unwrap().tags.event_ids().next() else {
+                break;
+            };
+            let Some(prev) = patches
+                .iter()
+                .find(|patch| patch.id == prev_id && !series.contains(patch))
+                .copied()
+            else {
+                break;
+            };
+            series.push(prev);
+        }
+        series.reverse();
+        series
+    }
+
+    /// Joins the patch series with newlines, falling back to the event content.
+    pub fn patch(&self, patches: impl IntoIterator<Item = &'a Event>) -> String {
+        let pr = self.0;
+        let patches: Vec<&'a Event> = patches.into_iter().collect();
+        let series = self.patches(patches.iter().copied());
+        if series.is_empty() {
+            return pr.content.clone();
+        }
+        series
+            .iter()
+            .map(|patch| patch.content.as_str())
+            .collect::<Vec<_>>()
+            .join("\n")
+    }
+
+    /// Returns the root author's newest update, since only the author may move the tip.
+    pub fn latest_update(
+        events: impl Iterator<Item = &'a Event>,
+        root: &Event,
+    ) -> Option<&'a Event> {
+        let root_hex = root.id.to_hex();
+        events
+            .filter(|e| e.kind == Kind::GitPullRequestUpdate)
+            .filter(|e| e.pubkey == root.pubkey)
+            .filter(|e| {
+                e.tags
+                    .iter()
+                    .any(|t| t.kind() == "E" && t.content() == Some(root_hex.as_str()))
+            })
+            .max_by_key(|e| e.created_at)
+    }
+
+    /// Walks reply links outward from the root patch, taking the newest child first.
+    fn forward_series(root: &'a Event, patches: &[&'a Event]) -> Vec<&'a Event> {
+        let mut series = vec![root];
+        loop {
+            let next = patches
+                .iter()
+                .filter(|patch| !series.contains(patch))
+                .filter(|patch| {
+                    patch
+                        .tags
+                        .event_ids()
+                        .any(|id| id == series.last().unwrap().id)
+                })
+                .max_by_key(|patch| patch.created_at);
+            let Some(next) = next else {
+                break;
+            };
+            series.push(next);
+        }
+        series
+    }
+
+    /// Checks the commit against the patch's `c` and `r` tags.
+    fn patch_produces_commit(patch: &Event, commit: &str) -> bool {
+        patch
+            .tags
+            .iter()
+            .any(|tag| match Nip34Tag::parse(tag.as_slice()) {
+                Ok(Nip34Tag::Commit(c) | Nip34Tag::Reference(c)) => c.to_string() == commit,
+                _ => false,
+            })
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    /// Returns the test signer keys.
+    fn keys() -> Keys {
+        Keys::new(
+            SecretKey::from_hex("0000000000000000000000000000000000000000000000000000000000000001")
+                .expect("valid secret key"),
+        )
+    }
+
+    /// Builds a signed pull request event.
+    fn pr_event(content: &str, tags: Vec<Tag>) -> Event {
+        EventBuilder::new(Kind::GitPullRequest, content)
+            .tags(tags)
+            .finalize(&keys())
+            .expect("signed event")
+    }
+
+    /// Builds a signed patch event with a fixed timestamp.
+    fn patch_event(content: &str, tags: Vec<Tag>, created_at: u64) -> Event {
+        EventBuilder::new(Kind::GitPatch, content)
+            .tags(tags)
+            .custom_created_at(Timestamp::from(created_at))
+            .finalize(&keys())
+            .expect("signed event")
+    }
+
+    /// Joins the full patch series into one diff.
+    #[test]
+    fn pull_request_patch_joins_the_whole_patch_set() {
+        let root = patch_event("patch-one", vec![], 100);
+        let second = patch_event("patch-two", vec![Tag::event(root.id)], 200);
+        let pr = pr_event("description", vec![Tag::event(root.id)]);
+
+        assert_eq!(
+            PullRequest::new(&pr).patch([&root, &second]),
+            "patch-one\npatch-two"
+        );
+        assert_eq!(
+            PullRequest::new(&pr).patches([&root, &second]),
+            vec![&root, &second]
+        );
+    }
+
+    /// Orders patches by walking the reply chain.
+    #[test]
+    fn pull_request_patches_walks_the_reply_chain_in_order() {
+        let root = patch_event("patch-one", vec![], 100);
+        let second = patch_event("patch-two", vec![Tag::event(root.id)], 200);
+        let third = patch_event("patch-three", vec![Tag::event(second.id)], 300);
+        let pr = pr_event("description", vec![Tag::event(root.id)]);
+
+        let series = PullRequest::new(&pr).patches([&third, &root, &second]);
+        assert_eq!(
+            series
+                .iter()
+                .map(|p| p.content.as_str())
+                .collect::<Vec<_>>(),
+            vec!["patch-one", "patch-two", "patch-three"]
+        );
+    }
+
+    /// Finds the patch series through the declared tip commit.
+    #[test]
+    fn pull_request_patches_finds_the_set_via_the_tip_commit() {
+        let root = patch_event("patch-one", vec![], 100);
+        let tip = "1111111111111111111111111111111111111111";
+        let last = patch_event(
+            "patch-two",
+            vec![
+                Tag::event(root.id),
+                Tag::parse(["r", tip]).expect("valid tag"),
+            ],
+            200,
+        );
+        let pr = pr_event(
+            "description",
+            vec![Tag::parse(["c", tip]).expect("valid tag")],
+        );
+
+        let series = PullRequest::new(&pr).patches([&root, &last]);
+        assert_eq!(
+            series
+                .iter()
+                .map(|p| p.content.as_str())
+                .collect::<Vec<_>>(),
+            vec!["patch-one", "patch-two"]
+        );
+    }
+
+    const COMMIT_HEX: &str = "1111111111111111111111111111111111111111";
+    const OTHER_ROOT_HEX: &str = "2222222222222222222222222222222222222222";
+
+    /// Builds a signed event with a fixed timestamp.
+    fn signed_at(kind: Kind, tags: Vec<Tag>, created_at: u64) -> Event {
+        EventBuilder::new(kind, "")
+            .tags(tags)
+            .custom_created_at(Timestamp::from(created_at))
+            .finalize(&keys())
+            .expect("signed event")
+    }
+
+    /// Builds the pull request root used by the update tests.
+    fn pr_root() -> Event {
+        signed_at(
+            Kind::GitPullRequest,
+            vec![
+                Tag::parse(["c", COMMIT_HEX]).expect("valid tag"),
+                Tag::parse(["branch-name", "feature/x"]).expect("valid tag"),
+            ],
+            100,
+        )
+    }
+
+    /// Picks the newest update targeting the root.
+    #[test]
+    fn latest_update_picks_newest_revision_of_the_root() {
+        let root = pr_root();
+        let root_hex = root.id.to_hex();
+
+        let revision = |created_at: u64| {
+            signed_at(
+                Kind::GitPullRequestUpdate,
+                vec![Tag::parse(["E", &root_hex]).expect("valid tag")],
+                created_at,
+            )
+        };
+        let unrelated = signed_at(
+            Kind::GitPullRequestUpdate,
+            vec![Tag::parse(["E", OTHER_ROOT_HEX]).expect("valid tag")],
+            999,
+        );
+
+        let events = [unrelated, revision(200), root.clone(), revision(300)];
+        let latest = PullRequest::latest_update(events.iter(), &root).expect("an update");
+
+        assert_eq!(latest.created_at.as_secs(), 300);
+        assert_eq!(latest.kind, Kind::GitPullRequestUpdate);
+    }
+
+    /// Ignores updates from authors other than the root owner.
+    #[test]
+    fn latest_update_ignores_other_authors() {
+        let root = pr_root();
+        let root_hex = root.id.to_hex();
+        let other = Keys::new(
+            SecretKey::from_hex("0000000000000000000000000000000000000000000000000000000000000002")
+                .expect("valid secret key"),
+        );
+        let stranger = EventBuilder::new(Kind::GitPullRequestUpdate, "")
+            .tags([Tag::parse(["E", &root_hex]).expect("valid tag")])
+            .custom_created_at(Timestamp::from(999))
+            .finalize(&other)
+            .expect("signed event");
+
+        assert!(PullRequest::latest_update([&stranger, &root].into_iter(), &root).is_none());
+    }
+}