Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Fix: Use gutter output for `cache show` command
Maximilian Roos892bbd83c7c6
diff --git a/CLAUDE.md b/CLAUDE.mdindex fc4adf5e8..4e13088ab 100644--- a/CLAUDE.md+++ b/CLAUDE.md@@ -307,13 +307,14 @@ Use `output::` functions with `cformat!` for styled content. The output function// ✅ GOOD - output:: handles emoji + outer color, cformat! handles inner stylingoutput::success(cformat!("Created <bold>{branch}</> from <bold>{base}</>"))?;output::warning(cformat!("Branch <bold>{name}</> has <dim>uncommitted changes</>"))?;-output::hint(cformat!("<dim>Run </>wt merge<dim> to continue</>"))?;+output::hint(cformat!("Run <bright-black>wt merge</><dim> to continue"))?;// ✅ GOOD - plain strings work too (no inner styling needed)output::progress("Rebasing onto main...")?;+output::hint("No changes to commit")?;```-**Available color-print tags:** `<bold>`, `<dim>`, `<red>`, `<green>`, `<yellow>`, `<cyan>`, `<magenta>`+**Available color-print tags:** `<bold>`, `<dim>`, `<bright-black>`, `<red>`, `<green>`, `<yellow>`, `<cyan>`, `<magenta>`**Emoji constants in cformat!:** Use `{ERROR_EMOJI}`, `{HINT_EMOJI}`, etc. for messages that bypass output:: functions (e.g., GitError Display impl):@@ -328,14 +329,17 @@ Branch names in messages should be bolded. Tables (`wt list`) use `StyledLine` wNever quote commands or branch names. Use styling to make them stand out:- **In normal font context**: Use `<bold>` for commands and branches-- **In dim font context** (hints): Close dim, show in normal font, reopen dim+- **In hints**: Use `<bright-black>` for commands, then `<dim>` to continue dimmed text```rust// ✅ GOOD - bold in normal contextoutput::info(cformat!("Use <bold>wt merge</> to continue"))?;-// ✅ GOOD - normal font in dim context (close/reopen dim)-output::hint(cformat!("<dim>Run </>wt list<dim> to see worktrees</>"))?;+// ✅ GOOD - bright-black for commands in hints (re-apply dim after)+output::hint(cformat!("Run <bright-black>wt list</><dim> to see worktrees"))?;++// ✅ GOOD - plain hint without commands+output::hint("No changes to commit")?;// ❌ BAD - quoted commandsoutput::hint("Run 'wt list' to see worktrees")?;diff --git a/src/commands/commit.rs b/src/commands/commit.rsindex e6017f6e7..cba90caae 100644--- a/src/commands/commit.rs+++ b/src/commands/commit.rs@@ -2,7 +2,7 @@ use anyhow::Context;use color_print::cformat;use worktrunk::config::CommitGenerationConfig;use worktrunk::git::Repository;-use worktrunk::styling::{HINT_EMOJI, format_with_gutter};+use worktrunk::styling::format_with_gutter;use super::command_executor::CommandContext;use super::hooks::HookPipeline;@@ -67,8 +67,8 @@ impl<'a> CommitGenerator<'a> {pub fn emit_hint_if_needed(&self) -> anyhow::Result<()> {if !self.config.is_configured() {- crate::output::print(cformat!(- "{HINT_EMOJI} <dim>Using fallback commit message. Run </>wt config --help<dim> for LLM setup guide</>"+ crate::output::hint(cformat!(+ "Using fallback commit message. Run <bright-black>wt config --help</><dim> for LLM setup guide"))?;}Ok(())@@ -143,7 +143,9 @@ impl CommitOptions<'_> {.unwrap_or(false);if self.no_verify && has_pre_commit {- crate::output::hint("Skipping pre-commit hook (--no-verify)")?;+ crate::output::hint(cformat!(+ "Skipping pre-commit hook (<bright-black>--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 c9b15051b..cb5471635 100644--- a/src/commands/config.rs+++ b/src/commands/config.rs@@ -51,11 +51,11 @@ pub fn handle_config_create() -> anyhow::Result<()> {format_path_for_display(&config_path)))?;output::blank()?;- output::print(cformat!(- "{HINT_EMOJI} <dim>Use </>wt config show<dim> to view existing configuration</>"+ output::hint(cformat!(+ "Use <bright-black>wt config show</><dim> to view existing configuration"))?;- output::print(cformat!(- "{HINT_EMOJI} <dim>Use </>wt config create --help<dim> for config format reference</>"+ output::hint(cformat!(+ "Use <bright-black>wt config create --help</><dim> for config format reference"))?;return Ok(());}@@ -128,7 +128,9 @@ fn render_user_config(out: &mut String) -> anyhow::Result<()> {writeln!(out,"{}",- cformat!("{HINT_EMOJI} <dim>Run </>wt config create<dim> to create a config file</>")+ cformat!(+ "{HINT_EMOJI} <dim>Run <bright-black>wt config create</><dim> to create a config file</>"+ ))?;writeln!(out)?;let default_config =@@ -327,7 +329,7 @@ fn render_shell_status(out: &mut String) -> anyhow::Result<()> {out,"{}",cformat!(- "{HINT_EMOJI} <dim>Run </>wt config shell install<dim> to enable shell integration</>"+ "{HINT_EMOJI} <dim>Run <bright-black>wt config shell install</><dim> to enable shell integration</>"))?;}@@ -475,8 +477,8 @@ pub fn handle_cache_show() -> anyhow::Result<()> {// Show default branch cachecrate::output::info("Default branch cache:")?;match repo.default_branch() {- Ok(branch) => crate::output::data(format!(" {branch}"))?,- Err(_) => crate::output::data(" (not cached)")?,+ Ok(branch) => crate::output::gutter(format_with_gutter(&branch, "", None))?,+ Err(_) => crate::output::gutter(format_with_gutter("(not cached)", "", None))?,}crate::output::blank()?;@@ -485,7 +487,7 @@ pub fn handle_cache_show() -> anyhow::Result<()> {let entries = CachedCiStatus::list_all(&repo);if entries.is_empty() {- crate::output::data(" (no CI cache entries)")?;+ crate::output::gutter(format_with_gutter("(empty)", "", None))?;return Ok(());}@@ -494,6 +496,7 @@ pub fn handle_cache_show() -> anyhow::Result<()> {.map(|d| d.as_secs()).unwrap_or(0);+ let mut ci_lines = Vec::new();for (branch, cached) in entries {let status = serde_json::to_string(&cached.status.ci_status).map(|s| s.trim_matches('"').to_string())@@ -501,8 +504,9 @@ pub fn handle_cache_show() -> anyhow::Result<()> {let age = now_secs.saturating_sub(cached.checked_at);let head: String = cached.head.chars().take(8).collect();- crate::output::data(format!(" {branch}: {status} (age: {age}s, head: {head})"))?;+ ci_lines.push(format!("{branch}: {status} (age: {age}s, head: {head})"));}+ crate::output::gutter(format_with_gutter(&ci_lines.join("\n"), "", None))?;Ok(())}diff --git a/src/commands/list/collect_progressive_impl.rs b/src/commands/list/collect_progressive_impl.rsindex 7381bc1ee..852475a1c 100644--- a/src/commands/list/collect_progressive_impl.rs+++ b/src/commands/list/collect_progressive_impl.rs@@ -20,12 +20,12 @@//! - Show error placeholder in UI//! - Continue silently (current behavior)+use crate::output;use crossbeam_channel::Sender;use std::path::PathBuf;use std::sync::Arc;use worktrunk::git::{LineDiff, Repository, Worktree};use worktrunk::path::format_path_for_display;-use worktrunk::styling::eprintln;use super::ci_status::PrStatus;use super::collect::{ExpectedResults, TaskKind, TaskResult, detect_git_operation};@@ -361,11 +361,11 @@ impl Task for UpstreamTask {}),Err(e) => {if ctx.verbose_errors {- eprintln!(- "Warning: ahead_behind failed for {}: {}",+ let _ = output::warning(format!(+ "ahead_behind failed for {}: {}",format_path_for_display(&ctx.repo_path),e- );+ ));}None}@@ -374,11 +374,11 @@ impl Task for UpstreamTask {Ok(None) => None,Err(e) => {if ctx.verbose_errors {- eprintln!(- "Warning: upstream_branch failed for {}: {}",+ let _ = output::warning(format!(+ "upstream_branch failed for {}: {}",format_path_for_display(&ctx.repo_path),e- );+ ));}None}diff --git a/src/commands/standalone.rs b/src/commands/standalone.rsindex 59d3e6a7b..b9ed94db0 100644--- a/src/commands/standalone.rs+++ b/src/commands/standalone.rs@@ -142,7 +142,9 @@ pub fn handle_squash(.unwrap_or(false);if skip_pre_commit && has_pre_commit {- crate::output::hint("Skipping pre-commit hook (--no-verify)")?;+ crate::output::hint(cformat!(+ "Skipping pre-commit hook (<bright-black>--no-verify</>)"+ ))?;} else if let Some(ref config) = project_config {HookPipeline::new(ctx).run_pre_commit(config, Some(&target_branch), auto_trust)?;}diff --git a/src/commands/worktree.rs b/src/commands/worktree.rsindex 888189b12..6a79b3d2b 100644--- a/src/commands/worktree.rs+++ b/src/commands/worktree.rs@@ -114,7 +114,7 @@ use std::path::PathBuf;use worktrunk::HookType;use worktrunk::config::{CommandPhase, WorktrunkConfig};use worktrunk::git::{GitError, Repository, ResolvedWorktree, is_command_not_approved};-use worktrunk::styling::{HINT_EMOJI, format_with_gutter};+use worktrunk::styling::format_with_gutter;use super::command_executor::CommandContext;use super::hooks::{HookFailureStrategy, HookPipeline};@@ -327,8 +327,8 @@ pub fn handle_switch(crate::output::warning(cformat!("Branch <bold>{resolved_branch}</> exists on remote ({remote_ref}); creating new branch from base instead"))?;- crate::output::print(cformat!(- "{HINT_EMOJI} <dim>Use </>wt switch <bold>{resolved_branch}</><dim> (without </>--create<dim>) to switch to the remote branch</>"+ crate::output::hint(cformat!(+ "Use <bright-black>wt switch {resolved_branch}</><dim> (without <bright-black>--create</><dim>) to switch to the remote branch"))?;}}diff --git a/src/git/error.rs b/src/git/error.rsindex e232108b2..02293f373 100644--- a/src/git/error.rs+++ b/src/git/error.rs@@ -150,21 +150,21 @@ impl std::fmt::Display for GitError {GitError::BranchAlreadyExists { branch } => {cwrite!(f,- "{ERROR_EMOJI} <red>Branch <bold>{branch}</> already exists</>\n\n{HINT_EMOJI} <dim>Remove </>--create<dim> flag to switch to the existing branch</>"+ "{ERROR_EMOJI} <red>Branch <bold>{branch}</> already exists</>\n\n{HINT_EMOJI} <dim>Remove <bright-black>--create</><dim> flag to switch to the existing branch</>")}GitError::InvalidReference { reference } => {cwrite!(f,- "{ERROR_EMOJI} <red>Branch <bold>{reference}</> not found</>\n\n{HINT_EMOJI} <dim>Use </>--create<dim> to create a new branch, or </>wt list --branches --remotes<dim> for available branches</>"+ "{ERROR_EMOJI} <red>Branch <bold>{reference}</> not found</>\n\n{HINT_EMOJI} <dim>Use <bright-black>--create</><dim> to create a new branch, or <bright-black>wt list --branches --remotes</><dim> for available branches</>")}GitError::WorktreeMissing { branch } => {cwrite!(f,- "{ERROR_EMOJI} <red>Worktree directory missing for <bold>{branch}</></>\n\n{HINT_EMOJI} <dim>Run </>git worktree prune<dim> to clean up</>"+ "{ERROR_EMOJI} <red>Worktree directory missing for <bold>{branch}</></>\n\n{HINT_EMOJI} <dim>Run <bright-black>git worktree prune</><dim> to clean up</>")}@@ -211,7 +211,7 @@ impl std::fmt::Display for GitError {let actual = format_path_for_display(actual_path);cwrite!(f,- "{ERROR_EMOJI} <red>Ambiguous: <bold>{expected}</> has a worktree on a different branch, but branch <bold>{branch}</> exists at <bold>{actual}</></>\n\n{HINT_EMOJI} <dim>Use </>wt list<dim> to see worktree-branch mappings</>"+ "{ERROR_EMOJI} <red>Ambiguous: <bold>{expected}</> has a worktree on a different branch, but branch <bold>{branch}</> exists at <bold>{actual}</></>\n\n{HINT_EMOJI} <dim>Use <bright-black>wt list</><dim> to see worktree-branch mappings</>")}@@ -286,12 +286,12 @@ impl std::fmt::Display for GitError {if *in_merge_context {cwrite!(f,- "\n{HINT_EMOJI} <dim>Run </>wt merge<dim> again to incorporate these changes</>"+ "\n{HINT_EMOJI} <dim>Run <bright-black>wt merge</><dim> again to incorporate these changes</>")} else {cwrite!(f,- "\n{HINT_EMOJI} <dim>Use </>wt step rebase<dim> or </>wt merge<dim> to rebase onto <bold>{target_branch}</></>"+ "\n{HINT_EMOJI} <dim>Use <bright-black>wt step rebase</><dim> or <bright-black>wt merge</><dim> to rebase onto <bold>{target_branch}</></>")}}@@ -299,7 +299,7 @@ impl std::fmt::Display for GitError {GitError::MergeCommitsFound => {cwrite!(f,- "{ERROR_EMOJI} <red>Found merge commits in push range</>\n\n{HINT_EMOJI} <dim>Use </>--allow-merge-commits<dim> to push non-linear history</>"+ "{ERROR_EMOJI} <red>Found merge commits in push range</>\n\n{HINT_EMOJI} <dim>Use <bright-black>--allow-merge-commits</><dim> to push non-linear history</>")}@@ -316,7 +316,7 @@ impl std::fmt::Display for GitError {} else {cwrite!(f,- "\n\n{HINT_EMOJI} <dim>Resolve conflicts and run </>git rebase --continue\n{HINT_EMOJI} <dim>Or abort with </>git rebase --abort"+ "\n\n{HINT_EMOJI} <dim>Resolve conflicts and run <bright-black>git rebase --continue</></>\n{HINT_EMOJI} <dim>Or abort with <bright-black>git rebase --abort</></>")}}@@ -329,7 +329,7 @@ impl std::fmt::Display for GitError {GitError::NotInteractive => {cwrite!(f,- "{ERROR_EMOJI} <red>Cannot prompt for approval in non-interactive environment</>\n\n{HINT_EMOJI} <dim>In CI/CD, use </>--force<dim> to skip prompts. To pre-approve commands, use </>wt config approvals add"+ "{ERROR_EMOJI} <red>Cannot prompt for approval in non-interactive environment</>\n\n{HINT_EMOJI} <dim>In CI/CD, use <bright-black>--force</><dim> to skip prompts. To pre-approve commands, use <bright-black>wt config approvals add</></>")}@@ -399,12 +399,12 @@ impl std::fmt::Display for WorktrunkError {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<dim> to skip {hook_type} commands</>"+ "{ERROR_EMOJI} <red>{hook_type} command failed: <bold>{name}</>: {error}</>\n\n{HINT_EMOJI} <dim>Use <bright-black>--no-verify</><dim> to skip {hook_type} commands</>")} else {cwrite!(f,- "{ERROR_EMOJI} <red>{hook_type} command failed: {error}</>\n\n{HINT_EMOJI} <dim>Use </>--no-verify<dim> to skip {hook_type} commands</>"+ "{ERROR_EMOJI} <red>{hook_type} command failed: {error}</>\n\n{HINT_EMOJI} <dim>Use <bright-black>--no-verify</><dim> to skip {hook_type} commands</>")}}diff --git a/src/main.rs b/src/main.rsindex 22ea82358..9149ad960 100644--- a/src/main.rs+++ b/src/main.rs@@ -336,7 +336,7 @@ fn main() {for (shell, path) in &scan_result.skipped {let path = format_path_for_display(path);crate::output::hint(cformat!(- "Skipped <bold>{shell}</>; {path} not found"+ "Skipped <bright-black>{shell}</><dim>; {path} not found"))?;}@@ -456,8 +456,8 @@ fn main() {"No {what} found in {path}"))?;} else {- crate::output::hint(format!(- "No {shell} {what} in {path}"+ crate::output::hint(cformat!(+ "No <bright-black>{shell}</><dim> {what} in {path}"))?;}}@@ -477,8 +477,8 @@ fn main() {"No completions found in {path}"))?;} else {- crate::output::hint(format!(- "No {shell} completions in {path}"+ crate::output::hint(cformat!(+ "No <bright-black>{shell}</><dim> completions in {path}"))?;}}diff --git a/src/output/traits.rs b/src/output/traits.rsindex 3fc2d00db..e23fa77da 100644--- a/src/output/traits.rs+++ b/src/output/traits.rs@@ -42,7 +42,7 @@ pub trait OutputHandler {self.write_message_line(&cformat!("{PROGRESS_EMOJI} <cyan>{message}</>"))}- /// Emit a hint message (automatically wrapped in dim)+ /// Emit a hint message (automatically wrapped in dim styling)fn hint(&mut self, message: String) -> io::Result<()> {self.write_message_line(&cformat!("{HINT_EMOJI} <dim>{message}</>"))}diff --git a/tests/integration_tests/config_cache.rs b/tests/integration_tests/config_cache.rsindex f29524d0f..833861694 100644--- a/tests/integration_tests/config_cache.rs+++ b/tests/integration_tests/config_cache.rs@@ -24,8 +24,10 @@ fn test_config_cache_show_empty() {assert!(output.status.success());assert_snapshot!(String::from_utf8_lossy(&output.stderr), @r"⚪ Default branch cache:+ [107m [0m main⚪ CI status cache:+ [107m [0m (empty)");}@@ -43,8 +45,10 @@ fn test_config_cache_show_with_default_branch() {assert!(output.status.success());assert_snapshot!(String::from_utf8_lossy(&output.stderr), @r"⚪ Default branch cache:+ [107m [0m main⚪ CI status cache:+ [107m [0m (empty)");}diff --git a/tests/integration_tests/config_init.rs b/tests/integration_tests/config_init.rsindex 227f845cc..14b016155 100644--- a/tests/integration_tests/config_init.rs+++ b/tests/integration_tests/config_init.rs@@ -32,8 +32,8 @@ fn test_config_init_already_exists() {----- stderr -----⚪ User config already exists: [1m~/.config/worktrunk/config.toml[22m- 💡 [2mUse [22mwt config show[2m to view existing configuration[22m- 💡 [2mUse [22mwt config create --help[2m for config format reference[22m+ 💡 [2mUse [90mwt config show[39m[2m to view existing configuration[22m[22m+ 💡 [2mUse [90mwt config create --help[39m[2m for config format reference[22m[22m");});}diff --git a/tests/integration_tests/configure_shell.rs b/tests/integration_tests/configure_shell.rsindex da7e65eda..c1872b50d 100644--- a/tests/integration_tests/configure_shell.rs+++ b/tests/integration_tests/configure_shell.rs@@ -36,8 +36,8 @@ fn test_configure_shell_with_yes() {🟡 [33mCompletions won't work; add to ~/.zshrc before the wt line:[39m[107m [0m [2m[0m[2m[34mautoload[0m[2m [0m[2m[36m-Uz[0m[2m compinit [0m[2m[36m&&[0m[2m [0m[2m[34mcompinit[0m[2m[0m✅ [32mAdded shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m[39m- 💡 [2mSkipped [1mbash[22m; ~/.bashrc not found[22m- 💡 [2mSkipped [1mfish[22m; ~/.config/fish/conf.d not found[22m+ 💡 [2mSkipped [90mbash[39m[2m; ~/.bashrc not found[22m[22m+ 💡 [2mSkipped [90mfish[39m[2m; ~/.config/fish/conf.d not found[22m[22m✅ [32mConfigured 1 shell[39m💡 [2mRestart shell or run: source ~/.zshrc[22m@@ -265,9 +265,9 @@ fn test_configure_shell_no_files() {----- stdout ---------- stderr ------ 💡 [2mSkipped [1mbash[22m; ~/.bashrc not found[22m- 💡 [2mSkipped [1mzsh[22m; ~/.zshrc not found[22m- 💡 [2mSkipped [1mfish[22m; ~/.config/fish/conf.d not found[22m+ 💡 [2mSkipped [90mbash[39m[2m; ~/.bashrc not found[22m[22m+ 💡 [2mSkipped [90mzsh[39m[2m; ~/.zshrc not found[22m[22m+ 💡 [2mSkipped [90mfish[39m[2m; ~/.config/fish/conf.d not found[22m[22m❌ [31mNo shell config files found[39m");});@@ -309,7 +309,7 @@ fn test_configure_shell_multiple_configs() {[107m [0m [2m[0m[2m[34mautoload[0m[2m [0m[2m[36m-Uz[0m[2m compinit [0m[2m[36m&&[0m[2m [0m[2m[34mcompinit[0m[2m[0m✅ [32mAdded shell extension & completions for [1mbash[22m @ [1m~/.bashrc[22m[39m✅ [32mAdded shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m[39m- 💡 [2mSkipped [1mfish[22m; ~/.config/fish/conf.d not found[22m+ 💡 [2mSkipped [90mfish[39m[2m; ~/.config/fish/conf.d not found[22m[22m✅ [32mConfigured 2 shells[39m💡 [2mRestart shell or run: source ~/.zshrc[22m@@ -372,7 +372,7 @@ fn test_configure_shell_mixed_states() {[107m [0m [2m[0m[2m[34mautoload[0m[2m [0m[2m[36m-Uz[0m[2m compinit [0m[2m[36m&&[0m[2m [0m[2m[34mcompinit[0m[2m[0m⚪ Already configured shell extension & completions for [1mbash[22m @ [1m~/.bashrc[22m✅ [32mAdded shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m[39m- 💡 [2mSkipped [1mfish[22m; ~/.config/fish/conf.d not found[22m+ 💡 [2mSkipped [90mfish[39m[2m; ~/.config/fish/conf.d not found[22m[22m✅ [32mConfigured 1 shell[39m💡 [2mRestart shell or run: source ~/.zshrc[22m@@ -428,9 +428,9 @@ fn test_uninstall_shell() {----- stderr -----✅ [32mRemoved shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m[39m- 💡 [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+ 💡 [2mNo [90mbash[39m[2m shell extension & completions in ~/.bashrc[22m[22m+ 💡 [2mNo [90mfish[39m[2m shell extension in ~/.config/fish/conf.d/wt.fish[22m[22m+ 💡 [2mNo [90mfish[39m[2m completions in ~/.config/fish/completions/wt.fish[22m[22m✅ [32mRemoved integration from 1 shell[39m💡 [2mRestart shell to complete uninstall[22m@@ -489,8 +489,8 @@ fn test_uninstall_shell_multiple() {----- stderr -----✅ [32mRemoved shell extension & completions for [1mbash[22m @ [1m~/.bashrc[22m[39m✅ [32mRemoved shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m[39m- 💡 [2mNo fish shell extension in ~/.config/fish/conf.d/wt.fish[22m- 💡 [2mNo fish completions in ~/.config/fish/completions/wt.fish[22m+ 💡 [2mNo [90mfish[39m[2m shell extension in ~/.config/fish/conf.d/wt.fish[22m[22m+ 💡 [2mNo [90mfish[39m[2m completions in ~/.config/fish/completions/wt.fish[22m[22m✅ [32mRemoved integration from 2 shells[39m💡 [2mRestart shell to complete uninstall[22m@@ -736,7 +736,7 @@ fn test_configure_shell_no_warning_for_bash_user() {----- stderr -----✅ [32mAdded shell extension & completions for [1mbash[22m @ [1m~/.bashrc[22m[39m✅ [32mAdded shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m[39m- 💡 [2mSkipped [1mfish[22m; ~/.config/fish/conf.d not found[22m+ 💡 [2mSkipped [90mfish[39m[2m; ~/.config/fish/conf.d not found[22m[22m✅ [32mConfigured 2 shells[39m💡 [2mRestart shell or run: source ~/.bashrc[22m@@ -856,7 +856,7 @@ fn test_configure_shell_no_warning_when_shell_unset() {----- stderr -----✅ [32mAdded shell extension & completions for [1mbash[22m @ [1m~/.bashrc[22m[39m✅ [32mAdded shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m[39m- 💡 [2mSkipped [1mfish[22m; ~/.config/fish/conf.d not found[22m+ 💡 [2mSkipped [90mfish[39m[2m; ~/.config/fish/conf.d not found[22m[22m✅ [32mConfigured 2 shells[39m");diff --git a/tests/integration_tests/directives.rs b/tests/integration_tests/directives.rsindex 0d69d260f..5a3ece4e3 100644--- a/tests/integration_tests/directives.rs+++ b/tests/integration_tests/directives.rs@@ -31,7 +31,7 @@ fn test_switch_internal_directive() {----- stderr -----❌ [31mBranch [1mmy-feature[22m not found[39m- 💡 [2mUse [22m--create[2m to create a new branch, or [22mwt list --branches --remotes[2m for available branches[22m+ 💡 [2mUse [90m--create[39m to create a new branch, or [90mwt list --branches --remotes[39m for available branches[22m");});}@@ -60,7 +60,7 @@ fn test_switch_without_internal() {----- stderr -----❌ [31mBranch [1mmy-feature[22m not found[39m- 💡 [2mUse [22m--create[2m to create a new branch, or [22mwt list --branches --remotes[2m for available branches[22m+ 💡 [2mUse [90m--create[39m to create a new branch, or [90mwt list --branches --remotes[39m for available branches[22m");});}diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__command_failure.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__command_failure.snapindex c38201daf..50662d332 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@@ -4,4 +4,4 @@ expression: output.normalized()---❌ [31mBranch [1mexisting[22m already exists[39m-💡 [2mRemove [22m--create[2m flag to switch to the existing branch[22m+💡 [2mRemove [90m--create[39m flag to switch to the existing branch[22mdiff --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 c95cace4e..9fdb6499f 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@@ -10,4 +10,4 @@ expression: output.normalized()✗ Test suite failed: 3 tests failing❌ [31mpre-merge command failed: [1mtest[22m: exit status: 1[39m-💡 [2mUse [22m--no-verify[2m to skip pre-merge commands[22m+💡 [2mUse [90m--no-verify[39m 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 c95cace4e..9fdb6499f 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap@@ -10,4 +10,4 @@ expression: output.normalized()✗ Test suite failed: 3 tests failing❌ [31mpre-merge command failed: [1mtest[22m: exit status: 1[39m-💡 [2mUse [22m--no-verify[2m to skip pre-merge commands[22m+💡 [2mUse [90m--no-verify[39m to skip pre-merge commands[22mdiff --git a/tests/snapshots/git_error_display__branch_already_exists.snap b/tests/snapshots/git_error_display__branch_already_exists.snapindex c1f6738d7..f069453d3 100644--- a/tests/snapshots/git_error_display__branch_already_exists.snap+++ b/tests/snapshots/git_error_display__branch_already_exists.snap@@ -4,4 +4,4 @@ expression: err.to_string()---❌ [31mBranch [1mfeature[22m already exists[39m-💡 [2mRemove [22m--create[2m flag to switch to the existing branch[22m+💡 [2mRemove [90m--create[39m flag to switch to the existing branch[22mdiff --git a/tests/snapshots/git_error_display__invalid_reference.snap b/tests/snapshots/git_error_display__invalid_reference.snapindex 240776e49..06ad5eb32 100644--- a/tests/snapshots/git_error_display__invalid_reference.snap+++ b/tests/snapshots/git_error_display__invalid_reference.snap@@ -4,4 +4,4 @@ expression: err.to_string()---❌ [31mBranch [1mnonexistent-branch[22m not found[39m-💡 [2mUse [22m--create[2m to create a new branch, or [22mwt list --branches --remotes[2m for available branches[22m+💡 [2mUse [90m--create[39m to create a new branch, or [90mwt list --branches --remotes[39m for available branches[22mdiff --git a/tests/snapshots/git_error_display__merge_commits_found.snap b/tests/snapshots/git_error_display__merge_commits_found.snapindex 169d537d4..3f40b3920 100644--- a/tests/snapshots/git_error_display__merge_commits_found.snap+++ b/tests/snapshots/git_error_display__merge_commits_found.snap@@ -4,4 +4,4 @@ expression: err.to_string()---❌ [31mFound merge commits in push range[39m-💡 [2mUse [22m--allow-merge-commits[2m to push non-linear history[22m+💡 [2mUse [90m--allow-merge-commits[39m to push non-linear history[22mdiff --git a/tests/snapshots/git_error_display__not_fast_forward.snap b/tests/snapshots/git_error_display__not_fast_forward.snapindex 7af0de2f1..8d027c2cf 100644--- a/tests/snapshots/git_error_display__not_fast_forward.snap+++ b/tests/snapshots/git_error_display__not_fast_forward.snap@@ -6,4 +6,4 @@ expression: err.to_string()[107m [0m abc1234 Fix bug[107m [0m def5678 Add feature-💡 [2mUse [22mwt step rebase[2m or [22mwt merge[2m to rebase onto [1mmain[22m[22m+💡 [2mUse [90mwt step rebase[39m or [90mwt merge[39m to rebase onto [1mmain[22m[22mdiff --git a/tests/snapshots/git_error_display__not_fast_forward_merge_context.snap b/tests/snapshots/git_error_display__not_fast_forward_merge_context.snapindex 696d90a22..89124187a 100644--- a/tests/snapshots/git_error_display__not_fast_forward_merge_context.snap+++ b/tests/snapshots/git_error_display__not_fast_forward_merge_context.snap@@ -5,4 +5,4 @@ expression: err.to_string()❌ [31mCan't push to local [1mmain[22m branch: it has newer commits[39m[107m [0m abc1234 New commit on main-💡 [2mRun [22mwt merge[2m again to incorporate these changes[22m+💡 [2mRun [90mwt merge[39m again to incorporate these changes[22mdiff --git a/tests/snapshots/git_error_display__not_interactive.snap b/tests/snapshots/git_error_display__not_interactive.snapindex 7eb1eb4cf..9b5bf352f 100644--- a/tests/snapshots/git_error_display__not_interactive.snap+++ b/tests/snapshots/git_error_display__not_interactive.snap@@ -4,4 +4,4 @@ expression: err.to_string()---❌ [31mCannot prompt for approval in non-interactive environment[39m-💡 [2mIn CI/CD, use [22m--force[2m to skip prompts. To pre-approve commands, use [22mwt config approvals add+💡 [2mIn CI/CD, use [90m--force[39m to skip prompts. To pre-approve commands, use [90mwt config approvals add[39m[22mdiff --git a/tests/snapshots/git_error_display__worktree_missing.snap b/tests/snapshots/git_error_display__worktree_missing.snapindex 4306f99f0..8e28f2a49 100644--- a/tests/snapshots/git_error_display__worktree_missing.snap+++ b/tests/snapshots/git_error_display__worktree_missing.snap@@ -4,4 +4,4 @@ expression: err.to_string()---❌ [31mWorktree directory missing for [1mstale-branch[39m[22m-💡 [2mRun [22mgit worktree prune[2m to clean up[22m+💡 [2mRun [90mgit worktree prune[39m to clean up[22mdiff --git a/tests/snapshots/git_error_display__worktree_path_mismatch.snap b/tests/snapshots/git_error_display__worktree_path_mismatch.snapindex f939b7a35..0cb04476d 100644--- a/tests/snapshots/git_error_display__worktree_path_mismatch.snap+++ b/tests/snapshots/git_error_display__worktree_path_mismatch.snap@@ -4,4 +4,4 @@ expression: err.to_string()---❌ [31mAmbiguous: [1m/tmp/repo.feature[22m has a worktree on a different branch, but branch [1mfeature[22m exists at [1m/tmp/repo.other[39m[22m-💡 [2mUse [22mwt list[2m to see worktree-branch mappings[22m+💡 [2mUse [90mwt list[39m to see worktree-branch mappings[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 096740378..c8b3fec7b 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@@ -31,4 +31,4 @@ exit_code: 1❌ [31mCannot prompt for approval in non-interactive environment[39m-💡 [2mIn CI/CD, use [22m--force[2m to skip prompts. To pre-approve commands, use [22mwt config approvals add+💡 [2mIn CI/CD, use [90m--force[39m to skip prompts. To pre-approve commands, use [90mwt config approvals add[39m[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 4d2675cf0..a3564f234 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@@ -16,4 +16,4 @@ exit_code: 1❌ [31mCannot prompt for approval in non-interactive environment[39m-💡 [2mIn CI/CD, use [22m--force[2m to skip prompts. To pre-approve commands, use [22mwt config approvals add+💡 [2mIn CI/CD, use [90m--force[39m to skip prompts. To pre-approve commands, use [90mwt config approvals add[39m[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 567bdc147..7de69d0c1 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@@ -22,4 +22,4 @@ exit_code: 1❌ [31mCannot prompt for approval in non-interactive environment[39m-💡 [2mIn CI/CD, use [22m--force[2m to skip prompts. To pre-approve commands, use [22mwt config approvals add+💡 [2mIn CI/CD, use [90m--force[39m to skip prompts. To pre-approve commands, use [90mwt config approvals add[39m[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 dfa568884..7f345ab0c 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@@ -19,4 +19,4 @@ exit_code: 1❌ [31mCannot prompt for approval in non-interactive environment[39m-💡 [2mIn CI/CD, use [22m--force[2m to skip prompts. To pre-approve commands, use [22mwt config approvals add+💡 [2mIn CI/CD, use [90m--force[39m to skip prompts. To pre-approve commands, use [90mwt config approvals add[39m[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 a53b3f227..814bb9496 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@@ -13,4 +13,4 @@ exit_code: 1❌ [31mCannot prompt for approval in non-interactive environment[39m-💡 [2mIn CI/CD, use [22m--force[2m to skip prompts. To pre-approve commands, use [22mwt config approvals add+💡 [2mIn CI/CD, use [90m--force[39m to skip prompts. To pre-approve commands, use [90mwt config approvals add[39m[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 4d2675cf0..a3564f234 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@@ -16,4 +16,4 @@ exit_code: 1❌ [31mCannot prompt for approval in non-interactive environment[39m-💡 [2mIn CI/CD, use [22m--force[2m to skip prompts. To pre-approve commands, use [22mwt config approvals add+💡 [2mIn CI/CD, use [90m--force[39m to skip prompts. To pre-approve commands, use [90mwt config approvals add[39m[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 67ba5a90f..675d0b547 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@@ -13,4 +13,4 @@ exit_code: 1❌ [31mCannot prompt for approval in non-interactive environment[39m-💡 [2mIn CI/CD, use [22m--force[2m to skip prompts. To pre-approve commands, use [22mwt config approvals add+💡 [2mIn CI/CD, use [90m--force[39m to skip prompts. To pre-approve commands, use [90mwt config approvals add[39m[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 d017f4027..fe388ddd5 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@@ -13,4 +13,4 @@ exit_code: 1❌ [31mCannot prompt for approval in non-interactive environment[39m-💡 [2mIn CI/CD, use [22m--force[2m to skip prompts. To pre-approve commands, use [22mwt config approvals add+💡 [2mIn CI/CD, use [90m--force[39m to skip prompts. To pre-approve commands, use [90mwt config approvals add[39m[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 9105113fb..92ebf669b 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@@ -13,4 +13,4 @@ exit_code: 1❌ [31mCannot prompt for approval in non-interactive environment[39m-💡 [2mIn CI/CD, use [22m--force[2m to skip prompts. To pre-approve commands, use [22mwt config approvals add+💡 [2mIn CI/CD, use [90m--force[39m to skip prompts. To pre-approve commands, use [90mwt config approvals add[39m[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 43c5bb815..3e490b44e 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@@ -32,4 +32,4 @@ exit_code: 1❌ [31mCannot prompt for approval in non-interactive environment[39m-💡 [2mIn CI/CD, use [22m--force[2m to skip prompts. To pre-approve commands, use [22mwt config approvals add+💡 [2mIn CI/CD, use [90m--force[39m to skip prompts. To pre-approve commands, use [90mwt config approvals add[39m[22mdiff --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 79981d865..59affdbb1 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@@ -36,4 +36,4 @@ exit_code: 0⚪ Already configured shell extension & completions for [1mzsh[22m @ ~/.zshrc[2m⚪ Skipped fish; ~/.config/fish/conf.d not found[22m-💡 [2mRun [22mwt config shell install[2m to enable shell integration[22m+💡 [2mRun [90mwt config shell install[39m to enable shell integration[22mdiff --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 ca97f4a7c..946055e9f 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@@ -26,7 +26,7 @@ exit_code: 0🔄 [36mSquashing 1 commit & working tree changes into a single commit [90m(1 file, [32m+1[39m[39m[90m)[39m...[39m💡 [2mBackup created @ b18c23e[22m🔄 [36mGenerating squash commit message...[39m-💡 [2mUsing fallback commit message. Run [22mwt config --help[2m for LLM setup guide[22m+💡 [2mUsing fallback commit message. Run [90mwt config --help[39m[2m for LLM setup guide[22m[22m[107m [0m [1mSquash commits from main[22m[107m [0m[107m [0m Combined commits: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 59e19410c..5610af73e 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@@ -26,7 +26,7 @@ exit_code: 0🟡 [33mAuto-staging 1 untracked file:[39m[107m [0m dirty.txt🔄 [36mCommitting changes with default message... [90m(1 file, [32m+1[39m, no squashing needed[39m[90m)[39m[39m-💡 [2mUsing fallback commit message. Run [22mwt config --help[2m for LLM setup guide[22m+💡 [2mUsing fallback commit message. Run [90mwt config --help[39m[2m for LLM setup guide[22m[22m[107m [0m [1mChanges to dirty.txt[22m✅ [32mCommitted changes @ [2mc1126ec[22m[39m🔄 [36mMerging 1 commit to [1mmain[22m @ [2mc1126ec[22m (no rebase needed)[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 8053a186c..efcd1c153 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@@ -28,4 +28,4 @@ exit_code: 1❌ [31mCan't push to local [1mmain[22m branch: it has newer commits[39m[107m [0m * [33mfb975b3[m Add main file-💡 [2mRun [22mwt merge[2m again to incorporate these changes[22m+💡 [2mRun [90mwt merge[39m again to incorporate these changes[22mdiff --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 46189d961..df20ab3f0 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@@ -26,7 +26,7 @@ exit_code: 0🟡 [33mAuto-staging 1 untracked file:[39m[107m [0m newfile.txt🔄 [36mCommitting changes with default message... [90m(1 file, [32m+1[39m, no squashing needed[39m[90m)[39m[39m-💡 [2mUsing fallback commit message. Run [22mwt config --help[2m for LLM setup guide[22m+💡 [2mUsing fallback commit message. Run [90mwt config --help[39m[2m for LLM setup guide[22m[22m[107m [0m [1mChanges to newfile.txt[22m✅ [32mCommitted changes @ [2m96ddfbc[22m[39m🔄 [36mMerging 1 commit to [1mmain[22m @ [2m96ddfbc[22m (no rebase needed)[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 b11306b7c..e64a274b7 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@@ -35,4 +35,4 @@ exit_code: 1[0m🟡 [33mCommand failed: exit status: 1[39m❌ [31mpost-merge command failed: exit status: 1[39m-💡 [2mUse [22m--no-verify[2m to skip post-merge commands[22m+💡 [2mUse [90m--no-verify[39m to skip post-merge commands[22mdiff --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 863bdd253..e93b46d84 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@@ -30,4 +30,4 @@ exit_code: 1[107m [0m [2m[0m[2m[34mexit[0m[2m 1[0m[0m❌ [31mpre-commit command failed: exit status: 1[39m-💡 [2mUse [22m--no-verify[2m to skip pre-commit commands[22m+💡 [2mUse [90m--no-verify[39m 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 7bd792e6d..1c6e58720 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@@ -30,7 +30,7 @@ exit_code: 0[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... [90m(1 file, [32m+1[39m, no squashing needed[39m[90m)[39m[39m-💡 [2mUsing fallback commit message. Run [22mwt config --help[2m for LLM setup guide[22m+💡 [2mUsing fallback commit message. Run [90mwt config --help[39m[2m for LLM setup guide[22m[22m[107m [0m [1mChanges to feature.txt[22m✅ [32mCommitted changes @ [2mcdc8f90[22m[39m🔄 [36mMerging 1 commit to [1mmain[22m @ [2mcdc8f90[22m (no rebase needed)[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 25511fd72..52b3648ee 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@@ -28,4 +28,4 @@ exit_code: 1[107m [0m [2m[0m[2m[34mexit[0m[2m 1[0m[0m❌ [31mpre-merge command failed: exit status: 1[39m-💡 [2mUse [22m--no-verify[2m to skip pre-merge commands[22m+💡 [2mUse [90m--no-verify[39m to skip pre-merge commands[22mdiff --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 d804b799e..d65718cdc 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@@ -28,4 +28,4 @@ exit_code: 1[107m [0m [2m[0m[2m[34mexit[0m[2m 1[0m[0m❌ [31mpre-commit command failed: exit status: 1[39m-💡 [2mUse [22m--no-verify[2m to skip pre-commit commands[22m+💡 [2mUse [90m--no-verify[39m to skip pre-commit commands[22mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snapindex 8325a7222..4d308e940 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap@@ -25,7 +25,7 @@ exit_code: 0----- stderr -----🔄 [36mSquashing 3 commits into a single commit [90m(3 files, [32m+3[39m[39m[90m)[39m...[39m🔄 [36mGenerating squash commit message...[39m-💡 [2mUsing fallback commit message. Run [22mwt config --help[2m for LLM setup guide[22m+💡 [2mUsing fallback commit message. Run [90mwt config --help[39m[2m for LLM setup guide[22m[22m[107m [0m [1mSquash commits from main[22m[107m [0m[107m [0m Combined commits:diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snapindex b4e92c8a3..9f0dbee67 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@@ -25,7 +25,7 @@ exit_code: 0----- stderr -----🔄 [36mSquashing 3 commits into a single commit...[39m🔄 [36mGenerating squash commit message...[39m-💡 [2mUsing fallback commit message. Run [22mwt config --help[2m for LLM setup guide[22m+💡 [2mUsing fallback commit message. Run [90mwt config --help[39m[2m for LLM setup guide[22m[22m[107m [0m [1mSquash commits from main[22m[107m [0m[107m [0m Combined commits: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 f7e2c7898..9acbee23d 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@@ -26,7 +26,7 @@ exit_code: 0----- stderr -----🔄 [36mSquashing 2 commits into a single commit [90m(2 files, [32m+2[39m[39m[90m)[39m...[39m🔄 [36mGenerating squash commit message...[39m-💡 [2mUsing fallback commit message. Run [22mwt config --help[2m for LLM setup guide[22m+💡 [2mUsing fallback commit message. Run [90mwt config --help[39m[2m for LLM setup guide[22m[22m[107m [0m [1mSquash commits from main[22m[107m [0m[107m [0m Combined commits:diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snapindex b34999099..ba4f19aeb 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@@ -28,7 +28,7 @@ exit_code: 0🔄 [36mSquashing 2 commits & working tree changes into a single commit [90m(2 files, [32m+2[39m[39m[90m)[39m...[39m💡 [2mBackup created @ 330ccd6[22m🔄 [36mGenerating squash commit message...[39m-💡 [2mUsing fallback commit message. Run [22mwt config --help[2m for LLM setup guide[22m+💡 [2mUsing fallback commit message. Run [90mwt config --help[39m[2m for LLM setup guide[22m[22m[107m [0m [1mSquash commits from main[22m[107m [0m[107m [0m Combined commits: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 d7ee25a49..261a4c745 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@@ -31,7 +31,7 @@ exit_code: 0🔄 [36mSquashing 1 commit & working tree changes into a single commit [90m(3 files, [32m+3[39m[39m[90m)[39m...[39m💡 [2mBackup created @ 4967998[22m🔄 [36mGenerating squash commit message...[39m-💡 [2mUsing fallback commit message. Run [22mwt config --help[2m for LLM setup guide[22m+💡 [2mUsing fallback commit message. Run [90mwt config --help[39m[2m for LLM setup guide[22m[22m[107m [0m [1mSquash commits from main[22m[107m [0m[107m [0m Combined commits:diff --git a/tests/snapshots/integration__integration_tests__merge__step_commit_both_flags.snap b/tests/snapshots/integration__integration_tests__merge__step_commit_both_flags.snapindex 404da1196..afc3ff321 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@@ -27,8 +27,8 @@ exit_code: 0----- stdout ---------- stderr ------💡 [2mSkipping pre-commit hook (--no-verify)[22m+💡 [2mSkipping pre-commit hook ([90m--no-verify[39m)[22m🔄 [36mCommitting tracked changes with default message... [90m(1 file, [32m+1[39m, [31m-1[39m[39m[90m)[39m[39m-💡 [2mUsing fallback commit message. Run [22mwt config --help[2m for LLM setup guide[22m+💡 [2mUsing fallback commit message. Run [90mwt config --help[39m[2m for LLM setup guide[22m[22m[107m [0m [1mChanges to tracked.txt[22m✅ [32mCommitted changes @ [2ma5890cb[22m[39mdiff --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 914ba3325..74bf4aac6 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@@ -26,11 +26,11 @@ exit_code: 0----- stdout ---------- stderr ------💡 [2mSkipping pre-commit hook (--no-verify)[22m+💡 [2mSkipping pre-commit hook ([90m--no-verify[39m)[22m🟡 [33mAuto-staging 2 untracked files:[39m[107m [0m .config/[107m [0m file1.txt🔄 [36mCommitting changes with default message... [90m(2 files, [32m+2[39m[39m[90m)[39m[39m-💡 [2mUsing fallback commit message. Run [22mwt config --help[2m for LLM setup guide[22m+💡 [2mUsing fallback commit message. Run [90mwt config --help[39m[2m for LLM setup guide[22m[22m[107m [0m [1mChanges to wt.toml & file1.txt[22m✅ [32mCommitted changes @ [2m3dbcd5d[22m[39mdiff --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 9d735c813..9451b7182 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,7 +27,7 @@ exit_code: 1----- stderr -----🔄 [36mCommitting changes with default message...[39m-💡 [2mUsing fallback commit message. Run [22mwt config --help[2m for LLM setup guide[22m+💡 [2mUsing fallback commit message. Run [90mwt config --help[39m[2m for LLM setup guide[22m[22m[107m [0m [1mWIP: Changes[22m❌ [31mFailed to commit[39m[107m [0m On branch maindiff --git a/tests/snapshots/integration__integration_tests__merge__step_commit_stage_tracked.snap b/tests/snapshots/integration__integration_tests__merge__step_commit_stage_tracked.snapindex 265840790..121e972ca 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,6 +27,6 @@ exit_code: 0----- stderr -----🔄 [36mCommitting tracked changes with default message... [90m(1 file, [32m+1[39m, [31m-1[39m[39m[90m)[39m[39m-💡 [2mUsing fallback commit message. Run [22mwt config --help[2m for LLM setup guide[22m+💡 [2mUsing fallback commit message. Run [90mwt config --help[39m[2m for LLM setup guide[22m[22m[107m [0m [1mChanges to tracked.txt[22m✅ [32mCommitted changes @ [2m7d441f0[22m[39mdiff --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 3b80e8b60..af6e165a1 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@@ -27,11 +27,11 @@ exit_code: 0----- stdout ---------- stderr ------💡 [2mSkipping pre-commit hook (--no-verify)[22m+💡 [2mSkipping pre-commit hook ([90m--no-verify[39m)[22m🔄 [36mSquashing 2 commits & tracked changes into a single commit [90m(3 files, [32m+3[39m[39m[90m)[39m...[39m💡 [2mBackup created @ 31e06e8[22m🔄 [36mGenerating squash commit message...[39m-💡 [2mUsing fallback commit message. Run [22mwt config --help[2m for LLM setup guide[22m+💡 [2mUsing fallback commit message. Run [90mwt config --help[39m[2m for LLM setup guide[22m[22m[107m [0m [1mSquash commits from main[22m[107m [0m[107m [0m Combined commits:diff --git a/tests/snapshots/integration__integration_tests__merge__step_squash_no_verify.snap b/tests/snapshots/integration__integration_tests__merge__step_squash_no_verify.snapindex c8594c914..45cb33699 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@@ -26,10 +26,10 @@ exit_code: 0----- stdout ---------- stderr ------💡 [2mSkipping pre-commit hook (--no-verify)[22m+💡 [2mSkipping pre-commit hook ([90m--no-verify[39m)[22m🔄 [36mSquashing 2 commits into a single commit [90m(3 files, [32m+3[39m[39m[90m)[39m...[39m🔄 [36mGenerating squash commit message...[39m-💡 [2mUsing fallback commit message. Run [22mwt config --help[2m for LLM setup guide[22m+💡 [2mUsing fallback commit message. Run [90mwt config --help[39m[2m for LLM setup guide[22m[22m[107m [0m [1mSquash commits from main[22m[107m [0m[107m [0m Combined commits:diff --git a/tests/snapshots/integration__integration_tests__merge__step_squash_stage_tracked.snap b/tests/snapshots/integration__integration_tests__merge__step_squash_stage_tracked.snapindex 4f11d0e42..756c62135 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@@ -29,7 +29,7 @@ exit_code: 0🔄 [36mSquashing 2 commits & tracked changes into a single commit [90m(2 files, [32m+2[39m[39m[90m)[39m...[39m💡 [2mBackup created @ ba1424b[22m🔄 [36mGenerating squash commit message...[39m-💡 [2mUsing fallback commit message. Run [22mwt config --help[2m for LLM setup guide[22m+💡 [2mUsing fallback commit message. Run [90mwt config --help[39m[2m for LLM setup guide[22m[22m[107m [0m [1mSquash commits from main[22m[107m [0m[107m [0m Combined commits:diff --git a/tests/snapshots/integration__integration_tests__push__push_error_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_error_not_fast_forward.snapindex 250728a99..59f4d7f82 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@@ -27,4 +27,4 @@ exit_code: 1❌ [31mCan't push to local [1mmain[22m branch: it has newer commits[39m[107m [0m * [33m5ca21c8[m Main commit-💡 [2mUse [22mwt step rebase[2m or [22mwt merge[2m to rebase onto [1mmain[22m[22m+💡 [2mUse [90mwt step rebase[39m or [90mwt merge[39m to rebase onto [1mmain[22m[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 ce0366e36..a4b28aaeb 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@@ -26,4 +26,4 @@ exit_code: 1----- stderr -----❌ [31mFound merge commits in push range[39m-💡 [2mUse [22m--allow-merge-commits[2m to push non-linear history[22m+💡 [2mUse [90m--allow-merge-commits[39m to push non-linear history[22mdiff --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 d5e1fbadf..f105054df 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@@ -27,4 +27,4 @@ exit_code: 1----- stderr -----❌ [31mBranch [1m__WORKTRUNK_CD__/tmp[22m already exists[39m-💡 [2mRemove [22m--create[2m flag to switch to the existing branch[22m+💡 [2mRemove [90m--create[39m flag to switch to the existing branch[22mdiff --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 df7a64312..e73f51c66 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@@ -26,4 +26,4 @@ exit_code: 1----- stderr -----❌ [31mBranch [1m__WORKTRUNK_EXEC__echo PWNED > /tmp/hacked6[22m not found[39m-💡 [2mUse [22m--create[2m to create a new branch, or [22mwt list --branches --remotes[2m for available branches[22m+💡 [2mUse [90m--create[39m to create a new branch, or [90mwt list --branches --remotes[39m for available branches[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 a4f54035c..098c8261d 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@@ -27,4 +27,4 @@ exit_code: 1----- stderr -----❌ [31mBranch [1mfeature-y[22m already exists[39m-💡 [2mRemove [22m--create[2m flag to switch to the existing branch[22m+💡 [2mRemove [90m--create[39m flag to switch to the existing branch[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 b34031647..6e44af941 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,6 +26,6 @@ exit_code: 0----- stderr -----🟡 [33mBranch [1mremote-feature[22m exists on remote (origin/remote-feature); creating new branch from base instead[39m-💡 [2mUse [22mwt switch [1mremote-feature[22m[2m (without [22m--create[2m) to switch to the remote branch[22m+💡 [2mUse [90mwt switch remote-feature[39m[2m (without [90m--create[39m) to switch to the remote branch[22m[22m✅ [32m[32mCreated new worktree for [1mremote-feature[22m from [1mmain[22m at [1m[REPO].remote-feature[39m[22m[39m💡 [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 ccd29b6f7..fb547a9a3 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@@ -26,4 +26,4 @@ exit_code: 1----- stderr -----❌ [31mWorktree directory missing for [1mmissing-wt[39m[22m-💡 [2mRun [22mgit worktree prune[2m to clean up[22m+💡 [2mRun [90mgit worktree prune[39m to clean up[22m