Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Feat: Add summary and styling to `merge` and `push` commands
Maximilian Roos6bc3c86aaeea
diff --git a/src/commands/list/mod.rs b/src/commands/list/mod.rsindex 806490cd1..5c465d22e 100644--- a/src/commands/list/mod.rs+++ b/src/commands/list/mod.rs@@ -331,13 +331,19 @@ fn display_summary(items: &[ListItem], include_branches: bool) {return;}- let worktree_count = items.iter().filter(|i| i.worktree_info().is_some()).count();+ let worktree_count = items+ .iter()+ .filter(|i| matches!(i, ListItem::Worktree(_)))+ .count();let branch_count = items.len() - worktree_count;// Count worktrees with changeslet dirty_count = items.iter()- .filter_map(|i| i.worktree_info())+ .filter_map(|i| match i {+ ListItem::Worktree(wt) => Some(wt),+ _ => None,+ }).filter(|wt| {let (added, deleted) = wt.working_tree_diff;added > 0 || deleted > 0@@ -345,8 +351,21 @@ fn display_summary(items: &[ListItem], include_branches: bool) {.count();// Count items ahead/behind- let ahead_count = items.iter().filter(|i| i.ahead() > 0).count();- let behind_count = items.iter().filter(|i| i.behind() > 0).count();+ let ahead_count = items+ .iter()+ .filter(|i| match i {+ ListItem::Worktree(wt) => wt.counts.ahead > 0,+ ListItem::Branch(br) => br.counts.ahead > 0,+ })+ .count();++ let behind_count = items+ .iter()+ .filter(|i| match i {+ ListItem::Worktree(wt) => wt.counts.behind > 0,+ ListItem::Branch(br) => br.counts.behind > 0,+ })+ .count();println!();let dim = Style::new().dimmed();diff --git a/src/commands/merge.rs b/src/commands/merge.rsindex f134b580f..c6bb6e000 100644--- a/src/commands/merge.rs+++ b/src/commands/merge.rs@@ -38,9 +38,12 @@ pub fn handle_merge(// Check for uncommitted changesrepo.ensure_clean_working_tree()?;+ // Track operations for summary+ let mut squashed_count: Option<usize> = None;+// Squash commits if requestedif squash {- handle_squash(&target_branch)?;+ squashed_count = handle_squash(&target_branch)?;}// Rebase onto target@@ -90,18 +93,58 @@ pub fn handle_merge())})?;}++ // Print comprehensive summary+ println!();+ print_merge_summary(¤t_branch, &target_branch, squashed_count, true);} else {- let green = AnstyleStyle::new().fg_color(Some(Color::Ansi(AnsiColor::Green)));- let green_bold = green.bold();- println!(- "✅ {green}Successfully merged to {green_bold}{target_branch}{green_bold:#} (worktree preserved){green:#}"- );+ // Print comprehensive summary (worktree preserved)+ println!();+ print_merge_summary(¤t_branch, &target_branch, squashed_count, false);}Ok(())}-fn handle_squash(target_branch: &str) -> Result<(), GitError> {+/// Print a comprehensive summary of the merge operation+fn print_merge_summary(+ from_branch: &str,+ to_branch: &str,+ squashed_count: Option<usize>,+ cleaned_up: bool,+) {+ let green = AnstyleStyle::new().fg_color(Some(Color::Ansi(AnsiColor::Green)));+ let green_bold = green.bold();+ let dim = AnstyleStyle::new().dimmed();++ println!("✅ {green}Merge complete{green:#}");+ println!();++ // Summary of operations+ let mut operations = Vec::new();++ if let Some(count) = squashed_count {+ operations.push(format!("Squashed {count} commits into 1"));+ }++ operations.push(format!(+ "Rebased {green_bold}{from_branch}{green_bold:#} onto {green_bold}{to_branch}{green_bold:#}"+ ));++ operations.push(format!("Pushed to {green_bold}{to_branch}{green_bold:#}"));++ if cleaned_up {+ operations.push("Cleaned up worktree".to_string());+ } else {+ operations.push("Preserved worktree".to_string());+ }++ for (i, op) in operations.iter().enumerate() {+ println!(" {dim}{}. {}{dim:#}", i + 1, op);+ }+}++fn handle_squash(target_branch: &str) -> Result<Option<usize>, GitError> {let repo = Repository::current();// Get merge base with target branch@@ -118,7 +161,7 @@ fn handle_squash(target_branch: &str) -> Result<(), GitError> {// No commits and no staged changes - nothing to squashlet dim = AnstyleStyle::new().dimmed();println!("{dim}No commits to squash - already at merge base{dim:#}");- return Ok(());+ return Ok(None);}if commit_count == 0 && has_staged {@@ -138,7 +181,7 @@ fn handle_squash(target_branch: &str) -> Result<(), GitError> {println!("{dim}Only 1 commit since {cyan_bold}{target_branch}{cyan_bold:#} - no squashing needed{dim:#}");- return Ok(());+ return Ok(None);}// One or more commits (possibly with staged changes) - squash them@@ -164,5 +207,5 @@ fn handle_squash(target_branch: &str) -> Result<(), GitError> {let green = AnstyleStyle::new().fg_color(Some(Color::Ansi(AnsiColor::Green)));println!("✅ {green}Squashed {commit_count} commits into one{green:#}");- Ok(())+ Ok(Some(commit_count))}diff --git a/src/commands/worktree.rs b/src/commands/worktree.rsindex 118f854b6..8d4375fdf 100644--- a/src/commands/worktree.rs+++ b/src/commands/worktree.rs@@ -648,6 +648,14 @@ pub fn handle_push(target: Option<&str>, allow_merge_commits: bool) -> Result<()// Count commits and show what will be pushedlet commit_count = repo.count_commits(&target_branch, "HEAD")?;++ // Get diff statistics early so we can use them in the summary+ let diff_shortstat = if commit_count > 0 {+ repo.run_command(&["diff", "--shortstat", &format!("{}..HEAD", target_branch)])?+ } else {+ String::new()+ };+if commit_count > 0 {let commit_text = if commit_count == 1 {"commit"@@ -675,6 +683,16 @@ pub fn handle_push(target: Option<&str>, allow_merge_commits: bool) -> Result<()])?;println!("{}", log_output.trim());println!();++ // Show diff statistics+ let diff_stat =+ repo.run_command(&["diff", "--stat", &format!("{}..HEAD", target_branch)])?;++ if !diff_stat.trim().is_empty() {+ let dim = AnstyleStyle::new().dimmed();+ println!("{dim}{}{dim:#}", diff_stat.trim());+ println!();+ }}// Get git common dir for the push@@ -687,8 +705,82 @@ pub fn handle_push(target: Option<&str>, allow_merge_commits: bool) -> Result<()GitError::CommandFailed(format!("{ERROR_EMOJI} {ERROR}Push failed: {e}{ERROR:#}"))})?;+ // Build success message with statisticslet green = AnstyleStyle::new().fg_color(Some(Color::Ansi(AnsiColor::Green)));let green_bold = green.bold();- println!("✅ {green}Pushed to {green_bold}{target_branch}{green_bold:#}{green:#}");++ if commit_count > 0 {+ // Parse shortstat to extract files/insertions/deletions+ // Example: " 3 files changed, 45 insertions(+), 12 deletions(-)"+ let stats = parse_diff_shortstat(&diff_shortstat);++ let mut summary_parts = vec![format!(+ "{} commit{}",+ commit_count,+ if commit_count == 1 { "" } else { "s" }+ )];++ if let Some(files) = stats.files {+ summary_parts.push(format!(+ "{} file{}",+ files,+ if files == 1 { "" } else { "s" }+ ));+ }+ if let Some(insertions) = stats.insertions {+ let addition = AnstyleStyle::new().fg_color(Some(Color::Ansi(AnsiColor::Green)));+ summary_parts.push(format!("{addition}+{insertions}{addition:#}"));+ }+ if let Some(deletions) = stats.deletions {+ let deletion = AnstyleStyle::new().fg_color(Some(Color::Ansi(AnsiColor::Red)));+ summary_parts.push(format!("{deletion}-{deletions}{deletion:#}"));+ }++ println!(+ "✅ {green}Pushed to {green_bold}{target_branch}{green_bold:#} ({}) {green:#}",+ summary_parts.join(", ")+ );+ } else {+ println!("✅ {green}Pushed to {green_bold}{target_branch}{green_bold:#}{green:#}");+ }+Ok(())}++/// Parse git diff --shortstat output+struct DiffStats {+ files: Option<usize>,+ insertions: Option<usize>,+ deletions: Option<usize>,+}++fn parse_diff_shortstat(output: &str) -> DiffStats {+ let mut stats = DiffStats {+ files: None,+ insertions: None,+ deletions: None,+ };++ // Example: " 3 files changed, 45 insertions(+), 12 deletions(-)"+ let parts: Vec<&str> = output.split(',').collect();++ for part in parts {+ let part = part.trim();++ if part.contains("file") {+ if let Some(num_str) = part.split_whitespace().next() {+ stats.files = num_str.parse().ok();+ }+ } else if part.contains("insertion") {+ if let Some(num_str) = part.split_whitespace().next() {+ stats.insertions = num_str.parse().ok();+ }+ } else if part.contains("deletion") {+ if let Some(num_str) = part.split_whitespace().next() {+ stats.deletions = num_str.parse().ok();+ }+ }+ }++ stats+}diff --git a/src/main.rs b/src/main.rsindex e1ae20df4..38579f49c 100644--- a/src/main.rs+++ b/src/main.rs@@ -10,8 +10,8 @@ mod display;mod llm;use commands::{- Shell, handle_complete, handle_completion, handle_configure_shell, handle_init, handle_list,- handle_merge, handle_push, handle_remove, handle_switch,+ ConfigAction, Shell, handle_complete, handle_completion, handle_configure_shell, handle_init,+ handle_list, handle_merge, handle_push, handle_remove, handle_switch,};#[derive(Debug, Clone, Copy, clap::ValueEnum)]@@ -160,13 +160,12 @@ fn main() {// Count actual changes (not AlreadyExists)let changes_count = results.iter()- .filter(|r| !matches!(r.action, crate::ConfigAction::AlreadyExists))+ .filter(|r| !matches!(r.action, ConfigAction::AlreadyExists)).count();if changes_count == 0 {// All shells already configuredlet green = Style::new().fg_color(Some(Color::Ansi(AnsiColor::Green)));- let green_bold = green.bold();println!("✅ {green}All shells already configured{green:#}");return;}diff --git a/tests/snapshots/integration__integration_tests__column_alignment__alignment_empty_diffs.snap b/tests/snapshots/integration__integration_tests__column_alignment__alignment_empty_diffs.snapindex 0e4c8c6a5..c3e6db984 100644--- a/tests/snapshots/integration__integration_tests__column_alignment__alignment_empty_diffs.snap+++ b/tests/snapshots/integration__integration_tests__column_alignment__alignment_empty_diffs.snap@@ -25,4 +25,6 @@ also-no-changes [2m9 months ago[0m [2mb834638e[0m [2mInitial commit[0mno-changes [2m9 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./no-changeswith-changes [2m9 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./with-changes+[2mShowing 4 worktrees, 1 with changes[0m+----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__column_alignment__alignment_extreme_diffs.snap b/tests/snapshots/integration__integration_tests__column_alignment__alignment_extreme_diffs.snapindex 351c381ab..b9cb88060 100644--- a/tests/snapshots/integration__integration_tests__column_alignment__alignment_extreme_diffs.snap+++ b/tests/snapshots/integration__integration_tests__column_alignment__alignment_extreme_diffs.snap@@ -24,4 +24,6 @@ exit_code: 0huge [2m9 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./hugetiny [2m9 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./tiny+[2mShowing 3 worktrees, 1 with changes[0m+----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__column_alignment__alignment_varying_diffs.snap b/tests/snapshots/integration__integration_tests__column_alignment__alignment_varying_diffs.snapindex 692137076..4007cea90 100644--- a/tests/snapshots/integration__integration_tests__column_alignment__alignment_varying_diffs.snap+++ b/tests/snapshots/integration__integration_tests__column_alignment__alignment_varying_diffs.snap@@ -25,4 +25,6 @@ feature-large [2m9 months ago[0m [2mb834638e[0m [2mInitial commit[0mfeature-medium [2m9 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./feature-mediumfeature-small [2m9 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./feature-small+[2mShowing 4 worktrees[0m+----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_already_exists.snap b/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_already_exists.snapindex 6bf91360d..d312b72c0 100644--- a/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_already_exists.snap+++ b/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_already_exists.snap@@ -14,7 +14,7 @@ info:GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""- HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpERU3Zo+ HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpeWdD3ULANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1704067200"@@ -22,7 +22,6 @@ info:success: trueexit_code: 0----- stdout ------Already configured [1mzsh[0m [TEMP_HOME]/.zshrc- [2mif command -v wt >/dev/null 2>&1; then eval "$(wt init zsh)"; fi[0m+✅ [32mAll shells already configured[0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_custom_prefix.snap b/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_custom_prefix.snapindex a6904cd1b..8e1916762 100644--- a/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_custom_prefix.snap+++ b/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_custom_prefix.snap@@ -16,7 +16,7 @@ info:GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""- HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp2TPYeW+ HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpuzP9NfLANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1704067200"@@ -27,4 +27,8 @@ exit_code: 0Added [1mbash[0m [TEMP_HOME]/.bash_profile[2mif command -v worktree >/dev/null 2>&1; then eval "$(worktree init bash)"; fi[0m+✅ [32mConfigured 1 shell[0m++💡 [2mRestart your shell or run: source <config-file>[0m+----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_fish.snap b/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_fish.snapindex 6e9659624..ec37ede0e 100644--- a/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_fish.snap+++ b/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_fish.snap@@ -14,7 +14,7 @@ info:GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""- HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpRrLvi6+ HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0kaR0ILANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1704067200"@@ -25,4 +25,8 @@ exit_code: 0Created [1mfish[0m [TEMP_HOME]/.config/fish/conf.d/wt.fish[2mif type -q wt; wt init fish | source; end[0m+✅ [32mConfigured 1 shell[0m++💡 [2mRestart your shell or run: source <config-file>[0m+----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_fish_custom_prefix.snap b/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_fish_custom_prefix.snapindex 272e89085..d5f974427 100644--- a/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_fish_custom_prefix.snap+++ b/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_fish_custom_prefix.snap@@ -16,7 +16,7 @@ info:GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""- HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpHWEVR4+ HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0BNQxdLANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1704067200"@@ -27,4 +27,8 @@ exit_code: 0Created [1mfish[0m [TEMP_HOME]/.config/fish/conf.d/worktree.fish[2mif type -q worktree; worktree init fish | source; end[0m+✅ [32mConfigured 1 shell[0m++💡 [2mRestart your shell or run: source <config-file>[0m+----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_mixed_states.snap b/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_mixed_states.snapindex da1fa1147..b9857962e 100644--- a/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_mixed_states.snap+++ b/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_mixed_states.snap@@ -12,7 +12,7 @@ info:GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""- HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpCqxPsc+ HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0ylY9jLANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1704067200"@@ -25,4 +25,8 @@ Already configured [1mbash[0m [TEMP_HOME]/.bash_profileAdded [1mzsh[0m [TEMP_HOME]/.zshrc[2mif command -v wt >/dev/null 2>&1; then eval "$(wt init zsh)"; fi[0m+✅ [32mConfigured 1 shell[0m++💡 [2mRestart your shell or run: source <config-file>[0m+----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_multiple_configs.snap b/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_multiple_configs.snapindex f6f546e84..d62a1dd62 100644--- a/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_multiple_configs.snap+++ b/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_multiple_configs.snap@@ -12,7 +12,7 @@ info:GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""- HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp5RiHJU+ HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpkUz5nGLANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1704067200"@@ -25,4 +25,8 @@ Added [1mbash[0m [TEMP_HOME]/.bash_profileAdded [1mzsh[0m [TEMP_HOME]/.zshrc[2mif command -v wt >/dev/null 2>&1; then eval "$(wt init zsh)"; fi[0m+✅ [32mConfigured 2 shells[0m++💡 [2mRestart your shell or run: source <config-file>[0m+----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_with_yes.snap b/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_with_yes.snapindex 752baa9c9..83e53f1ed 100644--- a/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_with_yes.snap+++ b/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_with_yes.snap@@ -12,7 +12,7 @@ info:GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""- HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpsM7nu9+ HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpX6Vm3MLANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1704067200"@@ -23,4 +23,8 @@ exit_code: 0Added [1mzsh[0m [TEMP_HOME]/.zshrc[2mif command -v wt >/dev/null 2>&1; then eval "$(wt init zsh)"; fi[0m+✅ [32mConfigured 1 shell[0m++💡 [2mRestart your shell or run: source <config-file>[0m+----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_zsh.snap b/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_zsh.snapindex 460f1109b..201000ba8 100644--- a/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_zsh.snap+++ b/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_zsh.snap@@ -14,7 +14,7 @@ info:GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""- HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpyxX7Uq+ HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp47FgdyLANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1704067200"@@ -25,4 +25,8 @@ exit_code: 0Added [1mzsh[0m [TEMP_HOME]/.zshrc[2mif command -v wt >/dev/null 2>&1; then eval "$(wt init zsh)"; fi[0m+✅ [32mConfigured 1 shell[0m++💡 [2mRestart your shell or run: source <config-file>[0m+----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__list__detached_head.snap b/tests/snapshots/integration__integration_tests__list__detached_head.snapindex 5fb4bcd17..ce5b65f24 100644--- a/tests/snapshots/integration__integration_tests__list__detached_head.snap+++ b/tests/snapshots/integration__integration_tests__list__detached_head.snap@@ -21,4 +21,6 @@ exit_code: 0[2mBranch [0m [2mAge [0m [2mCommit [0m [2mMessage [0m [2mPath[0m[1m[35m(detached)[0m [2m9 months ago[0m [1m[35mb834638e[0m [2mInitial commit[0m [1m[35m.[0m+[2mShowing 1 worktree[0m+----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap b/tests/snapshots/integration__integration_tests__list__locked_no_reason.snapindex ae611efc5..d3014f7d9 100644--- a/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap+++ b/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap@@ -22,4 +22,6 @@ exit_code: 0[1m[35mmain [0m [2m9 months ago[0m [1m[35mb834638e[0m [1m[35m./main[0mlocked-no-reason [2m9 months ago[0m [2mb834638e[0m ./locked-no-reason+[2mShowing 2 worktrees[0m+----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__list__locked_worktree.snap b/tests/snapshots/integration__integration_tests__list__locked_worktree.snapindex 1b12f6261..fda961993 100644--- a/tests/snapshots/integration__integration_tests__list__locked_worktree.snap+++ b/tests/snapshots/integration__integration_tests__list__locked_worktree.snap@@ -22,4 +22,6 @@ exit_code: 0[1m[35mmain [0m [2m9 months ago[0m [1m[35mb834638e[0m [2mInitial commit[0m [1m[35m./main[0mlocked-feature [2m9 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./locked-feature+[2mShowing 2 worktrees[0m+----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__list__long_branch_name.snap b/tests/snapshots/integration__integration_tests__list__long_branch_name.snapindex 15533a293..6adecbed6 100644--- a/tests/snapshots/integration__integration_tests__list__long_branch_name.snap+++ b/tests/snapshots/integration__integration_tests__list__long_branch_name.snap@@ -22,4 +22,6 @@ exit_code: 0[1m[35mmain [0m [1m[35mb834638e[0m [1m[35m./main[0mfeature-this-is-a-very-long-branch-name-that-should-test-column-alignment [2mb834638e[0m ./feature-this-is-a-very-long-branch-name-that-should-test-column-alignment+[2mShowing 2 worktrees[0m+----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__list__long_commit_message.snap b/tests/snapshots/integration__integration_tests__list__long_commit_message.snapindex 21b859d1d..3595de134 100644--- a/tests/snapshots/integration__integration_tests__list__long_commit_message.snap+++ b/tests/snapshots/integration__integration_tests__list__long_commit_message.snap@@ -22,4 +22,6 @@ exit_code: 0[1m[35mmain [0m [2m9 months ago[0m [1m[35m1310bfb9[0m [2mShort message[0m [1m[35m./main[0mfeature-a [2m9 months ago[0m [2mf078644e[0m [2mThis is a very long commit...[0m ./feature-a+[2mShowing 2 worktrees, 1 behind[0m+----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap b/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snapindex c8514c84b..a8c6d34ca 100644--- a/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap+++ b/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap@@ -25,4 +25,6 @@ short [2m9 months ago[0m [2mb834638e[0m ./shortvery-long-branch-name-here [2m9 months ago[0m [2mb834638e[0m ./very-long-branch-name-herewith-changes [2m9 months ago[0m [2mb834638e[0m ./with-changes+[2mShowing 5 worktrees[0m+----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snapindex 649bde73f..7e6da327f 100644--- a/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap+++ b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap@@ -23,4 +23,6 @@ exit_code: 0feature-a [2m9 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./feature-afeature-b [2m9 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./feature-b+[2mShowing 3 worktrees[0m+----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__list__single_worktree.snap b/tests/snapshots/integration__integration_tests__list__single_worktree.snapindex a53645f1c..d88bda201 100644--- a/tests/snapshots/integration__integration_tests__list__single_worktree.snap+++ b/tests/snapshots/integration__integration_tests__list__single_worktree.snap@@ -21,4 +21,6 @@ exit_code: 0[2mBranch[0m [2mAge [0m [2mCommit [0m [2mMessage [0m [2mPath[0m[1m[35mmain [0m [2m9 months ago[0m [1m[35mb834638e[0m [2mInitial commit[0m [1m[35m.[0m+[2mShowing 1 worktree[0m+----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__list__unicode_branch_name.snap b/tests/snapshots/integration__integration_tests__list__unicode_branch_name.snapindex 5789ea12e..a06757ae7 100644--- a/tests/snapshots/integration__integration_tests__list__unicode_branch_name.snap+++ b/tests/snapshots/integration__integration_tests__list__unicode_branch_name.snap@@ -23,4 +23,6 @@ exit_code: 0feature-日本語-test [2m9 months ago[0m [2mb834638e[0m ./feature-日本語-testfix-émoji-🎉 [2m9 months ago[0m [2mb834638e[0m ./fix-émoji-🎉+[2mShowing 3 worktrees[0m+----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snapindex 5a050fda1..77930e7fd 100644--- a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap+++ b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap@@ -22,4 +22,6 @@ exit_code: 0[1m[35mmain [0m [2m9 months ago[0m [1m[35me4614cb7[0m [2mFix bug with café ☕...[0m [1m[35m./main[0mfeature-test [2m9 months ago[0m [2m0c53695b[0m [2mAdd support for...[0m ./feature-test+[2mShowing 2 worktrees, 1 behind[0m+----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap b/tests/snapshots/integration__integration_tests__list__with_branches_flag.snapindex 3e3014d4a..dc2459b4c 100644--- a/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap+++ b/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap@@ -26,4 +26,6 @@ another-branch [2m9 months ago[0m [2mb834638e[0mfeature-without-worktree [2m9 months ago[0m [2mb834638e[0mfix-bug [2m9 months ago[0m [2mb834638e[0m+[2mShowing 2 worktrees, 3 branches[0m+----- stderr -----diff --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 12ee13ad5..22906b563 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@@ -24,4 +24,6 @@ exit_code: 0feature-a [2m9 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./feature-afeature-b [2m9 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./feature-b+[2mShowing 3 worktrees[0m+----- stderr -----diff --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 548281952..062034523 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@@ -25,4 +25,6 @@ branch-alpha [2m9 months ago[0m [2mb834638e[0m [2mInitial commit[0mbranch-beta [2m9 months ago[0m [2mb834638e[0m [2mInitial commit[0mbranch-gamma [2m9 months ago[0m [2mb834638e[0m [2mInitial commit[0m+[2mShowing 1 worktrees, 3 branches[0m+----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snapindex 01cd2751a..d77ba9508 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap@@ -24,11 +24,20 @@ exit_code: 0* [SHA] (HEAD -> feature) Add feature file-✅ [32mPushed to [1m[32mmain[0m[0m+[2mfeature.txt | 1 ++ 1 file changed, 1 insertion(+)[0m++✅ [32mPushed to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m🔄 [36mCleaning up worktree...[0m✅ [32mRemoved worktree and returned to primary[0m[2mPath: [REPO][0mTo enable automatic cd, run: wt configure-shell+✅ [32mMerge complete[0m++ [2m1. Rebased [1m[32mfeature[0m onto [1m[32mmain[0m[0m+ [2m2. Pushed to [1m[32mmain[0m[0m+ [2m3. Cleaned up worktree[0m+----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snapindex 01cd2751a..d77ba9508 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap@@ -24,11 +24,20 @@ exit_code: 0* [SHA] (HEAD -> feature) Add feature file-✅ [32mPushed to [1m[32mmain[0m[0m+[2mfeature.txt | 1 ++ 1 file changed, 1 insertion(+)[0m++✅ [32mPushed to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m🔄 [36mCleaning up worktree...[0m✅ [32mRemoved worktree and returned to primary[0m[2mPath: [REPO][0mTo enable automatic cd, run: wt configure-shell+✅ [32mMerge complete[0m++ [2m1. Rebased [1m[32mfeature[0m onto [1m[32mmain[0m[0m+ [2m2. Pushed to [1m[32mmain[0m[0m+ [2m3. Cleaned up worktree[0m+----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snapindex 4108fc21f..af7e3e674 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap@@ -27,12 +27,24 @@ exit_code: 0* [SHA] (HEAD -> feature) Squash commits from main-✅ [32mPushed to [1m[32mmain[0m[0m+[2mfile1.txt | 1 ++ file2.txt | 1 ++ file3.txt | 1 ++ 3 files changed, 3 insertions(+)[0m++✅ [32mPushed to [1m[32mmain[0m (1 commit, 3 files, [32m+3[0m) [0m🔄 [36mCleaning up worktree...[0m✅ [32mRemoved worktree and returned to primary[0m[2mPath: [REPO][0mTo enable automatic cd, run: wt configure-shell+✅ [32mMerge complete[0m++ [2m1. Squashed 3 commits into 1[0m+ [2m2. Rebased [1m[32mfeature[0m onto [1m[32mmain[0m[0m+ [2m3. Pushed to [1m[32mmain[0m[0m+ [2m4. Cleaned up worktree[0m+----- stderr -----🟡 [33mLLM generation failed, using deterministic message[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snapindex f9c74f478..cf0393f90 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap@@ -28,12 +28,23 @@ exit_code: 0* [SHA] (HEAD -> feature) Squash commits from main-✅ [32mPushed to [1m[32mmain[0m[0m+[2mfile1.txt | 1 ++ file2.txt | 1 ++ 2 files changed, 2 insertions(+)[0m++✅ [32mPushed to [1m[32mmain[0m (1 commit, 2 files, [32m+2[0m) [0m🔄 [36mCleaning up worktree...[0m✅ [32mRemoved worktree and returned to primary[0m[2mPath: [REPO][0mTo enable automatic cd, run: wt configure-shell+✅ [32mMerge complete[0m++ [2m1. Squashed 2 commits into 1[0m+ [2m2. Rebased [1m[32mfeature[0m onto [1m[32mmain[0m[0m+ [2m3. Pushed to [1m[32mmain[0m[0m+ [2m4. Cleaned up worktree[0m+----- stderr -----🟡 [33mLLM generation failed, using deterministic message[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snapindex 79a49b668..b9d68aa5a 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap@@ -26,11 +26,20 @@ exit_code: 0* [SHA] (HEAD -> feature) feat: single commit-✅ [32mPushed to [1m[32mmain[0m[0m+[2mfile1.txt | 1 ++ 1 file changed, 1 insertion(+)[0m++✅ [32mPushed to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m🔄 [36mCleaning up worktree...[0m✅ [32mRemoved worktree and returned to primary[0m[2mPath: [REPO][0mTo enable automatic cd, run: wt configure-shell+✅ [32mMerge complete[0m++ [2m1. Rebased [1m[32mfeature[0m onto [1m[32mmain[0m[0m+ [2m2. Pushed to [1m[32mmain[0m[0m+ [2m3. Cleaned up worktree[0m+----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snapindex 825e4071e..4ca5be98c 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap@@ -29,12 +29,22 @@ exit_code: 0* [SHA] (HEAD -> feature) Squash commits from main-✅ [32mPushed to [1m[32mmain[0m[0m+[2mauth.txt | 1 ++ 1 file changed, 1 insertion(+)[0m++✅ [32mPushed to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m🔄 [36mCleaning up worktree...[0m✅ [32mRemoved worktree and returned to primary[0m[2mPath: [REPO][0mTo enable automatic cd, run: wt configure-shell+✅ [32mMerge complete[0m++ [2m1. Squashed 2 commits into 1[0m+ [2m2. Rebased [1m[32mfeature[0m onto [1m[32mmain[0m[0m+ [2m3. Pushed to [1m[32mmain[0m[0m+ [2m4. Cleaned up worktree[0m+----- stderr -----🟡 [33mLLM generation failed, using deterministic message[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snapindex a1365b0cf..6ba6da291 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap@@ -23,11 +23,20 @@ exit_code: 0* [SHA] (HEAD -> feature) Add feature file-✅ [32mPushed to [1m[32mmain[0m[0m+[2mfeature.txt | 1 ++ 1 file changed, 1 insertion(+)[0m++✅ [32mPushed to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m🔄 [36mCleaning up worktree...[0m✅ [32mRemoved worktree and returned to primary[0m[2mPath: [REPO][0mTo enable automatic cd, run: wt configure-shell+✅ [32mMerge complete[0m++ [2m1. Rebased [1m[32mfeature[0m onto [1m[32mmain[0m[0m+ [2m2. Pushed to [1m[32mmain[0m[0m+ [2m3. Cleaned up worktree[0m+----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_keep.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_keep.snapindex 9a6c66e71..8c5c71247 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_with_keep.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_keep.snap@@ -25,7 +25,15 @@ exit_code: 0* [SHA] (HEAD -> feature) Add feature file-✅ [32mPushed to [1m[32mmain[0m[0m-✅ [32mSuccessfully merged to [1m[32mmain[0m (worktree preserved)[0m+[2mfeature.txt | 1 ++ 1 file changed, 1 insertion(+)[0m++✅ [32mPushed to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m++✅ [32mMerge complete[0m++ [2m1. Rebased [1m[32mfeature[0m onto [1m[32mmain[0m[0m+ [2m2. Pushed to [1m[32mmain[0m[0m+ [2m3. Preserved worktree[0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_fast_forward.snapindex 4a842910c..e218e0d2f 100644--- a/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap@@ -23,6 +23,9 @@ exit_code: 0* [SHA] (HEAD -> feature) Add test file-✅ [32mPushed to [1m[32mmain[0m[0m+[2mtest.txt | 1 ++ 1 file changed, 1 insertion(+)[0m++✅ [32mPushed to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snapindex b5e196edb..fd6d53216 100644--- a/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap@@ -23,6 +23,9 @@ exit_code: 0* [SHA] (HEAD -> feature) Add feature file-✅ [32mPushed to [1m[32mmain[0m[0m+[2mfeature.txt | 1 ++ 1 file changed, 1 insertion(+)[0m++✅ [32mPushed to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__push__push_to_default.snap b/tests/snapshots/integration__integration_tests__push__push_to_default.snapindex 8b6122af4..0f206765c 100644--- a/tests/snapshots/integration__integration_tests__push__push_to_default.snap+++ b/tests/snapshots/integration__integration_tests__push__push_to_default.snap@@ -22,6 +22,9 @@ exit_code: 0* [SHA] (HEAD -> feature) Add feature file-✅ [32mPushed to [1m[32mmain[0m[0m+[2mfeature.txt | 1 ++ 1 file changed, 1 insertion(+)[0m++✅ [32mPushed to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m----- stderr -----diff --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 1d9557c96..46f1e4c6f 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@@ -24,4 +24,6 @@ another-extremely-long-name-here [2mb834638e[0m ./another-extremely-long-namshort [2mb834638e[0m ./shortvery-long-feature-branch-name [2mb834638e[0m ./very-long-feature-branch-name+[2mShowing 4 worktrees[0m+----- stderr -----diff --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 c21907bbd..411d236f9 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@@ -24,4 +24,6 @@ long [2mb834638e[0m ./extremely-long-branch-name-that-might-cause-layout-imedium [2mb834638e[0m ./medium-length-namex [2mb834638e[0m ./x+[2mShowing 4 worktrees[0m+----- stderr -----diff --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 d21c76e6d..48c9f6de3 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@@ -24,4 +24,6 @@ a [2m9 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./abb [2m9 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./bbccc [2m9 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./ccc+[2mShowing 4 worktrees[0m+----- stderr -----diff --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 e977c5365..47e8a66af 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@@ -24,4 +24,6 @@ exit_code: 0feature-a [2m9 months ago[0m [2ma7bc47ca[0m [2mInitial commit with a reasonably long message[0m ./feature-afeature-b [2m9 months ago[0m [2ma7bc47ca[0m [2mInitial commit with a reasonably long message[0m ./feature-b+[2mShowing 3 worktrees[0m+----- stderr -----diff --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 e49c32e7c..543501a0c 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@@ -24,4 +24,6 @@ exit_code: 0feature-a [2m9 months ago[0m [2ma7bc47ca[0m [2mInitial commit with a reasonably long message[0m ./feature-afeature-b [2m9 months ago[0m [2ma7bc47ca[0m [2mInitial commit with a reasonably long message[0m ./feature-b+[2mShowing 3 worktrees[0m+----- stderr -----diff --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 18a8c4b1b..270dccfe0 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@@ -24,4 +24,6 @@ exit_code: 0feature-a [2m9 months ago[0m [2ma7bc47ca[0m [2mInitial commit with a...[0m ./feature-afeature-b [2m9 months ago[0m [2ma7bc47ca[0m [2mInitial commit with a...[0m ./feature-b+[2mShowing 3 worktrees[0m+----- stderr -----diff --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 41e8bc1d7..bbf056d53 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@@ -24,4 +24,6 @@ cafe [2m9 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./cafénaive [2m9 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./naïveresume [2m9 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./résumé+[2mShowing 4 worktrees[0m+----- stderr -----