Skip to content

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

fix(bash): Resolve ANSI color issues and streamline templates

Maximilian Roos697780939fdc
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 50b4ba7e5..d34a1d9ea 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -56,7 +56,8 @@ repos:
language: pygrep
types: ["rust"]
entry: '\\x1b\['
- exclude: '^(tests/|.*_test\.rs$|src/styling/(line|mod)\.rs$|src/output/directive\.rs$|src/cli\.rs$)'
+ # format.rs strips ANSI codes injected by wrap_ansi crate
+ exclude: '^(tests/|.*_test\.rs$|src/styling/(line|mod|format)\.rs$|src/output/directive\.rs$|src/cli\.rs$)'
ci:
# Currently network access isn't supported in the CI product.
diff --git a/src/styling/format.rs b/src/styling/format.rs
index 06975fd26..4de50fd6f 100644
--- a/src/styling/format.rs
+++ b/src/styling/format.rs
@@ -142,6 +142,11 @@ pub fn format_with_gutter(content: &str, left_margin: &str, max_width: Option<us
///
/// Uses `wrap-ansi` crate which handles ANSI escape sequences, Unicode width,
/// and OSC 8 hyperlinks automatically.
+///
+/// Note: wrap_ansi injects color reset codes ([39m for foreground, [49m for background)
+/// at line ends to make each line "self-contained". We strip these because:
+/// 1. We never emit [39m/[49m ourselves - all our resets use [0m (full reset)
+/// 2. These injected codes create visual discontinuity when styled text wraps
pub(super) fn wrap_styled_text(styled: &str, max_width: usize) -> Vec<String> {
if max_width == 0 {
return vec![styled.to_string()];
@@ -154,13 +159,20 @@ pub(super) fn wrap_styled_text(styled: &str, max_width: usize) -> Vec<String> {
return vec![String::new()];
}
- wrapped.lines().map(|s| s.to_owned()).collect()
+ // Strip color reset codes injected by wrap_ansi - we never emit these ourselves,
+ // so any occurrence is an artifact that creates visual discontinuity
+ let cleaned = wrapped
+ .replace("\x1b[39m", "") // reset foreground to default
+ .replace("\x1b[49m", ""); // reset background to default
+
+ cleaned.lines().map(|s| s.to_owned()).collect()
}
/// Formats bash/shell commands with syntax highlighting and gutter
///
-/// Highlights each original line first (preserving parsing context), then wraps
-/// the styled output. Long lines are wrapped at word boundaries to fit terminal width.
+/// Processes each line separately for highlighting (required for multi-line commands
+/// with `&&` at line ends), then applies template syntax detection to avoid
+/// misinterpreting `}}` as a command when it appears at line start.
///
/// # Example
/// ```ignore
@@ -172,6 +184,7 @@ pub fn format_bash_with_gutter(content: &str, left_margin: &str) -> String {
let gutter = super::GUTTER;
let reset = anstyle::Reset;
+ let dim = anstyle::Style::new().dimmed();
let mut output = String::new();
// Calculate available width for content
@@ -219,16 +232,15 @@ pub fn format_bash_with_gutter(content: &str, left_margin: &str) -> String {
let mut highlighter = Highlighter::new();
- // Process each ORIGINAL line (not wrapped) to preserve parsing context
+ // Process each line separately - this is required because tree-sitter's bash
+ // grammar fails to highlight multi-line commands when `&&` appears at line ends.
+ // Per-line processing gives proper highlighting for each line's content.
for line in content.lines() {
- // Step 1: Highlight the complete line with tree-sitter
- let mut styled_line = String::new();
+ let mut styled_line = format!("{dim}");
let Ok(highlights) = highlighter.highlight(&config, line.as_bytes(), None, |_| None) else {
- // Fallback: just use the plain line
+ // Fallback: if highlighting fails, use plain dim
styled_line.push_str(line);
-
- // Wrap and output with gutter
for wrapped in wrap_styled_text(&styled_line, available_width) {
output.push_str(&format!(
"{left_margin}{gutter} {gutter:#} {wrapped}{reset}\n"
@@ -239,30 +251,51 @@ pub fn format_bash_with_gutter(content: &str, left_margin: &str) -> String {
let line_bytes = line.as_bytes();
+ // Track the current highlight type so we can decide styling when we see the actual text
+ let mut pending_highlight: Option<usize> = None;
+
for event in highlights {
match event.unwrap() {
HighlightEvent::Source { start, end } => {
// Output the text for this source region
if let Ok(text) = std::str::from_utf8(&line_bytes[start..end]) {
+ // Apply pending highlight style, but skip command styling for template syntax
+ // (tree-sitter misinterprets `}}` at line start as a command)
+ if let Some(idx) = pending_highlight.take() {
+ let is_template_syntax =
+ text.starts_with("}}") || text.starts_with("{{");
+ let is_function = highlight_names
+ .get(idx)
+ .is_some_and(|name| *name == "function");
+
+ // Skip command styling for template syntax, apply normal styling otherwise
+ if !(is_function && is_template_syntax)
+ && let Some(name) = highlight_names.get(idx)
+ && let Some(style) = bash_token_style(name)
+ {
+ // Reset before applying style to clear the base dim, then apply token style.
+ // Token styles use dim+color (not bold) because bold (SGR 1) and dim (SGR 2)
+ // are mutually exclusive in some terminals like Alacritty.
+ styled_line.push_str(&format!("{reset}{style}"));
+ }
+ }
+
styled_line.push_str(text);
}
}
HighlightEvent::HighlightStart(idx) => {
- // Start of a highlighted region - apply style
- if let Some(name) = highlight_names.get(idx.0)
- && let Some(style) = bash_token_style(name)
- {
- styled_line.push_str(&format!("{style}"));
- }
+ // Remember the highlight type - we'll decide on styling when we see the text
+ pending_highlight = Some(idx.0);
}
HighlightEvent::HighlightEnd => {
- // End of highlighted region - reset style
- styled_line.push_str(&format!("{reset}"));
+ // End of highlighted region - reset and restore dim for unhighlighted text
+ pending_highlight = None;
+ styled_line.push_str(&format!("{reset}{dim}"));
}
}
}
- // Step 2: Wrap the styled line and output each part with gutter
+ // Wrap and output with gutter
for wrapped in wrap_styled_text(&styled_line, available_width) {
output.push_str(&format!(
"{left_margin}{gutter} {gutter:#} {wrapped}{reset}\n"
diff --git a/src/styling/highlighting.rs b/src/styling/highlighting.rs
index 66dda7d1e..1306c1873 100644
--- a/src/styling/highlighting.rs
+++ b/src/styling/highlighting.rs
@@ -24,37 +24,60 @@ use synoptic::{TokOpt, from_extension};
/// - "embedded": embedded content
#[cfg(feature = "syntax-highlighting")]
pub(super) fn bash_token_style(kind: &str) -> Option<Style> {
+ // All styles include .dimmed() so highlighted tokens match the dim base text.
+ // We do NOT use .bold() because bold (SGR 1) and dim (SGR 2) are mutually
+ // exclusive in some terminals like Alacritty - bold would cancel dim.
match kind {
- // Commands (npm, git, cargo, echo, cd, etc.) - bold blue
+ // Commands (npm, git, cargo, echo, cd, etc.) - dim blue
"function" => Some(
Style::new()
.fg_color(Some(Color::Ansi(AnsiColor::Blue)))
- .bold(),
+ .dimmed(),
),
- // Keywords (if, then, for, while, do, done, etc.) - bold magenta
+ // Keywords (if, then, for, while, do, done, etc.) - dim magenta
"keyword" => Some(
Style::new()
.fg_color(Some(Color::Ansi(AnsiColor::Magenta)))
- .bold(),
+ .dimmed(),
),
- // Strings (quoted values) - green
- "string" => Some(Style::new().fg_color(Some(Color::Ansi(AnsiColor::Green)))),
+ // Strings (quoted values) - dim green
+ "string" => Some(
+ Style::new()
+ .fg_color(Some(Color::Ansi(AnsiColor::Green)))
+ .dimmed(),
+ ),
- // Operators (&&, ||, |, $, -, >, <, etc.) - cyan
- "operator" => Some(Style::new().fg_color(Some(Color::Ansi(AnsiColor::Cyan)))),
+ // Operators (&&, ||, |, $, -, >, <, etc.) - dim cyan
+ "operator" => Some(
+ Style::new()
+ .fg_color(Some(Color::Ansi(AnsiColor::Cyan)))
+ .dimmed(),
+ ),
// Variables ($VAR, ${VAR}) - tree-sitter-bash 0.25 uses "property" not "variable"
- "property" => Some(Style::new().fg_color(Some(Color::Ansi(AnsiColor::Yellow)))),
+ "property" => Some(
+ Style::new()
+ .fg_color(Some(Color::Ansi(AnsiColor::Yellow)))
+ .dimmed(),
+ ),
- // Numbers - yellow
- "number" => Some(Style::new().fg_color(Some(Color::Ansi(AnsiColor::Yellow)))),
+ // Numbers - dim yellow
+ "number" => Some(
+ Style::new()
+ .fg_color(Some(Color::Ansi(AnsiColor::Yellow)))
+ .dimmed(),
+ ),
- // Constants/flags (--flag, -f) - cyan
- "constant" => Some(Style::new().fg_color(Some(Color::Ansi(AnsiColor::Cyan)))),
+ // Constants/flags (--flag, -f) - dim cyan
+ "constant" => Some(
+ Style::new()
+ .fg_color(Some(Color::Ansi(AnsiColor::Cyan)))
+ .dimmed(),
+ ),
- // Comments, embedded content, and everything else - no styling
+ // Comments, embedded content, and everything else - no styling (will use base dim)
_ => None,
}
}
diff --git a/src/styling/mod.rs b/src/styling/mod.rs
index 27ab40ddd..96d7613d5 100644
--- a/src/styling/mod.rs
+++ b/src/styling/mod.rs
@@ -512,4 +512,298 @@ command = "npm install"
assert_eq!(result.len(), 1);
assert_eq!(result[0], "verylongwordthatcannotbewrapped");
}
+
+ #[test]
+ fn test_wrap_styled_text_preserves_dim_across_wrap_points() {
+ // This test verifies that wrap_ansi preserves dim styling across wrap points.
+ // This was a bug where wrap_ansi lost track of ANSI state at line breaks,
+ // causing text after the wrap to lose its dim styling.
+ //
+ // Simulate what format_bash_with_gutter produces:
+ // - Starts with dim
+ // - Highlighted tokens have styles like bold+dim+color
+ // - After each highlight, we reset then restore dim: [0m[2m
+ // - Unhighlighted text stays dimmed
+
+ let dim = Style::new().dimmed();
+ let reset = anstyle::Reset;
+ let cmd_style = Style::new()
+ .fg_color(Some(anstyle::Color::Ansi(anstyle::AnsiColor::Blue)))
+ .bold()
+ .dimmed();
+
+ // Create a styled line exactly like the highlighter produces:
+ // [dim][cmd_style]cp[reset][dim] -cR {{ repo_root }}/target/debug/build {{ worktree }}/target/debug/
+ let styled = format!(
+ "{dim}{cmd_style}cp{reset}{dim} -cR {{{{ repo_root }}}}/target/debug/build {{{{ worktree }}}}/target/debug/"
+ );
+
+ // Wrap at a width that forces a break in the middle of unhighlighted text
+ let result = wrap_styled_text(&styled, 40);
+
+ // Should wrap into multiple lines
+ assert!(
+ result.len() > 1,
+ "Should wrap into multiple lines, got {} lines: {:?}",
+ result.len(),
+ result
+ );
+
+ // The key assertion: each wrapped line should start with dim
+ // wrap_ansi should restore the dim state at the start of each wrapped line
+ let dim_code = "\x1b[2m";
+
+ for (i, line) in result.iter().enumerate() {
+ // Every line should start with dim code
+ // Line 0: starts with our initial dim
+ // Line 1+: wrap_ansi should prepend dim to maintain state
+ assert!(
+ line.starts_with(dim_code),
+ "Line {} should START with dim code, but got: {:?}",
+ i + 1,
+ &line[..line.len().min(30)]
+ );
+ }
+ }
+
+ #[test]
+ fn test_format_bash_with_gutter_template_command() {
+ // Test that format_bash_with_gutter produces consistent dim styling
+ // for a realistic command with Jinja-style template variables.
+ // This is a regression test for wrap-point discontinuity.
+
+ let command = "cp -cR {{ repo_root }}/target/debug/.fingerprint {{ repo_root }}/target/debug/build {{ worktree }}/target/debug/";
+
+ // Get the result (will use actual terminal width, but we can still check structure)
+ let result = format_bash_with_gutter(command, "");
+
+ // Snapshot the raw output to verify ANSI codes are consistent
+ insta::assert_snapshot!(result);
+ }
+
+ #[test]
+ fn test_format_bash_multiline_command_consistent_styling() {
+ // This test simulates the REAL user scenario: a multi-line command
+ // where each line is processed separately by tree-sitter.
+ //
+ // The user's actual command:
+ // ```
+ // [ -d {{ repo_root }}/target/debug/deps ] && [ ! -e {{ worktree }}/target ] &&
+ // mkdir -p {{ worktree }}/target/debug/deps &&
+ // cp -c {{ repo_root }}/target/debug/deps/*.rlib ... {{ worktree
+ // }}/target/debug/deps/ &&
+ // ```
+ //
+ // Note: line 3 ends with `{{ worktree` and line 4 starts with `}}`
+ // These should have IDENTICAL styling since both are unhighlighted text.
+
+ let multiline_command = r#"[ -d {{ repo_root }}/target/debug/deps ] && [ ! -e {{ worktree }}/target ] &&
+mkdir -p {{ worktree }}/target/debug/deps &&
+cp -c {{ repo_root }}/target/debug/deps/*.rlib {{ repo_root }}/target/debug/deps/*.rmeta {{ worktree
+}}/target/debug/deps/ &&
+cp -cR {{ repo_root }}/target/debug/.fingerprint {{ repo_root }}/target/debug/build {{ worktree
+}}/target/debug/"#;
+
+ let result = format_bash_with_gutter(multiline_command, "");
+
+ // Snapshot the output - each line should have consistent dim styling
+ insta::assert_snapshot!(result);
+ }
+
+ #[test]
+ fn test_unhighlighted_text_has_consistent_dim_across_lines() {
+ // Verify that unhighlighted text (like template variables) has consistent
+ // styling whether it appears at the end of one line or start of another.
+ //
+ // The template text `{{ worktree` and `}}` should have identical ANSI codes.
+
+ let multiline = "echo {{ worktree\n}}/path";
+ let result = format_bash_with_gutter(multiline, "");
+
+ let lines: Vec<&str> = result.lines().collect();
+ assert_eq!(lines.len(), 2, "Should have 2 lines");
+
+ // Extract the styling for unhighlighted text on each line
+ // Line 1 ends with `{{ worktree` - find what style it's under
+ // Line 2 starts with `}}` - find what style it's under
+
+ let dim_code = "\x1b[2m";
+
+ // Both lines should contain dim code for the unhighlighted text
+ // Line 1: after "echo" (highlighted), the `{{ worktree` should be dimmed
+ // Line 2: the `}}` at the start should be dimmed
+
+ // Check that line 2 starts with dim after the gutter
+ // Gutter pattern: [107m [0m (then content)
+ // The search string "\x1b[0m " is 6 characters, so content starts at index + 6
+ let line2 = lines[1];
+ let content_start = line2.find("\x1b[0m ").map(|i| i + 6);
+ if let Some(start) = content_start {
+ let content = &line2[start..];
+ assert!(
+ content.starts_with(dim_code),
+ "Line 2 content should start with dim for `}}`, got: {:?}",
+ &content[..content.len().min(20)]
+ );
+ }
+
+ // Snapshot for visual verification
+ insta::assert_snapshot!(result);
+ }
+
+ #[test]
+ fn test_syntax_highlighting_produces_multiple_colors() {
+ // Verify that bash syntax highlighting produces different colors for different
+ // token types, not just a single dim color for everything.
+ //
+ // This catches regressions where all text becomes the same color.
+
+ let command = "echo 'hello' | grep hello > output.txt && cat output.txt";
+ let result = format_bash_with_gutter(command, "");
+
+ // Check for presence of different ANSI color codes:
+ // - Blue (34m) for commands like echo, grep, cat
+ // - Green (32m) for strings like 'hello'
+ // - Cyan (36m) for operators like |, >
+ let has_blue = result.contains("\x1b[34m");
+ let has_green = result.contains("\x1b[32m");
+ let has_cyan = result.contains("\x1b[36m");
+
+ assert!(
+ has_blue,
+ "Output should contain blue (34m) for commands, got: {:?}",
+ result
+ );
+ assert!(
+ has_green,
+ "Output should contain green (32m) for strings, got: {:?}",
+ result
+ );
+ assert!(
+ has_cyan,
+ "Output should contain cyan (36m) for operators, got: {:?}",
+ result
+ );
+
+ // Also verify dim is present (base styling)
+ assert!(
+ result.contains("\x1b[2m"),
+ "Output should contain dim (2m) for base styling"
+ );
+
+ // Snapshot for visual verification
+ insta::assert_snapshot!(result);
+ }
+
+ #[test]
+ fn test_no_color_discontinuity_in_template_variables() {
+ // Regression test: wrap_ansi injects [39m (reset foreground color) at line ends
+ // when it thinks a color is "open". This creates visual discontinuity where
+ // template variables like `{{ worktree` on line N and `}}` on line N+1 have
+ // different styling even though both should just be dim.
+ //
+ // We never emit [39m ourselves - all our resets use [0m (full reset).
+ // So any [39m in the output is an artifact from wrap_ansi that we must strip.
+ //
+ // This is the actual post-start command from user config that exposed the bug.
+ let command = r#"[ -d {{ repo_root }}/target/debug/deps ] && [ ! -e {{ worktree }}/target ] &&
+mkdir -p {{ worktree }}/target/debug/deps &&
+cp -c {{ repo_root }}/target/debug/deps/*.rlib {{ repo_root }}/target/debug/deps/*.rmeta {{ worktree
+}}/target/debug/deps/ &&
+cp -cR {{ repo_root }}/target/debug/.fingerprint {{ repo_root }}/target/debug/build {{ worktree
+}}/target/debug/"#;
+
+ let result = format_bash_with_gutter(command, "");
+
+ // The critical assertion: NO [39m codes should appear anywhere in the output.
+ // [39m is "reset foreground to default" - we never emit this, only [0m (full reset).
+ assert!(
+ !result.contains("\x1b[39m"),
+ "Output should NOT contain [39m (foreground reset) - this indicates wrap_ansi discontinuity.\n\
+ Found [39m in output:\n{}",
+ result
+ .lines()
+ .filter(|line| line.contains("\x1b[39m"))
+ .collect::<Vec<_>>()
+ .join("\n")
+ );
+
+ // Similarly, [49m (reset background) shouldn't appear - we use [0m for all resets.
+ assert!(
+ !result.contains("\x1b[49m"),
+ "Output should NOT contain [49m (background reset)"
+ );
+
+ // Verify we DO have the expected codes:
+ // - [2m for dim (base styling)
+ // - [0m for reset
+ // - Various color codes (34m blue, 36m cyan) for syntax highlighting
+ assert!(
+ result.contains("\x1b[2m"),
+ "Output should contain [2m (dim)"
+ );
+ assert!(
+ result.contains("\x1b[0m"),
+ "Output should contain [0m (reset)"
+ );
+ }
+
+ #[test]
+ fn test_no_bold_dim_conflict() {
+ // Regression test: We must never mix bold (SGR 1) and dim (SGR 2) in the same
+ // sequence because they are mutually exclusive in some terminals like Alacritty.
+ //
+ // The problematic pattern was [2m][1m][2m][34m] where dim, then bold, then dim
+ // again would cause the final dim to not render correctly.
+ //
+ // The fix: token styles use dim+color only (no bold). This test ensures we
+ // don't regress by checking that [2m][1m][2m] never appears.
+ let command = "cp -cR path/to/source path/to/dest";
+ let result = format_bash_with_gutter(command, "");
+
+ // The problematic pattern is [2m] followed by [1m] followed by [2m]
+ // This happens when: line starts with dim, style adds bold+dim
+ assert!(
+ !result.contains("\x1b[2m\x1b[1m\x1b[2m"),
+ "Output should NOT contain [2m][1m][2m] - this indicates redundant dim in token styles.\n\
+ Token styles should not include .dimmed() since the line already starts dim.\n\
+ Found pattern in output:\n{:?}",
+ result
+ );
+ }
+
+ #[test]
+ fn test_all_tokens_are_dimmed() {
+ // Regression test: All highlighted tokens should be dimmed to match the base text.
+ // We don't use bold because bold (SGR 1) and dim (SGR 2) are mutually exclusive
+ // in some terminals like Alacritty.
+ //
+ // Token styles should emit [2m] (dim) along with their color.
+ let command = "cp -cR path/to/source path/to/dest";
+ let result = format_bash_with_gutter(command, "");
+
+ // Verify commands are dim+blue: [0m][2m][34m] (reset, dim, blue)
+ assert!(
+ result.contains("\x1b[0m\x1b[2m\x1b[34m"),
+ "Commands should be dim+blue [0m][2m][34m].\n\
+ Output:\n{:?}",
+ result
+ );
+
+ // Verify flags are dim+cyan: [0m][2m][36m] (reset, dim, cyan)
+ assert!(
+ result.contains("\x1b[0m\x1b[2m\x1b[36m"),
+ "Flags should be dim+cyan [0m][2m][36m].\n\
+ Output:\n{:?}",
+ result
+ );
+
+ // Verify NO bold codes appear (we removed bold to avoid bold/dim conflict)
+ assert!(
+ !result.contains("\x1b[1m"),
+ "Output should NOT contain [1m] (bold) - we use dim instead.\n\
+ Output:\n{:?}",
+ result
+ );
+ }
}
diff --git a/src/styling/snapshots/worktrunk__styling__tests__format_bash_multiline_command_consistent_styling.snap b/src/styling/snapshots/worktrunk__styling__tests__format_bash_multiline_command_consistent_styling.snap
new file mode 100644
index 000000000..acda99ac3
--- /dev/null
+++ b/src/styling/snapshots/worktrunk__styling__tests__format_bash_multiline_command_consistent_styling.snap
@@ -0,0 +1,12 @@
+---
+source: src/styling/mod.rs
+expression: result
+---
+  [ -d {{ repo_root }}/target/debug/deps ] && [ ! -e {{ worktree }}/target ] &&
+  mkdir -p {{ worktree }}/target/debug/deps &&
+  cp -c {{ repo_root }}/target/debug/deps/*.rlib {{ repo_root
+  }}/target/debug/deps/*.rmeta {{ worktree
+  }}/target/debug/deps/ &&
+  cp -cR {{ repo_root }}/target/debug/.fingerprint {{ repo_root
+  }}/target/debug/build {{ worktree
+  }}/target/debug/
diff --git a/src/styling/snapshots/worktrunk__styling__tests__format_bash_with_gutter_template_command.snap b/src/styling/snapshots/worktrunk__styling__tests__format_bash_with_gutter_template_command.snap
new file mode 100644
index 000000000..5816ee70c
--- /dev/null
+++ b/src/styling/snapshots/worktrunk__styling__tests__format_bash_with_gutter_template_command.snap
@@ -0,0 +1,6 @@
+---
+source: src/styling/mod.rs
+expression: result
+---
+  cp -cR {{ repo_root }}/target/debug/.fingerprint {{ repo_root
+  }}/target/debug/build {{ worktree }}/target/debug/
diff --git a/src/styling/snapshots/worktrunk__styling__tests__syntax_highlighting_produces_multiple_colors.snap b/src/styling/snapshots/worktrunk__styling__tests__syntax_highlighting_produces_multiple_colors.snap
new file mode 100644
index 000000000..038721474
--- /dev/null
+++ b/src/styling/snapshots/worktrunk__styling__tests__syntax_highlighting_produces_multiple_colors.snap
@@ -0,0 +1,5 @@
+---
+source: src/styling/mod.rs
+expression: result
+---
+  echo 'hello' | grep hello > output.txt && cat output.txt
diff --git a/src/styling/snapshots/worktrunk__styling__tests__unhighlighted_text_has_consistent_dim_across_lines.snap b/src/styling/snapshots/worktrunk__styling__tests__unhighlighted_text_has_consistent_dim_across_lines.snap
new file mode 100644
index 000000000..de60d6382
--- /dev/null
+++ b/src/styling/snapshots/worktrunk__styling__tests__unhighlighted_text_has_consistent_dim_across_lines.snap
@@ -0,0 +1,6 @@
+---
+source: src/styling/mod.rs
+expression: result
+---
+  echo {{ worktree
+  }}/path
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 ee03e6a5c..d869bf027 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
πŸ’‘ Run `wt config shell install` to enable automatic cd
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 e2059efae..e117d8824 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 8b1dab08a..fba81762d 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
πŸ’‘ Run `wt config shell install` to enable automatic cd
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 10eabf0af..cc4713c3a 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 5eb57d93c..d37d7acea 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
πŸ’‘ Run `wt config shell install` to enable automatic cd
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 7a61ea5b7..31772fa88 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
πŸ’‘ Run `wt config shell install` to enable automatic cd
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 51ee5a3cf..9fa36dd86 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
πŸ’‘ Run `wt config shell install` to enable automatic cd
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..fd30ebee1 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..545b58b57 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 cbeb76349..6e385ff83 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 cbeb76349..6e385ff83 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..dbabeec0c 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..dbabeec0c 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 d9e682c3a..aa6617ce6 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] 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 d9e682c3a..aa6617ce6 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] 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 7255338ba..679b77d6a 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
@@ -3,10 +3,10 @@ source: tests/integration_tests/shell_wrapper.rs
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 fa4eb7311..9bce21bca 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
@@ -10,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
@@ -22,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..01bbb8e02 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..01bbb8e02 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..73e560eec 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..af1bb0a96 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..2de672e56 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 7292a29d1..3f12f5677 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
@@ -24,7 +24,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
πŸ’‘ Run `wt config shell install` to enable automatic cd
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 bed8e8a21..08f9abb75 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
@@ -31,4 +31,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 fa1327f0d..d98e359e9 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 c41c8c458..13f300b4a 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 2de2184f4..4d3dea13a 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 4f4c26f2b..7fc1cb81e 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 fa1327f0d..d98e359e9 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 37353a094..854102707 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
@@ -25,7 +25,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
πŸ’‘ Run `wt config shell install` to enable automatic cd
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 2014859ed..4b07a882e 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
@@ -25,7 +25,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
πŸ’‘ Run `wt config shell install` to enable automatic cd
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 70bdb076f..ca7adc446 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 a987a192f..7f9582817 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 9ec5f231b..6f2ffd2bb 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__add_approvals_all_none_approved.snap b/tests/snapshots/integration__integration_tests__approvals__add_approvals_all_none_approved.snap
index 7f6f80f8d..c3cd3ebad 100644
--- a/tests/snapshots/integration__integration_tests__approvals__add_approvals_all_none_approved.snap
+++ b/tests/snapshots/integration__integration_tests__approvals__add_approvals_all_none_approved.snap
@@ -32,4 +32,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 08f28b249..f59d781be 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
@@ -30,7 +30,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 46b91d2b7..0828b7534 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
@@ -30,9 +30,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 193d2a6ea..7ee0ed36e 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
@@ -30,7 +30,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 56b970428..28f4c169c 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
@@ -26,7 +26,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 e54212780..840aef8a8 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
@@ -26,7 +26,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 changes 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 096bbf9ec..cf3f5e087 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
@@ -24,7 +24,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 e14b0737f..51e2dd3e9 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
@@ -24,11 +24,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] 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 53a386dfd..e6f7b1f37 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
@@ -24,7 +24,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] 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 a303e7d09..0e40d5899 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
@@ -24,7 +24,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 6c6e6c897..a9d6f9d62 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
@@ -24,7 +24,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] 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 6a5a3588d..77633ab8e 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
@@ -37,9 +37,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] feat(auth): Implement JWT authentication system
  auth.rs | 8 ++++++++
@@ -49,7 +49,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 f70c57368..798dd6e00 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
@@ -26,11 +26,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
πŸ’‘ Run `wt config shell install` to enable automatic cd
πŸ”„ 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 e930b56f9..4b100fb77 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
@@ -32,9 +32,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] 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 68715edf7..6dd9f0957 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
@@ -25,11 +25,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
πŸ’‘ Run `wt config shell install` to enable automatic cd
πŸ”„ 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 150bae26c..4b7a414bf 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
@@ -28,8 +28,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 b0711c74f..68c19458a 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
@@ -25,7 +25,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
πŸ’‘ Run `wt config shell install` to enable automatic cd
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 eb0ed47ca..373de87c7 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
@@ -25,11 +25,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
πŸ’‘ Run `wt config shell install` to enable automatic cd
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 4a2f83166..a747877a5 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
@@ -25,9 +25,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
πŸ’‘ Run `wt config shell install` to enable automatic cd
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 cd0dce1d8..3077e2fc1 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
@@ -25,9 +25,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
πŸ’‘ Run `wt config shell install` to enable automatic cd
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 b1f290034..79b6fe125 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
@@ -25,7 +25,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
πŸ’‘ Run `wt config shell install` to enable automatic cd
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 299e311a5..3dfc7be0d 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
@@ -25,13 +25,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
πŸ’‘ Run `wt config shell install` to enable automatic cd
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 6355d7395..642d8abce 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
@@ -27,8 +27,8 @@ exit_code: 0
βœ… Created new worktree for feature from main at [REPO].feature
πŸ’‘ Run `wt config shell install` to enable automatic cd
πŸ”„ 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 24e9ab6ae..c035106cc 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
@@ -27,6 +27,6 @@ exit_code: 0
βœ… Created new worktree for feature from main at [REPO].feature
πŸ’‘ Run `wt config shell install` to enable automatic cd
πŸ”„ 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 08efb5edb..0832a5f83 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
@@ -27,6 +27,6 @@ exit_code: 0
βœ… Created new worktree for feature from main at [REPO].feature
πŸ’‘ Run `wt config shell install` to enable automatic cd
πŸ”„ 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 98e1f9b35..8329c3ee5 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
@@ -27,6 +27,6 @@ exit_code: 0
βœ… Created new worktree for feature from main at [REPO].feature
πŸ’‘ Run `wt config shell install` to enable automatic cd
πŸ”„ 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 7565b19a6..1589d8b07 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
@@ -27,8 +27,8 @@ exit_code: 0
βœ… Created new worktree for feature from main at [REPO].feature
πŸ’‘ Run `wt config shell install` to enable automatic cd
πŸ”„ 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 2fb5da61a..caf9382ca 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
@@ -27,8 +27,8 @@ exit_code: 0
βœ… Created new worktree for feature from main at [REPO].feature
πŸ’‘ Run `wt config shell install` to enable automatic cd
πŸ”„ 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 b2535a65e..9f07e3433 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
@@ -27,10 +27,10 @@ exit_code: 0
βœ… Created new worktree for feature from main at [REPO].feature
πŸ’‘ Run `wt config shell install` to enable automatic cd
πŸ”„ 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 a3aadfd75..f21dd84b9 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
@@ -27,6 +27,6 @@ exit_code: 0
βœ… Created new worktree for feature from main at [REPO].feature
πŸ’‘ Run `wt config shell install` to enable automatic cd
πŸ”„ 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 781427945..fd826da07 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
@@ -28,6 +28,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 70c432eb0..c71b2a2be 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap
@@ -27,6 +27,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 173833bfc..f61d03668 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap
@@ -28,6 +28,6 @@ exit_code: 1
----- stdout -----
βœ… Created new worktree for fail-test from main at [REPO].fail-test
πŸ”„ Executing (--execute):
-  exit 1
+  exit 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 af6b19033..bbac93bae 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap
@@ -28,9 +28,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 813207e7d..0c6d25aaa 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap
@@ -28,7 +28,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_execute_exit_code.snap b/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_exit_code.snap
index 8d6d736f4..e635f1572 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_exit_code.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_exit_code.snap
@@ -33,4 +33,4 @@ exit 42
----- stderr -----
βœ… Created new worktree for exit-code-test from main at [REPO].exit-code-test
πŸ”„ Executing (--execute):
-  exit 42
+  exit 42
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_output_then_exit.snap b/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_output_then_exit.snap
index ac6146715..2da7e7cb4 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_output_then_exit.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_output_then_exit.snap
@@ -34,5 +34,5 @@ exit 7
----- stderr -----
βœ… Created new worktree for output-exit-test from main at [REPO].output-exit-test
πŸ”„ Executing (--execute):
-  echo 'doing work'
-  exit 7
+  echo 'doing work'
+  exit 7
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 49124521b..68c559e2b 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snap
@@ -34,5 +34,5 @@ echo 'line2'
----- stderr -----
βœ… Created new worktree for exec-internal from main at [REPO].exec-internal
πŸ”„ Executing (--execute):
-  echo 'line1'
-  echo 'line2'
+  echo 'line1'
+  echo 'line2'