Skip to content

Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows

feat: improve snapshot testing experience and accept final insta snapshot

Maximilian Rooseb963011cc4e
diff --git a/CLAUDE.md b/CLAUDE.md
index a01027d8f..70f0a8227 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -239,7 +239,9 @@ output.push_str(&format!("{}", anstyle::Reset));
Style based on **user intent**, not data type. In messages, branch names are always bold. When a path is part of an action phrase (e.g., "changed directory to {path}"), it's bold because it answers "where?". When shown as supplementary metadata on a separate line (e.g., "Path: ..."), it's dimmed. Commit hashes are always dimmed in their surrounding color (reference info).
-Styled elements must maintain their surrounding color. Don't apply just `{bold}` or `{dim}` to elements in colored messages - compose the color with the style using `.bold()` or `.dimmed()` on the color style. Applying a style without color creates a color leak - the styled element loses its context color and appears in default terminal colors (black/white).
+**Parenthesized suffixes do NOT need to maintain surrounding color.** Parenthesized content (e.g., `(no squashing needed)`, `(3 files, +45, -12)`) can be unstyled/default color even within colored messages. These are supplementary details that don't need color emphasis.
+
+Styled elements (except parenthesized suffixes) must maintain their surrounding color. Don't apply just `{bold}` or `{dim}` to elements in colored messages - compose the color with the style using `.bold()` or `.dimmed()` on the color style. Applying a style without color creates a color leak - the styled element loses its context color and appears in default terminal colors (black/white).
```rust
// WRONG - styled element loses surrounding color
@@ -260,6 +262,10 @@ println!("✅ {GREEN}Created worktree, changed directory to {green_bold}{}{green
let green_dim = GREEN.dimmed();
println!("✅ {GREEN}Committed changes @ {green_dim}{hash}{green_dim:#}{GREEN:#}");
+// Parenthesized suffixes - unstyled even in colored messages
+let cyan_dim = CYAN.dimmed();
+println!("🔄 {CYAN}Merging to main @ {cyan_dim}{hash}{cyan_dim:#}{CYAN:#} (no squashing needed)");
+
// Path as supplementary metadata (separate line) - dimmed in unstyled context
let dim = AnstyleStyle::new().dimmed();
println!("✅ {GREEN}Created worktree{GREEN:#}\n{dim}Path: {}{dim:#}", path.display());
diff --git a/src/commands/dev.rs b/src/commands/dev.rs
index 99f5fa7a0..cdb408242 100644
--- a/src/commands/dev.rs
+++ b/src/commands/dev.rs
@@ -277,9 +277,10 @@ pub fn handle_dev_squash(
// Check if there are actually any changes to commit
if !repo.has_staged_changes()? {
- use worktrunk::styling::{ERROR, ERROR_EMOJI, HINT};
+ use worktrunk::styling::{ERROR, ERROR_EMOJI, HINT, HINT_EMOJI};
+ let hint_bold = HINT.bold();
return Err(GitError::CommandFailed(format!(
- "{ERROR_EMOJI} {ERROR}No changes to commit after squashing {commit_count} commits{ERROR:#}\n\n{HINT_EMOJI} {HINT}The commits resulted in no net changes (e.g., changes were reverted or already in {HINT:#}{CYAN_BOLD}{target_branch}{CYAN_BOLD:#}{HINT}){HINT:#}"
+ "{ERROR_EMOJI} {ERROR}No changes to commit after squashing {commit_count} commits{ERROR:#}\n\n{HINT_EMOJI} {HINT}The commits resulted in no net changes (e.g., changes were reverted or already in {hint_bold}{target_branch}{hint_bold:#}{HINT}){HINT:#}"
)));
}
@@ -330,7 +331,7 @@ pub fn handle_dev_rebase(target: Option<&str>) -> Result<bool, GitError> {
// Rebase onto target
crate::output::progress(format!(
- "🔄 {CYAN}Rebasing onto {CYAN:#}{CYAN_BOLD}{target_branch}{CYAN_BOLD:#}{CYAN}...{CYAN:#}"
+ "🔄 {CYAN}Rebasing onto {CYAN_BOLD}{target_branch}{CYAN_BOLD:#}{CYAN}...{CYAN:#}"
))?;
let rebase_result = repo.run_command(&["rebase", &target_branch]);
diff --git a/src/commands/merge.rs b/src/commands/merge.rs
index d42107201..b7c6ec520 100644
--- a/src/commands/merge.rs
+++ b/src/commands/merge.rs
@@ -169,7 +169,7 @@ pub fn handle_merge(
let new_branch = primary_repo.current_branch()?;
if new_branch.as_deref() != Some(&target_branch) {
crate::output::progress(format!(
- "🔄 {CYAN}Switching to {CYAN:#}{CYAN_BOLD}{target_branch}{CYAN_BOLD:#}{CYAN}...{CYAN:#}"
+ "🔄 {CYAN}Switching to {CYAN_BOLD}{target_branch}{CYAN_BOLD:#}{CYAN}...{CYAN:#}"
))?;
primary_repo
.run_command(&["switch", &target_branch])
diff --git a/src/commands/worktree.rs b/src/commands/worktree.rs
index 28ce4379d..f225f48da 100644
--- a/src/commands/worktree.rs
+++ b/src/commands/worktree.rs
@@ -662,7 +662,7 @@ pub fn handle_push(
let cyan_dim = CYAN.dimmed();
crate::output::progress(format!(
- "🔄 {CYAN}{verb_ing} {commit_count} {commit_text} to {CYAN_BOLD}{target_branch}{CYAN_BOLD:#} @ {cyan_dim}{head_sha}{cyan_dim:#}{CYAN:#} ({operations_text})\n"
+ "🔄 {CYAN}{verb_ing} {commit_count} {commit_text} to {CYAN_BOLD}{target_branch}{CYAN_BOLD:#}{CYAN} @ {cyan_dim}{head_sha}{cyan_dim:#}{CYAN:#} ({operations_text})\n"
))?;
// Show the commit graph with color
@@ -715,7 +715,7 @@ pub fn handle_push(
summary_parts.extend(stats.format_summary());
crate::output::progress(format!(
- "{SUCCESS_EMOJI} {GREEN}{verb} {GREEN_BOLD}{target_branch}{GREEN_BOLD:#} ({}) {GREEN:#}",
+ "{SUCCESS_EMOJI} {GREEN}{verb} {GREEN_BOLD}{target_branch}{GREEN_BOLD:#}{GREEN:#} ({})",
summary_parts.join(", ")
))?;
} else {
diff --git a/src/git.rs b/src/git.rs
index a055cde69..9740615bf 100644
--- a/src/git.rs
+++ b/src/git.rs
@@ -110,7 +110,7 @@ impl std::fmt::Display for GitError {
match command_name {
Some(name) => write!(
f,
- "{ERROR_EMOJI} {ERROR}{hook_type} command failed: {ERROR:#}{error_bold}{name}{error_bold:#}\n\n{error}\n\n{HINT_EMOJI} {HINT}Use --no-hooks to skip {hook_type} commands{HINT:#}"
+ "{ERROR_EMOJI} {ERROR}{hook_type} command failed: {error_bold}{name}{error_bold:#}{ERROR:#}\n\n{error}\n\n{HINT_EMOJI} {HINT}Use --no-hooks to skip {hook_type} commands{HINT:#}"
),
None => write!(
f,
@@ -132,7 +132,7 @@ impl std::fmt::Display for GitError {
let error_bold = ERROR.bold();
write!(
f,
- "{ERROR_EMOJI} {ERROR}Branch {ERROR:#}{error_bold}{branch}{error_bold:#}{ERROR} already exists{ERROR:#}\n\n{HINT_EMOJI} {HINT}Remove --create flag to switch to it{HINT:#}"
+ "{ERROR_EMOJI} {ERROR}Branch {error_bold}{branch}{error_bold:#}{ERROR} already exists{ERROR:#}\n\n{HINT_EMOJI} {HINT}Remove --create flag to switch to it{HINT:#}"
)
}
@@ -141,7 +141,7 @@ impl std::fmt::Display for GitError {
let error_bold = ERROR.bold();
write!(
f,
- "{ERROR_EMOJI} {ERROR}Worktree directory missing for {ERROR:#}{error_bold}{branch}{error_bold:#}\n\n{HINT_EMOJI} {HINT}Run 'git worktree prune' to clean up{HINT:#}"
+ "{ERROR_EMOJI} {ERROR}Worktree directory missing for {error_bold}{branch}{error_bold:#}{ERROR:#}\n\n{HINT_EMOJI} {HINT}Run 'git worktree prune' to clean up{HINT:#}"
)
}
@@ -150,7 +150,7 @@ impl std::fmt::Display for GitError {
let error_bold = ERROR.bold();
write!(
f,
- "{ERROR_EMOJI} {ERROR}No worktree found for branch {ERROR:#}{error_bold}{branch}{error_bold:#}"
+ "{ERROR_EMOJI} {ERROR}No worktree found for branch {error_bold}{branch}{error_bold:#}{ERROR:#}"
)
}
@@ -236,7 +236,7 @@ impl std::fmt::Display for GitError {
write!(
f,
- "{ERROR_EMOJI} {ERROR}Rebase onto {ERROR:#}{error_bold}{target_branch}{error_bold:#}{ERROR} incomplete{ERROR:#}"
+ "{ERROR_EMOJI} {ERROR}Rebase onto {error_bold}{target_branch}{error_bold:#}{ERROR} incomplete{ERROR:#}"
)?;
if !git_output.is_empty() {
diff --git a/src/output/handlers.rs b/src/output/handlers.rs
index e913c723a..55e9c235a 100644
--- a/src/output/handlers.rs
+++ b/src/output/handlers.rs
@@ -29,7 +29,7 @@ fn format_remove_message(result: &RemoveResult, branch: Option<&str>) -> String
match result {
RemoveResult::AlreadyOnDefault(branch) => {
format!(
- "{SUCCESS_EMOJI} {GREEN}Already on default branch {GREEN:#}{green_bold}{branch}{green_bold:#}"
+ "{SUCCESS_EMOJI} {GREEN}Already on default branch {green_bold}{branch}{green_bold:#}{GREEN:#}"
)
}
RemoveResult::RemovedWorktree {
@@ -51,7 +51,7 @@ fn format_remove_message(result: &RemoveResult, branch: Option<&str>) -> String
}
RemoveResult::SwitchedToDefault(branch) => {
format!(
- "{SUCCESS_EMOJI} {GREEN}Switched to default branch {GREEN:#}{green_bold}{branch}{green_bold:#}"
+ "{SUCCESS_EMOJI} {GREEN}Switched to default branch {green_bold}{branch}{green_bold:#}{GREEN:#}"
)
}
}
diff --git a/src/output/mod.rs b/src/output/mod.rs
index 597d4344f..c16f8c334 100644
--- a/src/output/mod.rs
+++ b/src/output/mod.rs
@@ -100,7 +100,7 @@ pub(crate) fn format_switch_success_message(
};
format!(
- "{SUCCESS_EMOJI} {GREEN}{action} {green_bold}{branch}{green_bold:#}{GREEN}{location} {green_bold}{}{green_bold:#}",
+ "{SUCCESS_EMOJI} {GREEN}{action} {green_bold}{branch}{green_bold:#}{GREEN}{location} {green_bold}{}{green_bold:#}{GREEN:#}",
path.display()
)
}
diff --git a/tests/integration_tests/directives.rs b/tests/integration_tests/directives.rs
index d49822083..1626ce9b2 100644
--- a/tests/integration_tests/directives.rs
+++ b/tests/integration_tests/directives.rs
@@ -80,7 +80,7 @@ fn test_remove_internal_directive() {
.arg("remove")
.current_dir(repo.root_path());
- assert_cmd_snapshot!(cmd, @"success: true\nexit_code: 0\n----- stdout -----\n✅ \u{1b}[32mAlready on default branch \u{1b}[0m\u{1b}[1m\u{1b}[32mmain\u{1b}[0m\0\n----- stderr -----");
+ assert_cmd_snapshot!(cmd, @"success: true\nexit_code: 0\n----- stdout -----\n✅ \u{1b}[32mAlready on default branch \u{1b}[1m\u{1b}[32mmain\u{1b}[0m\u{1b}[0m\0\n----- stderr -----");
});
}
@@ -102,7 +102,7 @@ fn test_remove_without_internal() {
success: true
exit_code: 0
----- stdout -----
- ✅ Already on default branch main
+ ✅ Already on default branch main
----- stderr -----
");
diff --git a/tests/integration_tests/merge.rs b/tests/integration_tests/merge.rs
index 5d1191fd1..85c3759e9 100644
--- a/tests/integration_tests/merge.rs
+++ b/tests/integration_tests/merge.rs
@@ -1968,14 +1968,14 @@ fn test_merge_no_commit_with_clean_tree() {
success: true
exit_code: 0
----- stdout -----
- 🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+ 🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) Add feature file
feature.txt | 1 +
1 file changed, 1 insertion(+)
- ✅ Merged to main (1 commit, 1 file, +1) 
+ ✅ Merged to main (1 commit, 1 file, +1)
✅ Kept worktree (use 'wt remove' to clean up)
----- stderr -----
@@ -2075,14 +2075,14 @@ fn test_merge_no_commit_no_squash_no_remove_redundant() {
success: true
exit_code: 0
----- stdout -----
- 🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+ 🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) Add feature file
feature.txt | 1 +
1 file changed, 1 insertion(+)
- ✅ Merged to main (1 commit, 1 file, +1) 
+ ✅ Merged to main (1 commit, 1 file, +1)
✅ Kept worktree (use 'wt remove' to clean up)
----- stderr -----
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__bash_shell_integration_hint_suppressed.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__bash_shell_integration_hint_suppressed.snap
index 69a77d954..bab1b2665 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.rs
expression: output.normalized().as_ref()
---
-✅ Created new worktree for bash-test, changed directory to [TMPDIR]/test-repo.bash-test
+✅ Created new worktree for bash-test, changed directory to [TMPDIR]/test-repo.bash-test
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__command_failure.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__command_failure.snap
index 0bd0ffaa8..c3abf6fe1 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__command_failure.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__command_failure.snap
@@ -2,6 +2,6 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized().as_ref()
---
-❌ Branch existing already exists
+❌ Branch existing already exists
💡 Remove --create flag to switch to it
diff --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.snap
index a103a1137..018a183a1 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.rs
expression: output.normalized().as_ref()
---
-✅ Created new worktree for fish-multiline, changed directory to [TMPDIR]/test-repo.fish-multiline
+✅ Created new worktree for fish-multiline, changed directory to [TMPDIR]/test-repo.fish-multiline
🔄 Executing (--execute):
  echo 'line 1'; echo 'line 2'; echo '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.snap
index 5d24c28e1..da66de298 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.rs
expression: output.normalized().as_ref()
---
-✅ Created new worktree for fish-minimal, changed directory to [TMPDIR]/test-repo.fish-minimal
+✅ Created new worktree for fish-minimal, changed directory to [TMPDIR]/test-repo.fish-minimal
diff --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.snap
index a295f6e7f..c68f6d98a 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap
@@ -2,6 +2,6 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized().as_ref()
---
-✅ Created new worktree for fish-bg, changed directory to [TMPDIR]/test-repo.fish-bg
+✅ Created new worktree for fish-bg, changed directory to [TMPDIR]/test-repo.fish-bg
🔄 Running post-start:
  echo 'fish background task'
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap
index 654c9f543..0cca67b19 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap
@@ -11,7 +11,7 @@ expression: output.normalized().as_ref()
  echo '✗ Test suite failed: 3 tests failing' && exit 1
✗ Test suite failed: 3 tests failing
-❌ pre-merge command failed: test
+❌ pre-merge command failed: test
Command failed with exit code: exit status: 1
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_fish.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_fish.snap
index a246db6b4..2849fdfc0 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_fish.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_fish.snap
@@ -10,7 +10,7 @@ expression: output.normalized().as_ref()
  echo '✗ Test suite failed: 3 tests failing' && exit 1
✗ Test suite failed: 3 tests failing
-❌ pre-merge command failed: test
+❌ pre-merge command failed: test
Command failed with exit code: exit status: 1
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap
index 1312bfde7..2da246f6d 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap
@@ -4,7 +4,7 @@ expression: output.normalized().as_ref()
---
✓ Code formatting check passed
✗ Test suite failed: 3 tests failing
-❌ pre-merge command failed: test
+❌ pre-merge command failed: test
Command failed with exit code: exit status: 1
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap
index 670e6375e..b3fcd2383 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
@@ -17,13 +17,13 @@ expression: output.normalized().as_ref()
✓ All 47 tests passed in 2.3s
-🔄 Merging 1 commit to main @ d067f01 (no squashing needed, no rebasing needed)
+🔄 Merging 1 commit to main @ d067f01 (no squashing needed, no rebasing needed)
* d067f01 (HEAD -> feature) Add feature
feature.txt | 1 +
1 file changed, 1 insertion(+)
-✅ Merged to main (1 commit, 1 file, +1) 
+✅ Merged to main (1 commit, 1 file, +1)
🔄 Cleaning up worktree...
✅ Returned to primary at [TMPDIR]/test-repo
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_fish.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_fish.snap
index 83c7be544..9a5dc9374 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
@@ -14,13 +14,13 @@ expression: output.normalized().as_ref()
  echo '✓ All 47 tests passed in 2.3s'
✓ All 47 tests passed in 2.3s
-🔄 Merging 1 commit to main @ d067f01 (no squashing needed, no rebasing needed)
+🔄 Merging 1 commit to main @ d067f01 (no squashing needed, no rebasing needed)
* d067f01 (HEAD -> feature) Add feature
feature.txt | 1 +
1 file changed, 1 insertion(+)
-✅ Merged to main (1 commit, 1 file, +1) 
+✅ Merged to main (1 commit, 1 file, +1)
🔄 Cleaning up worktree...
✅ Returned to primary at [TMPDIR]/test-repo
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap
index 17c3a6618..55dd8053e 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
@@ -17,13 +17,13 @@ expression: output.normalized().as_ref()
  echo '✓ All 47 tests passed in 2.3s'
-🔄 Merging 1 commit to main @ d067f01 (no squashing needed, no rebasing needed)
+🔄 Merging 1 commit to main @ d067f01 (no squashing needed, no rebasing needed)
* d067f01 (HEAD -> feature) Add feature
feature.txt | 1 +
1 file changed, 1 insertion(+)
-✅ Merged to main (1 commit, 1 file, +1) 
+✅ Merged to main (1 commit, 1 file, +1)
🔄 Cleaning up worktree...
✅ Returned to primary at [TMPDIR]/test-repo
diff --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.snap
index 7249e588f..fbd4cba69 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.rs
expression: output.normalized().as_ref()
---
-✅ Created new worktree for feature, changed directory to [TMPDIR]/test-repo.feature
+✅ Created new worktree for feature, changed directory to [TMPDIR]/test-repo.feature
diff --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.snap
index 3ea9cdaae..a395b31cc 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.rs
expression: output.normalized().as_ref()
---
-✅ Created new worktree for test-exec, changed directory to [TMPDIR]/test-repo.test-exec
+✅ Created new worktree for test-exec, changed directory to [TMPDIR]/test-repo.test-exec
🔄 Executing (--execute):
  echo executed
diff --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.snap
index 3ea9cdaae..a395b31cc 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.rs
expression: output.normalized().as_ref()
---
-✅ Created new worktree for test-exec, changed directory to [TMPDIR]/test-repo.test-exec
+✅ Created new worktree for test-exec, changed directory to [TMPDIR]/test-repo.test-exec
🔄 Executing (--execute):
  echo executed
diff --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.snap
index 0c7c1f787..d9fa41c43 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_bash.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_bash.snap
@@ -12,7 +12,7 @@ Installing dependencies...
Building project...
-✅ Created new worktree for feature-hooks, changed directory to [TMPDIR]/test-repo.feature-hooks
+✅ Created new worktree for feature-hooks, changed directory to [TMPDIR]/test-repo.feature-hooks
🔄 Running post-start: server
  echo 'Starting dev server on port 3000'
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap
index cb124be17..a5f593977 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap
@@ -12,7 +12,7 @@ expression: output.normalized().as_ref()
  echo 'Building project...'
-✅ Created new worktree for feature-hooks, changed directory to [TMPDIR]/test-repo.feature-hooks
+✅ Created new worktree for feature-hooks, changed directory to [TMPDIR]/test-repo.feature-hooks
🔄 Running post-start: server
  echo 'Starting dev server on port 3000'
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap
index 920e34896..802612239 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap
@@ -2,6 +2,6 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized().as_ref()
---
-✅ Created new worktree for feature-with-hooks, changed directory to [TMPDIR]/test-repo.feature-with-hooks
+✅ Created new worktree for feature-with-hooks, changed directory to [TMPDIR]/test-repo.feature-with-hooks
🔄 Running post-start:
  echo 'test command executed'
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap
index 748473cac..ca06a74a4 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap
@@ -2,6 +2,6 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized().as_ref()
---
-✅ Created new worktree for feature-bg, changed directory to [TMPDIR]/test-repo.feature-bg
+✅ Created new worktree for feature-bg, changed directory to [TMPDIR]/test-repo.feature-bg
🔄 Running post-start:
  echo 'background task'
diff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap
index c7d761382..0a6c23135 100644
Binary files a/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap and b/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap differ
diff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap
index e5a4a7e54..610c2beb1 100644
Binary files a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap and b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap differ
diff --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.snap
index 386f02758..bd44b18e6 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.rs
expression: output
---
-✅ Created new worktree for test-branch, changed directory to [REPO].test-branch
+✅ Created new worktree for test-branch, changed directory to [REPO].test-branch
MARKER
diff --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.snap
index d9f642e42..2ffc7fc72 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
@@ -18,7 +18,7 @@ info:
SOURCE_DATE_EPOCH: "1761609600"
WORKTRUNK_COMMIT_GENERATION__ARGS: "fix: update file 1 content"
WORKTRUNK_COMMIT_GENERATION__COMMAND: echo
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpe3Towy/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpO6T4uv/test-config.toml
---
success: true
exit_code: 0
@@ -33,7 +33,7 @@ exit_code: 0
  - feat: add file 2
✅ Squashed @ [SHA]
-🔄 Merging 1 commit to main @ [SHA] (no rebasing needed)
+🔄 Merging 1 commit to main @ [SHA] (no rebasing needed)
* [SHA] (HEAD -> feature) Squash commits from main
@@ -41,7 +41,7 @@ exit_code: 0
file2.txt | 1 +
2 files changed, 2 insertions(+)
-✅ Merged to main (1 commit, 2 files, +2) 
+✅ Merged to main (1 commit, 2 files, +2)
🔄 Cleaning up worktree...
✅ Returned to primary at [REPO]
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.snap
index 728660014..49c86283a 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap
@@ -16,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpUFP51D/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpd1IeyI/test-config.toml
---
success: true
exit_code: 0
@@ -30,14 +30,14 @@ exit_code: 0
  - feat: initial feature
✅ Squashed @ [SHA]
-🔄 Merging 1 commit to main @ [SHA] (no rebasing needed)
+🔄 Merging 1 commit to main @ [SHA] (no rebasing needed)
* [SHA] (HEAD -> feature) Squash commits from main
feature.txt | 1 +
1 file changed, 1 insertion(+)
-✅ Merged to main (1 commit, 1 file, +1) 
+✅ Merged to main (1 commit, 1 file, +1)
🔄 Cleaning up worktree...
✅ Returned to primary at [REPO]
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.snap
index 723549d8b..d1f21b5d6 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap
@@ -18,7 +18,7 @@ info:
SOURCE_DATE_EPOCH: "1761609600"
WORKTRUNK_COMMIT_GENERATION__ARGS: "fix: improve auth validation logic"
WORKTRUNK_COMMIT_GENERATION__COMMAND: echo
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpQBekKw/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpceSsPf/test-config.toml
---
success: true
exit_code: 0
@@ -32,14 +32,14 @@ exit_code: 0
  - feat: add authentication
✅ Squashed @ [SHA]
-🔄 Merging 1 commit to main @ [SHA] (no rebasing needed)
+🔄 Merging 1 commit to main @ [SHA] (no rebasing needed)
* [SHA] (HEAD -> feature) Squash commits from main
auth.txt | 1 +
1 file changed, 1 insertion(+)
-✅ Merged to main (1 commit, 1 file, +1) 
+✅ Merged to main (1 commit, 1 file, +1)
🔄 Cleaning up worktree...
✅ Returned to primary at [REPO]
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.snap
index d95bdf6d9..f0d782bed 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap
@@ -16,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpIjUcUr/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpVdi4r3/test-config.toml
---
success: true
exit_code: 0
@@ -27,14 +27,14 @@ exit_code: 0
  Changes to dirty.txt
✅ Committed changes @ [SHA]
-🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) Changes to dirty.txt
dirty.txt | 1 +
1 file changed, 1 insertion(+)
-✅ Merged to main (1 commit, 1 file, +1) 
+✅ Merged to main (1 commit, 1 file, +1)
🔄 Cleaning up worktree...
✅ Returned to primary at [REPO]
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
index d8dd1fabf..c3633bcfb 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
@@ -16,19 +16,19 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmptkSOlk/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpTVQpvp/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) Add feature file
feature.txt | 1 +
1 file changed, 1 insertion(+)
-✅ Merged to main (1 commit, 1 file, +1) 
+✅ Merged to main (1 commit, 1 file, +1)
🔄 Cleaning up worktree...
✅ Returned to primary at [REPO]
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap
index 33642f1d5..077adaa7f 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap
@@ -16,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpilqDa4/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp8CZaQW/test-config.toml
---
success: true
exit_code: 0
@@ -27,14 +27,14 @@ exit_code: 0
  Changes to newfile.txt
✅ Committed changes @ [SHA]
-🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> no-commits-dirty) Changes to newfile.txt
newfile.txt | 1 +
1 file changed, 1 insertion(+)
-✅ Merged to main (1 commit, 1 file, +1) 
+✅ Merged to main (1 commit, 1 file, +1)
🔄 Cleaning up worktree...
✅ Returned to primary at [REPO]
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
index 60969ddbe..7efcc2fec 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
@@ -17,12 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp47MZ2i/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp3R9uhq/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-🔄 Merging 2 commits to main @ [SHA] (no squashing needed, no rebasing needed)
+🔄 Merging 2 commits to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) feat: add file 2
* [SHA] feat: add file 1
@@ -31,7 +31,7 @@ exit_code: 0
file2.txt | 1 +
2 files changed, 2 insertions(+)
-✅ Merged to main (2 commits, 2 files, +2) 
+✅ Merged to main (2 commits, 2 files, +2)
🔄 Cleaning up worktree...
✅ Returned to primary at [REPO]
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.snap
index d3e5a585d..d74418df2 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
@@ -16,19 +16,19 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpngHC1t/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp3BtJLO/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) Add feature file
feature.txt | 1 +
1 file changed, 1 insertion(+)
-✅ Merged to main (1 commit, 1 file, +1) 
+✅ Merged to main (1 commit, 1 file, +1)
🔄 Cleaning up worktree...
✅ Returned to primary at [REPO]
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.snap
index cf41c4df2..40635e0c2 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap
@@ -17,19 +17,19 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpNdYWiB/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpSoqOuS/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) Add feature file
feature.txt | 1 +
1 file changed, 1 insertion(+)
-✅ Merged to main (1 commit, 1 file, +1) 
+✅ Merged to main (1 commit, 1 file, +1)
🔄 Cleaning up worktree...
✅ Returned to primary at [REPO]
🔄 Running post-merge:
diff --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.snap
index 5342636a6..d52d0eb11 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
@@ -17,19 +17,19 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpu4Wdel/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpkF12CC/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) Add feature file
feature.txt | 1 +
1 file changed, 1 insertion(+)
-✅ Merged to main (1 commit, 1 file, +1) 
+✅ Merged to main (1 commit, 1 file, +1)
🔄 Cleaning up worktree...
✅ Returned to primary at [REPO]
🔄 Running post-merge: deploy
diff --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.snap
index def060a69..fffb42efe 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap
@@ -17,19 +17,19 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpx7tLqH/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmplVioVl/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) Add feature file
feature.txt | 1 +
1 file changed, 1 insertion(+)
-✅ Merged to main (1 commit, 1 file, +1) 
+✅ Merged to main (1 commit, 1 file, +1)
🔄 Cleaning up worktree...
✅ Returned to primary at [REPO]
🔄 Running post-merge:
diff --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.snap
index 91a361d51..6579c3fb2 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
@@ -17,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpKhD1De/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpOU99JO/test-config.toml
---
success: true
exit_code: 0
@@ -31,14 +31,14 @@ exit_code: 0
  Changes to feature.txt
✅ Committed changes @ [SHA]
-🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) Changes to feature.txt
feature.txt | 1 +
1 file changed, 1 insertion(+)
-✅ Merged to main (1 commit, 1 file, +1) 
+✅ Merged to main (1 commit, 1 file, +1)
🔄 Cleaning up worktree...
✅ Returned to primary at [REPO]
diff --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.snap
index 7dbe327c9..f3fc27ef4 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
@@ -13,13 +13,13 @@ STDERR-FROM-FIRST
STDOUT-FROM-SECOND
STDERR-FROM-SECOND
-🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) Add feature file
feature.txt | 1 +
1 file changed, 1 insertion(+)
-✅ Merged to main (1 commit, 1 file, +1) 
+✅ Merged to main (1 commit, 1 file, +1)
🔄 Cleaning up worktree...
✅ Returned to primary at [REPO]
diff --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.snap
index 2d337ec39..9b3a3fe4c 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: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpwGHTxq/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpdEDWiJ/test-config.toml
---
success: true
exit_code: 0
@@ -31,14 +31,14 @@ exit_code: 0
🔄 Running pre-merge: test
  exit 0
-🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) Add feature file
feature.txt | 1 +
1 file changed, 1 insertion(+)
-✅ Merged to main (1 commit, 1 file, +1) 
+✅ Merged to main (1 commit, 1 file, +1)
🔄 Cleaning up worktree...
✅ Returned to primary at [REPO]
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.snap
index 0dd16b946..60d53681a 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: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpRyKcWN/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmppHE25z/test-config.toml
---
success: true
exit_code: 0
@@ -28,14 +28,14 @@ exit_code: 0
🔄 Running pre-merge: check2
  [PROJECT_ROOT]/tests/fixtures/mixed-output.sh check2 3
-🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) Add feature file
feature.txt | 1 +
1 file changed, 1 insertion(+)
-✅ Merged to main (1 commit, 1 file, +1) 
+✅ Merged to main (1 commit, 1 file, +1)
🔄 Cleaning up worktree...
✅ Returned to primary at [REPO]
diff --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.snap
index 2e9e83c6c..8f64a5070 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: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpA1E0R0/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpWwFahF/test-config.toml
---
success: true
exit_code: 0
@@ -25,14 +25,14 @@ exit_code: 0
🔄 Running pre-merge:
  exit 0
-🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) Add feature file
feature.txt | 1 +
1 file changed, 1 insertion(+)
-✅ Merged to main (1 commit, 1 file, +1) 
+✅ Merged to main (1 commit, 1 file, +1)
🔄 Cleaning up worktree...
✅ Returned to primary at [REPO]
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.snap
index 4f7f03f8a..2e2d568ab 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
@@ -17,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpPLoZkj/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpOFFeyS/test-config.toml
---
success: true
exit_code: 0
@@ -25,14 +25,14 @@ exit_code: 0
🔄 Running pre-commit:
  echo 'Pre-commit check passed'
-🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) Add feature file
feature.txt | 1 +
1 file changed, 1 insertion(+)
-✅ Merged to main (1 commit, 1 file, +1) 
+✅ Merged to main (1 commit, 1 file, +1)
🔄 Cleaning up worktree...
✅ Returned to primary at [REPO]
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap b/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap
index fcaa65c99..4380be8e0 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap
@@ -16,15 +16,15 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpmbdmkd/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpHIlJFB/test-config.toml
---
success: false
exit_code: 1
----- stdout -----
-🔄 Rebasing onto main...
+🔄 Rebasing onto main...
----- stderr -----
-❌ Rebase onto main incomplete
+❌ Rebase onto main incomplete
  Rebasing (1/1)
  error: could not apply [SHA]... Update shared.txt in feature
  hint: Resolve all conflicts manually, mark them as resolved with
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
index 55c0dd841..d823701a5 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
@@ -16,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp37SMX3/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpCVTX2D/test-config.toml
---
success: true
exit_code: 0
@@ -32,7 +32,7 @@ exit_code: 0
  - docs: update readme
✅ Squashed @ [SHA]
-🔄 Merging 1 commit to main @ [SHA] (no rebasing needed)
+🔄 Merging 1 commit to main @ [SHA] (no rebasing needed)
* [SHA] (HEAD -> feature) Squash commits from main
@@ -41,7 +41,7 @@ exit_code: 0
file3.txt | 1 +
3 files changed, 3 insertions(+)
-✅ Merged to main (1 commit, 3 files, +3) 
+✅ Merged to main (1 commit, 3 files, +3)
🔄 Cleaning up worktree...
✅ Returned to primary at [REPO]
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap
index f9f5d683e..c5750324c 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap
@@ -16,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpWF2f24/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpn3l3q5/test-config.toml
---
success: false
exit_code: 1
@@ -35,4 +35,4 @@ exit_code: 1
----- stderr -----
❌ No changes to commit after squashing 3 commits
-💡 The commits resulted in no net changes (e.g., changes were reverted or already in main)
+💡 The commits resulted in no net changes (e.g., changes were reverted or already in main)
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.snap
index 497d097a8..b8dc54f6b 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
@@ -17,7 +17,7 @@ info:
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
WORKTRUNK_COMMIT_GENERATION__COMMAND: nonexistent-llm-command
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpWUGCpU/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp4u5WDs/test-config.toml
---
success: true
exit_code: 0
@@ -32,7 +32,7 @@ exit_code: 0
  - fix: bug fix
✅ Squashed @ [SHA]
-🔄 Merging 1 commit to main @ [SHA] (no rebasing needed)
+🔄 Merging 1 commit to main @ [SHA] (no rebasing needed)
* [SHA] (HEAD -> feature) Squash commits from main
@@ -40,7 +40,7 @@ exit_code: 0
file2.txt | 1 +
2 files changed, 2 insertions(+)
-✅ Merged to main (1 commit, 2 files, +2) 
+✅ Merged to main (1 commit, 2 files, +2)
🔄 Cleaning up worktree...
✅ Returned to primary at [REPO]
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.snap
index cdc0265a9..979bf6704 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
@@ -16,19 +16,19 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpPUQG2N/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmprgn3iB/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) feat: single commit
file1.txt | 1 +
1 file changed, 1 insertion(+)
-✅ Merged to main (1 commit, 1 file, +1) 
+✅ Merged to main (1 commit, 1 file, +1)
🔄 Cleaning up worktree...
✅ Returned to primary at [REPO]
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.snap
index 9410e290c..7ededc9c2 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap
@@ -19,7 +19,7 @@ info:
WORKTRUNK_COMMIT_GENERATION__ARGS__0: "-c"
WORKTRUNK_COMMIT_GENERATION__ARGS__1: "cat >/dev/null && echo 'feat: implement user authentication system'"
WORKTRUNK_COMMIT_GENERATION__COMMAND: sh
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpaFGCSa/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpC2WOyY/test-config.toml
---
success: true
exit_code: 0
@@ -34,14 +34,14 @@ exit_code: 0
  - fix: handle edge case
✅ Squashed @ [SHA]
-🔄 Merging 1 commit to main @ [SHA] (no rebasing needed)
+🔄 Merging 1 commit to main @ [SHA] (no rebasing needed)
* [SHA] (HEAD -> feature) Squash commits from main
auth.txt | 1 +
1 file changed, 1 insertion(+)
-✅ Merged to main (1 commit, 1 file, +1) 
+✅ Merged to main (1 commit, 1 file, +1)
🔄 Cleaning up worktree...
✅ Returned to primary at [REPO]
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
index f86837b9b..e1146b425 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
@@ -15,19 +15,19 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpiVCXmB/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpYUyKxh/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) Add feature file
feature.txt | 1 +
1 file changed, 1 insertion(+)
-✅ Merged to main (1 commit, 1 file, +1) 
+✅ Merged to main (1 commit, 1 file, +1)
🔄 Cleaning up worktree...
✅ Returned to primary at [REPO]
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap
index 37471915c..151727370 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap
@@ -17,19 +17,19 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpj9B9zD/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpjIPIJl/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) Add feature file
feature.txt | 1 +
1 file changed, 1 insertion(+)
-✅ Merged to main (1 commit, 1 file, +1) 
+✅ Merged to main (1 commit, 1 file, +1)
✅ Kept worktree (use 'wt remove' to clean up)
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap
index 8fa92b8df..a7e60c7f5 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap
@@ -18,7 +18,7 @@ info:
SOURCE_DATE_EPOCH: "1761609600"
WORKTRUNK_COMMIT_GENERATION__ARGS: "fix: commit changes"
WORKTRUNK_COMMIT_GENERATION__COMMAND: echo
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpdokLWJ/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpyOZjZN/test-config.toml
---
success: true
exit_code: 0
@@ -33,7 +33,7 @@ exit_code: 0
  - feat: add file 1
✅ Squashed @ [SHA]
-🔄 Merging 1 commit to main @ [SHA] (no rebasing needed)
+🔄 Merging 1 commit to main @ [SHA] (no rebasing needed)
* [SHA] (HEAD -> feature) Squash commits from main
@@ -42,7 +42,7 @@ exit_code: 0
untracked2.txt | 1 +
3 files changed, 3 insertions(+)
-✅ Merged to main (1 commit, 3 files, +3) 
+✅ Merged to main (1 commit, 3 files, +3)
🔄 Cleaning up worktree...
✅ Returned to primary at [REPO]
diff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
index 66e7931a3..e08a5998e 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
@@ -16,9 +16,9 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
- PATH: "/private/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpavcSQw/test-repo/.bin:/Users/maximilian/.cargo/bin:/Users/maximilian/.local/bin:/Users/maximilian/.bun/bin:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
+ PATH: "/private/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpFFflmq/test-repo/.bin:/Users/maximilian/.cargo/bin:/Users/maximilian/.local/bin:/Users/maximilian/.bun/bin:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpavcSQw/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpFFflmq/test-config.toml
---
success: true
exit_code: 0
@@ -42,7 +42,7 @@ exit_code: 0
🔄 Running pre-merge: test
  cargo test
-🔄 Merging 1 commit to main @ [SHA] (no rebasing needed)
+🔄 Merging 1 commit to main @ [SHA] (no rebasing needed)
* [SHA] (HEAD -> feature-auth) feat(auth): Implement JWT authentication system
@@ -51,7 +51,7 @@ exit_code: 0
jwt.rs | 1 +
3 files changed, 3 insertions(+)
-✅ Merged to main (1 commit, 3 files, +3) 
+✅ Merged to main (1 commit, 3 files, +3)
🔄 Cleaning up worktree...
✅ Returned to primary at [REPO]
🔄 Running post-merge: install
diff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap
index 46878508d..96d2145fc 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap
@@ -16,19 +16,19 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmptYhnlT/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpZKumOL/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> fix-auth) Implement JWT validation
auth.rs | 1 +
1 file changed, 1 insertion(+)
-✅ Merged to main (1 commit, 1 file, +1) 
+✅ Merged to main (1 commit, 1 file, +1)
🔄 Cleaning up worktree...
✅ Returned to primary at [REPO]
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.snap
index 5279404de..3b75ebebe 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snap
@@ -17,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpdgKYF6/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpwtELB2/test-config.toml
---
success: true
exit_code: 0
@@ -25,7 +25,7 @@ exit_code: 0
🔄 Running post-create:
  echo 'Setup done' > setup.txt
-✅ Created new worktree for feature at [REPO].feature
+✅ Created new worktree for feature at [REPO].feature
To enable automatic cd, run: wt config shell
🔄 Running post-start: server
diff --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.snap
index a27757949..73a838180 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
@@ -1,6 +1,5 @@
---
source: tests/integration_tests/post_start_commands.rs
-assertion_line: 27
info:
program: wt
args:
@@ -20,12 +19,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp2o4aVD/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpw7qRQi/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-✅ Created new worktree for feature at [REPO].feature
+✅ Created new worktree for feature at [REPO].feature
🔄 Running post-start:
  echo 'Background task' > background.txt
diff --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.snap
index 498335153..7fd0a6933 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snap
@@ -17,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpUQk8E7/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpSL8cIi/test-config.toml
---
success: true
exit_code: 0
@@ -26,7 +26,7 @@ exit_code: 0
  exit 1
🟡 Command failed: Command failed with exit code: exit status: 1
-✅ Created new worktree for feature at [REPO].feature
+✅ Created new worktree for feature at [REPO].feature
To enable automatic cd, run: wt config shell
diff --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.snap
index 255e14436..574b70aa1 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiline_control_structure.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiline_control_structure.snap
@@ -17,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpxeTtWY/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmplIcGuI/test-config.toml
---
success: true
exit_code: 0
@@ -29,7 +29,7 @@ exit_code: 0
  echo 'File exists' > result.txt
  fi
-✅ Created new worktree for feature at [REPO].feature
+✅ Created new worktree for feature at [REPO].feature
To enable automatic cd, run: wt config shell
diff --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.snap
index 3854812e9..7ffbcc7be 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiple_commands_array.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiple_commands_array.snap
@@ -17,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpqF0dWl/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpxAvMPj/test-config.toml
---
success: true
exit_code: 0
@@ -28,7 +28,7 @@ exit_code: 0
🔄 Running post-create: 2
  echo 'Second'
-✅ Created new worktree for feature at [REPO].feature
+✅ Created new worktree for feature at [REPO].feature
To enable automatic cd, run: wt config shell
diff --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.snap
index fb5a13ee6..d1ba3662e 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_named_commands.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_named_commands.snap
@@ -17,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpQwcGd8/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp8lRZ3O/test-config.toml
---
success: true
exit_code: 0
@@ -28,7 +28,7 @@ exit_code: 0
🔄 Running post-create: setup
  echo 'Running setup'
-✅ Created new worktree for feature at [REPO].feature
+✅ Created new worktree for feature at [REPO].feature
To enable automatic cd, run: wt config shell
diff --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.snap
index 1e56ee3e3..b48b9c246 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_no_config.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_no_config.snap
@@ -17,12 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp7fbNUE/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmphz6CGY/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-✅ Created new worktree for feature at [REPO].feature
+✅ Created new worktree for feature at [REPO].feature
To enable automatic cd, run: wt config shell
diff --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.snap
index 90c87e8a6..a2d8bc425 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_single_command.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_single_command.snap
@@ -17,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp5v5bUo/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpRpNChz/test-config.toml
---
success: true
exit_code: 0
@@ -25,7 +25,7 @@ exit_code: 0
🔄 Running post-create:
  echo 'Setup complete'
-✅ Created new worktree for feature at [REPO].feature
+✅ Created new worktree for feature at [REPO].feature
To enable automatic cd, run: wt config shell
diff --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.snap
index 8b15c2a90..3c4cb98a3 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snap
@@ -17,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpa9URKu/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp6fXivq/test-config.toml
---
success: true
exit_code: 0
@@ -34,7 +34,7 @@ exit_code: 0
🔄 Running post-create: 4
  echo 'Root: [REPO]' >> info.txt
-✅ Created new worktree for feature/test at [REPO].feature-test
+✅ Created new worktree for feature/test at [REPO].feature-test
To enable automatic cd, run: wt config shell
diff --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.snap
index 9162a8ad2..ef4ffb3f8 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_complex_shell.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_complex_shell.snap
@@ -17,12 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpQ2h7cY/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp25Nkm3/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-✅ Created new worktree for feature at [REPO].feature
+✅ Created new worktree for feature at [REPO].feature
To enable automatic cd, run: wt config shell
🔄 Running post-start:
diff --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.snap
index d80c5322b..cf4fe32c8 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_invalid_command.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_invalid_command.snap
@@ -17,12 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpsC2WGS/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpXVkh1r/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-✅ Created new worktree for feature at [REPO].feature
+✅ Created new worktree for feature at [REPO].feature
To enable automatic cd, run: wt config shell
🔄 Running post-start:
diff --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.snap
index 84adf0ff8..0352b2960 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_log_captures_output.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_log_captures_output.snap
@@ -17,12 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpV3sDZd/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpwdZsCL/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-✅ Created new worktree for feature at [REPO].feature
+✅ Created new worktree for feature at [REPO].feature
To enable automatic cd, run: wt config shell
🔄 Running post-start:
diff --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.snap
index 35ca82940..4d7cab9d4 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiline_with_newlines.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiline_with_newlines.snap
@@ -17,12 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpYftlhj/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp8d3NOn/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-✅ Created new worktree for feature at [REPO].feature
+✅ Created new worktree for feature at [REPO].feature
To enable automatic cd, run: wt config shell
🔄 Running post-start:
diff --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.snap
index 0379ee78c..8e3b0f92b 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_background.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_background.snap
@@ -17,12 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpqUPMMY/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpv4ZXzM/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-✅ Created new worktree for feature at [REPO].feature
+✅ Created new worktree for feature at [REPO].feature
To enable automatic cd, run: wt config shell
🔄 Running post-start: task1
diff --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.snap
index 21b602fa4..cb7b9ef23 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_separate_logs.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_separate_logs.snap
@@ -17,12 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpejrs20/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpdSOELg/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-✅ Created new worktree for feature at [REPO].feature
+✅ Created new worktree for feature at [REPO].feature
To enable automatic cd, run: wt config shell
🔄 Running post-start: task1
diff --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.snap
index 8c973081a..8c229e939 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_single_background.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_single_background.snap
@@ -17,12 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpxR2kPB/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpkM68la/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-✅ Created new worktree for feature at [REPO].feature
+✅ Created new worktree for feature at [REPO].feature
To enable automatic cd, run: wt config shell
🔄 Running post-start:
diff --git a/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap
index 740b0856f..c71c1bd59 100644
--- a/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap
@@ -17,18 +17,18 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpA6oj6C/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpr59z4I/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-🔄 Pushing 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+🔄 Pushing 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) Add test file
test.txt | 1 +
1 file changed, 1 insertion(+)
-✅ Pushed to main (1 commit, 1 file, +1) 
+✅ Pushed to main (1 commit, 1 file, +1)
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap
index 81d8e57bb..73f4b780f 100644
--- a/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap
@@ -17,18 +17,18 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpsPgcef/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpJVAds2/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-🔄 Pushing 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+🔄 Pushing 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) Add feature file
feature.txt | 1 +
1 file changed, 1 insertion(+)
-✅ Pushed to main (1 commit, 1 file, +1) 
+✅ Pushed to main (1 commit, 1 file, +1)
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__push__push_to_default.snap b/tests/snapshots/integration__integration_tests__push__push_to_default.snap
index c896668c5..67b001318 100644
--- a/tests/snapshots/integration__integration_tests__push__push_to_default.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_to_default.snap
@@ -16,18 +16,18 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpWmwmoT/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp4rDtCD/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-🔄 Pushing 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+🔄 Pushing 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) Add feature file
feature.txt | 1 +
1 file changed, 1 insertion(+)
-✅ Pushed to main (1 commit, 1 file, +1) 
+✅ Pushed to main (1 commit, 1 file, +1)
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_already_on_default.snap b/tests/snapshots/integration__integration_tests__remove__remove_already_on_default.snap
index 00c99e3fa..a4796929d 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_already_on_default.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_already_on_default.snap
@@ -15,11 +15,11 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp5Isv2I/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpVGZnEV/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-✅ Already on default branch main
+✅ Already on default branch main
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_nonexistent_worktree.snap b/tests/snapshots/integration__integration_tests__remove__remove_nonexistent_worktree.snap
index 6608128b4..86fbcc8e6 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_nonexistent_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_nonexistent_worktree.snap
@@ -16,11 +16,11 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpifWDYQ/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpOe0qpE/test-config.toml
---
success: false
exit_code: 1
----- stdout -----
----- stderr -----
-❌ No worktree found for branch nonexistent
+❌ No worktree found for branch nonexistent
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_switch_to_default.snap b/tests/snapshots/integration__integration_tests__remove__remove_switch_to_default.snap
index 52ef783e7..c373ea694 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_switch_to_default.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_switch_to_default.snap
@@ -15,11 +15,11 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp3FRcyN/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpzNBMTY/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-✅ Switched to default branch main
+✅ Switched to default branch main
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__security__branch_name_with_cd_directive_not_executed.snap b/tests/snapshots/integration__integration_tests__security__branch_name_with_cd_directive_not_executed.snap
index 62bcd49a6..a49da2582 100644
--- a/tests/snapshots/integration__integration_tests__security__branch_name_with_cd_directive_not_executed.snap
+++ b/tests/snapshots/integration__integration_tests__security__branch_name_with_cd_directive_not_executed.snap
@@ -18,11 +18,11 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp1rspoF/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp2ge09E/test-config.toml
---
success: false
exit_code: 1
----- stdout -----
----- stderr -----
-❌ Branch __WORKTRUNK_CD__[PATH]
+❌ Branch __WORKTRUNK_CD__[PATH]
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_base_without_create.snap b/tests/snapshots/integration__integration_tests__switch__switch_base_without_create.snap
index a27f3efc5..a5510c0fe 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_base_without_create.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_base_without_create.snap
@@ -18,13 +18,13 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpmYxqRo/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpb5REe3/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
🟡 --base flag is only used with --create, ignoring
-✅ Switched to worktree for main at [REPO]
+✅ Switched to worktree for main at [REPO]
To enable automatic cd, run: wt config shell
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_create_existing_error.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_existing_error.snap
index 6c9f01d8f..885e7755e 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_create_existing_error.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_create_existing_error.snap
@@ -17,13 +17,13 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpr9dZQK/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpTnkuJT/test-config.toml
---
success: false
exit_code: 1
----- stdout -----
----- stderr -----
-❌ Branch feature-y already exists
+❌ Branch feature-y already exists
💡 Remove --create flag to switch to it
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_create_new.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_new.snap
index 2d62f6fb6..5aa3ee796 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_create_new.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_create_new.snap
@@ -17,12 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp5qoMzf/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpLcOi1H/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-✅ Created new worktree for feature-x at [REPO].feature-x
+✅ Created new worktree for feature-x at [REPO].feature-x
To enable automatic cd, run: wt config shell
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_create_no_remote.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_no_remote.snap
index ed153c8c4..cda624f8b 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_create_no_remote.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_create_no_remote.snap
@@ -17,12 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp45oyWY/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpN8OOYG/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-✅ Created new worktree for feature at [REPO].feature
+✅ Created new worktree for feature at [REPO].feature
To enable automatic cd, run: wt config shell
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_create_remote_only.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_remote_only.snap
index bbb53de2b..23fefb7cf 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_create_remote_only.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_create_remote_only.snap
@@ -17,12 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmprNaNVC/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp3qx2vn/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-✅ Created new worktree for remote-feature at [REPO].remote-feature
+✅ Created new worktree for remote-feature at [REPO].remote-feature
To enable automatic cd, run: wt config shell
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_error_missing_directory.snap b/tests/snapshots/integration__integration_tests__switch__switch_error_missing_directory.snap
index a4de38d25..b92cc864d 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_error_missing_directory.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_error_missing_directory.snap
@@ -16,13 +16,13 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpmAK33k/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp8XXz1Y/test-config.toml
---
success: false
exit_code: 1
----- stdout -----
----- stderr -----
-❌ Worktree directory missing for missing-wt
+❌ Worktree directory missing for missing-wt
💡 Run 'git worktree prune' to clean up
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snap
index c7678c37e..70dd97307 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snap
@@ -19,12 +19,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpmLRvXk/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpw6rxax/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-✅ Created new worktree for file-test at [REPO].file-test
+✅ Created new worktree for file-test at [REPO].file-test
🔄 Executing (--execute):
  echo 'test content' > test.txt
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap
index 7d1e711c7..4ef4f2501 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap
@@ -18,12 +18,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpbDsAyE/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp5GO4af/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-✅ Switched to worktree for existing-exec at [WORKTREE_EXISTING_EXEC]
+✅ Switched to worktree for existing-exec at [WORKTREE_EXISTING_EXEC]
🔄 Executing (--execute):
  echo 'existing worktree' > existing.txt
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap
index b71e4b412..f0b85e164 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap
@@ -19,12 +19,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpZOFgJX/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpkHCs5N/test-config.toml
---
success: false
exit_code: 1
----- stdout -----
-✅ Created new worktree for fail-test at [REPO].fail-test
+✅ Created new worktree for fail-test at [REPO].fail-test
🔄 Executing (--execute):
  exit 1
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap
index 684e366c3..7956ea2d0 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap
@@ -19,12 +19,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpTjeoau/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp876Zh0/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-✅ Created new worktree for multiline-test at [REPO].multiline-test
+✅ Created new worktree for multiline-test at [REPO].multiline-test
🔄 Executing (--execute):
  echo 'line1'
  echo 'line2'
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap
index 5b3fce726..e711b4779 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap
@@ -19,12 +19,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpAls7lL/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpWx2lRL/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-✅ Created new worktree for exec-test at [REPO].exec-test
+✅ Created new worktree for exec-test at [REPO].exec-test
🔄 Executing (--execute):
  echo '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.snap
index d34a76d1e..d500d5a10 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snap
@@ -16,12 +16,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpmEnODl/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpZMv8RG/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-✅ Switched to worktree for feature-z at [WORKTREE_FEATURE_Z]
+✅ Switched to worktree for feature-z at [WORKTREE_FEATURE_Z]
To enable automatic cd, run: wt config shell
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_existing_internal.snap b/tests/snapshots/integration__integration_tests__switch__switch_existing_internal.snap
index 8ea14f837..5e18f43e4 100644
Binary files a/tests/snapshots/integration__integration_tests__switch__switch_existing_internal.snap and b/tests/snapshots/integration__integration_tests__switch__switch_existing_internal.snap differ
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_internal_mode.snap b/tests/snapshots/integration__integration_tests__switch__switch_internal_mode.snap
index ad4d89231..18cfb80cf 100644
Binary files a/tests/snapshots/integration__integration_tests__switch__switch_internal_mode.snap and b/tests/snapshots/integration__integration_tests__switch__switch_internal_mode.snap differ
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snap b/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snap
index 9d913a6a9..4c96dcf74 100644
Binary 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 differ
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_with_base.snap b/tests/snapshots/integration__integration_tests__switch__switch_with_base.snap
index a93130587..a7046b5be 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_with_base.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_with_base.snap
@@ -19,12 +19,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp5FbczE/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpVSODsv/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-✅ Created new worktree for feature-with-base at [REPO].feature-with-base
+✅ Created new worktree for feature-with-base at [REPO].feature-with-base
To enable automatic cd, run: wt config shell