Skip to content

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.md
index b8ca8b91f..41f51cd15 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -177,15 +177,27 @@ All styling uses the **anstyle ecosystem** for composable, auto-detecting termin
Six 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.rs
index 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.rs
index 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.rs
index 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.rs
index 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 message
diff --git a/src/main.rs b/src/main.rs
index 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 activation
if 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 messages
if 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 gutter
let 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.rs
index 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 content
diff --git a/src/output/handlers.rs b/src/output/handlers.rs
index 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.rs
index 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 mode
self.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 stderr
stderr().flush()
}
diff --git a/src/output/mod.rs b/src/output/mod.rs
index e167a9526..36e075339 100644
--- a/src/output/mod.rs
+++ b/src/output/mod.rs
@@ -63,8 +63,8 @@ mod traits;
// Re-export the public API
pub use global::{
- OutputMode, 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 handlers
diff --git a/src/output/traits.rs b/src/output/traits.rs
index 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 message
fn 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.rs
index 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: true
exit_code: 0
----- stdout -----
+
+ ----- stderr -----
βšͺ Global config already exists: ~/.config/worktrunk/config.toml
πŸ’‘ Use 'wt config show' to view existing configuration
πŸ’‘ Use 'wt config create --help' for config format reference
-
- ----- stderr -----
");
});
}
@@ -57,11 +57,11 @@ fn test_config_init_creates_file() {
success: true
exit_code: 0
----- stdout -----
+
+ ----- stderr -----
βœ… Created config file: ~/.config/worktrunk/config.toml
πŸ’‘ Edit this file to customize worktree paths and LLM settings
-
- ----- stderr -----
");
});
diff --git a/tests/integration_tests/config_status.rs b/tests/integration_tests/config_status.rs
index 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), @"βœ… Set status for main to 🚧");
+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"βœ… Set status for main to 🚧");
// Verify it was set
let 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), @"βœ… Set status for feature to πŸ”§");
+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"βœ… Set status for feature to πŸ”§");
// Verify it was set
let 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), @"βœ… Cleared status for main");
+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"βœ… Cleared status for main");
// Verify it was unset
let 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), @"βœ… Cleared status for feature");
+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"βœ… Cleared status for feature");
// Verify it was unset
let 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), @"βœ… Cleared 3 statuses");
+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"βœ… Cleared 3 statuses");
// Verify all were unset
let 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.rs
index 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: true
exit_code: 0
----- stdout -----
+
+ ----- stderr -----
+ 🟑 Completions won't work: zsh's compinit is not enabled.
+  Add this to ~/.zshrc before the wt line:
+  autoload -Uz compinit && compinit
βœ… Added shell extension & completions for zsh @ ~/.zshrc
πŸ’‘ Skipped bash; ~/.bashrc not found
πŸ’‘ Skipped fish; ~/.config/fish/conf.d not found
βœ… Configured 1 shell
πŸ’‘ Restart shell or run: source ~/.zshrc
-
- ----- stderr -----
- 🟑 Completions won't work: zsh's compinit is not enabled.
-  Add this to ~/.zshrc before the wt line:
-  autoload -Uz compinit && compinit
");
});
@@ -75,15 +75,15 @@ fn test_configure_shell_specific_shell() {
success: true
exit_code: 0
----- stdout -----
- βœ… Added shell extension & completions for zsh @ ~/.zshrc
-
- βœ… Configured 1 shell
- πŸ’‘ Restart shell or run: source ~/.zshrc
----- stderr -----
🟑 Completions won't work: zsh's compinit is not enabled.
 Add this to ~/.zshrc before the wt line:
 autoload -Uz compinit && compinit
+ βœ… Added shell extension & completions for zsh @ ~/.zshrc
+
+ βœ… Configured 1 shell
+ πŸ’‘ Restart shell or run: source ~/.zshrc
");
});
@@ -123,10 +123,10 @@ fn test_configure_shell_already_exists() {
success: true
exit_code: 0
----- stdout -----
- βšͺ Already configured shell extension & completions for zsh @ ~/.zshrc
- βšͺ All shells already configured
----- stderr -----
+ βšͺ Already configured shell extension & completions for zsh @ ~/.zshrc
+ βšͺ All shells already configured
");
});
@@ -159,13 +159,13 @@ fn test_configure_shell_fish() {
success: true
exit_code: 0
----- stdout -----
+
+ ----- stderr -----
βœ… Created shell extension for fish @ ~/.config/fish/conf.d/wt.fish
βœ… Created completions for fish @ ~/.config/fish/completions/wt.fish
βœ… Configured 1 shell
πŸ’‘ Restart shell to activate
-
- ----- stderr -----
");
});
@@ -217,12 +217,12 @@ fn test_configure_shell_fish_extension_exists() {
success: true
exit_code: 0
----- stdout -----
+
+ ----- stderr -----
βšͺ Already configured shell extension for fish @ ~/.config/fish/conf.d/wt.fish
βœ… Created completions for fish @ ~/.config/fish/completions/wt.fish
βœ… Configured 1 shell
-
- ----- stderr -----
");
});
@@ -261,11 +261,11 @@ fn test_configure_shell_no_files() {
success: false
exit_code: 1
----- stdout -----
+
+ ----- stderr -----
πŸ’‘ Skipped bash; ~/.bashrc not found
πŸ’‘ Skipped zsh; ~/.zshrc not found
πŸ’‘ Skipped fish; ~/.config/fish/conf.d not found
-
- ----- stderr -----
❌ No shell config files found
");
});
@@ -299,17 +299,17 @@ fn test_configure_shell_multiple_configs() {
success: true
exit_code: 0
----- stdout -----
+
+ ----- stderr -----
+ 🟑 Completions won't work: zsh's compinit is not enabled.
+  Add this to ~/.zshrc before the wt line:
+  autoload -Uz compinit && compinit
βœ… Added shell extension & completions for bash @ ~/.bashrc
βœ… Added shell extension & completions for zsh @ ~/.zshrc
πŸ’‘ Skipped fish; ~/.config/fish/conf.d not found
βœ… Configured 2 shells
πŸ’‘ Restart shell or run: source ~/.zshrc
-
- ----- stderr -----
- 🟑 Completions won't work: zsh's compinit is not enabled.
-  Add this to ~/.zshrc before the wt line:
-  autoload -Uz compinit && compinit
");
});
@@ -361,17 +361,17 @@ fn test_configure_shell_mixed_states() {
success: true
exit_code: 0
----- stdout -----
+
+ ----- stderr -----
+ 🟑 Completions won't work: zsh's compinit is not enabled.
+  Add this to ~/.zshrc before the wt line:
+  autoload -Uz compinit && compinit
βšͺ Already configured shell extension & completions for bash @ ~/.bashrc
βœ… Added shell extension & completions for zsh @ ~/.zshrc
πŸ’‘ Skipped fish; ~/.config/fish/conf.d not found
βœ… Configured 1 shell
πŸ’‘ Restart shell or run: source ~/.zshrc
-
- ----- stderr -----
- 🟑 Completions won't work: zsh's compinit is not enabled.
-  Add this to ~/.zshrc before the wt line:
-  autoload -Uz compinit && compinit
");
});
@@ -421,6 +421,8 @@ fn test_uninstall_shell() {
success: true
exit_code: 0
----- stdout -----
+
+ ----- stderr -----
βœ… Removed shell extension & completions for zsh @ ~/.zshrc
πŸ’‘ No bash shell extension & completions in ~/.bashrc
πŸ’‘ No fish shell extension in ~/.config/fish/conf.d/wt.fish
@@ -428,8 +430,6 @@ fn test_uninstall_shell() {
βœ… Removed integration from 1 shell
πŸ’‘ Restart shell to complete uninstall
-
- ----- stderr -----
");
});
@@ -481,6 +481,8 @@ fn test_uninstall_shell_multiple() {
success: true
exit_code: 0
----- stdout -----
+
+ ----- stderr -----
βœ… Removed shell extension & completions for bash @ ~/.bashrc
βœ… Removed shell extension & completions for zsh @ ~/.zshrc
πŸ’‘ No fish shell extension in ~/.config/fish/conf.d/wt.fish
@@ -488,8 +490,6 @@ fn test_uninstall_shell_multiple() {
βœ… Removed integration from 2 shells
πŸ’‘ Restart shell to complete uninstall
-
- ----- stderr -----
");
});
@@ -534,9 +534,9 @@ fn test_uninstall_shell_not_found() {
success: true
exit_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: true
exit_code: 0
----- stdout -----
+
+ ----- stderr -----
βœ… Removed shell extension for fish @ ~/.config/fish/conf.d/wt.fish
βœ… Removed integration from 1 shell
πŸ’‘ Restart shell to complete uninstall
-
- ----- stderr -----
");
});
@@ -688,12 +688,12 @@ fn test_configure_shell_no_warning_when_compinit_enabled() {
success: true
exit_code: 0
----- stdout -----
+
+ ----- stderr -----
βœ… Added shell extension & completions for zsh @ ~/.zshrc
βœ… Configured 1 shell
πŸ’‘ Restart shell or run: source ~/.zshrc
-
- ----- stderr -----
");
});
}
@@ -728,14 +728,14 @@ fn test_configure_shell_no_warning_for_bash_user() {
success: true
exit_code: 0
----- stdout -----
+
+ ----- stderr -----
βœ… Added shell extension & completions for bash @ ~/.bashrc
βœ… Added shell extension & completions for zsh @ ~/.zshrc
πŸ’‘ Skipped fish; ~/.config/fish/conf.d not found
βœ… Configured 2 shells
πŸ’‘ Restart shell or run: source ~/.bashrc
-
- ----- stderr -----
");
});
}
@@ -769,12 +769,12 @@ fn test_configure_shell_no_warning_for_fish_install() {
success: true
exit_code: 0
----- stdout -----
+
+ ----- stderr -----
βœ… Created shell extension for fish @ ~/.config/fish/conf.d/wt.fish
βœ… Created completions for fish @ ~/.config/fish/completions/wt.fish
βœ… Configured 1 shell
-
- ----- stderr -----
");
});
}
@@ -811,10 +811,10 @@ fn test_configure_shell_no_warning_when_already_configured() {
success: true
exit_code: 0
----- stdout -----
- βšͺ Already configured shell extension & completions for zsh @ ~/.zshrc
- βšͺ All shells already configured
----- stderr -----
+ βšͺ Already configured shell extension & completions for zsh @ ~/.zshrc
+ βšͺ All shells already configured
");
});
}
@@ -848,13 +848,13 @@ fn test_configure_shell_no_warning_when_shell_unset() {
success: true
exit_code: 0
----- stdout -----
+
+ ----- stderr -----
βœ… Added shell extension & completions for bash @ ~/.bashrc
βœ… Added shell extension & completions for zsh @ ~/.zshrc
πŸ’‘ Skipped fish; ~/.config/fish/conf.d not found
βœ… Configured 2 shells
-
- ----- stderr -----
");
});
}
diff --git a/tests/integration_tests/directives.rs b/tests/integration_tests/directives.rs
index 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: true
exit_code: 0
----- stdout -----
- πŸ”„ Removing main worktree & branch in background
----- stderr -----
+ πŸ”„ Removing main worktree & branch in background
");
});
}
diff --git a/tests/integration_tests/merge.rs b/tests/integration_tests/merge.rs
index 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: true
exit_code: 0
----- stdout -----
- πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
- βœ… Merged to main (1 commit, 1 file, +1)
- βšͺ Worktree preserved (--no-remove)
----- stderr -----
+ πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
+ βœ… Merged to main (1 commit, 1 file, +1)
+ βšͺ Worktree preserved (--no-remove)
");
});
}
@@ -2555,14 +2555,14 @@ fn test_merge_no_commit_no_squash_no_remove_redundant() {
success: true
exit_code: 0
----- stdout -----
- πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
- βœ… Merged to main (1 commit, 1 file, +1)
- βšͺ Worktree preserved (--no-remove)
----- stderr -----
+ πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
+ βœ… Merged to main (1 commit, 1 file, +1)
+ βšͺ 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.snap
index 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
  echo 'test command'
test command
βœ… Created new worktree for test-approve from main at [REPO]/repo.test-approve
-πŸ’‘ Run `wt config shell install` to enable automatic cd
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snap
index 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? [y/N]
βšͺ Commands declined, continuing worktree creation
βœ… Created new worktree for test-decline from main at [REPO]/repo.test-decline
-πŸ’‘ Run `wt config shell install` to enable automatic cd
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snap
index 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
  echo 'Third command'
Third command
βœ… Created new worktree for test-mixed-accept from main at [REPO]/repo.test-mixed-accept
-πŸ’‘ Run `wt config shell install` to enable automatic cd
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snap
index 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? [y/N]
βšͺ Commands declined, continuing worktree creation
βœ… Created new worktree for test-mixed-decline from main at [REPO]/repo.test-mixed-decline
-πŸ’‘ Run `wt config shell install` to enable automatic cd
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snap
index 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
  echo 'Third command'
Third command
βœ… Created new worktree for test-multi from main at [REPO]/repo.test-multi
-πŸ’‘ Run `wt config shell install` to enable automatic cd
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap
index 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
  echo 'Running tests...'
Running tests...
βœ… Created new worktree for test-named from main at [REPO]/repo.test-named
-πŸ’‘ Run `wt config shell install` to enable automatic cd
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snap
index 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
  echo 'test command'
test command
βœ… Created new worktree for test-permission from main at [REPO]/repo.test-permission
-πŸ’‘ Run `wt config shell install` to enable automatic cd
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__already_approved_skip_prompt.snap b/tests/snapshots/integration__integration_tests__approval_ui__already_approved_skip_prompt.snap
index 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: true
exit_code: 0
----- stdout -----
-πŸ”„ Running post-create:
-βœ… Created new worktree for test-approved from main at [REPO].test-approved
-πŸ’‘ Run `wt config shell install` to enable automatic cd
----- stderr -----
+πŸ”„ Running post-create:
  echo 'approved' > output.txt
-
+βœ… Created new worktree for test-approved from main at [REPO].test-approved
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__force_bypasses_tty_check.snap b/tests/snapshots/integration__integration_tests__approval_ui__force_bypasses_tty_check.snap
index 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: true
exit_code: 0
----- stdout -----
-πŸ”„ Running post-create:
-βœ… Created new worktree for test-force-tty from main at [REPO].test-force-tty
-πŸ’‘ Run `wt config shell install` to enable automatic cd
----- stderr -----
+πŸ”„ Running post-create:
  echo 'test command'
test command
+βœ… Created new worktree for test-force-tty from main at [REPO].test-force-tty
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_first_run.snap b/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_first_run.snap
index 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: true
exit_code: 0
----- stdout -----
-πŸ”„ Running post-create:
-βœ… Created new worktree for test-force from main at [REPO].test-force
-πŸ’‘ Run `wt config shell install` to enable automatic cd
----- stderr -----
+πŸ”„ Running post-create:
  echo 'test command' > output.txt
-
+βœ… Created new worktree for test-force from main at [REPO].test-force
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__approvals__add_approvals_empty_config.snap b/tests/snapshots/integration__integration_tests__approvals__add_approvals_empty_config.snap
index 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: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
+ WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
exit_code: 0
----- stdout -----
-βšͺ No commands configured in project
----- stderr -----
+βšͺ No commands configured in project
diff --git a/tests/snapshots/integration__integration_tests__approvals__add_approvals_force.snap b/tests/snapshots/integration__integration_tests__approvals__add_approvals_force.snap
index 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: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
+ WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
exit_code: 0
----- stdout -----
-βœ… Commands approved; not saved (--force)
----- stderr -----
+βœ… Commands approved; not saved (--force)
diff --git a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_after_clear.snap b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_after_clear.snap
index 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: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
+ WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
exit_code: 0
----- stdout -----
-βšͺ No approvals to clear for this project
----- stderr -----
+βšͺ No approvals to clear for this project
diff --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.snap
index 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: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
+ WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
exit_code: 0
----- stdout -----
-βšͺ No approvals to clear
----- stderr -----
+βšͺ No approvals to clear
diff --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.snap
index 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: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
+ WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
exit_code: 0
----- stdout -----
-βœ… Cleared approvals for 1 project
----- stderr -----
+βœ… Cleared approvals for 1 project
diff --git a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_multiple_approvals.snap b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_multiple_approvals.snap
index 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: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
+ WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
exit_code: 0
----- stdout -----
-βšͺ No approvals to clear for this project
----- stderr -----
+βšͺ No approvals to clear for this project
diff --git a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_no_approvals.snap b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_no_approvals.snap
index 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: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
+ WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
exit_code: 0
----- stdout -----
-βšͺ No approvals to clear for this project
----- stderr -----
+βšͺ No approvals to clear for this project
diff --git a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_with_approvals.snap b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_with_approvals.snap
index 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: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
+ WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
exit_code: 0
----- stdout -----
-βšͺ No approvals to clear for this project
----- stderr -----
+βšͺ No approvals to clear for this project
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_already_on_target.snap b/tests/snapshots/integration__integration_tests__merge__merge_already_on_target.snap
index 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: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
exit_code: 0
----- stdout -----
-βšͺ Already up to date with main (no new commits, no rebase needed)
-βšͺ Worktree preserved (on main branch)
----- stderr -----
+βšͺ Already up to date with main (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.snap
index 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: true
exit_code: 0
----- stdout -----
+
+----- stderr -----
πŸ”„ Squashing 2 commits & working tree changes into a single commit (2 files, +2)...
πŸ’‘ Backup created @ 330ccd6
πŸ”„ Generating squash commit message...
+  fix: update file 1 content
βœ… Squashed @ b54183b
πŸ”„ Merging 1 commit to main @ b54183b (no rebase needed)
-βœ… Merged to main (1 commit, 2 files, +2)
-πŸ”„ Removing feature worktree & branch in background
-
------ stderr -----
-  fix: update file 1 content
  * b54183b fix: update file 1 content
  file1.txt | 1 +
  file2.txt | 1 +
  2 files changed, 2 insertions(+)
+βœ… Merged to main (1 commit, 2 files, +2)
+πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap
index 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: true
exit_code: 0
----- stdout -----
+
+----- stderr -----
πŸ”„ Squashing 1 commit & working tree changes into a single commit (1 file, +1)...
πŸ’‘ Backup created @ b18c23e
πŸ”„ Generating squash commit message...
-πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
-βœ… Squashed @ d118927
-πŸ”„ Merging 1 commit to main @ d118927 (no rebase needed)
-βœ… Merged to main (1 commit, 1 file, +1)
-πŸ”„ Removing feature worktree & branch in background
-
------ stderr -----
+πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
  Squash commits from main
 
  Combined commits:
  - feat: initial feature
+βœ… Squashed @ d118927
+πŸ”„ Merging 1 commit to main @ d118927 (no rebase needed)
  * d118927 Squash commits from main
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
+βœ… Merged to main (1 commit, 1 file, +1)
+πŸ”„ Removing feature worktree & branch in background
diff --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.snap
index 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: true
exit_code: 0
----- stdout -----
+
+----- stderr -----
πŸ”„ Squashing 1 commit & working tree changes into a single commit (1 file, +1)...
πŸ’‘ Backup created @ 967330a
πŸ”„ Generating squash commit message...
+  fix: improve auth validation logic
βœ… Squashed @ 1e3993e
πŸ”„ Merging 1 commit to main @ 1e3993e (no rebase needed)
-βœ… Merged to main (1 commit, 1 file, +1)
-πŸ”„ Removing feature worktree & branch in background
-
------ stderr -----
-  fix: improve auth validation logic
  * 1e3993e fix: improve auth validation logic
  auth.txt | 1 +
  1 file changed, 1 insertion(+)
+βœ… Merged to main (1 commit, 1 file, +1)
+πŸ”„ Removing feature worktree & branch in background
diff --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.snap
index 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: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
exit_code: 0
----- stdout -----
-βšͺ Already up to date with main (no new commits, no rebase needed)
-βšͺ Worktree preserved (on main branch)
----- stderr -----
+βšͺ Already up to date with main (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.snap
index 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: true
exit_code: 0
----- stdout -----
-🟑 Auto-staging 1 untracked file:
-πŸ”„ Committing changes with default message... (1 file, +1, no squashing needed)
-πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
-βœ… Committed changes @ c1126ec
-πŸ”„ Merging 1 commit to main @ c1126ec (no rebase needed)
-βœ… Merged to main (1 commit, 1 file, +1)
-πŸ”„ Removing feature worktree & branch in background
----- stderr -----
+🟑 Auto-staging 1 untracked file:
  dirty.txt
+πŸ”„ Committing changes with default message... (1 file, +1, no squashing needed)
+πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
  Changes to dirty.txt
+βœ… Committed changes @ c1126ec
+πŸ”„ Merging 1 commit to main @ c1126ec (no rebase needed)
  * c1126ec Changes to dirty.txt
  dirty.txt | 1 +
  1 file changed, 1 insertion(+)
+βœ… Merged to main (1 commit, 1 file, +1)
+πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
index 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: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
-βœ… Merged to main (1 commit, 1 file, +1)
-πŸ”„ Removing feature worktree & branch in background
----- stderr -----
+πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
+βœ… Merged to main (1 commit, 1 file, +1)
+πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap
index 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: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
+ WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
exit_code: 0
----- stdout -----
-βšͺ Already up to date with main (no new commits, no rebase needed)
-πŸ”„ Removing no-commits worktree & branch in background
----- stderr -----
+βšͺ Already up to date with main (no new commits, no rebase needed)
+πŸ”„ Removing no-commits worktree & branch in background
diff --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.snap
index 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: true
exit_code: 0
----- stdout -----
-🟑 Auto-staging 1 untracked file:
-πŸ”„ Committing changes with default message... (1 file, +1, no squashing needed)
-πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
-βœ… Committed changes @ 96ddfbc
-πŸ”„ Merging 1 commit to main @ 96ddfbc (no rebase needed)
-βœ… Merged to main (1 commit, 1 file, +1)
-πŸ”„ Removing no-commits-dirty worktree & branch in background
----- stderr -----
+🟑 Auto-staging 1 untracked file:
  newfile.txt
+πŸ”„ Committing changes with default message... (1 file, +1, no squashing needed)
+πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
  Changes to newfile.txt
+βœ… Committed changes @ 96ddfbc
+πŸ”„ Merging 1 commit to main @ 96ddfbc (no rebase needed)
  * 96ddfbc Changes to newfile.txt
  newfile.txt | 1 +
  1 file changed, 1 insertion(+)
+βœ… Merged to main (1 commit, 1 file, +1)
+πŸ”„ Removing no-commits-dirty worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap
index 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: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
-βœ… Merged to main (1 commit, 1 file, +1)
-πŸ”„ Removing feature worktree & branch in background
----- stderr -----
+πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
+βœ… Merged to main (1 commit, 1 file, +1)
+πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
index 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: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 2 commits to main @ bf212d3 (no commit/squash/rebase needed)
-βœ… Merged to main (2 commits, 2 files, +2)
-πŸ”„ Removing feature worktree & branch in background
----- stderr -----
+πŸ”„ Merging 2 commits to main @ bf212d3 (no commit/squash/rebase needed)
  * bf212d3 feat: add file 2
  * 123e46c feat: add file 1
  file1.txt | 1 +
  file2.txt | 1 +
  2 files changed, 2 insertions(+)
+βœ… Merged to main (2 commits, 2 files, +2)
+πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap
index 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: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ 4af48f0 (no commit/squash/rebase needed)
-βœ… Merged to main (1 commit, 1 file, +1)
-πŸ”„ Removing feature worktree & branch in background
----- stderr -----
+πŸ”„ Merging 1 commit to main @ 4af48f0 (no commit/squash/rebase needed)
  * 4af48f0 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
+βœ… Merged to main (1 commit, 1 file, +1)
+πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap
index 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: false
exit_code: 1
----- stdout -----
-πŸ”„ Merging 1 commit to main @ cdb002e (no commit/squash/rebase needed)
-βœ… Merged to main (1 commit, 1 file, +1)
-πŸ”„ Removing feature worktree & branch in background
-πŸ”„ Running post-merge:
-🟑 Command failed: exit status: 1
----- stderr -----
+πŸ”„ Merging 1 commit to main @ cdb002e (no commit/squash/rebase needed)
  * cdb002e Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
+βœ… Merged to main (1 commit, 1 file, +1)
+πŸ”„ Removing feature worktree & branch in background
+πŸ”„ Running post-merge:
  exit 1
-❌ post-merge command failed: exit status: 1
+🟑 Command failed: exit status: 1
+❌ post-merge command failed: exit status: 1
πŸ’‘ Use --no-verify to skip post-merge commands
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap
index 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: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ 8609b84 (no commit/squash/rebase needed)
-βœ… Merged to main (1 commit, 1 file, +1)
-πŸ”„ Removing feature worktree & branch in background
-πŸ”„ Running post-merge notify:
-πŸ”„ Running post-merge deploy:
----- stderr -----
+πŸ”„ Merging 1 commit to main @ 8609b84 (no commit/squash/rebase needed)
  * 8609b84 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
+βœ… Merged to main (1 commit, 1 file, +1)
+πŸ”„ Removing feature worktree & branch in background
+πŸ”„ Running post-merge notify:
  echo 'Merge to main complete' > notify.txt
-  echo 'Deploying branch feature' > deploy.txt
+πŸ”„ Running post-merge deploy:
+  echo 'Deploying branch feature' > deploy.txt

diff --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.snap
index 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: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ 72ff5fc (no commit/squash/rebase needed)
-βœ… Merged to main (1 commit, 1 file, +1)
-πŸ”„ Removing feature worktree & branch in background
----- stderr -----
+πŸ”„ Merging 1 commit to main @ 72ff5fc (no commit/squash/rebase needed)
  * 72ff5fc Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
+βœ… Merged to main (1 commit, 1 file, +1)
+πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap
index 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: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ 72ff5fc (no commit/squash/rebase needed)
-βœ… Merged to main (1 commit, 1 file, +1)
-πŸ”„ Removing feature worktree & branch in background
-πŸ”„ Running post-merge:
----- stderr -----
+πŸ”„ Merging 1 commit to main @ 72ff5fc (no commit/squash/rebase needed)
  * 72ff5fc Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
+βœ… Merged to main (1 commit, 1 file, +1)
+πŸ”„ Removing feature worktree & branch in background
+πŸ”„ Running post-merge:
  echo 'merged feature to main' > post-merge-ran.txt

diff --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.snap
index 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: true
exit_code: 0
----- stdout -----
+
+----- stderr -----
βšͺ Already up to date with main (no new commits, no rebase needed)
βšͺ Worktree preserved (on main branch)
πŸ”„ Running post-merge:
-
------ stderr -----
  echo 'post-merge ran from main' > post-merge-ran.txt

diff --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.snap
index 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: true
exit_code: 0
----- stdout -----
+
+----- stderr -----
βšͺ Already up to date with main (no new commits, no rebase needed)
πŸ”„ Removing feature worktree & branch in background
πŸ”„ Running post-merge:
-
------ stderr -----
  echo 'post-merge ran' > post-merge-ran.txt

diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snap
index 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: false
exit_code: 1
----- stdout -----
-🟑 Auto-staging 1 untracked file:
-πŸ”„ Running pre-commit:
----- stderr -----
+🟑 Auto-staging 1 untracked file:
  feature.txt
+πŸ”„ Running pre-commit:
  exit 1
❌ pre-commit command failed: exit status: 1
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap
index 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: true
exit_code: 0
----- stdout -----
-🟑 Auto-staging 1 untracked file:
-πŸ”„ Running pre-commit:
-πŸ”„ Committing changes with default message... (1 file, +1, no squashing needed)
-πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
-βœ… Committed changes @ cdc8f90
-πŸ”„ Merging 1 commit to main @ cdc8f90 (no rebase needed)
-βœ… Merged to main (1 commit, 1 file, +1)
-πŸ”„ Removing feature worktree & branch in background
----- stderr -----
+🟑 Auto-staging 1 untracked file:
  feature.txt
+πŸ”„ Running pre-commit:
  echo 'Pre-commit check passed'
Pre-commit check passed
+πŸ”„ Committing changes with default message... (1 file, +1, no squashing needed)
+πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
  Changes to feature.txt
+βœ… Committed changes @ cdc8f90
+πŸ”„ Merging 1 commit to main @ cdc8f90 (no rebase needed)
  * cdc8f90 Changes to feature.txt
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
+βœ… Merged to main (1 commit, 1 file, +1)
+πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap
index 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: false
exit_code: 1
----- stdout -----
-πŸ”„ Running pre-merge:
----- stderr -----
+πŸ”„ Running pre-merge:
  exit 1
❌ pre-merge command failed: exit status: 1
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap
index 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: true
exit_code: 0
----- stdout -----
-πŸ”„ Running pre-merge format:
-πŸ”„ Running pre-merge lint:
-πŸ”„ Running pre-merge test:
-πŸ”„ Merging 1 commit to main @ 2cbe2a2 (no commit/squash/rebase needed)
-βœ… Merged to main (1 commit, 1 file, +1)
-πŸ”„ Removing feature worktree & branch in background
----- stderr -----
+πŸ”„ Running pre-merge format:
  exit 0
-  exit 0
-  exit 0
-  * 2cbe2a2 Add feature file
+πŸ”„ Running pre-merge lint:
+  exit 0
+πŸ”„ Running pre-merge test:
+  exit 0
+πŸ”„ Merging 1 commit to main @ 2cbe2a2 (no commit/squash/rebase needed)
+  * 2cbe2a2 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
+βœ… Merged to main (1 commit, 1 file, +1)
+πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap
index 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: true
exit_code: 0
----- stdout -----
-πŸ”„ Running pre-merge:
-πŸ”„ Merging 1 commit to main @ 4b1199c (no commit/squash/rebase needed)
-βœ… Merged to main (1 commit, 1 file, +1)
-πŸ”„ Removing feature worktree & branch in background
----- stderr -----
+πŸ”„ Running pre-merge:
  exit 0
-  * 4b1199c Add feature file
+πŸ”„ Merging 1 commit to main @ 4b1199c (no commit/squash/rebase needed)
+  * 4b1199c Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
+βœ… Merged to main (1 commit, 1 file, +1)
+πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snap
index 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: false
exit_code: 1
----- stdout -----
-πŸ”„ Running pre-commit:
----- stderr -----
+πŸ”„ Running pre-commit:
  exit 1
❌ pre-commit command failed: exit status: 1
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap
index 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: true
exit_code: 0
----- stdout -----
-πŸ”„ Running pre-commit:
-πŸ”„ Merging 1 commit to main @ 726717f (no commit/squash/rebase needed)
-βœ… Merged to main (1 commit, 1 file, +1)
-πŸ”„ Removing feature worktree & branch in background
----- stderr -----
+πŸ”„ Running pre-commit:
  echo 'Pre-commit check passed'
Pre-commit check passed
+πŸ”„ Merging 1 commit to main @ 726717f (no commit/squash/rebase needed)
  * 726717f Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
+βœ… Merged to main (1 commit, 1 file, +1)
+πŸ”„ Removing feature worktree & branch in background
diff --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.snap
index 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: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
-βœ… Merged to main (1 commit, 1 file, +1)
-πŸ”„ Removing feature-from-develop worktree & branch in background
----- stderr -----
+πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
+βœ… Merged to main (1 commit, 1 file, +1)
+πŸ”„ Removing feature-from-develop worktree & branch in background
diff --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.snap
index 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: true
exit_code: 0
----- stdout -----
+
+----- stderr -----
πŸ”„ Rebasing onto main...
βœ… Rebased onto main
πŸ”„ Merging 1 commit to main @ 76778cc (no commit/squash needed)
-βœ… Merged to main (1 commit, 1 file, +1)
-πŸ”„ Removing feature-dirty-primary worktree & branch in background
-
------ stderr -----
  * 76778cc Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
+βœ… Merged to main (1 commit, 1 file, +1)
+πŸ”„ Removing feature-dirty-primary worktree & branch in background
diff --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.snap
index 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: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
-βœ… Merged to main (1 commit, 1 file, +1)
-βšͺ Worktree preserved (--no-remove)
----- stderr -----
+πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
+βœ… Merged to main (1 commit, 1 file, +1)
+βšͺ 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.snap
index 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: false
exit_code: 1
----- stdout -----
-πŸ”„ Rebasing onto main...
----- stderr -----
+πŸ”„ Rebasing onto main...
❌ Rebase onto main incomplete
  Rebasing (1/1)
  error: could not apply c661874... Update shared.txt in feature
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_rebase_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_rebase_fast_forward.snap
index 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: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
+ WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
exit_code: 0
----- stdout -----
+
+----- stderr -----
βœ… Fast-forwarded to main
βšͺ Already up to date with main (no new commits)
πŸ”„ Removing fast-forward-test worktree & branch in background
-
------ 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.snap
index 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: true
exit_code: 0
----- stdout -----
+
+----- stderr -----
πŸ”„ Rebasing onto main...
βœ… Rebased onto main
πŸ”„ Merging 1 commit to main @ ae48a8e (no commit/squash needed)
-βœ… Merged to main (1 commit, 1 file, +1)
-πŸ”„ Removing true-rebase-test worktree & branch in background
-
------ stderr -----
  * ae48a8e Add feature
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
+βœ… Merged to main (1 commit, 1 file, +1)
+πŸ”„ Removing true-rebase-test worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
index 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: true
exit_code: 0
----- stdout -----
-πŸ”„ Squashing 3 commits into a single commit (3 files, +3)...
-πŸ”„ Generating squash commit message...
-πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
-βœ… Squashed @ 27eb169
-πŸ”„ Merging 1 commit to main @ 27eb169 (no rebase needed)
-βœ… Merged to main (1 commit, 3 files, +3)
-πŸ”„ Removing feature worktree & branch in background
----- stderr -----
+πŸ”„ Squashing 3 commits into a single commit (3 files, +3)...
+πŸ”„ Generating squash commit message...
+πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
  Squash commits from main
 
  Combined commits:
  - feat: add file 1
  - fix: update logic
  - docs: update readme
+βœ… Squashed @ 27eb169
+πŸ”„ Merging 1 commit to main @ 27eb169 (no rebase needed)
  * 27eb169 Squash commits from main
  file1.txt | 1 +
  file2.txt | 1 +
  file3.txt | 1 +
  3 files changed, 3 insertions(+)
+βœ… Merged to main (1 commit, 3 files, +3)
+πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap
index 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: true
exit_code: 0
----- stdout -----
-πŸ”„ Squashing 3 commits into a single commit...
-πŸ”„ Generating squash commit message...
-πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
-βšͺ No changes after squashing 3 commits
-βšͺ Already up to date with main (no new commits, no rebase needed)
-πŸ”„ Removing feature worktree & branch in background
----- stderr -----
+πŸ”„ Squashing 3 commits into a single commit...
+πŸ”„ Generating squash commit message...
+πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
  Squash commits from main
 
  Combined commits:
  - Change 1
  - Change 2
  - Revert to initial
+βšͺ No changes after squashing 3 commits
+βšͺ Already up to date with main (no new commits, no rebase needed)
+πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_error.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_error.snap
index 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: false
exit_code: 1
----- stdout -----
-πŸ”„ Squashing 2 commits into a single commit (2 files, +2)...
-πŸ”„ Generating squash commit message...
----- stderr -----
+πŸ”„ Squashing 2 commits into a single commit (2 files, +2)...
+πŸ”„ Generating squash commit message...
❌ Commit generation command failed
  Error: connection refused
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap
index 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: true
exit_code: 0
----- stdout -----
-πŸ”„ Squashing 2 commits into a single commit (2 files, +2)...
-πŸ”„ Generating squash commit message...
-πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
-βœ… Squashed @ 091f0c5
-πŸ”„ Merging 1 commit to main @ 091f0c5 (no rebase needed)
-βœ… Merged to main (1 commit, 2 files, +2)
-πŸ”„ Removing feature worktree & branch in background
----- stderr -----
+πŸ”„ Squashing 2 commits into a single commit (2 files, +2)...
+πŸ”„ Generating squash commit message...
+πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
  Squash commits from main
 
  Combined commits:
  - feat: new feature
  - fix: bug fix
+βœ… Squashed @ 091f0c5
+πŸ”„ Merging 1 commit to main @ 091f0c5 (no rebase needed)
  * 091f0c5 Squash commits from main
  file1.txt | 1 +
  file2.txt | 1 +
  2 files changed, 2 insertions(+)
+βœ… Merged to main (1 commit, 2 files, +2)
+πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap
index 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: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ 525a81f (no commit/squash/rebase needed)
-βœ… Merged to main (1 commit, 1 file, +1)
-πŸ”„ Removing feature worktree & branch in background
----- stderr -----
+πŸ”„ Merging 1 commit to main @ 525a81f (no commit/squash/rebase needed)
  * 525a81f feat: single commit
  file1.txt | 1 +
  1 file changed, 1 insertion(+)
+βœ… Merged to main (1 commit, 1 file, +1)
+πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap
index 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: true
exit_code: 0
----- stdout -----
+
+----- stderr -----
πŸ”„ Squashing 2 commits into a single commit (1 file, +1)...
πŸ”„ Generating squash commit message...
+  feat: implement user authentication system
βœ… Squashed @ d42412f
πŸ”„ Merging 1 commit to main @ d42412f (no rebase needed)
-βœ… Merged to main (1 commit, 1 file, +1)
-πŸ”„ Removing feature worktree & branch in background
-
------ stderr -----
-  feat: implement user authentication system
  * d42412f feat: implement user authentication system
  auth.txt | 1 +
  1 file changed, 1 insertion(+)
+βœ… Merged to main (1 commit, 1 file, +1)
+πŸ”„ Removing feature worktree & branch in background
diff --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.snap
index 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: true
exit_code: 0
----- stdout -----
+
+----- stderr -----
πŸ”„ Squashing 2 commits & working tree changes into a single commit (2 files, +2)...
πŸ’‘ Backup created @ 330ccd6
πŸ”„ Generating squash commit message...
-πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
-βœ… Squashed @ d34e4c3
-πŸ”„ Merging 1 commit to main @ d34e4c3 (no rebase needed)
-βœ… Merged to main (1 commit, 2 files, +2)
-πŸ”„ Removing feature worktree & branch in background
-
------ stderr -----
+πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
  Squash commits from main
 
  Combined commits:
  - feat: add file 1
  - feat: add file 2
+βœ… Squashed @ d34e4c3
+πŸ”„ Merging 1 commit to main @ d34e4c3 (no rebase needed)
  * d34e4c3 Squash commits from main
  file1.txt | 1 +
  file2.txt | 1 +
  2 files changed, 2 insertions(+)
+βœ… Merged to main (1 commit, 2 files, +2)
+πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
index 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: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
-βœ… Merged to main (1 commit, 1 file, +1)
-πŸ”„ Removing feature worktree & branch in background
----- stderr -----
+πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
+βœ… Merged to main (1 commit, 1 file, +1)
+πŸ”„ Removing feature worktree & branch in background
diff --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.snap
index 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: true
exit_code: 0
----- stdout -----
+
+----- stderr -----
πŸ”„ Rebasing onto staging...
βœ… Rebased onto staging
πŸ”„ Merging 1 commit to staging @ 8280b9e (no commit/squash needed)
-βœ… Merged to staging (1 commit, 1 file, +1)
-πŸ”„ Removing feature-for-staging worktree & branch in background
-
------ stderr -----
  * 8280b9e Add feature for staging
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
+βœ… Merged to staging (1 commit, 1 file, +1)
+πŸ”„ Removing feature-for-staging worktree & branch in background
diff --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.snap
index 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: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
-βœ… Merged to main (1 commit, 1 file, +1)
-πŸ”„ Removing feature worktree & branch in background
----- stderr -----
+πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
+βœ… Merged to main (1 commit, 1 file, +1)
+πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap
index 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: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
-βœ… Merged to main (1 commit, 1 file, +1)
-πŸ”„ Removing feature worktree & branch in background
----- stderr -----
+πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
+βœ… Merged to main (1 commit, 1 file, +1)
+πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap
index 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: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
-βœ… Merged to main (1 commit, 1 file, +1)
-βšͺ Worktree preserved (--no-remove)
----- stderr -----
+πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
+βœ… Merged to main (1 commit, 1 file, +1)
+βšͺ 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.snap
index 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: true
exit_code: 0
----- stdout -----
-🟑 Auto-staging 2 untracked files:
-πŸ”„ Squashing 1 commit & working tree changes into a single commit (3 files, +3)...
-πŸ’‘ Backup created @ 4967998
-πŸ”„ Generating squash commit message...
-πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
-βœ… Squashed @ fbfc726
-πŸ”„ Merging 1 commit to main @ fbfc726 (no rebase needed)
-βœ… Merged to main (1 commit, 3 files, +3)
-πŸ”„ Removing feature worktree & branch in background
----- stderr -----
+🟑 Auto-staging 2 untracked files:
  untracked1.txt
  untracked2.txt
+πŸ”„ Squashing 1 commit & working tree changes into a single commit (3 files, +3)...
+πŸ’‘ Backup created @ 4967998
+πŸ”„ Generating squash commit message...
+πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
  Squash commits from main
 
  Combined commits:
  - feat: add file 1
+βœ… Squashed @ fbfc726
+πŸ”„ Merging 1 commit to main @ fbfc726 (no rebase needed)
  * fbfc726 Squash commits from main
  file1.txt | 1 +
  untracked1.txt | 1 +
  untracked2.txt | 1 +
  3 files changed, 3 insertions(+)
+βœ… Merged to main (1 commit, 3 files, +3)
+πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
index 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: true
exit_code: 0
----- stdout -----
-πŸ”„ Squashing 3 commits into a single commit (3 files, +33)...
-πŸ”„ Generating squash commit message...
-βœ… Squashed @ 95c3316
-πŸ”„ Running pre-merge test:
-πŸ”„ Running pre-merge lint:
-πŸ”„ Merging 1 commit to main @ 95c3316 (no rebase needed)
-βœ… Merged to main (1 commit, 3 files, +33)
-πŸ”„ Removing feature-auth worktree & branch in background
-πŸ”„ Running post-merge install:
----- stderr -----
+πŸ”„ Squashing 3 commits into a single commit (3 files, +33)...
+πŸ”„ Generating squash commit message...
  feat(auth): Implement JWT authentication system
 
  Add comprehensive JWT token handling including validation, refresh logic,
@@ -44,6 +37,8 @@ exit_code: 0
  - Implement token refresh mechanism with expiry handling
  - Add JWT encoding/decoding with signature verification
  - Create test suite covering all authentication flows
+βœ… Squashed @ 95c3316
+πŸ”„ Running pre-merge test:
  cargo test
 Finished test [unoptimized + debuginfo] target(s) in 0.12s
Running unittests src/lib.rs (target/debug/deps/worktrunk-abc123)
@@ -55,14 +50,19 @@ test auth::tests::test_token_refresh ... ok
test auth::tests::test_token_validation ... ok
test result: ok. 18 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.08s
+πŸ”„ Running pre-merge lint:
  cargo clippy
 Checking worktrunk v0.1.0
Finished dev [unoptimized + debuginfo] target(s) in 1.23s
+πŸ”„ Merging 1 commit to main @ 95c3316 (no rebase needed)
  * 95c3316 feat(auth): Implement JWT authentication system
  auth.rs | 8 ++++++++
  auth_test.rs | 17 +++++++++++++++++
  jwt.rs | 8 ++++++++
  3 files changed, 33 insertions(+)
+βœ… Merged to main (1 commit, 3 files, +33)
+πŸ”„ Removing feature-auth worktree & branch in background
+πŸ”„ Running post-merge install:
  cargo install --path .
 Installing worktrunk v0.1.0
Compiling worktrunk v0.1.0
diff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_post_create.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_post_create.snap
index 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: true
exit_code: 0
----- stdout -----
-πŸ”„ Running post-create install:
-βœ… Created new worktree for feature-x from main at [REPO].feature-x
-πŸ’‘ Run `wt config shell install` to enable automatic cd
-πŸ”„ Running post-start dev:
----- stderr -----
+πŸ”„ Running post-create install:
  uv sync

Resolved 24 packages in 145ms
Installed 24 packages in 1.2s
+βœ… Created new worktree for feature-x from main at [REPO].feature-x
+πŸ’‘ Run `wt config shell install` to enable automatic cd
+πŸ”„ Running post-start dev:
  uv run dev
diff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_pre_merge.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_pre_merge.snap
index 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: true
exit_code: 0
----- stdout -----
-πŸ”„ Squashing 3 commits into a single commit (2 files, +45)...
-πŸ”„ Generating squash commit message...
-βœ… Squashed @ 69200cc
-πŸ”„ Running pre-merge test:
-πŸ”„ Running pre-merge lint:
-πŸ”„ Merging 1 commit to main @ 69200cc (no rebase needed)
-βœ… Merged to main (1 commit, 2 files, +45)
-πŸ”„ Removing feature-auth worktree & branch in background
----- stderr -----
+πŸ”„ Squashing 3 commits into a single commit (2 files, +45)...
+πŸ”„ Generating squash commit message...
  feat(api): Add user authentication endpoints
 
  Implement login and token refresh endpoints with JWT validation.
  Includes comprehensive test coverage and input validation.
+βœ… Squashed @ 69200cc
+πŸ”„ Running pre-merge test:
  uv run pytest

============================= test session starts ==============================
@@ -49,11 +45,15 @@ tests/test_auth.py::test_token_validation PASSED [100%]
============================== 3 passed in 0.8s ===============================
+πŸ”„ Running pre-merge lint:
  uv run ruff check

All checks passed!
+πŸ”„ Merging 1 commit to main @ 69200cc (no rebase needed)
  * 69200cc feat(api): Add user authentication endpoints
  api/auth.py | 31 +++++++++++++++++++++++++++++++
  tests/test_auth.py | 14 ++++++++++++++
  2 files changed, 45 insertions(+)
+βœ… Merged to main (1 commit, 2 files, +45)
+πŸ”„ Removing feature-auth worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap
index 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: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ d29e0fd (no commit/squash/rebase needed)
-βœ… Merged to main (1 commit, 1 file, +13)
-πŸ”„ Removing fix-auth worktree & branch in background
----- stderr -----
+πŸ”„ Merging 1 commit to main @ d29e0fd (no commit/squash/rebase needed)
  * d29e0fd Implement JWT validation
  auth.rs | 13 +++++++++++++
  1 file changed, 13 insertions(+)
+βœ… Merged to main (1 commit, 1 file, +13)
+πŸ”„ Removing fix-auth worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_simple_switch.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_simple_switch.snap
index 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: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
+ WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
exit_code: 0
----- stdout -----
-βœ… Created new worktree for fix-auth from main at [REPO].fix-auth
-πŸ’‘ Run `wt config shell install` to enable automatic cd
----- stderr -----
+βœ… Created new worktree for fix-auth from main at [REPO].fix-auth
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__merge__step_commit_both_flags.snap b/tests/snapshots/integration__integration_tests__merge__step_commit_both_flags.snap
index 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: true
exit_code: 0
----- stdout -----
-πŸ’‘ Skipping pre-commit hook (--no-verify)
-πŸ”„ Committing tracked changes with default message... (1 file, +1, -1)
-πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
-βœ… Committed changes @ a5890cb
----- stderr -----
+πŸ’‘ Skipping pre-commit hook (--no-verify)
+πŸ”„ Committing tracked changes with default message... (1 file, +1, -1)
+πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
  Changes to tracked.txt
+βœ… Committed changes @ a5890cb
diff --git a/tests/snapshots/integration__integration_tests__merge__step_commit_no_verify.snap b/tests/snapshots/integration__integration_tests__merge__step_commit_no_verify.snap
index 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: true
exit_code: 0
----- stdout -----
-πŸ’‘ Skipping pre-commit hook (--no-verify)
-🟑 Auto-staging 2 untracked files:
-πŸ”„ Committing changes with default message... (2 files, +2)
-πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
-βœ… Committed changes @ 3dbcd5d
----- stderr -----
+πŸ’‘ Skipping pre-commit hook (--no-verify)
+🟑 Auto-staging 2 untracked files:
  .config/
  file1.txt
+πŸ”„ Committing changes with default message... (2 files, +2)
+πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
  Changes to wt.toml & file1.txt
+βœ… Committed changes @ 3dbcd5d
diff --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.snap
index 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: false
exit_code: 1
----- stdout -----
-πŸ”„ Committing changes with default message...
-πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
----- stderr -----
+πŸ”„ Committing changes with default message...
+πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
  WIP: Changes
❌ Failed to commit
  On branch main
diff --git a/tests/snapshots/integration__integration_tests__merge__step_commit_stage_tracked.snap b/tests/snapshots/integration__integration_tests__merge__step_commit_stage_tracked.snap
index 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: true
exit_code: 0
----- stdout -----
-πŸ”„ Committing tracked changes with default message... (1 file, +1, -1)
-πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
-βœ… Committed changes @ 7d441f0
----- stderr -----
+πŸ”„ Committing tracked changes with default message... (1 file, +1, -1)
+πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
  Changes to tracked.txt
+βœ… Committed changes @ 7d441f0
diff --git a/tests/snapshots/integration__integration_tests__merge__step_squash_both_flags.snap b/tests/snapshots/integration__integration_tests__merge__step_squash_both_flags.snap
index 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: true
exit_code: 0
----- stdout -----
+
+----- stderr -----
πŸ’‘ Skipping pre-commit hook (--no-verify)
πŸ”„ Squashing 2 commits & tracked changes into a single commit (3 files, +3)...
πŸ’‘ Backup created @ 31e06e8
πŸ”„ Generating squash commit message...
-πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
-βœ… Squashed @ 9f7a3e2
-
------ stderr -----
+πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
  Squash commits from main
 
  Combined commits:
  - feat: add file 1
  - feat: add file 2
+βœ… Squashed @ 9f7a3e2
diff --git a/tests/snapshots/integration__integration_tests__merge__step_squash_no_commits.snap b/tests/snapshots/integration__integration_tests__merge__step_squash_no_commits.snap
index 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: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
exit_code: 0
----- stdout -----
-βšͺ Nothing to squash; no commits ahead of main
----- stderr -----
+βšͺ Nothing to squash; no commits ahead of main
diff --git a/tests/snapshots/integration__integration_tests__merge__step_squash_no_verify.snap b/tests/snapshots/integration__integration_tests__merge__step_squash_no_verify.snap
index 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: true
exit_code: 0
----- stdout -----
+
+----- stderr -----
πŸ’‘ Skipping pre-commit hook (--no-verify)
πŸ”„ Squashing 2 commits into a single commit (3 files, +3)...
πŸ”„ Generating squash commit message...
-πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
-βœ… Squashed @ 588aa53
-
------ stderr -----
+πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
  Squash commits from main
 
  Combined commits:
  - feat: add file 1
  - feat: add file 2
+βœ… Squashed @ 588aa53
diff --git a/tests/snapshots/integration__integration_tests__merge__step_squash_single_commit.snap b/tests/snapshots/integration__integration_tests__merge__step_squash_single_commit.snap
index 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: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
exit_code: 0
----- stdout -----
-βšͺ Nothing to squash; already a single commit
----- stderr -----
+βšͺ Nothing to squash; already a single commit
diff --git a/tests/snapshots/integration__integration_tests__merge__step_squash_stage_tracked.snap b/tests/snapshots/integration__integration_tests__merge__step_squash_stage_tracked.snap
index 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: true
exit_code: 0
----- stdout -----
+
+----- stderr -----
πŸ”„ Squashing 2 commits & tracked changes into a single commit (2 files, +2)...
πŸ’‘ Backup created @ ba1424b
πŸ”„ Generating squash commit message...
-πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
-βœ… Squashed @ 6c0b38b
-
------ stderr -----
+πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
  Squash commits from main
 
  Combined commits:
  - feat: add file 1
  - feat: add file 2
+βœ… Squashed @ 6c0b38b
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snap b/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snap
index 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: true
exit_code: 0
----- stdout -----
-πŸ”„ Running post-create:
-βœ… Created new worktree for feature from main at [REPO].feature
-πŸ’‘ Run `wt config shell install` to enable automatic cd
-πŸ”„ Running post-start server:
----- stderr -----
+πŸ”„ Running post-create:
  echo 'Setup done' > setup.txt
-  sleep 0.05 && echo 'Server running' > server.txt
+βœ… Created new worktree for feature from main at [REPO].feature
+πŸ’‘ Run `wt config shell install` to enable automatic cd
+πŸ”„ Running post-start server:
+  sleep 0.05 && echo 'Server running' > server.txt
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap b/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap
index 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: true
exit_code: 0
----- stdout -----
-βœ… Created new worktree for feature from main at [REPO].feature
-πŸ”„ Running post-start:
-πŸ”„ Executing (--execute):
----- stderr -----
+βœ… Created new worktree for feature from main at [REPO].feature
+πŸ”„ Running post-start:
  echo 'Background task' > background.txt
+πŸ”„ Executing (--execute):
  echo 'Execute flag' > execute.txt
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snap
index 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: true
exit_code: 0
----- stdout -----
-πŸ”„ Running post-create:
-🟑 Command failed: exit status: 1
-βœ… Created new worktree for feature from main at [REPO].feature
-πŸ’‘ Run `wt config shell install` to enable automatic cd
----- stderr -----
+πŸ”„ Running post-create:
  exit 1
-
+🟑 Command failed: exit status: 1
+βœ… Created new worktree for feature from main at [REPO].feature
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiline_control_structure.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiline_control_structure.snap
index 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: true
exit_code: 0
----- stdout -----
-πŸ”„ Running post-create:
-βœ… Created new worktree for feature from main at [REPO].feature
-πŸ’‘ Run `wt config shell install` to enable automatic cd
----- stderr -----
+πŸ”„ Running post-create:
  if [ ! -f test.txt ]; then
  echo 'File does not exist' > result.txt
  else
  echo 'File exists' > result.txt
  fi
-
+βœ… Created new worktree for feature from main at [REPO].feature
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiple_commands_array.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiple_commands_array.snap
index 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: true
exit_code: 0
----- stdout -----
-πŸ”„ Running post-create:
-πŸ”„ Running post-create:
-βœ… Created new worktree for feature from main at [REPO].feature
-πŸ’‘ Run `wt config shell install` to enable automatic cd
----- stderr -----
+πŸ”„ Running post-create:
  echo 'First'
First
+πŸ”„ Running post-create:
  echo 'Second'
Second
+βœ… Created new worktree for feature from main at [REPO].feature
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_named_commands.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_named_commands.snap
index 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: true
exit_code: 0
----- stdout -----
-πŸ”„ Running post-create install:
-πŸ”„ Running post-create setup:
-βœ… Created new worktree for feature from main at [REPO].feature
-πŸ’‘ Run `wt config shell install` to enable automatic cd
----- stderr -----
+πŸ”„ Running post-create install:
  echo 'Installing deps'
Installing deps
+πŸ”„ Running post-create setup:
  echo 'Running setup'
Running setup
+βœ… Created new worktree for feature from main at [REPO].feature
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_no_config.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_no_config.snap
index 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/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
+ WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
exit_code: 0
----- stdout -----
-βœ… Created new worktree for feature from main at [REPO].feature
-πŸ’‘ Run `wt config shell install` to enable automatic cd
----- stderr -----
+βœ… Created new worktree for feature from main at [REPO].feature
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_single_command.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_single_command.snap
index 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: true
exit_code: 0
----- stdout -----
-πŸ”„ Running post-create:
-βœ… Created new worktree for feature from main at [REPO].feature
-πŸ’‘ Run `wt config shell install` to enable automatic cd
----- stderr -----
+πŸ”„ Running post-create:
  echo 'Setup complete'
Setup complete
+βœ… Created new worktree for feature from main at [REPO].feature
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snap
index 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: true
exit_code: 0
----- stdout -----
-πŸ”„ Running post-create:
-πŸ”„ Running post-create:
-πŸ”„ Running post-create:
-πŸ”„ Running post-create:
-βœ… Created new worktree for feature/test from main at [REPO].feature-test
-πŸ’‘ Run `wt config shell install` to enable automatic cd
----- stderr -----
+πŸ”„ Running post-create:
  echo 'Repo: repo' > info.txt
-  echo 'Branch: feature-test' >> info.txt
-  echo 'Worktree: [REPO].feature-test' >> info.txt
-  echo 'Root: [REPO]' >> info.txt
-
+πŸ”„ Running post-create:
+  echo 'Branch: feature-test' >> info.txt
+πŸ”„ Running post-create:
+  echo 'Worktree: [REPO].feature-test' >> info.txt
+πŸ”„ Running post-create:
+  echo 'Root: [REPO]' >> info.txt
+βœ… Created new worktree for feature/test from main at [REPO].feature-test
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_complex_shell.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_complex_shell.snap
index 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: true
exit_code: 0
----- stdout -----
-βœ… Created new worktree for feature from main at [REPO].feature
-πŸ’‘ Run `wt config shell install` to enable automatic cd
-πŸ”„ Running post-start:
----- stderr -----
+βœ… Created new worktree for feature from main at [REPO].feature
+πŸ’‘ Run `wt config shell install` to enable automatic cd
+πŸ”„ Running post-start:
  echo 'line1
  line2
  line3' | grep line2 > filtered.txt
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_create_with_command.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_create_with_command.snap
index 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: true
exit_code: 0
----- stdout -----
-βœ… Created new worktree for feature from main at [REPO].feature
-πŸ’‘ Run `wt config shell install` to enable automatic cd
-πŸ”„ Running post-start:
----- stderr -----
+βœ… Created new worktree for feature from main at [REPO].feature
+πŸ’‘ Run `wt config shell install` to enable automatic cd
+πŸ”„ Running post-start:
  echo 'POST-START-RAN' > post_start_marker.txt
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_invalid_command.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_invalid_command.snap
index 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: true
exit_code: 0
----- stdout -----
-βœ… Created new worktree for feature from main at [REPO].feature
-πŸ’‘ Run `wt config shell install` to enable automatic cd
-πŸ”„ Running post-start:
----- stderr -----
+βœ… Created new worktree for feature from main at [REPO].feature
+πŸ’‘ Run `wt config shell install` to enable automatic cd
+πŸ”„ Running post-start:
  echo 'unclosed quote
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_log_captures_output.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_log_captures_output.snap
index 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: true
exit_code: 0
----- stdout -----
-βœ… Created new worktree for feature from main at [REPO].feature
-πŸ’‘ Run `wt config shell install` to enable automatic cd
-πŸ”„ Running post-start:
----- stderr -----
+βœ… Created new worktree for feature from main at [REPO].feature
+πŸ’‘ Run `wt config shell install` to enable automatic cd
+πŸ”„ Running post-start:
  echo 'stdout output' && echo 'stderr output' >&2
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiline_with_newlines.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiline_with_newlines.snap
index 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: true
exit_code: 0
----- stdout -----
-βœ… Created new worktree for feature from main at [REPO].feature
-πŸ’‘ Run `wt config shell install` to enable automatic cd
-πŸ”„ Running post-start:
----- stderr -----
+βœ… Created new worktree for feature from main at [REPO].feature
+πŸ’‘ Run `wt config shell install` to enable automatic cd
+πŸ”„ Running post-start:
  echo 'first line' > multiline.txt
  echo 'second line' >> multiline.txt
  echo 'third line' >> multiline.txt
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_background.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_background.snap
index 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: true
exit_code: 0
----- stdout -----
-βœ… Created new worktree for feature from main at [REPO].feature
-πŸ’‘ Run `wt config shell install` to enable automatic cd
-πŸ”„ Running post-start task1:
-πŸ”„ Running post-start task2:
----- stderr -----
+βœ… Created new worktree for feature from main at [REPO].feature
+πŸ’‘ Run `wt config shell install` to enable automatic cd
+πŸ”„ Running post-start task1:
  echo 'Task 1 running' > task1.txt
+πŸ”„ Running post-start task2:
  echo 'Task 2 running' > task2.txt
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_separate_logs.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_separate_logs.snap
index 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: true
exit_code: 0
----- stdout -----
-βœ… Created new worktree for feature from main at [REPO].feature
-πŸ’‘ Run `wt config shell install` to enable automatic cd
-πŸ”„ Running post-start task1:
-πŸ”„ Running post-start task2:
-πŸ”„ Running post-start task3:
----- stderr -----
+βœ… Created new worktree for feature from main at [REPO].feature
+πŸ’‘ Run `wt config shell install` to enable automatic cd
+πŸ”„ Running post-start task1:
  echo 'TASK1_OUTPUT'
+πŸ”„ Running post-start task2:
  echo 'TASK2_OUTPUT'
+πŸ”„ Running post-start task3:
  echo 'TASK3_OUTPUT'
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_single_background.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_single_background.snap
index 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: true
exit_code: 0
----- stdout -----
-βœ… Created new worktree for feature from main at [REPO].feature
-πŸ’‘ Run `wt config shell install` to enable automatic cd
-πŸ”„ Running post-start:
----- stderr -----
+βœ… Created new worktree for feature from main at [REPO].feature
+πŸ’‘ Run `wt config shell install` to enable automatic cd
+πŸ”„ Running post-start:
  sleep 0.1 && echo 'Background task done' > background.txt
diff --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.snap
index 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: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
exit_code: 0
----- stdout -----
-🟑 Worktree for feature at [REPO].feature; cannot cd (no shell integration)
-πŸ’‘ Run `wt config shell install` to enable automatic cd
----- stderr -----
+🟑 Worktree for feature at [REPO].feature; cannot cd (no shell integration)
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__push__push_dirty_target_autostash.snap b/tests/snapshots/integration__integration_tests__push__push_dirty_target_autostash.snap
index 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: true
exit_code: 0
----- stdout -----
-πŸ”„ Stashing changes in [REPO]...
-πŸ”„ Pushing 1 commit to main @ 6551244
-πŸ”„ Restoring stashed changes in [REPO]...
-βœ… Pushed to main (1 commit, 1 file, +1)
----- stderr -----
+πŸ”„ Stashing changes in [REPO]...
+πŸ”„ Pushing 1 commit to main @ 6551244
  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
+πŸ”„ Restoring stashed changes in [REPO]...
+βœ… Pushed to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap
index 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: true
exit_code: 0
----- stdout -----
-πŸ”„ Pushing 1 commit to main @ c2e2bcc
-βœ… Pushed to main (1 commit, 1 file, +1)
----- stderr -----
+πŸ”„ Pushing 1 commit to main @ c2e2bcc
  * c2e2bcc Add test file
  test.txt | 1 +
  1 file changed, 1 insertion(+)
+βœ… Pushed to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__push__push_no_remote.snap b/tests/snapshots/integration__integration_tests__push__push_no_remote.snap
index 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: true
exit_code: 0
----- stdout -----
-πŸ”„ Pushing 1 commit to main @ 6551244
-βœ… Pushed to main (1 commit, 1 file, +1)
----- stderr -----
+πŸ”„ Pushing 1 commit to main @ 6551244
  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
+βœ… Pushed to main (1 commit, 1 file, +1)
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.snap
index 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: true
exit_code: 0
----- stdout -----
-πŸ”„ Pushing 1 commit to main @ 4af48f0
-βœ… Pushed to main (1 commit, 1 file, +1)
----- stderr -----
+πŸ”„ Pushing 1 commit to main @ 4af48f0
  * 4af48f0 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
+βœ… Pushed to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__push__push_to_default.snap b/tests/snapshots/integration__integration_tests__push__push_to_default.snap
index 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: true
exit_code: 0
----- stdout -----
-πŸ”„ Pushing 1 commit to main @ 6551244
-βœ… Pushed to main (1 commit, 1 file, +1)
----- stderr -----
+πŸ”„ Pushing 1 commit to main @ 6551244
  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
+βœ… Pushed to main (1 commit, 1 file, +1)
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.snap
index 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: true
exit_code: 0
----- stdout -----
-πŸ”„ Pushing 3 commits to main @ 13bed7b (merge commits allowed)
-βœ… Pushed to main (3 commits, 2 files, +2)
----- stderr -----
+πŸ”„ Pushing 3 commits to main @ 13bed7b (merge commits allowed)
  * 13bed7b Merge temp
  |/
  | * 1f38fab Commit 2
@@ -36,3 +35,4 @@ exit_code: 0
  file1.txt | 1 +
  file2.txt | 1 +
  2 files changed, 2 insertions(+)
+βœ… Pushed to main (3 commits, 2 files, +2)
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.snap
index 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: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
+ WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Removing main worktree & branch in background
----- stderr -----
+πŸ”„ Removing main worktree & branch in background
diff --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.snap
index 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: true
exit_code: 0
----- stdout -----
-βšͺ No worktree found for branch feature-squashed
-βœ… Removed branch feature-squashed
----- stderr -----
+βšͺ No worktree found for branch feature-squashed
+βœ… Removed branch feature-squashed
diff --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.snap
index 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: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
+ WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Removing feature-unmerged worktree in background; retaining unmerged branch
----- stderr -----
+πŸ”„ Removing feature-unmerged worktree in background; retaining unmerged branch
diff --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.snap
index 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: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
exit_code: 0
----- stdout -----
-βšͺ No worktree found for branch feature-force
-βœ… Removed branch feature-force (--force-delete)
----- stderr -----
+βšͺ No worktree found for branch feature-force
+βœ… Removed branch feature-force (--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.snap
index 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: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
exit_code: 0
----- stdout -----
-βšͺ No worktree found for branch feature-merged
-βœ… Removed branch feature-merged
----- stderr -----
+βšͺ No worktree found for branch feature-merged
+βœ… Removed branch feature-merged
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_branch_only_unmerged.snap b/tests/snapshots/integration__integration_tests__remove__remove_branch_only_unmerged.snap
index 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: true
exit_code: 0
----- stdout -----
-βšͺ No worktree found for branch feature-unmerged
-🟑 Could not delete branch feature-unmerged
----- stderr -----
+βšͺ No worktree found for branch feature-unmerged
+🟑 Could not delete branch feature-unmerged
  error: the branch 'feature-unmerged' is not fully merged
diff --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.snap
index 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: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
+ WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Removing feature-a worktree & branch in background
----- stderr -----
+πŸ”„ Removing feature-a worktree & branch in background
diff --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.snap
index 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: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
+ WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Removing feature-b worktree & branch in background
----- stderr -----
+πŸ”„ Removing feature-b worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_current_by_name.snap b/tests/snapshots/integration__integration_tests__remove__remove_current_by_name.snap
index 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: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
+ WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Removing feature-current worktree & branch in background
----- stderr -----
+πŸ”„ Removing feature-current worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_foreground.snap b/tests/snapshots/integration__integration_tests__remove__remove_foreground.snap
index 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: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
+ WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Removing worktree for feature-fg...
-βœ… Removed worktree & branch for feature-fg
----- stderr -----
+πŸ”„ Removing worktree for feature-fg...
+βœ… Removed worktree & branch for feature-fg
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap b/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap
index 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: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
+ WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Removing feature-wt worktree & branch in background
----- stderr -----
+πŸ”„ Removing feature-wt worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_multiple_including_current.snap b/tests/snapshots/integration__integration_tests__remove__remove_multiple_including_current.snap
index 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: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
+ WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
exit_code: 0
----- stdout -----
+
+----- stderr -----
πŸ”„ Removing feature-b worktree & branch in background
πŸ”„ Removing feature-c worktree & branch in background
πŸ”„ Removing feature-a worktree & branch in background
-
------ stderr -----
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap
index 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: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
+ WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
exit_code: 0
----- stdout -----
+
+----- stderr -----
πŸ”„ Removing feature-a worktree & branch in background
πŸ”„ Removing feature-b worktree & branch in background
πŸ”„ Removing feature-c worktree & branch in background
-
------ 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.snap
index 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: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
+ WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Removing feature-keep worktree in background; retaining branch (--no-delete-branch)
----- stderr -----
+πŸ”„ Removing feature-keep worktree in background; retaining branch (--no-delete-branch)
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_switch_to_default.snap b/tests/snapshots/integration__integration_tests__remove__remove_switch_to_default.snap
index 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: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
+ WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Removing feature worktree & branch in background
----- stderr -----
+πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__switch__create_with_base_main.snap b/tests/snapshots/integration__integration_tests__switch__create_with_base_main.snap
index 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/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
+ WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
exit_code: 0
----- stdout -----
-βœ… Created new worktree for new-feature from main at [REPO].new-feature
-πŸ’‘ Run `wt config shell install` to enable automatic cd
----- stderr -----
+βœ… Created new worktree for new-feature from main at [REPO].new-feature
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_base_without_create.snap b/tests/snapshots/integration__integration_tests__switch__switch_base_without_create.snap
index 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/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
+ WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
exit_code: 0
----- stdout -----
-🟑 --base flag is only used with --create, ignoring
-βšͺ Already on worktree for main at [REPO]
----- stderr -----
+🟑 --base flag is only used with --create, ignoring
+βšͺ Already on worktree for main at [REPO]
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_create_new.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_new.snap
index 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/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
+ WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
exit_code: 0
----- stdout -----
-βœ… Created new worktree for feature-x from main at [REPO].feature-x
-πŸ’‘ Run `wt config shell install` to enable automatic cd
----- stderr -----
+βœ… Created new worktree for feature-x from main at [REPO].feature-x
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_create_no_remote.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_no_remote.snap
index 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/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
+ WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
exit_code: 0
----- stdout -----
-βœ… Created new worktree for feature from main at [REPO].feature
-πŸ’‘ Run `wt config shell install` to enable automatic cd
----- stderr -----
+βœ… Created new worktree for feature from main at [REPO].feature
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_create_remote_only.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_remote_only.snap
index 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/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
+ WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
exit_code: 0
----- stdout -----
-βœ… Created new worktree for remote-feature from main at [REPO].remote-feature
-πŸ’‘ Run `wt config shell install` to enable automatic cd
----- stderr -----
+βœ… Created new worktree for remote-feature from main at [REPO].remote-feature
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --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.snap
index 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/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
+ WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
exit_code: 0
----- stdout -----
-βœ… Switched to worktree for main at [REPO].main
-πŸ’‘ Run `wt config shell install` to enable automatic cd
----- stderr -----
+βœ… Switched to worktree for main at [REPO].main
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snap
index 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: true
exit_code: 0
----- stdout -----
-βœ… Created new worktree for file-test from main at [REPO].file-test
-πŸ”„ Executing (--execute):
----- stderr -----
+βœ… Created new worktree for file-test from main at [REPO].file-test
+πŸ”„ Executing (--execute):
  echo 'test content' > test.txt
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap
index 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: true
exit_code: 0
----- stdout -----
-βœ… Switched to worktree for existing-exec at [REPO].existing-exec
-πŸ”„ Executing (--execute):
----- stderr -----
+βœ… Switched to worktree for existing-exec at [REPO].existing-exec
+πŸ”„ Executing (--execute):
  echo 'existing worktree' > existing.txt
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap
index 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: false
exit_code: 1
----- stdout -----
-βœ… Created new worktree for fail-test from main at [REPO].fail-test
-πŸ”„ Executing (--execute):
----- stderr -----
+βœ… Created new worktree for fail-test from main at [REPO].fail-test
+πŸ”„ Executing (--execute):
  exit 1
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap
index 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: true
exit_code: 0
----- stdout -----
-βœ… Created new worktree for multiline-test from main at [REPO].multiline-test
-πŸ”„ Executing (--execute):
line1
line2
line3
----- stderr -----
+βœ… Created new worktree for multiline-test from main at [REPO].multiline-test
+πŸ”„ Executing (--execute):
  echo 'line1'
  echo 'line2'
  echo 'line3'
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap
index 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: true
exit_code: 0
----- stdout -----
-βœ… Created new worktree for exec-test from main at [REPO].exec-test
-πŸ”„ Executing (--execute):
test output
----- stderr -----
+βœ… Created new worktree for exec-test from main at [REPO].exec-test
+πŸ”„ Executing (--execute):
  echo 'test output'
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snap b/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snap
index 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: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
exit_code: 0
----- stdout -----
-🟑 Worktree for feature-z at [REPO].feature-z; cannot cd (no shell integration)
-πŸ’‘ Run `wt config shell install` to enable automatic cd
----- stderr -----
+🟑 Worktree for feature-z at [REPO].feature-z; cannot cd (no shell integration)
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --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.snap
index 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: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
exit_code: 0
----- stdout -----
-βœ… Switched to worktree for shell-configured at [REPO].shell-configured
----- stderr -----
+βœ… Switched to worktree for shell-configured at [REPO].shell-configured
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_main_branch.snap b/tests/snapshots/integration__integration_tests__switch__switch_main_branch.snap
index 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/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
+ WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
exit_code: 0
----- stdout -----
-βšͺ Already on worktree for main at [REPO]
----- stderr -----
+βšͺ Already on worktree for main at [REPO]
diff --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.snap
index 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/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
+ WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
exit_code: 0
----- stdout -----
-βœ… Switched to worktree for feature-a at [REPO].feature-a
-πŸ’‘ Run `wt config shell install` to enable automatic cd
----- stderr -----
+βœ… Switched to worktree for feature-a at [REPO].feature-a
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch.snap b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch.snap
index 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: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
exit_code: 0
----- stdout -----
-🟑 Worktree for feature-a at [REPO].feature-a; cannot cd (no shell integration)
-πŸ’‘ Run `wt config shell install` to enable automatic cd
----- stderr -----
+🟑 Worktree for feature-a at [REPO].feature-a; cannot cd (no shell integration)
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_first.snap b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_first.snap
index 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/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
+ WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
exit_code: 0
----- stdout -----
-βœ… Switched to worktree for feature-a at [REPO].feature-a
-πŸ’‘ Run `wt config shell install` to enable automatic cd
----- stderr -----
+βœ… Switched to worktree for feature-a at [REPO].feature-a
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_second.snap b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_second.snap
index 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/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
+ WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
exit_code: 0
----- stdout -----
-βœ… Switched to worktree for feature-b at [REPO].feature-b
-πŸ’‘ Run `wt config shell install` to enable automatic cd
----- stderr -----
+βœ… Switched to worktree for feature-b at [REPO].feature-b
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --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.snap
index 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: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
exit_code: 0
----- stdout -----
-🟑 Worktree for feature-x at [REPO].feature-x; cannot cd (no shell integration)
-πŸ’‘ Run `wt config shell install` to enable automatic cd
----- stderr -----
+🟑 Worktree for feature-x at [REPO].feature-x; cannot cd (no shell integration)
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --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.snap
index 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/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
+ WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
exit_code: 0
----- stdout -----
-βœ… Switched to worktree for feature-x at [REPO].feature-x
-πŸ’‘ Run `wt config shell install` to enable automatic cd
----- stderr -----
+βœ… Switched to worktree for feature-x at [REPO].feature-x
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --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.snap
index 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/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
+ WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
exit_code: 0
----- stdout -----
-βœ… Switched to worktree for feature-y at [REPO].feature-y
-πŸ’‘ Run `wt config shell install` to enable automatic cd
----- stderr -----
+βœ… Switched to worktree for feature-y at [REPO].feature-y
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --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.snap
index 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/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
+ WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
exit_code: 0
----- stdout -----
-βœ… Created new worktree for feature-from-main from main at [REPO].feature-from-main
-πŸ’‘ Run `wt config shell install` to enable automatic cd
----- stderr -----
+βœ… Created new worktree for feature-from-main from main at [REPO].feature-from-main
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --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.snap
index 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: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
exit_code: 0
----- stdout -----
-🟑 Worktree for existing-branch at [REPO].existing-branch; cannot cd (no shell integration)
-πŸ’‘ Run `wt config shell install` to enable automatic cd
----- stderr -----
+🟑 Worktree for existing-branch at [REPO].existing-branch; cannot cd (no shell integration)
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_with_base.snap b/tests/snapshots/integration__integration_tests__switch__switch_with_base.snap
index 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/null
GIT_EDITOR: ""
+ HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
+ WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
exit_code: 0
----- stdout -----
-βœ… Created new worktree for feature-with-base from main at [REPO].feature-with-base
-πŸ’‘ Run `wt config shell install` to enable automatic cd
----- stderr -----
+βœ… Created new worktree for feature-with-base from main at [REPO].feature-with-base
+πŸ’‘ Run `wt config shell install` to enable automatic cd