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.rsindex 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.rsindex 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.rsindex 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.rsindex 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 leakformat!(- "{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.rsindex 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 ------ π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[0m (no commit/squash/rebase needed)+ π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[36m (no commit/squash/rebase needed)[0m[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)- β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+ β [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0mβͺ Worktree preserved (--no-remove)");});@@ -2557,11 +2557,11 @@ fn test_merge_no_commit_no_squash_no_remove_redundant() {----- stdout ---------- stderr ------ π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[0m (no commit/squash/rebase needed)+ π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[36m (no commit/squash/rebase needed)[0m[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)- β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+ β [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0mβͺ 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.snapindex 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-π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m[HASH][0m[0m (no commit/squash/rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m[HASH][0m[36m (no commit/squash/rebase needed)[0m[107m [0m * [33m[HASH][m Add feature[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0mπ [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0mdiff --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.snapindex 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-π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m[HASH][0m[0m (no commit/squash/rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m[HASH][0m[36m (no commit/squash/rebase needed)[0m[107m [0m * [33m[HASH][m Add feature[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0mπ [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0mdiff --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.snapindex 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()π [36mRunning pre-merge [1mtest[0m:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'β All 47 tests passed in 2.3s'[0m[2m[0mβ All 47 tests passed in 2.3s-π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m[HASH][0m[0m (no commit/squash/rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m[HASH][0m[36m (no commit/squash/rebase needed)[0m[107m [0m * [33m[HASH][m Add feature[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0mπ [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0mdiff --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.snapindex 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()π [36mRunning pre-merge [1mtest[0m:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'β All 47 tests passed in 2.3s'[0m[2m[0mβ All 47 tests passed in 2.3s-π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m[HASH][0m[0m (no commit/squash/rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m[HASH][0m[36m (no commit/squash/rebase needed)[0m[107m [0m * [33m[HASH][m Add feature[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0mπ [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0mdiff --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.snapindex 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.rsexpression: output.normalized()----π [36mSquashing 3 commits into a single commit[0m (2 files, [32m+45[0m)...+π [36mSquashing 3 commits into a single commit (2 files, [32m+45[0m)...[0mπ [36mGenerating squash commit message...[0m[107m [0m [1mfeat(api): Add user authentication endpoints[0m[107m [0m@@ -26,10 +26,10 @@ tests/test_auth.py::test_token_validation PASSED [100%]All checks passed!-π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m[HASH][0m[0m (no rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m[HASH][0m[36m (no rebase needed)[0m[107m [0m * [33m[HASH][m feat(api): Add user authentication endpoints[107m [0m api/auth.py | 31 [32m+++++++++++++++++++++++++++++++[m[107m [0m tests/test_auth.py | 14 [32m++++++++++++++[m[107m [0m 2 files changed, 45 insertions(+)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 2 files, [32m+45[0m)+β [32mMerged to [1m[32mmain[0m[32m (1 commit, 2 files, [32m+45[0m)[0mπ [36mRemoving [1m[36mfeature-auth[0m[36m worktree & branch in background[0mdiff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snapindex 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 ------π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[0m (no commit/squash/rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[36m (no commit/squash/rebase needed)[0m[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0mβͺ 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.snapindex 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: 0cd '[PATH]'----- stderr ------π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[0m (no commit/squash/rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[36m (no commit/squash/rebase needed)[0m[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0mπ [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0mdiff --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.snapindex 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 ------π [36mSquashing 2 commits & working tree changes into a single commit[0m (2 files, [32m+2[0m)...+π [36mSquashing 2 commits & working tree changes into a single commit (2 files, [32m+2[0m)...[0mπ‘ [2mBackup created @ [2m330ccd6[0m[0mπ [36mGenerating squash commit message...[0m[107m [0m [1mfix: update file 1 content[0mβ [32mSquashed @ [2m[32mb54183b[0m[0m-π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36mb54183b[0m[0m (no rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36mb54183b[0m[36m (no rebase needed)[0m[107m [0m * [33mb54183b[m fix: update file 1 content[107m [0m file1.txt | 1 [32m+[m[107m [0m file2.txt | 1 [32m+[m[107m [0m 2 files changed, 2 insertions(+)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 2 files, [32m+2[0m)+β [32mMerged to [1m[32mmain[0m[32m (1 commit, 2 files, [32m+2[0m)[0mπ [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snapindex 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 ------π [36mSquashing 1 commit & working tree changes into a single commit[0m (1 file, [32m+1[0m)...+π [36mSquashing 1 commit & working tree changes into a single commit (1 file, [32m+1[0m)...[0mπ‘ [2mBackup created @ [2mb18c23e[0m[0mπ [36mGenerating squash commit message...[0mπ‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m@@ -33,9 +33,9 @@ exit_code: 0[107m [0m Combined commits:[107m [0m - feat: initial featureβ [32mSquashed @ [2m[32md118927[0m[0m-π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36md118927[0m[0m (no rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36md118927[0m[36m (no rebase needed)[0m[107m [0m * [33md118927[m Squash commits from main[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0mπ [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0mdiff --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.snapindex 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 ------π [36mSquashing 1 commit & working tree changes into a single commit[0m (1 file, [32m+1[0m)...+π [36mSquashing 1 commit & working tree changes into a single commit (1 file, [32m+1[0m)...[0mπ‘ [2mBackup created @ [2m967330a[0m[0mπ [36mGenerating squash commit message...[0m[107m [0m [1mfix: improve auth validation logic[0mβ [32mSquashed @ [2m[32m1e3993e[0m[0m-π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m1e3993e[0m[0m (no rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m1e3993e[0m[36m (no rebase needed)[0m[107m [0m * [33m1e3993e[m fix: improve auth validation logic[107m [0m auth.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0mπ [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap b/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snapindex 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 -----π‘ [33mAuto-staging 1 untracked file:[0m[107m [0m dirty.txt-π [36mCommitting changes with default message...[0m (1 file, [32m+1[0m, no squashing needed)+π [36mCommitting changes with default message... (1 file, [32m+1[0m, no squashing needed)[0mπ‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[107m [0m [1mChanges to dirty.txt[0mβ [32mCommitted changes @ [2m[32mc1126ec[0m[0m-π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36mc1126ec[0m[0m (no rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36mc1126ec[0m[36m (no rebase needed)[0m[107m [0m * [33mc1126ec[m Changes to dirty.txt[107m [0m dirty.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0mπ [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snapindex 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 ------π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[0m (no commit/squash/rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[36m (no commit/squash/rebase needed)[0m[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0mπ [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0mdiff --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.snapindex 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 -----π‘ [33mAuto-staging 1 untracked file:[0m[107m [0m newfile.txt-π [36mCommitting changes with default message...[0m (1 file, [32m+1[0m, no squashing needed)+π [36mCommitting changes with default message... (1 file, [32m+1[0m, no squashing needed)[0mπ‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[107m [0m [1mChanges to newfile.txt[0mβ [32mCommitted changes @ [2m[32m96ddfbc[0m[0m-π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m96ddfbc[0m[0m (no rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m96ddfbc[0m[36m (no rebase needed)[0m[107m [0m * [33m96ddfbc[m Changes to newfile.txt[107m [0m newfile.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0mπ [36mRemoving [1m[36mno-commits-dirty[0m[36m worktree & branch in background[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snapindex 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 ------π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[0m (no commit/squash/rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[36m (no commit/squash/rebase needed)[0m[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0mπ [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snapindex 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 ------π [36mMerging 2 commits to [1m[36mmain[0m[36m @ [2m[36mbf212d3[0m[0m (no commit/squash/rebase needed)+π [36mMerging 2 commits to [1m[36mmain[0m[36m @ [2m[36mbf212d3[0m[36m (no commit/squash/rebase needed)[0m[107m [0m * [33mbf212d3[m feat: add file 2[107m [0m * [33m123e46c[m feat: add file 1[107m [0m file1.txt | 1 [32m+[m[107m [0m file2.txt | 1 [32m+[m[107m [0m 2 files changed, 2 insertions(+)-β [32mMerged to [1m[32mmain[0m[0m (2 commits, 2 files, [32m+2[0m)+β [32mMerged to [1m[32mmain[0m[32m (2 commits, 2 files, [32m+2[0m)[0mπ [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0mdiff --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 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 ------π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m4af48f0[0m[0m (no commit/squash/rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m4af48f0[0m[36m (no commit/squash/rebase needed)[0m[107m [0m * [33m4af48f0[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0mπ [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0mdiff --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.snapindex 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 ------π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36mcdb002e[0m[0m (no commit/squash/rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36mcdb002e[0m[36m (no commit/squash/rebase needed)[0m[107m [0m * [33mcdb002e[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0mπ [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0mπ [36mRunning post-merge:[0m[107m [0m [2m[0m[2m[34mexit[0m[2m 1[0mdiff --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.snapindex 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 ------π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m8609b84[0m[0m (no commit/squash/rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m8609b84[0m[36m (no commit/squash/rebase needed)[0m[107m [0m * [33m8609b84[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0mπ [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0mπ [36mRunning post-merge [1mnotify[0m:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Merge to main complete'[0m[2m [0m[2m[36m>[0m[2m notify.txt[0mdiff --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.snapindex 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 ------π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m72ff5fc[0m[0m (no commit/squash/rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m72ff5fc[0m[36m (no commit/squash/rebase needed)[0m[107m [0m * [33m72ff5fc[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0mπ [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0mdiff --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.snapindex 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 ------π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m72ff5fc[0m[0m (no commit/squash/rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m72ff5fc[0m[36m (no commit/squash/rebase needed)[0m[107m [0m * [33m72ff5fc[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0mπ [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0mπ [36mRunning post-merge:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'merged feature to main'[0m[2m [0m[2m[36m>[0m[2m post-merge-ran.txt[0mdiff --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.snapindex 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π [36mRunning pre-commit:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Pre-commit check passed'[0m[2m[0m[0mPre-commit check passed-π [36mCommitting changes with default message...[0m (1 file, [32m+1[0m, no squashing needed)+π [36mCommitting changes with default message... (1 file, [32m+1[0m, no squashing needed)[0mπ‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[107m [0m [1mChanges to feature.txt[0mβ [32mCommitted changes @ [2m[32mcdc8f90[0m[0m-π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36mcdc8f90[0m[0m (no rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36mcdc8f90[0m[36m (no rebase needed)[0m[107m [0m * [33mcdc8f90[m Changes to feature.txt[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0mπ [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0mdiff --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.snapindex 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[107m [0m [2m[0m[2m[34mexit[0m[2m 0[0m[0mπ [36mRunning pre-merge [1mtest[0m:[0m[107m [0m [2m[0m[2m[34mexit[0m[2m 0[0m-[0mπ [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m2cbe2a2[0m[0m (no commit/squash/rebase needed)+[0mπ [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m2cbe2a2[0m[36m (no commit/squash/rebase needed)[0m[107m [0m * [33m2cbe2a2[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0mπ [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0mdiff --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.snapindex 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 -----π [36mRunning pre-merge:[0m[107m [0m [2m[0m[2m[34mexit[0m[2m 0[0m-[0mπ [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m4b1199c[0m[0m (no commit/squash/rebase needed)+[0mπ [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m4b1199c[0m[36m (no commit/squash/rebase needed)[0m[107m [0m * [33m4b1199c[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0mπ [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0mdiff --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.snapindex 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π [36mRunning pre-commit:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Pre-commit check passed'[0m[2m[0m[0mPre-commit check passed-π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m726717f[0m[0m (no commit/squash/rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m726717f[0m[36m (no commit/squash/rebase needed)[0m[107m [0m * [33m726717f[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0mπ [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0mdiff --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.snapindex 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 ------π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[0m (no commit/squash/rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[36m (no commit/squash/rebase needed)[0m[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0mπ [36mRemoving [1m[36mfeature-from-develop[0m[36m worktree & branch in background[0mdiff --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.snapindex 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 -----π [36mRebasing onto [1m[36mmain[0m[36m...[0mβ [32mRebased onto [1m[32mmain[0m[0m-π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m76778cc[0m[0m (no commit/squash needed)+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m76778cc[0m[36m (no commit/squash needed)[0m[107m [0m * [33m76778cc[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0mπ [36mRemoving [1m[36mfeature-dirty-primary[0m[36m worktree & branch in background[0mdiff --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.snapindex 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 ------π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[0m (no commit/squash/rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[36m (no commit/squash/rebase needed)[0m[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0mβͺ 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.snapindex 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 -----π [36mRebasing onto [1m[36mmain[0m[36m...[0mβ [32mRebased onto [1m[32mmain[0m[0m-π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36mae48a8e[0m[0m (no commit/squash needed)+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36mae48a8e[0m[36m (no commit/squash needed)[0m[107m [0m * [33mae48a8e[m Add feature[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0mπ [36mRemoving [1m[36mtrue-rebase-test[0m[36m worktree & branch in background[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snapindex 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 ------π [36mSquashing 3 commits into a single commit[0m (3 files, [32m+3[0m)...+π [36mSquashing 3 commits into a single commit (3 files, [32m+3[0m)...[0mπ [36mGenerating squash commit message...[0mπ‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[107m [0m [1mSquash commits from main[0m@@ -34,11 +34,11 @@ exit_code: 0[107m [0m - fix: update logic[107m [0m - docs: update readmeβ [32mSquashed @ [2m[32m27eb169[0m[0m-π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m27eb169[0m[0m (no rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m27eb169[0m[36m (no rebase needed)[0m[107m [0m * [33m27eb169[m Squash commits from main[107m [0m file1.txt | 1 [32m+[m[107m [0m file2.txt | 1 [32m+[m[107m [0m file3.txt | 1 [32m+[m[107m [0m 3 files changed, 3 insertions(+)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 3 files, [32m+3[0m)+β [32mMerged to [1m[32mmain[0m[32m (1 commit, 3 files, [32m+3[0m)[0mπ [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_error.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_error.snapindex 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 ------π [36mSquashing 2 commits into a single commit[0m (2 files, [32m+2[0m)...+π [36mSquashing 2 commits into a single commit (2 files, [32m+2[0m)...[0mπ [36mGenerating squash commit message...[0mβ [31mCommit generation command failed[0m[107m [0m Error: connection refuseddiff --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 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 ------π [36mSquashing 2 commits into a single commit[0m (2 files, [32m+2[0m)...+π [36mSquashing 2 commits into a single commit (2 files, [32m+2[0m)...[0mπ [36mGenerating squash commit message...[0mπ‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[107m [0m [1mSquash commits from main[0m@@ -34,10 +34,10 @@ exit_code: 0[107m [0m - feat: new feature[107m [0m - fix: bug fixβ [32mSquashed @ [2m[32m091f0c5[0m[0m-π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m091f0c5[0m[0m (no rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m091f0c5[0m[36m (no rebase needed)[0m[107m [0m * [33m091f0c5[m Squash commits from main[107m [0m file1.txt | 1 [32m+[m[107m [0m file2.txt | 1 [32m+[m[107m [0m 2 files changed, 2 insertions(+)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 2 files, [32m+2[0m)+β [32mMerged to [1m[32mmain[0m[32m (1 commit, 2 files, [32m+2[0m)[0mπ [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[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 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 ------π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m525a81f[0m[0m (no commit/squash/rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m525a81f[0m[36m (no commit/squash/rebase needed)[0m[107m [0m * [33m525a81f[m feat: single commit[107m [0m file1.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0mπ [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0mdiff --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 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 ------π [36mSquashing 2 commits into a single commit[0m (1 file, [32m+1[0m)...+π [36mSquashing 2 commits into a single commit (1 file, [32m+1[0m)...[0mπ [36mGenerating squash commit message...[0m[107m [0m [1mfeat: implement user authentication system[0mβ [32mSquashed @ [2m[32md42412f[0m[0m-π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36md42412f[0m[0m (no rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36md42412f[0m[36m (no rebase needed)[0m[107m [0m * [33md42412f[m feat: implement user authentication system[107m [0m auth.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0mπ [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0mdiff --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.snapindex 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 ------π [36mSquashing 2 commits & working tree changes into a single commit[0m (2 files, [32m+2[0m)...+π [36mSquashing 2 commits & working tree changes into a single commit (2 files, [32m+2[0m)...[0mπ‘ [2mBackup created @ [2m330ccd6[0m[0mπ [36mGenerating squash commit message...[0mπ‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m@@ -36,10 +36,10 @@ exit_code: 0[107m [0m - feat: add file 1[107m [0m - feat: add file 2β [32mSquashed @ [2m[32md34e4c3[0m[0m-π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36md34e4c3[0m[0m (no rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36md34e4c3[0m[36m (no rebase needed)[0m[107m [0m * [33md34e4c3[m Squash commits from main[107m [0m file1.txt | 1 [32m+[m[107m [0m file2.txt | 1 [32m+[m[107m [0m 2 files changed, 2 insertions(+)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 2 files, [32m+2[0m)+β [32mMerged to [1m[32mmain[0m[32m (1 commit, 2 files, [32m+2[0m)[0mπ [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snapindex 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 ------π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[0m (no commit/squash/rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[36m (no commit/squash/rebase needed)[0m[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0mπ [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0mdiff --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.snapindex 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 -----π [36mRebasing onto [1m[36mstaging[0m[36m...[0mβ [32mRebased onto [1m[32mstaging[0m[0m-π [36mMerging 1 commit to [1m[36mstaging[0m[36m @ [2m[36m8280b9e[0m[0m (no commit/squash needed)+π [36mMerging 1 commit to [1m[36mstaging[0m[36m @ [2m[36m8280b9e[0m[36m (no commit/squash needed)[0m[107m [0m * [33m8280b9e[m Add feature for staging[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1m[32mstaging[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mMerged to [1m[32mstaging[0m[32m (1 commit, 1 file, [32m+1[0m)[0mπ [36mRemoving [1m[36mfeature-for-staging[0m[36m worktree & branch in background[0mdiff --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.snapindex 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 ------π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[0m (no commit/squash/rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[36m (no commit/squash/rebase needed)[0m[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0mπ [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snapindex 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 ------π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[0m (no commit/squash/rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[36m (no commit/squash/rebase needed)[0m[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0mπ [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snapindex 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 ------π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[0m (no commit/squash/rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[36m (no commit/squash/rebase needed)[0m[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0mβͺ 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.snapindex 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π‘ [33mAuto-staging 2 untracked files:[0m[107m [0m untracked1.txt[107m [0m untracked2.txt-π [36mSquashing 1 commit & working tree changes into a single commit[0m (3 files, [32m+3[0m)...+π [36mSquashing 1 commit & working tree changes into a single commit (3 files, [32m+3[0m)...[0mπ‘ [2mBackup created @ [2m4967998[0m[0mπ [36mGenerating squash commit message...[0mπ‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m@@ -38,11 +38,11 @@ exit_code: 0[107m [0m Combined commits:[107m [0m - feat: add file 1β [32mSquashed @ [2m[32mfbfc726[0m[0m-π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36mfbfc726[0m[0m (no rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36mfbfc726[0m[36m (no rebase needed)[0m[107m [0m * [33mfbfc726[m Squash commits from main[107m [0m file1.txt | 1 [32m+[m[107m [0m untracked1.txt | 1 [32m+[m[107m [0m untracked2.txt | 1 [32m+[m[107m [0m 3 files changed, 3 insertions(+)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 3 files, [32m+3[0m)+β [32mMerged to [1m[32mmain[0m[32m (1 commit, 3 files, [32m+3[0m)[0mπ [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snapindex 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 ------π [36mSquashing 3 commits into a single commit[0m (3 files, [32m+33[0m)...+π [36mSquashing 3 commits into a single commit (3 files, [32m+33[0m)...[0mπ [36mGenerating squash commit message...[0m[107m [0m [1mfeat(auth): Implement JWT authentication system[0m[107m [0m@@ -54,13 +54,13 @@ test result: ok. 18 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; fin[107m [0m [2m[0m[2m[34mcargo[0m[2m clippy[0m[0m Checking worktrunk v0.1.0Finished dev [unoptimized + debuginfo] target(s) in 1.23s-π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m95c3316[0m[0m (no rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m95c3316[0m[36m (no rebase needed)[0m[107m [0m * [33m95c3316[m feat(auth): Implement JWT authentication system[107m [0m auth.rs | 8 [32m++++++++[m[107m [0m auth_test.rs | 17 [32m+++++++++++++++++[m[107m [0m jwt.rs | 8 [32m++++++++[m[107m [0m 3 files changed, 33 insertions(+)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 3 files, [32m+33[0m)+β [32mMerged to [1m[32mmain[0m[32m (1 commit, 3 files, [32m+33[0m)[0mπ [36mRemoving [1m[36mfeature-auth[0m[36m worktree & branch in background[0mπ [36mRunning post-merge [1minstall[0m:[0m[107m [0m [2m[0m[2m[34mcargo[0m[2m install [0m[2m[36m--path[0m[2m .[0mdiff --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.snapindex 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 ------π [36mSquashing 3 commits into a single commit[0m (2 files, [32m+45[0m)...+π [36mSquashing 3 commits into a single commit (2 files, [32m+45[0m)...[0mπ [36mGenerating squash commit message...[0m[107m [0m [1mfeat(api): Add user authentication endpoints[0m[107m [0m@@ -50,10 +50,10 @@ tests/test_auth.py::test_token_validation PASSED [100%][0mAll checks passed!-π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m69200cc[0m[0m (no rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m69200cc[0m[36m (no rebase needed)[0m[107m [0m * [33m69200cc[m feat(api): Add user authentication endpoints[107m [0m api/auth.py | 31 [32m+++++++++++++++++++++++++++++++[m[107m [0m tests/test_auth.py | 14 [32m++++++++++++++[m[107m [0m 2 files changed, 45 insertions(+)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 2 files, [32m+45[0m)+β [32mMerged to [1m[32mmain[0m[32m (1 commit, 2 files, [32m+45[0m)[0mπ [36mRemoving [1m[36mfeature-auth[0m[36m worktree & branch in background[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snapindex 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 ------π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36md29e0fd[0m[0m (no commit/squash/rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36md29e0fd[0m[36m (no commit/squash/rebase needed)[0m[107m [0m * [33md29e0fd[m Implement JWT validation[107m [0m auth.rs | 13 [32m+++++++++++++[m[107m [0m 1 file changed, 13 insertions(+)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+13[0m)+β [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+13[0m)[0mπ [36mRemoving [1m[36mfix-auth[0m[36m worktree & branch in background[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__step_commit_both_flags.snap b/tests/snapshots/integration__integration_tests__merge__step_commit_both_flags.snapindex 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 -----π‘ [2mSkipping pre-commit hook (--no-verify)[0m-π [36mCommitting tracked changes with default message...[0m (1 file, [32m+1[0m, [31m-1[0m)+π [36mCommitting tracked changes with default message... (1 file, [32m+1[0m, [31m-1[0m)[0mπ‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[107m [0m [1mChanges to tracked.txt[0mβ [32mCommitted changes @ [2m[32ma5890cb[0m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__step_commit_no_verify.snap b/tests/snapshots/integration__integration_tests__merge__step_commit_no_verify.snapindex 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π‘ [33mAuto-staging 2 untracked files:[0m[107m [0m .config/[107m [0m file1.txt-π [36mCommitting changes with default message...[0m (2 files, [32m+2[0m)+π [36mCommitting changes with default message... (2 files, [32m+2[0m)[0mπ‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[107m [0m [1mChanges to wt.toml & file1.txt[0mβ [32mCommitted changes @ [2m[32m3dbcd5d[0m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__step_commit_stage_tracked.snap b/tests/snapshots/integration__integration_tests__merge__step_commit_stage_tracked.snapindex 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 ------π [36mCommitting tracked changes with default message...[0m (1 file, [32m+1[0m, [31m-1[0m)+π [36mCommitting tracked changes with default message... (1 file, [32m+1[0m, [31m-1[0m)[0mπ‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[107m [0m [1mChanges to tracked.txt[0mβ [32mCommitted changes @ [2m[32m7d441f0[0m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__step_squash_both_flags.snap b/tests/snapshots/integration__integration_tests__merge__step_squash_both_flags.snapindex 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 -----π‘ [2mSkipping pre-commit hook (--no-verify)[0m-π [36mSquashing 2 commits & tracked changes into a single commit[0m (3 files, [32m+3[0m)...+π [36mSquashing 2 commits & tracked changes into a single commit (3 files, [32m+3[0m)...[0mπ‘ [2mBackup created @ [2m31e06e8[0m[0mπ [36mGenerating squash commit message...[0mπ‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__step_squash_no_verify.snap b/tests/snapshots/integration__integration_tests__merge__step_squash_no_verify.snapindex 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 -----π‘ [2mSkipping pre-commit hook (--no-verify)[0m-π [36mSquashing 2 commits into a single commit[0m (3 files, [32m+3[0m)...+π [36mSquashing 2 commits into a single commit (3 files, [32m+3[0m)...[0mπ [36mGenerating squash commit message...[0mπ‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[107m [0m [1mSquash commits from main[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__step_squash_stage_tracked.snap b/tests/snapshots/integration__integration_tests__merge__step_squash_stage_tracked.snapindex 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 ------π [36mSquashing 2 commits & tracked changes into a single commit[0m (2 files, [32m+2[0m)...+π [36mSquashing 2 commits & tracked changes into a single commit (2 files, [32m+2[0m)...[0mπ‘ [2mBackup created @ [2mba1424b[0m[0mπ [36mGenerating squash commit message...[0mπ‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0mdiff --git a/tests/snapshots/integration__integration_tests__push__push_dirty_target_autostash.snap b/tests/snapshots/integration__integration_tests__push__push_dirty_target_autostash.snapindex 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 -----π [36mStashing changes in [1m[36m[REPO][0m[36m...[0m-π [36mPushing 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[0m+π [36mPushing 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[36m[0m[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)π [36mRestoring stashed changes in [1m[36m[REPO][0m[36m...[0m-β [32mPushed to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mPushed to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0mdiff --git a/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_fast_forward.snapindex 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 ------π [36mPushing 1 commit to [1m[36mmain[0m[36m @ [2m[36mc2e2bcc[0m[0m+π [36mPushing 1 commit to [1m[36mmain[0m[36m @ [2m[36mc2e2bcc[0m[36m[0m[107m [0m * [33mc2e2bcc[m Add test file[107m [0m test.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mPushed to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mPushed to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0mdiff --git a/tests/snapshots/integration__integration_tests__push__push_no_remote.snap b/tests/snapshots/integration__integration_tests__push__push_no_remote.snapindex 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 ------π [36mPushing 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[0m+π [36mPushing 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[36m[0m[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mPushed to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mPushed to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0mdiff --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 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 ------π [36mPushing 1 commit to [1m[36mmain[0m[36m @ [2m[36m4af48f0[0m[0m+π [36mPushing 1 commit to [1m[36mmain[0m[36m @ [2m[36m4af48f0[0m[36m[0m[107m [0m * [33m4af48f0[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mPushed to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mPushed to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0mdiff --git a/tests/snapshots/integration__integration_tests__push__push_to_default.snap b/tests/snapshots/integration__integration_tests__push__push_to_default.snapindex 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 ------π [36mPushing 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[0m+π [36mPushing 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[36m[0m[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mPushed to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mPushed to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0mdiff --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.snapindex 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 ------π [36mPushing 3 commits to [1m[36mmain[0m[36m @ [2m[36m13bed7b[0m[0m (merge commits allowed)+π [36mPushing 3 commits to [1m[36mmain[0m[36m @ [2m[36m13bed7b[0m[36m (merge commits allowed)[0m[107m [0m * [33m13bed7b[m Merge temp[107m [0m [31m|[m[32m/[m[107m [0m [31m|[m * [33m1f38fab[m Commit 2@@ -35,4 +35,4 @@ exit_code: 0[107m [0m file1.txt | 1 [32m+[m[107m [0m file2.txt | 1 [32m+[m[107m [0m 2 files changed, 2 insertions(+)-β [32mPushed to [1m[32mmain[0m[0m (3 commits, 2 files, [32m+2[0m)+β [32mPushed to [1m[32mmain[0m[32m (3 commits, 2 files, [32m+2[0m)[0mdiff --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.snapindex 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 -----βͺ [90mNo worktree found for branch feature-squashed[0m-β [32mRemoved branch [1m[32mfeature-squashed[0m[0m+β [32mRemoved branch [1m[32mfeature-squashed[0m[32m[0mdiff --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.snapindex 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 -----βͺ [90mNo worktree found for branch feature-force[0m-β [32mRemoved branch [1m[32mfeature-force[0m[0m (--force-delete)+β [32mRemoved branch [1m[32mfeature-force[0m[32m (--force-delete)[0mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_branch_only_merged.snap b/tests/snapshots/integration__integration_tests__remove__remove_branch_only_merged.snapindex 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 -----βͺ [90mNo worktree found for branch feature-merged[0m-β [32mRemoved branch [1m[32mfeature-merged[0m[0m+β [32mRemoved branch [1m[32mfeature-merged[0m[32m[0mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_foreground.snap b/tests/snapshots/integration__integration_tests__remove__remove_foreground.snapindex 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 -----π [36mRemoving worktree for [1m[36mfeature-fg[0m[36m...[0m-β [32mRemoved worktree & branch for [1m[32mfeature-fg[0m[0m+β [32mRemoved worktree & branch for [1m[32mfeature-fg[0m[32m[0m