Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
feat(list): Align numeric columns and dim removable branches
Maximilian Roos25a0429ec91d
diff --git a/src/commands/list/layout.rs b/src/commands/list/layout.rsindex 84707632c..e8e9e3cc4 100644--- a/src/commands/list/layout.rs+++ b/src/commands/list/layout.rs@@ -32,7 +32,7 @@ fn try_allocate(}/// Width information for diff columns (e.g., "+128 -147")-#[derive(Clone, Copy)]+#[derive(Clone, Copy, Debug)]pub struct DiffWidths {pub total: usize,pub added_digits: usize,@@ -53,10 +53,10 @@ pub struct ColumnWidths {pub branch: usize,pub time: usize,pub message: usize,- pub ahead_behind: usize,+ pub ahead_behind: DiffWidths,pub working_diff: DiffWidths,pub branch_diff: DiffWidths,- pub upstream: usize,+ pub upstream: DiffWidths,pub states: usize,pub commit: usize,pub path: usize,@@ -73,9 +73,7 @@ pub fn calculate_column_widths(items: &[ListItem]) -> ColumnWidths {let mut max_branch = "Branch".width();let mut max_time = "Age".width();let mut max_message = "Message".width();- let mut max_ahead_behind = "Cmts".width();- let mut max_upstream = "Remote".width();- let mut max_states = "State".width();+ let mut max_states = 0; // Start at 0, will use header width if needed// Track diff component widths separatelylet mut max_wt_added_digits = 0;@@ -83,6 +81,12 @@ pub fn calculate_column_widths(items: &[ListItem]) -> ColumnWidths {let mut max_br_added_digits = 0;let mut max_br_deleted_digits = 0;+ // Track ahead/behind digit widths separately for alignment+ let mut max_ahead_digits = 0;+ let mut max_behind_digits = 0;+ let mut max_upstream_ahead_digits = 0;+ let mut max_upstream_behind_digits = 0;+for item in items {let commit = item.commit_details();let counts = item.counts();@@ -101,10 +105,10 @@ pub fn calculate_column_widths(items: &[ListItem]) -> ColumnWidths {let msg_len = commit.commit_message.chars().take(50).count();max_message = max_message.max(msg_len);- // Ahead/behind (only for non-primary items)+ // Ahead/behind (only for non-primary items) - track digits separatelyif !item.is_primary() && (counts.ahead > 0 || counts.behind > 0) {- let ahead_behind_len = format!("↑{} ↓{}", counts.ahead, counts.behind).width();- max_ahead_behind = max_ahead_behind.max(ahead_behind_len);+ max_ahead_digits = max_ahead_digits.max(counts.ahead.to_string().len());+ max_behind_digits = max_behind_digits.max(counts.behind.to_string().len());}// Working tree diff (worktrees only) - track digits separately@@ -123,11 +127,12 @@ pub fn calculate_column_widths(items: &[ListItem]) -> ColumnWidths {max_br_deleted_digits = max_br_deleted_digits.max(branch_diff.1.to_string().len());}- // Upstream tracking- if let Some((remote_name, upstream_ahead, upstream_behind)) = upstream.active() {- let upstream_len =- format!("{} ↑{} ↓{}", remote_name, upstream_ahead, upstream_behind).width();- max_upstream = max_upstream.max(upstream_len);+ // Upstream tracking - track digits separately+ if let Some((_remote_name, upstream_ahead, upstream_behind)) = upstream.active() {+ max_upstream_ahead_digits =+ max_upstream_ahead_digits.max(upstream_ahead.to_string().len());+ max_upstream_behind_digits =+ max_upstream_behind_digits.max(upstream_behind.to_string().len());}// States (worktrees only)@@ -149,39 +154,42 @@ pub fn calculate_column_widths(items: &[ListItem]) -> ColumnWidths {};let branch_diff_total = if max_br_added_digits > 0 || max_br_deleted_digits > 0 {let data_width = 1 + max_br_added_digits + 1 + 1 + max_br_deleted_digits;- data_width.max("Cmt +/-".width()) // Ensure header fits if we have data+ data_width.max("Branch +/-".width()) // Ensure header fits if we have data} else {0 // No data, no column};- // Reset sparse column widths to 0 if they're still at header width (no data found)- let header_ahead_behind = "Cmts".width();- let header_upstream = "Remote".width();- let header_states = "State".width();-- let final_ahead_behind = if max_ahead_behind == header_ahead_behind {- 0 // No data found+ // Calculate ahead/behind column width (format: "↑n ↓n")+ let ahead_behind_total = if max_ahead_digits > 0 || max_behind_digits > 0 {+ let data_width = 1 + max_ahead_digits + 1 + 1 + max_behind_digits;+ data_width.max("Commits".width())} else {- max_ahead_behind+ 0};- let final_upstream = if max_upstream == header_upstream {- 0 // No data found+ // Calculate upstream column width (format: "↑n ↓n" or "remote ↑n ↓n")+ let upstream_total = if max_upstream_ahead_digits > 0 || max_upstream_behind_digits > 0 {+ let data_width = 1 + max_upstream_ahead_digits + 1 + 1 + max_upstream_behind_digits;+ data_width.max("Remote".width())} else {- max_upstream+ 0};- let final_states = if max_states == header_states {- 0 // No data found+ let final_states = if max_states > 0 {+ max_states.max("State".width())} else {- max_states+ 0};ColumnWidths {branch: max_branch,time: max_time,message: max_message,- ahead_behind: final_ahead_behind,+ ahead_behind: DiffWidths {+ total: ahead_behind_total,+ added_digits: max_ahead_digits,+ deleted_digits: max_behind_digits,+ },working_diff: DiffWidths {total: working_diff_total,added_digits: max_wt_added_digits,@@ -192,7 +200,11 @@ pub fn calculate_column_widths(items: &[ListItem]) -> ColumnWidths {added_digits: max_br_added_digits,deleted_digits: max_br_deleted_digits,},- upstream: final_upstream,+ upstream: DiffWidths {+ total: upstream_total,+ added_digits: max_upstream_ahead_digits,+ deleted_digits: max_upstream_behind_digits,+ },states: final_states,commit: 8, // Fixed width for short commit hashpath: 0, // Path width calculated later in responsive layout@@ -230,14 +242,15 @@ pub fn calculate_responsive_layout(items: &[ListItem]) -> LayoutConfig {// 1. branch - identity (what is this?)// 2. working_diff - uncommitted changes (CRITICAL: do I need to commit?)// 3. ahead_behind - commits difference (CRITICAL: am I ahead/behind?)- // 4. states - special states like [rebasing] (rare but urgent when present)- // 5. path - location (where is this?)- // 6. branch_diff - line diff in commits (work volume understanding)+ // 4. branch_diff - line diff in commits (work volume in those commits)+ // 5. states - special states like [rebasing] (rare but urgent when present)+ // 6. path - location (where is this?)// 7. upstream - tracking configuration (sync context)// 8. time - recency (nice-to-have context)// 9. commit - hash (reference info, rarely needed)// 10. message - description (nice-to-have, space-hungry)//+ // Note: ahead_behind and branch_diff are adjacent (both describe commits vs main)// Each column is shown if it has any data (ideal_width > 0) and fits in remaining space.// All columns participate in priority allocation - nothing is "essential".@@ -246,10 +259,10 @@ pub fn calculate_responsive_layout(items: &[ListItem]) -> LayoutConfig {branch: 0,time: 0,message: 0,- ahead_behind: 0,+ ahead_behind: DiffWidths::zero(),working_diff: DiffWidths::zero(),branch_diff: DiffWidths::zero(),- upstream: 0,+ upstream: DiffWidths::zero(),states: 0,commit: 0,path: 0,@@ -270,15 +283,17 @@ pub fn calculate_responsive_layout(items: &[ListItem]) -> LayoutConfig {}// Ahead/behind column (critical sync status)- widths.ahead_behind = try_allocate(&mut remaining, ideal_widths.ahead_behind, spacing, false);-- // States column (rare but urgent when present)- widths.states = try_allocate(&mut remaining, ideal_widths.states, spacing, false);-- // Path column (location - important for navigation)- widths.path = try_allocate(&mut remaining, max_path_width, spacing, false);+ let allocated_width = try_allocate(+ &mut remaining,+ ideal_widths.ahead_behind.total,+ spacing,+ false,+ );+ if allocated_width > 0 {+ widths.ahead_behind = ideal_widths.ahead_behind;+ }- // Branch diff column (work volume)+ // Branch diff column (work volume in those commits)let allocated_width = try_allocate(&mut remaining,ideal_widths.branch_diff.total,@@ -289,8 +304,17 @@ pub fn calculate_responsive_layout(items: &[ListItem]) -> LayoutConfig {widths.branch_diff = ideal_widths.branch_diff;}+ // States column (rare but urgent when present)+ widths.states = try_allocate(&mut remaining, ideal_widths.states, spacing, false);++ // Path column (location - important for navigation)+ widths.path = try_allocate(&mut remaining, max_path_width, spacing, false);+// Upstream column (sync configuration)- widths.upstream = try_allocate(&mut remaining, ideal_widths.upstream, spacing, false);+ let allocated_width = try_allocate(&mut remaining, ideal_widths.upstream.total, spacing, false);+ if allocated_width > 0 {+ widths.upstream = ideal_widths.upstream;+ }// Time column (contextual information)widths.time = try_allocate(&mut remaining, ideal_widths.time, spacing, false);@@ -369,20 +393,33 @@ mod tests {let widths = calculate_column_widths(&[super::ListItem::Worktree(info1)]);- // "↑3 ↓2" has visual width 5 (not 9 bytes)- assert_eq!(widths.ahead_behind, 5, "↑3 ↓2 should have width 5");+ // "↑3 ↓2" has format "↑3 ↓2" = 1+1+1+1+1 = 5, but header "Commits" is 7+ assert_eq!(+ widths.ahead_behind.total, 7,+ "Ahead/behind column should fit header 'Commits' (width 7)"+ );+ assert_eq!(widths.ahead_behind.added_digits, 1, "3 has 1 digit");+ assert_eq!(widths.ahead_behind.deleted_digits, 1, "2 has 1 digit");// "+100 -50" has width 8assert_eq!(widths.working_diff.total, 8, "+100 -50 should have width 8");assert_eq!(widths.working_diff.added_digits, 3, "100 has 3 digits");assert_eq!(widths.working_diff.deleted_digits, 2, "50 has 2 digits");- // "+200 -30" has width 8- assert_eq!(widths.branch_diff.total, 8, "+200 -30 should have width 8");+ // "+200 -30" has width 8, but header "Branch +/-" is 10, so column width is 10+ assert_eq!(+ widths.branch_diff.total, 10,+ "Branch diff column should fit header 'Branch +/-' (width 10)"+ );assert_eq!(widths.branch_diff.added_digits, 3, "200 has 3 digits");assert_eq!(widths.branch_diff.deleted_digits, 2, "30 has 2 digits");- // "origin ↑4 ↓0" has visual width 12 (not more due to Unicode arrows)- assert_eq!(widths.upstream, 12, "origin ↑4 ↓0 should have width 12");+ // Single remote: "↑4 ↓0" has format "↑4 ↓0" = 1+1+1+1+1 = 5, but header "Remote" is 6+ assert_eq!(+ widths.upstream.total, 6,+ "Upstream column should fit header 'Remote' (width 6) when single remote"+ );+ assert_eq!(widths.upstream.added_digits, 1, "4 has 1 digit");+ assert_eq!(widths.upstream.deleted_digits, 1, "0 has 1 digit");}}diff --git a/src/commands/list/render.rs b/src/commands/list/render.rsindex 3e5e3119c..80e8b88a5 100644--- a/src/commands/list/render.rs+++ b/src/commands/list/render.rs@@ -5,6 +5,57 @@ use worktrunk::styling::{ADDITION, CURRENT, DELETION, StyledLine};use super::layout::{DiffWidths, LayoutConfig};use super::model::{ListItem, WorktreeInfo};+/// Format arrow-based counts (e.g., "↑6 ↓1") with alignment+/// Down arrows always appear at the same column position by reserving space for ahead part+fn format_arrow_column(+ ahead: usize,+ behind: usize,+ widths: &DiffWidths,+ green: Style,+ red: Style,+) -> StyledLine {+ let mut segment = StyledLine::new();++ if ahead > 0 || behind > 0 {+ // Always reserve full width for ahead part (↑ + max_digits)+ if ahead > 0 {+ let ahead_str = format!("↑{}", ahead);+ segment.push_styled(&ahead_str, green);+ // Pad ahead part to fixed width+ let ahead_padding = widths.added_digits.saturating_sub(ahead.to_string().len());+ if ahead_padding > 0 {+ segment.push_raw(" ".repeat(ahead_padding));+ }+ } else {+ // Reserve full space when ahead is zero+ segment.push_raw(" ".repeat(1 + widths.added_digits));+ }++ // Always add separator space+ segment.push_raw(" ");++ // Always reserve full width for behind part (↓ + max_digits)+ if behind > 0 {+ let behind_str = format!("↓{}", behind);+ segment.push_styled(&behind_str, red);+ // Pad behind part to fixed width+ let behind_padding = widths+ .deleted_digits+ .saturating_sub(behind.to_string().len());+ if behind_padding > 0 {+ segment.push_raw(" ".repeat(behind_padding));+ }+ } else {+ // Reserve full space when behind is zero+ segment.push_raw(" ".repeat(1 + widths.deleted_digits));+ }+ } else {+ segment.push_raw(" ".repeat(widths.total));+ }++ segment+}+/// Format diff values as styled segments (right-aligned with attached signs)fn format_diff_column(added: usize,@@ -16,28 +67,43 @@ fn format_diff_column(let mut diff_segment = StyledLine::new();if added > 0 || deleted > 0 {- let added_part = format!(- "{:>width$}",- format!("+{}", added),- width = 1 + widths.added_digits- );- let deleted_part = format!(- "{:>width$}",- format!("-{}", deleted),- width = 1 + widths.deleted_digits- );-- // Calculate the content width+ // Always maintain full column width for alignment+ // Format: [padding] [+nnn] [ ] [-nnn]let content_width = (1 + widths.added_digits) + 1 + (1 + widths.deleted_digits);- // Add left padding to align to total widthlet left_padding = widths.total.saturating_sub(content_width);if left_padding > 0 {diff_segment.push_raw(" ".repeat(left_padding));}- diff_segment.push_styled(added_part, green);++ // Added part: show value or spaces+ if added > 0 {+ let added_part = format!(+ "{:>width$}",+ format!("+{}", added),+ width = 1 + widths.added_digits+ );+ diff_segment.push_styled(added_part, green);+ } else {+ // Blank space to maintain alignment+ diff_segment.push_raw(" ".repeat(1 + widths.added_digits));+ }++ // Space between added and deleteddiff_segment.push_raw(" ");- diff_segment.push_styled(deleted_part, red);++ // Deleted part: show value or spaces+ if deleted > 0 {+ let deleted_part = format!(+ "{:>width$}",+ format!("-{}", deleted),+ width = 1 + widths.deleted_digits+ );+ diff_segment.push_styled(deleted_part, red);+ } else {+ // Blank space to maintain alignment+ diff_segment.push_raw(" ".repeat(1 + widths.deleted_digits));+ }} else {diff_segment.push_raw(" ".repeat(widths.total));}@@ -96,11 +162,11 @@ pub fn format_header_line(layout: &LayoutConfig) {push_optional_header(&mut line, "Branch", widths.branch, dim);push_optional_header(&mut line, "WT +/-", widths.working_diff.total, dim);- push_optional_header(&mut line, "Cmts", widths.ahead_behind, dim);+ push_optional_header(&mut line, "Commits", widths.ahead_behind.total, dim);+ push_optional_header(&mut line, "Branch +/-", widths.branch_diff.total, dim);push_optional_header(&mut line, "State", widths.states, dim);push_optional_header(&mut line, "Path", widths.path, dim);- push_optional_header(&mut line, "Cmt +/-", widths.branch_diff.total, dim);- push_optional_header(&mut line, "Remote", widths.upstream, dim);+ push_optional_header(&mut line, "Remote", widths.upstream.total, dim);push_optional_header(&mut line, "Age", widths.time, dim);push_optional_header(&mut line, "Commit", widths.commit, dim);push_optional_header(&mut line, "Message", widths.message, dim);@@ -130,6 +196,17 @@ fn push_optional_header(line: &mut StyledLine, label: &str, width: usize, dim: S}}+/// Check if a branch is potentially removable (nothing ahead, no uncommitted changes)+fn is_potentially_removable(item: &ListItem) -> bool {+ let counts = item.counts();+ let wt_diff = item+ .worktree_info()+ .map(|info| info.working_tree_diff)+ .unwrap_or((0, 0));++ !item.is_primary() && counts.ahead == 0 && wt_diff == (0, 0)+}+/// Render a list item (worktree or branch) as a formatted linepub fn format_list_item_line(item: &ListItem,@@ -146,6 +223,9 @@ pub fn format_list_item_line(let worktree_info = item.worktree_info();let short_head = &head[..8.min(head.len())];+ // Check if branch is potentially removable+ let removable = is_potentially_removable(item);+// Determine styling (worktree-specific)let text_style = worktree_info.and_then(|info| {let is_current = current_worktree_path@@ -158,6 +238,13 @@ pub fn format_list_item_line(}});+ // Override styling if removable (dim the row)+ let text_style = if removable {+ Some(Style::new().dimmed())+ } else {+ text_style+ };+// Start building the linelet mut line = StyledLine::new();let mut first_column = true;@@ -170,9 +257,10 @@ pub fn format_list_item_line(first_column = false;};- // Branch name+ // Branch name (dimmed if removable)if widths.branch > 0 {push_gap_if_needed(&mut line);+let branch_text = format!("{:width$}", item.branch_name(), width = widths.branch);if let Some(style) = text_style {line.push_styled(branch_text, style);@@ -192,25 +280,33 @@ pub fn format_list_item_line(}}- // Ahead/behind (commits difference)- if widths.ahead_behind > 0 {+ // Ahead/behind (commits difference) - green ahead, dim red behind+ if widths.ahead_behind.total > 0 {+ push_gap_if_needed(&mut line);+ if !item.is_primary() && (counts.ahead > 0 || counts.behind > 0) {+ let dim_deletion = DELETION.dimmed();+ append_line(+ &mut line,+ format_arrow_column(+ counts.ahead,+ counts.behind,+ &widths.ahead_behind,+ ADDITION,+ dim_deletion,+ ),+ );+ } else {+ push_blank(&mut line, widths.ahead_behind.total);+ }+ }++ // Branch diff (line diff in commits)+ if widths.branch_diff.total > 0 {push_gap_if_needed(&mut line);if !item.is_primary() {- if counts.ahead > 0 || counts.behind > 0 {- let ahead_behind_text = format!(- "{:width$}",- format!("↑{} ↓{}", counts.ahead, counts.behind),- width = widths.ahead_behind- );- line.push_styled(- ahead_behind_text,- Style::new().fg_color(Some(Color::Ansi(AnsiColor::Yellow))),- );- } else {- push_blank(&mut line, widths.ahead_behind);- }+ push_diff(&mut line, branch_diff.0, branch_diff.1, &widths.branch_diff);} else {- push_blank(&mut line, widths.ahead_behind);+ push_blank(&mut line, widths.branch_diff.total);}}@@ -246,30 +342,24 @@ pub fn format_list_item_line(}}- // Branch diff (line diff in commits)- if widths.branch_diff.total > 0 {- push_gap_if_needed(&mut line);- if !item.is_primary() {- push_diff(&mut line, branch_diff.0, branch_diff.1, &widths.branch_diff);- } else {- push_blank(&mut line, widths.branch_diff.total);- }- }-// Upstream tracking- if widths.upstream > 0 {+ if widths.upstream.total > 0 {push_gap_if_needed(&mut line);- if let Some((remote_name, upstream_ahead, upstream_behind)) = upstream.active() {- let mut upstream_segment = StyledLine::new();- upstream_segment.push_styled(remote_name, Style::new().dimmed());- upstream_segment.push_raw(" ");- upstream_segment.push_styled(format!("↑{}", upstream_ahead), ADDITION);- upstream_segment.push_raw(" ");- upstream_segment.push_styled(format!("↓{}", upstream_behind), DELETION);- upstream_segment.pad_to(widths.upstream);- append_line(&mut line, upstream_segment);+ if let Some((_remote_name, upstream_ahead, upstream_behind)) = upstream.active() {+ let dim_deletion = DELETION.dimmed();+ // TODO: Handle show_remote_names when implemented+ append_line(+ &mut line,+ format_arrow_column(+ upstream_ahead,+ upstream_behind,+ &widths.upstream,+ ADDITION,+ dim_deletion,+ ),+ );} else {- push_blank(&mut line, widths.upstream);+ push_blank(&mut line, widths.upstream.total);}}diff --git a/tests/integration_tests/column_alignment_verification.rs b/tests/integration_tests/column_alignment_verification.rsindex d409be642..33d34dc6b 100644--- a/tests/integration_tests/column_alignment_verification.rs+++ b/tests/integration_tests/column_alignment_verification.rs@@ -55,10 +55,10 @@ impl ColumnPositions {if let Some(pos) = header.find("Age") {positions.age = Some(pos);}- if let Some(pos) = header.find("Cmts") {+ if let Some(pos) = header.find("Commits") {positions.cmts = Some(pos);}- if let Some(pos) = header.find("Cmt +/-") {+ if let Some(pos) = header.find("Branch +/-") {positions.cmt_diff = Some(pos);}if let Some(pos) = header.find("WT +/-") {@@ -198,8 +198,8 @@ fn verify_table_alignment(output: &str) -> Result<(), String> {let positions = [("Branch", Some(0usize)), // Branch always starts at 0("Age", header_positions.age),- ("Cmts", header_positions.cmts),- ("Cmt +/-", header_positions.cmt_diff),+ ("Commits", header_positions.cmts),+ ("Branch +/-", header_positions.cmt_diff),("WT +/-", header_positions.wt_diff),("Remote", header_positions.remote),("Commit", header_positions.commit),diff --git a/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap b/tests/snapshots/integration__integration_tests__list__locked_no_reason.snapindex 3fb46ca7e..495d13d00 100644--- a/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap+++ b/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap@@ -15,14 +15,14 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpkBJ5eI/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpontvav/test-config.toml---success: trueexit_code: 0----- stdout -----[2mBranch [0m [2mState [0m [2mPath [0m [2mAge [0m [2mCommit [0m [2mMessage [0m[1m[35mmain [0m [1m[35m./test-repo [0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m-locked-no-reason (locked) ./locked-no-reason [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m+[2mlocked-no-reason[0m (locked) [2m./locked-no-reason[0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m[2mShowing 2 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__locked_worktree.snap b/tests/snapshots/integration__integration_tests__list__locked_worktree.snapindex e4ac5bf38..d46c21f71 100644--- a/tests/snapshots/integration__integration_tests__list__locked_worktree.snap+++ b/tests/snapshots/integration__integration_tests__list__locked_worktree.snap@@ -15,14 +15,14 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmppF4TvD/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpMoL89L/test-config.toml---success: trueexit_code: 0----- stdout -----[2mBranch [0m [2mState [0m [2mPath [0m [2mAge [0m [2mCommit [0m [2mMessage [0m[1m[35mmain [0m [1m[35m./test-repo [0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m-locked-feature (locked: Testing lock functionality) ./locked-feature [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m+[2mlocked-feature[0m (locked: Testing lock functionality) [2m./locked-feature[0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m[2mShowing 2 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__long_commit_message.snap b/tests/snapshots/integration__integration_tests__list__long_commit_message.snapindex e624d5b8d..8ede48002 100644--- a/tests/snapshots/integration__integration_tests__list__long_commit_message.snap+++ b/tests/snapshots/integration__integration_tests__list__long_commit_message.snap@@ -15,14 +15,14 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpkjqAKW/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpbmtWq2/test-config.toml---success: trueexit_code: 0----- stdout ------[2mBranch [0m [2mCmts [0m [2mPath [0m [2mAge [0m [2mCommit [0m [2mMessage [0m-[1m[35mmain [0m [1m[35m./test-repo[0m [2m10 months ago[0m [2m1310bfb9[0m [2mShort message[0m-feature-a [33m↑0 ↓1[0m ./feature-a [2m10 months ago[0m [2mf078644e[0m [2mThis is a very long commit message that should test how the message column handles...[0m+[2mBranch [0m [2mCommits[0m [2mPath [0m [2mAge [0m [2mCommit [0m [2mMessage [0m+[1m[35mmain [0m [1m[35m./test-repo[0m [2m10 months ago[0m [2m1310bfb9[0m [2mShort message[0m+[2mfeature-a[0m [2m[31m↓1[0m [2m./feature-a[0m [2m10 months ago[0m [2mf078644e[0m [2mThis is a very long commit message that should test how the message column handles...[0m[2mShowing 2 worktrees, 1 behind[0mdiff --git a/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap b/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snapindex 3cdf8f944..4c093e7b1 100644--- a/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap+++ b/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap@@ -15,17 +15,17 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpNoMoVr/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpgVNclb/test-config.toml---success: trueexit_code: 0----- stdout -----[2mBranch [0m [2mPath [0m [2mAge [0m [2mCommit [0m [2mMessage [0m[1m[35mmain [0m [1m[35m./test-repo [0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m-medium-name ./medium-name [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m-short ./short [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m-very-long-branch-name-here ./very-long-branch-name-here [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m-with-changes ./with-changes [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m+[2mmedium-name [0m [2m./medium-name [0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m+[2mshort [0m [2m./short [0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m+[2mvery-long-branch-name-here[0m [2m./very-long-branch-name-here[0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m+[2mwith-changes [0m [2m./with-changes [0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m[2mShowing 5 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snapindex 80dc7b12f..56a31a6f2 100644--- a/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap+++ b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap@@ -15,15 +15,15 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpSNzXtm/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpNE7UMf/test-config.toml---success: trueexit_code: 0----- stdout -----[2mBranch [0m [2mPath [0m [2mAge [0m [2mCommit [0m [2mMessage [0m[1m[35mmain [0m [1m[35m./test-repo[0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m-feature-a ./feature-a [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m-feature-b ./feature-b [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m+[2mfeature-a[0m [2m./feature-a[0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m+[2mfeature-b[0m [2m./feature-b[0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m[2mShowing 3 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snapindex 7e8d720f2..fb975f2b0 100644--- a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap+++ b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap@@ -15,14 +15,14 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpav4jPx/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp9GXdoj/test-config.toml---success: trueexit_code: 0----- stdout ------[2mBranch [0m [2mCmts [0m [2mPath [0m [2mAge [0m [2mCommit [0m [2mMessage [0m-[1m[35mmain [0m [1m[35m./test-repo [0m [2m10 months ago[0m [2me4614cb7[0m [2mFix bug with café ☕ handling[0m-feature-test [33m↑0 ↓1[0m ./feature-test [2m10 months ago[0m [2m0c53695b[0m [2mAdd support for 日本語 and émoji 🎉[0m+[2mBranch [0m [2mCommits[0m [2mPath [0m [2mAge [0m [2mCommit [0m [2mMessage [0m+[1m[35mmain [0m [1m[35m./test-repo [0m [2m10 months ago[0m [2me4614cb7[0m [2mFix bug with café ☕ handling[0m+[2mfeature-test[0m [2m[31m↓1[0m [2m./feature-test[0m [2m10 months ago[0m [2m0c53695b[0m [2mAdd support for 日本語 and émoji 🎉[0m[2mShowing 2 worktrees, 1 behind[0mdiff --git a/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap b/tests/snapshots/integration__integration_tests__list__with_branches_flag.snapindex 2b15d17ea..6e5ead1da 100644--- a/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap+++ b/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap@@ -16,17 +16,17 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpG8kNFZ/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp5NquCm/test-config.toml---success: trueexit_code: 0----- stdout -----[2mBranch [0m [2mPath [0m [2mAge [0m [2mCommit [0m [2mMessage [0m[1m[35mmain [0m [1m[35m./test-repo [0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m-feature-with-worktree ./feature-with-worktree [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m-another-branch [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m-feature-without-worktree [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m-fix-bug [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m+[2mfeature-with-worktree [0m [2m./feature-with-worktree[0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m+[2manother-branch [0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m+[2mfeature-without-worktree[0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m+[2mfix-bug [0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m[2mShowing 2 worktrees, 3 branches[0mdiff --git a/tests/snapshots/integration__integration_tests__list__with_branches_flag_none_available.snap b/tests/snapshots/integration__integration_tests__list__with_branches_flag_none_available.snapindex a5883deee..e12878650 100644--- a/tests/snapshots/integration__integration_tests__list__with_branches_flag_none_available.snap+++ b/tests/snapshots/integration__integration_tests__list__with_branches_flag_none_available.snap@@ -16,15 +16,15 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpoOmhpq/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmphgqe0o/test-config.toml---success: trueexit_code: 0----- stdout -----[2mBranch [0m [2mPath [0m [2mAge [0m [2mCommit [0m [2mMessage [0m[1m[35mmain [0m [1m[35m./test-repo[0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m-feature-a ./feature-a [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m-feature-b ./feature-b [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m+[2mfeature-a[0m [2m./feature-a[0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m+[2mfeature-b[0m [2m./feature-b[0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m[2mShowing 3 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__with_branches_flag_only_branches.snap b/tests/snapshots/integration__integration_tests__list__with_branches_flag_only_branches.snapindex 0d51271c4..e7b284798 100644--- a/tests/snapshots/integration__integration_tests__list__with_branches_flag_only_branches.snap+++ b/tests/snapshots/integration__integration_tests__list__with_branches_flag_only_branches.snap@@ -16,16 +16,16 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp1lpiaf/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmprcprXE/test-config.toml---success: trueexit_code: 0----- stdout -----[2mBranch [0m [2mPath[0m [2mAge [0m [2mCommit [0m [2mMessage [0m[1m[35mmain [0m [1m[35m.[0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m-branch-alpha [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m-branch-beta [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m-branch-gamma [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m+[2mbranch-alpha[0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m+[2mbranch-beta [0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m+[2mbranch-gamma[0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m[2mShowing 1 worktrees, 3 branches[0mdiff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_empty_diffs.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_empty_diffs.snapindex 6469cd5af..787664a0e 100644--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_empty_diffs.snap+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_empty_diffs.snap@@ -15,15 +15,15 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpssSPOb/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpx4ybQ0/test-config.toml---success: trueexit_code: 0----- stdout -----[2mBranch [0m [2mWT +/-[0m [2mPath [0m [2mAge [0m [2mCommit [0m [2mMessage [0m[1m[35mmain [0m [1m[35m./test-repo [0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m-also-no-changes ./also-no-changes [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m-no-changes ./no-changes [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m+[2malso-no-changes[0m [2m./also-no-changes[0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m+[2mno-changes [0m [2m./no-changes [0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0mwith-changes [32m+1[0m [31m-1[0m ./with-changes [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m[2mShowing 4 worktrees, 1 with changes[0mdiff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_extreme_diffs.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_extreme_diffs.snapindex 2b9f5ce46..cfb3ce263 100644--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_extreme_diffs.snap+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_extreme_diffs.snap@@ -15,14 +15,14 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpLO8yce/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpCZauq0/test-config.toml---success: trueexit_code: 0----- stdout -----[2mBranch[0m [2mWT +/-[0m [2mPath [0m [2mAge [0m [2mCommit [0m [2mMessage [0m[1m[35mmain [0m [1m[35m./test-repo[0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m-huge ./huge [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m+[2mhuge [0m [2m./huge [0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0mtiny [32m+1[0m [31m-1[0m ./tiny [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m[2mShowing 3 worktrees, 1 with changes[0mdiff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_varying_diffs.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_varying_diffs.snapindex 93e1baf50..bfe29b6e5 100644--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_varying_diffs.snap+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_varying_diffs.snap@@ -15,16 +15,16 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpl2ecpl/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpZwQp1h/test-config.toml---success: trueexit_code: 0----- stdout -----[2mBranch [0m [2mPath [0m [2mAge [0m [2mCommit [0m [2mMessage [0m[1m[35mmain [0m [1m[35m./test-repo [0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m-feature-large ./feature-large [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m-feature-medium ./feature-medium [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m-feature-small ./feature-small [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m+[2mfeature-large [0m [2m./feature-large [0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m+[2mfeature-medium[0m [2m./feature-medium[0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m+[2mfeature-small [0m [2m./feature-small [0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m[2mShowing 4 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__long_branch_names.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__long_branch_names.snapindex afeb2d889..a26b2f72d 100644--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__long_branch_names.snap+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__long_branch_names.snap@@ -15,16 +15,16 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmps9ToYO/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmplPwzbl/test-config.toml---success: trueexit_code: 0----- stdout -----[2mBranch [0m [2mPath [0m [2mAge [0m [2mCommit [0m [2mMessage [0m[1m[35mmain [0m [1m[35m./test-repo [0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m-another-extremely-long-name-here ./another-extremely-long-name-here [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m-short ./short [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m-very-long-feature-branch-name ./very-long-feature-branch-name [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m+[2manother-extremely-long-name-here[0m [2m./another-extremely-long-name-here[0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m+[2mshort [0m [2m./short [0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m+[2mvery-long-feature-branch-name [0m [2m./very-long-feature-branch-name [0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m[2mShowing 4 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__mixed_length_branch_names.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__mixed_length_branch_names.snapindex 8ac92e532..89778f162 100644--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__mixed_length_branch_names.snap+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__mixed_length_branch_names.snap@@ -15,16 +15,16 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpihJu55/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp3VKRuB/test-config.toml---success: trueexit_code: 0----- stdout -----[2mBranch[0m [2mPath [0m [2mAge [0m [2mCommit [0m [2mMessage [0m[1m[35mmain [0m [1m[35m./test-repo [0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m-long ./extremely-long-branch-name-that-might-cause-layout-issues [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m-medium ./medium-length-name [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m-x ./x [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m+[2mlong [0m [2m./extremely-long-branch-name-that-might-cause-layout-issues[0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m+[2mmedium[0m [2m./medium-length-name [0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m+[2mx [0m [2m./x [0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m[2mShowing 4 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__short_branch_names.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__short_branch_names.snapindex 5689aabd8..834b03315 100644--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__short_branch_names.snap+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__short_branch_names.snap@@ -15,16 +15,16 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpEeVOyn/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpCNG9XX/test-config.toml---success: trueexit_code: 0----- stdout -----[2mBranch[0m [2mPath [0m [2mAge [0m [2mCommit [0m [2mMessage [0m[1m[35mmain [0m [1m[35m./test-repo[0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m-a ./a [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m-bb ./bb [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m-ccc ./ccc [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m+[2ma [0m [2m./a [0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m+[2mbb [0m [2m./bb [0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m+[2mccc [0m [2m./ccc [0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m[2mShowing 4 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_120.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_120.snapindex 57013f751..3d20f1d88 100644--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_120.snap+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_120.snap@@ -15,15 +15,15 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp98HOEI/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpmhWNlP/test-config.toml---success: trueexit_code: 0----- stdout -----[2mBranch [0m [2mPath [0m [2mAge [0m [2mCommit [0m [2mMessage [0m[1m[35mmain [0m [1m[35m./test-repo[0m [2m10 months ago[0m [2ma7bc47ca[0m [2mInitial commit with a reasonably long message[0m-feature-a ./feature-a [2m10 months ago[0m [2ma7bc47ca[0m [2mInitial commit with a reasonably long message[0m-feature-b ./feature-b [2m10 months ago[0m [2ma7bc47ca[0m [2mInitial commit with a reasonably long message[0m+[2mfeature-a[0m [2m./feature-a[0m [2m10 months ago[0m [2ma7bc47ca[0m [2mInitial commit with a reasonably long message[0m+[2mfeature-b[0m [2m./feature-b[0m [2m10 months ago[0m [2ma7bc47ca[0m [2mInitial commit with a reasonably long message[0m[2mShowing 3 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_150.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_150.snapindex 9b052f6b4..34d8431d3 100644--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_150.snap+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_150.snap@@ -15,15 +15,15 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp5pVEDf/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpTk73R3/test-config.toml---success: trueexit_code: 0----- stdout -----[2mBranch [0m [2mPath [0m [2mAge [0m [2mCommit [0m [2mMessage [0m[1m[35mmain [0m [1m[35m./test-repo[0m [2m10 months ago[0m [2ma7bc47ca[0m [2mInitial commit with a reasonably long message[0m-feature-a ./feature-a [2m10 months ago[0m [2ma7bc47ca[0m [2mInitial commit with a reasonably long message[0m-feature-b ./feature-b [2m10 months ago[0m [2ma7bc47ca[0m [2mInitial commit with a reasonably long message[0m+[2mfeature-a[0m [2m./feature-a[0m [2m10 months ago[0m [2ma7bc47ca[0m [2mInitial commit with a reasonably long message[0m+[2mfeature-b[0m [2m./feature-b[0m [2m10 months ago[0m [2ma7bc47ca[0m [2mInitial commit with a reasonably long message[0m[2mShowing 3 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_80.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_80.snapindex 599d745ef..cee5b99ea 100644--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_80.snap+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_80.snap@@ -15,15 +15,15 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpvXdvGk/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmppd6OUk/test-config.toml---success: trueexit_code: 0----- stdout -----[2mBranch [0m [2mPath [0m [2mAge [0m [2mCommit [0m [2mMessage [0m[1m[35mmain [0m [1m[35m./test-repo[0m [2m10 months ago[0m [2ma7bc47ca[0m [2mInitial commit with a...[0m-feature-a ./feature-a [2m10 months ago[0m [2ma7bc47ca[0m [2mInitial commit with a...[0m-feature-b ./feature-b [2m10 months ago[0m [2ma7bc47ca[0m [2mInitial commit with a...[0m+[2mfeature-a[0m [2m./feature-a[0m [2m10 months ago[0m [2ma7bc47ca[0m [2mInitial commit with a...[0m+[2mfeature-b[0m [2m./feature-b[0m [2m10 months ago[0m [2ma7bc47ca[0m [2mInitial commit with a...[0m[2mShowing 3 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__unicode_branch_names.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__unicode_branch_names.snapindex 86a7694a4..f58810973 100644--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__unicode_branch_names.snap+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__unicode_branch_names.snap@@ -15,16 +15,16 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpdHGY68/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmprFvZRh/test-config.toml---success: trueexit_code: 0----- stdout -----[2mBranch[0m [2mPath [0m [2mAge [0m [2mCommit [0m [2mMessage [0m[1m[35mmain [0m [1m[35m./test-repo[0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m-cafe ./café [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m-naive ./naïve [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m-resume ./résumé [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m+[2mcafe [0m [2m./café [0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m+[2mnaive [0m [2m./naïve [0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m+[2mresume[0m [2m./résumé [0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m[2mShowing 4 worktrees[0m