Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Fix(cli): Improve error reporting and message consistency
Maximilian Roos8cd3a85b7730
diff --git a/CLAUDE.md b/CLAUDE.mdindex b8ca8b91f..41f51cd15 100644--- a/CLAUDE.md+++ b/CLAUDE.md@@ -177,15 +177,27 @@ All styling uses the **anstyle ecosystem** for composable, auto-detecting terminSix canonical message patterns with their emojis:-1. **Progress**: π + cyan text (operations in progress)-2. **Success**: β + green text (successful completion)-3. **Errors**: β + red text (failures, invalid states)-4. **Warnings**: π‘ + yellow text (non-blocking issues)-5. **Hints**: π‘ + dimmed text (actionable suggestions, tips for user)- - Keep hints uniformly dimmed - don't use `HINT_BOLD` for emphasis (bold+dim renders inconsistently across terminals)-6. **Info**: βͺ + unstyled text (neutral status, system feedback, metadata)- - Use `output::info()` for primary status (unstyled)- - Add `HINT` style manually for supplementary/dimmed metadata+1. **Progress**: π (operations in progress)+2. **Success**: β (successful completion)+3. **Errors**: β (failures, invalid states)+4. **Warnings**: π‘ (non-blocking issues)+5. **Hints**: π‘ (actionable suggestions, tips for user)+6. **Info**: βͺ (neutral status, system feedback, metadata)++**All message methods just add the emoji prefix** - callers handle their own styling:+```rust+// Caller provides the styling+output::success(format!("{GREEN}Created worktree{GREEN:#}"))?;+output::hint(format!("{HINT}Run 'wt config' to configure{HINT:#}"))?;+```++**Styling conventions by type:**+- Progress β cyan (`{CYAN}...{CYAN:#}`)+- Success β green (`{GREEN}...{GREEN:#}`)+- Errors β red (`{ERROR}...{ERROR:#}`)+- Warnings β yellow (`{WARNING}...{WARNING:#}`)+- Hints β dimmed (`{HINT}...{HINT:#}`), avoid `HINT_BOLD` (renders inconsistently)+- Info β unstyled or dimmed for supplementary metadata**Every user-facing message requires either an emoji or a gutter** for consistent visual separation.@@ -196,15 +208,14 @@ Six canonical message patterns with their emojis:- **One blank after prompts** - Separate user input from results- **Never double blanks** - One blank line maximum between elements-### stdout vs stderr: Separation by Mode+### stdout vs stderr-**Interactive mode:**-- stdout: Status messages (progress, success, warning, info, hint)-- stderr: Errors, gutter content (diagnostics), child process output, interactive prompts+**Both modes write all messages to stderr.** stdout is reserved for structured data:-**Directive mode** (--internal flag for shell integration):-- stdout: Shell script emitted at the end (e.g., `cd '/path/to/worktree'`)-- stderr: All user-facing messages + child process output - streams in real-time+- **stdout**: JSON output (`--format=json`), shell scripts (directive mode)+- **stderr**: All user-facing messages (progress, success, errors, hints, gutter, etc.)++**Directive mode** additionally emits a shell script to stdout at the end.Use the output system (`output::success()`, `output::progress()`, etc.) to handle both modes automatically. Never write directly to stdout/stderr in command code.@@ -430,7 +441,9 @@ Cover success/error states, with/without data, and flag variations.Worktrunk supports two output modes, selected once at program startup:1. **Interactive Mode** - Human-friendly output with colors, emojis, and hints-2. **Directive Mode** - Shell script on stdout (at end), user messages on stderr (streaming)+2. **Directive Mode** - Shell script on stdout (at end), user messages on stderr++Both modes write all messages to stderr. stdout is reserved for structured data (JSON, shell scripts).The mode is determined at initialization in `main()` and never changes during execution.@@ -467,9 +480,9 @@ The output module (`src/output/global.rs`) provides:- `progress(message)` - Operations in progress (π, both modes)- `info(message)` - Neutral status/metadata (βͺ, both modes)- `warning(message)` - Non-blocking issues (π‘, both modes)-- `error(message)` - Critical failures (β, stdout in interactive, stderr in directive)-- `hint(message)` - Actionable suggestions (π‘, interactive only, suppressed in directive)-- `shell_integration_hint(message)` - Shell integration hints (interactive only)+- `hint(message)` - Actionable suggestions (π‘, both modes)+- `print(message)` - Write message as-is (caller formats, both modes)+- `shell_integration_hint(message)` - Shell integration hints (π‘, suppressed in directive)- `gutter(content)` - Gutter-formatted content (use with `format_with_gutter()`)- `blank()` - Blank line for visual separation- `raw(content)` - Raw output without emoji (JSON data)diff --git a/src/commands/command_approval.rs b/src/commands/command_approval.rsindex c9daa4f78..cee6a18c3 100644--- a/src/commands/command_approval.rs+++ b/src/commands/command_approval.rs@@ -7,8 +7,8 @@ use anyhow::Context;use worktrunk::config::{Command, WorktrunkConfig};use worktrunk::git::GitError;use worktrunk::styling::{- AnstyleStyle, HINT_EMOJI, INFO_EMOJI, WARNING, WARNING_BOLD, WARNING_EMOJI, eprint, eprintln,- format_bash_with_gutter, stderr,+ AnstyleStyle, HINT, HINT_EMOJI, INFO_EMOJI, WARNING, WARNING_BOLD, WARNING_EMOJI, eprint,+ eprintln, format_bash_with_gutter, stderr,};/// Batch approval helper used when multiple commands are queued for execution.@@ -66,7 +66,9 @@ pub fn approve_command_batch(if updated && let Err(e) = fresh_config.save() {let _ = output::warning(format!("Failed to save command approval: {e}"));- let _ = output::hint("Approval will be requested again next time.");+ let _ = output::hint(format!(+ "{HINT}Approval will be requested again next time.{HINT:#}"+ ));}}diff --git a/src/commands/commit.rs b/src/commands/commit.rsindex e9deb0175..4d5ce0de8 100644--- a/src/commands/commit.rs+++ b/src/commands/commit.rs@@ -143,7 +143,9 @@ impl CommitOptions<'_> {.unwrap_or(false);if self.no_verify && has_pre_commit {- crate::output::hint("Skipping pre-commit hook (--no-verify)")?;+ crate::output::hint(format!(+ "{HINT}Skipping pre-commit hook (--no-verify){HINT:#}"+ ))?;} else if let Some(ref config) = project_config {let pipeline = HookPipeline::new(*self.ctx);pipeline.run_pre_commit(config, self.target_branch, self.auto_trust)?;diff --git a/src/commands/config.rs b/src/commands/config.rsindex 851d47ce8..a9a921d29 100644--- a/src/commands/config.rs+++ b/src/commands/config.rs@@ -58,8 +58,12 @@ pub fn handle_config_create() -> anyhow::Result<()> {format_path_for_display(&config_path)))?;output::blank()?;- output::hint("Use 'wt config show' to view existing configuration")?;- output::hint("Use 'wt config create --help' for config format reference")?;+ output::hint(format!(+ "{HINT}Use 'wt config show' to view existing configuration{HINT:#}"+ ))?;+ output::hint(format!(+ "{HINT}Use 'wt config create --help' for config format reference{HINT:#}"+ ))?;return Ok(());}@@ -80,7 +84,9 @@ pub fn handle_config_create() -> anyhow::Result<()> {format_path_for_display(&config_path)))?;output::blank()?;- output::hint("Edit this file to customize worktree paths and LLM settings")?;+ output::hint(format!(+ "{HINT}Edit this file to customize worktree paths and LLM settings{HINT:#}"+ ))?;Ok(())}diff --git a/src/commands/standalone.rs b/src/commands/standalone.rsindex 44f891bd0..9bc402aa5 100644--- a/src/commands/standalone.rs+++ b/src/commands/standalone.rs@@ -1,7 +1,7 @@use anyhow::Context;use worktrunk::HookType;use worktrunk::git::Repository;-use worktrunk::styling::{AnstyleStyle, CYAN, CYAN_BOLD, GREEN_BOLD, format_with_gutter};+use worktrunk::styling::{AnstyleStyle, CYAN, CYAN_BOLD, GREEN_BOLD, HINT, format_with_gutter};use super::commit::{CommitGenerator, CommitOptions};use super::context::CommandEnv;@@ -141,7 +141,9 @@ pub fn handle_squash(.unwrap_or(false);if skip_pre_commit && has_pre_commit {- crate::output::hint("Skipping pre-commit hook (--no-verify)")?;+ crate::output::hint(format!(+ "{HINT}Skipping pre-commit hook (--no-verify){HINT:#}"+ ))?;} else if let Some(ref config) = project_config {HookPipeline::new(ctx).run_pre_commit(config, Some(&target_branch), auto_trust)?;}@@ -219,7 +221,7 @@ pub fn handle_squash(let (sha, _restore_cmd) = repo.create_safety_backup(&backup_message)?;use worktrunk::styling::AnstyleStyle;let dim = AnstyleStyle::new().dimmed();- crate::output::hint(format!("Backup created @ {dim}{sha}{dim:#}"))?;+ crate::output::hint(format!("{HINT}Backup created @ {dim}{sha}{dim:#}{HINT:#}"))?;}// Get commit subjects for the squash messagediff --git a/src/main.rs b/src/main.rsindex 746c82bb2..73966df55 100644--- a/src/main.rs+++ b/src/main.rs@@ -5,7 +5,7 @@ use std::process;use worktrunk::config::{WorktrunkConfig, set_config_path};use worktrunk::git::{Repository, exit_code, is_command_not_approved, set_base_path};use worktrunk::path::format_path_for_display;-use worktrunk::styling::{format_with_gutter, println};+use worktrunk::styling::{HINT, format_with_gutter, println};mod cli;mod commands;@@ -294,7 +294,7 @@ fn main() {for (shell, path) in &scan_result.skipped {let path = format_path_for_display(path);crate::output::hint(format!(- "Skipped {bold}{shell}{bold:#}; {path} not found"+ "{HINT}Skipped {bold}{shell}{bold:#}; {path} not found{HINT:#}"))?;}@@ -343,11 +343,11 @@ fn main() {// Fish auto-sources from conf.d, so just say "Restart shell"// Bash/Zsh can source directly for immediate activationif matches!(result.shell, worktrunk::shell::Shell::Fish) {- crate::output::hint("Restart shell to activate")?;+ crate::output::hint(format!("{HINT}Restart shell to activate{HINT:#}"))?;} else {let path = format_path_for_display(&result.path);crate::output::hint(format!(- "Restart shell or run: source {path}"+ "{HINT}Restart shell or run: source {path}{HINT:#}"))?;}}@@ -409,7 +409,7 @@ fn main() {))?;} else {crate::output::hint(format!(- "No {shell} {what} in {path}"+ "{HINT}No {shell} {what} in {path}{HINT:#}"))?;}}@@ -429,7 +429,7 @@ fn main() {))?;} else {crate::output::hint(format!(- "No {shell} completions in {path}"+ "{HINT}No {shell} completions in {path}{HINT:#}"))?;}}@@ -439,9 +439,9 @@ fn main() {if total_changes == 0 {if all_not_found == 0 {crate::output::blank()?;- crate::output::hint(- "No shell integration found to remove",- )?;+ crate::output::hint(format!(+ "{HINT}No shell integration found to remove{HINT:#}"+ ))?;}return Ok(());}@@ -465,7 +465,7 @@ fn main() {});if current_shell_affected {- crate::output::hint("Restart shell to complete uninstall")?;+ crate::output::hint(format!("{HINT}Restart shell to complete uninstall{HINT:#}"))?;}Ok(())})@@ -781,25 +781,23 @@ fn main() {let _ = output::terminate_output();if let Err(e) = result {- // Route through output system to respect mode:- // - Interactive mode: errors go to stdout- // - Directive mode: errors go to stderr+ use worktrunk::styling::{ERROR, ERROR_EMOJI};- // Check if it's a typed GitError - use its styled output+ // GitError and WorktrunkError produce styled messagesif let Some(git_err) = e.downcast_ref::<worktrunk::git::GitError>() {- let _ = output::error(git_err.styled());+ let _ = output::print(git_err.styled());+ } else if let Some(wt_err) = e.downcast_ref::<worktrunk::git::WorktrunkError>() {+ let _ = output::print(wt_err.to_string());} else {- // Anyhow error - multi-line errors from external commands get gutter formatting.- // We detect this by checking if context was added: e.to_string() != root_cause means- // the error was wrapped with .context(), so the root cause is raw external output.+ // Anyhow error - format with emoji/styling, multi-line gets gutterlet msg = e.to_string();let root_cause = e.root_cause().to_string();let has_context = msg != root_cause;if has_context && root_cause.contains('\n') {- let _ = output::error(msg);+ let _ = output::print(format!("{ERROR_EMOJI} {ERROR}{msg}{ERROR:#}"));let _ = output::gutter(format_with_gutter(&root_cause, "", None));} else {- let _ = output::error(msg);+ let _ = output::print(format!("{ERROR_EMOJI} {ERROR}{msg}{ERROR:#}"));}}diff --git a/src/output/global.rs b/src/output/global.rsindex 248c71422..644674ff6 100644--- a/src/output/global.rs+++ b/src/output/global.rs@@ -105,15 +105,11 @@ pub fn warning(message: impl Into<String>) -> io::Result<()> {with_output(|h| h.warning(message.into()))}-/// Emit an error message+/// Print a message (written as-is)///-/// Error messages are critical failures like "β Cannot remove main worktree"-/// The message is already formatted (includes ERROR_EMOJI from WorktrunkError::Display).-///-/// In interactive mode: goes to stdout (with other worktrunk output)-/// In directive mode: goes to stderr (with other user-facing messages)-pub fn error(message: impl Into<String>) -> io::Result<()> {- with_output(|h| h.error(message.into()))+/// The caller is responsible for formatting.+pub fn print(message: impl Into<String>) -> io::Result<()> {+ with_output(|h| h.print(message.into()))}/// Emit gutter-formatted contentdiff --git a/src/output/handlers.rs b/src/output/handlers.rsindex b7f19ca8e..e5097e2d0 100644--- a/src/output/handlers.rs+++ b/src/output/handlers.rs@@ -140,7 +140,7 @@ fn format_remove_worktree_message(}}-/// Shell integration hint message (without emoji - hint() adds it automatically)+/// Shell integration hint message (with HINT styling - emoji added by shell_integration_hint())fn shell_integration_hint() -> String {use worktrunk::styling::HINT;format!("{HINT}Run `wt config shell install` to enable automatic cd{HINT:#}")diff --git a/src/output/interactive.rs b/src/output/interactive.rsindex 8299da7bb..2391e025c 100644--- a/src/output/interactive.rs+++ b/src/output/interactive.rs@@ -2,7 +2,7 @@use std::io::{self, Write};use std::path::Path;-use worktrunk::styling::{ERROR, ERROR_EMOJI, eprintln, println, stderr, stdout};+use worktrunk::styling::{eprintln, stderr};#[cfg(not(unix))]use super::handlers::execute_streaming;@@ -15,42 +15,34 @@ use super::traits::OutputHandler;pub struct InteractiveOutput {/// Target directory for command execution (set by change_directory)target_dir: Option<std::path::PathBuf>,- /// Cached stdout handle- stdout: io::Stdout,}impl InteractiveOutput {pub fn new() -> Self {- Self {- target_dir: None,- stdout: io::stdout(),- }+ Self { target_dir: None }}}impl OutputHandler for InteractiveOutput {fn write_message_line(&mut self, line: &str) -> io::Result<()> {- // Use styled println for proper color detection- println!("{line}");- self.stdout.flush()- }-- fn error(&mut self, message: String) -> io::Result<()> {- // Errors go to stderr in all modes (Unix convention)- if message.starts_with(ERROR_EMOJI) {- eprintln!("{message}");- } else {- eprintln!("{ERROR_EMOJI} {ERROR}{message}{ERROR:#}");- }+ // All messages go to stderr (stdout reserved for data like JSON)+ eprintln!("{line}");stderr().flush()}fn gutter(&mut self, content: String) -> io::Result<()> {- // Gutter content is diagnostic/informational, not data - goes to stderr+ // Gutter uses write! (no newline) rather than writeln!write!(stderr(), "{content}")?;stderr().flush()}+ fn raw(&mut self, content: String) -> io::Result<()> {+ // JSON and structured data go to stdout for piping+ use worktrunk::styling::println;+ println!("{content}");+ io::stdout().flush()+ }+fn shell_integration_hint(&mut self, message: String) -> io::Result<()> {// Shell integration hints work the same as regular hints in interactive modeself.hint(message)@@ -95,8 +87,7 @@ impl OutputHandler for InteractiveOutput {}fn flush_for_stderr_prompt(&mut self) -> io::Result<()> {- // In interactive mode, flush both streams before stderr prompt- stdout().flush()?;+ // All messages go to stderr, so just flush stderrstderr().flush()}diff --git a/src/output/mod.rs b/src/output/mod.rsindex e167a9526..36e075339 100644--- a/src/output/mod.rs+++ b/src/output/mod.rs@@ -63,8 +63,8 @@ mod traits;// Re-export the public APIpub use global::{- OutputMode, blank, change_directory, error, execute, flush, flush_for_stderr_prompt, gutter,- hint, info, initialize, progress, raw, raw_terminal, shell_integration_hint, success,+ OutputMode, blank, change_directory, execute, flush, flush_for_stderr_prompt, gutter, hint,+ info, initialize, print, progress, raw, raw_terminal, shell_integration_hint, success,terminate_output, warning,};// Re-export output handlersdiff --git a/src/output/traits.rs b/src/output/traits.rsindex f04fc1774..c87dc5a66 100644--- a/src/output/traits.rs+++ b/src/output/traits.rs@@ -6,9 +6,7 @@use std::io::{self, Write};use std::path::Path;-use worktrunk::styling::{- ERROR, ERROR_EMOJI, HINT, HINT_EMOJI, INFO_EMOJI, PROGRESS_EMOJI, SUCCESS_EMOJI, WARNING_EMOJI,-};+use worktrunk::styling::{HINT_EMOJI, INFO_EMOJI, PROGRESS_EMOJI, SUCCESS_EMOJI, WARNING_EMOJI};/// Core output handler trait///@@ -30,7 +28,7 @@ pub trait OutputHandler {/// Emit a hint messagefn hint(&mut self, message: String) -> io::Result<()> {- self.write_message_line(&format!("{HINT_EMOJI} {HINT}{message}{HINT:#}"))+ self.write_message_line(&format!("{HINT_EMOJI} {message}"))}/// Emit an info message@@ -43,14 +41,9 @@ pub trait OutputHandler {self.write_message_line(&format!("{WARNING_EMOJI} {message}"))}- /// Emit an error message- fn error(&mut self, message: String) -> io::Result<()> {- // Add emoji and styling if not already present- if message.starts_with(ERROR_EMOJI) {- self.write_message_line(&message)- } else {- self.write_message_line(&format!("{ERROR_EMOJI} {ERROR}{message}{ERROR:#}"))- }+ /// Print a message (written as-is)+ fn print(&mut self, message: String) -> io::Result<()> {+ self.write_message_line(&message)}/// Emit gutter-formatted content (no emoji)diff --git a/tests/integration_tests/config_init.rs b/tests/integration_tests/config_init.rsindex 4443e2432..6240b0302 100644--- a/tests/integration_tests/config_init.rs+++ b/tests/integration_tests/config_init.rs@@ -28,12 +28,12 @@ fn test_config_init_already_exists() {success: trueexit_code: 0----- stdout -----++ ----- stderr -----βͺ Global config already exists: [1m~/.config/worktrunk/config.toml[0mπ‘ [2mUse 'wt config show' to view existing configuration[0mπ‘ [2mUse 'wt config create --help' for config format reference[0m-- ----- stderr -----");});}@@ -57,11 +57,11 @@ fn test_config_init_creates_file() {success: trueexit_code: 0----- stdout -----++ ----- stderr -----β [32mCreated config file: [1m[32m~/.config/worktrunk/config.toml[0m[0mπ‘ [2mEdit this file to customize worktree paths and LLM settings[0m-- ----- stderr -----");});diff --git a/tests/integration_tests/config_status.rs b/tests/integration_tests/config_status.rsindex 42551c65c..24b3c7edd 100644--- a/tests/integration_tests/config_status.rs+++ b/tests/integration_tests/config_status.rs@@ -20,7 +20,7 @@ fn test_config_status_set_branch_default() {.output().unwrap();assert!(output.status.success());- assert_snapshot!(String::from_utf8_lossy(&output.stdout), @"β [32mSet status for [1m[32mmain[0m[32m to [1m[32mπ§[0m[0m");+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"β [32mSet status for [1m[32mmain[0m[32m to [1m[32mπ§[0m[0m");// Verify it was setlet output = repo@@ -40,7 +40,7 @@ fn test_config_status_set_branch_specific() {.output().unwrap();assert!(output.status.success());- assert_snapshot!(String::from_utf8_lossy(&output.stdout), @"β [32mSet status for [1m[32mfeature[0m[32m to [1m[32mπ§[0m[0m");+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"β [32mSet status for [1m[32mfeature[0m[32m to [1m[32mπ§[0m[0m");// Verify it was setlet output = repo@@ -62,7 +62,7 @@ fn test_config_status_unset_branch_default() {let output = wt_config_status_cmd(&repo, &["unset"]).output().unwrap();assert!(output.status.success());- assert_snapshot!(String::from_utf8_lossy(&output.stdout), @"β [32mCleared status for [1m[32mmain[0m[0m");+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"β [32mCleared status for [1m[32mmain[0m[0m");// Verify it was unsetlet output = repo@@ -86,7 +86,7 @@ fn test_config_status_unset_branch_specific() {.output().unwrap();assert!(output.status.success());- assert_snapshot!(String::from_utf8_lossy(&output.stdout), @"β [32mCleared status for [1m[32mfeature[0m[0m");+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"β [32mCleared status for [1m[32mfeature[0m[0m");// Verify it was unsetlet output = repo@@ -116,7 +116,7 @@ fn test_config_status_unset_all() {.output().unwrap();assert!(output.status.success());- assert_snapshot!(String::from_utf8_lossy(&output.stdout), @"β [32mCleared [1m[32m3[0m[32m statuses[0m");+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"β [32mCleared [1m[32m3[0m[32m statuses[0m");// Verify all were unsetlet output = repo@@ -135,5 +135,6 @@ fn test_config_status_unset_all_empty() {.output().unwrap();assert!(output.status.success());- assert_snapshot!(String::from_utf8_lossy(&output.stdout), @"βͺ No statuses to clear");+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"βͺ No statuses to clear+");}diff --git a/tests/integration_tests/configure_shell.rs b/tests/integration_tests/configure_shell.rsindex 49de9cb39..c46b16ac8 100644--- a/tests/integration_tests/configure_shell.rs+++ b/tests/integration_tests/configure_shell.rs@@ -29,17 +29,17 @@ fn test_configure_shell_with_yes() {success: trueexit_code: 0----- stdout -----++ ----- stderr -----+ π‘ [33mCompletions won't work: zsh's compinit is not enabled.[0m+ [33m Add this to ~/.zshrc before the wt line:[0m+ [33m autoload -Uz compinit && compinit[0mβ Added shell extension & completions for [1mzsh[0m @ [1m~/.zshrc[0mπ‘ [2mSkipped [1mbash[0m; ~/.bashrc not found[0mπ‘ [2mSkipped [1mfish[0m; ~/.config/fish/conf.d not found[0mβ Configured 1 shellπ‘ [2mRestart shell or run: source ~/.zshrc[0m-- ----- stderr ------ π‘ [33mCompletions won't work: zsh's compinit is not enabled.[0m- [33m Add this to ~/.zshrc before the wt line:[0m- [33m autoload -Uz compinit && compinit[0m");});@@ -75,15 +75,15 @@ fn test_configure_shell_specific_shell() {success: trueexit_code: 0----- stdout ------ β Added shell extension & completions for [1mzsh[0m @ [1m~/.zshrc[0m-- β Configured 1 shell- π‘ [2mRestart shell or run: source ~/.zshrc[0m----- stderr -----π‘ [33mCompletions won't work: zsh's compinit is not enabled.[0m[33m Add this to ~/.zshrc before the wt line:[0m[33m autoload -Uz compinit && compinit[0m+ β Added shell extension & completions for [1mzsh[0m @ [1m~/.zshrc[0m++ β Configured 1 shell+ π‘ [2mRestart shell or run: source ~/.zshrc[0m");});@@ -123,10 +123,10 @@ fn test_configure_shell_already_exists() {success: trueexit_code: 0----- stdout ------ βͺ Already configured shell extension & completions for [1mzsh[0m @ [1m~/.zshrc[0m- βͺ All shells already configured----- stderr -----+ βͺ Already configured shell extension & completions for [1mzsh[0m @ [1m~/.zshrc[0m+ βͺ All shells already configured");});@@ -159,13 +159,13 @@ fn test_configure_shell_fish() {success: trueexit_code: 0----- stdout -----++ ----- stderr -----β Created shell extension for [1mfish[0m @ [1m~/.config/fish/conf.d/wt.fish[0mβ Created completions for [1mfish[0m @ [1m~/.config/fish/completions/wt.fish[0mβ Configured 1 shellπ‘ [2mRestart shell to activate[0m-- ----- stderr -----");});@@ -217,12 +217,12 @@ fn test_configure_shell_fish_extension_exists() {success: trueexit_code: 0----- stdout -----++ ----- stderr -----βͺ Already configured shell extension for [1mfish[0m @ [1m~/.config/fish/conf.d/wt.fish[0mβ Created completions for [1mfish[0m @ [1m~/.config/fish/completions/wt.fish[0mβ Configured 1 shell-- ----- stderr -----");});@@ -261,11 +261,11 @@ fn test_configure_shell_no_files() {success: falseexit_code: 1----- stdout -----++ ----- stderr -----π‘ [2mSkipped [1mbash[0m; ~/.bashrc not found[0mπ‘ [2mSkipped [1mzsh[0m; ~/.zshrc not found[0mπ‘ [2mSkipped [1mfish[0m; ~/.config/fish/conf.d not found[0m-- ----- stderr -----β [31mNo shell config files found[0m");});@@ -299,17 +299,17 @@ fn test_configure_shell_multiple_configs() {success: trueexit_code: 0----- stdout -----++ ----- stderr -----+ π‘ [33mCompletions won't work: zsh's compinit is not enabled.[0m+ [33m Add this to ~/.zshrc before the wt line:[0m+ [33m autoload -Uz compinit && compinit[0mβ Added shell extension & completions for [1mbash[0m @ [1m~/.bashrc[0mβ Added shell extension & completions for [1mzsh[0m @ [1m~/.zshrc[0mπ‘ [2mSkipped [1mfish[0m; ~/.config/fish/conf.d not found[0mβ Configured 2 shellsπ‘ [2mRestart shell or run: source ~/.zshrc[0m-- ----- stderr ------ π‘ [33mCompletions won't work: zsh's compinit is not enabled.[0m- [33m Add this to ~/.zshrc before the wt line:[0m- [33m autoload -Uz compinit && compinit[0m");});@@ -361,17 +361,17 @@ fn test_configure_shell_mixed_states() {success: trueexit_code: 0----- stdout -----++ ----- stderr -----+ π‘ [33mCompletions won't work: zsh's compinit is not enabled.[0m+ [33m Add this to ~/.zshrc before the wt line:[0m+ [33m autoload -Uz compinit && compinit[0mβͺ Already configured shell extension & completions for [1mbash[0m @ [1m~/.bashrc[0mβ Added shell extension & completions for [1mzsh[0m @ [1m~/.zshrc[0mπ‘ [2mSkipped [1mfish[0m; ~/.config/fish/conf.d not found[0mβ Configured 1 shellπ‘ [2mRestart shell or run: source ~/.zshrc[0m-- ----- stderr ------ π‘ [33mCompletions won't work: zsh's compinit is not enabled.[0m- [33m Add this to ~/.zshrc before the wt line:[0m- [33m autoload -Uz compinit && compinit[0m");});@@ -421,6 +421,8 @@ fn test_uninstall_shell() {success: trueexit_code: 0----- stdout -----++ ----- stderr -----β Removed shell extension & completions for [1mzsh[0m @ [1m~/.zshrc[0mπ‘ [2mNo bash shell extension & completions in ~/.bashrc[0mπ‘ [2mNo fish shell extension in ~/.config/fish/conf.d/wt.fish[0m@@ -428,8 +430,6 @@ fn test_uninstall_shell() {β Removed integration from 1 shellπ‘ [2mRestart shell to complete uninstall[0m-- ----- stderr -----");});@@ -481,6 +481,8 @@ fn test_uninstall_shell_multiple() {success: trueexit_code: 0----- stdout -----++ ----- stderr -----β Removed shell extension & completions for [1mbash[0m @ [1m~/.bashrc[0mβ Removed shell extension & completions for [1mzsh[0m @ [1m~/.zshrc[0mπ‘ [2mNo fish shell extension in ~/.config/fish/conf.d/wt.fish[0m@@ -488,8 +490,6 @@ fn test_uninstall_shell_multiple() {β Removed integration from 2 shellsπ‘ [2mRestart shell to complete uninstall[0m-- ----- stderr -----");});@@ -534,9 +534,9 @@ fn test_uninstall_shell_not_found() {success: trueexit_code: 0----- stdout ------ π‘ No shell extension & completions found in ~/.zshrc----- stderr -----+ π‘ No shell extension & completions found in ~/.zshrc");});}@@ -574,12 +574,12 @@ fn test_uninstall_shell_fish() {success: trueexit_code: 0----- stdout -----++ ----- stderr -----β Removed shell extension for [1mfish[0m @ [1m~/.config/fish/conf.d/wt.fish[0mβ Removed integration from 1 shellπ‘ [2mRestart shell to complete uninstall[0m-- ----- stderr -----");});@@ -688,12 +688,12 @@ fn test_configure_shell_no_warning_when_compinit_enabled() {success: trueexit_code: 0----- stdout -----++ ----- stderr -----β Added shell extension & completions for [1mzsh[0m @ [1m~/.zshrc[0mβ Configured 1 shellπ‘ [2mRestart shell or run: source ~/.zshrc[0m-- ----- stderr -----");});}@@ -728,14 +728,14 @@ fn test_configure_shell_no_warning_for_bash_user() {success: trueexit_code: 0----- stdout -----++ ----- stderr -----β Added shell extension & completions for [1mbash[0m @ [1m~/.bashrc[0mβ Added shell extension & completions for [1mzsh[0m @ [1m~/.zshrc[0mπ‘ [2mSkipped [1mfish[0m; ~/.config/fish/conf.d not found[0mβ Configured 2 shellsπ‘ [2mRestart shell or run: source ~/.bashrc[0m-- ----- stderr -----");});}@@ -769,12 +769,12 @@ fn test_configure_shell_no_warning_for_fish_install() {success: trueexit_code: 0----- stdout -----++ ----- stderr -----β Created shell extension for [1mfish[0m @ [1m~/.config/fish/conf.d/wt.fish[0mβ Created completions for [1mfish[0m @ [1m~/.config/fish/completions/wt.fish[0mβ Configured 1 shell-- ----- stderr -----");});}@@ -811,10 +811,10 @@ fn test_configure_shell_no_warning_when_already_configured() {success: trueexit_code: 0----- stdout ------ βͺ Already configured shell extension & completions for [1mzsh[0m @ [1m~/.zshrc[0m- βͺ All shells already configured----- stderr -----+ βͺ Already configured shell extension & completions for [1mzsh[0m @ [1m~/.zshrc[0m+ βͺ All shells already configured");});}@@ -848,13 +848,13 @@ fn test_configure_shell_no_warning_when_shell_unset() {success: trueexit_code: 0----- stdout -----++ ----- stderr -----β Added shell extension & completions for [1mbash[0m @ [1m~/.bashrc[0mβ Added shell extension & completions for [1mzsh[0m @ [1m~/.zshrc[0mπ‘ [2mSkipped [1mfish[0m; ~/.config/fish/conf.d not found[0mβ Configured 2 shells-- ----- stderr -----");});}diff --git a/tests/integration_tests/directives.rs b/tests/integration_tests/directives.rsindex 25a501b8c..00766c12f 100644--- a/tests/integration_tests/directives.rs+++ b/tests/integration_tests/directives.rs@@ -112,9 +112,9 @@ fn test_remove_without_internal() {success: trueexit_code: 0----- stdout ------ π [36mRemoving [1m[36mmain[0m[36m worktree & branch in background[0m----- stderr -----+ π [36mRemoving [1m[36mmain[0m[36m worktree & branch in background[0m");});}diff --git a/tests/integration_tests/merge.rs b/tests/integration_tests/merge.rsindex 39172e7a5..fe7240ef6 100644--- a/tests/integration_tests/merge.rs+++ b/tests/integration_tests/merge.rs@@ -2452,14 +2452,14 @@ fn test_merge_no_commit_with_clean_tree() {success: trueexit_code: 0----- stdout ------ π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[0m (no commit/squash/rebase needed)- β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)- βͺ Worktree preserved (--no-remove)----- stderr -----+ π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[0m (no commit/squash/rebase needed)[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)+ β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+ βͺ Worktree preserved (--no-remove)");});}@@ -2555,14 +2555,14 @@ fn test_merge_no_commit_no_squash_no_remove_redundant() {success: trueexit_code: 0----- stdout ------ π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[0m (no commit/squash/rebase needed)- β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)- βͺ Worktree preserved (--no-remove)----- stderr -----+ π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[0m (no commit/squash/rebase needed)[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)+ β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+ βͺ Worktree preserved (--no-remove)");});}diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snapindex 344490a3d..8e93f6371 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@@ -14,4 +14,4 @@ y[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]/repo.test-approve[0m[0m-π‘ [2m[2mRun `wt config shell install` to enable automatic cd[0m[0m+π‘ [2mRun `wt config shell install` to enable automatic cd[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 e606e8693..62466368b 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@@ -12,4 +12,4 @@ nπ‘ Allow and remember? [1m[y/N][0mβͺ Commands declined, continuing worktree creationβ [32mCreated new worktree for [1m[32mtest-decline[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO]/repo.test-decline[0m[0m-π‘ [2m[2mRun `wt config shell install` to enable automatic cd[0m[0m+π‘ [2mRun `wt config shell install` to enable automatic cd[0mdiff --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 33fba1242..9fff2439f 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@@ -23,4 +23,4 @@ y[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]/repo.test-mixed-accept[0m[0m-π‘ [2m[2mRun `wt config shell install` to enable automatic cd[0m[0m+π‘ [2mRun `wt config shell install` to enable automatic cd[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 8e2fd677d..bf5eb1525 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@@ -15,4 +15,4 @@ nπ‘ Allow and remember? [1m[y/N][0mβͺ Commands declined, continuing worktree creationβ [32mCreated new worktree for [1m[32mtest-mixed-decline[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO]/repo.test-mixed-decline[0m[0m-π‘ [2m[2mRun `wt config shell install` to enable automatic cd[0m[0m+π‘ [2mRun `wt config shell install` to enable automatic cd[0mdiff --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 19e2c7b8f..d76b2f816 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@@ -26,4 +26,4 @@ y[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]/repo.test-multi[0m[0m-π‘ [2m[2mRun `wt config shell install` to enable automatic cd[0m[0m+π‘ [2mRun `wt config shell install` to enable automatic cd[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 21777b3c3..69a92bcab 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@@ -26,4 +26,4 @@ y[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]/repo.test-named[0m[0m-π‘ [2m[2mRun `wt config shell install` to enable automatic cd[0m[0m+π‘ [2mRun `wt config shell install` to enable automatic cd[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 a280775c3..affe0f309 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@@ -16,4 +16,4 @@ y[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]/repo.test-permission[0m[0m-π‘ [2m[2mRun `wt config shell install` to enable automatic cd[0m[0m+π‘ [2mRun `wt config shell install` to enable automatic cd[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 8e0da2f92..fb396f2c7 100644--- a/tests/snapshots/integration__integration_tests__approval_ui__already_approved_skip_prompt.snap+++ b/tests/snapshots/integration__integration_tests__approval_ui__already_approved_skip_prompt.snap@@ -23,10 +23,9 @@ info:success: trueexit_code: 0----- stdout ------π [36mRunning post-create:[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[0m----- stderr -----+π [36mRunning post-create:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'approved'[0m[2m [0m[2m[36m>[0m[2m output.txt[0m-[0m+[0mβ [32mCreated new worktree for [1m[32mtest-approved[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].test-approved[0m[0m+π‘ [2mRun `wt config shell install` to enable automatic cd[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 1884a44c9..953e69f12 100644--- a/tests/snapshots/integration__integration_tests__approval_ui__force_bypasses_tty_check.snap+++ b/tests/snapshots/integration__integration_tests__approval_ui__force_bypasses_tty_check.snap@@ -24,10 +24,10 @@ info:success: trueexit_code: 0----- stdout ------π [36mRunning post-create:[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[0m----- stderr -----+π [36mRunning post-create:[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-force-tty[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].test-force-tty[0m[0m+π‘ [2mRun `wt config shell install` to enable automatic cd[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 fdf5df4fc..a8f6f1c01 100644--- a/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_first_run.snap+++ b/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_first_run.snap@@ -24,10 +24,9 @@ info:success: trueexit_code: 0----- stdout ------π [36mRunning post-create:[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[0m----- stderr -----+π [36mRunning post-create:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test command'[0m[2m [0m[2m[36m>[0m[2m output.txt[0m-[0m+[0mβ [32mCreated new worktree for [1m[32mtest-force[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].test-force[0m[0m+π‘ [2mRun `wt config shell install` to enable automatic cd[0mdiff --git a/tests/snapshots/integration__integration_tests__approvals__add_approvals_empty_config.snap b/tests/snapshots/integration__integration_tests__approvals__add_approvals_empty_config.snapindex 5295feb9b..4d6db61e7 100644--- a/tests/snapshots/integration__integration_tests__approvals__add_approvals_empty_config.snap+++ b/tests/snapshots/integration__integration_tests__approvals__add_approvals_empty_config.snap@@ -16,12 +16,13 @@ info:GIT_EDITOR: ""LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1761609600"+ SOURCE_DATE_EPOCH: "1735776000"+ WORKTRUNK_BIN: ""WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ------βͺ No commands configured in project----- stderr -----+βͺ No commands configured in projectdiff --git a/tests/snapshots/integration__integration_tests__approvals__add_approvals_force.snap b/tests/snapshots/integration__integration_tests__approvals__add_approvals_force.snapindex b273a74d9..dfc9d4dd4 100644--- a/tests/snapshots/integration__integration_tests__approvals__add_approvals_force.snap+++ b/tests/snapshots/integration__integration_tests__approvals__add_approvals_force.snap@@ -17,12 +17,13 @@ info:GIT_EDITOR: ""LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1761609600"+ SOURCE_DATE_EPOCH: "1735776000"+ WORKTRUNK_BIN: ""WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ------β [32mCommands approved; not saved (--force)[0m----- stderr -----+β [32mCommands approved; not saved (--force)[0mdiff --git a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_after_clear.snap b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_after_clear.snapindex c84019e91..5c25bd8f2 100644--- a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_after_clear.snap+++ b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_after_clear.snap@@ -16,12 +16,13 @@ info:GIT_EDITOR: ""LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1761609600"+ SOURCE_DATE_EPOCH: "1735776000"+ WORKTRUNK_BIN: ""WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ------βͺ [2mNo approvals to clear for this project[0m----- stderr -----+βͺ [2mNo approvals to clear for this project[0mdiff --git a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_global_no_approvals.snap b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_global_no_approvals.snapindex 04df3c0df..76cf9804e 100644--- a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_global_no_approvals.snap+++ b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_global_no_approvals.snap@@ -17,12 +17,13 @@ info:GIT_EDITOR: ""LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1761609600"+ SOURCE_DATE_EPOCH: "1735776000"+ WORKTRUNK_BIN: ""WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ------βͺ [2mNo approvals to clear[0m----- stderr -----+βͺ [2mNo approvals to clear[0mdiff --git a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_global_with_approvals.snap b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_global_with_approvals.snapindex 90e7e548d..00a3ed768 100644--- a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_global_with_approvals.snap+++ b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_global_with_approvals.snap@@ -17,12 +17,13 @@ info:GIT_EDITOR: ""LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1761609600"+ SOURCE_DATE_EPOCH: "1735776000"+ WORKTRUNK_BIN: ""WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ------β [32mCleared approvals for 1 project[0m----- stderr -----+β [32mCleared approvals for 1 project[0mdiff --git a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_multiple_approvals.snap b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_multiple_approvals.snapindex c84019e91..5c25bd8f2 100644--- a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_multiple_approvals.snap+++ b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_multiple_approvals.snap@@ -16,12 +16,13 @@ info:GIT_EDITOR: ""LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1761609600"+ SOURCE_DATE_EPOCH: "1735776000"+ WORKTRUNK_BIN: ""WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ------βͺ [2mNo approvals to clear for this project[0m----- stderr -----+βͺ [2mNo approvals to clear for this project[0mdiff --git a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_no_approvals.snap b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_no_approvals.snapindex c84019e91..5c25bd8f2 100644--- a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_no_approvals.snap+++ b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_no_approvals.snap@@ -16,12 +16,13 @@ info:GIT_EDITOR: ""LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1761609600"+ SOURCE_DATE_EPOCH: "1735776000"+ WORKTRUNK_BIN: ""WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ------βͺ [2mNo approvals to clear for this project[0m----- stderr -----+βͺ [2mNo approvals to clear for this project[0mdiff --git a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_with_approvals.snap b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_with_approvals.snapindex c84019e91..5c25bd8f2 100644--- a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_with_approvals.snap+++ b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_with_approvals.snap@@ -16,12 +16,13 @@ info:GIT_EDITOR: ""LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1761609600"+ SOURCE_DATE_EPOCH: "1735776000"+ WORKTRUNK_BIN: ""WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ------βͺ [2mNo approvals to clear for this project[0m----- stderr -----+βͺ [2mNo approvals to clear for this project[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_already_on_target.snap b/tests/snapshots/integration__integration_tests__merge__merge_already_on_target.snapindex 244330418..03b5831dd 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_already_on_target.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_already_on_target.snap@@ -14,14 +14,14 @@ info:GIT_EDITOR: ""LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1761609600"+ SOURCE_DATE_EPOCH: "1735776000"WORKTRUNK_BIN: ""WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ------βͺ Already up to date with [1mmain[0m (no new commits, no rebase needed)-βͺ Worktree preserved (on main branch)----- stderr -----+βͺ Already up to date with [1mmain[0m (no new commits, no rebase needed)+βͺ Worktree preserved (on main branch)diff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snapindex cb6cbcaa9..aa786d4ed 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap@@ -22,17 +22,17 @@ info:success: trueexit_code: 0----- stdout -----++----- stderr -----π [36mSquashing 2 commits & working tree changes into a single commit[0m (2 files, [32m+2[0m)...π‘ [2mBackup created @ [2m330ccd6[0m[0mπ [36mGenerating squash commit message...[0m+[107m [0m [1mfix: update file 1 content[0mβ [32mSquashed @ [2m[32mb54183b[0m[0mπ [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36mb54183b[0m[0m (no rebase needed)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 2 files, [32m+2[0m)-π [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m------- stderr ------[107m [0m [1mfix: update file 1 content[0m[107m [0m * [33mb54183b[m fix: update file 1 content[107m [0m file1.txt | 1 [32m+[m[107m [0m file2.txt | 1 [32m+[m[107m [0m 2 files changed, 2 insertions(+)+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 2 files, [32m+2[0m)+π [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snapindex 97d5c96f6..9f565dbf9 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap@@ -22,20 +22,20 @@ info:success: trueexit_code: 0----- stdout -----++----- stderr -----π [36mSquashing 1 commit & working tree changes into a single commit[0m (1 file, [32m+1[0m)...π‘ [2mBackup created @ [2mb18c23e[0m[0mπ [36mGenerating squash commit message...[0m-π‘ [2m[2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[0m-β [32mSquashed @ [2m[32md118927[0m[0m-π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36md118927[0m[0m (no rebase needed)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)-π [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m------- stderr -----+π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[107m [0m [1mSquash commits from main[0m[107m [0m[107m [0m Combined commits:[107m [0m - feat: initial feature+β [32mSquashed @ [2m[32md118927[0m[0m+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36md118927[0m[0m (no rebase needed)[107m [0m * [33md118927[m Squash commits from main[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+π [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snapindex d54126afb..06be630a1 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap@@ -22,16 +22,16 @@ info:success: trueexit_code: 0----- stdout -----++----- stderr -----π [36mSquashing 1 commit & working tree changes into a single commit[0m (1 file, [32m+1[0m)...π‘ [2mBackup created @ [2m967330a[0m[0mπ [36mGenerating squash commit message...[0m+[107m [0m [1mfix: improve auth validation logic[0mβ [32mSquashed @ [2m[32m1e3993e[0m[0mπ [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m1e3993e[0m[0m (no rebase needed)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)-π [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m------- stderr ------[107m [0m [1mfix: improve auth validation logic[0m[107m [0m * [33m1e3993e[m fix: improve auth validation logic[107m [0m auth.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+π [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_default_branch_missing_worktree.snap b/tests/snapshots/integration__integration_tests__merge__merge_default_branch_missing_worktree.snapindex 244330418..03b5831dd 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_default_branch_missing_worktree.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_default_branch_missing_worktree.snap@@ -14,14 +14,14 @@ info:GIT_EDITOR: ""LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1761609600"+ SOURCE_DATE_EPOCH: "1735776000"WORKTRUNK_BIN: ""WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ------βͺ Already up to date with [1mmain[0m (no new commits, no rebase needed)-βͺ Worktree preserved (on main branch)----- stderr -----+βͺ Already up to date with [1mmain[0m (no new commits, no rebase needed)+βͺ Worktree preserved (on main branch)diff --git a/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap b/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snapindex 6e1a5393a..36b588c61 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap@@ -22,17 +22,17 @@ info:success: trueexit_code: 0----- stdout ------π‘ [33mAuto-staging 1 untracked file:[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-β [32mCommitted changes @ [2m[32mc1126ec[0m[0m-π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36mc1126ec[0m[0m (no rebase needed)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)-π [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m----- stderr -----+π‘ [33mAuto-staging 1 untracked file:[0m[107m [0m dirty.txt+π [36mCommitting changes with default message...[0m (1 file, [32m+1[0m, no squashing needed)+π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[107m [0m [1mChanges to dirty.txt[0m+β [32mCommitted changes @ [2m[32mc1126ec[0m[0m+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36mc1126ec[0m[0m (no rebase needed)[107m [0m * [33mc1126ec[m Changes to dirty.txt[107m [0m dirty.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+π [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snapindex 075fd5a11..d6ba43970 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap@@ -22,11 +22,11 @@ info:success: trueexit_code: 0----- stdout ------π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[0m (no commit/squash/rebase needed)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)-π [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m----- stderr -----+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[0m (no commit/squash/rebase needed)[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+π [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snapindex a97a5d1e3..13adff816 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap@@ -15,13 +15,14 @@ info:GIT_EDITOR: ""LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1761609600"+ SOURCE_DATE_EPOCH: "1735776000"+ WORKTRUNK_BIN: ""WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ------βͺ Already up to date with [1mmain[0m (no new commits, no rebase needed)-π [36mRemoving [1m[36mno-commits[0m[36m worktree & branch in background[0m----- stderr -----+βͺ Already up to date with [1mmain[0m (no new commits, no rebase needed)+π [36mRemoving [1m[36mno-commits[0m[36m worktree & branch in background[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snapindex 9925d1504..a307377ef 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap@@ -22,17 +22,17 @@ info:success: trueexit_code: 0----- stdout ------π‘ [33mAuto-staging 1 untracked file:[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-β [32mCommitted changes @ [2m[32m96ddfbc[0m[0m-π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m96ddfbc[0m[0m (no rebase needed)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)-π [36mRemoving [1m[36mno-commits-dirty[0m[36m worktree & branch in background[0m----- stderr -----+π‘ [33mAuto-staging 1 untracked file:[0m[107m [0m newfile.txt+π [36mCommitting changes with default message...[0m (1 file, [32m+1[0m, no squashing needed)+π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[107m [0m [1mChanges to newfile.txt[0m+β [32mCommitted changes @ [2m[32m96ddfbc[0m[0m+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m96ddfbc[0m[0m (no rebase needed)[107m [0m * [33m96ddfbc[m Changes to newfile.txt[107m [0m newfile.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+π [36mRemoving [1m[36mno-commits-dirty[0m[36m worktree & branch in background[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snapindex 6d222a534..497a4ce3c 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap@@ -21,11 +21,11 @@ info:success: trueexit_code: 0----- stdout ------π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[0m (no commit/squash/rebase needed)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)-π [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m----- stderr -----+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[0m (no commit/squash/rebase needed)[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+π [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snapindex 3c74efd69..15a3cb90e 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap@@ -23,13 +23,13 @@ info:success: trueexit_code: 0----- stdout ------π [36mMerging 2 commits to [1m[36mmain[0m[36m @ [2m[36mbf212d3[0m[0m (no commit/squash/rebase needed)-β [32mMerged to [1m[32mmain[0m[0m (2 commits, 2 files, [32m+2[0m)-π [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m----- stderr -----+π [36mMerging 2 commits to [1m[36mmain[0m[36m @ [2m[36mbf212d3[0m[0m (no commit/squash/rebase needed)[107m [0m * [33mbf212d3[m feat: add file 2[107m [0m * [33m123e46c[m feat: add file 1[107m [0m file1.txt | 1 [32m+[m[107m [0m file2.txt | 1 [32m+[m[107m [0m 2 files changed, 2 insertions(+)+β [32mMerged to [1m[32mmain[0m[0m (2 commits, 2 files, [32m+2[0m)+π [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snapindex e7c334677..eb520ec88 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap@@ -22,11 +22,11 @@ info:success: trueexit_code: 0----- stdout ------π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m4af48f0[0m[0m (no commit/squash/rebase needed)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)-π [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m----- stderr -----+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m4af48f0[0m[0m (no commit/squash/rebase needed)[107m [0m * [33m4af48f0[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+π [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[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 6913cc7af..cf4ab86a0 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@@ -23,17 +23,17 @@ info:success: falseexit_code: 1----- stdout ------π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36mcdb002e[0m[0m (no commit/squash/rebase needed)-β [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-π‘ [33mCommand failed: exit status: 1[0m----- stderr -----+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36mcdb002e[0m[0m (no commit/squash/rebase needed)[107m [0m * [33mcdb002e[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)+β [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 [2m[0m[2m[34mexit[0m[2m 1[0m-[0mβ [31mpost-merge command failed: exit status: 1[0m+[0mπ‘ [33mCommand failed: exit status: 1[0m+β [31mpost-merge command failed: exit status: 1[0mπ‘ [2mUse --no-verify to skip post-merge commands[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 3977550a3..abbc2b14b 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@@ -23,16 +23,16 @@ info:success: trueexit_code: 0----- stdout ------π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m8609b84[0m[0m (no commit/squash/rebase needed)-β [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-π [36mRunning post-merge [1mdeploy[0m:[0m----- stderr -----+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m8609b84[0m[0m (no commit/squash/rebase needed)[107m [0m * [33m8609b84[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)+β [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 [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Merge to main complete'[0m[2m [0m[2m[36m>[0m[2m notify.txt[0m-[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+[0mπ [36mRunning post-merge [1mdeploy[0m:[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[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_no_verify.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_no_verify.snapindex fb4dcff01..6fdcf8d01 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_no_verify.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_no_verify.snap@@ -24,11 +24,11 @@ info:success: trueexit_code: 0----- stdout ------π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m72ff5fc[0m[0m (no commit/squash/rebase needed)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)-π [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m----- stderr -----+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m72ff5fc[0m[0m (no commit/squash/rebase needed)[107m [0m * [33m72ff5fc[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+π [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[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 a1209117d..7e10ebab6 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@@ -23,14 +23,14 @@ info:success: trueexit_code: 0----- stdout ------π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m72ff5fc[0m[0m (no commit/squash/rebase needed)-β [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----- stderr -----+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m72ff5fc[0m[0m (no commit/squash/rebase needed)[107m [0m * [33m72ff5fc[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)+β [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 [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[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_from_main_branch.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_from_main_branch.snapindex 238492c42..39b3c28d8 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_from_main_branch.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_from_main_branch.snap@@ -22,10 +22,10 @@ info:success: trueexit_code: 0----- stdout -----++----- stderr -----βͺ Already up to date with [1mmain[0m (no new commits, no rebase needed)βͺ Worktree preserved (on main branch)π [36mRunning post-merge:[0m------- stderr -----[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'post-merge ran from main'[0m[2m [0m[2m[36m>[0m[2m post-merge-ran.txt[0m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_with_nothing_to_merge.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_with_nothing_to_merge.snapindex d61c82505..ec4e07d69 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_with_nothing_to_merge.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_with_nothing_to_merge.snap@@ -23,10 +23,10 @@ info:success: trueexit_code: 0----- stdout -----++----- stderr -----βͺ Already up to date with [1mmain[0m (no new commits, no rebase needed)π [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0mπ [36mRunning post-merge:[0m------- stderr -----[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'post-merge ran'[0m[2m [0m[2m[36m>[0m[2m post-merge-ran.txt[0m[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 b4192e1e2..14f46eec8 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@@ -23,11 +23,11 @@ info:success: falseexit_code: 1----- stdout ------π‘ [33mAuto-staging 1 untracked file:[0m-π [36mRunning pre-commit:[0m----- stderr -----+π‘ [33mAuto-staging 1 untracked file:[0m[107m [0m feature.txt+π [36mRunning pre-commit:[0m[107m [0m [2m[0m[2m[34mexit[0m[2m 1[0m[0mβ [31mpre-commit command failed: exit status: 1[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 f5366bf05..7e3777659 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@@ -23,20 +23,20 @@ info:success: trueexit_code: 0----- stdout ------π‘ [33mAuto-staging 1 untracked file:[0m-π [36mRunning pre-commit:[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-β [32mCommitted changes @ [2m[32mcdc8f90[0m[0m-π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36mcdc8f90[0m[0m (no rebase needed)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)-π [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m----- stderr -----+π‘ [33mAuto-staging 1 untracked file:[0m[107m [0m feature.txt+π [36mRunning pre-commit:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Pre-commit check passed'[0m[2m[0m[0mPre-commit check passed+π [36mCommitting changes with default message...[0m (1 file, [32m+1[0m, no squashing needed)+π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[107m [0m [1mChanges to feature.txt[0m+β [32mCommitted changes @ [2m[32mcdc8f90[0m[0m+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36mcdc8f90[0m[0m (no rebase needed)[107m [0m * [33mcdc8f90[m Changes to feature.txt[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+π [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[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 7f515a305..7ef31dcbf 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap@@ -23,9 +23,9 @@ info:success: falseexit_code: 1----- stdout ------π [36mRunning pre-merge:[0m----- stderr -----+π [36mRunning pre-merge:[0m[107m [0m [2m[0m[2m[34mexit[0m[2m 1[0m[0mβ [31mpre-merge command failed: exit status: 1[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 0150daf74..e1e428410 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap@@ -23,17 +23,17 @@ info:success: trueexit_code: 0----- stdout ------π [36mRunning pre-merge [1mformat[0m:[0m-π [36mRunning pre-merge [1mlint[0m:[0m-π [36mRunning pre-merge [1mtest[0m:[0m-π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m2cbe2a2[0m[0m (no commit/squash/rebase needed)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)-π [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m----- stderr -----+π [36mRunning pre-merge [1mformat[0m:[0m[107m [0m [2m[0m[2m[34mexit[0m[2m 0[0m-[0m[107m [0m [2m[0m[2m[34mexit[0m[2m 0[0m-[0m[107m [0m [2m[0m[2m[34mexit[0m[2m 0[0m-[0m[107m [0m * [33m2cbe2a2[m Add feature file+[0mπ [36mRunning pre-merge [1mlint[0m:[0m+[107m [0m [2m[0m[2m[34mexit[0m[2m 0[0m+[0mπ [36mRunning pre-merge [1mtest[0m:[0m+[107m [0m [2m[0m[2m[34mexit[0m[2m 0[0m+[0mπ [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m2cbe2a2[0m[0m (no commit/squash/rebase needed)+[107m [0m * [33m2cbe2a2[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+π [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[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 7182b6d20..dec7a6275 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap@@ -23,13 +23,13 @@ info:success: trueexit_code: 0----- stdout ------π [36mRunning pre-merge:[0m-π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m4b1199c[0m[0m (no commit/squash/rebase needed)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)-π [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m----- stderr -----+π [36mRunning pre-merge:[0m[107m [0m [2m[0m[2m[34mexit[0m[2m 0[0m-[0m[107m [0m * [33m4b1199c[m Add feature file+[0mπ [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m4b1199c[0m[0m (no commit/squash/rebase needed)+[107m [0m * [33m4b1199c[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+π [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0mdiff --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 4444c28df..bd16edc08 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snap@@ -23,9 +23,9 @@ info:success: falseexit_code: 1----- stdout ------π [36mRunning pre-commit:[0m----- stderr -----+π [36mRunning pre-commit:[0m[107m [0m [2m[0m[2m[34mexit[0m[2m 1[0m[0mβ [31mpre-commit command failed: exit status: 1[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 e152bf81a..43a9396b9 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap@@ -23,14 +23,14 @@ info:success: trueexit_code: 0----- stdout ------π [36mRunning pre-commit:[0m-π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m726717f[0m[0m (no commit/squash/rebase needed)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)-π [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m----- stderr -----+π [36mRunning pre-commit:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Pre-commit check passed'[0m[2m[0m[0mPre-commit check passed+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m726717f[0m[0m (no commit/squash/rebase needed)[107m [0m * [33m726717f[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+π [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snap b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snapindex 704519534..a8b72d726 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snap@@ -22,11 +22,11 @@ info:success: trueexit_code: 0----- stdout ------π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[0m (no commit/squash/rebase needed)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)-π [36mRemoving [1m[36mfeature-from-develop[0m[36m worktree & branch in background[0m----- stderr -----+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[0m (no commit/squash/rebase needed)[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+π [36mRemoving [1m[36mfeature-from-develop[0m[36m worktree & branch in background[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snap b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snapindex 844ec251f..e6fe3dac1 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snap@@ -22,13 +22,13 @@ info:success: trueexit_code: 0----- stdout -----++----- stderr -----π [36mRebasing onto [1m[36mmain[0m[36m...[0mβ [32mRebased onto [1m[32mmain[0m[0mπ [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m76778cc[0m[0m (no commit/squash needed)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)-π [36mRemoving [1m[36mfeature-dirty-primary[0m[36m worktree & branch in background[0m------- stderr -----[107m [0m * [33m76778cc[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+π [36mRemoving [1m[36mfeature-dirty-primary[0m[36m worktree & branch in background[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_race_condition_before_new_commit.snap b/tests/snapshots/integration__integration_tests__merge__merge_race_condition_before_new_commit.snapindex 100f8b0f7..2d33c1ddd 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_race_condition_before_new_commit.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_race_condition_before_new_commit.snap@@ -23,11 +23,11 @@ info:success: trueexit_code: 0----- stdout ------π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[0m (no commit/squash/rebase needed)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)-βͺ Worktree preserved (--no-remove)----- stderr -----+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[0m (no commit/squash/rebase needed)[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+βͺ Worktree preserved (--no-remove)diff --git a/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap b/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snapindex 0752ac4b9..f0ef6ce99 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap@@ -22,9 +22,9 @@ info:success: falseexit_code: 1----- stdout ------π [36mRebasing onto [1m[36mmain[0m[36m...[0m----- stderr -----+π [36mRebasing onto [1m[36mmain[0m[36m...[0mβ [31mRebase onto [1m[31mmain[0m[31m incomplete[0m[107m [0m Rebasing (1/1)[107m [0m error: could not apply c661874... Update shared.txt in featurediff --git a/tests/snapshots/integration__integration_tests__merge__merge_rebase_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_rebase_fast_forward.snapindex 549d3981a..c7965b947 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_rebase_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_rebase_fast_forward.snap@@ -15,14 +15,15 @@ info:GIT_EDITOR: ""LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1761609600"+ SOURCE_DATE_EPOCH: "1735776000"+ WORKTRUNK_BIN: ""WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout -----++----- stderr -----β [32mFast-forwarded to [1m[32mmain[0m[0mβͺ Already up to date with [1mmain[0m (no new commits)π [36mRemoving [1m[36mfast-forward-test[0m[36m worktree & branch in background[0m------- stderr -----diff --git a/tests/snapshots/integration__integration_tests__merge__merge_rebase_true_rebase.snap b/tests/snapshots/integration__integration_tests__merge__merge_rebase_true_rebase.snapindex 38d54f71d..b4a28f3f4 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_rebase_true_rebase.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_rebase_true_rebase.snap@@ -22,13 +22,13 @@ info:success: trueexit_code: 0----- stdout -----++----- stderr -----π [36mRebasing onto [1m[36mmain[0m[36m...[0mβ [32mRebased onto [1m[32mmain[0m[0mπ [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36mae48a8e[0m[0m (no commit/squash needed)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)-π [36mRemoving [1m[36mtrue-rebase-test[0m[36m worktree & branch in background[0m------- stderr -----[107m [0m * [33mae48a8e[m Add feature[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+π [36mRemoving [1m[36mtrue-rebase-test[0m[36m worktree & branch in background[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snapindex 9473555b9..4062b418e 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap@@ -22,23 +22,23 @@ info:success: trueexit_code: 0----- stdout ------π [36mSquashing 3 commits into a single commit[0m (3 files, [32m+3[0m)...-π [36mGenerating squash commit message...[0m-π‘ [2m[2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[0m-β [32mSquashed @ [2m[32m27eb169[0m[0m-π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m27eb169[0m[0m (no rebase needed)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 3 files, [32m+3[0m)-π [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m----- stderr -----+π [36mSquashing 3 commits into a single commit[0m (3 files, [32m+3[0m)...+π [36mGenerating squash commit message...[0m+π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[107m [0m [1mSquash commits from main[0m[107m [0m[107m [0m Combined commits:[107m [0m - feat: add file 1[107m [0m - fix: update logic[107m [0m - docs: update readme+β [32mSquashed @ [2m[32m27eb169[0m[0m+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m27eb169[0m[0m (no rebase needed)[107m [0m * [33m27eb169[m Squash commits from main[107m [0m file1.txt | 1 [32m+[m[107m [0m file2.txt | 1 [32m+[m[107m [0m file3.txt | 1 [32m+[m[107m [0m 3 files changed, 3 insertions(+)+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 3 files, [32m+3[0m)+π [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snapindex 5348840e5..a68a404fe 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap@@ -22,17 +22,17 @@ info:success: trueexit_code: 0----- stdout ------π [36mSquashing 3 commits into a single commit...[0m-π [36mGenerating squash commit message...[0m-π‘ [2m[2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[0m-βͺ [2mNo changes after squashing 3 commits[0m-βͺ Already up to date with [1mmain[0m (no new commits, no rebase needed)-π [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m----- stderr -----+π [36mSquashing 3 commits into a single commit...[0m+π [36mGenerating squash commit message...[0m+π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[107m [0m [1mSquash commits from main[0m[107m [0m[107m [0m Combined commits:[107m [0m - Change 1[107m [0m - Change 2[107m [0m - Revert to initial+βͺ [2mNo changes after squashing 3 commits[0m+βͺ Already up to date with [1mmain[0m (no new commits, no rebase needed)+π [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_error.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_error.snapindex f5bbfbd9b..ffea8e4d1 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_error.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_error.snap@@ -22,10 +22,10 @@ info:success: falseexit_code: 1----- stdout ------π [36mSquashing 2 commits into a single commit[0m (2 files, [32m+2[0m)...-π [36mGenerating squash commit message...[0m----- stderr -----+π [36mSquashing 2 commits into a single commit[0m (2 files, [32m+2[0m)...+π [36mGenerating squash commit message...[0mβ [31mCommit generation command failed[0m[107m [0m Error: connection refuseddiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snapindex a50b17335..54ebcaaef 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap@@ -23,21 +23,21 @@ info:success: trueexit_code: 0----- stdout ------π [36mSquashing 2 commits into a single commit[0m (2 files, [32m+2[0m)...-π [36mGenerating squash commit message...[0m-π‘ [2m[2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[0m-β [32mSquashed @ [2m[32m091f0c5[0m[0m-π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m091f0c5[0m[0m (no rebase needed)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 2 files, [32m+2[0m)-π [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m----- stderr -----+π [36mSquashing 2 commits into a single commit[0m (2 files, [32m+2[0m)...+π [36mGenerating squash commit message...[0m+π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[107m [0m [1mSquash commits from main[0m[107m [0m[107m [0m Combined commits:[107m [0m - feat: new feature[107m [0m - fix: bug fix+β [32mSquashed @ [2m[32m091f0c5[0m[0m+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m091f0c5[0m[0m (no rebase needed)[107m [0m * [33m091f0c5[m Squash commits from main[107m [0m file1.txt | 1 [32m+[m[107m [0m file2.txt | 1 [32m+[m[107m [0m 2 files changed, 2 insertions(+)+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 2 files, [32m+2[0m)+π [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snapindex 3f139ec4d..55d0348f8 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap@@ -22,11 +22,11 @@ info:success: trueexit_code: 0----- stdout ------π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m525a81f[0m[0m (no commit/squash/rebase needed)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)-π [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m----- stderr -----+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m525a81f[0m[0m (no commit/squash/rebase needed)[107m [0m * [33m525a81f[m feat: single commit[107m [0m file1.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+π [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snapindex 74b53fc84..359242f01 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap@@ -22,15 +22,15 @@ info:success: trueexit_code: 0----- stdout -----++----- stderr -----π [36mSquashing 2 commits into a single commit[0m (1 file, [32m+1[0m)...π [36mGenerating squash commit message...[0m+[107m [0m [1mfeat: implement user authentication system[0mβ [32mSquashed @ [2m[32md42412f[0m[0mπ [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36md42412f[0m[0m (no rebase needed)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)-π [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m------- stderr ------[107m [0m [1mfeat: implement user authentication system[0m[107m [0m * [33md42412f[m feat: implement user authentication system[107m [0m auth.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+π [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snapindex c03edb5fc..b97d9524a 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snap@@ -24,22 +24,22 @@ info:success: trueexit_code: 0----- stdout -----++----- stderr -----π [36mSquashing 2 commits & working tree changes into a single commit[0m (2 files, [32m+2[0m)...π‘ [2mBackup created @ [2m330ccd6[0m[0mπ [36mGenerating squash commit message...[0m-π‘ [2m[2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[0m-β [32mSquashed @ [2m[32md34e4c3[0m[0m-π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36md34e4c3[0m[0m (no rebase needed)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 2 files, [32m+2[0m)-π [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m------- stderr -----+π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[107m [0m [1mSquash commits from main[0m[107m [0m[107m [0m Combined commits:[107m [0m - feat: add file 1[107m [0m - feat: add file 2+β [32mSquashed @ [2m[32md34e4c3[0m[0m+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36md34e4c3[0m[0m (no rebase needed)[107m [0m * [33md34e4c3[m Squash commits from main[107m [0m file1.txt | 1 [32m+[m[107m [0m file2.txt | 1 [32m+[m[107m [0m 2 files changed, 2 insertions(+)+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 2 files, [32m+2[0m)+π [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snapindex 6d222a534..497a4ce3c 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap@@ -21,11 +21,11 @@ info:success: trueexit_code: 0----- stdout ------π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[0m (no commit/squash/rebase needed)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)-π [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m----- stderr -----+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[0m (no commit/squash/rebase needed)[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+π [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_to_non_default_target.snap b/tests/snapshots/integration__integration_tests__merge__merge_to_non_default_target.snapindex 439d24f5f..43c24b2be 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_to_non_default_target.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_non_default_target.snap@@ -22,13 +22,13 @@ info:success: trueexit_code: 0----- stdout -----++----- stderr -----π [36mRebasing onto [1m[36mstaging[0m[36m...[0mβ [32mRebased onto [1m[32mstaging[0m[0mπ [36mMerging 1 commit to [1m[36mstaging[0m[36m @ [2m[36m8280b9e[0m[0m (no commit/squash needed)-β [32mMerged to [1m[32mstaging[0m[0m (1 commit, 1 file, [32m+1[0m)-π [36mRemoving [1m[36mfeature-for-staging[0m[36m worktree & branch in background[0m------- stderr -----[107m [0m * [33m8280b9e[m Add feature for staging[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)+β [32mMerged to [1m[32mstaging[0m[0m (1 commit, 1 file, [32m+1[0m)+π [36mRemoving [1m[36mfeature-for-staging[0m[36m worktree & branch in background[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_when_primary_not_on_default_but_default_has_worktree.snap b/tests/snapshots/integration__integration_tests__merge__merge_when_primary_not_on_default_but_default_has_worktree.snapindex 075fd5a11..d6ba43970 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_when_primary_not_on_default_but_default_has_worktree.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_when_primary_not_on_default_but_default_has_worktree.snap@@ -22,11 +22,11 @@ info:success: trueexit_code: 0----- stdout ------π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[0m (no commit/squash/rebase needed)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)-π [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m----- stderr -----+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[0m (no commit/squash/rebase needed)[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+π [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snapindex f78a53a97..4dbc1fbea 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap@@ -22,11 +22,11 @@ info:success: trueexit_code: 0----- stdout ------π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[0m (no commit/squash/rebase needed)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)-π [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m----- stderr -----+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[0m (no commit/squash/rebase needed)[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+π [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snapindex 100f8b0f7..2d33c1ddd 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap@@ -23,11 +23,11 @@ info:success: trueexit_code: 0----- stdout ------π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[0m (no commit/squash/rebase needed)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)-βͺ Worktree preserved (--no-remove)----- stderr -----+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[0m (no commit/squash/rebase needed)[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+βͺ Worktree preserved (--no-remove)diff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snapindex 4f9043ce2..aeb12fa3b 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap@@ -24,25 +24,25 @@ info:success: trueexit_code: 0----- stdout ------π‘ [33mAuto-staging 2 untracked files:[0m-π [36mSquashing 1 commit & working tree changes into a single commit[0m (3 files, [32m+3[0m)...-π‘ [2mBackup created @ [2m4967998[0m[0m-π [36mGenerating squash commit message...[0m-π‘ [2m[2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[0m-β [32mSquashed @ [2m[32mfbfc726[0m[0m-π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36mfbfc726[0m[0m (no rebase needed)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 3 files, [32m+3[0m)-π [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m----- stderr -----+π‘ [33mAuto-staging 2 untracked files:[0m[107m [0m untracked1.txt[107m [0m untracked2.txt+π [36mSquashing 1 commit & working tree changes into a single commit[0m (3 files, [32m+3[0m)...+π‘ [2mBackup created @ [2m4967998[0m[0m+π [36mGenerating squash commit message...[0m+π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[107m [0m [1mSquash commits from main[0m[107m [0m[107m [0m Combined commits:[107m [0m - feat: add file 1+β [32mSquashed @ [2m[32mfbfc726[0m[0m+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36mfbfc726[0m[0m (no rebase needed)[107m [0m * [33mfbfc726[m Squash commits from main[107m [0m file1.txt | 1 [32m+[m[107m [0m untracked1.txt | 1 [32m+[m[107m [0m untracked2.txt | 1 [32m+[m[107m [0m 3 files changed, 3 insertions(+)+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 3 files, [32m+3[0m)+π [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snapindex 52937f313..132a7deb0 100644--- a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap@@ -24,17 +24,10 @@ info:success: trueexit_code: 0----- stdout ------π [36mSquashing 3 commits into a single commit[0m (3 files, [32m+33[0m)...-π [36mGenerating squash commit message...[0m-β [32mSquashed @ [2m[32m95c3316[0m[0m-π [36mRunning pre-merge [1mtest[0m:[0m-π [36mRunning pre-merge [1mlint[0m:[0m-π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m95c3316[0m[0m (no rebase needed)-β [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----- stderr -----+π [36mSquashing 3 commits into a single commit[0m (3 files, [32m+33[0m)...+π [36mGenerating squash commit message...[0m[107m [0m [1mfeat(auth): Implement JWT authentication system[0m[107m [0m[107m [0m Add comprehensive JWT token handling including validation, refresh logic,@@ -44,6 +37,8 @@ exit_code: 0[107m [0m - Implement token refresh mechanism with expiry handling[107m [0m - Add JWT encoding/decoding with signature verification[107m [0m - Create test suite covering all authentication flows+β [32mSquashed @ [2m[32m95c3316[0m[0m+π [36mRunning pre-merge [1mtest[0m:[0m[107m [0m [2m[0m[2m[34mcargo[0m[2m test[0m[0m Finished test [unoptimized + debuginfo] target(s) in 0.12sRunning unittests src/lib.rs (target/debug/deps/worktrunk-abc123)@@ -55,14 +50,19 @@ test auth::tests::test_token_refresh ... oktest auth::tests::test_token_validation ... oktest result: ok. 18 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.08s+π [36mRunning pre-merge [1mlint[0m:[0m[107m [0m [2m[0m[2m[34mcargo[0m[2m clippy[0m[0m Checking worktrunk v0.1.0Finished dev [unoptimized + debuginfo] target(s) in 1.23s+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m95c3316[0m[0m (no rebase needed)[107m [0m * [33m95c3316[m feat(auth): Implement JWT authentication system[107m [0m auth.rs | 8 [32m++++++++[m[107m [0m auth_test.rs | 17 [32m+++++++++++++++++[m[107m [0m jwt.rs | 8 [32m++++++++[m[107m [0m 3 files changed, 33 insertions(+)+β [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 [2m[0m[2m[34mcargo[0m[2m install [0m[2m[36m--path[0m[2m .[0m[0m Installing worktrunk v0.1.0Compiling worktrunk v0.1.0diff --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 20154d349..773c3dc05 100644--- a/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_post_create.snap+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_post_create.snap@@ -25,14 +25,14 @@ info:success: trueexit_code: 0----- stdout ------π [36mRunning post-create [1minstall[0m:[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----- stderr -----+π [36mRunning post-create [1minstall[0m:[0m[107m [0m [2m[0m[2m[34muv[0m[2m sync[0m[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[REPO].feature-x[0m[0m+π‘ [2mRun `wt config shell install` to enable automatic cd[0m+π [36mRunning post-start [1mdev[0m:[0m[107m [0m [2m[0m[2m[34muv[0m[2m run dev[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 3b2173e5a..7123160b3 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@@ -24,20 +24,16 @@ info:success: trueexit_code: 0----- stdout ------π [36mSquashing 3 commits into a single commit[0m (2 files, [32m+45[0m)...-π [36mGenerating squash commit message...[0m-β [32mSquashed @ [2m[32m69200cc[0m[0m-π [36mRunning pre-merge [1mtest[0m:[0m-π [36mRunning pre-merge [1mlint[0m:[0m-π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m69200cc[0m[0m (no rebase needed)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 2 files, [32m+45[0m)-π [36mRemoving [1m[36mfeature-auth[0m[36m worktree & branch in background[0m----- stderr -----+π [36mSquashing 3 commits into a single commit[0m (2 files, [32m+45[0m)...+π [36mGenerating squash commit message...[0m[107m [0m [1mfeat(api): Add user authentication endpoints[0m[107m [0m[107m [0m Implement login and token refresh endpoints with JWT validation.[107m [0m Includes comprehensive test coverage and input validation.+β [32mSquashed @ [2m[32m69200cc[0m[0m+π [36mRunning pre-merge [1mtest[0m:[0m[107m [0m [2m[0m[2m[34muv[0m[2m run pytest[0m[0m============================= test session starts ==============================@@ -49,11 +45,15 @@ tests/test_auth.py::test_token_validation PASSED [100%]============================== 3 passed in 0.8s ===============================+π [36mRunning pre-merge [1mlint[0m:[0m[107m [0m [2m[0m[2m[34muv[0m[2m run ruff check[0m[0mAll checks passed!+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m69200cc[0m[0m (no rebase needed)[107m [0m * [33m69200cc[m feat(api): Add user authentication endpoints[107m [0m api/auth.py | 31 [32m+++++++++++++++++++++++++++++++[m[107m [0m tests/test_auth.py | 14 [32m++++++++++++++[m[107m [0m 2 files changed, 45 insertions(+)+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 2 files, [32m+45[0m)+π [36mRemoving [1m[36mfeature-auth[0m[36m worktree & branch in background[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snapindex 527ecef0f..5c53350ae 100644--- a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap@@ -22,11 +22,11 @@ info:success: trueexit_code: 0----- stdout ------π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36md29e0fd[0m[0m (no commit/squash/rebase needed)-β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+13[0m)-π [36mRemoving [1m[36mfix-auth[0m[36m worktree & branch in background[0m----- stderr -----+π [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36md29e0fd[0m[0m (no commit/squash/rebase needed)[107m [0m * [33md29e0fd[m Implement JWT validation[107m [0m auth.rs | 13 [32m+++++++++++++[m[107m [0m 1 file changed, 13 insertions(+)+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+13[0m)+π [36mRemoving [1m[36mfix-auth[0m[36m worktree & branch in background[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_simple_switch.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_simple_switch.snapindex 6a68b8d4d..fb7dc9e01 100644--- a/tests/snapshots/integration__integration_tests__merge__readme_example_simple_switch.snap+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_simple_switch.snap@@ -16,13 +16,14 @@ info:GIT_EDITOR: ""LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1761609600"+ SOURCE_DATE_EPOCH: "1735776000"+ WORKTRUNK_BIN: ""WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ------β [32mCreated new worktree for [1m[32mfix-auth[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].fix-auth[0m[0m-π‘ [2m[2mRun `wt config shell install` to enable automatic cd[0m[0m----- stderr -----+β [32mCreated new worktree for [1m[32mfix-auth[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].fix-auth[0m[0m+π‘ [2mRun `wt config shell install` to enable automatic cd[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__step_commit_both_flags.snap b/tests/snapshots/integration__integration_tests__merge__step_commit_both_flags.snapindex afc2d1035..d87a3b99d 100644--- a/tests/snapshots/integration__integration_tests__merge__step_commit_both_flags.snap+++ b/tests/snapshots/integration__integration_tests__merge__step_commit_both_flags.snap@@ -26,10 +26,10 @@ info:success: trueexit_code: 0----- stdout ------π‘ [2mSkipping pre-commit hook (--no-verify)[0m-π [36mCommitting tracked changes with default message...[0m (1 file, [32m+1[0m, [31m-1[0m)-π‘ [2m[2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[0m-β [32mCommitted changes @ [2m[32ma5890cb[0m[0m----- stderr -----+π‘ [2mSkipping pre-commit hook (--no-verify)[0m+π [36mCommitting tracked changes with default message...[0m (1 file, [32m+1[0m, [31m-1[0m)+π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[107m [0m [1mChanges to tracked.txt[0m+β [32mCommitted changes @ [2m[32ma5890cb[0m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__step_commit_no_verify.snap b/tests/snapshots/integration__integration_tests__merge__step_commit_no_verify.snapindex 284813c12..531673115 100644--- a/tests/snapshots/integration__integration_tests__merge__step_commit_no_verify.snap+++ b/tests/snapshots/integration__integration_tests__merge__step_commit_no_verify.snap@@ -25,13 +25,13 @@ info:success: trueexit_code: 0----- stdout ------π‘ [2mSkipping pre-commit hook (--no-verify)[0m-π‘ [33mAuto-staging 2 untracked files:[0m-π [36mCommitting changes with default message...[0m (2 files, [32m+2[0m)-π‘ [2m[2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[0m-β [32mCommitted changes @ [2m[32m3dbcd5d[0m[0m----- stderr -----+π‘ [2mSkipping pre-commit hook (--no-verify)[0m+π‘ [33mAuto-staging 2 untracked files:[0m[107m [0m .config/[107m [0m file1.txt+π [36mCommitting changes with default message...[0m (2 files, [32m+2[0m)+π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[107m [0m [1mChanges to wt.toml & file1.txt[0m+β [32mCommitted changes @ [2m[32m3dbcd5d[0m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__step_commit_nothing_to_commit.snap b/tests/snapshots/integration__integration_tests__merge__step_commit_nothing_to_commit.snapindex 8a73e4822..f94e25162 100644--- a/tests/snapshots/integration__integration_tests__merge__step_commit_nothing_to_commit.snap+++ b/tests/snapshots/integration__integration_tests__merge__step_commit_nothing_to_commit.snap@@ -25,10 +25,10 @@ info:success: falseexit_code: 1----- stdout ------π [36mCommitting changes with default message...[0m-π‘ [2m[2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[0m----- stderr -----+π [36mCommitting changes with default message...[0m+π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[107m [0m [1mWIP: Changes[0mβ [31mFailed to commit[0m[107m [0m On branch maindiff --git a/tests/snapshots/integration__integration_tests__merge__step_commit_stage_tracked.snap b/tests/snapshots/integration__integration_tests__merge__step_commit_stage_tracked.snapindex e3f2d3d7e..6c7b57865 100644--- a/tests/snapshots/integration__integration_tests__merge__step_commit_stage_tracked.snap+++ b/tests/snapshots/integration__integration_tests__merge__step_commit_stage_tracked.snap@@ -25,9 +25,9 @@ info:success: trueexit_code: 0----- stdout ------π [36mCommitting tracked changes with default message...[0m (1 file, [32m+1[0m, [31m-1[0m)-π‘ [2m[2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[0m-β [32mCommitted changes @ [2m[32m7d441f0[0m[0m----- stderr -----+π [36mCommitting tracked changes with default message...[0m (1 file, [32m+1[0m, [31m-1[0m)+π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[107m [0m [1mChanges to tracked.txt[0m+β [32mCommitted changes @ [2m[32m7d441f0[0m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__step_squash_both_flags.snap b/tests/snapshots/integration__integration_tests__merge__step_squash_both_flags.snapindex c0d4430dc..c0c220c79 100644--- a/tests/snapshots/integration__integration_tests__merge__step_squash_both_flags.snap+++ b/tests/snapshots/integration__integration_tests__merge__step_squash_both_flags.snap@@ -26,16 +26,16 @@ info:success: trueexit_code: 0----- stdout -----++----- stderr -----π‘ [2mSkipping pre-commit hook (--no-verify)[0mπ [36mSquashing 2 commits & tracked changes into a single commit[0m (3 files, [32m+3[0m)...π‘ [2mBackup created @ [2m31e06e8[0m[0mπ [36mGenerating squash commit message...[0m-π‘ [2m[2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[0m-β [32mSquashed @ [2m[32m9f7a3e2[0m[0m------- stderr -----+π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[107m [0m [1mSquash commits from main[0m[107m [0m[107m [0m Combined commits:[107m [0m - feat: add file 1[107m [0m - feat: add file 2+β [32mSquashed @ [2m[32m9f7a3e2[0m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__step_squash_no_commits.snap b/tests/snapshots/integration__integration_tests__merge__step_squash_no_commits.snapindex 61dd6d9f9..753592175 100644--- a/tests/snapshots/integration__integration_tests__merge__step_squash_no_commits.snap+++ b/tests/snapshots/integration__integration_tests__merge__step_squash_no_commits.snap@@ -15,13 +15,13 @@ info:GIT_EDITOR: ""LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1761609600"+ SOURCE_DATE_EPOCH: "1735776000"WORKTRUNK_BIN: ""WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ------βͺ Nothing to squash; no commits ahead of main----- stderr -----+βͺ Nothing to squash; no commits ahead of maindiff --git a/tests/snapshots/integration__integration_tests__merge__step_squash_no_verify.snap b/tests/snapshots/integration__integration_tests__merge__step_squash_no_verify.snapindex ec851961a..b583caf81 100644--- a/tests/snapshots/integration__integration_tests__merge__step_squash_no_verify.snap+++ b/tests/snapshots/integration__integration_tests__merge__step_squash_no_verify.snap@@ -25,15 +25,15 @@ info:success: trueexit_code: 0----- stdout -----++----- stderr -----π‘ [2mSkipping pre-commit hook (--no-verify)[0mπ [36mSquashing 2 commits into a single commit[0m (3 files, [32m+3[0m)...π [36mGenerating squash commit message...[0m-π‘ [2m[2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[0m-β [32mSquashed @ [2m[32m588aa53[0m[0m------- stderr -----+π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[107m [0m [1mSquash commits from main[0m[107m [0m[107m [0m Combined commits:[107m [0m - feat: add file 1[107m [0m - feat: add file 2+β [32mSquashed @ [2m[32m588aa53[0m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__step_squash_single_commit.snap b/tests/snapshots/integration__integration_tests__merge__step_squash_single_commit.snapindex 91be80ee6..9007f3d4e 100644--- a/tests/snapshots/integration__integration_tests__merge__step_squash_single_commit.snap+++ b/tests/snapshots/integration__integration_tests__merge__step_squash_single_commit.snap@@ -15,13 +15,13 @@ info:GIT_EDITOR: ""LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1761609600"+ SOURCE_DATE_EPOCH: "1735776000"WORKTRUNK_BIN: ""WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ------βͺ Nothing to squash; already a single commit----- stderr -----+βͺ Nothing to squash; already a single commitdiff --git a/tests/snapshots/integration__integration_tests__merge__step_squash_stage_tracked.snap b/tests/snapshots/integration__integration_tests__merge__step_squash_stage_tracked.snapindex 587d34dc3..14da6547e 100644--- a/tests/snapshots/integration__integration_tests__merge__step_squash_stage_tracked.snap+++ b/tests/snapshots/integration__integration_tests__merge__step_squash_stage_tracked.snap@@ -25,15 +25,15 @@ info:success: trueexit_code: 0----- stdout -----++----- stderr -----π [36mSquashing 2 commits & tracked changes into a single commit[0m (2 files, [32m+2[0m)...π‘ [2mBackup created @ [2mba1424b[0m[0mπ [36mGenerating squash commit message...[0m-π‘ [2m[2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[0m-β [32mSquashed @ [2m[32m6c0b38b[0m[0m------- stderr -----+π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[107m [0m [1mSquash commits from main[0m[107m [0m[107m [0m Combined commits:[107m [0m - feat: add file 1[107m [0m - feat: add file 2+β [32mSquashed @ [2m[32m6c0b38b[0m[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 a5ca7415e..ba2cf8137 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@@ -24,11 +24,11 @@ info:success: trueexit_code: 0----- stdout ------π [36mRunning post-create:[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----- stderr -----+π [36mRunning post-create:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Setup done'[0m[2m [0m[2m[36m>[0m[2m setup.txt[0m-[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+[0mβ [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0m+π‘ [2mRun `wt config shell install` to enable automatic cd[0m+π [36mRunning post-start [1mserver[0m:[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[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 89218bb42..36aebb2ee 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap@@ -26,10 +26,10 @@ info:success: trueexit_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-π [36mExecuting (--execute):[0m----- stderr -----+β [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 [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 [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Execute flag'[0m[2m [0m[2m[36m>[0m[2m execute.txt[0mdiff --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 92a95b5e3..1c66a6237 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@@ -24,11 +24,10 @@ info:success: trueexit_code: 0----- stdout ------π [36mRunning post-create:[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[0m----- stderr -----+π [36mRunning post-create:[0m[107m [0m [2m[0m[2m[34mexit[0m[2m 1[0m-[0m+[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+π‘ [2mRun `wt config shell install` to enable automatic cd[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 27609b84f..385c348eb 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@@ -24,14 +24,13 @@ info:success: trueexit_code: 0----- stdout ------π [36mRunning post-create:[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----- stderr -----+π [36mRunning post-create:[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-[0m+[0mβ [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0m+π‘ [2mRun `wt config shell install` to enable automatic cd[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 e1d356234..626c6263b 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@@ -24,13 +24,13 @@ info:success: trueexit_code: 0----- stdout ------π [36mRunning post-create:[0m-π [36mRunning post-create:[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----- stderr -----+π [36mRunning post-create:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'First'[0m[2m[0m[0mFirst+π [36mRunning post-create:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Second'[0m[2m[0m[0mSecond+β [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0m+π‘ [2mRun `wt config shell install` to enable automatic cd[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 865499dc3..9e8214a1b 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@@ -24,13 +24,13 @@ info:success: trueexit_code: 0----- stdout ------π [36mRunning post-create [1minstall[0m:[0m-π [36mRunning post-create [1msetup[0m:[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----- stderr -----+π [36mRunning post-create [1minstall[0m:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Installing deps'[0m[2m[0m[0mInstalling deps+π [36mRunning post-create [1msetup[0m:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Running setup'[0m[2m[0m[0mRunning setup+β [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0m+π‘ [2mRun `wt config shell install` to enable automatic cd[0mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_no_config.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_no_config.snapindex 6e3a0c272..b5ead8564 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_no_config.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_no_config.snap@@ -14,15 +14,17 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1761609600"+ SOURCE_DATE_EPOCH: "1735776000"+ WORKTRUNK_BIN: ""WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ------β [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----- stderr -----+β [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0m+π‘ [2mRun `wt config shell install` to enable automatic cd[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 9c54034ae..5595e841f 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@@ -24,10 +24,10 @@ info:success: trueexit_code: 0----- stdout ------π [36mRunning post-create:[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----- stderr -----+π [36mRunning post-create:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Setup complete'[0m[2m[0m[0mSetup complete+β [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0m+π‘ [2mRun `wt config shell install` to enable automatic cd[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 4bacde493..828123e4a 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@@ -24,16 +24,15 @@ info:success: trueexit_code: 0----- stdout ------π [36mRunning post-create:[0m-π [36mRunning post-create:[0m-π [36mRunning post-create:[0m-π [36mRunning post-create:[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[0m----- stderr -----+π [36mRunning post-create:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Repo: repo'[0m[2m [0m[2m[36m>[0m[2m info.txt[0m-[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-[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-[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Root: [REPO]'[0m[2m [0m[2m[36m>>[0m[2m info.txt[0m-[0m+[0mπ [36mRunning post-create:[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+[0mπ [36mRunning post-create:[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+[0mπ [36mRunning post-create:[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Root: [REPO]'[0m[2m [0m[2m[36m>>[0m[2m info.txt[0m+[0mβ [32mCreated new worktree for [1m[32mfeature/test[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature-test[0m[0m+π‘ [2mRun `wt config shell install` to enable automatic cd[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 60aa063b3..1c4a190fe 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@@ -24,11 +24,11 @@ info:success: trueexit_code: 0----- stdout ------β [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----- stderr -----+β [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0m+π‘ [2mRun `wt config shell install` to enable automatic cd[0m+π [36mRunning post-start:[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[0mdiff --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 33e40fed1..8f5cd1760 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@@ -24,9 +24,9 @@ info:success: trueexit_code: 0----- stdout ------β [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----- stderr -----+β [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0m+π‘ [2mRun `wt config shell install` to enable automatic cd[0m+π [36mRunning post-start:[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[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 847a3dda3..e04d6e6cd 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@@ -24,9 +24,9 @@ info:success: trueexit_code: 0----- stdout ------β [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----- stderr -----+β [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0m+π‘ [2mRun `wt config shell install` to enable automatic cd[0m+π [36mRunning post-start:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m 'unclosed quote[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 ce558b57c..aa20dee63 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@@ -24,9 +24,9 @@ info:success: trueexit_code: 0----- stdout ------β [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----- stderr -----+β [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0m+π‘ [2mRun `wt config shell install` to enable automatic cd[0m+π [36mRunning post-start:[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[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 b2ca9dc73..fade7da5a 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@@ -24,11 +24,11 @@ info:success: trueexit_code: 0----- stdout ------β [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----- stderr -----+β [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0m+π‘ [2mRun `wt config shell install` to enable automatic cd[0m+π [36mRunning post-start:[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[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 6a3e6faa0..047592888 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@@ -24,11 +24,11 @@ info:success: trueexit_code: 0----- stdout ------β [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-π [36mRunning post-start [1mtask2[0m:[0m----- stderr -----+β [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0m+π‘ [2mRun `wt config shell install` to enable automatic cd[0m+π [36mRunning post-start [1mtask1[0m:[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 [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Task 2 running'[0m[2m [0m[2m[36m>[0m[2m task2.txt[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 f19214e14..9611a7124 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@@ -24,13 +24,13 @@ info:success: trueexit_code: 0----- stdout ------β [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-π [36mRunning post-start [1mtask2[0m:[0m-π [36mRunning post-start [1mtask3[0m:[0m----- stderr -----+β [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0m+π‘ [2mRun `wt config shell install` to enable automatic cd[0m+π [36mRunning post-start [1mtask1[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 [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'TASK2_OUTPUT'[0m[2m[0m+π [36mRunning post-start [1mtask3[0m:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'TASK3_OUTPUT'[0m[2m[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 51c25e824..ddfeed570 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@@ -24,9 +24,9 @@ info:success: trueexit_code: 0----- stdout ------β [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----- stderr -----+β [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0m+π‘ [2mRun `wt config shell install` to enable automatic cd[0m+π [36mRunning post-start:[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[0mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_skip_existing.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_skip_existing.snapindex c8818b225..858620e43 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_skip_existing.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_skip_existing.snap@@ -16,14 +16,14 @@ info:HOME: "[TEST_HOME]"LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1761609600"+ SOURCE_DATE_EPOCH: "1735776000"WORKTRUNK_BIN: ""WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ------π‘ [33mWorktree for [1m[33mfeature[0m[33m at [1m[33m[REPO].feature[0m[33m; cannot cd (no shell integration)[0m-π‘ [2m[2mRun `wt config shell install` to enable automatic cd[0m[0m----- stderr -----+π‘ [33mWorktree for [1m[33mfeature[0m[33m at [1m[33m[REPO].feature[0m[33m; cannot cd (no shell integration)[0m+π‘ [2mRun `wt config shell install` to enable automatic cd[0mdiff --git a/tests/snapshots/integration__integration_tests__push__push_dirty_target_autostash.snap b/tests/snapshots/integration__integration_tests__push__push_dirty_target_autostash.snapindex fdf7f7e49..9fe1c76fd 100644--- a/tests/snapshots/integration__integration_tests__push__push_dirty_target_autostash.snap+++ b/tests/snapshots/integration__integration_tests__push__push_dirty_target_autostash.snap@@ -23,12 +23,12 @@ info:success: trueexit_code: 0----- stdout ------π [36mStashing changes in [1m[36m[REPO][0m[36m...[0m-π [36mPushing 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[0m-π [36mRestoring stashed changes in [1m[36m[REPO][0m[36m...[0m-β [32mPushed to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)----- stderr -----+π [36mStashing changes in [1m[36m[REPO][0m[36m...[0m+π [36mPushing 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[0m[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)+π [36mRestoring stashed changes in [1m[36m[REPO][0m[36m...[0m+β [32mPushed to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)diff --git a/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_fast_forward.snapindex da650dd39..1977f8238 100644--- a/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap@@ -23,10 +23,10 @@ info:success: trueexit_code: 0----- stdout ------π [36mPushing 1 commit to [1m[36mmain[0m[36m @ [2m[36mc2e2bcc[0m[0m-β [32mPushed to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)----- stderr -----+π [36mPushing 1 commit to [1m[36mmain[0m[36m @ [2m[36mc2e2bcc[0m[0m[107m [0m * [33mc2e2bcc[m Add test file[107m [0m test.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)+β [32mPushed to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)diff --git a/tests/snapshots/integration__integration_tests__push__push_no_remote.snap b/tests/snapshots/integration__integration_tests__push__push_no_remote.snapindex 5d92c8094..16f0c04d2 100644--- a/tests/snapshots/integration__integration_tests__push__push_no_remote.snap+++ b/tests/snapshots/integration__integration_tests__push__push_no_remote.snap@@ -22,10 +22,10 @@ info:success: trueexit_code: 0----- stdout ------π [36mPushing 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[0m-β [32mPushed to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)----- stderr -----+π [36mPushing 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[0m[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)+β [32mPushed to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)diff --git a/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snapindex bd67b292f..3f65906cd 100644--- a/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap@@ -23,10 +23,10 @@ info:success: trueexit_code: 0----- stdout ------π [36mPushing 1 commit to [1m[36mmain[0m[36m @ [2m[36m4af48f0[0m[0m-β [32mPushed to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)----- stderr -----+π [36mPushing 1 commit to [1m[36mmain[0m[36m @ [2m[36m4af48f0[0m[0m[107m [0m * [33m4af48f0[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)+β [32mPushed to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)diff --git a/tests/snapshots/integration__integration_tests__push__push_to_default.snap b/tests/snapshots/integration__integration_tests__push__push_to_default.snapindex 5d92c8094..16f0c04d2 100644--- a/tests/snapshots/integration__integration_tests__push__push_to_default.snap+++ b/tests/snapshots/integration__integration_tests__push__push_to_default.snap@@ -22,10 +22,10 @@ info:success: trueexit_code: 0----- stdout ------π [36mPushing 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[0m-β [32mPushed to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)----- stderr -----+π [36mPushing 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[0m[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)+β [32mPushed to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)diff --git a/tests/snapshots/integration__integration_tests__push__push_with_merge_commits_allowed.snap b/tests/snapshots/integration__integration_tests__push__push_with_merge_commits_allowed.snapindex 65be3aa7d..1088dcacc 100644--- a/tests/snapshots/integration__integration_tests__push__push_with_merge_commits_allowed.snap+++ b/tests/snapshots/integration__integration_tests__push__push_with_merge_commits_allowed.snap@@ -24,10 +24,9 @@ info:success: trueexit_code: 0----- stdout ------π [36mPushing 3 commits to [1m[36mmain[0m[36m @ [2m[36m13bed7b[0m[0m (merge commits allowed)-β [32mPushed to [1m[32mmain[0m[0m (3 commits, 2 files, [32m+2[0m)----- stderr -----+π [36mPushing 3 commits to [1m[36mmain[0m[36m @ [2m[36m13bed7b[0m[0m (merge commits allowed)[107m [0m * [33m13bed7b[m Merge temp[107m [0m [31m|[m[32m/[m[107m [0m [31m|[m * [33m1f38fab[m Commit 2@@ -36,3 +35,4 @@ exit_code: 0[107m [0m file1.txt | 1 [32m+[m[107m [0m file2.txt | 1 [32m+[m[107m [0m 2 files changed, 2 insertions(+)+β [32mPushed to [1m[32mmain[0m[0m (3 commits, 2 files, [32m+2[0m)diff --git a/tests/snapshots/integration__integration_tests__remove__remove_already_on_default.snap b/tests/snapshots/integration__integration_tests__remove__remove_already_on_default.snapindex 87dbba4d7..a978464bd 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_already_on_default.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_already_on_default.snap@@ -14,12 +14,13 @@ info:GIT_EDITOR: ""LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1761609600"+ SOURCE_DATE_EPOCH: "1735776000"+ WORKTRUNK_BIN: ""WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ------π [36mRemoving [1m[36mmain[0m[36m worktree & branch in background[0m----- stderr -----+π [36mRemoving [1m[36mmain[0m[36m worktree & branch in background[0mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_branch_matching_tree_content.snap b/tests/snapshots/integration__integration_tests__remove__remove_branch_matching_tree_content.snapindex 6f02d61d8..d1c22c49e 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_branch_matching_tree_content.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_branch_matching_tree_content.snap@@ -22,7 +22,7 @@ info:success: trueexit_code: 0----- stdout ------βͺ [90mNo worktree found for branch feature-squashed[0m-β [32mRemoved branch [1m[32mfeature-squashed[0m[0m----- stderr -----+βͺ [90mNo worktree found for branch feature-squashed[0m+β [32mRemoved branch [1m[32mfeature-squashed[0m[0mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_branch_not_fully_merged.snap b/tests/snapshots/integration__integration_tests__remove__remove_branch_not_fully_merged.snapindex f29bbfe5d..604cf0d58 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_branch_not_fully_merged.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_branch_not_fully_merged.snap@@ -15,12 +15,13 @@ info:GIT_EDITOR: ""LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1761609600"+ SOURCE_DATE_EPOCH: "1735776000"+ WORKTRUNK_BIN: ""WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ------π [36mRemoving [1m[36mfeature-unmerged[0m[36m worktree in background; retaining unmerged branch[0m----- stderr -----+π [36mRemoving [1m[36mfeature-unmerged[0m[36m worktree in background; retaining unmerged branch[0mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_branch_only_force_delete.snap b/tests/snapshots/integration__integration_tests__remove__remove_branch_only_force_delete.snapindex d180071a3..2f21a2ce1 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_branch_only_force_delete.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_branch_only_force_delete.snap@@ -16,14 +16,14 @@ info:GIT_EDITOR: ""LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1761609600"+ SOURCE_DATE_EPOCH: "1735776000"WORKTRUNK_BIN: ""WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ------βͺ [90mNo worktree found for branch feature-force[0m-β [32mRemoved branch [1m[32mfeature-force[0m[0m (--force-delete)----- stderr -----+βͺ [90mNo worktree found for branch feature-force[0m+β [32mRemoved branch [1m[32mfeature-force[0m[0m (--force-delete)diff --git a/tests/snapshots/integration__integration_tests__remove__remove_branch_only_merged.snap b/tests/snapshots/integration__integration_tests__remove__remove_branch_only_merged.snapindex 9704640b2..f709b2460 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_branch_only_merged.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_branch_only_merged.snap@@ -15,14 +15,14 @@ info:GIT_EDITOR: ""LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1761609600"+ SOURCE_DATE_EPOCH: "1735776000"WORKTRUNK_BIN: ""WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ------βͺ [90mNo worktree found for branch feature-merged[0m-β [32mRemoved branch [1m[32mfeature-merged[0m[0m----- stderr -----+βͺ [90mNo worktree found for branch feature-merged[0m+β [32mRemoved branch [1m[32mfeature-merged[0m[0mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_branch_only_unmerged.snap b/tests/snapshots/integration__integration_tests__remove__remove_branch_only_unmerged.snapindex 2eccdc2cc..cd93cdb95 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_branch_only_unmerged.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_branch_only_unmerged.snap@@ -22,8 +22,8 @@ info:success: trueexit_code: 0----- stdout ------βͺ [90mNo worktree found for branch feature-unmerged[0m-π‘ [33mCould not delete branch [1m[33mfeature-unmerged[0m[0m----- stderr -----+βͺ [90mNo worktree found for branch feature-unmerged[0m+π‘ [33mCould not delete branch [1m[33mfeature-unmerged[0m[0m[107m [0m error: the branch 'feature-unmerged' is not fully mergeddiff --git a/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_main.snap b/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_main.snapindex 967b0688e..51af4afa3 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_main.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_main.snap@@ -15,12 +15,13 @@ info:GIT_EDITOR: ""LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1761609600"+ SOURCE_DATE_EPOCH: "1735776000"+ WORKTRUNK_BIN: ""WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ------π [36mRemoving [1m[36mfeature-a[0m[36m worktree & branch in background[0m----- stderr -----+π [36mRemoving [1m[36mfeature-a[0m[36m worktree & branch in background[0mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_other_worktree.snap b/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_other_worktree.snapindex 4fe945e95..f31cb1a98 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_other_worktree.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_other_worktree.snap@@ -15,12 +15,13 @@ info:GIT_EDITOR: ""LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1761609600"+ SOURCE_DATE_EPOCH: "1735776000"+ WORKTRUNK_BIN: ""WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ------π [36mRemoving [1m[36mfeature-b[0m[36m worktree & branch in background[0m----- stderr -----+π [36mRemoving [1m[36mfeature-b[0m[36m worktree & branch in background[0mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_current_by_name.snap b/tests/snapshots/integration__integration_tests__remove__remove_current_by_name.snapindex 562fa66cc..c8c869f0a 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_current_by_name.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_current_by_name.snap@@ -15,12 +15,13 @@ info:GIT_EDITOR: ""LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1761609600"+ SOURCE_DATE_EPOCH: "1735776000"+ WORKTRUNK_BIN: ""WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ------π [36mRemoving [1m[36mfeature-current[0m[36m worktree & branch in background[0m----- stderr -----+π [36mRemoving [1m[36mfeature-current[0m[36m worktree & branch in background[0mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_foreground.snap b/tests/snapshots/integration__integration_tests__remove__remove_foreground.snapindex d7f1cce73..343bf489b 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_foreground.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_foreground.snap@@ -16,13 +16,14 @@ info:GIT_EDITOR: ""LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1761609600"+ SOURCE_DATE_EPOCH: "1735776000"+ WORKTRUNK_BIN: ""WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ------π [36mRemoving worktree for [1m[36mfeature-fg[0m[36m...[0m-β [32mRemoved worktree & branch for [1m[32mfeature-fg[0m[0m----- stderr -----+π [36mRemoving worktree for [1m[36mfeature-fg[0m[36m...[0m+β [32mRemoved worktree & branch for [1m[32mfeature-fg[0m[0mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap b/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snapindex 5a390d9de..10c96246b 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap@@ -14,12 +14,13 @@ info:GIT_EDITOR: ""LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1761609600"+ SOURCE_DATE_EPOCH: "1735776000"+ WORKTRUNK_BIN: ""WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ------π [36mRemoving [1m[36mfeature-wt[0m[36m worktree & branch in background[0m----- stderr -----+π [36mRemoving [1m[36mfeature-wt[0m[36m worktree & branch in background[0mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_multiple_including_current.snap b/tests/snapshots/integration__integration_tests__remove__remove_multiple_including_current.snapindex 54e1b446e..f2654aa5a 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_multiple_including_current.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_multiple_including_current.snap@@ -17,14 +17,15 @@ info:GIT_EDITOR: ""LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1761609600"+ SOURCE_DATE_EPOCH: "1735776000"+ WORKTRUNK_BIN: ""WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout -----++----- stderr -----π [36mRemoving [1m[36mfeature-b[0m[36m worktree & branch in background[0mπ [36mRemoving [1m[36mfeature-c[0m[36m worktree & branch in background[0mπ [36mRemoving [1m[36mfeature-a[0m[36m worktree & branch in background[0m------- stderr -----diff --git a/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snapindex 617588735..476674456 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap@@ -17,14 +17,15 @@ info:GIT_EDITOR: ""LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1761609600"+ SOURCE_DATE_EPOCH: "1735776000"+ WORKTRUNK_BIN: ""WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout -----++----- stderr -----π [36mRemoving [1m[36mfeature-a[0m[36m worktree & branch in background[0mπ [36mRemoving [1m[36mfeature-b[0m[36m worktree & branch in background[0mπ [36mRemoving [1m[36mfeature-c[0m[36m worktree & branch in background[0m------- stderr -----diff --git a/tests/snapshots/integration__integration_tests__remove__remove_no_delete_branch.snap b/tests/snapshots/integration__integration_tests__remove__remove_no_delete_branch.snapindex e0e229db7..14c70836b 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_no_delete_branch.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_no_delete_branch.snap@@ -16,12 +16,13 @@ info:GIT_EDITOR: ""LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1761609600"+ SOURCE_DATE_EPOCH: "1735776000"+ WORKTRUNK_BIN: ""WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ------π [36mRemoving [1m[36mfeature-keep[0m[36m worktree in background; retaining branch (--no-delete-branch)[0m----- stderr -----+π [36mRemoving [1m[36mfeature-keep[0m[36m worktree in background; retaining branch (--no-delete-branch)[0mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_switch_to_default.snap b/tests/snapshots/integration__integration_tests__remove__remove_switch_to_default.snapindex 9010799af..3ab4aca9d 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_switch_to_default.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_switch_to_default.snap@@ -14,12 +14,13 @@ info:GIT_EDITOR: ""LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1761609600"+ SOURCE_DATE_EPOCH: "1735776000"+ WORKTRUNK_BIN: ""WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ------π [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m----- stderr -----+π [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__create_with_base_main.snap b/tests/snapshots/integration__integration_tests__switch__create_with_base_main.snapindex 9eb2bdbf6..6e0badf12 100644--- a/tests/snapshots/integration__integration_tests__switch__create_with_base_main.snap+++ b/tests/snapshots/integration__integration_tests__switch__create_with_base_main.snap@@ -16,15 +16,17 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1761609600"+ SOURCE_DATE_EPOCH: "1735776000"+ WORKTRUNK_BIN: ""WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ------β [32mCreated new worktree for [1m[32mnew-feature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].new-feature[0m[0m-π‘ [2m[2mRun `wt config shell install` to enable automatic cd[0m[0m----- stderr -----+β [32mCreated new worktree for [1m[32mnew-feature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].new-feature[0m[0m+π‘ [2mRun `wt config shell install` to enable automatic cd[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_base_without_create.snap b/tests/snapshots/integration__integration_tests__switch__switch_base_without_create.snapindex 97f3ac983..b3c1c5900 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_base_without_create.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_base_without_create.snap@@ -15,15 +15,17 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1761609600"+ SOURCE_DATE_EPOCH: "1735776000"+ WORKTRUNK_BIN: ""WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ------π‘ [33m--base flag is only used with --create, ignoring[0m-βͺ Already on worktree for [1mmain[0m at [1m[REPO][0m----- stderr -----+π‘ [33m--base flag is only used with --create, ignoring[0m+βͺ Already on worktree for [1mmain[0m at [1m[REPO][0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_create_new.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_new.snapindex d5e433c7d..a938e438d 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_create_new.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_create_new.snap@@ -14,15 +14,17 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1761609600"+ SOURCE_DATE_EPOCH: "1735776000"+ WORKTRUNK_BIN: ""WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ------β [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----- stderr -----+β [32mCreated new worktree for [1m[32mfeature-x[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature-x[0m[0m+π‘ [2mRun `wt config shell install` to enable automatic cd[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_create_no_remote.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_no_remote.snapindex e206d8804..6f66affc4 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_create_no_remote.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_create_no_remote.snap@@ -14,15 +14,17 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1761609600"+ SOURCE_DATE_EPOCH: "1735776000"+ WORKTRUNK_BIN: ""WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ------β [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----- stderr -----+β [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0m+π‘ [2mRun `wt config shell install` to enable automatic cd[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_create_remote_only.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_remote_only.snapindex e3b5dc5e5..577609897 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_create_remote_only.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_create_remote_only.snap@@ -14,15 +14,17 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1761609600"+ SOURCE_DATE_EPOCH: "1735776000"+ WORKTRUNK_BIN: ""WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ------β [32mCreated new worktree for [1m[32mremote-feature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].remote-feature[0m[0m-π‘ [2m[2mRun `wt config shell install` to enable automatic cd[0m[0m----- stderr -----+β [32mCreated new worktree for [1m[32mremote-feature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].remote-feature[0m[0m+π‘ [2mRun `wt config shell install` to enable automatic cd[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_default_branch_missing_worktree.snap b/tests/snapshots/integration__integration_tests__switch__switch_default_branch_missing_worktree.snapindex 2bca73501..d809b6170 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_default_branch_missing_worktree.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_default_branch_missing_worktree.snap@@ -13,15 +13,17 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1761609600"+ SOURCE_DATE_EPOCH: "1735776000"+ WORKTRUNK_BIN: ""WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ------β [32mSwitched to worktree for [1m[32mmain[0m[32m at [1m[32m[REPO].main[0m[0m-π‘ [2m[2mRun `wt config shell install` to enable automatic cd[0m[0m----- stderr -----+β [32mSwitched to worktree for [1m[32mmain[0m[32m at [1m[32m[REPO].main[0m[0m+π‘ [2mRun `wt config shell install` to enable automatic cd[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 5363d0e21..b4587b645 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snap@@ -26,8 +26,8 @@ info:success: trueexit_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----- stderr -----+β [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 [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test content'[0m[2m [0m[2m[36m>[0m[2m test.txt[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snapindex 7d1113890..ac1e05b83 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap@@ -25,8 +25,8 @@ info:success: trueexit_code: 0----- stdout ------β [32mSwitched to worktree for [1m[32mexisting-exec[0m[32m at [1m[32m[REPO].existing-exec[0m[0m-π [36mExecuting (--execute):[0m----- stderr -----+β [32mSwitched to worktree for [1m[32mexisting-exec[0m[32m at [1m[32m[REPO].existing-exec[0m[0m+π [36mExecuting (--execute):[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'existing worktree'[0m[2m [0m[2m[36m>[0m[2m existing.txt[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snapindex f8872a706..f3a5137ae 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap@@ -26,8 +26,8 @@ info:success: falseexit_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----- stderr -----+β [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 [2m[0m[2m[34mexit[0m[2m 1[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snapindex 81db844b7..fe3df4b2e 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap@@ -26,13 +26,13 @@ info:success: trueexit_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):[0mline1line2line3----- stderr -----+β [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 [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[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snapindex f3af2a7a4..1ba5e09c0 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap@@ -26,9 +26,9 @@ info:success: trueexit_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):[0mtest output----- stderr -----+β [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 [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test output'[0m[2m[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snap b/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snapindex 74ca7c12a..994d30744 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snap@@ -16,14 +16,14 @@ info:HOME: "[TEST_HOME]"LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1761609600"+ SOURCE_DATE_EPOCH: "1735776000"WORKTRUNK_BIN: ""WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ------π‘ [33mWorktree for [1m[33mfeature-z[0m[33m at [1m[33m[REPO].feature-z[0m[33m; cannot cd (no shell integration)[0m-π‘ [2m[2mRun `wt config shell install` to enable automatic cd[0m[0m----- stderr -----+π‘ [33mWorktree for [1m[33mfeature-z[0m[33m at [1m[33m[REPO].feature-z[0m[33m; cannot cd (no shell integration)[0m+π‘ [2mRun `wt config shell install` to enable automatic cd[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_existing_with_shell_configured.snap b/tests/snapshots/integration__integration_tests__switch__switch_existing_with_shell_configured.snapindex b218d6c75..26c3422e2 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_existing_with_shell_configured.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_existing_with_shell_configured.snap@@ -16,13 +16,13 @@ info:HOME: "[TEST_HOME]"LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1761609600"+ SOURCE_DATE_EPOCH: "1735776000"WORKTRUNK_BIN: ""WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ------β [32mSwitched to worktree for [1m[32mshell-configured[0m[32m at [1m[32m[REPO].shell-configured[0m[0m----- stderr -----+β [32mSwitched to worktree for [1m[32mshell-configured[0m[32m at [1m[32m[REPO].shell-configured[0m[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_main_branch.snap b/tests/snapshots/integration__integration_tests__switch__switch_main_branch.snapindex 1f51af78b..636a1af55 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_main_branch.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_main_branch.snap@@ -13,14 +13,16 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1761609600"+ SOURCE_DATE_EPOCH: "1735776000"+ WORKTRUNK_BIN: ""WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ------βͺ Already on worktree for [1mmain[0m at [1m[REPO][0m----- stderr -----+βͺ Already on worktree for [1mmain[0m at [1m[REPO][0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_main_branch_to_feature.snap b/tests/snapshots/integration__integration_tests__switch__switch_main_branch_to_feature.snapindex 181f5f881..f5a6ed5c2 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_main_branch_to_feature.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_main_branch_to_feature.snap@@ -13,15 +13,17 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1761609600"+ SOURCE_DATE_EPOCH: "1735776000"+ WORKTRUNK_BIN: ""WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ------β [32mSwitched to worktree for [1m[32mfeature-a[0m[32m at [1m[32m[REPO].feature-a[0m[0m-π‘ [2m[2mRun `wt config shell install` to enable automatic cd[0m[0m----- stderr -----+β [32mSwitched to worktree for [1m[32mfeature-a[0m[32m at [1m[32m[REPO].feature-a[0m[0m+π‘ [2mRun `wt config shell install` to enable automatic cd[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch.snap b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch.snapindex 9a8ae155a..57c02c25f 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch.snap@@ -16,14 +16,14 @@ info:HOME: "[TEST_HOME]"LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1761609600"+ SOURCE_DATE_EPOCH: "1735776000"WORKTRUNK_BIN: ""WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ------π‘ [33mWorktree for [1m[33mfeature-a[0m[33m at [1m[33m[REPO].feature-a[0m[33m; cannot cd (no shell integration)[0m-π‘ [2m[2mRun `wt config shell install` to enable automatic cd[0m[0m----- stderr -----+π‘ [33mWorktree for [1m[33mfeature-a[0m[33m at [1m[33m[REPO].feature-a[0m[33m; cannot cd (no shell integration)[0m+π‘ [2mRun `wt config shell install` to enable automatic cd[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_first.snap b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_first.snapindex 181f5f881..f5a6ed5c2 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_first.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_first.snap@@ -13,15 +13,17 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1761609600"+ SOURCE_DATE_EPOCH: "1735776000"+ WORKTRUNK_BIN: ""WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ------β [32mSwitched to worktree for [1m[32mfeature-a[0m[32m at [1m[32m[REPO].feature-a[0m[0m-π‘ [2m[2mRun `wt config shell install` to enable automatic cd[0m[0m----- stderr -----+β [32mSwitched to worktree for [1m[32mfeature-a[0m[32m at [1m[32m[REPO].feature-a[0m[0m+π‘ [2mRun `wt config shell install` to enable automatic cd[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_second.snap b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_second.snapindex 4cb094b72..551279b40 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_second.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_second.snap@@ -13,15 +13,17 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1761609600"+ SOURCE_DATE_EPOCH: "1735776000"+ WORKTRUNK_BIN: ""WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ------β [32mSwitched to worktree for [1m[32mfeature-b[0m[32m at [1m[32m[REPO].feature-b[0m[0m-π‘ [2m[2mRun `wt config shell install` to enable automatic cd[0m[0m----- stderr -----+β [32mSwitched to worktree for [1m[32mfeature-b[0m[32m at [1m[32m[REPO].feature-b[0m[0m+π‘ [2mRun `wt config shell install` to enable automatic cd[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_with_worktrunk_history_back.snap b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_with_worktrunk_history_back.snapindex 66695a30c..1e18d193c 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_with_worktrunk_history_back.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_with_worktrunk_history_back.snap@@ -16,14 +16,14 @@ info:HOME: "[TEST_HOME]"LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1761609600"+ SOURCE_DATE_EPOCH: "1735776000"WORKTRUNK_BIN: ""WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ------π‘ [33mWorktree for [1m[33mfeature-x[0m[33m at [1m[33m[REPO].feature-x[0m[33m; cannot cd (no shell integration)[0m-π‘ [2m[2mRun `wt config shell install` to enable automatic cd[0m[0m----- stderr -----+π‘ [33mWorktree for [1m[33mfeature-x[0m[33m at [1m[33m[REPO].feature-x[0m[33m; cannot cd (no shell integration)[0m+π‘ [2mRun `wt config shell install` to enable automatic cd[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_with_worktrunk_history_first.snap b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_with_worktrunk_history_first.snapindex 4a052df50..3005d275c 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_with_worktrunk_history_first.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_with_worktrunk_history_first.snap@@ -13,15 +13,17 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1761609600"+ SOURCE_DATE_EPOCH: "1735776000"+ WORKTRUNK_BIN: ""WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ------β [32mSwitched to worktree for [1m[32mfeature-x[0m[32m at [1m[32m[REPO].feature-x[0m[0m-π‘ [2m[2mRun `wt config shell install` to enable automatic cd[0m[0m----- stderr -----+β [32mSwitched to worktree for [1m[32mfeature-x[0m[32m at [1m[32m[REPO].feature-x[0m[0m+π‘ [2mRun `wt config shell install` to enable automatic cd[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_with_worktrunk_history_second.snap b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_with_worktrunk_history_second.snapindex cd18f7251..ffeadf97e 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_with_worktrunk_history_second.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_with_worktrunk_history_second.snap@@ -13,15 +13,17 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1761609600"+ SOURCE_DATE_EPOCH: "1735776000"+ WORKTRUNK_BIN: ""WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ------β [32mSwitched to worktree for [1m[32mfeature-y[0m[32m at [1m[32m[REPO].feature-y[0m[0m-π‘ [2m[2mRun `wt config shell install` to enable automatic cd[0m[0m----- stderr -----+β [32mSwitched to worktree for [1m[32mfeature-y[0m[32m at [1m[32m[REPO].feature-y[0m[0m+π‘ [2mRun `wt config shell install` to enable automatic cd[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_primary_on_different_branch.snap b/tests/snapshots/integration__integration_tests__switch__switch_primary_on_different_branch.snapindex 54edcbcb5..eec1e5cad 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_primary_on_different_branch.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_primary_on_different_branch.snap@@ -14,15 +14,17 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1761609600"+ SOURCE_DATE_EPOCH: "1735776000"+ WORKTRUNK_BIN: ""WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ------β [32mCreated new worktree for [1m[32mfeature-from-main[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature-from-main[0m[0m-π‘ [2m[2mRun `wt config shell install` to enable automatic cd[0m[0m----- stderr -----+β [32mCreated new worktree for [1m[32mfeature-from-main[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature-from-main[0m[0m+π‘ [2mRun `wt config shell install` to enable automatic cd[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_to_existing_primary_on_different_branch.snap b/tests/snapshots/integration__integration_tests__switch__switch_to_existing_primary_on_different_branch.snapindex 0a78c6e8b..1792a9147 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_to_existing_primary_on_different_branch.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_to_existing_primary_on_different_branch.snap@@ -16,14 +16,14 @@ info:HOME: "[TEST_HOME]"LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1761609600"+ SOURCE_DATE_EPOCH: "1735776000"WORKTRUNK_BIN: ""WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ------π‘ [33mWorktree for [1m[33mexisting-branch[0m[33m at [1m[33m[REPO].existing-branch[0m[33m; cannot cd (no shell integration)[0m-π‘ [2m[2mRun `wt config shell install` to enable automatic cd[0m[0m----- stderr -----+π‘ [33mWorktree for [1m[33mexisting-branch[0m[33m at [1m[33m[REPO].existing-branch[0m[33m; cannot cd (no shell integration)[0m+π‘ [2mRun `wt config shell install` to enable automatic cd[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_with_base.snap b/tests/snapshots/integration__integration_tests__switch__switch_with_base.snapindex 1f4e02834..50eb05bdc 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_with_base.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_with_base.snap@@ -16,15 +16,17 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C- SOURCE_DATE_EPOCH: "1761609600"+ SOURCE_DATE_EPOCH: "1735776000"+ WORKTRUNK_BIN: ""WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout ------β [32mCreated new worktree for [1m[32mfeature-with-base[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature-with-base[0m[0m-π‘ [2m[2mRun `wt config shell install` to enable automatic cd[0m[0m----- stderr -----+β [32mCreated new worktree for [1m[32mfeature-with-base[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature-with-base[0m[0m+π‘ [2mRun `wt config shell install` to enable automatic cd[0m