Skip to content

polish gpui interactions #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hewigovens merged 10 commits into from
Jun 1, 2026
Merged

polish gpui interactions #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c3d689a
feat(gpui): polish diff find controls
hewigovens May 26, 2026
93a01a6
feat(gpui): add bookmark pr diff like swiftui shell
hewigovens May 28, 2026
17e6d81
polish gpui auto theme / commit box.
hewigovens May 30, 2026
82cd6ca
polish gpui interactions
hewigovens May 31, 2026
361afaf
fix gpui review feedback.
hewigovens May 31, 2026
92d72de
polish(gpui): clean up repo window
hewigovens Jun 1, 2026
20a4da8
polish(gpui): share input editing behavior.
hewigovens Jun 1, 2026
07e3cc7
refactor spawn/task, line input/text area, scoll ux
hewigovens Jun 1, 2026
d7b0d51
fix: polish gpui context menus and divergent handling
hewigovens Jun 1, 2026
251259b
test: stabilize command palette ui test
hewigovens Jun 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 25 additions & 23 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

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.

> **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.
> **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.

[![CI](https://github.com/hewigovens/jayjay/actions/workflows/ci.yml/badge.svg)](https://github.com/hewigovens/jayjay/actions/workflows/ci.yml)
[![Release](https://img.shields.io/github/v/release/hewigovens/jayjay?include_prereleases)](https://github.com/hewigovens/jayjay/releases)
Expand Down Expand Up @@ -110,15 +110,15 @@ just gpui # Build, ad-hoc sign, launch against current dir
just gpui /path/repo # Open a specific repo
just gpui-bundle # Build the .app without launching
```
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).
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).

**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.

**Requirements**: macOS 26 (Tahoe) recommended.

## Roadmap

See [Roadmap.md](Roadmap.md) for near-term and long-term plans.
See [UserGuide.md](UserGuide.md) for shipped features and [Roadmap.md](Roadmap.md) for current plans.

## Contributing

Expand Down Expand Up @@ -178,7 +178,7 @@ JayJay doesn't replace the jj CLI — it complements it. The DAG graph, visual d
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.

**Does JayJay work on Windows or Linux?**
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).
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).

## License

Expand Down
Loading
Loading