kajji 0.1.0

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 eliaskc
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -0,0 +1,128 @@
+# kajji
+
+> The rudder for your jj
+
+A simple terminal UI for [Jujutsu](https://github.com/martinvonz/jj), inspired by [lazygit](https://github.com/jesseduffield/lazygit). Built with [OpenTUI](https://github.com/sst/opentui) and [SolidJS](https://www.solidjs.com/).
+
+![kajji screenshot](./kajji.png)
+
+While learning jj I found myself coming back to lazygit to view diffs and traverse the changes I'd made quickly and easily, which has become increasingly important to me with the rise of coding agents. While there are existing jj TUIs, none quite scratched that lazygit itch.
+
+Kajji is my attempt to bring the simplicity and polish of lazygit to jj, while also leveraging coding agents effectively and building a TUI for the first time.
+
+> Disclaimer: almost all code in this project has been written by coding agents (primarily Claude Opus 4.5 through [OpenCode](https://github.com/sst/opencode)).
+
+## Principles
+
+- **Polish & simplicity** - Do less, but do it well.
+- **Intuitive UX** - Sensible defaults, consistent patterns.
+- **Snappy** - If it feels slow, it's a bug.
+
+## Features
+
+- **Full-color diffs** — works with difftastic, delta, or your configured diff tool
+- **Commit log** — navigate jj's graph with vim-style keybindings
+- **Bookmarks panel** — drill down into commits and files
+- **Collapsible file tree** — with status colors (A/M/D)
+- **Operation log** — view and restore from jj op history
+- **Git operations** — fetch and push
+- **Undo/redo** — with confirmation showing what will change
+- **Help palette** — press `?` for all keybindings with fuzzy search
+
+## Installation
+
+> **Requirements**: [Bun](https://bun.sh) and [jj](https://github.com/martinvonz/jj)
+
+```bash
+# npm
+npm install -g kajji
+
+# bun
+bun install -g kajji
+
+# pnpm
+pnpm add -g kajji
+
+# or run directly
+bunx kajji
+```
+
+### From source
+
+```bash
+git clone https://github.com/eliaskc/kajji.git
+cd kajji
+bun install
+bun dev
+```
+
+## Usage
+
+Run `kajji` in any jj repository:
+
+```bash
+kajji
+```
+
+### Keybindings
+
+| Key | Action |
+| --- | ------ |
+| `j` / `k` | Move down / up |
+| `Tab` | Cycle focus between panels |
+| `Enter` | Drill into commit / file |
+| `Escape` | Back / close modal |
+| `?` | Show help with fuzzy search |
+| `q` | Quit |
+
+### Operations
+
+| Key | Action |
+| --- | ------ |
+| `n` | New change |
+| `e` | Edit change |
+| `d` | Describe change |
+| `s` | Squash into parent |
+| `a` | Abandon change |
+| `u` / `U` | Undo / redo |
+| `f` / `F` | Git fetch / fetch all |
+| `p` / `P` | Git push / push all |
+
+### Bookmarks
+
+| Key | Action |
+| --- | ------ |
+| `c` | Create bookmark |
+| `d` | Delete bookmark |
+| `r` | Rename bookmark |
+| `b` | Create bookmark on commit |
+
+## Next up
+
+- Multi-select for batch rebase and squash
+- Search and filter (log, bookmarks, files)
+- Workspaces tab (monitor agent commits across workspaces)
+
+## Exploring
+
+- Interactive `jj split` (file/hunk selection)
+- Stacked PR creation and overview
+- Configuration (user config file, theme switching)
+
+See [PROJECT](./context/PROJECT.md) for the full plan.
+
+## Built With
+
+- [OpenTUI](https://github.com/sst/opentui) + [SolidJS](https://www.solidjs.com/) - Modern TypeScript TUI framework
+- [Bun](https://bun.sh) - Fast JavaScript runtime
+- [jj (Jujutsu)](https://github.com/martinvonz/jj) - Git-compatible VCS
+
+## Related Projects
+
+- [lazygit](https://github.com/jesseduffield/lazygit) - The inspiration for this project
+- [jjui](https://github.com/idursun/jjui) - Go-based jj TUI
+- [lazyjj](https://github.com/Cretezy/lazyjj) - Rust-based jj TUI
+
+## License
+
+MIT

package/bin/kajji.js

@@ -0,0 +1,2 @@
+#!/usr/bin/env bun
+import "../src/index.tsx"

package/package.json

@@ -0,0 +1,56 @@
+{
+	"name": "kajji",
+	"version": "0.1.0",
+	"description": "A terminal UI for Jujutsu: the rudder for your jj",
+	"type": "module",
+	"engines": {
+		"bun": ">=1.0.0"
+	},
+	"bin": {
+		"kajji": "./bin/kajji.js"
+	},
+	"files": ["bin", "src"],
+	"scripts": {
+		"dev": "NODE_ENV=development bun --watch run src/index.tsx",
+		"test": "bun test",
+		"check": "tsc --noEmit",
+		"lint": "biome check .",
+		"lint:fix": "biome check --write ."
+	},
+	"devDependencies": {
+		"@biomejs/biome": "^1.9.4",
+		"@types/bun": "latest"
+	},
+	"peerDependencies": {
+		"typescript": "^5"
+	},
+	"dependencies": {
+		"@babel/core": "^7.28.5",
+		"@babel/preset-typescript": "^7.28.5",
+		"@opentui/core": "^0.1.66",
+		"@opentui/solid": "^0.1.66",
+		"babel-preset-solid": "1.9.9",
+		"fuzzysort": "^3.1.0",
+		"ghostty-opentui": "^1.3.11",
+		"solid-js": "1.9.9"
+	},
+	"keywords": [
+		"jj",
+		"jujutsu",
+		"tui",
+		"terminal",
+		"cli",
+		"vcs",
+		"version-control"
+	],
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/eliaskc/kajji.git"
+	},
+	"homepage": "https://github.com/eliaskc/kajji#readme",
+	"bugs": {
+		"url": "https://github.com/eliaskc/kajji/issues"
+	},
+	"author": "eliaskc",
+	"license": "MIT"
+}

package/src/App.tsx

@@ -0,0 +1,229 @@
+import { useRenderer } from "@opentui/solid"
+import { onMount } from "solid-js"
+import { jjGitFetch, jjGitPush } from "./commander/operations"
+import { Layout } from "./components/Layout"
+import { HelpModal } from "./components/modals/HelpModal"
+import { BookmarksPanel } from "./components/panels/BookmarksPanel"
+import { LogPanel } from "./components/panels/LogPanel"
+import { MainArea } from "./components/panels/MainArea"
+import { CommandProvider, useCommand } from "./context/command"
+import { CommandLogProvider, useCommandLog } from "./context/commandlog"
+import { DialogContainer, DialogProvider, useDialog } from "./context/dialog"
+import { FocusProvider, useFocus } from "./context/focus"
+import { KeybindProvider } from "./context/keybind"
+import { LoadingProvider, useLoading } from "./context/loading"
+import { SyncProvider, useSync } from "./context/sync"
+import { ThemeProvider } from "./context/theme"
+
+function AppContent() {
+	const renderer = useRenderer()
+	const { loadLog, loadBookmarks, refresh } = useSync()
+	const focus = useFocus()
+	const command = useCommand()
+	const dialog = useDialog()
+	const commandLog = useCommandLog()
+	const globalLoading = useLoading()
+
+	onMount(() => {
+		loadLog()
+		loadBookmarks()
+
+		renderer.console.keyBindings = [
+			{ name: "y", ctrl: true, action: "copy-selection" },
+		]
+		renderer.console.onCopySelection = (text) => {
+			const proc = Bun.spawn(["pbcopy"], { stdin: "pipe" })
+			proc.stdin.write(text)
+			proc.stdin.end()
+		}
+	})
+
+	command.register(() => [
+		{
+			id: "global.quit",
+			title: "quit",
+			keybind: "quit",
+			context: "global",
+			type: "action",
+			onSelect: () => {
+				renderer.destroy()
+				process.exit(0)
+			},
+		},
+		...(Bun.env.NODE_ENV === "development"
+			? [
+					{
+						id: "global.toggle_console",
+						title: "toggle console",
+						keybind: "toggle_console" as const,
+						context: "global" as const,
+						type: "action" as const,
+						onSelect: () => renderer.console.toggle(),
+					},
+				]
+			: []),
+		{
+			id: "global.focus_next",
+			title: "focus next panel",
+			keybind: "focus_next",
+			context: "global",
+			type: "navigation",
+			visibility: "help-only",
+			onSelect: () => focus.cycleNext(),
+		},
+		{
+			id: "global.focus_prev",
+			title: "focus previous panel",
+			keybind: "focus_prev",
+			context: "global",
+			type: "navigation",
+			visibility: "help-only",
+			onSelect: () => focus.cyclePrev(),
+		},
+		{
+			id: "global.focus_panel_1",
+			title: "focus log panel",
+			keybind: "focus_panel_1",
+			context: "global",
+			type: "navigation",
+			visibility: "help-only",
+			onSelect: () => focus.setPanel("log"),
+		},
+		{
+			id: "global.focus_panel_2",
+			title: "focus refs panel",
+			keybind: "focus_panel_2",
+			context: "global",
+			type: "navigation",
+			visibility: "help-only",
+			onSelect: () => focus.setPanel("refs"),
+		},
+		{
+			id: "global.focus_panel_3",
+			title: "focus detail panel",
+			keybind: "focus_panel_3",
+			context: "global",
+			type: "navigation",
+			visibility: "help-only",
+			onSelect: () => focus.setPanel("detail"),
+		},
+		{
+			id: "global.help",
+			title: "help",
+			keybind: "help",
+			context: "global",
+			type: "action",
+			onSelect: () =>
+				dialog.toggle("help", () => <HelpModal />, {
+					hints: [{ key: "enter", label: "execute" }],
+				}),
+		},
+		{
+			id: "global.refresh",
+			title: "refresh",
+			keybind: "refresh",
+			context: "global",
+			type: "action",
+			visibility: "help-only",
+			onSelect: () => refresh(),
+		},
+		{
+			id: "global.git_fetch",
+			title: "git fetch",
+			keybind: "jj_git_fetch",
+			context: "global",
+			type: "git",
+			visibility: "help-only",
+			onSelect: async () => {
+				const result = await globalLoading.run("Fetching...", () =>
+					jjGitFetch(),
+				)
+				commandLog.addEntry(result)
+				if (result.success) {
+					refresh()
+				}
+			},
+		},
+		{
+			id: "global.git_fetch_all",
+			title: "git fetch all",
+			keybind: "jj_git_fetch_all",
+			context: "global",
+			type: "git",
+			visibility: "help-only",
+			onSelect: async () => {
+				const result = await globalLoading.run("Fetching all...", () =>
+					jjGitFetch({ allRemotes: true }),
+				)
+				commandLog.addEntry(result)
+				if (result.success) {
+					refresh()
+				}
+			},
+		},
+		{
+			id: "global.git_push",
+			title: "git push",
+			keybind: "jj_git_push",
+			context: "global",
+			type: "git",
+			visibility: "help-only",
+			onSelect: async () => {
+				const result = await globalLoading.run("Pushing...", () => jjGitPush())
+				commandLog.addEntry(result)
+				if (result.success) {
+					refresh()
+				}
+			},
+		},
+		{
+			id: "global.git_push_all",
+			title: "git push all",
+			keybind: "jj_git_push_all",
+			context: "global",
+			type: "git",
+			visibility: "help-only",
+			onSelect: async () => {
+				const result = await globalLoading.run("Pushing all...", () =>
+					jjGitPush({ all: true }),
+				)
+				commandLog.addEntry(result)
+				if (result.success) {
+					refresh()
+				}
+			},
+		},
+	])
+
+	return (
+		<DialogContainer>
+			<Layout
+				top={<LogPanel />}
+				bottom={<BookmarksPanel />}
+				right={<MainArea />}
+			/>
+		</DialogContainer>
+	)
+}
+
+export function App() {
+	return (
+		<ThemeProvider>
+			<FocusProvider>
+				<LoadingProvider>
+					<SyncProvider>
+						<KeybindProvider>
+							<CommandLogProvider>
+								<DialogProvider>
+									<CommandProvider>
+										<AppContent />
+									</CommandProvider>
+								</DialogProvider>
+							</CommandLogProvider>
+						</KeybindProvider>
+					</SyncProvider>
+				</LoadingProvider>
+			</FocusProvider>
+		</ThemeProvider>
+	)
+}

package/src/commander/bookmarks.ts

@@ -0,0 +1,129 @@
+import { execute } from "./executor"
+import type { OperationResult } from "./operations"
+
+export interface Bookmark {
+	name: string
+	changeId: string
+	commitId: string
+	description: string
+	isLocal: boolean
+	remote?: string
+}
+
+export interface FetchBookmarksOptions {
+	cwd?: string
+	allRemotes?: boolean
+}
+
+export async function fetchBookmarks(
+	options: FetchBookmarksOptions = {},
+): Promise<Bookmark[]> {
+	const args = ["bookmark", "list"]
+
+	if (options.allRemotes) {
+		args.push("--all-remotes")
+	}
+
+	const result = await execute(args, { cwd: options.cwd })
+
+	if (!result.success) {
+		throw new Error(`jj bookmark list failed: ${result.stderr}`)
+	}
+
+	return parseBookmarkOutput(result.stdout)
+}
+
+export function parseBookmarkOutput(output: string): Bookmark[] {
+	const bookmarks: Bookmark[] = []
+	const lines = output.split("\n")
+
+	for (const line of lines) {
+		if (!line.trim()) continue
+
+		const isRemote = line.startsWith("  @")
+
+		if (isRemote) {
+			const match = line.match(/^\s+@(\S+):\s+(\S+)\s+(\S+)\s*(.*)$/)
+			if (match) {
+				bookmarks.push({
+					name: match[1] ?? "",
+					changeId: match[2] ?? "",
+					commitId: match[3] ?? "",
+					description: match[4]?.trim() ?? "",
+					isLocal: false,
+					remote: match[1],
+				})
+			}
+		} else {
+			const match = line.match(/^(\S+):\s+(\S+)\s+(\S+)\s*(.*)$/)
+			if (match) {
+				bookmarks.push({
+					name: match[1] ?? "",
+					changeId: match[2] ?? "",
+					commitId: match[3] ?? "",
+					description: match[4]?.trim() ?? "",
+					isLocal: true,
+				})
+			}
+		}
+	}
+
+	return bookmarks
+}
+
+export async function jjBookmarkCreate(
+	name: string,
+	options?: { revision?: string },
+): Promise<OperationResult> {
+	const args = ["bookmark", "create", name]
+	if (options?.revision) {
+		args.push("-r", options.revision)
+	}
+	const result = await execute(args)
+	return {
+		...result,
+		command: `jj ${args.join(" ")}`,
+	}
+}
+
+export async function jjBookmarkDelete(name: string): Promise<OperationResult> {
+	const args = ["bookmark", "delete", name]
+	const result = await execute(args)
+	return {
+		...result,
+		command: `jj ${args.join(" ")}`,
+	}
+}
+
+export async function jjBookmarkRename(
+	oldName: string,
+	newName: string,
+): Promise<OperationResult> {
+	const args = ["bookmark", "rename", oldName, newName]
+	const result = await execute(args)
+	return {
+		...result,
+		command: `jj ${args.join(" ")}`,
+	}
+}
+
+export async function jjBookmarkForget(name: string): Promise<OperationResult> {
+	const args = ["bookmark", "forget", name]
+	const result = await execute(args)
+	return {
+		...result,
+		command: `jj ${args.join(" ")}`,
+	}
+}
+
+export async function jjBookmarkSet(
+	name: string,
+	revision: string,
+): Promise<OperationResult> {
+	const args = ["bookmark", "set", name, "-r", revision]
+	const result = await execute(args)
+	return {
+		...result,
+		command: `jj ${args.join(" ")}`,
+	}
+}