Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Unify directory change output between remove and switch commands (#274)
Maximilian Roos72cf5cd35c3d
diff --git a/src/output/handlers.rs b/src/output/handlers.rsindex 023b02fe5..d61fca6d7 100644--- a/src/output/handlers.rs+++ b/src/output/handlers.rs@@ -292,8 +292,6 @@ fn get_flag_note(////// `target_branch`: The branch we checked integration against (Some = merge context, None = explicit remove)fn format_remove_worktree_message(- main_path: &std::path::Path,- changed_directory: bool,branch_name: &str,branch: Option<&str>,deletion_mode: BranchDeletionMode,@@ -303,7 +301,6 @@ fn format_remove_worktree_message(let flag_note = get_flag_note(deletion_mode, outcome, target_branch);let branch_display = branch.or(Some(branch_name));- let path_display = format_path_for_display(main_path);// Build message parallel to background format: "Removed {branch} worktree & branch{flag_note}"let branch_deleted = matches!(@@ -328,17 +325,7 @@ fn format_remove_worktree_message(// flag_after contains integration symbols (like _) that render outside green in dim.let flag_text = &flag_note.text;let flag_after = flag_note.after_green();- let msg = if changed_directory {- if let Some(b) = branch_display {- cformat!(- "<green>✓ Removed <bold>{b}</> {action_suffix}; changed directory to <bold>{path_display}</>{flag_text}</>{flag_after}"- )- } else {- cformat!(- "<green>✓ Removed {action_suffix}; changed directory to <bold>{path_display}</>{flag_text}</>{flag_after}"- )- }- } else if let Some(b) = branch_display {+ let msg = if let Some(b) = branch_display {cformat!("<green>✓ Removed <bold>{b}</> {action_suffix}{flag_text}</>{flag_after}")} else {cformat!("<green>✓ Removed {action_suffix}{flag_text}</>{flag_after}")@@ -676,28 +663,20 @@ fn handle_removed_worktree_output(let flag_text = &flag_note.text;let flag_after = flag_note.after_cyan();- // Directory change suffix: ". Changing directory to path" when we're moving the user- let dir_change = if changed_directory {- let path_display = format_path_for_display(main_path);- cformat!("<cyan>. Changing directory to <bold>{path_display}</></>")- } else {- String::new()- };-// Reason in parentheses: user flags shown explicitly, integration reason for automatic cleanup// Note: We use FormattedMessage directly instead of progress_message() to control// where cyan styling ends. Symbol must be inside the <cyan> block to get proper coloring.let action = if deletion_mode.should_keep() {cformat!(- "<cyan>◎ Removing <bold>{branch_name}</> worktree in background; retaining branch{flag_text}</>{flag_after}{dir_change}"+ "<cyan>◎ Removing <bold>{branch_name}</> worktree in background; retaining branch{flag_text}</>{flag_after}")} else if should_delete_branch {cformat!(- "<cyan>◎ Removing <bold>{branch_name}</> worktree & branch in background{flag_text}</>{flag_after}{dir_change}"+ "<cyan>◎ Removing <bold>{branch_name}</> worktree & branch in background{flag_text}</>{flag_after}")} else {cformat!(- "<cyan>◎ Removing <bold>{branch_name}</> worktree in background; retaining unmerged branch</>{dir_change}"+ "<cyan>◎ Removing <bold>{branch_name}</> worktree in background; retaining unmerged branch</>")};super::print(FormattedMessage::new(action))?;@@ -710,6 +689,16 @@ fn handle_removed_worktree_output()))?;}+ // Show switch message when changing directory+ if changed_directory+ && let Ok(Some(dest_branch)) = Repository::at(main_path).current_branch()+ {+ let path_display = format_path_for_display(main_path);+ super::print(info_message(cformat!(+ "Switched to worktree for <bold>{dest_branch}</> @ <bold>{path_display}</>"+ )))?;+ }+// Build command with the decision we already madelet remove_command =build_remove_command(worktree_path, should_delete_branch.then_some(branch_name));@@ -769,8 +758,6 @@ fn handle_removed_worktree_output(// Show success message (includes emoji and color)super::print(format_remove_worktree_message(- main_path,- changed_directory,branch_name,branch,deletion_mode,@@ -786,6 +773,16 @@ fn handle_removed_worktree_output()))?;}+ // Show switch message when changing directory+ if changed_directory+ && let Ok(Some(dest_branch)) = Repository::at(main_path).current_branch()+ {+ let path_display = format_path_for_display(main_path);+ super::print(info_message(cformat!(+ "Switched to worktree for <bold>{dest_branch}</> @ <bold>{path_display}</>"+ )))?;+ }+super::flush()?;Ok(())}@@ -1073,12 +1070,8 @@ mod tests {#[test]fn test_format_remove_worktree_message() {- let main_path = PathBuf::from("/home/user/project");-// Removed worktree and branch (integrated)let msg = format_remove_worktree_message(- &main_path,- false,"feature",Some("feature"),BranchDeletionMode::SafeDelete,@@ -1092,8 +1085,6 @@ mod tests {// Removed worktree only (--no-delete-branch)let msg = format_remove_worktree_message(- &main_path,- false,"feature",Some("feature"),BranchDeletionMode::Keep,@@ -1104,23 +1095,18 @@ mod tests {assert!(!msg.as_str().contains("& branch"));assert!(msg.as_str().contains("--no-delete-branch"));- // Removed with directory change+ // Force deleted branchlet msg = format_remove_worktree_message(- &main_path,- true,"feature",Some("feature"),BranchDeletionMode::ForceDelete,&BranchDeletionOutcome::ForceDeleted,None,);- assert!(msg.as_str().contains("changed directory"));assert!(msg.as_str().contains("--force-delete"));// Unmerged branch retainedlet msg = format_remove_worktree_message(- &main_path,- false,"feature",Some("feature"),BranchDeletionMode::SafeDelete,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 3bfdd6e41..9d36af1ed 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,5 @@ expression: output.normalized()[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)[32m✓[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[36m. Changing directory to [1m[TMPDIR]/repo[39m[22m+[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[2m○[22m Switched to worktree for [1mmain[22m @ [1m[TMPDIR]/repo[22mdiff --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 3bfdd6e41..9d36af1ed 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,5 @@ expression: output.normalized()[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)[32m✓[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[36m. Changing directory to [1m[TMPDIR]/repo[39m[22m+[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[2m○[22m Switched to worktree for [1mmain[22m @ [1m[TMPDIR]/repo[22mdiff --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 8fa124cf1..970021aa3 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,5 @@ expression: output.normalized()[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)[32m✓[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[36m. Changing directory to [1m[TMPDIR]/repo[39m[22m+[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[2m○[22m Switched to worktree for [1mmain[22m @ [1m[TMPDIR]/repo[22mdiff --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 8fa124cf1..970021aa3 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,5 @@ expression: output.normalized()[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)[32m✓[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[36m. Changing directory to [1m[TMPDIR]/repo[39m[22m+[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[2m○[22m Switched to worktree for [1mmain[22m @ [1m[TMPDIR]/repo[22mdiff --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 a7dfce173..dcc20baa2 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,5 @@ All checks passed![107m [0m tests/test_auth.py | 14 [32m++++++++++++++[m[107m [0m 2 files changed, 45 insertions(+)[32m✓[39m [32mMerged to [1mmain[22m [90m(1 commit, 2 files, [32m+45[39m[39m[90m)[39m[39m-[36m◎ Removing [1mfeature-auth[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[36m. Changing directory to [1m[TMPDIR]/repo[39m[22m+[36m◎ Removing [1mfeature-auth[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[2m○[22m Switched to worktree for [1mmain[22m @ [1m[TMPDIR]/repo[22mdiff --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 68c9d7d73..c9850e0d8 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,5 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()----[36m◎ Removing [1mfeature-api[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[36m. Changing directory to [1m[TMPDIR]/repo[39m[22m+[36m◎ Removing [1mfeature-api[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[2m○[22m Switched to worktree for [1mmain[22m @ [1m[TMPDIR]/repo[22mdiff --git a/tests/snapshots/integration__integration_tests__directives__merge_directive_file.snap b/tests/snapshots/integration__integration_tests__directives__merge_directive_file.snapindex 7312b1869..e400f269c 100644--- a/tests/snapshots/integration__integration_tests__directives__merge_directive_file.snap+++ b/tests/snapshots/integration__integration_tests__directives__merge_directive_file.snap@@ -36,4 +36,5 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)[32m✓[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[36m. Changing directory to [1m_REPO_[39m[22m+[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22mdiff --git a/tests/snapshots/integration__integration_tests__directives__merge_directive_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_directive_remove.snapindex 7312b1869..e400f269c 100644--- a/tests/snapshots/integration__integration_tests__directives__merge_directive_remove.snap+++ b/tests/snapshots/integration__integration_tests__directives__merge_directive_remove.snap@@ -36,4 +36,5 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)[32m✓[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[36m. Changing directory to [1m_REPO_[39m[22m+[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22mdiff --git a/tests/snapshots/integration__integration_tests__directives__remove_directive_file.snap b/tests/snapshots/integration__integration_tests__directives__remove_directive_file.snapindex 93d9e8190..79c7ec86d 100644--- a/tests/snapshots/integration__integration_tests__directives__remove_directive_file.snap+++ b/tests/snapshots/integration__integration_tests__directives__remove_directive_file.snap@@ -30,4 +30,5 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[36m. Changing directory to [1m_REPO_[39m[22m+[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22mdiff --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 81e4850d0..665cb5926 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@@ -41,4 +41,5 @@ exit_code: 0[107m [0m file2.txt | 1 [32m+[m[107m [0m 2 files changed, 2 insertions(+)[32m✓[39m [32mMerged to [1mmain[22m [90m(1 commit, 2 files, [32m+2[39m[39m[90m)[39m[39m-[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[36m. Changing directory to [1m_REPO_[39m[22m+[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22mdiff --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 5500939a3..3a3361e16 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@@ -44,4 +44,5 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)[32m✓[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[36m. Changing directory to [1m_REPO_[39m[22m+[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22mdiff --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 7934c3415..310e6d698 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@@ -40,4 +40,5 @@ exit_code: 0[107m [0m auth.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)[32m✓[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[36m. Changing directory to [1m_REPO_[39m[22m+[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22mdiff --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 9798b7ae0..adb783e3d 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@@ -41,4 +41,5 @@ exit_code: 0[107m [0m dirty.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)[32m✓[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[36m. Changing directory to [1m_REPO_[39m[22m+[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snapindex 31eb8e3b4..d752f3b07 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap@@ -35,4 +35,5 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)[32m✓[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[36m. Changing directory to [1m_REPO_[39m[22m+[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snapindex 94a34f2fa..87f7be233 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap@@ -31,4 +31,5 @@ exit_code: 0----- stderr -----[2m○[22m Already up to date with [1mmain[22m (no new commits, no rebase needed)-[36m◎ Removing [1mno-commits[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[36m. Changing directory to [1m_REPO_[39m[22m+[36m◎ Removing [1mno-commits[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22mdiff --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 8539c5b3d..81ea04516 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@@ -41,4 +41,5 @@ exit_code: 0[107m [0m newfile.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)[32m✓[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-[36m◎ Removing [1mno-commits-dirty[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[36m. Changing directory to [1m_REPO_[39m[22m+[36m◎ Removing [1mno-commits-dirty[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_rebase_already_rebased.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_rebase_already_rebased.snapindex 9882d4625..b1a691c88 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_no_rebase_already_rebased.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_rebase_already_rebased.snap@@ -36,4 +36,5 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)[32m✓[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[36m. Changing directory to [1m_REPO_[39m[22m+[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snapindex 7b61bc015..1aafeccb8 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap@@ -34,4 +34,5 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)[32m✓[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[36m. Changing directory to [1m_REPO_[39m[22m+[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snapindex 80a4c4de4..9232f96e4 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap@@ -38,4 +38,5 @@ exit_code: 0[107m [0m file2.txt | 1 [32m+[m[107m [0m 2 files changed, 2 insertions(+)[32m✓[39m [32mMerged to [1mmain[22m [90m(2 commits, 2 files, [32m+2[39m[39m[90m)[39m[39m-[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[36m. Changing directory to [1m_REPO_[39m[22m+[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22mdiff --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 1752013f9..b306654e0 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@@ -35,4 +35,5 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)[32m✓[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[36m. Changing directory to [1m_REPO_[39m[22m+[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22mdiff --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 8bdfcde87..44c0c3ddd 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@@ -36,7 +36,8 @@ exit_code: 1[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)[32m✓[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[36m. Changing directory to [1m_REPO_[39m[22m+[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22m[36m◎[39m [36mRunning project post-merge:[39m[107m [0m [2m[0m[2m[34mexit[0m[2m 1[0m[33m▲[39m [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 2d2fe2876..1ade67171 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@@ -36,7 +36,8 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)[32m✓[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[36m. Changing directory to [1m_REPO_[39m[22m+[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22m[36m◎[39m [36mRunning project 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[36m◎[39m [36mRunning project 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 62ec7c19f..d840294d9 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@@ -37,4 +37,5 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)[32m✓[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[36m. Changing directory to [1m_REPO_[39m[22m+[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22mdiff --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 ab5b3b89d..843b6aaca 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@@ -36,6 +36,7 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)[32m✓[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[36m. Changing directory to [1m_REPO_[39m[22m+[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22m[36m◎[39m [36mRunning project 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.txtdiff --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 1bab4e3b6..f7976d738 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@@ -32,6 +32,7 @@ exit_code: 0----- stderr -----[2m○[22m Already up to date with [1mmain[22m (no new commits, no rebase needed)-[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[36m. Changing directory to [1m_REPO_[39m[22m+[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22m[36m◎[39m [36mRunning project 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.txtdiff --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 ec2e6c1e0..60ddb6627 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@@ -45,4 +45,5 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)[32m✓[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[36m. Changing directory to [1m_REPO_[39m[22m+[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22mdiff --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 9092fca17..49204c240 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@@ -42,4 +42,5 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)[32m✓[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[36m. Changing directory to [1m_REPO_[39m[22m+[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_no_hooks.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_no_hooks.snapindex bab8bb071..e1ffa307b 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_no_hooks.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_no_hooks.snap@@ -36,4 +36,5 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)[32m✓[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[36m. Changing directory to [1m_REPO_[39m[22m+[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22mdiff --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 c275dae04..d9c20bfa9 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@@ -38,4 +38,5 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)[32m✓[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[36m. Changing directory to [1m_REPO_[39m[22m+[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22mdiff --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 e152c8069..9a5de3fa1 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@@ -39,4 +39,5 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)[32m✓[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[36m. Changing directory to [1m_REPO_[39m[22m+[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22mdiff --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 95b80889d..2b007af1a 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@@ -35,4 +35,5 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)[32m✓[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-[36m◎ Removing [1mfeature-from-develop[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[36m. Changing directory to [1m_REPO_[39m[22m+[36m◎ Removing [1mfeature-from-develop[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[2m○[22m Switched to worktree for [1mdevelop[22m @ [1m_REPO_[22mdiff --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 664485177..61971b9b6 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@@ -37,4 +37,5 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)[32m✓[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-[36m◎ Removing [1mfeature-dirty-primary[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[36m. Changing directory to [1m_REPO_[39m[22m+[36m◎ Removing [1mfeature-dirty-primary[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[2m○[22m Switched to worktree for [1mdevelop[22m @ [1m_REPO_[22mdiff --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 dd709f2d7..dfb3daa2c 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@@ -32,4 +32,5 @@ exit_code: 0----- stderr -----[32m✓[39m [32mFast-forwarded to [1mmain[22m[39m[2m○[22m Already up to date with [1mmain[22m (no new commits)-[36m◎ Removing [1mfast-forward-test[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[36m. Changing directory to [1m_REPO_[39m[22m+[36m◎ Removing [1mfast-forward-test[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22mdiff --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 dd38e1154..8b3bb6fd4 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@@ -37,4 +37,5 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)[32m✓[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-[36m◎ Removing [1mtrue-rebase-test[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[36m. Changing directory to [1m_REPO_[39m[22m+[36m◎ Removing [1mtrue-rebase-test[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snapindex 9450bbc5a..9df25545f 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap@@ -47,4 +47,5 @@ exit_code: 0[107m [0m file3.txt | 1 [32m+[m[107m [0m 3 files changed, 3 insertions(+)[32m✓[39m [32mMerged to [1mmain[22m [90m(1 commit, 3 files, [32m+3[39m[39m[90m)[39m[39m-[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[36m. Changing directory to [1m_REPO_[39m[22m+[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22mdiff --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 4239933dc..42a078260 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@@ -41,4 +41,5 @@ exit_code: 0[107m [0m - Revert to initial[2m○[22m No changes after squashing 3 commits[2m○[22m Already up to date with [1mmain[22m (no new commits, no rebase needed)-[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[36m. Changing directory to [1m_REPO_[39m[22m+[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22mdiff --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 e4103caca..455ddf614 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@@ -35,4 +35,5 @@ exit_code: 0[107m [0m file1.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)[32m✓[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[36m. Changing directory to [1m_REPO_[39m[22m+[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22mdiff --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 c8fb2130a..1c8cd2b67 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@@ -39,4 +39,5 @@ exit_code: 0[107m [0m auth.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)[32m✓[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[36m. Changing directory to [1m_REPO_[39m[22m+[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22mdiff --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 ea6ad75ec..2ee82152d 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@@ -43,4 +43,5 @@ exit_code: 0[107m [0m file2.txt | 1 [32m+[m[107m [0m 2 files changed, 2 insertions(+)[32m✓[39m [32mMerged to [1mmain[22m [90m(1 commit, 2 files, [32m+2[39m[39m[90m)[39m[39m-[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[36m. Changing directory to [1m_REPO_[39m[22m+[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snapindex 7b61bc015..1aafeccb8 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap@@ -34,4 +34,5 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)[32m✓[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[36m. Changing directory to [1m_REPO_[39m[22m+[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22mdiff --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 1808b90c0..fdc5b6113 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@@ -37,4 +37,5 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)[32m✓[39m [32mMerged to [1mstaging[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-[36m◎ Removing [1mfeature-for-staging[22m worktree & branch in background (same commit as [1mstaging[22m,[39m [2m_[22m[36m)[39m[36m. Changing directory to [1m_REPO_[39m[22m+[36m◎ Removing [1mfeature-for-staging[22m worktree & branch in background (same commit as [1mstaging[22m,[39m [2m_[22m[36m)[39m+[2m○[22m Switched to worktree for [1mstaging[22m @ [1m_REPO_[22mdiff --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 1738db88c..15d1802fa 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@@ -35,4 +35,5 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)[32m✓[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[36m. Changing directory to [1m_REPO_.main-wt[39m[22m+[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_.main-wt[22mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snapindex 4c1ca66f1..f75f52b5f 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap@@ -35,4 +35,5 @@ exit_code: 0[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)[32m✓[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[36m. Changing directory to [1m_REPO_[39m[22m+[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22mdiff --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 4235c511a..e6722905c 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@@ -47,4 +47,5 @@ exit_code: 0[107m [0m untracked2.txt | 1 [32m+[m[107m [0m 3 files changed, 3 insertions(+)[32m✓[39m [32mMerged to [1mmain[22m [90m(1 commit, 3 files, [32m+3[39m[39m[90m)[39m[39m-[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[36m. Changing directory to [1m_REPO_[39m[22m+[36m◎ Removing [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22mdiff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snapindex cd9a5d548..b87e27528 100644--- a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap@@ -66,7 +66,8 @@ 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(+)[32m✓[39m [32mMerged to [1mmain[22m [90m(1 commit, 3 files, [32m+33[39m[39m[90m)[39m[39m-[36m◎ Removing [1mfeature-auth[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[36m. Changing directory to [1m_REPO_[39m[22m+[36m◎ Removing [1mfeature-auth[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22m[36m◎[39m [36mRunning project post-merge [1minstall[22m:[39m[107m [0m [2m[0m[2m[34mcargo[0m[2m install [0m[2m[36m--path[0m[2m .[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 df2722571..03c979895 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@@ -61,4 +61,5 @@ All checks passed![107m [0m tests/test_auth.py | 14 [32m++++++++++++++[m[107m [0m 2 files changed, 45 insertions(+)[32m✓[39m [32mMerged to [1mmain[22m [90m(1 commit, 2 files, [32m+45[39m[39m[90m)[39m[39m-[36m◎ Removing [1mfeature-auth[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[36m. Changing directory to [1m_REPO_[39m[22m+[36m◎ Removing [1mfeature-auth[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22mdiff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snapindex 2855ac573..bb7a03d7c 100644--- a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap@@ -35,4 +35,5 @@ exit_code: 0[107m [0m auth.rs | 13 [32m+++++++++++++[m[107m [0m 1 file changed, 13 insertions(+)[32m✓[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+13[39m[39m[90m)[39m[39m-[36m◎ Removing [1mfix-auth[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[36m. Changing directory to [1m_REPO_[39m[22m+[36m◎ Removing [1mfix-auth[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22mdiff --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 5317733fc..56c08d7b0 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@@ -30,4 +30,5 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎ Removing [1mfeature-current[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[36m. Changing directory to [1m_REPO_[39m[22m+[36m◎ Removing [1mfeature-current[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap b/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snapindex 838eda50a..4f6dd413e 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap@@ -29,4 +29,5 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎ Removing [1mfeature-wt[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[36m. Changing directory to [1m_REPO_[39m[22m+[36m◎ Removing [1mfeature-wt[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap b/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snapindex 94699a997..5e6757a1a 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap@@ -30,4 +30,5 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎ Removing [1mfeature-internal[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[36m. Changing directory to [1m_REPO_[39m[22m+[36m◎ Removing [1mfeature-internal[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22mdiff --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 c8b797666..3a8cc8a9f 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@@ -31,4 +31,5 @@ exit_code: 0----- stderr -----[36m◎[39m [36mRemoving current worktree...[39m-[32m✓ Removed [1mfeature[22m worktree & branch; changed directory to [1m_REPO_[22m (same commit as [1mmain[22m,[39m [2m_[22m[32m)[39m+[32m✓ Removed [1mfeature[22m worktree & branch (same commit as [1mmain[22m,[39m [2m_[22m[32m)[39m+[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22mdiff --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 a1b664daa..9023a0b6a 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@@ -34,4 +34,5 @@ exit_code: 0----- stderr -----[36m◎ Removing [1mfeature-b[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[36m◎ Removing [1mfeature-c[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m-[36m◎ Removing [1mfeature-a[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[36m. Changing directory to [1m_REPO_[39m[22m+[36m◎ Removing [1mfeature-a[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22m