Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
refactor(tests): Improve suite, address display, and fix snapshot rebase order
Maximilian Roos36872dbf9b39
diff --git a/CLAUDE.md b/CLAUDE.mdindex 6ee0d7b59..1227e772c 100644--- a/CLAUDE.md+++ b/CLAUDE.md@@ -192,6 +192,18 @@ println!("Switched to worktree: {bold}{branch}{bold:#}");Tables (`wt list`) use conditional styling for branch names to indicate worktree state (current/primary/other), not bold.+**CRITICAL: Avoid nested style resets** - When composing styles, apply all attributes to a single style object rather than nesting different styles. Nested resets can leak colors:++```rust+// ❌ BAD - nested reset can leak color+"{WARNING}Text with {bold}nested{bold:#} styles{WARNING:#}"+// When {bold:#} resets, it also resets WARNING color!++// ✅ GOOD - compose styles together+let warning_bold = WARNING.bold();+"{WARNING}Text with {warning_bold}composed{warning_bold:#} styles{WARNING:#}"+```+### Information Hierarchy & Path Styling**Principle: Bold what answers the user's question, dim what provides context.**@@ -243,6 +255,17 @@ Colors automatically adjust based on environment:All handled automatically by `anstream` macros.+**CRITICAL: Always use styled print macros** - Import `print`, `println`, `eprint`, `eprintln` from `worktrunk::styling`, NOT the standard library versions. The styled versions use `anstream` for proper color detection and reset handling. Using standard macros bypasses color management and can cause leaks:++```rust+// ❌ BAD - uses standard library macro, bypasses anstream+eprintln!("{}", styled_text);++// ✅ GOOD - import and use anstream-wrapped version+use worktrunk::styling::eprintln;+eprintln!("{}", styled_text);+```+### Design Principles- **Inline over wrappers** - Use `{style}text{style:#}` pattern, not wrapper functionsdiff --git a/src/commands/command_approval.rs b/src/commands/command_approval.rsindex 2e2923d7d..bf2500f04 100644--- a/src/commands/command_approval.rs+++ b/src/commands/command_approval.rs@@ -5,7 +5,7 @@use worktrunk::config::{ApprovedCommand, CommandConfig, WorktrunkConfig};use worktrunk::git::{GitError, GitResultExt};use worktrunk::styling::{- AnstyleStyle, HINT_EMOJI, WARNING, WARNING_EMOJI, eprintln, format_bash_with_gutter,+ AnstyleStyle, HINT_EMOJI, WARNING, WARNING_EMOJI, eprint, eprintln, format_bash_with_gutter,};/// Convert CommandConfig to a vector of `(name, command)` pairs.@@ -99,12 +99,13 @@ fn prompt_for_batch_approval(let project_name = project_id.split('/').next_back().unwrap_or(project_id);let bold = AnstyleStyle::new().bold();let dim = AnstyleStyle::new().dimmed();+ let warning_bold = WARNING.bold();let count = commands.len();let plural = if count == 1 { "" } else { "s" };eprintln!();eprintln!(- "{WARNING_EMOJI} {WARNING}Permission required to execute {bold}{count}{bold:#} command{plural}{WARNING:#}",+ "{WARNING_EMOJI} {WARNING}Permission required to execute {warning_bold}{count}{warning_bold:#} command{plural}{WARNING:#}",);eprintln!();eprintln!("{bold}{project_name}{bold:#} ({dim}{project_id}{dim:#}) wants to execute:");diff --git a/src/commands/dev.rs b/src/commands/dev.rsindex d2e8c2cea..8bd79a914 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::{AnstyleStyle, HINT, HINT_EMOJI};+use worktrunk::styling::{HINT, HINT_EMOJI};use super::merge::{execute_post_merge_commands, run_pre_commit_commands, run_pre_merge_commands,@@ -99,12 +99,12 @@ fn load_project_config(repo: &Repository) -> Result<ProjectConfig, GitError> {Some(cfg) => Ok(cfg),None => {// No project config found - show helpful error- let bold = AnstyleStyle::new().bold();use worktrunk::styling::ERROR;use worktrunk::styling::ERROR_EMOJI;+ let hint_bold = HINT.bold();eprintln!("{ERROR_EMOJI} {ERROR}No project configuration found{ERROR:#}",);eprintln!(- "{HINT_EMOJI} {HINT}Create a config file at: {bold}{}{bold:#}{HINT:#}",+ "{HINT_EMOJI} {HINT}Create a config file at: {hint_bold}{}{hint_bold:#}{HINT:#}",config_path.display());Err(GitError::CommandFailed(diff --git a/src/commands/merge.rs b/src/commands/merge.rsindex 8fbde2a2f..653bd2adc 100644--- a/src/commands/merge.rs+++ b/src/commands/merge.rs@@ -161,12 +161,13 @@ pub fn handle_merge(/// Format the merge summary message (includes emoji and color for consistency)fn format_merge_summary(primary_path: Option<&std::path::Path>) -> String {- use worktrunk::styling::{GREEN, SUCCESS_EMOJI};+ use worktrunk::styling::{AnstyleStyle, GREEN, SUCCESS_EMOJI};+ let dim = AnstyleStyle::new().dimmed();// Show where we ended upif let Some(path) = primary_path {format!(- "{SUCCESS_EMOJI} {GREEN}Returned to primary at {}{GREEN:#}",+ "{SUCCESS_EMOJI} {GREEN}Returned to primary at {dim}{}{dim:#}{GREEN:#}",path.display())} else {diff --git a/src/main.rs b/src/main.rsindex a677b3e69..682e819cf 100644--- a/src/main.rs+++ b/src/main.rs@@ -435,11 +435,10 @@ fn main() {// Remove others firstfor worktree in others.iter() {// Show progress before starting removal- use anstyle::Style;use worktrunk::styling::CYAN;- let bold = Style::new().bold();+ let cyan_bold = CYAN.bold();output::progress(format!(- "🔄 {CYAN}Removing worktree for {bold}{worktree}{bold:#}...{CYAN:#}"+ "🔄 {CYAN}Removing worktree for {cyan_bold}{worktree}{cyan_bold:#}...{CYAN:#}"))?;let result = handle_remove(Some(worktree.as_str()))?;@@ -449,11 +448,10 @@ fn main() {// Remove current worktree last (if it was in the list)if let Some(current_name) = current {// Show progress before starting removal- use anstyle::Style;use worktrunk::styling::CYAN;- let bold = Style::new().bold();+ let cyan_bold = CYAN.bold();output::progress(format!(- "🔄 {CYAN}Removing worktree for {bold}{current_name}{bold:#}...{CYAN:#}"+ "🔄 {CYAN}Removing worktree for {cyan_bold}{current_name}{cyan_bold:#}...{CYAN:#}"))?;let result = handle_remove(Some(current_name.as_str()))?;diff --git a/src/output/directive.rs b/src/output/directive.rsindex 8159d29c8..06249a457 100644--- a/src/output/directive.rs+++ b/src/output/directive.rs@@ -57,17 +57,18 @@ impl DirectiveOutput {/// In directive mode, the shell wrapper will actually change directories,/// so we can say "changed directory to {path}"pub fn format_switch_success(&self, branch: &str, path: &Path, created_branch: bool) -> String {- use worktrunk::styling::{GREEN, SUCCESS_EMOJI};+ use worktrunk::styling::{AnstyleStyle, GREEN, SUCCESS_EMOJI};let green_bold = GREEN.bold();+ let dim = AnstyleStyle::new().dimmed();if created_branch {format!(- "{SUCCESS_EMOJI} {GREEN}Created new worktree for {green_bold}{branch}{green_bold:#}, changed directory to {green_bold}{}{green_bold:#}{GREEN:#}",+ "{SUCCESS_EMOJI} {GREEN}Created new worktree for {green_bold}{branch}{green_bold:#}, changed directory to {dim}{}{dim:#}{GREEN:#}",path.display())} else {format!(- "{SUCCESS_EMOJI} {GREEN}Switched to worktree for {green_bold}{branch}{green_bold:#}, changed directory to {green_bold}{}{green_bold:#}{GREEN:#}",+ "{SUCCESS_EMOJI} {GREEN}Switched to worktree for {green_bold}{branch}{green_bold:#}, changed directory to {dim}{}{dim:#}{GREEN:#}",path.display())}diff --git a/src/output/handlers.rs b/src/output/handlers.rsindex 6ae473ae5..6e234866f 100644--- a/src/output/handlers.rs+++ b/src/output/handlers.rs@@ -23,8 +23,9 @@ fn format_switch_message(result: &SwitchResult, branch: &str) -> String {/// Format message for remove operation (includes emoji and color for consistency)fn format_remove_message(result: &RemoveResult) -> String {- use worktrunk::styling::{GREEN, SUCCESS_EMOJI};+ use worktrunk::styling::{AnstyleStyle, GREEN, SUCCESS_EMOJI};let green_bold = GREEN.bold();+ let dim = AnstyleStyle::new().dimmed();match result {RemoveResult::AlreadyOnDefault(branch) => {@@ -34,7 +35,7 @@ fn format_remove_message(result: &RemoveResult) -> String {}RemoveResult::RemovedWorktree { primary_path } => {format!(- "{SUCCESS_EMOJI} {GREEN}Removed worktree, returned to primary at {}{GREEN:#}",+ "{SUCCESS_EMOJI} {GREEN}Removed worktree, returned to primary at {dim}{}{dim:#}{GREEN:#}",primary_path.display())}diff --git a/src/output/interactive.rs b/src/output/interactive.rsindex 112792217..2f3091b9c 100644--- a/src/output/interactive.rs+++ b/src/output/interactive.rs@@ -72,17 +72,18 @@ impl InteractiveOutput {////// In interactive mode, we can't actually change directories, so we say "at {path}"pub fn format_switch_success(&self, branch: &str, path: &Path, created_branch: bool) -> String {- use worktrunk::styling::{GREEN, SUCCESS_EMOJI};+ use worktrunk::styling::{AnstyleStyle, GREEN, SUCCESS_EMOJI};let green_bold = GREEN.bold();+ let dim = AnstyleStyle::new().dimmed();if created_branch {format!(- "{SUCCESS_EMOJI} {GREEN}Created new worktree for {green_bold}{branch}{green_bold:#} at {green_bold}{}{green_bold:#}{GREEN:#}",+ "{SUCCESS_EMOJI} {GREEN}Created new worktree for {green_bold}{branch}{green_bold:#} at {dim}{}{dim:#}{GREEN:#}",path.display())} else {format!(- "{SUCCESS_EMOJI} {GREEN}Switched to worktree for {green_bold}{branch}{green_bold:#} at {green_bold}{}{green_bold:#}{GREEN:#}",+ "{SUCCESS_EMOJI} {GREEN}Switched to worktree for {green_bold}{branch}{green_bold:#} at {dim}{}{dim:#}{GREEN:#}",path.display())}diff --git a/tests/integration_tests/completion.rs b/tests/integration_tests/completion.rsindex 302b8bd56..866465b1a 100644--- a/tests/integration_tests/completion.rs+++ b/tests/integration_tests/completion.rs@@ -688,7 +688,7 @@ fn test_complete_dev_run_hook_shows_hook_types() {temp.commit("initial");// Test completion for dev run-hook- let mut cmd = Command::new(assert_cmd::cargo::cargo_bin!("wt"));+ let mut cmd = Command::new(get_cargo_bin("wt"));let output = cmd.current_dir(temp.root_path()).args(["complete", "wt", "dev", "run-hook", ""])@@ -715,7 +715,7 @@ fn test_complete_dev_run_hook_with_partial_input() {temp.commit("initial");// Test completion with partial input- let mut cmd = Command::new(assert_cmd::cargo::cargo_bin!("wt"));+ let mut cmd = Command::new(get_cargo_bin("wt"));let output = cmd.current_dir(temp.root_path()).args(["complete", "wt", "dev", "run-hook", "po"])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 2a849723e..38dd42a1b 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[32m[TMPDIR]/test-repo.bash-test[0m[0m+✅ [32mCreated new worktree for [1m[32mbash-test[0m, changed directory to [2m[TMPDIR]/test-repo.bash-test[0m[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 ea70102f7..edd27b2f0 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[32m[TMPDIR]/test-repo.fish-multiline[0m[0m+✅ [32mCreated new worktree for [1m[32mfish-multiline[0m, changed directory to [2m[TMPDIR]/test-repo.fish-multiline[0m[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 7017b0a26..268fa5130 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[32m[TMPDIR]/test-repo.fish-minimal[0m[0m+✅ [32mCreated new worktree for [1m[32mfish-minimal[0m, changed directory to [2m[TMPDIR]/test-repo.fish-minimal[0m[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 00c68710b..2f9178082 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@@ -5,4 +5,4 @@ expression: output.normalized().as_ref()🔄 [36mRunning post-start:[0m[40m [0m [1m[34mecho [32m'fish background task'-✅ [32mCreated new worktree for [1m[32mfish-bg[0m, changed directory to [1m[32m[TMPDIR]/test-repo.fish-bg[0m[0m+✅ [32mCreated new worktree for [1m[32mfish-bg[0m, changed directory to [2m[TMPDIR]/test-repo.fish-bg[0m[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snapindex 52d40277f..04cd1cfea 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@@ -28,4 +28,4 @@ expression: output.normalized().as_ref()✅ [32mMerged to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m🔄 [36mCleaning up worktree...[0m-✅ [32mReturned to primary at [TMPDIR]/test-repo[0m+✅ [32mReturned to primary at [2m[TMPDIR]/test-repo[0m[0mdiff --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 f42702cbf..dc2d49504 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@@ -24,4 +24,4 @@ expression: output.normalized().as_ref()✅ [32mMerged to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m🔄 [36mCleaning up worktree...[0m-✅ [32mReturned to primary at [TMPDIR]/test-repo[0m+✅ [32mReturned to primary at [2m[TMPDIR]/test-repo[0m[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snapindex c9c58c67c..4c8177274 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@@ -28,4 +28,4 @@ expression: output.normalized().as_ref()✅ [32mMerged to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m🔄 [36mCleaning up worktree...[0m-✅ [32mReturned to primary at [TMPDIR]/test-repo[0m+✅ [32mReturned to primary at [2m[TMPDIR]/test-repo[0m[0mdiff --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 8b824a4bb..fa1d4e86a 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__remove.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__remove.snap@@ -2,5 +2,5 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized().as_ref()----🔄 [36mRemoving worktree for [1mto-remove[0m...[0m+🔄 [36mRemoving worktree for [1m[36mto-remove[0m...[0m✅ [32mRemoved worktree for [1m[32mto-remove[0m[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 2c88e4e9d..40bed3f2b 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[32m[TMPDIR]/test-repo.feature[0m[0m+✅ [32mCreated new worktree for [1m[32mfeature[0m, changed directory to [2m[TMPDIR]/test-repo.feature[0m[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 2450fdfa2..c78d6d26d 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[32m[TMPDIR]/test-repo.test-exec[0m[0m+✅ [32mCreated new worktree for [1m[32mtest-exec[0m, changed directory to [2m[TMPDIR]/test-repo.test-exec[0m[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 2450fdfa2..c78d6d26d 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[32m[TMPDIR]/test-repo.test-exec[0m[0m+✅ [32mCreated new worktree for [1m[32mtest-exec[0m, changed directory to [2m[TMPDIR]/test-repo.test-exec[0m[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 64c1da482..d7d7f533b 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@@ -18,4 +18,4 @@ Building project...🔄 [36mRunning post-start: watch[0m[40m [0m [1m[34mecho [32m'Watching for file changes'-✅ [32mCreated new worktree for [1m[32mfeature-hooks[0m, changed directory to [1m[32m[TMPDIR]/test-repo.feature-hooks[0m[0m+✅ [32mCreated new worktree for [1m[32mfeature-hooks[0m, changed directory to [2m[TMPDIR]/test-repo.feature-hooks[0m[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_fish.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_fish.snapindex 6e574ee6a..73e1da98d 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_fish.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_fish.snap@@ -16,4 +16,4 @@ Building project...🔄 [36mRunning post-start: watch[0m[40m [0m [1m[34mecho [32m'Watching for file changes'-✅ [32mCreated new worktree for [1m[32mfeature-hooks[0m, changed directory to [1m[32m[TMPDIR]/test-repo.feature-hooks[0m[0m+✅ [32mCreated new worktree for [1m[32mfeature-hooks[0m, changed directory to [2m[TMPDIR]/test-repo.feature-hooks[0m[0mdiff --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 38264d562..3670f0786 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@@ -18,4 +18,4 @@ Building project...🔄 [36mRunning post-start: watch[0m[40m [0m [1m[34mecho [32m'Watching for file changes'-✅ [32mCreated new worktree for [1m[32mfeature-hooks[0m, changed directory to [1m[32m[TMPDIR]/test-repo.feature-hooks[0m[0m+✅ [32mCreated new worktree for [1m[32mfeature-hooks[0m, changed directory to [2m[TMPDIR]/test-repo.feature-hooks[0m[0mdiff --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 825c98d43..0dedd825f 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@@ -5,4 +5,4 @@ expression: output.normalized().as_ref()🔄 [36mRunning post-start:[0m[40m [0m [1m[34mecho [32m'test command executed'-✅ [32mCreated new worktree for [1m[32mfeature-with-hooks[0m, changed directory to [1m[32m[TMPDIR]/test-repo.feature-with-hooks[0m[0m+✅ [32mCreated new worktree for [1m[32mfeature-with-hooks[0m, changed directory to [2m[TMPDIR]/test-repo.feature-with-hooks[0m[0mdiff --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 56922bf41..aae76152b 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@@ -5,4 +5,4 @@ expression: output.normalized().as_ref()🔄 [36mRunning post-start:[0m[40m [0m [1m[34mecho [32m'background task'-✅ [32mCreated new worktree for [1m[32mfeature-bg[0m, changed directory to [1m[32m[TMPDIR]/test-repo.feature-bg[0m[0m+✅ [32mCreated new worktree for [1m[32mfeature-bg[0m, changed directory to [2m[TMPDIR]/test-repo.feature-bg[0m[0mdiff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snapindex 559a0e79b..e99eb33a7 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 9726a5f63..069ca445d 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[32m[REPO].test-branch[0m[0m+✅ [32mCreated new worktree for [1m[32mtest-branch[0m, changed directory to [2m[REPO].test-branch[0m[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 b311c37a4..afd24d0ee 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@@ -13,13 +13,12 @@ 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_COMMIT_GENERATION__ARGS: "fix: update file 1 content"WORKTRUNK_COMMIT_GENERATION__COMMAND: echo- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpGIeJXC/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpY82I6F/test-config.toml---success: trueexit_code: 0@@ -46,6 +45,6 @@ exit_code: 0✅ [32mMerged to [1m[32mmain[0m (1 commit, 2 files, [32m+2[0m) [0m🔄 [36mCleaning up worktree...[0m-✅ [32mReturned to primary at [REPO][0m+✅ [32mReturned to primary at [2m[REPO][0m[0m----- stderr -----diff --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 ba2730b16..f5e6e9633 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@@ -12,11 +12,10 @@ 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/.tmpodbChs/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpC1vIGz/test-config.toml---success: trueexit_code: 0@@ -39,6 +38,6 @@ exit_code: 0✅ [32mMerged to [1m[32mmain[0m (2 commits, 1 file, [32m+1[0m) [0m🔄 [36mCleaning up worktree...[0m-✅ [32mReturned to primary at [REPO][0m+✅ [32mReturned to primary at [2m[REPO][0m[0m----- stderr -----diff --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 255bf2069..997dd1e22 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@@ -12,13 +12,12 @@ 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_COMMIT_GENERATION__ARGS: "fix: improve auth validation logic"WORKTRUNK_COMMIT_GENERATION__COMMAND: echo- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpxZUCEr/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpOz5jBP/test-config.toml---success: trueexit_code: 0@@ -41,6 +40,6 @@ exit_code: 0✅ [32mMerged to [1m[32mmain[0m (2 commits, 1 file, [32m+1[0m) [0m🔄 [36mCleaning up worktree...[0m-✅ [32mReturned to primary at [REPO][0m+✅ [32mReturned to primary at [2m[REPO][0m[0m----- stderr -----diff --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 4b52aef9a..5e79e6632 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@@ -12,11 +12,10 @@ 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/.tmp7Dsi4E/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0tLDRd/test-config.toml---success: trueexit_code: 0@@ -38,6 +37,6 @@ exit_code: 0✅ [32mMerged to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m🔄 [36mCleaning up worktree...[0m-✅ [32mReturned to primary at [REPO][0m+✅ [32mReturned to primary at [2m[REPO][0m[0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snapindex b90830fb1..b8ba2c80e 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap@@ -12,11 +12,10 @@ 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/.tmpTqcYRR/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmphJavlh/test-config.toml---success: trueexit_code: 0@@ -32,6 +31,6 @@ exit_code: 0✅ [32mMerged to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m🔄 [36mCleaning up worktree...[0m-✅ [32mReturned to primary at [REPO][0m+✅ [32mReturned to primary at [2m[REPO][0m[0m----- stderr -----diff --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 0e93db4cb..a1edeab1c 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,11 +12,10 @@ 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/.tmpWqopvB/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpKUB6t1/test-config.toml---success: trueexit_code: 0@@ -32,6 +31,6 @@ exit_code: 0✅ [32mMerged to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m🔄 [36mCleaning up worktree...[0m-✅ [32mReturned to primary at [REPO][0m+✅ [32mReturned to primary at [2m[REPO][0m[0m----- stderr -----diff --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 f7cb1c925..76808bb1f 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@@ -13,11 +13,10 @@ 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/.tmpyCBIMe/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpwgLxRb/test-config.toml---success: trueexit_code: 0@@ -33,7 +32,7 @@ exit_code: 0✅ [32mMerged to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m🔄 [36mCleaning up worktree...[0m-✅ [32mReturned to primary at [REPO][0m+✅ [32mReturned to primary at [2m[REPO][0m[0m🔄 [36mRunning post-merge:[0m[40m [0m [1m[34mexit 1diff --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 c7e672ac8..3dac13d4a 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,11 +13,10 @@ 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/.tmpKb79NL/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpgfHFF8/test-config.toml---success: trueexit_code: 0@@ -33,7 +32,7 @@ exit_code: 0✅ [32mMerged to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m🔄 [36mCleaning up worktree...[0m-✅ [32mReturned to primary at [REPO][0m+✅ [32mReturned to primary at [2m[REPO][0m[0m🔄 [36mRunning post-merge: deploy[0m[40m [0m [1m[34mecho [32m'Deploying branch feature' [36m> deploy.txtdiff --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 84c5d77a5..81ab8ded3 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@@ -13,11 +13,10 @@ 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/.tmpu70TEh/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpGDHgpq/test-config.toml---success: trueexit_code: 0@@ -33,7 +32,7 @@ exit_code: 0✅ [32mMerged to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m🔄 [36mCleaning up worktree...[0m-✅ [32mReturned to primary at [REPO][0m+✅ [32mReturned to primary at [2m[REPO][0m[0m🔄 [36mRunning post-merge:[0m[40m [0m [1m[34mecho [32m'merged feature to main' [36m> post-merge-ran.txtdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snapindex 85d5dafa1..730c449aa 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,11 +13,10 @@ 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/.tmpq6Fqrm/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpGPXr1M/test-config.toml---success: trueexit_code: 0@@ -42,7 +41,7 @@ exit_code: 0✅ [32mMerged to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m🔄 [36mCleaning up worktree...[0m-✅ [32mReturned to primary at [REPO][0m+✅ [32mReturned to primary at [2m[REPO][0m[0m----- stderr -----Pre-commit check passeddiff --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 fe2a85cc6..5192a81ff 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@@ -24,4 +24,4 @@ STDERR-FROM-SECOND✅ [32mMerged to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m🔄 [36mCleaning up worktree...[0m-✅ [32mReturned to primary at [REPO][0m+✅ [32mReturned to primary at [2m[REPO][0m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snapindex fcee81663..12d51b130 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@@ -17,7 +17,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpSbuIzF/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp9gK2VY/test-config.toml---success: trueexit_code: 0@@ -42,6 +42,6 @@ exit_code: 0✅ [32mMerged to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m🔄 [36mCleaning up worktree...[0m-✅ [32mReturned to primary at [REPO][0m+✅ [32mReturned to primary at [2m[REPO][0m[0m----- stderr -----diff --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 24a3b5e4e..1886fd6a7 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,11 +13,10 @@ 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/.tmpb7lKGC/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpRSGXKS/test-config.toml---success: trueexit_code: 0@@ -33,6 +32,6 @@ exit_code: 0✅ [32mMerged to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m🔄 [36mCleaning up worktree...[0m-✅ [32mReturned to primary at [REPO][0m+✅ [32mReturned to primary at [2m[REPO][0m[0m----- stderr -----diff --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 f9632b218..33645a6c4 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@@ -17,7 +17,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpJGAaLr/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp3GcE8o/test-config.toml---success: trueexit_code: 0@@ -39,7 +39,7 @@ exit_code: 0✅ [32mMerged to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m🔄 [36mCleaning up worktree...[0m-✅ [32mReturned to primary at [REPO][0m+✅ [32mReturned to primary at [2m[REPO][0m[0m----- stderr -----[check1] stdout line 1diff --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 27db741c3..bc6be23bd 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,7 +17,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmplKmOf1/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp7PVXx8/test-config.toml---success: trueexit_code: 0@@ -36,6 +36,6 @@ exit_code: 0✅ [32mMerged to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m🔄 [36mCleaning up worktree...[0m-✅ [32mReturned to primary at [REPO][0m+✅ [32mReturned to primary at [2m[REPO][0m[0m----- stderr -----diff --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 fdf980ab0..0801bbffb 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,11 +14,10 @@ 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/.tmpFRZNsw/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp5vSpTy/test-config.toml---success: trueexit_code: 0@@ -38,7 +37,7 @@ exit_code: 0✅ [32mMerged to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m🔄 [36mCleaning up worktree...[0m-✅ [32mReturned to primary at [REPO][0m+✅ [32mReturned to primary at [2m[REPO][0m[0m----- stderr -----Pre-squash check passeddiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snapindex 260dbac68..1e46c78c7 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap@@ -13,11 +13,10 @@ 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/.tmp0Vk3gf/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpK2R45F/test-config.toml---success: trueexit_code: 0@@ -46,6 +45,6 @@ exit_code: 0✅ [32mMerged to [1m[32mmain[0m (1 commit, 3 files, [32m+3[0m) [0m🔄 [36mCleaning up worktree...[0m-✅ [32mReturned to primary at [REPO][0m+✅ [32mReturned to primary at [2m[REPO][0m[0m----- stderr -----diff --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 1e00b1609..a0db2a1ca 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@@ -13,12 +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_COMMIT_GENERATION__COMMAND: nonexistent-llm-command- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpPUipYd/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpTWKzoF/test-config.toml---success: trueexit_code: 0@@ -45,6 +44,6 @@ exit_code: 0✅ [32mMerged to [1m[32mmain[0m (1 commit, 2 files, [32m+2[0m) [0m🔄 [36mCleaning up worktree...[0m-✅ [32mReturned to primary at [REPO][0m+✅ [32mReturned to primary at [2m[REPO][0m[0m----- stderr -----diff --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 8b740a754..515ec288b 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,11 +13,10 @@ 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/.tmpyYVGir/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpoM9avQ/test-config.toml---success: trueexit_code: 0@@ -34,6 +33,6 @@ exit_code: 0✅ [32mMerged to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m🔄 [36mCleaning up worktree...[0m-✅ [32mReturned to primary at [REPO][0m+✅ [32mReturned to primary at [2m[REPO][0m[0m----- stderr -----diff --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 69e798e82..cbb36fa45 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@@ -13,14 +13,13 @@ 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_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/.tmpUoVJyx/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpBfVgOr/test-config.toml---success: trueexit_code: 0@@ -46,6 +45,6 @@ exit_code: 0✅ [32mMerged to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m🔄 [36mCleaning up worktree...[0m-✅ [32mReturned to primary at [REPO][0m+✅ [32mReturned to primary at [2m[REPO][0m[0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snapindex 0cf5045f9..fd7914f3c 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap@@ -11,11 +11,10 @@ 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/.tmp6kCcxR/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpnPgwRJ/test-config.toml---success: trueexit_code: 0@@ -31,6 +30,6 @@ exit_code: 0✅ [32mMerged to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m🔄 [36mCleaning up worktree...[0m-✅ [32mReturned to primary at [REPO][0m+✅ [32mReturned to primary at [2m[REPO][0m[0m----- stderr -----diff --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 94435dc65..979ce1e0a 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@@ -13,11 +13,10 @@ 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/.tmpSXuYf3/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpLkYtsf/test-config.toml---success: trueexit_code: 0@@ -28,7 +27,7 @@ exit_code: 0🔄 [36mRunning post-start: server[0m[40m [0m [1m[34msleep 0.5 [36m&& [1m[34mecho [32m'Server running' [36m> server.txt-✅ [32mCreated new worktree for [1m[32mfeature[0m at [1m[32m[REPO].feature[0m[0m+✅ [32mCreated new worktree for [1m[32mfeature[0m at [2m[REPO].feature[0m[0mTo enable automatic cd, run: wt config shelldiff --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 e871653e2..95718c579 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@@ -15,11 +15,10 @@ 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/.tmp72zfpv/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpy0HXln/test-config.toml---success: trueexit_code: 0@@ -27,7 +26,7 @@ exit_code: 0🔄 [36mRunning post-start:[0m[40m [0m [1m[34mecho [32m'Background task' [36m> background.txt-✅ [32mCreated new worktree for [1m[32mfeature[0m at [1m[32m[REPO].feature[0m[0m+✅ [32mCreated new worktree for [1m[32mfeature[0m at [2m[REPO].feature[0m[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 717723f49..6c800f460 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@@ -13,11 +13,10 @@ 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/.tmpTSCPfX/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp52uf4X/test-config.toml---success: trueexit_code: 0@@ -26,7 +25,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[32m[REPO].feature[0m[0m+✅ [32mCreated new worktree for [1m[32mfeature[0m at [2m[REPO].feature[0m[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 c3eedb715..ab2556f7f 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@@ -13,11 +13,10 @@ 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/.tmpR5DdbY/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpslS57M/test-config.toml---success: trueexit_code: 0@@ -29,7 +28,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[32m[REPO].feature[0m[0m+✅ [32mCreated new worktree for [1m[32mfeature[0m at [2m[REPO].feature[0m[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 5f068b5c0..369a67bfe 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@@ -13,11 +13,10 @@ 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/.tmpO3fqwg/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpXP3KUE/test-config.toml---success: trueexit_code: 0@@ -28,7 +27,7 @@ exit_code: 0🔄 [36mRunning post-create: 2[0m[40m [0m [1m[34mecho [32m'Second'-✅ [32mCreated new worktree for [1m[32mfeature[0m at [1m[32m[REPO].feature[0m[0m+✅ [32mCreated new worktree for [1m[32mfeature[0m at [2m[REPO].feature[0m[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 3fc8810a7..1ae1f0e93 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@@ -13,11 +13,10 @@ 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/.tmpHyiyl6/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpFeEv7z/test-config.toml---success: trueexit_code: 0@@ -28,7 +27,7 @@ exit_code: 0🔄 [36mRunning post-create: setup[0m[40m [0m [1m[34mecho [32m'Running setup'-✅ [32mCreated new worktree for [1m[32mfeature[0m at [1m[32m[REPO].feature[0m[0m+✅ [32mCreated new worktree for [1m[32mfeature[0m at [2m[REPO].feature[0m[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 80849ca54..962ebf7e4 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@@ -13,16 +13,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/.tmp7YhCwn/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp7eh314/test-config.toml---success: trueexit_code: 0----- stdout ------✅ [32mCreated new worktree for [1m[32mfeature[0m at [1m[32m[REPO].feature[0m[0m+✅ [32mCreated new worktree for [1m[32mfeature[0m at [2m[REPO].feature[0m[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 dba5aee62..4d625614d 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@@ -13,11 +13,10 @@ 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/.tmpVxHABO/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpth1Wjx/test-config.toml---success: trueexit_code: 0@@ -25,7 +24,7 @@ exit_code: 0🔄 [36mRunning post-create:[0m[40m [0m [1m[34mecho [32m'Setup complete'-✅ [32mCreated new worktree for [1m[32mfeature[0m at [1m[32m[REPO].feature[0m[0m+✅ [32mCreated new worktree for [1m[32mfeature[0m at [2m[REPO].feature[0m[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 7a75c98bd..3d3a81e47 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@@ -13,11 +13,10 @@ 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/.tmpz4D7MK/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp8UllPf/test-config.toml---success: trueexit_code: 0@@ -34,7 +33,7 @@ exit_code: 0🔄 [36mRunning post-create: 4[0m[40m [0m [1m[34mecho [32m'Root: [REPO]' [36m>> info.txt-✅ [32mCreated new worktree for [1m[32mfeature/test[0m at [1m[32m[REPO].feature-test[0m[0m+✅ [32mCreated new worktree for [1m[32mfeature/test[0m at [2m[REPO].feature-test[0m[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 549f3fed3..9f116a0b6 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@@ -13,11 +13,10 @@ 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/.tmpQkmeBa/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpXCbTAO/test-config.toml---success: trueexit_code: 0@@ -27,7 +26,7 @@ exit_code: 0[40m [0m [1m[34mline2[40m [0m [1m[34mline3' | grep line2 > filtered.txt-✅ [32mCreated new worktree for [1m[32mfeature[0m at [1m[32m[REPO].feature[0m[0m+✅ [32mCreated new worktree for [1m[32mfeature[0m at [2m[REPO].feature[0m[0mTo enable automatic cd, run: wt config shelldiff --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 ab608311c..8365b7146 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@@ -13,11 +13,10 @@ 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/.tmpFLqz2Z/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpculkoK/test-config.toml---success: trueexit_code: 0@@ -25,7 +24,7 @@ exit_code: 0🔄 [36mRunning post-start:[0m[40m [0m [1m[34mecho 'unclosed quote-✅ [32mCreated new worktree for [1m[32mfeature[0m at [1m[32m[REPO].feature[0m[0m+✅ [32mCreated new worktree for [1m[32mfeature[0m at [2m[REPO].feature[0m[0mTo enable automatic cd, run: wt config shelldiff --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 093bbded4..3e1e3436a 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@@ -13,11 +13,10 @@ 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/.tmprpb0oK/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmphBwRjp/test-config.toml---success: trueexit_code: 0@@ -25,7 +24,7 @@ exit_code: 0🔄 [36mRunning post-start:[0m[40m [0m [1m[34mecho [32m'stdout output' [36m&& [1m[34mecho [32m'stderr output' >&2-✅ [32mCreated new worktree for [1m[32mfeature[0m at [1m[32m[REPO].feature[0m[0m+✅ [32mCreated new worktree for [1m[32mfeature[0m at [2m[REPO].feature[0m[0mTo enable automatic cd, run: wt config shelldiff --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 c257baadd..96d5b5085 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@@ -13,11 +13,10 @@ 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/.tmpyFapZH/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp1q3u7W/test-config.toml---success: trueexit_code: 0@@ -27,7 +26,7 @@ exit_code: 0[40m [0m [1m[34mecho [32m'second line' [36m>> multiline.txt[40m [0m [1m[34mecho [32m'third line' [36m>> multiline.txt-✅ [32mCreated new worktree for [1m[32mfeature[0m at [1m[32m[REPO].feature[0m[0m+✅ [32mCreated new worktree for [1m[32mfeature[0m at [2m[REPO].feature[0m[0mTo enable automatic cd, run: wt config shelldiff --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 6aef25fe3..fd4f94fc8 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@@ -13,11 +13,10 @@ 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/.tmpqKOqIQ/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpGKkTa1/test-config.toml---success: trueexit_code: 0@@ -28,7 +27,7 @@ exit_code: 0🔄 [36mRunning post-start: task2[0m[40m [0m [1m[34mecho [32m'Task 2 running' [36m> task2.txt-✅ [32mCreated new worktree for [1m[32mfeature[0m at [1m[32m[REPO].feature[0m[0m+✅ [32mCreated new worktree for [1m[32mfeature[0m at [2m[REPO].feature[0m[0mTo enable automatic cd, run: wt config shelldiff --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 dea37b581..44d506f9b 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@@ -13,11 +13,10 @@ 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/.tmpc1ekPX/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpuLxpWM/test-config.toml---success: trueexit_code: 0@@ -31,7 +30,7 @@ exit_code: 0🔄 [36mRunning post-start: task3[0m[40m [0m [1m[34mecho [32m'TASK3_OUTPUT'-✅ [32mCreated new worktree for [1m[32mfeature[0m at [1m[32m[REPO].feature[0m[0m+✅ [32mCreated new worktree for [1m[32mfeature[0m at [2m[REPO].feature[0m[0mTo enable automatic cd, run: wt config shelldiff --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 0954bf7a1..1e6b71980 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@@ -13,11 +13,10 @@ 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/.tmpM1pzXk/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmplpgtqF/test-config.toml---success: trueexit_code: 0@@ -25,7 +24,7 @@ exit_code: 0🔄 [36mRunning post-start:[0m[40m [0m [1m[34msleep 1 [36m&& [1m[34mecho [32m'Background task done' [36m> background.txt-✅ [32mCreated new worktree for [1m[32mfeature[0m at [1m[32m[REPO].feature[0m[0m+✅ [32mCreated new worktree for [1m[32mfeature[0m at [2m[REPO].feature[0m[0mTo enable automatic cd, run: wt config shelldiff --git a/tests/snapshots/integration__integration_tests__remove__remove_by_name_dirty_target.snap b/tests/snapshots/integration__integration_tests__remove__remove_by_name_dirty_target.snapindex bfda7a68c..8163d2bdd 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_by_name_dirty_target.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_by_name_dirty_target.snap@@ -7,20 +7,20 @@ info:- feature-dirtyenv: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/.tmp6YqzPG/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpArleFS/test-config.toml---success: falseexit_code: 1----- stdout ------🔄 [36mRemoving worktree for [1mfeature-dirty[0m...[0m+🔄 [36mRemoving worktree for [1m[36mfeature-dirty[0m...[0m----- stderr -----❌ [31mWorking tree has uncommitted changes[0mdiff --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 8f67184f7..d6557b45f 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@@ -7,20 +7,20 @@ info:- feature-aenv: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/.tmpw83zyY/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpwoV5d4/test-config.toml---success: trueexit_code: 0----- stdout ------🔄 [36mRemoving worktree for [1mfeature-a[0m...[0m+🔄 [36mRemoving worktree for [1m[36mfeature-a[0m...[0m✅ [32mRemoved worktree for [1m[32mfeature-a[0m[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 bc20ae620..f43860ae2 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@@ -7,20 +7,20 @@ info:- feature-benv: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/.tmpLbWCyd/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpgkTzI3/test-config.toml---success: trueexit_code: 0----- stdout ------🔄 [36mRemoving worktree for [1mfeature-b[0m...[0m+🔄 [36mRemoving worktree for [1m[36mfeature-b[0m...[0m✅ [32mRemoved worktree for [1m[32mfeature-b[0m[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 700d060b1..9022ebc0b 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@@ -7,20 +7,20 @@ info:- feature-currentenv: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/.tmpm9BNNl/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpp17EuP/test-config.toml---success: trueexit_code: 0----- stdout ------🔄 [36mRemoving worktree for [1mfeature-current[0m...[0m-✅ [32mRemoved worktree, returned to primary at [REPO][0m+🔄 [36mRemoving worktree for [1m[36mfeature-current[0m...[0m+✅ [32mRemoved worktree, returned to primary at [2m[REPO][0m[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 37bf205eb..b999457e9 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.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@@ -13,11 +14,11 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp19Hrkj/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpBjz5Ug/test-config.toml---success: trueexit_code: 0----- stdout ------✅ [32mRemoved worktree, returned to primary at [REPO][0m+✅ [32mRemoved worktree, returned to primary at [2m[REPO][0m[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 0f02042ee..336f3d80a 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 8ae349ab2..090f23704 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@@ -9,24 +9,24 @@ info:- feature-cenv: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/.tmp8NegOA/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpISy0zz/test-config.toml---success: trueexit_code: 0----- stdout ------🔄 [36mRemoving worktree for [1mfeature-b[0m...[0m+🔄 [36mRemoving worktree for [1m[36mfeature-b[0m...[0m✅ [32mRemoved worktree for [1m[32mfeature-b[0m[0m-🔄 [36mRemoving worktree for [1mfeature-c[0m...[0m+🔄 [36mRemoving worktree for [1m[36mfeature-c[0m...[0m✅ [32mRemoved worktree for [1m[32mfeature-c[0m[0m-🔄 [36mRemoving worktree for [1mfeature-a[0m...[0m-✅ [32mRemoved worktree, returned to primary at [REPO][0m+🔄 [36mRemoving worktree for [1m[36mfeature-a[0m...[0m+✅ [32mRemoved worktree, returned to primary at [2m[REPO][0m[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 5e4cb13e2..6b4ccd19e 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap@@ -9,24 +9,24 @@ info:- feature-cenv: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/.tmpyRudJg/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpYrctGH/test-config.toml---success: trueexit_code: 0----- stdout ------🔄 [36mRemoving worktree for [1mfeature-a[0m...[0m+🔄 [36mRemoving worktree for [1m[36mfeature-a[0m...[0m✅ [32mRemoved worktree for [1m[32mfeature-a[0m[0m-🔄 [36mRemoving worktree for [1mfeature-b[0m...[0m+🔄 [36mRemoving worktree for [1m[36mfeature-b[0m...[0m✅ [32mRemoved worktree for [1m[32mfeature-b[0m[0m-🔄 [36mRemoving worktree for [1mfeature-c[0m...[0m+🔄 [36mRemoving worktree for [1m[36mfeature-c[0m...[0m✅ [32mRemoved worktree for [1m[32mfeature-c[0m[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 54a189872..0b7bb46e8 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_nonexistent_worktree.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_nonexistent_worktree.snap@@ -7,20 +7,20 @@ info:- nonexistentenv: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/.tmp1Dq2Fj/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpkmLMGZ/test-config.toml---success: falseexit_code: 1----- stdout ------🔄 [36mRemoving worktree for [1mnonexistent[0m...[0m+🔄 [36mRemoving worktree for [1m[36mnonexistent[0m...[0m----- stderr -----❌ [31mNo worktree found for branch [1m[31mnonexistent[0m[0mdiff --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 1fcbea9a0..d25ab1235 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@@ -14,17 +14,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/.tmpvXJSL1/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpBKyBSb/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[32m[REPO][0m[0m+✅ [32mSwitched to worktree for [1m[32mmain[0m at [2m[REPO][0m[0mTo enable automatic cd, run: wt config shelldiff --git a/tests/snapshots/integration__integration_tests__switch__switch_create_new.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_new.snapindex 00a25a151..2f5546c7b 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_create_new.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_create_new.snap@@ -13,16 +13,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/.tmpOX13l7/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpuOKnbm/test-config.toml---success: trueexit_code: 0----- stdout ------✅ [32mCreated new worktree for [1m[32mfeature-x[0m at [1m[32m[REPO].feature-x[0m[0m+✅ [32mCreated new worktree for [1m[32mfeature-x[0m at [2m[REPO].feature-x[0m[0mTo enable automatic cd, run: wt config shelldiff --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 a824f260d..cfb45abb4 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@@ -15,16 +15,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/.tmpKNwepL/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpeS8uKr/test-config.toml---success: trueexit_code: 0----- stdout ------✅ [32mCreated new worktree for [1m[32mfile-test[0m at [1m[32m[REPO].file-test[0m[0m+✅ [32mCreated new worktree for [1m[32mfile-test[0m at [2m[REPO].file-test[0m[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 33a2a846f..4b4997f3d 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap@@ -14,16 +14,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/.tmpuc1i1r/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpuFG2vR/test-config.toml---success: trueexit_code: 0----- stdout ------✅ [32mSwitched to worktree for [1m[32mexisting-exec[0m at [1m[32m[WORKTREE_EXISTING_EXEC][0m[0m+✅ [32mSwitched to worktree for [1m[32mexisting-exec[0m at [2m[WORKTREE_EXISTING_EXEC][0m[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 2bfd5964f..4b142845a 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap@@ -15,16 +15,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/.tmpvR1UNm/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpmL5yt1/test-config.toml---success: falseexit_code: 1----- stdout ------✅ [32mCreated new worktree for [1m[32mfail-test[0m at [1m[32m[REPO].fail-test[0m[0m+✅ [32mCreated new worktree for [1m[32mfail-test[0m at [2m[REPO].fail-test[0m[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 bac4cd96c..8d6cb78e4 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap@@ -15,16 +15,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/.tmpAGzzq3/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpEHaZqQ/test-config.toml---success: trueexit_code: 0----- stdout ------✅ [32mCreated new worktree for [1m[32mmultiline-test[0m at [1m[32m[REPO].multiline-test[0m[0m+✅ [32mCreated new worktree for [1m[32mmultiline-test[0m at [2m[REPO].multiline-test[0m[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 76a6d15b8..596ae25db 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap@@ -15,16 +15,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/.tmpd7ZTBn/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp9KW3IH/test-config.toml---success: trueexit_code: 0----- stdout ------✅ [32mCreated new worktree for [1m[32mexec-test[0m at [1m[32m[REPO].exec-test[0m[0m+✅ [32mCreated new worktree for [1m[32mexec-test[0m at [2m[REPO].exec-test[0m[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 b885a59b1..416e53ab6 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snap@@ -12,16 +12,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/.tmp6eXJXQ/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpvKMVPn/test-config.toml---success: trueexit_code: 0----- stdout ------✅ [32mSwitched to worktree for [1m[32mfeature-z[0m at [1m[32m[WORKTREE_FEATURE_Z][0m[0m+✅ [32mSwitched to worktree for [1m[32mfeature-z[0m at [2m[WORKTREE_FEATURE_Z][0m[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 0d6121eba..a02af807f 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 4c872fd6d..125ef103f 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 30235984e..05911f6c9 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 0503b6cb7..a7d8d8ef4 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@@ -16,16 +16,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/.tmpiuaAob/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpg40tXe/test-config.toml---success: trueexit_code: 0----- stdout ------✅ [32mCreated new worktree for [1m[32mno-hooks-test[0m at [1m[32m[REPO].no-hooks-test[0m[0m+✅ [32mCreated new worktree for [1m[32mno-hooks-test[0m at [2m[REPO].no-hooks-test[0m[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 675e846ec..ed5390e04 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@@ -15,16 +15,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/.tmpaInF4G/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmppeu8EL/test-config.toml---success: trueexit_code: 0----- stdout ------✅ [32mSwitched to worktree for [1m[32mexisting-no-hooks[0m at [1m[32m[WORKTREE_EXISTING_NO_HOOKS][0m[0m+✅ [32mSwitched to worktree for [1m[32mexisting-no-hooks[0m at [2m[WORKTREE_EXISTING_NO_HOOKS][0m[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 1a1970a89..3713dd8b8 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@@ -14,17 +14,16 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null- GIT_EDITOR: ""- HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpaEqKaa+ HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpKxVSWNLANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpKGiD8q/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmph3cAbc/test-config.toml---success: trueexit_code: 0----- stdout ------✅ [32mCreated new worktree for [1m[32mno-post-start[0m at [1m[32m[REPO].no-post-start[0m[0m+✅ [32mCreated new worktree for [1m[32mno-post-start[0m at [2m[REPO].no-post-start[0m[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 08e401d5f..67634de97 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@@ -15,17 +15,16 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null- GIT_EDITOR: ""- HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpmajxwl+ HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp7DolD7LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpzaVEoX/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpcEdk7I/test-config.toml---success: trueexit_code: 0----- stdout ------✅ [32mCreated new worktree for [1m[32mforce-no-hooks[0m at [1m[32m[REPO].force-no-hooks[0m[0m+✅ [32mCreated new worktree for [1m[32mforce-no-hooks[0m at [2m[REPO].force-no-hooks[0m[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 d665eba1f..ac1525eff 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_with_base.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_with_base.snap@@ -15,16 +15,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/.tmpXUj97k/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpPycQW6/test-config.toml---success: trueexit_code: 0----- stdout ------✅ [32mCreated new worktree for [1m[32mfeature-with-base[0m at [1m[32m[REPO].feature-with-base[0m[0m+✅ [32mCreated new worktree for [1m[32mfeature-with-base[0m at [2m[REPO].feature-with-base[0m[0mTo enable automatic cd, run: wt config shell