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.lockindex 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.tomlindex 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.rsindex 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 executionlet 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 visiblestderr().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.rsindex 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.rsindex 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 existsif 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 pathlet 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 existsif !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::Resulfor 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 rootlet 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 existsif !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) shellsfor (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>) -> anyhowlet 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 commandpub 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.rsindex 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.rsindex 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.rsindex 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 indicatorspub 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 alignmentlet 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 activityif !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 statusdiff --git a/src/commands/merge.rs b/src/commands/merge.rsindex 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 compatibilityif !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.rsindex 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.rsindex 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.rsindex 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 messagelet 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 commitif !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 resultif 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.rsindex 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 flagif 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 usedlet 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 pushedlet 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.rsindex 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 printingdiff --git a/src/main.rs b/src/main.rsindex 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 shellsfor (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 activationif 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 resultsfor 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 resultsfor 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 completionsfor (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 Displayif 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 gutterlet 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.rsindex 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 runpub 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 dolet 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.rsindex 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 branchlet (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 leakmatch 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.rsindex 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 usepub 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 usepub 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 usepub 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 usepub 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 usepub 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.rsindex 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: [1m~/.config/worktrunk/config.toml[0m+ ⚪ Global config already exists: [1m~/.config/worktrunk/config.toml[22m- 💡 [2mUse 'wt config show' to view existing configuration[0m- 💡 [2mUse 'wt config create --help' for config format reference[0m+ 💡 [2mUse 'wt config show' to view existing configuration[22m+ 💡 [2mUse 'wt config create --help' for config format reference[22m");});}@@ -59,9 +59,9 @@ fn test_config_init_creates_file() {----- stdout ---------- stderr ------ ✅ [32mCreated config file: [1m[32m~/.config/worktrunk/config.toml[0m[0m+ ✅ [32mCreated config file: [1m~/.config/worktrunk/config.toml[39m[22m- 💡 [2mEdit this file to customize worktree paths and LLM settings[0m+ 💡 [2mEdit this file to customize worktree paths and LLM settings[22m");});diff --git a/tests/integration_tests/config_show.rs b/tests/integration_tests/config_show.rsindex 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: [1m~/.config/worktrunk/config.toml[0m+ ⚪ Global Config: [1m~/.config/worktrunk/config.toml[22m[107m [0m worktree-path = [32m"../{{ main_worktree }}.{{ branch }}"[0m[107m [0m[107m [0m [1m[36m[projects."test-project"][0m[107m [0m approved-commands = [[32m"npm install"[0m]- ⚪ Project Config: [1m[REPO]/.config/wt.toml[0m+ ⚪ Project Config: [1m[REPO]/.config/wt.toml[22m[107m [0m post-create = [32m"npm install"[0m[107m [0m[107m [0m [1m[36m[post-start][0m[107m [0m server = [32m"npm run dev"[0m- [2m⚪ Skipped bash; ~/.bashrc not found[0m- [2m⚪ Skipped zsh; ~/.zshrc not found[0m- [2m⚪ Skipped fish; ~/.config/fish/conf.d not found[0m+ [2m⚪ Skipped bash; ~/.bashrc not found[22m+ [2m⚪ Skipped zsh; ~/.zshrc not found[22m+ [2m⚪ Skipped fish; ~/.config/fish/conf.d not found[22m"#);});}@@ -99,15 +99,15 @@ fn test_config_show_no_project_config() {----- stdout ---------- stderr ------ ⚪ Global Config: [1m~/.config/worktrunk/config.toml[0m+ ⚪ Global Config: [1m~/.config/worktrunk/config.toml[22m[107m [0m worktree-path = [32m"../{{ main_worktree }}.{{ branch }}"[0m- ⚪ Project Config: [1m[REPO]/.config/wt.toml[0m- 💡 [2mNot found[0m+ ⚪ Project Config: [1m[REPO]/.config/wt.toml[22m+ 💡 [2mNot found[22m- [2m⚪ Skipped bash; ~/.bashrc not found[0m- [2m⚪ Skipped zsh; ~/.zshrc not found[0m- [2m⚪ Skipped fish; ~/.config/fish/conf.d not found[0m+ [2m⚪ Skipped bash; ~/.bashrc not found[22m+ [2m⚪ Skipped zsh; ~/.zshrc not found[22m+ [2m⚪ Skipped fish; ~/.config/fish/conf.d not found[22m"#);});}@@ -140,14 +140,14 @@ fn test_config_show_outside_git_repo() {----- stdout ---------- stderr ------ ⚪ Global Config: [1m~/.config/worktrunk/config.toml[0m+ ⚪ Global Config: [1m~/.config/worktrunk/config.toml[22m[107m [0m worktree-path = [32m"../{{ main_worktree }}.{{ branch }}"[0m- ⚪ [2mProject Config: Not in a git repository[0m+ ⚪ [2mProject Config: Not in a git repository[22m- [2m⚪ Skipped bash; ~/.bashrc not found[0m- [2m⚪ Skipped zsh; ~/.zshrc not found[0m- [2m⚪ Skipped fish; ~/.config/fish/conf.d not found[0m+ [2m⚪ Skipped bash; ~/.bashrc not found[22m+ [2m⚪ Skipped zsh; ~/.zshrc not found[22m+ [2m⚪ Skipped fish; ~/.config/fish/conf.d not found[22m"#);});}@@ -296,17 +296,17 @@ fn test_config_show_warns_unknown_project_keys() {----- stdout ---------- stderr ------ ⚪ Global Config: [1m~/.config/worktrunk/config.toml[0m+ ⚪ Global Config: [1m~/.config/worktrunk/config.toml[22m[107m [0m worktree-path = [32m"../{{ main_worktree }}.{{ branch }}"[0m- ⚪ Project Config: [1m[REPO]/.config/wt.toml[0m- 🟡 [33mUnknown key [1m[33mpost-merge-command[0m[33m will be ignored[0m+ ⚪ Project Config: [1m[REPO]/.config/wt.toml[22m+ 🟡 [33mUnknown key [1mpost-merge-command[22m will be ignored[39m[107m [0m [1m[36m[post-merge-command][0m[107m [0m deploy = [32m"task deploy"[0m- [2m⚪ Skipped bash; ~/.bashrc not found[0m- [2m⚪ Skipped zsh; ~/.zshrc not found[0m- [2m⚪ Skipped fish; ~/.config/fish/conf.d not found[0m+ [2m⚪ Skipped bash; ~/.bashrc not found[22m+ [2m⚪ Skipped zsh; ~/.zshrc not found[22m+ [2m⚪ Skipped fish; ~/.config/fish/conf.d not found[22m"#);});}@@ -339,19 +339,19 @@ fn test_config_show_warns_unknown_user_keys() {----- stdout ---------- stderr ------ ⚪ Global Config: [1m~/.config/worktrunk/config.toml[0m- 🟡 [33mUnknown key [1m[33mcommit-gen[0m[33m will be ignored[0m+ ⚪ Global Config: [1m~/.config/worktrunk/config.toml[22m+ 🟡 [33mUnknown key [1mcommit-gen[22m will be ignored[39m[107m [0m worktree-path = [32m"../{{ main_worktree }}.{{ branch }}"[0m[107m [0m[107m [0m [1m[36m[commit-gen][0m[107m [0m command = [32m"llm"[0m- ⚪ Project Config: [1m[REPO]/.config/wt.toml[0m- 💡 [2mNot found[0m+ ⚪ Project Config: [1m[REPO]/.config/wt.toml[22m+ 💡 [2mNot found[22m- [2m⚪ Skipped bash; ~/.bashrc not found[0m- [2m⚪ Skipped zsh; ~/.zshrc not found[0m- [2m⚪ Skipped fish; ~/.config/fish/conf.d not found[0m+ [2m⚪ Skipped bash; ~/.bashrc not found[22m+ [2m⚪ Skipped zsh; ~/.zshrc not found[22m+ [2m⚪ Skipped fish; ~/.config/fish/conf.d not found[22m"#);});}diff --git a/tests/integration_tests/config_status.rs b/tests/integration_tests/config_status.rsindex 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), @"✅ [32mSet status for [1m[32mmain[0m[32m to [1m[32m🚧[0m[0m");+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"✅ [32mSet status for [1mmain[22m to [1m🚧[39m[22m");// Verify it was setlet output = repo@@ -40,7 +40,7 @@ fn test_config_status_set_branch_specific() {.output().unwrap();assert!(output.status.success());- assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"✅ [32mSet status for [1m[32mfeature[0m[32m to [1m[32m🔧[0m[0m");+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"✅ [32mSet status for [1mfeature[22m to [1m🔧[39m[22m");// Verify it was setlet output = repo@@ -62,7 +62,7 @@ fn test_config_status_unset_branch_default() {let output = wt_config_status_cmd(&repo, &["unset"]).output().unwrap();assert!(output.status.success());- assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"✅ [32mCleared status for [1m[32mmain[0m[0m");+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"✅ [32mCleared status for [1mmain[39m[22m");// Verify it was unsetlet output = repo@@ -86,7 +86,7 @@ fn test_config_status_unset_branch_specific() {.output().unwrap();assert!(output.status.success());- assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"✅ [32mCleared status for [1m[32mfeature[0m[0m");+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"✅ [32mCleared status for [1mfeature[39m[22m");// Verify it was unsetlet output = repo@@ -116,7 +116,7 @@ fn test_config_status_unset_all() {.output().unwrap();assert!(output.status.success());- assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"✅ [32mCleared [1m[32m3[0m[32m statuses[0m");+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"✅ [32mCleared [1m3[22m statuses[39m");// Verify all were unsetlet output = repodiff --git a/tests/integration_tests/configure_shell.rs b/tests/integration_tests/configure_shell.rsindex 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 ------ 🟡 [33mCompletions won't work: zsh's compinit is not enabled.[0m- [33m Add this to ~/.zshrc before the wt line:[0m- [33m autoload -Uz compinit && compinit[0m- ✅ Added shell extension & completions for [1mzsh[0m @ [1m~/.zshrc[0m- 💡 [2mSkipped [1mbash[0m; ~/.bashrc not found[0m- 💡 [2mSkipped [1mfish[0m; ~/.config/fish/conf.d not found[0m+ 🟡 [33mCompletions won't work: zsh's compinit is not enabled.[39m+ [33m Add this to ~/.zshrc before the wt line:[39m+ [33m autoload -Uz compinit && compinit[39m+ ✅ Added shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m+ 💡 [2mSkipped [1mbash[22m; ~/.bashrc not found[22m+ 💡 [2mSkipped [1mfish[22m; ~/.config/fish/conf.d not found[22m✅ Configured 1 shell- 💡 [2mRestart shell or run: source ~/.zshrc[0m+ 💡 [2mRestart shell or run: source ~/.zshrc[22m");});@@ -77,13 +77,13 @@ fn test_configure_shell_specific_shell() {----- stdout ---------- stderr ------ 🟡 [33mCompletions won't work: zsh's compinit is not enabled.[0m- [33m Add this to ~/.zshrc before the wt line:[0m- [33m autoload -Uz compinit && compinit[0m- ✅ Added shell extension & completions for [1mzsh[0m @ [1m~/.zshrc[0m+ 🟡 [33mCompletions won't work: zsh's compinit is not enabled.[39m+ [33m Add this to ~/.zshrc before the wt line:[39m+ [33m autoload -Uz compinit && compinit[39m+ ✅ Added shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m✅ Configured 1 shell- 💡 [2mRestart shell or run: source ~/.zshrc[0m+ 💡 [2mRestart shell or run: source ~/.zshrc[22m");});@@ -125,7 +125,7 @@ fn test_configure_shell_already_exists() {----- stdout ---------- stderr ------ ⚪ Already configured shell extension & completions for [1mzsh[0m @ [1m~/.zshrc[0m+ ⚪ Already configured shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m⚪ All shells already configured");});@@ -161,11 +161,11 @@ fn test_configure_shell_fish() {----- stdout ---------- stderr ------ ✅ Created shell extension for [1mfish[0m @ [1m~/.config/fish/conf.d/wt.fish[0m- ✅ Created completions for [1mfish[0m @ [1m~/.config/fish/completions/wt.fish[0m+ ✅ Created shell extension for [1mfish[22m @ [1m~/.config/fish/conf.d/wt.fish[22m+ ✅ Created completions for [1mfish[22m @ [1m~/.config/fish/completions/wt.fish[22m✅ Configured 1 shell- 💡 [2mRestart shell to activate[0m+ 💡 [2mRestart shell to activate[22m");});@@ -219,8 +219,8 @@ fn test_configure_shell_fish_extension_exists() {----- stdout ---------- stderr ------ ⚪ Already configured shell extension for [1mfish[0m @ [1m~/.config/fish/conf.d/wt.fish[0m- ✅ Created completions for [1mfish[0m @ [1m~/.config/fish/completions/wt.fish[0m+ ⚪ Already configured shell extension for [1mfish[22m @ [1m~/.config/fish/conf.d/wt.fish[22m+ ✅ Created completions for [1mfish[22m @ [1m~/.config/fish/completions/wt.fish[22m✅ Configured 1 shell");@@ -263,10 +263,10 @@ fn test_configure_shell_no_files() {----- stdout ---------- stderr ------ 💡 [2mSkipped [1mbash[0m; ~/.bashrc not found[0m- 💡 [2mSkipped [1mzsh[0m; ~/.zshrc not found[0m- 💡 [2mSkipped [1mfish[0m; ~/.config/fish/conf.d not found[0m- ❌ [31mNo shell config files found[0m+ 💡 [2mSkipped [1mbash[22m; ~/.bashrc not found[22m+ 💡 [2mSkipped [1mzsh[22m; ~/.zshrc not found[22m+ 💡 [2mSkipped [1mfish[22m; ~/.config/fish/conf.d not found[22m+ ❌ [31mNo shell config files found[39m");});}@@ -301,15 +301,15 @@ fn test_configure_shell_multiple_configs() {----- stdout ---------- stderr ------ 🟡 [33mCompletions won't work: zsh's compinit is not enabled.[0m- [33m Add this to ~/.zshrc before the wt line:[0m- [33m autoload -Uz compinit && compinit[0m- ✅ Added shell extension & completions for [1mbash[0m @ [1m~/.bashrc[0m- ✅ Added shell extension & completions for [1mzsh[0m @ [1m~/.zshrc[0m- 💡 [2mSkipped [1mfish[0m; ~/.config/fish/conf.d not found[0m+ 🟡 [33mCompletions won't work: zsh's compinit is not enabled.[39m+ [33m Add this to ~/.zshrc before the wt line:[39m+ [33m autoload -Uz compinit && compinit[39m+ ✅ Added shell extension & completions for [1mbash[22m @ [1m~/.bashrc[22m+ ✅ Added shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m+ 💡 [2mSkipped [1mfish[22m; ~/.config/fish/conf.d not found[22m✅ Configured 2 shells- 💡 [2mRestart shell or run: source ~/.zshrc[0m+ 💡 [2mRestart shell or run: source ~/.zshrc[22m");});@@ -363,15 +363,15 @@ fn test_configure_shell_mixed_states() {----- stdout ---------- stderr ------ 🟡 [33mCompletions won't work: zsh's compinit is not enabled.[0m- [33m Add this to ~/.zshrc before the wt line:[0m- [33m autoload -Uz compinit && compinit[0m- ⚪ Already configured shell extension & completions for [1mbash[0m @ [1m~/.bashrc[0m- ✅ Added shell extension & completions for [1mzsh[0m @ [1m~/.zshrc[0m- 💡 [2mSkipped [1mfish[0m; ~/.config/fish/conf.d not found[0m+ 🟡 [33mCompletions won't work: zsh's compinit is not enabled.[39m+ [33m Add this to ~/.zshrc before the wt line:[39m+ [33m autoload -Uz compinit && compinit[39m+ ⚪ Already configured shell extension & completions for [1mbash[22m @ [1m~/.bashrc[22m+ ✅ Added shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m+ 💡 [2mSkipped [1mfish[22m; ~/.config/fish/conf.d not found[22m✅ Configured 1 shell- 💡 [2mRestart shell or run: source ~/.zshrc[0m+ 💡 [2mRestart shell or run: source ~/.zshrc[22m");});@@ -423,13 +423,13 @@ fn test_uninstall_shell() {----- stdout ---------- stderr ------ ✅ Removed shell extension & completions for [1mzsh[0m @ [1m~/.zshrc[0m- 💡 [2mNo bash shell extension & completions in ~/.bashrc[0m- 💡 [2mNo fish shell extension in ~/.config/fish/conf.d/wt.fish[0m- 💡 [2mNo fish completions in ~/.config/fish/completions/wt.fish[0m+ ✅ Removed shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m+ 💡 [2mNo bash shell extension & completions in ~/.bashrc[22m+ 💡 [2mNo fish shell extension in ~/.config/fish/conf.d/wt.fish[22m+ 💡 [2mNo fish completions in ~/.config/fish/completions/wt.fish[22m✅ Removed integration from 1 shell- 💡 [2mRestart shell to complete uninstall[0m+ 💡 [2mRestart shell to complete uninstall[22m");});@@ -483,13 +483,13 @@ fn test_uninstall_shell_multiple() {----- stdout ---------- stderr ------ ✅ Removed shell extension & completions for [1mbash[0m @ [1m~/.bashrc[0m- ✅ Removed shell extension & completions for [1mzsh[0m @ [1m~/.zshrc[0m- 💡 [2mNo fish shell extension in ~/.config/fish/conf.d/wt.fish[0m- 💡 [2mNo fish completions in ~/.config/fish/completions/wt.fish[0m+ ✅ Removed shell extension & completions for [1mbash[22m @ [1m~/.bashrc[22m+ ✅ Removed shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m+ 💡 [2mNo fish shell extension in ~/.config/fish/conf.d/wt.fish[22m+ 💡 [2mNo fish completions in ~/.config/fish/completions/wt.fish[22m✅ Removed integration from 2 shells- 💡 [2mRestart shell to complete uninstall[0m+ 💡 [2mRestart shell to complete uninstall[22m");});@@ -576,10 +576,10 @@ fn test_uninstall_shell_fish() {----- stdout ---------- stderr ------ ✅ Removed shell extension for [1mfish[0m @ [1m~/.config/fish/conf.d/wt.fish[0m+ ✅ Removed shell extension for [1mfish[22m @ [1m~/.config/fish/conf.d/wt.fish[22m✅ Removed integration from 1 shell- 💡 [2mRestart shell to complete uninstall[0m+ 💡 [2mRestart shell to complete uninstall[22m");});@@ -690,10 +690,10 @@ fn test_configure_shell_no_warning_when_compinit_enabled() {----- stdout ---------- stderr ------ ✅ Added shell extension & completions for [1mzsh[0m @ [1m~/.zshrc[0m+ ✅ Added shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m✅ Configured 1 shell- 💡 [2mRestart shell or run: source ~/.zshrc[0m+ 💡 [2mRestart shell or run: source ~/.zshrc[22m");});}@@ -730,12 +730,12 @@ fn test_configure_shell_no_warning_for_bash_user() {----- stdout ---------- stderr ------ ✅ Added shell extension & completions for [1mbash[0m @ [1m~/.bashrc[0m- ✅ Added shell extension & completions for [1mzsh[0m @ [1m~/.zshrc[0m- 💡 [2mSkipped [1mfish[0m; ~/.config/fish/conf.d not found[0m+ ✅ Added shell extension & completions for [1mbash[22m @ [1m~/.bashrc[22m+ ✅ Added shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m+ 💡 [2mSkipped [1mfish[22m; ~/.config/fish/conf.d not found[22m✅ Configured 2 shells- 💡 [2mRestart shell or run: source ~/.bashrc[0m+ 💡 [2mRestart shell or run: source ~/.bashrc[22m");});}@@ -771,8 +771,8 @@ fn test_configure_shell_no_warning_for_fish_install() {----- stdout ---------- stderr ------ ✅ Created shell extension for [1mfish[0m @ [1m~/.config/fish/conf.d/wt.fish[0m- ✅ Created completions for [1mfish[0m @ [1m~/.config/fish/completions/wt.fish[0m+ ✅ Created shell extension for [1mfish[22m @ [1m~/.config/fish/conf.d/wt.fish[22m+ ✅ Created completions for [1mfish[22m @ [1m~/.config/fish/completions/wt.fish[22m✅ Configured 1 shell");@@ -813,7 +813,7 @@ fn test_configure_shell_no_warning_when_already_configured() {----- stdout ---------- stderr ------ ⚪ Already configured shell extension & completions for [1mzsh[0m @ [1m~/.zshrc[0m+ ⚪ Already configured shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m⚪ All shells already configured");});@@ -850,9 +850,9 @@ fn test_configure_shell_no_warning_when_shell_unset() {----- stdout ---------- stderr ------ ✅ Added shell extension & completions for [1mbash[0m @ [1m~/.bashrc[0m- ✅ Added shell extension & completions for [1mzsh[0m @ [1m~/.zshrc[0m- 💡 [2mSkipped [1mfish[0m; ~/.config/fish/conf.d not found[0m+ ✅ Added shell extension & completions for [1mbash[22m @ [1m~/.bashrc[22m+ ✅ Added shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m+ 💡 [2mSkipped [1mfish[22m; ~/.config/fish/conf.d not found[22m✅ Configured 2 shells");diff --git a/tests/integration_tests/directives.rs b/tests/integration_tests/directives.rsindex 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 ------ ❌ [31mFailed to create worktree for [1m[31mmy-feature[0m[0m+ ❌ [31mFailed to create worktree for [1mmy-feature[22m[39m[107m [0m fatal: invalid reference: my-feature");});@@ -57,7 +57,7 @@ fn test_switch_without_internal() {----- stdout ---------- stderr ------ ❌ [31mFailed to create worktree for [1m[31mmy-feature[0m[0m+ ❌ [31mFailed to create worktree for [1mmy-feature[22m[39m[107m [0m fatal: invalid reference: my-feature");});@@ -89,7 +89,7 @@ fn test_remove_internal_directive() {cd '[PATH]'----- stderr ------ 🔄 [36mRemoving [1m[36mmain[0m[36m worktree & branch in background[0m+ 🔄 [36mRemoving [1mmain[22m worktree & branch in background[39m");});}@@ -114,7 +114,7 @@ fn test_remove_without_internal() {----- stdout ---------- stderr ------ 🔄 [36mRemoving [1m[36mmain[0m[36m worktree & branch in background[0m+ 🔄 [36mRemoving [1mmain[22m worktree & branch in background[39m");});}diff --git a/tests/integration_tests/merge.rs b/tests/integration_tests/merge.rsindex 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 ------ 🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[36m (no commit/squash/rebase needed)[0m+ 🔄 [36mMerging 1 commit to [1mmain[22m @ [2m6551244[22m (no commit/squash/rebase needed)[39m[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)- ✅ [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0m+ ✅ [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m⚪ Worktree preserved (--no-remove)");});@@ -2502,9 +2502,9 @@ fn test_merge_no_commit_with_dirty_tree() {----- stdout ---------- stderr ------ ❌ [31mCannot merge with --no-commit: working tree has uncommitted changes[0m+ ❌ [31mCannot merge with --no-commit: working tree has uncommitted changes[39m- 💡 [2mCommit or stash them first[0m+ 💡 [2mCommit or stash them first[22m");});}@@ -2557,11 +2557,11 @@ fn test_merge_no_commit_no_squash_no_remove_redundant() {----- stdout ---------- stderr ------ 🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[36m (no commit/squash/rebase needed)[0m+ 🔄 [36mMerging 1 commit to [1mmain[22m @ [2m6551244[22m (no commit/squash/rebase needed)[39m[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)- ✅ [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0m+ ✅ [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m⚪ Worktree preserved (--no-remove)");});diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snapindex 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-🟡 [33m[1m[33mrepo[0m[33m needs approval to execute [1m[33m1[0m[33m command:[0m+🟡 [33m[1mrepo[22m needs approval to execute [1m1[22m command:[39m⚪ post-create:[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test command'[0m[2m[0m-💡 Allow and remember? [1m[y/N][0m-🔄 [36mRunning post-create:[0m+💡 Allow and remember? [1m[y/N][22m+🔄 [36mRunning post-create:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test command'[0m[2m[0m[0mtest command-✅ [32mCreated new worktree for [1m[32mtest-approve[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO]/repo.test-approve[0m[0m-💡 [2mRun `wt config shell install` to enable automatic cd[0m+✅ [32mCreated new worktree for [1mtest-approve[22m from [1mmain[22m at [1m[REPO]/repo.test-approve[39m[22m+💡 [2mRun `wt config shell install` to enable automatic cd[22mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snapindex 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-🟡 [33m[1m[33mrepo[0m[33m needs approval to execute [1m[33m1[0m[33m command:[0m+🟡 [33m[1mrepo[22m needs approval to execute [1m1[22m command:[39m⚪ post-create:[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test command'[0m[2m[0m-💡 Allow and remember? [1m[y/N][0m+💡 Allow and remember? [1m[y/N][22m⚪ Commands declined, continuing worktree creation-✅ [32mCreated new worktree for [1m[32mtest-decline[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO]/repo.test-decline[0m[0m-💡 [2mRun `wt config shell install` to enable automatic cd[0m+✅ [32mCreated new worktree for [1mtest-decline[22m from [1mmain[22m at [1m[REPO]/repo.test-decline[39m[22m+💡 [2mRun `wt config shell install` to enable automatic cd[22mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snapindex 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-🟡 [33m[1m[33mrepo[0m[33m needs approval to execute [1m[33m2[0m[33m commands:[0m+🟡 [33m[1mrepo[22m needs approval to execute [1m2[22m commands:[39m⚪ post-create:[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'First command'[0m[2m[0m@@ -12,15 +12,15 @@ y⚪ post-create:[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Third command'[0m[2m[0m-💡 Allow and remember? [1m[y/N][0m-🔄 [36mRunning post-create:[0m+💡 Allow and remember? [1m[y/N][22m+🔄 [36mRunning post-create:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'First command'[0m[2m[0m[0mFirst command-🔄 [36mRunning post-create:[0m+🔄 [36mRunning post-create:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Second command'[0m[2m[0m[0mSecond command-🔄 [36mRunning post-create:[0m+🔄 [36mRunning post-create:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Third command'[0m[2m[0m[0mThird command-✅ [32mCreated new worktree for [1m[32mtest-mixed-accept[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO]/repo.test-mixed-accept[0m[0m-💡 [2mRun `wt config shell install` to enable automatic cd[0m+✅ [32mCreated new worktree for [1mtest-mixed-accept[22m from [1mmain[22m at [1m[REPO]/repo.test-mixed-accept[39m[22m+💡 [2mRun `wt config shell install` to enable automatic cd[22mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snapindex 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-🟡 [33m[1m[33mrepo[0m[33m needs approval to execute [1m[33m2[0m[33m commands:[0m+🟡 [33m[1mrepo[22m needs approval to execute [1m2[22m commands:[39m⚪ post-create:[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'First command'[0m[2m[0m@@ -12,7 +12,7 @@ n⚪ post-create:[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Third command'[0m[2m[0m-💡 Allow and remember? [1m[y/N][0m+💡 Allow and remember? [1m[y/N][22m⚪ Commands declined, continuing worktree creation-✅ [32mCreated new worktree for [1m[32mtest-mixed-decline[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO]/repo.test-mixed-decline[0m[0m-💡 [2mRun `wt config shell install` to enable automatic cd[0m+✅ [32mCreated new worktree for [1mtest-mixed-decline[22m from [1mmain[22m at [1m[REPO]/repo.test-mixed-decline[39m[22m+💡 [2mRun `wt config shell install` to enable automatic cd[22mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snapindex 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-🟡 [33m[1m[33mrepo[0m[33m needs approval to execute [1m[33m3[0m[33m commands:[0m+🟡 [33m[1mrepo[22m needs approval to execute [1m3[22m commands:[39m⚪ post-create:[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'First command'[0m[2m[0m@@ -15,15 +15,15 @@ y⚪ post-create:[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Third command'[0m[2m[0m-💡 Allow and remember? [1m[y/N][0m-🔄 [36mRunning post-create:[0m+💡 Allow and remember? [1m[y/N][22m+🔄 [36mRunning post-create:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'First command'[0m[2m[0m[0mFirst command-🔄 [36mRunning post-create:[0m+🔄 [36mRunning post-create:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Second command'[0m[2m[0m[0mSecond command-🔄 [36mRunning post-create:[0m+🔄 [36mRunning post-create:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Third command'[0m[2m[0m[0mThird command-✅ [32mCreated new worktree for [1m[32mtest-multi[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO]/repo.test-multi[0m[0m-💡 [2mRun `wt config shell install` to enable automatic cd[0m+✅ [32mCreated new worktree for [1mtest-multi[22m from [1mmain[22m at [1m[REPO]/repo.test-multi[39m[22m+💡 [2mRun `wt config shell install` to enable automatic cd[22mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snapindex 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-🟡 [33m[1m[33mrepo[0m[33m needs approval to execute [1m[33m3[0m[33m commands:[0m+🟡 [33m[1mrepo[22m needs approval to execute [1m3[22m commands:[39m-⚪ post-create [1minstall[0m:+⚪ post-create [1minstall[22m:[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Installing dependencies...'[0m[2m[0m-⚪ post-create [1mbuild[0m:+⚪ post-create [1mbuild[22m:[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Building project...'[0m[2m[0m-⚪ post-create [1mtest[0m:+⚪ post-create [1mtest[22m:[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Running tests...'[0m[2m[0m-💡 Allow and remember? [1m[y/N][0m-🔄 [36mRunning post-create [1minstall[0m:[0m+💡 Allow and remember? [1m[y/N][22m+🔄 [36mRunning post-create [1minstall[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Installing dependencies...'[0m[2m[0m[0mInstalling dependencies...-🔄 [36mRunning post-create [1mbuild[0m:[0m+🔄 [36mRunning post-create [1mbuild[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Building project...'[0m[2m[0m[0mBuilding project...-🔄 [36mRunning post-create [1mtest[0m:[0m+🔄 [36mRunning post-create [1mtest[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Running tests...'[0m[2m[0m[0mRunning tests...-✅ [32mCreated new worktree for [1m[32mtest-named[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO]/repo.test-named[0m[0m-💡 [2mRun `wt config shell install` to enable automatic cd[0m+✅ [32mCreated new worktree for [1mtest-named[22m from [1mmain[22m at [1m[REPO]/repo.test-named[39m[22m+💡 [2mRun `wt config shell install` to enable automatic cd[22mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snapindex 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-🟡 [33m[1m[33mrepo[0m[33m needs approval to execute [1m[33m1[0m[33m command:[0m+🟡 [33m[1mrepo[22m needs approval to execute [1m1[22m command:[39m⚪ post-create:[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test command'[0m[2m[0m-💡 Allow and remember? [1m[y/N][0m+💡 Allow and remember? [1m[y/N][22m🟡 Failed to save command approval: Failed to write config file: Permission denied (os error 13)-💡 [2mApproval will be requested again next time.[0m-🔄 [36mRunning post-create:[0m+💡 [2mApproval will be requested again next time.[22m+🔄 [36mRunning post-create:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test command'[0m[2m[0m[0mtest command-✅ [32mCreated new worktree for [1m[32mtest-permission[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO]/repo.test-permission[0m[0m-💡 [2mRun `wt config shell install` to enable automatic cd[0m+✅ [32mCreated new worktree for [1mtest-permission[22m from [1mmain[22m at [1m[REPO]/repo.test-permission[39m[22m+💡 [2mRun `wt config shell install` to enable automatic cd[22mdiff --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.snapindex 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.rsexpression: output.normalized()----✅ [32mCreated new worktree for [1m[32mbash-test[0m[32m from [1m[32mmain[0m[32m at [1m[32m[TMPDIR]/repo.bash-test[0m[0m+✅ [32mCreated new worktree for [1mbash-test[22m from [1mmain[22m at [1m[TMPDIR]/repo.bash-test[39m[22mdiff --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.snapindex 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.rsexpression: output.normalized()----❌ [31mBranch [1m[31mexisting[0m[31m already exists[0m+❌ [31mBranch [1mexisting[22m already exists[39m-💡 [2mRemove --create flag to switch to it[0m+💡 [2mRemove --create flag to switch to it[22mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_multiline_command_execution.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_multiline_command_execution.snapindex 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.rsexpression: output.normalized()----✅ [32mCreated new worktree for [1m[32mfish-multiline[0m[32m from [1m[32mmain[0m[32m at [1m[32m[TMPDIR]/repo.fish-multiline[0m[0m-🔄 [36mExecuting (--execute):[0m+✅ [32mCreated new worktree for [1mfish-multiline[22m from [1mmain[22m at [1m[TMPDIR]/repo.fish-multiline[39m[22m+🔄 [36mExecuting (--execute):[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'line 1'[0m[2m; [0m[2m[34mecho[0m[2m [0m[2m[32m'line 2'[0m[2m; [0m[2m[34mecho[0m[2m [0m[2m[32m'line 3'[0m[2m[0mline 1line 2diff --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.snapindex 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.rsexpression: output.normalized()----✅ [32mCreated new worktree for [1m[32mfish-minimal[0m[32m from [1m[32mmain[0m[32m at [1m[32m[TMPDIR]/repo.fish-minimal[0m[0m+✅ [32mCreated new worktree for [1mfish-minimal[22m from [1mmain[22m at [1m[TMPDIR]/repo.fish-minimal[39m[22mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snapindex 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.rsexpression: output.normalized()----✅ [32mCreated new worktree for [1m[32mfish-bg[0m[32m from [1m[32mmain[0m[32m at [1m[32m[TMPDIR]/repo.fish-bg[0m[0m-🔄 [36mRunning post-start:[0m+✅ [32mCreated new worktree for [1mfish-bg[22m from [1mmain[22m at [1m[TMPDIR]/repo.fish-bg[39m[22m+🔄 [36mRunning post-start:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'fish background task'[0m[2m[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge.snapindex 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.rsexpression: output.normalized()----⚪ Already up to date with [1mmain[0m (no new commits, no rebase needed)+⚪ Already up to date with [1mmain[22m (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.snapindex 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.rsexpression: output.normalized()----🔄 [36mRunning pre-merge [1mcheck1[0m:[0m+🔄 [36mRunning pre-merge [1mcheck1[22m:[39m[107m [0m [2m[0m[2m[34m[TMPDIR]/repo/mixed-output.sh[0m[2m check1 3[0m[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-🔄 [36mRunning pre-merge [1mcheck2[0m:[0m+🔄 [36mRunning pre-merge [1mcheck2[22m:[39m[107m [0m [2m[0m[2m[34m[TMPDIR]/repo/mixed-output.sh[0m[2m check2 3[0m[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-🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m[HASH][0m[36m (no commit/squash/rebase needed)[0m+🔄 [36mMerging 1 commit to [1mmain[22m @ [2m[HASH][22m (no commit/squash/rebase needed)[39m[107m [0m * [33m[HASH][m Add feature[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-✅ [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0m-🔄 [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m+✅ [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m+🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snapindex 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.rsexpression: output.normalized()----🔄 [36mRunning pre-merge [1mcheck1[0m:[0m+🔄 [36mRunning pre-merge [1mcheck1[22m:[39m[107m [0m [2m[0m[2m[34m[TMPDIR]/repo/mixed-output.sh[0m[2m check1 3[0m[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-🔄 [36mRunning pre-merge [1mcheck2[0m:[0m+🔄 [36mRunning pre-merge [1mcheck2[22m:[39m[107m [0m [2m[0m[2m[34m[TMPDIR]/repo/mixed-output.sh[0m[2m check2 3[0m[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-🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m[HASH][0m[36m (no commit/squash/rebase needed)[0m+🔄 [36mMerging 1 commit to [1mmain[22m @ [2m[HASH][22m (no commit/squash/rebase needed)[39m[107m [0m * [33m[HASH][m Add feature[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-✅ [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0m-🔄 [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m+✅ [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m+🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snapindex 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.rsexpression: output.normalized()----🔄 [36mRunning pre-merge [1mformat[0m:[0m+🔄 [36mRunning pre-merge [1mformat[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'✓ Code formatting check passed'[0m[2m[0m✓ Code formatting check passed-🔄 [36mRunning pre-merge [1mtest[0m:[0m+🔄 [36mRunning pre-merge [1mtest[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'✗ Test suite failed: 3 tests failing'[0m[2m [0m[2m[36m&&[0m[2m [0m[2m[34mexit[0m[2m 1[0m✗ Test suite failed: 3 tests failing-❌ [31mpre-merge command failed: [1m[31mtest[0m[31m: exit status: 1[0m+❌ [31mpre-merge command failed: [1mtest[22m: exit status: 1[39m-💡 [2mUse --no-verify to skip pre-merge commands[0m+💡 [2mUse --no-verify to skip pre-merge commands[22mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snapindex 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.rsexpression: output.normalized()----🔄 [36mRunning pre-merge [1mformat[0m:[0m+🔄 [36mRunning pre-merge [1mformat[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'✓ Code formatting check passed'[0m[2m[0m✓ Code formatting check passed-🔄 [36mRunning pre-merge [1mtest[0m:[0m+🔄 [36mRunning pre-merge [1mtest[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'✗ Test suite failed: 3 tests failing'[0m[2m [0m[2m[36m&&[0m[2m [0m[2m[34mexit[0m[2m 1[0m✗ Test suite failed: 3 tests failing-❌ [31mpre-merge command failed: [1m[31mtest[0m[31m: exit status: 1[0m+❌ [31mpre-merge command failed: [1mtest[22m: exit status: 1[39m-💡 [2mUse --no-verify to skip pre-merge commands[0m+💡 [2mUse --no-verify to skip pre-merge commands[22mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snapindex 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.rsexpression: output.normalized()----🔄 [36mRunning pre-merge [1mformat[0m:[0m+🔄 [36mRunning pre-merge [1mformat[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'✓ Code formatting check passed'[0m[2m[0m✓ Code formatting check passed-🔄 [36mRunning pre-merge [1mlint[0m:[0m+🔄 [36mRunning pre-merge [1mlint[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'✓ Linting passed - no warnings'[0m[2m[0m✓ Linting passed - no warnings-🔄 [36mRunning pre-merge [1mtest[0m:[0m+🔄 [36mRunning pre-merge [1mtest[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'✓ All 47 tests passed in 2.3s'[0m[2m[0m✓ All 47 tests passed in 2.3s-🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m[HASH][0m[36m (no commit/squash/rebase needed)[0m+🔄 [36mMerging 1 commit to [1mmain[22m @ [2m[HASH][22m (no commit/squash/rebase needed)[39m[107m [0m * [33m[HASH][m Add feature[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-✅ [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0m-🔄 [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m+✅ [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m+🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snapindex 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.rsexpression: output.normalized()----🔄 [36mRunning pre-merge [1mformat[0m:[0m+🔄 [36mRunning pre-merge [1mformat[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'✓ Code formatting check passed'[0m[2m[0m✓ Code formatting check passed-🔄 [36mRunning pre-merge [1mlint[0m:[0m+🔄 [36mRunning pre-merge [1mlint[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'✓ Linting passed - no warnings'[0m[2m[0m✓ Linting passed - no warnings-🔄 [36mRunning pre-merge [1mtest[0m:[0m+🔄 [36mRunning pre-merge [1mtest[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'✓ All 47 tests passed in 2.3s'[0m[2m[0m✓ All 47 tests passed in 2.3s-🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m[HASH][0m[36m (no commit/squash/rebase needed)[0m+🔄 [36mMerging 1 commit to [1mmain[22m @ [2m[HASH][22m (no commit/squash/rebase needed)[39m[107m [0m * [33m[HASH][m Add feature[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-✅ [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0m-🔄 [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m+✅ [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m+🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_post_create.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_post_create.snapindex 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.rsexpression: output.normalized()----🔄 [36mRunning post-create [1minstall[0m:[0m+🔄 [36mRunning post-create [1minstall[22m:[39m[107m [0m [2m[0m[2m[34muv[0m[2m sync[0mResolved 24 packages in 145msInstalled 24 packages in 1.2s-✅ [32mCreated new worktree for [1m[32mfeature-x[0m[32m from [1m[32mmain[0m[32m at [1m[32m[TMPDIR]/repo.feature-x[0m[0m-🔄 [36mRunning post-start [1mdev[0m:[0m+✅ [32mCreated new worktree for [1mfeature-x[22m from [1mmain[22m at [1m[TMPDIR]/repo.feature-x[39m[22m+🔄 [36mRunning post-start [1mdev[22m:[39m[107m [0m [2m[0m[2m[34muv[0m[2m run dev[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_pre_merge.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_pre_merge.snapindex 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.rsexpression: output.normalized()----🔄 [36mSquashing 3 commits into a single commit (2 files, [32m+45[0m)...[0m-🔄 [36mGenerating squash commit message...[0m-[107m [0m [1mfeat(api): Add user authentication endpoints[0m+🔄 [36mSquashing 3 commits into a single commit (2 files, [32m+45[0m)...[39m+🔄 [36mGenerating squash commit message...[39m+[107m [0m [1mfeat(api): Add user authentication endpoints[22m[107m [0m[107m [0m Implement login and token refresh endpoints with JWT validation.[107m [0m Includes comprehensive test coverage and input validation.-✅ [32mSquashed @ [2m[32m[HASH][0m[0m-🔄 [36mRunning pre-merge [1mtest[0m:[0m+✅ [32mSquashed @ [2m[HASH][39m[22m+🔄 [36mRunning pre-merge [1mtest[22m:[39m[107m [0m [2m[0m[2m[34muv[0m[2m run pytest[0m============================= test session starts ==============================@@ -21,15 +21,15 @@ tests/test_auth.py::test_token_validation PASSED [100%]============================== 3 passed in 0.8s ===============================-🔄 [36mRunning pre-merge [1mlint[0m:[0m+🔄 [36mRunning pre-merge [1mlint[22m:[39m[107m [0m [2m[0m[2m[34muv[0m[2m run ruff check[0mAll checks passed!-🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m[HASH][0m[36m (no rebase needed)[0m+🔄 [36mMerging 1 commit to [1mmain[22m @ [2m[HASH][22m (no rebase needed)[39m[107m [0m * [33m[HASH][m feat(api): Add user authentication endpoints[107m [0m api/auth.py | 31 [32m+++++++++++++++++++++++++++++++[m[107m [0m tests/test_auth.py | 14 [32m++++++++++++++[m[107m [0m 2 files changed, 45 insertions(+)-✅ [32mMerged to [1m[32mmain[0m[32m (1 commit, 2 files, [32m+45[0m)[0m-🔄 [36mRemoving [1m[36mfeature-auth[0m[36m worktree & branch in background[0m+✅ [32mMerged to [1mmain[22m (1 commit, 2 files, [32m+45[0m)[39m+🔄 [36mRemoving [1mfeature-auth[22m worktree & branch in background[39mdiff --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.snapindex 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.rsexpression: output.normalized()----✅ [32mCreated new worktree for [1m[32mfix-auth[0m[32m from [1m[32mmain[0m[32m at [1m[32m[TMPDIR]/repo.fix-auth[0m[0m+✅ [32mCreated new worktree for [1mfix-auth[22m from [1mmain[22m at [1m[TMPDIR]/repo.fix-auth[39m[22mdiff --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.snapindex 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.rsexpression: output.normalized()----🔄 [36mRemoving [1m[36mto-remove[0m[36m worktree & branch in background[0m+🔄 [36mRemoving [1mto-remove[22m worktree & branch in background[39mdiff --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.snapindex 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.rsexpression: output.normalized()----✅ [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[TMPDIR]/repo.feature[0m[0m+✅ [32mCreated new worktree for [1mfeature[22m from [1mmain[22m at [1m[TMPDIR]/repo.feature[39m[22mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute.snapindex 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.rsexpression: output.normalized()----✅ [32mCreated new worktree for [1m[32mtest-exec[0m[32m from [1m[32mmain[0m[32m at [1m[32m[TMPDIR]/repo.test-exec[0m[0m-🔄 [36mExecuting (--execute):[0m+✅ [32mCreated new worktree for [1mtest-exec[22m from [1mmain[22m at [1m[TMPDIR]/repo.test-exec[39m[22m+🔄 [36mExecuting (--execute):[39m[107m [0m [2m[0m[2m[34mecho[0m[2m executed[0mexecuteddiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_through_wrapper.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_through_wrapper.snapindex 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.rsexpression: output.normalized()----✅ [32mCreated new worktree for [1m[32mtest-exec[0m[32m from [1m[32mmain[0m[32m at [1m[32m[TMPDIR]/repo.test-exec[0m[0m-🔄 [36mExecuting (--execute):[0m+✅ [32mCreated new worktree for [1mtest-exec[22m from [1mmain[22m at [1m[TMPDIR]/repo.test-exec[39m[22m+🔄 [36mExecuting (--execute):[39m[107m [0m [2m[0m[2m[34mecho[0m[2m executed[0mexecuteddiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snapindex 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.rsexpression: output.normalized()----🔄 [36mRunning post-create:[0m+🔄 [36mRunning post-create:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Installing dependencies...'[0m[2m[0mInstalling dependencies...-🔄 [36mRunning post-create:[0m+🔄 [36mRunning post-create:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Building project...'[0m[2m[0mBuilding project...-✅ [32mCreated new worktree for [1m[32mfeature-hooks[0m[32m from [1m[32mmain[0m[32m at [1m[32m[TMPDIR]/repo.feature-hooks[0m[0m-🔄 [36mRunning post-start [1mserver[0m:[0m+✅ [32mCreated new worktree for [1mfeature-hooks[22m from [1mmain[22m at [1m[TMPDIR]/repo.feature-hooks[39m[22m+🔄 [36mRunning post-start [1mserver[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Starting dev server on port 3000'[0m[2m[0m-🔄 [36mRunning post-start [1mwatch[0m:[0m+🔄 [36mRunning post-start [1mwatch[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Watching for file changes'[0m[2m[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snapindex 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.rsexpression: output.normalized()----✅ [32mCreated new worktree for [1m[32mfeature-with-hooks[0m[32m from [1m[32mmain[0m[32m at [1m[32m[TMPDIR]/repo.feature-with-hooks[0m[0m-🔄 [36mRunning post-start:[0m+✅ [32mCreated new worktree for [1mfeature-with-hooks[22m from [1mmain[22m at [1m[TMPDIR]/repo.feature-with-hooks[39m[22m+🔄 [36mRunning post-start:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test command executed'[0m[2m[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snapindex 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.rsexpression: output.normalized()----✅ [32mCreated new worktree for [1m[32mfeature-bg[0m[32m from [1m[32mmain[0m[32m at [1m[32m[TMPDIR]/repo.feature-bg[0m[0m-🔄 [36mRunning post-start:[0m+✅ [32mCreated new worktree for [1mfeature-bg[22m from [1mmain[22m at [1m[TMPDIR]/repo.feature-bg[39m[22m+🔄 [36mRunning post-start:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'background task'[0m[2m[0mdiff --git a/tests/integration_tests/statusline.rs b/tests/integration_tests/statusline.rsindex 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 [36m?[0m");+ assert_snapshot!(output, @"main [36m?[39m");}#[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 [36m?[0m | Opus");+ assert_snapshot!(output, @"[PATH] main [36m?[39m | Opus");});}diff --git a/tests/snapshots/git_error_display__push_failed.snap b/tests/snapshots/git_error_display__push_failed.snapindex 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()----❌ [31mPush failed[0m+❌ [31mPush failed[39m[107m [0m To /Users/user/workspace/repo/.git[107m [0m ! [remote rejected] HEAD -> main (Up-to-date check failed)[107m [0m 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.snapindex 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()----❌ [31mFailed to remove worktree for [1m[31mfeature-x[0m[31m at [1m[31m/tmp/repo.feature-x[0m[0m+❌ [31mFailed to remove worktree for [1mfeature-x[22m at [1m/tmp/repo.feature-x[39m[22m[107m [0m fatal: worktree is dirty[107m [0m error: could not remove worktreediff --git a/tests/snapshots/integration__integration_tests__approval_ui__already_approved_skip_prompt.snap b/tests/snapshots/integration__integration_tests__approval_ui__already_approved_skip_prompt.snapindex 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 ------🔄 [36mRunning post-create:[0m+🔄 [36mRunning post-create:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'approved'[0m[2m [0m[2m[36m>[0m[2m output.txt[0m-[0m✅ [32mCreated new worktree for [1m[32mtest-approved[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].test-approved[0m[0m-💡 [2mRun `wt config shell install` to enable automatic cd[0m+[0m✅ [32mCreated new worktree for [1mtest-approved[22m from [1mmain[22m at [1m[REPO].test-approved[39m[22m+💡 [2mRun `wt config shell install` to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_fails_in_non_tty.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_fails_in_non_tty.snapindex 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 ------🟡 [33m[1m[33mrepo[0m[33m needs approval to execute [1m[33m1[0m[33m command:[0m+🟡 [33m[1mrepo[22m needs approval to execute [1m1[22m command:[39m⚪ post-create:[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test command'[0m[2m[0m-❌ [31mCannot prompt for approval in non-interactive environment[0m+❌ [31mCannot prompt for approval in non-interactive environment[39m-💡 [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'[0m+💡 [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'[22mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_mixed_approved_unapproved.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_mixed_approved_unapproved.snapindex 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 ------🟡 [33m[1m[33mrepo[0m[33m needs approval to execute [1m[33m2[0m[33m commands:[0m+🟡 [33m[1mrepo[22m needs approval to execute [1m2[22m commands:[39m⚪ post-create:[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'First command'[0m[2m[0m@@ -14,6 +14,6 @@ exit_code: 1⚪ post-create:[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Third command'[0m[2m[0m-❌ [31mCannot prompt for approval in non-interactive environment[0m+❌ [31mCannot prompt for approval in non-interactive environment[39m-💡 [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'[0m+💡 [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'[22mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_multiple_commands.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_multiple_commands.snapindex 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 ------🟡 [33m[1m[33mrepo[0m[33m needs approval to execute [1m[33m4[0m[33m commands:[0m+🟡 [33m[1mrepo[22m needs approval to execute [1m4[22m commands:[39m⚪ post-create:[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Branch: test-nested-branch'[0m[2m[0m@@ -20,6 +20,6 @@ exit_code: 1⚪ post-create:[107m [0m [2m[0m[2m[34mcd[0m[2m [REPO].test-nested-branch [0m[2m[36m&&[0m[2m [0m[2m[34mpwd[0m[2m[0m-❌ [31mCannot prompt for approval in non-interactive environment[0m+❌ [31mCannot prompt for approval in non-interactive environment[39m-💡 [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'[0m+💡 [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'[22mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_named_commands.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_named_commands.snapindex 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 ------🟡 [33m[1m[33mrepo[0m[33m needs approval to execute [1m[33m3[0m[33m commands:[0m+🟡 [33m[1mrepo[22m needs approval to execute [1m3[22m commands:[39m-⚪ post-create [1minstall[0m:+⚪ post-create [1minstall[22m:[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Installing dependencies...'[0m[2m[0m-⚪ post-create [1mbuild[0m:+⚪ post-create [1mbuild[22m:[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Building project...'[0m[2m[0m-⚪ post-create [1mtest[0m:+⚪ post-create [1mtest[22m:[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Running tests...'[0m[2m[0m-❌ [31mCannot prompt for approval in non-interactive environment[0m+❌ [31mCannot prompt for approval in non-interactive environment[39m-💡 [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'[0m+💡 [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'[22mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_single_command.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_single_command.snapindex 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 ------🟡 [33m[1m[33mrepo[0m[33m needs approval to execute [1m[33m1[0m[33m command:[0m+🟡 [33m[1mrepo[22m needs approval to execute [1m1[22m command:[39m⚪ post-create:[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Worktree path: [REPO].feature-test-approval'[0m[2m[0m-❌ [31mCannot prompt for approval in non-interactive environment[0m+❌ [31mCannot prompt for approval in non-interactive environment[39m-💡 [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'[0m+💡 [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'[22mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__decline_approval_skips_only_unapproved.snap b/tests/snapshots/integration__integration_tests__approval_ui__decline_approval_skips_only_unapproved.snapindex 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 ------🟡 [33m[1m[33mrepo[0m[33m needs approval to execute [1m[33m2[0m[33m commands:[0m+🟡 [33m[1mrepo[22m needs approval to execute [1m2[22m commands:[39m⚪ post-create:[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'First command'[0m[2m[0m@@ -14,6 +14,6 @@ exit_code: 1⚪ post-create:[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Third command'[0m[2m[0m-❌ [31mCannot prompt for approval in non-interactive environment[0m+❌ [31mCannot prompt for approval in non-interactive environment[39m-💡 [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'[0m+💡 [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'[22mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__force_bypasses_tty_check.snap b/tests/snapshots/integration__integration_tests__approval_ui__force_bypasses_tty_check.snapindex 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 ------🔄 [36mRunning post-create:[0m+🔄 [36mRunning post-create:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test command'[0m[2m[0m[0mtest command-✅ [32mCreated new worktree for [1m[32mtest-force-tty[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].test-force-tty[0m[0m-💡 [2mRun `wt config shell install` to enable automatic cd[0m+✅ [32mCreated new worktree for [1mtest-force-tty[22m from [1mmain[22m at [1m[REPO].test-force-tty[39m[22m+💡 [2mRun `wt config shell install` to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_first_run.snap b/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_first_run.snapindex 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 ------🔄 [36mRunning post-create:[0m+🔄 [36mRunning post-create:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test command'[0m[2m [0m[2m[36m>[0m[2m output.txt[0m-[0m✅ [32mCreated new worktree for [1m[32mtest-force[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].test-force[0m[0m-💡 [2mRun `wt config shell install` to enable automatic cd[0m+[0m✅ [32mCreated new worktree for [1mtest-force[22m from [1mmain[22m at [1m[REPO].test-force[39m[22m+💡 [2mRun `wt config shell install` to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_second_run.snap b/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_second_run.snapindex 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 ------🟡 [33m[1m[33mrepo[0m[33m needs approval to execute [1m[33m1[0m[33m command:[0m+🟡 [33m[1mrepo[22m needs approval to execute [1m1[22m command:[39m⚪ post-create:[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test command'[0m[2m [0m[2m[36m>[0m[2m output.txt[0m-❌ [31mCannot prompt for approval in non-interactive environment[0m+❌ [31mCannot prompt for approval in non-interactive environment[39m-💡 [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'[0m+💡 [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'[22mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__run_hook_post_merge_requires_approval.snap b/tests/snapshots/integration__integration_tests__approval_ui__run_hook_post_merge_requires_approval.snapindex 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 ------🟡 [33m[1m[33mrepo[0m[33m needs approval to execute [1m[33m1[0m[33m command:[0m+🟡 [33m[1mrepo[22m needs approval to execute [1m1[22m command:[39m⚪ post-merge:[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Post-merge cleanup for main'[0m[2m[0m-❌ [31mCannot prompt for approval in non-interactive environment[0m+❌ [31mCannot prompt for approval in non-interactive environment[39m-💡 [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'[0m+💡 [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'[22mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__run_hook_pre_merge_requires_approval.snap b/tests/snapshots/integration__integration_tests__approval_ui__run_hook_pre_merge_requires_approval.snapindex 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 ------🟡 [33m[1m[33mrepo[0m[33m needs approval to execute [1m[33m1[0m[33m command:[0m+🟡 [33m[1mrepo[22m needs approval to execute [1m1[22m command:[39m⚪ pre-merge:[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Running pre-merge checks on main'[0m[2m[0m-❌ [31mCannot prompt for approval in non-interactive environment[0m+❌ [31mCannot prompt for approval in non-interactive environment[39m-💡 [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'[0m+💡 [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'[22mdiff --git a/tests/snapshots/integration__integration_tests__approvals__add_approvals_all_none_approved.snap b/tests/snapshots/integration__integration_tests__approvals__add_approvals_all_none_approved.snapindex 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 ------🟡 [33m[1m[33mrepo[0m[33m needs approval to execute [1m[33m1[0m[33m command:[0m+🟡 [33m[1mrepo[22m needs approval to execute [1m1[22m command:[39m⚪ post-create:[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test'[0m[2m[0m-❌ [31mCannot prompt for approval in non-interactive environment[0m+❌ [31mCannot prompt for approval in non-interactive environment[39m-💡 [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'[0m+💡 [2mIn CI/CD, use --force to skip prompts. To pre-approve commands, use 'wt config approvals add'[22mdiff --git a/tests/snapshots/integration__integration_tests__approvals__add_approvals_force.snap b/tests/snapshots/integration__integration_tests__approvals__add_approvals_force.snapindex 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 ------✅ [32mCommands approved; not saved (--force)[0m+✅ [32mCommands approved; not saved (--force)[39mdiff --git a/tests/snapshots/integration__integration_tests__approvals__add_approvals_no_config.snap b/tests/snapshots/integration__integration_tests__approvals__add_approvals_no_config.snapindex 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 ------❌ [31mNo project configuration found[0m+❌ [31mNo project configuration found[39m-💡 [2mCreate a config file at: [1m[2m[REPO]/.config/wt.toml[0m[0m+💡 [2mCreate a config file at: [1m[REPO]/.config/wt.toml[22m[22mdiff --git a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_after_clear.snap b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_after_clear.snapindex 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 ------⚪ [2mNo approvals to clear for this project[0m+⚪ No approvals to clear for this projectdiff --git a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_global_no_approvals.snap b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_global_no_approvals.snapindex 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 ------⚪ [2mNo approvals to clear[0m+⚪ No approvals to cleardiff --git a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_global_with_approvals.snap b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_global_with_approvals.snapindex 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 ------✅ [32mCleared approvals for 1 project[0m+✅ [32mCleared approvals for 1 project[39mdiff --git a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_multiple_approvals.snap b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_multiple_approvals.snapindex 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 ------⚪ [2mNo approvals to clear for this project[0m+⚪ No approvals to clear for this projectdiff --git a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_no_approvals.snap b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_no_approvals.snapindex 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 ------⚪ [2mNo approvals to clear for this project[0m+⚪ No approvals to clear for this projectdiff --git a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_with_approvals.snap b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_with_approvals.snapindex 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 ------⚪ [2mNo approvals to clear for this project[0m+⚪ No approvals to clear for this projectdiff --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.snapindex 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: CLC_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: [1m~/.config/worktrunk/config.toml[0m-💡 [2mEmpty file (using defaults)[0m+⚪ Global Config: [1m~/.config/worktrunk/config.toml[22m+💡 [2mEmpty file (using defaults)[22m-⚪ Project Config: [1m[REPO]/.config/wt.toml[0m-💡 [2mNot found[0m+⚪ Project Config: [1m[REPO]/.config/wt.toml[22m+💡 [2mNot found[22m-💡 [2mNot configured shell extension & completions for bash @ ~/.bashrc[0m-⚪ Already configured shell extension & completions for [1mzsh[0m @ ~/.zshrc-[2m⚪ Skipped fish; ~/.config/fish/conf.d not found[0m+💡 [2mNot configured shell extension & completions for bash @ ~/.bashrc[22m+⚪ Already configured shell extension & completions for [1mzsh[22m @ ~/.zshrc+[2m⚪ Skipped fish; ~/.config/fish/conf.d not found[22m-💡 [2mRun 'wt config shell install' to enable shell integration[0m+💡 [2mRun 'wt config shell install' to enable shell integration[22mdiff --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.snapindex 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: CLC_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: [1m~/.config/worktrunk/config.toml[0m-💡 [2mEmpty file (using defaults)[0m+⚪ Global Config: [1m~/.config/worktrunk/config.toml[22m+💡 [2mEmpty file (using defaults)[22m-⚪ Project Config: [1m[REPO]/.config/wt.toml[0m-💡 [2mNot found[0m+⚪ Project Config: [1m[REPO]/.config/wt.toml[22m+💡 [2mNot found[22m-⚪ Already configured shell extension & completions for [1mzsh[0m @ ~/.zshrc-[2m⚪ Skipped bash; ~/.bashrc not found[0m-[2m⚪ Skipped fish; ~/.config/fish/conf.d not found[0m+⚪ Already configured shell extension & completions for [1mzsh[22m @ ~/.zshrc+[2m⚪ Skipped bash; ~/.bashrc not found[22m+[2m⚪ Skipped fish; ~/.config/fish/conf.d not found[22mdiff --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.snapindex 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: CLC_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: [1m~/.config/worktrunk/config.toml[0m-💡 [2mEmpty file (using defaults)[0m+⚪ Global Config: [1m~/.config/worktrunk/config.toml[22m+💡 [2mEmpty file (using defaults)[22m-⚪ Project Config: [1m[REPO]/.config/wt.toml[0m-💡 [2mNot found[0m+⚪ Project Config: [1m[REPO]/.config/wt.toml[22m+💡 [2mNot found[22m-⚪ Already configured shell extension & completions for [1mzsh[0m @ ~/.zshrc-🟡 [33mCompletions won't work; add to ~/.zshrc before the wt line:[0m+⚪ Already configured shell extension & completions for [1mzsh[22m @ ~/.zshrc+🟡 [33mCompletions won't work; add to ~/.zshrc before the wt line:[39m[107m [0m autoload -Uz compinit && compinit-[2m⚪ Skipped bash; ~/.bashrc not found[0m-[2m⚪ Skipped fish; ~/.config/fish/conf.d not found[0m+[2m⚪ Skipped bash; ~/.bashrc not found[22m+[2m⚪ Skipped fish; ~/.config/fish/conf.d not found[22mdiff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snapindex 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 ------🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[36m (no commit/squash/rebase needed)[0m+🔄 [36mMerging 1 commit to [1mmain[22m @ [2m6551244[22m (no commit/squash/rebase needed)[39m[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-✅ [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0m+✅ [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m⚪ 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.snapindex 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: 0cd '[PATH]'----- stderr ------🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[36m (no commit/squash/rebase needed)[0m+🔄 [36mMerging 1 commit to [1mmain[22m @ [2m6551244[22m (no commit/squash/rebase needed)[39m[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-✅ [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0m-🔄 [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m+✅ [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m+🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39mdiff --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.snapindex 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: CLC_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: [1m~/.config/worktrunk/config.toml[0m+⚪ Global Config: [1m~/.config/worktrunk/config.toml[22m[107m [0m worktree-path = [32m"../{{ main_worktree }}.{{ branch }}"[0m-⚪ Project Config: [1m[REPO]/.config/wt.toml[0m-💡 [2mNot found[0m+⚪ Project Config: [1m[REPO]/.config/wt.toml[22m+💡 [2mNot found[22m-[2m⚪ Skipped bash; ~/.bashrc not found[0m-[2m⚪ Skipped zsh; ~/.zshrc not found[0m-[2m⚪ Skipped fish; ~/.config/fish/conf.d not found[0m+[2m⚪ Skipped bash; ~/.bashrc not found[22m+[2m⚪ Skipped zsh; ~/.zshrc not found[22m+[2m⚪ Skipped fish; ~/.config/fish/conf.d not found[22mdiff --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.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m.[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+@ [1mmain[0m [2m^[22m [1m.[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 1 worktree[0mdiff --git a/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snap b/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m.[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m- [2mbranch-only[0m [2m_[0m [2m⎇[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+@ [1mmain[0m [2m^[22m [1m.[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+ [2mbranch-only[0m [2m_[22m [2m⎇[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 1 worktrees, 1 branches[0mdiff --git a/tests/snapshots/integration__integration_tests__list__default_branch_missing_worktree.snap b/tests/snapshots/integration__integration_tests__list__default_branch_missing_worktree.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mdevelop[0m [2m^[0m [33m⚐[0m [1m.[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+@ [1mdevelop[0m [2m^[22m [33m⚐[39m [1m.[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 1 worktree[0mdiff --git a/tests/snapshots/integration__integration_tests__list__detached_head.snap b/tests/snapshots/integration__integration_tests__list__detached_head.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1m-[0m [2m^[0m [33m⚐[0m [1m.[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+@ [1m-[0m [2m^[22m [33m⚐[39m [1m.[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 1 worktree[0mdiff --git a/tests/snapshots/integration__integration_tests__list__detached_head_in_worktree.snap b/tests/snapshots/integration__integration_tests__list__detached_head_in_worktree.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2m-[0m [2m_[0m [33m⚐[0m [2m./repo.feature[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2m-[0m [2m_[22m [33m⚐[39m [2m./repo.feature[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 2 worktrees[0mdiff --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.snapindex 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.snapindex 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.snapindex 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.snapindex 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.snapindex 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.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ diverged [36m![0m [2m↑[0m 💬 [32m+40[0m [31m-60[0m [32m↑1[0m ./repo.diverged [2m8ba5aa92[0m [2m1d[0m [2mDiverged commit[0m-+ feature-changes [36m![0m[36m?[0m [2m↑[0m 🤖 [32m+50[0m [31m-100[0m [32m↑1[0m ./repo.feature-changes [2mb854b166[0m [2m1d[0m [2mAdd 100 lines[0m-+ [2mfix[0m [36m?[0m[2m_[0m 💬 [2m./repo.fix[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ diverged [36m![39m [2m↑[22m 💬 [32m+40[0m [31m-60[0m [32m↑1[0m ./repo.diverged [2m8ba5aa92[0m [2m1d[0m [2mDiverged commit[0m++ feature-changes [36m![39m[36m?[39m [2m↑[22m 🤖 [32m+50[0m [31m-100[0m [32m↑1[0m ./repo.feature-changes [2mb854b166[0m [2m1d[0m [2mAdd 100 lines[0m++ [2mfix[0m [36m?[39m[2m_[22m 💬 [2m./repo.fix[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 4 worktrees, 2 with changes, 2 ahead[0mdiff --git a/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap b/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mfeature-current[0m [2m↑[0m [32m↑1[0m [1m./repo.feature-current[0m [2mfc28a4d1[0m [2m23h[0m [2mCommit at 01:00[0m-^ main [2m^[0m ./repo [2m6c3da842[0m [2m1d[0m [2mInitial commit on main[0m-+ feature-newest [2m↑[0m [32m↑1[0m ./repo.feature-newest [2m136358eb[0m [2m21h[0m [2mCommit at 03:00[0m-+ feature-middle [2m↑[0m [32m↑1[0m ./repo.feature-middle [2ma0a4851a[0m [2m22h[0m [2mCommit at 02:00[0m-+ feature-oldest [2m↑[0m [32m↑1[0m ./repo.feature-oldest [2m1b1a2d78[0m [2m23h[0m [2mCommit at 00:30[0m+@ [1mfeature-current[0m [2m↑[22m [32m↑1[0m [1m./repo.feature-current[0m [2mfc28a4d1[0m [2m23h[0m [2mCommit at 01:00[0m+^ main [2m^[22m ./repo [2m6c3da842[0m [2m1d[0m [2mInitial commit on main[0m++ feature-newest [2m↑[22m [32m↑1[0m ./repo.feature-newest [2m136358eb[0m [2m21h[0m [2mCommit at 03:00[0m++ feature-middle [2m↑[22m [32m↑1[0m ./repo.feature-middle [2ma0a4851a[0m [2m22h[0m [2mCommit at 02:00[0m++ feature-oldest [2m↑[22m [32m↑1[0m ./repo.feature-oldest [2m1b1a2d78[0m [2m23h[0m [2mCommit at 00:30[0m⚪ [2mShowing 5 worktrees, 4 ahead[0mdiff --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.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mdevelop[0m [2m^[0m [33m⚐[0m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-a[0m [2m_[0m [2m./repo.feature-a[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-b[0m [2m_[0m [2m./repo.feature-b[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+@ [1mdevelop[0m [2m^[22m [33m⚐[39m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-a[0m [2m_[22m [2m./repo.feature-a[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-b[0m [2m_[22m [2m./repo.feature-b[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 3 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snap b/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-a[0m [2m_[0m [2m./repo.feature-a[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-b[0m [2m_[0m [2m./repo.feature-b[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-a[0m [2m_[22m [2m./repo.feature-a[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-b[0m [2m_[22m [2m./repo.feature-b[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 3 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap b/tests/snapshots/integration__integration_tests__list__locked_no_reason.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mlocked-no-reason[0m [2m_[0m [33m⊠[0m [2m./repo.locked-no-reason[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mlocked-no-reason[0m [2m_[22m [33m⊠[39m [2m./repo.locked-no-reason[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 2 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__locked_worktree.snap b/tests/snapshots/integration__integration_tests__list__locked_worktree.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mlocked-feature[0m [2m_[0m [33m⊠[0m [2m./repo.locked-feature[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mlocked-feature[0m [2m_[22m [33m⊠[39m [2m./repo.locked-feature[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 2 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__long_commit_message.snap b/tests/snapshots/integration__integration_tests__list__long_commit_message.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m./repo[0m [2m1310bfb9[0m [2m1d[0m [2mShort message[0m-+ [2mfeature-a[0m [2m_[0m[2m↓[0m [2m[31m↓1[0m [2m./repo.feature-a[0m [2mf078644e[0m [2m1d[0m [2mThis is a very long commit message that should test how the…[0m+@ [1mmain[0m [2m^[22m [1m./repo[0m [2m1310bfb9[0m [2m1d[0m [2mShort message[0m++ [2mfeature-a[0m [2m_[22m[2m↓[22m [2m[31m↓1[0m [2m./repo.feature-a[0m [2mf078644e[0m [2m1d[0m [2mThis is a very long commit message that should test how the…[0m⚪ [2mShowing 2 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap b/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mmedium-name[0m [2m_[0m [2m./repo.medium-name[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mshort[0m [2m_[0m [2m./repo.short[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mvery-long-branch-name-here[0m [2m_[0m [2m./repo.very-long-branch-name-here[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mwith-changes[0m [2m_[0m [2m./repo.with-changes[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mmedium-name[0m [2m_[22m [2m./repo.medium-name[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mshort[0m [2m_[22m [2m./repo.short[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mvery-long-branch-name-here[0m [2m_[22m [2m./repo.very-long-branch-name-here[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mwith-changes[0m [2m_[22m [2m./repo.with-changes[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 5 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap b/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mmain…±[0m [1mPath[0m [1mRemote⇅[0m [1mCI[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m[2m⇡[0m [1m./repo[0m [32m⇡1[0m [2m[31m⇣0[0m [2m85ed6d3d[0m [2m1d[0m [2mMain advances[0m-+ feature [36m+[0m[36m![0m[36m?[0m[33m⊘[0m[2m↕[0m[2m⇅[0m[33m⊠[0m🤖 [32m+2[0m [31m-2[0m [32m↑2[0m [2m[31m↓1[0m [32m+3[0m [31m-1[0m ./repo.feature [32m⇡1[0m [2m[31m⇣1[0m [2m4afb2b9e[0m [2m1d[0m [2mLocal commit[0m+@ [1mmain[0m [2m^[22m[2m⇡[22m [1m./repo[0m [32m⇡1[0m [2m[31m⇣0[0m [2m85ed6d3d[0m [2m1d[0m [2mMain advances[0m++ feature [36m+[39m[36m![39m[36m?[39m[33m⊘[39m[2m↕[22m[2m⇅[22m[33m⊠[39m🤖 [32m+2[0m [31m-2[0m [32m↑2[0m [2m[31m↓1[0m [32m+3[0m [31m-1[0m ./repo.feature [32m⇡1[0m [2m[31m⇣1[0m [2m4afb2b9e[0m [2m1d[0m [2mLocal commit[0m⚪ [2mShowing 2 worktrees, 1 with changes, 1 ahead[0mdiff --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.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mmain…±[0m [1mPath[0m [1mRemote⇅[0m [1mCI[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb7c14ce1[0m [2m1d[0m [2mMain conflicting changes[0m-+ feature [36m+[0m[36m![0m[36m?[0m[31m✖[0m [33m⊠[0m🤖 [32m+7[0m ./repo.feature [2mb7c14ce1[0m [2m1d[0m [2mMain conflicting changes[0m+@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb7c14ce1[0m [2m1d[0m [2mMain conflicting changes[0m++ feature [36m+[39m[36m![39m[36m?[39m[31m✖[39m [33m⊠[39m🤖 [32m+7[0m ./repo.feature [2mb7c14ce1[0m [2m1d[0m [2mMain conflicting changes[0m⚪ [2mShowing 2 worktrees, 1 with changes[0mdiff --git a/tests/snapshots/integration__integration_tests__list__maximum_working_tree_symbols.snap b/tests/snapshots/integration__integration_tests__list__maximum_working_tree_symbols.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ feature [36m+[0m[36m![0m[36m?[0m [2m↑[0m [32m+2[0m [31m-3[0m [32m↑1[0m ./repo.feature [2m689c2504[0m [2m1d[0m [2mAdd files[0m+@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ feature [36m+[39m[36m![39m[36m?[39m [2m↑[22m [32m+2[0m [31m-3[0m [32m↑1[0m ./repo.feature [2m689c2504[0m [2m1d[0m [2mAdd files[0m⚪ [2mShowing 2 worktrees, 1 with changes, 1 ahead[0mdiff --git a/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-a[0m [2m_[0m [2m./repo.feature-a[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-b[0m [2m_[0m [2m./repo.feature-b[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-a[0m [2m_[22m [2m./repo.feature-a[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-b[0m [2m_[22m [2m./repo.feature-b[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 3 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap b/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature[0m [2m_[0m [2m./repo.feature[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature[0m [2m_[22m [2m./repo.feature[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 2 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__previous_worktree_gutter.snap b/tests/snapshots/integration__integration_tests__list__previous_worktree_gutter.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-- [2mfeature[0m [2m_[0m [2m./repo.feature[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+- [2mfeature[0m [2m_[22m [2m./repo.feature[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 2 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__progressive_flag.snap b/tests/snapshots/integration__integration_tests__list__progressive_flag.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-a[0m [2m_[0m [2m./repo.feature-a[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-b[0m [2m_[0m [2m./repo.feature-b[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-a[0m [2m_[22m [2m./repo.feature-a[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-b[0m [2m_[22m [2m./repo.feature-b[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 3 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap b/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-a[0m [2m_[0m [2m./repo.feature-a[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m- [2morphan-1[0m [2m_[0m [2m⎇[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m- [2morphan-2[0m [2m_[0m [2m⎇[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-a[0m [2m_[22m [2m./repo.feature-a[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+ [2morphan-1[0m [2m_[22m [2m⎇[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+ [2morphan-2[0m [2m_[22m [2m⎇[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 2 worktrees, 2 branches[0mdiff --git a/tests/snapshots/integration__integration_tests__list__readme_example_simple_list.snap b/tests/snapshots/integration__integration_tests__list__readme_example_simple_list.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m./repo[0m [32m⇡0[0m [2m[31m⇣0[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ feature-x [36m+[0m [2m↑[0m [32m+5[0m [32m↑3[0m ./repo.feature-x [2m6bba16d6[0m [2m1h[0m [2mAdd file 3[0m-+ bugfix-y [2m↑[0m [32m↑1[0m ./repo.bugfix-y [2mbafa4cbd[0m [2m2h[0m [2mFix bug[0m+@ [1mmain[0m [2m^[22m [1m./repo[0m [32m⇡0[0m [2m[31m⇣0[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ feature-x [36m+[39m [2m↑[22m [32m+5[0m [32m↑3[0m ./repo.feature-x [2m6bba16d6[0m [2m1h[0m [2mAdd file 3[0m++ bugfix-y [2m↑[22m [32m↑1[0m ./repo.bugfix-y [2mbafa4cbd[0m [2m2h[0m [2mFix bug[0m⚪ [2mShowing 3 worktrees, 1 with changes, 2 ahead[0mdiff --git a/tests/snapshots/integration__integration_tests__list__single_worktree.snap b/tests/snapshots/integration__integration_tests__list__single_worktree.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m.[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+@ [1mmain[0m [2m^[22m [1m.[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 1 worktree[0mdiff --git a/tests/snapshots/integration__integration_tests__list__status_column_padding_emoji.snap b/tests/snapshots/integration__integration_tests__list__status_column_padding_emoji.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ main-symbol [2m↑[0m 💬 [32m↑1[0m ./repo.main-symbol [2m579fcd0b[0m [2m1d[0m [2mSymbol commit[0m-+ pr-link [2m↑[0m 🤖 [32m↑1[0m ./repo.pr-link [2me17e7d2d[0m [2m1d[0m [2mPR commit[0m-+ wli-sequence [36m![0m[36m?[0m [2m↑[0m 🤖 [32m+1[0m [31m-112[0m [32m↑1[0m ./repo.wli-sequence [2ma2483ffd[0m [2m1d[0m [2mInitial content[0m+@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ main-symbol [2m↑[22m 💬 [32m↑1[0m ./repo.main-symbol [2m579fcd0b[0m [2m1d[0m [2mSymbol commit[0m++ pr-link [2m↑[22m 🤖 [32m↑1[0m ./repo.pr-link [2me17e7d2d[0m [2m1d[0m [2mPR commit[0m++ wli-sequence [36m![39m[36m?[39m [2m↑[22m 🤖 [32m+1[0m [31m-112[0m [32m↑1[0m ./repo.wli-sequence [2ma2483ffd[0m [2m1d[0m [2mInitial content[0m⚪ [2mShowing 4 worktrees, 1 with changes, 3 ahead[0mdiff --git a/tests/snapshots/integration__integration_tests__list__task_dag_detached_head.snap b/tests/snapshots/integration__integration_tests__list__task_dag_detached_head.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1m-[0m [2m^[0m [33m⚐[0m [1m.[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+@ [1m-[0m [2m^[22m [33m⚐[39m [1m.[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 1 worktree[0mdiff --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.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mmain…±[0m [1mPath[0m [1mRemote⇅[0m [1mCI[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-a[0m [36m?[0m[2m_[0m [2m./repo.feature-a[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ feature-b [2m↑[0m [32m↑1[0m [32m+1[0m [31m-1[0m ./repo.feature-b [2m2d37ca75[0m [2m1d[0m [2mTest commit[0m+@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-a[0m [36m?[39m[2m_[22m [2m./repo.feature-a[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ feature-b [2m↑[22m [32m↑1[0m [32m+1[0m [31m-1[0m ./repo.feature-b [2m2d37ca75[0m [2m1d[0m [2mTest commit[0m⚪ [2mShowing 3 worktrees, 1 ahead[0mdiff --git a/tests/snapshots/integration__integration_tests__list__task_dag_many_worktrees.snap b/tests/snapshots/integration__integration_tests__list__task_dag_many_worktrees.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-1[0m [2m_[0m [2m./repo.feature-1[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-10[0m [2m_[0m [2m./repo.feature-10[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-2[0m [2m_[0m [2m./repo.feature-2[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-3[0m [2m_[0m [2m./repo.feature-3[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-4[0m [2m_[0m [2m./repo.feature-4[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-5[0m [2m_[0m [2m./repo.feature-5[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-6[0m [2m_[0m [2m./repo.feature-6[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-7[0m [2m_[0m [2m./repo.feature-7[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-8[0m [2m_[0m [2m./repo.feature-8[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-9[0m [2m_[0m [2m./repo.feature-9[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-1[0m [2m_[22m [2m./repo.feature-1[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-10[0m [2m_[22m [2m./repo.feature-10[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-2[0m [2m_[22m [2m./repo.feature-2[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-3[0m [2m_[22m [2m./repo.feature-3[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-4[0m [2m_[22m [2m./repo.feature-4[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-5[0m [2m_[22m [2m./repo.feature-5[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-6[0m [2m_[22m [2m./repo.feature-6[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-7[0m [2m_[22m [2m./repo.feature-7[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-8[0m [2m_[22m [2m./repo.feature-8[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-9[0m [2m_[22m [2m./repo.feature-9[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 11 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__task_dag_multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__list__task_dag_multiple_worktrees.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-a[0m [2m_[0m [2m./repo.feature-a[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-b[0m [2m_[0m [2m./repo.feature-b[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-c[0m [2m_[0m [2m./repo.feature-c[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-a[0m [2m_[22m [2m./repo.feature-a[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-b[0m [2m_[22m [2m./repo.feature-b[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-c[0m [2m_[22m [2m./repo.feature-c[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 4 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__task_dag_ordering_stability.snap b/tests/snapshots/integration__integration_tests__list__task_dag_ordering_stability.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mfeature-current[0m [2m↑[0m [32m↑1[0m [1m./repo.feature-current[0m [2mfc28a4d1[0m [2m23h[0m [2mCommit at 01:00[0m-^ main [2m^[0m ./repo [2m6c3da842[0m [2m1d[0m [2mInitial commit on main[0m-+ feature-newest [2m↑[0m [32m↑1[0m ./repo.feature-newest [2m136358eb[0m [2m21h[0m [2mCommit at 03:00[0m-+ feature-middle [2m↑[0m [32m↑1[0m ./repo.feature-middle [2ma0a4851a[0m [2m22h[0m [2mCommit at 02:00[0m-+ feature-oldest [2m↑[0m [32m↑1[0m ./repo.feature-oldest [2m1b1a2d78[0m [2m23h[0m [2mCommit at 00:30[0m+@ [1mfeature-current[0m [2m↑[22m [32m↑1[0m [1m./repo.feature-current[0m [2mfc28a4d1[0m [2m23h[0m [2mCommit at 01:00[0m+^ main [2m^[22m ./repo [2m6c3da842[0m [2m1d[0m [2mInitial commit on main[0m++ feature-newest [2m↑[22m [32m↑1[0m ./repo.feature-newest [2m136358eb[0m [2m21h[0m [2mCommit at 03:00[0m++ feature-middle [2m↑[22m [32m↑1[0m ./repo.feature-middle [2ma0a4851a[0m [2m22h[0m [2mCommit at 02:00[0m++ feature-oldest [2m↑[22m [32m↑1[0m ./repo.feature-oldest [2m1b1a2d78[0m [2m23h[0m [2mCommit at 00:30[0m⚪ [2mShowing 5 worktrees, 4 ahead[0mdiff --git a/tests/snapshots/integration__integration_tests__list__task_dag_single_worktree.snap b/tests/snapshots/integration__integration_tests__list__task_dag_single_worktree.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m.[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+@ [1mmain[0m [2m^[22m [1m.[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 1 worktree[0mdiff --git a/tests/snapshots/integration__integration_tests__list__task_dag_with_locked.snap b/tests/snapshots/integration__integration_tests__list__task_dag_with_locked.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mlocked[0m [2m_[0m [33m⊠[0m [2m./repo.locked[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mnormal[0m [2m_[0m [2m./repo.normal[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mlocked[0m [2m_[22m [33m⊠[39m [2m./repo.locked[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mnormal[0m [2m_[22m [2m./repo.normal[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 3 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap b/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mmain…±[0m [1mPath[0m [1mRemote⇅[0m [1mCI[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m./repo[0m [32m⇡0[0m [2m[31m⇣0[0m [2m6c3da842[0m [2m1d[0m [2mInitial commit on main[0m-+ ahead [2m↑[0m[2m⇡[0m [32m↑1[0m [32m+1[0m ./repo.ahead [32m⇡1[0m [2m[31m⇣0[0m [2m2fff52c2[0m [2m1d[0m [2mAhead commit[0m-+ [2min-sync[0m [2m_[0m [2m./repo.in-sync[0m [32m⇡0[0m [2m[31m⇣0[0m [2m6c3da842[0m [2m1d[0m [2mInitial commit on main[0m+@ [1mmain[0m [2m^[22m [1m./repo[0m [32m⇡0[0m [2m[31m⇣0[0m [2m6c3da842[0m [2m1d[0m [2mInitial commit on main[0m++ ahead [2m↑[22m[2m⇡[22m [32m↑1[0m [32m+1[0m ./repo.ahead [32m⇡1[0m [2m[31m⇣0[0m [2m2fff52c2[0m [2m1d[0m [2mAhead commit[0m++ [2min-sync[0m [2m_[22m [2m./repo.in-sync[0m [32m⇡0[0m [2m[31m⇣0[0m [2m6c3da842[0m [2m1d[0m [2mInitial commit on main[0m⚪ [2mShowing 3 worktrees, 1 ahead[0mdiff --git a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m./repo[0m [2me4614cb7[0m [2m1d[0m [2mFix bug with café ☕ handling[0m-+ [2mfeature-test[0m [2m_[0m[2m↓[0m [2m[31m↓1[0m [2m./repo.feature-test[0m [2m0c53695b[0m [2m1d[0m [2mAdd support for 日本語 and émoji 🎉[0m+@ [1mmain[0m [2m^[22m [1m./repo[0m [2me4614cb7[0m [2m1d[0m [2mFix bug with café ☕ handling[0m++ [2mfeature-test[0m [2m_[22m[2m↓[22m [2m[31m↓1[0m [2m./repo.feature-test[0m [2m0c53695b[0m [2m1d[0m [2mAdd support for 日本語 and émoji 🎉[0m⚪ [2mShowing 2 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__user_status_special_chars.snap b/tests/snapshots/integration__integration_tests__list__user_status_special_chars.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2memoji[0m [2m_[0m 🔄 [2m./repo.emoji[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mmulti[0m [2m_[0m 👨💻 [2m./repo.multi[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2memoji[0m [2m_[22m 🔄 [2m./repo.emoji[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mmulti[0m [2m_[22m 👨💻 [2m./repo.multi[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 3 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap b/tests/snapshots/integration__integration_tests__list__with_branches_flag.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-with-worktree[0m [2m_[0m [2m./repo.feature-with-worktree[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m- [2manother-branch[0m [2m_[0m [2m⎇[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m- [2mfeature-without-worktree[0m [2m_[0m [2m⎇[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m- [2mfix-bug[0m [2m_[0m [2m⎇[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-with-worktree[0m [2m_[22m [2m./repo.feature-with-worktree[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+ [2manother-branch[0m [2m_[22m [2m⎇[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+ [2mfeature-without-worktree[0m [2m_[22m [2m⎇[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+ [2mfix-bug[0m [2m_[22m [2m⎇[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 2 worktrees, 3 branches[0mdiff --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.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-a[0m [2m_[0m [2m./repo.feature-a[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-b[0m [2m_[0m [2m./repo.feature-b[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-a[0m [2m_[22m [2m./repo.feature-a[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-b[0m [2m_[22m [2m./repo.feature-b[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 3 worktrees[0mdiff --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.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m.[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m- [2mbranch-alpha[0m [2m_[0m [2m⎇[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m- [2mbranch-beta[0m [2m_[0m [2m⎇[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m- [2mbranch-gamma[0m [2m_[0m [2m⎇[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+@ [1mmain[0m [2m^[22m [1m.[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+ [2mbranch-alpha[0m [2m_[22m [2m⎇[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+ [2mbranch-beta[0m [2m_[22m [2m⎇[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+ [2mbranch-gamma[0m [2m_[22m [2m⎇[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 1 worktrees, 3 branches[0mdiff --git a/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap b/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m.[0m [32m⇡0[0m [2m[31m⇣0[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m- [2mlocal-only-1[0m [2m_[0m [2m⎇[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m- [2mlocal-only-2[0m [2m_[0m [2m⎇[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m- [2morigin/remote-only-1[0m [2m_[0m [2m⎇[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m- [2morigin/remote-only-2[0m [2m_[0m [2m⎇[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+@ [1mmain[0m [2m^[22m [1m.[0m [32m⇡0[0m [2m[31m⇣0[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+ [2mlocal-only-1[0m [2m_[22m [2m⎇[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+ [2mlocal-only-2[0m [2m_[22m [2m⎇[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+ [2morigin/remote-only-1[0m [2m_[22m [2m⎇[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+ [2morigin/remote-only-2[0m [2m_[22m [2m⎇[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 1 worktrees, 2 branches, 2 remote branches[0mdiff --git a/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap b/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m./repo[0m [32m⇡0[0m [2m[31m⇣0[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-with-worktree[0m [2m_[0m [2m./repo.feature-with-worktree[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m- [2morigin/remote-only[0m [2m_[0m [2m⎇[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+@ [1mmain[0m [2m^[22m [1m./repo[0m [32m⇡0[0m [2m[31m⇣0[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-with-worktree[0m [2m_[22m [2m./repo.feature-with-worktree[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+ [2morigin/remote-only[0m [2m_[22m [2m⎇[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 2 worktrees, 1 remote branches[0mdiff --git a/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap b/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m.[0m [32m⇡0[0m [2m[31m⇣0[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m- [2morigin/remote-feature-1[0m [2m_[0m [2m⎇[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m- [2morigin/remote-feature-2[0m [2m_[0m [2m⎇[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+@ [1mmain[0m [2m^[22m [1m.[0m [32m⇡0[0m [2m[31m⇣0[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+ [2morigin/remote-feature-1[0m [2m_[22m [2m⎇[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+ [2morigin/remote-feature-2[0m [2m_[22m [2m⎇[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 1 worktrees, 2 remote branches[0mdiff --git a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mmain…±[0m [1mPath[0m [1mRemote⇅[0m [1mCI[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m./repo[0m [32m⇡0[0m [2m[31m⇣0[0m [2m6c3da842[0m [2m1d[0m [2mInitial commit on main[0m-+ ahead [2m↑[0m[2m⇡[0m [32m↑2[0m [32m+2[0m ./repo.ahead [32m⇡2[0m [2m[31m⇣0[0m [2m8d8f4673[0m [2m1d[0m [2mAhead commit 2[0m-+ [2mbehind[0m [2m_[0m [2m⇣[0m [2m./repo.behind[0m [32m⇡0[0m [2m[31m⇣1[0m [2m6c3da842[0m [2m1d[0m [2mInitial commit on main[0m-+ diverged [2m↑[0m[2m⇅[0m [32m↑1[0m [32m+1[0m ./repo.diverged [32m⇡1[0m [2m[31m⇣1[0m [2mca7cb696[0m [2m1d[0m [2mDiverged local commit[0m-+ [2min-sync[0m [2m_[0m [2m./repo.in-sync[0m [32m⇡0[0m [2m[31m⇣0[0m [2m6c3da842[0m [2m1d[0m [2mInitial commit on main[0m-+ [2mno-upstream[0m [2m_[0m [2m./repo.no-upstream[0m [2m6c3da842[0m [2m1d[0m [2mInitial commit on main[0m+@ [1mmain[0m [2m^[22m [1m./repo[0m [32m⇡0[0m [2m[31m⇣0[0m [2m6c3da842[0m [2m1d[0m [2mInitial commit on main[0m++ ahead [2m↑[22m[2m⇡[22m [32m↑2[0m [32m+2[0m ./repo.ahead [32m⇡2[0m [2m[31m⇣0[0m [2m8d8f4673[0m [2m1d[0m [2mAhead commit 2[0m++ [2mbehind[0m [2m_[22m [2m⇣[22m [2m./repo.behind[0m [32m⇡0[0m [2m[31m⇣1[0m [2m6c3da842[0m [2m1d[0m [2mInitial commit on main[0m++ diverged [2m↑[22m[2m⇅[22m [32m↑1[0m [32m+1[0m ./repo.diverged [32m⇡1[0m [2m[31m⇣1[0m [2mca7cb696[0m [2m1d[0m [2mDiverged local commit[0m++ [2min-sync[0m [2m_[22m [2m./repo.in-sync[0m [32m⇡0[0m [2m[31m⇣0[0m [2m6c3da842[0m [2m1d[0m [2mInitial commit on main[0m++ [2mno-upstream[0m [2m_[22m [2m./repo.no-upstream[0m [2m6c3da842[0m [2m1d[0m [2mInitial commit on main[0m⚪ [2mShowing 6 worktrees, 2 ahead[0mdiff --git a/tests/snapshots/integration__integration_tests__list__with_user_status.snap b/tests/snapshots/integration__integration_tests__list__with_user_status.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ feature-api [2m↑[0m 🤖 [32m↑1[0m ./repo.feature-api [2m9606cd0f[0m [2m1d[0m [2mAdd REST API endpoints[0m-+ review-ui [36m?[0m [2m↑[0m 💬 [32m↑1[0m ./repo.review-ui [2mafd3b353[0m [2m1d[0m [2mAdd dashboard component[0m-+ [2mwip-docs[0m [36m?[0m[2m_[0m [2m./repo.wip-docs[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ feature-api [2m↑[22m 🤖 [32m↑1[0m ./repo.feature-api [2m9606cd0f[0m [2m1d[0m [2mAdd REST API endpoints[0m++ review-ui [36m?[39m [2m↑[22m 💬 [32m↑1[0m ./repo.review-ui [2mafd3b353[0m [2m1d[0m [2mAdd dashboard component[0m++ [2mwip-docs[0m [36m?[39m[2m_[22m [2m./repo.wip-docs[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 4 worktrees, 2 ahead[0mdiff --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.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ test [36m+[0m[36m![0m[36m?[0m [32m+1[0m [31m-1[0m ./repo.test [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ test [36m+[39m[36m![39m[36m?[39m [32m+1[0m [31m-1[0m ./repo.test [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 2 worktrees, 1 with changes[0mdiff --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.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ complex [36m![0m[36m?[0m [32m+1[0m [31m-1[0m ./repo.complex [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ simple [36m+[0m [36m?[0m [32m+1[0m [31m-1[0m ./repo.simple [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ complex [36m![39m[36m?[39m [32m+1[0m [31m-1[0m ./repo.complex [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ simple [36m+[39m [36m?[39m [32m+1[0m [31m-1[0m ./repo.simple [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 3 worktrees, 2 with changes[0mdiff --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.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m.[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+@ [1mmain[0m [2m^[22m [1m.[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 1 worktree[0mdiff --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.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m.[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m- [2mfeature[0m [2m_[0m [2m⎇[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+@ [1mmain[0m [2m^[22m [1m.[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+ [2mfeature[0m [2m_[22m [2m⎇[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 1 worktrees, 1 branches[0mdiff --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.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m.[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+@ [1mmain[0m [2m^[22m [1m.[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 1 worktree[0mdiff --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.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m.[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+@ [1mmain[0m [2m^[22m [1m.[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 1 worktree[0mdiff --git a/tests/snapshots/integration__integration_tests__list_config__list_no_config.snap b/tests/snapshots/integration__integration_tests__list_config__list_no_config.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m.[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+@ [1mmain[0m [2m^[22m [1m.[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 1 worktree[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_already_on_target.snap b/tests/snapshots/integration__integration_tests__merge__merge_already_on_target.snapindex 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 [1mmain[0m (no new commits, no rebase needed)+⚪ Already up to date with [1mmain[22m (no new commits, no rebase needed)⚪ Worktree preserved (on main branch)diff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snapindex 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 ------🔄 [36mSquashing 2 commits & working tree changes into a single commit (2 files, [32m+2[0m)...[0m-💡 [2mBackup created @ [2m330ccd6[0m[0m-🔄 [36mGenerating squash commit message...[0m-[107m [0m [1mfix: update file 1 content[0m-✅ [32mSquashed @ [2m[32mb54183b[0m[0m-🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36mb54183b[0m[36m (no rebase needed)[0m+🔄 [36mSquashing 2 commits & working tree changes into a single commit (2 files, [32m+2[0m)...[39m+💡 [2mBackup created @ 330ccd6[22m+🔄 [36mGenerating squash commit message...[39m+[107m [0m [1mfix: update file 1 content[22m+✅ [32mSquashed @ [2mb54183b[39m[22m+🔄 [36mMerging 1 commit to [1mmain[22m @ [2mb54183b[22m (no rebase needed)[39m[107m [0m * [33mb54183b[m fix: update file 1 content[107m [0m file1.txt | 1 [32m+[m[107m [0m file2.txt | 1 [32m+[m[107m [0m 2 files changed, 2 insertions(+)-✅ [32mMerged to [1m[32mmain[0m[32m (1 commit, 2 files, [32m+2[0m)[0m-🔄 [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m+✅ [32mMerged to [1mmain[22m (1 commit, 2 files, [32m+2[0m)[39m+🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snapindex 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 ------🔄 [36mSquashing 1 commit & working tree changes into a single commit (1 file, [32m+1[0m)...[0m-💡 [2mBackup created @ [2mb18c23e[0m[0m-🔄 [36mGenerating squash commit message...[0m-💡 [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m-[107m [0m [1mSquash commits from main[0m+🔄 [36mSquashing 1 commit & working tree changes into a single commit (1 file, [32m+1[0m)...[39m+💡 [2mBackup created @ b18c23e[22m+🔄 [36mGenerating squash commit message...[39m+💡 [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[22m+[107m [0m [1mSquash commits from main[22m[107m [0m[107m [0m Combined commits:[107m [0m - feat: initial feature-✅ [32mSquashed @ [2m[32md118927[0m[0m-🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36md118927[0m[36m (no rebase needed)[0m+✅ [32mSquashed @ [2md118927[39m[22m+🔄 [36mMerging 1 commit to [1mmain[22m @ [2md118927[22m (no rebase needed)[39m[107m [0m * [33md118927[m Squash commits from main[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-✅ [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0m-🔄 [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m+✅ [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m+🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snapindex 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 ------🔄 [36mSquashing 1 commit & working tree changes into a single commit (1 file, [32m+1[0m)...[0m-💡 [2mBackup created @ [2m967330a[0m[0m-🔄 [36mGenerating squash commit message...[0m-[107m [0m [1mfix: improve auth validation logic[0m-✅ [32mSquashed @ [2m[32m1e3993e[0m[0m-🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m1e3993e[0m[36m (no rebase needed)[0m+🔄 [36mSquashing 1 commit & working tree changes into a single commit (1 file, [32m+1[0m)...[39m+💡 [2mBackup created @ 967330a[22m+🔄 [36mGenerating squash commit message...[39m+[107m [0m [1mfix: improve auth validation logic[22m+✅ [32mSquashed @ [2m1e3993e[39m[22m+🔄 [36mMerging 1 commit to [1mmain[22m @ [2m1e3993e[22m (no rebase needed)[39m[107m [0m * [33m1e3993e[m fix: improve auth validation logic[107m [0m auth.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-✅ [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0m-🔄 [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m+✅ [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m+🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_default_branch_missing_worktree.snap b/tests/snapshots/integration__integration_tests__merge__merge_default_branch_missing_worktree.snapindex 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 [1mmain[0m (no new commits, no rebase needed)+⚪ Already up to date with [1mmain[22m (no new commits, no rebase needed)⚪ Worktree preserved (on main branch)diff --git a/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap b/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snapindex 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 ------🟡 [33mAuto-staging 1 untracked file:[0m+🟡 [33mAuto-staging 1 untracked file:[39m[107m [0m dirty.txt-🔄 [36mCommitting changes with default message... (1 file, [32m+1[0m, no squashing needed)[0m-💡 [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m-[107m [0m [1mChanges to dirty.txt[0m-✅ [32mCommitted changes @ [2m[32mc1126ec[0m[0m-🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36mc1126ec[0m[36m (no rebase needed)[0m+🔄 [36mCommitting changes with default message... (1 file, [32m+1[0m, no squashing needed)[39m+💡 [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[22m+[107m [0m [1mChanges to dirty.txt[22m+✅ [32mCommitted changes @ [2mc1126ec[39m[22m+🔄 [36mMerging 1 commit to [1mmain[22m @ [2mc1126ec[22m (no rebase needed)[39m[107m [0m * [33mc1126ec[m Changes to dirty.txt[107m [0m dirty.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-✅ [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0m-🔄 [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m+✅ [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m+🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_error_conflicting_changes.snap b/tests/snapshots/integration__integration_tests__merge__merge_error_conflicting_changes.snapindex 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 ------❌ [31mCannot push: conflicting uncommitted changes in:[0m+❌ [31mCannot push: conflicting uncommitted changes in:[39m[107m [0m shared.txt-💡 [2mCommit or stash these changes in [REPO].main-wt first[0m+💡 [2mCommit or stash these changes in [REPO].main-wt first[22mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_error_detached_head.snap b/tests/snapshots/integration__integration_tests__merge__merge_error_detached_head.snapindex 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 ------❌ [31mCannot merge: not on a branch (detached HEAD)[0m+❌ [31mCannot merge: not on a branch (detached HEAD)[39m-💡 [2mSwitch to a branch first with 'git switch <branch>'[0m+💡 [2mSwitch to a branch first with 'git switch <branch>'[22mdiff --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.snapindex 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 ------❌ [31mCannot merge with --no-commit: working tree has uncommitted changes[0m+❌ [31mCannot merge with --no-commit: working tree has uncommitted changes[39m-💡 [2mCommit or stash them first[0m+💡 [2mCommit or stash them first[22mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snapindex 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 ------🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[36m (no commit/squash/rebase needed)[0m+🔄 [36mMerging 1 commit to [1mmain[22m @ [2m6551244[22m (no commit/squash/rebase needed)[39m[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-✅ [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0m-🔄 [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m+✅ [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m+🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39mdiff --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.snapindex 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 ------❌ [31mCan't push to local [1m[31mmain[0m[31m branch: it has newer commits[0m+❌ [31mCan't push to local [1mmain[22m branch: it has newer commits[39m[107m [0m * [33mfb975b3[m Add main file-💡 [2mRun 'wt merge' again to incorporate these changes[0m+💡 [2mRun 'wt merge' again to incorporate these changes[22mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snapindex 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 [1mmain[0m (no new commits, no rebase needed)-🔄 [36mRemoving [1m[36mno-commits[0m[36m worktree & branch in background[0m+⚪ Already up to date with [1mmain[22m (no new commits, no rebase needed)+🔄 [36mRemoving [1mno-commits[22m worktree & branch in background[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snapindex 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 ------🟡 [33mAuto-staging 1 untracked file:[0m+🟡 [33mAuto-staging 1 untracked file:[39m[107m [0m newfile.txt-🔄 [36mCommitting changes with default message... (1 file, [32m+1[0m, no squashing needed)[0m-💡 [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m-[107m [0m [1mChanges to newfile.txt[0m-✅ [32mCommitted changes @ [2m[32m96ddfbc[0m[0m-🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m96ddfbc[0m[36m (no rebase needed)[0m+🔄 [36mCommitting changes with default message... (1 file, [32m+1[0m, no squashing needed)[39m+💡 [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[22m+[107m [0m [1mChanges to newfile.txt[22m+✅ [32mCommitted changes @ [2m96ddfbc[39m[22m+🔄 [36mMerging 1 commit to [1mmain[22m @ [2m96ddfbc[22m (no rebase needed)[39m[107m [0m * [33m96ddfbc[m Changes to newfile.txt[107m [0m newfile.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-✅ [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0m-🔄 [36mRemoving [1m[36mno-commits-dirty[0m[36m worktree & branch in background[0m+✅ [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m+🔄 [36mRemoving [1mno-commits-dirty[22m worktree & branch in background[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snapindex 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 ------🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[36m (no commit/squash/rebase needed)[0m+🔄 [36mMerging 1 commit to [1mmain[22m @ [2m6551244[22m (no commit/squash/rebase needed)[39m[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-✅ [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0m-🔄 [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m+✅ [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m+🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snapindex 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 ------🔄 [36mMerging 2 commits to [1m[36mmain[0m[36m @ [2m[36mbf212d3[0m[36m (no commit/squash/rebase needed)[0m+🔄 [36mMerging 2 commits to [1mmain[22m @ [2mbf212d3[22m (no commit/squash/rebase needed)[39m[107m [0m * [33mbf212d3[m feat: add file 2[107m [0m * [33m123e46c[m feat: add file 1[107m [0m file1.txt | 1 [32m+[m[107m [0m file2.txt | 1 [32m+[m[107m [0m 2 files changed, 2 insertions(+)-✅ [32mMerged to [1m[32mmain[0m[32m (2 commits, 2 files, [32m+2[0m)[0m-🔄 [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m+✅ [32mMerged to [1mmain[22m (2 commits, 2 files, [32m+2[0m)[39m+🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snapindex 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 ------🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m4af48f0[0m[36m (no commit/squash/rebase needed)[0m+🔄 [36mMerging 1 commit to [1mmain[22m @ [2m4af48f0[22m (no commit/squash/rebase needed)[39m[107m [0m * [33m4af48f0[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-✅ [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0m-🔄 [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m+✅ [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m+🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snapindex 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 ------🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36mcdb002e[0m[36m (no commit/squash/rebase needed)[0m+🔄 [36mMerging 1 commit to [1mmain[22m @ [2mcdb002e[22m (no commit/squash/rebase needed)[39m[107m [0m * [33mcdb002e[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-✅ [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0m-🔄 [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m-🔄 [36mRunning post-merge:[0m+✅ [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m+🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39m+🔄 [36mRunning post-merge:[39m[107m [0m [2m[0m[2m[34mexit[0m[2m 1[0m-[0m🟡 [33mCommand failed: exit status: 1[0m-❌ [31mpost-merge command failed: exit status: 1[0m+[0m🟡 [33mCommand failed: exit status: 1[39m+❌ [31mpost-merge command failed: exit status: 1[39m-💡 [2mUse --no-verify to skip post-merge commands[0m+💡 [2mUse --no-verify to skip post-merge commands[22mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snapindex 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 ------🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m8609b84[0m[36m (no commit/squash/rebase needed)[0m+🔄 [36mMerging 1 commit to [1mmain[22m @ [2m8609b84[22m (no commit/squash/rebase needed)[39m[107m [0m * [33m8609b84[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-✅ [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0m-🔄 [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m-🔄 [36mRunning post-merge [1mnotify[0m:[0m+✅ [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m+🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39m+🔄 [36mRunning post-merge [1mnotify[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Merge to main complete'[0m[2m [0m[2m[36m>[0m[2m notify.txt[0m-[0m🔄 [36mRunning post-merge [1mdeploy[0m:[0m+[0m🔄 [36mRunning post-merge [1mdeploy[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Deploying branch feature'[0m[2m [0m[2m[36m>[0m[2m deploy.txt[0m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_no_verify.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_no_verify.snapindex 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 ------🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m72ff5fc[0m[36m (no commit/squash/rebase needed)[0m+🔄 [36mMerging 1 commit to [1mmain[22m @ [2m72ff5fc[22m (no commit/squash/rebase needed)[39m[107m [0m * [33m72ff5fc[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-✅ [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0m-🔄 [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m+✅ [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m+🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snapindex 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 ------🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m72ff5fc[0m[36m (no commit/squash/rebase needed)[0m+🔄 [36mMerging 1 commit to [1mmain[22m @ [2m72ff5fc[22m (no commit/squash/rebase needed)[39m[107m [0m * [33m72ff5fc[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-✅ [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0m-🔄 [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m-🔄 [36mRunning post-merge:[0m+✅ [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m+🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39m+🔄 [36mRunning post-merge:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'merged feature to main'[0m[2m [0m[2m[36m>[0m[2m post-merge-ran.txt[0m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_from_main_branch.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_from_main_branch.snapindex 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 [1mmain[0m (no new commits, no rebase needed)+⚪ Already up to date with [1mmain[22m (no new commits, no rebase needed)⚪ Worktree preserved (on main branch)-🔄 [36mRunning post-merge:[0m+🔄 [36mRunning post-merge:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'post-merge ran from main'[0m[2m [0m[2m[36m>[0m[2m post-merge-ran.txt[0m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_with_nothing_to_merge.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_with_nothing_to_merge.snapindex 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 [1mmain[0m (no new commits, no rebase needed)-🔄 [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m-🔄 [36mRunning post-merge:[0m+⚪ Already up to date with [1mmain[22m (no new commits, no rebase needed)+🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39m+🔄 [36mRunning post-merge:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'post-merge ran'[0m[2m [0m[2m[36m>[0m[2m post-merge-ran.txt[0m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snapindex 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 ------🟡 [33mAuto-staging 1 untracked file:[0m+🟡 [33mAuto-staging 1 untracked file:[39m[107m [0m feature.txt-🔄 [36mRunning pre-commit:[0m+🔄 [36mRunning pre-commit:[39m[107m [0m [2m[0m[2m[34mexit[0m[2m 1[0m-[0m❌ [31mpre-commit command failed: exit status: 1[0m+[0m❌ [31mpre-commit command failed: exit status: 1[39m-💡 [2mUse --no-verify to skip pre-commit commands[0m+💡 [2mUse --no-verify to skip pre-commit commands[22mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snapindex 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 ------🟡 [33mAuto-staging 1 untracked file:[0m+🟡 [33mAuto-staging 1 untracked file:[39m[107m [0m feature.txt-🔄 [36mRunning pre-commit:[0m+🔄 [36mRunning pre-commit:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Pre-commit check passed'[0m[2m[0m[0mPre-commit check passed-🔄 [36mCommitting changes with default message... (1 file, [32m+1[0m, no squashing needed)[0m-💡 [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m-[107m [0m [1mChanges to feature.txt[0m-✅ [32mCommitted changes @ [2m[32mcdc8f90[0m[0m-🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36mcdc8f90[0m[36m (no rebase needed)[0m+🔄 [36mCommitting changes with default message... (1 file, [32m+1[0m, no squashing needed)[39m+💡 [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[22m+[107m [0m [1mChanges to feature.txt[22m+✅ [32mCommitted changes @ [2mcdc8f90[39m[22m+🔄 [36mMerging 1 commit to [1mmain[22m @ [2mcdc8f90[22m (no rebase needed)[39m[107m [0m * [33mcdc8f90[m Changes to feature.txt[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-✅ [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0m-🔄 [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m+✅ [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m+🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snapindex 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 ------🔄 [36mRunning pre-merge:[0m+🔄 [36mRunning pre-merge:[39m[107m [0m [2m[0m[2m[34mexit[0m[2m 1[0m-[0m❌ [31mpre-merge command failed: exit status: 1[0m+[0m❌ [31mpre-merge command failed: exit status: 1[39m-💡 [2mUse --no-verify to skip pre-merge commands[0m+💡 [2mUse --no-verify to skip pre-merge commands[22mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snapindex 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 ------🔄 [36mRunning pre-merge [1mformat[0m:[0m+🔄 [36mRunning pre-merge [1mformat[22m:[39m[107m [0m [2m[0m[2m[34mexit[0m[2m 0[0m-[0m🔄 [36mRunning pre-merge [1mlint[0m:[0m+[0m🔄 [36mRunning pre-merge [1mlint[22m:[39m[107m [0m [2m[0m[2m[34mexit[0m[2m 0[0m-[0m🔄 [36mRunning pre-merge [1mtest[0m:[0m+[0m🔄 [36mRunning pre-merge [1mtest[22m:[39m[107m [0m [2m[0m[2m[34mexit[0m[2m 0[0m-[0m🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m2cbe2a2[0m[36m (no commit/squash/rebase needed)[0m+[0m🔄 [36mMerging 1 commit to [1mmain[22m @ [2m2cbe2a2[22m (no commit/squash/rebase needed)[39m[107m [0m * [33m2cbe2a2[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-✅ [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0m-🔄 [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m+✅ [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m+🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snapindex 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 ------🔄 [36mRunning pre-merge:[0m+🔄 [36mRunning pre-merge:[39m[107m [0m [2m[0m[2m[34mexit[0m[2m 0[0m-[0m🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m4b1199c[0m[36m (no commit/squash/rebase needed)[0m+[0m🔄 [36mMerging 1 commit to [1mmain[22m @ [2m4b1199c[22m (no commit/squash/rebase needed)[39m[107m [0m * [33m4b1199c[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-✅ [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0m-🔄 [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m+✅ [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m+🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snapindex 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 ------🔄 [36mRunning pre-commit:[0m+🔄 [36mRunning pre-commit:[39m[107m [0m [2m[0m[2m[34mexit[0m[2m 1[0m-[0m❌ [31mpre-commit command failed: exit status: 1[0m+[0m❌ [31mpre-commit command failed: exit status: 1[39m-💡 [2mUse --no-verify to skip pre-commit commands[0m+💡 [2mUse --no-verify to skip pre-commit commands[22mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snapindex 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 ------🔄 [36mRunning pre-commit:[0m+🔄 [36mRunning pre-commit:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Pre-commit check passed'[0m[2m[0m[0mPre-commit check passed-🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m726717f[0m[36m (no commit/squash/rebase needed)[0m+🔄 [36mMerging 1 commit to [1mmain[22m @ [2m726717f[22m (no commit/squash/rebase needed)[39m[107m [0m * [33m726717f[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-✅ [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0m-🔄 [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m+✅ [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m+🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snap b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snapindex 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 ------🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[36m (no commit/squash/rebase needed)[0m+🔄 [36mMerging 1 commit to [1mmain[22m @ [2m6551244[22m (no commit/squash/rebase needed)[39m[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-✅ [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0m-🔄 [36mRemoving [1m[36mfeature-from-develop[0m[36m worktree & branch in background[0m+✅ [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m+🔄 [36mRemoving [1mfeature-from-develop[22m worktree & branch in background[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snap b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snapindex 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 ------🔄 [36mRebasing onto [1m[36mmain[0m[36m...[0m-✅ [32mRebased onto [1m[32mmain[0m[0m-🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m76778cc[0m[36m (no commit/squash needed)[0m+🔄 [36mRebasing onto [1mmain[22m...[39m+✅ [32mRebased onto [1mmain[39m[22m+🔄 [36mMerging 1 commit to [1mmain[22m @ [2m76778cc[22m (no commit/squash needed)[39m[107m [0m * [33m76778cc[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-✅ [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0m-🔄 [36mRemoving [1m[36mfeature-dirty-primary[0m[36m worktree & branch in background[0m+✅ [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m+🔄 [36mRemoving [1mfeature-dirty-primary[22m worktree & branch in background[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_race_condition_before_new_commit.snap b/tests/snapshots/integration__integration_tests__merge__merge_race_condition_before_new_commit.snapindex 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 ------🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[36m (no commit/squash/rebase needed)[0m+🔄 [36mMerging 1 commit to [1mmain[22m @ [2m6551244[22m (no commit/squash/rebase needed)[39m[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-✅ [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0m+✅ [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m⚪ Worktree preserved (--no-remove)diff --git a/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap b/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snapindex 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 ------🔄 [36mRebasing onto [1m[36mmain[0m[36m...[0m-❌ [31mRebase onto [1m[31mmain[0m[31m incomplete[0m+🔄 [36mRebasing onto [1mmain[22m...[39m+❌ [31mRebase onto [1mmain[22m incomplete[39m[107m [0m Rebasing (1/1)[107m [0m error: could not apply c661874... Update shared.txt in feature[107m [0m Could not apply c661874... # Update shared.txt in featurediff --git a/tests/snapshots/integration__integration_tests__merge__merge_rebase_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_rebase_fast_forward.snapindex 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 ------✅ [32mFast-forwarded to [1m[32mmain[0m[0m-⚪ Already up to date with [1mmain[0m (no new commits)-🔄 [36mRemoving [1m[36mfast-forward-test[0m[36m worktree & branch in background[0m+✅ [32mFast-forwarded to [1mmain[39m[22m+⚪ Already up to date with [1mmain[22m (no new commits)+🔄 [36mRemoving [1mfast-forward-test[22m worktree & branch in background[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_rebase_true_rebase.snap b/tests/snapshots/integration__integration_tests__merge__merge_rebase_true_rebase.snapindex 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 ------🔄 [36mRebasing onto [1m[36mmain[0m[36m...[0m-✅ [32mRebased onto [1m[32mmain[0m[0m-🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36mae48a8e[0m[36m (no commit/squash needed)[0m+🔄 [36mRebasing onto [1mmain[22m...[39m+✅ [32mRebased onto [1mmain[39m[22m+🔄 [36mMerging 1 commit to [1mmain[22m @ [2mae48a8e[22m (no commit/squash needed)[39m[107m [0m * [33mae48a8e[m Add feature[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-✅ [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0m-🔄 [36mRemoving [1m[36mtrue-rebase-test[0m[36m worktree & branch in background[0m+✅ [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m+🔄 [36mRemoving [1mtrue-rebase-test[22m worktree & branch in background[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snapindex 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 ------🔄 [36mSquashing 3 commits into a single commit (3 files, [32m+3[0m)...[0m-🔄 [36mGenerating squash commit message...[0m-💡 [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m-[107m [0m [1mSquash commits from main[0m+🔄 [36mSquashing 3 commits into a single commit (3 files, [32m+3[0m)...[39m+🔄 [36mGenerating squash commit message...[39m+💡 [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[22m+[107m [0m [1mSquash commits from main[22m[107m [0m[107m [0m Combined commits:[107m [0m - feat: add file 1[107m [0m - fix: update logic[107m [0m - docs: update readme-✅ [32mSquashed @ [2m[32m27eb169[0m[0m-🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m27eb169[0m[36m (no rebase needed)[0m+✅ [32mSquashed @ [2m27eb169[39m[22m+🔄 [36mMerging 1 commit to [1mmain[22m @ [2m27eb169[22m (no rebase needed)[39m[107m [0m * [33m27eb169[m Squash commits from main[107m [0m file1.txt | 1 [32m+[m[107m [0m file2.txt | 1 [32m+[m[107m [0m file3.txt | 1 [32m+[m[107m [0m 3 files changed, 3 insertions(+)-✅ [32mMerged to [1m[32mmain[0m[32m (1 commit, 3 files, [32m+3[0m)[0m-🔄 [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m+✅ [32mMerged to [1mmain[22m (1 commit, 3 files, [32m+3[0m)[39m+🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snapindex 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 ------🔄 [36mSquashing 3 commits into a single commit...[0m-🔄 [36mGenerating squash commit message...[0m-💡 [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m-[107m [0m [1mSquash commits from main[0m+🔄 [36mSquashing 3 commits into a single commit...[39m+🔄 [36mGenerating squash commit message...[39m+💡 [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[22m+[107m [0m [1mSquash commits from main[22m[107m [0m[107m [0m Combined commits:[107m [0m - Change 1[107m [0m - Change 2[107m [0m - Revert to initial-⚪ [2mNo changes after squashing 3 commits[0m-⚪ Already up to date with [1mmain[0m (no new commits, no rebase needed)-🔄 [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m+⚪ [2mNo changes after squashing 3 commits[22m+⚪ Already up to date with [1mmain[22m (no new commits, no rebase needed)+🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_error.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_error.snapindex 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 ------🔄 [36mSquashing 2 commits into a single commit (2 files, [32m+2[0m)...[0m-🔄 [36mGenerating squash commit message...[0m-❌ [31mCommit generation command failed[0m+🔄 [36mSquashing 2 commits into a single commit (2 files, [32m+2[0m)...[39m+🔄 [36mGenerating squash commit message...[39m+❌ [31mCommit generation command failed[39m[107m [0m 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.snapindex 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 ------🔄 [36mSquashing 2 commits into a single commit (2 files, [32m+2[0m)...[0m-🔄 [36mGenerating squash commit message...[0m-💡 [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m-[107m [0m [1mSquash commits from main[0m+🔄 [36mSquashing 2 commits into a single commit (2 files, [32m+2[0m)...[39m+🔄 [36mGenerating squash commit message...[39m+💡 [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[22m+[107m [0m [1mSquash commits from main[22m[107m [0m[107m [0m Combined commits:[107m [0m - feat: new feature[107m [0m - fix: bug fix-✅ [32mSquashed @ [2m[32m091f0c5[0m[0m-🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m091f0c5[0m[36m (no rebase needed)[0m+✅ [32mSquashed @ [2m091f0c5[39m[22m+🔄 [36mMerging 1 commit to [1mmain[22m @ [2m091f0c5[22m (no rebase needed)[39m[107m [0m * [33m091f0c5[m Squash commits from main[107m [0m file1.txt | 1 [32m+[m[107m [0m file2.txt | 1 [32m+[m[107m [0m 2 files changed, 2 insertions(+)-✅ [32mMerged to [1m[32mmain[0m[32m (1 commit, 2 files, [32m+2[0m)[0m-🔄 [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m+✅ [32mMerged to [1mmain[22m (1 commit, 2 files, [32m+2[0m)[39m+🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snapindex 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 ------🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m525a81f[0m[36m (no commit/squash/rebase needed)[0m+🔄 [36mMerging 1 commit to [1mmain[22m @ [2m525a81f[22m (no commit/squash/rebase needed)[39m[107m [0m * [33m525a81f[m feat: single commit[107m [0m file1.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-✅ [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0m-🔄 [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m+✅ [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m+🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snapindex 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 ------🔄 [36mSquashing 2 commits into a single commit (1 file, [32m+1[0m)...[0m-🔄 [36mGenerating squash commit message...[0m-[107m [0m [1mfeat: implement user authentication system[0m-✅ [32mSquashed @ [2m[32md42412f[0m[0m-🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36md42412f[0m[36m (no rebase needed)[0m+🔄 [36mSquashing 2 commits into a single commit (1 file, [32m+1[0m)...[39m+🔄 [36mGenerating squash commit message...[39m+[107m [0m [1mfeat: implement user authentication system[22m+✅ [32mSquashed @ [2md42412f[39m[22m+🔄 [36mMerging 1 commit to [1mmain[22m @ [2md42412f[22m (no rebase needed)[39m[107m [0m * [33md42412f[m feat: implement user authentication system[107m [0m auth.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-✅ [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0m-🔄 [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m+✅ [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m+🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snapindex 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 ------🔄 [36mSquashing 2 commits & working tree changes into a single commit (2 files, [32m+2[0m)...[0m-💡 [2mBackup created @ [2m330ccd6[0m[0m-🔄 [36mGenerating squash commit message...[0m-💡 [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m-[107m [0m [1mSquash commits from main[0m+🔄 [36mSquashing 2 commits & working tree changes into a single commit (2 files, [32m+2[0m)...[39m+💡 [2mBackup created @ 330ccd6[22m+🔄 [36mGenerating squash commit message...[39m+💡 [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[22m+[107m [0m [1mSquash commits from main[22m[107m [0m[107m [0m Combined commits:[107m [0m - feat: add file 1[107m [0m - feat: add file 2-✅ [32mSquashed @ [2m[32md34e4c3[0m[0m-🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36md34e4c3[0m[36m (no rebase needed)[0m+✅ [32mSquashed @ [2md34e4c3[39m[22m+🔄 [36mMerging 1 commit to [1mmain[22m @ [2md34e4c3[22m (no rebase needed)[39m[107m [0m * [33md34e4c3[m Squash commits from main[107m [0m file1.txt | 1 [32m+[m[107m [0m file2.txt | 1 [32m+[m[107m [0m 2 files changed, 2 insertions(+)-✅ [32mMerged to [1m[32mmain[0m[32m (1 commit, 2 files, [32m+2[0m)[0m-🔄 [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m+✅ [32mMerged to [1mmain[22m (1 commit, 2 files, [32m+2[0m)[39m+🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snapindex 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 ------🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[36m (no commit/squash/rebase needed)[0m+🔄 [36mMerging 1 commit to [1mmain[22m @ [2m6551244[22m (no commit/squash/rebase needed)[39m[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-✅ [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0m-🔄 [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m+✅ [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m+🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_to_non_default_target.snap b/tests/snapshots/integration__integration_tests__merge__merge_to_non_default_target.snapindex 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 ------🔄 [36mRebasing onto [1m[36mstaging[0m[36m...[0m-✅ [32mRebased onto [1m[32mstaging[0m[0m-🔄 [36mMerging 1 commit to [1m[36mstaging[0m[36m @ [2m[36m8280b9e[0m[36m (no commit/squash needed)[0m+🔄 [36mRebasing onto [1mstaging[22m...[39m+✅ [32mRebased onto [1mstaging[39m[22m+🔄 [36mMerging 1 commit to [1mstaging[22m @ [2m8280b9e[22m (no commit/squash needed)[39m[107m [0m * [33m8280b9e[m Add feature for staging[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-✅ [32mMerged to [1m[32mstaging[0m[32m (1 commit, 1 file, [32m+1[0m)[0m-🔄 [36mRemoving [1m[36mfeature-for-staging[0m[36m worktree & branch in background[0m+✅ [32mMerged to [1mstaging[22m (1 commit, 1 file, [32m+1[0m)[39m+🔄 [36mRemoving [1mfeature-for-staging[22m worktree & branch in background[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_when_primary_not_on_default_but_default_has_worktree.snap b/tests/snapshots/integration__integration_tests__merge__merge_when_primary_not_on_default_but_default_has_worktree.snapindex 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 ------🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[36m (no commit/squash/rebase needed)[0m+🔄 [36mMerging 1 commit to [1mmain[22m @ [2m6551244[22m (no commit/squash/rebase needed)[39m[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-✅ [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0m-🔄 [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m+✅ [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m+🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snapindex 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 ------🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[36m (no commit/squash/rebase needed)[0m+🔄 [36mMerging 1 commit to [1mmain[22m @ [2m6551244[22m (no commit/squash/rebase needed)[39m[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-✅ [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0m-🔄 [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m+✅ [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m+🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snapindex 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 ------🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[36m (no commit/squash/rebase needed)[0m+🔄 [36mMerging 1 commit to [1mmain[22m @ [2m6551244[22m (no commit/squash/rebase needed)[39m[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-✅ [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0m+✅ [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m⚪ Worktree preserved (--no-remove)diff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snapindex 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 ------🟡 [33mAuto-staging 2 untracked files:[0m+🟡 [33mAuto-staging 2 untracked files:[39m[107m [0m untracked1.txt[107m [0m untracked2.txt-🔄 [36mSquashing 1 commit & working tree changes into a single commit (3 files, [32m+3[0m)...[0m-💡 [2mBackup created @ [2m4967998[0m[0m-🔄 [36mGenerating squash commit message...[0m-💡 [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m-[107m [0m [1mSquash commits from main[0m+🔄 [36mSquashing 1 commit & working tree changes into a single commit (3 files, [32m+3[0m)...[39m+💡 [2mBackup created @ 4967998[22m+🔄 [36mGenerating squash commit message...[39m+💡 [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[22m+[107m [0m [1mSquash commits from main[22m[107m [0m[107m [0m Combined commits:[107m [0m - feat: add file 1-✅ [32mSquashed @ [2m[32mfbfc726[0m[0m-🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36mfbfc726[0m[36m (no rebase needed)[0m+✅ [32mSquashed @ [2mfbfc726[39m[22m+🔄 [36mMerging 1 commit to [1mmain[22m @ [2mfbfc726[22m (no rebase needed)[39m[107m [0m * [33mfbfc726[m Squash commits from main[107m [0m file1.txt | 1 [32m+[m[107m [0m untracked1.txt | 1 [32m+[m[107m [0m untracked2.txt | 1 [32m+[m[107m [0m 3 files changed, 3 insertions(+)-✅ [32mMerged to [1m[32mmain[0m[32m (1 commit, 3 files, [32m+3[0m)[0m-🔄 [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m+✅ [32mMerged to [1mmain[22m (1 commit, 3 files, [32m+3[0m)[39m+🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snapindex 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 ------🔄 [36mSquashing 3 commits into a single commit (3 files, [32m+33[0m)...[0m-🔄 [36mGenerating squash commit message...[0m-[107m [0m [1mfeat(auth): Implement JWT authentication system[0m+🔄 [36mSquashing 3 commits into a single commit (3 files, [32m+33[0m)...[39m+🔄 [36mGenerating squash commit message...[39m+[107m [0m [1mfeat(auth): Implement JWT authentication system[22m[107m [0m[107m [0m Add comprehensive JWT token handling including validation, refresh logic,[107m [0m and authentication tests. This establishes the foundation for secure@@ -37,8 +37,8 @@ exit_code: 0[107m [0m - Implement token refresh mechanism with expiry handling[107m [0m - Add JWT encoding/decoding with signature verification[107m [0m - Create test suite covering all authentication flows-✅ [32mSquashed @ [2m[32m95c3316[0m[0m-🔄 [36mRunning pre-merge [1mtest[0m:[0m+✅ [32mSquashed @ [2m95c3316[39m[22m+🔄 [36mRunning pre-merge [1mtest[22m:[39m[107m [0m [2m[0m[2m[34mcargo[0m[2m test[0m[0m Finished test [unoptimized + debuginfo] target(s) in 0.12sRunning unittests src/lib.rs (target/debug/deps/worktrunk-abc123)@@ -50,19 +50,19 @@ test auth::tests::test_token_refresh ... oktest auth::tests::test_token_validation ... oktest result: ok. 18 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.08s-🔄 [36mRunning pre-merge [1mlint[0m:[0m+🔄 [36mRunning pre-merge [1mlint[22m:[39m[107m [0m [2m[0m[2m[34mcargo[0m[2m clippy[0m[0m Checking worktrunk v0.1.0Finished dev [unoptimized + debuginfo] target(s) in 1.23s-🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m95c3316[0m[36m (no rebase needed)[0m+🔄 [36mMerging 1 commit to [1mmain[22m @ [2m95c3316[22m (no rebase needed)[39m[107m [0m * [33m95c3316[m feat(auth): Implement JWT authentication system[107m [0m auth.rs | 8 [32m++++++++[m[107m [0m auth_test.rs | 17 [32m+++++++++++++++++[m[107m [0m jwt.rs | 8 [32m++++++++[m[107m [0m 3 files changed, 33 insertions(+)-✅ [32mMerged to [1m[32mmain[0m[32m (1 commit, 3 files, [32m+33[0m)[0m-🔄 [36mRemoving [1m[36mfeature-auth[0m[36m worktree & branch in background[0m-🔄 [36mRunning post-merge [1minstall[0m:[0m+✅ [32mMerged to [1mmain[22m (1 commit, 3 files, [32m+33[0m)[39m+🔄 [36mRemoving [1mfeature-auth[22m worktree & branch in background[39m+🔄 [36mRunning post-merge [1minstall[22m:[39m[107m [0m [2m[0m[2m[34mcargo[0m[2m install [0m[2m[36m--path[0m[2m .[0m[0m Installing worktrunk v0.1.0Compiling worktrunk v0.1.0diff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_post_create.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_post_create.snapindex 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 ------🔄 [36mRunning post-create [1minstall[0m:[0m+🔄 [36mRunning post-create [1minstall[22m:[39m[107m [0m [2m[0m[2m[34muv[0m[2m sync[0m[0mResolved 24 packages in 145msInstalled 24 packages in 1.2s-✅ [32mCreated new worktree for [1m[32mfeature-x[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature-x[0m[0m-💡 [2mRun `wt config shell install` to enable automatic cd[0m-🔄 [36mRunning post-start [1mdev[0m:[0m+✅ [32mCreated new worktree for [1mfeature-x[22m from [1mmain[22m at [1m[REPO].feature-x[39m[22m+💡 [2mRun `wt config shell install` to enable automatic cd[22m+🔄 [36mRunning post-start [1mdev[22m:[39m[107m [0m [2m[0m[2m[34muv[0m[2m run dev[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_pre_merge.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_pre_merge.snapindex 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 ------🔄 [36mSquashing 3 commits into a single commit (2 files, [32m+45[0m)...[0m-🔄 [36mGenerating squash commit message...[0m-[107m [0m [1mfeat(api): Add user authentication endpoints[0m+🔄 [36mSquashing 3 commits into a single commit (2 files, [32m+45[0m)...[39m+🔄 [36mGenerating squash commit message...[39m+[107m [0m [1mfeat(api): Add user authentication endpoints[22m[107m [0m[107m [0m Implement login and token refresh endpoints with JWT validation.[107m [0m Includes comprehensive test coverage and input validation.-✅ [32mSquashed @ [2m[32m69200cc[0m[0m-🔄 [36mRunning pre-merge [1mtest[0m:[0m+✅ [32mSquashed @ [2m69200cc[39m[22m+🔄 [36mRunning pre-merge [1mtest[22m:[39m[107m [0m [2m[0m[2m[34muv[0m[2m run pytest[0m[0m============================= test session starts ==============================@@ -45,15 +45,15 @@ tests/test_auth.py::test_token_validation PASSED [100%]============================== 3 passed in 0.8s ===============================-🔄 [36mRunning pre-merge [1mlint[0m:[0m+🔄 [36mRunning pre-merge [1mlint[22m:[39m[107m [0m [2m[0m[2m[34muv[0m[2m run ruff check[0m[0mAll checks passed!-🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36m69200cc[0m[36m (no rebase needed)[0m+🔄 [36mMerging 1 commit to [1mmain[22m @ [2m69200cc[22m (no rebase needed)[39m[107m [0m * [33m69200cc[m feat(api): Add user authentication endpoints[107m [0m api/auth.py | 31 [32m+++++++++++++++++++++++++++++++[m[107m [0m tests/test_auth.py | 14 [32m++++++++++++++[m[107m [0m 2 files changed, 45 insertions(+)-✅ [32mMerged to [1m[32mmain[0m[32m (1 commit, 2 files, [32m+45[0m)[0m-🔄 [36mRemoving [1m[36mfeature-auth[0m[36m worktree & branch in background[0m+✅ [32mMerged to [1mmain[22m (1 commit, 2 files, [32m+45[0m)[39m+🔄 [36mRemoving [1mfeature-auth[22m worktree & branch in background[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snapindex 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 ------🔄 [36mMerging 1 commit to [1m[36mmain[0m[36m @ [2m[36md29e0fd[0m[36m (no commit/squash/rebase needed)[0m+🔄 [36mMerging 1 commit to [1mmain[22m @ [2md29e0fd[22m (no commit/squash/rebase needed)[39m[107m [0m * [33md29e0fd[m Implement JWT validation[107m [0m auth.rs | 13 [32m+++++++++++++[m[107m [0m 1 file changed, 13 insertions(+)-✅ [32mMerged to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+13[0m)[0m-🔄 [36mRemoving [1m[36mfix-auth[0m[36m worktree & branch in background[0m+✅ [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+13[0m)[39m+🔄 [36mRemoving [1mfix-auth[22m worktree & branch in background[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_simple_switch.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_simple_switch.snapindex 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 ------✅ [32mCreated new worktree for [1m[32mfix-auth[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].fix-auth[0m[0m-💡 [2mRun `wt config shell install` to enable automatic cd[0m+✅ [32mCreated new worktree for [1mfix-auth[22m from [1mmain[22m at [1m[REPO].fix-auth[39m[22m+💡 [2mRun `wt config shell install` to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__merge__step_commit_both_flags.snap b/tests/snapshots/integration__integration_tests__merge__step_commit_both_flags.snapindex 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 ------💡 [2mSkipping pre-commit hook (--no-verify)[0m-🔄 [36mCommitting tracked changes with default message... (1 file, [32m+1[0m, [31m-1[0m)[0m-💡 [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m-[107m [0m [1mChanges to tracked.txt[0m-✅ [32mCommitted changes @ [2m[32ma5890cb[0m[0m+💡 [2mSkipping pre-commit hook (--no-verify)[22m+🔄 [36mCommitting tracked changes with default message... (1 file, [32m+1[0m, [31m-1[0m)[39m+💡 [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[22m+[107m [0m [1mChanges to tracked.txt[22m+✅ [32mCommitted changes @ [2ma5890cb[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__merge__step_commit_no_verify.snap b/tests/snapshots/integration__integration_tests__merge__step_commit_no_verify.snapindex 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 ------💡 [2mSkipping pre-commit hook (--no-verify)[0m-🟡 [33mAuto-staging 2 untracked files:[0m+💡 [2mSkipping pre-commit hook (--no-verify)[22m+🟡 [33mAuto-staging 2 untracked files:[39m[107m [0m .config/[107m [0m file1.txt-🔄 [36mCommitting changes with default message... (2 files, [32m+2[0m)[0m-💡 [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m-[107m [0m [1mChanges to wt.toml & file1.txt[0m-✅ [32mCommitted changes @ [2m[32m3dbcd5d[0m[0m+🔄 [36mCommitting changes with default message... (2 files, [32m+2[0m)[39m+💡 [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[22m+[107m [0m [1mChanges to wt.toml & file1.txt[22m+✅ [32mCommitted changes @ [2m3dbcd5d[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__merge__step_commit_nothing_to_commit.snap b/tests/snapshots/integration__integration_tests__merge__step_commit_nothing_to_commit.snapindex 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 ------🔄 [36mCommitting changes with default message...[0m-💡 [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m-[107m [0m [1mWIP: Changes[0m-❌ [31mFailed to commit[0m+🔄 [36mCommitting changes with default message...[39m+💡 [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[22m+[107m [0m [1mWIP: Changes[22m+❌ [31mFailed to commit[39m[107m [0m On branch main[107m [0m nothing to commit, working tree cleandiff --git a/tests/snapshots/integration__integration_tests__merge__step_commit_stage_tracked.snap b/tests/snapshots/integration__integration_tests__merge__step_commit_stage_tracked.snapindex 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 ------🔄 [36mCommitting tracked changes with default message... (1 file, [32m+1[0m, [31m-1[0m)[0m-💡 [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m-[107m [0m [1mChanges to tracked.txt[0m-✅ [32mCommitted changes @ [2m[32m7d441f0[0m[0m+🔄 [36mCommitting tracked changes with default message... (1 file, [32m+1[0m, [31m-1[0m)[39m+💡 [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[22m+[107m [0m [1mChanges to tracked.txt[22m+✅ [32mCommitted changes @ [2m7d441f0[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__merge__step_squash_both_flags.snap b/tests/snapshots/integration__integration_tests__merge__step_squash_both_flags.snapindex 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 ------💡 [2mSkipping pre-commit hook (--no-verify)[0m-🔄 [36mSquashing 2 commits & tracked changes into a single commit (3 files, [32m+3[0m)...[0m-💡 [2mBackup created @ [2m31e06e8[0m[0m-🔄 [36mGenerating squash commit message...[0m-💡 [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m-[107m [0m [1mSquash commits from main[0m+💡 [2mSkipping pre-commit hook (--no-verify)[22m+🔄 [36mSquashing 2 commits & tracked changes into a single commit (3 files, [32m+3[0m)...[39m+💡 [2mBackup created @ 31e06e8[22m+🔄 [36mGenerating squash commit message...[39m+💡 [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[22m+[107m [0m [1mSquash commits from main[22m[107m [0m[107m [0m Combined commits:[107m [0m - feat: add file 1[107m [0m - feat: add file 2-✅ [32mSquashed @ [2m[32m9f7a3e2[0m[0m+✅ [32mSquashed @ [2m9f7a3e2[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__merge__step_squash_no_verify.snap b/tests/snapshots/integration__integration_tests__merge__step_squash_no_verify.snapindex 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 ------💡 [2mSkipping pre-commit hook (--no-verify)[0m-🔄 [36mSquashing 2 commits into a single commit (3 files, [32m+3[0m)...[0m-🔄 [36mGenerating squash commit message...[0m-💡 [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m-[107m [0m [1mSquash commits from main[0m+💡 [2mSkipping pre-commit hook (--no-verify)[22m+🔄 [36mSquashing 2 commits into a single commit (3 files, [32m+3[0m)...[39m+🔄 [36mGenerating squash commit message...[39m+💡 [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[22m+[107m [0m [1mSquash commits from main[22m[107m [0m[107m [0m Combined commits:[107m [0m - feat: add file 1[107m [0m - feat: add file 2-✅ [32mSquashed @ [2m[32m588aa53[0m[0m+✅ [32mSquashed @ [2m588aa53[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__merge__step_squash_stage_tracked.snap b/tests/snapshots/integration__integration_tests__merge__step_squash_stage_tracked.snapindex 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 ------🔄 [36mSquashing 2 commits & tracked changes into a single commit (2 files, [32m+2[0m)...[0m-💡 [2mBackup created @ [2mba1424b[0m[0m-🔄 [36mGenerating squash commit message...[0m-💡 [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m-[107m [0m [1mSquash commits from main[0m+🔄 [36mSquashing 2 commits & tracked changes into a single commit (2 files, [32m+2[0m)...[39m+💡 [2mBackup created @ ba1424b[22m+🔄 [36mGenerating squash commit message...[39m+💡 [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[22m+[107m [0m [1mSquash commits from main[22m[107m [0m[107m [0m Combined commits:[107m [0m - feat: add file 1[107m [0m - feat: add file 2-✅ [32mSquashed @ [2m[32m6c0b38b[0m[0m+✅ [32mSquashed @ [2m6c0b38b[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snap b/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snapindex 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 ------🔄 [36mRunning post-create:[0m+🔄 [36mRunning post-create:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Setup done'[0m[2m [0m[2m[36m>[0m[2m setup.txt[0m-[0m✅ [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0m-💡 [2mRun `wt config shell install` to enable automatic cd[0m-🔄 [36mRunning post-start [1mserver[0m:[0m+[0m✅ [32mCreated new worktree for [1mfeature[22m from [1mmain[22m at [1m[REPO].feature[39m[22m+💡 [2mRun `wt config shell install` to enable automatic cd[22m+🔄 [36mRunning post-start [1mserver[22m:[39m[107m [0m [2m[0m[2m[34msleep[0m[2m 0.05 [0m[2m[36m&&[0m[2m [0m[2m[34mecho[0m[2m [0m[2m[32m'Server running'[0m[2m [0m[2m[36m>[0m[2m server.txt[0mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap b/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snapindex 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 ------✅ [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0m-🔄 [36mRunning post-start:[0m+✅ [32mCreated new worktree for [1mfeature[22m from [1mmain[22m at [1m[REPO].feature[39m[22m+🔄 [36mRunning post-start:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Background task'[0m[2m [0m[2m[36m>[0m[2m background.txt[0m-🔄 [36mExecuting (--execute):[0m+🔄 [36mExecuting (--execute):[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Execute flag'[0m[2m [0m[2m[36m>[0m[2m execute.txt[0mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__invalid_toml.snap b/tests/snapshots/integration__integration_tests__post_start_commands__invalid_toml.snapindex 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 ------❌ [31mFailed to load project config[0m+❌ [31mFailed to load project config[39m[107m [0m Failed to parse TOML: TOML parse error at line 1, column 31[107m [0m |[107m [0m 1 | post-create = [invalid syntaxdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snapindex 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 ------🔄 [36mRunning post-create:[0m+🔄 [36mRunning post-create:[39m[107m [0m [2m[0m[2m[34mexit[0m[2m 1[0m-[0m🟡 [33mCommand failed: exit status: 1[0m-✅ [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0m-💡 [2mRun `wt config shell install` to enable automatic cd[0m+[0m🟡 [33mCommand failed: exit status: 1[39m+✅ [32mCreated new worktree for [1mfeature[22m from [1mmain[22m at [1m[REPO].feature[39m[22m+💡 [2mRun `wt config shell install` to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiline_control_structure.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiline_control_structure.snapindex 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 ------🔄 [36mRunning post-create:[0m+🔄 [36mRunning post-create:[39m[107m [0m [2m[0m[2m[35mif[0m[2m [ ! -f test.txt ]; [0m[2m[35mthen[0m[2m[0m[2m[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'File does not exist'[0m[2m [0m[2m[36m>[0m[2m result.txt[0m[107m [0m [2m[0m[2m[34melse[0m[2m[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'File exists'[0m[2m [0m[2m[36m>[0m[2m result.txt[0m[107m [0m [2m[0m[2m[34mfi[0m[2m[0m-[0m✅ [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0m-💡 [2mRun `wt config shell install` to enable automatic cd[0m+[0m✅ [32mCreated new worktree for [1mfeature[22m from [1mmain[22m at [1m[REPO].feature[39m[22m+💡 [2mRun `wt config shell install` to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiple_commands_array.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiple_commands_array.snapindex 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 ------🔄 [36mRunning post-create:[0m+🔄 [36mRunning post-create:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'First'[0m[2m[0m[0mFirst-🔄 [36mRunning post-create:[0m+🔄 [36mRunning post-create:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Second'[0m[2m[0m[0mSecond-✅ [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0m-💡 [2mRun `wt config shell install` to enable automatic cd[0m+✅ [32mCreated new worktree for [1mfeature[22m from [1mmain[22m at [1m[REPO].feature[39m[22m+💡 [2mRun `wt config shell install` to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_named_commands.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_named_commands.snapindex 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 ------🔄 [36mRunning post-create [1minstall[0m:[0m+🔄 [36mRunning post-create [1minstall[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Installing deps'[0m[2m[0m[0mInstalling deps-🔄 [36mRunning post-create [1msetup[0m:[0m+🔄 [36mRunning post-create [1msetup[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Running setup'[0m[2m[0m[0mRunning setup-✅ [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0m-💡 [2mRun `wt config shell install` to enable automatic cd[0m+✅ [32mCreated new worktree for [1mfeature[22m from [1mmain[22m at [1m[REPO].feature[39m[22m+💡 [2mRun `wt config shell install` to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_no_config.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_no_config.snapindex 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 ------✅ [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0m-💡 [2mRun `wt config shell install` to enable automatic cd[0m+✅ [32mCreated new worktree for [1mfeature[22m from [1mmain[22m at [1m[REPO].feature[39m[22m+💡 [2mRun `wt config shell install` to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_single_command.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_single_command.snapindex 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 ------🔄 [36mRunning post-create:[0m+🔄 [36mRunning post-create:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Setup complete'[0m[2m[0m[0mSetup complete-✅ [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0m-💡 [2mRun `wt config shell install` to enable automatic cd[0m+✅ [32mCreated new worktree for [1mfeature[22m from [1mmain[22m at [1m[REPO].feature[39m[22m+💡 [2mRun `wt config shell install` to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snapindex 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 ------🔄 [36mRunning post-create:[0m+🔄 [36mRunning post-create:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Repo: repo'[0m[2m [0m[2m[36m>[0m[2m info.txt[0m-[0m🔄 [36mRunning post-create:[0m+[0m🔄 [36mRunning post-create:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Branch: feature-test'[0m[2m [0m[2m[36m>>[0m[2m info.txt[0m-[0m🔄 [36mRunning post-create:[0m+[0m🔄 [36mRunning post-create:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Worktree: [REPO].feature-test'[0m[2m [0m[2m[36m>>[0m[2m info.txt[0m-[0m🔄 [36mRunning post-create:[0m+[0m🔄 [36mRunning post-create:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Root: [REPO]'[0m[2m [0m[2m[36m>>[0m[2m info.txt[0m-[0m✅ [32mCreated new worktree for [1m[32mfeature/test[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature-test[0m[0m-💡 [2mRun `wt config shell install` to enable automatic cd[0m+[0m✅ [32mCreated new worktree for [1mfeature/test[22m from [1mmain[22m at [1m[REPO].feature-test[39m[22m+💡 [2mRun `wt config shell install` to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_complex_shell.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_complex_shell.snapindex 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 ------✅ [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0m-💡 [2mRun `wt config shell install` to enable automatic cd[0m-🔄 [36mRunning post-start:[0m+✅ [32mCreated new worktree for [1mfeature[22m from [1mmain[22m at [1m[REPO].feature[39m[22m+💡 [2mRun `wt config shell install` to enable automatic cd[22m+🔄 [36mRunning post-start:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m 'line1[0m[107m [0m [2m[0m[2m[34mline2[0m[2m[0m[107m [0m [2m[0m[2m[34mline3[0m[2m' | grep line2 > filtered.txt[0mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_create_with_command.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_create_with_command.snapindex 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 ------✅ [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0m-💡 [2mRun `wt config shell install` to enable automatic cd[0m-🔄 [36mRunning post-start:[0m+✅ [32mCreated new worktree for [1mfeature[22m from [1mmain[22m at [1m[REPO].feature[39m[22m+💡 [2mRun `wt config shell install` to enable automatic cd[22m+🔄 [36mRunning post-start:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'POST-START-RAN'[0m[2m [0m[2m[36m>[0m[2m post_start_marker.txt[0mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_invalid_command.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_invalid_command.snapindex 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 ------✅ [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0m-💡 [2mRun `wt config shell install` to enable automatic cd[0m-🔄 [36mRunning post-start:[0m+✅ [32mCreated new worktree for [1mfeature[22m from [1mmain[22m at [1m[REPO].feature[39m[22m+💡 [2mRun `wt config shell install` to enable automatic cd[22m+🔄 [36mRunning post-start:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m 'unclosed quote[0mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_log_captures_output.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_log_captures_output.snapindex 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 ------✅ [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0m-💡 [2mRun `wt config shell install` to enable automatic cd[0m-🔄 [36mRunning post-start:[0m+✅ [32mCreated new worktree for [1mfeature[22m from [1mmain[22m at [1m[REPO].feature[39m[22m+💡 [2mRun `wt config shell install` to enable automatic cd[22m+🔄 [36mRunning post-start:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'stdout output'[0m[2m [0m[2m[36m&&[0m[2m [0m[2m[34mecho[0m[2m [0m[2m[32m'stderr output'[0m[2m >&2[0mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiline_with_newlines.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiline_with_newlines.snapindex 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 ------✅ [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0m-💡 [2mRun `wt config shell install` to enable automatic cd[0m-🔄 [36mRunning post-start:[0m+✅ [32mCreated new worktree for [1mfeature[22m from [1mmain[22m at [1m[REPO].feature[39m[22m+💡 [2mRun `wt config shell install` to enable automatic cd[22m+🔄 [36mRunning post-start:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'first line'[0m[2m [0m[2m[36m>[0m[2m multiline.txt[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'second line'[0m[2m [0m[2m[36m>>[0m[2m multiline.txt[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'third line'[0m[2m [0m[2m[36m>>[0m[2m multiline.txt[0mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_background.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_background.snapindex 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 ------✅ [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0m-💡 [2mRun `wt config shell install` to enable automatic cd[0m-🔄 [36mRunning post-start [1mtask1[0m:[0m+✅ [32mCreated new worktree for [1mfeature[22m from [1mmain[22m at [1m[REPO].feature[39m[22m+💡 [2mRun `wt config shell install` to enable automatic cd[22m+🔄 [36mRunning post-start [1mtask1[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Task 1 running'[0m[2m [0m[2m[36m>[0m[2m task1.txt[0m-🔄 [36mRunning post-start [1mtask2[0m:[0m+🔄 [36mRunning post-start [1mtask2[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Task 2 running'[0m[2m [0m[2m[36m>[0m[2m task2.txt[0mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_separate_logs.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_separate_logs.snapindex 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 ------✅ [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0m-💡 [2mRun `wt config shell install` to enable automatic cd[0m-🔄 [36mRunning post-start [1mtask1[0m:[0m+✅ [32mCreated new worktree for [1mfeature[22m from [1mmain[22m at [1m[REPO].feature[39m[22m+💡 [2mRun `wt config shell install` to enable automatic cd[22m+🔄 [36mRunning post-start [1mtask1[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'TASK1_OUTPUT'[0m[2m[0m-🔄 [36mRunning post-start [1mtask2[0m:[0m+🔄 [36mRunning post-start [1mtask2[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'TASK2_OUTPUT'[0m[2m[0m-🔄 [36mRunning post-start [1mtask3[0m:[0m+🔄 [36mRunning post-start [1mtask3[22m:[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'TASK3_OUTPUT'[0m[2m[0mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_single_background.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_single_background.snapindex 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 ------✅ [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0m-💡 [2mRun `wt config shell install` to enable automatic cd[0m-🔄 [36mRunning post-start:[0m+✅ [32mCreated new worktree for [1mfeature[22m from [1mmain[22m at [1m[REPO].feature[39m[22m+💡 [2mRun `wt config shell install` to enable automatic cd[22m+🔄 [36mRunning post-start:[39m[107m [0m [2m[0m[2m[34msleep[0m[2m 0.1 [0m[2m[36m&&[0m[2m [0m[2m[34mecho[0m[2m [0m[2m[32m'Background task done'[0m[2m [0m[2m[36m>[0m[2m background.txt[0mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_skip_existing.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_skip_existing.snapindex 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 ------🟡 [33mWorktree for [1m[33mfeature[0m[33m at [1m[33m[REPO].feature[0m[33m; cannot cd (no shell integration)[0m-💡 [2mRun `wt config shell install` to enable automatic cd[0m+🟡 [33mWorktree for [1mfeature[22m at [1m[REPO].feature[22m; cannot cd (no shell integration)[39m+💡 [2mRun `wt config shell install` to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__push__push_dirty_target_autostash.snap b/tests/snapshots/integration__integration_tests__push__push_dirty_target_autostash.snapindex 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 ------🔄 [36mStashing changes in [1m[36m[REPO][0m[36m...[0m-🔄 [36mPushing 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[36m[0m+🔄 [36mStashing changes in [1m[REPO][22m...[39m+🔄 [36mPushing 1 commit to [1mmain[22m @ [2m6551244[22m[39m[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-🔄 [36mRestoring stashed changes in [1m[36m[REPO][0m[36m...[0m-✅ [32mPushed to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0m+🔄 [36mRestoring stashed changes in [1m[REPO][22m...[39m+✅ [32mPushed to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39mdiff --git a/tests/snapshots/integration__integration_tests__push__push_dirty_target_overlap.snap b/tests/snapshots/integration__integration_tests__push__push_dirty_target_overlap.snapindex 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 ------❌ [31mCannot push: conflicting uncommitted changes in:[0m+❌ [31mCannot push: conflicting uncommitted changes in:[39m[107m [0m conflict.txt-💡 [2mCommit or stash these changes in [REPO] first[0m+💡 [2mCommit or stash these changes in [REPO] first[22mdiff --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.snapindex 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 ------❌ [31mCan't push to local [1m[31mmain[0m[31m branch: it has newer commits[0m+❌ [31mCan't push to local [1mmain[22m branch: it has newer commits[39m[107m [0m * [33m5ca21c8[m Main commit-💡 [2mUse 'wt step rebase' or 'wt merge' to rebase onto main[0m+💡 [2mUse 'wt step rebase' or 'wt merge' to rebase onto main[22mdiff --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.snapindex 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 ------❌ [31mFound merge commits in push range[0m+❌ [31mFound merge commits in push range[39m-💡 [2mUse --allow-merge-commits to push non-linear history[0m+💡 [2mUse --allow-merge-commits to push non-linear history[22mdiff --git a/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_fast_forward.snapindex 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 ------🔄 [36mPushing 1 commit to [1m[36mmain[0m[36m @ [2m[36mc2e2bcc[0m[36m[0m+🔄 [36mPushing 1 commit to [1mmain[22m @ [2mc2e2bcc[22m[39m[107m [0m * [33mc2e2bcc[m Add test file[107m [0m test.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-✅ [32mPushed to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0m+✅ [32mPushed to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39mdiff --git a/tests/snapshots/integration__integration_tests__push__push_no_remote.snap b/tests/snapshots/integration__integration_tests__push__push_no_remote.snapindex 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 ------🔄 [36mPushing 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[36m[0m+🔄 [36mPushing 1 commit to [1mmain[22m @ [2m6551244[22m[39m[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-✅ [32mPushed to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0m+✅ [32mPushed to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39mdiff --git a/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snapindex 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 ------🔄 [36mPushing 1 commit to [1m[36mmain[0m[36m @ [2m[36m4af48f0[0m[36m[0m+🔄 [36mPushing 1 commit to [1mmain[22m @ [2m4af48f0[22m[39m[107m [0m * [33m4af48f0[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-✅ [32mPushed to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0m+✅ [32mPushed to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39mdiff --git a/tests/snapshots/integration__integration_tests__push__push_to_default.snap b/tests/snapshots/integration__integration_tests__push__push_to_default.snapindex 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 ------🔄 [36mPushing 1 commit to [1m[36mmain[0m[36m @ [2m[36m6551244[0m[36m[0m+🔄 [36mPushing 1 commit to [1mmain[22m @ [2m6551244[22m[39m[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-✅ [32mPushed to [1m[32mmain[0m[32m (1 commit, 1 file, [32m+1[0m)[0m+✅ [32mPushed to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39mdiff --git a/tests/snapshots/integration__integration_tests__push__push_with_merge_commits_allowed.snap b/tests/snapshots/integration__integration_tests__push__push_with_merge_commits_allowed.snapindex 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 ------🔄 [36mPushing 3 commits to [1m[36mmain[0m[36m @ [2m[36m13bed7b[0m[36m (merge commits allowed)[0m+🔄 [36mPushing 3 commits to [1mmain[22m @ [2m13bed7b[22m (merge commits allowed)[39m[107m [0m * [33m13bed7b[m Merge temp[107m [0m [31m|[m[32m/[m[107m [0m [31m|[m * [33m1f38fab[m Commit 2@@ -35,4 +35,4 @@ exit_code: 0[107m [0m file1.txt | 1 [32m+[m[107m [0m file2.txt | 1 [32m+[m[107m [0m 2 files changed, 2 insertions(+)-✅ [32mPushed to [1m[32mmain[0m[32m (3 commits, 2 files, [32m+2[0m)[0m+✅ [32mPushed to [1mmain[22m (3 commits, 2 files, [32m+2[0m)[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_already_on_default.snap b/tests/snapshots/integration__integration_tests__remove__remove_already_on_default.snapindex 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 ------🔄 [36mRemoving [1m[36mmain[0m[36m worktree & branch in background[0m+🔄 [36mRemoving [1mmain[22m worktree & branch in background[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_branch_matching_tree_content.snap b/tests/snapshots/integration__integration_tests__remove__remove_branch_matching_tree_content.snapindex 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 ------⚪ [90mNo worktree found for branch feature-squashed[0m-✅ [32mRemoved branch [1m[32mfeature-squashed[0m[32m[0m+⚪ [90mNo worktree found for branch feature-squashed[39m+✅ [32mRemoved branch [1mfeature-squashed[22m[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_branch_not_fully_merged.snap b/tests/snapshots/integration__integration_tests__remove__remove_branch_not_fully_merged.snapindex 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 ------🔄 [36mRemoving [1m[36mfeature-unmerged[0m[36m worktree in background; retaining unmerged branch[0m+🔄 [36mRemoving [1mfeature-unmerged[22m worktree in background; retaining unmerged branch[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_branch_only_force_delete.snap b/tests/snapshots/integration__integration_tests__remove__remove_branch_only_force_delete.snapindex 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 ------⚪ [90mNo worktree found for branch feature-force[0m-✅ [32mRemoved branch [1m[32mfeature-force[0m[32m (--force-delete)[0m+⚪ [90mNo worktree found for branch feature-force[39m+✅ [32mRemoved branch [1mfeature-force[22m (--force-delete)[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_branch_only_merged.snap b/tests/snapshots/integration__integration_tests__remove__remove_branch_only_merged.snapindex 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 ------⚪ [90mNo worktree found for branch feature-merged[0m-✅ [32mRemoved branch [1m[32mfeature-merged[0m[32m[0m+⚪ [90mNo worktree found for branch feature-merged[39m+✅ [32mRemoved branch [1mfeature-merged[22m[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_branch_only_unmerged.snap b/tests/snapshots/integration__integration_tests__remove__remove_branch_only_unmerged.snapindex 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 ------⚪ [90mNo worktree found for branch feature-unmerged[0m-🟡 [33mCould not delete branch [1m[33mfeature-unmerged[0m[0m+⚪ [90mNo worktree found for branch feature-unmerged[39m+🟡 [33mCould not delete branch [1mfeature-unmerged[39m[22m[107m [0m error: the branch 'feature-unmerged' is not fully mergeddiff --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.snapindex 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 ------❌ [31mCannot remove worktree: working tree has uncommitted changes[0m+❌ [31mCannot remove worktree: working tree has uncommitted changes[39m-💡 [2mCommit or stash them first[0m+💡 [2mCommit or stash them first[22mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_main.snap b/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_main.snapindex 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 ------🔄 [36mRemoving [1m[36mfeature-a[0m[36m worktree & branch in background[0m+🔄 [36mRemoving [1mfeature-a[22m worktree & branch in background[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_other_worktree.snap b/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_other_worktree.snapindex 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 ------🔄 [36mRemoving [1m[36mfeature-b[0m[36m worktree & branch in background[0m+🔄 [36mRemoving [1mfeature-b[22m worktree & branch in background[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_current_by_name.snap b/tests/snapshots/integration__integration_tests__remove__remove_current_by_name.snapindex 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 ------🔄 [36mRemoving [1m[36mfeature-current[0m[36m worktree & branch in background[0m+🔄 [36mRemoving [1mfeature-current[22m worktree & branch in background[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_dirty_working_tree.snap b/tests/snapshots/integration__integration_tests__remove__remove_dirty_working_tree.snapindex 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 ------❌ [31mCannot remove worktree: working tree has uncommitted changes[0m+❌ [31mCannot remove worktree: working tree has uncommitted changes[39m-💡 [2mCommit or stash them first[0m+💡 [2mCommit or stash them first[22mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_foreground.snap b/tests/snapshots/integration__integration_tests__remove__remove_foreground.snapindex 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 ------🔄 [36mRemoving worktree for [1m[36mfeature-fg[0m[36m...[0m-✅ [32mRemoved worktree & branch for [1m[32mfeature-fg[0m[32m[0m+🔄 [36mRemoving worktree for [1mfeature-fg[22m...[39m+✅ [32mRemoved worktree & branch for [1mfeature-fg[22m[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap b/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snapindex 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 ------🔄 [36mRemoving [1m[36mfeature-wt[0m[36m worktree & branch in background[0m+🔄 [36mRemoving [1mfeature-wt[22m worktree & branch in background[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap b/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snapindex 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: CLC_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: 0cd '[REPO]'----- stderr ------🔄 [36mRemoving [1m[36mfeature-internal[0m[36m worktree & branch in background[0m+🔄 [36mRemoving [1mfeature-internal[22m worktree & branch in background[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_multiple_including_current.snap b/tests/snapshots/integration__integration_tests__remove__remove_multiple_including_current.snapindex 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 ------🔄 [36mRemoving [1m[36mfeature-b[0m[36m worktree & branch in background[0m-🔄 [36mRemoving [1m[36mfeature-c[0m[36m worktree & branch in background[0m-🔄 [36mRemoving [1m[36mfeature-a[0m[36m worktree & branch in background[0m+🔄 [36mRemoving [1mfeature-b[22m worktree & branch in background[39m+🔄 [36mRemoving [1mfeature-c[22m worktree & branch in background[39m+🔄 [36mRemoving [1mfeature-a[22m worktree & branch in background[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snapindex 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 ------🔄 [36mRemoving [1m[36mfeature-a[0m[36m worktree & branch in background[0m-🔄 [36mRemoving [1m[36mfeature-b[0m[36m worktree & branch in background[0m-🔄 [36mRemoving [1m[36mfeature-c[0m[36m worktree & branch in background[0m+🔄 [36mRemoving [1mfeature-a[22m worktree & branch in background[39m+🔄 [36mRemoving [1mfeature-b[22m worktree & branch in background[39m+🔄 [36mRemoving [1mfeature-c[22m worktree & branch in background[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_no_delete_branch.snap b/tests/snapshots/integration__integration_tests__remove__remove_no_delete_branch.snapindex 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 ------🔄 [36mRemoving [1m[36mfeature-keep[0m[36m worktree in background; retaining branch (--no-delete-branch)[0m+🔄 [36mRemoving [1mfeature-keep[22m worktree in background; retaining branch (--no-delete-branch)[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_nonexistent_worktree.snap b/tests/snapshots/integration__integration_tests__remove__remove_nonexistent_worktree.snapindex 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 ------❌ [31mNo worktree found for branch [1m[31mnonexistent[0m[0m+❌ [31mNo worktree found for branch [1mnonexistent[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_switch_to_default.snap b/tests/snapshots/integration__integration_tests__remove__remove_switch_to_default.snapindex 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 ------🔄 [36mRemoving [1m[36mfeature[0m[36m worktree & branch in background[0m+🔄 [36mRemoving [1mfeature[22m worktree & branch in background[39mdiff --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.snapindex 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: CLC_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 ------❌ [31mBranch [1m[31m__WORKTRUNK_CD__/tmp[0m[31m already exists[0m+❌ [31mBranch [1m__WORKTRUNK_CD__/tmp[22m already exists[39m-💡 [2mRemove --create flag to switch to it[0m+💡 [2mRemove --create flag to switch to it[22mdiff --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.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m./repo[0m [2mf9d58892[0m [2m1d[0m [2mFix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4[0m-+ [2mfeature[0m [2m_[0m [2m./repo.feature[0m [2mf9d58892[0m [2m1d[0m [2mFix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4[0m+@ [1mmain[0m [2m^[22m [1m./repo[0m [2mf9d58892[0m [2m1d[0m [2mFix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4[0m++ [2mfeature[0m [2m_[22m [2m./repo.feature[0m [2mf9d58892[0m [2m1d[0m [2mFix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4[0m⚪ [2mShowing 2 worktrees[0mdiff --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.snapindex 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: CLC_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 ------❌ [31mFailed to create worktree for [1m[31m__WORKTRUNK_EXEC__echo PWNED > /tmp/hacked6[0m[0m+❌ [31mFailed to create worktree for [1m__WORKTRUNK_EXEC__echo PWNED > /tmp/hacked6[22m[39m[107m [0m fatal: invalid reference: __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked6diff --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.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m.[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+@ [1mmain[0m [2m^[22m [1m.[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 1 worktree[0mdiff --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.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2malso-no-changes[0m [2m_[0m [2m./repo.also-no-changes[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mno-changes[0m [2m_[0m [2m./repo.no-changes[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ with-changes [36m![0m [32m+1[0m [31m-1[0m ./repo.with-changes [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2malso-no-changes[0m [2m_[22m [2m./repo.also-no-changes[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mno-changes[0m [2m_[22m [2m./repo.no-changes[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ with-changes [36m![39m [32m+1[0m [31m-1[0m ./repo.with-changes [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 4 worktrees, 1 with changes[0mdiff --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.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mhuge[0m [36m?[0m[2m_[0m [2m./repo.huge[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ tiny [36m![0m [32m+1[0m [31m-1[0m ./repo.tiny [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mhuge[0m [36m?[39m[2m_[22m [2m./repo.huge[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ tiny [36m![39m [32m+1[0m [31m-1[0m ./repo.tiny [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 3 worktrees, 1 with changes[0mdiff --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.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-large[0m [36m?[0m[2m_[0m [2m./repo.feature-large[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-medium[0m [36m?[0m[2m_[0m [2m./repo.feature-medium[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mfeature-small[0m [36m?[0m[2m_[0m [2m./repo.feature-small[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-large[0m [36m?[39m[2m_[22m [2m./repo.feature-large[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-medium[0m [36m?[39m[2m_[22m [2m./repo.feature-medium[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mfeature-small[0m [36m?[39m[2m_[22m [2m./repo.feature-small[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 4 worktrees[0mdiff --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.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m-@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb834638e[0m [2m1d[0m-+ [2manother-extremely-long-name-here[0m [2m_[0m [2m./repo.another-extremely-long-name-here[0m [2mb834638e[0m [2m1d[0m-+ [2mshort[0m [2m_[0m [2m./repo.short[0m [2mb834638e[0m [2m1d[0m-+ [2mvery-long-feature-branch-name[0m [2m_[0m [2m./repo.very-long-feature-branch-name[0m [2mb834638e[0m [2m1d[0m+@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m++ [2manother-extremely-long-name-here[0m [2m_[22m [2m./repo.another-extremely-long-name-here[0m [2mb834638e[0m [2m1d[0m++ [2mshort[0m [2m_[22m [2m./repo.short[0m [2mb834638e[0m [2m1d[0m++ [2mvery-long-feature-branch-name[0m [2m_[22m [2m./repo.very-long-feature-branch-name[0m [2mb834638e[0m [2m1d[0m⚪ [2mShowing 4 worktrees, 1 column hidden[0mdiff --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.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mextremely-long-branch-name-that-might-cause-layout-issues[0m [2m_[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mmedium[0m [2m_[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mx[0m [2m_[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+@ [1mmain[0m [2m^[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mextremely-long-branch-name-that-might-cause-layout-issues[0m [2m_[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mmedium[0m [2m_[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mx[0m [2m_[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 4 worktrees, 1 column hidden[0mdiff --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.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2ma[0m [2m_[0m [2m./repo.a[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mbb[0m [2m_[0m [2m./repo.bb[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mccc[0m [2m_[0m [2m./repo.ccc[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2ma[0m [2m_[22m [2m./repo.a[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mbb[0m [2m_[22m [2m./repo.bb[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mccc[0m [2m_[22m [2m./repo.ccc[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 4 worktrees[0mdiff --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.snapindex 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[0m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mcafe[0m [2m_[0m [2m./repo.cafe[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mnaive[0m [2m_[0m [2m./repo.naive[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2mresume[0m [2m_[0m [2m./repo.resume[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mcafe[0m [2m_[22m [2m./repo.cafe[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mnaive[0m [2m_[22m [2m./repo.naive[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2mresume[0m [2m_[22m [2m./repo.resume[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 4 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__create_with_base_main.snap b/tests/snapshots/integration__integration_tests__switch__create_with_base_main.snapindex 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 ------✅ [32mCreated new worktree for [1m[32mnew-feature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].new-feature[0m[0m-💡 [2mRun `wt config shell install` to enable automatic cd[0m+✅ [32mCreated new worktree for [1mnew-feature[22m from [1mmain[22m at [1m[REPO].new-feature[39m[22m+💡 [2mRun `wt config shell install` to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_base_without_create.snap b/tests/snapshots/integration__integration_tests__switch__switch_base_without_create.snapindex 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 ------🟡 [33m--base flag is only used with --create, ignoring[0m-⚪ Already on worktree for [1mmain[0m at [1m[REPO][0m+🟡 [33m--base flag is only used with --create, ignoring[39m+⚪ Already on worktree for [1mmain[22m at [1m[REPO][22mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_create_existing_error.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_existing_error.snapindex 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 ------❌ [31mBranch [1m[31mfeature-y[0m[31m already exists[0m+❌ [31mBranch [1mfeature-y[22m already exists[39m-💡 [2mRemove --create flag to switch to it[0m+💡 [2mRemove --create flag to switch to it[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_create_new.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_new.snapindex 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 ------✅ [32mCreated new worktree for [1m[32mfeature-x[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature-x[0m[0m-💡 [2mRun `wt config shell install` to enable automatic cd[0m+✅ [32mCreated new worktree for [1mfeature-x[22m from [1mmain[22m at [1m[REPO].feature-x[39m[22m+💡 [2mRun `wt config shell install` to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_create_no_remote.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_no_remote.snapindex 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 ------✅ [32mCreated new worktree for [1m[32mfeature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature[0m[0m-💡 [2mRun `wt config shell install` to enable automatic cd[0m+✅ [32mCreated new worktree for [1mfeature[22m from [1mmain[22m at [1m[REPO].feature[39m[22m+💡 [2mRun `wt config shell install` to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_create_remote_only.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_remote_only.snapindex 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 ------🟡 [33mBranch [1m[33mremote-feature[0m[33m exists on remote (origin/remote-feature); creating new branch from base instead[0m-💡 [2mUse 'wt switch remote-feature' (without --create) to switch to the remote branch[0m-✅ [32mCreated new worktree for [1m[32mremote-feature[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].remote-feature[0m[0m-💡 [2mRun `wt config shell install` to enable automatic cd[0m+🟡 [33mBranch [1mremote-feature[22m exists on remote (origin/remote-feature); creating new branch from base instead[39m+💡 [2mUse 'wt switch remote-feature' (without --create) to switch to the remote branch[22m+✅ [32mCreated new worktree for [1mremote-feature[22m from [1mmain[22m at [1m[REPO].remote-feature[39m[22m+💡 [2mRun `wt config shell install` to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_default_branch_missing_worktree.snap b/tests/snapshots/integration__integration_tests__switch__switch_default_branch_missing_worktree.snapindex 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 ------✅ [32mSwitched to worktree for [1m[32mmain[0m[32m at [1m[32m[REPO].main[0m[0m-💡 [2mRun `wt config shell install` to enable automatic cd[0m+✅ [32mSwitched to worktree for [1mmain[22m at [1m[REPO].main[39m[22m+💡 [2mRun `wt config shell install` to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_error_missing_directory.snap b/tests/snapshots/integration__integration_tests__switch__switch_error_missing_directory.snapindex 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 ------❌ [31mWorktree directory missing for [1m[31mmissing-wt[0m[0m+❌ [31mWorktree directory missing for [1mmissing-wt[39m[22m-💡 [2mRun 'git worktree prune' to clean up[0m+💡 [2mRun 'git worktree prune' to clean up[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_error_path_occupied.snap b/tests/snapshots/integration__integration_tests__switch__switch_error_path_occupied.snapindex 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 ------❌ [31mCannot create worktree for [1m[31moccupied-branch[0m[31m: target path already exists[0m+❌ [31mCannot create worktree for [1moccupied-branch[22m: target path already exists[39m-💡 [2mReuse the existing worktree at [REPO]/../repo.occupied-branch or remove it before retrying[0m+💡 [2mReuse the existing worktree at [REPO]/../repo.occupied-branch or remove it before retrying[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snapindex 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 ------✅ [32mCreated new worktree for [1m[32mfile-test[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].file-test[0m[0m-🔄 [36mExecuting (--execute):[0m+✅ [32mCreated new worktree for [1mfile-test[22m from [1mmain[22m at [1m[REPO].file-test[39m[22m+🔄 [36mExecuting (--execute):[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test content'[0m[2m [0m[2m[36m>[0m[2m test.txt[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snapindex 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 ------✅ [32mSwitched to worktree for [1m[32mexisting-exec[0m[32m at [1m[32m[REPO].existing-exec[0m[0m-🔄 [36mExecuting (--execute):[0m+✅ [32mSwitched to worktree for [1mexisting-exec[22m at [1m[REPO].existing-exec[39m[22m+🔄 [36mExecuting (--execute):[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'existing worktree'[0m[2m [0m[2m[36m>[0m[2m existing.txt[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snapindex 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 ------✅ [32mCreated new worktree for [1m[32mfail-test[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].fail-test[0m[0m-🔄 [36mExecuting (--execute):[0m+✅ [32mCreated new worktree for [1mfail-test[22m from [1mmain[22m at [1m[REPO].fail-test[39m[22m+🔄 [36mExecuting (--execute):[39m[107m [0m [2m[0m[2m[34mexit[0m[2m 1[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snapindex 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 @@ line2line3----- stderr ------✅ [32mCreated new worktree for [1m[32mmultiline-test[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].multiline-test[0m[0m-🔄 [36mExecuting (--execute):[0m+✅ [32mCreated new worktree for [1mmultiline-test[22m from [1mmain[22m at [1m[REPO].multiline-test[39m[22m+🔄 [36mExecuting (--execute):[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'line1'[0m[2m[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'line2'[0m[2m[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'line3'[0m[2m[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snapindex 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: 0test output----- stderr ------✅ [32mCreated new worktree for [1m[32mexec-test[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].exec-test[0m[0m-🔄 [36mExecuting (--execute):[0m+✅ [32mCreated new worktree for [1mexec-test[22m from [1mmain[22m at [1m[REPO].exec-test[39m[22m+🔄 [36mExecuting (--execute):[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test output'[0m[2m[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snap b/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snapindex 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 ------🟡 [33mWorktree for [1m[33mfeature-z[0m[33m at [1m[33m[REPO].feature-z[0m[33m; cannot cd (no shell integration)[0m-💡 [2mRun `wt config shell install` to enable automatic cd[0m+🟡 [33mWorktree for [1mfeature-z[22m at [1m[REPO].feature-z[22m; cannot cd (no shell integration)[39m+💡 [2mRun `wt config shell install` to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_existing_internal.snap b/tests/snapshots/integration__integration_tests__switch__switch_existing_internal.snapindex 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: CLC_ALL: C- SOURCE_DATE_EPOCH: "1761609600"+ SOURCE_DATE_EPOCH: "1735776000"WORKTRUNK_BIN: ""WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---@@ -27,4 +27,4 @@ exit_code: 0cd '[REPO].existing-wt'----- stderr ------✅ [32mSwitched to worktree for [1m[32mexisting-wt[0m[32m at [1m[32m[REPO].existing-wt[0m[0m+✅ [32mSwitched to worktree for [1mexisting-wt[22m at [1m[REPO].existing-wt[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_existing_with_shell_configured.snap b/tests/snapshots/integration__integration_tests__switch__switch_existing_with_shell_configured.snapindex 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 ------✅ [32mSwitched to worktree for [1m[32mshell-configured[0m[32m at [1m[32m[REPO].shell-configured[0m[0m+✅ [32mSwitched to worktree for [1mshell-configured[22m at [1m[REPO].shell-configured[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_exit_code.snap b/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_exit_code.snapindex 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: CLC_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 ------✅ [32mCreated new worktree for [1m[32mexit-code-test[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].exit-code-test[0m[0m-🔄 [36mExecuting (--execute):[0m+✅ [32mCreated new worktree for [1mexit-code-test[22m from [1mmain[22m at [1m[REPO].exit-code-test[39m[22m+🔄 [36mExecuting (--execute):[39m[107m [0m [2m[0m[2m[34mexit[0m[2m 42[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_output_then_exit.snap b/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_output_then_exit.snapindex 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: CLC_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 ------✅ [32mCreated new worktree for [1m[32moutput-exit-test[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].output-exit-test[0m[0m-🔄 [36mExecuting (--execute):[0m+✅ [32mCreated new worktree for [1moutput-exit-test[22m from [1mmain[22m at [1m[REPO].output-exit-test[39m[22m+🔄 [36mExecuting (--execute):[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'doing work'[0m[2m[0m[107m [0m [2m[0m[2m[34mexit[0m[2m 7[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_internal_mode.snap b/tests/snapshots/integration__integration_tests__switch__switch_internal_mode.snapindex 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: CLC_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: 0cd '[REPO].internal-test'----- stderr ------✅ [32mCreated new worktree for [1m[32minternal-test[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].internal-test[0m[0m+✅ [32mCreated new worktree for [1minternal-test[22m from [1mmain[22m at [1m[REPO].internal-test[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snap b/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snapindex 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: CLC_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 ------✅ [32mCreated new worktree for [1m[32mexec-internal[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].exec-internal[0m[0m-🔄 [36mExecuting (--execute):[0m+✅ [32mCreated new worktree for [1mexec-internal[22m from [1mmain[22m at [1m[REPO].exec-internal[39m[22m+🔄 [36mExecuting (--execute):[39m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'line1'[0m[2m[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'line2'[0m[2m[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_main_branch.snap b/tests/snapshots/integration__integration_tests__switch__switch_main_branch.snapindex 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 [1mmain[0m at [1m[REPO][0m+⚪ Already on worktree for [1mmain[22m at [1m[REPO][22mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_main_branch_to_feature.snap b/tests/snapshots/integration__integration_tests__switch__switch_main_branch_to_feature.snapindex 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 ------✅ [32mSwitched to worktree for [1m[32mfeature-a[0m[32m at [1m[32m[REPO].feature-a[0m[0m-💡 [2mRun `wt config shell install` to enable automatic cd[0m+✅ [32mSwitched to worktree for [1mfeature-a[22m at [1m[REPO].feature-a[39m[22m+💡 [2mRun `wt config shell install` to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch.snap b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch.snapindex 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 ------🟡 [33mWorktree for [1m[33mfeature-a[0m[33m at [1m[33m[REPO].feature-a[0m[33m; cannot cd (no shell integration)[0m-💡 [2mRun `wt config shell install` to enable automatic cd[0m+🟡 [33mWorktree for [1mfeature-a[22m at [1m[REPO].feature-a[22m; cannot cd (no shell integration)[39m+💡 [2mRun `wt config shell install` to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_first.snap b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_first.snapindex 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 ------✅ [32mSwitched to worktree for [1m[32mfeature-a[0m[32m at [1m[32m[REPO].feature-a[0m[0m-💡 [2mRun `wt config shell install` to enable automatic cd[0m+✅ [32mSwitched to worktree for [1mfeature-a[22m at [1m[REPO].feature-a[39m[22m+💡 [2mRun `wt config shell install` to enable automatic cd[22mdiff --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.snapindex 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 ------❌ [31mNo previous branch found in history. Use 'wt list' to see available worktrees.[0m+❌ [31mNo previous branch found in history. Use 'wt list' to see available worktrees.[39mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_second.snap b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_second.snapindex 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 ------✅ [32mSwitched to worktree for [1m[32mfeature-b[0m[32m at [1m[32m[REPO].feature-b[0m[0m-💡 [2mRun `wt config shell install` to enable automatic cd[0m+✅ [32mSwitched to worktree for [1mfeature-b[22m at [1m[REPO].feature-b[39m[22m+💡 [2mRun `wt config shell install` to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_with_worktrunk_history_back.snap b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_with_worktrunk_history_back.snapindex 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 ------🟡 [33mWorktree for [1m[33mfeature-x[0m[33m at [1m[33m[REPO].feature-x[0m[33m; cannot cd (no shell integration)[0m-💡 [2mRun `wt config shell install` to enable automatic cd[0m+🟡 [33mWorktree for [1mfeature-x[22m at [1m[REPO].feature-x[22m; cannot cd (no shell integration)[39m+💡 [2mRun `wt config shell install` to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_with_worktrunk_history_first.snap b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_with_worktrunk_history_first.snapindex 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 ------✅ [32mSwitched to worktree for [1m[32mfeature-x[0m[32m at [1m[32m[REPO].feature-x[0m[0m-💡 [2mRun `wt config shell install` to enable automatic cd[0m+✅ [32mSwitched to worktree for [1mfeature-x[22m at [1m[REPO].feature-x[39m[22m+💡 [2mRun `wt config shell install` to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_with_worktrunk_history_second.snap b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_with_worktrunk_history_second.snapindex 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 ------✅ [32mSwitched to worktree for [1m[32mfeature-y[0m[32m at [1m[32m[REPO].feature-y[0m[0m-💡 [2mRun `wt config shell install` to enable automatic cd[0m+✅ [32mSwitched to worktree for [1mfeature-y[22m at [1m[REPO].feature-y[39m[22m+💡 [2mRun `wt config shell install` to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_primary_on_different_branch.snap b/tests/snapshots/integration__integration_tests__switch__switch_primary_on_different_branch.snapindex 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 ------✅ [32mCreated new worktree for [1m[32mfeature-from-main[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature-from-main[0m[0m-💡 [2mRun `wt config shell install` to enable automatic cd[0m+✅ [32mCreated new worktree for [1mfeature-from-main[22m from [1mmain[22m at [1m[REPO].feature-from-main[39m[22m+💡 [2mRun `wt config shell install` to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_to_existing_primary_on_different_branch.snap b/tests/snapshots/integration__integration_tests__switch__switch_to_existing_primary_on_different_branch.snapindex 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 ------🟡 [33mWorktree for [1m[33mexisting-branch[0m[33m at [1m[33m[REPO].existing-branch[0m[33m; cannot cd (no shell integration)[0m-💡 [2mRun `wt config shell install` to enable automatic cd[0m+🟡 [33mWorktree for [1mexisting-branch[22m at [1m[REPO].existing-branch[22m; cannot cd (no shell integration)[39m+💡 [2mRun `wt config shell install` to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_with_base.snap b/tests/snapshots/integration__integration_tests__switch__switch_with_base.snapindex 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 ------✅ [32mCreated new worktree for [1m[32mfeature-with-base[0m[32m from [1m[32mmain[0m[32m at [1m[32m[REPO].feature-with-base[0m[0m-💡 [2mRun `wt config shell install` to enable automatic cd[0m+✅ [32mCreated new worktree for [1mfeature-with-base[22m from [1mmain[22m at [1m[REPO].feature-with-base[39m[22m+💡 [2mRun `wt config shell install` to enable automatic cd[22m