feat: initial implementation of jjf

A TUI revision picker for jujutsu (jj). Wraps any jj subcommand with an
inline fuzzy-finder over jj log, then forwards the picked revision(s)
as -r '<id>' to the underlying jj invocation.

Features:
- Inline viewport (no full-screen alt-screen takeover)
- Smart prefix matching: typing the bold portion of a change ID jumps
  to that revision instantly
- Multi-select via Tab; emitted as -r 'A|B|C' revset union
- Preflight detection of subcommands that don't accept -r
- Optional shell integration (jjf init <bash|zsh|fish|nu>) that
  rewrites shell history so up-arrow recalls the resolved jj command

Hand-rolled ANSI rendering to /dev/tty; only crossterm, nucleo-matcher,
anyhow, and libc as runtime dependencies.
This commit is contained in:
swaits committed 2026-04-29 15:58:55 -06:00
commit ed801c80ee
11 files changed
+1325

No files matched your search

+511
View File
@@ -0,0 +1,511 @@
use std::collections::HashSet;
use std::fs::{File, OpenOptions};
use std::io::Write;
use std::time::Duration;
use anyhow::{Context, Result};
use crossterm::event::{self, Event, KeyCode, KeyEvent, KeyEventKind, KeyModifiers};
use nucleo_matcher::{Config, Matcher, Utf32Str};
use crate::jj::Row;
// SGR constants
const SGR_RESET: &[u8] = b"\x1b[0m";
const SGR_RESET_SHORT: &[u8] = b"\x1b[m";
const SGR_DIM: &[u8] = b"\x1b[2m";
const SGR_BOLD: &[u8] = b"\x1b[1m";
const SGR_FG_CYAN: &[u8] = b"\x1b[36m";
const SGR_FG_YELLOW: &[u8] = b"\x1b[33m";
const SGR_BG_CURSOR: &[u8] = b"\x1b[48;5;237m";
const ERASE_TO_EOL: &[u8] = b"\x1b[K";
const ERASE_TO_END: &[u8] = b"\x1b[J";
const SHOW_CURSOR: &[u8] = b"\x1b[?25h";
const HIDE_CURSOR: &[u8] = b"\x1b[?25l";
struct App {
rows: Vec<Row>,
filter: String,
cursor: usize,
view_offset: usize,
selected: HashSet<usize>,
filtered: Vec<usize>,
matcher: Matcher,
last_height: usize,
}
impl App {
fn new(rows: Vec<Row>) -> Self {
let n = rows.len();
Self {
rows,
filter: String::new(),
cursor: 0,
view_offset: 0,
selected: HashSet::new(),
filtered: (0..n).collect(),
matcher: Matcher::new(Config::DEFAULT),
last_height: 0,
}
}
fn refilter(&mut self) {
if self.filter.is_empty() {
self.filtered = (0..self.rows.len()).collect();
} else {
let App {
rows,
matcher,
filter,
..
} = self;
let mut hbuf: Vec<char> = Vec::new();
let mut nbuf: Vec<char> = Vec::new();
let q_lower = filter.to_lowercase();
let mut scored: Vec<(usize, u32)> = rows
.iter()
.enumerate()
.filter_map(|(i, row)| {
score_row(row, filter, &q_lower, matcher, &mut hbuf, &mut nbuf).map(|s| (i, s))
})
.collect();
scored.sort_by(|a, b| b.1.cmp(&a.1).then(a.0.cmp(&b.0)));
self.filtered = scored.into_iter().map(|(i, _)| i).collect();
}
self.cursor = 0;
self.view_offset = 0;
}
fn move_cursor(&mut self, delta: isize) {
let len = self.filtered.len();
if len == 0 {
return;
}
let mut c = self.cursor as isize + delta;
if c < 0 {
c = 0;
}
let max = len as isize - 1;
if c > max {
c = max;
}
self.cursor = c as usize;
self.adjust_view();
}
fn jump_top(&mut self) {
self.cursor = 0;
self.adjust_view();
}
fn jump_bottom(&mut self) {
if !self.filtered.is_empty() {
self.cursor = self.filtered.len() - 1;
self.adjust_view();
}
}
fn adjust_view(&mut self) {
if self.last_height == 0 {
return;
}
if self.cursor < self.view_offset {
self.view_offset = self.cursor;
} else if self.cursor >= self.view_offset + self.last_height {
self.view_offset = self.cursor + 1 - self.last_height;
}
}
fn toggle_select(&mut self) {
if let Some(&row_idx) = self.filtered.get(self.cursor)
&& !self.selected.insert(row_idx)
{
self.selected.remove(&row_idx);
}
}
fn pending_ids(&self) -> Vec<String> {
if self.selected.is_empty() {
if let Some(&row_idx) = self.filtered.get(self.cursor) {
return vec![short_id(&self.rows[row_idx])];
}
return Vec::new();
}
let mut indices: Vec<usize> = self.selected.iter().copied().collect();
indices.sort_unstable();
indices
.into_iter()
.map(|i| short_id(&self.rows[i]))
.collect()
}
}
fn short_id(row: &Row) -> String {
if row.change_id_prefix.is_empty() {
row.change_id_short.clone()
} else {
row.change_id_prefix.clone()
}
}
fn score_row(
row: &Row,
query: &str,
q_lower: &str,
matcher: &mut Matcher,
hbuf: &mut Vec<char>,
nbuf: &mut Vec<char>,
) -> Option<u32> {
let mut best: u32 = 0;
let mut hit = false;
let cp = row.change_id_prefix.to_lowercase();
let cs = row.change_id_short.to_lowercase();
let kp = row.commit_id_prefix.to_lowercase();
let ks = row.commit_id_short.to_lowercase();
if !cp.is_empty() && cp.starts_with(q_lower) {
best = best.max(1_000_000);
hit = true;
}
if cs.starts_with(q_lower) {
best = best.max(100_000);
hit = true;
}
if !kp.is_empty() && kp.starts_with(q_lower) {
best = best.max(10_000);
hit = true;
}
if ks.starts_with(q_lower) {
best = best.max(1_000);
hit = true;
}
let h = Utf32Str::new(&row.plain, hbuf);
let n = Utf32Str::new(query, nbuf);
if let Some(score) = matcher.fuzzy_match(h, n) {
best = best.max(score as u32);
hit = true;
}
if hit { Some(best) } else { None }
}
pub fn run(rows: Vec<Row>) -> Result<Option<Vec<String>>> {
install_panic_hook();
let mut tty = OpenOptions::new()
.read(true)
.write(true)
.open("/dev/tty")
.context("open /dev/tty")?;
crossterm::terminal::enable_raw_mode().context("enable raw mode")?;
let mut viewport_y: u16 = 0;
let result = (|| {
let (term_cols, term_rows) = crossterm::terminal::size().unwrap_or((80, 24));
let max_height = (term_rows / 2).clamp(8, 20);
let needed = (rows.len() as u16).saturating_add(2);
let viewport_height = needed.min(max_height).max(4);
viewport_y = allocate_viewport(&mut tty, viewport_height, term_rows)?;
tty.write_all(HIDE_CURSOR)?;
tty.flush()?;
run_loop(&mut tty, rows, viewport_y, viewport_height, term_cols)
})();
let _ = cleanup_at(&mut tty, viewport_y);
let _ = crossterm::terminal::disable_raw_mode();
result
}
fn allocate_viewport(tty: &mut File, viewport_height: u16, term_rows: u16) -> Result<u16> {
let (_, mut cursor_row) = crossterm::cursor::position().context("query cursor position")?;
let bottom_excl = cursor_row + viewport_height;
if bottom_excl > term_rows {
let scroll = bottom_excl - term_rows;
for _ in 0..scroll {
tty.write_all(b"\n")?;
}
tty.flush()?;
cursor_row = cursor_row.saturating_sub(scroll);
}
Ok(cursor_row)
}
fn cleanup_at(tty: &mut File, viewport_y: u16) -> std::io::Result<()> {
write!(tty, "\x1b[{};1H", viewport_y + 1)?;
tty.write_all(ERASE_TO_END)?;
tty.write_all(SHOW_CURSOR)?;
tty.flush()
}
fn install_panic_hook() {
let original = std::panic::take_hook();
std::panic::set_hook(Box::new(move |info| {
let _ = crossterm::terminal::disable_raw_mode();
if let Ok(mut tty) = OpenOptions::new().write(true).open("/dev/tty") {
let _ = tty.write_all(SHOW_CURSOR);
let _ = tty.flush();
}
original(info);
}));
}
fn run_loop(
tty: &mut File,
rows: Vec<Row>,
viewport_y: u16,
viewport_height: u16,
term_cols: u16,
) -> Result<Option<Vec<String>>> {
let mut app = App::new(rows);
app.last_height = (viewport_height as usize).saturating_sub(2); // input + hint
loop {
render(tty, &app, viewport_y, viewport_height, term_cols)?;
if !event::poll(Duration::from_millis(250)).context("event poll failed")? {
continue;
}
match event::read().context("event read failed")? {
Event::Key(key) if key.kind == KeyEventKind::Press => {
if let Some(action) = handle_key(&mut app, key) {
return Ok(action);
}
}
Event::Resize(_, _) => {
// Just redraw on next loop iteration; viewport stays the same.
}
_ => {}
}
}
}
fn handle_key(app: &mut App, key: KeyEvent) -> Option<Option<Vec<String>>> {
let ctrl = key.modifiers.contains(KeyModifiers::CONTROL);
if ctrl {
match key.code {
KeyCode::Char('c') => return Some(None),
KeyCode::Char('n') | KeyCode::Char('j') => {
app.move_cursor(1);
return None;
}
KeyCode::Char('p') | KeyCode::Char('k') => {
app.move_cursor(-1);
return None;
}
KeyCode::Char('a') => {
app.jump_top();
return None;
}
KeyCode::Char('e') => {
app.jump_bottom();
return None;
}
KeyCode::Char('h') => {
app.filter.pop();
app.refilter();
return None;
}
KeyCode::Char('u') => {
app.filter.clear();
app.refilter();
return None;
}
KeyCode::Char('w') => {
delete_word(&mut app.filter);
app.refilter();
return None;
}
_ => return None,
}
}
match key.code {
KeyCode::Esc => Some(None),
KeyCode::Enter => Some(Some(app.pending_ids())),
KeyCode::Tab => {
app.toggle_select();
None
}
KeyCode::Up => {
app.move_cursor(-1);
None
}
KeyCode::Down => {
app.move_cursor(1);
None
}
KeyCode::PageUp => {
app.move_cursor(-(app.last_height.max(1) as isize));
None
}
KeyCode::PageDown => {
app.move_cursor(app.last_height.max(1) as isize);
None
}
KeyCode::Home => {
app.jump_top();
None
}
KeyCode::End => {
app.jump_bottom();
None
}
KeyCode::Backspace => {
app.filter.pop();
app.refilter();
None
}
KeyCode::Char(c) => {
app.filter.push(c);
app.refilter();
None
}
_ => None,
}
}
fn delete_word(s: &mut String) {
while s.ends_with(' ') {
s.pop();
}
while let Some(c) = s.chars().last() {
if c.is_whitespace() {
break;
}
s.pop();
}
}
fn render(
tty: &mut File,
app: &App,
viewport_y: u16,
viewport_height: u16,
term_cols: u16,
) -> Result<()> {
let mut buf: Vec<u8> = Vec::with_capacity(8 * 1024);
// Move to viewport top-left.
write!(buf, "\x1b[{};1H", viewport_y + 1)?;
// Input row.
buf.extend_from_slice(SGR_BOLD);
buf.extend_from_slice(SGR_FG_CYAN);
buf.extend_from_slice("❯ ".as_bytes());
buf.extend_from_slice(SGR_RESET);
buf.extend_from_slice(app.filter.as_bytes());
buf.extend_from_slice(SGR_FG_CYAN);
buf.extend_from_slice("█".as_bytes());
buf.extend_from_slice(SGR_RESET);
buf.extend_from_slice(ERASE_TO_EOL);
buf.extend_from_slice(b"\r\n");
// Log rows.
let log_height = app.last_height;
let visible: Vec<(usize, usize)> = app
.filtered
.iter()
.enumerate()
.skip(app.view_offset)
.take(log_height)
.map(|(filt_idx, &row_idx)| (filt_idx, row_idx))
.collect();
for i in 0..log_height {
if let Some(&(filt_idx, row_idx)) = visible.get(i) {
let row = &app.rows[row_idx];
let is_cursor = filt_idx == app.cursor;
let is_selected = app.selected.contains(&row_idx);
render_row(&mut buf, row, is_cursor, is_selected, term_cols);
} else {
buf.extend_from_slice(ERASE_TO_EOL);
}
buf.extend_from_slice(b"\r\n");
}
// Hint row.
let counts = if app.selected.is_empty() {
format!("[{}/{}] ", app.filtered.len(), app.rows.len())
} else {
format!(
"[{}/{} · {} selected] ",
app.filtered.len(),
app.rows.len(),
app.selected.len()
)
};
buf.extend_from_slice(SGR_DIM);
buf.extend_from_slice(counts.as_bytes());
buf.extend_from_slice(
"type filter · ↑↓/^N^P nav · tab select · enter run · ^U clear · esc quit".as_bytes(),
);
buf.extend_from_slice(SGR_RESET);
buf.extend_from_slice(ERASE_TO_EOL);
// Park cursor at end of input line so terminal doesn't blink in the log.
// Compute input column = column after "❯ " + filter chars + cursor block.
let input_col = 2 + app.filter.chars().count() as u16 + 1;
write!(buf, "\x1b[{};{}H", viewport_y + 1, input_col + 1)?;
let _ = viewport_height; // currently unused; reserved for future use
tty.write_all(&buf)?;
tty.flush()?;
Ok(())
}
fn render_row(buf: &mut Vec<u8>, row: &Row, is_cursor: bool, is_selected: bool, width: u16) {
// Selected marker (always rendered at column 0, two cells)
if is_selected {
buf.extend_from_slice(SGR_BOLD);
buf.extend_from_slice(SGR_FG_YELLOW);
buf.extend_from_slice("▎ ".as_bytes());
buf.extend_from_slice(SGR_RESET);
} else {
buf.extend_from_slice(b" ");
}
if is_cursor {
buf.extend_from_slice(SGR_BG_CURSOR);
// Inject bg-restore after every embedded reset so the row's bg persists.
inject_bg_into(buf, &row.styled, SGR_BG_CURSOR);
// Pad to terminal width with bg.
let used_chars = 2 + crate::jj::strip_ansi(&row.styled).chars().count();
let width_us = width as usize;
if used_chars < width_us {
for _ in 0..(width_us - used_chars) {
buf.push(b' ');
}
}
buf.extend_from_slice(SGR_RESET);
buf.extend_from_slice(ERASE_TO_EOL);
} else {
buf.extend_from_slice(&row.styled);
buf.extend_from_slice(SGR_RESET);
buf.extend_from_slice(ERASE_TO_EOL);
}
}
/// Copy `src` into `dst`, but after every embedded `ESC [ 0 m` or `ESC [ m`
/// reset, append `bg` so the cursor-row background survives mid-row resets.
fn inject_bg_into(dst: &mut Vec<u8>, src: &[u8], bg: &[u8]) {
let mut i = 0;
while i < src.len() {
if src[i] == 0x1b && src.get(i + 1) == Some(&b'[') {
if src[i..].starts_with(SGR_RESET) {
dst.extend_from_slice(SGR_RESET);
dst.extend_from_slice(bg);
i += SGR_RESET.len();
continue;
}
if src[i..].starts_with(SGR_RESET_SHORT) {
dst.extend_from_slice(SGR_RESET_SHORT);
dst.extend_from_slice(bg);
i += SGR_RESET_SHORT.len();
continue;
}
}
dst.push(src[i]);
i += 1;
}
}