Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Refactor symbol styling in remove/merge messages (#260)
Maximilian Roos5c208238a34f
diff --git a/.claude/rules/cli-output-formatting.md b/.claude/rules/cli-output-formatting.mdindex 5d3d2f630..c3195e56c 100644--- a/.claude/rules/cli-output-formatting.md+++ b/.claude/rules/cli-output-formatting.md@@ -41,6 +41,25 @@ information, not restate what's already said."Committing with default message... (3 files, +45, -12)"```+**Two types of parenthesized content with different styling:**++1. **Stats parentheses → Gray** (`[90m` bright-black): Supplementary numerical+ info that could be omitted without losing meaning.+ ```+ ✅ Merged to main (1 commit, 1 file, +1)+ 🔄 Squashing 2 commits into a single commit (2 files, +2)...+ ```++2. **Reason parentheses → Message color**: Explains WHY an action is happening;+ integral to understanding.+ ```+ 🔄 Removing feature worktree & branch in background (same commit as main, _)+ ```++Stats are truly optional context. Reasons answer "why is this safe/happening?"+and belong with the main message. Symbols within reason parentheses still render+in their native styling (see "Symbol styling" below).+**Avoid pronouns with cross-message referents:** Hints appear as separatemessages from errors. Don't use pronouns like "it" that refer to somethingmentioned in the error message.@@ -99,17 +118,17 @@ behavior:"Removing feature worktree in background; retaining branch (--no-delete-branch)" // User flag (user keeps)```-**Symbol styling:** Status symbols should use their standard styling consistently-across all contexts (messages, tables, etc.). Each symbol has a defined-appearance:+**Symbol styling:** Symbols are atomic with their color — the styling is part of+the symbol's identity, not a presentation choice. Each symbol has a defined+appearance that must be preserved in all contexts:- `_` and `⊂` — dim (integration/safe-to-delete indicators)-- Other symbols may have colors (e.g., diff indicators)+- `+N` and `-N` — green/red (diff indicators)-Symbols should match their `wt list` appearance when referenced in messages.-When a symbol appears in a progress/success message, ensure the message's color-(e.g., cyan for progress) is closed BEFORE the symbol so the symbol renders in-its standard styling, not tinted by the message color.+When a symbol appears in a colored message (cyan progress, green success), close+the message color before the symbol so it renders in its native styling. This+requires breaking out of the message color and reopening it after the symbol.+See `FlagNote` in `src/output/handlers.rs` for the implementation pattern.**Comma + "but" + em-dash for limitations:** When stating an outcome with alimitation and its reason:diff --git a/src/output/handlers.rs b/src/output/handlers.rsindex 7845b1c33..38b58909e 100644--- a/src/output/handlers.rs+++ b/src/output/handlers.rs@@ -15,8 +15,9 @@ use worktrunk::git::path_dir_name;use worktrunk::path::format_path_for_display;use worktrunk::shell::Shell;use worktrunk::styling::{- FormattedMessage, PROGRESS_EMOJI, error_message, format_with_gutter, hint_message,- info_message, progress_message, success_message, suggest_command, warning_message,+ FormattedMessage, PROGRESS_EMOJI, SUCCESS_EMOJI, error_message, format_with_gutter,+ hint_message, info_message, progress_message, success_message, suggest_command,+ warning_message,};/// Format a switch message with a consistent location phrase@@ -192,6 +193,69 @@ fn handle_branch_deletion_result(}}+// ============================================================================+// FlagNote: Workaround for cformat! being compile-time only+// ============================================================================+//+// We want to parameterize the color (cyan/green) but can't because cformat!+// parses color tags at compile time before generic substitution. So we have+// duplicate methods (after_cyan, after_green) instead of after(color).+//+// This is ugly but unavoidable. Keep it encapsulated here.+// ============================================================================++struct FlagNote {+ text: String,+ symbol: Option<String>,+ suffix: String,+}++impl FlagNote {+ fn empty() -> Self {+ Self {+ text: String::new(),+ symbol: None,+ suffix: String::new(),+ }+ }++ fn text_only(text: impl Into<String>) -> Self {+ Self {+ text: text.into(),+ symbol: None,+ suffix: String::new(),+ }+ }++ fn with_symbol(+ text: impl Into<String>,+ symbol: impl Into<String>,+ suffix: impl Into<String>,+ ) -> Self {+ Self {+ text: text.into(),+ symbol: Some(symbol.into()),+ suffix: suffix.into(),+ }+ }++ fn after_cyan(&self) -> String {+ match &self.symbol {+ Some(s) => cformat!("{}<cyan>{}</>", s, self.suffix),+ None => String::new(),+ }+ }++ fn after_green(&self) -> String {+ match &self.symbol {+ Some(s) => cformat!("{}<green>{}</>", s, self.suffix),+ None => String::new(),+ }+ }+}++// ============================================================================+/// Get flag acknowledgment note for remove messages////// `target_branch`: The branch we checked integration against (shown in reason)@@ -199,27 +263,34 @@ fn get_flag_note(deletion_mode: BranchDeletionMode,outcome: &BranchDeletionOutcome,target_branch: Option<&str>,-) -> String {+) -> FlagNote {if deletion_mode.should_keep() {- return " (--no-delete-branch)".to_string();+ return FlagNote::text_only(" (--no-delete-branch)");}match outcome {- BranchDeletionOutcome::NotDeleted => String::new(),- BranchDeletionOutcome::ForceDeleted => " (--force-delete)".to_string(),+ BranchDeletionOutcome::NotDeleted => FlagNote::empty(),+ BranchDeletionOutcome::ForceDeleted => FlagNote::text_only(" (--force-delete)"),BranchDeletionOutcome::Integrated(reason) => {let Some(target) = target_branch else {- return String::new();+ return FlagNote::empty();};let symbol = reason.symbol();let desc = reason.description();- cformat!(" ({desc} <bold>{target}</>, <dim>{symbol}</>)")+ FlagNote::with_symbol(+ cformat!(" ({desc} <bold>{target}</>,"),+ cformat!(" <dim>{symbol}</>"),+ ")",+ )}}}/// Format message for remove worktree operation (includes emoji and color for consistency)///+/// Returns a FormattedMessage with green styling for success messages.+/// The symbol (if present) is placed outside the green so it renders in its canonical dim styling.+////// `target_branch`: The branch we checked integration against (Some = merge context, None = explicit remove)fn format_remove_worktree_message(main_path: &std::path::Path,@@ -229,7 +300,7 @@ fn format_remove_worktree_message(deletion_mode: BranchDeletionMode,outcome: &BranchDeletionOutcome,target_branch: Option<&str>,-) -> String {+) -> FormattedMessage {let flag_note = get_flag_note(deletion_mode, outcome, target_branch);let branch_display = branch.or(Some(branch_name));@@ -254,21 +325,27 @@ fn format_remove_worktree_message("worktree"};- if changed_directory {+ // Symbol is placed AFTER closing green so it renders in its canonical dim styling.+ 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!(- "Removed <bold>{b}</> {action_suffix}; changed directory to <bold>{path_display}</>{flag_note}"+ "{SUCCESS_EMOJI} <green>Removed <bold>{b}</> {action_suffix}; changed directory to <bold>{path_display}</>{flag_text}</>{flag_after}")} else {cformat!(- "Removed {action_suffix}; changed directory to <bold>{path_display}</>{flag_note}"+ "{SUCCESS_EMOJI} <green>Removed {action_suffix}; changed directory to <bold>{path_display}</>{flag_text}</>{flag_after}")}} else if let Some(b) = branch_display {- cformat!("Removed <bold>{b}</> {action_suffix}{flag_note}")+ cformat!(+ "{SUCCESS_EMOJI} <green>Removed <bold>{b}</> {action_suffix}{flag_text}</>{flag_after}"+ )} else {- format!("Removed {action_suffix}{flag_note}")- }+ cformat!("{SUCCESS_EMOJI} <green>Removed {action_suffix}{flag_text}</>{flag_after}")+ };+ FormattedMessage::new(msg)}/// Shell integration hint message@@ -482,8 +559,10 @@ fn handle_branch_only_output(&deletion.outcome,Some(&deletion.effective_target),);- super::print(success_message(cformat!(- "Removed branch <bold>{branch_name}</>{flag_note}"+ let flag_text = &flag_note.text;+ let flag_after = flag_note.after_green();+ super::print(FormattedMessage::new(cformat!(+ "{SUCCESS_EMOJI} <green>Removed branch <bold>{branch_name}</>{flag_text}</>{flag_after}")))?;}@@ -594,18 +673,20 @@ fn handle_removed_worktree_output();let flag_note = get_flag_note(deletion_mode, &outcome, effective_target.as_deref());+ let flag_text = &flag_note.text;+ let flag_after = flag_note.after_cyan();// 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. The flag_note (integration reason) should use standard- // colors so the symbol appears in its canonical dim styling, not cyan.+ // where cyan styling ends. The symbol appears after closing cyan so it renders+ // in its canonical dim styling, not tinted by cyan.let action = if deletion_mode.should_keep() {cformat!(- "{PROGRESS_EMOJI} <cyan>Removing <bold>{branch_name}</> worktree in background; retaining branch</>{flag_note}"+ "{PROGRESS_EMOJI} <cyan>Removing <bold>{branch_name}</> worktree in background; retaining branch{flag_text}</>{flag_after}")} else if should_delete_branch {cformat!(- "{PROGRESS_EMOJI} <cyan>Removing <bold>{branch_name}</> worktree & branch in background</>{flag_note}"+ "{PROGRESS_EMOJI} <cyan>Removing <bold>{branch_name}</> worktree & branch in background{flag_text}</>{flag_after}")} else {cformat!(@@ -680,7 +761,7 @@ fn handle_removed_worktree_output(};// Show success message (includes emoji and color)- super::print(success_message(format_remove_worktree_message(+ super::print(format_remove_worktree_message(main_path,changed_directory,branch_name,@@ -688,7 +769,7 @@ fn handle_removed_worktree_output(deletion_mode,&outcome,effective_target.as_deref(),- )))?;+ ))?;// Show hint for unmerged branches (after success message)if show_hint {@@ -907,37 +988,37 @@ mod tests {#[test]fn test_get_flag_note() {- // --no-delete-branch flag- assert_eq!(- get_flag_note(- BranchDeletionMode::Keep,- &BranchDeletionOutcome::NotDeleted,- None- ),- " (--no-delete-branch)"+ // --no-delete-branch flag (text only, no symbol, no suffix)+ let note = get_flag_note(+ BranchDeletionMode::Keep,+ &BranchDeletionOutcome::NotDeleted,+ None,);+ assert_eq!(note.text, " (--no-delete-branch)");+ assert!(note.symbol.is_none());+ assert!(note.suffix.is_empty());- // NotDeleted without flag- assert_eq!(- get_flag_note(- BranchDeletionMode::SafeDelete,- &BranchDeletionOutcome::NotDeleted,- None- ),- ""+ // NotDeleted without flag (empty)+ let note = get_flag_note(+ BranchDeletionMode::SafeDelete,+ &BranchDeletionOutcome::NotDeleted,+ None,);+ assert!(note.text.is_empty());+ assert!(note.symbol.is_none());+ assert!(note.suffix.is_empty());- // Force deleted- assert_eq!(- get_flag_note(- BranchDeletionMode::ForceDelete,- &BranchDeletionOutcome::ForceDeleted,- None- ),- " (--force-delete)"+ // Force deleted (text only, no symbol, no suffix)+ let note = get_flag_note(+ BranchDeletionMode::ForceDelete,+ &BranchDeletionOutcome::ForceDeleted,+ None,);+ assert_eq!(note.text, " (--force-delete)");+ assert!(note.symbol.is_none());+ assert!(note.suffix.is_empty());- // Integration reasons - check description and target separately since target is styled+ // Integration reasons - text includes description and target, symbol is separate, suffix is closing parenlet cases = [(IntegrationReason::SameCommit, "same commit as"),(IntegrationReason::Ancestor, "ancestor of"),@@ -952,14 +1033,30 @@ mod tests {Some("main"),);assert!(- note.contains(expected_desc),- "reason {:?} should contain '{}'",+ note.text.contains(expected_desc),+ "reason {:?} text should contain '{}'",reason,expected_desc);assert!(- note.contains("main"),- "reason {:?} should contain target 'main'",+ note.text.contains("main"),+ "reason {:?} text should contain target 'main'",+ reason+ );+ assert!(+ note.symbol.is_some(),+ "reason {:?} should have a symbol",+ reason+ );+ let symbol = note.symbol.as_ref().unwrap();+ assert!(+ symbol.contains(reason.symbol()),+ "reason {:?} symbol part should contain the symbol",+ reason+ );+ assert_eq!(+ note.suffix, ")",+ "reason {:?} suffix should be closing paren",reason);}@@ -979,10 +1076,10 @@ mod tests {&BranchDeletionOutcome::Integrated(IntegrationReason::SameCommit),Some("main"),);- assert!(msg.contains("feature"));- assert!(msg.contains("worktree & branch"));- assert!(msg.contains("same commit as"));- assert!(msg.contains("main"));+ assert!(msg.as_str().contains("feature"));+ assert!(msg.as_str().contains("worktree & branch"));+ assert!(msg.as_str().contains("same commit as"));+ assert!(msg.as_str().contains("main"));// Removed worktree only (--no-delete-branch)let msg = format_remove_worktree_message(@@ -994,9 +1091,9 @@ mod tests {&BranchDeletionOutcome::NotDeleted,None,);- assert!(msg.contains("worktree"));- assert!(!msg.contains("& branch"));- assert!(msg.contains("--no-delete-branch"));+ assert!(msg.as_str().contains("worktree"));+ assert!(!msg.as_str().contains("& branch"));+ assert!(msg.as_str().contains("--no-delete-branch"));// Removed with directory changelet msg = format_remove_worktree_message(@@ -1008,8 +1105,8 @@ mod tests {&BranchDeletionOutcome::ForceDeleted,None,);- assert!(msg.contains("changed directory"));- assert!(msg.contains("--force-delete"));+ assert!(msg.as_str().contains("changed directory"));+ assert!(msg.as_str().contains("--force-delete"));// Unmerged branch retainedlet msg = format_remove_worktree_message(@@ -1021,7 +1118,7 @@ mod tests {&BranchDeletionOutcome::NotDeleted,None,);- assert!(msg.contains("retaining unmerged branch"));+ assert!(msg.as_str().contains("retaining unmerged branch"));}#[test]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 c775f12b0..3b0326ec4 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-🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[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 c775f12b0..3b0326ec4 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-🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[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 1b57dc5b7..18158ec6d 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-🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[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 1b57dc5b7..18158ec6d 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-🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[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 a263e3923..3bea2f65c 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-🔄 [36mRemoving [1mfeature-auth[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mfeature-auth[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[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 5e23cd639..dc19dd262 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()----🔄 [36mRemoving [1mfeature-api[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mfeature-api[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[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 d35ea6512..a73fdab39 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()----🔄 [36mRemoving [1mto-remove[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mto-remove[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_powershell_directive.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_powershell_directive.snapindex d90071017..40f2e209e 100644--- a/tests/snapshots/integration__integration_tests__directives__merge_internal_powershell_directive.snap+++ b/tests/snapshots/integration__integration_tests__directives__merge_internal_powershell_directive.snap@@ -37,4 +37,4 @@ Set-Location _REPO_[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-🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snapindex c37bf7be1..ce91659f5 100644--- a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap+++ b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap@@ -37,4 +37,4 @@ cd _REPO_[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-🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --git a/tests/snapshots/integration__integration_tests__directives__remove_internal_powershell_directive.snap b/tests/snapshots/integration__integration_tests__directives__remove_internal_powershell_directive.snapindex 56293d420..048afc8aa 100644--- a/tests/snapshots/integration__integration_tests__directives__remove_internal_powershell_directive.snap+++ b/tests/snapshots/integration__integration_tests__directives__remove_internal_powershell_directive.snap@@ -31,4 +31,4 @@ exit_code: 0Set-Location _REPO_----- stderr ------🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[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 3cc5f15ab..644844160 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@@ -19,6 +19,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -40,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-🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[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 3065237d4..646b25373 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@@ -19,6 +19,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -43,4 +44,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-🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[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 886f13790..9bc91a73a 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@@ -19,6 +19,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -39,4 +40,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-🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[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 f19577566..e7b1aeb18 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@@ -19,6 +19,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -40,4 +41,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-🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snapindex 6beb9da8a..9b2cd4c3d 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap@@ -19,6 +19,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -34,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-🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snapindex 8b65dc405..b7a19391b 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap@@ -19,6 +19,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -30,4 +31,4 @@ exit_code: 0----- stderr -----⚪ Already up to date with [1mmain[22m (no new commits, no rebase needed)-🔄 [36mRemoving [1mno-commits[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mno-commits[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[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 bde5c32fb..402cd7733 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@@ -19,6 +19,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -40,4 +41,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-🔄 [36mRemoving [1mno-commits-dirty[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mno-commits-dirty[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --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 cb54e9ef7..66f5d3cef 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@@ -20,6 +20,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -35,4 +36,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-🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snapindex a523da3bf..18be53cd4 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap@@ -18,6 +18,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -33,4 +34,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-🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snapindex 8de11017d..4f2fe00f4 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap@@ -20,6 +20,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -37,4 +38,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-🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[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 08f28db7b..e7eaf5c65 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@@ -19,6 +19,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -34,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-🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[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 b8a2e4455..059f6a53e 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,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-🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m🔄 [36mRunning project post-merge:[39m[107m [0m [2m[0m[2m[34mexit[0m[2m 1[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 416c3c74a..4d7332ef9 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@@ -20,6 +20,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -35,7 +36,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-🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[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🔄 [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 8e240d483..2868b08fa 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@@ -21,6 +21,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -36,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-🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[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 e1bc0ef53..4e4ba9b96 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@@ -20,6 +20,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -35,6 +36,6 @@ 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-🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[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 f184ecf0a..bccc65150 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@@ -20,6 +20,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -31,6 +32,6 @@ exit_code: 0----- stderr -----⚪ Already up to date with [1mmain[22m (no new commits, no rebase needed)-🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[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 2b62094c3..9665b3f5b 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@@ -20,6 +20,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -44,4 +45,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-🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[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 00e482c3d..66c81166f 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@@ -20,6 +20,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -41,4 +42,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-🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --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 31e89d886..eb1911a23 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@@ -20,6 +20,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -35,4 +36,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-🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[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 865fe5e3f..4e1bdf003 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@@ -20,6 +20,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -37,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-🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[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 a118f0703..bd819c2b7 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@@ -20,6 +20,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -38,4 +39,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-🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[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 e98bace9d..d3bde84ff 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@@ -19,6 +19,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -34,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-🔄 [36mRemoving [1mfeature-from-develop[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mfeature-from-develop[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[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 0887a7f44..e5820f0b6 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@@ -19,6 +19,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -36,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-🔄 [36mRemoving [1mfeature-dirty-primary[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mfeature-dirty-primary[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[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 1dde87787..a464105a5 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@@ -19,6 +19,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -31,4 +32,4 @@ exit_code: 0----- stderr -----✅ [32mFast-forwarded to [1mmain[22m[39m⚪ Already up to date with [1mmain[22m (no new commits)-🔄 [36mRemoving [1mfast-forward-test[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mfast-forward-test[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[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 a481480b8..c13d3b7c2 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@@ -19,6 +19,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -36,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-🔄 [36mRemoving [1mtrue-rebase-test[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mtrue-rebase-test[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snapindex cddc17796..40c849a3c 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap@@ -19,6 +19,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -46,4 +47,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-🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[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 c24f13808..84974210d 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@@ -19,6 +19,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -40,4 +41,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)-🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[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 bc5076c09..b21d47c7d 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@@ -19,6 +19,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -34,4 +35,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-🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[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 d2998812b..7b821db17 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@@ -19,6 +19,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -38,4 +39,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-🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[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 12e43f67c..c43b3af43 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@@ -19,6 +19,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_COMMIT_GENERATION__ARGS: "fix: update files"@@ -42,4 +43,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-🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snapindex a523da3bf..18be53cd4 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap@@ -18,6 +18,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -33,4 +34,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-🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[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 0cce79c4e..2ae40d824 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@@ -19,6 +19,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -36,4 +37,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-🔄 [36mRemoving [1mfeature-for-staging[22m worktree & branch in background[39m (same commit as [1mstaging[22m, [2m_[22m)+🔄 [36mRemoving [1mfeature-for-staging[22m worktree & branch in background (same commit as [1mstaging[22m,[39m [2m_[22m[36m)[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 6beb9da8a..9b2cd4c3d 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@@ -19,6 +19,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -34,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-🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snapindex e511e5105..171838ee7 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap@@ -19,6 +19,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -34,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-🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[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 df2f69b50..1edbfebae 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@@ -19,6 +19,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_COMMIT_GENERATION__ARGS: "fix: commit changes"@@ -46,4 +47,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-🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snapindex 93f04d99e..18ea7f4db 100644--- a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap@@ -20,6 +20,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -65,7 +66,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-🔄 [36mRemoving [1mfeature-auth[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mfeature-auth[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[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 f8b5b5fe1..f5cdaf4e7 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@@ -20,6 +20,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -60,4 +61,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-🔄 [36mRemoving [1mfeature-auth[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mfeature-auth[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snapindex 0c50b3ed7..170e648e6 100644--- a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap@@ -19,6 +19,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -34,4 +35,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-🔄 [36mRemoving [1mfix-auth[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mfix-auth[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_executes.snap b/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_executes.snapindex 17c4bc321..21bd1d641 100644--- a/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_executes.snap+++ b/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_executes.snap@@ -20,6 +20,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -34,4 +35,4 @@ exit_code: 0🔄 [36mRunning project pre-remove:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'About to remove worktree'[0m[2m[0mAbout to remove worktree-✅ [32mRemoved [1mfeature-hook[22m worktree & branch (same commit as [1mmain[22m, [2m_[22m)[39m+✅ [32mRemoved [1mfeature-hook[22m worktree & branch (same commit as [1mmain[22m,[39m [2m_[22m[32m)[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_skipped_with_no_verify.snap b/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_skipped_with_no_verify.snapindex 9c2dfaf6f..ce2d43ff6 100644--- a/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_skipped_with_no_verify.snap+++ b/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_skipped_with_no_verify.snap@@ -21,6 +21,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -32,4 +33,4 @@ exit_code: 0----- stderr -----🔄 [36mRemoving [1mfeature-skip[22m worktree...[39m-✅ [32mRemoved [1mfeature-skip[22m worktree & branch (same commit as [1mmain[22m, [2m_[22m)[39m+✅ [32mRemoved [1mfeature-skip[22m worktree & branch (same commit as [1mmain[22m,[39m [2m_[22m[32m)[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_template_variables.snap b/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_template_variables.snapindex fca84857a..28a145b78 100644--- a/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_template_variables.snap+++ b/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_template_variables.snap@@ -20,6 +20,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -40,4 +41,4 @@ exit_code: 0🔄 [36mRunning project pre-remove [1mworktree_name[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Name: repo.feature-templates'[0m[2m[0mName: repo.feature-templates-✅ [32mRemoved [1mfeature-templates[22m worktree & branch (same commit as [1mmain[22m, [2m_[22m)[39m+✅ [32mRemoved [1mfeature-templates[22m worktree & branch (same commit as [1mmain[22m,[39m [2m_[22m[32m)[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_branch_matching_tree_content.snap b/tests/snapshots/integration__integration_tests__remove__remove_branch_matching_tree_content.snapindex 6bfbed242..f849dea2b 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_branch_matching_tree_content.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_branch_matching_tree_content.snap@@ -19,6 +19,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -30,4 +31,4 @@ exit_code: 0----- stderr -----🟡 [33mNo worktree found for branch [1mfeature-squashed[22m[39m-✅ [32mRemoved branch [1mfeature-squashed[22m (tree matches [1mmain[22m, [2m⊂[22m)[39m+✅ [32mRemoved branch [1mfeature-squashed[22m (tree matches [1mmain[22m,[39m [2m⊂[22m[32m)[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_branch_no_worktree_path_occupied.snap b/tests/snapshots/integration__integration_tests__remove__remove_branch_no_worktree_path_occupied.snapindex c2fefcd1d..db10dcf74 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_branch_no_worktree_path_occupied.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_branch_no_worktree_path_occupied.snap@@ -19,6 +19,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -30,4 +31,4 @@ exit_code: 0----- stderr -----🟡 [33mNo worktree found for branch [1mnpm[22m[39m-✅ [32mRemoved branch [1mnpm[22m (same commit as [1mmain[22m, [2m_[22m)[39m+✅ [32mRemoved branch [1mnpm[22m (same commit as [1mmain[22m,[39m [2m_[22m[32m)[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_branch_only_force_delete.snap b/tests/snapshots/integration__integration_tests__remove__remove_branch_only_force_delete.snapindex e3c8a90ef..05385e4c5 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_branch_only_force_delete.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_branch_only_force_delete.snap@@ -7,6 +7,7 @@ info:- "--force-delete"- feature-forceenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -14,10 +15,16 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0diff --git a/tests/snapshots/integration__integration_tests__remove__remove_branch_only_merged.snap b/tests/snapshots/integration__integration_tests__remove__remove_branch_only_merged.snapindex f25194fe8..d9ffec465 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_branch_only_merged.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_branch_only_merged.snap@@ -19,6 +19,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -30,4 +31,4 @@ exit_code: 0----- stderr -----🟡 [33mNo worktree found for branch [1mfeature-merged[22m[39m-✅ [32mRemoved branch [1mfeature-merged[22m (same commit as [1mmain[22m, [2m_[22m)[39m+✅ [32mRemoved branch [1mfeature-merged[22m (same commit as [1mmain[22m,[39m [2m_[22m[32m)[39mdiff --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 cd00e12e5..ee27cc94c 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@@ -19,6 +19,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -29,4 +30,4 @@ exit_code: 0----- stdout ---------- stderr ------🔄 [36mRemoving [1mfeature-a[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mfeature-a[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[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 bb805a223..77ed7c0cb 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@@ -19,6 +19,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -29,4 +30,4 @@ exit_code: 0----- stdout ---------- stderr ------🔄 [36mRemoving [1mfeature-b[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mfeature-b[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[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 711ae6b29..408b6d2f3 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@@ -19,6 +19,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -29,4 +30,4 @@ exit_code: 0----- stdout ---------- stderr ------🔄 [36mRemoving [1mfeature-current[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mfeature-current[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_default_branch_no_tautology.snap b/tests/snapshots/integration__integration_tests__remove__remove_default_branch_no_tautology.snapindex 87008ad05..fcd0b7f04 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_default_branch_no_tautology.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_default_branch_no_tautology.snap@@ -1,6 +1,5 @@---source: tests/integration_tests/remove.rs-assertion_line: 640info:program: wtargs:@@ -17,6 +16,7 @@ info:GIT_EDITOR: ""LANG: CLC_ALL: C+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---diff --git a/tests/snapshots/integration__integration_tests__remove__remove_foreground.snap b/tests/snapshots/integration__integration_tests__remove__remove_foreground.snapindex 4b4f77d46..e8991e508 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_foreground.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_foreground.snap@@ -20,6 +20,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -31,4 +32,4 @@ exit_code: 0----- stderr -----🔄 [36mRemoving [1mfeature-fg[22m worktree...[39m-✅ [32mRemoved [1mfeature-fg[22m worktree & branch (same commit as [1mmain[22m, [2m_[22m)[39m+✅ [32mRemoved [1mfeature-fg[22m worktree & branch (same commit as [1mmain[22m,[39m [2m_[22m[32m)[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_foreground_unmerged.snap b/tests/snapshots/integration__integration_tests__remove__remove_foreground_unmerged.snapindex 223ccb0d8..d31d8feec 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_foreground_unmerged.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_foreground_unmerged.snap@@ -20,6 +20,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"diff --git a/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap b/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snapindex d989d1726..919e60620 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap@@ -18,6 +18,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -28,4 +29,4 @@ exit_code: 0----- stdout ---------- stderr ------🔄 [36mRemoving [1mfeature-wt[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mfeature-wt[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap b/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snapindex 80d100322..90cb65958 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap@@ -31,4 +31,4 @@ exit_code: 0cd _REPO_----- stderr ------🔄 [36mRemoving [1mfeature-internal[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mfeature-internal[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[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 307665811..a05e3fb2c 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@@ -30,4 +30,4 @@ exit_code: 0----- stderr -----🔄 [36mRemoving current worktree...[39m-✅ [32mRemoved [1mfeature[22m worktree & branch; changed directory to [1m_REPO_[22m (same commit as [1mmain[22m, [2m_[22m)[39m+✅ [32mRemoved [1mfeature[22m worktree & branch; changed directory to [1m_REPO_[22m (same commit as [1mmain[22m,[39m [2m_[22m[32m)[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 745517521..5680c5be4 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@@ -19,6 +19,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -29,4 +30,4 @@ exit_code: 0----- stdout ---------- stderr ------🔄 [36mRemoving [1mfeature2[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mfeature2[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[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 5ebb29cd9..ff35c6218 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@@ -21,6 +21,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -31,6 +32,6 @@ exit_code: 0----- stdout ---------- stderr ------🔄 [36mRemoving [1mfeature-b[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)-🔄 [36mRemoving [1mfeature-c[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)-🔄 [36mRemoving [1mfeature-a[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mfeature-b[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+🔄 [36mRemoving [1mfeature-c[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+🔄 [36mRemoving [1mfeature-a[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snapindex c17cc26d2..b47badecf 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap@@ -21,6 +21,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -31,6 +32,6 @@ exit_code: 0----- stdout ---------- stderr ------🔄 [36mRemoving [1mfeature-a[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)-🔄 [36mRemoving [1mfeature-b[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)-🔄 [36mRemoving [1mfeature-c[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mfeature-a[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+🔄 [36mRemoving [1mfeature-b[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+🔄 [36mRemoving [1mfeature-c[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_no_delete_branch.snap b/tests/snapshots/integration__integration_tests__remove__remove_no_delete_branch.snapindex e8764b381..832c81699 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_no_delete_branch.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_no_delete_branch.snap@@ -20,6 +20,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -30,4 +31,4 @@ exit_code: 0----- stdout ---------- stderr ------🔄 [36mRemoving [1mfeature-keep[22m worktree in background; retaining branch[39m (--no-delete-branch)+🔄 [36mRemoving [1mfeature-keep[22m worktree in background; retaining branch (--no-delete-branch)[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_partial_success.snap b/tests/snapshots/integration__integration_tests__remove__remove_partial_success.snapindex f24482acf..3c5848ed5 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_partial_success.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_partial_success.snap@@ -20,6 +20,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -30,5 +31,5 @@ exit_code: 1----- stdout ---------- stderr ------🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39m (same commit as [1mmain[22m, [2m_[22m)+🔄 [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m❌ [31mNo worktree found for branch [1mnonexistent[22m[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_squash_merged_then_main_advanced.snap b/tests/snapshots/integration__integration_tests__remove__remove_squash_merged_then_main_advanced.snapindex 5cc42800a..210bf55a3 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_squash_merged_then_main_advanced.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_squash_merged_then_main_advanced.snap@@ -19,6 +19,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -30,4 +31,4 @@ exit_code: 0----- stderr -----🟡 [33mNo worktree found for branch [1mfeature-squash[22m[39m-✅ [32mRemoved branch [1mfeature-squash[22m (all changes in [1mmain[22m, [2m⊂[22m)[39m+✅ [32mRemoved branch [1mfeature-squash[22m (all changes in [1mmain[22m,[39m [2m⊂[22m[32m)[39mdiff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_remove_executes.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_remove_executes.snapindex cc482d026..1ce5b136a 100644--- a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_remove_executes.snap+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_remove_executes.snap@@ -20,6 +20,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -32,4 +33,4 @@ exit_code: 0----- stderr -----🔄 [36mRunning user pre-remove [1mcleanup[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'USER_PRE_REMOVE_RAN'[0m[2m [0m[2m[36m>[0m[2m ../user_preremove_marker.txt-[0m🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39m (--force-delete)+[0m🔄 [36mRemoving [1mfeature[22m worktree & branch in background (--force-delete)[39mdiff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_remove_skipped_no_verify.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_remove_skipped_no_verify.snapindex ad5bf22de..068bdd12b 100644--- a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_remove_skipped_no_verify.snap+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_remove_skipped_no_verify.snap@@ -21,6 +21,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -31,4 +32,4 @@ exit_code: 0----- stdout ---------- stderr ------🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39m (--force-delete)+🔄 [36mRemoving [1mfeature[22m worktree & branch in background (--force-delete)[39m