Skip to content

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

style(output): Make paths bold in success messages

Maximilian Roos08d30af39a85
diff --git a/CLAUDE.md b/CLAUDE.md
index e0612dabd..00c16d172 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -204,24 +204,39 @@ let warning_bold = WARNING.bold();
"{WARNING}Text with {warning_bold}composed{warning_bold:#} styles{WARNING:#}"
```
-### Information Hierarchy & Path Styling
+### Information Hierarchy & Styling
**Principle: Bold what answers the user's question, dim what provides context.**
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 (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).
+
```rust
-// Path as primary answer (standalone)
+// WRONG - styled element loses surrounding color
+let green = AnstyleStyle::new().fg_color(Some(Color::Ansi(AnsiColor::Green)));
let bold = AnstyleStyle::new().bold();
-println!("Global Config: {bold}{}{bold:#}", path.display());
+println!("✅ {green}Message {bold}{path}{bold:#}{green:#}"); // Path will be black/white!
-// Path embedded in action phrase (part of the message)
-let bold = AnstyleStyle::new().bold();
-println!("✅ Created {bold}{branch}{bold:#}, changed directory to {bold}{}{bold:#}", path.display());
+// RIGHT - styled element maintains surrounding color
+let green = AnstyleStyle::new().fg_color(Some(Color::Ansi(AnsiColor::Green)));
+let green_bold = green.bold();
+println!("✅ {green}Message {green_bold}{path}{green_bold:#}");
-// Path as supplementary metadata (separate line)
+// Using semantic constants (preferred pattern)
+let green_bold = GREEN.bold();
+println!("✅ {GREEN}Created worktree, changed directory to {green_bold}{}{green_bold:#}", path.display());
+
+// Commit hash as reference info (outside colored context - OK to use HINT directly)
+println!("✅ {GREEN}Committed changes{GREEN:#} @ {HINT}{hash}{HINT:#}"); // OK - hash is outside green
+
+// Path as supplementary metadata (separate line) - dimmed in unstyled context
let dim = AnstyleStyle::new().dimmed();
-println!("✅ Created {bold}{branch}{bold:#}\n{dim}Path: {}{dim:#}", path.display());
+println!("✅ {GREEN}Created worktree{GREEN:#}\n{dim}Path: {}{dim:#}", path.display());
+
+// Element in unstyled message - just bold
+let bold = AnstyleStyle::new().bold();
+println!("Global Config: {bold}{}{bold:#}", path.display());
```
**Visual hierarchy patterns:**
diff --git a/src/commands/merge.rs b/src/commands/merge.rs
index 064226bd0..89ea3db0b 100644
--- a/src/commands/merge.rs
+++ b/src/commands/merge.rs
@@ -218,13 +218,13 @@ pub fn handle_merge(
/// Format the merge summary message (includes emoji and color for consistency)
fn format_merge_summary(primary_path: Option<&std::path::Path>) -> String {
- use worktrunk::styling::{AnstyleStyle, GREEN, SUCCESS_EMOJI};
- let dim = AnstyleStyle::new().dimmed();
+ use worktrunk::styling::{GREEN, SUCCESS_EMOJI};
+ let green_bold = GREEN.bold();
// Show where we ended up
if let Some(path) = primary_path {
format!(
- "{SUCCESS_EMOJI} {GREEN}Returned to primary at {dim}{}{dim:#}{GREEN:#}",
+ "{SUCCESS_EMOJI} {GREEN}Returned to primary at {green_bold}{}{green_bold:#}{GREEN:#}",
path.display()
)
} else {
diff --git a/src/output/directive.rs b/src/output/directive.rs
index d8393210f..f66de258f 100644
--- a/src/output/directive.rs
+++ b/src/output/directive.rs
@@ -88,18 +88,17 @@ impl DirectiveOutput {
/// In directive mode, the shell wrapper will actually change directories,
/// so we can say "changed directory to {path}"
pub fn format_switch_success(&self, branch: &str, path: &Path, created_branch: bool) -> String {
- use worktrunk::styling::{AnstyleStyle, GREEN, SUCCESS_EMOJI};
+ use worktrunk::styling::{GREEN, SUCCESS_EMOJI};
let green_bold = GREEN.bold();
- let bold = AnstyleStyle::new().bold();
if created_branch {
format!(
- "{SUCCESS_EMOJI} {GREEN}Created new worktree for {GREEN:#}{green_bold}{branch}{green_bold:#}{GREEN}, changed directory to {GREEN:#}{bold}{}{bold:#}",
+ "{SUCCESS_EMOJI} {GREEN}Created new worktree for {green_bold}{branch}{green_bold:#}{GREEN}, changed directory to {green_bold}{}{green_bold:#}",
path.display()
)
} else {
format!(
- "{SUCCESS_EMOJI} {GREEN}Switched to worktree for {GREEN:#}{green_bold}{branch}{green_bold:#}{GREEN}, changed directory to {GREEN:#}{bold}{}{bold:#}",
+ "{SUCCESS_EMOJI} {GREEN}Switched to worktree for {green_bold}{branch}{green_bold:#}{GREEN}, changed directory to {green_bold}{}{green_bold:#}",
path.display()
)
}
diff --git a/src/output/handlers.rs b/src/output/handlers.rs
index a1bab65d8..e497d98b0 100644
--- a/src/output/handlers.rs
+++ b/src/output/handlers.rs
@@ -23,9 +23,8 @@ fn format_switch_message(result: &SwitchResult, branch: &str) -> String {
/// Format message for remove operation (includes emoji and color for consistency)
fn format_remove_message(result: &RemoveResult) -> String {
- use worktrunk::styling::{AnstyleStyle, GREEN, SUCCESS_EMOJI};
+ use worktrunk::styling::{GREEN, SUCCESS_EMOJI};
let green_bold = GREEN.bold();
- let dim = AnstyleStyle::new().dimmed();
match result {
RemoveResult::AlreadyOnDefault(branch) => {
@@ -35,7 +34,7 @@ fn format_remove_message(result: &RemoveResult) -> String {
}
RemoveResult::RemovedWorktree { primary_path } => {
format!(
- "{SUCCESS_EMOJI} {GREEN}Removed worktree, returned to primary at {GREEN:#}{dim}{}{dim:#}",
+ "{SUCCESS_EMOJI} {GREEN}Removed worktree, returned to primary at {green_bold}{}{green_bold:#}",
primary_path.display()
)
}
diff --git a/src/output/interactive.rs b/src/output/interactive.rs
index f6c1c6f27..e858d6b04 100644
--- a/src/output/interactive.rs
+++ b/src/output/interactive.rs
@@ -72,18 +72,17 @@ impl InteractiveOutput {
///
/// In interactive mode, we can't actually change directories, so we say "at {path}"
pub fn format_switch_success(&self, branch: &str, path: &Path, created_branch: bool) -> String {
- use worktrunk::styling::{AnstyleStyle, GREEN, SUCCESS_EMOJI};
+ use worktrunk::styling::{GREEN, SUCCESS_EMOJI};
let green_bold = GREEN.bold();
- let bold = AnstyleStyle::new().bold();
if created_branch {
format!(
- "{SUCCESS_EMOJI} {GREEN}Created new worktree for {GREEN:#}{green_bold}{branch}{green_bold:#}{GREEN} at {GREEN:#}{bold}{}{bold:#}",
+ "{SUCCESS_EMOJI} {GREEN}Created new worktree for {green_bold}{branch}{green_bold:#}{GREEN} at {green_bold}{}{green_bold:#}",
path.display()
)
} else {
format!(
- "{SUCCESS_EMOJI} {GREEN}Switched to worktree for {GREEN:#}{green_bold}{branch}{green_bold:#}{GREEN} at {GREEN:#}{bold}{}{bold:#}",
+ "{SUCCESS_EMOJI} {GREEN}Switched to worktree for {green_bold}{branch}{green_bold:#}{GREEN} at {green_bold}{}{green_bold:#}",
path.display()
)
}
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 c32648555..69a77d954 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__fish_multiline_command_execution.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_multiline_command_execution.snap
index 4428db468..5d0d538d0 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 4bcf7445e..5d24c28e1 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 0b7986cb6..a7793ecd5 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_success_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap
index 5b0a2f956..62b69ba34 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap
@@ -28,4 +28,4 @@ expression: output.normalized().as_ref()
✅ Merged to main (1 commit, 1 file, +1) 
🔄 Cleaning up worktree...
-✅ Returned to primary at [TMPDIR]/test-repo
+✅ 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 63f3251ff..c6066ec25 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_fish.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_fish.snap
@@ -24,4 +24,4 @@ expression: output.normalized().as_ref()
✅ Merged to main (1 commit, 1 file, +1) 
🔄 Cleaning up worktree...
-✅ Returned to primary at [TMPDIR]/test-repo
+✅ 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 55aeecf73..a06eae903 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap
@@ -28,4 +28,4 @@ expression: output.normalized().as_ref()
✅ Merged to main (1 commit, 1 file, +1) 
🔄 Cleaning up worktree...
-✅ Returned to primary at [TMPDIR]/test-repo
+✅ 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 8ccef0242..7249e588f 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 bdc16bb32..0f2f4a876 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 bdc16bb32..0f2f4a876 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 d357d908a..8b62d3de3 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 574e7446f..abd963ade 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 419efa3df..720dea4e7 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 858a47428..f11ca6c5f 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_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap
index e887cdb93..b79263c0a 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 3bf2d3050..386f02758 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 ed00e6127..f173e25f6 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/.tmpSm7dqz/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpoq8xKF/test-config.toml
---
success: true
exit_code: 0
@@ -45,6 +45,6 @@ exit_code: 0
✅ Merged to main (1 commit, 2 files, +2) 
🔄 Cleaning up worktree...
-✅ Returned to primary at [REPO]
+✅ Returned to primary at [REPO]
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap
index 323ca8029..a397dafcd 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/.tmp29wNFY/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpBtoMwe/test-config.toml
---
success: true
exit_code: 0
@@ -41,6 +41,6 @@ exit_code: 0
✅ Merged to main (1 commit, 1 file, +1) 
🔄 Cleaning up worktree...
-✅ Returned to primary at [REPO]
+✅ Returned to primary at [REPO]
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap
index c7b16d608..019e34ad4 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/.tmpHgqkAV/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpw4kOyY/test-config.toml
---
success: true
exit_code: 0
@@ -43,6 +43,6 @@ exit_code: 0
✅ Merged to main (1 commit, 1 file, +1) 
🔄 Cleaning up worktree...
-✅ Returned to primary at [REPO]
+✅ Returned to primary at [REPO]
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap b/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap
index 2f9b324b8..17178ed3c 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/.tmpB0fxlV/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmprf8zoj/test-config.toml
---
success: true
exit_code: 0
@@ -39,6 +39,6 @@ exit_code: 0
✅ Merged to main (1 commit, 1 file, +1) 
🔄 Cleaning up worktree...
-✅ Returned to primary at [REPO]
+✅ Returned to primary at [REPO]
----- stderr -----
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 02f308f9a..5db047502 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
@@ -16,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpRltXLA/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpiPkNmb/test-config.toml
---
success: true
exit_code: 0
@@ -33,6 +33,6 @@ exit_code: 0
✅ Merged to main (1 commit, 1 file, +1) 
🔄 Cleaning up worktree...
-✅ Returned to primary at [REPO]
+✅ Returned to primary at [REPO]
----- stderr -----
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 44657e64e..ed0277399 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
@@ -17,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpvdFVPg/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpPwjMHL/test-config.toml
---
success: true
exit_code: 0
@@ -35,6 +35,6 @@ exit_code: 0
✅ Merged to main (2 commits, 2 files, +2) 
🔄 Cleaning up worktree...
-✅ Returned to primary at [REPO]
+✅ Returned to primary at [REPO]
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap
index c9a1282c5..eb8509987 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,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpS3tfN5/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpjOOZid/test-config.toml
---
success: true
exit_code: 0
@@ -33,6 +33,6 @@ exit_code: 0
✅ Merged to main (1 commit, 1 file, +1) 
🔄 Cleaning up worktree...
-✅ Returned to primary at [REPO]
+✅ Returned to primary at [REPO]
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap
index 3108e486b..3fd3e81a0 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,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpw5ZzqO/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpjTXaoZ/test-config.toml
---
success: true
exit_code: 0
@@ -34,7 +34,7 @@ exit_code: 0
✅ Merged to main (1 commit, 1 file, +1) 
🔄 Cleaning up worktree...
-✅ Returned to primary at [REPO]
+✅ Returned to primary at [REPO]
🔄 Running post-merge:
  exit 1
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 1be98e14f..350d023d3 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,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmppK3g8X/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpOj6qHL/test-config.toml
---
success: true
exit_code: 0
@@ -34,7 +34,7 @@ exit_code: 0
✅ Merged to main (1 commit, 1 file, +1) 
🔄 Cleaning up worktree...
-✅ Returned to primary at [REPO]
+✅ Returned to primary at [REPO]
🔄 Running post-merge: deploy
  echo 'Deploying branch feature' > deploy.txt
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 b2dc8be01..7eb81b144 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,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpFRTeJw/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp6Xgulv/test-config.toml
---
success: true
exit_code: 0
@@ -34,7 +34,7 @@ exit_code: 0
✅ Merged to main (1 commit, 1 file, +1) 
🔄 Cleaning up worktree...
-✅ Returned to primary at [REPO]
+✅ Returned to primary at [REPO]
🔄 Running post-merge:
  echo 'merged feature to main' > post-merge-ran.txt
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snap
index 201c21bf4..84f71720d 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snap
@@ -17,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpDPSCsN/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpg6iL0s/test-config.toml
---
success: true
exit_code: 0
@@ -40,6 +40,6 @@ exit_code: 0
✅ Merged to main (1 commit, 1 file, +1) 
🔄 Cleaning up worktree...
-✅ Returned to primary at [REPO]
+✅ Returned to primary at [REPO]
----- stderr -----
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 3e1d6f00a..290ea9e56 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/.tmpboobtT/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpSPaz7H/test-config.toml
---
success: true
exit_code: 0
@@ -40,6 +40,6 @@ exit_code: 0
✅ Merged to main (1 commit, 1 file, +1) 
🔄 Cleaning up worktree...
-✅ Returned to primary at [REPO]
+✅ Returned to primary at [REPO]
----- stderr -----
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 005398878..a0e5143dc 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
@@ -25,4 +25,4 @@ STDERR-FROM-SECOND
✅ Merged to main (1 commit, 1 file, +1) 
🔄 Cleaning up worktree...
-✅ Returned to primary at [REPO]
+✅ 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 9c2dd9f8e..a3e768973 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/.tmpAvOzvL/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpK2fWWa/test-config.toml
---
success: true
exit_code: 0
@@ -43,7 +43,7 @@ exit_code: 0
✅ Merged to main (1 commit, 1 file, +1) 
🔄 Cleaning up worktree...
-✅ Returned to primary at [REPO]
+✅ Returned to primary at [REPO]
----- stderr -----

diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_no_hooks.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_no_hooks.snap
index 2dd5b2f36..eb4873d81 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_no_hooks.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_no_hooks.snap
@@ -17,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpJRHr7G/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpgjkV0P/test-config.toml
---
success: true
exit_code: 0
@@ -34,6 +34,6 @@ exit_code: 0
✅ Merged to main (1 commit, 1 file, +1) 
🔄 Cleaning up worktree...
-✅ Returned to primary at [REPO]
+✅ Returned to primary at [REPO]
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snap
index a8c2bdd40..3cb8ce423 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/.tmpeDgewa/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpH2jh86/test-config.toml
---
success: true
exit_code: 0
@@ -40,7 +40,7 @@ exit_code: 0
✅ Merged to main (1 commit, 1 file, +1) 
🔄 Cleaning up worktree...
-✅ Returned to primary at [REPO]
+✅ Returned to primary at [REPO]
----- stderr -----
[check1] stdout line 1
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 1d2a8b9c3..2a6dd7e79 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/.tmpk56RZn/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpZtJve8/test-config.toml
---
success: true
exit_code: 0
@@ -37,7 +37,7 @@ exit_code: 0
✅ Merged to main (1 commit, 1 file, +1) 
🔄 Cleaning up worktree...
-✅ Returned to primary at [REPO]
+✅ Returned to primary at [REPO]
----- stderr -----

diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap
index f20a3a502..977f47df9 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/.tmpNF3MJQ/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpWOgEtO/test-config.toml
---
success: true
exit_code: 0
@@ -37,7 +37,7 @@ exit_code: 0
✅ Merged to main (1 commit, 1 file, +1) 
🔄 Cleaning up worktree...
-✅ Returned to primary at [REPO]
+✅ Returned to primary at [REPO]
----- stderr -----
Pre-squash check passed
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 5f19b2e87..af2c0c185 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/.tmpeIG2tw/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmplEePPv/test-config.toml
---
success: true
exit_code: 0
@@ -45,6 +45,6 @@ exit_code: 0
✅ Merged to main (1 commit, 3 files, +3) 
🔄 Cleaning up worktree...
-✅ Returned to primary at [REPO]
+✅ Returned to primary at [REPO]
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap
index a42f2aa9b..b35564b66 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/.tmpRD0zND/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpQHSiFx/test-config.toml
---
success: true
exit_code: 0
@@ -44,6 +44,6 @@ exit_code: 0
✅ Merged to main (1 commit, 2 files, +2) 
🔄 Cleaning up worktree...
-✅ Returned to primary at [REPO]
+✅ Returned to primary at [REPO]
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap
index a9b8af3f6..ead421d00 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,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp6L3zsm/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp2vAl0t/test-config.toml
---
success: true
exit_code: 0
@@ -33,6 +33,6 @@ exit_code: 0
✅ Merged to main (1 commit, 1 file, +1) 
🔄 Cleaning up worktree...
-✅ Returned to primary at [REPO]
+✅ Returned to primary at [REPO]
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap
index 059e0fd86..b82091410 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/.tmpmyaNgb/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpUHqZqc/test-config.toml
---
success: true
exit_code: 0
@@ -45,6 +45,6 @@ exit_code: 0
✅ Merged to main (1 commit, 1 file, +1) 
🔄 Cleaning up worktree...
-✅ Returned to primary at [REPO]
+✅ Returned to primary at [REPO]
----- stderr -----
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 b18b515b7..968b2d809 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
@@ -15,7 +15,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpES4d1v/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmplC6pQP/test-config.toml
---
success: true
exit_code: 0
@@ -32,6 +32,6 @@ exit_code: 0
✅ Merged to main (1 commit, 1 file, +1) 
🔄 Cleaning up worktree...
-✅ Returned to primary at [REPO]
+✅ Returned to primary at [REPO]
----- 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 326095b95..bcdc21e43 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/.tmpf9g0jQ/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpCnchmX/test-config.toml
---
success: true
exit_code: 0
@@ -46,6 +46,6 @@ exit_code: 0
✅ Merged to main (1 commit, 3 files, +3) 
🔄 Cleaning up worktree...
-✅ Returned to primary at [REPO]
+✅ Returned to primary at [REPO]
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snap b/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snap
index c5ed0b4f5..ddf1c275f 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/.tmp9uScgn/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpLfE81d/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 fe3eaf7f5..471d49e19 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap
@@ -19,12 +19,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpRhdN4A/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpdgWPLD/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
🔄 Executing (--execute):
  echo 'Execute flag' > execute.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 7501d7940..83a3baeab 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/.tmpOs7G1m/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpEzKGqv/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 4006083f4..c06498ebf 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/.tmpbe7wjL/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpSK4rIE/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 d11970228..83c6e97aa 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/.tmpA6B2vu/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp6BSBvR/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 99b9b35f1..d7dcd466d 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/.tmpUm2yjQ/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp5593R7/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 3f54e9525..1e56ee3e3 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/.tmpSOYK5N/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp7fbNUE/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 827aba0ec..bf0538d28 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/.tmpfaDLn5/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpxfYzYL/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 f6bf2c211..0ee8c5064 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/.tmpQU6lub/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpv6ksxe/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 236ea5e2e..a437306c4 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/.tmpaTiFOo/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmppEKpc3/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 16dc6c12a..5ced16d31 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/.tmpGS2uQB/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpuuffeH/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 fa4c180ed..2d78a0ef2 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/.tmpSEMUTB/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpcKjthE/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 28bd92fa8..f3ff79ccc 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/.tmpnc72m6/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp1qmdzg/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 1ec18de6b..b9c90e90c 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/.tmpImJjco/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpL1QZ4b/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 9c2d89b82..1c544b483 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/.tmpFUHSvA/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpyBOrPy/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 2406fdb25..281825ab6 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/.tmpZYNplg/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpJ1CnZX/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__remove__remove_current_by_name.snap b/tests/snapshots/integration__integration_tests__remove__remove_current_by_name.snap
index 870e59f5b..00a8d2746 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_current_by_name.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_current_by_name.snap
@@ -16,12 +16,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmplmsOFq/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmprULsWr/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
🔄 Removing worktree for feature-current...
-✅ Removed worktree, returned to primary at [REPO]
+✅ Removed worktree, returned to primary at [REPO]
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap b/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap
index 05f8c2225..81c724825 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap
@@ -15,11 +15,11 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpcfTmsh/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpLJvDCp/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-✅ Removed worktree, returned to primary at [REPO]
+✅ Removed worktree, returned to primary at [REPO]
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap b/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap
index 747673d3b..1fa0100f9 100644
Binary files a/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap and b/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap differ
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_multiple_including_current.snap b/tests/snapshots/integration__integration_tests__remove__remove_multiple_including_current.snap
index 3e4f5052c..4f902670c 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_multiple_including_current.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_multiple_including_current.snap
@@ -18,7 +18,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpnTnZpE/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpE0SOHC/test-config.toml
---
success: true
exit_code: 0
@@ -28,6 +28,6 @@ exit_code: 0
🔄 Removing worktree for feature-c...
✅ Removed worktree for feature-c
🔄 Removing worktree for feature-a...
-✅ Removed worktree, returned to primary at [REPO]
+✅ Removed worktree, returned to primary at [REPO]
----- stderr -----
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 84baaea8d..a27f3efc5 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/.tmpMJMcDh/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpmYxqRo/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_new.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_new.snap
index c19ce2258..2d62f6fb6 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/.tmptwz3fh/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp5qoMzf/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 7c02f79ce..ed153c8c4 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/.tmpHeZwAo/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp45oyWY/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 0e8df8844..bbb53de2b 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/.tmpw4Xlfj/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmprNaNVC/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_execute_creates_file.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snap
index 346bcfb8b..913be45a0 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/.tmp25iADj/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpOriKcx/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 93b6996fc..2bc95d1c2 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/.tmpE4HxF9/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpLbvJBO/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 28865ddc1..f98b0f6cf 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/.tmpTWBt9s/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmppWjmaP/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 a0050a259..0f2a2a4be 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/.tmpX8YD2y/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpyX9jOe/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 7d9999012..f9c568529 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/.tmpiZRqFm/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpmZfgam/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 b3c05e048..d34a76d1e 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/.tmpk98b5H/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpmEnODl/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 29b7b67d7..8ea14f837 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 9576693a1..ad4d89231 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 230788b13..9f934312d 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_no_hooks_execute_still_runs.snap b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_execute_still_runs.snap
index e748e22de..622365557 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_execute_still_runs.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_execute_still_runs.snap
@@ -20,12 +20,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp9e2mUl/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp5jJ6Hd/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-✅ Created new worktree for no-hooks-test at [REPO].no-hooks-test
+✅ Created new worktree for no-hooks-test at [REPO].no-hooks-test
🔄 Executing (--execute):
  echo 'execute command runs'
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_existing.snap b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_existing.snap
index df8a36f97..9a75e5f1b 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_existing.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_existing.snap
@@ -19,12 +19,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpHrubiU/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpkG95YB/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-✅ Switched to worktree for existing-no-hooks at [WORKTREE_EXISTING_NO_HOOKS]
+✅ Switched to worktree for existing-no-hooks at [WORKTREE_EXISTING_NO_HOOKS]
🔄 Executing (--execute):
  echo 'execute still runs'
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_skips_post_start.snap b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_skips_post_start.snap
index 616057ef8..206180199 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_skips_post_start.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_skips_post_start.snap
@@ -15,16 +15,16 @@ info:
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
- HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmphwN3Tf
+ HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpGFuEpJ
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpr8EVQB/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpYu0uhp/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-✅ Created new worktree for no-post-start at [REPO].no-post-start
+✅ Created new worktree for no-post-start at [REPO].no-post-start
To enable automatic cd, run: wt config shell
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_with_force.snap b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_with_force.snap
index 444dc685c..17dff8218 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_with_force.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_with_force.snap
@@ -16,16 +16,16 @@ info:
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
- HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0NlAPb
+ HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpJE9SyH
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpGptfXz/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpQYtIa0/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-✅ Created new worktree for force-no-hooks at [REPO].force-no-hooks
+✅ Created new worktree for force-no-hooks at [REPO].force-no-hooks
To enable automatic cd, run: wt config shell
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 54afb009b..a93130587 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/.tmpQBUfc3/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp5FbczE/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