Skip to content

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

Docs: Define indentation policy and remove redundant indents

Maximilian Roosf846b6835c21
diff --git a/CLAUDE.md b/CLAUDE.md
index e1bb609a3..15f0cadf0 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -163,6 +163,66 @@ println!("✅ Created {bold}{branch}{bold:#}\n {dim}Path: {}{dim:#}", path.disp
| Config values | Normal | **Dim** |
| Metadata | Dim | **Dim** |
+### Indentation Policy
+
+**Core Principle: No manual indentation for secondary information.**
+
+Styling (bold, dim, color) already provides visual hierarchy. Manual indentation adds cognitive load without adding clarity.
+
+**Rules:**
+
+1. **Secondary paths, metadata**: No indent, use dimmed styling only
+ ```rust
+ // Good - dimming provides hierarchy
+ println!("✅ Created {bold}{branch}{bold:#}");
+ println!("{dim}Path: {}{dim:#}", path.display());
+
+ // Bad - unnecessary indent
+ println!("✅ Created {bold}{branch}{bold:#}");
+ println!(" {dim}Path: {}{dim:#}", path.display());
+ ```
+
+2. **File lists (bullets)**: No indent, bullet provides visual separation
+ ```rust
+ // Good - bullet is enough
+ for file in &files {
+ eprintln!("{dim}•{dim:#} {}", file);
+ }
+
+ // Bad - redundant indent
+ for file in &files {
+ eprintln!(" {dim}•{dim:#} {}", file);
+ }
+ ```
+
+3. **Log file paths**: No indent, dimming is sufficient
+ ```rust
+ // Good
+ eprintln!("{dim}Logs: {}{dim:#}", path);
+
+ // Bad
+ eprintln!(" {dim}Logs: {}{dim:#}", path);
+ ```
+
+4. **Quoted content (commands, config)**: Use `format_with_gutter()` instead of manual indents
+ ```rust
+ // Good - gutter provides visual separation
+ print!("{}", format_with_gutter(&command));
+
+ // Bad - manual indentation
+ for line in command.lines() {
+ println!(" {}", line);
+ }
+ ```
+
+**Exception:** Nested hierarchies where structural relationships must be clear (not yet encountered in this codebase).
+
+**Rationale:**
+- Styling already creates visual hierarchy
+- Indentation is redundant cognitive load
+- Simpler output is easier to scan
+- Follows git's own output conventions
+
### Color Detection
Colors automatically adjust based on environment:
diff --git a/src/commands/configure_shell.rs b/src/commands/configure_shell.rs
index 243fd9e0f..3898c1eb9 100644
--- a/src/commands/configure_shell.rs
+++ b/src/commands/configure_shell.rs
@@ -2,6 +2,7 @@ use std::fs::{self, OpenOptions};
use std::io::{self, BufRead, BufReader, Write};
use std::path::{Path, PathBuf};
use worktrunk::shell::Shell;
+use worktrunk::styling::format_with_gutter;
pub struct ConfigureResult {
pub shell: Shell,
@@ -354,15 +355,12 @@ fn prompt_for_confirmation(results: &[ConfigureResult]) -> Result<bool, String>
let shell = result.shell;
let path = result.path.display();
eprintln!(
- " {} {bold}{shell}{bold:#} {bold}{path}{bold:#}",
+ "{} {bold}{shell}{bold:#} {bold}{path}{bold:#}",
result.action.description(),
);
- // Show the config line that will be added with dim styling
- for line in result.config_line.lines() {
- let dim = Style::new().dimmed();
- eprintln!(" {dim}{line}{dim:#}");
- }
+ // Show the config line that will be added with gutter
+ eprint!("{}", format_with_gutter(&result.config_line));
}
eprintln!();
diff --git a/src/commands/worktree.rs b/src/commands/worktree.rs
index 84942c596..fa38c0106 100644
--- a/src/commands/worktree.rs
+++ b/src/commands/worktree.rs
@@ -314,7 +314,7 @@ fn check_worktree_conflicts(
eprintln!();
let dim = AnstyleStyle::new().dimmed();
for file in &overlapping {
- eprintln!(" {dim}•{dim:#} {}", file);
+ eprintln!("{dim}•{dim:#} {}", file);
}
eprintln!();
eprintln!(
@@ -446,7 +446,7 @@ fn spawn_post_start_commands(
} else {
log_path.display().to_string()
};
- eprintln!(" {dim}→ Logs: {}{dim:#}", display_path);
+ eprintln!("{dim}Logs: {}{dim:#}", display_path);
}
Err(e) => {
eprintln!("{WARNING_EMOJI} {WARNING}Failed to spawn '{name}': {e}{WARNING:#}");
diff --git a/src/main.rs b/src/main.rs
index 6bb704797..ee88ad945 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -269,6 +269,7 @@ fn main() {
// Show what was done
for result in &results {
+ use worktrunk::styling::format_with_gutter;
let bold = Style::new().bold();
let shell = result.shell;
let path = result.path.display();
@@ -276,11 +277,8 @@ fn main() {
"{} {bold}{shell}{bold:#} {path}",
result.action.description(),
);
- // Indent each line of the config content with dim/gray color
- for line in result.config_line.lines() {
- let dim = Style::new().dimmed();
- println!(" {dim}{line}{dim:#}");
- }
+ // Show config line with gutter
+ print!("{}", format_with_gutter(&result.config_line));
}
// Success summary
diff --git a/src/output/handlers.rs b/src/output/handlers.rs
index e9db98c37..b4f89077c 100644
--- a/src/output/handlers.rs
+++ b/src/output/handlers.rs
@@ -19,12 +19,12 @@ fn format_switch_message_plain(result: &SwitchResult, branch: &str) -> String {
let dim = AnstyleStyle::new().dimmed();
if *created_branch {
format!(
- "Created new worktree for {bold}{branch}{bold:#}\n {dim}Path: {}{dim:#}",
+ "Created new worktree for {bold}{branch}{bold:#}\n{dim}Path: {}{dim:#}",
path.display()
)
} else {
format!(
- "Added worktree for {bold}{branch}{bold:#}\n {dim}Path: {}{dim:#}",
+ "Added worktree for {bold}{branch}{bold:#}\n{dim}Path: {}{dim:#}",
path.display()
)
}
@@ -43,7 +43,7 @@ fn format_remove_message_plain(result: &RemoveResult) -> String {
}
RemoveResult::RemovedWorktree { primary_path } => {
format!(
- "Removed worktree, returned to primary\n {dim}Path: {}{dim:#}",
+ "Removed worktree, returned to primary\n{dim}Path: {}{dim:#}",
primary_path.display()
)
}
diff --git a/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_custom_prefix.snap b/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_custom_prefix.snap
index 8e1916762..82ad70c1a 100644
--- a/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_custom_prefix.snap
+++ b/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_custom_prefix.snap
@@ -16,7 +16,7 @@ info:
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
- HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpuzP9Nf
+ HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpxFTOKL
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1704067200"
@@ -25,7 +25,7 @@ success: true
exit_code: 0
----- stdout -----
Added bash [TEMP_HOME]/.bash_profile
- if command -v worktree >/dev/null 2>&1; then eval "$(worktree init bash)"; fi
+  if command -v worktree >/dev/null 2>&1; then eval "$(worktree init bash)"; fi
✅ Configured 1 shell
diff --git a/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_fish.snap b/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_fish.snap
index ec37ede0e..9436a4eec 100644
--- a/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_fish.snap
+++ b/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_fish.snap
@@ -14,7 +14,7 @@ info:
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
- HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0kaR0I
+ HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0Zu3xW
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1704067200"
@@ -23,7 +23,7 @@ success: true
exit_code: 0
----- stdout -----
Created fish [TEMP_HOME]/.config/fish/conf.d/wt.fish
- if type -q wt; wt init fish | source; end
+  if type -q wt; wt init fish | source; end
✅ Configured 1 shell
diff --git a/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_fish_custom_prefix.snap b/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_fish_custom_prefix.snap
index d5f974427..b12e99037 100644
--- a/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_fish_custom_prefix.snap
+++ b/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_fish_custom_prefix.snap
@@ -16,7 +16,7 @@ info:
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
- HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0BNQxd
+ HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpOKerBG
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1704067200"
@@ -25,7 +25,7 @@ success: true
exit_code: 0
----- stdout -----
Created fish [TEMP_HOME]/.config/fish/conf.d/worktree.fish
- if type -q worktree; worktree init fish | source; end
+  if type -q worktree; worktree init fish | source; end
✅ Configured 1 shell
diff --git a/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_mixed_states.snap b/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_mixed_states.snap
index b9857962e..7e8577ff3 100644
--- a/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_mixed_states.snap
+++ b/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_mixed_states.snap
@@ -12,7 +12,7 @@ info:
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
- HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0ylY9j
+ HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpB2w1cN
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1704067200"
@@ -21,9 +21,9 @@ success: true
exit_code: 0
----- stdout -----
Already configured bash [TEMP_HOME]/.bash_profile
- if command -v wt >/dev/null 2>&1; then eval "$(wt init bash)"; fi
+  if command -v wt >/dev/null 2>&1; then eval "$(wt init bash)"; fi
Added zsh [TEMP_HOME]/.zshrc
- if command -v wt >/dev/null 2>&1; then eval "$(wt init zsh)"; fi
+  if command -v wt >/dev/null 2>&1; then eval "$(wt init zsh)"; fi
✅ Configured 1 shell
diff --git a/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_multiple_configs.snap b/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_multiple_configs.snap
index d62a1dd62..67a6c8a60 100644
--- a/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_multiple_configs.snap
+++ b/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_multiple_configs.snap
@@ -12,7 +12,7 @@ info:
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
- HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpkUz5nG
+ HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpKuNOGN
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1704067200"
@@ -21,9 +21,9 @@ success: true
exit_code: 0
----- stdout -----
Added bash [TEMP_HOME]/.bash_profile
- if command -v wt >/dev/null 2>&1; then eval "$(wt init bash)"; fi
+  if command -v wt >/dev/null 2>&1; then eval "$(wt init bash)"; fi
Added zsh [TEMP_HOME]/.zshrc
- if command -v wt >/dev/null 2>&1; then eval "$(wt init zsh)"; fi
+  if command -v wt >/dev/null 2>&1; then eval "$(wt init zsh)"; fi
✅ Configured 2 shells
diff --git a/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_with_yes.snap b/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_with_yes.snap
index 83e53f1ed..6bed2369a 100644
--- a/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_with_yes.snap
+++ b/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_with_yes.snap
@@ -12,7 +12,7 @@ info:
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
- HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpX6Vm3M
+ HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp8JiWs5
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1704067200"
@@ -21,7 +21,7 @@ success: true
exit_code: 0
----- stdout -----
Added zsh [TEMP_HOME]/.zshrc
- if command -v wt >/dev/null 2>&1; then eval "$(wt init zsh)"; fi
+  if command -v wt >/dev/null 2>&1; then eval "$(wt init zsh)"; fi
✅ Configured 1 shell
diff --git a/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_zsh.snap b/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_zsh.snap
index 201000ba8..03e2a8c30 100644
--- a/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_zsh.snap
+++ b/tests/snapshots/integration__integration_tests__configure_shell__configure_shell_zsh.snap
@@ -14,7 +14,7 @@ info:
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
- HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp47Fgdy
+ HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp8d5PlC
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1704067200"
@@ -23,7 +23,7 @@ success: true
exit_code: 0
----- stdout -----
Added zsh [TEMP_HOME]/.zshrc
- if command -v wt >/dev/null 2>&1; then eval "$(wt init zsh)"; fi
+  if command -v wt >/dev/null 2>&1; then eval "$(wt init zsh)"; fi
✅ Configured 1 shell
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 80d1a4cb1..7f04291e5 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
@@ -38,7 +38,7 @@ exit_code: 0
✅ Pushed to main (1 commit, 2 files, +2) 
🔄 Cleaning up worktree...
✅ Removed worktree, returned to primary
- Path: [REPO]
+Path: [REPO]
✅ Merge complete
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 7f09cccb9..3cb3f19d4 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
@@ -33,7 +33,7 @@ exit_code: 0
✅ Pushed to main (2 commits, 1 file, +1) 
🔄 Cleaning up worktree...
✅ Removed worktree, returned to primary
- Path: [REPO]
+Path: [REPO]
✅ Merge complete
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 7c9d9a25b..04b284c0a 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
@@ -35,7 +35,7 @@ exit_code: 0
✅ Pushed to main (2 commits, 1 file, +1) 
🔄 Cleaning up worktree...
✅ Removed worktree, returned to primary
- Path: [REPO]
+Path: [REPO]
✅ Merge complete
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_message.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_message.snap
index 37cf76f81..c345dfb40 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_message.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_message.snap
@@ -37,7 +37,7 @@ exit_code: 0
✅ Pushed to main (2 commits, 1 file, +1) 
🔄 Cleaning up worktree...
✅ Removed worktree, returned to primary
- Path: [REPO]
+Path: [REPO]
✅ Merge complete
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 103920ad8..1254935fb 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
@@ -30,7 +30,7 @@ exit_code: 0
✅ Pushed to main (1 commit, 1 file, +1) 
🔄 Cleaning up worktree...
✅ Removed worktree, returned to primary
- Path: [REPO]
+Path: [REPO]
✅ Merge complete
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 474a79e01..11da28141 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
@@ -30,7 +30,7 @@ exit_code: 0
✅ Pushed to main (1 commit, 1 file, +1) 
🔄 Cleaning up worktree...
✅ Removed worktree, returned to primary
- Path: [REPO]
+Path: [REPO]
✅ Merge complete
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_named.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_named.snap
index ceba19506..5c3470645 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_named.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_named.snap
@@ -34,7 +34,7 @@ exit_code: 0
✅ Pushed to main (1 commit, 1 file, +1) 
🔄 Cleaning up worktree...
✅ Removed worktree, returned to primary
- Path: [REPO]
+Path: [REPO]
✅ Merge complete
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_no_verify.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_no_verify.snap
index cf0118447..106dc5f2a 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_no_verify.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_no_verify.snap
@@ -31,7 +31,7 @@ exit_code: 0
✅ Pushed to main (1 commit, 1 file, +1) 
🔄 Cleaning up worktree...
✅ Removed worktree, returned to primary
- Path: [REPO]
+Path: [REPO]
✅ Merge complete
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_success.snap
index 62cb216c3..941916a4c 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_success.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_success.snap
@@ -32,7 +32,7 @@ exit_code: 0
✅ Pushed to main (1 commit, 1 file, +1) 
🔄 Cleaning up worktree...
✅ Removed worktree, returned to primary
- Path: [REPO]
+Path: [REPO]
✅ Merge complete
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 e3eb89577..e7df543ab 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
@@ -35,7 +35,7 @@ exit_code: 0
✅ Pushed to main (1 commit, 3 files, +3) 
🔄 Cleaning up worktree...
✅ Removed worktree, returned to primary
- Path: [REPO]
+Path: [REPO]
✅ Merge complete
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 4de1a2b3b..00d564696 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
@@ -35,7 +35,7 @@ exit_code: 0
✅ Pushed to main (1 commit, 2 files, +2) 
🔄 Cleaning up worktree...
✅ Removed worktree, returned to primary
- Path: [REPO]
+Path: [REPO]
✅ Merge complete
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 287ae3d07..cb76e67c4 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
@@ -32,7 +32,7 @@ exit_code: 0
✅ Pushed to main (1 commit, 1 file, +1) 
🔄 Cleaning up worktree...
✅ Removed worktree, returned to primary
- Path: [REPO]
+Path: [REPO]
✅ Merge complete
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 dd9bbe158..9db67bb46 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
@@ -36,7 +36,7 @@ exit_code: 0
✅ Pushed to main (1 commit, 1 file, +1) 
🔄 Cleaning up worktree...
✅ Removed worktree, returned to primary
- Path: [REPO]
+Path: [REPO]
✅ Merge complete
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 12666fdcc..e83c32230 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
@@ -29,7 +29,7 @@ exit_code: 0
✅ Pushed to main (1 commit, 1 file, +1) 
🔄 Cleaning up worktree...
✅ Removed worktree, returned to primary
- Path: [REPO]
+Path: [REPO]
✅ Merge complete
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 5c9f48ee7..8eacd5eb3 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snap
@@ -13,7 +13,7 @@ info:
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
- HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpg0brXv
+ HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp2FHDQQ
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1704067200"
@@ -22,7 +22,7 @@ success: true
exit_code: 0
----- stdout -----
✅ Created new worktree for feature
- Path: [REPO]/../test-repo.feature
+Path: [REPO]/../test-repo.feature
To enable automatic cd, run: wt configure-shell
@@ -31,4 +31,4 @@ To enable automatic cd, run: wt configure-shell
  echo 'Setup done' > setup.txt
🔄 Starting (background):
  sleep 0.5 && echo 'Server running' > server.txt
- → Logs: .git/wt-logs/post-start-[NAME]-[TIMESTAMP].log
+Logs: .git/wt-logs/post-start-[NAME]-[TIMESTAMP].log
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 e855d9625..a04840dcd 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap
@@ -15,7 +15,7 @@ info:
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
- HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpXOg16V
+ HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpepD9ed
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1704067200"
@@ -24,9 +24,9 @@ success: true
exit_code: 0
----- stdout -----
✅ Created new worktree for feature
- Path: [REPO]/../test-repo.feature
+Path: [REPO]/../test-repo.feature
----- stderr -----
🔄 Starting (background):
  echo 'Background task' > background.txt
- → Logs: .git/wt-logs/post-start-[NAME]-[TIMESTAMP].log
+Logs: .git/wt-logs/post-start-[NAME]-[TIMESTAMP].log
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 9602a81d8..44b271507 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snap
@@ -13,7 +13,7 @@ info:
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
- HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpgCT48M
+ HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpaNS7HJ
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1704067200"
@@ -22,7 +22,7 @@ success: true
exit_code: 0
----- stdout -----
✅ Created new worktree for feature
- Path: [REPO]/../test-repo.feature
+Path: [REPO]/../test-repo.feature
To enable automatic cd, run: wt configure-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 9196f1b92..34cb4b97a 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiple_commands_array.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiple_commands_array.snap
@@ -13,7 +13,7 @@ info:
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
- HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpjy1xEa
+ HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmppLCTMI
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1704067200"
@@ -24,7 +24,7 @@ exit_code: 0
First
Second
✅ Created new worktree for feature
- Path: [REPO]/../test-repo.feature
+Path: [REPO]/../test-repo.feature
To enable automatic cd, run: wt configure-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 f7c88008f..690cee898 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_named_commands.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_named_commands.snap
@@ -13,7 +13,7 @@ info:
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
- HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpCU11E0
+ HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpTK5nxF
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1704067200"
@@ -24,7 +24,7 @@ exit_code: 0
Installing deps
Running setup
✅ Created new worktree for feature
- Path: [REPO]/../test-repo.feature
+Path: [REPO]/../test-repo.feature
To enable automatic cd, run: wt configure-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 ac8530bca..964009365 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
@@ -21,7 +21,7 @@ success: true
exit_code: 0
----- stdout -----
✅ Created new worktree for feature
- Path: [REPO]/../test-repo.feature
+Path: [REPO]/../test-repo.feature
To enable automatic cd, run: wt configure-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 8efc05d87..18d4f44b2 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_single_command.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_single_command.snap
@@ -13,7 +13,7 @@ info:
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
- HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp1AeZLB
+ HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpbbCnF2
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1704067200"
@@ -23,7 +23,7 @@ exit_code: 0
----- stdout -----
Setup complete
✅ Created new worktree for feature
- Path: [REPO]/../test-repo.feature
+Path: [REPO]/../test-repo.feature
To enable automatic cd, run: wt configure-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 aee2e56d3..f7bbedf17 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snap
@@ -13,7 +13,7 @@ info:
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
- HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0cGcZ1
+ HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpi51XBI
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1704067200"
@@ -22,7 +22,7 @@ success: true
exit_code: 0
----- stdout -----
✅ Created new worktree for feature/test
- Path: [REPO]/../test-repo.feature-test
+Path: [REPO]/../test-repo.feature-test
To enable automatic cd, run: wt configure-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 209cbe437..ee89f30e8 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_complex_shell.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_complex_shell.snap
@@ -13,7 +13,7 @@ info:
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
- HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpxbKULZ
+ HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpDb2l3t
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1704067200"
@@ -22,7 +22,7 @@ success: true
exit_code: 0
----- stdout -----
✅ Created new worktree for feature
- Path: [REPO]/../test-repo.feature
+Path: [REPO]/../test-repo.feature
To enable automatic cd, run: wt configure-shell
@@ -31,4 +31,4 @@ To enable automatic cd, run: wt configure-shell
  echo 'line1
  line2
  line3' | grep line2 > filtered.txt
- → Logs: .git/wt-logs/post-start-[NAME]-[TIMESTAMP].log
+Logs: .git/wt-logs/post-start-[NAME]-[TIMESTAMP].log
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 2bec50abc..402786b4f 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_invalid_command.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_invalid_command.snap
@@ -13,7 +13,7 @@ info:
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
- HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpP5nxdV
+ HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpl6nPl8
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1704067200"
@@ -22,11 +22,11 @@ success: true
exit_code: 0
----- stdout -----
✅ Created new worktree for feature
- Path: [REPO]/../test-repo.feature
+Path: [REPO]/../test-repo.feature
To enable automatic cd, run: wt configure-shell
----- stderr -----
🔄 Starting (background):
  echo 'unclosed quote
- → Logs: .git/wt-logs/post-start-[NAME]-[TIMESTAMP].log
+Logs: .git/wt-logs/post-start-[NAME]-[TIMESTAMP].log
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 3d84b0093..f058dc948 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_log_captures_output.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_log_captures_output.snap
@@ -13,7 +13,7 @@ info:
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
- HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpN2wP2D
+ HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpksBqhW
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1704067200"
@@ -22,11 +22,11 @@ success: true
exit_code: 0
----- stdout -----
✅ Created new worktree for feature
- Path: [REPO]/../test-repo.feature
+Path: [REPO]/../test-repo.feature
To enable automatic cd, run: wt configure-shell
----- stderr -----
🔄 Starting (background):
  echo 'stdout output' && echo 'stderr output' >&2
- → Logs: .git/wt-logs/post-start-[NAME]-[TIMESTAMP].log
+Logs: .git/wt-logs/post-start-[NAME]-[TIMESTAMP].log
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 9fbacbae2..be0e33dfa 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_background.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_background.snap
@@ -13,7 +13,7 @@ info:
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
- HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmppcEMJL
+ HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpr62vYU
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1704067200"
@@ -22,14 +22,14 @@ success: true
exit_code: 0
----- stdout -----
✅ Created new worktree for feature
- Path: [REPO]/../test-repo.feature
+Path: [REPO]/../test-repo.feature
To enable automatic cd, run: wt configure-shell
----- stderr -----
🔄 Starting (background):
  echo 'Task 1 running' > task1.txt
- → Logs: .git/wt-logs/post-start-[NAME]-[TIMESTAMP].log
+Logs: .git/wt-logs/post-start-[NAME]-[TIMESTAMP].log
🔄 Starting (background):
  echo 'Task 2 running' > task2.txt
- → Logs: .git/wt-logs/post-start-[NAME]-[TIMESTAMP].log
+Logs: .git/wt-logs/post-start-[NAME]-[TIMESTAMP].log
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 07ca435bc..f0a42948b 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_separate_logs.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_separate_logs.snap
@@ -13,7 +13,7 @@ info:
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
- HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpDczT4t
+ HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpactyI0
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1704067200"
@@ -22,17 +22,17 @@ success: true
exit_code: 0
----- stdout -----
✅ Created new worktree for feature
- Path: [REPO]/../test-repo.feature
+Path: [REPO]/../test-repo.feature
To enable automatic cd, run: wt configure-shell
----- stderr -----
🔄 Starting (background):
  echo 'TASK1_OUTPUT'
- → Logs: .git/wt-logs/post-start-[NAME]-[TIMESTAMP].log
+Logs: .git/wt-logs/post-start-[NAME]-[TIMESTAMP].log
🔄 Starting (background):
  echo 'TASK2_OUTPUT'
- → Logs: .git/wt-logs/post-start-[NAME]-[TIMESTAMP].log
+Logs: .git/wt-logs/post-start-[NAME]-[TIMESTAMP].log
🔄 Starting (background):
  echo 'TASK3_OUTPUT'
- → Logs: .git/wt-logs/post-start-[NAME]-[TIMESTAMP].log
+Logs: .git/wt-logs/post-start-[NAME]-[TIMESTAMP].log
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 1a21b4f44..085c2dede 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_single_background.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_single_background.snap
@@ -13,7 +13,7 @@ info:
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
- HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpIUXGAN
+ HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpmJSoiD
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1704067200"
@@ -22,11 +22,11 @@ success: true
exit_code: 0
----- stdout -----
✅ Created new worktree for feature
- Path: [REPO]/../test-repo.feature
+Path: [REPO]/../test-repo.feature
To enable automatic cd, run: wt configure-shell
----- stderr -----
🔄 Starting (background):
  sleep 1 && echo 'Background task done' > background.txt
- → Logs: .git/wt-logs/post-start-[NAME]-[TIMESTAMP].log
+Logs: .git/wt-logs/post-start-[NAME]-[TIMESTAMP].log
diff --git a/tests/snapshots/integration__integration_tests__push__push_dirty_target.snap b/tests/snapshots/integration__integration_tests__push__push_dirty_target.snap
index b71b31ca5..83701c4a1 100644
--- a/tests/snapshots/integration__integration_tests__push__push_dirty_target.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_dirty_target.snap
@@ -23,6 +23,6 @@ exit_code: 1
----- stderr -----
❌ Cannot push: conflicting uncommitted changes in:
- • conflict.txt
+• conflict.txt
💡 Commit or stash these changes in [REPO] first
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 3033e34d3..a87667647 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap
@@ -19,6 +19,6 @@ success: true
exit_code: 0
----- stdout -----
✅ Removed worktree, returned to primary
- Path: [REPO]
+Path: [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 f384a42c7..fd01a0e4f 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__switch__switch_create_new.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_new.snap
index 3fc455777..8f36ca364 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_create_new.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_create_new.snap
@@ -21,7 +21,7 @@ success: true
exit_code: 0
----- stdout -----
✅ Created new worktree for feature-x
- Path: [REPO]/../test-repo.feature-x
+Path: [REPO]/../test-repo.feature-x
To enable automatic cd, run: wt configure-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 ac995c2cf..90271282d 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
@@ -23,6 +23,6 @@ success: true
exit_code: 0
----- stdout -----
✅ Created new worktree for file-test
- Path: [REPO]/../test-repo.file-test
+Path: [REPO]/../test-repo.file-test
----- stderr -----
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 25ad57e6d..5ccdd2710 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap
@@ -23,7 +23,7 @@ success: false
exit_code: 1
----- stdout -----
✅ Created new worktree for fail-test
- Path: [REPO]/../test-repo.fail-test
+Path: [REPO]/../test-repo.fail-test
----- stderr -----
Command failed with exit code: exit status: 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 cf3113752..d94323af3 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap
@@ -23,7 +23,7 @@ success: true
exit_code: 0
----- stdout -----
✅ Created new worktree for multiline-test
- Path: [REPO]/../test-repo.multiline-test
+Path: [REPO]/../test-repo.multiline-test
line1
line2
line3
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 52a9e382b..5dd9cd3b9 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap
@@ -23,7 +23,7 @@ success: true
exit_code: 0
----- stdout -----
✅ Created new worktree for exec-test
- Path: [REPO]/../test-repo.exec-test
+Path: [REPO]/../test-repo.exec-test
test output
----- stderr -----
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 916a0fec7..a9f2c2459 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 247803cd3..1017d1720 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_config_commands_execute_still_runs.snap b/tests/snapshots/integration__integration_tests__switch__switch_no_config_commands_execute_still_runs.snap
index 07e79da3b..a6dc83ed3 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_no_config_commands_execute_still_runs.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_no_config_commands_execute_still_runs.snap
@@ -24,7 +24,7 @@ success: true
exit_code: 0
----- stdout -----
✅ Created new worktree for no-config-commands-test
- Path: [REPO]/../test-repo.no-config-commands-test
+Path: [REPO]/../test-repo.no-config-commands-test
execute command runs
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_no_config_commands_skips_post_start.snap b/tests/snapshots/integration__integration_tests__switch__switch_no_config_commands_skips_post_start.snap
index 42b2e1858..857ed2070 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_no_config_commands_skips_post_start.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_no_config_commands_skips_post_start.snap
@@ -14,7 +14,7 @@ info:
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
- HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpNFSOzv
+ HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpxGAvrF
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1704067200"
@@ -23,7 +23,7 @@ success: true
exit_code: 0
----- stdout -----
✅ Created new worktree for no-post-start
- Path: [REPO]/../test-repo.no-post-start
+Path: [REPO]/../test-repo.no-post-start
To enable automatic cd, run: wt configure-shell
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_no_config_commands_with_force.snap b/tests/snapshots/integration__integration_tests__switch__switch_no_config_commands_with_force.snap
index c789364ce..68607f184 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_no_config_commands_with_force.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_no_config_commands_with_force.snap
@@ -15,7 +15,7 @@ info:
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
- HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpAByZ8M
+ HOME: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpkUEnxv
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1704067200"
@@ -24,7 +24,7 @@ success: true
exit_code: 0
----- stdout -----
✅ Created new worktree for force-no-config-commands
- Path: [REPO]/../test-repo.force-no-config-commands
+Path: [REPO]/../test-repo.force-no-config-commands
To enable automatic cd, run: wt configure-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 bd17825c0..e6f176c2d 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_with_base.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_with_base.snap
@@ -23,7 +23,7 @@ success: true
exit_code: 0
----- stdout -----
✅ Created new worktree for feature-with-base
- Path: [REPO]/../test-repo.feature-with-base
+Path: [REPO]/../test-repo.feature-with-base
To enable automatic cd, run: wt configure-shell