Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
feat: Support empty columns and updated snapshots
Maximilian Roosef8312bbec51
diff --git a/src/commands/list/layout.rs b/src/commands/list/layout.rsindex ae3e28368..04936b145 100644--- a/src/commands/list/layout.rs+++ b/src/commands/list/layout.rs@@ -145,34 +145,28 @@ pub const HEADER_MESSAGE: &str = "Message";/// This is the general solution for preventing header overflow: pass the header/// string and the calculated data width, and this returns the larger of the two.///-/// Ensures column width fits header text, unless data_width is 0 (empty column).-///-/// CRITICAL: Returns 0 when data_width is 0. This ensures empty columns don't-/// allocate space for headers, allowing ColumnIdeal to return None, which prevents-/// allocation even at low priority (12+) due to EMPTY_PENALTY.+/// For empty columns (data_width = 0), returns header width. This allows empty+/// columns to be allocated at low priority (base_priority + EMPTY_PENALTY) for+/// visual consistency on wide terminals.fn fit_header(header: &str, data_width: usize) -> usize {use unicode_width::UnicodeWidthStr;- if data_width == 0 {- // Empty column - don't allocate space for header- return 0;- }data_width.max(header.width())}/// Calculates width for a diff-style column (format: "+added -deleted" or "↑ahead ↓behind").////// Returns DiffWidths with:-/// - total: width including header minimum ("+{added} -{deleted}"), or 0 if no data+/// - total: width including header minimum ("+{added} -{deleted}"), or just header width if no data/// - added_digits/deleted_digits: number of digits for each part///-/// Empty columns (both digits = 0) have total = 0, which causes ColumnIdeal::diff()-/// to return None, preventing allocation even at low priority (12+).+/// Empty columns (both digits = 0) get header width and are allocated at low priority+/// (base_priority + EMPTY_PENALTY) for visual consistency on wide terminals.fn calculate_diff_width(header: &str, added_digits: usize, deleted_digits: usize) -> DiffWidths {let has_data = added_digits > 0 || deleted_digits > 0;let data_width = if has_data {1 + added_digits + 1 + 1 + deleted_digits // "+added -deleted"} else {- 0 // fit_header will return 0 for empty columns+ 0 // fit_header will use header width for empty columns};let total = fit_header(header, data_width);@@ -815,13 +809,13 @@ mod tests {}#[test]- fn test_column_positions_with_hidden_columns() {+ fn test_column_positions_with_empty_columns() {use crate::commands::list::model::{AheadBehind, BranchDiffTotals, CommitDetails, DisplayFields, UpstreamStatus,WorktreeInfo,};- // Create minimal data - most columns will be hidden+ // Create minimal data - most columns will be emptylet info = WorktreeInfo {worktree: worktrunk::git::Worktree {path: PathBuf::from("/test"),@@ -865,38 +859,28 @@ mod tests {"Branch column should start at position 0");- let empty_columns_visible = [- ColumnKind::WorkingDiff,- ColumnKind::AheadBehind,- ColumnKind::BranchDiff,- ColumnKind::States,- ColumnKind::Upstream,- ]- .iter()- .any(|kind| layout.columns.iter().any(|col| &col.kind == kind));-- assert!(- !empty_columns_visible,- "Empty columns should be hidden (not allocated) when they have no data"- );-+ // Columns with data should always be visible (Branch, Path, Time, Commit, Message)let path_visible = layout.columns.iter().any(|col| col.kind == ColumnKind::Path);- assert!(path_visible, "Path should always be visible");+ assert!(path_visible, "Path should always be visible (has data)");++ // Empty columns may or may not be visible depending on terminal width+ // They have low priority (base_priority + EMPTY_PENALTY) so they're allocated+ // only if space remains after higher-priority columns}#[test]- fn test_consecutive_hidden_columns_skip_correctly() {+ fn test_consecutive_empty_columns_have_low_priority() {use crate::commands::list::model::{AheadBehind, BranchDiffTotals, CommitDetails, DisplayFields, UpstreamStatus,WorktreeInfo,};- // Create data where multiple consecutive columns are hidden:- // visible(branch) → hidden(working_diff) → hidden(ahead_behind) → hidden(branch_diff)- // → hidden(states) → visible(path)+ // Create data where multiple consecutive columns are empty:+ // visible(branch) → empty(working_diff) → empty(ahead_behind) → empty(branch_diff)+ // → empty(states) → visible(path)let info = WorktreeInfo {worktree: worktrunk::git::Worktree {path: PathBuf::from("/test/worktree"),@@ -915,12 +899,12 @@ mod tests {ahead: 0,behind: 0,},- working_tree_diff: (0, 0), // Hidden: no dirty changes+ working_tree_diff: (0, 0), // Empty: no dirty changesworking_tree_diff_with_main: Some((0, 0)),- branch_diff: BranchDiffTotals { diff: (0, 0) }, // Hidden: no diff- is_primary: true, // Hidden: no ahead/behind for primary- upstream: UpstreamStatus::default(), // Hidden: no upstream- worktree_state: None, // Hidden: no state+ branch_diff: BranchDiffTotals { diff: (0, 0) }, // Empty: no diff+ is_primary: true, // Empty: no ahead/behind for primary+ upstream: UpstreamStatus::default(), // Empty: no upstream+ worktree_state: None, // Empty: no statepr_status: None,has_conflicts: false,status_symbols: String::new(),@@ -937,7 +921,7 @@ mod tests {.any(|col| col.kind == ColumnKind::Path);assert!(path_visible,- "Path should be visible (has data, priority 6)"+ "Path should be visible (has data, priority 7)");let message_visible = layout@@ -946,10 +930,10 @@ mod tests {.any(|col| col.kind == ColumnKind::Message);assert!(message_visible,- "Message should be allocated before empty columns"+ "Message should be allocated before empty columns (priority 12 < empty columns)");// Empty columns (priority 12+) may or may not be visible depending on terminal width.- // They rank lower than message (priority 11), so message allocates first.+ // They rank lower than message (priority 12), so message allocates first.}}diff --git a/tests/integration_tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snap b/tests/integration_tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snapindex d93ab6e6f..799a91b84 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snap@@ -12,14 +12,14 @@ info:LC_ALL: CNO_COLOR: ""SOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp058jKO/test-config.toml+ WORKTRUNK_CONFIG: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpV36gM5/test-config.toml---success: trueexit_code: 0----- stdout ------Branch Status Main ↕ State Path Commit-feature ./test-repo.feature 5c078f19-main ↓ ↓1 (no commits) ./test-repo.main 039e01d8+Branch Status Working ± Main ↕ State Path Commit+feature ./test-repo.feature 5c078f19+main ↓ ↓1 (no commits) ./test-repo.main 039e01d8Showing 2 worktrees, 1 behinddiff --git a/tests/snapshots/integration__integration_tests__list__detached_head.snap b/tests/snapshots/integration__integration_tests__list__detached_head.snapindex d063cd77b..fbf0423df 100644--- a/tests/snapshots/integration__integration_tests__list__detached_head.snap+++ b/tests/snapshots/integration__integration_tests__list__detached_head.snap@@ -15,13 +15,13 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpnwY2gK/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp380JDp/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch [0m [1mPath[0m [1mCommit [0m [1mAge [0m [1mMessage[0m-[1m[35m(detached)[0m [1m[35m. [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[1mBranch [0m [1mStatus[0m [1mWorking ±[0m [1mMain ↕[0m [1mState[0m [1mPath[0m [1mRemote ↕[0m [1mCommit [0m [1mAge [0m [1mMessage[0m+[1m[35m(detached)[0m [1m[35m. [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m[2mShowing 1 worktree[0mdiff --git a/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap b/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snapindex 0b5c45590..1aee5e10d 100644--- a/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap+++ b/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap@@ -15,17 +15,17 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0ctBJ2/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpue943Q/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch [0m [1mStatus[0m [1mMain ↕[0m [1mPath [0m [1mCommit [0m [1mAge [0m [1mMessage[0m-[36mmain [0m [36m./test-repo [0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0m-[1m[35mfeature-current[0m ↑ [32m↑1[0m [1m[35m./feature-current[0m [2mfc28a4d1[0m [2m9 months ago [0m [2mCommit at 01:00[0m-feature-newest ↑ [32m↑1[0m ./feature-newest [2m136358eb[0m [2m9 months ago [0m [2mCommit at 03:00[0m-feature-middle ↑ [32m↑1[0m ./feature-middle [2ma0a4851a[0m [2m9 months ago [0m [2mCommit at 02:00[0m-feature-oldest ↑ [32m↑1[0m ./feature-oldest [2m1b1a2d78[0m [2m9 months ago [0m [2mCommit at 00:30[0m+[1mBranch [0m [1mStatus[0m [1mWorking ±[0m [1mMain ↕[0m [1mState[0m [1mPath [0m [1mRemote ↕[0m [1mCommit [0m [1mAge [0m [1mMessage[0m+[36mmain [0m [36m./test-repo [0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0m+[1m[35mfeature-current[0m ↑ [32m↑1[0m [1m[35m./feature-current[0m [2mfc28a4d1[0m [2m9 months ago [0m [2mCommit at 01:00[0m+feature-newest ↑ [32m↑1[0m ./feature-newest [2m136358eb[0m [2m9 months ago [0m [2mCommit at 03:00[0m+feature-middle ↑ [32m↑1[0m ./feature-middle [2ma0a4851a[0m [2m9 months ago [0m [2mCommit at 02:00[0m+feature-oldest ↑ [32m↑1[0m ./feature-oldest [2m1b1a2d78[0m [2m9 months ago [0m [2mCommit at 00:30[0m[2mShowing 5 worktrees, 4 ahead[0mdiff --git a/tests/snapshots/integration__integration_tests__list__list_primary_on_different_branch.snap b/tests/snapshots/integration__integration_tests__list__list_primary_on_different_branch.snapindex 4a6757ab6..1a14a45c0 100644--- a/tests/snapshots/integration__integration_tests__list__list_primary_on_different_branch.snap+++ b/tests/snapshots/integration__integration_tests__list__list_primary_on_different_branch.snap@@ -15,15 +15,15 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpYTyVFj/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpJU1zHk/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch [0m [1mState [0m [1mPath [0m [1mCommit [0m [1mAge [0m [1mMessage[0m-[1m[35mdevelop [0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-a[0m [2m(matches main)[0m [2m./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-b[0m [2m(matches main)[0m [2m./feature-b[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[1mBranch [0m [1mStatus[0m [1mWorking ±[0m [1mMain ↕[0m [1mState [0m [1mPath [0m [1mRemote ↕[0m [1mCommit [0m [1mAge [0m [1mMessage[0m+[1m[35mdevelop [0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature-a[0m [2m(matches main)[0m [2m./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature-b[0m [2m(matches main)[0m [2m./feature-b[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m[2mShowing 3 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap b/tests/snapshots/integration__integration_tests__list__locked_no_reason.snapindex 01a54a3a6..80d52c8c0 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/.tmppkvTWc/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpAHGSC7/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch [0m [1mState [0m [1mPath [0m [1mCommit [0m [1mAge [0m [1mMessage[0m-[1m[35mmain [0m [1m[35m./test-repo [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mlocked-no-reason[0m [2m(matches main) (locked)[0m [2m./locked-no-reason[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[1mBranch [0m [1mStatus[0m [1mWorking ±[0m [1mMain ↕[0m [1mState [0m [1mPath [0m [1mRemote ↕[0m [1mCommit [0m [1mAge [0m [1mMessage[0m+[1m[35mmain [0m [1m[35m./test-repo [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mlocked-no-reason[0m [2m(matches main) (locked)[0m [2m./locked-no-reason[0m [2mb834638e[0m [2m10 months ago[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 9a33d4936..1c5d61dbc 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/.tmpURntiJ/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpIL6ViK/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch [0m [1mState [0m [1mPath [0m [1mCommit [0m [1mAge [0m [1mMessage[0m-[1m[35mmain [0m [1m[35m./test-repo [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mlocked-feature[0m [2m(matches main) (locked: Testing lock functionality)[0m [2m./locked-feature[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[1mBranch [0m [1mStatus[0m [1mWorking ±[0m [1mState [0m [1mPath [0m [1mCommit [0m [1mAge [0m [1mMessage[0m+[1m[35mmain [0m [1m[35m./test-repo [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mlocked-feature[0m [2m(matches main) (locked: Testing lock functionality)[0m [2m./locked-feature[0m [2mb834638e[0m [2m10 months ago[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 c887fdf6b..7a3267174 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/.tmpkokc9o/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpBFgMz4/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch [0m [1mStatus[0m [1mMain ↕[0m [1mState [0m [1mPath [0m [1mCommit [0m [1mAge [0m [1mMessage[0m-[1m[35mmain [0m [1m[35m./test-repo[0m [2m1310bfb9[0m [2m10 months ago[0m [2mShort message[0m-[2mfeature-a[0m ↓ [2m[31m↓1[0m [2m(no commits)[0m [2m./feature-a[0m [2mf078644e[0m [2m10 months ago[0m [2mThis is a very long commit message that should test how the message...[0m+[1mBranch [0m [1mStatus[0m [1mWorking ±[0m [1mMain ↕[0m [1mState [0m [1mPath [0m [1mRemote ↕[0m [1mCommit [0m [1mAge [0m [1mMessage[0m+[1m[35mmain [0m [1m[35m./test-repo[0m [2m1310bfb9[0m [2m10 months ago[0m [2mShort message[0m+[2mfeature-a[0m ↓ [2m[31m↓1[0m [2m(no commits)[0m [2m./feature-a[0m [2mf078644e[0m [2m10 months ago[0m [2mThis is a very long commit message that should...[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 55d597335..bf8e602b1 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/.tmpGcclbO/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpDWuoI9/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch [0m [1mState [0m [1mPath [0m [1mCommit [0m [1mAge [0m [1mMessage[0m-[1m[35mmain [0m [1m[35m./test-repo [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mmedium-name [0m [2m(matches main)[0m [2m./medium-name [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mshort [0m [2m(matches main)[0m [2m./short [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mvery-long-branch-name-here[0m [2m(matches main)[0m [2m./very-long-branch-name-here[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mwith-changes [0m [2m(matches main)[0m [2m./with-changes [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[1mBranch [0m [1mStatus[0m [1mWorking ±[0m [1mMain ↕[0m [1mState [0m [1mPath [0m [1mRemote ↕[0m [1mCommit [0m [1mAge [0m [1mMessage[0m+[1m[35mmain [0m [1m[35m./test-repo [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mmedium-name [0m [2m(matches main)[0m [2m./medium-name [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mshort [0m [2m(matches main)[0m [2m./short [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mvery-long-branch-name-here[0m [2m(matches main)[0m [2m./very-long-branch-name-here[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mwith-changes [0m [2m(matches main)[0m [2m./with-changes [0m [2mb834638e[0m [2m10 months ago[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 3a6b6dec3..f94bc49ec 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/.tmps9va1X/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpO22See/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch [0m [1mState [0m [1mPath [0m [1mCommit [0m [1mAge [0m [1mMessage[0m-[1m[35mmain [0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-a[0m [2m(matches main)[0m [2m./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-b[0m [2m(matches main)[0m [2m./feature-b[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[1mBranch [0m [1mStatus[0m [1mWorking ±[0m [1mMain ↕[0m [1mState [0m [1mPath [0m [1mRemote ↕[0m [1mCommit [0m [1mAge [0m [1mMessage[0m+[1m[35mmain [0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature-a[0m [2m(matches main)[0m [2m./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature-b[0m [2m(matches main)[0m [2m./feature-b[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m[2mShowing 3 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__single_worktree.snap b/tests/snapshots/integration__integration_tests__list__single_worktree.snapindex 632b404f4..25bb19492 100644--- a/tests/snapshots/integration__integration_tests__list__single_worktree.snap+++ b/tests/snapshots/integration__integration_tests__list__single_worktree.snap@@ -15,13 +15,13 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0Ag2cE/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0xhuUS/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch[0m [1mPath[0m [1mCommit [0m [1mAge [0m [1mMessage[0m-[1m[35mmain [0m [1m[35m. [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[1mBranch[0m [1mStatus[0m [1mWorking ±[0m [1mMain ↕[0m [1mState[0m [1mPath[0m [1mRemote ↕[0m [1mCommit [0m [1mAge [0m [1mMessage[0m+[1m[35mmain [0m [1m[35m. [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m[2mShowing 1 worktree[0mdiff --git a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snapindex 54358e9eb..979332c4a 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/.tmpmr0coS/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpitGQoB/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch [0m [1mStatus[0m [1mMain ↕[0m [1mState [0m [1mPath [0m [1mCommit [0m [1mAge [0m [1mMessage[0m-[1m[35mmain [0m [1m[35m./test-repo [0m [2me4614cb7[0m [2m10 months ago[0m [2mFix bug with café ☕ handling[0m-[2mfeature-test[0m ↓ [2m[31m↓1[0m [2m(no commits)[0m [2m./feature-test[0m [2m0c53695b[0m [2m10 months ago[0m [2mAdd support for 日本語 and émoji 🎉[0m+[1mBranch [0m [1mStatus[0m [1mWorking ±[0m [1mMain ↕[0m [1mState [0m [1mPath [0m [1mRemote ↕[0m [1mCommit [0m [1mAge [0m [1mMessage[0m+[1m[35mmain [0m [1m[35m./test-repo [0m [2me4614cb7[0m [2m10 months ago[0m [2mFix bug with café ☕ handling[0m+[2mfeature-test[0m ↓ [2m[31m↓1[0m [2m(no commits)[0m [2m./feature-test[0m [2m0c53695b[0m [2m10 months ago[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 ac8ff94d1..4d2c17801 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/.tmpaXFlnD/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpNJpWee/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch [0m [1mState [0m [1mPath [0m [1mCommit [0m [1mAge [0m [1mMessage[0m-[1m[35mmain [0m [1m[35m./test-repo [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-with-worktree [0m [2m(matches main)[0m [2m./feature-with-worktree[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2manother-branch [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-without-worktree[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfix-bug [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[1mBranch [0m [1mStatus[0m [1mWorking ±[0m [1mMain ↕[0m [1mState [0m [1mPath [0m [1mRemote ↕[0m [1mCommit [0m [1mAge [0m [1mMessage[0m+[1m[35mmain [0m [1m[35m./test-repo [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature-with-worktree [0m [2m(matches main)[0m [2m./feature-with-worktree[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2manother-branch [0m · [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature-without-worktree[0m · [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfix-bug [0m · [2mb834638e[0m [2m10 months ago[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 85a8e6874..b1bc91e10 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/.tmpEWmoPb/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpxteLBR/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch [0m [1mState [0m [1mPath [0m [1mCommit [0m [1mAge [0m [1mMessage[0m-[1m[35mmain [0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-a[0m [2m(matches main)[0m [2m./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-b[0m [2m(matches main)[0m [2m./feature-b[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[1mBranch [0m [1mStatus[0m [1mWorking ±[0m [1mMain ↕[0m [1mState [0m [1mPath [0m [1mRemote ↕[0m [1mCommit [0m [1mAge [0m [1mMessage[0m+[1m[35mmain [0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature-a[0m [2m(matches main)[0m [2m./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature-b[0m [2m(matches main)[0m [2m./feature-b[0m [2mb834638e[0m [2m10 months ago[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 dc2442756..b6c29c338 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/.tmpFLN6zt/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpgfQ7GH/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch [0m [1mPath[0m [1mCommit [0m [1mAge [0m [1mMessage[0m-[1m[35mmain [0m [1m[35m. [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mbranch-alpha[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mbranch-beta [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mbranch-gamma[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[1mBranch [0m [1mStatus[0m [1mWorking ±[0m [1mMain ↕[0m [1mState[0m [1mPath[0m [1mRemote ↕[0m [1mCommit [0m [1mAge [0m [1mMessage[0m+[1m[35mmain [0m [1m[35m. [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mbranch-alpha[0m · [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mbranch-beta [0m · [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mbranch-gamma[0m · [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m[2mShowing 1 worktrees, 3 branches[0mdiff --git a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snapindex 805811996..690b886db 100644--- a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap+++ b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap@@ -17,18 +17,18 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpuWw6nv/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpPt1GBn/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch [0m [1mStatus[0m [1mMain ↕[0m [1mMain ±[0m [1mState [0m [1mPath [0m [1mRemote ↕[0m [1mCI[0m [1mCommit [0m [1mAge [0m [1mMessage[0m-[1m[35mmain [0m [1m[35m./test-repo [0m [32m↑0[0m [2m[31m↓0[0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0m-ahead ↑⇡ [32m↑2[0m [32m+2[0m ./ahead [32m↑2[0m [2m[31m↓0[0m [2m8d8f4673[0m [2m10 months ago[0m [2mAhead commit 2[0m-[2mbehind [0m ⇣ [2m(matches main)[0m [2m./behind [0m [32m↑0[0m [2m[31m↓1[0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0m-diverged ↑⇡⇣ [32m↑1[0m [32m+1[0m ./diverged [32m↑1[0m [2m[31m↓1[0m [2mca7cb696[0m [2m10 months ago[0m [2mDiverged local commit[0m-[2min-sync [0m [2m(matches main)[0m [2m./in-sync [0m [32m↑0[0m [2m[31m↓0[0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0m-[2mno-upstream[0m [2m(matches main)[0m [2m./no-upstream[0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0m+[1mBranch [0m [1mStatus[0m [1mWorking ±[0m [1mMain ↕[0m [1mMain ±[0m [1mState [0m [1mPath [0m [1mRemote ↕[0m [1mCI[0m [1mCommit [0m [1mAge [0m [1mMessage[0m+[1m[35mmain [0m [1m[35m./test-repo [0m [32m↑0[0m [2m[31m↓0[0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0m+ahead ↑⇡ [32m↑2[0m [32m+2[0m ./ahead [32m↑2[0m [2m[31m↓0[0m [2m8d8f4673[0m [2m10 months ago[0m [2mAhead commit 2[0m+[2mbehind [0m ⇣ [2m(matches main)[0m [2m./behind [0m [32m↑0[0m [2m[31m↓1[0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0m+diverged ↑⇡⇣ [32m↑1[0m [32m+1[0m ./diverged [32m↑1[0m [2m[31m↓1[0m [2mca7cb696[0m [2m10 months ago[0m [2mDiverged local commit[0m+[2min-sync [0m [2m(matches main)[0m [2m./in-sync [0m [32m↑0[0m [2m[31m↓0[0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0m+[2mno-upstream[0m [2m(matches main)[0m [2m./no-upstream[0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0m[2mShowing 6 worktrees, 2 ahead[0mdiff --git a/tests/snapshots/integration__integration_tests__security__commit_message_with_directive_not_executed.snap b/tests/snapshots/integration__integration_tests__security__commit_message_with_directive_not_executed.snapindex c07c763cc..b51a2c5cf 100644--- a/tests/snapshots/integration__integration_tests__security__commit_message_with_directive_not_executed.snap+++ b/tests/snapshots/integration__integration_tests__security__commit_message_with_directive_not_executed.snap@@ -15,14 +15,14 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpxPTYUt/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpCwPjPZ/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch [0m [1mState [0m [1mPath [0m [1mCommit [0m [1mAge [0m [1mMessage[0m-[1m[35mmain [0m [1m[35m./test-repo[0m [SHA] [2m10 months ago[0m [2mFix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4[0m-[2mfeature[0m [2m(matches main)[0m [2m./feature [0m [SHA] [2m10 months ago[0m [2mFix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4[0m+[1mBranch [0m [1mStatus[0m [1mWorking ±[0m [1mMain ↕[0m [1mState [0m [1mPath [0m [1mRemote ↕[0m [1mCommit [0m [1mAge [0m [1mMessage[0m+[1m[35mmain [0m [1m[35m./test-repo[0m [SHA] [2m10 months ago[0m [2mFix bug __WORKTRUNK_EXEC__echo PWNED >...[0m+[2mfeature[0m [2m(matches main)[0m [2m./feature [0m [SHA] [2m10 months ago[0m [2mFix bug __WORKTRUNK_EXEC__echo PWNED >...[0m[2mShowing 2 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__security__path_with_directive_not_executed.snap b/tests/snapshots/integration__integration_tests__security__path_with_directive_not_executed.snapindex 4af3e9215..480e0f0be 100644--- a/tests/snapshots/integration__integration_tests__security__path_with_directive_not_executed.snap+++ b/tests/snapshots/integration__integration_tests__security__path_with_directive_not_executed.snap@@ -15,13 +15,13 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpkv4qkH/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmppXVT8Z/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch[0m [1mPath[0m [1mCommit [0m [1mAge [0m [1mMessage[0m-[1m[35mmain [0m [1m[35m. [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[1mBranch[0m [1mStatus[0m [1mWorking ±[0m [1mMain ↕[0m [1mState[0m [1mPath[0m [1mRemote ↕[0m [1mCommit [0m [1mAge [0m [1mMessage[0m+[1m[35mmain [0m [1m[35m. [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m[2mShowing 1 worktree[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 1ac9e3a7d..aece973b8 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,16 +15,16 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp19VPVw/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpqAdHeK/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch [0m [1mStatus[0m [1mWorking ±[0m [1mState [0m [1mPath [0m [1mCommit [0m [1mAge [0m [1mMessage[0m-[1m[35mmain [0m [1m[35m./test-repo [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2malso-no-changes[0m [2m(matches main)[0m [2m./also-no-changes[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mno-changes [0m [2m(matches main)[0m [2m./no-changes [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-with-changes ! [32m+1[0m [31m-1[0m ./with-changes [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[1mBranch [0m [1mStatus[0m [1mWorking ±[0m [1mMain ↕[0m [1mState [0m [1mPath [0m [1mRemote ↕[0m [1mCommit [0m [1mAge [0m [1mMessage[0m+[1m[35mmain [0m [1m[35m./test-repo [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2malso-no-changes[0m [2m(matches main)[0m [2m./also-no-changes[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mno-changes [0m [2m(matches main)[0m [2m./no-changes [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+with-changes ! [32m+1[0m [31m-1[0m ./with-changes [2mb834638e[0m [2m10 months ago[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 6d6d9fc6b..e93960399 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,15 +15,15 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpPvsf6Y/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpV1rC2l/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch[0m [1mStatus[0m [1mWorking ±[0m [1mState [0m [1mPath [0m [1mCommit [0m [1mAge [0m [1mMessage[0m-[1m[35mmain [0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mhuge [0m ? [2m(matches main)[0m [2m./huge [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-tiny ! [32m+1[0m [31m-1[0m ./tiny [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[1mBranch[0m [1mStatus[0m [1mWorking ±[0m [1mMain ↕[0m [1mState [0m [1mPath [0m [1mRemote ↕[0m [1mCommit [0m [1mAge [0m [1mMessage[0m+[1m[35mmain [0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mhuge [0m ? [2m(matches main)[0m [2m./huge [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+tiny ! [32m+1[0m [31m-1[0m ./tiny [2mb834638e[0m [2m10 months ago[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 19e8c2bdb..16083f0e6 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/.tmpsfUzeC/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpekPSvx/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch [0m [1mStatus[0m [1mState [0m [1mPath [0m [1mCommit [0m [1mAge [0m [1mMessage[0m-[1m[35mmain [0m [1m[35m./test-repo [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-large [0m ? [2m(matches main)[0m [2m./feature-large [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-medium[0m ? [2m(matches main)[0m [2m./feature-medium[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-small [0m ? [2m(matches main)[0m [2m./feature-small [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[1mBranch [0m [1mStatus[0m [1mWorking ±[0m [1mMain ↕[0m [1mState [0m [1mPath [0m [1mRemote ↕[0m [1mCommit [0m [1mAge [0m [1mMessage[0m+[1m[35mmain [0m [1m[35m./test-repo [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature-large [0m ? [2m(matches main)[0m [2m./feature-large [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature-medium[0m ? [2m(matches main)[0m [2m./feature-medium[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature-small [0m ? [2m(matches main)[0m [2m./feature-small [0m [2mb834638e[0m [2m10 months ago[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 aa7816fa4..931a218af 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/.tmpo99RD4/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpBGZEIR/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch [0m [1mState [0m [1mPath [0m [1mCommit [0m [1mAge [0m [1mMessage[0m-[1m[35mmain [0m [1m[35m./test-repo [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2manother-extremely-long-name-here[0m [2m(matches main)[0m [2m./another-extremely-long-name-here[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mshort [0m [2m(matches main)[0m [2m./short [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mvery-long-feature-branch-name [0m [2m(matches main)[0m [2m./very-long-feature-branch-name [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[1mBranch [0m [1mStatus[0m [1mWorking ±[0m [1mState [0m [1mPath [0m [1mCommit [0m [1mAge [0m [1mMessage[0m+[1m[35mmain [0m [1m[35m./test-repo [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2manother-extremely-long-name-here[0m [2m(matches main)[0m [2m./another-extremely-long-name-here[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mshort [0m [2m(matches main)[0m [2m./short [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mvery-long-feature-branch-name [0m [2m(matches main)[0m [2m./very-long-feature-branch-name [0m [2mb834638e[0m [2m10 months ago[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 3455b6cc5..07c9943a6 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/.tmpmN1uQ1/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpkIA2B1/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch[0m [1mState [0m [1mPath [0m [1mCommit [0m [1mAge [0m [1mMessage[0m-[1m[35mmain [0m [1m[35m./test-repo [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mlong [0m [2m(matches main)[0m [2m./extremely-long-branch-name-that-might-cause-layout-issues[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mmedium[0m [2m(matches main)[0m [2m./medium-length-name [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mx [0m [2m(matches main)[0m [2m./x [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[1mBranch[0m [1mStatus[0m [1mWorking ±[0m [1mState [0m [1mPath [0m [1mCommit [0m [1mAge [0m [1mMessage[0m+[1m[35mmain [0m [1m[35m./test-repo [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mlong [0m [2m(matches main)[0m [2m./extremely-long-branch-name-that-might-cause-layout-issues[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mmedium[0m [2m(matches main)[0m [2m./medium-length-name [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mx [0m [2m(matches main)[0m [2m./x [0m [2mb834638e[0m [2m10 months ago[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 30b8bc99a..3ed0d33bb 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/.tmptCtAnP/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpiHj6xt/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch[0m [1mState [0m [1mPath [0m [1mCommit [0m [1mAge [0m [1mMessage[0m-[1m[35mmain [0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2ma [0m [2m(matches main)[0m [2m./a [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mbb [0m [2m(matches main)[0m [2m./bb [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mccc [0m [2m(matches main)[0m [2m./ccc [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[1mBranch[0m [1mStatus[0m [1mWorking ±[0m [1mMain ↕[0m [1mState [0m [1mPath [0m [1mRemote ↕[0m [1mCommit [0m [1mAge [0m [1mMessage[0m+[1m[35mmain [0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2ma [0m [2m(matches main)[0m [2m./a [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mbb [0m [2m(matches main)[0m [2m./bb [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mccc [0m [2m(matches main)[0m [2m./ccc [0m [2mb834638e[0m [2m10 months ago[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 69a2403aa..b3c3cefde 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/.tmpqBzHEQ/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmptyQc9m/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch [0m [1mState [0m [1mPath [0m [1mCommit [0m [1mAge [0m [1mMessage[0m-[1m[35mmain [0m [1m[35m./test-repo[0m [2ma7bc47ca[0m [2m10 months ago[0m [2mInitial commit with a reasonably long message[0m-[2mfeature-a[0m [2m(matches main)[0m [2m./feature-a[0m [2ma7bc47ca[0m [2m10 months ago[0m [2mInitial commit with a reasonably long message[0m-[2mfeature-b[0m [2m(matches main)[0m [2m./feature-b[0m [2ma7bc47ca[0m [2m10 months ago[0m [2mInitial commit with a reasonably long message[0m+[1mBranch [0m [1mStatus[0m [1mState [0m [1mPath [0m [1mCommit [0m [1mAge [0m [1mMessage[0m+[1m[35mmain [0m [1m[35m./test-repo[0m [2ma7bc47ca[0m [2m10 months ago[0m [2mInitial commit with a reasonably long message[0m+[2mfeature-a[0m [2m(matches main)[0m [2m./feature-a[0m [2ma7bc47ca[0m [2m10 months ago[0m [2mInitial commit with a reasonably long message[0m+[2mfeature-b[0m [2m(matches main)[0m [2m./feature-b[0m [2ma7bc47ca[0m [2m10 months ago[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 84e2e7508..02467ba90 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/.tmpzos1Ut/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpehDlRY/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch [0m [1mState [0m [1mPath [0m [1mCommit [0m [1mAge [0m [1mMessage[0m-[1m[35mmain [0m [1m[35m./test-repo[0m [2ma7bc47ca[0m [2m10 months ago[0m [2mInitial commit with a reasonably long message[0m-[2mfeature-a[0m [2m(matches main)[0m [2m./feature-a[0m [2ma7bc47ca[0m [2m10 months ago[0m [2mInitial commit with a reasonably long message[0m-[2mfeature-b[0m [2m(matches main)[0m [2m./feature-b[0m [2ma7bc47ca[0m [2m10 months ago[0m [2mInitial commit with a reasonably long message[0m+[1mBranch [0m [1mStatus[0m [1mWorking ±[0m [1mMain ↕[0m [1mState [0m [1mPath [0m [1mRemote ↕[0m [1mCommit [0m [1mAge [0m [1mMessage[0m+[1m[35mmain [0m [1m[35m./test-repo[0m [2ma7bc47ca[0m [2m10 months ago[0m [2mInitial commit with a reasonably long message[0m+[2mfeature-a[0m [2m(matches main)[0m [2m./feature-a[0m [2ma7bc47ca[0m [2m10 months ago[0m [2mInitial commit with a reasonably long message[0m+[2mfeature-b[0m [2m(matches main)[0m [2m./feature-b[0m [2ma7bc47ca[0m [2m10 months ago[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 736b0a7dc..ca4323518 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/.tmpRjlLHv/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpdrgrEo/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch [0m [1mState [0m [1mPath [0m [1mCommit [0m [1mAge[0m-[1m[35mmain [0m [1m[35m./test-repo[0m [2ma7bc47ca[0m [2m10 months ago[0m-[2mfeature-a[0m [2m(matches main)[0m [2m./feature-a[0m [2ma7bc47ca[0m [2m10 months ago[0m-[2mfeature-b[0m [2m(matches main)[0m [2m./feature-b[0m [2ma7bc47ca[0m [2m10 months ago[0m+[1mBranch [0m [1mStatus[0m [1mMain ↕[0m [1mState [0m [1mPath [0m [1mCommit [0m [1mAge[0m+[1m[35mmain [0m [1m[35m./test-repo[0m [2ma7bc47ca[0m [2m10 months ago[0m+[2mfeature-a[0m [2m(matches main)[0m [2m./feature-a[0m [2ma7bc47ca[0m [2m10 months ago[0m+[2mfeature-b[0m [2m(matches main)[0m [2m./feature-b[0m [2ma7bc47ca[0m [2m10 months ago[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 b05ac3f49..1745c9eb1 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/.tmpFmn47D/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpmzQlAA/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch[0m [1mState [0m [1mPath [0m [1mCommit [0m [1mAge [0m [1mMessage[0m-[1m[35mmain [0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mcafe [0m [2m(matches main)[0m [2m./café [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mnaive [0m [2m(matches main)[0m [2m./naïve [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mresume[0m [2m(matches main)[0m [2m./résumé [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[1mBranch[0m [1mStatus[0m [1mWorking ±[0m [1mMain ↕[0m [1mState [0m [1mPath [0m [1mRemote ↕[0m [1mCommit [0m [1mAge [0m [1mMessage[0m+[1m[35mmain [0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mcafe [0m [2m(matches main)[0m [2m./café [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mnaive [0m [2m(matches main)[0m [2m./naïve [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mresume[0m [2m(matches main)[0m [2m./résumé [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m[2mShowing 4 worktrees[0m