|
4 | 4 |
|
5 | 5 | Browse your DAG, review side-by-side diffs, resolve conflicts, and run every jj operation from one window. JayJay is a full-featured **jj GUI** with DAG visualization, interdiff (PR-style revision comparison), diff edit mode, file annotate, one-click conflict resolution, AI-generated commit messages, and a command palette. |
6 | 6 |
|
7 | | -> **Two shells share a Rust core:** the **SwiftUI shell** (stable, macOS-only) is what ships in releases. A second **GPUI shell** (alpha, cross-platform target — Linux + Windows + macOS) is in active development and is read-only today. See [Roadmap.md](Roadmap.md) for milestone status, and [Build from source](#install) below to try it. |
| 7 | +> **Two shells share a Rust core:** the **SwiftUI shell** (stable, macOS-only) is what ships in releases. A second **GPUI shell** (alpha, cross-platform target — Linux + Windows + macOS) is in active development with read parity and early write actions. See [UserGuide.md](UserGuide.md) for a feature walkthrough, [Roadmap.md](Roadmap.md) for milestone status, and [Build from source](#install) below to try it. |
8 | 8 |
|
9 | 9 | [](https://github.com/hewigovens/jayjay/actions/workflows/ci.yml) |
10 | 10 | [](https://github.com/hewigovens/jayjay/releases) |
@@ -110,15 +110,15 @@ just gpui # Build, ad-hoc sign, launch against current dir |
110 | 110 | just gpui /path/repo # Open a specific repo |
111 | 111 | just gpui-bundle # Build the .app without launching |
112 | 112 | ``` |
113 | | -The GPUI shell uses [Zed's GPUI 1.0](https://github.com/zed-industries/zed) and is **read-only today** — DAG, diffs, annotate, file history, evolog, FS-watcher auto-refresh, persistent file review (space to toggle, mtime-based invalidation), bookmark / workspace pickers. Write actions (describe, new, squash, abandon, split, drag-rebase, conflict resolve) are the next milestone — see [Roadmap.md](Roadmap.md). |
| 113 | +The GPUI shell uses [Zed's GPUI 1.0](https://github.com/zed-industries/zed). It has read parity for DAG, diffs, annotate, file history, evolog, FS-watcher auto-refresh, persistent file review, bookmark / workspace pickers, plus early write actions for describe and the commit box. More write actions are tracked in [Roadmap.md](Roadmap.md). |
114 | 114 |
|
115 | 115 | **Auto-update**: JayJay checks for updates automatically via Sparkle. You can also check manually from JayJay → Check for Updates. Auto-update may require App Management permission in System Settings → Privacy & Security. |
116 | 116 |
|
117 | 117 | **Requirements**: macOS 26 (Tahoe) recommended. |
118 | 118 |
|
119 | 119 | ## Roadmap |
120 | 120 |
|
121 | | -See [Roadmap.md](Roadmap.md) for near-term and long-term plans. |
| 121 | +See [UserGuide.md](UserGuide.md) for shipped features and [Roadmap.md](Roadmap.md) for current plans. |
122 | 122 |
|
123 | 123 | ## Contributing |
124 | 124 |
|
@@ -178,7 +178,7 @@ JayJay doesn't replace the jj CLI — it complements it. The DAG graph, visual d |
178 | 178 | JayJay is **free and source-available**, not OSI open source. The macOS app is [BSL 1.1](LICENSE) — free to use, fork, modify, and redistribute; the only restriction is paid app-store distribution without permission. It converts to Apache-2.0 on 2030-03-23. The Rust crates (`jayjay-core`, `jayjay-uniffi`, `jj-diff`) are Apache-2.0 today. |
179 | 179 |
|
180 | 180 | **Does JayJay work on Windows or Linux?** |
181 | | -The shipped SwiftUI app is macOS-only. A second cross-platform shell built on Zed's [GPUI](https://github.com/zed-industries/zed) framework is in alpha — it shares the Rust core (`jayjay-core`) with the SwiftUI shell and is read-only today (DAG, diffs, annotate, file history, evolog, FS-watcher auto-refresh, persistent file review). Build it with `just gpui` from a source checkout. Write actions land in the next milestone; see [Roadmap.md](Roadmap.md). |
| 181 | +The shipped SwiftUI app is macOS-only. A second cross-platform shell built on Zed's [GPUI](https://github.com/zed-industries/zed) framework is in alpha — it shares the Rust core (`jayjay-core`) with the SwiftUI shell and has read parity plus early write actions for describe and the commit box. Build it with `just gpui` from a source checkout. More write actions are tracked in [Roadmap.md](Roadmap.md). |
182 | 182 |
|
183 | 183 | ## License |
184 | 184 |
|
|
0 commit comments