Skip to content

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

feat: Improve terminal output and shell configuration

Maximilian Rooscadca7c12398
diff --git a/Cargo.lock b/Cargo.lock
index 86a9da90c..cb2a6199d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -357,6 +357,27 @@ version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
+[[package]]
+name = "color-print"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3aa954171903797d5623e047d9ab69d91b493657917bdfb8c2c80ecaf9cdb6f4"
+dependencies = [
+ "color-print-proc-macro",
+]
+
+[[package]]
+name = "color-print-proc-macro"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "692186b5ebe54007e45a59aea47ece9eb4108e141326c304cdc91699a7118a22"
+dependencies = [
+ "nom",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
[[package]]
name = "colorchoice"
version = "1.0.4"
@@ -2884,6 +2905,7 @@ dependencies = [
"chrono",
"clap",
"clap_complete",
+ "color-print",
"config",
"criterion",
"crossbeam-channel",
diff --git a/Cargo.toml b/Cargo.toml
index cd1c5b3d4..73832a09e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -48,6 +48,7 @@ anyhow = "1.0"
anstream = "0.6"
anstyle = "1.0"
ansi-str = "0.9"
+color-print = "0.3"
askama = { version = "0.14", default-features = false, features = ["derive", "std"] }
chrono = "0.4"
clap = { version = "4.5", features = ["derive", "unstable-ext"] }
diff --git a/src/commands/command_approval.rs b/src/commands/command_approval.rs
index cee6a18c3..c6ff3fd94 100644
--- a/src/commands/command_approval.rs
+++ b/src/commands/command_approval.rs
@@ -4,11 +4,11 @@
use crate::output;
use anyhow::Context;
+use color_print::cformat;
use worktrunk::config::{Command, WorktrunkConfig};
use worktrunk::git::GitError;
use worktrunk::styling::{
- AnstyleStyle, HINT, HINT_EMOJI, INFO_EMOJI, WARNING, WARNING_BOLD, WARNING_EMOJI, eprint,
- eprintln, format_bash_with_gutter, stderr,
+ HINT_EMOJI, INFO_EMOJI, WARNING_EMOJI, eprint, eprintln, format_bash_with_gutter, stderr,
};
/// Batch approval helper used when multiple commands are queued for execution.
@@ -66,8 +66,8 @@ 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(format!(
- "{HINT}Approval will be requested again next time.{HINT:#}"
+ let _ = output::hint(cformat!(
+ "<dim>Approval will be requested again next time.</>"
));
}
}
@@ -79,7 +79,6 @@ fn prompt_for_batch_approval(commands: &[&Command], project_id: &str) -> anyhow:
use std::io::{self, IsTerminal, Write};
let project_name = project_id.split('/').next_back().unwrap_or(project_id);
- let bold = AnstyleStyle::new().bold();
let count = commands.len();
let plural = if count == 1 { "" } else { "s" };
@@ -89,7 +88,10 @@ fn prompt_for_batch_approval(commands: &[&Command], project_id: &str) -> anyhow:
crate::output::flush_for_stderr_prompt()?;
eprintln!(
- "{WARNING_EMOJI} {WARNING}{WARNING_BOLD}{project_name}{WARNING_BOLD:#}{WARNING} needs approval to execute {WARNING_BOLD}{count}{WARNING_BOLD:#}{WARNING} command{plural}:{WARNING:#}"
+ "{}",
+ cformat!(
+ "{WARNING_EMOJI} <yellow><bold>{project_name}</> needs approval to execute <bold>{count}</> command{plural}:</>"
+ )
);
eprintln!();
@@ -99,7 +101,7 @@ fn prompt_for_batch_approval(commands: &[&Command], project_id: &str) -> anyhow:
// Uses INFO_EMOJI (⚪) since this is a preview, not active execution
let phase = cmd.phase.to_string();
let label = match &cmd.name {
- Some(name) => format!("{INFO_EMOJI} {phase} {bold}{name}{bold:#}:"),
+ Some(name) => cformat!("{INFO_EMOJI} {phase} <bold>{name}</>:"),
None => format!("{INFO_EMOJI} {phase}:"),
};
eprintln!("{label}");
@@ -117,7 +119,10 @@ fn prompt_for_batch_approval(commands: &[&Command], project_id: &str) -> anyhow:
// Flush stderr before showing prompt to ensure all output is visible
stderr().flush()?;
- eprint!("{HINT_EMOJI} Allow and remember? {bold}[y/N]{bold:#} ");
+ eprint!(
+ "{}",
+ cformat!("{HINT_EMOJI} Allow and remember? <bold>[y/N]</> ")
+ );
stderr().flush()?;
let mut response = String::new();
diff --git a/src/commands/commit.rs b/src/commands/commit.rs
index a53e83f59..00fc8f8da 100644
--- a/src/commands/commit.rs
+++ b/src/commands/commit.rs
@@ -1,7 +1,8 @@
use anyhow::Context;
+use color_print::cformat;
use worktrunk::config::CommitGenerationConfig;
use worktrunk::git::Repository;
-use worktrunk::styling::{AnstyleStyle, CYAN, GREEN, HINT, format_with_gutter};
+use worktrunk::styling::format_with_gutter;
use super::command_executor::CommandContext;
use super::hooks::HookPipeline;
@@ -46,14 +47,13 @@ impl<'a> CommitGenerator<'a> {
}
pub fn format_message_for_display(&self, message: &str) -> String {
- let bold = AnstyleStyle::new().bold();
let lines: Vec<&str> = message.lines().collect();
if lines.is_empty() {
return String::new();
}
- let mut result = format!("{bold}{}{bold:#}", lines[0]);
+ let mut result = cformat!("<bold>{}</>", lines[0]);
if lines.len() > 1 {
for line in &lines[1..] {
@@ -67,8 +67,8 @@ impl<'a> CommitGenerator<'a> {
pub fn emit_hint_if_needed(&self) -> anyhow::Result<()> {
if !self.config.is_configured() {
- crate::output::hint(format!(
- "{HINT}Using fallback commit message. Run 'wt config --help' for LLM setup guide{HINT:#}"
+ crate::output::hint(cformat!(
+ "<dim>Using fallback commit message. Run 'wt config --help' for LLM setup guide</>"
))?;
}
Ok(())
@@ -103,9 +103,9 @@ impl<'a> CommitGenerator<'a> {
}
let full_progress_msg = if parts.is_empty() {
- format!("{CYAN}{action}{CYAN:#}")
+ cformat!("<cyan>{action}</>")
} else {
- format!("{CYAN}{action} ({}){CYAN:#}", parts.join(", "))
+ cformat!("<cyan>{action} ({})</>", parts.join(", "))
};
crate::output::progress(full_progress_msg)?;
@@ -124,9 +124,8 @@ impl<'a> CommitGenerator<'a> {
.trim()
.to_string();
- let green_dim = GREEN.dimmed();
- crate::output::success(format!(
- "{GREEN}Committed changes @ {green_dim}{commit_hash}{green_dim:#}{GREEN:#}"
+ crate::output::success(cformat!(
+ "<green>Committed changes @ <dim>{commit_hash}</></>"
))?;
Ok(())
@@ -143,9 +142,7 @@ impl CommitOptions<'_> {
.unwrap_or(false);
if self.no_verify && has_pre_commit {
- crate::output::hint(format!(
- "{HINT}Skipping pre-commit hook (--no-verify){HINT:#}"
- ))?;
+ crate::output::hint(cformat!("<dim>Skipping pre-commit hook (--no-verify)</>"))?;
} 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 804fa8d0c..bf8c546ed 100644
--- a/src/commands/config.rs
+++ b/src/commands/config.rs
@@ -1,4 +1,5 @@
use anyhow::Context;
+use color_print::cformat;
use etcetera::base_strategy::{BaseStrategy, choose_base_strategy};
use std::fmt::Write as _;
use std::path::PathBuf;
@@ -6,10 +7,7 @@ use worktrunk::config::{find_unknown_project_keys, find_unknown_user_keys};
use worktrunk::git::Repository;
use worktrunk::path::format_path_for_display;
use worktrunk::shell::Shell;
-use worktrunk::styling::{
- AnstyleStyle, CYAN, GREEN, GREEN_BOLD, HINT, HINT_EMOJI, INFO_EMOJI, WARNING, WARNING_BOLD,
- WARNING_EMOJI, format_toml, format_with_gutter,
-};
+use worktrunk::styling::{HINT_EMOJI, INFO_EMOJI, WARNING_EMOJI, format_toml, format_with_gutter};
use super::configure_shell::{ConfigAction, scan_shell_configs};
use super::list::ci_status::CachedCiStatus;
@@ -52,17 +50,16 @@ pub fn handle_config_create() -> anyhow::Result<()> {
// Check if file already exists
if config_path.exists() {
- let bold = AnstyleStyle::new().bold();
- output::info(format!(
- "Global config already exists: {bold}{}{bold:#}",
+ output::info(cformat!(
+ "Global config already exists: <bold>{}</>",
format_path_for_display(&config_path)
))?;
output::blank()?;
- output::hint(format!(
- "{HINT}Use 'wt config show' to view existing configuration{HINT:#}"
+ output::hint(cformat!(
+ "<dim>Use 'wt config show' to view existing configuration</>"
))?;
- output::hint(format!(
- "{HINT}Use 'wt config create --help' for config format reference{HINT:#}"
+ output::hint(cformat!(
+ "<dim>Use 'wt config create --help' for config format reference</>"
))?;
return Ok(());
}
@@ -78,14 +75,13 @@ pub fn handle_config_create() -> anyhow::Result<()> {
std::fs::write(&config_path, commented_config).context("Failed to write config file")?;
// Success message
- let green_bold = GREEN.bold();
- output::success(format!(
- "{GREEN}Created config file: {green_bold}{}{green_bold:#}{GREEN:#}",
+ output::success(cformat!(
+ "<green>Created config file: <bold>{}</></>",
format_path_for_display(&config_path)
))?;
output::blank()?;
- output::hint(format!(
- "{HINT}Edit this file to customize worktree paths and LLM settings{HINT:#}"
+ output::hint(cformat!(
+ "<dim>Edit this file to customize worktree paths and LLM settings</>"
))?;
Ok(())
@@ -118,8 +114,6 @@ pub fn handle_config_show() -> anyhow::Result<()> {
}
fn render_global_config(out: &mut String) -> anyhow::Result<()> {
- let bold = AnstyleStyle::new().bold();
-
// Get config path
let config_path = get_global_config_path().ok_or_else(|| {
anyhow::anyhow!(
@@ -129,16 +123,24 @@ fn render_global_config(out: &mut String) -> anyhow::Result<()> {
writeln!(
out,
- "{INFO_EMOJI} Global Config: {bold}{}{bold:#}",
- format_path_for_display(&config_path)
+ "{}",
+ cformat!(
+ "{INFO_EMOJI} Global Config: <bold>{}</>",
+ format_path_for_display(&config_path)
+ )
)?;
// Check if file exists
if !config_path.exists() {
- writeln!(out, "{HINT_EMOJI} {HINT}Not found (using defaults){HINT:#}")?;
writeln!(
out,
- "{HINT_EMOJI} {HINT}Run 'wt config create' to create a config file{HINT:#}"
+ "{}",
+ cformat!("{HINT_EMOJI} <dim>Not found (using defaults)</>")
+ )?;
+ writeln!(
+ out,
+ "{}",
+ cformat!("{HINT_EMOJI} <dim>Run 'wt config create' to create a config file</>")
)?;
writeln!(out)?;
let default_config =
@@ -153,7 +155,8 @@ fn render_global_config(out: &mut String) -> anyhow::Result<()> {
if contents.trim().is_empty() {
writeln!(
out,
- "{HINT_EMOJI} {HINT}Empty file (using defaults){HINT:#}"
+ "{}",
+ cformat!("{HINT_EMOJI} <dim>Empty file (using defaults)</>")
)?;
return Ok(());
}
@@ -172,16 +175,14 @@ fn warn_unknown_keys(out: &mut String, unknown_keys: &[String]) -> anyhow::Resul
for key in unknown_keys {
writeln!(
out,
- "{WARNING_EMOJI} {WARNING}Unknown key {WARNING_BOLD}{key}{WARNING_BOLD:#}{WARNING} will be ignored{WARNING:#}"
+ "{}",
+ cformat!("{WARNING_EMOJI} <yellow>Unknown key <bold>{key}</> will be ignored</>")
)?;
}
Ok(())
}
fn render_project_config(out: &mut String) -> anyhow::Result<()> {
- let bold = AnstyleStyle::new().bold();
- let dim = AnstyleStyle::new().dimmed();
-
// Try to get current repository root
let repo = Repository::current();
let repo_root = match repo.worktree_root() {
@@ -189,7 +190,8 @@ fn render_project_config(out: &mut String) -> anyhow::Result<()> {
Err(_) => {
writeln!(
out,
- "{INFO_EMOJI} {dim}Project Config: Not in a git repository{dim:#}"
+ "{}",
+ cformat!("{INFO_EMOJI} <dim>Project Config: Not in a git repository</>")
)?;
return Ok(());
}
@@ -198,13 +200,16 @@ fn render_project_config(out: &mut String) -> anyhow::Result<()> {
writeln!(
out,
- "{INFO_EMOJI} Project Config: {bold}{}{bold:#}",
- format_path_for_display(&config_path)
+ "{}",
+ cformat!(
+ "{INFO_EMOJI} Project Config: <bold>{}</>",
+ format_path_for_display(&config_path)
+ )
)?;
// Check if file exists
if !config_path.exists() {
- writeln!(out, "{HINT_EMOJI} {HINT}Not found{HINT:#}")?;
+ writeln!(out, "{}", cformat!("{HINT_EMOJI} <dim>Not found</>"))?;
return Ok(());
}
@@ -212,7 +217,7 @@ fn render_project_config(out: &mut String) -> anyhow::Result<()> {
let contents = std::fs::read_to_string(&config_path).context("Failed to read config file")?;
if contents.trim().is_empty() {
- writeln!(out, "{HINT_EMOJI} {HINT}Empty file{HINT:#}")?;
+ writeln!(out, "{}", cformat!("{HINT_EMOJI} <dim>Empty file</>"))?;
return Ok(());
}
@@ -226,16 +231,14 @@ fn render_project_config(out: &mut String) -> anyhow::Result<()> {
}
fn render_shell_status(out: &mut String) -> anyhow::Result<()> {
- let bold = AnstyleStyle::new().bold();
- let dim = AnstyleStyle::new().dimmed();
-
// Use the same detection logic as `wt config shell install`
let scan_result = match scan_shell_configs(None, true) {
Ok(r) => r,
Err(e) => {
writeln!(
out,
- "{HINT_EMOJI} {HINT}Could not determine shell status: {e}{HINT:#}"
+ "{}",
+ cformat!("{HINT_EMOJI} <dim>Could not determine shell status: {e}</>")
)?;
return Ok(());
}
@@ -260,14 +263,20 @@ fn render_shell_status(out: &mut String) -> anyhow::Result<()> {
ConfigAction::AlreadyExists => {
writeln!(
out,
- "{INFO_EMOJI} Already configured {what} for {bold}{shell}{bold:#} @ {path}"
+ "{}",
+ cformat!(
+ "{INFO_EMOJI} Already configured {what} for <bold>{shell}</> @ {path}"
+ )
)?;
// Check if zsh has compinit enabled (required for completions)
if matches!(shell, Shell::Zsh) && check_zsh_compinit_missing() {
writeln!(
out,
- "{WARNING_EMOJI} {WARNING}Completions won't work; add to ~/.zshrc before the wt line:{WARNING:#}"
+ "{}",
+ cformat!(
+ "{WARNING_EMOJI} <yellow>Completions won't work; add to ~/.zshrc before the wt line:</>"
+ )
)?;
write!(
out,
@@ -284,13 +293,19 @@ fn render_shell_status(out: &mut String) -> anyhow::Result<()> {
if completion_path.exists() {
writeln!(
out,
- "{INFO_EMOJI} Already configured completions for {bold}{shell}{bold:#} @ {completion_display}"
+ "{}",
+ cformat!(
+ "{INFO_EMOJI} Already configured completions for <bold>{shell}</> @ {completion_display}"
+ )
)?;
} else {
any_not_configured = true;
writeln!(
out,
- "{HINT_EMOJI} {HINT}Not configured completions for {shell} @ {completion_display}{HINT:#}"
+ "{}",
+ cformat!(
+ "{HINT_EMOJI} <dim>Not configured completions for {shell} @ {completion_display}</>"
+ )
)?;
}
}
@@ -299,7 +314,8 @@ fn render_shell_status(out: &mut String) -> anyhow::Result<()> {
any_not_configured = true;
writeln!(
out,
- "{HINT_EMOJI} {HINT}Not configured {what} for {shell} @ {path}{HINT:#}"
+ "{}",
+ cformat!("{HINT_EMOJI} <dim>Not configured {what} for {shell} @ {path}</>")
)?;
}
_ => {} // Added/Created won't appear in dry_run mode
@@ -309,7 +325,11 @@ fn render_shell_status(out: &mut String) -> anyhow::Result<()> {
// Show skipped (not installed) shells
for (shell, path) in &scan_result.skipped {
let path = format_path_for_display(path);
- writeln!(out, "{dim}⚪ Skipped {shell}; {path} not found{dim:#}")?;
+ writeln!(
+ out,
+ "{}",
+ cformat!("<dim>⚪ Skipped {shell}; {path} not found</>")
+ )?;
}
// Summary hint
@@ -317,7 +337,10 @@ fn render_shell_status(out: &mut String) -> anyhow::Result<()> {
writeln!(out)?;
writeln!(
out,
- "{HINT_EMOJI} {HINT}Run 'wt config shell install' to enable shell integration{HINT:#}"
+ "{}",
+ cformat!(
+ "{HINT_EMOJI} <dim>Run 'wt config shell install' to enable shell integration</>"
+ )
)?;
}
@@ -393,9 +416,8 @@ pub fn handle_config_status_set(value: String, branch: Option<String>) -> anyhow
let config_key = format!("worktrunk.status.{}", branch_name);
repo.run_command(&["config", &config_key, &value])?;
- let branch_bold = GREEN.bold();
- crate::output::success(format!(
- "{GREEN}Set status for {branch_bold}{branch_name}{branch_bold:#}{GREEN} to {GREEN_BOLD}{value}{GREEN_BOLD:#}{GREEN:#}"
+ crate::output::success(cformat!(
+ "<green>Set status for <bold>{branch_name}</> to <bold>{value}</></>"
))?;
Ok(())
@@ -422,8 +444,8 @@ pub fn handle_config_status_unset(target: String) -> anyhow::Result<()> {
if cleared_count == 0 {
crate::output::info("No statuses to clear")?;
} else {
- crate::output::success(format!(
- "{GREEN}Cleared {GREEN_BOLD}{cleared_count}{GREEN_BOLD:#}{GREEN} status{}{GREEN:#}",
+ crate::output::success(cformat!(
+ "<green>Cleared <bold>{cleared_count}</> status{}</>",
if cleared_count == 1 { "" } else { "es" }
))?;
}
@@ -439,9 +461,8 @@ pub fn handle_config_status_unset(target: String) -> anyhow::Result<()> {
repo.run_command(&["config", "--unset", &config_key])
.context("Failed to unset status (may not be set)")?;
- let branch_bold = GREEN.bold();
- crate::output::success(format!(
- "{GREEN}Cleared status for {branch_bold}{branch_name}{branch_bold:#}{GREEN:#}"
+ crate::output::success(cformat!(
+ "<green>Cleared status for <bold>{branch_name}</></>"
))?;
}
@@ -450,12 +471,10 @@ pub fn handle_config_status_unset(target: String) -> anyhow::Result<()> {
/// Handle the cache show command
pub fn handle_cache_show() -> anyhow::Result<()> {
- use worktrunk::styling::HINT;
-
let repo = Repository::current();
// Show default branch cache
- crate::output::info(format!("{HINT}Default branch cache:{HINT:#}"))?;
+ crate::output::info(cformat!("<dim>Default branch cache:</>"))?;
match repo.default_branch() {
Ok(branch) => crate::output::data(format!(" {branch}"))?,
Err(_) => crate::output::data(" (not cached)")?,
@@ -463,7 +482,7 @@ pub fn handle_cache_show() -> anyhow::Result<()> {
crate::output::blank()?;
// Show CI status cache
- crate::output::info(format!("{HINT}CI status cache:{HINT:#}"))?;
+ crate::output::info(cformat!("<dim>CI status cache:</>"))?;
let entries = CachedCiStatus::list_all(&repo);
if entries.is_empty() {
@@ -499,8 +518,8 @@ pub fn handle_cache_clear(cache_type: Option<String>) -> anyhow::Result<()> {
if cleared == 0 {
crate::output::info("No CI cache entries to clear")?;
} else {
- crate::output::success(format!(
- "{GREEN}Cleared {GREEN_BOLD}{cleared}{GREEN_BOLD:#}{GREEN} CI cache entr{}{GREEN:#}",
+ crate::output::success(cformat!(
+ "<green>Cleared <bold>{cleared}</> CI cache entr{}</>",
if cleared == 1 { "y" } else { "ies" }
))?;
}
@@ -510,7 +529,7 @@ pub fn handle_cache_clear(cache_type: Option<String>) -> anyhow::Result<()> {
.run_command(&["config", "--unset", "worktrunk.defaultBranch"])
.is_ok()
{
- crate::output::success(format!("{GREEN}Cleared default branch cache{GREEN:#}"))?;
+ crate::output::success(cformat!("<green>Cleared default branch cache</>"))?;
} else {
crate::output::info("No default branch cache to clear")?;
}
@@ -522,7 +541,7 @@ pub fn handle_cache_clear(cache_type: Option<String>) -> anyhow::Result<()> {
let cleared_ci = CachedCiStatus::clear_all(&repo) > 0;
if cleared_default || cleared_ci {
- crate::output::success(format!("{GREEN}Cleared all caches{GREEN:#}"))?;
+ crate::output::success(cformat!("<green>Cleared all caches</>"))?;
} else {
crate::output::info("No caches to clear")?;
}
@@ -539,15 +558,11 @@ pub fn handle_cache_clear(cache_type: Option<String>) -> anyhow::Result<()> {
pub fn handle_cache_refresh() -> anyhow::Result<()> {
let repo = Repository::current();
- crate::output::progress(format!(
- "{CYAN}Querying remote for default branch...{CYAN:#}"
- ))?;
+ crate::output::progress(cformat!("<cyan>Querying remote for default branch...</>"))?;
let branch = repo.refresh_default_branch()?;
- crate::output::success(format!(
- "{GREEN}Cache refreshed: {GREEN_BOLD}{branch}{GREEN_BOLD:#}{GREEN:#}"
- ))?;
+ crate::output::success(cformat!("<green>Cache refreshed: <bold>{branch}</></>"))?;
Ok(())
}
diff --git a/src/commands/configure_shell.rs b/src/commands/configure_shell.rs
index 00d1db49c..520c2d8c1 100644
--- a/src/commands/configure_shell.rs
+++ b/src/commands/configure_shell.rs
@@ -173,12 +173,15 @@ pub fn handle_configure_shell(
// Only show advisory if we positively detect it's missing (Some(false)).
// If detection fails (None), stay silent - we can't be sure.
if shell::detect_zsh_compinit() == Some(false) {
- use worktrunk::styling::{WARNING, WARNING_EMOJI, eprintln};
- eprintln!(
- "{WARNING_EMOJI} {WARNING}Completions won't work: zsh's compinit is not enabled.{WARNING:#}"
- );
- eprintln!("{WARNING} Add this to ~/.zshrc before the wt line:{WARNING:#}");
- eprintln!("{WARNING} autoload -Uz compinit && compinit{WARNING:#}");
+ use color_print::cformat;
+ let _ = crate::output::warning(cformat!(
+ "<yellow>Completions won't work: zsh's compinit is not enabled.</>"
+ ));
+ let _ = crate::output::print(cformat!(
+ "<yellow> Add this to ~/.zshrc before the wt line:</>"
+ ));
+ let _ =
+ crate::output::print(cformat!("<yellow> autoload -Uz compinit && compinit</>"));
}
}
diff --git a/src/commands/hooks.rs b/src/commands/hooks.rs
index bd9eec177..f5803c845 100644
--- a/src/commands/hooks.rs
+++ b/src/commands/hooks.rs
@@ -1,7 +1,8 @@
+use color_print::cformat;
use worktrunk::HookType;
use worktrunk::config::{CommandConfig, CommandPhase, ProjectConfig};
use worktrunk::git::WorktrunkError;
-use worktrunk::styling::{CYAN, WARNING, WARNING_BOLD, format_bash_with_gutter};
+use worktrunk::styling::format_bash_with_gutter;
use super::command_executor::{CommandContext, PreparedCommand, prepare_project_commands};
use crate::commands::process::spawn_detached;
@@ -59,7 +60,7 @@ impl<'a> HookPipeline<'a> {
for prepared in commands {
let label =
crate::commands::format_command_label(label_prefix, prepared.name.as_deref());
- crate::output::progress(format!("{CYAN}{label}:{CYAN:#}"))?;
+ crate::output::progress(cformat!("<cyan>{label}:</>"))?;
crate::output::gutter(format_bash_with_gutter(&prepared.expanded, ""))?;
if let Err(err) =
@@ -90,10 +91,10 @@ impl<'a> HookPipeline<'a> {
}
HookFailureStrategy::Warn => {
let message = match &prepared.name {
- Some(name) => format!(
- "{WARNING}Command {WARNING_BOLD}{name}{WARNING_BOLD:#}{WARNING} failed: {err_msg}{WARNING:#}"
- ),
- None => format!("{WARNING}Command failed: {err_msg}{WARNING:#}"),
+ Some(name) => {
+ cformat!("<yellow>Command <bold>{name}</> failed: {err_msg}</>")
+ }
+ None => cformat!("<yellow>Command failed: {err_msg}</>"),
};
crate::output::warning(message)?;
@@ -141,7 +142,7 @@ impl<'a> HookPipeline<'a> {
for prepared in commands {
let label =
crate::commands::format_command_label(label_prefix, prepared.name.as_deref());
- crate::output::progress(format!("{CYAN}{label}:{CYAN:#}"))?;
+ crate::output::progress(cformat!("<cyan>{label}:</>"))?;
crate::output::gutter(format_bash_with_gutter(&prepared.expanded, ""))?;
let name = prepared.name.as_deref().unwrap_or("cmd");
@@ -156,9 +157,9 @@ impl<'a> HookPipeline<'a> {
let err_msg = err.to_string();
let message = match &prepared.name {
Some(name) => {
- format!("{WARNING}Failed to spawn '{name}': {err_msg}{WARNING:#}")
+ cformat!("<yellow>Failed to spawn \"{name}\": {err_msg}</>")
}
- None => format!("{WARNING}Failed to spawn command: {err_msg}{WARNING:#}"),
+ None => cformat!("<yellow>Failed to spawn command: {err_msg}</>"),
};
crate::output::warning(message)?;
}
diff --git a/src/commands/list/model.rs b/src/commands/list/model.rs
index b4f358b96..fbe8a69d0 100644
--- a/src/commands/list/model.rs
+++ b/src/commands/list/model.rs
@@ -628,11 +628,11 @@ impl MainDivergence {
/// Returns styled symbol (dimmed), or None for None variant.
pub fn styled(&self) -> Option<String> {
- use worktrunk::styling::HINT;
+ use color_print::cformat;
if *self == Self::None {
None
} else {
- Some(format!("{HINT}{self}{HINT:#}"))
+ Some(cformat!("<dim>{self}</>"))
}
}
}
@@ -688,11 +688,11 @@ impl UpstreamDivergence {
/// Returns styled symbol (dimmed), or None for None variant.
pub fn styled(&self) -> Option<String> {
- use worktrunk::styling::HINT;
+ use color_print::cformat;
if *self == Self::None {
None
} else {
- Some(format!("{HINT}{self}{HINT:#}"))
+ Some(cformat!("<dim>{self}</>"))
}
}
}
@@ -793,14 +793,14 @@ impl BranchOpState {
/// - WARNING (yellow): Rebase, Merge, MergeTreeConflicts - active/stuck states
/// - HINT (dimmed): MatchesMain, NoCommits - low urgency removability indicators
pub fn styled(&self) -> Option<String> {
- use worktrunk::styling::{ERROR, HINT, WARNING};
+ use color_print::cformat;
match self {
Self::None => None,
- Self::Conflicts => Some(format!("{ERROR}{self}{ERROR:#}")),
+ Self::Conflicts => Some(cformat!("<red>{self}</>")),
Self::Rebase | Self::Merge | Self::MergeTreeConflicts => {
- Some(format!("{WARNING}{self}{WARNING:#}"))
+ Some(cformat!("<yellow>{self}</>"))
}
- Self::MatchesMain | Self::NoCommits => Some(format!("{HINT}{self}{HINT:#}")),
+ Self::MatchesMain | Self::NoCommits => Some(cformat!("<dim>{self}</>")),
}
}
}
@@ -942,7 +942,8 @@ impl StatusSymbols {
///
/// See [`StatusSymbols`] struct doc for symbol categories.
pub fn render_with_mask(&self, mask: &PositionMask) -> String {
- use worktrunk::styling::{CYAN, HINT, StyledLine, WARNING};
+ use color_print::cformat;
+ use worktrunk::styling::StyledLine;
let mut result = String::with_capacity(64);
@@ -972,7 +973,7 @@ impl StatusSymbols {
// Working tree symbols split into 3 fixed columns for vertical alignment
let style_working = |sym: char| -> (String, bool) {
if self.working_tree.contains(sym) {
- (format!("{CYAN}{sym}{CYAN:#}"), true)
+ (cformat!("<cyan>{sym}</>"), true)
} else {
(String::new(), false)
}
@@ -983,9 +984,9 @@ impl StatusSymbols {
let worktree_state_str = match self.worktree_state {
WorktreeState::None => String::new(),
// Branch indicator (⎇) is informational (dimmed)
- WorktreeState::Branch => format!("{HINT}{}{HINT:#}", self.worktree_state),
+ WorktreeState::Branch => cformat!("<dim>{}</>", self.worktree_state),
// Worktree attrs (⚐⌫⊠) are warnings (yellow)
- _ => format!("{WARNING}{}{WARNING:#}", self.worktree_state),
+ _ => cformat!("<yellow>{}</>", self.worktree_state),
};
let user_status_str = self.user_status.as_deref().unwrap_or("").to_string();
@@ -1062,13 +1063,13 @@ impl StatusSymbols {
/// Render status symbols in compact form for statusline (no grid alignment).
pub fn format_compact(&self) -> String {
- use worktrunk::styling::{CYAN, WARNING};
+ use color_print::cformat;
let mut result = String::new();
// Working tree symbols (compact, no padding) - cyan for activity
if !self.working_tree.is_empty() {
- result.push_str(&format!("{CYAN}{}{CYAN:#}", self.working_tree));
+ result.push_str(&cformat!("<cyan>{}</>", self.working_tree));
}
// Branch/op state
@@ -1082,7 +1083,7 @@ impl StatusSymbols {
self.worktree_state,
WorktreeState::PathMismatch | WorktreeState::Prunable | WorktreeState::Locked
) {
- result.push_str(&format!("{WARNING}{}{WARNING:#}", self.worktree_state));
+ result.push_str(&cformat!("<yellow>{}</>", self.worktree_state));
}
// User status
diff --git a/src/commands/merge.rs b/src/commands/merge.rs
index 2879e971b..20bebcfca 100644
--- a/src/commands/merge.rs
+++ b/src/commands/merge.rs
@@ -1,7 +1,8 @@
+use color_print::cformat;
use worktrunk::HookType;
use worktrunk::config::{Command, CommandPhase, ProjectConfig};
use worktrunk::git::Repository;
-use worktrunk::styling::{ERROR, ERROR_EMOJI, HINT, HINT_EMOJI};
+use worktrunk::styling::{ERROR_EMOJI, HINT_EMOJI};
use super::command_approval::approve_command_batch;
use super::command_executor::CommandContext;
@@ -93,7 +94,11 @@ pub fn handle_merge(
// Validate --no-commit flag compatibility
if !commit && remove {
return Err(anyhow::anyhow!(
- "{ERROR_EMOJI} {ERROR}--no-commit requires --no-remove{ERROR:#}\n\n{HINT_EMOJI} {HINT}Cannot remove active worktree when skipping commit/rebase{HINT:#}"
+ "{}\n\n{}",
+ cformat!("{ERROR_EMOJI} <red>--no-commit requires --no-remove</>"),
+ cformat!(
+ "{HINT_EMOJI} <dim>Cannot remove active worktree when skipping commit/rebase</>"
+ )
));
}
diff --git a/src/commands/mod.rs b/src/commands/mod.rs
index b73726b29..48feb9fff 100644
--- a/src/commands/mod.rs
+++ b/src/commands/mod.rs
@@ -42,13 +42,10 @@ pub use worktrunk::shell::Shell;
/// - `format_command_label("post-create", Some("install"))` → `"Running post-create install"` (with bold)
/// - `format_command_label("post-create", None)` → `"Running post-create"`
pub fn format_command_label(command_type: &str, name: Option<&str>) -> String {
- use worktrunk::styling::AnstyleStyle;
+ use color_print::cformat;
match name {
- Some(name) => {
- let bold = AnstyleStyle::new().bold();
- format!("Running {command_type} {bold}{name}{bold:#}")
- }
+ Some(name) => cformat!("Running {command_type} <bold>{name}</>"),
None => format!("Running {command_type}"),
}
}
diff --git a/src/commands/repository_ext.rs b/src/commands/repository_ext.rs
index 087fb0988..d1954e0fa 100644
--- a/src/commands/repository_ext.rs
+++ b/src/commands/repository_ext.rs
@@ -4,10 +4,11 @@ use std::time::{SystemTime, UNIX_EPOCH};
use super::worktree::RemoveResult;
use anyhow::Context;
+use color_print::cformat;
use worktrunk::config::ProjectConfig;
use worktrunk::git::{GitError, Repository};
use worktrunk::path::format_path_for_display;
-use worktrunk::styling::{CYAN, CYAN_BOLD, WARNING, WARNING_BOLD, format_with_gutter};
+use worktrunk::styling::format_with_gutter;
/// CLI-only helpers implemented on [`Repository`] via an extension trait so we can keep orphan
/// implementations inside the binary crate.
@@ -166,8 +167,8 @@ impl RepositoryCliExt for Repository {
nanos
);
- crate::output::progress(format!(
- "{CYAN}Stashing changes in {CYAN_BOLD}{}{CYAN_BOLD:#}{CYAN}...{CYAN:#}",
+ crate::output::progress(cformat!(
+ "<cyan>Stashing changes in <bold>{}</><cyan>...</>",
format_path_for_display(wt_path)
))?;
@@ -230,8 +231,8 @@ impl AutoStageWarning {
let count = self.files.len();
let file_word = if count == 1 { "file" } else { "files" };
- crate::output::warning(format!(
- "{WARNING}Auto-staging {count} untracked {file_word}:{WARNING:#}"
+ crate::output::warning(cformat!(
+ "<yellow>Auto-staging {count} untracked {file_word}:</>"
))?;
let joined_files = self.files.join("\n");
@@ -257,8 +258,8 @@ impl TargetWorktreeStash {
}
pub(crate) fn restore(self) -> anyhow::Result<()> {
- crate::output::progress(format!(
- "{CYAN}Restoring stashed changes in {CYAN_BOLD}{}{CYAN_BOLD:#}{CYAN}...{CYAN:#}",
+ crate::output::progress(cformat!(
+ "<cyan>Restoring stashed changes in <bold>{}</><cyan>...</>",
format_path_for_display(&self.path)
))?;
@@ -266,8 +267,8 @@ impl TargetWorktreeStash {
.repo
.run_command(&["stash", "pop", "--quiet", &self.stash_ref])
{
- crate::output::warning(format!(
- "{WARNING}Failed to restore stash {WARNING_BOLD}{stash_ref}{WARNING_BOLD:#}{WARNING} - run 'git stash pop {stash_ref}' in {WARNING_BOLD}{path}{WARNING_BOLD:#}{WARNING:#}",
+ crate::output::warning(cformat!(
+ "<yellow>Failed to restore stash <bold>{stash_ref}</> - run 'git stash pop {stash_ref}' in <bold>{path}</></>",
stash_ref = self.stash_ref,
path = format_path_for_display(&self.path),
))?;
diff --git a/src/commands/standalone.rs b/src/commands/standalone.rs
index 78138955d..baca02c6b 100644
--- a/src/commands/standalone.rs
+++ b/src/commands/standalone.rs
@@ -1,7 +1,8 @@
use anyhow::Context;
+use color_print::cformat;
use worktrunk::HookType;
use worktrunk::git::Repository;
-use worktrunk::styling::{AnstyleStyle, CYAN, CYAN_BOLD, GREEN_BOLD, HINT, format_with_gutter};
+use worktrunk::styling::format_with_gutter;
use super::commit::{CommitGenerator, CommitOptions};
use super::context::CommandEnv;
@@ -141,9 +142,7 @@ pub fn handle_squash(
.unwrap_or(false);
if skip_pre_commit && has_pre_commit {
- crate::output::hint(format!(
- "{HINT}Skipping pre-commit hook (--no-verify){HINT:#}"
- ))?;
+ crate::output::hint(cformat!("<dim>Skipping pre-commit hook (--no-verify)</>"))?;
} else if let Some(ref config) = project_config {
HookPipeline::new(ctx).run_pre_commit(config, Some(&target_branch), auto_trust)?;
}
@@ -204,12 +203,12 @@ pub fn handle_squash(
let parts = total_stats;
let squash_progress = if parts.is_empty() {
- format!(
- "{CYAN}Squashing {commit_count} {commit_text}{with_changes} into a single commit...{CYAN:#}"
+ cformat!(
+ "<cyan>Squashing {commit_count} {commit_text}{with_changes} into a single commit...</>"
)
} else {
- format!(
- "{CYAN}Squashing {commit_count} {commit_text}{with_changes} into a single commit ({})...{CYAN:#}",
+ cformat!(
+ "<cyan>Squashing {commit_count} {commit_text}{with_changes} into a single commit ({})...</>",
parts.join(", ")
)
};
@@ -219,16 +218,14 @@ pub fn handle_squash(
if has_staged {
let backup_message = format!("{} → {} (squash)", current_branch, target_branch);
let (sha, _restore_cmd) = repo.create_safety_backup(&backup_message)?;
- use worktrunk::styling::AnstyleStyle;
- let dim = AnstyleStyle::new().dimmed();
- crate::output::hint(format!("{HINT}Backup created @ {dim}{sha}{dim:#}{HINT:#}"))?;
+ crate::output::hint(cformat!("<dim>Backup created @ {sha}</>"))?;
}
// Get commit subjects for the squash message
let subjects = repo.commit_subjects(&range)?;
// Generate squash commit message
- crate::output::progress(format!("{CYAN}Generating squash commit message...{CYAN:#}"))?;
+ crate::output::progress(cformat!("<cyan>Generating squash commit message...</>"))?;
generator.emit_hint_if_needed()?;
@@ -257,9 +254,8 @@ pub fn handle_squash(
// Check if there are actually any changes to commit
if !repo.has_staged_changes()? {
- let dim = AnstyleStyle::new().dimmed();
- crate::output::info(format!(
- "{dim}No changes after squashing {commit_count} {commit_text}{dim:#}"
+ crate::output::info(cformat!(
+ "<dim>No changes after squashing {commit_count} {commit_text}</>"
))?;
return Ok(SquashResult::NoNetChanges);
}
@@ -275,11 +271,7 @@ pub fn handle_squash(
.to_string();
// Show success immediately after completing the squash
- use worktrunk::styling::GREEN;
- let green_dim = GREEN.dimmed();
- crate::output::success(format!(
- "{GREEN}Squashed @ {green_dim}{commit_hash}{green_dim:#}{GREEN:#}"
- ))?;
+ crate::output::success(cformat!("<green>Squashed @ <dim>{commit_hash}</></>"))?;
Ok(SquashResult::Squashed)
}
@@ -317,8 +309,8 @@ pub fn handle_rebase(target: Option<&str>) -> anyhow::Result<RebaseResult> {
// Only show progress for true rebases (fast-forwards are instant)
if !is_fast_forward {
- crate::output::progress(format!(
- "{CYAN}Rebasing onto {CYAN_BOLD}{target_branch}{CYAN_BOLD:#}{CYAN}...{CYAN:#}"
+ crate::output::progress(cformat!(
+ "<cyan>Rebasing onto <bold>{target_branch}</>...</>"
))?;
}
@@ -355,15 +347,12 @@ pub fn handle_rebase(target: Option<&str>) -> anyhow::Result<RebaseResult> {
}
// Success
- use worktrunk::styling::GREEN;
if is_fast_forward {
- crate::output::success(format!(
- "{GREEN}Fast-forwarded to {GREEN_BOLD}{target_branch}{GREEN_BOLD:#}{GREEN:#}"
+ crate::output::success(cformat!(
+ "<green>Fast-forwarded to <bold>{target_branch}</></>"
))?;
} else {
- crate::output::success(format!(
- "{GREEN}Rebased onto {GREEN_BOLD}{target_branch}{GREEN_BOLD:#}{GREEN:#}"
- ))?;
+ crate::output::success(cformat!("<green>Rebased onto <bold>{target_branch}</></>"))?;
}
Ok(RebaseResult::Rebased)
@@ -421,18 +410,12 @@ pub fn handle_standalone_add_approvals(force: bool, show_all: bool) -> anyhow::R
// Show result
if approved {
- use worktrunk::styling::GREEN;
-
if force {
// When using --force, commands aren't saved to config
- crate::output::success(format!(
- "{GREEN}Commands approved; not saved (--force){GREEN:#}"
- ))?;
+ crate::output::success(cformat!("<green>Commands approved; not saved (--force)</>"))?;
} else {
// Interactive approval - commands were saved to config (unless save failed)
- crate::output::success(format!(
- "{GREEN}Commands approved & saved to config{GREEN:#}"
- ))?;
+ crate::output::success(cformat!("<green>Commands approved & saved to config</>"))?;
}
} else {
crate::output::info("Commands declined")?;
@@ -452,17 +435,15 @@ pub fn handle_standalone_clear_approvals(global: bool) -> anyhow::Result<()> {
let project_count = config.projects.len();
if project_count == 0 {
- let dim = worktrunk::styling::AnstyleStyle::new().dimmed();
- crate::output::info(format!("{dim}No approvals to clear{dim:#}"))?;
+ crate::output::info("No approvals to clear")?;
return Ok(());
}
config.projects.clear();
config.save().context("Failed to save config")?;
- use worktrunk::styling::GREEN;
- crate::output::success(format!(
- "{GREEN}Cleared approvals for {project_count} project{}{GREEN:#}",
+ crate::output::success(cformat!(
+ "<green>Cleared approvals for {project_count} project{}</>",
if project_count == 1 { "" } else { "s" }
))?;
} else {
@@ -474,10 +455,7 @@ pub fn handle_standalone_clear_approvals(global: bool) -> anyhow::Result<()> {
let had_approvals = config.projects.contains_key(&project_id);
if !had_approvals {
- let dim = worktrunk::styling::AnstyleStyle::new().dimmed();
- crate::output::info(format!(
- "{dim}No approvals to clear for this project{dim:#}"
- ))?;
+ crate::output::info("No approvals to clear for this project")?;
return Ok(());
}
@@ -492,9 +470,8 @@ pub fn handle_standalone_clear_approvals(global: bool) -> anyhow::Result<()> {
.revoke_project(&project_id)
.context("Failed to clear project approvals")?;
- use worktrunk::styling::GREEN;
- crate::output::success(format!(
- "{GREEN}Cleared {approval_count} approval{} for this project{GREEN:#}",
+ crate::output::success(cformat!(
+ "<green>Cleared {approval_count} approval{} for this project</>",
if approval_count == 1 { "" } else { "s" }
))?;
}
diff --git a/src/commands/worktree.rs b/src/commands/worktree.rs
index 13f79efe9..c69167702 100644
--- a/src/commands/worktree.rs
+++ b/src/commands/worktree.rs
@@ -109,14 +109,12 @@
//! The shell wrapper is generated by `wt config shell init <shell>` from templates in `templates/`.
use anyhow::Context;
+use color_print::cformat;
use std::path::PathBuf;
use worktrunk::HookType;
use worktrunk::config::{CommandPhase, WorktrunkConfig};
use worktrunk::git::{GitError, Repository, is_command_not_approved};
-use worktrunk::styling::{
- AnstyleStyle, CYAN, CYAN_BOLD, GREEN, GREEN_BOLD, HINT, WARNING, WARNING_BOLD,
- format_with_gutter,
-};
+use worktrunk::styling::format_with_gutter;
use super::command_executor::CommandContext;
use super::hooks::{HookFailureStrategy, HookPipeline};
@@ -235,19 +233,19 @@ pub fn handle_switch(
let remotes = repo.remotes_with_branch(&resolved_branch)?;
if !remotes.is_empty() {
let remote_ref = format!("{}/{}", remotes[0], resolved_branch);
- crate::output::warning(format!(
- "{WARNING}Branch {WARNING_BOLD}{resolved_branch}{WARNING_BOLD:#}{WARNING} exists on remote ({remote_ref}); creating new branch from base instead{WARNING:#}"
+ crate::output::warning(cformat!(
+ "<yellow>Branch <bold>{resolved_branch}</> exists on remote ({remote_ref}); creating new branch from base instead</>"
))?;
- crate::output::hint(format!(
- "{HINT}Use 'wt switch {resolved_branch}' (without --create) to switch to the remote branch{HINT:#}"
+ crate::output::hint(cformat!(
+ "<dim>Use 'wt switch {resolved_branch}' (without --create) to switch to the remote branch</>"
))?;
}
}
// Check if base flag was provided without create flag
if resolved_base.is_some() && !create {
- crate::output::warning(format!(
- "{WARNING}--base flag is only used with --create, ignoring{WARNING:#}"
+ crate::output::warning(cformat!(
+ "<yellow>--base flag is only used with --create, ignoring</>"
))?;
}
@@ -446,9 +444,7 @@ pub fn handle_remove(
// Show progress (unless running in background - output handler will show command)
if !background {
- let progress_msg = format!(
- "{CYAN}Removing worktree for {CYAN_BOLD}{worktree_name}{CYAN_BOLD:#}{CYAN}...{CYAN:#}"
- );
+ let progress_msg = cformat!("<cyan>Removing worktree for <bold>{worktree_name}</>...</>");
crate::output::progress(progress_msg)?;
}
@@ -607,8 +603,6 @@ pub fn handle_push(
"Pushing"
};
- let cyan_dim = CYAN.dimmed();
-
// Build parenthetical showing which operations didn't happen and flags used
let mut notes = Vec::new();
@@ -638,8 +632,8 @@ pub fn handle_push(
format!(" ({})", notes.join(", "))
};
- crate::output::progress(format!(
- "{CYAN}{verb_ing} {commit_count} {commit_text} to {CYAN_BOLD}{target_branch}{CYAN_BOLD:#}{CYAN} @ {cyan_dim}{head_sha}{cyan_dim:#}{CYAN}{operations_note}{CYAN:#}"
+ crate::output::progress(cformat!(
+ "<cyan>{verb_ing} {commit_count} {commit_text} to <bold>{target_branch}</> @ <dim>{head_sha}</>{operations_note}</>"
))?;
// Show the commit graph with color
@@ -692,14 +686,11 @@ pub fn handle_push(
)];
summary_parts.extend(stats_summary);
- crate::output::success(format!(
- "{GREEN}{verb} {GREEN_BOLD}{target_branch}{GREEN_BOLD:#}{GREEN} ({}){GREEN:#}",
+ crate::output::success(cformat!(
+ "<green>{verb} <bold>{target_branch}</> ({})</>",
summary_parts.join(", ")
))?;
} else {
- // No commits to push - state description without action verb
- let bold = AnstyleStyle::new().bold();
-
// For merge workflow context, explain why nothing was pushed
let context = if let Some(ops) = operations {
let mut notes = Vec::new();
@@ -719,8 +710,8 @@ pub fn handle_push(
};
// No action: nothing was pushed, just acknowledging state
- crate::output::info(format!(
- "Already up to date with {bold}{target_branch}{bold:#}{context}"
+ crate::output::info(cformat!(
+ "Already up to date with <bold>{target_branch}</>{context}"
))?;
}
diff --git a/src/git/error.rs b/src/git/error.rs
index 731207168..b247d8cdc 100644
--- a/src/git/error.rs
+++ b/src/git/error.rs
@@ -11,11 +11,11 @@
use std::path::PathBuf;
+use color_print::cwrite;
+
use super::HookType;
use crate::path::format_path_for_display;
-use crate::styling::{
- ERROR, ERROR_BOLD, ERROR_EMOJI, HINT, HINT_BOLD, HINT_EMOJI, INFO_EMOJI, format_with_gutter,
-};
+use crate::styling::{ERROR_EMOJI, HINT_EMOJI, INFO_EMOJI, format_with_gutter};
/// Domain errors for git and worktree operations.
///
@@ -119,9 +119,9 @@ impl std::fmt::Display for GitError {
Some(action) => format!("Cannot {action}: not on a branch (detached HEAD)"),
None => "Not on a branch (detached HEAD)".to_string(),
};
- write!(
+ cwrite!(
f,
- "{ERROR_EMOJI} {ERROR}{message}{ERROR:#}\n\n{HINT_EMOJI} {HINT}Switch to a branch first with 'git switch <branch>'{HINT:#}"
+ "{ERROR_EMOJI} <red>{message}</>\n\n{HINT_EMOJI} <dim>Switch to a branch first with 'git switch <<branch>>'</>"
)
}
@@ -132,30 +132,30 @@ impl std::fmt::Display for GitError {
}
None => "Working tree has uncommitted changes".to_string(),
};
- write!(
+ cwrite!(
f,
- "{ERROR_EMOJI} {ERROR}{message}{ERROR:#}\n\n{HINT_EMOJI} {HINT}Commit or stash them first{HINT:#}"
+ "{ERROR_EMOJI} <red>{message}</>\n\n{HINT_EMOJI} <dim>Commit or stash them first</>"
)
}
GitError::BranchAlreadyExists { branch } => {
- write!(
+ cwrite!(
f,
- "{ERROR_EMOJI} {ERROR}Branch {ERROR_BOLD}{branch}{ERROR_BOLD:#}{ERROR} already exists{ERROR:#}\n\n{HINT_EMOJI} {HINT}Remove --create flag to switch to it{HINT:#}"
+ "{ERROR_EMOJI} <red>Branch <bold>{branch}</> already exists</>\n\n{HINT_EMOJI} <dim>Remove --create flag to switch to it</>"
)
}
GitError::WorktreeMissing { branch } => {
- write!(
+ cwrite!(
f,
- "{ERROR_EMOJI} {ERROR}Worktree directory missing for {ERROR_BOLD}{branch}{ERROR_BOLD:#}{ERROR:#}\n\n{HINT_EMOJI} {HINT}Run 'git worktree prune' to clean up{HINT:#}"
+ "{ERROR_EMOJI} <red>Worktree directory missing for <bold>{branch}</></>\n\n{HINT_EMOJI} <dim>Run 'git worktree prune' to clean up</>"
)
}
GitError::NoWorktreeFound { branch } => {
- write!(
+ cwrite!(
f,
- "{ERROR_EMOJI} {ERROR}No worktree found for branch {ERROR_BOLD}{branch}{ERROR_BOLD:#}{ERROR:#}"
+ "{ERROR_EMOJI} <red>No worktree found for branch <bold>{branch}</></>"
)
}
@@ -164,23 +164,22 @@ impl std::fmt::Display for GitError {
path,
occupant,
} => {
+ let path_display = format_path_for_display(path);
let occupant_note = occupant
.as_ref()
- .map(|b| format!(" (currently on {HINT_BOLD}{b}{HINT_BOLD:#}{HINT})"))
+ .map(|b| format!(" (currently on <bold>{b}</>)"))
.unwrap_or_default();
- write!(
+ cwrite!(
f,
- "{ERROR_EMOJI} {ERROR}Cannot create worktree for {ERROR_BOLD}{branch}{ERROR_BOLD:#}{ERROR}: target path already exists{ERROR:#}\n\n{HINT_EMOJI} {HINT}Reuse the existing worktree at {}{} or remove it before retrying{HINT:#}",
- format_path_for_display(path),
- occupant_note
+ "{ERROR_EMOJI} <red>Cannot create worktree for <bold>{branch}</>: target path already exists</>\n\n{HINT_EMOJI} <dim>Reuse the existing worktree at {path_display}{occupant_note} or remove it before retrying</>"
)
}
GitError::WorktreePathExists { path } => {
- write!(
+ let path_display = format_path_for_display(path);
+ cwrite!(
f,
- "{ERROR_EMOJI} {ERROR}Directory already exists: {ERROR_BOLD}{}{ERROR_BOLD:#}{ERROR:#}\n\n{HINT_EMOJI} {HINT}Remove the directory or use a different branch name{HINT:#}",
- format_path_for_display(path)
+ "{ERROR_EMOJI} <red>Directory already exists: <bold>{path_display}</></>\n\n{HINT_EMOJI} <dim>Remove the directory or use a different branch name</>"
)
}
@@ -189,14 +188,13 @@ impl std::fmt::Display for GitError {
base_branch,
error,
} => {
+ use color_print::cformat;
let base_suffix = base_branch
.as_ref()
- .map(|base| {
- format!("{ERROR} from base {ERROR_BOLD}{base}{ERROR_BOLD:#}{ERROR}")
- })
+ .map(|base| format!(" from base <bold>{base}</>"))
.unwrap_or_default();
- let header = format!(
- "{ERROR_EMOJI} {ERROR}Failed to create worktree for {ERROR_BOLD}{branch}{ERROR_BOLD:#}{base_suffix}{ERROR:#}"
+ let header = cformat!(
+ "{ERROR_EMOJI} <red>Failed to create worktree for <bold>{branch}</>{base_suffix}</>"
);
write!(f, "{}", format_error_block(header, error))
}
@@ -206,9 +204,10 @@ impl std::fmt::Display for GitError {
path,
error,
} => {
- let header = format!(
- "{ERROR_EMOJI} {ERROR}Failed to remove worktree for {ERROR_BOLD}{branch}{ERROR_BOLD:#}{ERROR} at {ERROR_BOLD}{}{ERROR_BOLD:#}{ERROR:#}",
- format_path_for_display(path)
+ use color_print::cformat;
+ let path_display = format_path_for_display(path);
+ let header = cformat!(
+ "{ERROR_EMOJI} <red>Failed to remove worktree for <bold>{branch}</> at <bold>{path_display}</></>"
);
write!(f, "{}", format_error_block(header, error))
}
@@ -217,18 +216,18 @@ impl std::fmt::Display for GitError {
files,
worktree_path,
} => {
- write!(
+ cwrite!(
f,
- "{ERROR_EMOJI} {ERROR}Cannot push: conflicting uncommitted changes in:{ERROR:#}\n\n"
+ "{ERROR_EMOJI} <red>Cannot push: conflicting uncommitted changes in:</>\n\n"
)?;
if !files.is_empty() {
let joined_files = files.join("\n");
write!(f, "{}", format_with_gutter(&joined_files, "", None))?;
}
- write!(
+ let path_display = format_path_for_display(worktree_path);
+ cwrite!(
f,
- "\n{HINT_EMOJI} {HINT}Commit or stash these changes in {} first{HINT:#}",
- format_path_for_display(worktree_path)
+ "\n{HINT_EMOJI} <dim>Commit or stash these changes in {path_display} first</>"
)
}
@@ -237,9 +236,9 @@ impl std::fmt::Display for GitError {
commits_formatted,
in_merge_context,
} => {
- write!(
+ cwrite!(
f,
- "{ERROR_EMOJI} {ERROR}Can't push to local {ERROR_BOLD}{target_branch}{ERROR_BOLD:#}{ERROR} branch: it has newer commits{ERROR:#}"
+ "{ERROR_EMOJI} <red>Can't push to local <bold>{target_branch}</> branch: it has newer commits</>"
)?;
if !commits_formatted.is_empty() {
write!(f, "\n{}", format_with_gutter(commits_formatted, "", None))?;
@@ -250,13 +249,13 @@ impl std::fmt::Display for GitError {
} else {
format!("Use 'wt step rebase' or 'wt merge' to rebase onto {target_branch}")
};
- write!(f, "\n{HINT_EMOJI} {HINT}{hint}{HINT:#}")
+ cwrite!(f, "\n{HINT_EMOJI} <dim>{hint}</>")
}
GitError::MergeCommitsFound => {
- write!(
+ cwrite!(
f,
- "{ERROR_EMOJI} {ERROR}Found merge commits in push range{ERROR:#}\n\n{HINT_EMOJI} {HINT}Use --allow-merge-commits to push non-linear history{HINT:#}"
+ "{ERROR_EMOJI} <red>Found merge commits in push range</>\n\n{HINT_EMOJI} <dim>Use --allow-merge-commits to push non-linear history</>"
)
}
@@ -264,35 +263,37 @@ impl std::fmt::Display for GitError {
target_branch,
git_output,
} => {
- write!(
+ cwrite!(
f,
- "{ERROR_EMOJI} {ERROR}Rebase onto {ERROR_BOLD}{target_branch}{ERROR_BOLD:#}{ERROR} incomplete{ERROR:#}"
+ "{ERROR_EMOJI} <red>Rebase onto <bold>{target_branch}</> incomplete</>"
)?;
if !git_output.is_empty() {
write!(f, "\n{}", format_with_gutter(git_output, "", None))
} else {
- write!(
+ cwrite!(
f,
- "\n\n{HINT_EMOJI} {HINT}Resolve conflicts and run 'git rebase --continue'{HINT:#}\n{HINT_EMOJI} {HINT}Or abort with 'git rebase --abort'{HINT:#}"
+ "\n\n{HINT_EMOJI} <dim>Resolve conflicts and run 'git rebase --continue'</>\n{HINT_EMOJI} <dim>Or abort with 'git rebase --abort'</>"
)
}
}
GitError::PushFailed { error } => {
- let header = format!("{ERROR_EMOJI} {ERROR}Push failed{ERROR:#}");
+ use color_print::cformat;
+ let header = cformat!("{ERROR_EMOJI} <red>Push failed</>");
write!(f, "{}", format_error_block(header, error))
}
GitError::NotInteractive => {
- write!(
+ cwrite!(
f,
- "{ERROR_EMOJI} {ERROR}Cannot prompt for approval in non-interactive environment{ERROR:#}\n\n{HINT_EMOJI} {HINT}In CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'{HINT:#}"
+ "{ERROR_EMOJI} <red>Cannot prompt for approval in non-interactive environment</>\n\n{HINT_EMOJI} <dim>In CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'</>"
)
}
GitError::LlmCommandFailed { command, error } => {
+ use color_print::cformat;
let error_header =
- format!("{ERROR_EMOJI} {ERROR}Commit generation command failed{ERROR:#}");
+ cformat!("{ERROR_EMOJI} <red>Commit generation command failed</>");
let error_block = format_error_block(error_header, error);
let command_gutter = format_with_gutter(command, "", None);
write!(
@@ -304,15 +305,15 @@ impl std::fmt::Display for GitError {
}
GitError::ProjectConfigNotFound { config_path } => {
- write!(
+ let path_display = format_path_for_display(config_path);
+ cwrite!(
f,
- "{ERROR_EMOJI} {ERROR}No project configuration found{ERROR:#}\n\n{HINT_EMOJI} {HINT}Create a config file at: {HINT_BOLD}{}{HINT_BOLD:#}{HINT:#}",
- format_path_for_display(config_path)
+ "{ERROR_EMOJI} <red>No project configuration found</>\n\n{HINT_EMOJI} <dim>Create a config file at: <bold>{path_display}</></>"
)
}
GitError::ParseError { message } | GitError::Other { message } => {
- write!(f, "{ERROR_EMOJI} {ERROR}{message}{ERROR:#}")
+ cwrite!(f, "{ERROR_EMOJI} <red>{message}</>")
}
}
}
@@ -341,7 +342,7 @@ impl std::fmt::Display for WorktrunkError {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
match self {
WorktrunkError::ChildProcessExited { message, .. } => {
- write!(f, "{ERROR_EMOJI} {ERROR}{message}{ERROR:#}")
+ cwrite!(f, "{ERROR_EMOJI} <red>{message}</>")
}
WorktrunkError::HookCommandFailed {
hook_type,
@@ -349,15 +350,17 @@ impl std::fmt::Display for WorktrunkError {
error,
..
} => {
- let name_suffix = command_name
- .as_ref()
- .map(|n| format!(": {ERROR_BOLD}{n}{ERROR_BOLD:#}{ERROR}"))
- .unwrap_or_default();
-
- write!(
- f,
- "{ERROR_EMOJI} {ERROR}{hook_type} command failed{name_suffix}: {error}{ERROR:#}\n\n{HINT_EMOJI} {HINT}Use --no-verify to skip {hook_type} commands{HINT:#}"
- )
+ if let Some(name) = command_name {
+ cwrite!(
+ f,
+ "{ERROR_EMOJI} <red>{hook_type} command failed: <bold>{name}</>: {error}</>\n\n{HINT_EMOJI} <dim>Use --no-verify to skip {hook_type} commands</>"
+ )
+ } else {
+ cwrite!(
+ f,
+ "{ERROR_EMOJI} <red>{hook_type} command failed: {error}</>\n\n{HINT_EMOJI} <dim>Use --no-verify to skip {hook_type} commands</>"
+ )
+ }
}
WorktrunkError::CommandNotApproved => {
Ok(()) // on_skip callback handles the printing
diff --git a/src/main.rs b/src/main.rs
index 06dfbed10..40db028b4 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,11 +1,11 @@
-use anstyle::Style;
use anyhow::Context;
use clap::FromArgMatches;
+use color_print::cformat;
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::{HINT, format_with_gutter, println};
+use worktrunk::styling::{format_with_gutter, println};
mod cli;
mod commands;
@@ -161,7 +161,6 @@ fn main() {
env_logger::Env::default().default_filter_or(if cli.verbose { "debug" } else { "off" }),
)
.format(|buf, record| {
- use anstyle::Style;
use std::io::Write;
let msg = record.args().to_string();
@@ -183,31 +182,30 @@ fn main() {
})
.unwrap_or('?');
- let dim = Style::new().dimmed();
-
// Commands start with $, make only the command bold (not $ or [worktree])
if let Some(rest) = msg.strip_prefix("$ ") {
- let bold = Style::new().bold();
-
// Split: "git command [worktree]" -> ("git command", " [worktree]")
if let Some(bracket_pos) = rest.find(" [") {
let command = &rest[..bracket_pos];
let worktree = &rest[bracket_pos..];
writeln!(
buf,
- "{dim}[{thread_num}]{dim:#} $ {bold}{command}{bold:#}{worktree}"
+ "{}",
+ cformat!("<dim>[{thread_num}]</> $ <bold>{command}</>{worktree}")
)
} else {
- writeln!(buf, "{dim}[{thread_num}]{dim:#} $ {bold}{rest}{bold:#}")
+ writeln!(
+ buf,
+ "{}",
+ cformat!("<dim>[{thread_num}]</> $ <bold>{rest}</>")
+ )
}
} else if msg.starts_with(" ! ") {
// Error output - show in red
- use anstyle::{AnsiColor, Color};
- let red = Style::new().fg_color(Some(Color::Ansi(AnsiColor::Red)));
- writeln!(buf, "{dim}[{thread_num}]{dim:#} {red}{msg}{red:#}")
+ writeln!(buf, "{}", cformat!("<dim>[{thread_num}]</> <red>{msg}</>"))
} else {
// Regular output with thread ID
- writeln!(buf, "{dim}[{thread_num}]{dim:#} {msg}")
+ writeln!(buf, "{}", cformat!("<dim>[{thread_num}]</> {msg}"))
}
})
.init();
@@ -246,7 +244,6 @@ fn main() {
.count();
// Show configured shells grouped with their completions
- let bold = Style::new().bold();
for result in &scan_result.configured {
let shell = result.shell;
let path = format_path_for_display(&result.path);
@@ -256,8 +253,8 @@ fn main() {
} else {
"shell extension"
};
- let message = format!(
- "{} {what} for {bold}{shell}{bold:#} @ {bold}{path}{bold:#}",
+ let message = cformat!(
+ "{} {what} for <bold>{shell}</> @ <bold>{path}</>",
result.action.description()
);
@@ -282,8 +279,8 @@ fn main() {
// as meaningful to show, but the asymmetry is confusing.
if let Some(comp_result) = scan_result.completion_results.iter().find(|r| r.shell == shell) {
let comp_path = format_path_for_display(&comp_result.path);
- let comp_message = format!(
- "{} completions for {bold}{shell}{bold:#} @ {bold}{comp_path}{bold:#}",
+ let comp_message = cformat!(
+ "{} completions for <bold>{shell}</> @ <bold>{comp_path}</>",
comp_result.action.description()
);
match comp_result.action {
@@ -303,8 +300,8 @@ fn main() {
// Show skipped shells
for (shell, path) in &scan_result.skipped {
let path = format_path_for_display(path);
- crate::output::hint(format!(
- "{HINT}Skipped {bold}{shell}{bold:#}; {path} not found{HINT:#}"
+ crate::output::hint(cformat!(
+ "<dim>Skipped <bold>{shell}</>; {path} not found</>"
))?;
}
@@ -353,11 +350,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(format!("{HINT}Restart shell to activate{HINT:#}"))?;
+ crate::output::hint(cformat!("<dim>Restart shell to activate</>"))?;
} else {
let path = format_path_for_display(&result.path);
- crate::output::hint(format!(
- "{HINT}Restart shell or run: source {path}{HINT:#}"
+ crate::output::hint(cformat!(
+ "<dim>Restart shell or run: source {path}</>"
))?;
}
}
@@ -376,30 +373,32 @@ fn main() {
// Show shell extension results
for result in &scan_result.results {
- let bold = Style::new().bold();
let shell = result.shell;
let path = format_path_for_display(&result.path);
// For bash/zsh, completions are inline in the init script
- let what = if matches!(shell, worktrunk::shell::Shell::Bash | worktrunk::shell::Shell::Zsh) {
+ let what = if matches!(
+ shell,
+ worktrunk::shell::Shell::Bash
+ | worktrunk::shell::Shell::Zsh
+ ) {
"shell extension & completions"
} else {
"shell extension"
};
- crate::output::success(format!(
- "{} {what} for {bold}{shell}{bold:#} @ {bold}{path}{bold:#}",
+ crate::output::success(cformat!(
+ "{} {what} for <bold>{shell}</> @ <bold>{path}</>",
result.action.description(),
))?;
}
// Show completion results
for result in &scan_result.completion_results {
- let bold = Style::new().bold();
let shell = result.shell;
let path = format_path_for_display(&result.path);
- crate::output::success(format!(
- "{} completions for {bold}{shell}{bold:#} @ {bold}{path}{bold:#}",
+ crate::output::success(cformat!(
+ "{} completions for <bold>{shell}</> @ <bold>{path}</>",
result.action.description(),
))?;
}
@@ -408,7 +407,11 @@ fn main() {
for (shell, path) in &scan_result.not_found {
let path = format_path_for_display(path);
// Use consistent terminology matching install/uninstall messages
- let what = if matches!(shell, worktrunk::shell::Shell::Bash | worktrunk::shell::Shell::Zsh) {
+ let what = if matches!(
+ shell,
+ worktrunk::shell::Shell::Bash
+ | worktrunk::shell::Shell::Zsh
+ ) {
"shell extension & completions"
} else {
"shell extension"
@@ -418,8 +421,8 @@ fn main() {
"No {what} found in {path}"
))?;
} else {
- crate::output::hint(format!(
- "{HINT}No {shell} {what} in {path}{HINT:#}"
+ crate::output::hint(cformat!(
+ "<dim>No {shell} {what} in {path}</>"
))?;
}
}
@@ -428,7 +431,8 @@ fn main() {
// Only show this if the shell extension was ALSO not found - if we removed
// the shell extension, no need to warn about missing completions
for (shell, path) in &scan_result.completion_not_found {
- let shell_was_removed = scan_result.results.iter().any(|r| r.shell == *shell);
+ let shell_was_removed =
+ scan_result.results.iter().any(|r| r.shell == *shell);
if shell_was_removed {
continue; // Shell extension was removed, don't warn about completions
}
@@ -438,19 +442,20 @@ fn main() {
"No completions found in {path}"
))?;
} else {
- crate::output::hint(format!(
- "{HINT}No {shell} completions in {path}{HINT:#}"
+ crate::output::hint(cformat!(
+ "<dim>No {shell} completions in {path}</>"
))?;
}
}
// Exit with info if nothing was found
- let all_not_found = scan_result.not_found.len() + scan_result.completion_not_found.len();
+ let all_not_found = scan_result.not_found.len()
+ + scan_result.completion_not_found.len();
if total_changes == 0 {
if all_not_found == 0 {
crate::output::blank()?;
- crate::output::hint(format!(
- "{HINT}No shell integration found to remove{HINT:#}"
+ crate::output::hint(cformat!(
+ "<dim>No shell integration found to remove</>"
))?;
}
return Ok(());
@@ -468,14 +473,17 @@ fn main() {
.ok()
.and_then(|s| s.rsplit('/').next().map(String::from));
- let current_shell_affected = current_shell.as_ref().is_some_and(|shell_name| {
- scan_result.results.iter().any(|r| {
- r.shell.to_string().eq_ignore_ascii_case(shell_name)
- })
- });
+ let current_shell_affected =
+ current_shell.as_ref().is_some_and(|shell_name| {
+ scan_result.results.iter().any(|r| {
+ r.shell.to_string().eq_ignore_ascii_case(shell_name)
+ })
+ });
if current_shell_affected {
- crate::output::hint(format!("{HINT}Restart shell to complete uninstall{HINT:#}"))?;
+ crate::output::hint(cformat!(
+ "<dim>Restart shell to complete uninstall</>"
+ ))?;
}
Ok(())
})
@@ -791,7 +799,7 @@ fn main() {
let _ = output::terminate_output();
if let Err(e) = result {
- use worktrunk::styling::{ERROR, ERROR_EMOJI};
+ use worktrunk::styling::ERROR_EMOJI;
// GitError and WorktrunkError produce styled output via Display
if let Some(err) = e.downcast_ref::<worktrunk::git::GitError>() {
@@ -802,7 +810,7 @@ fn main() {
// Anyhow error - format with emoji, multi-line root cause gets gutter
let msg = e.to_string();
let root_cause = e.root_cause().to_string();
- let _ = output::print(format!("{ERROR_EMOJI} {ERROR}{msg}{ERROR:#}"));
+ let _ = output::print(cformat!("{ERROR_EMOJI} <red>{msg}</>"));
if msg != root_cause && root_cause.contains('\n') {
let _ = output::gutter(format_with_gutter(&root_cause, "", None));
}
diff --git a/src/output/handlers.rs b/src/output/handlers.rs
index 916da22b0..c82c99f93 100644
--- a/src/output/handlers.rs
+++ b/src/output/handlers.rs
@@ -1,14 +1,14 @@
//! Output handlers for worktree operations using the global output context
+use color_print::cformat;
+
use crate::commands::process::spawn_detached;
use crate::commands::worktree::{RemoveResult, SwitchResult};
use worktrunk::git::GitError;
use worktrunk::git::Repository;
use worktrunk::path::format_path_for_display;
use worktrunk::shell::Shell;
-use worktrunk::styling::{
- CYAN, CYAN_BOLD, GREEN, GREEN_BOLD, WARNING, WARNING_BOLD, format_with_gutter,
-};
+use worktrunk::styling::format_with_gutter;
/// Check if a branch's content has been integrated into the target.
///
@@ -63,8 +63,8 @@ fn handle_branch_deletion_result(
Ok(true) => Ok(true),
Ok(false) => {
// Branch not integrated - show warning
- super::warning(format!(
- "{WARNING}Could not delete branch {WARNING_BOLD}{branch_name}{WARNING_BOLD:#}{WARNING:#}"
+ super::warning(cformat!(
+ "<yellow>Could not delete branch <bold>{branch_name}</></>"
))?;
super::gutter(format_with_gutter(
&format!("error: the branch '{}' is not fully merged", branch_name),
@@ -75,8 +75,8 @@ fn handle_branch_deletion_result(
}
Err(e) => {
// Git command failed - show warning with error details
- super::warning(format!(
- "{WARNING}Could not delete branch {WARNING_BOLD}{branch_name}{WARNING_BOLD:#}{WARNING:#}"
+ super::warning(cformat!(
+ "<yellow>Could not delete branch <bold>{branch_name}</></>"
))?;
super::gutter(format_with_gutter(&e.to_string(), "", None))?;
Ok(false)
@@ -119,30 +119,26 @@ fn format_remove_worktree_message(
let branch_display = branch.or(Some(branch_name));
+ let path_display = format_path_for_display(main_path);
+
if changed_directory {
if let Some(b) = branch_display {
- // Re-establish GREEN after each green_bold reset to prevent color leak
- format!(
- "{GREEN}{action} for {GREEN_BOLD}{b}{GREEN_BOLD:#}{GREEN}, changed directory to {GREEN_BOLD}{}{GREEN_BOLD:#}{GREEN}{flag_note}{GREEN:#}",
- format_path_for_display(main_path)
+ cformat!(
+ "<green>{action} for <bold>{b}</>, changed directory to <bold>{path_display}</>{flag_note}</>"
)
} else {
- format!(
- "{GREEN}{action}, changed directory to {GREEN_BOLD}{}{GREEN_BOLD:#}{GREEN}{flag_note}{GREEN:#}",
- format_path_for_display(main_path)
- )
+ cformat!("<green>{action}, changed directory to <bold>{path_display}</>{flag_note}</>")
}
} else if let Some(b) = branch_display {
- format!("{GREEN}{action} for {GREEN_BOLD}{b}{GREEN_BOLD:#}{GREEN}{flag_note}{GREEN:#}")
+ cformat!("<green>{action} for <bold>{b}</>{flag_note}</>")
} else {
- format!("{GREEN}{action}{flag_note}{GREEN:#}")
+ cformat!("<green>{action}{flag_note}</>")
}
}
/// 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:#}")
+ cformat!("<dim>Run `wt config shell install` to enable automatic cd</>")
}
/// Handle output for a switch operation
@@ -162,9 +158,8 @@ pub fn handle_switch_output(
match result {
SwitchResult::AlreadyAt(path) => {
// Already at target - show info, no hint needed
- let bold = worktrunk::styling::AnstyleStyle::new().bold();
- super::info(format!(
- "Already on worktree for {bold}{branch}{bold:#} at {bold}{}{bold:#}",
+ super::info(cformat!(
+ "Already on worktree for <bold>{branch}</> at <bold>{}</>",
format_path_for_display(path)
))?;
}
@@ -179,9 +174,9 @@ pub fn handle_switch_output(
))?;
} else {
// Shell integration not configured - show warning and setup hint
- super::warning(format!(
- "{WARNING}Worktree for {WARNING_BOLD}{branch}{WARNING_BOLD:#}{WARNING} at {WARNING_BOLD}{}{WARNING_BOLD:#}{WARNING}; cannot cd (no shell integration){WARNING:#}",
- format_path_for_display(path)
+ let path_display = format_path_for_display(path);
+ super::warning(cformat!(
+ "<yellow>Worktree for <bold>{branch}</> at <bold>{path_display}</>; cannot cd (no shell integration)</>"
))?;
super::shell_integration_hint(shell_integration_hint())?;
}
@@ -215,10 +210,10 @@ pub fn handle_switch_output(
/// Execute the --execute command after hooks have run
pub fn execute_user_command(command: &str) -> anyhow::Result<()> {
- use worktrunk::styling::{CYAN, format_bash_with_gutter};
+ use worktrunk::styling::format_bash_with_gutter;
// Show what command is being executed (section header + gutter content)
- super::progress(format!("{CYAN}Executing (--execute):{CYAN:#}"))?;
+ super::progress(cformat!("<cyan>Executing (--execute):</>"))?;
super::gutter(format_bash_with_gutter(command, ""))?;
super::execute(command)?;
@@ -303,11 +298,9 @@ fn handle_branch_only_output(
no_delete_branch: bool,
force_delete: bool,
) -> anyhow::Result<()> {
- use worktrunk::styling::GRAY;
-
// Show info message that no worktree was found
- super::info(format!(
- "{GRAY}No worktree found for branch {branch_name}{GRAY:#}"
+ super::info(cformat!(
+ "<bright-black>No worktree found for branch {branch_name}</>"
))?;
// Attempt branch deletion (unless --no-delete-branch was specified)
@@ -327,8 +320,8 @@ fn handle_branch_only_output(
} else {
""
};
- super::success(format!(
- "{GREEN}Removed branch {GREEN_BOLD}{branch_name}{GREEN_BOLD:#}{GREEN}{flag_note}{GREEN:#}"
+ super::success(cformat!(
+ "<green>Removed branch <bold>{branch_name}</>{flag_note}</>"
))?;
}
@@ -375,22 +368,20 @@ fn handle_removed_worktree_output(
// Show progress message based on what we'll do
let action = if no_delete_branch {
- format!(
- "{CYAN}Removing {CYAN_BOLD}{branch_name}{CYAN_BOLD:#}{CYAN} worktree in background; retaining branch (--no-delete-branch){CYAN:#}"
+ cformat!(
+ "<cyan>Removing <bold>{branch_name}</> worktree in background; retaining branch (--no-delete-branch)</>"
)
} else if should_delete_branch {
if force_delete {
- format!(
- "{CYAN}Removing {CYAN_BOLD}{branch_name}{CYAN_BOLD:#}{CYAN} worktree & branch in background (--force-delete){CYAN:#}"
+ cformat!(
+ "<cyan>Removing <bold>{branch_name}</> worktree & branch in background (--force-delete)</>"
)
} else {
- format!(
- "{CYAN}Removing {CYAN_BOLD}{branch_name}{CYAN_BOLD:#}{CYAN} worktree & branch in background{CYAN:#}"
- )
+ cformat!("<cyan>Removing <bold>{branch_name}</> worktree & branch in background</>")
}
} else {
- format!(
- "{CYAN}Removing {CYAN_BOLD}{branch_name}{CYAN_BOLD:#}{CYAN} worktree in background; retaining unmerged branch{CYAN:#}"
+ cformat!(
+ "<cyan>Removing <bold>{branch_name}</> worktree in background; retaining unmerged branch</>"
)
};
super::progress(action)?;
diff --git a/src/output/mod.rs b/src/output/mod.rs
index 394a64ac9..a127932ce 100644
--- a/src/output/mod.rs
+++ b/src/output/mod.rs
@@ -72,6 +72,7 @@ pub use handlers::{
execute_command_in_worktree, execute_user_command, handle_remove_output, handle_switch_output,
};
+use color_print::cformat;
use std::path::Path;
use worktrunk::path::format_path_for_display;
@@ -87,8 +88,6 @@ pub(crate) fn format_switch_success_message(
base_branch: Option<&str>,
from_remote: Option<&str>,
) -> String {
- use worktrunk::styling::{GREEN, GREEN_BOLD};
-
// Determine action and source based on how the worktree was created
// Priority: explicit --create > DWIM from remote > existing local branch
let (action, source) = if created_branch {
@@ -99,14 +98,13 @@ pub(crate) fn format_switch_success_message(
("Switched to worktree for", None)
};
- // Re-establish GREEN after each green_bold reset to prevent color leak
match source {
- Some(src) => format!(
- "{GREEN}{action} {GREEN_BOLD}{branch}{GREEN_BOLD:#}{GREEN} from {GREEN_BOLD}{src}{GREEN_BOLD:#}{GREEN} at {GREEN_BOLD}{}{GREEN_BOLD:#}{GREEN:#}",
+ Some(src) => cformat!(
+ "<green>{action} <bold>{branch}</> from <bold>{src}</> at <bold>{}</></>",
format_path_for_display(path)
),
- None => format!(
- "{GREEN}{action} {GREEN_BOLD}{branch}{GREEN_BOLD:#}{GREEN} at {GREEN_BOLD}{}{GREEN_BOLD:#}{GREEN:#}",
+ None => cformat!(
+ "<green>{action} <bold>{branch}</> at <bold>{}</></>",
format_path_for_display(path)
),
}
diff --git a/src/styling/constants.rs b/src/styling/constants.rs
index 11bc89651..c301c1c43 100644
--- a/src/styling/constants.rs
+++ b/src/styling/constants.rs
@@ -1,33 +1,71 @@
//! Style constants and emojis for terminal output
//!
-//! Provides semantic constants for consistent styling across the codebase.
+//! # Two Styling Approaches
+//!
+//! This codebase uses two complementary styling approaches:
+//!
+//! ## 1. `color-print` for format strings (preferred for messages)
+//!
+//! Use `cformat!` with HTML-like tags for user-facing messages. Nesting is automatic:
+//!
+//! ```rust,ignore
+//! use color_print::cformat;
+//!
+//! // Simple styling
+//! cformat!("<green>Success message</>")
+//!
+//! // Nested styles - bold inherits green, nesting "just works"
+//! cformat!("<green>Removed branch <bold>{branch}</> successfully</>")
+//!
+//! // Semantic mapping:
+//! // - Errors: <red>...</>
+//! // - Warnings: <yellow>...</>
+//! // - Hints: <dim>...</>
+//! // - Progress: <cyan>...</>
+//! // - Success: <green>...</>
+//! ```
+//!
+//! ## 2. `anstyle` for programmatic styling
+//!
+//! Use `Style` constants for `StyledLine`, table rendering, and computed styles.
+//!
+//! # Semantic Color Reference
+//!
+//! | Semantic | color-print tag | anstyle constant |
+//! |----------|-----------------|------------------|
+//! | Error | `<red>` | `ERROR` |
+//! | Warning | `<yellow>` | `WARNING` |
+//! | Hint | `<dim>` | `HINT` |
+//! | Progress | `<cyan>` | `CYAN` |
+//! | Success | `<green>` | `GREEN` |
+//! | Secondary | `<bright-black>` | `GRAY` |
use anstyle::{AnsiColor, Color, Style};
// ============================================================================
-// Semantic Style Constants
+// Semantic Style Constants (for programmatic use with StyledLine, etc.)
// ============================================================================
-/// Error style (red) - use as `{ERROR}text{ERROR:#}`
+/// Error style (red) - for programmatic use; prefer `<red>` in cformat!
pub const ERROR: Style = Style::new().fg_color(Some(Color::Ansi(AnsiColor::Red)));
-/// Error bold style (red + bold) - use as `{ERROR_BOLD}text{ERROR_BOLD:#}`
+/// Error bold style (red + bold) - for programmatic use
pub const ERROR_BOLD: Style = Style::new()
.fg_color(Some(Color::Ansi(AnsiColor::Red)))
.bold();
-/// Warning style (yellow) - use as `{WARNING}text{WARNING:#}`
+/// Warning style (yellow) - for programmatic use; prefer `<yellow>` in cformat!
pub const WARNING: Style = Style::new().fg_color(Some(Color::Ansi(AnsiColor::Yellow)));
-/// Warning bold style (yellow + bold) - use as `{WARNING_BOLD}text{WARNING_BOLD:#}`
+/// Warning bold style (yellow + bold) - for programmatic use
pub const WARNING_BOLD: Style = Style::new()
.fg_color(Some(Color::Ansi(AnsiColor::Yellow)))
.bold();
-/// Hint style (dimmed) - use as `{HINT}text{HINT:#}`
+/// Hint style (dimmed) - for programmatic use; prefer `<dim>` in cformat!
pub const HINT: Style = Style::new().dimmed();
-/// Hint bold style (dimmed + bold) - use as `{HINT_BOLD}text{HINT_BOLD:#}`
+/// Hint bold style (dimmed + bold) - for programmatic use
pub const HINT_BOLD: Style = Style::new().dimmed().bold();
/// Addition style for diffs (green)
@@ -36,23 +74,23 @@ pub const ADDITION: Style = Style::new().fg_color(Some(Color::Ansi(AnsiColor::Gr
/// Deletion style for diffs (red)
pub const DELETION: Style = Style::new().fg_color(Some(Color::Ansi(AnsiColor::Red)));
-/// Cyan style - use as `{CYAN}text{CYAN:#}`
+/// Cyan style - for programmatic use; prefer `<cyan>` in cformat!
pub const CYAN: Style = Style::new().fg_color(Some(Color::Ansi(AnsiColor::Cyan)));
-/// Cyan bold style - use as `{CYAN_BOLD}text{CYAN_BOLD:#}`
+/// Cyan bold style - for programmatic use
pub const CYAN_BOLD: Style = Style::new()
.fg_color(Some(Color::Ansi(AnsiColor::Cyan)))
.bold();
-/// Green style - use as `{GREEN}text{GREEN:#}`
+/// Green style - for programmatic use; prefer `<green>` in cformat!
pub const GREEN: Style = Style::new().fg_color(Some(Color::Ansi(AnsiColor::Green)));
-/// Green bold style - use as `{GREEN_BOLD}text{GREEN_BOLD:#}`
+/// Green bold style - for programmatic use
pub const GREEN_BOLD: Style = Style::new()
.fg_color(Some(Color::Ansi(AnsiColor::Green)))
.bold();
-/// Gray style for secondary/metadata text - use as `{GRAY}text{GRAY:#}`
+/// Gray style for secondary/metadata text - for programmatic use; prefer `<bright-black>` in cformat!
pub const GRAY: Style = Style::new().fg_color(Some(Color::Ansi(AnsiColor::BrightBlack)));
/// Gutter style for quoted content (commands, config, error details)
@@ -70,22 +108,22 @@ pub const GUTTER: Style = Style::new().bg_color(Some(Color::Ansi(AnsiColor::Brig
// Message Emojis
// ============================================================================
-/// Progress emoji - use with cyan style: `println!("{PROGRESS_EMOJI} {cyan}message{cyan:#}");`
+/// Progress emoji: `cprintln!("{PROGRESS_EMOJI} <cyan>message</>");`
pub const PROGRESS_EMOJI: &str = "🔄";
-/// Success emoji - use with GREEN style: `println!("{SUCCESS_EMOJI} {GREEN}message{GREEN:#}");`
+/// Success emoji: `cprintln!("{SUCCESS_EMOJI} <green>message</>");`
pub const SUCCESS_EMOJI: &str = "✅";
-/// Error emoji - use with ERROR style: `println!("{ERROR_EMOJI} {ERROR}message{ERROR:#}");`
+/// Error emoji: `cprintln!("{ERROR_EMOJI} <red>message</>");`
pub const ERROR_EMOJI: &str = "❌";
-/// Warning emoji - use with WARNING style: `println!("{WARNING_EMOJI} {WARNING}message{WARNING:#}");`
+/// Warning emoji: `cprintln!("{WARNING_EMOJI} <yellow>message</>");`
pub const WARNING_EMOJI: &str = "🟡";
-/// Hint emoji - use with HINT style: `println!("{HINT_EMOJI} {HINT}message{HINT:#}");`
+/// Hint emoji: `cprintln!("{HINT_EMOJI} <dim>message</>");`
pub const HINT_EMOJI: &str = "💡";
/// Info emoji - use for neutral status (primary status NOT dimmed, metadata may be dimmed)
/// Primary status: `output::info("All commands already approved")?;`
-/// Metadata: `println!("{INFO_EMOJI} {dim}Showing 5 worktrees...{dim:#}");`
+/// Metadata: `cprintln!("{INFO_EMOJI} <dim>Showing 5 worktrees...</>");`
pub const INFO_EMOJI: &str = "⚪";
diff --git a/tests/integration_tests/config_init.rs b/tests/integration_tests/config_init.rs
index 6240b0302..4c208e445 100644
--- a/tests/integration_tests/config_init.rs
+++ b/tests/integration_tests/config_init.rs
@@ -30,10 +30,10 @@ fn test_config_init_already_exists() {
----- stdout -----
----- stderr -----
- ⚪ Global config already exists: ~/.config/worktrunk/config.toml
+ ⚪ 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
+ 💡 Use 'wt config show' to view existing configuration
+ 💡 Use 'wt config create --help' for config format reference
");
});
}
@@ -59,9 +59,9 @@ fn test_config_init_creates_file() {
----- stdout -----
----- stderr -----
- ✅ Created config file: ~/.config/worktrunk/config.toml
+ ✅ Created config file: ~/.config/worktrunk/config.toml
- 💡 Edit this file to customize worktree paths and LLM settings
+ 💡 Edit this file to customize worktree paths and LLM settings
");
});
diff --git a/tests/integration_tests/config_show.rs b/tests/integration_tests/config_show.rs
index 81d7364d6..33d31d9ab 100644
--- a/tests/integration_tests/config_show.rs
+++ b/tests/integration_tests/config_show.rs
@@ -51,21 +51,21 @@ server = "npm run dev"
----- stdout -----
----- stderr -----
- ⚪ Global Config: ~/.config/worktrunk/config.toml
+ ⚪ Global Config: ~/.config/worktrunk/config.toml
  worktree-path = "../{{ main_worktree }}.{{ branch }}"
 
  [projects."test-project"]
  approved-commands = ["npm install"]
- ⚪ Project Config: [REPO]/.config/wt.toml
+ ⚪ Project Config: [REPO]/.config/wt.toml
  post-create = "npm install"
 
  [post-start]
  server = "npm run dev"
- ⚪ Skipped bash; ~/.bashrc not found
- ⚪ Skipped zsh; ~/.zshrc not found
- ⚪ Skipped fish; ~/.config/fish/conf.d not found
+ ⚪ Skipped bash; ~/.bashrc not found
+ ⚪ Skipped zsh; ~/.zshrc not found
+ ⚪ Skipped fish; ~/.config/fish/conf.d not found
"#);
});
}
@@ -99,15 +99,15 @@ fn test_config_show_no_project_config() {
----- stdout -----
----- stderr -----
- ⚪ Global Config: ~/.config/worktrunk/config.toml
+ ⚪ Global Config: ~/.config/worktrunk/config.toml
  worktree-path = "../{{ main_worktree }}.{{ branch }}"
- ⚪ Project Config: [REPO]/.config/wt.toml
- 💡 Not found
+ ⚪ Project Config: [REPO]/.config/wt.toml
+ 💡 Not found
- ⚪ Skipped bash; ~/.bashrc not found
- ⚪ Skipped zsh; ~/.zshrc not found
- ⚪ Skipped fish; ~/.config/fish/conf.d not found
+ ⚪ Skipped bash; ~/.bashrc not found
+ ⚪ Skipped zsh; ~/.zshrc not found
+ ⚪ Skipped fish; ~/.config/fish/conf.d not found
"#);
});
}
@@ -140,14 +140,14 @@ fn test_config_show_outside_git_repo() {
----- stdout -----
----- stderr -----
- ⚪ Global Config: ~/.config/worktrunk/config.toml
+ ⚪ Global Config: ~/.config/worktrunk/config.toml
  worktree-path = "../{{ main_worktree }}.{{ branch }}"
- ⚪ Project Config: Not in a git repository
+ ⚪ Project Config: Not in a git repository
- ⚪ Skipped bash; ~/.bashrc not found
- ⚪ Skipped zsh; ~/.zshrc not found
- ⚪ Skipped fish; ~/.config/fish/conf.d not found
+ ⚪ Skipped bash; ~/.bashrc not found
+ ⚪ Skipped zsh; ~/.zshrc not found
+ ⚪ Skipped fish; ~/.config/fish/conf.d not found
"#);
});
}
@@ -296,17 +296,17 @@ fn test_config_show_warns_unknown_project_keys() {
----- stdout -----
----- stderr -----
- ⚪ Global Config: ~/.config/worktrunk/config.toml
+ ⚪ Global Config: ~/.config/worktrunk/config.toml
  worktree-path = "../{{ main_worktree }}.{{ branch }}"
- ⚪ Project Config: [REPO]/.config/wt.toml
- 🟡 Unknown key post-merge-command will be ignored
+ ⚪ Project Config: [REPO]/.config/wt.toml
+ 🟡 Unknown key post-merge-command will be ignored
  [post-merge-command]
  deploy = "task deploy"
- ⚪ Skipped bash; ~/.bashrc not found
- ⚪ Skipped zsh; ~/.zshrc not found
- ⚪ Skipped fish; ~/.config/fish/conf.d not found
+ ⚪ Skipped bash; ~/.bashrc not found
+ ⚪ Skipped zsh; ~/.zshrc not found
+ ⚪ Skipped fish; ~/.config/fish/conf.d not found
"#);
});
}
@@ -339,19 +339,19 @@ fn test_config_show_warns_unknown_user_keys() {
----- stdout -----
----- stderr -----
- ⚪ Global Config: ~/.config/worktrunk/config.toml
- 🟡 Unknown key commit-gen will be ignored
+ ⚪ Global Config: ~/.config/worktrunk/config.toml
+ 🟡 Unknown key commit-gen will be ignored
  worktree-path = "../{{ main_worktree }}.{{ branch }}"
 
  [commit-gen]
  command = "llm"
- ⚪ Project Config: [REPO]/.config/wt.toml
- 💡 Not found
+ ⚪ Project Config: [REPO]/.config/wt.toml
+ 💡 Not found
- ⚪ Skipped bash; ~/.bashrc not found
- ⚪ Skipped zsh; ~/.zshrc not found
- ⚪ Skipped fish; ~/.config/fish/conf.d not found
+ ⚪ Skipped bash; ~/.bashrc not found
+ ⚪ Skipped zsh; ~/.zshrc not found
+ ⚪ Skipped fish; ~/.config/fish/conf.d not found
"#);
});
}
diff --git a/tests/integration_tests/config_status.rs b/tests/integration_tests/config_status.rs
index 24b3c7edd..192e44941 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.stderr), @"✅ 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.stderr), @"✅ 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.stderr), @"✅ 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.stderr), @"✅ 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.stderr), @"✅ Cleared 3 statuses");
+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"✅ Cleared 3 statuses");
// Verify all were unset
let output = repo
diff --git a/tests/integration_tests/configure_shell.rs b/tests/integration_tests/configure_shell.rs
index c46b16ac8..535357b13 100644
--- a/tests/integration_tests/configure_shell.rs
+++ b/tests/integration_tests/configure_shell.rs
@@ -31,15 +31,15 @@ fn test_configure_shell_with_yes() {
----- 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
+ 🟡 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
+ 💡 Restart shell or run: source ~/.zshrc
");
});
@@ -77,13 +77,13 @@ fn test_configure_shell_specific_shell() {
----- 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
+ 🟡 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
+ 💡 Restart shell or run: source ~/.zshrc
");
});
@@ -125,7 +125,7 @@ fn test_configure_shell_already_exists() {
----- stdout -----
----- stderr -----
- ⚪ Already configured shell extension & completions for zsh @ ~/.zshrc
+ ⚪ Already configured shell extension & completions for zsh @ ~/.zshrc
⚪ All shells already configured
");
});
@@ -161,11 +161,11 @@ fn test_configure_shell_fish() {
----- stdout -----
----- stderr -----
- ✅ Created shell extension for fish @ ~/.config/fish/conf.d/wt.fish
- ✅ Created completions for fish @ ~/.config/fish/completions/wt.fish
+ ✅ 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
+ 💡 Restart shell to activate
");
});
@@ -219,8 +219,8 @@ fn test_configure_shell_fish_extension_exists() {
----- stdout -----
----- stderr -----
- ⚪ Already configured shell extension for fish @ ~/.config/fish/conf.d/wt.fish
- ✅ Created completions for fish @ ~/.config/fish/completions/wt.fish
+ ⚪ Already configured shell extension for fish @ ~/.config/fish/conf.d/wt.fish
+ ✅ Created completions for fish @ ~/.config/fish/completions/wt.fish
✅ Configured 1 shell
");
@@ -263,10 +263,10 @@ fn test_configure_shell_no_files() {
----- stdout -----
----- stderr -----
- 💡 Skipped bash; ~/.bashrc not found
- 💡 Skipped zsh; ~/.zshrc not found
- 💡 Skipped fish; ~/.config/fish/conf.d not found
- ❌ No shell config files found
+ 💡 Skipped bash; ~/.bashrc not found
+ 💡 Skipped zsh; ~/.zshrc not found
+ 💡 Skipped fish; ~/.config/fish/conf.d not found
+ ❌ No shell config files found
");
});
}
@@ -301,15 +301,15 @@ fn test_configure_shell_multiple_configs() {
----- 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
+ 🟡 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
+ 💡 Restart shell or run: source ~/.zshrc
");
});
@@ -363,15 +363,15 @@ fn test_configure_shell_mixed_states() {
----- 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
+ 🟡 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
+ 💡 Restart shell or run: source ~/.zshrc
");
});
@@ -423,13 +423,13 @@ fn test_uninstall_shell() {
----- 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
- 💡 No fish completions in ~/.config/fish/completions/wt.fish
+ ✅ 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
+ 💡 No fish completions in ~/.config/fish/completions/wt.fish
✅ Removed integration from 1 shell
- 💡 Restart shell to complete uninstall
+ 💡 Restart shell to complete uninstall
");
});
@@ -483,13 +483,13 @@ fn test_uninstall_shell_multiple() {
----- 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
- 💡 No fish completions in ~/.config/fish/completions/wt.fish
+ ✅ 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
+ 💡 No fish completions in ~/.config/fish/completions/wt.fish
✅ Removed integration from 2 shells
- 💡 Restart shell to complete uninstall
+ 💡 Restart shell to complete uninstall
");
});
@@ -576,10 +576,10 @@ fn test_uninstall_shell_fish() {
----- stdout -----
----- stderr -----
- ✅ Removed shell extension for fish @ ~/.config/fish/conf.d/wt.fish
+ ✅ Removed shell extension for fish @ ~/.config/fish/conf.d/wt.fish
✅ Removed integration from 1 shell
- 💡 Restart shell to complete uninstall
+ 💡 Restart shell to complete uninstall
");
});
@@ -690,10 +690,10 @@ fn test_configure_shell_no_warning_when_compinit_enabled() {
----- stdout -----
----- stderr -----
- ✅ Added shell extension & completions for zsh @ ~/.zshrc
+ ✅ Added shell extension & completions for zsh @ ~/.zshrc
✅ Configured 1 shell
- 💡 Restart shell or run: source ~/.zshrc
+ 💡 Restart shell or run: source ~/.zshrc
");
});
}
@@ -730,12 +730,12 @@ fn test_configure_shell_no_warning_for_bash_user() {
----- stdout -----
----- stderr -----
- ✅ Added shell extension & completions for bash @ ~/.bashrc
- ✅ Added shell extension & completions for zsh @ ~/.zshrc
- 💡 Skipped fish; ~/.config/fish/conf.d not found
+ ✅ 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
+ 💡 Restart shell or run: source ~/.bashrc
");
});
}
@@ -771,8 +771,8 @@ fn test_configure_shell_no_warning_for_fish_install() {
----- stdout -----
----- stderr -----
- ✅ Created shell extension for fish @ ~/.config/fish/conf.d/wt.fish
- ✅ Created completions for fish @ ~/.config/fish/completions/wt.fish
+ ✅ Created shell extension for fish @ ~/.config/fish/conf.d/wt.fish
+ ✅ Created completions for fish @ ~/.config/fish/completions/wt.fish
✅ Configured 1 shell
");
@@ -813,7 +813,7 @@ fn test_configure_shell_no_warning_when_already_configured() {
----- stdout -----
----- stderr -----
- ⚪ Already configured shell extension & completions for zsh @ ~/.zshrc
+ ⚪ Already configured shell extension & completions for zsh @ ~/.zshrc
⚪ All shells already configured
");
});
@@ -850,9 +850,9 @@ fn test_configure_shell_no_warning_when_shell_unset() {
----- stdout -----
----- stderr -----
- ✅ Added shell extension & completions for bash @ ~/.bashrc
- ✅ Added shell extension & completions for zsh @ ~/.zshrc
- 💡 Skipped fish; ~/.config/fish/conf.d not found
+ ✅ 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
");
diff --git a/tests/integration_tests/directives.rs b/tests/integration_tests/directives.rs
index 00766c12f..d541fbdd0 100644
--- a/tests/integration_tests/directives.rs
+++ b/tests/integration_tests/directives.rs
@@ -29,7 +29,7 @@ fn test_switch_internal_directive() {
----- stdout -----
----- stderr -----
- ❌ Failed to create worktree for my-feature
+ ❌ Failed to create worktree for my-feature
  fatal: invalid reference: my-feature
");
});
@@ -57,7 +57,7 @@ fn test_switch_without_internal() {
----- stdout -----
----- stderr -----
- ❌ Failed to create worktree for my-feature
+ ❌ Failed to create worktree for my-feature
  fatal: invalid reference: my-feature
");
});
@@ -89,7 +89,7 @@ fn test_remove_internal_directive() {
cd '[PATH]'
----- stderr -----
- 🔄 Removing main worktree & branch in background
+ 🔄 Removing main worktree & branch in background
");
});
}
@@ -114,7 +114,7 @@ fn test_remove_without_internal() {
----- stdout -----
----- stderr -----
- 🔄 Removing main worktree & branch in background
+ 🔄 Removing main worktree & branch in background
");
});
}
diff --git a/tests/integration_tests/merge.rs b/tests/integration_tests/merge.rs
index 1fd6aa6ea..1f814aa5c 100644
--- a/tests/integration_tests/merge.rs
+++ b/tests/integration_tests/merge.rs
@@ -2454,11 +2454,11 @@ fn test_merge_no_commit_with_clean_tree() {
----- stdout -----
----- stderr -----
- 🔄 Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
+ 🔄 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)
+ ✅ Merged to main (1 commit, 1 file, +1)
⚪ Worktree preserved (--no-remove)
");
});
@@ -2502,9 +2502,9 @@ fn test_merge_no_commit_with_dirty_tree() {
----- stdout -----
----- stderr -----
- ❌ Cannot merge with --no-commit: working tree has uncommitted changes
+ ❌ Cannot merge with --no-commit: working tree has uncommitted changes
- 💡 Commit or stash them first
+ 💡 Commit or stash them first
");
});
}
@@ -2557,11 +2557,11 @@ fn test_merge_no_commit_no_squash_no_remove_redundant() {
----- stdout -----
----- stderr -----
- 🔄 Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
+ 🔄 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)
+ ✅ 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 8e93f6371..79400930f 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
@@ -4,14 +4,14 @@ expression: normalized
---
y
-🟡 repo needs approval to execute 1 command:
+🟡 repo needs approval to execute 1 command:
⚪ post-create:
  echo 'test command'
-💡 Allow and remember? [y/N]
-🔄 Running post-create:
+💡 Allow and remember? [y/N]
+🔄 Running post-create:
  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
+✅ Created new worktree for test-approve from main at [REPO]/repo.test-approve
+💡 Run `wt config shell install` to enable automatic cd
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snap
index 62466368b..2d808bfff 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
@@ -4,12 +4,12 @@ expression: normalized
---
n
-🟡 repo needs approval to execute 1 command:
+🟡 repo needs approval to execute 1 command:
⚪ post-create:
  echo 'test command'
-💡 Allow and remember? [y/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
+✅ Created new worktree for test-decline from main at [REPO]/repo.test-decline
+💡 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 9fff2439f..2b5e00f39 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
@@ -4,7 +4,7 @@ expression: normalized
---
y
-🟡 repo needs approval to execute 2 commands:
+🟡 repo needs approval to execute 2 commands:
⚪ post-create:
  echo 'First command'
@@ -12,15 +12,15 @@ y
⚪ post-create:
  echo 'Third command'
-💡 Allow and remember? [y/N]
-🔄 Running post-create:
+💡 Allow and remember? [y/N]
+🔄 Running post-create:
  echo 'First command'
First command
-🔄 Running post-create:
+🔄 Running post-create:
  echo 'Second command'
Second command
-🔄 Running post-create:
+🔄 Running post-create:
  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
+✅ Created new worktree for test-mixed-accept from main at [REPO]/repo.test-mixed-accept
+💡 Run `wt config shell install` to enable automatic cd
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snap
index bf5eb1525..f6aa93785 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
@@ -4,7 +4,7 @@ expression: normalized
---
n
-🟡 repo needs approval to execute 2 commands:
+🟡 repo needs approval to execute 2 commands:
⚪ post-create:
  echo 'First command'
@@ -12,7 +12,7 @@ n
⚪ post-create:
  echo 'Third command'
-💡 Allow and remember? [y/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
+✅ Created new worktree for test-mixed-decline from main at [REPO]/repo.test-mixed-decline
+💡 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 d76b2f816..aec98d35b 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
@@ -4,7 +4,7 @@ expression: normalized
---
y
-🟡 repo needs approval to execute 3 commands:
+🟡 repo needs approval to execute 3 commands:
⚪ post-create:
  echo 'First command'
@@ -15,15 +15,15 @@ y
⚪ post-create:
  echo 'Third command'
-💡 Allow and remember? [y/N]
-🔄 Running post-create:
+💡 Allow and remember? [y/N]
+🔄 Running post-create:
  echo 'First command'
First command
-🔄 Running post-create:
+🔄 Running post-create:
  echo 'Second command'
Second command
-🔄 Running post-create:
+🔄 Running post-create:
  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
+✅ Created new worktree for test-multi from main at [REPO]/repo.test-multi
+💡 Run `wt config shell install` to enable automatic cd
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap
index 69a92bcab..04af4db18 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
@@ -4,26 +4,26 @@ expression: normalized
---
y
-🟡 repo needs approval to execute 3 commands:
+🟡 repo needs approval to execute 3 commands:
-⚪ post-create install:
+⚪ post-create install:
  echo 'Installing dependencies...'
-⚪ post-create build:
+⚪ post-create build:
  echo 'Building project...'
-⚪ post-create test:
+⚪ post-create test:
  echo 'Running tests...'
-💡 Allow and remember? [y/N]
-🔄 Running post-create install:
+💡 Allow and remember? [y/N]
+🔄 Running post-create install:
  echo 'Installing dependencies...'
Installing dependencies...
-🔄 Running post-create build:
+🔄 Running post-create build:
  echo 'Building project...'
Building project...
-🔄 Running post-create test:
+🔄 Running post-create test:
  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
+✅ Created new worktree for test-named from main at [REPO]/repo.test-named
+💡 Run `wt config shell install` to enable automatic cd
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snap
index affe0f309..5bd4e8a01 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
@@ -4,16 +4,16 @@ expression: normalized
---
y
-🟡 repo needs approval to execute 1 command:
+🟡 repo needs approval to execute 1 command:
⚪ post-create:
  echo 'test command'
-💡 Allow and remember? [y/N]
+💡 Allow and remember? [y/N]
🟡 Failed to save command approval: Failed to write config file: Permission denied (os error 13)
-💡 Approval will be requested again next time.
-🔄 Running post-create:
+💡 Approval will be requested again next time.
+🔄 Running post-create:
  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
+✅ Created new worktree for test-permission from main at [REPO]/repo.test-permission
+💡 Run `wt config shell install` to enable automatic cd
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__bash_shell_integration_hint_suppressed.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__bash_shell_integration_hint_suppressed.snap
index 6bff4af1a..b812bd367 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__bash_shell_integration_hint_suppressed.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__bash_shell_integration_hint_suppressed.snap
@@ -2,4 +2,4 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-✅ Created new worktree for bash-test from main at [TMPDIR]/repo.bash-test
+✅ Created new worktree for bash-test from main at [TMPDIR]/repo.bash-test
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__command_failure.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__command_failure.snap
index a468502e3..8d9c512d1 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__command_failure.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__command_failure.snap
@@ -2,6 +2,6 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-❌ Branch existing already exists
+❌ Branch existing already exists
-💡 Remove --create flag to switch to it
+💡 Remove --create flag to switch to it
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_multiline_command_execution.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_multiline_command_execution.snap
index 9b24491a5..d8ba731b9 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_multiline_command_execution.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_multiline_command_execution.snap
@@ -2,8 +2,8 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-✅ Created new worktree for fish-multiline from main at [TMPDIR]/repo.fish-multiline
-🔄 Executing (--execute):
+✅ Created new worktree for fish-multiline from main at [TMPDIR]/repo.fish-multiline
+🔄 Executing (--execute):
  echo 'line 1'; echo 'line 2'; echo 'line 3'
line 1
line 2
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_handles_empty_chunks.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_handles_empty_chunks.snap
index f47634014..cd78a4ba8 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_handles_empty_chunks.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_handles_empty_chunks.snap
@@ -2,4 +2,4 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-✅ Created new worktree for fish-minimal from main at [TMPDIR]/repo.fish-minimal
+✅ Created new worktree for fish-minimal from main at [TMPDIR]/repo.fish-minimal
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap
index a99d0de2a..581a91aea 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap
@@ -2,6 +2,6 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-✅ Created new worktree for fish-bg from main at [TMPDIR]/repo.fish-bg
-🔄 Running post-start:
+✅ Created new worktree for fish-bg from main at [TMPDIR]/repo.fish-bg
+🔄 Running post-start:
  echo 'fish background task'
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge.snap
index 3e99edaa5..f7fcfd543 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge.snap
@@ -2,5 +2,5 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-⚪ Already up to date with main (no new commits, no rebase needed)
+⚪ Already up to date with main (no new commits, no rebase needed)
⚪ Worktree preserved (on main branch)
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap
index 01eefc6cb..665ee74cf 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap
@@ -2,7 +2,7 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-🔄 Running pre-merge check1:
+🔄 Running pre-merge check1:
  [TMPDIR]/repo/mixed-output.sh check1 3
[check1] stdout line 1
[check1] stderr line 1
@@ -12,7 +12,7 @@ expression: output.normalized()
[check1] stderr line 3
[check1] stdout complete
[check1] stderr complete
-🔄 Running pre-merge check2:
+🔄 Running pre-merge check2:
  [TMPDIR]/repo/mixed-output.sh check2 3
[check2] stdout line 1
[check2] stderr line 1
@@ -22,9 +22,9 @@ expression: output.normalized()
[check2] stderr line 3
[check2] stdout complete
[check2] stderr complete
-🔄 Merging 1 commit to main @ [HASH] (no commit/squash/rebase needed)
+🔄 Merging 1 commit to main @ [HASH] (no commit/squash/rebase needed)
  * [HASH] Add feature
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background
+✅ Merged to main (1 commit, 1 file, +1)
+🔄 Removing feature worktree & branch in background
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap
index 01eefc6cb..665ee74cf 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap
@@ -2,7 +2,7 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-🔄 Running pre-merge check1:
+🔄 Running pre-merge check1:
  [TMPDIR]/repo/mixed-output.sh check1 3
[check1] stdout line 1
[check1] stderr line 1
@@ -12,7 +12,7 @@ expression: output.normalized()
[check1] stderr line 3
[check1] stdout complete
[check1] stderr complete
-🔄 Running pre-merge check2:
+🔄 Running pre-merge check2:
  [TMPDIR]/repo/mixed-output.sh check2 3
[check2] stdout line 1
[check2] stderr line 1
@@ -22,9 +22,9 @@ expression: output.normalized()
[check2] stderr line 3
[check2] stdout complete
[check2] stderr complete
-🔄 Merging 1 commit to main @ [HASH] (no commit/squash/rebase needed)
+🔄 Merging 1 commit to main @ [HASH] (no commit/squash/rebase needed)
  * [HASH] Add feature
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background
+✅ Merged to main (1 commit, 1 file, +1)
+🔄 Removing feature worktree & branch in background
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap
index dbabeec0c..db9509e1f 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap
@@ -2,12 +2,12 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-🔄 Running pre-merge format:
+🔄 Running pre-merge format:
  echo '✓ Code formatting check passed'
✓ Code formatting check passed
-🔄 Running pre-merge test:
+🔄 Running pre-merge test:
  echo '✗ Test suite failed: 3 tests failing' && exit 1
✗ Test suite failed: 3 tests failing
-❌ pre-merge command failed: test: exit status: 1
+❌ pre-merge command failed: test: exit status: 1
-💡 Use --no-verify to skip pre-merge commands
+💡 Use --no-verify to skip pre-merge commands
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap
index dbabeec0c..db9509e1f 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap
@@ -2,12 +2,12 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-🔄 Running pre-merge format:
+🔄 Running pre-merge format:
  echo '✓ Code formatting check passed'
✓ Code formatting check passed
-🔄 Running pre-merge test:
+🔄 Running pre-merge test:
  echo '✗ Test suite failed: 3 tests failing' && exit 1
✗ Test suite failed: 3 tests failing
-❌ pre-merge command failed: test: exit status: 1
+❌ pre-merge command failed: test: exit status: 1
-💡 Use --no-verify to skip pre-merge commands
+💡 Use --no-verify to skip pre-merge commands
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap
index cf56fed43..61ab244f2 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap
@@ -2,18 +2,18 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-🔄 Running pre-merge format:
+🔄 Running pre-merge format:
  echo '✓ Code formatting check passed'
✓ Code formatting check passed
-🔄 Running pre-merge lint:
+🔄 Running pre-merge lint:
  echo '✓ Linting passed - no warnings'
✓ Linting passed - no warnings
-🔄 Running pre-merge test:
+🔄 Running pre-merge test:
  echo '✓ All 47 tests passed in 2.3s'
✓ All 47 tests passed in 2.3s
-🔄 Merging 1 commit to main @ [HASH] (no commit/squash/rebase needed)
+🔄 Merging 1 commit to main @ [HASH] (no commit/squash/rebase needed)
  * [HASH] Add feature
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background
+✅ Merged to main (1 commit, 1 file, +1)
+🔄 Removing feature worktree & branch in background
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap
index cf56fed43..61ab244f2 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap
@@ -2,18 +2,18 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-🔄 Running pre-merge format:
+🔄 Running pre-merge format:
  echo '✓ Code formatting check passed'
✓ Code formatting check passed
-🔄 Running pre-merge lint:
+🔄 Running pre-merge lint:
  echo '✓ Linting passed - no warnings'
✓ Linting passed - no warnings
-🔄 Running pre-merge test:
+🔄 Running pre-merge test:
  echo '✓ All 47 tests passed in 2.3s'
✓ All 47 tests passed in 2.3s
-🔄 Merging 1 commit to main @ [HASH] (no commit/squash/rebase needed)
+🔄 Merging 1 commit to main @ [HASH] (no commit/squash/rebase needed)
  * [HASH] Add feature
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-✅ Merged to main (1 commit, 1 file, +1)
-🔄 Removing feature worktree & branch in background
+✅ Merged to main (1 commit, 1 file, +1)
+🔄 Removing feature worktree & branch in background
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_post_create.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_post_create.snap
index 32706c886..83d578ae7 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_post_create.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_post_create.snap
@@ -2,11 +2,11 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-🔄 Running post-create install:
+🔄 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 [TMPDIR]/repo.feature-x
-🔄 Running post-start dev:
+✅ Created new worktree for feature-x from main at [TMPDIR]/repo.feature-x
+🔄 Running post-start dev:
  uv run dev
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_pre_merge.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_pre_merge.snap
index feb70435c..d5bb13ae3 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_pre_merge.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_pre_merge.snap
@@ -2,14 +2,14 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-🔄 Squashing 3 commits into a single commit (2 files, +45)...
-🔄 Generating squash commit message...
-  feat(api): Add user authentication endpoints
+🔄 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 @ [HASH]
-🔄 Running pre-merge test:
+✅ Squashed @ [HASH]
+🔄 Running pre-merge test:
  uv run pytest
============================= test session starts ==============================
@@ -21,15 +21,15 @@ tests/test_auth.py::test_token_validation PASSED [100%]
============================== 3 passed in 0.8s ===============================
-🔄 Running pre-merge lint:
+🔄 Running pre-merge lint:
  uv run ruff check
All checks passed!
-🔄 Merging 1 commit to main @ [HASH] (no rebase needed)
+🔄 Merging 1 commit to main @ [HASH] (no rebase needed)
  * [HASH] 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
+✅ Merged to main (1 commit, 2 files, +45)
+🔄 Removing feature-auth worktree & branch in background
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_simple_switch.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_simple_switch.snap
index 387f26fc1..28b83dcae 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_simple_switch.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_simple_switch.snap
@@ -2,4 +2,4 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-✅ Created new worktree for fix-auth from main at [TMPDIR]/repo.fix-auth
+✅ Created new worktree for fix-auth from main at [TMPDIR]/repo.fix-auth
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__remove.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__remove.snap
index d4b8a67f1..8914b925e 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__remove.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__remove.snap
@@ -2,4 +2,4 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-🔄 Removing to-remove worktree & branch in background
+🔄 Removing to-remove worktree & branch in background
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_create.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_create.snap
index 43aaa2fa8..859c4e56b 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_create.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_create.snap
@@ -2,4 +2,4 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-✅ Created new worktree for feature from main at [TMPDIR]/repo.feature
+✅ Created new worktree for feature from main at [TMPDIR]/repo.feature
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute.snap
index 010c89d18..5b1ed3ab4 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute.snap
@@ -2,7 +2,7 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-✅ Created new worktree for test-exec from main at [TMPDIR]/repo.test-exec
-🔄 Executing (--execute):
+✅ Created new worktree for test-exec from main at [TMPDIR]/repo.test-exec
+🔄 Executing (--execute):
  echo executed
executed
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_through_wrapper.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_through_wrapper.snap
index 010c89d18..5b1ed3ab4 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_through_wrapper.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_through_wrapper.snap
@@ -2,7 +2,7 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-✅ Created new worktree for test-exec from main at [TMPDIR]/repo.test-exec
-🔄 Executing (--execute):
+✅ Created new worktree for test-exec from main at [TMPDIR]/repo.test-exec
+🔄 Executing (--execute):
  echo executed
executed
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap
index 4d1e265a7..0497f89ab 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap
@@ -2,14 +2,14 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-🔄 Running post-create:
+🔄 Running post-create:
  echo 'Installing dependencies...'
Installing dependencies...
-🔄 Running post-create:
+🔄 Running post-create:
  echo 'Building project...'
Building project...
-✅ Created new worktree for feature-hooks from main at [TMPDIR]/repo.feature-hooks
-🔄 Running post-start server:
+✅ Created new worktree for feature-hooks from main at [TMPDIR]/repo.feature-hooks
+🔄 Running post-start server:
  echo 'Starting dev server on port 3000'
-🔄 Running post-start watch:
+🔄 Running post-start watch:
  echo 'Watching for file changes'
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap
index 93cdb4f77..e241a3f0d 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap
@@ -2,6 +2,6 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-✅ Created new worktree for feature-with-hooks from main at [TMPDIR]/repo.feature-with-hooks
-🔄 Running post-start:
+✅ Created new worktree for feature-with-hooks from main at [TMPDIR]/repo.feature-with-hooks
+🔄 Running post-start:
  echo 'test command executed'
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap
index 0539d072f..2a6e25558 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap
@@ -2,6 +2,6 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-✅ Created new worktree for feature-bg from main at [TMPDIR]/repo.feature-bg
-🔄 Running post-start:
+✅ Created new worktree for feature-bg from main at [TMPDIR]/repo.feature-bg
+🔄 Running post-start:
  echo 'background task'
diff --git a/tests/integration_tests/statusline.rs b/tests/integration_tests/statusline.rs
index 34f3ea25e..a91588059 100644
--- a/tests/integration_tests/statusline.rs
+++ b/tests/integration_tests/statusline.rs
@@ -119,7 +119,7 @@ fn test_statusline_basic() {
fn test_statusline_with_changes() {
let repo = setup_repo_with_changes();
let output = run_statusline(&repo, &[], None);
- assert_snapshot!(output, @"main ?");
+ assert_snapshot!(output, @"main ?");
}
#[test]
@@ -169,7 +169,7 @@ fn test_statusline_claude_code_full_context() {
let output = run_statusline(&repo, &["--claude-code"], Some(&json));
claude_code_snapshot_settings(&repo).bind(|| {
- assert_snapshot!(output, @"[PATH] main ? | Opus");
+ assert_snapshot!(output, @"[PATH] main ? | Opus");
});
}
diff --git a/tests/snapshots/git_error_display__push_failed.snap b/tests/snapshots/git_error_display__push_failed.snap
index 159bac8ae..1fbf662d5 100644
--- a/tests/snapshots/git_error_display__push_failed.snap
+++ b/tests/snapshots/git_error_display__push_failed.snap
@@ -1,8 +1,8 @@
---
source: tests/git_error_display.rs
-expression: msg
+expression: err.to_string()
---
-❌ Push failed
+❌ Push failed
  To /Users/user/workspace/repo/.git
  ! [remote rejected] HEAD -> main (Up-to-date check failed)
  error: failed to push some refs to '/Users/user/workspace/repo/.git'
diff --git a/tests/snapshots/git_error_display__worktree_removal_failed.snap b/tests/snapshots/git_error_display__worktree_removal_failed.snap
index 1d09d2f06..e533bbf10 100644
--- a/tests/snapshots/git_error_display__worktree_removal_failed.snap
+++ b/tests/snapshots/git_error_display__worktree_removal_failed.snap
@@ -1,7 +1,7 @@
---
source: tests/git_error_display.rs
-expression: msg
+expression: err.to_string()
---
-❌ Failed to remove worktree for feature-x at /tmp/repo.feature-x
+❌ Failed to remove worktree for feature-x at /tmp/repo.feature-x
  fatal: worktree is dirty
  error: could not remove worktree
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 fb396f2c7..39b4eed3f 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
@@ -25,7 +25,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Running post-create:
+🔄 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
+✅ Created new worktree for test-approved from main at [REPO].test-approved
+💡 Run `wt config shell install` to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_fails_in_non_tty.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_fails_in_non_tty.snap
index 2ee2bf4a1..2fd6d5263 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__approval_fails_in_non_tty.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__approval_fails_in_non_tty.snap
@@ -25,11 +25,11 @@ exit_code: 1
----- stdout -----
----- stderr -----
-🟡 repo needs approval to execute 1 command:
+🟡 repo needs approval to execute 1 command:
⚪ post-create:
  echo 'test command'
-❌ Cannot prompt for approval in non-interactive environment
+❌ Cannot prompt for approval in non-interactive environment
-💡 In CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'
+💡 In CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_mixed_approved_unapproved.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_mixed_approved_unapproved.snap
index e521d8821..45e8eb234 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__approval_mixed_approved_unapproved.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__approval_mixed_approved_unapproved.snap
@@ -6,7 +6,7 @@ exit_code: 1
----- stdout -----
----- stderr -----
-🟡 repo needs approval to execute 2 commands:
+🟡 repo needs approval to execute 2 commands:
⚪ post-create:
  echo 'First command'
@@ -14,6 +14,6 @@ exit_code: 1
⚪ post-create:
  echo 'Third command'
-❌ Cannot prompt for approval in non-interactive environment
+❌ Cannot prompt for approval in non-interactive environment
-💡 In CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'
+💡 In CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_multiple_commands.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_multiple_commands.snap
index b1d77e44b..8f43e4db1 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__approval_multiple_commands.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__approval_multiple_commands.snap
@@ -6,7 +6,7 @@ exit_code: 1
----- stdout -----
----- stderr -----
-🟡 repo needs approval to execute 4 commands:
+🟡 repo needs approval to execute 4 commands:
⚪ post-create:
  echo 'Branch: test-nested-branch'
@@ -20,6 +20,6 @@ exit_code: 1
⚪ post-create:
  cd [REPO].test-nested-branch && pwd
-❌ Cannot prompt for approval in non-interactive environment
+❌ Cannot prompt for approval in non-interactive environment
-💡 In CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'
+💡 In CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_named_commands.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_named_commands.snap
index 0fd6894f3..a059492d5 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__approval_named_commands.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__approval_named_commands.snap
@@ -6,17 +6,17 @@ exit_code: 1
----- stdout -----
----- stderr -----
-🟡 repo needs approval to execute 3 commands:
+🟡 repo needs approval to execute 3 commands:
-⚪ post-create install:
+⚪ post-create install:
  echo 'Installing dependencies...'
-⚪ post-create build:
+⚪ post-create build:
  echo 'Building project...'
-⚪ post-create test:
+⚪ post-create test:
  echo 'Running tests...'
-❌ Cannot prompt for approval in non-interactive environment
+❌ Cannot prompt for approval in non-interactive environment
-💡 In CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'
+💡 In CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_single_command.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_single_command.snap
index 7d87b3f4c..572efce17 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__approval_single_command.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__approval_single_command.snap
@@ -6,11 +6,11 @@ exit_code: 1
----- stdout -----
----- stderr -----
-🟡 repo needs approval to execute 1 command:
+🟡 repo needs approval to execute 1 command:
⚪ post-create:
  echo 'Worktree path: [REPO].feature-test-approval'
-❌ Cannot prompt for approval in non-interactive environment
+❌ Cannot prompt for approval in non-interactive environment
-💡 In CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'
+💡 In CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__decline_approval_skips_only_unapproved.snap b/tests/snapshots/integration__integration_tests__approval_ui__decline_approval_skips_only_unapproved.snap
index e521d8821..45e8eb234 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__decline_approval_skips_only_unapproved.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__decline_approval_skips_only_unapproved.snap
@@ -6,7 +6,7 @@ exit_code: 1
----- stdout -----
----- stderr -----
-🟡 repo needs approval to execute 2 commands:
+🟡 repo needs approval to execute 2 commands:
⚪ post-create:
  echo 'First command'
@@ -14,6 +14,6 @@ exit_code: 1
⚪ post-create:
  echo 'Third command'
-❌ Cannot prompt for approval in non-interactive environment
+❌ Cannot prompt for approval in non-interactive environment
-💡 In CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'
+💡 In CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'
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 953e69f12..f5325fd95 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
@@ -26,8 +26,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Running post-create:
+🔄 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
+✅ 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 a8f6f1c01..46dacf56f 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
@@ -26,7 +26,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Running post-create:
+🔄 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
+✅ Created new worktree for test-force from main at [REPO].test-force
+💡 Run `wt config shell install` to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_second_run.snap b/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_second_run.snap
index 60161fd42..ac8ee6e22 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_second_run.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_second_run.snap
@@ -6,11 +6,11 @@ exit_code: 1
----- stdout -----
----- stderr -----
-🟡 repo needs approval to execute 1 command:
+🟡 repo needs approval to execute 1 command:
⚪ post-create:
  echo 'test command' > output.txt
-❌ Cannot prompt for approval in non-interactive environment
+❌ Cannot prompt for approval in non-interactive environment
-💡 In CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'
+💡 In CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__run_hook_post_merge_requires_approval.snap b/tests/snapshots/integration__integration_tests__approval_ui__run_hook_post_merge_requires_approval.snap
index ce66a8375..8a21cb82b 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__run_hook_post_merge_requires_approval.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__run_hook_post_merge_requires_approval.snap
@@ -6,11 +6,11 @@ exit_code: 1
----- stdout -----
----- stderr -----
-🟡 repo needs approval to execute 1 command:
+🟡 repo needs approval to execute 1 command:
⚪ post-merge:
  echo 'Post-merge cleanup for main'
-❌ Cannot prompt for approval in non-interactive environment
+❌ Cannot prompt for approval in non-interactive environment
-💡 In CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'
+💡 In CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__run_hook_pre_merge_requires_approval.snap b/tests/snapshots/integration__integration_tests__approval_ui__run_hook_pre_merge_requires_approval.snap
index 6941121fa..71921e6bd 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__run_hook_pre_merge_requires_approval.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__run_hook_pre_merge_requires_approval.snap
@@ -6,11 +6,11 @@ exit_code: 1
----- stdout -----
----- stderr -----
-🟡 repo needs approval to execute 1 command:
+🟡 repo needs approval to execute 1 command:
⚪ pre-merge:
  echo 'Running pre-merge checks on main'
-❌ Cannot prompt for approval in non-interactive environment
+❌ Cannot prompt for approval in non-interactive environment
-💡 In CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'
+💡 In CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'
diff --git a/tests/snapshots/integration__integration_tests__approvals__add_approvals_all_none_approved.snap b/tests/snapshots/integration__integration_tests__approvals__add_approvals_all_none_approved.snap
index afbb7a961..42cf8b85a 100644
--- a/tests/snapshots/integration__integration_tests__approvals__add_approvals_all_none_approved.snap
+++ b/tests/snapshots/integration__integration_tests__approvals__add_approvals_all_none_approved.snap
@@ -26,11 +26,11 @@ exit_code: 1
----- stdout -----
----- stderr -----
-🟡 repo needs approval to execute 1 command:
+🟡 repo needs approval to execute 1 command:
⚪ post-create:
  echo 'test'
-❌ Cannot prompt for approval in non-interactive environment
+❌ Cannot prompt for approval in non-interactive environment
-💡 In CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'
+💡 In CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'
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 dfc9d4dd4..1f6e087d3 100644
--- a/tests/snapshots/integration__integration_tests__approvals__add_approvals_force.snap
+++ b/tests/snapshots/integration__integration_tests__approvals__add_approvals_force.snap
@@ -26,4 +26,4 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Commands approved; not saved (--force)
+✅ Commands approved; not saved (--force)
diff --git a/tests/snapshots/integration__integration_tests__approvals__add_approvals_no_config.snap b/tests/snapshots/integration__integration_tests__approvals__add_approvals_no_config.snap
index b800dec35..a64a37e03 100644
--- a/tests/snapshots/integration__integration_tests__approvals__add_approvals_no_config.snap
+++ b/tests/snapshots/integration__integration_tests__approvals__add_approvals_no_config.snap
@@ -25,6 +25,6 @@ exit_code: 1
----- stdout -----
----- stderr -----
-❌ No project configuration found
+❌ No project configuration found
-💡 Create a config file at: [REPO]/.config/wt.toml
+💡 Create a config file at: [REPO]/.config/wt.toml
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 5c25bd8f2..b32fbad80 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
@@ -25,4 +25,4 @@ exit_code: 0
----- stdout -----
----- stderr -----
-⚪ No approvals to clear for this project
+⚪ 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 76cf9804e..702cd8d54 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
@@ -26,4 +26,4 @@ exit_code: 0
----- stdout -----
----- stderr -----
-⚪ No approvals to clear
+⚪ 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 00a3ed768..c75de670d 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
@@ -26,4 +26,4 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Cleared approvals for 1 project
+✅ 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 5c25bd8f2..b32fbad80 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
@@ -25,4 +25,4 @@ exit_code: 0
----- stdout -----
----- stderr -----
-⚪ No approvals to clear for this project
+⚪ 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 5c25bd8f2..b32fbad80 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
@@ -25,4 +25,4 @@ exit_code: 0
----- stdout -----
----- stderr -----
-⚪ No approvals to clear for this project
+⚪ 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 5c25bd8f2..b32fbad80 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
@@ -25,4 +25,4 @@ exit_code: 0
----- stdout -----
----- stderr -----
-⚪ No approvals to clear for this project
+⚪ No approvals to clear for this project
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_partial_shell_config_shows_hint.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_partial_shell_config_shows_hint.snap
index 66bad7d2b..fbdebf595 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_partial_shell_config_shows_hint.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_partial_shell_config_shows_hint.snap
@@ -16,7 +16,7 @@ info:
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WT_ASSUME_COMPINIT: "1"
@@ -27,14 +27,14 @@ exit_code: 0
----- stdout -----
----- stderr -----
-⚪ Global Config: ~/.config/worktrunk/config.toml
-💡 Empty file (using defaults)
+⚪ Global Config: ~/.config/worktrunk/config.toml
+💡 Empty file (using defaults)
-⚪ Project Config: [REPO]/.config/wt.toml
-💡 Not found
+⚪ Project Config: [REPO]/.config/wt.toml
+💡 Not found
-💡 Not configured shell extension & completions for bash @ ~/.bashrc
-⚪ Already configured shell extension & completions for zsh @ ~/.zshrc
-⚪ Skipped fish; ~/.config/fish/conf.d not found
+💡 Not configured shell extension & completions for bash @ ~/.bashrc
+⚪ Already configured shell extension & completions for zsh @ ~/.zshrc
+⚪ Skipped fish; ~/.config/fish/conf.d not found
-💡 Run 'wt config shell install' to enable shell integration
+💡 Run 'wt config shell install' to enable shell integration
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_correct_order.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_correct_order.snap
index 644dced39..90a7c2616 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_correct_order.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_correct_order.snap
@@ -16,7 +16,7 @@ info:
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WT_ASSUME_COMPINIT: "1"
@@ -27,12 +27,12 @@ exit_code: 0
----- stdout -----
----- stderr -----
-⚪ Global Config: ~/.config/worktrunk/config.toml
-💡 Empty file (using defaults)
+⚪ Global Config: ~/.config/worktrunk/config.toml
+💡 Empty file (using defaults)
-⚪ Project Config: [REPO]/.config/wt.toml
-💡 Not found
+⚪ Project Config: [REPO]/.config/wt.toml
+💡 Not found
-⚪ Already configured shell extension & completions for zsh @ ~/.zshrc
-⚪ Skipped bash; ~/.bashrc not found
-⚪ Skipped fish; ~/.config/fish/conf.d not found
+⚪ Already configured shell extension & completions for zsh @ ~/.zshrc
+⚪ Skipped bash; ~/.bashrc not found
+⚪ Skipped fish; ~/.config/fish/conf.d not found
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_warning.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_warning.snap
index 56e0206c0..c8c6554fa 100644
--- a/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_warning.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_warning.snap
@@ -16,7 +16,7 @@ info:
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
@@ -26,14 +26,14 @@ exit_code: 0
----- stdout -----
----- stderr -----
-⚪ Global Config: ~/.config/worktrunk/config.toml
-💡 Empty file (using defaults)
+⚪ Global Config: ~/.config/worktrunk/config.toml
+💡 Empty file (using defaults)
-⚪ Project Config: [REPO]/.config/wt.toml
-💡 Not found
+⚪ Project Config: [REPO]/.config/wt.toml
+💡 Not found
-⚪ Already configured shell extension & completions for zsh @ ~/.zshrc
-🟡 Completions won't work; add to ~/.zshrc before the wt line:
+⚪ Already configured shell extension & completions for zsh @ ~/.zshrc
+🟡 Completions won't work; add to ~/.zshrc before the wt line:
  autoload -Uz compinit && compinit
-⚪ Skipped bash; ~/.bashrc not found
-⚪ Skipped fish; ~/.config/fish/conf.d not found
+⚪ Skipped bash; ~/.bashrc not found
+⚪ Skipped fish; ~/.config/fish/conf.d not found
diff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap
index e9780a5cf..da192f9a8 100644
--- a/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap
+++ b/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap
@@ -26,9 +26,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
+🔄 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)
+✅ Merged to main (1 commit, 1 file, +1)
⚪ Worktree preserved (--no-remove)
diff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap
index 819b2f348..447d80c99 100644
--- a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap
+++ b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap
@@ -26,9 +26,9 @@ exit_code: 0
cd '[PATH]'
----- stderr -----
-🔄 Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
+🔄 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
+✅ Merged to main (1 commit, 1 file, +1)
+🔄 Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__internal_flag__config_show_with_internal_flag.snap b/tests/snapshots/integration__integration_tests__internal_flag__config_show_with_internal_flag.snap
index c93695274..22263bec2 100644
--- a/tests/snapshots/integration__integration_tests__internal_flag__config_show_with_internal_flag.snap
+++ b/tests/snapshots/integration__integration_tests__internal_flag__config_show_with_internal_flag.snap
@@ -17,7 +17,8 @@ info:
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
+ WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
@@ -26,12 +27,12 @@ exit_code: 0
----- stdout -----
----- stderr -----
-⚪ Global Config: ~/.config/worktrunk/config.toml
+⚪ Global Config: ~/.config/worktrunk/config.toml
  worktree-path = "../{{ main_worktree }}.{{ branch }}"
-⚪ Project Config: [REPO]/.config/wt.toml
-💡 Not found
+⚪ Project Config: [REPO]/.config/wt.toml
+💡 Not found
-⚪ Skipped bash; ~/.bashrc not found
-⚪ Skipped zsh; ~/.zshrc not found
-⚪ Skipped fish; ~/.config/fish/conf.d not found
+⚪ Skipped bash; ~/.bashrc not found
+⚪ Skipped zsh; ~/.zshrc not found
+⚪ Skipped fish; ~/.config/fish/conf.d not found
diff --git a/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snap b/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snap
index f5b0e9a4f..c42591cbf 100644
--- a/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snap
+++ b/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snap
@@ -25,6 +25,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . b834638e 1d Initial commit
+@ main ^ . b834638e 1d Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snap b/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snap
index 78c445f00..7cee4056c 100644
--- a/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snap
+++ b/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snap
@@ -25,7 +25,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . b834638e 1d Initial commit
- branch-only _ ⎇ b834638e 1d Initial commit
+@ main ^ . b834638e 1d Initial commit
+ branch-only _ ⎇ b834638e 1d Initial commit
⚪ Showing 1 worktrees, 1 branches
diff --git a/tests/snapshots/integration__integration_tests__list__default_branch_missing_worktree.snap b/tests/snapshots/integration__integration_tests__list__default_branch_missing_worktree.snap
index 56d67c585..5f60d8988 100644
--- a/tests/snapshots/integration__integration_tests__list__default_branch_missing_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__default_branch_missing_worktree.snap
@@ -24,6 +24,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ develop ^ ⚐ . b834638e 1d Initial commit
+@ develop ^ ⚐ . b834638e 1d Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list__detached_head.snap b/tests/snapshots/integration__integration_tests__list__detached_head.snap
index 63a60c9f3..fbbaadd12 100644
--- a/tests/snapshots/integration__integration_tests__list__detached_head.snap
+++ b/tests/snapshots/integration__integration_tests__list__detached_head.snap
@@ -24,6 +24,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ - ^ ⚐ . b834638e 1d Initial commit
+@ - ^ ⚐ . b834638e 1d Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list__detached_head_in_worktree.snap b/tests/snapshots/integration__integration_tests__list__detached_head_in_worktree.snap
index 7be85cde4..7f97b721e 100644
--- a/tests/snapshots/integration__integration_tests__list__detached_head_in_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__detached_head_in_worktree.snap
@@ -24,7 +24,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ - _ ⚐ ./repo.feature b834638e 1d Initial commit
+@ main ^ ./repo b834638e 1d Initial commit
++ - _ ⚐ ./repo.feature b834638e 1d Initial commit
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__json_tree_matches_main_after_merge.snap b/tests/snapshots/integration__integration_tests__list__json_tree_matches_main_after_merge.snap
index 354066549..5147e6685 100644
--- a/tests/snapshots/integration__integration_tests__list__json_tree_matches_main_after_merge.snap
+++ b/tests/snapshots/integration__integration_tests__list__json_tree_matches_main_after_merge.snap
@@ -110,7 +110,7 @@ exit_code: 0
"worktree_state": ""
},
"commits_display": "/u001b[32m↑2/u001b[0m",
- "status_line": "feature-merged /u001b[2m≡/u001b[0m /u001b[32m↑2/u001b[0m",
+ "status_line": "feature-merged /u001b[2m≡/u001b[22m /u001b[32m↑2/u001b[0m",
"type": "worktree",
"path": "[REPO].feature-merged",
"bare": false,
diff --git a/tests/snapshots/integration__integration_tests__list__json_with_display_fields.snap b/tests/snapshots/integration__integration_tests__list__json_with_display_fields.snap
index 0e6eb15e5..4b6c32bbe 100644
--- a/tests/snapshots/integration__integration_tests__list__json_with_display_fields.snap
+++ b/tests/snapshots/integration__integration_tests__list__json_with_display_fields.snap
@@ -111,7 +111,7 @@ exit_code: 0
},
"commits_display": "/u001b[32m↑2/u001b[0m /u001b[2m/u001b[31m↓2/u001b[0m",
"branch_diff_display": "/u001b[32m+1/u001b[0m",
- "status_line": "feature-ahead /u001b[36m!?/u001b[0m ±/u001b[32m+1/u001b[0m /u001b[31m-1/u001b[0m /u001b[32m↑2/u001b[0m /u001b[2m/u001b[31m↓2/u001b[0m",
+ "status_line": "feature-ahead /u001b[36m!?/u001b[39m ±/u001b[32m+1/u001b[0m /u001b[31m-1/u001b[0m /u001b[32m↑2/u001b[0m /u001b[2m/u001b[31m↓2/u001b[0m",
"type": "worktree",
"path": "[REPO].feature-ahead",
"bare": false,
@@ -160,7 +160,7 @@ exit_code: 0
"worktree_state": ""
},
"commits_display": "/u001b[2m/u001b[31m↓2/u001b[0m",
- "status_line": "feature-behind /u001b[2m_/u001b[0m /u001b[2m/u001b[31m↓2/u001b[0m",
+ "status_line": "feature-behind /u001b[2m_/u001b[22m /u001b[2m/u001b[31m↓2/u001b[0m",
"type": "worktree",
"path": "[REPO].feature-behind",
"bare": false,
diff --git a/tests/snapshots/integration__integration_tests__list__json_with_git_operation.snap b/tests/snapshots/integration__integration_tests__list__json_with_git_operation.snap
index 08e25cdbe..e5dd7063d 100644
--- a/tests/snapshots/integration__integration_tests__list__json_with_git_operation.snap
+++ b/tests/snapshots/integration__integration_tests__list__json_with_git_operation.snap
@@ -109,7 +109,7 @@ exit_code: 0
"upstream_divergence": "",
"worktree_state": ""
},
- "status_line": "feature /u001b[31m✖/u001b[0m",
+ "status_line": "feature /u001b[31m✖/u001b[39m",
"type": "worktree",
"path": "[REPO].feature",
"bare": false,
diff --git a/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap b/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap
index 3de0f408c..ef21edc54 100644
--- a/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap
+++ b/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap
@@ -109,7 +109,7 @@ exit_code: 0
"upstream_divergence": "",
"worktree_state": ""
},
- "status_line": "feature-detached /u001b[2m_/u001b[0m",
+ "status_line": "feature-detached /u001b[2m_/u001b[22m",
"type": "worktree",
"path": "[REPO].feature-detached",
"bare": false,
@@ -159,7 +159,7 @@ exit_code: 0
"upstream_divergence": "",
"worktree_state": "⊠"
},
- "status_line": "locked-feature /u001b[2m_/u001b[0m/u001b[33m⊠/u001b[0m",
+ "status_line": "locked-feature /u001b[2m_/u001b[22m/u001b[33m⊠/u001b[39m",
"type": "worktree",
"path": "[REPO].locked-feature",
"bare": false,
diff --git a/tests/snapshots/integration__integration_tests__list__json_with_user_status.snap b/tests/snapshots/integration__integration_tests__list__json_with_user_status.snap
index bc8e16361..e23c079f6 100644
--- a/tests/snapshots/integration__integration_tests__list__json_with_user_status.snap
+++ b/tests/snapshots/integration__integration_tests__list__json_with_user_status.snap
@@ -111,7 +111,7 @@ exit_code: 0
"worktree_state": "",
"user_status": "🔧"
},
- "status_line": "with-status /u001b[2m_/u001b[0m🔧",
+ "status_line": "with-status /u001b[2m_/u001b[22m🔧",
"type": "worktree",
"path": "[REPO].with-status",
"bare": false,
@@ -161,7 +161,7 @@ exit_code: 0
"upstream_divergence": "",
"worktree_state": ""
},
- "status_line": "without-status /u001b[2m_/u001b[0m",
+ "status_line": "without-status /u001b[2m_/u001b[22m",
"type": "worktree",
"path": "[REPO].without-status",
"bare": false,
diff --git a/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap b/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap
index 0d4e1b8d7..44d737535 100644
--- a/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap
+++ b/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap
@@ -24,9 +24,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ diverged ! ↑ 💬 +40 -60 ↑1 ./repo.diverged 8ba5aa92 1d Diverged commit
-+ feature-changes !? ↑ 🤖 +50 -100 ↑1 ./repo.feature-changes b854b166 1d Add 100 lines
-+ fix ?_ 💬 ./repo.fix b834638e 1d Initial commit
+@ main ^ ./repo b834638e 1d Initial commit
++ diverged ! ↑ 💬 +40 -60 ↑1 ./repo.diverged 8ba5aa92 1d Diverged commit
++ feature-changes !? ↑ 🤖 +50 -100 ↑1 ./repo.feature-changes b854b166 1d Add 100 lines
++ fix ?_ 💬 ./repo.fix b834638e 1d Initial commit
⚪ Showing 4 worktrees, 2 with changes, 2 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap b/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap
index 6e9580db4..fcc630c76 100644
--- a/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap
@@ -24,10 +24,10 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ feature-current ↑ ↑1 ./repo.feature-current fc28a4d1 23h Commit at 01:00
-^ main ^ ./repo 6c3da842 1d Initial commit on main
-+ feature-newest ↑ ↑1 ./repo.feature-newest 136358eb 21h Commit at 03:00
-+ feature-middle ↑ ↑1 ./repo.feature-middle a0a4851a 22h Commit at 02:00
-+ feature-oldest ↑ ↑1 ./repo.feature-oldest 1b1a2d78 23h Commit at 00:30
+@ feature-current ↑ ↑1 ./repo.feature-current fc28a4d1 23h Commit at 01:00
+^ main ^ ./repo 6c3da842 1d Initial commit on main
++ feature-newest ↑ ↑1 ./repo.feature-newest 136358eb 21h Commit at 03:00
++ feature-middle ↑ ↑1 ./repo.feature-middle a0a4851a 22h Commit at 02:00
++ feature-oldest ↑ ↑1 ./repo.feature-oldest 1b1a2d78 23h Commit at 00:30
⚪ Showing 5 worktrees, 4 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_primary_on_different_branch.snap b/tests/snapshots/integration__integration_tests__list__list_primary_on_different_branch.snap
index 8b970b75d..64839cc7c 100644
--- a/tests/snapshots/integration__integration_tests__list__list_primary_on_different_branch.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_primary_on_different_branch.snap
@@ -24,8 +24,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ develop ^ ⚐ ./repo b834638e 1d Initial commit
-+ feature-a _ ./repo.feature-a b834638e 1d Initial commit
-+ feature-b _ ./repo.feature-b b834638e 1d Initial commit
+@ develop ^ ⚐ ./repo b834638e 1d Initial commit
++ feature-a _ ./repo.feature-a b834638e 1d Initial commit
++ feature-b _ ./repo.feature-b b834638e 1d Initial commit
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snap b/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snap
index 9ac35b177..ce3236ae5 100644
--- a/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snap
@@ -20,8 +20,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ feature-a _ ./repo.feature-a b834638e 1d Initial commit
-+ feature-b _ ./repo.feature-b b834638e 1d Initial commit
+@ main ^ ./repo b834638e 1d Initial commit
++ feature-a _ ./repo.feature-a b834638e 1d Initial commit
++ feature-b _ ./repo.feature-b b834638e 1d Initial commit
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap b/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap
index dbe7e1e49..aa26f83f0 100644
--- a/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap
+++ b/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap
@@ -24,7 +24,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ locked-no-reason _ ⊠ ./repo.locked-no-reason b834638e 1d Initial commit
+@ main ^ ./repo b834638e 1d Initial commit
++ locked-no-reason _ ⊠ ./repo.locked-no-reason b834638e 1d Initial commit
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__locked_worktree.snap b/tests/snapshots/integration__integration_tests__list__locked_worktree.snap
index c62854c17..6cf2423a5 100644
--- a/tests/snapshots/integration__integration_tests__list__locked_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__locked_worktree.snap
@@ -24,7 +24,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ locked-feature _ ⊠ ./repo.locked-feature b834638e 1d Initial commit
+@ main ^ ./repo b834638e 1d Initial commit
++ locked-feature _ ⊠ ./repo.locked-feature b834638e 1d Initial commit
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__long_commit_message.snap b/tests/snapshots/integration__integration_tests__list__long_commit_message.snap
index ebf5d6c02..7ce33089e 100644
--- a/tests/snapshots/integration__integration_tests__list__long_commit_message.snap
+++ b/tests/snapshots/integration__integration_tests__list__long_commit_message.snap
@@ -24,7 +24,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo 1310bfb9 1d Short message
-+ feature-a _↓ ↓1 ./repo.feature-a f078644e 1d This is a very long commit message that should test how the…
+@ main ^ ./repo 1310bfb9 1d Short message
++ feature-a _↓ ↓1 ./repo.feature-a f078644e 1d This is a very long commit message that should test how the…
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap b/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap
index 100510500..24494d738 100644
--- a/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap
+++ b/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap
@@ -24,10 +24,10 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ medium-name _ ./repo.medium-name b834638e 1d Initial commit
-+ short _ ./repo.short b834638e 1d Initial commit
-+ very-long-branch-name-here _ ./repo.very-long-branch-name-here b834638e 1d Initial commit
-+ with-changes _ ./repo.with-changes b834638e 1d Initial commit
+@ main ^ ./repo b834638e 1d Initial commit
++ medium-name _ ./repo.medium-name b834638e 1d Initial commit
++ short _ ./repo.short b834638e 1d Initial commit
++ very-long-branch-name-here _ ./repo.very-long-branch-name-here b834638e 1d Initial commit
++ with-changes _ ./repo.with-changes b834638e 1d Initial commit
⚪ Showing 5 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap b/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap
index 8d96fc8d9..80b187272 100644
--- a/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap
+++ b/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap
@@ -25,7 +25,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^⇡ ./repo ⇡1 ⇣0 85ed6d3d 1d Main advances
-+ feature +!?⊘↕⇅⊠🤖 +2 -2 ↑2 ↓1 +3 -1 ./repo.feature ⇡1 ⇣1 4afb2b9e 1d Local commit
+@ main ^⇡ ./repo ⇡1 ⇣0 85ed6d3d 1d Main advances
++ feature +!?⊘↕⇅⊠🤖 +2 -2 ↑2 ↓1 +3 -1 ./repo.feature ⇡1 ⇣1 4afb2b9e 1d Local commit
⚪ Showing 2 worktrees, 1 with changes, 1 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__maximum_status_with_git_operation.snap b/tests/snapshots/integration__integration_tests__list__maximum_status_with_git_operation.snap
index 88f60586c..47ee0c631 100644
--- a/tests/snapshots/integration__integration_tests__list__maximum_status_with_git_operation.snap
+++ b/tests/snapshots/integration__integration_tests__list__maximum_status_with_git_operation.snap
@@ -25,7 +25,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ ./repo b7c14ce1 1d Main conflicting changes
-+ feature +!?✖ ⊠🤖 +7 ./repo.feature b7c14ce1 1d Main conflicting changes
+@ main ^ ./repo b7c14ce1 1d Main conflicting changes
++ feature +!?✖ ⊠🤖 +7 ./repo.feature b7c14ce1 1d Main conflicting changes
⚪ Showing 2 worktrees, 1 with changes
diff --git a/tests/snapshots/integration__integration_tests__list__maximum_working_tree_symbols.snap b/tests/snapshots/integration__integration_tests__list__maximum_working_tree_symbols.snap
index e4d1e7b30..4c786a494 100644
--- a/tests/snapshots/integration__integration_tests__list__maximum_working_tree_symbols.snap
+++ b/tests/snapshots/integration__integration_tests__list__maximum_working_tree_symbols.snap
@@ -24,7 +24,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ feature +!? ↑ +2 -3 ↑1 ./repo.feature 689c2504 1d Add files
+@ main ^ ./repo b834638e 1d Initial commit
++ feature +!? ↑ +2 -3 ↑1 ./repo.feature 689c2504 1d Add files
⚪ Showing 2 worktrees, 1 with changes, 1 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap
index 28d7ecbac..7a4cfd37c 100644
--- a/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap
@@ -24,8 +24,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ feature-a _ ./repo.feature-a b834638e 1d Initial commit
-+ feature-b _ ./repo.feature-b b834638e 1d Initial commit
+@ main ^ ./repo b834638e 1d Initial commit
++ feature-a _ ./repo.feature-a b834638e 1d Initial commit
++ feature-b _ ./repo.feature-b b834638e 1d Initial commit
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap b/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap
index 714dfcf98..ac47cb7c5 100644
--- a/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap
@@ -25,7 +25,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ feature _ ./repo.feature b834638e 1d Initial commit
+@ main ^ ./repo b834638e 1d Initial commit
++ feature _ ./repo.feature b834638e 1d Initial commit
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__previous_worktree_gutter.snap b/tests/snapshots/integration__integration_tests__list__previous_worktree_gutter.snap
index d15addcfa..536001725 100644
--- a/tests/snapshots/integration__integration_tests__list__previous_worktree_gutter.snap
+++ b/tests/snapshots/integration__integration_tests__list__previous_worktree_gutter.snap
@@ -24,7 +24,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-- feature _ ./repo.feature b834638e 1d Initial commit
+@ main ^ ./repo b834638e 1d Initial commit
+- feature _ ./repo.feature b834638e 1d Initial commit
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__progressive_flag.snap b/tests/snapshots/integration__integration_tests__list__progressive_flag.snap
index 81189e764..d59e023ea 100644
--- a/tests/snapshots/integration__integration_tests__list__progressive_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__progressive_flag.snap
@@ -25,8 +25,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ feature-a _ ./repo.feature-a b834638e 1d Initial commit
-+ feature-b _ ./repo.feature-b b834638e 1d Initial commit
+@ main ^ ./repo b834638e 1d Initial commit
++ feature-a _ ./repo.feature-a b834638e 1d Initial commit
++ feature-b _ ./repo.feature-b b834638e 1d Initial commit
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap b/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap
index 060b2bab6..e8c277aca 100644
--- a/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap
@@ -26,9 +26,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ feature-a _ ./repo.feature-a b834638e 1d Initial commit
- orphan-1 _ ⎇ b834638e 1d Initial commit
- orphan-2 _ ⎇ b834638e 1d Initial commit
+@ main ^ ./repo b834638e 1d Initial commit
++ feature-a _ ./repo.feature-a b834638e 1d Initial commit
+ orphan-1 _ ⎇ b834638e 1d Initial commit
+ orphan-2 _ ⎇ b834638e 1d Initial commit
⚪ Showing 2 worktrees, 2 branches
diff --git a/tests/snapshots/integration__integration_tests__list__readme_example_simple_list.snap b/tests/snapshots/integration__integration_tests__list__readme_example_simple_list.snap
index eb9f85364..1d2d930ac 100644
--- a/tests/snapshots/integration__integration_tests__list__readme_example_simple_list.snap
+++ b/tests/snapshots/integration__integration_tests__list__readme_example_simple_list.snap
@@ -24,8 +24,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo ⇡0 ⇣0 b834638e 1d Initial commit
-+ feature-x + ↑ +5 ↑3 ./repo.feature-x 6bba16d6 1h Add file 3
-+ bugfix-y ↑ ↑1 ./repo.bugfix-y bafa4cbd 2h Fix bug
+@ main ^ ./repo ⇡0 ⇣0 b834638e 1d Initial commit
++ feature-x + ↑ +5 ↑3 ./repo.feature-x 6bba16d6 1h Add file 3
++ bugfix-y ↑ ↑1 ./repo.bugfix-y bafa4cbd 2h Fix bug
⚪ Showing 3 worktrees, 1 with changes, 2 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__single_worktree.snap b/tests/snapshots/integration__integration_tests__list__single_worktree.snap
index 34feea6ee..f9ace8b73 100644
--- a/tests/snapshots/integration__integration_tests__list__single_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__single_worktree.snap
@@ -24,6 +24,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . b834638e 1d Initial commit
+@ main ^ . b834638e 1d Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list__status_column_padding_emoji.snap b/tests/snapshots/integration__integration_tests__list__status_column_padding_emoji.snap
index 61e657616..4053404bc 100644
--- a/tests/snapshots/integration__integration_tests__list__status_column_padding_emoji.snap
+++ b/tests/snapshots/integration__integration_tests__list__status_column_padding_emoji.snap
@@ -24,9 +24,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ main-symbol ↑ 💬 ↑1 ./repo.main-symbol 579fcd0b 1d Symbol commit
-+ pr-link ↑ 🤖 ↑1 ./repo.pr-link e17e7d2d 1d PR commit
-+ wli-sequence !? ↑ 🤖 +1 -112 ↑1 ./repo.wli-sequence a2483ffd 1d Initial content
+@ main ^ ./repo b834638e 1d Initial commit
++ main-symbol ↑ 💬 ↑1 ./repo.main-symbol 579fcd0b 1d Symbol commit
++ pr-link ↑ 🤖 ↑1 ./repo.pr-link e17e7d2d 1d PR commit
++ wli-sequence !? ↑ 🤖 +1 -112 ↑1 ./repo.wli-sequence a2483ffd 1d Initial content
⚪ Showing 4 worktrees, 1 with changes, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_detached_head.snap b/tests/snapshots/integration__integration_tests__list__task_dag_detached_head.snap
index 96892d824..a1ff0ac2d 100644
--- a/tests/snapshots/integration__integration_tests__list__task_dag_detached_head.snap
+++ b/tests/snapshots/integration__integration_tests__list__task_dag_detached_head.snap
@@ -25,6 +25,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ - ^ ⚐ . b834638e 1d Initial commit
+@ - ^ ⚐ . b834638e 1d Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_full_with_diffs.snap b/tests/snapshots/integration__integration_tests__list__task_dag_full_with_diffs.snap
index 476cf4513..cdd443f2f 100644
--- a/tests/snapshots/integration__integration_tests__list__task_dag_full_with_diffs.snap
+++ b/tests/snapshots/integration__integration_tests__list__task_dag_full_with_diffs.snap
@@ -26,8 +26,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ feature-a ?_ ./repo.feature-a b834638e 1d Initial commit
-+ feature-b ↑ ↑1 +1 -1 ./repo.feature-b 2d37ca75 1d Test commit
+@ main ^ ./repo b834638e 1d Initial commit
++ feature-a ?_ ./repo.feature-a b834638e 1d Initial commit
++ feature-b ↑ ↑1 +1 -1 ./repo.feature-b 2d37ca75 1d Test commit
⚪ Showing 3 worktrees, 1 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_many_worktrees.snap b/tests/snapshots/integration__integration_tests__list__task_dag_many_worktrees.snap
index 06e8e4cff..f8f39b4c7 100644
--- a/tests/snapshots/integration__integration_tests__list__task_dag_many_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__list__task_dag_many_worktrees.snap
@@ -25,16 +25,16 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ feature-1 _ ./repo.feature-1 b834638e 1d Initial commit
-+ feature-10 _ ./repo.feature-10 b834638e 1d Initial commit
-+ feature-2 _ ./repo.feature-2 b834638e 1d Initial commit
-+ feature-3 _ ./repo.feature-3 b834638e 1d Initial commit
-+ feature-4 _ ./repo.feature-4 b834638e 1d Initial commit
-+ feature-5 _ ./repo.feature-5 b834638e 1d Initial commit
-+ feature-6 _ ./repo.feature-6 b834638e 1d Initial commit
-+ feature-7 _ ./repo.feature-7 b834638e 1d Initial commit
-+ feature-8 _ ./repo.feature-8 b834638e 1d Initial commit
-+ feature-9 _ ./repo.feature-9 b834638e 1d Initial commit
+@ main ^ ./repo b834638e 1d Initial commit
++ feature-1 _ ./repo.feature-1 b834638e 1d Initial commit
++ feature-10 _ ./repo.feature-10 b834638e 1d Initial commit
++ feature-2 _ ./repo.feature-2 b834638e 1d Initial commit
++ feature-3 _ ./repo.feature-3 b834638e 1d Initial commit
++ feature-4 _ ./repo.feature-4 b834638e 1d Initial commit
++ feature-5 _ ./repo.feature-5 b834638e 1d Initial commit
++ feature-6 _ ./repo.feature-6 b834638e 1d Initial commit
++ feature-7 _ ./repo.feature-7 b834638e 1d Initial commit
++ feature-8 _ ./repo.feature-8 b834638e 1d Initial commit
++ feature-9 _ ./repo.feature-9 b834638e 1d Initial commit
⚪ Showing 11 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__list__task_dag_multiple_worktrees.snap
index 35b09016f..c9e1321d2 100644
--- a/tests/snapshots/integration__integration_tests__list__task_dag_multiple_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__list__task_dag_multiple_worktrees.snap
@@ -25,9 +25,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ feature-a _ ./repo.feature-a b834638e 1d Initial commit
-+ feature-b _ ./repo.feature-b b834638e 1d Initial commit
-+ feature-c _ ./repo.feature-c b834638e 1d Initial commit
+@ main ^ ./repo b834638e 1d Initial commit
++ feature-a _ ./repo.feature-a b834638e 1d Initial commit
++ feature-b _ ./repo.feature-b b834638e 1d Initial commit
++ feature-c _ ./repo.feature-c b834638e 1d Initial commit
⚪ Showing 4 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_ordering_stability.snap b/tests/snapshots/integration__integration_tests__list__task_dag_ordering_stability.snap
index ebbdcec92..3241ebad2 100644
--- a/tests/snapshots/integration__integration_tests__list__task_dag_ordering_stability.snap
+++ b/tests/snapshots/integration__integration_tests__list__task_dag_ordering_stability.snap
@@ -25,10 +25,10 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ feature-current ↑ ↑1 ./repo.feature-current fc28a4d1 23h Commit at 01:00
-^ main ^ ./repo 6c3da842 1d Initial commit on main
-+ feature-newest ↑ ↑1 ./repo.feature-newest 136358eb 21h Commit at 03:00
-+ feature-middle ↑ ↑1 ./repo.feature-middle a0a4851a 22h Commit at 02:00
-+ feature-oldest ↑ ↑1 ./repo.feature-oldest 1b1a2d78 23h Commit at 00:30
+@ feature-current ↑ ↑1 ./repo.feature-current fc28a4d1 23h Commit at 01:00
+^ main ^ ./repo 6c3da842 1d Initial commit on main
++ feature-newest ↑ ↑1 ./repo.feature-newest 136358eb 21h Commit at 03:00
++ feature-middle ↑ ↑1 ./repo.feature-middle a0a4851a 22h Commit at 02:00
++ feature-oldest ↑ ↑1 ./repo.feature-oldest 1b1a2d78 23h Commit at 00:30
⚪ Showing 5 worktrees, 4 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_single_worktree.snap b/tests/snapshots/integration__integration_tests__list__task_dag_single_worktree.snap
index d83612be2..cf5696f4e 100644
--- a/tests/snapshots/integration__integration_tests__list__task_dag_single_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__task_dag_single_worktree.snap
@@ -25,6 +25,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . b834638e 1d Initial commit
+@ main ^ . b834638e 1d Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_with_locked.snap b/tests/snapshots/integration__integration_tests__list__task_dag_with_locked.snap
index 773b56b45..7780ed2a7 100644
--- a/tests/snapshots/integration__integration_tests__list__task_dag_with_locked.snap
+++ b/tests/snapshots/integration__integration_tests__list__task_dag_with_locked.snap
@@ -25,8 +25,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ locked _ ⊠ ./repo.locked b834638e 1d Initial commit
-+ normal _ ./repo.normal b834638e 1d Initial commit
+@ main ^ ./repo b834638e 1d Initial commit
++ locked _ ⊠ ./repo.locked b834638e 1d Initial commit
++ normal _ ./repo.normal b834638e 1d Initial commit
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap b/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap
index 98bb73218..0d2155cde 100644
--- a/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap
+++ b/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap
@@ -26,8 +26,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ ./repo ⇡0 ⇣0 6c3da842 1d Initial commit on main
-+ ahead ↑⇡ ↑1 +1 ./repo.ahead ⇡1 ⇣0 2fff52c2 1d Ahead commit
-+ in-sync _ ./repo.in-sync ⇡0 ⇣0 6c3da842 1d Initial commit on main
+@ main ^ ./repo ⇡0 ⇣0 6c3da842 1d Initial commit on main
++ ahead ↑⇡ ↑1 +1 ./repo.ahead ⇡1 ⇣0 2fff52c2 1d Ahead commit
++ in-sync _ ./repo.in-sync ⇡0 ⇣0 6c3da842 1d Initial commit on main
⚪ Showing 3 worktrees, 1 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap
index 67b71ea57..6a09a66cf 100644
--- a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap
+++ b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap
@@ -24,7 +24,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo e4614cb7 1d Fix bug with café ☕ handling
-+ feature-test _↓ ↓1 ./repo.feature-test 0c53695b 1d Add support for 日本語 and émoji 🎉
+@ main ^ ./repo e4614cb7 1d Fix bug with café ☕ handling
++ feature-test _↓ ↓1 ./repo.feature-test 0c53695b 1d Add support for 日本語 and émoji 🎉
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__user_status_special_chars.snap b/tests/snapshots/integration__integration_tests__list__user_status_special_chars.snap
index 742fb8c60..96228ed1c 100644
--- a/tests/snapshots/integration__integration_tests__list__user_status_special_chars.snap
+++ b/tests/snapshots/integration__integration_tests__list__user_status_special_chars.snap
@@ -24,8 +24,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ emoji _ 🔄 ./repo.emoji b834638e 1d Initial commit
-+ multi _ 👨‍💻 ./repo.multi b834638e 1d Initial commit
+@ main ^ ./repo b834638e 1d Initial commit
++ emoji _ 🔄 ./repo.emoji b834638e 1d Initial commit
++ multi _ 👨‍💻 ./repo.multi b834638e 1d Initial commit
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap b/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap
index 35fde2cc4..9101c1d68 100644
--- a/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap
@@ -25,10 +25,10 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ feature-with-worktree _ ./repo.feature-with-worktree b834638e 1d Initial commit
- another-branch _ ⎇ b834638e 1d Initial commit
- feature-without-worktree _ ⎇ b834638e 1d Initial commit
- fix-bug _ ⎇ b834638e 1d Initial commit
+@ main ^ ./repo b834638e 1d Initial commit
++ feature-with-worktree _ ./repo.feature-with-worktree b834638e 1d Initial commit
+ another-branch _ ⎇ b834638e 1d Initial commit
+ feature-without-worktree _ ⎇ b834638e 1d Initial commit
+ fix-bug _ ⎇ b834638e 1d Initial commit
⚪ Showing 2 worktrees, 3 branches
diff --git a/tests/snapshots/integration__integration_tests__list__with_branches_flag_none_available.snap b/tests/snapshots/integration__integration_tests__list__with_branches_flag_none_available.snap
index b4c3ba253..f85f2c727 100644
--- a/tests/snapshots/integration__integration_tests__list__with_branches_flag_none_available.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_branches_flag_none_available.snap
@@ -25,8 +25,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ feature-a _ ./repo.feature-a b834638e 1d Initial commit
-+ feature-b _ ./repo.feature-b b834638e 1d Initial commit
+@ main ^ ./repo b834638e 1d Initial commit
++ feature-a _ ./repo.feature-a b834638e 1d Initial commit
++ feature-b _ ./repo.feature-b b834638e 1d Initial commit
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__with_branches_flag_only_branches.snap b/tests/snapshots/integration__integration_tests__list__with_branches_flag_only_branches.snap
index f7ebc73c0..5892863f0 100644
--- a/tests/snapshots/integration__integration_tests__list__with_branches_flag_only_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_branches_flag_only_branches.snap
@@ -25,9 +25,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . b834638e 1d Initial commit
- branch-alpha _ ⎇ b834638e 1d Initial commit
- branch-beta _ ⎇ b834638e 1d Initial commit
- branch-gamma _ ⎇ b834638e 1d Initial commit
+@ main ^ . b834638e 1d Initial commit
+ branch-alpha _ ⎇ b834638e 1d Initial commit
+ branch-beta _ ⎇ b834638e 1d Initial commit
+ branch-gamma _ ⎇ b834638e 1d Initial commit
⚪ Showing 1 worktrees, 3 branches
diff --git a/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap b/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap
index 5ebde7bd9..971299a0a 100644
--- a/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap
@@ -26,10 +26,10 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . ⇡0 ⇣0 b834638e 1d Initial commit
- local-only-1 _ ⎇ b834638e 1d Initial commit
- local-only-2 _ ⎇ b834638e 1d Initial commit
- origin/remote-only-1 _ ⎇ b834638e 1d Initial commit
- origin/remote-only-2 _ ⎇ b834638e 1d Initial commit
+@ main ^ . ⇡0 ⇣0 b834638e 1d Initial commit
+ local-only-1 _ ⎇ b834638e 1d Initial commit
+ local-only-2 _ ⎇ b834638e 1d Initial commit
+ origin/remote-only-1 _ ⎇ b834638e 1d Initial commit
+ origin/remote-only-2 _ ⎇ b834638e 1d Initial commit
⚪ Showing 1 worktrees, 2 branches, 2 remote branches
diff --git a/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap b/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap
index 577d88c1f..ba91c1847 100644
--- a/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap
@@ -25,8 +25,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo ⇡0 ⇣0 b834638e 1d Initial commit
-+ feature-with-worktree _ ./repo.feature-with-worktree b834638e 1d Initial commit
- origin/remote-only _ ⎇ b834638e 1d Initial commit
+@ main ^ ./repo ⇡0 ⇣0 b834638e 1d Initial commit
++ feature-with-worktree _ ./repo.feature-with-worktree b834638e 1d Initial commit
+ origin/remote-only _ ⎇ b834638e 1d Initial commit
⚪ Showing 2 worktrees, 1 remote branches
diff --git a/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap b/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap
index 70d3d4f3f..b4d2a06f5 100644
--- a/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap
@@ -25,8 +25,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . ⇡0 ⇣0 b834638e 1d Initial commit
- origin/remote-feature-1 _ ⎇ b834638e 1d Initial commit
- origin/remote-feature-2 _ ⎇ b834638e 1d Initial commit
+@ main ^ . ⇡0 ⇣0 b834638e 1d Initial commit
+ origin/remote-feature-1 _ ⎇ b834638e 1d Initial commit
+ origin/remote-feature-2 _ ⎇ b834638e 1d Initial commit
⚪ Showing 1 worktrees, 2 remote branches
diff --git a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
index 04a3c65f8..1e23e173f 100644
--- a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
@@ -27,11 +27,11 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ ./repo ⇡0 ⇣0 6c3da842 1d Initial commit on main
-+ ahead ↑⇡ ↑2 +2 ./repo.ahead ⇡2 ⇣0 8d8f4673 1d Ahead commit 2
-+ behind _ ⇣ ./repo.behind ⇡0 ⇣1 6c3da842 1d Initial commit on main
-+ diverged ↑⇅ ↑1 +1 ./repo.diverged ⇡1 ⇣1 ca7cb696 1d Diverged local commit
-+ in-sync _ ./repo.in-sync ⇡0 ⇣0 6c3da842 1d Initial commit on main
-+ no-upstream _ ./repo.no-upstream 6c3da842 1d Initial commit on main
+@ main ^ ./repo ⇡0 ⇣0 6c3da842 1d Initial commit on main
++ ahead ↑⇡ ↑2 +2 ./repo.ahead ⇡2 ⇣0 8d8f4673 1d Ahead commit 2
++ behind _ ⇣ ./repo.behind ⇡0 ⇣1 6c3da842 1d Initial commit on main
++ diverged ↑⇅ ↑1 +1 ./repo.diverged ⇡1 ⇣1 ca7cb696 1d Diverged local commit
++ in-sync _ ./repo.in-sync ⇡0 ⇣0 6c3da842 1d Initial commit on main
++ no-upstream _ ./repo.no-upstream 6c3da842 1d Initial commit on main
⚪ Showing 6 worktrees, 2 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__with_user_status.snap b/tests/snapshots/integration__integration_tests__list__with_user_status.snap
index e37d6c0f1..8b44a0cd4 100644
--- a/tests/snapshots/integration__integration_tests__list__with_user_status.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_user_status.snap
@@ -24,9 +24,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ feature-api ↑ 🤖 ↑1 ./repo.feature-api 9606cd0f 1d Add REST API endpoints
-+ review-ui ? ↑ 💬 ↑1 ./repo.review-ui afd3b353 1d Add dashboard component
-+ wip-docs ?_ ./repo.wip-docs b834638e 1d Initial commit
+@ main ^ ./repo b834638e 1d Initial commit
++ feature-api ↑ 🤖 ↑1 ./repo.feature-api 9606cd0f 1d Add REST API endpoints
++ review-ui ? ↑ 💬 ↑1 ./repo.review-ui afd3b353 1d Add dashboard component
++ wip-docs ?_ ./repo.wip-docs b834638e 1d Initial commit
⚪ Showing 4 worktrees, 2 ahead
diff --git a/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_alignment_check.snap b/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_alignment_check.snap
index de4f72d44..e4227c56b 100644
--- a/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_alignment_check.snap
+++ b/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_alignment_check.snap
@@ -24,7 +24,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ test +!? +1 -1 ./repo.test b834638e 1d Initial commit
+@ main ^ ./repo b834638e 1d Initial commit
++ test +!? +1 -1 ./repo.test b834638e 1d Initial commit
⚪ Showing 2 worktrees, 1 with changes
diff --git a/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_width_consistency.snap b/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_width_consistency.snap
index 6e29fc543..6d9db8270 100644
--- a/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_width_consistency.snap
+++ b/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_width_consistency.snap
@@ -24,8 +24,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ complex !? +1 -1 ./repo.complex b834638e 1d Initial commit
-+ simple + ? +1 -1 ./repo.simple b834638e 1d Initial commit
+@ main ^ ./repo b834638e 1d Initial commit
++ complex !? +1 -1 ./repo.complex b834638e 1d Initial commit
++ simple + ? +1 -1 ./repo.simple b834638e 1d Initial commit
⚪ Showing 3 worktrees, 2 with changes
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_branches_enabled.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_branches_enabled.snap
index c1b791dd6..9fcf97167 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_branches_enabled.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_branches_enabled.snap
@@ -26,6 +26,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . b834638e 1d Initial commit
+@ main ^ . b834638e 1d Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override.snap
index 436587b0d..971162e00 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override.snap
@@ -27,7 +27,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . b834638e 1d Initial commit
- feature _ ⎇ b834638e 1d Initial commit
+@ main ^ . b834638e 1d Initial commit
+ feature _ ⎇ b834638e 1d Initial commit
⚪ Showing 1 worktrees, 1 branches
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_full_and_branches.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_full_and_branches.snap
index c1b791dd6..9fcf97167 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_full_and_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_full_and_branches.snap
@@ -26,6 +26,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . b834638e 1d Initial commit
+@ main ^ . b834638e 1d Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_full_enabled.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_full_enabled.snap
index c1b791dd6..9fcf97167 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_full_enabled.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_full_enabled.snap
@@ -26,6 +26,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . b834638e 1d Initial commit
+@ main ^ . b834638e 1d Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_no_config.snap b/tests/snapshots/integration__integration_tests__list_config__list_no_config.snap
index c1b791dd6..9fcf97167 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_no_config.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_no_config.snap
@@ -26,6 +26,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . b834638e 1d Initial commit
+@ main ^ . b834638e 1d Initial commit
⚪ Showing 1 worktree
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 03b5831dd..08201a4b1 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
@@ -23,5 +23,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-⚪ Already up to date with main (no new commits, no rebase needed)
+⚪ 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 c80354018..f52e6b8b4 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
@@ -24,15 +24,15 @@ 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)
+🔄 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)
  * 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
+✅ 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 e9f2d53bd..24eeb6ff5 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
@@ -24,18 +24,18 @@ 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
-  Squash commits from main
+🔄 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
+  Squash commits from main
 
  Combined commits:
  - feat: initial feature
-✅ Squashed @ d118927
-🔄 Merging 1 commit to main @ d118927 (no rebase needed)
+✅ 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
+✅ 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 8b052df09..db1ac2de1 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
@@ -24,14 +24,14 @@ 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)
+🔄 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)
  * 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
+✅ 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 03b5831dd..08201a4b1 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
@@ -23,5 +23,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-⚪ Already up to date with main (no new commits, no rebase needed)
+⚪ 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 5fe6f2514..d61ed713b 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
@@ -24,15 +24,15 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🟡 Auto-staging 1 untracked file:
+🟡 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)
+🔄 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
+✅ Merged to main (1 commit, 1 file, +1)
+🔄 Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_error_conflicting_changes.snap b/tests/snapshots/integration__integration_tests__merge__merge_error_conflicting_changes.snap
index 243ce50f5..3c299b544 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_error_conflicting_changes.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_error_conflicting_changes.snap
@@ -24,8 +24,8 @@ exit_code: 1
----- stdout -----
----- stderr -----
-❌ Cannot push: conflicting uncommitted changes in:
+❌ Cannot push: conflicting uncommitted changes in:
  shared.txt
-💡 Commit or stash these changes in [REPO].main-wt first
+💡 Commit or stash these changes in [REPO].main-wt first
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_error_detached_head.snap b/tests/snapshots/integration__integration_tests__merge__merge_error_detached_head.snap
index 831097d91..4e142587f 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_error_detached_head.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_error_detached_head.snap
@@ -24,6 +24,6 @@ exit_code: 1
----- stdout -----
----- stderr -----
-❌ Cannot merge: not on a branch (detached HEAD)
+❌ Cannot merge: not on a branch (detached HEAD)
-💡 Switch to a branch first with 'git switch <branch>'
+💡 Switch to a branch first with 'git switch <branch>'
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_error_uncommitted_changes_no_commit.snap b/tests/snapshots/integration__integration_tests__merge__merge_error_uncommitted_changes_no_commit.snap
index ecde15a40..1ee512407 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_error_uncommitted_changes_no_commit.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_error_uncommitted_changes_no_commit.snap
@@ -26,6 +26,6 @@ exit_code: 1
----- stdout -----
----- stderr -----
-❌ Cannot merge with --no-commit: working tree has uncommitted changes
+❌ Cannot merge with --no-commit: working tree has uncommitted changes
-💡 Commit or stash them first
+💡 Commit or stash them first
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 0bd79455d..d98ecdafb 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
@@ -24,9 +24,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
+🔄 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
+✅ 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_commit_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_commit_not_fast_forward.snap
index eb2802379..0174f9f5e 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_commit_not_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_commit_not_fast_forward.snap
@@ -26,7 +26,7 @@ exit_code: 1
----- stdout -----
----- stderr -----
-❌ Can't push to local main branch: it has newer commits
+❌ Can't push to local main branch: it has newer commits
  * fb975b3 Add main file
-💡 Run 'wt merge' again to incorporate these changes
+💡 Run 'wt merge' again to incorporate these changes
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 13adff816..cf7a0e821 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap
@@ -24,5 +24,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-⚪ Already up to date with main (no new commits, no rebase needed)
-🔄 Removing no-commits worktree & branch in background
+⚪ 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 dac88343f..ec2b7409d 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
@@ -24,15 +24,15 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🟡 Auto-staging 1 untracked file:
+🟡 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)
+🔄 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
+✅ 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 4bf4c3a70..ae831ba48 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap
@@ -23,9 +23,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
+🔄 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
+✅ 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 bcef7647e..b19a84ec3 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
@@ -25,11 +25,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Merging 2 commits to main @ bf212d3 (no commit/squash/rebase needed)
+🔄 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
+✅ 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 95ffd24bd..5b2d76943 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
@@ -24,9 +24,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Merging 1 commit to main @ 4af48f0 (no commit/squash/rebase needed)
+🔄 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
+✅ 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 9ee4c9b28..e5609b41b 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
@@ -25,15 +25,15 @@ exit_code: 1
----- stdout -----
----- stderr -----
-🔄 Merging 1 commit to main @ cdb002e (no commit/squash/rebase needed)
+🔄 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:
+✅ Merged to main (1 commit, 1 file, +1)
+🔄 Removing feature worktree & branch in background
+🔄 Running post-merge:
  exit 1
-🟡 Command failed: exit status: 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
+💡 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 a3be7b53a..0a148cbd9 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
@@ -25,14 +25,14 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Merging 1 commit to main @ 8609b84 (no commit/squash/rebase needed)
+🔄 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:
+✅ 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
-🔄 Running post-merge deploy:
+🔄 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 e5fea9277..96e60ddf2 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
@@ -26,9 +26,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Merging 1 commit to main @ 72ff5fc (no commit/squash/rebase needed)
+🔄 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
+✅ 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 edd34c5f6..cb89787b1 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
@@ -25,12 +25,12 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Merging 1 commit to main @ 72ff5fc (no commit/squash/rebase needed)
+🔄 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:
+✅ 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 39b3c28d8..bb35e1137 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
@@ -24,8 +24,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
-⚪ Already up to date with main (no new commits, no rebase needed)
+⚪ Already up to date with main (no new commits, no rebase needed)
⚪ Worktree preserved (on main branch)
-🔄 Running post-merge:
+🔄 Running post-merge:
  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 ec4e07d69..daddee8df 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
@@ -25,8 +25,8 @@ 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:
+⚪ Already up to date with main (no new commits, no rebase needed)
+🔄 Removing feature worktree & branch in background
+🔄 Running post-merge:
  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 14f46eec8..5d3bfc300 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
@@ -25,10 +25,10 @@ exit_code: 1
----- stdout -----
----- stderr -----
-🟡 Auto-staging 1 untracked file:
+🟡 Auto-staging 1 untracked file:
  feature.txt
-🔄 Running pre-commit:
+🔄 Running pre-commit:
  exit 1
-❌ pre-commit command failed: exit status: 1
+❌ pre-commit command failed: exit status: 1
-💡 Use --no-verify to skip pre-commit commands
+💡 Use --no-verify to skip pre-commit commands
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap
index 3cfac261d..d5827cd33 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
@@ -25,18 +25,18 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🟡 Auto-staging 1 untracked file:
+🟡 Auto-staging 1 untracked file:
  feature.txt
-🔄 Running pre-commit:
+🔄 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)
+🔄 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
+✅ 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 7ef31dcbf..4b9863d01 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
@@ -25,8 +25,8 @@ exit_code: 1
----- stdout -----
----- stderr -----
-🔄 Running pre-merge:
+🔄 Running pre-merge:
  exit 1
-❌ pre-merge command failed: exit status: 1
+❌ pre-merge command failed: exit status: 1
-💡 Use --no-verify to skip pre-merge commands
+💡 Use --no-verify to skip pre-merge commands
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap
index e96cc2e0e..3ef51e65e 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
@@ -25,15 +25,15 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Running pre-merge format:
+🔄 Running pre-merge format:
  exit 0
-🔄 Running pre-merge lint:
+🔄 Running pre-merge lint:
  exit 0
-🔄 Running pre-merge test:
+🔄 Running pre-merge test:
  exit 0
-🔄 Merging 1 commit to main @ 2cbe2a2 (no commit/squash/rebase needed)
+🔄 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
+✅ 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 a2f8c7d3e..01f669d1b 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
@@ -25,11 +25,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Running pre-merge:
+🔄 Running pre-merge:
  exit 0
-🔄 Merging 1 commit to main @ 4b1199c (no commit/squash/rebase needed)
+🔄 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
+✅ 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 bd16edc08..51256108a 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
@@ -25,8 +25,8 @@ exit_code: 1
----- stdout -----
----- stderr -----
-🔄 Running pre-commit:
+🔄 Running pre-commit:
  exit 1
-❌ pre-commit command failed: exit status: 1
+❌ pre-commit command failed: exit status: 1
-💡 Use --no-verify to skip pre-commit commands
+💡 Use --no-verify to skip pre-commit commands
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap
index 4b5e01101..c6c55d430 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
@@ -25,12 +25,12 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Running pre-commit:
+🔄 Running pre-commit:
  echo 'Pre-commit check passed'
Pre-commit check passed
-🔄 Merging 1 commit to main @ 726717f (no commit/squash/rebase needed)
+🔄 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
+✅ 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 c186641ad..9e29d33de 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
@@ -24,9 +24,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
+🔄 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
+✅ 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 d16589213..8b97a8960 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
@@ -24,11 +24,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Rebasing onto main...
-✅ Rebased onto main
-🔄 Merging 1 commit to main @ 76778cc (no commit/squash needed)
+🔄 Rebasing onto main...
+✅ Rebased onto main
+🔄 Merging 1 commit to main @ 76778cc (no commit/squash needed)
  * 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
+✅ 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 471872937..9908dac11 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
@@ -25,9 +25,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
+🔄 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)
+✅ 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 f0ef6ce99..27c927360 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap
@@ -24,8 +24,8 @@ exit_code: 1
----- stdout -----
----- stderr -----
-🔄 Rebasing onto main...
-❌ Rebase onto main incomplete
+🔄 Rebasing onto main...
+❌ Rebase onto main incomplete
  Rebasing (1/1)
  error: could not apply c661874... Update shared.txt in feature
  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 c7965b947..9a55ac6ac 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
@@ -24,6 +24,6 @@ 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
+✅ Fast-forwarded to main
+⚪ Already up to date with main (no new commits)
+🔄 Removing fast-forward-test worktree & branch in background
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 5960f2b87..6afe37fa4 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
@@ -24,11 +24,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Rebasing onto main...
-✅ Rebased onto main
-🔄 Merging 1 commit to main @ ae48a8e (no commit/squash needed)
+🔄 Rebasing onto main...
+✅ Rebased onto main
+🔄 Merging 1 commit to main @ ae48a8e (no commit/squash needed)
  * 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
+✅ 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 9aaebfcc0..ca35232a7 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
@@ -24,21 +24,21 @@ exit_code: 0
----- stdout -----
----- 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
+🔄 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)
+✅ 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
+✅ 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 a68a404fe..1ceb1c099 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
@@ -24,15 +24,15 @@ exit_code: 0
----- stdout -----
----- 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
+🔄 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
+⚪ 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 275e4c26f..e73fbe31a 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
@@ -24,9 +24,9 @@ exit_code: 1
----- stdout -----
----- stderr -----
-🔄 Squashing 2 commits into a single commit (2 files, +2)...
-🔄 Generating squash commit message...
-❌ Commit generation command failed
+🔄 Squashing 2 commits into a single commit (2 files, +2)...
+🔄 Generating squash commit message...
+❌ Commit generation command failed
  Error: connection refused
⚪ Ran command:
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 5d2f12ff7..fd899c343 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
@@ -25,19 +25,19 @@ exit_code: 0
----- stdout -----
----- 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
+🔄 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)
+✅ 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
+✅ 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 36f4d340f..6dcec2b8f 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
@@ -24,9 +24,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Merging 1 commit to main @ 525a81f (no commit/squash/rebase needed)
+🔄 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
+✅ 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 75c49523f..b377bcd7b 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
@@ -24,13 +24,13 @@ 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)
+🔄 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)
  * 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
+✅ 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 0a34dfc63..d0c267dfd 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
@@ -26,20 +26,20 @@ 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
-  Squash commits from main
+🔄 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
+  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)
+✅ 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
+✅ 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 4bf4c3a70..ae831ba48 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
@@ -23,9 +23,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
+🔄 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
+✅ 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 f4e6fe583..ba3c4670f 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
@@ -24,11 +24,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Rebasing onto staging...
-✅ Rebased onto staging
-🔄 Merging 1 commit to staging @ 8280b9e (no commit/squash needed)
+🔄 Rebasing onto staging...
+✅ Rebased onto staging
+🔄 Merging 1 commit to staging @ 8280b9e (no commit/squash needed)
  * 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
+✅ 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 0bd79455d..d98ecdafb 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
@@ -24,9 +24,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
+🔄 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
+✅ 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 301d58767..0c21f9b8a 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap
@@ -24,9 +24,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
+🔄 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
+✅ 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 471872937..9908dac11 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
@@ -25,9 +25,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
+🔄 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)
+✅ 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 e02d48307..85585f509 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
@@ -26,23 +26,23 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🟡 Auto-staging 2 untracked files:
+🟡 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
+🔄 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)
+✅ 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
+✅ 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 5cc478106..cb4a85d68 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
@@ -26,9 +26,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Squashing 3 commits into a single commit (3 files, +33)...
-🔄 Generating squash commit message...
-  feat(auth): Implement JWT authentication system
+🔄 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,
  and authentication tests. This establishes the foundation for secure
@@ -37,8 +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:
+✅ 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)
@@ -50,19 +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:
+🔄 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)
+🔄 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:
+✅ 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 773c3dc05..1d3bebb24 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
@@ -27,12 +27,12 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Running post-create install:
+🔄 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:
+✅ 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 e27f6f81d..7e6e4c82d 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
@@ -26,14 +26,14 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Squashing 3 commits into a single commit (2 files, +45)...
-🔄 Generating squash commit message...
-  feat(api): Add user authentication endpoints
+🔄 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:
+✅ Squashed @ 69200cc
+🔄 Running pre-merge test:
  uv run pytest

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

All checks passed!
-🔄 Merging 1 commit to main @ 69200cc (no rebase needed)
+🔄 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
+✅ 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 9be75423e..be5a08902 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap
@@ -24,9 +24,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Merging 1 commit to main @ d29e0fd (no commit/squash/rebase needed)
+🔄 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
+✅ 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 fb7dc9e01..b2f06dafc 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
@@ -25,5 +25,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created new worktree for fix-auth from main at [REPO].fix-auth
-💡 Run `wt config shell install` to enable automatic cd
+✅ 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 0d4a2c4fa..eeb58674a 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
@@ -28,8 +28,8 @@ exit_code: 0
----- stdout -----
----- 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
+💡 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 f6fc46249..e09dea863 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
@@ -27,11 +27,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
-💡 Skipping pre-commit hook (--no-verify)
-🟡 Auto-staging 2 untracked files:
+💡 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
+🔄 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 f94e25162..05f247264 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
@@ -27,9 +27,9 @@ exit_code: 1
----- stdout -----
----- stderr -----
-🔄 Committing changes with default message...
-💡 Using fallback commit message. Run 'wt config --help' for LLM setup guide
-  WIP: Changes
-❌ Failed to commit
+🔄 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
  nothing to commit, working tree clean
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 656c422aa..920ba75d0 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
@@ -27,7 +27,7 @@ exit_code: 0
----- stdout -----
----- 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
+🔄 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 912685b81..775f131c5 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
@@ -28,14 +28,14 @@ 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
-  Squash commits from main
+💡 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
+  Squash commits from main
 
  Combined commits:
  - feat: add file 1
  - feat: add file 2
-✅ Squashed @ 9f7a3e2
+✅ Squashed @ 9f7a3e2
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 3d321a094..4203cff43 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
@@ -27,13 +27,13 @@ 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
-  Squash commits from main
+💡 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
+  Squash commits from main
 
  Combined commits:
  - feat: add file 1
  - feat: add file 2
-✅ Squashed @ 588aa53
+✅ Squashed @ 588aa53
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 3c70f4351..9b25e4a19 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
@@ -27,13 +27,13 @@ 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
-  Squash commits from main
+🔄 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
+  Squash commits from main
 
  Combined commits:
  - feat: add file 1
  - feat: add file 2
-✅ Squashed @ 6c0b38b
+✅ 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 ba2cf8137..94602687b 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
@@ -26,9 +26,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Running post-create:
+🔄 Running post-create:
  echo 'Setup done' > setup.txt
-✅ Created new worktree for feature from main at [REPO].feature
-💡 Run `wt config shell install` to enable automatic cd
-🔄 Running post-start server:
+✅ 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 36aebb2ee..2dd243d7a 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap
@@ -28,8 +28,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created new worktree for feature from main at [REPO].feature
-🔄 Running post-start:
+✅ Created new worktree for feature from main at [REPO].feature
+🔄 Running post-start:
  echo 'Background task' > background.txt
-🔄 Executing (--execute):
+🔄 Executing (--execute):
  echo 'Execute flag' > execute.txt
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__invalid_toml.snap b/tests/snapshots/integration__integration_tests__post_start_commands__invalid_toml.snap
index 56e530504..c30a5e3bf 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__invalid_toml.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__invalid_toml.snap
@@ -26,7 +26,7 @@ exit_code: 1
----- stdout -----
----- stderr -----
-❌ Failed to load project config
+❌ Failed to load project config
  Failed to parse TOML: TOML parse error at line 1, column 31
  |
  1 | post-create = [invalid syntax
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 1c66a6237..4d75b6633 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
@@ -26,8 +26,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Running post-create:
+🔄 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
+🟡 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 385c348eb..163f28bb3 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
@@ -26,11 +26,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Running post-create:
+🔄 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
+✅ 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 626c6263b..2a023d3d7 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
@@ -26,11 +26,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Running post-create:
+🔄 Running post-create:
  echo 'First'
First
-🔄 Running post-create:
+🔄 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
+✅ 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 9e8214a1b..bd56526f7 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
@@ -26,11 +26,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Running post-create install:
+🔄 Running post-create install:
  echo 'Installing deps'
Installing deps
-🔄 Running post-create setup:
+🔄 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
+✅ 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 b5ead8564..1f41f03dc 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
@@ -26,5 +26,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created new worktree for feature from main at [REPO].feature
-💡 Run `wt config shell install` to enable automatic cd
+✅ 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 5595e841f..0689fa3d5 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
@@ -26,8 +26,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Running post-create:
+🔄 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
+✅ 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 828123e4a..ab0800a3f 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
@@ -26,13 +26,13 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Running post-create:
+🔄 Running post-create:
  echo 'Repo: repo' > info.txt
-🔄 Running post-create:
+🔄 Running post-create:
  echo 'Branch: feature-test' >> info.txt
-🔄 Running post-create:
+🔄 Running post-create:
  echo 'Worktree: [REPO].feature-test' >> info.txt
-🔄 Running post-create:
+🔄 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
+✅ 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 1c4a190fe..ba985c73e 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
@@ -26,9 +26,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created new worktree for feature from main at [REPO].feature
-💡 Run `wt config shell install` to enable automatic cd
-🔄 Running post-start:
+✅ 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 8f5cd1760..a73c4691e 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
@@ -26,7 +26,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created new worktree for feature from main at [REPO].feature
-💡 Run `wt config shell install` to enable automatic cd
-🔄 Running post-start:
+✅ 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 e04d6e6cd..fd6da2eb7 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
@@ -26,7 +26,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created new worktree for feature from main at [REPO].feature
-💡 Run `wt config shell install` to enable automatic cd
-🔄 Running post-start:
+✅ 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 aa20dee63..a7c957528 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
@@ -26,7 +26,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created new worktree for feature from main at [REPO].feature
-💡 Run `wt config shell install` to enable automatic cd
-🔄 Running post-start:
+✅ 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 fade7da5a..7d032f3a7 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
@@ -26,9 +26,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created new worktree for feature from main at [REPO].feature
-💡 Run `wt config shell install` to enable automatic cd
-🔄 Running post-start:
+✅ 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 047592888..02d0681d7 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
@@ -26,9 +26,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created new worktree for feature from main at [REPO].feature
-💡 Run `wt config shell install` to enable automatic cd
-🔄 Running post-start task1:
+✅ 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:
+🔄 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 9611a7124..c92c7308a 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
@@ -26,11 +26,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created new worktree for feature from main at [REPO].feature
-💡 Run `wt config shell install` to enable automatic cd
-🔄 Running post-start task1:
+✅ 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:
+🔄 Running post-start task2:
  echo 'TASK2_OUTPUT'
-🔄 Running post-start task3:
+🔄 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 ddfeed570..fca1260e0 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
@@ -26,7 +26,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created new worktree for feature from main at [REPO].feature
-💡 Run `wt config shell install` to enable automatic cd
-🔄 Running post-start:
+✅ 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 858620e43..10325d739 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
@@ -25,5 +25,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🟡 Worktree for feature at [REPO].feature; cannot cd (no shell integration)
-💡 Run `wt config shell install` to enable automatic cd
+🟡 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 0aeed3dda..0a83ad3cf 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
@@ -25,10 +25,10 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Stashing changes in [REPO]...
-🔄 Pushing 1 commit to main @ 6551244
+🔄 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)
+🔄 Restoring stashed changes in [REPO]...
+✅ Pushed to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__push__push_dirty_target_overlap.snap b/tests/snapshots/integration__integration_tests__push__push_dirty_target_overlap.snap
index 8bfdc6cf3..8bf97a5f0 100644
--- a/tests/snapshots/integration__integration_tests__push__push_dirty_target_overlap.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_dirty_target_overlap.snap
@@ -25,8 +25,8 @@ exit_code: 1
----- stdout -----
----- stderr -----
-❌ Cannot push: conflicting uncommitted changes in:
+❌ Cannot push: conflicting uncommitted changes in:
  conflict.txt
-💡 Commit or stash these changes in [REPO] first
+💡 Commit or stash these changes in [REPO] first
diff --git a/tests/snapshots/integration__integration_tests__push__push_error_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_error_not_fast_forward.snap
index 753eb029f..0efd8c567 100644
--- a/tests/snapshots/integration__integration_tests__push__push_error_not_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_error_not_fast_forward.snap
@@ -25,7 +25,7 @@ exit_code: 1
----- stdout -----
----- stderr -----
-❌ Can't push to local main branch: it has newer commits
+❌ Can't push to local main branch: it has newer commits
  * 5ca21c8 Main commit
-💡 Use 'wt step rebase' or 'wt merge' to rebase onto main
+💡 Use 'wt step rebase' or 'wt merge' to rebase onto main
diff --git a/tests/snapshots/integration__integration_tests__push__push_error_with_merge_commits.snap b/tests/snapshots/integration__integration_tests__push__push_error_with_merge_commits.snap
index 05f22d18e..3e2ccf6c4 100644
--- a/tests/snapshots/integration__integration_tests__push__push_error_with_merge_commits.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_error_with_merge_commits.snap
@@ -25,6 +25,6 @@ exit_code: 1
----- stdout -----
----- stderr -----
-❌ Found merge commits in push range
+❌ Found merge commits in push range
-💡 Use --allow-merge-commits to push non-linear history
+💡 Use --allow-merge-commits to push non-linear history
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 dc96d9984..7b28df25d 100644
--- a/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap
@@ -25,8 +25,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Pushing 1 commit to main @ c2e2bcc
+🔄 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)
+✅ 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 fc8cf9898..6e30f4e38 100644
--- a/tests/snapshots/integration__integration_tests__push__push_no_remote.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_no_remote.snap
@@ -24,8 +24,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Pushing 1 commit to main @ 6551244
+🔄 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)
+✅ 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 6ebdcc633..3e538b44b 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
@@ -25,8 +25,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Pushing 1 commit to main @ 4af48f0
+🔄 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)
+✅ 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 fc8cf9898..6e30f4e38 100644
--- a/tests/snapshots/integration__integration_tests__push__push_to_default.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_to_default.snap
@@ -24,8 +24,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Pushing 1 commit to main @ 6551244
+🔄 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)
+✅ 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 937d1df71..8a8534efd 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
@@ -26,7 +26,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Pushing 3 commits to main @ 13bed7b (merge commits allowed)
+🔄 Pushing 3 commits to main @ 13bed7b (merge commits allowed)
  * 13bed7b Merge temp
  |/
  | * 1f38fab Commit 2
@@ -35,4 +35,4 @@ exit_code: 0
  file1.txt | 1 +
  file2.txt | 1 +
  2 files changed, 2 insertions(+)
-✅ Pushed to main (3 commits, 2 files, +2)
+✅ 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 a978464bd..ea9d15404 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
@@ -23,4 +23,4 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Removing main worktree & branch in background
+🔄 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 1ce643f9c..dcd56baa3 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
@@ -24,5 +24,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-⚪ No worktree found for branch feature-squashed
-✅ Removed branch feature-squashed
+⚪ 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 604cf0d58..c68c9ff65 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
@@ -24,4 +24,4 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Removing feature-unmerged worktree in background; retaining unmerged branch
+🔄 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 25adaf15a..4a8283a07 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
@@ -25,5 +25,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-⚪ No worktree found for branch feature-force
-✅ Removed branch feature-force (--force-delete)
+⚪ 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 862062664..d42cd9080 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
@@ -24,5 +24,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-⚪ No worktree found for branch feature-merged
-✅ Removed branch feature-merged
+⚪ 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 cd93cdb95..7e95bdabf 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
@@ -24,6 +24,6 @@ exit_code: 0
----- stdout -----
----- stderr -----
-⚪ No worktree found for branch feature-unmerged
-🟡 Could not delete branch feature-unmerged
+⚪ 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_dirty_target.snap b/tests/snapshots/integration__integration_tests__remove__remove_by_name_dirty_target.snap
index 04982ecc4..c46c433af 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_by_name_dirty_target.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_by_name_dirty_target.snap
@@ -24,6 +24,6 @@ exit_code: 1
----- stdout -----
----- stderr -----
-❌ Cannot remove worktree: working tree has uncommitted changes
+❌ Cannot remove worktree: working tree has uncommitted changes
-💡 Commit or stash them first
+💡 Commit or stash them first
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 51af4afa3..68b1d290b 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
@@ -24,4 +24,4 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Removing feature-a worktree & branch in background
+🔄 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 f31cb1a98..817ee54e6 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
@@ -24,4 +24,4 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Removing feature-b worktree & branch in background
+🔄 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 c8c869f0a..9bd68b5c0 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
@@ -24,4 +24,4 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Removing feature-current worktree & branch in background
+🔄 Removing feature-current worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_dirty_working_tree.snap b/tests/snapshots/integration__integration_tests__remove__remove_dirty_working_tree.snap
index e62325adf..fb3e9bca6 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_dirty_working_tree.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_dirty_working_tree.snap
@@ -23,6 +23,6 @@ exit_code: 1
----- stdout -----
----- stderr -----
-❌ Cannot remove worktree: working tree has uncommitted changes
+❌ Cannot remove worktree: working tree has uncommitted changes
-💡 Commit or stash them first
+💡 Commit or stash them first
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_foreground.snap b/tests/snapshots/integration__integration_tests__remove__remove_foreground.snap
index e7e757226..4d26d627e 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_foreground.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_foreground.snap
@@ -25,5 +25,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Removing worktree for feature-fg...
-✅ Removed worktree & branch for feature-fg
+🔄 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 10c96246b..9709f7f06 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap
@@ -23,4 +23,4 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Removing feature-wt worktree & branch in background
+🔄 Removing feature-wt worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap b/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap
index 661d30994..21c645e7b 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap
@@ -15,7 +15,8 @@ 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
@@ -24,4 +25,4 @@ exit_code: 0
cd '[REPO]'
----- stderr -----
-🔄 Removing feature-internal worktree & branch in background
+🔄 Removing feature-internal 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 f2654aa5a..42f074f07 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
@@ -26,6 +26,6 @@ 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
+🔄 Removing feature-b worktree & branch in background
+🔄 Removing feature-c worktree & branch in background
+🔄 Removing feature-a worktree & branch in background
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 476674456..5283e05ad 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap
@@ -26,6 +26,6 @@ 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
+🔄 Removing feature-a worktree & branch in background
+🔄 Removing feature-b worktree & branch in background
+🔄 Removing feature-c worktree & branch in background
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 14c70836b..65c760d8a 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
@@ -25,4 +25,4 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Removing feature-keep worktree in background; retaining branch (--no-delete-branch)
+🔄 Removing feature-keep worktree in background; retaining branch (--no-delete-branch)
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_nonexistent_worktree.snap b/tests/snapshots/integration__integration_tests__remove__remove_nonexistent_worktree.snap
index f66f84d2a..656118cd4 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_nonexistent_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_nonexistent_worktree.snap
@@ -24,4 +24,4 @@ exit_code: 1
----- stdout -----
----- stderr -----
-❌ No worktree found for branch nonexistent
+❌ No worktree found for branch nonexistent
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 3ab4aca9d..e2a85b762 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
@@ -23,4 +23,4 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🔄 Removing feature worktree & branch in background
+🔄 Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__security__branch_name_with_cd_directive_not_executed.snap b/tests/snapshots/integration__integration_tests__security__branch_name_with_cd_directive_not_executed.snap
index 5ea3f5940..cc2627acc 100644
--- a/tests/snapshots/integration__integration_tests__security__branch_name_with_cd_directive_not_executed.snap
+++ b/tests/snapshots/integration__integration_tests__security__branch_name_with_cd_directive_not_executed.snap
@@ -17,7 +17,8 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
+ WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: false
@@ -25,6 +26,6 @@ exit_code: 1
----- stdout -----
----- stderr -----
-❌ Branch __WORKTRUNK_CD__/tmp already exists
+❌ Branch __WORKTRUNK_CD__/tmp already exists
-💡 Remove --create flag to switch to it
+💡 Remove --create flag to switch to it
diff --git a/tests/snapshots/integration__integration_tests__security__commit_message_with_directive_not_executed.snap b/tests/snapshots/integration__integration_tests__security__commit_message_with_directive_not_executed.snap
index e3521343d..4ff8d3f49 100644
--- a/tests/snapshots/integration__integration_tests__security__commit_message_with_directive_not_executed.snap
+++ b/tests/snapshots/integration__integration_tests__security__commit_message_with_directive_not_executed.snap
@@ -24,7 +24,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo f9d58892 1d Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
-+ feature _ ./repo.feature f9d58892 1d Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
+@ main ^ ./repo f9d58892 1d Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
++ feature _ ./repo.feature f9d58892 1d Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__security__error_message_with_directive_not_executed.snap b/tests/snapshots/integration__integration_tests__security__error_message_with_directive_not_executed.snap
index 2dc7c0334..9fc102253 100644
--- a/tests/snapshots/integration__integration_tests__security__error_message_with_directive_not_executed.snap
+++ b/tests/snapshots/integration__integration_tests__security__error_message_with_directive_not_executed.snap
@@ -16,7 +16,8 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
+ WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: false
@@ -24,5 +25,5 @@ exit_code: 1
----- stdout -----
----- stderr -----
-❌ Failed to create worktree for __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked6
+❌ Failed to create worktree for __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked6
  fatal: invalid reference: __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked6
diff --git a/tests/snapshots/integration__integration_tests__security__path_with_directive_not_executed.snap b/tests/snapshots/integration__integration_tests__security__path_with_directive_not_executed.snap
index 5dacfa1cd..d8e6b485a 100644
--- a/tests/snapshots/integration__integration_tests__security__path_with_directive_not_executed.snap
+++ b/tests/snapshots/integration__integration_tests__security__path_with_directive_not_executed.snap
@@ -24,6 +24,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . b834638e 1d Initial commit
+@ main ^ . b834638e 1d Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_empty_diffs.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_empty_diffs.snap
index 328bcf38b..1b95144bb 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_empty_diffs.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_empty_diffs.snap
@@ -24,9 +24,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ also-no-changes _ ./repo.also-no-changes b834638e 1d Initial commit
-+ no-changes _ ./repo.no-changes b834638e 1d Initial commit
-+ with-changes ! +1 -1 ./repo.with-changes b834638e 1d Initial commit
+@ main ^ ./repo b834638e 1d Initial commit
++ also-no-changes _ ./repo.also-no-changes b834638e 1d Initial commit
++ no-changes _ ./repo.no-changes b834638e 1d Initial commit
++ with-changes ! +1 -1 ./repo.with-changes b834638e 1d Initial commit
⚪ Showing 4 worktrees, 1 with changes
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_extreme_diffs.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_extreme_diffs.snap
index cf39e2e9b..867e84632 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_extreme_diffs.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_extreme_diffs.snap
@@ -24,8 +24,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ huge ?_ ./repo.huge b834638e 1d Initial commit
-+ tiny ! +1 -1 ./repo.tiny b834638e 1d Initial commit
+@ main ^ ./repo b834638e 1d Initial commit
++ huge ?_ ./repo.huge b834638e 1d Initial commit
++ tiny ! +1 -1 ./repo.tiny b834638e 1d Initial commit
⚪ Showing 3 worktrees, 1 with changes
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_varying_diffs.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_varying_diffs.snap
index 7eb1cdc94..ea6e17ba3 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_varying_diffs.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_varying_diffs.snap
@@ -24,9 +24,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ feature-large ?_ ./repo.feature-large b834638e 1d Initial commit
-+ feature-medium ?_ ./repo.feature-medium b834638e 1d Initial commit
-+ feature-small ?_ ./repo.feature-small b834638e 1d Initial commit
+@ main ^ ./repo b834638e 1d Initial commit
++ feature-large ?_ ./repo.feature-large b834638e 1d Initial commit
++ feature-medium ?_ ./repo.feature-medium b834638e 1d Initial commit
++ feature-small ?_ ./repo.feature-small b834638e 1d Initial commit
⚪ Showing 4 worktrees
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__long_branch_names.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__long_branch_names.snap
index e06e43f15..5febb6cd0 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__long_branch_names.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__long_branch_names.snap
@@ -24,9 +24,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age
-@ main ^ ./repo b834638e 1d
-+ another-extremely-long-name-here _ ./repo.another-extremely-long-name-here b834638e 1d
-+ short _ ./repo.short b834638e 1d
-+ very-long-feature-branch-name _ ./repo.very-long-feature-branch-name b834638e 1d
+@ main ^ ./repo b834638e 1d
++ another-extremely-long-name-here _ ./repo.another-extremely-long-name-here b834638e 1d
++ short _ ./repo.short b834638e 1d
++ very-long-feature-branch-name _ ./repo.very-long-feature-branch-name b834638e 1d
⚪ Showing 4 worktrees, 1 column hidden
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__mixed_length_branch_names.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__mixed_length_branch_names.snap
index 5437e36fa..304e33e3e 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__mixed_length_branch_names.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__mixed_length_branch_names.snap
@@ -24,9 +24,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Remote⇅ Commit Age Message
-@ main ^ b834638e 1d Initial commit
-+ extremely-long-branch-name-that-might-cause-layout-issues _ b834638e 1d Initial commit
-+ medium _ b834638e 1d Initial commit
-+ x _ b834638e 1d Initial commit
+@ main ^ b834638e 1d Initial commit
++ extremely-long-branch-name-that-might-cause-layout-issues _ b834638e 1d Initial commit
++ medium _ b834638e 1d Initial commit
++ x _ b834638e 1d Initial commit
⚪ Showing 4 worktrees, 1 column hidden
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__short_branch_names.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__short_branch_names.snap
index 96a55d61d..f392c4a92 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__short_branch_names.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__short_branch_names.snap
@@ -24,9 +24,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ a _ ./repo.a b834638e 1d Initial commit
-+ bb _ ./repo.bb b834638e 1d Initial commit
-+ ccc _ ./repo.ccc b834638e 1d Initial commit
+@ main ^ ./repo b834638e 1d Initial commit
++ a _ ./repo.a b834638e 1d Initial commit
++ bb _ ./repo.bb b834638e 1d Initial commit
++ ccc _ ./repo.ccc b834638e 1d Initial commit
⚪ Showing 4 worktrees
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__unicode_branch_names.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__unicode_branch_names.snap
index 6d0ec315f..a191adb06 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__unicode_branch_names.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__unicode_branch_names.snap
@@ -24,9 +24,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ cafe _ ./repo.cafe b834638e 1d Initial commit
-+ naive _ ./repo.naive b834638e 1d Initial commit
-+ resume _ ./repo.resume b834638e 1d Initial commit
+@ main ^ ./repo b834638e 1d Initial commit
++ cafe _ ./repo.cafe b834638e 1d Initial commit
++ naive _ ./repo.naive b834638e 1d Initial commit
++ resume _ ./repo.resume b834638e 1d Initial commit
⚪ Showing 4 worktrees
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 6e0badf12..622745952 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
@@ -28,5 +28,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created new worktree for new-feature from main at [REPO].new-feature
-💡 Run `wt config shell install` to enable automatic cd
+✅ 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 b3c1c5900..cf88b6150 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
@@ -27,5 +27,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🟡 --base flag is only used with --create, ignoring
-⚪ Already on worktree for main at [REPO]
+🟡 --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_existing_error.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_existing_error.snap
index 9cf45fabb..a70696fa7 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_create_existing_error.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_create_existing_error.snap
@@ -26,6 +26,6 @@ exit_code: 1
----- stdout -----
----- stderr -----
-❌ Branch feature-y already exists
+❌ Branch feature-y already exists
-💡 Remove --create flag to switch to it
+💡 Remove --create flag to switch to it
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 a938e438d..430086b0c 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_create_new.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_create_new.snap
@@ -26,5 +26,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created new worktree for feature-x from main at [REPO].feature-x
-💡 Run `wt config shell install` to enable automatic cd
+✅ 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 6f66affc4..42bac9371 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
@@ -26,5 +26,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created new worktree for feature from main at [REPO].feature
-💡 Run `wt config shell install` to enable automatic cd
+✅ 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 755accd9a..9ef1b3bb7 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
@@ -26,7 +26,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🟡 Branch remote-feature exists on remote (origin/remote-feature); creating new branch from base instead
-💡 Use 'wt switch remote-feature' (without --create) to switch to the remote branch
-✅ Created new worktree for remote-feature from main at [REPO].remote-feature
-💡 Run `wt config shell install` to enable automatic cd
+🟡 Branch remote-feature exists on remote (origin/remote-feature); creating new branch from base instead
+💡 Use 'wt switch remote-feature' (without --create) to switch to the remote branch
+✅ 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 d809b6170..9aa1f7f30 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
@@ -25,5 +25,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Switched to worktree for main at [REPO].main
-💡 Run `wt config shell install` to enable automatic cd
+✅ 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_error_missing_directory.snap b/tests/snapshots/integration__integration_tests__switch__switch_error_missing_directory.snap
index f9482b5c1..c076fd922 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_error_missing_directory.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_error_missing_directory.snap
@@ -25,6 +25,6 @@ exit_code: 1
----- stdout -----
----- stderr -----
-❌ Worktree directory missing for missing-wt
+❌ Worktree directory missing for missing-wt
-💡 Run 'git worktree prune' to clean up
+💡 Run 'git worktree prune' to clean up
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_error_path_occupied.snap b/tests/snapshots/integration__integration_tests__switch__switch_error_path_occupied.snap
index 15af8da73..2ba0f0d02 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_error_path_occupied.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_error_path_occupied.snap
@@ -26,6 +26,6 @@ exit_code: 1
----- stdout -----
----- stderr -----
-❌ Cannot create worktree for occupied-branch: target path already exists
+❌ Cannot create worktree for occupied-branch: target path already exists
-💡 Reuse the existing worktree at [REPO]/../repo.occupied-branch or remove it before retrying
+💡 Reuse the existing worktree at [REPO]/../repo.occupied-branch or remove it before retrying
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 b4587b645..1fcce9193 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snap
@@ -28,6 +28,6 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created new worktree for file-test from main at [REPO].file-test
-🔄 Executing (--execute):
+✅ 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 ac1e05b83..add03ce87 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap
@@ -27,6 +27,6 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Switched to worktree for existing-exec at [REPO].existing-exec
-🔄 Executing (--execute):
+✅ 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 f3a5137ae..ad139ba7f 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap
@@ -28,6 +28,6 @@ exit_code: 1
----- stdout -----
----- stderr -----
-✅ Created new worktree for fail-test from main at [REPO].fail-test
-🔄 Executing (--execute):
+✅ 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 fe3df4b2e..dd8dba354 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap
@@ -31,8 +31,8 @@ line2
line3
----- stderr -----
-✅ Created new worktree for multiline-test from main at [REPO].multiline-test
-🔄 Executing (--execute):
+✅ 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 1ba5e09c0..acd3e9bf0 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap
@@ -29,6 +29,6 @@ exit_code: 0
test output
----- stderr -----
-✅ Created new worktree for exec-test from main at [REPO].exec-test
-🔄 Executing (--execute):
+✅ 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 994d30744..573a0df19 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snap
@@ -25,5 +25,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🟡 Worktree for feature-z at [REPO].feature-z; cannot cd (no shell integration)
-💡 Run `wt config shell install` to enable automatic cd
+🟡 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_internal.snap b/tests/snapshots/integration__integration_tests__switch__switch_existing_internal.snap
index 4b61944c3..24ffc6481 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_existing_internal.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_existing_internal.snap
@@ -17,7 +17,7 @@ info:
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
@@ -27,4 +27,4 @@ exit_code: 0
cd '[REPO].existing-wt'
----- stderr -----
-✅ Switched to worktree for existing-wt at [REPO].existing-wt
+✅ Switched to worktree for existing-wt at [REPO].existing-wt
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 26c3422e2..72773bd58 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
@@ -25,4 +25,4 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Switched to worktree for shell-configured at [REPO].shell-configured
+✅ Switched to worktree for shell-configured at [REPO].shell-configured
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_exit_code.snap b/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_exit_code.snap
index e635f1572..75e0fd2af 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_exit_code.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_exit_code.snap
@@ -20,7 +20,7 @@ info:
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
@@ -31,6 +31,6 @@ cd '[REPO].exit-code-test'
exit 42
----- stderr -----
-✅ Created new worktree for exit-code-test from main at [REPO].exit-code-test
-🔄 Executing (--execute):
+✅ Created new worktree for exit-code-test from main at [REPO].exit-code-test
+🔄 Executing (--execute):
  exit 42
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_output_then_exit.snap b/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_output_then_exit.snap
index 2da7e7cb4..4ae99c130 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_output_then_exit.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_output_then_exit.snap
@@ -20,7 +20,7 @@ info:
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
@@ -32,7 +32,7 @@ echo 'doing work'
exit 7
----- stderr -----
-✅ Created new worktree for output-exit-test from main at [REPO].output-exit-test
-🔄 Executing (--execute):
+✅ Created new worktree for output-exit-test from main at [REPO].output-exit-test
+🔄 Executing (--execute):
  echo 'doing work'
  exit 7
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_internal_mode.snap b/tests/snapshots/integration__integration_tests__switch__switch_internal_mode.snap
index 081d03ac1..dac2f49f5 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_internal_mode.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_internal_mode.snap
@@ -18,7 +18,8 @@ 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
@@ -27,4 +28,4 @@ exit_code: 0
cd '[REPO].internal-test'
----- stderr -----
-✅ Created new worktree for internal-test from main at [REPO].internal-test
+✅ Created new worktree for internal-test from main at [REPO].internal-test
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snap b/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snap
index 68c559e2b..afa8e3326 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snap
@@ -20,7 +20,7 @@ info:
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
- SOURCE_DATE_EPOCH: "1761609600"
+ SOURCE_DATE_EPOCH: "1735776000"
WORKTRUNK_BIN: ""
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
@@ -32,7 +32,7 @@ echo 'line1'
echo 'line2'
----- stderr -----
-✅ Created new worktree for exec-internal from main at [REPO].exec-internal
-🔄 Executing (--execute):
+✅ Created new worktree for exec-internal from main at [REPO].exec-internal
+🔄 Executing (--execute):
  echo 'line1'
  echo 'line2'
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 636a1af55..cdc3c8bdc 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_main_branch.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_main_branch.snap
@@ -25,4 +25,4 @@ exit_code: 0
----- stdout -----
----- stderr -----
-⚪ Already on worktree for main at [REPO]
+⚪ 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 f5a6ed5c2..11b2d860d 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
@@ -25,5 +25,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Switched to worktree for feature-a at [REPO].feature-a
-💡 Run `wt config shell install` to enable automatic cd
+✅ 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 57c02c25f..f07208264 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch.snap
@@ -25,5 +25,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🟡 Worktree for feature-a at [REPO].feature-a; cannot cd (no shell integration)
-💡 Run `wt config shell install` to enable automatic cd
+🟡 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 f5a6ed5c2..11b2d860d 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
@@ -25,5 +25,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Switched to worktree for feature-a at [REPO].feature-a
-💡 Run `wt config shell install` to enable automatic cd
+✅ 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_no_history.snap b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_no_history.snap
index 6f8bd9c24..94e2185cc 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_no_history.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_no_history.snap
@@ -25,4 +25,4 @@ exit_code: 1
----- stdout -----
----- stderr -----
-❌ No previous branch found in history. Use 'wt list' to see available worktrees.
+❌ No previous branch found in history. Use 'wt list' to see available worktrees.
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 551279b40..e3b2509e8 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
@@ -25,5 +25,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Switched to worktree for feature-b at [REPO].feature-b
-💡 Run `wt config shell install` to enable automatic cd
+✅ 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 1e18d193c..aac1adc38 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
@@ -25,5 +25,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🟡 Worktree for feature-x at [REPO].feature-x; cannot cd (no shell integration)
-💡 Run `wt config shell install` to enable automatic cd
+🟡 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 3005d275c..38a1d787b 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
@@ -25,5 +25,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Switched to worktree for feature-x at [REPO].feature-x
-💡 Run `wt config shell install` to enable automatic cd
+✅ 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 ffeadf97e..78a9fc444 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
@@ -25,5 +25,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Switched to worktree for feature-y at [REPO].feature-y
-💡 Run `wt config shell install` to enable automatic cd
+✅ 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 eec1e5cad..c6b6cddc3 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
@@ -26,5 +26,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created new worktree for feature-from-main from main at [REPO].feature-from-main
-💡 Run `wt config shell install` to enable automatic cd
+✅ 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 1792a9147..18883e992 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
@@ -25,5 +25,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🟡 Worktree for existing-branch at [REPO].existing-branch; cannot cd (no shell integration)
-💡 Run `wt config shell install` to enable automatic cd
+🟡 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 50eb05bdc..809b3ade1 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_with_base.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_with_base.snap
@@ -28,5 +28,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-✅ Created new worktree for feature-with-base from main at [REPO].feature-with-base
-💡 Run `wt config shell install` to enable automatic cd
+✅ Created new worktree for feature-with-base from main at [REPO].feature-with-base
+💡 Run `wt config shell install` to enable automatic cd