Skip to content

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.md
index 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 styling
output::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` w
Never 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 context
output::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 commands
output::hint("Run 'wt list' to see worktrees")?;
diff --git a/src/commands/commit.rs b/src/commands/commit.rs
index 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.rs
index 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 cache
crate::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.rs
index 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.rs
index 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.rs
index 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.rs
index 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.rs
index 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.rs
index 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.rs
index 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:
+   main
⚪ CI status cache:
+   (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:
+   main
⚪ CI status cache:
+   (empty)
");
}
diff --git a/tests/integration_tests/config_init.rs b/tests/integration_tests/config_init.rs
index 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: ~/.config/worktrunk/config.toml
- 💡 Use wt config show to view existing configuration
- 💡 Use wt config create --help for config format reference
+ 💡 Use wt config show to view existing configuration
+ 💡 Use wt config create --help for config format reference
");
});
}
diff --git a/tests/integration_tests/configure_shell.rs b/tests/integration_tests/configure_shell.rs
index 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() {
🟡 Completions won't work; add to ~/.zshrc before the wt line:
  autoload -Uz compinit && compinit
✅ Added shell extension & completions for zsh @ ~/.zshrc
- 💡 Skipped bash; ~/.bashrc not found
- 💡 Skipped fish; ~/.config/fish/conf.d not found
+ 💡 Skipped bash; ~/.bashrc not found
+ 💡 Skipped fish; ~/.config/fish/conf.d not found
✅ Configured 1 shell
💡 Restart shell or run: source ~/.zshrc
@@ -265,9 +265,9 @@ fn test_configure_shell_no_files() {
----- stdout -----
----- stderr -----
- 💡 Skipped bash; ~/.bashrc not found
- 💡 Skipped zsh; ~/.zshrc not found
- 💡 Skipped fish; ~/.config/fish/conf.d not found
+ 💡 Skipped bash; ~/.bashrc not found
+ 💡 Skipped zsh; ~/.zshrc not found
+ 💡 Skipped fish; ~/.config/fish/conf.d not found
❌ No shell config files found
");
});
@@ -309,7 +309,7 @@ fn test_configure_shell_multiple_configs() {
  autoload -Uz compinit && compinit
✅ Added shell extension & completions for bash @ ~/.bashrc
✅ Added shell extension & completions for zsh @ ~/.zshrc
- 💡 Skipped fish; ~/.config/fish/conf.d not found
+ 💡 Skipped fish; ~/.config/fish/conf.d not found
✅ Configured 2 shells
💡 Restart shell or run: source ~/.zshrc
@@ -372,7 +372,7 @@ fn test_configure_shell_mixed_states() {
  autoload -Uz compinit && compinit
⚪ Already configured shell extension & completions for bash @ ~/.bashrc
✅ Added shell extension & completions for zsh @ ~/.zshrc
- 💡 Skipped fish; ~/.config/fish/conf.d not found
+ 💡 Skipped fish; ~/.config/fish/conf.d not found
✅ Configured 1 shell
💡 Restart shell or run: source ~/.zshrc
@@ -428,9 +428,9 @@ fn test_uninstall_shell() {
----- stderr -----
✅ Removed shell extension & completions for zsh @ ~/.zshrc
- 💡 No bash shell extension & completions in ~/.bashrc
- 💡 No fish shell extension in ~/.config/fish/conf.d/wt.fish
- 💡 No fish completions in ~/.config/fish/completions/wt.fish
+ 💡 No bash shell extension & completions in ~/.bashrc
+ 💡 No fish shell extension in ~/.config/fish/conf.d/wt.fish
+ 💡 No fish completions in ~/.config/fish/completions/wt.fish
✅ Removed integration from 1 shell
💡 Restart shell to complete uninstall
@@ -489,8 +489,8 @@ fn test_uninstall_shell_multiple() {
----- stderr -----
✅ Removed shell extension & completions for bash @ ~/.bashrc
✅ Removed shell extension & completions for zsh @ ~/.zshrc
- 💡 No fish shell extension in ~/.config/fish/conf.d/wt.fish
- 💡 No fish completions in ~/.config/fish/completions/wt.fish
+ 💡 No fish shell extension in ~/.config/fish/conf.d/wt.fish
+ 💡 No fish completions in ~/.config/fish/completions/wt.fish
✅ Removed integration from 2 shells
💡 Restart shell to complete uninstall
@@ -736,7 +736,7 @@ fn test_configure_shell_no_warning_for_bash_user() {
----- stderr -----
✅ Added shell extension & completions for bash @ ~/.bashrc
✅ Added shell extension & completions for zsh @ ~/.zshrc
- 💡 Skipped fish; ~/.config/fish/conf.d not found
+ 💡 Skipped fish; ~/.config/fish/conf.d not found
✅ Configured 2 shells
💡 Restart shell or run: source ~/.bashrc
@@ -856,7 +856,7 @@ fn test_configure_shell_no_warning_when_shell_unset() {
----- stderr -----
✅ Added shell extension & completions for bash @ ~/.bashrc
✅ Added shell extension & completions for zsh @ ~/.zshrc
- 💡 Skipped fish; ~/.config/fish/conf.d not found
+ 💡 Skipped fish; ~/.config/fish/conf.d not found
✅ Configured 2 shells
");
diff --git a/tests/integration_tests/directives.rs b/tests/integration_tests/directives.rs
index 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 -----
❌ Branch my-feature not found
- 💡 Use --create to create a new branch, or wt list --branches --remotes for available branches
+ 💡 Use --create to create a new branch, or wt list --branches --remotes for available branches
");
});
}
@@ -60,7 +60,7 @@ fn test_switch_without_internal() {
----- stderr -----
❌ Branch my-feature not found
- 💡 Use --create to create a new branch, or wt list --branches --remotes for available branches
+ 💡 Use --create to create a new branch, or wt list --branches --remotes for available branches
");
});
}
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__command_failure.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__command_failure.snap
index 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()
---
❌ Branch existing already exists
-💡 Remove --create flag to switch to the existing branch
+💡 Remove --create flag to switch to the existing branch
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap
index 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
❌ pre-merge command failed: test: exit status: 1
-💡 Use --no-verify to skip pre-merge commands
+💡 Use --no-verify to skip pre-merge commands
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap
index 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
❌ pre-merge command failed: test: exit status: 1
-💡 Use --no-verify to skip pre-merge commands
+💡 Use --no-verify to skip pre-merge commands
diff --git a/tests/snapshots/git_error_display__branch_already_exists.snap b/tests/snapshots/git_error_display__branch_already_exists.snap
index 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()
---
❌ Branch feature already exists
-💡 Remove --create flag to switch to the existing branch
+💡 Remove --create flag to switch to the existing branch
diff --git a/tests/snapshots/git_error_display__invalid_reference.snap b/tests/snapshots/git_error_display__invalid_reference.snap
index 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()
---
❌ Branch nonexistent-branch not found
-💡 Use --create to create a new branch, or wt list --branches --remotes for available branches
+💡 Use --create to create a new branch, or wt list --branches --remotes for available branches
diff --git a/tests/snapshots/git_error_display__merge_commits_found.snap b/tests/snapshots/git_error_display__merge_commits_found.snap
index 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()
---
❌ Found merge commits in push range
-💡 Use --allow-merge-commits to push non-linear history
+💡 Use --allow-merge-commits to push non-linear history
diff --git a/tests/snapshots/git_error_display__not_fast_forward.snap b/tests/snapshots/git_error_display__not_fast_forward.snap
index 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()
  abc1234 Fix bug
  def5678 Add feature
-💡 Use wt step rebase or wt merge to rebase onto main
+💡 Use wt step rebase or wt merge to rebase onto main
diff --git a/tests/snapshots/git_error_display__not_fast_forward_merge_context.snap b/tests/snapshots/git_error_display__not_fast_forward_merge_context.snap
index 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()
❌ Can't push to local main branch: it has newer commits
  abc1234 New commit on main
-💡 Run wt merge again to incorporate these changes
+💡 Run wt merge again to incorporate these changes
diff --git a/tests/snapshots/git_error_display__not_interactive.snap b/tests/snapshots/git_error_display__not_interactive.snap
index 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()
---
❌ Cannot prompt for approval in non-interactive environment
-💡 In CI/CD, use --force to skip prompts. To pre-approve commands, use wt config approvals add
+💡 In CI/CD, use --force to skip prompts. To pre-approve commands, use wt config approvals add
diff --git a/tests/snapshots/git_error_display__worktree_missing.snap b/tests/snapshots/git_error_display__worktree_missing.snap
index 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()
---
❌ Worktree directory missing for stale-branch
-💡 Run git worktree prune to clean up
+💡 Run git worktree prune to clean up
diff --git a/tests/snapshots/git_error_display__worktree_path_mismatch.snap b/tests/snapshots/git_error_display__worktree_path_mismatch.snap
index 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()
---
❌ Ambiguous: /tmp/repo.feature has a worktree on a different branch, but branch feature exists at /tmp/repo.other
-💡 Use wt list to see worktree-branch mappings
+💡 Use wt list to see worktree-branch mappings
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_fails_in_non_tty.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_fails_in_non_tty.snap
index 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
❌ Cannot prompt for approval in non-interactive environment
-💡 In CI/CD, use --force to skip prompts. To pre-approve commands, use wt config approvals add
+💡 In CI/CD, use --force to skip prompts. To pre-approve commands, use wt config approvals add
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_mixed_approved_unapproved.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_mixed_approved_unapproved.snap
index 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
❌ Cannot prompt for approval in non-interactive environment
-💡 In CI/CD, use --force to skip prompts. To pre-approve commands, use wt config approvals add
+💡 In CI/CD, use --force to skip prompts. To pre-approve commands, use wt config approvals add
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_multiple_commands.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_multiple_commands.snap
index 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
❌ Cannot prompt for approval in non-interactive environment
-💡 In CI/CD, use --force to skip prompts. To pre-approve commands, use wt config approvals add
+💡 In CI/CD, use --force to skip prompts. To pre-approve commands, use wt config approvals add
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_named_commands.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_named_commands.snap
index 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
❌ Cannot prompt for approval in non-interactive environment
-💡 In CI/CD, use --force to skip prompts. To pre-approve commands, use wt config approvals add
+💡 In CI/CD, use --force to skip prompts. To pre-approve commands, use wt config approvals add
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_single_command.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_single_command.snap
index 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
❌ Cannot prompt for approval in non-interactive environment
-💡 In CI/CD, use --force to skip prompts. To pre-approve commands, use wt config approvals add
+💡 In CI/CD, use --force to skip prompts. To pre-approve commands, use wt config approvals add
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__decline_approval_skips_only_unapproved.snap b/tests/snapshots/integration__integration_tests__approval_ui__decline_approval_skips_only_unapproved.snap
index 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
❌ Cannot prompt for approval in non-interactive environment
-💡 In CI/CD, use --force to skip prompts. To pre-approve commands, use wt config approvals add
+💡 In CI/CD, use --force to skip prompts. To pre-approve commands, use wt config approvals add
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_second_run.snap b/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_second_run.snap
index 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
❌ Cannot prompt for approval in non-interactive environment
-💡 In CI/CD, use --force to skip prompts. To pre-approve commands, use wt config approvals add
+💡 In CI/CD, use --force to skip prompts. To pre-approve commands, use wt config approvals add
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__run_hook_post_merge_requires_approval.snap b/tests/snapshots/integration__integration_tests__approval_ui__run_hook_post_merge_requires_approval.snap
index 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
❌ Cannot prompt for approval in non-interactive environment
-💡 In CI/CD, use --force to skip prompts. To pre-approve commands, use wt config approvals add
+💡 In CI/CD, use --force to skip prompts. To pre-approve commands, use wt config approvals add
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__run_hook_pre_merge_requires_approval.snap b/tests/snapshots/integration__integration_tests__approval_ui__run_hook_pre_merge_requires_approval.snap
index 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
❌ Cannot prompt for approval in non-interactive environment
-💡 In CI/CD, use --force to skip prompts. To pre-approve commands, use wt config approvals add
+💡 In CI/CD, use --force to skip prompts. To pre-approve commands, use wt config approvals add
diff --git a/tests/snapshots/integration__integration_tests__approvals__add_approvals_all_none_approved.snap b/tests/snapshots/integration__integration_tests__approvals__add_approvals_all_none_approved.snap
index 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
❌ Cannot prompt for approval in non-interactive environment
-💡 In CI/CD, use --force to skip prompts. To pre-approve commands, use wt config approvals add
+💡 In CI/CD, use --force to skip prompts. To pre-approve commands, use wt config approvals add
diff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_partial_shell_config_shows_hint.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_partial_shell_config_shows_hint.snap
index 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 zsh @ ~/.zshrc
⚪ Skipped fish; ~/.config/fish/conf.d not found
-💡 Run wt config shell install to enable shell integration
+💡 Run wt config shell install to enable shell integration
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap
index 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
🔄 Squashing 1 commit & working tree changes into a single commit (1 file, +1)...
💡 Backup created @ b18c23e
🔄 Generating squash commit message...
-💡 Using fallback commit message. Run wt config --help for LLM setup guide
+💡 Using fallback commit message. Run wt config --help for LLM setup guide
  Squash commits from main
 
  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.snap
index 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
🟡 Auto-staging 1 untracked file:
  dirty.txt
🔄 Committing changes with default message... (1 file, +1, no squashing needed)
-💡 Using fallback commit message. Run wt config --help for LLM setup guide
+💡 Using fallback commit message. Run wt config --help for LLM setup guide
  Changes to dirty.txt
✅ Committed changes @ c1126ec
🔄 Merging 1 commit to main @ c1126ec (no rebase needed)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_commit_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_commit_not_fast_forward.snap
index 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
❌ Can't push to local main branch: it has newer commits
  * fb975b3 Add main file
-💡 Run wt merge again to incorporate these changes
+💡 Run wt merge again to incorporate these changes
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap
index 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
🟡 Auto-staging 1 untracked file:
  newfile.txt
🔄 Committing changes with default message... (1 file, +1, no squashing needed)
-💡 Using fallback commit message. Run wt config --help for LLM setup guide
+💡 Using fallback commit message. Run wt config --help for LLM setup guide
  Changes to newfile.txt
✅ Committed changes @ 96ddfbc
🔄 Merging 1 commit to main @ 96ddfbc (no rebase needed)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap
index 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
🟡 Command failed: exit status: 1
❌ post-merge command failed: exit status: 1
-💡 Use --no-verify to skip post-merge commands
+💡 Use --no-verify to skip post-merge commands
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snap
index 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
  exit 1
❌ pre-commit command failed: exit status: 1
-💡 Use --no-verify to skip pre-commit commands
+💡 Use --no-verify to skip pre-commit commands
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap
index 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
  echo 'Pre-commit check passed'
Pre-commit check passed
🔄 Committing changes with default message... (1 file, +1, no squashing needed)
-💡 Using fallback commit message. Run wt config --help for LLM setup guide
+💡 Using fallback commit message. Run wt config --help for LLM setup guide
  Changes to feature.txt
✅ Committed changes @ cdc8f90
🔄 Merging 1 commit to main @ cdc8f90 (no rebase needed)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap
index 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
  exit 1
❌ pre-merge command failed: exit status: 1
-💡 Use --no-verify to skip pre-merge commands
+💡 Use --no-verify to skip pre-merge commands
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snap
index 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
  exit 1
❌ pre-commit command failed: exit status: 1
-💡 Use --no-verify to skip pre-commit commands
+💡 Use --no-verify to skip pre-commit commands
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
index 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 -----
🔄 Squashing 3 commits into a single commit (3 files, +3)...
🔄 Generating squash commit message...
-💡 Using fallback commit message. Run wt config --help for LLM setup guide
+💡 Using fallback commit message. Run wt config --help for LLM setup guide
  Squash commits from main
 
  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.snap
index 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 -----
🔄 Squashing 3 commits into a single commit...
🔄 Generating squash commit message...
-💡 Using fallback commit message. Run wt config --help for LLM setup guide
+💡 Using fallback commit message. Run wt config --help for LLM setup guide
  Squash commits from main
 
  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.snap
index 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 -----
🔄 Squashing 2 commits into a single commit (2 files, +2)...
🔄 Generating squash commit message...
-💡 Using fallback commit message. Run wt config --help for LLM setup guide
+💡 Using fallback commit message. Run wt config --help for LLM setup guide
  Squash commits from main
 
  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.snap
index 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
🔄 Squashing 2 commits & working tree changes into a single commit (2 files, +2)...
💡 Backup created @ 330ccd6
🔄 Generating squash commit message...
-💡 Using fallback commit message. Run wt config --help for LLM setup guide
+💡 Using fallback commit message. Run wt config --help for LLM setup guide
  Squash commits from main
 
  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.snap
index 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
🔄 Squashing 1 commit & working tree changes into a single commit (3 files, +3)...
💡 Backup created @ 4967998
🔄 Generating squash commit message...
-💡 Using fallback commit message. Run wt config --help for LLM setup guide
+💡 Using fallback commit message. Run wt config --help for LLM setup guide
  Squash commits from main
 
  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.snap
index 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 -----
-💡 Skipping pre-commit hook (--no-verify)
+💡 Skipping pre-commit hook (--no-verify)
🔄 Committing tracked changes with default message... (1 file, +1, -1)
-💡 Using fallback commit message. Run wt config --help for LLM setup guide
+💡 Using fallback commit message. Run wt config --help for LLM setup guide
  Changes to tracked.txt
✅ Committed changes @ a5890cb
diff --git a/tests/snapshots/integration__integration_tests__merge__step_commit_no_verify.snap b/tests/snapshots/integration__integration_tests__merge__step_commit_no_verify.snap
index 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 -----
-💡 Skipping pre-commit hook (--no-verify)
+💡 Skipping pre-commit hook (--no-verify)
🟡 Auto-staging 2 untracked files:
  .config/
  file1.txt
🔄 Committing changes with default message... (2 files, +2)
-💡 Using fallback commit message. Run wt config --help for LLM setup guide
+💡 Using fallback commit message. Run wt config --help for LLM setup guide
  Changes to wt.toml & file1.txt
✅ Committed changes @ 3dbcd5d
diff --git a/tests/snapshots/integration__integration_tests__merge__step_commit_nothing_to_commit.snap b/tests/snapshots/integration__integration_tests__merge__step_commit_nothing_to_commit.snap
index 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 -----
🔄 Committing changes with default message...
-💡 Using fallback commit message. Run wt config --help for LLM setup guide
+💡 Using fallback commit message. Run wt config --help for LLM setup guide
  WIP: Changes
❌ Failed to commit
  On branch main
diff --git a/tests/snapshots/integration__integration_tests__merge__step_commit_stage_tracked.snap b/tests/snapshots/integration__integration_tests__merge__step_commit_stage_tracked.snap
index 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 -----
🔄 Committing tracked changes with default message... (1 file, +1, -1)
-💡 Using fallback commit message. Run wt config --help for LLM setup guide
+💡 Using fallback commit message. Run wt config --help for LLM setup guide
  Changes to tracked.txt
✅ Committed changes @ 7d441f0
diff --git a/tests/snapshots/integration__integration_tests__merge__step_squash_both_flags.snap b/tests/snapshots/integration__integration_tests__merge__step_squash_both_flags.snap
index 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 -----
-💡 Skipping pre-commit hook (--no-verify)
+💡 Skipping pre-commit hook (--no-verify)
🔄 Squashing 2 commits & tracked changes into a single commit (3 files, +3)...
💡 Backup created @ 31e06e8
🔄 Generating squash commit message...
-💡 Using fallback commit message. Run wt config --help for LLM setup guide
+💡 Using fallback commit message. Run wt config --help for LLM setup guide
  Squash commits from main
 
  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.snap
index 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 -----
-💡 Skipping pre-commit hook (--no-verify)
+💡 Skipping pre-commit hook (--no-verify)
🔄 Squashing 2 commits into a single commit (3 files, +3)...
🔄 Generating squash commit message...
-💡 Using fallback commit message. Run wt config --help for LLM setup guide
+💡 Using fallback commit message. Run wt config --help for LLM setup guide
  Squash commits from main
 
  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.snap
index 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
🔄 Squashing 2 commits & tracked changes into a single commit (2 files, +2)...
💡 Backup created @ ba1424b
🔄 Generating squash commit message...
-💡 Using fallback commit message. Run wt config --help for LLM setup guide
+💡 Using fallback commit message. Run wt config --help for LLM setup guide
  Squash commits from main
 
  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.snap
index 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
❌ Can't push to local main branch: it has newer commits
  * 5ca21c8 Main commit
-💡 Use wt step rebase or wt merge to rebase onto main
+💡 Use wt step rebase or wt merge to rebase onto main
diff --git a/tests/snapshots/integration__integration_tests__push__push_error_with_merge_commits.snap b/tests/snapshots/integration__integration_tests__push__push_error_with_merge_commits.snap
index 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 -----
❌ Found merge commits in push range
-💡 Use --allow-merge-commits to push non-linear history
+💡 Use --allow-merge-commits to push non-linear history
diff --git a/tests/snapshots/integration__integration_tests__security__branch_name_with_cd_directive_not_executed.snap b/tests/snapshots/integration__integration_tests__security__branch_name_with_cd_directive_not_executed.snap
index 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 -----
❌ Branch __WORKTRUNK_CD__/tmp already exists
-💡 Remove --create flag to switch to the existing branch
+💡 Remove --create flag to switch to the existing branch
diff --git a/tests/snapshots/integration__integration_tests__security__error_message_with_directive_not_executed.snap b/tests/snapshots/integration__integration_tests__security__error_message_with_directive_not_executed.snap
index 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 -----
❌ Branch __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked6 not found
-💡 Use --create to create a new branch, or wt list --branches --remotes for available branches
+💡 Use --create to create a new branch, or wt list --branches --remotes for available branches
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_create_existing_error.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_existing_error.snap
index 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 -----
❌ Branch feature-y already exists
-💡 Remove --create flag to switch to the existing branch
+💡 Remove --create flag to switch to the existing branch
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_create_remote_only.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_remote_only.snap
index 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 -----
🟡 Branch remote-feature exists on remote (origin/remote-feature); creating new branch from base instead
-💡 Use wt switch remote-feature (without --create) to switch to the remote branch
+💡 Use wt switch remote-feature (without --create) to switch to the remote branch
✅ Created new worktree for remote-feature from main at [REPO].remote-feature
💡 Run `wt config shell install` to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_error_missing_directory.snap b/tests/snapshots/integration__integration_tests__switch__switch_error_missing_directory.snap
index 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 -----
❌ Worktree directory missing for missing-wt
-💡 Run git worktree prune to clean up
+💡 Run git worktree prune to clean up