Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
feat: Auto-select skim preview layout by terminal size
Maximilian Rooscb88a2d22c56
diff --git a/src/cli.rs b/src/cli.rsindex fc8b8279a..657361331 100644--- a/src/cli.rs+++ b/src/cli.rs@@ -602,7 +602,7 @@ Docs: <https://llm.datasette.io/> | <https://github.com/sigoden/aichat>/// Interactive worktree selector///- /// Toggle preview tabs with 1/2/3 keys.+ /// Toggle preview tabs with 1/2/3 keys. Toggle preview visibility with alt-p.#[cfg(unix)]Select,diff --git a/src/commands/select.rs b/src/commands/select.rsindex 7a6c182b7..50c602dbb 100644--- a/src/commands/select.rs+++ b/src/commands/select.rs@@ -78,6 +78,18 @@ fn pager_needs_paging_disabled(pager_cmd: &str) -> bool {/// If the pager takes longer than this, kill it and fall back to raw diff.const PAGER_TIMEOUT: Duration = Duration::from_millis(2000);+/// Skim uses this percentage of terminal height.+const SKIM_HEIGHT_PERCENT: usize = 90;++/// Maximum number of list items visible in down layout before scrolling.+const MAX_VISIBLE_ITEMS: usize = 12;++/// Lines reserved for skim chrome (header + prompt/margins).+const LIST_CHROME_LINES: usize = 4;++/// Minimum preview lines to keep usable even with many items.+const MIN_PREVIEW_LINES: usize = 5;+/// Run git diff piped directly through the pager as a streaming pipeline.////// Runs `git <args> | pager` as a single shell command, avoiding intermediate@@ -190,6 +202,79 @@ enum PreviewMode {BranchDiff = 3,}+/// Typical terminal character aspect ratio (width/height).+///+/// Terminal characters are taller than wide - typically around 0.5 (twice as tall as wide).+/// This varies by font, but 0.5 is a reasonable default for monospace fonts.+const CHAR_ASPECT_RATIO: f64 = 0.5;++/// Preview layout orientation for the interactive selector+///+/// Preview window position (auto-detected at startup based on terminal dimensions)+///+/// - Right: Preview on the right side (50% width) - better for wide terminals+/// - Down: Preview below the list - better for tall/vertical monitors+#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]+enum PreviewLayout {+ #[default]+ Right,+ Down,+}++impl PreviewLayout {+ /// Auto-detect layout based on terminal dimensions.+ ///+ /// Terminal dimensions are in characters, not pixels. Since characters are+ /// typically twice as tall as wide (~0.5 aspect ratio), we correct for this+ /// when calculating the effective aspect ratio.+ ///+ /// Example: 180 cols × 136 rows+ /// - Raw ratio: 180/136 = 1.32 (appears landscape)+ /// - Effective: 1.32 × 0.5 = 0.66 (actually portrait!)+ ///+ /// Returns Down for portrait (effective ratio < 1.0), Right for landscape.+ fn auto_detect() -> Self {+ let (cols, rows) = terminal_size::terminal_size()+ .map(|(terminal_size::Width(w), terminal_size::Height(h))| (w as f64, h as f64))+ .unwrap_or((80.0, 24.0));++ // Effective aspect ratio accounting for character shape+ let effective_ratio = (cols / rows) * CHAR_ASPECT_RATIO;++ if effective_ratio < 1.0 {+ Self::Down+ } else {+ Self::Right+ }+ }+}++impl PreviewLayout {+ /// Calculate the preview window spec for skim+ ///+ /// For Right layout: always 50%+ /// For Down layout: dynamically sized based on item count - list gets+ /// up to MAX_VISIBLE_ITEMS lines, preview gets the rest (min 5 lines)+ fn to_preview_window_spec(self, num_items: usize) -> String {+ match self {+ Self::Right => "right:50%".to_string(),+ Self::Down => {+ let height = terminal_size::terminal_size()+ .map(|(_, terminal_size::Height(h))| h as usize)+ .unwrap_or(24);++ let available = height * SKIM_HEIGHT_PERCENT / 100;+ let list_lines = LIST_CHROME_LINES + num_items.min(MAX_VISIBLE_ITEMS);+ // Ensure preview doesn't exceed available space while trying to maintain minimum+ let remaining = available.saturating_sub(list_lines);+ let preview_lines = remaining.max(MIN_PREVIEW_LINES).min(available);++ format!("down:{}", preview_lines)+ }+ }+ }+}+impl PreviewMode {fn from_u8(n: u8) -> Self {match n {@@ -198,32 +283,49 @@ impl PreviewMode {_ => Self::WorkingTree,}}+}++/// Preview state persistence (mode only, layout auto-detected)+///+/// State file format: Single digit representing preview mode (1=WorkingTree, 2=History, 3=BranchDiff)+struct PreviewStateData;++impl PreviewStateData {+ fn state_path() -> PathBuf {+ // Use per-process temp file to avoid race conditions when running multiple instances+ std::env::temp_dir().join(format!("wt-select-state-{}", std::process::id()))+ }- fn read_from_state() -> Self {+ /// Read current preview mode from state file+ fn read_mode() -> PreviewMode {let state_path = Self::state_path();fs::read_to_string(&state_path).ok().and_then(|s| s.trim().parse::<u8>().ok())- .map(Self::from_u8)- .unwrap_or(Self::WorkingTree)+ .map(PreviewMode::from_u8)+ .unwrap_or(PreviewMode::WorkingTree)}- fn state_path() -> PathBuf {- // Use per-process temp file to avoid race conditions when running multiple instances- std::env::temp_dir().join(format!("wt-select-mode-{}", std::process::id()))+ fn write_mode(mode: PreviewMode) {+ let state_path = Self::state_path();+ let _ = fs::write(&state_path, format!("{}", mode as u8));}}/// RAII wrapper for preview state file lifecycle managementstruct PreviewState {path: PathBuf,+ initial_layout: PreviewLayout,}impl PreviewState {fn new() -> Self {- let path = PreviewMode::state_path();- let _ = fs::write(&path, "1");- Self { path }+ let path = PreviewStateData::state_path();+ PreviewStateData::write_mode(PreviewMode::WorkingTree);+ Self {+ path,+ initial_layout: PreviewLayout::auto_detect(),+ }}}@@ -275,7 +377,7 @@ impl SkimItem for WorktreeSkimItem {}fn preview(&self, context: PreviewContext<'_>) -> ItemPreview {- let mode = PreviewMode::read_from_state();+ let mode = PreviewStateData::read_mode();// Build preview: tabs header + contentlet mut result = Self::render_preview_tabs(mode);@@ -289,7 +391,7 @@ impl WorktreeSkimItem {/// Render the tab header for the preview window////// Shows all preview modes as tabs, with the current mode bolded- /// and unselected modes dimmed. Controls are shown below in dimmed text.+ /// and unselected modes dimmed. Controls shown below.fn render_preview_tabs(mode: PreviewMode) -> String {/// Format a tab label with bold (active) or dimmed (inactive) stylingfn format_tab(label: &str, is_active: bool) -> String {@@ -305,7 +407,7 @@ impl WorktreeSkimItem {let tab1 = format_tab("1: HEAD±", mode == PreviewMode::WorkingTree);let tab2 = format_tab("2: history", mode == PreviewMode::History);let tab3 = format_tab("3: main…±", mode == PreviewMode::BranchDiff);- let controls = format_tab("ctrl-u/d: scroll", false);+ let controls = format_tab("ctrl-u/d: scroll | alt-p: toggle", false);format!("{} | {} | {}\n{}\n\n", tab1, tab2, tab3, controls)}@@ -555,6 +657,12 @@ pub fn handle_select(is_directive_mode: bool) -> anyhow::Result<()> {.map(|(_, terminal_size::Height(h))| (h as usize * 45 / 100).max(5)).unwrap_or(10);+ // Calculate preview window spec based on auto-detected layout+ // items.len() - 1 because we added a header row+ let num_items = items.len().saturating_sub(1);+ let initial_layout = _state.initial_layout;+ let preview_window_spec = initial_layout.to_preview_window_spec(num_items);+// Configure skim options with Rust-based preview and mode switching keybindingslet options = SkimOptionsBuilder::default().height("90%".to_string())@@ -563,7 +671,7 @@ pub fn handle_select(is_directive_mode: bool) -> anyhow::Result<()> {.multi(false).no_info(true) // Hide info line (matched/total counter).preview(Some("".to_string())) // Enable preview (empty string means use SkimItem::preview())- .preview_window("right:50%".to_string())+ .preview_window(preview_window_spec)// Color scheme using fzf's --color=light values: dark text (237) on light gray bg (251)//// Terminal color compatibility is tricky:@@ -582,19 +690,22 @@ pub fn handle_select(is_directive_mode: bool) -> anyhow::Result<()> {.to_string(),)).bind(vec![- // Mode switching+ // Mode switching (1/2/3 keys change preview content)format!(- "1:execute-silent(echo 1 > {})+refresh-preview",+ "1:execute-silent(echo 1 > {0})+refresh-preview",state_path_str),format!(- "2:execute-silent(echo 2 > {})+refresh-preview",+ "2:execute-silent(echo 2 > {0})+refresh-preview",state_path_str),format!(- "3:execute-silent(echo 3 > {})+refresh-preview",+ "3:execute-silent(echo 3 > {0})+refresh-preview",state_path_str),+ // Preview toggle (alt-p shows/hides preview)+ // Note: skim doesn't support change-preview-window like fzf, only toggle+ "alt-p:toggle-preview".to_string(),// Preview scrolling (half-page based on terminal height)format!("ctrl-u:preview-up({half_page})"),format!("ctrl-d:preview-down({half_page})"),@@ -662,50 +773,39 @@ mod tests {}#[test]- fn test_preview_mode_state_file_read_default() {- // When state file doesn't exist or is invalid, default to WorkingTree- let state_path = PreviewMode::state_path();- // Clean up any existing state- let _ = fs::remove_file(&state_path);+ fn test_preview_layout_to_preview_window_spec() {+ // Right is always 50%+ assert_eq!(PreviewLayout::Right.to_preview_window_spec(10), "right:50%");- assert_eq!(PreviewMode::read_from_state(), PreviewMode::WorkingTree);+ // Down calculates based on item count+ let spec = PreviewLayout::Down.to_preview_window_spec(5);+ assert!(spec.starts_with("down:"));}#[test]- fn test_preview_mode_state_file_roundtrip() {- // Use a unique test file to avoid conflicts with concurrent tests- let test_state_path =- std::env::temp_dir().join(format!("wt-select-mode-test-{}", std::process::id()));-- // Write mode 1 (WorkingTree)- fs::write(&test_state_path, "1").unwrap();- let mode = fs::read_to_string(&test_state_path)- .ok()- .and_then(|s| s.trim().parse::<u8>().ok())- .map(PreviewMode::from_u8)- .unwrap_or(PreviewMode::WorkingTree);+ fn test_preview_state_data_read_default() {+ // When state file doesn't exist, defaults to WorkingTree+ let state_path = PreviewStateData::state_path();+ let _ = fs::remove_file(&state_path);++ let mode = PreviewStateData::read_mode();assert_eq!(mode, PreviewMode::WorkingTree);+ }- // Write mode 2 (History)- fs::write(&test_state_path, "2").unwrap();- let mode = fs::read_to_string(&test_state_path)- .ok()- .and_then(|s| s.trim().parse::<u8>().ok())- .map(PreviewMode::from_u8)- .unwrap_or(PreviewMode::WorkingTree);- assert_eq!(mode, PreviewMode::History);+ #[test]+ fn test_preview_state_data_roundtrip() {+ // Write and read back various modes+ PreviewStateData::write_mode(PreviewMode::WorkingTree);+ assert_eq!(PreviewStateData::read_mode(), PreviewMode::WorkingTree);- // Write mode 3 (BranchDiff)- fs::write(&test_state_path, "3").unwrap();- let mode = fs::read_to_string(&test_state_path)- .ok()- .and_then(|s| s.trim().parse::<u8>().ok())- .map(PreviewMode::from_u8)- .unwrap_or(PreviewMode::WorkingTree);- assert_eq!(mode, PreviewMode::BranchDiff);+ PreviewStateData::write_mode(PreviewMode::History);+ assert_eq!(PreviewStateData::read_mode(), PreviewMode::History);++ PreviewStateData::write_mode(PreviewMode::BranchDiff);+ assert_eq!(PreviewStateData::read_mode(), PreviewMode::BranchDiff);// Cleanup- let _ = fs::remove_file(&test_state_path);+ let _ = fs::remove_file(PreviewStateData::state_path());}#[test]diff --git a/tests/integration_tests/snapshots/integration__integration_tests__select__select_abort_escape.snap b/tests/integration_tests/snapshots/integration__integration_tests__select__select_abort_escape.snapindex 08f34de32..743bc0479 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__select__select_abort_escape.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__select__select_abort_escape.snap@@ -3,7 +3,7 @@ source: tests/integration_tests/select.rsexpression: normalized---> [QUERY] │[PREVIEW_HEADER]- Branch Status HEAD± main↕ Path Remote⇅ Co│ctrl-u/d: scroll+ Branch Status HEAD± main↕ Path Remote⇅ Co│ctrl-u/d: scroll | alt-p: toggle> @ main ^ . ..││⚪ main has no uncommitted changes│diff --git a/tests/integration_tests/snapshots/integration__integration_tests__select__select_multiple_worktrees.snap b/tests/integration_tests/snapshots/integration__integration_tests__select__select_multiple_worktrees.snapindex 618553c62..2625624ec 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__select__select_multiple_worktrees.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__select__select_multiple_worktrees.snap@@ -3,7 +3,7 @@ source: tests/integration_tests/select.rsexpression: normalized---> [QUERY] │[PREVIEW_HEADER]- Branch Status HEAD± main↕ Path │ctrl-u/d: scroll+ Branch Status HEAD± main↕ Path │ctrl-u/d: scroll | alt-p: toggle> @ main ^ ./repo ..│+ feature-one _ ./repo.fea..│⚪ main has no uncommitted changes+ feature-two _ ./repo.fea..│diff --git a/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_history.snap b/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_history.snapindex 9f38148de..d1ff61cd0 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_history.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_history.snap@@ -3,7 +3,7 @@ source: tests/integration_tests/select.rsexpression: normalized---> [QUERY] │[PREVIEW_HEADER]- Branch Status HEAD± main↕ Path │ctrl-u/d: scroll+ Branch Status HEAD± main↕ Path │ctrl-u/d: scroll | alt-p: toggle> + feature ↑ ↑5 ./repo.feature..││* b1549b6 (feature) Add file 5 with important changes│* 111f7e4 Add file 4 with important changesdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_main_diff.snap b/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_main_diff.snapindex 3f1b5554c..5b0c3592e 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_main_diff.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_main_diff.snap@@ -3,7 +3,7 @@ source: tests/integration_tests/select.rsexpression: normalized---> [QUERY] │[PREVIEW_HEADER]- Branch Status HEAD± main↕ Path │ctrl-u/d: scroll+ Branch Status HEAD± main↕ Path │ctrl-u/d: scroll | alt-p: toggle> + feature ↑ ↑2 ./repo.feature..││ feature_code.rs | 6 ++++++│ tests.rs | 4 ++++diff --git a/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_uncommitted.snap b/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_uncommitted.snapindex de5e5286f..443570563 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_uncommitted.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_uncommitted.snap@@ -3,7 +3,7 @@ source: tests/integration_tests/select.rsexpression: normalized---> [QUERY] │[PREVIEW_HEADER]- Branch Status HEAD± main↕ Path │ctrl-u/d: scroll+ Branch Status HEAD± main↕ Path │ctrl-u/d: scroll | alt-p: toggle> + feature ! ↑ +3 -1 ↑1 ./repo.feature..││ tracked.txt | 4 +++-│ 1 file changed, 3 insertions(+), 1 deletion(-)diff --git a/tests/integration_tests/snapshots/integration__integration_tests__select__select_with_branches.snap b/tests/integration_tests/snapshots/integration__integration_tests__select__select_with_branches.snapindex 719bd934e..05c947420 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__select__select_with_branches.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__select__select_with_branches.snap@@ -3,7 +3,7 @@ source: tests/integration_tests/select.rsexpression: normalized---> [QUERY] │[PREVIEW_HEADER]- Branch Status HEAD± main↕ Path │ctrl-u/d: scroll+ Branch Status HEAD± main↕ Path │ctrl-u/d: scroll | alt-p: toggle> @ main ^ ./repo │+ active-worktree _ ./repo..│⚪ main has no uncommitted changesorphan-branch _ ⎇ │