Skip to content

Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows

Fix: Ensure consistent color resetting in output

Maximilian Roose25aa1f04fad
diff --git a/src/commands/commit.rs b/src/commands/commit.rs
index 4d5ce0de8..a53e83f59 100644
--- a/src/commands/commit.rs
+++ b/src/commands/commit.rs
@@ -105,7 +105,7 @@ impl<'a> CommitGenerator<'a> {
let full_progress_msg = if parts.is_empty() {
format!("{CYAN}{action}{CYAN:#}")
} else {
- format!("{CYAN}{action}{CYAN:#} ({})", parts.join(", "))
+ format!("{CYAN}{action} ({}){CYAN:#}", parts.join(", "))
};
crate::output::progress(full_progress_msg)?;
diff --git a/src/commands/standalone.rs b/src/commands/standalone.rs
index 9bc402aa5..78138955d 100644
--- a/src/commands/standalone.rs
+++ b/src/commands/standalone.rs
@@ -209,7 +209,7 @@ pub fn handle_squash(
)
} else {
format!(
- "{CYAN}Squashing {commit_count} {commit_text}{with_changes} into a single commit{CYAN:#} ({})...",
+ "{CYAN}Squashing {commit_count} {commit_text}{with_changes} into a single commit ({})...{CYAN:#}",
parts.join(", ")
)
};
diff --git a/src/commands/worktree.rs b/src/commands/worktree.rs
index 56aca393a..7273d8d9e 100644
--- a/src/commands/worktree.rs
+++ b/src/commands/worktree.rs
@@ -608,7 +608,7 @@ pub fn handle_push(
};
crate::output::progress(format!(
- "{CYAN}{verb_ing} {commit_count} {commit_text} to {CYAN_BOLD}{target_branch}{CYAN_BOLD:#}{CYAN} @ {cyan_dim}{head_sha}{cyan_dim:#}{CYAN:#}{operations_note}"
+ "{CYAN}{verb_ing} {commit_count} {commit_text} to {CYAN_BOLD}{target_branch}{CYAN_BOLD:#}{CYAN} @ {cyan_dim}{head_sha}{cyan_dim:#}{CYAN}{operations_note}{CYAN:#}"
))?;
// Show the commit graph with color
@@ -662,7 +662,7 @@ pub fn handle_push(
summary_parts.extend(stats_summary);
crate::output::success(format!(
- "{GREEN}{verb} {GREEN_BOLD}{target_branch}{GREEN_BOLD:#}{GREEN:#} ({})",
+ "{GREEN}{verb} {GREEN_BOLD}{target_branch}{GREEN_BOLD:#}{GREEN} ({}){GREEN:#}",
summary_parts.join(", ")
))?;
} else {
diff --git a/src/output/handlers.rs b/src/output/handlers.rs
index e5097e2d0..6f1509ae3 100644
--- a/src/output/handlers.rs
+++ b/src/output/handlers.rs
@@ -124,19 +124,19 @@ fn format_remove_worktree_message(
if let Some(b) = branch_display {
// Re-establish GREEN after each green_bold reset to prevent color leak
format!(
- "{GREEN}{action} for {GREEN_BOLD}{b}{GREEN_BOLD:#}{GREEN}, changed directory to {GREEN_BOLD}{}{GREEN_BOLD:#}{GREEN:#}{flag_note}",
+ "{GREEN}{action} for {GREEN_BOLD}{b}{GREEN_BOLD:#}{GREEN}, changed directory to {GREEN_BOLD}{}{GREEN_BOLD:#}{GREEN}{flag_note}{GREEN:#}",
format_path_for_display(main_path)
)
} else {
format!(
- "{GREEN}{action}, changed directory to {GREEN_BOLD}{}{GREEN_BOLD:#}{GREEN:#}{flag_note}",
+ "{GREEN}{action}, changed directory to {GREEN_BOLD}{}{GREEN_BOLD:#}{GREEN}{flag_note}{GREEN:#}",
format_path_for_display(main_path)
)
}
} else if let Some(b) = branch_display {
- format!("{GREEN}{action} for {GREEN_BOLD}{b}{GREEN_BOLD:#}{GREEN:#}{flag_note}")
+ format!("{GREEN}{action} for {GREEN_BOLD}{b}{GREEN_BOLD:#}{GREEN}{flag_note}{GREEN:#}")
} else {
- format!("{GREEN}{action}{GREEN:#}{flag_note}")
+ format!("{GREEN}{action}{flag_note}{GREEN:#}")
}
}
@@ -325,7 +325,7 @@ fn handle_branch_only_output(
""
};
super::success(format!(
- "{GREEN}Removed branch {GREEN_BOLD}{branch_name}{GREEN_BOLD:#}{GREEN:#}{flag_note}"
+ "{GREEN}Removed branch {GREEN_BOLD}{branch_name}{GREEN_BOLD:#}{GREEN}{flag_note}{GREEN:#}"
))?;
}
diff --git a/tests/integration_tests/merge.rs b/tests/integration_tests/merge.rs
index fe7240ef6..1fd6aa6ea 100644
--- a/tests/integration_tests/merge.rs
+++ b/tests/integration_tests/merge.rs
@@ -2454,11 +2454,11 @@ fn test_merge_no_commit_with_clean_tree() {
----- stdout -----
----- stderr -----
- πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
+ πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
- βœ… Merged to main (1 commit, 1 file, +1)
+ βœ… Merged to main (1 commit, 1 file, +1)
βšͺ Worktree preserved (--no-remove)
");
});
@@ -2557,11 +2557,11 @@ fn test_merge_no_commit_no_squash_no_remove_redundant() {
----- stdout -----
----- stderr -----
- πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
+ πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
- βœ… Merged to main (1 commit, 1 file, +1)
+ βœ… Merged to main (1 commit, 1 file, +1)
βšͺ Worktree preserved (--no-remove)
");
});
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap
index 84638fef0..01eefc6cb 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap
@@ -22,9 +22,9 @@ expression: output.normalized()
[check2] stderr line 3
[check2] stdout complete
[check2] stderr complete
-πŸ”„ Merging 1 commit to main @ [HASH] (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ [HASH] (no commit/squash/rebase needed)
  * [HASH] Add feature
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
+βœ… Merged to main (1 commit, 1 file, +1)
πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap
index 84638fef0..01eefc6cb 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap
@@ -22,9 +22,9 @@ expression: output.normalized()
[check2] stderr line 3
[check2] stdout complete
[check2] stderr complete
-πŸ”„ Merging 1 commit to main @ [HASH] (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ [HASH] (no commit/squash/rebase needed)
  * [HASH] Add feature
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
+βœ… Merged to main (1 commit, 1 file, +1)
πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap
index aa6617ce6..cf56fed43 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap
@@ -11,9 +11,9 @@ expression: output.normalized()
πŸ”„ Running pre-merge test:
  echo 'βœ“ All 47 tests passed in 2.3s'
βœ“ All 47 tests passed in 2.3s
-πŸ”„ Merging 1 commit to main @ [HASH] (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ [HASH] (no commit/squash/rebase needed)
  * [HASH] Add feature
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
+βœ… Merged to main (1 commit, 1 file, +1)
πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap
index aa6617ce6..cf56fed43 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap
@@ -11,9 +11,9 @@ expression: output.normalized()
πŸ”„ Running pre-merge test:
  echo 'βœ“ All 47 tests passed in 2.3s'
βœ“ All 47 tests passed in 2.3s
-πŸ”„ Merging 1 commit to main @ [HASH] (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ [HASH] (no commit/squash/rebase needed)
  * [HASH] Add feature
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
+βœ… Merged to main (1 commit, 1 file, +1)
πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_pre_merge.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_pre_merge.snap
index 9bce21bca..feb70435c 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_pre_merge.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_pre_merge.snap
@@ -2,7 +2,7 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-πŸ”„ Squashing 3 commits into a single commit (2 files, +45)...
+πŸ”„ Squashing 3 commits into a single commit (2 files, +45)...
πŸ”„ Generating squash commit message...
  feat(api): Add user authentication endpoints
 
@@ -26,10 +26,10 @@ tests/test_auth.py::test_token_validation PASSED [100%]
All checks passed!
-πŸ”„ Merging 1 commit to main @ [HASH] (no rebase needed)
+πŸ”„ Merging 1 commit to main @ [HASH] (no rebase needed)
  * [HASH] feat(api): Add user authentication endpoints
  api/auth.py | 31 +++++++++++++++++++++++++++++++
  tests/test_auth.py | 14 ++++++++++++++
  2 files changed, 45 insertions(+)
-βœ… Merged to main (1 commit, 2 files, +45)
+βœ… Merged to main (1 commit, 2 files, +45)
πŸ”„ Removing feature-auth worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap
index b8028744c..e9780a5cf 100644
--- a/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap
+++ b/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap
@@ -26,9 +26,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
+βœ… Merged to main (1 commit, 1 file, +1)
βšͺ Worktree preserved (--no-remove)
diff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap
index 68f1a0f40..819b2f348 100644
--- a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap
+++ b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap
@@ -26,9 +26,9 @@ exit_code: 0
cd '[PATH]'
----- stderr -----
-πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
+βœ… Merged to main (1 commit, 1 file, +1)
πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap
index aa786d4ed..c80354018 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap
@@ -24,15 +24,15 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Squashing 2 commits & working tree changes into a single commit (2 files, +2)...
+πŸ”„ Squashing 2 commits & working tree changes into a single commit (2 files, +2)...
πŸ’‘ Backup created @ 330ccd6
πŸ”„ Generating squash commit message...
  fix: update file 1 content
βœ… Squashed @ b54183b
-πŸ”„ Merging 1 commit to main @ b54183b (no rebase needed)
+πŸ”„ Merging 1 commit to main @ b54183b (no rebase needed)
  * b54183b fix: update file 1 content
  file1.txt | 1 +
  file2.txt | 1 +
  2 files changed, 2 insertions(+)
-βœ… Merged to main (1 commit, 2 files, +2)
+βœ… Merged to main (1 commit, 2 files, +2)
πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap
index 9f565dbf9..e9f2d53bd 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap
@@ -24,7 +24,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Squashing 1 commit & working tree changes into a single commit (1 file, +1)...
+πŸ”„ Squashing 1 commit & working tree changes into a single commit (1 file, +1)...
πŸ’‘ Backup created @ b18c23e
πŸ”„ Generating squash commit message...
πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
@@ -33,9 +33,9 @@ exit_code: 0
  Combined commits:
  - feat: initial feature
βœ… Squashed @ d118927
-πŸ”„ Merging 1 commit to main @ d118927 (no rebase needed)
+πŸ”„ Merging 1 commit to main @ d118927 (no rebase needed)
  * d118927 Squash commits from main
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
+βœ… Merged to main (1 commit, 1 file, +1)
πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap
index 06be630a1..8b052df09 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap
@@ -24,14 +24,14 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Squashing 1 commit & working tree changes into a single commit (1 file, +1)...
+πŸ”„ Squashing 1 commit & working tree changes into a single commit (1 file, +1)...
πŸ’‘ Backup created @ 967330a
πŸ”„ Generating squash commit message...
  fix: improve auth validation logic
βœ… Squashed @ 1e3993e
-πŸ”„ Merging 1 commit to main @ 1e3993e (no rebase needed)
+πŸ”„ Merging 1 commit to main @ 1e3993e (no rebase needed)
  * 1e3993e fix: improve auth validation logic
  auth.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
+βœ… Merged to main (1 commit, 1 file, +1)
πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap b/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap
index 36b588c61..5fe6f2514 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap
@@ -26,13 +26,13 @@ exit_code: 0
----- stderr -----
🟑 Auto-staging 1 untracked file:
  dirty.txt
-πŸ”„ Committing changes with default message... (1 file, +1, no squashing needed)
+πŸ”„ Committing changes with default message... (1 file, +1, no squashing needed)
πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
  Changes to dirty.txt
βœ… Committed changes @ c1126ec
-πŸ”„ Merging 1 commit to main @ c1126ec (no rebase needed)
+πŸ”„ Merging 1 commit to main @ c1126ec (no rebase needed)
  * c1126ec Changes to dirty.txt
  dirty.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
+βœ… Merged to main (1 commit, 1 file, +1)
πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
index d6ba43970..0bd79455d 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
@@ -24,9 +24,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
+βœ… Merged to main (1 commit, 1 file, +1)
πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap
index a307377ef..dac88343f 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap
@@ -26,13 +26,13 @@ exit_code: 0
----- stderr -----
🟑 Auto-staging 1 untracked file:
  newfile.txt
-πŸ”„ Committing changes with default message... (1 file, +1, no squashing needed)
+πŸ”„ Committing changes with default message... (1 file, +1, no squashing needed)
πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
  Changes to newfile.txt
βœ… Committed changes @ 96ddfbc
-πŸ”„ Merging 1 commit to main @ 96ddfbc (no rebase needed)
+πŸ”„ Merging 1 commit to main @ 96ddfbc (no rebase needed)
  * 96ddfbc Changes to newfile.txt
  newfile.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
+βœ… Merged to main (1 commit, 1 file, +1)
πŸ”„ Removing no-commits-dirty worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap
index 497a4ce3c..4bf4c3a70 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap
@@ -23,9 +23,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
+βœ… Merged to main (1 commit, 1 file, +1)
πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
index 15a3cb90e..bcef7647e 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
@@ -25,11 +25,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Merging 2 commits to main @ bf212d3 (no commit/squash/rebase needed)
+πŸ”„ Merging 2 commits to main @ bf212d3 (no commit/squash/rebase needed)
  * bf212d3 feat: add file 2
  * 123e46c feat: add file 1
  file1.txt | 1 +
  file2.txt | 1 +
  2 files changed, 2 insertions(+)
-βœ… Merged to main (2 commits, 2 files, +2)
+βœ… Merged to main (2 commits, 2 files, +2)
πŸ”„ Removing feature worktree & branch in background
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.snap
index eb520ec88..95ffd24bd 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,9 +24,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Merging 1 commit to main @ 4af48f0 (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ 4af48f0 (no commit/squash/rebase needed)
  * 4af48f0 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
+βœ… Merged to main (1 commit, 1 file, +1)
πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap
index cf4ab86a0..9ee4c9b28 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap
@@ -25,11 +25,11 @@ exit_code: 1
----- stdout -----
----- stderr -----
-πŸ”„ Merging 1 commit to main @ cdb002e (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ cdb002e (no commit/squash/rebase needed)
  * cdb002e Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
+βœ… Merged to main (1 commit, 1 file, +1)
πŸ”„ Removing feature worktree & branch in background
πŸ”„ Running post-merge:
  exit 1
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap
index abbc2b14b..a3be7b53a 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap
@@ -25,11 +25,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Merging 1 commit to main @ 8609b84 (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ 8609b84 (no commit/squash/rebase needed)
  * 8609b84 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
+βœ… Merged to main (1 commit, 1 file, +1)
πŸ”„ Removing feature worktree & branch in background
πŸ”„ Running post-merge notify:
  echo 'Merge to main complete' > notify.txt
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_no_verify.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_no_verify.snap
index 6fdcf8d01..e5fea9277 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_no_verify.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_no_verify.snap
@@ -26,9 +26,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Merging 1 commit to main @ 72ff5fc (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ 72ff5fc (no commit/squash/rebase needed)
  * 72ff5fc Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
+βœ… Merged to main (1 commit, 1 file, +1)
πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap
index 7e10ebab6..edd34c5f6 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap
@@ -25,11 +25,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Merging 1 commit to main @ 72ff5fc (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ 72ff5fc (no commit/squash/rebase needed)
  * 72ff5fc Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
+βœ… Merged to main (1 commit, 1 file, +1)
πŸ”„ Removing feature worktree & branch in background
πŸ”„ Running post-merge:
  echo 'merged feature to main' > post-merge-ran.txt
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap
index 7e3777659..3cfac261d 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap
@@ -30,13 +30,13 @@ exit_code: 0
πŸ”„ Running pre-commit:
  echo 'Pre-commit check passed'
Pre-commit check passed
-πŸ”„ Committing changes with default message... (1 file, +1, no squashing needed)
+πŸ”„ Committing changes with default message... (1 file, +1, no squashing needed)
πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
  Changes to feature.txt
βœ… Committed changes @ cdc8f90
-πŸ”„ Merging 1 commit to main @ cdc8f90 (no rebase needed)
+πŸ”„ Merging 1 commit to main @ cdc8f90 (no rebase needed)
  * cdc8f90 Changes to feature.txt
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
+βœ… Merged to main (1 commit, 1 file, +1)
πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap
index e1e428410..e96cc2e0e 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap
@@ -31,9 +31,9 @@ exit_code: 0
  exit 0
πŸ”„ Running pre-merge test:
  exit 0
-πŸ”„ Merging 1 commit to main @ 2cbe2a2 (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ 2cbe2a2 (no commit/squash/rebase needed)
  * 2cbe2a2 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
+βœ… Merged to main (1 commit, 1 file, +1)
πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap
index dec7a6275..a2f8c7d3e 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap
@@ -27,9 +27,9 @@ exit_code: 0
----- stderr -----
πŸ”„ Running pre-merge:
  exit 0
-πŸ”„ Merging 1 commit to main @ 4b1199c (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ 4b1199c (no commit/squash/rebase needed)
  * 4b1199c Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
+βœ… Merged to main (1 commit, 1 file, +1)
πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap
index 43a9396b9..4b5e01101 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap
@@ -28,9 +28,9 @@ exit_code: 0
πŸ”„ Running pre-commit:
  echo 'Pre-commit check passed'
Pre-commit check passed
-πŸ”„ Merging 1 commit to main @ 726717f (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ 726717f (no commit/squash/rebase needed)
  * 726717f Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
+βœ… Merged to main (1 commit, 1 file, +1)
πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snap b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snap
index a8b72d726..c186641ad 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snap
@@ -24,9 +24,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
+βœ… Merged to main (1 commit, 1 file, +1)
πŸ”„ Removing feature-from-develop worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snap b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snap
index e6fe3dac1..d16589213 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snap
@@ -26,9 +26,9 @@ exit_code: 0
----- stderr -----
πŸ”„ Rebasing onto main...
βœ… Rebased onto main
-πŸ”„ Merging 1 commit to main @ 76778cc (no commit/squash needed)
+πŸ”„ Merging 1 commit to main @ 76778cc (no commit/squash needed)
  * 76778cc Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
+βœ… Merged to main (1 commit, 1 file, +1)
πŸ”„ Removing feature-dirty-primary worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_race_condition_before_new_commit.snap b/tests/snapshots/integration__integration_tests__merge__merge_race_condition_before_new_commit.snap
index 2d33c1ddd..471872937 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_race_condition_before_new_commit.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_race_condition_before_new_commit.snap
@@ -25,9 +25,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
+βœ… Merged to main (1 commit, 1 file, +1)
βšͺ Worktree preserved (--no-remove)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_rebase_true_rebase.snap b/tests/snapshots/integration__integration_tests__merge__merge_rebase_true_rebase.snap
index b4a28f3f4..5960f2b87 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_rebase_true_rebase.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_rebase_true_rebase.snap
@@ -26,9 +26,9 @@ exit_code: 0
----- stderr -----
πŸ”„ Rebasing onto main...
βœ… Rebased onto main
-πŸ”„ Merging 1 commit to main @ ae48a8e (no commit/squash needed)
+πŸ”„ Merging 1 commit to main @ ae48a8e (no commit/squash needed)
  * ae48a8e Add feature
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
+βœ… Merged to main (1 commit, 1 file, +1)
πŸ”„ Removing true-rebase-test worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
index 4062b418e..9aaebfcc0 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
@@ -24,7 +24,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Squashing 3 commits into a single commit (3 files, +3)...
+πŸ”„ Squashing 3 commits into a single commit (3 files, +3)...
πŸ”„ Generating squash commit message...
πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
  Squash commits from main
@@ -34,11 +34,11 @@ exit_code: 0
  - fix: update logic
  - docs: update readme
βœ… Squashed @ 27eb169
-πŸ”„ Merging 1 commit to main @ 27eb169 (no rebase needed)
+πŸ”„ Merging 1 commit to main @ 27eb169 (no rebase needed)
  * 27eb169 Squash commits from main
  file1.txt | 1 +
  file2.txt | 1 +
  file3.txt | 1 +
  3 files changed, 3 insertions(+)
-βœ… Merged to main (1 commit, 3 files, +3)
+βœ… Merged to main (1 commit, 3 files, +3)
πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_error.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_error.snap
index ffea8e4d1..275e4c26f 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_error.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_error.snap
@@ -24,7 +24,7 @@ exit_code: 1
----- stdout -----
----- stderr -----
-πŸ”„ Squashing 2 commits into a single commit (2 files, +2)...
+πŸ”„ Squashing 2 commits into a single commit (2 files, +2)...
πŸ”„ Generating squash commit message...
❌ Commit generation command failed
  Error: connection refused
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap
index 54ebcaaef..5d2f12ff7 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
@@ -25,7 +25,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Squashing 2 commits into a single commit (2 files, +2)...
+πŸ”„ Squashing 2 commits into a single commit (2 files, +2)...
πŸ”„ Generating squash commit message...
πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
  Squash commits from main
@@ -34,10 +34,10 @@ exit_code: 0
  - feat: new feature
  - fix: bug fix
βœ… Squashed @ 091f0c5
-πŸ”„ Merging 1 commit to main @ 091f0c5 (no rebase needed)
+πŸ”„ Merging 1 commit to main @ 091f0c5 (no rebase needed)
  * 091f0c5 Squash commits from main
  file1.txt | 1 +
  file2.txt | 1 +
  2 files changed, 2 insertions(+)
-βœ… Merged to main (1 commit, 2 files, +2)
+βœ… Merged to main (1 commit, 2 files, +2)
πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap
index 55d0348f8..36f4d340f 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
@@ -24,9 +24,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Merging 1 commit to main @ 525a81f (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ 525a81f (no commit/squash/rebase needed)
  * 525a81f feat: single commit
  file1.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
+βœ… Merged to main (1 commit, 1 file, +1)
πŸ”„ Removing feature worktree & branch in background
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.snap
index 359242f01..75c49523f 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
@@ -24,13 +24,13 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Squashing 2 commits into a single commit (1 file, +1)...
+πŸ”„ Squashing 2 commits into a single commit (1 file, +1)...
πŸ”„ Generating squash commit message...
  feat: implement user authentication system
βœ… Squashed @ d42412f
-πŸ”„ Merging 1 commit to main @ d42412f (no rebase needed)
+πŸ”„ Merging 1 commit to main @ d42412f (no rebase needed)
  * d42412f feat: implement user authentication system
  auth.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
+βœ… Merged to main (1 commit, 1 file, +1)
πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snap
index b97d9524a..0a34dfc63 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snap
@@ -26,7 +26,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Squashing 2 commits & working tree changes into a single commit (2 files, +2)...
+πŸ”„ Squashing 2 commits & working tree changes into a single commit (2 files, +2)...
πŸ’‘ Backup created @ 330ccd6
πŸ”„ Generating squash commit message...
πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
@@ -36,10 +36,10 @@ exit_code: 0
  - feat: add file 1
  - feat: add file 2
βœ… Squashed @ d34e4c3
-πŸ”„ Merging 1 commit to main @ d34e4c3 (no rebase needed)
+πŸ”„ Merging 1 commit to main @ d34e4c3 (no rebase needed)
  * d34e4c3 Squash commits from main
  file1.txt | 1 +
  file2.txt | 1 +
  2 files changed, 2 insertions(+)
-βœ… Merged to main (1 commit, 2 files, +2)
+βœ… Merged to main (1 commit, 2 files, +2)
πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
index 497a4ce3c..4bf4c3a70 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
@@ -23,9 +23,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
+βœ… Merged to main (1 commit, 1 file, +1)
πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_to_non_default_target.snap b/tests/snapshots/integration__integration_tests__merge__merge_to_non_default_target.snap
index 43c24b2be..f4e6fe583 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_to_non_default_target.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_non_default_target.snap
@@ -26,9 +26,9 @@ exit_code: 0
----- stderr -----
πŸ”„ Rebasing onto staging...
βœ… Rebased onto staging
-πŸ”„ Merging 1 commit to staging @ 8280b9e (no commit/squash needed)
+πŸ”„ Merging 1 commit to staging @ 8280b9e (no commit/squash needed)
  * 8280b9e Add feature for staging
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to staging (1 commit, 1 file, +1)
+βœ… Merged to staging (1 commit, 1 file, +1)
πŸ”„ Removing feature-for-staging worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_when_primary_not_on_default_but_default_has_worktree.snap b/tests/snapshots/integration__integration_tests__merge__merge_when_primary_not_on_default_but_default_has_worktree.snap
index d6ba43970..0bd79455d 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_when_primary_not_on_default_but_default_has_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_when_primary_not_on_default_but_default_has_worktree.snap
@@ -24,9 +24,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
+βœ… Merged to main (1 commit, 1 file, +1)
πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap
index 4dbc1fbea..301d58767 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap
@@ -24,9 +24,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
+βœ… Merged to main (1 commit, 1 file, +1)
πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap
index 2d33c1ddd..471872937 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap
@@ -25,9 +25,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
+βœ… Merged to main (1 commit, 1 file, +1)
βšͺ Worktree preserved (--no-remove)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap
index aeb12fa3b..e02d48307 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap
@@ -29,7 +29,7 @@ exit_code: 0
🟑 Auto-staging 2 untracked files:
  untracked1.txt
  untracked2.txt
-πŸ”„ Squashing 1 commit & working tree changes into a single commit (3 files, +3)...
+πŸ”„ Squashing 1 commit & working tree changes into a single commit (3 files, +3)...
πŸ’‘ Backup created @ 4967998
πŸ”„ Generating squash commit message...
πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
@@ -38,11 +38,11 @@ exit_code: 0
  Combined commits:
  - feat: add file 1
βœ… Squashed @ fbfc726
-πŸ”„ Merging 1 commit to main @ fbfc726 (no rebase needed)
+πŸ”„ Merging 1 commit to main @ fbfc726 (no rebase needed)
  * fbfc726 Squash commits from main
  file1.txt | 1 +
  untracked1.txt | 1 +
  untracked2.txt | 1 +
  3 files changed, 3 insertions(+)
-βœ… Merged to main (1 commit, 3 files, +3)
+βœ… Merged to main (1 commit, 3 files, +3)
πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
index 132a7deb0..5cc478106 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
@@ -26,7 +26,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Squashing 3 commits into a single commit (3 files, +33)...
+πŸ”„ Squashing 3 commits into a single commit (3 files, +33)...
πŸ”„ Generating squash commit message...
  feat(auth): Implement JWT authentication system
 
@@ -54,13 +54,13 @@ test result: ok. 18 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; fin
  cargo clippy
 Checking worktrunk v0.1.0
Finished dev [unoptimized + debuginfo] target(s) in 1.23s
-πŸ”„ Merging 1 commit to main @ 95c3316 (no rebase needed)
+πŸ”„ Merging 1 commit to main @ 95c3316 (no rebase needed)
  * 95c3316 feat(auth): Implement JWT authentication system
  auth.rs | 8 ++++++++
  auth_test.rs | 17 +++++++++++++++++
  jwt.rs | 8 ++++++++
  3 files changed, 33 insertions(+)
-βœ… Merged to main (1 commit, 3 files, +33)
+βœ… Merged to main (1 commit, 3 files, +33)
πŸ”„ Removing feature-auth worktree & branch in background
πŸ”„ Running post-merge install:
  cargo install --path .
diff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_pre_merge.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_pre_merge.snap
index 7123160b3..e27f6f81d 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_pre_merge.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_pre_merge.snap
@@ -26,7 +26,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Squashing 3 commits into a single commit (2 files, +45)...
+πŸ”„ Squashing 3 commits into a single commit (2 files, +45)...
πŸ”„ Generating squash commit message...
  feat(api): Add user authentication endpoints
 
@@ -50,10 +50,10 @@ tests/test_auth.py::test_token_validation PASSED [100%]

All checks passed!
-πŸ”„ Merging 1 commit to main @ 69200cc (no rebase needed)
+πŸ”„ Merging 1 commit to main @ 69200cc (no rebase needed)
  * 69200cc feat(api): Add user authentication endpoints
  api/auth.py | 31 +++++++++++++++++++++++++++++++
  tests/test_auth.py | 14 ++++++++++++++
  2 files changed, 45 insertions(+)
-βœ… Merged to main (1 commit, 2 files, +45)
+βœ… Merged to main (1 commit, 2 files, +45)
πŸ”„ Removing feature-auth worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap
index 5c53350ae..9be75423e 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap
@@ -24,9 +24,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Merging 1 commit to main @ d29e0fd (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ d29e0fd (no commit/squash/rebase needed)
  * d29e0fd Implement JWT validation
  auth.rs | 13 +++++++++++++
  1 file changed, 13 insertions(+)
-βœ… Merged to main (1 commit, 1 file, +13)
+βœ… Merged to main (1 commit, 1 file, +13)
πŸ”„ Removing fix-auth worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__step_commit_both_flags.snap b/tests/snapshots/integration__integration_tests__merge__step_commit_both_flags.snap
index d87a3b99d..0d4a2c4fa 100644
--- a/tests/snapshots/integration__integration_tests__merge__step_commit_both_flags.snap
+++ b/tests/snapshots/integration__integration_tests__merge__step_commit_both_flags.snap
@@ -29,7 +29,7 @@ exit_code: 0
----- stderr -----
πŸ’‘ Skipping pre-commit hook (--no-verify)
-πŸ”„ Committing tracked changes with default message... (1 file, +1, -1)
+πŸ”„ Committing tracked changes with default message... (1 file, +1, -1)
πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
  Changes to tracked.txt
βœ… Committed changes @ a5890cb
diff --git a/tests/snapshots/integration__integration_tests__merge__step_commit_no_verify.snap b/tests/snapshots/integration__integration_tests__merge__step_commit_no_verify.snap
index 531673115..f6fc46249 100644
--- a/tests/snapshots/integration__integration_tests__merge__step_commit_no_verify.snap
+++ b/tests/snapshots/integration__integration_tests__merge__step_commit_no_verify.snap
@@ -31,7 +31,7 @@ exit_code: 0
🟑 Auto-staging 2 untracked files:
  .config/
  file1.txt
-πŸ”„ Committing changes with default message... (2 files, +2)
+πŸ”„ Committing changes with default message... (2 files, +2)
πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
  Changes to wt.toml & file1.txt
βœ… Committed changes @ 3dbcd5d
diff --git a/tests/snapshots/integration__integration_tests__merge__step_commit_stage_tracked.snap b/tests/snapshots/integration__integration_tests__merge__step_commit_stage_tracked.snap
index 6c7b57865..656c422aa 100644
--- a/tests/snapshots/integration__integration_tests__merge__step_commit_stage_tracked.snap
+++ b/tests/snapshots/integration__integration_tests__merge__step_commit_stage_tracked.snap
@@ -27,7 +27,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Committing tracked changes with default message... (1 file, +1, -1)
+πŸ”„ Committing tracked changes with default message... (1 file, +1, -1)
πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
  Changes to tracked.txt
βœ… Committed changes @ 7d441f0
diff --git a/tests/snapshots/integration__integration_tests__merge__step_squash_both_flags.snap b/tests/snapshots/integration__integration_tests__merge__step_squash_both_flags.snap
index c0c220c79..912685b81 100644
--- a/tests/snapshots/integration__integration_tests__merge__step_squash_both_flags.snap
+++ b/tests/snapshots/integration__integration_tests__merge__step_squash_both_flags.snap
@@ -29,7 +29,7 @@ exit_code: 0
----- stderr -----
πŸ’‘ Skipping pre-commit hook (--no-verify)
-πŸ”„ Squashing 2 commits & tracked changes into a single commit (3 files, +3)...
+πŸ”„ Squashing 2 commits & tracked changes into a single commit (3 files, +3)...
πŸ’‘ Backup created @ 31e06e8
πŸ”„ Generating squash commit message...
πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
diff --git a/tests/snapshots/integration__integration_tests__merge__step_squash_no_verify.snap b/tests/snapshots/integration__integration_tests__merge__step_squash_no_verify.snap
index b583caf81..3d321a094 100644
--- a/tests/snapshots/integration__integration_tests__merge__step_squash_no_verify.snap
+++ b/tests/snapshots/integration__integration_tests__merge__step_squash_no_verify.snap
@@ -28,7 +28,7 @@ exit_code: 0
----- stderr -----
πŸ’‘ Skipping pre-commit hook (--no-verify)
-πŸ”„ Squashing 2 commits into a single commit (3 files, +3)...
+πŸ”„ Squashing 2 commits into a single commit (3 files, +3)...
πŸ”„ Generating squash commit message...
πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
  Squash commits from main
diff --git a/tests/snapshots/integration__integration_tests__merge__step_squash_stage_tracked.snap b/tests/snapshots/integration__integration_tests__merge__step_squash_stage_tracked.snap
index 14da6547e..3c70f4351 100644
--- a/tests/snapshots/integration__integration_tests__merge__step_squash_stage_tracked.snap
+++ b/tests/snapshots/integration__integration_tests__merge__step_squash_stage_tracked.snap
@@ -27,7 +27,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Squashing 2 commits & tracked changes into a single commit (2 files, +2)...
+πŸ”„ Squashing 2 commits & tracked changes into a single commit (2 files, +2)...
πŸ’‘ Backup created @ ba1424b
πŸ”„ Generating squash commit message...
πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
diff --git a/tests/snapshots/integration__integration_tests__push__push_dirty_target_autostash.snap b/tests/snapshots/integration__integration_tests__push__push_dirty_target_autostash.snap
index 9fe1c76fd..0aeed3dda 100644
--- a/tests/snapshots/integration__integration_tests__push__push_dirty_target_autostash.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_dirty_target_autostash.snap
@@ -26,9 +26,9 @@ exit_code: 0
----- stderr -----
πŸ”„ Stashing changes in [REPO]...
-πŸ”„ Pushing 1 commit to main @ 6551244
+πŸ”„ Pushing 1 commit to main @ 6551244
  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
πŸ”„ Restoring stashed changes in [REPO]...
-βœ… Pushed to main (1 commit, 1 file, +1)
+βœ… Pushed to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap
index 1977f8238..dc96d9984 100644
--- a/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap
@@ -25,8 +25,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Pushing 1 commit to main @ c2e2bcc
+πŸ”„ Pushing 1 commit to main @ c2e2bcc
  * c2e2bcc Add test file
  test.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Pushed to main (1 commit, 1 file, +1)
+βœ… Pushed to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__push__push_no_remote.snap b/tests/snapshots/integration__integration_tests__push__push_no_remote.snap
index 16f0c04d2..fc8cf9898 100644
--- a/tests/snapshots/integration__integration_tests__push__push_no_remote.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_no_remote.snap
@@ -24,8 +24,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Pushing 1 commit to main @ 6551244
+πŸ”„ Pushing 1 commit to main @ 6551244
  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Pushed to main (1 commit, 1 file, +1)
+βœ… Pushed to main (1 commit, 1 file, +1)
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.snap
index 3f65906cd..6ebdcc633 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
@@ -25,8 +25,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Pushing 1 commit to main @ 4af48f0
+πŸ”„ Pushing 1 commit to main @ 4af48f0
  * 4af48f0 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Pushed to main (1 commit, 1 file, +1)
+βœ… Pushed to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__push__push_to_default.snap b/tests/snapshots/integration__integration_tests__push__push_to_default.snap
index 16f0c04d2..fc8cf9898 100644
--- a/tests/snapshots/integration__integration_tests__push__push_to_default.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_to_default.snap
@@ -24,8 +24,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Pushing 1 commit to main @ 6551244
+πŸ”„ Pushing 1 commit to main @ 6551244
  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Pushed to main (1 commit, 1 file, +1)
+βœ… Pushed to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__push__push_with_merge_commits_allowed.snap b/tests/snapshots/integration__integration_tests__push__push_with_merge_commits_allowed.snap
index 1088dcacc..937d1df71 100644
--- a/tests/snapshots/integration__integration_tests__push__push_with_merge_commits_allowed.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_with_merge_commits_allowed.snap
@@ -26,7 +26,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Pushing 3 commits to main @ 13bed7b (merge commits allowed)
+πŸ”„ Pushing 3 commits to main @ 13bed7b (merge commits allowed)
  * 13bed7b Merge temp
  |/
  | * 1f38fab Commit 2
@@ -35,4 +35,4 @@ exit_code: 0
  file1.txt | 1 +
  file2.txt | 1 +
  2 files changed, 2 insertions(+)
-βœ… Pushed to main (3 commits, 2 files, +2)
+βœ… Pushed to main (3 commits, 2 files, +2)
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_branch_matching_tree_content.snap b/tests/snapshots/integration__integration_tests__remove__remove_branch_matching_tree_content.snap
index d1c22c49e..1ce643f9c 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_branch_matching_tree_content.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_branch_matching_tree_content.snap
@@ -25,4 +25,4 @@ exit_code: 0
----- stderr -----
βšͺ No worktree found for branch feature-squashed
-βœ… Removed branch feature-squashed
+βœ… Removed branch feature-squashed
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_branch_only_force_delete.snap b/tests/snapshots/integration__integration_tests__remove__remove_branch_only_force_delete.snap
index 2f21a2ce1..25adaf15a 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_branch_only_force_delete.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_branch_only_force_delete.snap
@@ -26,4 +26,4 @@ exit_code: 0
----- stderr -----
βšͺ No worktree found for branch feature-force
-βœ… Removed branch feature-force (--force-delete)
+βœ… Removed branch feature-force (--force-delete)
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_branch_only_merged.snap b/tests/snapshots/integration__integration_tests__remove__remove_branch_only_merged.snap
index f709b2460..862062664 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_branch_only_merged.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_branch_only_merged.snap
@@ -25,4 +25,4 @@ exit_code: 0
----- stderr -----
βšͺ No worktree found for branch feature-merged
-βœ… Removed branch feature-merged
+βœ… Removed branch feature-merged
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_foreground.snap b/tests/snapshots/integration__integration_tests__remove__remove_foreground.snap
index 343bf489b..e7e757226 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_foreground.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_foreground.snap
@@ -26,4 +26,4 @@ exit_code: 0
----- stderr -----
πŸ”„ Removing worktree for feature-fg...
-βœ… Removed worktree & branch for feature-fg
+βœ… Removed worktree & branch for feature-fg