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.yamlindex 50b4ba7e5..d34a1d9ea 100644--- a/.pre-commit-config.yaml+++ b/.pre-commit-config.yaml@@ -56,7 +56,8 @@ repos:language: pygreptypes: ["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.rsindex 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 wrapspub(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 dimstyled_line.push_str(line);-- // Wrap and output with gutterfor 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 regionif 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 gutterfor 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.rsindex 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.rsindex 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.snapnew file mode 100644index 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+---+[107m [0m [2m[ -d {{ repo_root }}/target/debug/deps ] && [ ! -e {{ worktree }}/target ] [0m[2m[36m&&[0m[2m[0m[2m[0m+[107m [0m [2m[0m[2m[34mmkdir[0m[2m [0m[2m[36m-p[0m[2m {{ worktree }}/target/debug/deps [0m[2m[36m&&[0m[2m[0m[2m[0m+[107m [0m [2m[0m[2m[34mcp[0m[2m [0m[2m[36m-c[0m[2m {{ repo_root }}/target/debug/deps/*.rlib {{ repo_root[0m+[107m [0m [2m}}/target/debug/deps/*.rmeta {{ worktree[0m+[107m [0m [2m}}/target/debug/deps/[0m[2m [0m[2m[36m&&[0m[2m[0m[2m[0m+[107m [0m [2m[0m[2m[34mcp[0m[2m [0m[2m[36m-cR[0m[2m {{ repo_root }}/target/debug/.fingerprint {{ repo_root[0m+[107m [0m [2m}}/target/debug/build {{ worktree[0m+[107m [0m [2m}}/target/debug/[0m[2m[0mdiff --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.snapnew file mode 100644index 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+---+[107m [0m [2m[0m[2m[34mcp[0m[2m [0m[2m[36m-cR[0m[2m {{ repo_root }}/target/debug/.fingerprint {{ repo_root[0m+[107m [0m [2m}}/target/debug/build {{ worktree }}/target/debug/[0mdiff --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.snapnew file mode 100644index 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+---+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'hello'[0m[2m [0m[2m[36m|[0m[2m [0m[2m[34mgrep[0m[2m hello [0m[2m[36m>[0m[2m output.txt [0m[2m[36m&&[0m[2m [0m[2m[34mcat[0m[2m output.txt[0mdiff --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.snapnew file mode 100644index 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+---+[107m [0m [2m[0m[2m[34mecho[0m[2m {{ worktree[0m+[107m [0m [2m}}/path[0m[2m[0mdiff --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.snapindex 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π‘ [33m[1m[33mtest-repo[0m[33m needs approval to execute [1m[33m1[0m[33m command:[0mβͺ post-create:-[107m [0m [1m[34mecho[0m [32m'test command'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test command'[0m[2m[0mπ‘ Allow and remember? [1m[y/N][0mπ [36mRunning post-create:[0m-[107m [0m [1m[34mecho[0m [32m'test command'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test command'[0m[2m[0m[0mtest commandβ [32mCreated new worktree for [1m[32mtest-approve[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO]/test-repo.test-approve[0m[0mπ‘ [2m[2mRun `wt config shell install` to enable automatic cd[0m[0mdiff --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.snapindex 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π‘ [33m[1m[33mtest-repo[0m[33m needs approval to execute [1m[33m1[0m[33m command:[0mβͺ post-create:-[107m [0m [1m[34mecho[0m [32m'test command'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test command'[0m[2m[0mπ‘ Allow and remember? [1m[y/N][0mβͺ Commands declined, continuing worktree creationdiff --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.snapindex 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π‘ [33m[1m[33mtest-repo[0m[33m needs approval to execute [1m[33m2[0m[33m commands:[0mβͺ post-create:-[107m [0m [1m[34mecho[0m [32m'First command'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'First command'[0m[2m[0mβͺ post-create:-[107m [0m [1m[34mecho[0m [32m'Third command'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Third command'[0m[2m[0mπ‘ Allow and remember? [1m[y/N][0mπ [36mRunning post-create:[0m-[107m [0m [1m[34mecho[0m [32m'First command'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'First command'[0m[2m[0m[0mFirst commandπ [36mRunning post-create:[0m-[107m [0m [1m[34mecho[0m [32m'Second command'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Second command'[0m[2m[0m[0mSecond commandπ [36mRunning post-create:[0m-[107m [0m [1m[34mecho[0m [32m'Third command'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Third command'[0m[2m[0m[0mThird commandβ [32mCreated new worktree for [1m[32mtest-mixed-accept[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO]/test-repo.test-mixed-accept[0m[0mπ‘ [2m[2mRun `wt config shell install` to enable automatic cd[0m[0mdiff --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.snapindex 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π‘ [33m[1m[33mtest-repo[0m[33m needs approval to execute [1m[33m2[0m[33m commands:[0mβͺ post-create:-[107m [0m [1m[34mecho[0m [32m'First command'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'First command'[0m[2m[0mβͺ post-create:-[107m [0m [1m[34mecho[0m [32m'Third command'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Third command'[0m[2m[0mπ‘ Allow and remember? [1m[y/N][0mβͺ Commands declined, continuing worktree creationdiff --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.snapindex 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π‘ [33m[1m[33mtest-repo[0m[33m needs approval to execute [1m[33m3[0m[33m commands:[0mβͺ post-create:-[107m [0m [1m[34mecho[0m [32m'First command'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'First command'[0m[2m[0mβͺ post-create:-[107m [0m [1m[34mecho[0m [32m'Second command'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Second command'[0m[2m[0mβͺ post-create:-[107m [0m [1m[34mecho[0m [32m'Third command'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Third command'[0m[2m[0mπ‘ Allow and remember? [1m[y/N][0mπ [36mRunning post-create:[0m-[107m [0m [1m[34mecho[0m [32m'First command'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'First command'[0m[2m[0m[0mFirst commandπ [36mRunning post-create:[0m-[107m [0m [1m[34mecho[0m [32m'Second command'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Second command'[0m[2m[0m[0mSecond commandπ [36mRunning post-create:[0m-[107m [0m [1m[34mecho[0m [32m'Third command'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Third command'[0m[2m[0m[0mThird commandβ [32mCreated new worktree for [1m[32mtest-multi[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO]/test-repo.test-multi[0m[0mπ‘ [2m[2mRun `wt config shell install` to enable automatic cd[0m[0mdiff --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.snapindex 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π‘ [33m[1m[33mtest-repo[0m[33m needs approval to execute [1m[33m3[0m[33m commands:[0mβͺ post-create [1minstall[0m:-[107m [0m [1m[34mecho[0m [32m'Installing dependencies...'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Installing dependencies...'[0m[2m[0mβͺ post-create [1mbuild[0m:-[107m [0m [1m[34mecho[0m [32m'Building project...'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Building project...'[0m[2m[0mβͺ post-create [1mtest[0m:-[107m [0m [1m[34mecho[0m [32m'Running tests...'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Running tests...'[0m[2m[0mπ‘ Allow and remember? [1m[y/N][0mπ [36mRunning post-create [1minstall[0m:[0m-[107m [0m [1m[34mecho[0m [32m'Installing dependencies...'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Installing dependencies...'[0m[2m[0m[0mInstalling dependencies...π [36mRunning post-create [1mbuild[0m:[0m-[107m [0m [1m[34mecho[0m [32m'Building project...'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Building project...'[0m[2m[0m[0mBuilding project...π [36mRunning post-create [1mtest[0m:[0m-[107m [0m [1m[34mecho[0m [32m'Running tests...'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Running tests...'[0m[2m[0m[0mRunning tests...β [32mCreated new worktree for [1m[32mtest-named[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO]/test-repo.test-named[0m[0mπ‘ [2m[2mRun `wt config shell install` to enable automatic cd[0m[0mdiff --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.snapindex 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π‘ [33m[1m[33mtest-repo[0m[33m needs approval to execute [1m[33m1[0m[33m command:[0mβͺ post-create:-[107m [0m [1m[34mecho[0m [32m'test command'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test command'[0m[2m[0mπ‘ Allow and remember? [1m[y/N][0mπ‘ Failed to save command approval: Failed to write config file: Permission denied (os error 13)π‘ [2mYou will be prompted again next time.[0mπ [36mRunning post-create:[0m-[107m [0m [1m[34mecho[0m [32m'test command'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test command'[0m[2m[0m[0mtest commandβ [32mCreated new worktree for [1m[32mtest-permission[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO]/test-repo.test-permission[0m[0mπ‘ [2m[2mRun `wt config shell install` to enable automatic cd[0m[0mdiff --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.snapindex 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()---β [32mCreated new worktree for [1m[32mfish-multiline[0m[32m from [1m[32mmain[0m[32m at [1m[32m[TMPDIR]/test-repo.fish-multiline[0m[0mπ [36mExecuting (--execute):[0m-[107m [0m [1m[34mecho[0m [32m'line 1'[0m; [1m[34mecho[0m [32m'line 2'[0m; [1m[34mecho[0m [32m'line 3'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'line 1'[0m[2m; [0m[2m[34mecho[0m[2m [0m[2m[32m'line 2'[0m[2m; [0m[2m[34mecho[0m[2m [0m[2m[32m'line 3'[0m[2m[0mline 1line 2line 3diff --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.snapindex 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()---β [32mCreated new worktree for [1m[32mfish-bg[0m[32m from [1m[32mmain[0m[32m at [1m[32m[TMPDIR]/test-repo.fish-bg[0m[0mπ [36mRunning post-start:[0m-[107m [0m [1m[34mecho[0m [32m'fish background task'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'fish background task'[0m[2m[0mdiff --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.snapindex 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.rsexpression: output.normalized()---π [36mRunning pre-merge [1mcheck1[0m:[0m-[107m [0m [1m[34m[WORKSPACE]/tests/fixtures/mixed-output.sh[0m check1 3[0m+[107m [0m [2m[0m[2m[34m[WORKSPACE]/tests/fixtures/mixed-output.sh[0m[2m check1 3[0m[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π [36mRunning pre-merge [1mcheck2[0m:[0m-[107m [0m [1m[34m[WORKSPACE]/tests/fixtures/mixed-output.sh[0m check2 3[0m+[107m [0m [2m[0m[2m[34m[WORKSPACE]/tests/fixtures/mixed-output.sh[0m[2m check2 3[0m[check2] stdout line 1[check2] stderr line 1[check2] stdout line 2diff --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.snapindex 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.rsexpression: output.normalized()---π [36mRunning pre-merge [1mcheck1[0m:[0m-[107m [0m [1m[34m[WORKSPACE]/tests/fixtures/mixed-output.sh[0m check1 3[0m+[107m [0m [2m[0m[2m[34m[WORKSPACE]/tests/fixtures/mixed-output.sh[0m[2m check1 3[0m[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π [36mRunning pre-merge [1mcheck2[0m:[0m-[107m [0m [1m[34m[WORKSPACE]/tests/fixtures/mixed-output.sh[0m check2 3[0m+[107m [0m [2m[0m[2m[34m[WORKSPACE]/tests/fixtures/mixed-output.sh[0m[2m check2 3[0m[check2] stdout line 1[check2] stderr line 1[check2] stdout line 2diff --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.snapindex 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.rsexpression: output.normalized()---π [36mRunning pre-merge [1mformat[0m:[0m-[107m [0m [1m[34mecho[0m [32m'β Code formatting check passed'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'β Code formatting check passed'[0m[2m[0mβ Code formatting check passedπ [36mRunning pre-merge [1mtest[0m:[0m-[107m [0m [1m[34mecho[0m [32m'β Test suite failed: 3 tests failing'[0m [36m&&[0m [1m[34mexit[0m 1[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'β Test suite failed: 3 tests failing'[0m[2m [0m[2m[36m&&[0m[2m [0m[2m[34mexit[0m[2m 1[0mβ Test suite failed: 3 tests failingβ [31mpre-merge command failed: [1m[31mtest[0m[31m: exit status: 1[0mdiff --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.snapindex 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.rsexpression: output.normalized()---π [36mRunning pre-merge [1mformat[0m:[0m-[107m [0m [1m[34mecho[0m [32m'β Code formatting check passed'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'β Code formatting check passed'[0m[2m[0mβ Code formatting check passedπ [36mRunning pre-merge [1mtest[0m:[0m-[107m [0m [1m[34mecho[0m [32m'β Test suite failed: 3 tests failing'[0m [36m&&[0m [1m[34mexit[0m 1[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'β Test suite failed: 3 tests failing'[0m[2m [0m[2m[36m&&[0m[2m [0m[2m[34mexit[0m[2m 1[0mβ Test suite failed: 3 tests failingβ [31mpre-merge command failed: [1m[31mtest[0m[31m: exit status: 1[0mdiff --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.snapindex 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.rsexpression: output.normalized()---π [36mRunning pre-merge [1mformat[0m:[0m-[107m [0m [1m[34mecho[0m [32m'β Code formatting check passed'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'β Code formatting check passed'[0m[2m[0mβ Code formatting check passedπ [36mRunning pre-merge [1mlint[0m:[0m-[107m [0m [1m[34mecho[0m [32m'β Linting passed - no warnings'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'β Linting passed - no warnings'[0m[2m[0mβ Linting passed - no warningsπ [36mRunning pre-merge [1mtest[0m:[0m-[107m [0m [1m[34mecho[0m [32m'β All 47 tests passed in 2.3s'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'β All 47 tests passed in 2.3s'[0m[2m[0mβ All 47 tests passed in 2.3sπ [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m[HASH][0m[0m (no commit/squash/rebase needed)[107m [0m * [33m[HASH][m Add featurediff --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.snapindex 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.rsexpression: output.normalized()---π [36mRunning pre-merge [1mformat[0m:[0m-[107m [0m [1m[34mecho[0m [32m'β Code formatting check passed'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'β Code formatting check passed'[0m[2m[0mβ Code formatting check passedπ [36mRunning pre-merge [1mlint[0m:[0m-[107m [0m [1m[34mecho[0m [32m'β Linting passed - no warnings'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'β Linting passed - no warnings'[0m[2m[0mβ Linting passed - no warningsπ [36mRunning pre-merge [1mtest[0m:[0m-[107m [0m [1m[34mecho[0m [32m'β All 47 tests passed in 2.3s'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'β All 47 tests passed in 2.3s'[0m[2m[0mβ All 47 tests passed in 2.3sπ [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m[HASH][0m[0m (no commit/squash/rebase needed)[107m [0m * [33m[HASH][m Add featurediff --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.snapindex 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.rsexpression: output.normalized()---π [36mRunning post-create [1minstall[0m:[0m-[107m [0m [1m[34muv[0m sync[0m+[107m [0m [2m[0m[2m[34muv[0m[2m sync[0mResolved 24 packages in 145msInstalled 24 packages in 1.2sβ [32mCreated new worktree for [1m[32mfeature-x[0m[32m from [1m[32mmain[0m[32m at [1m[32m[TMPDIR]/test-repo.feature-x[0m[0mπ [36mRunning post-start [1mdev[0m:[0m-[107m [0m [1m[34muv[0m run dev[0m+[107m [0m [2m[0m[2m[34muv[0m[2m run dev[0mdiff --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.snapindex 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()[107m [0m Includes comprehensive test coverage and input validation.β [32mSquashed @ [2m[32m[HASH][0m[0mπ [36mRunning pre-merge [1mtest[0m:[0m-[107m [0m [1m[34muv[0m run pytest[0m+[107m [0m [2m[0m[2m[34muv[0m[2m run pytest[0m============================= test session starts ==============================collected 3 items@@ -22,7 +22,7 @@ tests/test_auth.py::test_token_validation PASSED [100%]============================== 3 passed in 0.8s ===============================π [36mRunning pre-merge [1mlint[0m:[0m-[107m [0m [1m[34muv[0m run ruff check[0m+[107m [0m [2m[0m[2m[34muv[0m[2m run ruff check[0mAll 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.snapindex 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()---β [32mCreated new worktree for [1m[32mtest-exec[0m[32m from [1m[32mmain[0m[32m at [1m[32m[TMPDIR]/test-repo.test-exec[0m[0mπ [36mExecuting (--execute):[0m-[107m [0m [1m[34mecho[0m executed[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m executed[0mexecuteddiff --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.snapindex 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()---β [32mCreated new worktree for [1m[32mtest-exec[0m[32m from [1m[32mmain[0m[32m at [1m[32m[TMPDIR]/test-repo.test-exec[0m[0mπ [36mExecuting (--execute):[0m-[107m [0m [1m[34mecho[0m executed[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m executed[0mexecuteddiff --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.snapindex 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.rsexpression: output.normalized()---π [36mRunning post-create:[0m-[107m [0m [1m[34mecho[0m [32m'Installing dependencies...'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Installing dependencies...'[0m[2m[0mInstalling dependencies...π [36mRunning post-create:[0m-[107m [0m [1m[34mecho[0m [32m'Building project...'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Building project...'[0m[2m[0mBuilding project...β [32mCreated new worktree for [1m[32mfeature-hooks[0m[32m from [1m[32mmain[0m[32m at [1m[32m[TMPDIR]/test-repo.feature-hooks[0m[0mπ [36mRunning post-start [1mserver[0m:[0m-[107m [0m [1m[34mecho[0m [32m'Starting dev server on port 3000'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Starting dev server on port 3000'[0m[2m[0mπ [36mRunning post-start [1mwatch[0m:[0m-[107m [0m [1m[34mecho[0m [32m'Watching for file changes'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Watching for file changes'[0m[2m[0mdiff --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.snapindex 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()---β [32mCreated new worktree for [1m[32mfeature-with-hooks[0m[32m from [1m[32mmain[0m[32m at [1m[32m[TMPDIR]/test-repo.feature-with-hooks[0m[0mπ [36mRunning post-start:[0m-[107m [0m [1m[34mecho[0m [32m'test command executed'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test command executed'[0m[2m[0mdiff --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.snapindex 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()---β [32mCreated new worktree for [1m[32mfeature-bg[0m[32m from [1m[32mmain[0m[32m at [1m[32m[TMPDIR]/test-repo.feature-bg[0m[0mπ [36mRunning post-start:[0m-[107m [0m [1m[34mecho[0m [32m'background task'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'background task'[0m[2m[0mdiff --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.snapindex 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: trueexit_code: 0----- stdout -----π [36mRunning post-create:[0m-[107m [0m [1m[34mecho[0m [32m'approved'[0m [36m>[0m output.txt[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'approved'[0m[2m [0m[2m[36m>[0m[2m output.txt[0mβ [32mCreated new worktree for [1m[32mtest-approved[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].test-approved[0m[0mπ‘ [2m[2mRun `wt config shell install` to enable automatic cd[0m[0mdiff --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.snapindex 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π‘ [33m[1m[33mtest-repo[0m[33m needs approval to execute [1m[33m1[0m[33m command:[0mβͺ post-create:-[107m [0m [1m[34mecho[0m [32m'test command'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test command'[0m[2m[0mdiff --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.snapindex 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π‘ [33m[1m[33mtest-repo[0m[33m needs approval to execute [1m[33m2[0m[33m commands:[0mβͺ post-create:-[107m [0m [1m[34mecho[0m [32m'First command'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'First command'[0m[2m[0mβͺ post-create:-[107m [0m [1m[34mecho[0m [32m'Third command'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Third command'[0m[2m[0mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_multiple_commands.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_multiple_commands.snapindex 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π‘ [33m[1m[33mtest-repo[0m[33m needs approval to execute [1m[33m4[0m[33m commands:[0mβͺ post-create:-[107m [0m [1m[34mecho[0m [32m'Branch: test-nested-branch'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Branch: test-nested-branch'[0m[2m[0mβͺ post-create:-[107m [0m [1m[34mecho[0m [32m'Worktree: [REPO].test-nested-branch'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Worktree: [REPO].test-nested-branch'[0m[2m[0mβͺ post-create:-[107m [0m [1m[34mecho[0m [32m'Repo: test-repo'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Repo: test-repo'[0m[2m[0mβͺ post-create:-[107m [0m [1m[34mcd[0m [REPO].test-nested-branch [36m&&[0m [1m[34mpwd[0m[0m+[107m [0m [2m[0m[2m[34mcd[0m[2m [REPO].test-nested-branch [0m[2m[36m&&[0m[2m [0m[2m[34mpwd[0m[2m[0mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_named_commands.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_named_commands.snapindex 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π‘ [33m[1m[33mtest-repo[0m[33m needs approval to execute [1m[33m3[0m[33m commands:[0mβͺ post-create [1minstall[0m:-[107m [0m [1m[34mecho[0m [32m'Installing dependencies...'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Installing dependencies...'[0m[2m[0mβͺ post-create [1mbuild[0m:-[107m [0m [1m[34mecho[0m [32m'Building project...'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Building project...'[0m[2m[0mβͺ post-create [1mtest[0m:-[107m [0m [1m[34mecho[0m [32m'Running tests...'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Running tests...'[0m[2m[0mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_single_command.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_single_command.snapindex 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π‘ [33m[1m[33mtest-repo[0m[33m needs approval to execute [1m[33m1[0m[33m command:[0mβͺ post-create:-[107m [0m [1m[34mecho[0m [32m'Worktree path: [REPO].feature-test-approval'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Worktree path: [REPO].feature-test-approval'[0m[2m[0mdiff --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.snapindex 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π‘ [33m[1m[33mtest-repo[0m[33m needs approval to execute [1m[33m2[0m[33m commands:[0mβͺ post-create:-[107m [0m [1m[34mecho[0m [32m'First command'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'First command'[0m[2m[0mβͺ post-create:-[107m [0m [1m[34mecho[0m [32m'Third command'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Third command'[0m[2m[0mdiff --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.snapindex 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: trueexit_code: 0----- stdout -----π [36mRunning post-create:[0m-[107m [0m [1m[34mecho[0m [32m'test command'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test command'[0m[2m[0mβ [32mCreated new worktree for [1m[32mtest-force-tty[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].test-force-tty[0m[0mπ‘ [2m[2mRun `wt config shell install` to enable automatic cd[0m[0mdiff --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.snapindex 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: trueexit_code: 0----- stdout -----π [36mRunning post-create:[0m-[107m [0m [1m[34mecho[0m [32m'test command'[0m [36m>[0m output.txt[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test command'[0m[2m [0m[2m[36m>[0m[2m output.txt[0mβ [32mCreated new worktree for [1m[32mtest-force[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].test-force[0m[0mπ‘ [2m[2mRun `wt config shell install` to enable automatic cd[0m[0mdiff --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.snapindex 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π‘ [33m[1m[33mtest-repo[0m[33m needs approval to execute [1m[33m1[0m[33m command:[0mβͺ post-create:-[107m [0m [1m[34mecho[0m [32m'test command'[0m [36m>[0m output.txt[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test command'[0m[2m [0m[2m[36m>[0m[2m output.txt[0mdiff --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.snapindex 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π‘ [33m[1m[33mtest-repo[0m[33m needs approval to execute [1m[33m1[0m[33m command:[0mβͺ post-merge:-[107m [0m [1m[34mecho[0m [32m'Post-merge cleanup for main'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Post-merge cleanup for main'[0m[2m[0mdiff --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.snapindex 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π‘ [33m[1m[33mtest-repo[0m[33m needs approval to execute [1m[33m1[0m[33m command:[0mβͺ pre-merge:-[107m [0m [1m[34mecho[0m [32m'Running pre-merge checks on main'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Running pre-merge checks on main'[0m[2m[0mdiff --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.snapindex 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π‘ [33m[1m[33mtest-repo[0m[33m needs approval to execute [1m[33m1[0m[33m command:[0mβͺ post-create:-[107m [0m [1m[34mecho[0m [32m'test'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test'[0m[2m[0mdiff --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.snapindex 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β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)π [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0mπ [36mRunning post-merge:[0m-[107m [0m [1m[34mexit[0m 1[0m+[107m [0m [2m[0m[2m[34mexit[0m[2m 1[0mπ‘ [33mCommand failed: exit status: 1[0mβ [31mpost-merge command failed: exit status: 1[0mdiff --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.snapindex 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β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)π [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0mπ [36mRunning post-merge [1mnotify[0m:[0m-[107m [0m [1m[34mecho[0m [32m'Merge to main complete'[0m [36m>[0m notify.txt[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Merge to main complete'[0m[2m [0m[2m[36m>[0m[2m notify.txt[0mπ [36mRunning post-merge [1mdeploy[0m:[0m-[107m [0m [1m[34mecho[0m [32m'Deploying branch feature'[0m [36m>[0m deploy.txt[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Deploying branch feature'[0m[2m [0m[2m[36m>[0m[2m deploy.txt[0m----- stderr -----[0m[0mdiff --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.snapindex 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β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)π [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0mπ [36mRunning post-merge:[0m-[107m [0m [1m[34mecho[0m [32m'merged feature to main'[0m [36m>[0m post-merge-ran.txt[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'merged feature to main'[0m[2m [0m[2m[36m>[0m[2m post-merge-ran.txt[0m----- stderr -----[0mdiff --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.snapindex 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π‘ [33mAuto-staging 1 untracked file:[0m[107m [0m feature.txtπ [36mRunning pre-commit:[0m-[107m [0m [1m[34mexit[0m 1[0m+[107m [0m [2m[0m[2m[34mexit[0m[2m 1[0mβ [31mpre-commit command failed: exit status: 1[0mπ‘ [2mUse --no-verify to skip pre-commit commands[0mdiff --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.snapindex 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π‘ [33mAuto-staging 1 untracked file:[0m[107m [0m feature.txtπ [36mRunning pre-commit:[0m-[107m [0m [1m[34mecho[0m [32m'Pre-commit check passed'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Pre-commit check passed'[0m[2m[0mπ [36mCommitting changes with default message...[0m (1 file, [32m+1[0m, no squashing needed)π‘ [2m[2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[0m[107m [0m [1mChanges to feature.txt[0mdiff --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.snapindex 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: falseexit_code: 1----- stdout -----π [36mRunning pre-merge:[0m-[107m [0m [1m[34mexit[0m 1[0m+[107m [0m [2m[0m[2m[34mexit[0m[2m 1[0mβ [31mpre-merge command failed: exit status: 1[0mπ‘ [2mUse --no-verify to skip pre-merge commands[0mdiff --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.snapindex 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: trueexit_code: 0----- stdout -----π [36mRunning pre-merge [1mformat[0m:[0m-[107m [0m [1m[34mexit[0m 0[0m+[107m [0m [2m[0m[2m[34mexit[0m[2m 0[0mπ [36mRunning pre-merge [1mlint[0m:[0m-[107m [0m [1m[34mexit[0m 0[0m+[107m [0m [2m[0m[2m[34mexit[0m[2m 0[0mπ [36mRunning pre-merge [1mtest[0m:[0m-[107m [0m [1m[34mexit[0m 0[0m+[107m [0m [2m[0m[2m[34mexit[0m[2m 0[0mπ [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no commit/squash/rebase needed)[107m [0m * [SHA] Add feature file[107m [0m feature.txt | 1 [32m+[mdiff --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.snapindex 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: trueexit_code: 0----- stdout -----π [36mRunning pre-merge:[0m-[107m [0m [1m[34mexit[0m 0[0m+[107m [0m [2m[0m[2m[34mexit[0m[2m 0[0mπ [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no commit/squash/rebase needed)[107m [0m * [SHA] Add feature file[107m [0m feature.txt | 1 [32m+[mdiff --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.snapindex 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: falseexit_code: 1----- stdout -----π [36mRunning pre-commit:[0m-[107m [0m [1m[34mexit[0m 1[0m+[107m [0m [2m[0m[2m[34mexit[0m[2m 1[0mβ [31mpre-commit command failed: exit status: 1[0mπ‘ [2mUse --no-verify to skip pre-commit commands[0mdiff --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.snapindex 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: trueexit_code: 0----- stdout -----π [36mRunning pre-commit:[0m-[107m [0m [1m[34mecho[0m [32m'Pre-commit check passed'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Pre-commit check passed'[0m[2m[0mπ [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no commit/squash/rebase needed)[107m [0m * [SHA] Add feature file[107m [0m feature.txt | 1 [32m+[mdiff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snapindex 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[107m [0m - Create test suite covering all authentication flowsβ [32mSquashed @ [2m[SHA][0mπ [36mRunning pre-merge [1mtest[0m:[0m-[107m [0m [1m[34mcargo[0m test[0m+[107m [0m [2m[0m[2m[34mcargo[0m[2m test[0mπ [36mRunning pre-merge [1mlint[0m:[0m-[107m [0m [1m[34mcargo[0m clippy[0m+[107m [0m [2m[0m[2m[34mcargo[0m[2m clippy[0mπ [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no rebase needed)[107m [0m * [SHA] feat(auth): Implement JWT authentication system[107m [0m auth.rs | 8 [32m++++++++[m@@ -49,7 +49,7 @@ exit_code: 0β [32mMerged to [1m[32mmain[0m[0m (1 commit, 3 files, [32m+33[0m)π [36mRemoving [1m[36mfeature-auth[0m[36m worktree & branch in background[0mπ [36mRunning post-merge [1minstall[0m:[0m-[107m [0m [1m[34mcargo[0m install [36m--path[0m .[0m+[107m [0m [2m[0m[2m[34mcargo[0m[2m install [0m[2m[36m--path[0m[2m .[0m----- stderr -----[0m Finished test [unoptimized + debuginfo] target(s) in 0.12sdiff --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.snapindex 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: trueexit_code: 0----- stdout -----π [36mRunning post-create [1minstall[0m:[0m-[107m [0m [1m[34muv[0m sync[0m+[107m [0m [2m[0m[2m[34muv[0m[2m sync[0mβ [32mCreated new worktree for [1m[32mfeature-x[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature-x[0m[0mπ‘ [2m[2mRun `wt config shell install` to enable automatic cd[0m[0mπ [36mRunning post-start [1mdev[0m:[0m-[107m [0m [1m[34muv[0m run dev[0m+[107m [0m [2m[0m[2m[34muv[0m[2m run dev[0m----- stderr -----[0mdiff --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.snapindex 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[107m [0m Includes comprehensive test coverage and input validation.β [32mSquashed @ [2m[SHA][0mπ [36mRunning pre-merge [1mtest[0m:[0m-[107m [0m [1m[34muv[0m run pytest[0m+[107m [0m [2m[0m[2m[34muv[0m[2m run pytest[0mπ [36mRunning pre-merge [1mlint[0m:[0m-[107m [0m [1m[34muv[0m run ruff check[0m+[107m [0m [2m[0m[2m[34muv[0m[2m run ruff check[0mπ [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[SHA][0m (no rebase needed)[107m [0m * [SHA] feat(api): Add user authentication endpoints[107m [0m api/auth.py | 31 [32m+++++++++++++++++++++++++++++++[mdiff --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.snapindex 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: trueexit_code: 0----- stdout -----π [36mRunning post-create:[0m-[107m [0m [1m[34mecho[0m [32m'Setup done'[0m [36m>[0m setup.txt[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Setup done'[0m[2m [0m[2m[36m>[0m[2m setup.txt[0mβ [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0mπ‘ [2m[2mRun `wt config shell install` to enable automatic cd[0m[0mπ [36mRunning post-start [1mserver[0m:[0m-[107m [0m [1m[34msleep[0m 0.05 [36m&&[0m [1m[34mecho[0m [32m'Server running'[0m [36m>[0m server.txt[0m+[107m [0m [2m[0m[2m[34msleep[0m[2m 0.05 [0m[2m[36m&&[0m[2m [0m[2m[34mecho[0m[2m [0m[2m[32m'Server running'[0m[2m [0m[2m[36m>[0m[2m server.txt[0m----- stderr -----[0mdiff --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.snapindex 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 -----β [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0mπ [36mRunning post-start:[0m-[107m [0m [1m[34mecho[0m [32m'Background task'[0m [36m>[0m background.txt[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Background task'[0m[2m [0m[2m[36m>[0m[2m background.txt[0mπ [36mExecuting (--execute):[0m-[107m [0m [1m[34mecho[0m [32m'Execute flag'[0m [36m>[0m execute.txt[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Execute flag'[0m[2m [0m[2m[36m>[0m[2m execute.txt[0m----- 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.snapindex 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: trueexit_code: 0----- stdout -----π [36mRunning post-create:[0m-[107m [0m [1m[34mexit[0m 1[0m+[107m [0m [2m[0m[2m[34mexit[0m[2m 1[0mπ‘ [33mCommand failed: exit status: 1[0mβ [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0mπ‘ [2m[2mRun `wt config shell install` to enable automatic cd[0m[0mdiff --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.snapindex 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: trueexit_code: 0----- stdout -----π [36mRunning post-create:[0m-[107m [0m [1m[35mif[0m [ ! -f test.txt ]; [1m[35mthen[0m[1m[35m[0m[0m-[107m [0m [1m[34mecho[0m [32m'File does not exist'[0m [36m>[0m result.txt[0m-[107m [0m [1m[34melse[0m[0m-[107m [0m [1m[34mecho[0m [32m'File exists'[0m [36m>[0m result.txt[0m-[107m [0m [1m[34mfi[0m[0m+[107m [0m [2m[0m[2m[35mif[0m[2m [ ! -f test.txt ]; [0m[2m[35mthen[0m[2m[0m[2m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'File does not exist'[0m[2m [0m[2m[36m>[0m[2m result.txt[0m+[107m [0m [2m[0m[2m[34melse[0m[2m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'File exists'[0m[2m [0m[2m[36m>[0m[2m result.txt[0m+[107m [0m [2m[0m[2m[34mfi[0m[2m[0mβ [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0mπ‘ [2m[2mRun `wt config shell install` to enable automatic cd[0m[0mdiff --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.snapindex 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: trueexit_code: 0----- stdout -----π [36mRunning post-create:[0m-[107m [0m [1m[34mecho[0m [32m'First'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'First'[0m[2m[0mπ [36mRunning post-create:[0m-[107m [0m [1m[34mecho[0m [32m'Second'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Second'[0m[2m[0mβ [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0mπ‘ [2m[2mRun `wt config shell install` to enable automatic cd[0m[0mdiff --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.snapindex 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: trueexit_code: 0----- stdout -----π [36mRunning post-create [1minstall[0m:[0m-[107m [0m [1m[34mecho[0m [32m'Installing deps'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Installing deps'[0m[2m[0mπ [36mRunning post-create [1msetup[0m:[0m-[107m [0m [1m[34mecho[0m [32m'Running setup'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Running setup'[0m[2m[0mβ [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0mπ‘ [2m[2mRun `wt config shell install` to enable automatic cd[0m[0mdiff --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.snapindex 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: trueexit_code: 0----- stdout -----π [36mRunning post-create:[0m-[107m [0m [1m[34mecho[0m [32m'Setup complete'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Setup complete'[0m[2m[0mβ [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0mπ‘ [2m[2mRun `wt config shell install` to enable automatic cd[0m[0mdiff --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.snapindex 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: trueexit_code: 0----- stdout -----π [36mRunning post-create:[0m-[107m [0m [1m[34mecho[0m [32m'Repo: test-repo'[0m [36m>[0m info.txt[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Repo: test-repo'[0m[2m [0m[2m[36m>[0m[2m info.txt[0mπ [36mRunning post-create:[0m-[107m [0m [1m[34mecho[0m [32m'Branch: feature-test'[0m [36m>>[0m info.txt[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Branch: feature-test'[0m[2m [0m[2m[36m>>[0m[2m info.txt[0mπ [36mRunning post-create:[0m-[107m [0m [1m[34mecho[0m [32m'Worktree: [REPO].feature-test'[0m [36m>>[0m info.txt[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Worktree: [REPO].feature-test'[0m[2m [0m[2m[36m>>[0m[2m info.txt[0mπ [36mRunning post-create:[0m-[107m [0m [1m[34mecho[0m [32m'Root: [REPO]'[0m [36m>>[0m info.txt[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Root: [REPO]'[0m[2m [0m[2m[36m>>[0m[2m info.txt[0mβ [32mCreated new worktree for [1m[32mfeature/test[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature-test[0m[0mπ‘ [2m[2mRun `wt config shell install` to enable automatic cd[0m[0mdiff --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.snapindex 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β [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0mπ‘ [2m[2mRun `wt config shell install` to enable automatic cd[0m[0mπ [36mRunning post-start:[0m-[107m [0m [1m[34mecho[0m 'line1[0m-[107m [0m [1m[34mline2[0m[0m-[107m [0m [1m[34mline3[0m' | grep line2 > filtered.txt[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m 'line1[0m+[107m [0m [2m[0m[2m[34mline2[0m[2m[0m+[107m [0m [2m[0m[2m[34mline3[0m[2m' | grep line2 > filtered.txt[0m----- 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.snapindex 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β [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0mπ‘ [2m[2mRun `wt config shell install` to enable automatic cd[0m[0mπ [36mRunning post-start:[0m-[107m [0m [1m[34mecho[0m [32m'POST-START-RAN'[0m [36m>[0m post_start_marker.txt[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'POST-START-RAN'[0m[2m [0m[2m[36m>[0m[2m post_start_marker.txt[0m----- 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.snapindex 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β [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0mπ‘ [2m[2mRun `wt config shell install` to enable automatic cd[0m[0mπ [36mRunning post-start:[0m-[107m [0m [1m[34mecho[0m 'unclosed quote[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m 'unclosed quote[0m----- 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.snapindex 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β [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0mπ‘ [2m[2mRun `wt config shell install` to enable automatic cd[0m[0mπ [36mRunning post-start:[0m-[107m [0m [1m[34mecho[0m [32m'stdout output'[0m [36m&&[0m [1m[34mecho[0m [32m'stderr output'[0m >&2[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'stdout output'[0m[2m [0m[2m[36m&&[0m[2m [0m[2m[34mecho[0m[2m [0m[2m[32m'stderr output'[0m[2m >&2[0m----- 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.snapindex 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β [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0mπ‘ [2m[2mRun `wt config shell install` to enable automatic cd[0m[0mπ [36mRunning post-start:[0m-[107m [0m [1m[34mecho[0m [32m'first line'[0m [36m>[0m multiline.txt[0m-[107m [0m [1m[34mecho[0m [32m'second line'[0m [36m>>[0m multiline.txt[0m-[107m [0m [1m[34mecho[0m [32m'third line'[0m [36m>>[0m multiline.txt[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'first line'[0m[2m [0m[2m[36m>[0m[2m multiline.txt[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'second line'[0m[2m [0m[2m[36m>>[0m[2m multiline.txt[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'third line'[0m[2m [0m[2m[36m>>[0m[2m multiline.txt[0m----- 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.snapindex 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β [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0mπ‘ [2m[2mRun `wt config shell install` to enable automatic cd[0m[0mπ [36mRunning post-start [1mtask1[0m:[0m-[107m [0m [1m[34mecho[0m [32m'Task 1 running'[0m [36m>[0m task1.txt[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Task 1 running'[0m[2m [0m[2m[36m>[0m[2m task1.txt[0mπ [36mRunning post-start [1mtask2[0m:[0m-[107m [0m [1m[34mecho[0m [32m'Task 2 running'[0m [36m>[0m task2.txt[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Task 2 running'[0m[2m [0m[2m[36m>[0m[2m task2.txt[0m----- 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.snapindex 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β [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0mπ‘ [2m[2mRun `wt config shell install` to enable automatic cd[0m[0mπ [36mRunning post-start [1mtask1[0m:[0m-[107m [0m [1m[34mecho[0m [32m'TASK1_OUTPUT'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'TASK1_OUTPUT'[0m[2m[0mπ [36mRunning post-start [1mtask2[0m:[0m-[107m [0m [1m[34mecho[0m [32m'TASK2_OUTPUT'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'TASK2_OUTPUT'[0m[2m[0mπ [36mRunning post-start [1mtask3[0m:[0m-[107m [0m [1m[34mecho[0m [32m'TASK3_OUTPUT'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'TASK3_OUTPUT'[0m[2m[0m----- 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.snapindex 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β [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0mπ‘ [2m[2mRun `wt config shell install` to enable automatic cd[0m[0mπ [36mRunning post-start:[0m-[107m [0m [1m[34msleep[0m 0.1 [36m&&[0m [1m[34mecho[0m [32m'Background task done'[0m [36m>[0m background.txt[0m+[107m [0m [2m[0m[2m[34msleep[0m[2m 0.1 [0m[2m[36m&&[0m[2m [0m[2m[34mecho[0m[2m [0m[2m[32m'Background task done'[0m[2m [0m[2m[36m>[0m[2m background.txt[0m----- 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.snapindex 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 -----β [32mCreated new worktree for [1m[32mfile-test[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].file-test[0m[0mπ [36mExecuting (--execute):[0m-[107m [0m [1m[34mecho[0m [32m'test content'[0m [36m>[0m test.txt[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test content'[0m[2m [0m[2m[36m>[0m[2m test.txt[0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snapindex 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 -----β [32mSwitched to worktree for [1m[32mexisting-exec[0m[32m at [1m[32m[WORKTREE_EXISTING_EXEC][0m[0mπ [36mExecuting (--execute):[0m-[107m [0m [1m[34mecho[0m [32m'existing worktree'[0m [36m>[0m existing.txt[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'existing worktree'[0m[2m [0m[2m[36m>[0m[2m existing.txt[0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snapindex 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 -----β [32mCreated new worktree for [1m[32mfail-test[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].fail-test[0m[0mπ [36mExecuting (--execute):[0m-[107m [0m [1m[34mexit[0m 1[0m+[107m [0m [2m[0m[2m[34mexit[0m[2m 1[0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snapindex 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 -----β [32mCreated new worktree for [1m[32mmultiline-test[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].multiline-test[0m[0mπ [36mExecuting (--execute):[0m-[107m [0m [1m[34mecho[0m [32m'line1'[0m[0m-[107m [0m [1m[34mecho[0m [32m'line2'[0m[0m-[107m [0m [1m[34mecho[0m [32m'line3'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'line1'[0m[2m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'line2'[0m[2m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'line3'[0m[2m[0mline1line2line3diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snapindex 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 -----β [32mCreated new worktree for [1m[32mexec-test[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].exec-test[0m[0mπ [36mExecuting (--execute):[0m-[107m [0m [1m[34mecho[0m [32m'test output'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test output'[0m[2m[0mtest 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.snapindex 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 -----β [32mCreated new worktree for [1m[32mexit-code-test[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].exit-code-test[0m[0mπ [36mExecuting (--execute):[0m-[107m [0m [1m[34mexit[0m 42[0m+[107m [0m [2m[0m[2m[34mexit[0m[2m 42[0mdiff --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.snapindex 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 -----β [32mCreated new worktree for [1m[32moutput-exit-test[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].output-exit-test[0m[0mπ [36mExecuting (--execute):[0m-[107m [0m [1m[34mecho[0m [32m'doing work'[0m[0m-[107m [0m [1m[34mexit[0m 7[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'doing work'[0m[2m[0m+[107m [0m [2m[0m[2m[34mexit[0m[2m 7[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snap b/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snapindex 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 -----β [32mCreated new worktree for [1m[32mexec-internal[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].exec-internal[0m[0mπ [36mExecuting (--execute):[0m-[107m [0m [1m[34mecho[0m [32m'line1'[0m[0m-[107m [0m [1m[34mecho[0m [32m'line2'[0m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'line1'[0m[2m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'line2'[0m[2m[0m