Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
feat: Replace synoptic with tree-sitter for bash syntax highlighting
Maximilian Roosd1ab0e8c58d9
diff --git a/Cargo.lock b/Cargo.lockindex 10f0f4477..280f9426a 100644--- a/Cargo.lock+++ b/Cargo.lock@@ -1638,6 +1638,12 @@ version = "0.4.11"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"+[[package]]+name = "streaming-iterator"+version = "0.1.9"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "2b2231b7c3057d5e4ad0156fb3dc807d900806020c5ffa3ee6ff2c8c76fb8520"+[[package]]name = "strsim"version = "0.11.1"@@ -1840,6 +1846,48 @@ version = "1.0.4"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "df8b2b54733674ad286d16267dcfc7a71ed5c776e4ac7aa3c3e2561f7c637bf2"+[[package]]+name = "tree-sitter"+version = "0.24.7"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "a5387dffa7ffc7d2dae12b50c6f7aab8ff79d6210147c6613561fc3d474c6f75"+dependencies = [+ "cc",+ "regex",+ "regex-syntax",+ "streaming-iterator",+ "tree-sitter-language",+]++[[package]]+name = "tree-sitter-bash"+version = "0.23.3"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "329a4d48623ac337d42b1df84e81a1c9dbb2946907c102ca72db158c1964a52e"+dependencies = [+ "cc",+ "tree-sitter-language",+]++[[package]]+name = "tree-sitter-highlight"+version = "0.24.7"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "6411813e4a9ebc87d391b98b0f3ce65d5361cd80c54de8651d8b85b555ea5d95"+dependencies = [+ "lazy_static",+ "regex",+ "streaming-iterator",+ "thiserror 1.0.69",+ "tree-sitter",+]++[[package]]+name = "tree-sitter-language"+version = "0.1.5"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "c4013970217383f67b18aef68f6fb2e8d409bc5755227092d32efb0422ba24b8"+[[package]]name = "typeid"version = "1.0.3"@@ -2317,6 +2365,9 @@ dependencies = ["tempfile","terminal_size","toml",+ "tree-sitter",+ "tree-sitter-bash",+ "tree-sitter-highlight","unicode-width","vergen-gitcl",]diff --git a/Cargo.toml b/Cargo.tomlindex 02c1b69f3..94feef300 100644--- a/Cargo.toml+++ b/Cargo.toml@@ -37,6 +37,9 @@ shellexpand = "3.1"synoptic = "2"terminal_size = "0.4"toml = "0.9"+tree-sitter = "0.24"+tree-sitter-bash = "0.23"+tree-sitter-highlight = "0.24"unicode-width = "0.2"[build-dependencies]diff --git a/src/commands/command_approval.rs b/src/commands/command_approval.rsindex ac952e70b..2e2923d7d 100644--- a/src/commands/command_approval.rs+++ b/src/commands/command_approval.rs@@ -5,7 +5,7 @@use worktrunk::config::{ApprovedCommand, CommandConfig, WorktrunkConfig};use worktrunk::git::{GitError, GitResultExt};use worktrunk::styling::{- AnstyleStyle, HINT_EMOJI, WARNING, WARNING_EMOJI, eprintln, format_with_gutter,+ AnstyleStyle, HINT_EMOJI, WARNING, WARNING_EMOJI, eprintln, format_bash_with_gutter,};/// Convert CommandConfig to a vector of `(name, command)` pairs.@@ -115,7 +115,7 @@ fn prompt_for_batch_approval(Some(n) => format!("{n}: {command}"),None => (*command).clone(),};- eprint!("{}", format_with_gutter(&label, "", None));+ eprint!("{}", format_bash_with_gutter(&label, ""));}eprintln!();diff --git a/src/commands/configure_shell.rs b/src/commands/configure_shell.rsindex d22d0b2fa..cad305e0a 100644--- a/src/commands/configure_shell.rs+++ b/src/commands/configure_shell.rs@@ -2,7 +2,7 @@ use std::fs::{self, OpenOptions};use std::io::{self, BufRead, BufReader, Write};use std::path::{Path, PathBuf};use worktrunk::shell::Shell;-use worktrunk::styling::format_with_gutter;+use worktrunk::styling::format_bash_with_gutter;pub struct ConfigureResult {pub shell: Shell,@@ -361,7 +361,7 @@ fn prompt_for_confirmation(results: &[ConfigureResult]) -> Result<bool, String>);// Show the config line that will be added with gutter- eprint!("{}", format_with_gutter(&result.config_line, "", None));+ eprint!("{}", format_bash_with_gutter(&result.config_line, ""));}eprintln!();diff --git a/src/commands/merge.rs b/src/commands/merge.rsindex 2e7fe4f28..b481ad923 100644--- a/src/commands/merge.rs+++ b/src/commands/merge.rs@@ -1,6 +1,8 @@use worktrunk::config::{ProjectConfig, WorktrunkConfig};use worktrunk::git::{GitError, GitResultExt, Repository};-use worktrunk::styling::{AnstyleStyle, CYAN, CYAN_BOLD, HINT, HINT_EMOJI, format_with_gutter};+use worktrunk::styling::{+ AnstyleStyle, CYAN, CYAN_BOLD, HINT, HINT_EMOJI, format_bash_with_gutter, format_with_gutter,+};use super::command_executor::{CommandContext, prepare_project_commands};use super::worktree::{handle_push, handle_remove, parse_diff_shortstat};@@ -428,7 +430,7 @@ pub fn run_pre_merge_commands(format!("π {CYAN}Running pre-merge command:{CYAN:#}")};crate::output::progress(header)?;- crate::output::progress(format_with_gutter(&prepared.expanded, "", None))?;+ crate::output::progress(format_bash_with_gutter(&prepared.expanded, ""))?;if let Err(e) = execute_command_in_worktree(worktree_path, &prepared.expanded) {return Err(GitError::PreMergeCommandFailed {@@ -498,7 +500,7 @@ pub fn execute_post_merge_commands(format!("π {CYAN}Running post-merge command:{CYAN:#}")};crate::output::progress(header)?;- crate::output::progress(format_with_gutter(&prepared.expanded, "", None))?;+ crate::output::progress(format_bash_with_gutter(&prepared.expanded, ""))?;if let Err(e) = execute_command_in_worktree(main_worktree_path, &prepared.expanded) {use worktrunk::styling::WARNING_EMOJI;diff --git a/src/commands/worktree.rs b/src/commands/worktree.rsindex 93b7d0a7a..cc8ee016e 100644--- a/src/commands/worktree.rs+++ b/src/commands/worktree.rs@@ -105,7 +105,7 @@ use worktrunk::config::{ProjectConfig, WorktrunkConfig};use worktrunk::git::{GitError, GitResultExt, Repository};use worktrunk::styling::{ADDITION, AnstyleStyle, CYAN, CYAN_BOLD, DELETION, GREEN, GREEN_BOLD, SUCCESS_EMOJI, WARNING,- WARNING_EMOJI, format_with_gutter,+ WARNING_EMOJI, format_bash_with_gutter,};use super::command_executor::{CommandContext, prepare_project_commands};@@ -431,7 +431,7 @@ pub fn execute_post_create_commands(// Execute each command sequentiallyfor prepared in commands {crate::output::progress(format!("π {CYAN}Executing (post-create):{CYAN:#}"))?;- crate::output::progress(format_with_gutter(&prepared.expanded, "", None))?;+ crate::output::progress(format_bash_with_gutter(&prepared.expanded, ""))?;if let Err(e) = execute_command_in_worktree(worktree_path, &prepared.expanded) {let warning_bold = WARNING.bold();@@ -489,7 +489,7 @@ fn spawn_post_start_commands(// Spawn each command as a detached background processfor prepared in commands {crate::output::progress(format!("π {CYAN}Starting (background):{CYAN:#}"))?;- crate::output::progress(format_with_gutter(&prepared.expanded, "", None))?;+ crate::output::progress(format_bash_with_gutter(&prepared.expanded, ""))?;let name = prepared.name.as_deref().unwrap_or("cmd");match spawn_detached(worktree_path, &prepared.expanded, name) {@@ -554,7 +554,7 @@ pub fn execute_post_start_commands_sequential(// Execute sequentially for testingfor prepared in commands {crate::output::progress(format!("π {CYAN}Executing (post-start):{CYAN:#}"))?;- crate::output::progress(format_with_gutter(&prepared.expanded, "", None))?;+ crate::output::progress(format_bash_with_gutter(&prepared.expanded, ""))?;if let Err(e) = execute_command_in_worktree(worktree_path, &prepared.expanded) {let message = match &prepared.name {diff --git a/src/main.rs b/src/main.rsindex 46e26d15d..0e4b729dd 100644--- a/src/main.rs+++ b/src/main.rs@@ -355,7 +355,7 @@ fn main() {// Show what was done (instant operations, no progress needed)for result in &results {- use worktrunk::styling::format_with_gutter;+ use worktrunk::styling::format_bash_with_gutter;let bold = Style::new().bold();let shell = result.shell;let path = result.path.display();@@ -364,7 +364,7 @@ fn main() {result.action.description(),);// Show config line with gutter- print!("{}", format_with_gutter(&result.config_line, "", None));+ print!("{}", format_bash_with_gutter(&result.config_line, ""));}// Success summarydiff --git a/src/output/handlers.rs b/src/output/handlers.rsindex 51b07f9b3..99462441f 100644--- a/src/output/handlers.rs+++ b/src/output/handlers.rs@@ -75,7 +75,7 @@ pub fn handle_switch_output(branch: &str,execute: Option<&str>,) -> Result<(), GitError> {- use worktrunk::styling::{CYAN, format_with_gutter};+ use worktrunk::styling::{CYAN, format_bash_with_gutter};// Set target directory for command executionsuper::change_directory(result.path())?;@@ -87,7 +87,7 @@ pub fn handle_switch_output(if let Some(cmd) = execute {// Show what command is being executed (matches post-create/post-start format)super::progress(format!("π {CYAN}Executing (--execute):{CYAN:#}"))?;- super::progress(format_with_gutter(cmd, "", None))?;+ super::progress(format_bash_with_gutter(cmd, ""))?;super::execute(cmd)?;} else {diff --git a/src/styling.rs b/src/styling.rsindex e9578ccc5..f8051f2c1 100644--- a/src/styling.rs+++ b/src/styling.rs@@ -14,7 +14,7 @@//! Use `println!` for all worktrunk messages. Use `eprintln!` only for interactive prompts.use anstyle::{AnsiColor, Color, Style};-use synoptic::{TokOpt, from_extension};+use synoptic::{TokOpt, from_extension}; // Still used for TOML highlightinguse unicode_width::UnicodeWidthStr;// ============================================================================@@ -322,6 +322,167 @@ pub fn format_with_gutter(content: &str, left_margin: &str, max_width: Option<usoutput}+/// Formats bash/shell commands with syntax highlighting and gutter+///+/// Similar to `format_with_gutter` but applies bash syntax highlighting using tree-sitter.+/// Long lines are wrapped at word boundaries to fit terminal width.+///+/// # Example+/// ```ignore+/// print!("{}", format_bash_with_gutter("npm install --frozen-lockfile"));+/// ```+pub fn format_bash_with_gutter(content: &str, left_margin: &str) -> String {+ use tree_sitter_highlight::{HighlightConfiguration, HighlightEvent, Highlighter};++ let gutter = Style::new().bg_color(Some(Color::Ansi(AnsiColor::Black)));+ let mut output = String::new();++ // Calculate available width for wrapping+ let term_width = get_terminal_width();+ let left_margin_width = left_margin.width();+ let available_width = term_width.saturating_sub(2 + left_margin_width);++ // Wrap lines at word boundaries+ let mut wrapped_lines = Vec::new();+ for line in content.lines() {+ let wrapped = wrap_text_at_width(line, available_width);+ wrapped_lines.extend(wrapped);+ }++ // Set up tree-sitter bash highlighting+ let highlight_names = vec![+ "function", // Commands like npm, git, cargo+ "keyword", // Keywords like for, if, while+ "string", // Quoted strings+ "operator", // Operators like &&, ||, |, $, -+ "comment", // Comments+ "number", // Numbers+ "variable", // Variables+ "constant", // Constants/flags+ ];++ let bash_language = tree_sitter_bash::LANGUAGE;+ let bash_highlights = tree_sitter_bash::HIGHLIGHT_QUERY;++ let mut config = HighlightConfiguration::new(+ bash_language.into(),+ "bash",+ bash_highlights,+ "", // injections query+ "", // locals query+ )+ .unwrap_or_else(|_| {+ // Fallback: if tree-sitter fails, use plain gutter formatting+ HighlightConfiguration::new(+ bash_language.into(),+ "bash",+ "", // empty query+ "",+ "",+ )+ .unwrap()+ });++ config.configure(&highlight_names);++ let mut highlighter = Highlighter::new();++ // Process each wrapped line+ for line in &wrapped_lines {+ output.push_str(&format!("{left_margin}{gutter} {gutter:#} "));++ // Highlight this line+ let Ok(highlights) = highlighter.highlight(&config, line.as_bytes(), None, |_| None) else {+ // Fallback: just print plain text if highlighting fails+ output.push_str(line);+ output.push('\n');+ continue;+ };++ let line_bytes = line.as_bytes();++ for event in highlights {+ match event.unwrap() {+ HighlightEvent::Source { start, end } => {+ // Output the text for this source region+ if let Ok(text) = std::str::from_utf8(&line_bytes[start..end]) {+ output.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)+ {+ output.push_str(&format!("{style}"));+ }+ }+ HighlightEvent::HighlightEnd => {+ // End of highlighted region - reset style+ output.push_str(&format!("{:#}", Style::new()));+ }+ }+ }++ output.push('\n');+ }++ output+}++// ============================================================================+// Bash Syntax Highlighting+// ============================================================================++/// Maps bash token kinds to anstyle styles+///+/// Token names come from tree-sitter-bash's highlight queries.+/// Common tokens include:+/// - "function": commands like npm, git, cargo, echo, cd+/// - "keyword": bash keywords (if, then, for, while, do, done, etc.)+/// - "string": quoted strings+/// - "comment": hash-prefixed comments+/// - "operator": operators like &&, ||, |, $, -, etc.+/// - "constant": flags (arguments starting with -)+fn bash_token_style(kind: &str) -> Option<Style> {+ match kind {+ // Commands (npm, git, cargo, echo, cd, etc.) - bold blue+ "function" => Some(+ Style::new()+ .fg_color(Some(Color::Ansi(AnsiColor::Blue)))+ .bold(),+ ),++ // Keywords (if, then, for, while, do, done, etc.) - bold magenta+ "keyword" => Some(+ Style::new()+ .fg_color(Some(Color::Ansi(AnsiColor::Magenta)))+ .bold(),+ ),++ // Strings (quoted values) - green+ "string" => Some(Style::new().fg_color(Some(Color::Ansi(AnsiColor::Green)))),++ // Comments (hash-prefixed) - dimmed+ "comment" => Some(Style::new().dimmed()),++ // Operators (&&, ||, |, $, -, >, <, etc.) - cyan+ "operator" => Some(Style::new().fg_color(Some(Color::Ansi(AnsiColor::Cyan)))),++ // Variables ($VAR, ${VAR}) - yellow+ "variable" => Some(Style::new().fg_color(Some(Color::Ansi(AnsiColor::Yellow)))),++ // Numbers - yellow+ "digit" | "number" => Some(Style::new().fg_color(Some(Color::Ansi(AnsiColor::Yellow)))),++ // Constants/flags (--flag, -f) - cyan+ "constant" => Some(Style::new().fg_color(Some(Color::Ansi(AnsiColor::Cyan)))),++ // Everything else (plain arguments, etc.)+ _ => None,+ }+}+// ============================================================================// TOML Syntax Highlighting// ============================================================================diff --git a/tests/integration_tests/configure_shell.rs b/tests/integration_tests/configure_shell.rsindex 95f115129..f95c5488f 100644--- a/tests/integration_tests/configure_shell.rs+++ b/tests/integration_tests/configure_shell.rs@@ -32,7 +32,7 @@ fn test_configure_shell_with_yes() {exit_code: 0----- stdout -----Added [1mzsh[0m [TEMP_HOME]/.zshrc- [40m [0m if command -v wt >/dev/null 2>&1; then eval "$(wt init zsh)"; fi+ [40m [0m [1m[35mif [1m[34mcommand [36m-v wt [36m>/dev/null [33m2>&1; [1m[35mthen [1m[34meval [32m"$([1m[34mwt init zsh)"; [1m[35mfiβ [32mConfigured 1 shell[0m@@ -76,7 +76,7 @@ fn test_configure_shell_specific_shell() {exit_code: 0----- stdout -----Added [1mzsh[0m [TEMP_HOME]/.zshrc- [40m [0m if command -v wt >/dev/null 2>&1; then eval "$(wt init zsh)"; fi+ [40m [0m [1m[35mif [1m[34mcommand [36m-v wt [36m>/dev/null [33m2>&1; [1m[35mthen [1m[34meval [32m"$([1m[34mwt init zsh)"; [1m[35mfiβ [32mConfigured 1 shell[0m@@ -170,7 +170,7 @@ fn test_configure_shell_custom_prefix() {exit_code: 0----- stdout -----Added [1mbash[0m [TEMP_HOME]/.bash_profile- [40m [0m if command -v worktree >/dev/null 2>&1; then eval "$(worktree init bash)"; fi+ [40m [0m [1m[35mif [1m[34mcommand [36m-v worktree [36m>/dev/null [33m2>&1; [1m[35mthen [1m[34meval [32m"$([1m[34mworktree init bash)"; [1m[35mfiβ [32mConfigured 1 shell[0m@@ -210,7 +210,7 @@ fn test_configure_shell_fish() {exit_code: 0----- stdout -----Created [1mfish[0m [TEMP_HOME]/.config/fish/conf.d/wt.fish- [40m [0m if type -q wt; wt init fish | source; end+ [40m [0m [1m[35mif [1m[34mtype [36m-q wt; [1m[34mwt init fish [36m| [1m[34msource; endβ [32mConfigured 1 shell[0m@@ -288,7 +288,7 @@ fn test_configure_shell_fish_custom_prefix() {exit_code: 0----- stdout -----Created [1mfish[0m [TEMP_HOME]/.config/fish/conf.d/worktree.fish- [40m [0m if type -q worktree; worktree init fish | source; end+ [40m [0m [1m[35mif [1m[34mtype [36m-q worktree; [1m[34mworktree init fish [36m| [1m[34msource; endβ [32mConfigured 1 shell[0m@@ -346,9 +346,9 @@ fn test_configure_shell_multiple_configs() {exit_code: 0----- stdout -----Added [1mbash[0m [TEMP_HOME]/.bash_profile- [40m [0m if command -v wt >/dev/null 2>&1; then eval "$(wt init bash)"; fi+ [40m [0m [1m[35mif [1m[34mcommand [36m-v wt [36m>/dev/null [33m2>&1; [1m[35mthen [1m[34meval [32m"$([1m[34mwt init bash)"; [1m[35mfiAdded [1mzsh[0m [TEMP_HOME]/.zshrc- [40m [0m if command -v wt >/dev/null 2>&1; then eval "$(wt init zsh)"; fi+ [40m [0m [1m[35mif [1m[34mcommand [36m-v wt [36m>/dev/null [33m2>&1; [1m[35mthen [1m[34meval [32m"$([1m[34mwt init zsh)"; [1m[35mfiβ [32mConfigured 2 shells[0m@@ -411,9 +411,9 @@ fn test_configure_shell_mixed_states() {exit_code: 0----- stdout -----Already configured [1mbash[0m [TEMP_HOME]/.bash_profile- [40m [0m if command -v wt >/dev/null 2>&1; then eval "$(wt init bash)"; fi+ [40m [0m [1m[35mif [1m[34mcommand [36m-v wt [36m>/dev/null [33m2>&1; [1m[35mthen [1m[34meval [32m"$([1m[34mwt init bash)"; [1m[35mfiAdded [1mzsh[0m [TEMP_HOME]/.zshrc- [40m [0m if command -v wt >/dev/null 2>&1; then eval "$(wt init zsh)"; fi+ [40m [0m [1m[35mif [1m[34mcommand [36m-v wt [36m>/dev/null [33m2>&1; [1m[35mthen [1m[34meval [32m"$([1m[34mwt init zsh)"; [1m[35mfiβ [32mConfigured 1 shell[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 4dcf5d5dd..991bb3b1b 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().as_ref()---β [32mCreated new worktree for [1m[32mfish-multiline[0m at [TMPDIR]/test-repo.fish-multiline[0mπ [36mExecuting (--execute):[0m-[40m [0m echo 'line 1'; echo 'line 2'; echo 'line 3'+[40m [0m [1m[34mecho [32m'line 1'; [1m[34mecho [32m'line 2'; [1m[34mecho [32m'line 3'line 1line 2diff --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 0c156c4f2..78f9e7843 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@@ -1,8 +1,8 @@---source: tests/integration_tests/shell_wrapper.rs-expression: normalized.as_ref()+expression: output.normalized().as_ref()---π [36mStarting (background):[0m-[40m [0m echo 'fish background task'+[40m [0m [1m[34mecho [32m'fish background task'β [32mCreated new worktree for [1m[32mfish-bg[0m at [TMPDIR]/test-repo.fish-bg[0mdiff --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 d79592646..4c6e97b15 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,12 +3,12 @@ source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized().as_ref()---π [36mRunning pre-merge command [1m[36mformat[0m:[0m-[40m [0m echo 'β Code formatting check passed'+[40m [0m [1m[34mecho [32m'β Code formatting check passed'β Code formatting check passedπ [36mRunning pre-merge command [1m[36mtest[0m:[0m-[40m [0m echo 'β Test suite failed: 3 tests failing' && exit 1+[40m [0m [1m[34mecho [32m'β Test suite failed: 3 tests failing' [36m&& [1m[34mexit 1β Test suite failed: 3 tests failingβ [31mPre-merge command failed: [1m[31mtest[0m[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_fish.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_fish.snapindex 087a29bf6..a67b78882 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_fish.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_fish.snap@@ -3,11 +3,11 @@ source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized().as_ref()---π [36mRunning pre-merge command [1m[36mformat[0m:[0m-[40m [0m echo 'β Code formatting check passed'+[40m [0m [1m[34mecho [32m'β Code formatting check passed'β Code formatting check passedπ [36mRunning pre-merge command [1m[36mtest[0m:[0m-[40m [0m echo 'β Test suite failed: 3 tests failing' && exit 1+[40m [0m [1m[34mecho [32m'β Test suite failed: 3 tests failing' [36m&& [1m[34mexit 1β Test suite failed: 3 tests failingβ [31mPre-merge command failed: [1m[31mtest[0m[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 8903390cb..6bf37829c 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@@ -10,8 +10,8 @@ Command failed with exit code: exit status: 1π‘ [2mUse --no-hooks to skip pre-merge commands[0mπ [36mRunning pre-merge command [1m[36mformat[0m:[0m-[40m [0m echo 'β Code formatting check passed'+[40m [0m [1m[34mecho [32m'β Code formatting check passed'π [36mRunning pre-merge command [1m[36mtest[0m:[0m-[40m [0m echo 'β Test suite failed: 3 tests failing' && exit 1+[40m [0m [1m[34mecho [32m'β Test suite failed: 3 tests failing' [36m&& [1m[34mexit 1diff --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 28913557b..967e136cb 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,17 +3,17 @@ source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized().as_ref()---π [36mRunning pre-merge command [1m[36mformat[0m:[0m-[40m [0m echo 'β Code formatting check passed'+[40m [0m [1m[34mecho [32m'β Code formatting check passed'β Code formatting check passedπ [36mRunning pre-merge command [1m[36mlint[0m:[0m-[40m [0m echo 'β Linting passed - no warnings'+[40m [0m [1m[34mecho [32m'β Linting passed - no warnings'β Linting passed - no warningsπ [36mRunning pre-merge command [1m[36mtest[0m:[0m-[40m [0m echo 'β All 47 tests passed in 2.3s'+[40m [0m [1m[34mecho [32m'β All 47 tests passed in 2.3s'β All 47 tests passed in 2.3sdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_fish.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_fish.snapindex 50c767940..2a7a3c974 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_fish.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_fish.snap@@ -3,15 +3,15 @@ source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized().as_ref()---π [36mRunning pre-merge command [1m[36mformat[0m:[0m-[40m [0m echo 'β Code formatting check passed'+[40m [0m [1m[34mecho [32m'β Code formatting check passed'β Code formatting check passedπ [36mRunning pre-merge command [1m[36mlint[0m:[0m-[40m [0m echo 'β Linting passed - no warnings'+[40m [0m [1m[34mecho [32m'β Linting passed - no warnings'β Linting passed - no warningsπ [36mRunning pre-merge command [1m[36mtest[0m:[0m-[40m [0m echo 'β All 47 tests passed in 2.3s'+[40m [0m [1m[34mecho [32m'β All 47 tests passed in 2.3s'β All 47 tests passed in 2.3sπ [36mRebasing onto [1m[36mmain[0m...[0mdiff --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 6f85a617a..932a76fd4 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@@ -6,15 +6,15 @@ expression: output.normalized().as_ref()β Linting passed - no warningsβ All 47 tests passed in 2.3sπ [36mRunning pre-merge command [1m[36mformat[0m:[0m-[40m [0m echo 'β Code formatting check passed'+[40m [0m [1m[34mecho [32m'β Code formatting check passed'π [36mRunning pre-merge command [1m[36mlint[0m:[0m-[40m [0m echo 'β Linting passed - no warnings'+[40m [0m [1m[34mecho [32m'β Linting passed - no warnings'π [36mRunning pre-merge command [1m[36mtest[0m:[0m-[40m [0m echo 'β All 47 tests passed in 2.3s'+[40m [0m [1m[34mecho [32m'β All 47 tests passed in 2.3s'π [36mRebasing onto [1m[36mmain[0m...[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_bash.snapindex 8bef55bb1..4a4173969 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_bash.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_bash.snap@@ -4,6 +4,6 @@ expression: output.normalized().as_ref()---β [32mCreated new worktree for [1m[32mtest-exec[0m at [TMPDIR]/test-repo.test-exec[0mπ [36mExecuting (--execute):[0m-[40m [0m echo executed+[40m [0m [1m[34mecho executedexecuteddiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_fish.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_fish.snapindex 8bef55bb1..4a4173969 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_fish.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_fish.snap@@ -4,6 +4,6 @@ expression: output.normalized().as_ref()---β [32mCreated new worktree for [1m[32mtest-exec[0m at [TMPDIR]/test-repo.test-exec[0mπ [36mExecuting (--execute):[0m-[40m [0m echo executed+[40m [0m [1m[34mecho executedexecuteddiff --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 8bef55bb1..4a4173969 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,6 +4,6 @@ expression: output.normalized().as_ref()---β [32mCreated new worktree for [1m[32mtest-exec[0m at [TMPDIR]/test-repo.test-exec[0mπ [36mExecuting (--execute):[0m-[40m [0m echo executed+[40m [0m [1m[34mecho executedexecuteddiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_zsh.snapindex 8bef55bb1..4a4173969 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_zsh.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_zsh.snap@@ -4,6 +4,6 @@ expression: output.normalized().as_ref()---β [32mCreated new worktree for [1m[32mtest-exec[0m at [TMPDIR]/test-repo.test-exec[0mπ [36mExecuting (--execute):[0m-[40m [0m echo executed+[40m [0m [1m[34mecho executedexecuteddiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_bash.snapindex 98117f88b..97bc371bc 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_bash.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_bash.snap@@ -3,19 +3,19 @@ source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized().as_ref()---π [36mExecuting (post-create):[0m-[40m [0m echo 'Installing dependencies...'+[40m [0m [1m[34mecho [32m'Installing dependencies...'Installing dependencies...π [36mExecuting (post-create):[0m-[40m [0m echo 'Building project...'+[40m [0m [1m[34mecho [32m'Building project...'Building project...π [36mStarting (background):[0m-[40m [0m echo 'Starting dev server on port 3000'+[40m [0m [1m[34mecho [32m'Starting dev server on port 3000'π [36mStarting (background):[0m-[40m [0m echo 'Watching for file changes'+[40m [0m [1m[34mecho [32m'Watching for file changes'β [32mCreated new worktree for [1m[32mfeature-hooks[0m at [TMPDIR]/test-repo.feature-hooks[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_fish.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_fish.snapindex 0c15259c7..21b64d4f2 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_fish.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_fish.snap@@ -3,17 +3,17 @@ source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized().as_ref()---π [36mExecuting (post-create):[0m-[40m [0m echo 'Installing dependencies...'+[40m [0m [1m[34mecho [32m'Installing dependencies...'Installing dependencies...π [36mExecuting (post-create):[0m-[40m [0m echo 'Building project...'+[40m [0m [1m[34mecho [32m'Building project...'Building project...π [36mStarting (background):[0m-[40m [0m echo 'Starting dev server on port 3000'+[40m [0m [1m[34mecho [32m'Starting dev server on port 3000'π [36mStarting (background):[0m-[40m [0m echo 'Watching for file changes'+[40m [0m [1m[34mecho [32m'Watching for file changes'β [32mCreated new worktree for [1m[32mfeature-hooks[0m at [TMPDIR]/test-repo.feature-hooks[0mdiff --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 351825872..bf700149e 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@@ -5,17 +5,17 @@ expression: output.normalized().as_ref()Installing dependencies...Building project...π [36mExecuting (post-create):[0m-[40m [0m echo 'Installing dependencies...'+[40m [0m [1m[34mecho [32m'Installing dependencies...'π [36mExecuting (post-create):[0m-[40m [0m echo 'Building project...'+[40m [0m [1m[34mecho [32m'Building project...'π [36mStarting (background):[0m-[40m [0m echo 'Starting dev server on port 3000'+[40m [0m [1m[34mecho [32m'Starting dev server on port 3000'π [36mStarting (background):[0m-[40m [0m echo 'Watching for file changes'+[40m [0m [1m[34mecho [32m'Watching for file changes'β [32mCreated new worktree for [1m[32mfeature-hooks[0m at [TMPDIR]/test-repo.feature-hooks[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 cdfe6f06c..ba5a5f504 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@@ -1,8 +1,8 @@---source: tests/integration_tests/shell_wrapper.rs-expression: normalized.as_ref()+expression: output.normalized().as_ref()---π [36mStarting (background):[0m-[40m [0m echo 'test command executed'+[40m [0m [1m[34mecho [32m'test command executed'β [32mCreated new worktree for [1m[32mfeature-with-hooks[0m at [TMPDIR]/test-repo.feature-with-hooks[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 7bbe3c585..3eddcc618 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@@ -1,8 +1,8 @@---source: tests/integration_tests/shell_wrapper.rs-expression: normalized.as_ref()+expression: output.normalized().as_ref()---π [36mStarting (background):[0m-[40m [0m echo 'background task'+[40m [0m [1m[34mecho [32m'background task'β [32mCreated new worktree for [1m[32mfeature-bg[0m at [TMPDIR]/test-repo.feature-bg[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 6c006466d..ec6328c5f 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap@@ -17,7 +17,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpN3GNrq/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp2ySiyI/test-config.toml---success: trueexit_code: 0@@ -35,7 +35,7 @@ exit_code: 0β [32mReturned to primary at [REPO][0mπ [36mRunning post-merge command:[0m-[40m [0m exit 1+[40m [0m [1m[34mexit 1π‘ [33mCommand failed: Command failed with exit code: 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 9f6b58455..c4f6af0bd 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap@@ -17,7 +17,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpalMG2p/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpJYHpXe/test-config.toml---success: trueexit_code: 0@@ -35,10 +35,10 @@ exit_code: 0β [32mReturned to primary at [REPO][0mπ [36mRunning post-merge command [1m[36mdeploy[0m:[0m-[40m [0m echo 'Deploying branch feature' > deploy.txt+[40m [0m [1m[34mecho [32m'Deploying branch feature' [36m> deploy.txtπ [36mRunning post-merge command [1m[36mnotify[0m:[0m-[40m [0m echo 'Merge to main complete' > notify.txt+[40m [0m [1m[34mecho [32m'Merge to main complete' [36m> notify.txt----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snapindex 2063200f8..8d516cdb6 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap@@ -17,7 +17,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpTuY6BE/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpow17hQ/test-config.toml---success: trueexit_code: 0@@ -35,7 +35,7 @@ exit_code: 0β [32mReturned to primary at [REPO][0mπ [36mRunning post-merge command:[0m-[40m [0m echo 'merged feature to main' > post-merge-ran.txt+[40m [0m [1m[34mecho [32m'merged feature to main' [36m> post-merge-ran.txt----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_combined_output.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_combined_output.snapindex 30e5a9397..3f6fb1165 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_combined_output.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_combined_output.snap@@ -4,12 +4,12 @@ expression: output---Exit code: 0π [36mRunning pre-merge command [1m[36mfirst[0m:[0m-[40m [0m echo 'STDOUT-FROM-FIRST' && echo 'STDERR-FROM-FIRST' >&2+[40m [0m [1m[34mecho [32m'STDOUT-FROM-FIRST' [36m&& [1m[34mecho [32m'STDERR-FROM-FIRST' >&2STDOUT-FROM-FIRSTSTDERR-FROM-FIRSTπ [36mRunning pre-merge command [1m[36msecond[0m:[0m-[40m [0m echo 'STDOUT-FROM-SECOND' && echo 'STDERR-FROM-SECOND' >&2+[40m [0m [1m[34mecho [32m'STDOUT-FROM-SECOND' [36m&& [1m[34mecho [32m'STDERR-FROM-SECOND' >&2STDOUT-FROM-SECONDSTDERR-FROM-SECONDdiff --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 d10dc1c65..a23814240 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@@ -17,13 +17,13 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpqnmKZt/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpXNzYyg/test-config.toml---success: falseexit_code: 1----- stdout -----π [36mRunning pre-merge command:[0m-[40m [0m exit 1+[40m [0m [1m[34mexit 1----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snapindex e3b04396c..6e69289d0 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap@@ -17,19 +17,19 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpgwig2T/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpQYFkT2/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mRunning pre-merge command [1m[36mformat[0m:[0m-[40m [0m exit 0+[40m [0m [1m[34mexit 0π [36mRunning pre-merge command [1m[36mlint[0m:[0m-[40m [0m exit 0+[40m [0m [1m[34mexit 0π [36mRunning pre-merge command [1m[36mtest[0m:[0m-[40m [0m exit 0+[40m [0m [1m[34mexit 0π [36mRebasing onto [1m[36mmain[0m...[0mπ [36mMerging 1 commit to [1m[36mmain[0m @ [SHA][0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snapindex c16892f10..486a40179 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snap@@ -17,16 +17,16 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpRrHqcZ/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpTlDjqL/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mRunning pre-merge command [1m[36mcheck1[0m:[0m-[40m [0m [PROJECT_ROOT]/tests/fixtures/mixed-output.sh check1 3+[40m [0m [1m[34m[PROJECT_ROOT]/tests/fixtures/mixed-output.sh check1 3π [36mRunning pre-merge command [1m[36mcheck2[0m:[0m-[40m [0m [PROJECT_ROOT]/tests/fixtures/mixed-output.sh check2 3+[40m [0m [1m[34m[PROJECT_ROOT]/tests/fixtures/mixed-output.sh check2 3π [36mRebasing onto [1m[36mmain[0m...[0mπ [36mMerging 1 commit to [1m[36mmain[0m @ [SHA][0mdiff --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 a63760335..6923e9c02 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap@@ -17,13 +17,13 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpsL42Gp/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpQoY18o/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mRunning pre-merge command:[0m-[40m [0m exit 0+[40m [0m [1m[34mexit 0π [36mRebasing onto [1m[36mmain[0m...[0mπ [36mMerging 1 commit to [1m[36mmain[0m @ [SHA][0mdiff --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 01fd838af..6e937c1b6 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@@ -8,6 +8,7 @@ info:- featureenv:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/null@@ -16,16 +17,16 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp10JOFA/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpq2cN92/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mExecuting (post-create):[0m-[40m [0m echo 'Setup done' > setup.txt+[40m [0m [1m[34mecho [32m'Setup done' [36m> setup.txtπ [36mStarting (background):[0m-[40m [0m sleep 0.5 && echo 'Server running' > server.txt+[40m [0m [1m[34msleep 0.5 [36m&& [1m[34mecho [32m'Server running' [36m> server.txtβ [32mCreated new worktree for [1m[32mfeature[0m at [REPO].feature[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 135e87bad..8ff908a4e 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@@ -10,6 +10,7 @@ info:- "echo 'Execute flag' > execute.txt"env:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/null@@ -18,17 +19,17 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpE0F9E8/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpA4nIH0/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mStarting (background):[0m-[40m [0m echo 'Background task' > background.txt+[40m [0m [1m[34mecho [32m'Background task' [36m> background.txtβ [32mCreated new worktree for [1m[32mfeature[0m at [REPO].feature[0mπ [36mExecuting (--execute):[0m-[40m [0m echo 'Execute flag' > execute.txt+[40m [0m [1m[34mecho [32m'Execute flag' [36m> execute.txt----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snapindex 8224103e7..80ca84625 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snap@@ -17,13 +17,13 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpNJmbE1/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp9ZhOmu/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mExecuting (post-create):[0m-[40m [0m exit 1+[40m [0m [1m[34mexit 1π‘ [33mCommand failed: Command failed with exit code: exit status: 1[0mβ [32mCreated new worktree for [1m[32mfeature[0m at [REPO].feature[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 bdeb2e81e..6f8c5d8c9 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiline_control_structure.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiline_control_structure.snap@@ -17,17 +17,17 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpTA5Adn/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpCIVxhL/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mExecuting (post-create):[0m-[40m [0m if [ ! -f test.txt ]; then-[40m [0m echo 'File does not exist' > result.txt-[40m [0m else-[40m [0m echo 'File exists' > result.txt-[40m [0m fi+[40m [0m [1m[35mif [ ! -f test.txt ]; [1m[35mthen[1m[35m+[40m [0m [1m[34mecho [32m'File does not exist' [36m> result.txt+[40m [0m [1m[34melse+[40m [0m [1m[34mecho [32m'File exists' [36m> result.txt+[40m [0m [1m[34mfiβ [32mCreated new worktree for [1m[32mfeature[0m at [REPO].feature[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 396c236b9..5b70ed11d 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@@ -8,6 +8,7 @@ info:- featureenv:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/null@@ -16,16 +17,16 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp1gS9pX/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp9bj8m8/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mExecuting (post-create):[0m-[40m [0m echo 'First'+[40m [0m [1m[34mecho [32m'First'π [36mExecuting (post-create):[0m-[40m [0m echo 'Second'+[40m [0m [1m[34mecho [32m'Second'β [32mCreated new worktree for [1m[32mfeature[0m at [REPO].feature[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 bcfa5ebd5..ca126069f 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@@ -8,6 +8,7 @@ info:- featureenv:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/null@@ -16,16 +17,16 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpo7iXlU/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpUoNDWb/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mExecuting (post-create):[0m-[40m [0m echo 'Installing deps'+[40m [0m [1m[34mecho [32m'Installing deps'π [36mExecuting (post-create):[0m-[40m [0m echo 'Running setup'+[40m [0m [1m[34mecho [32m'Running setup'β [32mCreated new worktree for [1m[32mfeature[0m at [REPO].feature[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 a58a695b9..8e60b3bcd 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@@ -8,6 +8,7 @@ info:- featureenv:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/null@@ -16,13 +17,13 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpMD80IM/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpnKKTEx/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mExecuting (post-create):[0m-[40m [0m echo 'Setup complete'+[40m [0m [1m[34mecho [32m'Setup complete'β [32mCreated new worktree for [1m[32mfeature[0m at [REPO].feature[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 1430a4be9..b2d2f3652 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snap@@ -17,22 +17,22 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpVEaiug/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpsA9gbG/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mExecuting (post-create):[0m-[40m [0m echo 'Repo: test-repo' > info.txt+[40m [0m [1m[34mecho [32m'Repo: test-repo' [36m> info.txtπ [36mExecuting (post-create):[0m-[40m [0m echo 'Branch: feature-test' >> info.txt+[40m [0m [1m[34mecho [32m'Branch: feature-test' [36m>> info.txtπ [36mExecuting (post-create):[0m-[40m [0m echo 'Worktree: [REPO].feature-test' >> info.txt+[40m [0m [1m[34mecho [32m'Worktree: [REPO].feature-test' [36m>> info.txtπ [36mExecuting (post-create):[0m-[40m [0m echo 'Root: [REPO]' >> info.txt+[40m [0m [1m[34mecho [32m'Root: [REPO]' [36m>> info.txtβ [32mCreated new worktree for [1m[32mfeature/test[0m at [REPO].feature-test[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 5de590a91..311477dc4 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@@ -8,6 +8,7 @@ info:- featureenv:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/null@@ -16,15 +17,15 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpcODNgD/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp5zSzoe/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mStarting (background):[0m-[40m [0m echo 'line1-[40m [0m line2-[40m [0m line3' | grep line2 > filtered.txt+[40m [0m [1m[34mecho 'line1+[40m [0m [1m[34mline2+[40m [0m [1m[34mline3' | grep line2 > filtered.txtβ [32mCreated new worktree for [1m[32mfeature[0m at [REPO].feature[0mdiff --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 52ba9f9e9..ff959bd13 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@@ -8,6 +8,7 @@ info:- featureenv:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/null@@ -16,13 +17,13 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpTKQVEK/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmplr7P8Y/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mStarting (background):[0m-[40m [0m echo 'unclosed quote+[40m [0m [1m[34mecho 'unclosed quoteβ [32mCreated new worktree for [1m[32mfeature[0m at [REPO].feature[0mdiff --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 26fb8208f..9c2fa0432 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@@ -8,6 +8,7 @@ info:- featureenv:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/null@@ -16,13 +17,13 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmplmHcHO/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpyugcH2/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mStarting (background):[0m-[40m [0m echo 'stdout output' && echo 'stderr output' >&2+[40m [0m [1m[34mecho [32m'stdout output' [36m&& [1m[34mecho [32m'stderr output' >&2β [32mCreated new worktree for [1m[32mfeature[0m at [REPO].feature[0mdiff --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 b0f1dcbf3..34c2096b2 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiline_with_newlines.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiline_with_newlines.snap@@ -17,15 +17,15 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpLo32Wc/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpNYMKbD/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mStarting (background):[0m-[40m [0m echo 'first line' > multiline.txt-[40m [0m echo 'second line' >> multiline.txt-[40m [0m echo 'third line' >> multiline.txt+[40m [0m [1m[34mecho [32m'first line' [36m> multiline.txt+[40m [0m [1m[34mecho [32m'second line' [36m>> multiline.txt+[40m [0m [1m[34mecho [32m'third line' [36m>> multiline.txtβ [32mCreated new worktree for [1m[32mfeature[0m at [REPO].feature[0mdiff --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 236bafb1c..45259dda4 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@@ -8,6 +8,7 @@ info:- featureenv:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/null@@ -16,16 +17,16 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpxxlDwn/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpYeW6bk/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mStarting (background):[0m-[40m [0m echo 'Task 1 running' > task1.txt+[40m [0m [1m[34mecho [32m'Task 1 running' [36m> task1.txtπ [36mStarting (background):[0m-[40m [0m echo 'Task 2 running' > task2.txt+[40m [0m [1m[34mecho [32m'Task 2 running' [36m> task2.txtβ [32mCreated new worktree for [1m[32mfeature[0m at [REPO].feature[0mdiff --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 131b1fd36..7e922d902 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@@ -8,6 +8,7 @@ info:- featureenv:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/null@@ -16,19 +17,19 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpEDC1KG/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmptz6odB/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mStarting (background):[0m-[40m [0m echo 'TASK1_OUTPUT'+[40m [0m [1m[34mecho [32m'TASK1_OUTPUT'π [36mStarting (background):[0m-[40m [0m echo 'TASK2_OUTPUT'+[40m [0m [1m[34mecho [32m'TASK2_OUTPUT'π [36mStarting (background):[0m-[40m [0m echo 'TASK3_OUTPUT'+[40m [0m [1m[34mecho [32m'TASK3_OUTPUT'β [32mCreated new worktree for [1m[32mfeature[0m at [REPO].feature[0mdiff --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 67c71e14d..ff95afc62 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@@ -8,6 +8,7 @@ info:- featureenv:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/null@@ -16,13 +17,13 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpnXTuNy/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpLJlECk/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mStarting (background):[0m-[40m [0m sleep 1 && echo 'Background task done' > background.txt+[40m [0m [1m[34msleep 1 [36m&& [1m[34mecho [32m'Background task done' [36m> background.txtβ [32mCreated new worktree for [1m[32mfeature[0m at [REPO].feature[0mdiff --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 2c4d8159d..7e6f94a1c 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@@ -10,6 +10,7 @@ info:- "echo 'test content' > test.txt"env:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/null@@ -18,14 +19,14 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpnFxFGm/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpasOuP1/test-config.toml---success: trueexit_code: 0----- stdout -----β [32mCreated new worktree for [1m[32mfile-test[0m at [REPO].file-test[0mπ [36mExecuting (--execute):[0m-[40m [0m echo 'test content' > test.txt+[40m [0m [1m[34mecho [32m'test content' [36m> test.txt----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snapindex 0c97242a1..5cee38de4 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap@@ -9,6 +9,7 @@ info:- "echo 'existing worktree' > existing.txt"env:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/null@@ -17,14 +18,14 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpB10CRl/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpP11Ajq/test-config.toml---success: trueexit_code: 0----- stdout -----β [32mSwitched to worktree for [1m[32mexisting-exec[0m at [WORKTREE_EXISTING_EXEC][0mπ [36mExecuting (--execute):[0m-[40m [0m echo 'existing worktree' > existing.txt+[40m [0m [1m[34mecho [32m'existing worktree' [36m> existing.txt----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snapindex 08c8a0674..d0aaac5e7 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap@@ -10,6 +10,7 @@ info:- exit 1env:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/null@@ -18,14 +19,14 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpw4Og5c/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpx7rfUR/test-config.toml---success: falseexit_code: 1----- stdout -----β [32mCreated new worktree for [1m[32mfail-test[0m at [REPO].fail-test[0mπ [36mExecuting (--execute):[0m-[40m [0m exit 1+[40m [0m [1m[34mexit 1----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snapindex e3e284632..9cd6be1a1 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap@@ -19,16 +19,16 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpN8ASNd/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp5QpUt9/test-config.toml---success: trueexit_code: 0----- stdout -----β [32mCreated new worktree for [1m[32mmultiline-test[0m at [REPO].multiline-test[0mπ [36mExecuting (--execute):[0m-[40m [0m echo 'line1'-[40m [0m echo 'line2'-[40m [0m echo 'line3'+[40m [0m [1m[34mecho [32m'line1'+[40m [0m [1m[34mecho [32m'line2'+[40m [0m [1m[34mecho [32m'line3'line1line2diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snapindex bfb1ef19e..0212e461d 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap@@ -19,14 +19,14 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpyR0ymU/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpKkzRRv/test-config.toml---success: trueexit_code: 0----- stdout -----β [32mCreated new worktree for [1m[32mexec-test[0m at [REPO].exec-test[0mπ [36mExecuting (--execute):[0m-[40m [0m echo 'test output'+[40m [0m [1m[34mecho [32m'test output'test outputdiff --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 5724099b4..952273e4c 100644Binary files a/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snap and b/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snap differdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_execute_still_runs.snap b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_execute_still_runs.snapindex 0a642bca2..7408cd794 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_execute_still_runs.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_execute_still_runs.snap@@ -20,14 +20,14 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpd7PpAa/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpeYMcNt/test-config.toml---success: trueexit_code: 0----- stdout -----β [32mCreated new worktree for [1m[32mno-hooks-test[0m at [REPO].no-hooks-test[0mπ [36mExecuting (--execute):[0m-[40m [0m echo 'execute command runs'+[40m [0m [1m[34mecho [32m'execute command runs'execute command runsdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_existing.snap b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_existing.snapindex 784a9e4f6..72e28b175 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_existing.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_existing.snap@@ -19,14 +19,14 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpHtiZXO/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpRegQEi/test-config.toml---success: trueexit_code: 0----- stdout -----β [32mSwitched to worktree for [1m[32mexisting-no-hooks[0m at [WORKTREE_EXISTING_NO_HOOKS][0mπ [36mExecuting (--execute):[0m-[40m [0m echo 'execute still runs'+[40m [0m [1m[34mecho [32m'execute still runs'execute still runs