Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
fix(output): Ensure Anstyle styles reset correctly
Maximilian Roosaef7b3a4a6c5
diff --git a/src/commands/dev.rs b/src/commands/dev.rsindex 8bd79a914..9da14b11a 100644--- a/src/commands/dev.rs+++ b/src/commands/dev.rs@@ -1,6 +1,6 @@use worktrunk::config::{ProjectConfig, WorktrunkConfig};use worktrunk::git::{GitError, GitResultExt, Repository};-use worktrunk::styling::{HINT, HINT_EMOJI};+use worktrunk::styling::{HINT, HINT_EMOJI, eprintln};use super::merge::{execute_post_merge_commands, run_pre_commit_commands, run_pre_merge_commands,diff --git a/src/commands/list/mod.rs b/src/commands/list/mod.rsindex 2994f552c..918ff772c 100644--- a/src/commands/list/mod.rs+++ b/src/commands/list/mod.rs@@ -13,6 +13,7 @@ use render::{format_list_item_line,};use worktrunk::git::{GitError, Repository};+use worktrunk::styling::println;/// Helper to enrich common display fields shared between worktrees and branchesfn enrich_common_fields(@@ -125,7 +126,6 @@ pub fn handle_list(fn display_summary(items: &[ListItem], include_branches: bool) {use anstyle::Style;- use worktrunk::styling::println;if items.is_empty() {println!();diff --git a/src/commands/list/render.rs b/src/commands/list/render.rsindex 2f2c71313..5ebb541ab 100644--- a/src/commands/list/render.rs+++ b/src/commands/list/render.rs@@ -1,6 +1,6 @@use crate::display::{format_relative_time, shorten_path, truncate_at_word_boundary};use anstyle::{AnsiColor, Color, Style};-use worktrunk::styling::{ADDITION, CURRENT, DELETION, StyledLine};+use worktrunk::styling::{ADDITION, CURRENT, DELETION, StyledLine, println};use super::ci_status::{CiStatus, PrStatus};use super::layout::{DiffWidths, LayoutConfig};diff --git a/src/commands/merge.rs b/src/commands/merge.rsindex c2db6dd5a..c0303a1f3 100644--- a/src/commands/merge.rs+++ b/src/commands/merge.rs@@ -61,7 +61,7 @@ pub fn handle_merge(// Rebase onto targetcrate::output::progress(format!(- "π {CYAN}Rebasing onto {CYAN_BOLD}{target_branch}{CYAN_BOLD:#}...{CYAN:#}"+ "π {CYAN}Rebasing onto {CYAN:#}{CYAN_BOLD}{target_branch}{CYAN_BOLD:#}{CYAN}...{CYAN:#}"))?;let rebase_result = repo.run_command(&["rebase", &target_branch]);@@ -127,7 +127,7 @@ pub fn handle_merge(let new_branch = primary_repo.current_branch()?;if new_branch.as_deref() != Some(&target_branch) {crate::output::progress(format!(- "π {CYAN}Switching to {CYAN_BOLD}{target_branch}{CYAN_BOLD:#}...{CYAN:#}"+ "π {CYAN}Switching to {CYAN:#}{CYAN_BOLD}{target_branch}{CYAN_BOLD:#}{CYAN}...{CYAN:#}"))?;primary_repo.run_command(&["switch", &target_branch])@@ -369,7 +369,7 @@ fn handle_squash(if commit_count == 1 && !has_staged {// Single commit, no staged changes - nothing to docrate::output::hint(format!(- "{HINT_EMOJI} {HINT}Only 1 commit since {CYAN_BOLD}{target_branch}{CYAN_BOLD:#} - no squashing needed{HINT:#}"+ "{HINT_EMOJI} {HINT}Only 1 commit since {HINT:#}{CYAN_BOLD}{target_branch}{CYAN_BOLD:#}{HINT} - no squashing needed{HINT:#}"))?;return Ok(None);}@@ -432,7 +432,7 @@ fn handle_squash(if !repo.has_staged_changes()? {use worktrunk::styling::{ERROR, ERROR_EMOJI, HINT, HINT_EMOJI};return Err(GitError::CommandFailed(format!(- "{ERROR_EMOJI} {ERROR}No changes to commit after squashing {commit_count} commits{ERROR:#}\n\n{HINT_EMOJI} {HINT}The commits resulted in no net changes (e.g., changes were reverted or already in {CYAN_BOLD}{target_branch}{CYAN_BOLD:#}){HINT:#}"+ "{ERROR_EMOJI} {ERROR}No changes to commit after squashing {commit_count} commits{ERROR:#}\n\n{HINT_EMOJI} {HINT}The commits resulted in no net changes (e.g., changes were reverted or already in {HINT:#}{CYAN_BOLD}{target_branch}{CYAN_BOLD:#}{HINT}){HINT:#}")));}diff --git a/src/git.rs b/src/git.rsindex 3af3ea6de..fd4638289 100644--- a/src/git.rs+++ b/src/git.rs@@ -103,7 +103,7 @@ impl std::fmt::Display for GitError {match command_name {Some(name) => write!(f,- "{ERROR_EMOJI} {ERROR}Pre-commit command failed: {error_bold}{name}{error_bold:#}{ERROR:#}\n\n{error}\n\n{HINT_EMOJI} {HINT}Use --no-hooks to skip pre-commit commands{HINT:#}"+ "{ERROR_EMOJI} {ERROR}Pre-commit command failed: {ERROR:#}{error_bold}{name}{error_bold:#}\n\n{error}\n\n{HINT_EMOJI} {HINT}Use --no-hooks to skip pre-commit commands{HINT:#}"),None => write!(f,@@ -121,7 +121,7 @@ impl std::fmt::Display for GitError {match command_name {Some(name) => write!(f,- "{ERROR_EMOJI} {ERROR}Pre-squash command failed: {error_bold}{name}{error_bold:#}{ERROR:#}\n\n{error}\n\n{HINT_EMOJI} {HINT}Use --no-hooks to skip pre-squash commands{HINT:#}"+ "{ERROR_EMOJI} {ERROR}Pre-squash command failed: {ERROR:#}{error_bold}{name}{error_bold:#}\n\n{error}\n\n{HINT_EMOJI} {HINT}Use --no-hooks to skip pre-squash commands{HINT:#}"),None => write!(f,@@ -139,7 +139,7 @@ impl std::fmt::Display for GitError {match command_name {Some(name) => write!(f,- "{ERROR_EMOJI} {ERROR}Pre-merge command failed: {error_bold}{name}{error_bold:#}{ERROR:#}\n\n{error}\n\n{HINT_EMOJI} {HINT}Use --no-hooks to skip pre-merge commands{HINT:#}"+ "{ERROR_EMOJI} {ERROR}Pre-merge command failed: {ERROR:#}{error_bold}{name}{error_bold:#}\n\n{error}\n\n{HINT_EMOJI} {HINT}Use --no-hooks to skip pre-merge commands{HINT:#}"),None => write!(f,@@ -161,7 +161,7 @@ impl std::fmt::Display for GitError {let error_bold = ERROR.bold();write!(f,- "{ERROR_EMOJI} {ERROR}Branch {error_bold}{branch}{error_bold:#} already exists{ERROR:#}\n\n{HINT_EMOJI} {HINT}Remove --create flag to switch to it{HINT:#}"+ "{ERROR_EMOJI} {ERROR}Branch {ERROR:#}{error_bold}{branch}{error_bold:#}{ERROR} already exists{ERROR:#}\n\n{HINT_EMOJI} {HINT}Remove --create flag to switch to it{HINT:#}")}@@ -170,7 +170,7 @@ impl std::fmt::Display for GitError {let error_bold = ERROR.bold();write!(f,- "{ERROR_EMOJI} {ERROR}Worktree directory missing for {error_bold}{branch}{error_bold:#}{ERROR:#}\n\n{HINT_EMOJI} {HINT}Run 'git worktree prune' to clean up{HINT:#}"+ "{ERROR_EMOJI} {ERROR}Worktree directory missing for {ERROR:#}{error_bold}{branch}{error_bold:#}\n\n{HINT_EMOJI} {HINT}Run 'git worktree prune' to clean up{HINT:#}")}@@ -179,7 +179,7 @@ impl std::fmt::Display for GitError {let error_bold = ERROR.bold();write!(f,- "{ERROR_EMOJI} {ERROR}No worktree found for branch {error_bold}{branch}{error_bold:#}{ERROR:#}"+ "{ERROR_EMOJI} {ERROR}No worktree found for branch {ERROR:#}{error_bold}{branch}{error_bold:#}")}@@ -210,7 +210,7 @@ impl std::fmt::Display for GitError {let error_bold = ERROR.bold();write!(f,- "{ERROR_EMOJI} {ERROR}Not a fast-forward from {error_bold}{target_branch}{error_bold:#} to HEAD{ERROR:#}\n\n{HINT_EMOJI} {HINT}The target branch has commits not in your current branch{HINT:#}\n{HINT_EMOJI} {HINT}Consider: git pull or git rebase{HINT:#}"+ "{ERROR_EMOJI} {ERROR}Not a fast-forward from {ERROR:#}{error_bold}{target_branch}{error_bold:#}{ERROR} to HEAD{ERROR:#}\n\n{HINT_EMOJI} {HINT}The target branch has commits not in your current branch{HINT:#}\n{HINT_EMOJI} {HINT}Consider: git pull or git rebase{HINT:#}")}@@ -240,7 +240,7 @@ impl std::fmt::Display for GitError {let error_bold = ERROR.bold();write!(f,- "{ERROR_EMOJI} {ERROR}Rebase onto {error_bold}{target_branch}{error_bold:#} incomplete: {state}{ERROR:#}\n\n{HINT_EMOJI} {HINT}Resolve conflicts and run 'git rebase --continue'{HINT:#}\n{HINT_EMOJI} {HINT}Or abort with 'git rebase --abort'{HINT:#}"+ "{ERROR_EMOJI} {ERROR}Rebase onto {ERROR:#}{error_bold}{target_branch}{error_bold:#}{ERROR} incomplete: {state}{ERROR:#}\n\n{HINT_EMOJI} {HINT}Resolve conflicts and run 'git rebase --continue'{HINT:#}\n{HINT_EMOJI} {HINT}Or abort with 'git rebase --abort'{HINT:#}")}}diff --git a/src/output/directive.rs b/src/output/directive.rsindex a766d88e5..d8393210f 100644--- a/src/output/directive.rs+++ b/src/output/directive.rs@@ -94,12 +94,12 @@ impl DirectiveOutput {if created_branch {format!(- "{SUCCESS_EMOJI} {GREEN}Created new worktree for {green_bold}{branch}{green_bold:#}, changed directory to {bold}{}{bold:#}{GREEN:#}",+ "{SUCCESS_EMOJI} {GREEN}Created new worktree for {GREEN:#}{green_bold}{branch}{green_bold:#}{GREEN}, changed directory to {GREEN:#}{bold}{}{bold:#}",path.display())} else {format!(- "{SUCCESS_EMOJI} {GREEN}Switched to worktree for {green_bold}{branch}{green_bold:#}, changed directory to {bold}{}{bold:#}{GREEN:#}",+ "{SUCCESS_EMOJI} {GREEN}Switched to worktree for {GREEN:#}{green_bold}{branch}{green_bold:#}{GREEN}, changed directory to {GREEN:#}{bold}{}{bold:#}",path.display())}diff --git a/src/output/handlers.rs b/src/output/handlers.rsindex e8bbd080e..a1bab65d8 100644--- a/src/output/handlers.rs+++ b/src/output/handlers.rs@@ -30,23 +30,23 @@ fn format_remove_message(result: &RemoveResult) -> String {match result {RemoveResult::AlreadyOnDefault(branch) => {format!(- "{SUCCESS_EMOJI} {GREEN}Already on default branch {green_bold}{branch}{green_bold:#}{GREEN:#}"+ "{SUCCESS_EMOJI} {GREEN}Already on default branch {GREEN:#}{green_bold}{branch}{green_bold:#}")}RemoveResult::RemovedWorktree { primary_path } => {format!(- "{SUCCESS_EMOJI} {GREEN}Removed worktree, returned to primary at {dim}{}{dim:#}{GREEN:#}",+ "{SUCCESS_EMOJI} {GREEN}Removed worktree, returned to primary at {GREEN:#}{dim}{}{dim:#}",primary_path.display())}RemoveResult::SwitchedToDefault(branch) => {format!(- "{SUCCESS_EMOJI} {GREEN}Switched to default branch {green_bold}{branch}{green_bold:#}{GREEN:#}"+ "{SUCCESS_EMOJI} {GREEN}Switched to default branch {GREEN:#}{green_bold}{branch}{green_bold:#}")}RemoveResult::RemovedOtherWorktree { branch } => {format!(- "{SUCCESS_EMOJI} {GREEN}Removed worktree for {green_bold}{branch}{green_bold:#}{GREEN:#}"+ "{SUCCESS_EMOJI} {GREEN}Removed worktree for {GREEN:#}{green_bold}{branch}{green_bold:#}")}}diff --git a/src/output/interactive.rs b/src/output/interactive.rsindex 7eb77a843..f6c1c6f27 100644--- a/src/output/interactive.rs+++ b/src/output/interactive.rs@@ -78,12 +78,12 @@ impl InteractiveOutput {if created_branch {format!(- "{SUCCESS_EMOJI} {GREEN}Created new worktree for {green_bold}{branch}{green_bold:#} at {bold}{}{bold:#}{GREEN:#}",+ "{SUCCESS_EMOJI} {GREEN}Created new worktree for {GREEN:#}{green_bold}{branch}{green_bold:#}{GREEN} at {GREEN:#}{bold}{}{bold:#}",path.display())} else {format!(- "{SUCCESS_EMOJI} {GREEN}Switched to worktree for {green_bold}{branch}{green_bold:#} at {bold}{}{bold:#}{GREEN:#}",+ "{SUCCESS_EMOJI} {GREEN}Switched to worktree for {GREEN:#}{green_bold}{branch}{green_bold:#}{GREEN} at {GREEN:#}{bold}{}{bold:#}",path.display())}diff --git a/tests/integration_tests/directives.rs b/tests/integration_tests/directives.rsindex 288be9c09..77b1302e1 100644--- a/tests/integration_tests/directives.rs+++ b/tests/integration_tests/directives.rs@@ -80,7 +80,7 @@ fn test_remove_internal_directive() {.arg("remove").current_dir(repo.root_path());- assert_cmd_snapshot!(cmd, @"success: true\nexit_code: 0\n----- stdout -----\nβ \u{1b}[32mAlready on default branch \u{1b}[1m\u{1b}[32mmain\u{1b}[0m\u{1b}[0m\0\n----- stderr -----");+ assert_cmd_snapshot!(cmd, @"success: true\nexit_code: 0\n----- stdout -----\nβ \u{1b}[32mAlready on default branch \u{1b}[0m\u{1b}[1m\u{1b}[32mmain\u{1b}[0m\0\n----- stderr -----");});}@@ -102,7 +102,7 @@ fn test_remove_without_internal() {success: trueexit_code: 0----- stdout ------ β [32mAlready on default branch [1m[32mmain[0m[0m+ β [32mAlready on default branch [0m[1m[32mmain[0m----- stderr -----");diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__bash_shell_integration_hint_suppressed.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__bash_shell_integration_hint_suppressed.snapindex 57eb5997a..c32648555 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__bash_shell_integration_hint_suppressed.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__bash_shell_integration_hint_suppressed.snap@@ -2,4 +2,4 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized().as_ref()----β [32mCreated new worktree for [1m[32mbash-test[0m, changed directory to [1m[TMPDIR]/test-repo.bash-test[0m[0m+β [32mCreated new worktree for [0m[1m[32mbash-test[0m[32m, changed directory to [0m[1m[TMPDIR]/test-repo.bash-test[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__command_failure.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__command_failure.snapindex dc69189d5..0bd0ffaa8 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__command_failure.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__command_failure.snap@@ -2,6 +2,6 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized().as_ref()----β [31mBranch [1m[31mexisting[0m already exists[0m+β [31mBranch [0m[1m[31mexisting[0m[31m already exists[0mπ‘ [2mRemove --create flag to switch to it[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_multiline_command_execution.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_multiline_command_execution.snapindex ff5b94a0e..4428db468 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_multiline_command_execution.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_multiline_command_execution.snap@@ -2,7 +2,7 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized().as_ref()----β [32mCreated new worktree for [1m[32mfish-multiline[0m, changed directory to [1m[TMPDIR]/test-repo.fish-multiline[0m[0m+β [32mCreated new worktree for [0m[1m[32mfish-multiline[0m[32m, changed directory to [0m[1m[TMPDIR]/test-repo.fish-multiline[0mπ [36mExecuting (--execute):[0m[40m [0m [1m[34mecho [32m'line 1'; [1m[34mecho [32m'line 2'; [1m[34mecho [32m'line 3'diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_handles_empty_chunks.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_handles_empty_chunks.snapindex 137ff5dfa..4bcf7445e 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_handles_empty_chunks.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_handles_empty_chunks.snap@@ -2,4 +2,4 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized().as_ref()----β [32mCreated new worktree for [1m[32mfish-minimal[0m, changed directory to [1m[TMPDIR]/test-repo.fish-minimal[0m[0m+β [32mCreated new worktree for [0m[1m[32mfish-minimal[0m[32m, changed directory to [0m[1m[TMPDIR]/test-repo.fish-minimal[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snapindex 9157bfbaa..0b7986cb6 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap@@ -2,6 +2,6 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized().as_ref()----β [32mCreated new worktree for [1m[32mfish-bg[0m, changed directory to [1m[TMPDIR]/test-repo.fish-bg[0m[0m+β [32mCreated new worktree for [0m[1m[32mfish-bg[0m[32m, changed directory to [0m[1m[TMPDIR]/test-repo.fish-bg[0mπ [36mRunning post-start:[0m[40m [0m [1m[34mecho [32m'fish background task'diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snapindex 5be8f6e57..44bfdddd5 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap@@ -2,7 +2,7 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized().as_ref()----π [36mRebasing onto [1m[36mmain[0m...[0m+π [36mRebasing onto [0m[1m[36mmain[0m[36m...[0mπ [36mRunning pre-merge: [1mformat[0m[0m[0m[40m [0m [1m[34mecho [32m'β Code formatting check passed'@@ -12,7 +12,7 @@ expression: output.normalized().as_ref()[0m[40m [0m [1m[34mecho [32m'β Test suite failed: 3 tests failing' [36m&& [1m[34mexit 1β Test suite failed: 3 tests failing-β [31mPre-merge command failed: [1m[31mtest[0m[0m+β [31mPre-merge command failed: [0m[1m[31mtest[0mCommand failed with exit code: exit status: 1diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_fish.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_fish.snapindex 3b38b580b..5ea0996b9 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_fish.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_fish.snap@@ -2,7 +2,7 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized().as_ref()----π [36mRebasing onto [1m[36mmain[0m...[0m+π [36mRebasing onto [0m[1m[36mmain[0m[36m...[0mπ [36mRunning pre-merge: [1mformat[0m[0m[0m[40m [0m [1m[34mecho [32m'β Code formatting check passed'@@ -11,7 +11,7 @@ expression: output.normalized().as_ref()[0m[40m [0m [1m[34mecho [32m'β Test suite failed: 3 tests failing' [36m&& [1m[34mexit 1β Test suite failed: 3 tests failing-β [31mPre-merge command failed: [1m[31mtest[0m[0m+β [31mPre-merge command failed: [0m[1m[31mtest[0mCommand failed with exit code: exit status: 1diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snapindex 037396430..d73cf5c86 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap@@ -4,12 +4,12 @@ expression: output.normalized().as_ref()---[0mβ Code formatting check passed[0mβ Test suite failed: 3 tests failing-β [31mPre-merge command failed: [1m[31mtest[0m[0m+β [31mPre-merge command failed: [0m[1m[31mtest[0mCommand failed with exit code: exit status: 1π‘ [2mUse --no-hooks to skip pre-merge commands[0m-π [36mRebasing onto [1m[36mmain[0m...[0m+π [36mRebasing onto [0m[1m[36mmain[0m[36m...[0mπ [36mRunning pre-merge: [1mformat[0m[0m[40m [0m [1m[34mecho [32m'β Code formatting check passed'diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snapindex 046694aff..5b0a2f956 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@@ -2,7 +2,7 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized().as_ref()----π [36mRebasing onto [1m[36mmain[0m...[0m+π [36mRebasing onto [0m[1m[36mmain[0m[36m...[0mπ [36mRunning pre-merge: [1mformat[0m[0m[0m[40m [0m [1m[34mecho [32m'β Code formatting check passed'diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_fish.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_fish.snapindex 4f27768b7..63f3251ff 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_fish.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_fish.snap@@ -2,7 +2,7 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized().as_ref()----π [36mRebasing onto [1m[36mmain[0m...[0m+π [36mRebasing onto [0m[1m[36mmain[0m[36m...[0mπ [36mRunning pre-merge: [1mformat[0m[0m[0m[40m [0m [1m[34mecho [32m'β Code formatting check passed'diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snapindex c88d3d0ba..55aeecf73 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@@ -5,7 +5,7 @@ expression: output.normalized().as_ref()[0mβ Code formatting check passed[0mβ Linting passed - no warnings[0mβ All 47 tests passed in 2.3s-π [36mRebasing onto [1m[36mmain[0m...[0m+π [36mRebasing onto [0m[1m[36mmain[0m[36m...[0mπ [36mRunning pre-merge: [1mformat[0m[0m[40m [0m [1m[34mecho [32m'β Code formatting check passed'diff --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 fa1d4e86a..930ee8418 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@@ -3,4 +3,4 @@ source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized().as_ref()---π [36mRemoving worktree for [1m[36mto-remove[0m...[0m-β [32mRemoved worktree for [1m[32mto-remove[0m[0m+β [32mRemoved worktree for [0m[1m[32mto-remove[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_create.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_create.snapindex 9ab2d526c..8ccef0242 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_create.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_create.snap@@ -2,4 +2,4 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized().as_ref()----β [32mCreated new worktree for [1m[32mfeature[0m, changed directory to [1m[TMPDIR]/test-repo.feature[0m[0m+β [32mCreated new worktree for [0m[1m[32mfeature[0m[32m, changed directory to [0m[1m[TMPDIR]/test-repo.feature[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute.snapindex a0f80810e..bdc16bb32 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute.snap@@ -2,7 +2,7 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized().as_ref()----β [32mCreated new worktree for [1m[32mtest-exec[0m, changed directory to [1m[TMPDIR]/test-repo.test-exec[0m[0m+β [32mCreated new worktree for [0m[1m[32mtest-exec[0m[32m, changed directory to [0m[1m[TMPDIR]/test-repo.test-exec[0mπ [36mExecuting (--execute):[0m[40m [0m [1m[34mecho executeddiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_through_wrapper.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_through_wrapper.snapindex a0f80810e..bdc16bb32 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_through_wrapper.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_through_wrapper.snap@@ -2,7 +2,7 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized().as_ref()----β [32mCreated new worktree for [1m[32mtest-exec[0m, changed directory to [1m[TMPDIR]/test-repo.test-exec[0m[0m+β [32mCreated new worktree for [0m[1m[32mtest-exec[0m[32m, changed directory to [0m[1m[TMPDIR]/test-repo.test-exec[0mπ [36mExecuting (--execute):[0m[40m [0m [1m[34mecho executeddiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_bash.snapindex 72b43690e..d357d908a 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_bash.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_bash.snap@@ -12,7 +12,7 @@ Installing dependencies...Building project...-β [32mCreated new worktree for [1m[32mfeature-hooks[0m, changed directory to [1m[TMPDIR]/test-repo.feature-hooks[0m[0m+β [32mCreated new worktree for [0m[1m[32mfeature-hooks[0m[32m, changed directory to [0m[1m[TMPDIR]/test-repo.feature-hooks[0mπ [36mRunning post-start: [1mserver[0m[0m[40m [0m [1m[34mecho [32m'Starting dev server on port 3000'diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snapindex 1615edeaa..574e7446f 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap@@ -12,7 +12,7 @@ expression: output.normalized().as_ref()[40m [0m [1m[34mecho [32m'Building project...'-β [32mCreated new worktree for [1m[32mfeature-hooks[0m, changed directory to [1m[TMPDIR]/test-repo.feature-hooks[0m[0m+β [32mCreated new worktree for [0m[1m[32mfeature-hooks[0m[32m, changed directory to [0m[1m[TMPDIR]/test-repo.feature-hooks[0mπ [36mRunning post-start: [1mserver[0m[0m[40m [0m [1m[34mecho [32m'Starting dev server on port 3000'diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snapindex a0d1b5924..419efa3df 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap@@ -2,6 +2,6 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized().as_ref()----β [32mCreated new worktree for [1m[32mfeature-with-hooks[0m, changed directory to [1m[TMPDIR]/test-repo.feature-with-hooks[0m[0m+β [32mCreated new worktree for [0m[1m[32mfeature-with-hooks[0m[32m, changed directory to [0m[1m[TMPDIR]/test-repo.feature-with-hooks[0mπ [36mRunning post-start:[0m[40m [0m [1m[34mecho [32m'test command executed'diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snapindex b8354bccc..858a47428 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap@@ -2,6 +2,6 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized().as_ref()----β [32mCreated new worktree for [1m[32mfeature-bg[0m, changed directory to [1m[TMPDIR]/test-repo.feature-bg[0m[0m+β [32mCreated new worktree for [0m[1m[32mfeature-bg[0m[32m, changed directory to [0m[1m[TMPDIR]/test-repo.feature-bg[0mπ [36mRunning post-start:[0m[40m [0m [1m[34mecho [32m'background task'diff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_keep.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_keep.snapindex f26a96836..0f8234dd3 100644Binary files a/tests/snapshots/integration__integration_tests__directives__merge_internal_keep.snap and b/tests/snapshots/integration__integration_tests__directives__merge_internal_keep.snap differdiff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snapindex e99eb33a7..e887cdb93 100644Binary files a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap and b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap differdiff --git a/tests/snapshots/integration__integration_tests__e2e_shell__bash_e2e_switch_linebreaks.snap b/tests/snapshots/integration__integration_tests__e2e_shell__bash_e2e_switch_linebreaks.snapindex d72933242..3bf2d3050 100644--- a/tests/snapshots/integration__integration_tests__e2e_shell__bash_e2e_switch_linebreaks.snap+++ b/tests/snapshots/integration__integration_tests__e2e_shell__bash_e2e_switch_linebreaks.snap@@ -2,5 +2,5 @@source: tests/integration_tests/e2e_shell.rsexpression: output----β [32mCreated new worktree for [1m[32mtest-branch[0m, changed directory to [1m[REPO].test-branch[0m[0m+β [32mCreated new worktree for [0m[1m[32mtest-branch[0m[32m, changed directory to [0m[1m[REPO].test-branch[0mMARKERdiff --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 05efeae14..f98fd9a2c 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,7 +19,7 @@ info:SOURCE_DATE_EPOCH: "1761609600"WORKTRUNK_COMMIT_GENERATION__ARGS: "fix: update file 1 content"WORKTRUNK_COMMIT_GENERATION__COMMAND: echo- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpGNwnK0/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpUIJO3O/test-config.toml---success: trueexit_code: 0@@ -34,7 +34,7 @@ exit_code: 0[40m [0m - feat: add file 2β [32mSquashed 2 commits into 1[0m @ [SHA]-π [36mRebasing onto [1m[36mmain[0m...[0m+π [36mRebasing onto [0m[1m[36mmain[0m[36m...[0mπ [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from maindiff --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 c7ed9e2b6..1bd1997d3 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@@ -16,7 +16,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpSGnUHI/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpGiDjID/test-config.toml---success: trueexit_code: 0@@ -27,7 +27,7 @@ exit_code: 0[40m [0m [1mWIP: Auto-commit before merge[0mβ [32mCommitted changes[0m @ [SHA]-π [36mRebasing onto [1m[36mmain[0m...[0m+π [36mRebasing onto [0m[1m[36mmain[0m[36m...[0mπ [36mMerging 2 commits to [1m[36mmain[0m[0m @ [SHA]* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m WIP: Auto-commit before mergediff --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 70f8b3733..45c46127c 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@@ -18,7 +18,7 @@ info:SOURCE_DATE_EPOCH: "1761609600"WORKTRUNK_COMMIT_GENERATION__ARGS: "fix: improve auth validation logic"WORKTRUNK_COMMIT_GENERATION__COMMAND: echo- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpYlKXRB/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmplB1CST/test-config.toml---success: trueexit_code: 0@@ -29,7 +29,7 @@ exit_code: 0[40m [0m [1mWIP: Auto-commit before merge[0mβ [32mCommitted changes[0m @ [SHA]-π [36mRebasing onto [1m[36mmain[0m...[0m+π [36mRebasing onto [0m[1m[36mmain[0m[36m...[0mπ [36mMerging 2 commits to [1m[36mmain[0m[0m @ [SHA]* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m WIP: Auto-commit before mergediff --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 d3cd0dbd8..e177cb1b2 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@@ -16,7 +16,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpycnuaa/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmphZdwpG/test-config.toml---success: trueexit_code: 0@@ -27,7 +27,7 @@ exit_code: 0[40m [0m [1mWIP: Auto-commit before merge[0mβ [32mCommitted changes[0m @ [SHA]-π [36mRebasing onto [1m[36mmain[0m...[0m+π [36mRebasing onto [0m[1m[36mmain[0m[36m...[0mπ [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m WIP: Auto-commit before mergediff --git a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snapindex b8ba2c80e..511037412 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap@@ -12,15 +12,16 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmphJavlh/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpIlspxR/test-config.toml---success: trueexit_code: 0----- stdout ------π [36mRebasing onto [1m[36mmain[0m...[0m+π [36mRebasing onto [0m[1m[36mmain[0m[36m...[0mπ [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature filediff --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 a1edeab1c..d051dcb96 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@@ -12,15 +12,16 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpKUB6t1/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp7OsJSf/test-config.toml---success: trueexit_code: 0----- stdout ------π [36mRebasing onto [1m[36mmain[0m...[0m+π [36mRebasing onto [0m[1m[36mmain[0m[36m...[0mπ [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature filediff --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 89a48fec4..a20c30102 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@@ -17,12 +17,12 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpT1f9Hm/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp4xnHdq/test-config.toml---success: trueexit_code: 0----- stdout ------π [36mRebasing onto [1m[36mmain[0m...[0m+π [36mRebasing onto [0m[1m[36mmain[0m[36m...[0mπ [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature filediff --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 0f16842c1..dc717e8f3 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@@ -13,15 +13,16 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpZxZQF9/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpewxYBg/test-config.toml---success: trueexit_code: 0----- stdout ------π [36mRebasing onto [1m[36mmain[0m...[0m+π [36mRebasing onto [0m[1m[36mmain[0m[36m...[0mπ [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature filediff --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 5a74bd447..588af1f05 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@@ -17,12 +17,12 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpLb4vMz/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpT0Xi2i/test-config.toml---success: trueexit_code: 0----- stdout ------π [36mRebasing onto [1m[36mmain[0m...[0m+π [36mRebasing onto [0m[1m[36mmain[0m[36m...[0mπ [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature filediff --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 f0faa2dea..b6defb84c 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@@ -13,10 +13,11 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp6AjptB/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpQNyioS/test-config.toml---success: trueexit_code: 0@@ -30,7 +31,7 @@ exit_code: 0[40m [0m [1mWIP: Auto-commit before merge[0mβ [32mCommitted changes[0m @ [SHA]-π [36mRebasing onto [1m[36mmain[0m...[0m+π [36mRebasing onto [0m[1m[36mmain[0m[36m...[0mπ [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m WIP: Auto-commit before mergediff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_combined_output.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_combined_output.snapindex 49fbc83ba..2dde09d27 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_combined_output.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_combined_output.snap@@ -3,7 +3,7 @@ source: tests/integration_tests/merge.rsexpression: output---Exit code: 0-π [36mRebasing onto [1m[36mmain[0m...[0m+π [36mRebasing onto [0m[1m[36mmain[0m[36m...[0mπ [36mRunning pre-merge: [1mfirst[0m[0m[40m [0m [1m[34mecho [32m'STDOUT-FROM-FIRST' [36m&& [1m[34mecho [32m'STDERR-FROM-FIRST' >&2diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snapindex 25f16d221..fb67f2f42 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap@@ -17,12 +17,12 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpHN1Gsh/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp2pHoJx/test-config.toml---success: falseexit_code: 1----- stdout ------π [36mRebasing onto [1m[36mmain[0m...[0m+π [36mRebasing onto [0m[1m[36mmain[0m[36m...[0mπ [36mRunning pre-merge:[0m[40m [0m [1m[34mexit 1diff --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 eb4ac233d..dc05c0761 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@@ -13,15 +13,16 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp93EEWp/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0b1qDe/test-config.toml---success: trueexit_code: 0----- stdout ------π [36mRebasing onto [1m[36mmain[0m...[0m+π [36mRebasing onto [0m[1m[36mmain[0m[36m...[0mπ [36mRunning pre-merge: [1mformat[0m[0m[40m [0m [1m[34mexit 0diff --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 1886fd6a7..86bf370bf 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@@ -13,15 +13,16 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpRSGXKS/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpz1Svg2/test-config.toml---success: trueexit_code: 0----- stdout ------π [36mRebasing onto [1m[36mmain[0m...[0m+π [36mRebasing onto [0m[1m[36mmain[0m[36m...[0mπ [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature filediff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snapindex 060a88bf3..d31a23f25 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snap@@ -13,15 +13,16 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpMGhwKV/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpE07Dyc/test-config.toml---success: trueexit_code: 0----- stdout ------π [36mRebasing onto [1m[36mmain[0m...[0m+π [36mRebasing onto [0m[1m[36mmain[0m[36m...[0mπ [36mRunning pre-merge: [1mcheck1[0m[0m[40m [0m [1m[34m[PROJECT_ROOT]/tests/fixtures/mixed-output.sh check1 3diff --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 9bb91b1d9..5560cbcc3 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@@ -17,12 +17,12 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp7YAl9h/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpJDhHCh/test-config.toml---success: trueexit_code: 0----- stdout ------π [36mRebasing onto [1m[36mmain[0m...[0m+π [36mRebasing onto [0m[1m[36mmain[0m[36m...[0mπ [36mRunning pre-merge:[0m[40m [0m [1m[34mexit 0diff --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 4c0eee709..3e4621c17 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@@ -14,10 +14,11 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpMTUIaI/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpC1Hhfi/test-config.toml---success: trueexit_code: 0@@ -25,8 +26,8 @@ exit_code: 0π [36mRunning pre-squash:[0m[40m [0m [1m[34mecho [32m'Pre-squash check passed'-π‘ [2mOnly 1 commit since [1m[36mmain[0m - no squashing needed[0m-π [36mRebasing onto [1m[36mmain[0m...[0m+π‘ [2mOnly 1 commit since [0m[1m[36mmain[0m[2m - no squashing needed[0m+π [36mRebasing onto [0m[1m[36mmain[0m[36m...[0mπ [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature filediff --git a/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap b/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snapindex 645062d1a..86f8ea094 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap@@ -16,15 +16,15 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp54dUDd/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmptHp5qH/test-config.toml---success: falseexit_code: 1----- stdout ------π [36mRebasing onto [1m[36mmain[0m...[0m+π [36mRebasing onto [0m[1m[36mmain[0m[36m...[0m----- stderr ------β [31mRebase onto [1m[31mmain[0m incomplete: REBASING 1/1[0m+β [31mRebase onto [0m[1m[31mmain[0m[31m incomplete: REBASING 1/1[0mπ‘ [2mResolve conflicts and run 'git rebase --continue'[0mπ‘ [2mOr abort with 'git rebase --abort'[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snapindex cb6faf3dd..c1a4c00ad 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap@@ -17,7 +17,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpn7Fz7h/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpUTTHOg/test-config.toml---success: trueexit_code: 0@@ -33,7 +33,7 @@ exit_code: 0[40m [0m - docs: update readmeβ [32mSquashed 3 commits into 1[0m @ [SHA]-π [36mRebasing onto [1m[36mmain[0m...[0m+π [36mRebasing onto [0m[1m[36mmain[0m[36m...[0mπ [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from maindiff --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 6d2f565f5..2d65e5655 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@@ -17,7 +17,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpuiKLaJ/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpJq6lmf/test-config.toml---success: falseexit_code: 1@@ -36,4 +36,4 @@ exit_code: 1----- stderr -----β [31mNo changes to commit after squashing 3 commits[0m-π‘ [2mThe commits resulted in no net changes (e.g., changes were reverted or already in [1m[36mmain[0m)[0m+π‘ [2mThe commits resulted in no net changes (e.g., changes were reverted or already in [0m[1m[36mmain[0m[2m)[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snapindex 465c13f78..914b96d60 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap@@ -18,7 +18,7 @@ info:LC_ALL: CSOURCE_DATE_EPOCH: "1761609600"WORKTRUNK_COMMIT_GENERATION__COMMAND: nonexistent-llm-command- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpqGPEwf/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp4DeuiX/test-config.toml---success: trueexit_code: 0@@ -33,7 +33,7 @@ exit_code: 0[40m [0m - fix: bug fixβ [32mSquashed 2 commits into 1[0m @ [SHA]-π [36mRebasing onto [1m[36mmain[0m...[0m+π [36mRebasing onto [0m[1m[36mmain[0m[36m...[0mπ [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from maindiff --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 515ec288b..1e8711b87 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@@ -13,16 +13,17 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpoM9avQ/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpwj2gxC/test-config.toml---success: trueexit_code: 0----- stdout ------π‘ [2mOnly 1 commit since [1m[36mmain[0m - no squashing needed[0m-π [36mRebasing onto [1m[36mmain[0m...[0m+π‘ [2mOnly 1 commit since [0m[1m[36mmain[0m[2m - no squashing needed[0m+π [36mRebasing onto [0m[1m[36mmain[0m[36m...[0mπ [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m feat: single commitdiff --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 28f560ae3..4fe91edd0 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@@ -20,7 +20,7 @@ info:WORKTRUNK_COMMIT_GENERATION__ARGS__0: "-c"WORKTRUNK_COMMIT_GENERATION__ARGS__1: "cat >/dev/null && echo 'feat: implement user authentication system'"WORKTRUNK_COMMIT_GENERATION__COMMAND: sh- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp8GMkOm/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpA50Vmu/test-config.toml---success: trueexit_code: 0@@ -35,7 +35,7 @@ exit_code: 0[40m [0m - fix: handle edge caseβ [32mSquashed 2 commits into 1[0m @ [SHA]-π [36mRebasing onto [1m[36mmain[0m...[0m+π [36mRebasing onto [0m[1m[36mmain[0m[36m...[0mπ [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from maindiff --git a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snapindex fd7914f3c..18d3b7cfa 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap@@ -11,15 +11,16 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpnPgwRJ/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmphldM5d/test-config.toml---success: trueexit_code: 0----- stdout ------π [36mRebasing onto [1m[36mmain[0m...[0m+π [36mRebasing onto [0m[1m[36mmain[0m[36m...[0mπ [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature filediff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_keep.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_keep.snapindex 381f678ff..a3f40f1e5 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_with_keep.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_keep.snap@@ -17,12 +17,12 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpdJ8MB6/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmptU87PL/test-config.toml---success: trueexit_code: 0----- stdout ------π [36mRebasing onto [1m[36mmain[0m...[0m+π [36mRebasing onto [0m[1m[36mmain[0m[36m...[0mπ [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature filediff --git a/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snap b/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snapindex cdca5580a..c5ed0b4f5 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snap@@ -17,7 +17,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpSHnw3w/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp9uScgn/test-config.toml---success: trueexit_code: 0@@ -25,7 +25,7 @@ exit_code: 0π [36mRunning post-create:[0m[40m [0m [1m[34mecho [32m'Setup done' [36m> setup.txt-β [32mCreated new worktree for [1m[32mfeature[0m at [1m[REPO].feature[0m[0m+β [32mCreated new worktree for [0m[1m[32mfeature[0m[32m at [0m[1m[REPO].feature[0mTo enable automatic cd, run: wt config shellπ [36mRunning post-start: [1mserver[0m[0mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap b/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snapindex 4e4de3804..fe3eaf7f5 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap@@ -19,12 +19,12 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpNYpiBV/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpRhdN4A/test-config.toml---success: trueexit_code: 0----- stdout ------β [32mCreated new worktree for [1m[32mfeature[0m at [1m[REPO].feature[0m[0m+β [32mCreated new worktree for [0m[1m[32mfeature[0m[32m at [0m[1m[REPO].feature[0mπ [36mExecuting (--execute):[0m[40m [0m [1m[34mecho [32m'Execute flag' [36m> execute.txtdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snapindex 37c6e3a29..7501d7940 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snap@@ -17,7 +17,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpLjifGu/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpOs7G1m/test-config.toml---success: trueexit_code: 0@@ -26,7 +26,7 @@ exit_code: 0[40m [0m [1m[34mexit 1π‘ [33mCommand failed: Command failed with exit code: exit status: 1[0m-β [32mCreated new worktree for [1m[32mfeature[0m at [1m[REPO].feature[0m[0m+β [32mCreated new worktree for [0m[1m[32mfeature[0m[32m at [0m[1m[REPO].feature[0mTo enable automatic cd, run: wt config shelldiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiline_control_structure.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiline_control_structure.snapindex dafcc1495..4006083f4 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiline_control_structure.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiline_control_structure.snap@@ -17,7 +17,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0UjsQ2/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpbe7wjL/test-config.toml---success: trueexit_code: 0@@ -29,7 +29,7 @@ exit_code: 0[40m [0m [1m[34mecho [32m'File exists' [36m> result.txt[40m [0m [1m[34mfi-β [32mCreated new worktree for [1m[32mfeature[0m at [1m[REPO].feature[0m[0m+β [32mCreated new worktree for [0m[1m[32mfeature[0m[32m at [0m[1m[REPO].feature[0mTo enable automatic cd, run: wt config shelldiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiple_commands_array.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiple_commands_array.snapindex e9e4dae17..d11970228 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiple_commands_array.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiple_commands_array.snap@@ -17,7 +17,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp5Kx6T0/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpA6B2vu/test-config.toml---success: trueexit_code: 0@@ -28,7 +28,7 @@ exit_code: 0π [36mRunning post-create: [1m2[0m[0m[40m [0m [1m[34mecho [32m'Second'-β [32mCreated new worktree for [1m[32mfeature[0m at [1m[REPO].feature[0m[0m+β [32mCreated new worktree for [0m[1m[32mfeature[0m[32m at [0m[1m[REPO].feature[0mTo enable automatic cd, run: wt config shelldiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_named_commands.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_named_commands.snapindex 0f4924ede..99b9b35f1 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_named_commands.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_named_commands.snap@@ -17,7 +17,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpIXmAtT/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpUm2yjQ/test-config.toml---success: trueexit_code: 0@@ -28,7 +28,7 @@ exit_code: 0π [36mRunning post-create: [1msetup[0m[0m[40m [0m [1m[34mecho [32m'Running setup'-β [32mCreated new worktree for [1m[32mfeature[0m at [1m[REPO].feature[0m[0m+β [32mCreated new worktree for [0m[1m[32mfeature[0m[32m at [0m[1m[REPO].feature[0mTo enable automatic cd, run: wt config shelldiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_no_config.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_no_config.snapindex 084f5efd0..3f54e9525 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_no_config.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_no_config.snap@@ -17,12 +17,12 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmprPg9fH/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpSOYK5N/test-config.toml---success: trueexit_code: 0----- stdout ------β [32mCreated new worktree for [1m[32mfeature[0m at [1m[REPO].feature[0m[0m+β [32mCreated new worktree for [0m[1m[32mfeature[0m[32m at [0m[1m[REPO].feature[0mTo enable automatic cd, run: wt config shelldiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_single_command.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_single_command.snapindex d32855e88..827aba0ec 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_single_command.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_single_command.snap@@ -17,7 +17,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpv1uv4k/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpfaDLn5/test-config.toml---success: trueexit_code: 0@@ -25,7 +25,7 @@ exit_code: 0π [36mRunning post-create:[0m[40m [0m [1m[34mecho [32m'Setup complete'-β [32mCreated new worktree for [1m[32mfeature[0m at [1m[REPO].feature[0m[0m+β [32mCreated new worktree for [0m[1m[32mfeature[0m[32m at [0m[1m[REPO].feature[0mTo enable automatic cd, run: wt config shelldiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snapindex d31e6f0e9..f6bf2c211 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snap@@ -17,7 +17,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpK7dGHL/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpQU6lub/test-config.toml---success: trueexit_code: 0@@ -34,7 +34,7 @@ exit_code: 0π [36mRunning post-create: [1m4[0m[0m[40m [0m [1m[34mecho [32m'Root: [REPO]' [36m>> info.txt-β [32mCreated new worktree for [1m[32mfeature/test[0m at [1m[REPO].feature-test[0m[0m+β [32mCreated new worktree for [0m[1m[32mfeature/test[0m[32m at [0m[1m[REPO].feature-test[0mTo enable automatic cd, run: wt config shelldiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_complex_shell.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_complex_shell.snapindex 99f2f11ee..236ea5e2e 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_complex_shell.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_complex_shell.snap@@ -17,12 +17,12 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpZZ1Hxj/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpaTiFOo/test-config.toml---success: trueexit_code: 0----- stdout ------β [32mCreated new worktree for [1m[32mfeature[0m at [1m[REPO].feature[0m[0m+β [32mCreated new worktree for [0m[1m[32mfeature[0m[32m at [0m[1m[REPO].feature[0mTo enable automatic cd, run: wt config shellπ [36mRunning post-start:[0mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_invalid_command.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_invalid_command.snapindex b2a4c9dda..16dc6c12a 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_invalid_command.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_invalid_command.snap@@ -17,12 +17,12 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpupdr7e/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpGS2uQB/test-config.toml---success: trueexit_code: 0----- stdout ------β [32mCreated new worktree for [1m[32mfeature[0m at [1m[REPO].feature[0m[0m+β [32mCreated new worktree for [0m[1m[32mfeature[0m[32m at [0m[1m[REPO].feature[0mTo enable automatic cd, run: wt config shellπ [36mRunning post-start:[0mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_log_captures_output.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_log_captures_output.snapindex 16df982e3..fa4c180ed 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_log_captures_output.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_log_captures_output.snap@@ -17,12 +17,12 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmphgwTVZ/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpSEMUTB/test-config.toml---success: trueexit_code: 0----- stdout ------β [32mCreated new worktree for [1m[32mfeature[0m at [1m[REPO].feature[0m[0m+β [32mCreated new worktree for [0m[1m[32mfeature[0m[32m at [0m[1m[REPO].feature[0mTo enable automatic cd, run: wt config shellπ [36mRunning post-start:[0mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiline_with_newlines.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiline_with_newlines.snapindex 9ff0840de..28bd92fa8 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiline_with_newlines.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiline_with_newlines.snap@@ -17,12 +17,12 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpQmUUGm/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpnc72m6/test-config.toml---success: trueexit_code: 0----- stdout ------β [32mCreated new worktree for [1m[32mfeature[0m at [1m[REPO].feature[0m[0m+β [32mCreated new worktree for [0m[1m[32mfeature[0m[32m at [0m[1m[REPO].feature[0mTo enable automatic cd, run: wt config shellπ [36mRunning post-start:[0mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_background.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_background.snapindex 831b8538c..1ec18de6b 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_background.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_background.snap@@ -17,12 +17,12 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpxdAo1o/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpImJjco/test-config.toml---success: trueexit_code: 0----- stdout ------β [32mCreated new worktree for [1m[32mfeature[0m at [1m[REPO].feature[0m[0m+β [32mCreated new worktree for [0m[1m[32mfeature[0m[32m at [0m[1m[REPO].feature[0mTo enable automatic cd, run: wt config shellπ [36mRunning post-start: [1mtask1[0m[0mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_separate_logs.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_separate_logs.snapindex 470a0a1b8..9c2d89b82 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_separate_logs.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_separate_logs.snap@@ -17,12 +17,12 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0SFYX9/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpFUHSvA/test-config.toml---success: trueexit_code: 0----- stdout ------β [32mCreated new worktree for [1m[32mfeature[0m at [1m[REPO].feature[0m[0m+β [32mCreated new worktree for [0m[1m[32mfeature[0m[32m at [0m[1m[REPO].feature[0mTo enable automatic cd, run: wt config shellπ [36mRunning post-start: [1mtask1[0m[0mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_single_background.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_single_background.snapindex 1a13fc066..2406fdb25 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_single_background.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_single_background.snap@@ -17,12 +17,12 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpRouTTi/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpZYNplg/test-config.toml---success: trueexit_code: 0----- stdout ------β [32mCreated new worktree for [1m[32mfeature[0m at [1m[REPO].feature[0m[0m+β [32mCreated new worktree for [0m[1m[32mfeature[0m[32m at [0m[1m[REPO].feature[0mTo enable automatic cd, run: wt config shellπ [36mRunning post-start:[0mdiff --git a/tests/snapshots/integration__integration_tests__push__push_error_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_error_not_fast_forward.snapindex a3373178b..6346a3d63 100644--- a/tests/snapshots/integration__integration_tests__push__push_error_not_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__push__push_error_not_fast_forward.snap@@ -7,21 +7,23 @@ info:- mainenv:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpLX191Y/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp2anII4/test-config.toml---success: falseexit_code: 1----- stdout ---------- stderr ------β [31mNot a fast-forward from [1m[31mmain[0m to HEAD[0m+β [31mNot a fast-forward from [0m[1m[31mmain[0m[31m to HEAD[0mπ‘ [2mThe target branch has commits not in your current branch[0mπ‘ [2mConsider: git pull or git rebase[0mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_already_on_default.snap b/tests/snapshots/integration__integration_tests__remove__remove_already_on_default.snapindex 5dddab611..445eb7a81 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_already_on_default.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_already_on_default.snap@@ -6,6 +6,7 @@ info:- removeenv:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/null@@ -14,11 +15,11 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpiwEwxk/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpCbfiBE/test-config.toml---success: trueexit_code: 0----- stdout ------β [32mAlready on default branch [1m[32mmain[0m[0m+β [32mAlready on default branch [0m[1m[32mmain[0m----- stderr -----diff --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 d6557b45f..5915a1111 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@@ -12,15 +12,16 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpwoV5d4/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmprA25Vy/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mRemoving worktree for [1m[36mfeature-a[0m...[0m-β [32mRemoved worktree for [1m[32mfeature-a[0m[0m+β [32mRemoved worktree for [0m[1m[32mfeature-a[0m----- stderr -----diff --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 f43860ae2..7d447eda1 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@@ -12,15 +12,16 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpgkTzI3/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp3YUOqW/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mRemoving worktree for [1m[36mfeature-b[0m...[0m-β [32mRemoved worktree for [1m[32mfeature-b[0m[0m+β [32mRemoved worktree for [0m[1m[32mfeature-b[0m----- stderr -----diff --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 9022ebc0b..870e59f5b 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@@ -12,15 +12,16 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpp17EuP/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmplmsOFq/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mRemoving worktree for [1m[36mfeature-current[0m...[0m-β [32mRemoved worktree, returned to primary at [2m[REPO][0m[0m+β [32mRemoved worktree, returned to primary at [0m[2m[REPO][0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap b/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snapindex b999457e9..05f8c2225 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap@@ -11,14 +11,15 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpBjz5Ug/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpcfTmsh/test-config.toml---success: trueexit_code: 0----- stdout ------β [32mRemoved worktree, returned to primary at [2m[REPO][0m[0m+β [32mRemoved worktree, returned to primary at [0m[2m[REPO][0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap b/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snapindex 336f3d80a..747673d3b 100644Binary files a/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap and b/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap differdiff --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 090f23704..3e4f5052c 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@@ -14,19 +14,20 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpISy0zz/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpnTnZpE/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mRemoving worktree for [1m[36mfeature-b[0m...[0m-β [32mRemoved worktree for [1m[32mfeature-b[0m[0m+β [32mRemoved worktree for [0m[1m[32mfeature-b[0mπ [36mRemoving worktree for [1m[36mfeature-c[0m...[0m-β [32mRemoved worktree for [1m[32mfeature-c[0m[0m+β [32mRemoved worktree for [0m[1m[32mfeature-c[0mπ [36mRemoving worktree for [1m[36mfeature-a[0m...[0m-β [32mRemoved worktree, returned to primary at [2m[REPO][0m[0m+β [32mRemoved worktree, returned to primary at [0m[2m[REPO][0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snapindex 6b4ccd19e..13eac027c 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap@@ -14,19 +14,20 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpYrctGH/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpVwovCx/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mRemoving worktree for [1m[36mfeature-a[0m...[0m-β [32mRemoved worktree for [1m[32mfeature-a[0m[0m+β [32mRemoved worktree for [0m[1m[32mfeature-a[0mπ [36mRemoving worktree for [1m[36mfeature-b[0m...[0m-β [32mRemoved worktree for [1m[32mfeature-b[0m[0m+β [32mRemoved worktree for [0m[1m[32mfeature-b[0mπ [36mRemoving worktree for [1m[36mfeature-c[0m...[0m-β [32mRemoved worktree for [1m[32mfeature-c[0m[0m+β [32mRemoved worktree for [0m[1m[32mfeature-c[0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__remove__remove_nonexistent_worktree.snap b/tests/snapshots/integration__integration_tests__remove__remove_nonexistent_worktree.snapindex 0b7bb46e8..1eb93195e 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_nonexistent_worktree.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_nonexistent_worktree.snap@@ -12,10 +12,11 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpkmLMGZ/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp9KO7x2/test-config.toml---success: falseexit_code: 1@@ -23,4 +24,4 @@ exit_code: 1π [36mRemoving worktree for [1m[36mnonexistent[0m...[0m----- stderr ------β [31mNo worktree found for branch [1m[31mnonexistent[0m[0m+β [31mNo worktree found for branch [0m[1m[31mnonexistent[0mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_switch_to_default.snap b/tests/snapshots/integration__integration_tests__remove__remove_switch_to_default.snapindex c7156906c..a9ed5e469 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_switch_to_default.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_switch_to_default.snap@@ -6,6 +6,7 @@ info:- removeenv:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/null@@ -14,11 +15,11 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp7awyli/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpMx1qX7/test-config.toml---success: trueexit_code: 0----- stdout ------β [32mSwitched to default branch [1m[32mmain[0m[0m+β [32mSwitched to default branch [0m[1m[32mmain[0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__security__branch_name_with_cd_directive_not_executed.snap b/tests/snapshots/integration__integration_tests__security__branch_name_with_cd_directive_not_executed.snapindex fe3837d36..62bcd49a6 100644--- a/tests/snapshots/integration__integration_tests__security__branch_name_with_cd_directive_not_executed.snap+++ b/tests/snapshots/integration__integration_tests__security__branch_name_with_cd_directive_not_executed.snap@@ -18,11 +18,11 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpo8j40U/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp1rspoF/test-config.toml---success: falseexit_code: 1----- stdout ---------- stderr ------β [31mBranch [1m[31m__WORKTRUNK_CD__[PATH]+β [31mBranch [0m[1m[31m__WORKTRUNK_CD__[PATH]diff --git a/tests/snapshots/integration__integration_tests__switch__switch_base_without_create.snap b/tests/snapshots/integration__integration_tests__switch__switch_base_without_create.snapindex 830974a30..84baaea8d 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_base_without_create.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_base_without_create.snap@@ -18,13 +18,13 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpJ5iAjV/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpMJMcDh/test-config.toml---success: trueexit_code: 0----- stdout -----π‘ [33m--base flag is only used with --create, ignoring[0m-β [32mSwitched to worktree for [1m[32mmain[0m at [1m[REPO][0m[0m+β [32mSwitched to worktree for [0m[1m[32mmain[0m[32m at [0m[1m[REPO][0mTo enable automatic cd, run: wt config shelldiff --git a/tests/snapshots/integration__integration_tests__switch__switch_create_existing_error.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_existing_error.snapindex 4e46c2e8d..6c9f01d8f 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_create_existing_error.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_create_existing_error.snap@@ -8,20 +8,22 @@ info:- feature-yenv:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpen5y9C/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpr9dZQK/test-config.toml---success: falseexit_code: 1----- stdout ---------- stderr ------β [31mBranch [1m[31mfeature-y[0m already exists[0m+β [31mBranch [0m[1m[31mfeature-y[0m[31m already exists[0mπ‘ [2mRemove --create flag to switch to it[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_create_new.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_new.snapindex 543cb6671..c19ce2258 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_create_new.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_create_new.snap@@ -17,12 +17,12 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpPJqdAZ/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmptwz3fh/test-config.toml---success: trueexit_code: 0----- stdout ------β [32mCreated new worktree for [1m[32mfeature-x[0m at [1m[REPO].feature-x[0m[0m+β [32mCreated new worktree for [0m[1m[32mfeature-x[0m[32m at [0m[1m[REPO].feature-x[0mTo enable automatic cd, run: wt config shelldiff --git a/tests/snapshots/integration__integration_tests__switch__switch_create_no_remote.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_no_remote.snapindex bf03dc0d1..7c02f79ce 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_create_no_remote.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_create_no_remote.snap@@ -17,12 +17,12 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpigojqA/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpHeZwAo/test-config.toml---success: trueexit_code: 0----- stdout ------β [32mCreated new worktree for [1m[32mfeature[0m at [1m[REPO].feature[0m[0m+β [32mCreated new worktree for [0m[1m[32mfeature[0m[32m at [0m[1m[REPO].feature[0mTo enable automatic cd, run: wt config shelldiff --git a/tests/snapshots/integration__integration_tests__switch__switch_create_remote_only.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_remote_only.snapindex 76386184e..0e8df8844 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_create_remote_only.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_create_remote_only.snap@@ -17,12 +17,12 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpboPJAp/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpw4Xlfj/test-config.toml---success: trueexit_code: 0----- stdout ------β [32mCreated new worktree for [1m[32mremote-feature[0m at [1m[REPO].remote-feature[0m[0m+β [32mCreated new worktree for [0m[1m[32mremote-feature[0m[32m at [0m[1m[REPO].remote-feature[0mTo enable automatic cd, run: wt config shelldiff --git a/tests/snapshots/integration__integration_tests__switch__switch_error_missing_directory.snap b/tests/snapshots/integration__integration_tests__switch__switch_error_missing_directory.snapindex f69e81cba..a4de38d25 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_error_missing_directory.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_error_missing_directory.snap@@ -7,20 +7,22 @@ info:- missing-wtenv:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpDfDNEl/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpmAK33k/test-config.toml---success: falseexit_code: 1----- stdout ---------- stderr ------β [31mWorktree directory missing for [1m[31mmissing-wt[0m[0m+β [31mWorktree directory missing for [0m[1m[31mmissing-wt[0mπ‘ [2mRun 'git worktree prune' to clean up[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snapindex 1cda8e7f9..346bcfb8b 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snap@@ -19,12 +19,12 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpiXPfdn/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp25iADj/test-config.toml---success: trueexit_code: 0----- stdout ------β [32mCreated new worktree for [1m[32mfile-test[0m at [1m[REPO].file-test[0m[0m+β [32mCreated new worktree for [0m[1m[32mfile-test[0m[32m at [0m[1m[REPO].file-test[0mπ [36mExecuting (--execute):[0m[40m [0m [1m[34mecho [32m'test content' [36m> test.txtdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snapindex 71225d0bc..93b6996fc 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap@@ -18,12 +18,12 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmps7sIrp/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpE4HxF9/test-config.toml---success: trueexit_code: 0----- stdout ------β [32mSwitched to worktree for [1m[32mexisting-exec[0m at [1m[WORKTREE_EXISTING_EXEC][0m[0m+β [32mSwitched to worktree for [0m[1m[32mexisting-exec[0m[32m at [0m[1m[WORKTREE_EXISTING_EXEC][0mπ [36mExecuting (--execute):[0m[40m [0m [1m[34mecho [32m'existing worktree' [36m> existing.txtdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snapindex 6a4b73ee9..28865ddc1 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap@@ -19,12 +19,12 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmptcWQZg/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpTWBt9s/test-config.toml---success: falseexit_code: 1----- stdout ------β [32mCreated new worktree for [1m[32mfail-test[0m at [1m[REPO].fail-test[0m[0m+β [32mCreated new worktree for [0m[1m[32mfail-test[0m[32m at [0m[1m[REPO].fail-test[0mπ [36mExecuting (--execute):[0m[40m [0m [1m[34mexit 1diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snapindex d489b534d..a0050a259 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap@@ -19,12 +19,12 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpOfIfWL/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpX8YD2y/test-config.toml---success: trueexit_code: 0----- stdout ------β [32mCreated new worktree for [1m[32mmultiline-test[0m at [1m[REPO].multiline-test[0m[0m+β [32mCreated new worktree for [0m[1m[32mmultiline-test[0m[32m at [0m[1m[REPO].multiline-test[0mπ [36mExecuting (--execute):[0m[40m [0m [1m[34mecho [32m'line1'[40m [0m [1m[34mecho [32m'line2'diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snapindex 089c24efc..7d9999012 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap@@ -19,12 +19,12 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpIVfCvt/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpiZRqFm/test-config.toml---success: trueexit_code: 0----- stdout ------β [32mCreated new worktree for [1m[32mexec-test[0m at [1m[REPO].exec-test[0m[0m+β [32mCreated new worktree for [0m[1m[32mexec-test[0m[32m at [0m[1m[REPO].exec-test[0mπ [36mExecuting (--execute):[0m[40m [0m [1m[34mecho [32m'test output'diff --git a/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snap b/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snapindex eb5135130..b3c05e048 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snap@@ -16,12 +16,12 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpSbHuCa/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpk98b5H/test-config.toml---success: trueexit_code: 0----- stdout ------β [32mSwitched to worktree for [1m[32mfeature-z[0m at [1m[WORKTREE_FEATURE_Z][0m[0m+β [32mSwitched to worktree for [0m[1m[32mfeature-z[0m[32m at [0m[1m[WORKTREE_FEATURE_Z][0mTo enable automatic cd, run: wt config shelldiff --git a/tests/snapshots/integration__integration_tests__switch__switch_existing_internal.snap b/tests/snapshots/integration__integration_tests__switch__switch_existing_internal.snapindex c22d60250..29b7b67d7 100644Binary files a/tests/snapshots/integration__integration_tests__switch__switch_existing_internal.snap and b/tests/snapshots/integration__integration_tests__switch__switch_existing_internal.snap differdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_internal_mode.snap b/tests/snapshots/integration__integration_tests__switch__switch_internal_mode.snapindex 62bc0746c..9576693a1 100644Binary files a/tests/snapshots/integration__integration_tests__switch__switch_internal_mode.snap and b/tests/snapshots/integration__integration_tests__switch__switch_internal_mode.snap differdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snap b/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snapindex 658052ad4..230788b13 100644Binary files a/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snap and b/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snap differdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_execute_still_runs.snap b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_execute_still_runs.snapindex cad661c05..e748e22de 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_execute_still_runs.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_execute_still_runs.snap@@ -20,12 +20,12 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpfBZMH9/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp9e2mUl/test-config.toml---success: trueexit_code: 0----- stdout ------β [32mCreated new worktree for [1m[32mno-hooks-test[0m at [1m[REPO].no-hooks-test[0m[0m+β [32mCreated new worktree for [0m[1m[32mno-hooks-test[0m[32m at [0m[1m[REPO].no-hooks-test[0mπ [36mExecuting (--execute):[0m[40m [0m [1m[34mecho [32m'execute command runs'diff --git a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_existing.snap b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_existing.snapindex aafdf65df..df8a36f97 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_existing.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_existing.snap@@ -19,12 +19,12 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpTf5MlF/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpHrubiU/test-config.toml---success: trueexit_code: 0----- stdout ------β [32mSwitched to worktree for [1m[32mexisting-no-hooks[0m at [1m[WORKTREE_EXISTING_NO_HOOKS][0m[0m+β [32mSwitched to worktree for [0m[1m[32mexisting-no-hooks[0m[32m at [0m[1m[WORKTREE_EXISTING_NO_HOOKS][0mπ [36mExecuting (--execute):[0m[40m [0m [1m[34mecho [32m'execute still runs'diff --git a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_skips_post_start.snap b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_skips_post_start.snapindex cfc7ccdb9..616057ef8 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_skips_post_start.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_skips_post_start.snap@@ -15,16 +15,16 @@ info:GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""- HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpuLwZjp+ HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmphwN3TfLANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpfpCslg/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpr8EVQB/test-config.toml---success: trueexit_code: 0----- stdout ------β [32mCreated new worktree for [1m[32mno-post-start[0m at [1m[REPO].no-post-start[0m[0m+β [32mCreated new worktree for [0m[1m[32mno-post-start[0m[32m at [0m[1m[REPO].no-post-start[0mTo enable automatic cd, run: wt config shelldiff --git a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_with_force.snap b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_with_force.snapindex 6f72f1af3..444dc685c 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_with_force.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_with_force.snap@@ -16,16 +16,16 @@ info:GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""- HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpSlH1kP+ HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0NlAPbLANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp40CWMS/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpGptfXz/test-config.toml---success: trueexit_code: 0----- stdout ------β [32mCreated new worktree for [1m[32mforce-no-hooks[0m at [1m[REPO].force-no-hooks[0m[0m+β [32mCreated new worktree for [0m[1m[32mforce-no-hooks[0m[32m at [0m[1m[REPO].force-no-hooks[0mTo enable automatic cd, run: wt config shelldiff --git a/tests/snapshots/integration__integration_tests__switch__switch_with_base.snap b/tests/snapshots/integration__integration_tests__switch__switch_with_base.snapindex 1d598a1fa..54afb009b 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_with_base.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_with_base.snap@@ -19,12 +19,12 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmprEfpAW/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpQBUfc3/test-config.toml---success: trueexit_code: 0----- stdout ------β [32mCreated new worktree for [1m[32mfeature-with-base[0m at [1m[REPO].feature-with-base[0m[0m+β [32mCreated new worktree for [0m[1m[32mfeature-with-base[0m[32m at [0m[1m[REPO].feature-with-base[0mTo enable automatic cd, run: wt config shell