Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Refactor merge message reasons for clarity
Maximilian Roos301419bd0111
diff --git a/CLAUDE.md b/CLAUDE.mdindex c0d2a285f..185082024 100644--- a/CLAUDE.md+++ b/CLAUDE.md@@ -168,8 +168,8 @@ Use consistent punctuation and structure for related messages:```rust// β GOOD - parallel structure with integration reason explaining branch deletion// Both wt merge and wt remove show integration reason when branch is deleted-"Removing feature worktree & branch in background (ancestor of main)" // Branch is integrated (ancestor)-"Removing feature worktree & branch in background (contents match main)" // Branch is integrated (squash/rebase)+"Removing feature worktree & branch in background (already in main)" // Branch is integrated (ancestor)+"Removing feature worktree & branch in background (files match main)" // Branch is integrated (squash/rebase)"Removing feature worktree in background; retaining unmerged branch" // Unmerged (system keeps)"Removing feature worktree in background; retaining branch (--no-delete-branch)" // User flag (user keeps)```diff --git a/README.md b/README.mdindex 71c74cf63..54d1dcc11 100644--- a/README.md+++ b/README.md@@ -112,7 +112,7 @@ Say we merged via CI, our changes are on main, and we're finished with the workt```console$ wt remove-π Removing feature-api worktree & branch in background (no marginal contribution to main)+π Removing feature-api worktree & branch in background (already in main)```<!-- END AUTO-GENERATED -->@@ -320,7 +320,7 @@ test result: ok. 18 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finjwt.rs | 8 ++++++++3 files changed, 33 insertions(+)β Merged to main (1 commit, 3 files, +33)-π Removing feature-auth worktree & branch in background (no marginal contribution to main)+π Removing feature-auth worktree & branch in background (already in main)π Running post-merge install:cargo install --path .Installing worktrunk v0.1.0diff --git a/docs/content/quickstart.md b/docs/content/quickstart.mdindex 95dda7176..3a6af86de 100644--- a/docs/content/quickstart.md+++ b/docs/content/quickstart.md@@ -55,7 +55,7 @@ When you're done with a worktree (e.g., after merging via CI):```bash$ wt remove-π Removing feature-api worktree & branch in background (no marginal contribution to main)+π Removing feature-api worktree & branch in background (already in main)```Worktrunk checks if your changes are already on main before deleting the branch.diff --git a/src/output/global.rs b/src/output/global.rsindex e1a338a73..92323fc4c 100644--- a/src/output/global.rs+++ b/src/output/global.rs@@ -105,6 +105,14 @@ pub fn warning(message: impl Into<String>) -> io::Result<()> {with_output(|h| h.warning(message.into()))}+/// Emit an error message+///+/// Error messages indicate failures like "β Failed to delete branch"+/// They use ERROR_EMOJI (β) and red styling.+pub fn error(message: impl Into<String>) -> io::Result<()> {+ with_output(|h| h.error(message.into()))+}+/// Print a message (written as-is)////// The caller is responsible for formatting.diff --git a/src/output/handlers.rs b/src/output/handlers.rsindex 0215e2634..e6896611c 100644--- a/src/output/handlers.rs+++ b/src/output/handlers.rs@@ -130,15 +130,15 @@ fn handle_branch_deletion_result(Ok(None) => {// Branch not integrated - we chose not to delete (not a failure)super::info(cformat!(- "Branch <bold>{branch_name}</> retained; not integrated into HEAD"+ "Branch <bold>{branch_name}</> retained; has unmerged changes"))?;Ok(None)}Err(e) => {- // Git command failed - show warning with actual error details- super::warning(cformat!("Could not delete branch <bold>{branch_name}</>"))?;+ // Git command failed - this is an error (we decided to delete but couldn't)+ super::error(cformat!("Failed to delete branch <bold>{branch_name}</>"))?;super::gutter(format_with_gutter(&e.to_string(), "", None))?;- Ok(None)+ Err(e)}}}@@ -161,9 +161,9 @@ fn get_flag_note(// Show integration reason when branch is deleted (both wt merge and wt remove)match deletion_result {Some(Some(IntegrationReason::NoMarginalContribution)) => {- format!(" (no marginal contribution to {target})")+ format!(" (already in {target})")}- Some(Some(IntegrationReason::ContentsMatch)) => format!(" (contents match {target})"),+ Some(Some(IntegrationReason::ContentsMatch)) => format!(" (files match {target})"),Some(None) | None => String::new(),}} else {diff --git a/src/output/mod.rs b/src/output/mod.rsindex 769a681d2..17a80cffc 100644--- a/src/output/mod.rs+++ b/src/output/mod.rs@@ -63,8 +63,8 @@ mod traits;// Re-export the public APIpub use global::{- OutputMode, blank, change_directory, data, execute, flush, flush_for_stderr_prompt, gutter,- hint, info, initialize, print, progress, shell_integration_hint, success, table,+ OutputMode, blank, change_directory, data, error, execute, flush, flush_for_stderr_prompt,+ gutter, hint, info, initialize, print, progress, shell_integration_hint, success, table,terminate_output, warning,};// Re-export output handlersdiff --git a/src/output/traits.rs b/src/output/traits.rsindex b1a51b557..3fc2d00db 100644--- a/src/output/traits.rs+++ b/src/output/traits.rs@@ -11,6 +11,7 @@//! - progress β cyan//! - hint β dimmed//! - warning β yellow+//! - error β red//! - info β no color (neutral status)//!//! Callers provide content with optional inner styling (like `<bold>`) using `cformat!`.@@ -19,7 +20,9 @@use color_print::cformat;use std::io::{self, Write};use std::path::Path;-use worktrunk::styling::{HINT_EMOJI, INFO_EMOJI, PROGRESS_EMOJI, SUCCESS_EMOJI, WARNING_EMOJI};+use worktrunk::styling::{+ ERROR_EMOJI, HINT_EMOJI, INFO_EMOJI, PROGRESS_EMOJI, SUCCESS_EMOJI, WARNING_EMOJI,+};/// Core output handler trait///@@ -54,6 +57,11 @@ pub trait OutputHandler {self.write_message_line(&cformat!("{WARNING_EMOJI} <yellow>{message}</>"))}+ /// Emit an error message (automatically wrapped in red)+ fn error(&mut self, message: String) -> io::Result<()> {+ self.write_message_line(&cformat!("{ERROR_EMOJI} <red>{message}</>"))+ }+/// Print a message (written as-is)fn print(&mut self, message: String) -> io::Result<()> {self.write_message_line(&message)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 37755833f..fb1e7b3f7 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@@ -27,4 +27,4 @@ expression: output.normalized()[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (already in main)[39m[39mdiff --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 37755833f..fb1e7b3f7 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@@ -27,4 +27,4 @@ expression: output.normalized()[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (already in main)[39m[39mdiff --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 df30a26a7..baf781fb8 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@@ -16,4 +16,4 @@ expression: output.normalized()[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (already in main)[39m[39mdiff --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 df30a26a7..baf781fb8 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@@ -16,4 +16,4 @@ expression: output.normalized()[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (already in main)[39m[39mdiff --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 3128c655c..60067d250 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@@ -32,4 +32,4 @@ All checks passed![107m [0m tests/test_auth.py | 14 [32m++++++++++++++[m[107m [0m 2 files changed, 45 insertions(+)β [32mMerged to [1mmain[22m [90m(1 commit, 2 files, [32m+45[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature-auth[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mfeature-auth[22m worktree & branch in background (already in main)[39m[39mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_remove.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_remove.snapindex f41391bb2..2819bbf23 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_remove.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_remove.snap@@ -2,4 +2,4 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()----π [36m[36mRemoving [1mfeature-api[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mfeature-api[22m worktree & branch in background (already in main)[39m[39mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__remove.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__remove.snapindex 7ae76881a..61b563972 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__remove.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__remove.snap@@ -2,4 +2,4 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()----π [36m[36mRemoving [1mto-remove[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mto-remove[22m worktree & branch in background (already in main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snapindex f367f345d..5e792af90 100644--- a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap+++ b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap@@ -30,4 +30,4 @@ cd '[PATH]'[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (already in main)[39m[39mdiff --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 040d5c3c9..5e3609c3c 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@@ -34,4 +34,4 @@ exit_code: 0[107m [0m file2.txt | 1 [32m+[m[107m [0m 2 files changed, 2 insertions(+)β [32mMerged to [1mmain[22m [90m(1 commit, 2 files, [32m+2[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (already in main)[39m[39mdiff --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 68b8f911c..ca97f4a7c 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@@ -37,4 +37,4 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (already in main)[39m[39mdiff --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 834bafdf1..cc75d4126 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@@ -33,4 +33,4 @@ exit_code: 0[107m [0m auth.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (already in main)[39m[39mdiff --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 99113f527..59e19410c 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@@ -34,4 +34,4 @@ exit_code: 0[107m [0m dirty.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (already in main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snapindex e19ff9b0b..700e30884 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap@@ -28,4 +28,4 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (already in main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snapindex a0ff8744f..b7cdcd172 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap@@ -24,4 +24,4 @@ exit_code: 0----- stderr -----βͺ Already up to date with [1mmain[22m (no new commits, no rebase needed)-π [36m[36mRemoving [1mno-commits[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mno-commits[22m worktree & branch in background (already in main)[39m[39mdiff --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 cdf5d5b04..46189d961 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@@ -34,4 +34,4 @@ exit_code: 0[107m [0m newfile.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mno-commits-dirty[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mno-commits-dirty[22m worktree & branch in background (already in main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snapindex aa25ec1fd..ef64f7e1c 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap@@ -27,4 +27,4 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (already in main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snapindex f82c3b25c..1ea907013 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap@@ -31,4 +31,4 @@ exit_code: 0[107m [0m file2.txt | 1 [32m+[m[107m [0m 2 files changed, 2 insertions(+)β [32mMerged to [1mmain[22m [90m(2 commits, 2 files, [32m+2[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (already in main)[39m[39mdiff --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 27f765742..2b2539a08 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@@ -28,4 +28,4 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (already in main)[39m[39mdiff --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 6be676cf0..b11306b7c 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@@ -29,7 +29,7 @@ exit_code: 1[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (already in main)[39m[39mπ [36mRunning post-merge:[39m[107m [0m [2m[0m[2m[34mexit[0m[2m 1[0m[0mπ‘ [33mCommand failed: exit status: 1[39mdiff --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 2872b3654..4a41235ba 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@@ -29,7 +29,7 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (already in main)[39m[39mπ [36mRunning post-merge [1mnotify[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Merge to main complete'[0m[2m [0m[2m[36m>[0m[2m notify.txt[0m[0mπ [36mRunning post-merge [1mdeploy[22m:[39mdiff --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 2ed09a2c1..4fa74d0fb 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@@ -30,4 +30,4 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (already in main)[39m[39mdiff --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 8dfae9007..fa5d181f5 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@@ -29,7 +29,7 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (already in main)[39m[39mπ [36mRunning post-merge:[39m[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[0m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_with_nothing_to_merge.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_with_nothing_to_merge.snapindex 205aa4f7f..90312e838 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_with_nothing_to_merge.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_with_nothing_to_merge.snap@@ -25,7 +25,7 @@ exit_code: 0----- stderr -----βͺ Already up to date with [1mmain[22m (no new commits, no rebase needed)-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (already in main)[39m[39mπ [36mRunning post-merge:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'post-merge ran'[0m[2m [0m[2m[36m>[0m[2m post-merge-ran.txt[0m[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 79a68dc5d..7bd792e6d 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@@ -38,4 +38,4 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (already in main)[39m[39mdiff --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 00da296da..741576fb9 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@@ -35,4 +35,4 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (already in main)[39m[39mdiff --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 3b1993a57..76e8c58e1 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@@ -31,4 +31,4 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (already in main)[39m[39mdiff --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 014381346..da97cfce2 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@@ -32,4 +32,4 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (already in main)[39m[39mdiff --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 8d9ffd9d6..e28d24ecc 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@@ -28,4 +28,4 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature-from-develop[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mfeature-from-develop[22m worktree & branch in background (already in main)[39m[39mdiff --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 475cfa037..666b2d7c1 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@@ -30,4 +30,4 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature-dirty-primary[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mfeature-dirty-primary[22m worktree & branch in background (already in main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_rebase_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_rebase_fast_forward.snapindex a30934f38..d1705d484 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_rebase_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_rebase_fast_forward.snap@@ -25,4 +25,4 @@ exit_code: 0----- stderr -----β [32mFast-forwarded to [1mmain[22m[39mβͺ Already up to date with [1mmain[22m (no new commits)-π [36m[36mRemoving [1mfast-forward-test[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mfast-forward-test[22m worktree & branch in background (already in main)[39m[39mdiff --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 572f5e13f..fbe4bbb47 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@@ -30,4 +30,4 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mtrue-rebase-test[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mtrue-rebase-test[22m worktree & branch in background (already in main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snapindex bcc32cb65..8325a7222 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap@@ -40,4 +40,4 @@ exit_code: 0[107m [0m file3.txt | 1 [32m+[m[107m [0m 3 files changed, 3 insertions(+)β [32mMerged to [1mmain[22m [90m(1 commit, 3 files, [32m+3[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (already in main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snapindex 7573809ef..b4e92c8a3 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap@@ -34,4 +34,4 @@ exit_code: 0[107m [0m - Revert to initialβͺ No changes after squashing 3 commitsβͺ Already up to date with [1mmain[22m (no new commits, no rebase needed)-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (already in main)[39m[39mdiff --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 894ca7597..f7e2c7898 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@@ -39,4 +39,4 @@ exit_code: 0[107m [0m file2.txt | 1 [32m+[m[107m [0m 2 files changed, 2 insertions(+)β [32mMerged to [1mmain[22m [90m(1 commit, 2 files, [32m+2[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (already in main)[39m[39mdiff --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 5e77d72b2..c20238746 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@@ -28,4 +28,4 @@ exit_code: 0[107m [0m file1.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (already in main)[39m[39mdiff --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 aa68a8441..c3a8d5a2c 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@@ -32,4 +32,4 @@ exit_code: 0[107m [0m auth.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (already in main)[39m[39mdiff --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 9628cc8b7..b34999099 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@@ -41,4 +41,4 @@ exit_code: 0[107m [0m file2.txt | 1 [32m+[m[107m [0m 2 files changed, 2 insertions(+)β [32mMerged to [1mmain[22m [90m(1 commit, 2 files, [32m+2[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (already in main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snapindex aa25ec1fd..ef64f7e1c 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap@@ -27,4 +27,4 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (already in main)[39m[39mdiff --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 a255b40d1..26a3c127e 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@@ -30,4 +30,4 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mstaging[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature-for-staging[22m worktree & branch in background (no marginal contribution to staging)[39m[39m+π [36m[36mRemoving [1mfeature-for-staging[22m worktree & branch in background (already in staging)[39m[39mdiff --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 e19ff9b0b..700e30884 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@@ -28,4 +28,4 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (already in main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snapindex a2132389e..66937af47 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap@@ -28,4 +28,4 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (already in main)[39m[39mdiff --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 e979c9228..d7ee25a49 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@@ -44,4 +44,4 @@ exit_code: 0[107m [0m untracked2.txt | 1 [32m+[m[107m [0m 3 files changed, 3 insertions(+)β [32mMerged to [1mmain[22m [90m(1 commit, 3 files, [32m+3[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (already in main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snapindex 4ffe97006..3041bb5fe 100644--- a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap@@ -60,7 +60,7 @@ test result: ok. 18 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; fin[107m [0m jwt.rs | 8 [32m++++++++[m[107m [0m 3 files changed, 33 insertions(+)β [32mMerged to [1mmain[22m [90m(1 commit, 3 files, [32m+33[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature-auth[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mfeature-auth[22m worktree & branch in background (already in main)[39m[39mπ [36mRunning post-merge [1minstall[22m:[39m[107m [0m [2m[0m[2m[34mcargo[0m[2m install [0m[2m[36m--path[0m[2m .[0m[0m Installing worktrunk v0.1.0diff --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 0b0ec302e..aaafeb298 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@@ -55,4 +55,4 @@ All checks passed![107m [0m tests/test_auth.py | 14 [32m++++++++++++++[m[107m [0m 2 files changed, 45 insertions(+)β [32mMerged to [1mmain[22m [90m(1 commit, 2 files, [32m+45[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfeature-auth[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mfeature-auth[22m worktree & branch in background (already in main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snapindex 1674155f9..014f62817 100644--- a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap@@ -28,4 +28,4 @@ exit_code: 0[107m [0m auth.rs | 13 [32m+++++++++++++[m[107m [0m 1 file changed, 13 insertions(+)β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+13[39m[39m[90m)[39m[39m-π [36m[36mRemoving [1mfix-auth[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mfix-auth[22m worktree & branch in background (already in main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_branch_only_unmerged.snap b/tests/snapshots/integration__integration_tests__remove__remove_branch_only_unmerged.snapindex 8119bf70b..76d1cd214 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_branch_only_unmerged.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_branch_only_unmerged.snap@@ -24,4 +24,4 @@ exit_code: 0----- stderr -----π‘ [33mNo worktree found for branch [1mfeature-unmerged[22m[39m-βͺ Branch [1mfeature-unmerged[22m retained; not integrated into HEAD+βͺ Branch [1mfeature-unmerged[22m retained; has unmerged changesdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_main.snap b/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_main.snapindex 374288218..6fecd0865 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_main.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_main.snap@@ -23,4 +23,4 @@ exit_code: 0----- stdout ---------- stderr ------π [36m[36mRemoving [1mfeature-a[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mfeature-a[22m worktree & branch in background (already in main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_other_worktree.snap b/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_other_worktree.snapindex 3a70465bc..a35ce476d 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_other_worktree.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_other_worktree.snap@@ -23,4 +23,4 @@ exit_code: 0----- stdout ---------- stderr ------π [36m[36mRemoving [1mfeature-b[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mfeature-b[22m worktree & branch in background (already in main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_current_by_name.snap b/tests/snapshots/integration__integration_tests__remove__remove_current_by_name.snapindex dfaa96733..8c3910393 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_current_by_name.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_current_by_name.snap@@ -23,4 +23,4 @@ exit_code: 0----- stdout ---------- stderr ------π [36m[36mRemoving [1mfeature-current[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mfeature-current[22m worktree & branch in background (already in main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_foreground.snap b/tests/snapshots/integration__integration_tests__remove__remove_foreground.snapindex a7265e67d..cf9239f41 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_foreground.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_foreground.snap@@ -25,4 +25,4 @@ exit_code: 0----- stderr -----π [36mRemoving worktree for [1mfeature-fg[22m...[39m-β [32mRemoved [1mfeature-fg[22m worktree & branch (no marginal contribution to main)[39m+β [32mRemoved [1mfeature-fg[22m worktree & branch (already in main)[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap b/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snapindex 6998937d1..37c12d0e6 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap@@ -22,4 +22,4 @@ exit_code: 0----- stdout ---------- stderr ------π [36m[36mRemoving [1mfeature-wt[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mfeature-wt[22m worktree & branch in background (already in main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap b/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snapindex 7602bb37e..ff0feba52 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap@@ -24,4 +24,4 @@ exit_code: 0cd '[REPO]'----- stderr ------π [36m[36mRemoving [1mfeature-internal[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mfeature-internal[22m worktree & branch in background (already in main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_main_vs_linked__from_linked_succeeds.snap b/tests/snapshots/integration__integration_tests__remove__remove_main_vs_linked__from_linked_succeeds.snapindex 2dfc9fb70..6874301b0 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_main_vs_linked__from_linked_succeeds.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_main_vs_linked__from_linked_succeeds.snap@@ -22,4 +22,4 @@ exit_code: 0----- stdout ---------- stderr ------π [36m[36mRemoving [1mfeature[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background (already in main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_main_vs_linked__from_main_by_name_succeeds.snap b/tests/snapshots/integration__integration_tests__remove__remove_main_vs_linked__from_main_by_name_succeeds.snapindex 0875144c9..80b7e50ef 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_main_vs_linked__from_main_by_name_succeeds.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_main_vs_linked__from_main_by_name_succeeds.snap@@ -23,4 +23,4 @@ exit_code: 0----- stdout ---------- stderr ------π [36m[36mRemoving [1mfeature2[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mfeature2[22m worktree & branch in background (already in main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_multiple_including_current.snap b/tests/snapshots/integration__integration_tests__remove__remove_multiple_including_current.snapindex 56364d59b..b6b80cb7d 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_multiple_including_current.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_multiple_including_current.snap@@ -25,6 +25,6 @@ exit_code: 0----- stdout ---------- stderr ------π [36m[36mRemoving [1mfeature-b[22m worktree & branch in background (no marginal contribution to main)[39m[39m-π [36m[36mRemoving [1mfeature-c[22m worktree & branch in background (no marginal contribution to main)[39m[39m-π [36m[36mRemoving [1mfeature-a[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mfeature-b[22m worktree & branch in background (already in main)[39m[39m+π [36m[36mRemoving [1mfeature-c[22m worktree & branch in background (already in main)[39m[39m+π [36m[36mRemoving [1mfeature-a[22m worktree & branch in background (already in main)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snapindex 05c215023..b8b7faac8 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap@@ -25,6 +25,6 @@ exit_code: 0----- stdout ---------- stderr ------π [36m[36mRemoving [1mfeature-a[22m worktree & branch in background (no marginal contribution to main)[39m[39m-π [36m[36mRemoving [1mfeature-b[22m worktree & branch in background (no marginal contribution to main)[39m[39m-π [36m[36mRemoving [1mfeature-c[22m worktree & branch in background (no marginal contribution to main)[39m[39m+π [36m[36mRemoving [1mfeature-a[22m worktree & branch in background (already in main)[39m[39m+π [36m[36mRemoving [1mfeature-b[22m worktree & branch in background (already in main)[39m[39m+π [36m[36mRemoving [1mfeature-c[22m worktree & branch in background (already in main)[39m[39m