A native macOS GUI for Jujutsu (jj) — fast, keyboard-driven, built with Rust + SwiftUI.
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 with read parity and early write actions. See UserGuide.md for a feature walkthrough, Roadmap.md for milestone status, and Build from source below to try it.
History & Graph
- DAG visualization with lane-based fork/merge rendering
- Bookmark and conflict indicators on every node
- Revset filtering with preset chips (All, Mine, Bookmarks, Trunk, Conflicts, Heads)
- Change evolution viewer (
jj evolog) — see every prior version of a rewritten change with interdiff against current; right-click to copy commit-id orjj restorecommand for recovery - Load more: incrementally load older history
- Auto-refresh via file system watcher
Diff & Review
- Unified + side-by-side diff modes (toggle with one click)
- Histogram diff algorithm (via
jj-diffcrate) — instant diffs even for large files - Diff edit mode (
jj diffedit-style): select files, hunks, or line ranges across a change - Interdiff: compare any two revisions (shift-click or context menu)
- File annotate (blame) with syntax-highlighted gutter — click to navigate
- File history: list all revisions that modified a file
- tree-sitter syntax highlighting (18 languages)
- Word-level change highlighting
- Context collapsing, rename detection
- Background preloading of all file diffs
- Persistent file review state (survives restart, auto-invalidates on content change)
Conflict Resolution
- Conflicted files shown with warning indicator and resolution bar
- One-click "Use Ours" / "Use Theirs" resolution
- "Resolve in Editor" via
jj resolve --tool(VS Code, Zed merge editors) - Auto-refresh after resolution
Operations
- New, edit, describe, squash, abandon, split (with parallel option), graft, duplicate, merge
- Extract selected diff to child/parallel changes, move selected changes to
@, discard selected working-copy changes - Absorb hunks into ancestors, back out (revert) changes
- Git push/fetch with auto-track
- Bookmark Manager (⌘⇧B) with stats, filter, clean up stale branches, resolve conflicts
- Pull Request on GitHub/Codeberg from bookmark right-click (DAG row + Bookmark Manager) — opens an existing PR when one exists, else a GitHub or Codeberg PR compose URL; public Codeberg PR status is shown via the Forgejo API
- Divergent commit detection and resolution
- Undo via operation log
- Command palette (⌘⇧P) with ~35 commands; type
jj <args>(or! <args>) for inline raw jj CLI output
AI Commit Messages
- Codex CLI, Claude CLI, Apple Intelligence fallback chain
Tools & Settings
- External editor integration (VS Code, Zed, Xcode, Android Studio, Vim + auto-detection)
- Terminal integration (Terminal.app, iTerm2, Ghostty)
- Dock menu with recent repositories
- Font family picker + ⌘+/-/0 zoom
- Commit avatars (GitHub + Gravatar)
- Multi-window, recent repos, CLI launcher with URL scheme
| Key | Action |
|---|---|
| ⌘⇧P | Command palette |
| ⌘F | Find in diff |
| ⌘R | Refresh |
| ⌘O | Open repository |
| ⌘+/⌘-/⌘0 | Zoom in/out/reset |
| ⌘⇧B | Bookmark Manager |
| ⌘⇧U | Undo (operation log) |
| Space | Toggle file reviewed |
| Shift+Click | Compare two revisions (interdiff) |
Homebrew:
brew install --cask hewigovens/tap/jayjayDownload: Grab the latest release from GitHub Releases, unzip, and move to Applications.
Build from source (SwiftUI shell, macOS):
just run # Build and run
just install-cli # Install CLI launcher to ~/.local/bin
jayjay . # Open current repoBuild the GPUI shell (alpha, cross-platform):
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 launchingThe GPUI shell uses Zed's GPUI 1.0. 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.
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.
See UserGuide.md for shipped features and Roadmap.md for current plans.
See CONTRIBUTING.md for architecture notes, development workflow, and the current jj-lib vs jj CLI backend split.
The diff engine is extracted as a standalone Rust crate with zero dependency on jj-lib:
[dependencies]
jj-diff = { git = "https://github.com/hewigovens/jayjay" }Features:
- Histogram line diff (via
similar3.0) - Word-level diff highlighting
- tree-sitter syntax highlighting (18 languages)
- Context collapsing with display-to-full line index mapping
- Skip highlighting for
.lock/.csv/.svgfiles
Usage:
use jj_diff::{compute_file_diff, collapse_context_with_mapping};
let diff = compute_file_diff("main.rs", &old_content, &new_content, false);
let collapsed = collapse_context_with_mapping(&diff);
for line in &collapsed.diff.lines {
// render line with line.style, line.spans
}The full FAQ lives on the site: jayjay.hewig.dev/#faq — what JayJay is, install, interdiff, side-by-side diffs, diff edit, how it differs from the CLI, licensing, and platform support.
- Rust crates (
crates/): Apache-2.0 - macOS app (
shell/, everything else): BSL 1.1 — free to use, modify, and redistribute; paid app store distribution requires permission. Converts to Apache-2.0 on 2030-03-23.