Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
feat: Improve column padding for unicode characters
Maximilian Roosecdd3d6ddd2d
diff --git a/src/commands/list/render.rs b/src/commands/list/render.rsindex 0d9036785..02963e4f4 100644--- a/src/commands/list/render.rs+++ b/src/commands/list/render.rs@@ -207,12 +207,13 @@ pub fn format_header_line(layout: &LayoutConfig) {for (i, column) in layout.columns.iter().enumerate() {line.pad_to(column.start);let is_last = i == layout.columns.len() - 1;- let header = if is_last {- column.header.to_string()- } else {- format!("{:width$}", column.header, width = column.width)- };- line.push_styled(header, style);+ let header_start = line.width();++ line.push_styled(column.header.to_string(), style);++ if !is_last {+ line.pad_to(header_start + column.width);+ }}println!("{}", line.render());@@ -296,29 +297,30 @@ pub fn format_list_item_line(match (column.kind, column.format) {(ColumnKind::Branch, _) => {- let branch_text = if is_last {- item.branch_name().to_string()- } else {- format!("{:width$}", item.branch_name(), width = column.width)- };+ let branch_start = line.width();+ let branch_text = item.branch_name().to_string();+if let Some(style) = text_style {line.push_styled(branch_text, style);} else {line.push_raw(branch_text);}++ if !is_last {+ line.pad_to(branch_start + column.width);+ }}(ColumnKind::Status, _) => {// Combine git status symbols + user-defined status from worktrunk.statuslet status_content = item.combined_status();-- let status_text = if is_last {- status_content- } else {- format!("{:width$}", status_content, width = column.width)- };+ let status_start = line.width();// Status column never inherits row color- line.push_raw(status_text);+ line.push_raw(status_content);++ if !is_last {+ line.pad_to(status_start + column.width);+ }}(ColumnKind::WorkingDiff, ColumnFormat::Diff { digits, variant }) => {if let Some(info) = worktree_info {@@ -382,15 +384,16 @@ pub fn format_list_item_line((ColumnKind::Path, _) => {if let Some(info) = worktree_info {let path_str = shorten_path(&info.worktree.path, &layout.common_prefix);- let path_text = if is_last {- path_str- } else {- format!("{:width$}", path_str, width = column.width)- };+ let path_start = line.width();+if let Some(style) = text_style {- line.push_styled(path_text, style);+ line.push_styled(path_str, style);} else {- line.push_raw(path_text);+ line.push_raw(path_str);+ }++ if !is_last {+ line.pad_to(path_start + column.width);}} else if !is_last {push_blank(&mut line, column.width);@@ -417,16 +420,13 @@ pub fn format_list_item_line(}}(ColumnKind::Time, _) => {- let time_str = if is_last {- format_relative_time(commit.timestamp)- } else {- format!(- "{:width$}",- format_relative_time(commit.timestamp),- width = column.width- )- };+ let time_str = format_relative_time(commit.timestamp);+ let time_start = line.width();line.push_styled(time_str, Style::new().dimmed());++ if !is_last {+ line.pad_to(time_start + column.width);+ }}(ColumnKind::CiStatus, _) => {if let Some(pr_status) = item.pr_status() {@@ -440,12 +440,12 @@ pub fn format_list_item_line(}}(ColumnKind::Commit, _) => {- let commit_text = if is_last {- short_head.to_string()- } else {- format!("{:width$}", short_head, width = column.width)- };- line.push_styled(commit_text, Style::new().dimmed());+ let commit_start = line.width();+ line.push_styled(short_head.to_string(), Style::new().dimmed());++ if !is_last {+ line.pad_to(commit_start + column.width);+ }}(ColumnKind::Message, _) => {let msg = truncate_at_word_boundary(&commit.commit_message, layout.max_message_len);@@ -838,4 +838,65 @@ mod tests {"Should render ↑0 ↓0 with padding");}++ #[test]+ fn test_status_column_padding_with_emoji() {+ use unicode_width::UnicodeWidthStr;++ // Test that status column with emoji is padded correctly using visual width+ // This reproduces the issue where "↑🤖" was misaligned++ // Case 1: Status with emoji (↑ is 1 column, 🤖 is 2 columns = 3 total)+ let status_with_emoji = "↑🤖";+ assert_eq!(+ status_with_emoji.width(),+ 3,+ "Status '↑🤖' should have visual width 3"+ );++ let mut line1 = StyledLine::new();+ let status_start = line1.width(); // 0+ line1.push_raw(status_with_emoji.to_string());+ line1.pad_to(status_start + 6); // Pad to width 6 (typical Status column width)++ assert_eq!(line1.width(), 6, "Status column with emoji should pad to 6");++ // Case 2: Status with only ASCII symbols (↑ is 1 column = 1 total)+ let status_ascii = "↑";+ assert_eq!(+ status_ascii.width(),+ 1,+ "Status '↑' should have visual width 1"+ );++ let mut line2 = StyledLine::new();+ let status_start2 = line2.width();+ line2.push_raw(status_ascii.to_string());+ line2.pad_to(status_start2 + 6);++ assert_eq!(line2.width(), 6, "Status column with ASCII should pad to 6");++ // Both should have the same visual width after padding+ assert_eq!(+ line1.width(),+ line2.width(),+ "Unicode and ASCII status should pad to same visual width"+ );++ // Case 3: Complex status with multiple emoji (git symbols + user status)+ let complex_status = "↑⇡🤖📝";+ // ↑ (1) + ⇡ (1) + 🤖 (2) + 📝 (2) = 6 visual columns+ assert_eq!(+ complex_status.width(),+ 6,+ "Complex status should have visual width 6"+ );++ let mut line3 = StyledLine::new();+ let status_start3 = line3.width();+ line3.push_raw(complex_status.to_string());+ line3.pad_to(status_start3 + 10); // Pad to width 10++ assert_eq!(line3.width(), 10, "Complex status should pad to 10");+ }}diff --git a/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snap b/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snapindex e9180caa6..0e6b47f38 100644--- a/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snap+++ b/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snap@@ -16,13 +16,13 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpY0biwu/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpRXxM1r/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[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+[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[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__branch_only_ignores_main_worktree_status.snap b/tests/snapshots/integration__integration_tests__list__branch_only_ignores_main_worktree_status.snapindex 2488419c7..0fc731ae9 100644--- a/tests/snapshots/integration__integration_tests__list__branch_only_ignores_main_worktree_status.snap+++ b/tests/snapshots/integration__integration_tests__list__branch_only_ignores_main_worktree_status.snap@@ -16,13 +16,13 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpSZiNaw/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmplee5sV/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch [0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[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+[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[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-only[0m 🌿 [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 1 worktrees, 1 branches[0mdiff --git a/tests/snapshots/integration__integration_tests__list__detached_head.snap b/tests/snapshots/integration__integration_tests__list__detached_head.snapindex 2c36ce50e..8b813a220 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/.tmpqg3Uzx/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpWdVbzD/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch [0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[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+[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[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 45a38a7ef..0233c7e25 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/.tmpK96GlU/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpybO5k3/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch [0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[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+[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[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 2e5860dc7..08b3998c2 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,13 +15,13 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpIBidsY/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpSg5Jbh/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch [0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[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+[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[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./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m[2mfeature-b[0m ≡ [2m./feature-b[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0mdiff --git a/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap b/tests/snapshots/integration__integration_tests__list__locked_no_reason.snapindex 3e1c701c6..55cbb6cad 100644--- a/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap+++ b/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap@@ -15,13 +15,13 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpFppUjE/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpdSqKUl/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch [0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[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+[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[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./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 38cc20640..c8387af06 100644--- a/tests/snapshots/integration__integration_tests__list__locked_worktree.snap+++ b/tests/snapshots/integration__integration_tests__list__locked_worktree.snap@@ -15,13 +15,13 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpqclNf5/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpjlYXTK/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch [0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[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+[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[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-feature[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 3e1507552..91df95c2d 100644--- a/tests/snapshots/integration__integration_tests__list__long_commit_message.snap+++ b/tests/snapshots/integration__integration_tests__list__long_commit_message.snap@@ -15,13 +15,13 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpO5qeHk/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpfBW90h/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch [0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[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+[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[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./feature-a[0m [2mf078644e[0m [2m10 months ago[0m [2mThis is a very long commit message that should test how the...[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 3c30e11d6..0bd207ecf 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/.tmp79brGl/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpc1p6ui/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch [0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[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./medium-name [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mshort [0m ≡ [2m./short [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[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./medium-name[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mshort[0m ≡ [2m./short[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m[2mvery-long-branch-name-here[0m ≡ [2m./very-long-branch-name-here[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mwith-changes [0m ≡ [2m./with-changes [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mwith-changes[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 98f89aab2..221caec42 100644--- a/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap+++ b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap@@ -15,13 +15,13 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp5m0th3/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpZtdqHh/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch [0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[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+[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[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./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m[2mfeature-b[0m ≡ [2m./feature-b[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0mdiff --git a/tests/snapshots/integration__integration_tests__list__single_worktree.snap b/tests/snapshots/integration__integration_tests__list__single_worktree.snapindex 659693956..79fb846d6 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/.tmpMMeNkK/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpHJAtx9/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[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+[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[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 04b695a94..8e66550b8 100644--- a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap+++ b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap@@ -15,13 +15,13 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpMs0gUU/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpeBoewF/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch [0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[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+[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[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./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__user_status_special_chars.snap b/tests/snapshots/integration__integration_tests__list__user_status_special_chars.snapindex 48f557fac..d091a8723 100644--- a/tests/snapshots/integration__integration_tests__list__user_status_special_chars.snap+++ b/tests/snapshots/integration__integration_tests__list__user_status_special_chars.snap@@ -15,15 +15,15 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpqrRHQM/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp5uHWVQ/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[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-[2memoji [0m ≡🔄 [2m./emoji [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mmulti [0m ≡👨💻 [2m./multi [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[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+[2memoji[0m ≡🔄 [2m./emoji[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mmulti[0m ≡👨💻 [2m./multi[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.snap b/tests/snapshots/integration__integration_tests__list__with_branches_flag.snapindex 1771c09ee..1ebd553f4 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/.tmpOQ5Lff/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0q3R8F/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch [0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[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./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+[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[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./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+[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 76f6b6f40..ccd38ee89 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,13 +16,13 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpJ9aNQZ/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpAeVNH0/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch [0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[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+[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[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./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m[2mfeature-b[0m ≡ [2m./feature-b[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[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 18a8db090..98a918973 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,15 +16,15 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpzrqoYc/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpiGydZK/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch [0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[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+[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[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-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 53279781a..d749b6657 100644--- a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap+++ b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap@@ -17,17 +17,17 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpBMl2d2/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpYC2mEF/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch [0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mmain…±[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+[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mmain…±[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[0mahead ↑⇡ [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./behind [0m [32m↑0[0m [2m[31m↓1[0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0m+[2mbehind[0m ≡ ⇣ [2m./behind[0m [32m↑0[0m [2m[31m↓1[0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0mdiverged ↑⇅ [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./in-sync [0m [32m↑0[0m [2m[31m↓0[0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0m+[2min-sync[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./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__list__with_user_status.snap b/tests/snapshots/integration__integration_tests__list__with_user_status.snapindex a0c7ee7c7..3cba3d6e1 100644--- a/tests/snapshots/integration__integration_tests__list__with_user_status.snap+++ b/tests/snapshots/integration__integration_tests__list__with_user_status.snap@@ -15,14 +15,14 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpZ3h1R0/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpfK8fKr/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch [0m [1mStatus [0m [1mHEAD±[0m [1mmain↕[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-[2mclean-no-status [0m ≡ [2m./clean-no-status [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[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+[2mclean-no-status[0m ≡ [2m./clean-no-status[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m[2mclean-with-status[0m ≡⏸️ [2m./clean-with-status[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0mdirty-no-status ! [32m+1[0m [31m-1[0m ./dirty-no-status [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m[2mdirty-with-status[0m ≡ ?🤖 [2m./dirty-with-status[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[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 6e4e6eaed..0c74ee603 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/.tmp7xqeoB/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp8s96uL/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch [0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[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 > /tmp/hacked4[0m-[2mfeature[0m ≡ [2m./feature [0m [SHA] [2m10 months ago[0m [2mFix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4[0m+[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[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 > /tmp/hacked4[0m+[2mfeature[0m ≡ [2m./feature[0m [SHA] [2m10 months ago[0m [2mFix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4[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 4fb96393b..0f991358f 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/.tmp0QXl5t/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpMvLZSx/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[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+[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[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 3cb3948a8..85a520c59 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/.tmpd9se16/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpOWIvjQ/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch [0m [1mStatus [0m [1mHEAD±[0m [1mmain↕[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+[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[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./also-no-changes[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mno-changes [0m ≡ [2m./no-changes [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mno-changes[0m ≡ [2m./no-changes[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0mwith-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 9ceb2be10..bbc569f10 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/.tmpG0npLV/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpiKG71I/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch[0m [1mStatus [0m [1mHEAD±[0m [1mmain↕[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./huge [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[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./huge[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0mtiny ! [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 113002bb1..cb37d9f81 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/.tmprkX0w6/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpTtJ7zr/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch [0m [1mStatus [0m [1mHEAD±[0m [1mmain↕[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./feature-large [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[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./feature-large[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m[2mfeature-medium[0m ≡ ? [2m./feature-medium[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-small [0m ≡ ? [2m./feature-small [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature-small[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 74bd49801..6443739f7 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/.tmpVl4cGG/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpldRIzz/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch [0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[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+[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[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[2manother-extremely-long-name-here[0m ≡ [2m./another-extremely-long-name-here[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mshort [0m ≡ [2m./short [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mvery-long-feature-branch-name [0m ≡ [2m./very-long-feature-branch-name [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mshort[0m ≡ [2m./short[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mvery-long-feature-branch-name[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 f7e5023ec..abe6b75a2 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/.tmpk6uHYm/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpbX8BzY/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[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-[2mlong [0m ≡ [2m./extremely-long-branch-name-that-might-cause-layout-issues[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mmedium[0m ≡ [2m./medium-length-name [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mx [0m ≡ [2m./x [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[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+[2mlong[0m ≡ [2m./extremely-long-branch-name-that-might-cause-layout-issues[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mmedium[0m ≡ [2m./medium-length-name[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mx[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 4863e55ed..e2e4eeb49 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/.tmp38qlRl/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpP1gIXm/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[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./a [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mbb [0m ≡ [2m./bb [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mccc [0m ≡ [2m./ccc [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[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./a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mbb[0m ≡ [2m./bb[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mccc[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__unicode_branch_names.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__unicode_branch_names.snapindex 7266482fa..7aca87780 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/.tmpAI8U2z/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpQWWUFK/test-config.toml---success: trueexit_code: 0----- stdout ------[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[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./café [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mnaive [0m ≡ [2m./naïve [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mresume[0m ≡ [2m./résumé [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[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./café[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mnaive[0m ≡ [2m./naïve[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mresume[0m ≡ [2m./résumé[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 4 worktrees[0m