Skip to content

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

Docs: Explain blank line principles for clarity

Maximilian Roosd6769eeeac98
diff --git a/CLAUDE.md b/CLAUDE.md
index f882b1198..26f08dfb8 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -169,6 +169,13 @@ Six canonical message patterns with their emojis:
**Every user-facing message requires either an emoji or a gutter** for consistent visual separation.
+### Blank Line Principles
+
+- **No leading/trailing blanks** - Start immediately, end cleanly
+- **One blank after blocks** - Separate multi-line content (gutter blocks, sections)
+- **One blank after prompts** - Separate user input from results
+- **Never double blanks** - One blank line maximum between elements
+
### stdout vs stderr: Separation by Mode
**Interactive mode:**
diff --git a/src/commands/configure_shell.rs b/src/commands/configure_shell.rs
index 085b95130..bd09e9269 100644
--- a/src/commands/configure_shell.rs
+++ b/src/commands/configure_shell.rs
@@ -378,10 +378,6 @@ fn prompt_for_confirmation(results: &[ConfigureResult]) -> Result<bool, String>
crate::output::flush_for_stderr_prompt().map_err(|e| e.to_string())?;
// Interactive prompts go to stderr so they appear even when stdout is redirected
- eprintln!();
- eprintln!("{INFO_EMOJI} Configuration changes:");
- eprintln!();
-
for result in results {
// Skip items that are already configured
if matches!(result.action, ConfigAction::AlreadyExists) {
@@ -401,9 +397,9 @@ fn prompt_for_confirmation(results: &[ConfigureResult]) -> Result<bool, String>
// Show the config line that will be added with gutter
eprint!("{}", format_bash_with_gutter(&result.config_line, ""));
+ eprintln!(); // Blank line after each shell block
}
- eprintln!();
let bold = Style::new().bold();
eprint!("{INFO_EMOJI} Proceed? {bold}[y/N]{bold:#} ");
io::stderr().flush().map_err(|e| e.to_string())?;
@@ -413,6 +409,9 @@ fn prompt_for_confirmation(results: &[ConfigureResult]) -> Result<bool, String>
.read_line(&mut input)
.map_err(|e| e.to_string())?;
+ // Blank line after user input to separate from results
+ eprintln!();
+
let response = input.trim().to_lowercase();
Ok(response == "y" || response == "yes")
}
diff --git a/src/main.rs b/src/main.rs
index 780b25deb..e0d09db26 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -5,7 +5,7 @@ use std::process;
use worktrunk::config::{WorktrunkConfig, set_config_path};
use worktrunk::git::{Repository, exit_code, is_command_not_approved, set_base_path};
use worktrunk::path::format_path_for_display;
-use worktrunk::styling::{SUCCESS_EMOJI, println};
+use worktrunk::styling::println;
mod cli;
mod commands;
@@ -219,8 +219,7 @@ fn main() {
handle_configure_shell(shell, force, command_name)
.map_err(|e| anyhow::anyhow!("{}", e))
.and_then(|scan_result| {
- use anstyle::{AnsiColor, Color};
- use worktrunk::styling::{HINT, HINT_EMOJI, format_bash_with_gutter};
+ use worktrunk::styling::format_bash_with_gutter;
let changes_count = scan_result
.configured
@@ -233,23 +232,38 @@ fn main() {
let bold = Style::new().bold();
let shell = result.shell;
let path = format_path_for_display(&result.path);
-
- println!(
- "{} {} {bold}{shell}{bold:#} {path}",
- result.action.emoji(),
- result.action.description(),
+ let message = format!(
+ "{} {bold}{shell}{bold:#} {path}",
+ result.action.description()
);
+
+ // Use appropriate output function based on action
+ match result.action {
+ ConfigAction::Added | ConfigAction::Created => {
+ crate::output::success(message)?;
+ }
+ ConfigAction::AlreadyExists => {
+ crate::output::info(message)?;
+ }
+ ConfigAction::WouldAdd | ConfigAction::WouldCreate => {
+ crate::output::progress(message)?;
+ }
+ }
+
// Show config line only for new additions
if changes_count > 0 {
- print!("{}", format_bash_with_gutter(&result.config_line, ""));
+ crate::output::gutter(format_bash_with_gutter(
+ &result.config_line,
+ "",
+ ))?;
+ crate::output::blank()?;
}
}
// Show skipped shells
- let dimmed = Style::new().dimmed();
for (shell, path) in &scan_result.skipped {
let path = format_path_for_display(path);
- println!("{HINT_EMOJI} {dimmed}{shell} {path} (not found){dimmed:#}");
+ crate::output::hint(format!("{shell} {path} (not found)"))?;
}
// Exit with error if no shells configured
@@ -258,38 +272,39 @@ fn main() {
}
// Summary
- let green = Style::new().fg_color(Some(Color::Ansi(AnsiColor::Green)));
if changes_count > 0 {
- println!();
let plural = if changes_count == 1 { "" } else { "s" };
- println!(
- "{SUCCESS_EMOJI} {green}Configured {changes_count} shell{plural}{green:#}"
- );
- println!();
+ crate::output::success(format!(
+ "Configured {changes_count} shell{plural}"
+ ))?;
+ crate::output::blank()?;
// Find the config file for the current shell
let current_shell = std::env::var("SHELL")
.ok()
.and_then(|s| s.rsplit('/').next().map(String::from));
- let current_shell_path = current_shell.as_ref().and_then(|shell_name| {
- scan_result
- .configured
- .iter()
- .filter(|r| !matches!(r.action, ConfigAction::AlreadyExists))
- .find(|r| r.shell.to_string().eq_ignore_ascii_case(shell_name))
- .map(|r| format_path_for_display(&r.path))
- });
+ let current_shell_path =
+ current_shell.as_ref().and_then(|shell_name| {
+ scan_result
+ .configured
+ .iter()
+ .filter(|r| {
+ !matches!(r.action, ConfigAction::AlreadyExists)
+ })
+ .find(|r| {
+ r.shell.to_string().eq_ignore_ascii_case(shell_name)
+ })
+ .map(|r| format_path_for_display(&r.path))
+ });
if let Some(path) = current_shell_path {
- println!(
- "{HINT_EMOJI} {HINT}Restart your shell or run: source {path}{HINT:#}"
- );
+ crate::output::hint(format!(
+ "Restart your shell or run: source {path}"
+ ))?;
}
} else {
- println!(
- "{SUCCESS_EMOJI} {green}All shells already configured{green:#}"
- );
+ crate::output::success("All shells already configured")?;
}
Ok(())
})
diff --git a/src/output/global.rs b/src/output/global.rs
index 67c146531..8b15f64bc 100644
--- a/src/output/global.rs
+++ b/src/output/global.rs
@@ -130,6 +130,13 @@ pub fn gutter(content: impl Into<String>) -> io::Result<()> {
with_output(|h| h.gutter(content.into()))
}
+/// Emit a blank line for visual separation
+///
+/// Used to separate logical sections of output.
+pub fn blank() -> io::Result<()> {
+ with_output(|h| h.blank())
+}
+
/// Emit raw output without emoji decoration
///
/// Used for structured data like JSON. Goes to stdout in interactive mode,
diff --git a/src/output/mod.rs b/src/output/mod.rs
index 35f3e1cdd..ee64bb994 100644
--- a/src/output/mod.rs
+++ b/src/output/mod.rs
@@ -63,8 +63,8 @@ mod traits;
// Re-export the public API
pub use global::{
- OutputMode, change_directory, error, execute, flush, flush_for_stderr_prompt, gutter, hint,
- info, initialize, progress, raw, raw_terminal, shell_integration_hint, success,
+ OutputMode, blank, change_directory, error, execute, flush, flush_for_stderr_prompt, gutter,
+ hint, info, initialize, progress, raw, raw_terminal, shell_integration_hint, success,
terminate_output, warning,
};
diff --git a/src/output/traits.rs b/src/output/traits.rs
index de168d2f2..12740de79 100644
--- a/src/output/traits.rs
+++ b/src/output/traits.rs
@@ -59,6 +59,11 @@ pub trait OutputHandler {
/// without adding additional newlines.
fn gutter(&mut self, content: String) -> io::Result<()>;
+ /// Emit a blank line for visual separation
+ fn blank(&mut self) -> io::Result<()> {
+ self.write_message_line("")
+ }
+
/// Emit raw output without emoji decoration
fn raw(&mut self, content: String) -> io::Result<()> {
self.write_message_line(&content)
diff --git a/src/styling/format.rs b/src/styling/format.rs
index 8ed9eb03c..00d9570cf 100644
--- a/src/styling/format.rs
+++ b/src/styling/format.rs
@@ -156,11 +156,12 @@ fn wrap_content_for_gutter(content: &str, left_margin: &str) -> Vec<String> {
#[cfg(not(feature = "syntax-highlighting"))]
fn format_wrapped_lines_plain(wrapped_lines: &[String], left_margin: &str) -> String {
let gutter = super::GUTTER;
+ let dimmed = anstyle::Style::new().dimmed();
let mut output = String::new();
for line in wrapped_lines {
output.push_str(&format!("{left_margin}{gutter} {gutter:#} "));
- output.push_str(line);
+ output.push_str(&format!("{dimmed}{line}{dimmed:#}"));
output.push_str(&format!("{}", anstyle::Reset));
output.push('\n');
}
diff --git a/src/styling/highlighting.rs b/src/styling/highlighting.rs
index 8b6dd4003..f70f12588 100644
--- a/src/styling/highlighting.rs
+++ b/src/styling/highlighting.rs
@@ -24,45 +24,39 @@ use synoptic::{TokOpt, from_extension};
/// - "embedded": embedded content
#[cfg(feature = "syntax-highlighting")]
pub(super) fn bash_token_style(kind: &str) -> Option<Style> {
- match kind {
+ // All tokens are dimmed for subdued appearance in gutter content.
+ // Previously unstyled tokens (embedded, unknown) now get dimmed too -
+ // this ensures the entire gutter block has consistent visual weight.
+ let base = match kind {
// Commands (npm, git, cargo, echo, cd, etc.) - bold blue
- "function" => Some(
- Style::new()
- .fg_color(Some(Color::Ansi(AnsiColor::Blue)))
- .bold(),
- ),
+ "function" => Style::new()
+ .fg_color(Some(Color::Ansi(AnsiColor::Blue)))
+ .bold(),
// Keywords (if, then, for, while, do, done, etc.) - bold magenta
- "keyword" => Some(
- Style::new()
- .fg_color(Some(Color::Ansi(AnsiColor::Magenta)))
- .bold(),
- ),
+ "keyword" => Style::new()
+ .fg_color(Some(Color::Ansi(AnsiColor::Magenta)))
+ .bold(),
// Strings (quoted values) - green
- "string" => Some(Style::new().fg_color(Some(Color::Ansi(AnsiColor::Green)))),
-
- // Comments (hash-prefixed) - dimmed
- "comment" => Some(Style::new().dimmed()),
+ "string" => Style::new().fg_color(Some(Color::Ansi(AnsiColor::Green))),
// Operators (&&, ||, |, $, -, >, <, etc.) - cyan
- "operator" => Some(Style::new().fg_color(Some(Color::Ansi(AnsiColor::Cyan)))),
+ "operator" => Style::new().fg_color(Some(Color::Ansi(AnsiColor::Cyan))),
// Variables ($VAR, ${VAR}) - tree-sitter-bash 0.25 uses "property" not "variable"
- "property" => Some(Style::new().fg_color(Some(Color::Ansi(AnsiColor::Yellow)))),
+ "property" => Style::new().fg_color(Some(Color::Ansi(AnsiColor::Yellow))),
// Numbers - yellow
- "number" => Some(Style::new().fg_color(Some(Color::Ansi(AnsiColor::Yellow)))),
+ "number" => Style::new().fg_color(Some(Color::Ansi(AnsiColor::Yellow))),
// Constants/flags (--flag, -f) - cyan
- "constant" => Some(Style::new().fg_color(Some(Color::Ansi(AnsiColor::Cyan)))),
-
- // Embedded content - default (no special styling)
- "embedded" => None,
+ "constant" => Style::new().fg_color(Some(Color::Ansi(AnsiColor::Cyan))),
- // Everything else (plain arguments, etc.)
- _ => None,
- }
+ // Comments, embedded content, and everything else - no additional styling
+ _ => Style::new(),
+ };
+ Some(base.dimmed())
}
// ============================================================================
diff --git a/tests/integration_tests/configure_shell.rs b/tests/integration_tests/configure_shell.rs
index b4a3fe586..960bef368 100644
--- a/tests/integration_tests/configure_shell.rs
+++ b/tests/integration_tests/configure_shell.rs
@@ -30,11 +30,11 @@ fn test_configure_shell_with_yes() {
exit_code: 0
----- stdout -----
βœ… Added zsh ~/.zshrc
-   if command -v wt >/dev/null 2>&1; then eval "$(command wt config shell init zsh)"; fi
+   if command -v wt >/dev/null 2>&1; then eval "$(command wt config shell init zsh)"; fi
+
πŸ’‘ bash ~/.bashrc (not found)
πŸ’‘ fish ~/.config/fish/conf.d (not found)
-
- βœ… Configured 1 shell
+ βœ… Configured 1 shell
πŸ’‘ Restart your shell or run: source ~/.zshrc
@@ -75,9 +75,9 @@ fn test_configure_shell_specific_shell() {
exit_code: 0
----- stdout -----
βœ… Added zsh ~/.zshrc
-   if command -v wt >/dev/null 2>&1; then eval "$(command wt config shell init zsh)"; fi
+   if command -v wt >/dev/null 2>&1; then eval "$(command wt config shell init zsh)"; fi
- βœ… Configured 1 shell
+ βœ… Configured 1 shell
πŸ’‘ Restart your shell or run: source ~/.zshrc
@@ -122,7 +122,7 @@ fn test_configure_shell_already_exists() {
exit_code: 0
----- stdout -----
βšͺ Already configured zsh ~/.zshrc
- βœ… All shells already configured
+ βœ… All shells already configured
----- stderr -----
");
@@ -158,9 +158,9 @@ fn test_configure_shell_fish() {
exit_code: 0
----- stdout -----
βœ… Created fish ~/.config/fish/conf.d/wt.fish
-   if type -q wt; command wt config shell init fish | source; end
+   if type -q wt; command wt config shell init fish | source; end
- βœ… Configured 1 shell
+ βœ… Configured 1 shell
πŸ’‘ Restart your shell or run: source ~/.config/fish/conf.d/wt.fish
@@ -241,12 +241,13 @@ fn test_configure_shell_multiple_configs() {
exit_code: 0
----- stdout -----
βœ… Added bash ~/.bashrc
-   if command -v wt >/dev/null 2>&1; then eval "$(command wt config shell init bash)"; fi
+   if command -v wt >/dev/null 2>&1; then eval "$(command wt config shell init bash)"; fi
+
βœ… Added zsh ~/.zshrc
-   if command -v wt >/dev/null 2>&1; then eval "$(command wt config shell init zsh)"; fi
- πŸ’‘ fish ~/.config/fish/conf.d (not found)
+   if command -v wt >/dev/null 2>&1; then eval "$(command wt config shell init zsh)"; fi
- βœ… Configured 2 shells
+ πŸ’‘ fish ~/.config/fish/conf.d (not found)
+ βœ… Configured 2 shells
πŸ’‘ Restart your shell or run: source ~/.zshrc
@@ -303,12 +304,13 @@ fn test_configure_shell_mixed_states() {
exit_code: 0
----- stdout -----
βšͺ Already configured bash ~/.bashrc
-   if command -v wt >/dev/null 2>&1; then eval "$(command wt config shell init bash)"; fi
+   if command -v wt >/dev/null 2>&1; then eval "$(command wt config shell init bash)"; fi
+
βœ… Added zsh ~/.zshrc
-   if command -v wt >/dev/null 2>&1; then eval "$(command wt config shell init zsh)"; fi
- πŸ’‘ fish ~/.config/fish/conf.d (not found)
+   if command -v wt >/dev/null 2>&1; then eval "$(command wt config shell init zsh)"; fi
- βœ… Configured 1 shell
+ πŸ’‘ fish ~/.config/fish/conf.d (not found)
+ βœ… Configured 1 shell
πŸ’‘ Restart your shell or run: source ~/.zshrc
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snap
index c14fa2b15..103bf35a4 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snap
@@ -7,11 +7,11 @@ y
🟑 test-repo needs approval to execute 1 command:
πŸ”„ post-create:
-  echo 'test command'
+  echo 'test command'
πŸ’‘ Allow and remember? [y/N]
πŸ”„ Running post-create:
-  echo 'test command'
+  echo 'test command'
test command
βœ… Created new worktree for test-approve from main at [REPO]/test-repo.test-approve
πŸ’‘ To enable automatic cd, run: wt config shell install
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snap
index dbadd060f..09c944ae6 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snap
@@ -7,7 +7,7 @@ n
🟑 test-repo needs approval to execute 1 command:
πŸ”„ post-create:
-  echo 'test command'
+  echo 'test command'
πŸ’‘ Allow and remember? [y/N]
βšͺ Commands declined, continuing worktree creation
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snap
index d59261b02..a12c134dd 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snap
@@ -7,20 +7,20 @@ y
🟑 test-repo needs approval to execute 2 commands:
πŸ”„ post-create:
-  echo 'First command'
+  echo 'First command'
πŸ”„ post-create:
-  echo 'Third command'
+  echo 'Third command'
πŸ’‘ Allow and remember? [y/N]
πŸ”„ Running post-create:
-  echo 'First command'
+  echo 'First command'
First command
πŸ”„ Running post-create:
-  echo 'Second command'
+  echo 'Second command'
Second command
πŸ”„ Running post-create:
-  echo 'Third command'
+  echo 'Third command'
Third command
βœ… Created new worktree for test-mixed-accept from main at [REPO]/test-repo.test-mixed-accept
πŸ’‘ To enable automatic cd, run: wt config shell install
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snap
index 9cfb09565..f94a2d481 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snap
@@ -7,10 +7,10 @@ n
🟑 test-repo needs approval to execute 2 commands:
πŸ”„ post-create:
-  echo 'First command'
+  echo 'First command'
πŸ”„ post-create:
-  echo 'Third command'
+  echo 'Third command'
πŸ’‘ Allow and remember? [y/N]
βšͺ Commands declined, continuing worktree creation
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snap
index 06046af32..60e3375b9 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snap
@@ -7,23 +7,23 @@ y
🟑 test-repo needs approval to execute 3 commands:
πŸ”„ post-create:
-  echo 'First command'
+  echo 'First command'
πŸ”„ post-create:
-  echo 'Second command'
+  echo 'Second command'
πŸ”„ post-create:
-  echo 'Third command'
+  echo 'Third command'
πŸ’‘ Allow and remember? [y/N]
πŸ”„ Running post-create:
-  echo 'First command'
+  echo 'First command'
First command
πŸ”„ Running post-create:
-  echo 'Second command'
+  echo 'Second command'
Second command
πŸ”„ Running post-create:
-  echo 'Third command'
+  echo 'Third command'
Third command
βœ… Created new worktree for test-multi from main at [REPO]/test-repo.test-multi
πŸ’‘ To enable automatic cd, run: wt config shell install
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap
index 98f336dd8..77c57c8bc 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap
@@ -7,23 +7,23 @@ y
🟑 test-repo needs approval to execute 3 commands:
πŸ”„ post-create install:
-  echo 'Installing dependencies...'
+  echo 'Installing dependencies...'
πŸ”„ post-create build:
-  echo 'Building project...'
+  echo 'Building project...'
πŸ”„ post-create test:
-  echo 'Running tests...'
+  echo 'Running tests...'
πŸ’‘ Allow and remember? [y/N]
πŸ”„ Running post-create install:
-  echo 'Installing dependencies...'
+  echo 'Installing dependencies...'
Installing dependencies...
πŸ”„ Running post-create build:
-  echo 'Building project...'
+  echo 'Building project...'
Building project...
πŸ”„ Running post-create test:
-  echo 'Running tests...'
+  echo 'Running tests...'
Running tests...
βœ… Created new worktree for test-named from main at [REPO]/test-repo.test-named
πŸ’‘ To enable automatic cd, run: wt config shell install
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snap
index d383a2ccb..f23856c17 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snap
@@ -7,13 +7,13 @@ y
🟑 test-repo needs approval to execute 1 command:
πŸ”„ post-create:
-  echo 'test command'
+  echo 'test command'
πŸ’‘ Allow and remember? [y/N]
🟑 Failed to save command approval: Failed to write config file: Permission denied (os error 13)
πŸ’‘ You will be prompted again next time.
πŸ”„ Running post-create:
-  echo 'test command'
+  echo 'test command'
test command
βœ… Created new worktree for test-permission from main at [REPO]/test-repo.test-permission
πŸ’‘ To enable automatic cd, run: wt config shell install
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 8c354e801..6bc71502c 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
@@ -4,7 +4,7 @@ expression: output.normalized()
---
βœ… Created new worktree for fish-multiline from main at [TMPDIR]/test-repo.fish-multiline
πŸ”„ Executing (--execute):
-  echo 'line 1'; echo 'line 2'; echo 'line 3'
+  echo 'line 1'; echo 'line 2'; echo 'line 3'
line 1
line 2
line 3
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 b009ffcf9..56471eec0 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
@@ -4,4 +4,4 @@ expression: output.normalized()
---
βœ… Created new worktree for fish-bg from main at [TMPDIR]/test-repo.fish-bg
πŸ”„ Running post-start:
-  echo 'fish background task'
+  echo 'fish background task'
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap
index 0587f19f4..fbe6173ea 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap
@@ -3,7 +3,7 @@ source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
πŸ”„ Running pre-merge check1:
-  [WORKSPACE]/tests/fixtures/mixed-output.sh check1 3
+  [WORKSPACE]/tests/fixtures/mixed-output.sh check1 3
[check1] stdout line 1
[check1] stderr line 1
[check1] stdout line 2
@@ -13,7 +13,7 @@ expression: output.normalized()
[check1] stdout complete
[check1] stderr complete
πŸ”„ Running pre-merge check2:
-  [WORKSPACE]/tests/fixtures/mixed-output.sh check2 3
+  [WORKSPACE]/tests/fixtures/mixed-output.sh check2 3
[check2] stdout line 1
[check2] stderr line 1
[check2] stdout line 2
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap
index 0587f19f4..fbe6173ea 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap
@@ -3,7 +3,7 @@ source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
πŸ”„ Running pre-merge check1:
-  [WORKSPACE]/tests/fixtures/mixed-output.sh check1 3
+  [WORKSPACE]/tests/fixtures/mixed-output.sh check1 3
[check1] stdout line 1
[check1] stderr line 1
[check1] stdout line 2
@@ -13,7 +13,7 @@ expression: output.normalized()
[check1] stdout complete
[check1] stderr complete
πŸ”„ Running pre-merge check2:
-  [WORKSPACE]/tests/fixtures/mixed-output.sh check2 3
+  [WORKSPACE]/tests/fixtures/mixed-output.sh check2 3
[check2] stdout line 1
[check2] stderr line 1
[check2] stdout line 2
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap
index 12840d713..0bfa20dcc 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap
@@ -3,10 +3,10 @@ source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
πŸ”„ Running pre-merge format:
-  echo 'βœ“ Code formatting check passed'
+  echo 'βœ“ Code formatting check passed'
βœ“ Code formatting check passed
πŸ”„ Running pre-merge test:
-  echo 'βœ— Test suite failed: 3 tests failing' && exit 1
+  echo 'βœ— Test suite failed: 3 tests failing' && exit 1
βœ— Test suite failed: 3 tests failing
❌ pre-merge command failed: test: exit status: 1
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap
index 12840d713..0bfa20dcc 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap
@@ -3,10 +3,10 @@ source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
πŸ”„ Running pre-merge format:
-  echo 'βœ“ Code formatting check passed'
+  echo 'βœ“ Code formatting check passed'
βœ“ Code formatting check passed
πŸ”„ Running pre-merge test:
-  echo 'βœ— Test suite failed: 3 tests failing' && exit 1
+  echo 'βœ— Test suite failed: 3 tests failing' && exit 1
βœ— Test suite failed: 3 tests failing
❌ pre-merge command failed: test: exit status: 1
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap
index 8a12341c1..323f81f39 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
@@ -3,13 +3,13 @@ source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
πŸ”„ Running pre-merge format:
-  echo 'βœ“ Code formatting check passed'
+  echo 'βœ“ Code formatting check passed'
βœ“ Code formatting check passed
πŸ”„ Running pre-merge lint:
-  echo 'βœ“ Linting passed - no warnings'
+  echo 'βœ“ Linting passed - no warnings'
βœ“ Linting passed - no warnings
πŸ”„ Running pre-merge test:
-  echo 'βœ“ All 47 tests passed in 2.3s'
+  echo 'βœ“ All 47 tests passed in 2.3s'
βœ“ All 47 tests passed in 2.3s
πŸ”„ Merging 1 commit to main @ [HASH] (no commit/squash/rebase needed)
  * [HASH] (HEAD -> feature) Add feature
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 8a12341c1..323f81f39 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
@@ -3,13 +3,13 @@ source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
πŸ”„ Running pre-merge format:
-  echo 'βœ“ Code formatting check passed'
+  echo 'βœ“ Code formatting check passed'
βœ“ Code formatting check passed
πŸ”„ Running pre-merge lint:
-  echo 'βœ“ Linting passed - no warnings'
+  echo 'βœ“ Linting passed - no warnings'
βœ“ Linting passed - no warnings
πŸ”„ Running pre-merge test:
-  echo 'βœ“ All 47 tests passed in 2.3s'
+  echo 'βœ“ All 47 tests passed in 2.3s'
βœ“ All 47 tests passed in 2.3s
πŸ”„ Merging 1 commit to main @ [HASH] (no commit/squash/rebase needed)
  * [HASH] (HEAD -> feature) Add feature
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_post_create.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_post_create.snap
index 532658f8d..30ade69e2 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_post_create.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_post_create.snap
@@ -1,13 +1,12 @@
---
source: tests/integration_tests/shell_wrapper.rs
-assertion_line: 2278
expression: output.normalized()
---
πŸ”„ Running post-create install:
-  uv sync
+  uv sync
Resolved 24 packages in 145ms
Installed 24 packages in 1.2s
βœ… Created new worktree for feature-x from main at [TMPDIR]/test-repo.feature-x
πŸ”„ Running post-start dev:
-  uv run dev
+  uv run dev
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_pre_merge.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_pre_merge.snap
index 9eab15628..05ec516f8 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_pre_merge.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_pre_merge.snap
@@ -1,6 +1,5 @@
---
source: tests/integration_tests/shell_wrapper.rs
-assertion_line: 2186
expression: output.normalized()
---
πŸ”„ Squashing 3 commits into a single commit (2 files, +45)...
@@ -11,7 +10,7 @@ expression: output.normalized()
  Includes comprehensive test coverage and input validation.
βœ… Squashed @ [HASH]
πŸ”„ Running pre-merge test:
-  uv run pytest
+  uv run pytest
============================= test session starts ==============================
collected 3 items
@@ -23,7 +22,7 @@ tests/test_auth.py::test_token_validation PASSED [100%]
============================== 3 passed in 0.8s ===============================
πŸ”„ Running pre-merge lint:
-  uv run ruff check
+  uv run ruff check
All checks passed!
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 73d5afa18..4291c6179 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
@@ -4,5 +4,5 @@ expression: output.normalized()
---
βœ… Created new worktree for test-exec from main at [TMPDIR]/test-repo.test-exec
πŸ”„ Executing (--execute):
-  echo executed
+  echo executed
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 73d5afa18..4291c6179 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
@@ -4,5 +4,5 @@ expression: output.normalized()
---
βœ… Created new worktree for test-exec from main at [TMPDIR]/test-repo.test-exec
πŸ”„ Executing (--execute):
-  echo executed
+  echo executed
executed
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 9edab7e8c..4095ee738 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
@@ -3,13 +3,13 @@ source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
πŸ”„ Running post-create:
-  echo 'Installing dependencies...'
+  echo 'Installing dependencies...'
Installing dependencies...
πŸ”„ Running post-create:
-  echo 'Building project...'
+  echo 'Building project...'
Building project...
βœ… Created new worktree for feature-hooks from main at [TMPDIR]/test-repo.feature-hooks
πŸ”„ Running post-start server:
-  echo 'Starting dev server on port 3000'
+  echo 'Starting dev server on port 3000'
πŸ”„ Running post-start watch:
-  echo 'Watching for file changes'
+  echo 'Watching for file changes'
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 84553e3c5..150751ce9 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
@@ -4,4 +4,4 @@ expression: output.normalized()
---
βœ… Created new worktree for feature-with-hooks from main at [TMPDIR]/test-repo.feature-with-hooks
πŸ”„ Running post-start:
-  echo 'test command executed'
+  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 6bdb21ca3..26b18241a 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
@@ -4,4 +4,4 @@ expression: output.normalized()
---
βœ… Created new worktree for feature-bg from main at [TMPDIR]/test-repo.feature-bg
πŸ”„ Running post-start:
-  echo 'background task'
+  echo 'background task'
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__already_approved_skip_prompt.snap b/tests/snapshots/integration__integration_tests__approval_ui__already_approved_skip_prompt.snap
index 6168a0b76..1d0bce5d9 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__already_approved_skip_prompt.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__already_approved_skip_prompt.snap
@@ -23,7 +23,7 @@ success: true
exit_code: 0
----- stdout -----
πŸ”„ Running post-create:
-  echo 'approved' > output.txt
+  echo 'approved' > output.txt
βœ… Created new worktree for test-approved from main at [REPO].test-approved
πŸ’‘ To enable automatic cd, run: wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_fails_in_non_tty.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_fails_in_non_tty.snap
index 47a96af98..a54265aaf 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__approval_fails_in_non_tty.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__approval_fails_in_non_tty.snap
@@ -30,4 +30,4 @@ exit_code: 1
🟑 test-repo needs approval to execute 1 command:
πŸ”„ post-create:
-  echo 'test command'
+  echo 'test command'
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_mixed_approved_unapproved.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_mixed_approved_unapproved.snap
index 8b0e0ed99..3495a3f7a 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__approval_mixed_approved_unapproved.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__approval_mixed_approved_unapproved.snap
@@ -12,7 +12,7 @@ exit_code: 1
🟑 test-repo needs approval to execute 2 commands:
πŸ”„ post-create:
-  echo 'First command'
+  echo 'First command'
πŸ”„ post-create:
-  echo 'Third command'
+  echo 'Third command'
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_multiple_commands.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_multiple_commands.snap
index 0574151bc..d24ded3bf 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__approval_multiple_commands.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__approval_multiple_commands.snap
@@ -12,13 +12,13 @@ exit_code: 1
🟑 test-repo needs approval to execute 4 commands:
πŸ”„ post-create:
-  echo 'Branch: test-nested-branch'
+  echo 'Branch: test-nested-branch'
πŸ”„ post-create:
-  echo 'Worktree: [REPO].test-nested-branch'
+  echo 'Worktree: [REPO].test-nested-branch'
πŸ”„ post-create:
-  echo 'Repo: test-repo'
+  echo 'Repo: test-repo'
πŸ”„ post-create:
-  cd [REPO].test-nested-branch && pwd
+  cd [REPO].test-nested-branch && pwd
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_named_commands.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_named_commands.snap
index dd43ea263..4dc6cde07 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__approval_named_commands.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__approval_named_commands.snap
@@ -12,10 +12,10 @@ exit_code: 1
🟑 test-repo needs approval to execute 3 commands:
πŸ”„ post-create install:
-  echo 'Installing dependencies...'
+  echo 'Installing dependencies...'
πŸ”„ post-create build:
-  echo 'Building project...'
+  echo 'Building project...'
πŸ”„ post-create test:
-  echo 'Running tests...'
+  echo 'Running tests...'
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_single_command.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_single_command.snap
index 53ca68d5e..a7ad82325 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__approval_single_command.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__approval_single_command.snap
@@ -12,4 +12,4 @@ exit_code: 1
🟑 test-repo needs approval to execute 1 command:
πŸ”„ post-create:
-  echo 'Worktree path: [REPO].feature-test-approval'
+  echo 'Worktree path: [REPO].feature-test-approval'
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__decline_approval_skips_only_unapproved.snap b/tests/snapshots/integration__integration_tests__approval_ui__decline_approval_skips_only_unapproved.snap
index 8b0e0ed99..3495a3f7a 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__decline_approval_skips_only_unapproved.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__decline_approval_skips_only_unapproved.snap
@@ -12,7 +12,7 @@ exit_code: 1
🟑 test-repo needs approval to execute 2 commands:
πŸ”„ post-create:
-  echo 'First command'
+  echo 'First command'
πŸ”„ post-create:
-  echo 'Third command'
+  echo 'Third command'
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__force_bypasses_tty_check.snap b/tests/snapshots/integration__integration_tests__approval_ui__force_bypasses_tty_check.snap
index b31ffa175..ae980b43f 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__force_bypasses_tty_check.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__force_bypasses_tty_check.snap
@@ -24,7 +24,7 @@ success: true
exit_code: 0
----- stdout -----
πŸ”„ Running post-create:
-  echo 'test command'
+  echo 'test command'
βœ… Created new worktree for test-force-tty from main at [REPO].test-force-tty
πŸ’‘ To enable automatic cd, run: wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_first_run.snap b/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_first_run.snap
index e5a8ef045..1f3d093f0 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_first_run.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_first_run.snap
@@ -24,7 +24,7 @@ success: true
exit_code: 0
----- stdout -----
πŸ”„ Running post-create:
-  echo 'test command' > output.txt
+  echo 'test command' > output.txt
βœ… Created new worktree for test-force from main at [REPO].test-force
πŸ’‘ To enable automatic cd, run: wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_second_run.snap b/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_second_run.snap
index d283140b5..3c81ef554 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_second_run.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_second_run.snap
@@ -12,4 +12,4 @@ exit_code: 1
🟑 test-repo needs approval to execute 1 command:
πŸ”„ post-create:
-  echo 'test command' > output.txt
+  echo 'test command' > output.txt
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__run_hook_post_merge_requires_approval.snap b/tests/snapshots/integration__integration_tests__approval_ui__run_hook_post_merge_requires_approval.snap
index cdd1698cd..c2437f37e 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__run_hook_post_merge_requires_approval.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__run_hook_post_merge_requires_approval.snap
@@ -12,4 +12,4 @@ exit_code: 1
🟑 test-repo needs approval to execute 1 command:
πŸ”„ post-merge:
-  echo 'Post-merge cleanup for main'
+  echo 'Post-merge cleanup for main'
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__run_hook_pre_merge_requires_approval.snap b/tests/snapshots/integration__integration_tests__approval_ui__run_hook_pre_merge_requires_approval.snap
index 70a3fea78..a371492c2 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__run_hook_pre_merge_requires_approval.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__run_hook_pre_merge_requires_approval.snap
@@ -12,4 +12,4 @@ exit_code: 1
🟑 test-repo needs approval to execute 1 command:
πŸ”„ pre-merge:
-  echo 'Running pre-merge checks on main'
+  echo 'Running pre-merge checks on main'
diff --git a/tests/snapshots/integration__integration_tests__approvals__ask_approvals_all_none_approved.snap b/tests/snapshots/integration__integration_tests__approvals__ask_approvals_all_none_approved.snap
index 741ff8a75..47130162d 100644
--- a/tests/snapshots/integration__integration_tests__approvals__ask_approvals_all_none_approved.snap
+++ b/tests/snapshots/integration__integration_tests__approvals__ask_approvals_all_none_approved.snap
@@ -31,4 +31,4 @@ exit_code: 1
🟑 test-repo needs approval to execute 1 command:
πŸ”„ post-create:
-  echo 'test'
+  echo 'test'
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 e7d610d6f..5439a9071 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
@@ -29,7 +29,7 @@ exit_code: 1
βœ… Merged to main (1 commit, 1 file, +1)
πŸ”„ Removing feature worktree & branch in background
πŸ”„ Running post-merge:
-  exit 1
+  exit 1
🟑 Command failed: exit status: 1
❌ post-merge command failed: exit status: 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 8a1a7ac4b..3e63466a2 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
@@ -29,9 +29,9 @@ exit_code: 0
βœ… Merged to main (1 commit, 1 file, +1)
πŸ”„ Removing feature worktree & branch in background
πŸ”„ Running post-merge notify:
-  echo 'Merge to main complete' > notify.txt
+  echo 'Merge to main complete' > notify.txt
πŸ”„ Running post-merge deploy:
-  echo 'Deploying branch feature' > deploy.txt
+  echo 'Deploying branch feature' > deploy.txt
----- stderr -----

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 cf2673bc0..349b125a4 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
@@ -29,7 +29,7 @@ exit_code: 0
βœ… Merged to main (1 commit, 1 file, +1)
πŸ”„ Removing feature worktree & branch in background
πŸ”„ Running post-merge:
-  echo 'merged feature to main' > post-merge-ran.txt
+  echo 'merged feature to main' > post-merge-ran.txt
----- stderr -----

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 dafa1518d..3755fbd2e 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
@@ -25,7 +25,7 @@ exit_code: 1
🟑 Auto-staging 1 untracked file:
  feature.txt
πŸ”„ Running pre-commit:
-  exit 1
+  exit 1
❌ pre-commit command failed: exit status: 1
πŸ’‘ Use --no-verify to skip pre-commit commands
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 d0da1857a..3278ccfe7 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
@@ -25,7 +25,7 @@ exit_code: 0
🟑 Auto-staging 1 untracked file:
  feature.txt
πŸ”„ Running pre-commit:
-  echo 'Pre-commit check passed'
+  echo 'Pre-commit check passed'
πŸ”„ Committing with default message... (1 file, +1, no squashing needed)
πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
  Changes to feature.txt
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap
index 406ffe640..cbbf798a5 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap
@@ -23,7 +23,7 @@ success: false
exit_code: 1
----- stdout -----
πŸ”„ Running pre-merge:
-  exit 1
+  exit 1
❌ pre-merge command failed: exit status: 1
πŸ’‘ Use --no-verify to skip pre-merge commands
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 097b15421..4ad58809e 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
@@ -23,11 +23,11 @@ success: true
exit_code: 0
----- stdout -----
πŸ”„ Running pre-merge format:
-  exit 0
+  exit 0
πŸ”„ Running pre-merge lint:
-  exit 0
+  exit 0
πŸ”„ Running pre-merge test:
-  exit 0
+  exit 0
πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
  * [SHA] (HEAD -> feature) Add feature file
  feature.txt | 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 d0c3246e2..2894208af 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
@@ -23,7 +23,7 @@ success: true
exit_code: 0
----- stdout -----
πŸ”„ Running pre-merge:
-  exit 0
+  exit 0
πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
  * [SHA] (HEAD -> feature) Add feature file
  feature.txt | 1 +
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snap
index 96ca47117..09934335a 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snap
@@ -23,7 +23,7 @@ success: false
exit_code: 1
----- stdout -----
πŸ”„ Running pre-commit:
-  exit 1
+  exit 1
❌ pre-commit command failed: exit status: 1
πŸ’‘ Use --no-verify to skip pre-commit commands
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 2aa574986..6ab81949b 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
@@ -23,7 +23,7 @@ success: true
exit_code: 0
----- stdout -----
πŸ”„ Running pre-commit:
-  echo 'Pre-commit check passed'
+  echo 'Pre-commit check passed'
πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
  * [SHA] (HEAD -> feature) Add feature file
  feature.txt | 1 +
diff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
index 32f6c77e4..4ae363b1e 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
@@ -36,9 +36,9 @@ exit_code: 0
  - Create test suite covering all authentication flows
βœ… Squashed @ [SHA]
πŸ”„ Running pre-merge test:
-  cargo test
+  cargo test
πŸ”„ Running pre-merge lint:
-  cargo clippy
+  cargo clippy
πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
  * [SHA] (HEAD -> feature-auth) feat(auth): Implement JWT authentication system
  auth.rs | 8 ++++++++
@@ -48,7 +48,7 @@ exit_code: 0
βœ… Merged to main (1 commit, 3 files, +33)
πŸ”„ Removing feature-auth worktree & branch in background
πŸ”„ Running post-merge install:
-  cargo install --path .
+  cargo install --path .
----- stderr -----
 Finished test [unoptimized + debuginfo] target(s) in 0.12s
diff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_post_create.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_post_create.snap
index b19bd56e9..a22642abe 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_post_create.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_post_create.snap
@@ -25,11 +25,11 @@ success: true
exit_code: 0
----- stdout -----
πŸ”„ Running post-create install:
-  uv sync
+  uv sync
βœ… Created new worktree for feature-x from main at [REPO].feature-x
πŸ’‘ To enable automatic cd, run: wt config shell install
πŸ”„ Running post-start dev:
-  uv run dev
+  uv run dev
----- stderr -----

diff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_pre_merge.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_pre_merge.snap
index ba0b7de04..d564b5d0e 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_pre_merge.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_pre_merge.snap
@@ -31,9 +31,9 @@ exit_code: 0
  Includes comprehensive test coverage and input validation.
βœ… Squashed @ [SHA]
πŸ”„ Running pre-merge test:
-  uv run pytest
+  uv run pytest
πŸ”„ Running pre-merge lint:
-  uv run ruff check
+  uv run ruff check
πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
  * [SHA] (HEAD -> feature-auth) feat(api): Add user authentication endpoints
  api/auth.py | 31 +++++++++++++++++++++++++++++++
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 40a7c251f..5525317a6 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
@@ -23,11 +23,11 @@ success: true
exit_code: 0
----- stdout -----
πŸ”„ Running post-create:
-  echo 'Setup done' > setup.txt
+  echo 'Setup done' > setup.txt
βœ… Created new worktree for feature from main at [REPO].feature
πŸ’‘ To enable automatic cd, run: wt config shell install
πŸ”„ Running post-start server:
-  sleep 0.05 && echo 'Server running' > server.txt
+  sleep 0.05 && echo 'Server running' > server.txt
----- stderr -----

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 438f48c52..bb6e081c1 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
@@ -26,8 +26,8 @@ exit_code: 0
----- stdout -----
βœ… Created new worktree for feature from main at [REPO].feature
πŸ”„ Running post-start:
-  echo 'Background task' > background.txt
+  echo 'Background task' > background.txt
πŸ”„ Executing (--execute):
-  echo 'Execute flag' > execute.txt
+  echo 'Execute flag' > execute.txt
----- stderr -----
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 051dd12dd..cbadbb9ad 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
@@ -23,7 +23,7 @@ success: true
exit_code: 0
----- stdout -----
πŸ”„ Running post-create:
-  exit 1
+  exit 1
🟑 Command failed: exit status: 1
βœ… Created new worktree for feature from main at [REPO].feature
πŸ’‘ To enable automatic cd, run: wt config shell install
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 2dad48b72..d786da458 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
@@ -23,11 +23,11 @@ success: true
exit_code: 0
----- stdout -----
πŸ”„ Running post-create:
-  if [ ! -f test.txt ]; then
-  echo 'File does not exist' > result.txt
-  else
-  echo 'File exists' > result.txt
-  fi
+  if [ ! -f test.txt ]; then
+  echo 'File does not exist' > result.txt
+  else
+  echo 'File exists' > result.txt
+  fi
βœ… Created new worktree for feature from main at [REPO].feature
πŸ’‘ To enable automatic cd, run: wt config shell install
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 823ca25fe..a88e14634 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
@@ -23,9 +23,9 @@ success: true
exit_code: 0
----- stdout -----
πŸ”„ Running post-create:
-  echo 'First'
+  echo 'First'
πŸ”„ Running post-create:
-  echo 'Second'
+  echo 'Second'
βœ… Created new worktree for feature from main at [REPO].feature
πŸ’‘ To enable automatic cd, run: wt config shell install
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 932640e92..62f16e8f2 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
@@ -23,9 +23,9 @@ success: true
exit_code: 0
----- stdout -----
πŸ”„ Running post-create install:
-  echo 'Installing deps'
+  echo 'Installing deps'
πŸ”„ Running post-create setup:
-  echo 'Running setup'
+  echo 'Running setup'
βœ… Created new worktree for feature from main at [REPO].feature
πŸ’‘ To enable automatic cd, run: wt config shell install
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 85be977cf..cfee110d5 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
@@ -23,7 +23,7 @@ success: true
exit_code: 0
----- stdout -----
πŸ”„ Running post-create:
-  echo 'Setup complete'
+  echo 'Setup complete'
βœ… Created new worktree for feature from main at [REPO].feature
πŸ’‘ To enable automatic cd, run: wt config shell install
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 d865ee6b0..90b1764bb 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
@@ -23,13 +23,13 @@ success: true
exit_code: 0
----- stdout -----
πŸ”„ Running post-create:
-  echo 'Repo: test-repo' > info.txt
+  echo 'Repo: test-repo' > info.txt
πŸ”„ Running post-create:
-  echo 'Branch: feature-test' >> info.txt
+  echo 'Branch: feature-test' >> info.txt
πŸ”„ Running post-create:
-  echo 'Worktree: [REPO].feature-test' >> info.txt
+  echo 'Worktree: [REPO].feature-test' >> info.txt
πŸ”„ Running post-create:
-  echo 'Root: [REPO]' >> info.txt
+  echo 'Root: [REPO]' >> info.txt
βœ… Created new worktree for feature/test from main at [REPO].feature-test
πŸ’‘ To enable automatic cd, run: wt config shell install
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 a2beea0a3..05319b69e 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
@@ -25,8 +25,8 @@ exit_code: 0
βœ… Created new worktree for feature from main at [REPO].feature
πŸ’‘ To enable automatic cd, run: wt config shell install
πŸ”„ Running post-start:
-  echo 'line1
-  line2
-  line3' | grep line2 > filtered.txt
+  echo 'line1
+  line2
+  line3' | grep line2 > filtered.txt
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_create_with_command.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_create_with_command.snap
index 7d7df0bc6..2314130e3 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_create_with_command.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_create_with_command.snap
@@ -25,6 +25,6 @@ exit_code: 0
βœ… Created new worktree for feature from main at [REPO].feature
πŸ’‘ To enable automatic cd, run: wt config shell install
πŸ”„ Running post-start:
-  echo 'POST-START-RAN' > post_start_marker.txt
+  echo 'POST-START-RAN' > post_start_marker.txt
----- stderr -----
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 2e367ce5a..90ae00623 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
@@ -25,6 +25,6 @@ exit_code: 0
βœ… Created new worktree for feature from main at [REPO].feature
πŸ’‘ To enable automatic cd, run: wt config shell install
πŸ”„ Running post-start:
-  echo 'unclosed quote
+  echo 'unclosed quote
----- stderr -----
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 2cf309e5a..15a86a08c 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
@@ -25,6 +25,6 @@ exit_code: 0
βœ… Created new worktree for feature from main at [REPO].feature
πŸ’‘ To enable automatic cd, run: wt config shell install
πŸ”„ Running post-start:
-  echo 'stdout output' && echo 'stderr output' >&2
+  echo 'stdout output' && echo 'stderr output' >&2
----- stderr -----
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 bb2ace1f6..9cd98f9f9 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
@@ -25,8 +25,8 @@ exit_code: 0
βœ… Created new worktree for feature from main at [REPO].feature
πŸ’‘ To enable automatic cd, run: wt config shell install
πŸ”„ Running post-start:
-  echo 'first line' > multiline.txt
-  echo 'second line' >> multiline.txt
-  echo 'third line' >> multiline.txt
+  echo 'first line' > multiline.txt
+  echo 'second line' >> multiline.txt
+  echo 'third line' >> multiline.txt
----- stderr -----
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 e47a0cad4..b9404bda0 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
@@ -25,8 +25,8 @@ exit_code: 0
βœ… Created new worktree for feature from main at [REPO].feature
πŸ’‘ To enable automatic cd, run: wt config shell install
πŸ”„ Running post-start task1:
-  echo 'Task 1 running' > task1.txt
+  echo 'Task 1 running' > task1.txt
πŸ”„ Running post-start task2:
-  echo 'Task 2 running' > task2.txt
+  echo 'Task 2 running' > task2.txt
----- stderr -----
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 078f07a3d..11c5d94f6 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
@@ -25,10 +25,10 @@ exit_code: 0
βœ… Created new worktree for feature from main at [REPO].feature
πŸ’‘ To enable automatic cd, run: wt config shell install
πŸ”„ Running post-start task1:
-  echo 'TASK1_OUTPUT'
+  echo 'TASK1_OUTPUT'
πŸ”„ Running post-start task2:
-  echo 'TASK2_OUTPUT'
+  echo 'TASK2_OUTPUT'
πŸ”„ Running post-start task3:
-  echo 'TASK3_OUTPUT'
+  echo 'TASK3_OUTPUT'
----- stderr -----
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 a6c9c3395..9b9c84959 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
@@ -25,6 +25,6 @@ exit_code: 0
βœ… Created new worktree for feature from main at [REPO].feature
πŸ’‘ To enable automatic cd, run: wt config shell install
πŸ”„ Running post-start:
-  sleep 0.1 && echo 'Background task done' > background.txt
+  sleep 0.1 && echo 'Background task done' > background.txt
----- stderr -----
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 107e19bcb..c93d29c45 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
@@ -26,6 +26,6 @@ exit_code: 0
----- stdout -----
βœ… Created new worktree for file-test from main at [REPO].file-test
πŸ”„ Executing (--execute):
-  echo 'test content' > test.txt
+  echo 'test content' > test.txt
----- stderr -----
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 6d37bc5db..fe713f3f7 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap
@@ -25,6 +25,6 @@ exit_code: 0
----- stdout -----
βœ… Switched to worktree for existing-exec at [WORKTREE_EXISTING_EXEC]
πŸ”„ Executing (--execute):
-  echo 'existing worktree' > existing.txt
+  echo 'existing worktree' > existing.txt
----- 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 aa69d9bd7..1ffd393cc 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap
@@ -26,7 +26,7 @@ exit_code: 1
----- stdout -----
βœ… Created new worktree for fail-test from main at [REPO].fail-test
πŸ”„ Executing (--execute):
-  exit 1
+  exit 1
❌ exit status: 1
----- stderr -----
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 cc57aae68..96a7c3df7 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap
@@ -26,9 +26,9 @@ exit_code: 0
----- stdout -----
βœ… Created new worktree for multiline-test from main at [REPO].multiline-test
πŸ”„ Executing (--execute):
-  echo 'line1'
-  echo 'line2'
-  echo 'line3'
+  echo 'line1'
+  echo 'line2'
+  echo 'line3'
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 68150e1df..534c0d730 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap
@@ -26,7 +26,7 @@ exit_code: 0
----- stdout -----
βœ… Created new worktree for exec-test from main at [REPO].exec-test
πŸ”„ Executing (--execute):
-  echo 'test output'
+  echo 'test output'
test output
----- stderr -----
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 4720021d7..bf76f66d7 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