Skip to content

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

feat: Auto-wrap messages in semantic colors and update docs

Maximilian Roose497344c0887
diff --git a/CLAUDE.md b/CLAUDE.md
index 4d6ad903d..3e9683c23 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -184,20 +184,24 @@ Six canonical message patterns with their emojis:
5. **Hints**: πŸ’‘ (actionable suggestions, tips for user)
6. **Info**: βšͺ (neutral status, system feedback, metadata)
-**All message methods just add the emoji prefix** - callers handle their own styling:
+**Output functions automatically add emoji AND semantic color.** Callers provide content with optional inner styling (like `<bold>`):
+
```rust
-// Caller provides the styling
-output::success(format!("{GREEN}Created worktree{GREEN:#}"))?;
-output::hint(format!("{HINT}Run 'wt config' to configure{HINT:#}"))?;
+// Simple message - function adds emoji + color
+output::success("Created worktree")?;
+output::hint("Run 'wt config' to configure")?;
+
+// With inner styling - use cformat! for bold/dim within the message
+output::success(cformat!("Created worktree for <bold>{branch}</>"))?;
+output::warning(cformat!("Branch <bold>{name}</> not found"))?;
```
-**Styling conventions by type:**
-- Progress β†’ cyan (`{CYAN}...{CYAN:#}`)
-- Success β†’ green (`{GREEN}...{GREEN:#}`)
-- Errors β†’ red (`{ERROR}...{ERROR:#}`)
-- Warnings β†’ yellow (`{WARNING}...{WARNING:#}`)
-- Hints β†’ dimmed (`{HINT}...{HINT:#}`), avoid `HINT_BOLD` (renders inconsistently)
-- Info β†’ unstyled or dimmed for supplementary metadata
+**Semantic colors added automatically:**
+- `success()` β†’ green
+- `progress()` β†’ cyan
+- `hint()` β†’ dimmed
+- `warning()` β†’ yellow
+- `info()` β†’ no color (neutral status)
**Every user-facing message requires either an emoji or a gutter** for consistent visual separation.
@@ -241,7 +245,7 @@ Output should appear immediately adjacent to the operations it describes. Progre
Sequential operations should show immediate feedback:
```rust
for item in items {
- output::progress(format!("πŸ”„ Removing {item}..."))?;
+ output::progress(format!("Removing {item}..."))?;
perform_operation(item)?;
output::success(format!("Removed {item}"))?; // Immediate feedback
}
@@ -264,9 +268,9 @@ Progress messages should include all relevant details (what's being done, counts
```rust
// βœ… GOOD - detailed progress, minimal success
-output::progress("πŸ”„ Squashing 3 commits & working tree changes into a single commit (5 files, +60)...")?;
+output::progress("Squashing 3 commits & working tree changes into a single commit (5 files, +60)...")?;
perform_squash()?;
-output::success("βœ… Squashed @ a1b2c3d")?;
+output::success("Squashed @ a1b2c3d")?;
```
### Semantic Style Constants
@@ -288,55 +292,45 @@ Style constants defined in `src/styling/constants.rs`:
Emoji constants: `PROGRESS_EMOJI` (πŸ”„), `SUCCESS_EMOJI` (βœ…), `ERROR_EMOJI` (❌), `WARNING_EMOJI` (🟑), `HINT_EMOJI` (πŸ’‘), `INFO_EMOJI` (βšͺ)
-### Inline Formatting Pattern
+### Styling in Command Code
-Use anstyle's inline pattern `{style}text{style:#}` where `#` means reset:
+Use `output::` functions with `cformat!` for styled content. The output function adds the emoji + semantic color, and `cformat!` handles inner styling:
```rust
-use worktrunk::styling::{println, CYAN, ERROR, ERROR_EMOJI, HINT, HINT_EMOJI};
+// βœ… 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!("Run '<bold>wt merge</>' to continue"))?;
-println!("πŸ”„ {CYAN}Rebasing onto main...{CYAN:#}");
-println!("{ERROR_EMOJI} {ERROR}Working tree has uncommitted changes{ERROR:#}");
-println!("{HINT_EMOJI} {HINT}Use 'wt list' to see all worktrees{HINT:#}");
+// βœ… GOOD - plain strings work too (no inner styling needed)
+output::progress("Rebasing onto main...")?;
```
-### Composing Styles
-
-Compose styles using anstyle methods (`.bold()`, `.fg_color()`, etc.). Branch names in messages (not tables) should be bolded. Tables (`wt list`) use conditional styling for branch names to indicate worktree state (current/main/other).
+**Available color-print tags:** `<bold>`, `<dim>`, `<red>`, `<green>`, `<yellow>`, `<cyan>`, `<magenta>`
-Nested style resets leak color. Compose attributes into a single style, then re-apply the surrounding style after the reset:
+**Emoji constants in cformat!:** Use `{ERROR_EMOJI}`, `{HINT_EMOJI}`, etc. for messages that bypass output:: functions (e.g., GitError Display impl):
```rust
-// ❌ BAD - nested bold loses surrounding color, text after reset is unstyled
-"{WARNING}Text with {bold}nested{bold:#} styles{WARNING:#}"
-// βœ… GOOD - use composed style and re-apply surrounding style after reset
-"{WARNING}Text with {WARNING_BOLD}composed{WARNING_BOLD:#}{WARNING} styles{WARNING:#}"
-// βœ… ALSO GOOD - styled element at end (no text after reset needs styling)
-"{WARNING}Message: {WARNING_BOLD}{value}{WARNING_BOLD:#}{WARNING:#}"
+cformat!("{ERROR_EMOJI} <red>Branch <bold>{branch}</> not found</>")
```
-**Key insight**: `{STYLE:#}` always resets to default, not to the surrounding style. Re-apply the surrounding style after any composed style reset if there's more text to style.
+Branch names in messages should be bolded. Tables (`wt list`) use `StyledLine` with conditional styling for branch names.
### Color Detection
-Colors automatically adjust based on environment (NO_COLOR, CLICOLOR_FORCE, TTY detection) via `anstream` macros.
+Colors automatically adjust based on environment (NO_COLOR, CLICOLOR_FORCE, TTY detection). When using `output::` functions, this is handled automatically.
-Styled print macros must be imported from `worktrunk::styling`, not stdlib:
+For direct terminal I/O (rare - mainly internal output system code), import print macros from `worktrunk::styling`:
```rust
-// ❌ BAD - uses standard library macro, bypasses anstream
-eprintln!("{}", styled_text);
-// βœ… GOOD - import and use anstream-wrapped version
-use worktrunk::styling::eprintln;
-eprintln!("{}", styled_text);
+use worktrunk::styling::eprintln; // Auto-detects color support
```
### Design Principles
-- **Use the ecosystem, not manual escape codes** - Use `anstyle` for colors, `osc8` for hyperlinks, `strip-ansi-escapes` for stripping. Never manually write ANSI codes (`\x1b[...`)
-- **Inline over wrappers** - Use `{style}text{style:#}` pattern, not wrapper functions
-- **Composition over special cases** - Use `.bold()`, `.fg_color()`, not `format_X_with_Y()`
-- **Semantic constants** - Use `ERROR`, `WARNING`, not raw colors
+- **Use the ecosystem, not manual escape codes** - Use `color-print` for command code, `anstyle` for tables/StyledLine. Never manually write ANSI codes (`\x1b[...`)
+- **output:: functions over direct printing** - Use output:: for user messages, which auto-adds emoji + semantic color
+- **cformat! for inner styling** - Use `<bold>`, `<dim>` tags within output:: calls
- **YAGNI for presentation** - Most output needs no styling
- **Unicode-aware** - Width calculations respect emoji and CJK characters (via `StyledLine`)
- **Graceful degradation** - Must work without color support
@@ -364,21 +358,19 @@ Use `format_with_gutter()` for quoted content. Gutter content displays external
```rust
// Show warning message, then external error in gutter
-super::warning(format!(
- "{WARNING}Could not delete branch {WARNING_BOLD}{branch_name}{WARNING_BOLD:#}{WARNING:#}"
-))?;
-super::gutter(format_with_gutter(&e.to_string(), "", None))?;
+output::warning(cformat!("Could not delete branch <bold>{branch_name}</>"))?;
+output::gutter(format_with_gutter(&e.to_string(), "", None))?;
```
**Linebreaks:** Gutter content requires a single newline before it, never double newlines. Output functions (`progress()`, `success()`, etc.) use `println!()` internally, adding a trailing newline. Messages passed to these functions should not include `\n`:
```rust
// βœ… GOOD - no trailing \n
-output::progress(format!("{CYAN}Merging...{CYAN:#}"))?;
+output::progress("Merging...")?;
output::gutter(format_with_gutter(&log, "", None))?;
// ❌ BAD - trailing \n creates blank line
-output::progress(format!("{CYAN}Merging...{CYAN:#}\n"))?;
+output::progress("Merging...\n")?;
```
### Error Message Formatting
diff --git a/src/commands/command_approval.rs b/src/commands/command_approval.rs
index c6ff3fd94..75546a5b2 100644
--- a/src/commands/command_approval.rs
+++ b/src/commands/command_approval.rs
@@ -66,9 +66,7 @@ pub fn approve_command_batch(
if updated && let Err(e) = fresh_config.save() {
let _ = output::warning(format!("Failed to save command approval: {e}"));
- let _ = output::hint(cformat!(
- "<dim>Approval will be requested again next time.</>"
- ));
+ let _ = output::hint("Approval will be requested again next time.");
}
}
diff --git a/src/commands/commit.rs b/src/commands/commit.rs
index 00fc8f8da..f70b26684 100644
--- a/src/commands/commit.rs
+++ b/src/commands/commit.rs
@@ -67,9 +67,9 @@ impl<'a> CommitGenerator<'a> {
pub fn emit_hint_if_needed(&self) -> anyhow::Result<()> {
if !self.config.is_configured() {
- crate::output::hint(cformat!(
- "<dim>Using fallback commit message. Run 'wt config --help' for LLM setup guide</>"
- ))?;
+ crate::output::hint(
+ "Using fallback commit message. Run 'wt config --help' for LLM setup guide",
+ )?;
}
Ok(())
}
@@ -103,9 +103,12 @@ impl<'a> CommitGenerator<'a> {
}
let full_progress_msg = if parts.is_empty() {
- cformat!("<cyan>{action}</>")
+ action
} else {
- cformat!("<cyan>{action} ({})</>", parts.join(", "))
+ // Gray parenthetical with separate cformat for closing paren (avoids optimizer)
+ let parts_str = parts.join(", ");
+ let paren_close = cformat!("<bright-black>)</>");
+ cformat!("{action} <bright-black>({parts_str}</>{paren_close}")
};
crate::output::progress(full_progress_msg)?;
@@ -124,9 +127,7 @@ impl<'a> CommitGenerator<'a> {
.trim()
.to_string();
- crate::output::success(cformat!(
- "<green>Committed changes @ <dim>{commit_hash}</></>"
- ))?;
+ crate::output::success(cformat!("Committed changes @ <dim>{commit_hash}</>"))?;
Ok(())
}
@@ -142,7 +143,7 @@ impl CommitOptions<'_> {
.unwrap_or(false);
if self.no_verify && has_pre_commit {
- crate::output::hint(cformat!("<dim>Skipping pre-commit hook (--no-verify)</>"))?;
+ crate::output::hint("Skipping pre-commit hook (--no-verify)")?;
} else if let Some(ref config) = project_config {
let pipeline = HookPipeline::new(*self.ctx);
pipeline.run_pre_commit(config, self.target_branch, self.auto_trust)?;
diff --git a/src/commands/config.rs b/src/commands/config.rs
index bf8c546ed..36b36847c 100644
--- a/src/commands/config.rs
+++ b/src/commands/config.rs
@@ -55,12 +55,8 @@ pub fn handle_config_create() -> anyhow::Result<()> {
format_path_for_display(&config_path)
))?;
output::blank()?;
- output::hint(cformat!(
- "<dim>Use 'wt config show' to view existing configuration</>"
- ))?;
- output::hint(cformat!(
- "<dim>Use 'wt config create --help' for config format reference</>"
- ))?;
+ output::hint("Use 'wt config show' to view existing configuration")?;
+ output::hint("Use 'wt config create --help' for config format reference")?;
return Ok(());
}
@@ -76,13 +72,11 @@ pub fn handle_config_create() -> anyhow::Result<()> {
// Success message
output::success(cformat!(
- "<green>Created config file: <bold>{}</></>",
+ "Created config file: <bold>{}</>",
format_path_for_display(&config_path)
))?;
output::blank()?;
- output::hint(cformat!(
- "<dim>Edit this file to customize worktree paths and LLM settings</>"
- ))?;
+ output::hint("Edit this file to customize worktree paths and LLM settings")?;
Ok(())
}
@@ -417,7 +411,7 @@ pub fn handle_config_status_set(value: String, branch: Option<String>) -> anyhow
repo.run_command(&["config", &config_key, &value])?;
crate::output::success(cformat!(
- "<green>Set status for <bold>{branch_name}</> to <bold>{value}</></>"
+ "Set status for <bold>{branch_name}</> to <bold>{value}</>"
))?;
Ok(())
@@ -445,7 +439,7 @@ pub fn handle_config_status_unset(target: String) -> anyhow::Result<()> {
crate::output::info("No statuses to clear")?;
} else {
crate::output::success(cformat!(
- "<green>Cleared <bold>{cleared_count}</> status{}</>",
+ "Cleared <bold>{cleared_count}</> status{}",
if cleared_count == 1 { "" } else { "es" }
))?;
}
@@ -461,9 +455,7 @@ pub fn handle_config_status_unset(target: String) -> anyhow::Result<()> {
repo.run_command(&["config", "--unset", &config_key])
.context("Failed to unset status (may not be set)")?;
- crate::output::success(cformat!(
- "<green>Cleared status for <bold>{branch_name}</></>"
- ))?;
+ crate::output::success(cformat!("Cleared status for <bold>{branch_name}</>"))?;
}
Ok(())
@@ -519,7 +511,7 @@ pub fn handle_cache_clear(cache_type: Option<String>) -> anyhow::Result<()> {
crate::output::info("No CI cache entries to clear")?;
} else {
crate::output::success(cformat!(
- "<green>Cleared <bold>{cleared}</> CI cache entr{}</>",
+ "Cleared <bold>{cleared}</> CI cache entr{}",
if cleared == 1 { "y" } else { "ies" }
))?;
}
@@ -529,7 +521,7 @@ pub fn handle_cache_clear(cache_type: Option<String>) -> anyhow::Result<()> {
.run_command(&["config", "--unset", "worktrunk.defaultBranch"])
.is_ok()
{
- crate::output::success(cformat!("<green>Cleared default branch cache</>"))?;
+ crate::output::success("Cleared default branch cache")?;
} else {
crate::output::info("No default branch cache to clear")?;
}
@@ -541,7 +533,7 @@ pub fn handle_cache_clear(cache_type: Option<String>) -> anyhow::Result<()> {
let cleared_ci = CachedCiStatus::clear_all(&repo) > 0;
if cleared_default || cleared_ci {
- crate::output::success(cformat!("<green>Cleared all caches</>"))?;
+ crate::output::success("Cleared all caches")?;
} else {
crate::output::info("No caches to clear")?;
}
@@ -558,11 +550,11 @@ pub fn handle_cache_clear(cache_type: Option<String>) -> anyhow::Result<()> {
pub fn handle_cache_refresh() -> anyhow::Result<()> {
let repo = Repository::current();
- crate::output::progress(cformat!("<cyan>Querying remote for default branch...</>"))?;
+ crate::output::progress("Querying remote for default branch...")?;
let branch = repo.refresh_default_branch()?;
- crate::output::success(cformat!("<green>Cache refreshed: <bold>{branch}</></>"))?;
+ crate::output::success(cformat!("Cache refreshed: <bold>{branch}</>"))?;
Ok(())
}
diff --git a/src/commands/configure_shell.rs b/src/commands/configure_shell.rs
index 520c2d8c1..541e21c36 100644
--- a/src/commands/configure_shell.rs
+++ b/src/commands/configure_shell.rs
@@ -173,15 +173,11 @@ pub fn handle_configure_shell(
// Only show advisory if we positively detect it's missing (Some(false)).
// If detection fails (None), stay silent - we can't be sure.
if shell::detect_zsh_compinit() == Some(false) {
- use color_print::cformat;
- let _ = crate::output::warning(cformat!(
- "<yellow>Completions won't work: zsh's compinit is not enabled.</>"
- ));
- let _ = crate::output::print(cformat!(
- "<yellow> Add this to ~/.zshrc before the wt line:</>"
- ));
- let _ =
- crate::output::print(cformat!("<yellow> autoload -Uz compinit && compinit</>"));
+ let _ = crate::output::warning(
+ "Completions won't work: zsh's compinit is not enabled.\n\
+ Add this to ~/.zshrc before the wt line:\n\
+ autoload -Uz compinit && compinit",
+ );
}
}
diff --git a/src/commands/hooks.rs b/src/commands/hooks.rs
index f5803c845..88682e4e2 100644
--- a/src/commands/hooks.rs
+++ b/src/commands/hooks.rs
@@ -60,7 +60,7 @@ impl<'a> HookPipeline<'a> {
for prepared in commands {
let label =
crate::commands::format_command_label(label_prefix, prepared.name.as_deref());
- crate::output::progress(cformat!("<cyan>{label}:</>"))?;
+ crate::output::progress(format!("{label}:"))?;
crate::output::gutter(format_bash_with_gutter(&prepared.expanded, ""))?;
if let Err(err) =
@@ -92,9 +92,9 @@ impl<'a> HookPipeline<'a> {
HookFailureStrategy::Warn => {
let message = match &prepared.name {
Some(name) => {
- cformat!("<yellow>Command <bold>{name}</> failed: {err_msg}</>")
+ cformat!("Command <bold>{name}</> failed: {err_msg}")
}
- None => cformat!("<yellow>Command failed: {err_msg}</>"),
+ None => format!("Command failed: {err_msg}"),
};
crate::output::warning(message)?;
@@ -142,7 +142,7 @@ impl<'a> HookPipeline<'a> {
for prepared in commands {
let label =
crate::commands::format_command_label(label_prefix, prepared.name.as_deref());
- crate::output::progress(cformat!("<cyan>{label}:</>"))?;
+ crate::output::progress(format!("{label}:"))?;
crate::output::gutter(format_bash_with_gutter(&prepared.expanded, ""))?;
let name = prepared.name.as_deref().unwrap_or("cmd");
@@ -156,10 +156,8 @@ impl<'a> HookPipeline<'a> {
) {
let err_msg = err.to_string();
let message = match &prepared.name {
- Some(name) => {
- cformat!("<yellow>Failed to spawn \"{name}\": {err_msg}</>")
- }
- None => cformat!("<yellow>Failed to spawn command: {err_msg}</>"),
+ Some(name) => format!("Failed to spawn \"{name}\": {err_msg}"),
+ None => format!("Failed to spawn command: {err_msg}"),
};
crate::output::warning(message)?;
}
diff --git a/src/commands/repository_ext.rs b/src/commands/repository_ext.rs
index d1954e0fa..da186a633 100644
--- a/src/commands/repository_ext.rs
+++ b/src/commands/repository_ext.rs
@@ -168,7 +168,7 @@ impl RepositoryCliExt for Repository {
);
crate::output::progress(cformat!(
- "<cyan>Stashing changes in <bold>{}</><cyan>...</>",
+ "Stashing changes in <bold>{}</>...",
format_path_for_display(wt_path)
))?;
@@ -231,9 +231,7 @@ impl AutoStageWarning {
let count = self.files.len();
let file_word = if count == 1 { "file" } else { "files" };
- crate::output::warning(cformat!(
- "<yellow>Auto-staging {count} untracked {file_word}:</>"
- ))?;
+ crate::output::warning(format!("Auto-staging {count} untracked {file_word}:"))?;
let joined_files = self.files.join("\n");
crate::output::gutter(format_with_gutter(&joined_files, "", None))?;
@@ -259,7 +257,7 @@ impl TargetWorktreeStash {
pub(crate) fn restore(self) -> anyhow::Result<()> {
crate::output::progress(cformat!(
- "<cyan>Restoring stashed changes in <bold>{}</><cyan>...</>",
+ "Restoring stashed changes in <bold>{}</>...",
format_path_for_display(&self.path)
))?;
@@ -268,7 +266,7 @@ impl TargetWorktreeStash {
.run_command(&["stash", "pop", "--quiet", &self.stash_ref])
{
crate::output::warning(cformat!(
- "<yellow>Failed to restore stash <bold>{stash_ref}</> - run 'git stash pop {stash_ref}' in <bold>{path}</></>",
+ "Failed to restore stash <bold>{stash_ref}</> - run 'git stash pop {stash_ref}' in <bold>{path}</>",
stash_ref = self.stash_ref,
path = format_path_for_display(&self.path),
))?;
diff --git a/src/commands/standalone.rs b/src/commands/standalone.rs
index baca02c6b..59d3e6a7b 100644
--- a/src/commands/standalone.rs
+++ b/src/commands/standalone.rs
@@ -142,7 +142,7 @@ pub fn handle_squash(
.unwrap_or(false);
if skip_pre_commit && has_pre_commit {
- crate::output::hint(cformat!("<dim>Skipping pre-commit hook (--no-verify)</>"))?;
+ crate::output::hint("Skipping pre-commit hook (--no-verify)")?;
} else if let Some(ref config) = project_config {
HookPipeline::new(ctx).run_pre_commit(config, Some(&target_branch), auto_trust)?;
}
@@ -203,13 +203,13 @@ pub fn handle_squash(
let parts = total_stats;
let squash_progress = if parts.is_empty() {
- cformat!(
- "<cyan>Squashing {commit_count} {commit_text}{with_changes} into a single commit...</>"
- )
+ format!("Squashing {commit_count} {commit_text}{with_changes} into a single commit...")
} else {
+ // Gray parenthetical with separate cformat for closing paren (avoids optimizer)
+ let parts_str = parts.join(", ");
+ let paren_close = cformat!("<bright-black>)</>");
cformat!(
- "<cyan>Squashing {commit_count} {commit_text}{with_changes} into a single commit ({})...</>",
- parts.join(", ")
+ "Squashing {commit_count} {commit_text}{with_changes} into a single commit <bright-black>({parts_str}</>{paren_close}..."
)
};
crate::output::progress(squash_progress)?;
@@ -218,14 +218,14 @@ pub fn handle_squash(
if has_staged {
let backup_message = format!("{} β†’ {} (squash)", current_branch, target_branch);
let (sha, _restore_cmd) = repo.create_safety_backup(&backup_message)?;
- crate::output::hint(cformat!("<dim>Backup created @ {sha}</>"))?;
+ crate::output::hint(format!("Backup created @ {sha}"))?;
}
// Get commit subjects for the squash message
let subjects = repo.commit_subjects(&range)?;
// Generate squash commit message
- crate::output::progress(cformat!("<cyan>Generating squash commit message...</>"))?;
+ crate::output::progress("Generating squash commit message...")?;
generator.emit_hint_if_needed()?;
@@ -254,8 +254,8 @@ pub fn handle_squash(
// Check if there are actually any changes to commit
if !repo.has_staged_changes()? {
- crate::output::info(cformat!(
- "<dim>No changes after squashing {commit_count} {commit_text}</>"
+ crate::output::info(format!(
+ "No changes after squashing {commit_count} {commit_text}"
))?;
return Ok(SquashResult::NoNetChanges);
}
@@ -271,7 +271,7 @@ pub fn handle_squash(
.to_string();
// Show success immediately after completing the squash
- crate::output::success(cformat!("<green>Squashed @ <dim>{commit_hash}</></>"))?;
+ crate::output::success(cformat!("Squashed @ <dim>{commit_hash}</>"))?;
Ok(SquashResult::Squashed)
}
@@ -309,9 +309,7 @@ pub fn handle_rebase(target: Option<&str>) -> anyhow::Result<RebaseResult> {
// Only show progress for true rebases (fast-forwards are instant)
if !is_fast_forward {
- crate::output::progress(cformat!(
- "<cyan>Rebasing onto <bold>{target_branch}</>...</>"
- ))?;
+ crate::output::progress(cformat!("Rebasing onto <bold>{target_branch}</>..."))?;
}
let rebase_result = repo.run_command(&["rebase", &target_branch]);
@@ -348,11 +346,9 @@ pub fn handle_rebase(target: Option<&str>) -> anyhow::Result<RebaseResult> {
// Success
if is_fast_forward {
- crate::output::success(cformat!(
- "<green>Fast-forwarded to <bold>{target_branch}</></>"
- ))?;
+ crate::output::success(cformat!("Fast-forwarded to <bold>{target_branch}</>"))?;
} else {
- crate::output::success(cformat!("<green>Rebased onto <bold>{target_branch}</></>"))?;
+ crate::output::success(cformat!("Rebased onto <bold>{target_branch}</>"))?;
}
Ok(RebaseResult::Rebased)
@@ -412,10 +408,10 @@ pub fn handle_standalone_add_approvals(force: bool, show_all: bool) -> anyhow::R
if approved {
if force {
// When using --force, commands aren't saved to config
- crate::output::success(cformat!("<green>Commands approved; not saved (--force)</>"))?;
+ crate::output::success("Commands approved; not saved (--force)")?;
} else {
// Interactive approval - commands were saved to config (unless save failed)
- crate::output::success(cformat!("<green>Commands approved & saved to config</>"))?;
+ crate::output::success("Commands approved & saved to config")?;
}
} else {
crate::output::info("Commands declined")?;
@@ -442,8 +438,8 @@ pub fn handle_standalone_clear_approvals(global: bool) -> anyhow::Result<()> {
config.projects.clear();
config.save().context("Failed to save config")?;
- crate::output::success(cformat!(
- "<green>Cleared approvals for {project_count} project{}</>",
+ crate::output::success(format!(
+ "Cleared approvals for {project_count} project{}",
if project_count == 1 { "" } else { "s" }
))?;
} else {
@@ -470,8 +466,8 @@ pub fn handle_standalone_clear_approvals(global: bool) -> anyhow::Result<()> {
.revoke_project(&project_id)
.context("Failed to clear project approvals")?;
- crate::output::success(cformat!(
- "<green>Cleared {approval_count} approval{} for this project</>",
+ crate::output::success(format!(
+ "Cleared {approval_count} approval{} for this project",
if approval_count == 1 { "" } else { "s" }
))?;
}
diff --git a/src/commands/worktree.rs b/src/commands/worktree.rs
index c8f4f17ab..6aa864224 100644
--- a/src/commands/worktree.rs
+++ b/src/commands/worktree.rs
@@ -234,19 +234,17 @@ pub fn handle_switch(
if !remotes.is_empty() {
let remote_ref = format!("{}/{}", remotes[0], resolved_branch);
crate::output::warning(cformat!(
- "<yellow>Branch <bold>{resolved_branch}</> exists on remote ({remote_ref}); creating new branch from base instead</>"
+ "Branch <bold>{resolved_branch}</> exists on remote ({remote_ref}); creating new branch from base instead"
))?;
- crate::output::hint(cformat!(
- "<dim>Use 'wt switch {resolved_branch}' (without --create) to switch to the remote branch</>"
+ crate::output::hint(format!(
+ "Use 'wt switch {resolved_branch}' (without --create) to switch to the remote branch"
))?;
}
}
// Check if base flag was provided without create flag
if resolved_base.is_some() && !create {
- crate::output::warning(cformat!(
- "<yellow>--base flag is only used with --create, ignoring</>"
- ))?;
+ crate::output::warning("--base flag is only used with --create, ignoring")?;
}
// Check if worktree already exists for this branch
@@ -641,7 +639,7 @@ pub fn handle_push(
};
crate::output::progress(cformat!(
- "<cyan>{verb_ing} {commit_count} {commit_text} to <bold>{target_branch}</> @ <dim>{head_sha}</>{operations_note}</>"
+ "{verb_ing} {commit_count} {commit_text} to <bold>{target_branch}</> @ <dim>{head_sha}</>{operations_note}"
))?;
// Show the commit graph with color
@@ -694,9 +692,12 @@ pub fn handle_push(
)];
summary_parts.extend(stats_summary);
+ // Re-apply bright-black after stats (which end with a reset) so ) is also gray
+ let stats_str = summary_parts.join(", ");
+ let paren_close = cformat!("<bright-black>)</>"); // Separate to avoid cformat optimization
crate::output::success(cformat!(
- "<green>{verb} <bold>{target_branch}</> ({})</>",
- summary_parts.join(", ")
+ "{verb} <bold>{target_branch}</> <bright-black>({stats_str}</>{}",
+ paren_close
))?;
} else {
// For merge workflow context, explain why nothing was pushed
diff --git a/src/main.rs b/src/main.rs
index 40db028b4..4e7175a59 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -301,7 +301,7 @@ fn main() {
for (shell, path) in &scan_result.skipped {
let path = format_path_for_display(path);
crate::output::hint(cformat!(
- "<dim>Skipped <bold>{shell}</>; {path} not found</>"
+ "Skipped <bold>{shell}</>; {path} not found"
))?;
}
@@ -350,11 +350,11 @@ fn main() {
// Fish auto-sources from conf.d, so just say "Restart shell"
// Bash/Zsh can source directly for immediate activation
if matches!(result.shell, worktrunk::shell::Shell::Fish) {
- crate::output::hint(cformat!("<dim>Restart shell to activate</>"))?;
+ crate::output::hint("Restart shell to activate")?;
} else {
let path = format_path_for_display(&result.path);
- crate::output::hint(cformat!(
- "<dim>Restart shell or run: source {path}</>"
+ crate::output::hint(format!(
+ "Restart shell or run: source {path}"
))?;
}
}
@@ -421,8 +421,8 @@ fn main() {
"No {what} found in {path}"
))?;
} else {
- crate::output::hint(cformat!(
- "<dim>No {shell} {what} in {path}</>"
+ crate::output::hint(format!(
+ "No {shell} {what} in {path}"
))?;
}
}
@@ -442,8 +442,8 @@ fn main() {
"No completions found in {path}"
))?;
} else {
- crate::output::hint(cformat!(
- "<dim>No {shell} completions in {path}</>"
+ crate::output::hint(format!(
+ "No {shell} completions in {path}"
))?;
}
}
@@ -454,9 +454,9 @@ fn main() {
if total_changes == 0 {
if all_not_found == 0 {
crate::output::blank()?;
- crate::output::hint(cformat!(
- "<dim>No shell integration found to remove</>"
- ))?;
+ crate::output::hint(
+ "No shell integration found to remove",
+ )?;
}
return Ok(());
}
@@ -481,9 +481,7 @@ fn main() {
});
if current_shell_affected {
- crate::output::hint(cformat!(
- "<dim>Restart shell to complete uninstall</>"
- ))?;
+ crate::output::hint("Restart shell to complete uninstall")?;
}
Ok(())
})
diff --git a/src/output/traits.rs b/src/output/traits.rs
index b71186f1d..19b9e27a9 100644
--- a/src/output/traits.rs
+++ b/src/output/traits.rs
@@ -3,10 +3,25 @@
//! This trait extracts common patterns between Interactive and Directive output modes.
//! The fundamental operation is `write_message_line` - implementations control where
//! messages go (stdout for interactive, stderr for directive).
+//!
+//! # Semantic Colors
+//!
+//! Output functions automatically wrap content in semantic colors:
+//! - success β†’ green
+//! - progress β†’ cyan
+//! - hint β†’ dimmed
+//! - warning β†’ yellow
+//! - info β†’ no color (neutral status)
+//!
+//! Callers provide content with optional inner styling (like `<bold>`) using `cformat!`.
+//! The trait adds the outer semantic color, so callers don't repeat `<green>...</>` etc.
use std::io::{self, Write};
use std::path::Path;
-use worktrunk::styling::{HINT_EMOJI, INFO_EMOJI, PROGRESS_EMOJI, SUCCESS_EMOJI, WARNING_EMOJI};
+use worktrunk::styling::{
+ CYAN, GREEN, HINT, HINT_EMOJI, INFO_EMOJI, PROGRESS_EMOJI, SUCCESS_EMOJI, WARNING,
+ WARNING_EMOJI,
+};
/// Core output handler trait
///
@@ -16,29 +31,29 @@ pub trait OutputHandler {
/// Write a single logical message line to the primary user stream
fn write_message_line(&mut self, line: &str) -> io::Result<()>;
- /// Emit a success message
+ /// Emit a success message (automatically wrapped in green)
fn success(&mut self, message: String) -> io::Result<()> {
- self.write_message_line(&format!("{SUCCESS_EMOJI} {message}"))
+ self.write_message_line(&format!("{SUCCESS_EMOJI} {GREEN}{message}{GREEN:#}"))
}
- /// Emit a progress message
+ /// Emit a progress message (automatically wrapped in cyan)
fn progress(&mut self, message: String) -> io::Result<()> {
- self.write_message_line(&format!("{PROGRESS_EMOJI} {message}"))
+ self.write_message_line(&format!("{PROGRESS_EMOJI} {CYAN}{message}{CYAN:#}"))
}
- /// Emit a hint message
+ /// Emit a hint message (automatically wrapped in dim)
fn hint(&mut self, message: String) -> io::Result<()> {
- self.write_message_line(&format!("{HINT_EMOJI} {message}"))
+ self.write_message_line(&format!("{HINT_EMOJI} {HINT}{message}{HINT:#}"))
}
- /// Emit an info message
+ /// Emit an info message (no color - neutral status)
fn info(&mut self, message: String) -> io::Result<()> {
self.write_message_line(&format!("{INFO_EMOJI} {message}"))
}
- /// Emit a warning message
+ /// Emit a warning message (automatically wrapped in yellow)
fn warning(&mut self, message: String) -> io::Result<()> {
- self.write_message_line(&format!("{WARNING_EMOJI} {message}"))
+ self.write_message_line(&format!("{WARNING_EMOJI} {WARNING}{message}{WARNING:#}"))
}
/// Print a message (written as-is)
diff --git a/tests/integration_tests/config_init.rs b/tests/integration_tests/config_init.rs
index 4c208e445..0bd1eb7f4 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 -----
βšͺ Global config already exists: ~/.config/worktrunk/config.toml
- πŸ’‘ Use 'wt config show' to view existing configuration
- πŸ’‘ Use 'wt config create --help' for config format reference
+ πŸ’‘ Use 'wt config show' to view existing configuration
+ πŸ’‘ Use 'wt config create --help' for config format reference
");
});
}
@@ -59,9 +59,9 @@ fn test_config_init_creates_file() {
----- stdout -----
----- stderr -----
- βœ… Created config file: ~/.config/worktrunk/config.toml
+ βœ… Created config file: ~/.config/worktrunk/config.toml
- πŸ’‘ Edit this file to customize worktree paths and LLM settings
+ πŸ’‘ Edit this file to customize worktree paths and LLM settings
");
});
diff --git a/tests/integration_tests/config_status.rs b/tests/integration_tests/config_status.rs
index 192e44941..08071913e 100644
--- a/tests/integration_tests/config_status.rs
+++ b/tests/integration_tests/config_status.rs
@@ -20,7 +20,7 @@ fn test_config_status_set_branch_default() {
.output()
.unwrap();
assert!(output.status.success());
- assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"βœ… Set status for main to 🚧");
+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"βœ… Set status for main to 🚧");
// Verify it was set
let output = repo
@@ -40,7 +40,7 @@ fn test_config_status_set_branch_specific() {
.output()
.unwrap();
assert!(output.status.success());
- assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"βœ… Set status for feature to πŸ”§");
+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"βœ… Set status for feature to πŸ”§");
// Verify it was set
let output = repo
@@ -62,7 +62,7 @@ fn test_config_status_unset_branch_default() {
let output = wt_config_status_cmd(&repo, &["unset"]).output().unwrap();
assert!(output.status.success());
- assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"βœ… Cleared status for main");
+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"βœ… Cleared status for main");
// Verify it was unset
let output = repo
@@ -86,7 +86,7 @@ fn test_config_status_unset_branch_specific() {
.output()
.unwrap();
assert!(output.status.success());
- assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"βœ… Cleared status for feature");
+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"βœ… Cleared status for feature");
// Verify it was unset
let output = repo
@@ -116,7 +116,7 @@ fn test_config_status_unset_all() {
.output()
.unwrap();
assert!(output.status.success());
- assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"βœ… Cleared 3 statuses");
+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"βœ… Cleared 3 statuses");
// Verify all were unset
let output = repo
diff --git a/tests/integration_tests/configure_shell.rs b/tests/integration_tests/configure_shell.rs
index 535357b13..1f86f9d13 100644
--- a/tests/integration_tests/configure_shell.rs
+++ b/tests/integration_tests/configure_shell.rs
@@ -31,15 +31,15 @@ fn test_configure_shell_with_yes() {
----- stdout -----
----- stderr -----
- 🟑 Completions won't work: zsh's compinit is not enabled.
-  Add this to ~/.zshrc before the wt line:
-  autoload -Uz compinit && compinit
- βœ… Added shell extension & completions for zsh @ ~/.zshrc
- πŸ’‘ Skipped bash; ~/.bashrc not found
- πŸ’‘ Skipped fish; ~/.config/fish/conf.d not found
-
- βœ… Configured 1 shell
- πŸ’‘ Restart shell or run: source ~/.zshrc
+ 🟑 Completions won't work: zsh's compinit is not enabled.
+ Add this to ~/.zshrc before the wt line:
+ autoload -Uz compinit && compinit
+ βœ… Added shell extension & completions for zsh @ ~/.zshrc
+ πŸ’‘ Skipped bash; ~/.bashrc not found
+ πŸ’‘ Skipped fish; ~/.config/fish/conf.d not found
+
+ βœ… Configured 1 shell
+ πŸ’‘ Restart shell or run: source ~/.zshrc
");
});
@@ -77,13 +77,13 @@ fn test_configure_shell_specific_shell() {
----- stdout -----
----- stderr -----
- 🟑 Completions won't work: zsh's compinit is not enabled.
-  Add this to ~/.zshrc before the wt line:
-  autoload -Uz compinit && compinit
- βœ… Added shell extension & completions for zsh @ ~/.zshrc
+ 🟑 Completions won't work: zsh's compinit is not enabled.
+ Add this to ~/.zshrc before the wt line:
+ autoload -Uz compinit && compinit
+ βœ… Added shell extension & completions for zsh @ ~/.zshrc
- βœ… Configured 1 shell
- πŸ’‘ Restart shell or run: source ~/.zshrc
+ βœ… Configured 1 shell
+ πŸ’‘ Restart shell or run: source ~/.zshrc
");
});
@@ -161,11 +161,11 @@ fn test_configure_shell_fish() {
----- stdout -----
----- stderr -----
- βœ… Created shell extension for fish @ ~/.config/fish/conf.d/wt.fish
- βœ… Created completions for fish @ ~/.config/fish/completions/wt.fish
+ βœ… Created shell extension for fish @ ~/.config/fish/conf.d/wt.fish
+ βœ… Created completions for fish @ ~/.config/fish/completions/wt.fish
- βœ… Configured 1 shell
- πŸ’‘ Restart shell to activate
+ βœ… Configured 1 shell
+ πŸ’‘ Restart shell to activate
");
});
@@ -220,9 +220,9 @@ fn test_configure_shell_fish_extension_exists() {
----- stderr -----
βšͺ Already configured shell extension for fish @ ~/.config/fish/conf.d/wt.fish
- βœ… Created completions for fish @ ~/.config/fish/completions/wt.fish
+ βœ… Created completions for fish @ ~/.config/fish/completions/wt.fish
- βœ… Configured 1 shell
+ βœ… Configured 1 shell
");
});
@@ -263,9 +263,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
");
});
@@ -301,15 +301,15 @@ fn test_configure_shell_multiple_configs() {
----- stdout -----
----- stderr -----
- 🟑 Completions won't work: zsh's compinit is not enabled.
-  Add this to ~/.zshrc before the wt line:
-  autoload -Uz compinit && compinit
- βœ… Added shell extension & completions for bash @ ~/.bashrc
- βœ… Added shell extension & completions for zsh @ ~/.zshrc
- πŸ’‘ Skipped fish; ~/.config/fish/conf.d not found
-
- βœ… Configured 2 shells
- πŸ’‘ Restart shell or run: source ~/.zshrc
+ 🟑 Completions won't work: zsh's compinit is not enabled.
+ Add this to ~/.zshrc before the wt line:
+ autoload -Uz compinit && compinit
+ βœ… Added shell extension & completions for bash @ ~/.bashrc
+ βœ… Added shell extension & completions for zsh @ ~/.zshrc
+ πŸ’‘ Skipped fish; ~/.config/fish/conf.d not found
+
+ βœ… Configured 2 shells
+ πŸ’‘ Restart shell or run: source ~/.zshrc
");
});
@@ -363,15 +363,15 @@ fn test_configure_shell_mixed_states() {
----- stdout -----
----- stderr -----
- 🟑 Completions won't work: zsh's compinit is not enabled.
-  Add this to ~/.zshrc before the wt line:
-  autoload -Uz compinit && compinit
+ 🟑 Completions won't work: zsh's compinit is not enabled.
+ Add this to ~/.zshrc before the wt line:
+ autoload -Uz compinit && compinit
βšͺ Already configured shell extension & completions for bash @ ~/.bashrc
- βœ… Added shell extension & completions for zsh @ ~/.zshrc
- πŸ’‘ Skipped fish; ~/.config/fish/conf.d not found
+ βœ… Added shell extension & completions for zsh @ ~/.zshrc
+ πŸ’‘ Skipped fish; ~/.config/fish/conf.d not found
- βœ… Configured 1 shell
- πŸ’‘ Restart shell or run: source ~/.zshrc
+ βœ… Configured 1 shell
+ πŸ’‘ Restart shell or run: source ~/.zshrc
");
});
@@ -423,13 +423,13 @@ fn test_uninstall_shell() {
----- stdout -----
----- stderr -----
- βœ… Removed shell extension & completions for zsh @ ~/.zshrc
- πŸ’‘ No bash shell extension & completions in ~/.bashrc
- πŸ’‘ No fish shell extension in ~/.config/fish/conf.d/wt.fish
- πŸ’‘ No fish completions in ~/.config/fish/completions/wt.fish
+ βœ… Removed shell extension & completions for zsh @ ~/.zshrc
+ πŸ’‘ No bash shell extension & completions in ~/.bashrc
+ πŸ’‘ No fish shell extension in ~/.config/fish/conf.d/wt.fish
+ πŸ’‘ No fish completions in ~/.config/fish/completions/wt.fish
- βœ… Removed integration from 1 shell
- πŸ’‘ Restart shell to complete uninstall
+ βœ… Removed integration from 1 shell
+ πŸ’‘ Restart shell to complete uninstall
");
});
@@ -483,13 +483,13 @@ fn test_uninstall_shell_multiple() {
----- stdout -----
----- stderr -----
- βœ… Removed shell extension & completions for bash @ ~/.bashrc
- βœ… Removed shell extension & completions for zsh @ ~/.zshrc
- πŸ’‘ No fish shell extension in ~/.config/fish/conf.d/wt.fish
- πŸ’‘ No fish completions in ~/.config/fish/completions/wt.fish
+ βœ… Removed shell extension & completions for bash @ ~/.bashrc
+ βœ… Removed shell extension & completions for zsh @ ~/.zshrc
+ πŸ’‘ No fish shell extension in ~/.config/fish/conf.d/wt.fish
+ πŸ’‘ No fish completions in ~/.config/fish/completions/wt.fish
- βœ… Removed integration from 2 shells
- πŸ’‘ Restart shell to complete uninstall
+ βœ… Removed integration from 2 shells
+ πŸ’‘ Restart shell to complete uninstall
");
});
@@ -536,7 +536,7 @@ fn test_uninstall_shell_not_found() {
----- stdout -----
----- stderr -----
- 🟑 No shell extension & completions found in ~/.zshrc
+ 🟑 No shell extension & completions found in ~/.zshrc
");
});
}
@@ -576,10 +576,10 @@ fn test_uninstall_shell_fish() {
----- stdout -----
----- stderr -----
- βœ… Removed shell extension for fish @ ~/.config/fish/conf.d/wt.fish
+ βœ… Removed shell extension for fish @ ~/.config/fish/conf.d/wt.fish
- βœ… Removed integration from 1 shell
- πŸ’‘ Restart shell to complete uninstall
+ βœ… Removed integration from 1 shell
+ πŸ’‘ Restart shell to complete uninstall
");
});
@@ -690,10 +690,10 @@ fn test_configure_shell_no_warning_when_compinit_enabled() {
----- stdout -----
----- stderr -----
- βœ… Added shell extension & completions for zsh @ ~/.zshrc
+ βœ… Added shell extension & completions for zsh @ ~/.zshrc
- βœ… Configured 1 shell
- πŸ’‘ Restart shell or run: source ~/.zshrc
+ βœ… Configured 1 shell
+ πŸ’‘ Restart shell or run: source ~/.zshrc
");
});
}
@@ -730,12 +730,12 @@ fn test_configure_shell_no_warning_for_bash_user() {
----- stdout -----
----- stderr -----
- βœ… Added shell extension & completions for bash @ ~/.bashrc
- βœ… Added shell extension & completions for zsh @ ~/.zshrc
- πŸ’‘ Skipped fish; ~/.config/fish/conf.d not found
+ βœ… Added shell extension & completions for bash @ ~/.bashrc
+ βœ… Added shell extension & completions for zsh @ ~/.zshrc
+ πŸ’‘ Skipped fish; ~/.config/fish/conf.d not found
- βœ… Configured 2 shells
- πŸ’‘ Restart shell or run: source ~/.bashrc
+ βœ… Configured 2 shells
+ πŸ’‘ Restart shell or run: source ~/.bashrc
");
});
}
@@ -771,10 +771,10 @@ fn test_configure_shell_no_warning_for_fish_install() {
----- stdout -----
----- stderr -----
- βœ… Created shell extension for fish @ ~/.config/fish/conf.d/wt.fish
- βœ… Created completions for fish @ ~/.config/fish/completions/wt.fish
+ βœ… Created shell extension for fish @ ~/.config/fish/conf.d/wt.fish
+ βœ… Created completions for fish @ ~/.config/fish/completions/wt.fish
- βœ… Configured 1 shell
+ βœ… Configured 1 shell
");
});
}
@@ -850,11 +850,11 @@ fn test_configure_shell_no_warning_when_shell_unset() {
----- stdout -----
----- stderr -----
- βœ… Added shell extension & completions for bash @ ~/.bashrc
- βœ… Added shell extension & completions for zsh @ ~/.zshrc
- πŸ’‘ Skipped fish; ~/.config/fish/conf.d not found
+ βœ… Added shell extension & completions for bash @ ~/.bashrc
+ βœ… Added shell extension & completions for zsh @ ~/.zshrc
+ πŸ’‘ Skipped fish; ~/.config/fish/conf.d not found
- βœ… Configured 2 shells
+ βœ… Configured 2 shells
");
});
}
diff --git a/tests/integration_tests/directives.rs b/tests/integration_tests/directives.rs
index b57e778f2..7f1251e99 100644
--- a/tests/integration_tests/directives.rs
+++ b/tests/integration_tests/directives.rs
@@ -91,7 +91,7 @@ fn test_remove_internal_directive() {
cd '[PATH]'
----- stderr -----
- πŸ”„ Removing main worktree & branch in background
+ πŸ”„ Removing main worktree & branch in background
");
});
}
@@ -116,7 +116,7 @@ fn test_remove_without_internal() {
----- stdout -----
----- stderr -----
- πŸ”„ Removing main worktree & branch in background
+ πŸ”„ Removing main worktree & branch in background
");
});
}
diff --git a/tests/integration_tests/merge.rs b/tests/integration_tests/merge.rs
index 1f814aa5c..3dba94fda 100644
--- a/tests/integration_tests/merge.rs
+++ b/tests/integration_tests/merge.rs
@@ -2454,11 +2454,11 @@ fn test_merge_no_commit_with_clean_tree() {
----- stdout -----
----- stderr -----
- πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
+ πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
- βœ… Merged to main (1 commit, 1 file, +1)
+ βœ… Merged to main (1 commit, 1 file, +1)
βšͺ Worktree preserved (--no-remove)
");
});
@@ -2557,11 +2557,11 @@ fn test_merge_no_commit_no_squash_no_remove_redundant() {
----- stdout -----
----- stderr -----
- πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
+ πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
- βœ… Merged to main (1 commit, 1 file, +1)
+ βœ… Merged to main (1 commit, 1 file, +1)
βšͺ Worktree preserved (--no-remove)
");
});
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snap
index 79400930f..e283096f5 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snap
@@ -10,8 +10,8 @@ y
  echo 'test command'
πŸ’‘ Allow and remember? [y/N]
-πŸ”„ Running post-create:
+πŸ”„ Running post-create:
  echo 'test command'
test command
-βœ… Created new worktree for test-approve from main at [REPO]/repo.test-approve
-πŸ’‘ Run `wt config shell install` to enable automatic cd
+βœ… Created new worktree for test-approve from main at [REPO]/repo.test-approve
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snap
index 2d808bfff..5663b00fc 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snap
@@ -11,5 +11,5 @@ n
πŸ’‘ Allow and remember? [y/N]
βšͺ Commands declined, continuing worktree creation
-βœ… Created new worktree for test-decline from main at [REPO]/repo.test-decline
-πŸ’‘ Run `wt config shell install` to enable automatic cd
+βœ… Created new worktree for test-decline from main at [REPO]/repo.test-decline
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snap
index 2b5e00f39..d07ae95a3 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snap
@@ -13,14 +13,14 @@ y
  echo 'Third command'
πŸ’‘ Allow and remember? [y/N]
-πŸ”„ Running post-create:
+πŸ”„ Running post-create:
  echo 'First command'
First command
-πŸ”„ Running post-create:
+πŸ”„ Running post-create:
  echo 'Second command'
Second command
-πŸ”„ Running post-create:
+πŸ”„ Running post-create:
  echo 'Third command'
Third command
-βœ… Created new worktree for test-mixed-accept from main at [REPO]/repo.test-mixed-accept
-πŸ’‘ Run `wt config shell install` to enable automatic cd
+βœ… Created new worktree for test-mixed-accept from main at [REPO]/repo.test-mixed-accept
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snap
index f6aa93785..4bf9d273b 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snap
@@ -14,5 +14,5 @@ n
πŸ’‘ Allow and remember? [y/N]
βšͺ Commands declined, continuing worktree creation
-βœ… Created new worktree for test-mixed-decline from main at [REPO]/repo.test-mixed-decline
-πŸ’‘ Run `wt config shell install` to enable automatic cd
+βœ… Created new worktree for test-mixed-decline from main at [REPO]/repo.test-mixed-decline
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snap
index aec98d35b..c90ae37be 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snap
@@ -16,14 +16,14 @@ y
  echo 'Third command'
πŸ’‘ Allow and remember? [y/N]
-πŸ”„ Running post-create:
+πŸ”„ Running post-create:
  echo 'First command'
First command
-πŸ”„ Running post-create:
+πŸ”„ Running post-create:
  echo 'Second command'
Second command
-πŸ”„ Running post-create:
+πŸ”„ Running post-create:
  echo 'Third command'
Third command
-βœ… Created new worktree for test-multi from main at [REPO]/repo.test-multi
-πŸ’‘ Run `wt config shell install` to enable automatic cd
+βœ… Created new worktree for test-multi from main at [REPO]/repo.test-multi
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap
index 04af4db18..9dacd3a83 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap
@@ -16,14 +16,14 @@ y
  echo 'Running tests...'
πŸ’‘ Allow and remember? [y/N]
-πŸ”„ Running post-create install:
+πŸ”„ Running post-create install:
  echo 'Installing dependencies...'
Installing dependencies...
-πŸ”„ Running post-create build:
+πŸ”„ Running post-create build:
  echo 'Building project...'
Building project...
-πŸ”„ Running post-create test:
+πŸ”„ Running post-create test:
  echo 'Running tests...'
Running tests...
-βœ… Created new worktree for test-named from main at [REPO]/repo.test-named
-πŸ’‘ Run `wt config shell install` to enable automatic cd
+βœ… Created new worktree for test-named from main at [REPO]/repo.test-named
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snap
index 5bd4e8a01..8bf64226b 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snap
@@ -10,10 +10,10 @@ y
  echo 'test command'
πŸ’‘ Allow and remember? [y/N]
-🟑 Failed to save command approval: Failed to write config file: Permission denied (os error 13)
-πŸ’‘ Approval will be requested again next time.
-πŸ”„ Running post-create:
+🟑 Failed to save command approval: Failed to write config file: Permission denied (os error 13)
+πŸ’‘ Approval will be requested again next time.
+πŸ”„ Running post-create:
  echo 'test command'
test command
-βœ… Created new worktree for test-permission from main at [REPO]/repo.test-permission
-πŸ’‘ Run `wt config shell install` to enable automatic cd
+βœ… Created new worktree for test-permission from main at [REPO]/repo.test-permission
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__bash_shell_integration_hint_suppressed.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__bash_shell_integration_hint_suppressed.snap
index b812bd367..de28536f8 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__bash_shell_integration_hint_suppressed.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__bash_shell_integration_hint_suppressed.snap
@@ -2,4 +2,4 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-βœ… Created new worktree for bash-test from main at [TMPDIR]/repo.bash-test
+βœ… Created new worktree for bash-test from main at [TMPDIR]/repo.bash-test
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_multiline_command_execution.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_multiline_command_execution.snap
index d8ba731b9..a90ad055a 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_multiline_command_execution.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_multiline_command_execution.snap
@@ -2,8 +2,8 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-βœ… Created new worktree for fish-multiline from main at [TMPDIR]/repo.fish-multiline
-πŸ”„ Executing (--execute):
+βœ… Created new worktree for fish-multiline from main at [TMPDIR]/repo.fish-multiline
+πŸ”„ Executing (--execute):
  echo 'line 1'; echo 'line 2'; echo 'line 3'
line 1
line 2
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_handles_empty_chunks.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_handles_empty_chunks.snap
index cd78a4ba8..a4a68346c 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_handles_empty_chunks.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_handles_empty_chunks.snap
@@ -2,4 +2,4 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-βœ… Created new worktree for fish-minimal from main at [TMPDIR]/repo.fish-minimal
+βœ… Created new worktree for fish-minimal from main at [TMPDIR]/repo.fish-minimal
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap
index 581a91aea..b35b9a6b4 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap
@@ -2,6 +2,6 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-βœ… Created new worktree for fish-bg from main at [TMPDIR]/repo.fish-bg
-πŸ”„ Running post-start:
+βœ… Created new worktree for fish-bg from main at [TMPDIR]/repo.fish-bg
+πŸ”„ Running post-start:
  echo 'fish background task'
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap
index 665ee74cf..ae214e0e7 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap
@@ -2,7 +2,7 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-πŸ”„ Running pre-merge check1:
+πŸ”„ Running pre-merge check1:
  [TMPDIR]/repo/mixed-output.sh check1 3
[check1] stdout line 1
[check1] stderr line 1
@@ -12,7 +12,7 @@ expression: output.normalized()
[check1] stderr line 3
[check1] stdout complete
[check1] stderr complete
-πŸ”„ Running pre-merge check2:
+πŸ”„ Running pre-merge check2:
  [TMPDIR]/repo/mixed-output.sh check2 3
[check2] stdout line 1
[check2] stderr line 1
@@ -22,9 +22,9 @@ expression: output.normalized()
[check2] stderr line 3
[check2] stdout complete
[check2] stderr complete
-πŸ”„ Merging 1 commit to main @ [HASH] (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ [HASH] (no commit/squash/rebase needed)
  * [HASH] Add feature
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
-πŸ”„ Removing feature worktree & branch in background
+βœ… Merged to main (1 commit, 1 file, +1)
+πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap
index 665ee74cf..ae214e0e7 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap
@@ -2,7 +2,7 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-πŸ”„ Running pre-merge check1:
+πŸ”„ Running pre-merge check1:
  [TMPDIR]/repo/mixed-output.sh check1 3
[check1] stdout line 1
[check1] stderr line 1
@@ -12,7 +12,7 @@ expression: output.normalized()
[check1] stderr line 3
[check1] stdout complete
[check1] stderr complete
-πŸ”„ Running pre-merge check2:
+πŸ”„ Running pre-merge check2:
  [TMPDIR]/repo/mixed-output.sh check2 3
[check2] stdout line 1
[check2] stderr line 1
@@ -22,9 +22,9 @@ expression: output.normalized()
[check2] stderr line 3
[check2] stdout complete
[check2] stderr complete
-πŸ”„ Merging 1 commit to main @ [HASH] (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ [HASH] (no commit/squash/rebase needed)
  * [HASH] Add feature
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
-πŸ”„ Removing feature worktree & branch in background
+βœ… Merged to main (1 commit, 1 file, +1)
+πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap
index db9509e1f..f206874b9 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap
@@ -2,10 +2,10 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-πŸ”„ Running pre-merge format:
+πŸ”„ Running pre-merge format:
  echo 'βœ“ Code formatting check passed'
βœ“ Code formatting check passed
-πŸ”„ Running pre-merge test:
+πŸ”„ Running pre-merge test:
  echo 'βœ— Test suite failed: 3 tests failing' && exit 1
βœ— Test suite failed: 3 tests failing
❌ pre-merge command failed: test: exit status: 1
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 db9509e1f..f206874b9 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap
@@ -2,10 +2,10 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-πŸ”„ Running pre-merge format:
+πŸ”„ Running pre-merge format:
  echo 'βœ“ Code formatting check passed'
βœ“ Code formatting check passed
-πŸ”„ Running pre-merge test:
+πŸ”„ Running pre-merge test:
  echo 'βœ— Test suite failed: 3 tests failing' && exit 1
βœ— Test suite failed: 3 tests failing
❌ pre-merge command failed: test: exit status: 1
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap
index 61ab244f2..e6ef53404 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap
@@ -2,18 +2,18 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-πŸ”„ Running pre-merge format:
+πŸ”„ Running pre-merge format:
  echo 'βœ“ Code formatting check passed'
βœ“ Code formatting check passed
-πŸ”„ Running pre-merge lint:
+πŸ”„ Running pre-merge lint:
  echo 'βœ“ Linting passed - no warnings'
βœ“ Linting passed - no warnings
-πŸ”„ Running pre-merge test:
+πŸ”„ Running pre-merge test:
  echo 'βœ“ All 47 tests passed in 2.3s'
βœ“ All 47 tests passed in 2.3s
-πŸ”„ Merging 1 commit to main @ [HASH] (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ [HASH] (no commit/squash/rebase needed)
  * [HASH] Add feature
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
-πŸ”„ Removing feature worktree & branch in background
+βœ… Merged to main (1 commit, 1 file, +1)
+πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap
index 61ab244f2..e6ef53404 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap
@@ -2,18 +2,18 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-πŸ”„ Running pre-merge format:
+πŸ”„ Running pre-merge format:
  echo 'βœ“ Code formatting check passed'
βœ“ Code formatting check passed
-πŸ”„ Running pre-merge lint:
+πŸ”„ Running pre-merge lint:
  echo 'βœ“ Linting passed - no warnings'
βœ“ Linting passed - no warnings
-πŸ”„ Running pre-merge test:
+πŸ”„ Running pre-merge test:
  echo 'βœ“ All 47 tests passed in 2.3s'
βœ“ All 47 tests passed in 2.3s
-πŸ”„ Merging 1 commit to main @ [HASH] (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ [HASH] (no commit/squash/rebase needed)
  * [HASH] Add feature
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
-πŸ”„ Removing feature worktree & branch in background
+βœ… Merged to main (1 commit, 1 file, +1)
+πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_post_create.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_post_create.snap
index 83d578ae7..6c35db3a4 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_post_create.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_post_create.snap
@@ -2,11 +2,11 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-πŸ”„ Running post-create install:
+πŸ”„ Running post-create install:
  uv sync
Resolved 24 packages in 145ms
Installed 24 packages in 1.2s
-βœ… Created new worktree for feature-x from main at [TMPDIR]/repo.feature-x
-πŸ”„ Running post-start dev:
+βœ… Created new worktree for feature-x from main at [TMPDIR]/repo.feature-x
+πŸ”„ Running post-start dev:
  uv run dev
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_pre_merge.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_pre_merge.snap
index d5bb13ae3..29c79d7a1 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_pre_merge.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_pre_merge.snap
@@ -2,14 +2,14 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-πŸ”„ Squashing 3 commits into a single commit (2 files, +45)...
-πŸ”„ Generating squash commit message...
+πŸ”„ Squashing 3 commits into a single commit (2 files, +45)...
+πŸ”„ Generating squash commit message...
  feat(api): Add user authentication endpoints
 
  Implement login and token refresh endpoints with JWT validation.
  Includes comprehensive test coverage and input validation.
-βœ… Squashed @ [HASH]
-πŸ”„ Running pre-merge test:
+βœ… Squashed @ [HASH]
+πŸ”„ Running pre-merge test:
  uv run pytest
============================= test session starts ==============================
@@ -21,15 +21,15 @@ tests/test_auth.py::test_token_validation PASSED [100%]
============================== 3 passed in 0.8s ===============================
-πŸ”„ Running pre-merge lint:
+πŸ”„ Running pre-merge lint:
  uv run ruff check
All checks passed!
-πŸ”„ Merging 1 commit to main @ [HASH] (no rebase needed)
+πŸ”„ Merging 1 commit to main @ [HASH] (no rebase needed)
  * [HASH] feat(api): Add user authentication endpoints
  api/auth.py | 31 +++++++++++++++++++++++++++++++
  tests/test_auth.py | 14 ++++++++++++++
  2 files changed, 45 insertions(+)
-βœ… Merged to main (1 commit, 2 files, +45)
-πŸ”„ Removing feature-auth worktree & branch in background
+βœ… Merged to main (1 commit, 2 files, +45)
+πŸ”„ Removing feature-auth worktree & branch in background
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_simple_switch.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_simple_switch.snap
index 28b83dcae..fb31198ac 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_simple_switch.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_simple_switch.snap
@@ -2,4 +2,4 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-βœ… Created new worktree for fix-auth from main at [TMPDIR]/repo.fix-auth
+βœ… Created new worktree for fix-auth from main at [TMPDIR]/repo.fix-auth
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__remove.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__remove.snap
index 8914b925e..12fe24a15 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__remove.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__remove.snap
@@ -2,4 +2,4 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-πŸ”„ Removing to-remove worktree & branch in background
+πŸ”„ Removing to-remove worktree & branch in background
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_create.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_create.snap
index 859c4e56b..7814f0fbe 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_create.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_create.snap
@@ -2,4 +2,4 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-βœ… Created new worktree for feature from main at [TMPDIR]/repo.feature
+βœ… Created new worktree for feature from main at [TMPDIR]/repo.feature
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute.snap
index 5b1ed3ab4..e6ffa57da 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute.snap
@@ -2,7 +2,7 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-βœ… Created new worktree for test-exec from main at [TMPDIR]/repo.test-exec
-πŸ”„ Executing (--execute):
+βœ… Created new worktree for test-exec from main at [TMPDIR]/repo.test-exec
+πŸ”„ Executing (--execute):
  echo executed
executed
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_through_wrapper.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_through_wrapper.snap
index 5b1ed3ab4..e6ffa57da 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_through_wrapper.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_through_wrapper.snap
@@ -2,7 +2,7 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-βœ… Created new worktree for test-exec from main at [TMPDIR]/repo.test-exec
-πŸ”„ Executing (--execute):
+βœ… Created new worktree for test-exec from main at [TMPDIR]/repo.test-exec
+πŸ”„ Executing (--execute):
  echo executed
executed
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap
index 0497f89ab..f13062ee8 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap
@@ -2,14 +2,14 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-πŸ”„ Running post-create:
+πŸ”„ Running post-create:
  echo 'Installing dependencies...'
Installing dependencies...
-πŸ”„ Running post-create:
+πŸ”„ Running post-create:
  echo 'Building project...'
Building project...
-βœ… Created new worktree for feature-hooks from main at [TMPDIR]/repo.feature-hooks
-πŸ”„ Running post-start server:
+βœ… Created new worktree for feature-hooks from main at [TMPDIR]/repo.feature-hooks
+πŸ”„ Running post-start server:
  echo 'Starting dev server on port 3000'
-πŸ”„ Running post-start watch:
+πŸ”„ Running post-start watch:
  echo 'Watching for file changes'
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap
index e241a3f0d..2bdcc41ae 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap
@@ -2,6 +2,6 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-βœ… Created new worktree for feature-with-hooks from main at [TMPDIR]/repo.feature-with-hooks
-πŸ”„ Running post-start:
+βœ… Created new worktree for feature-with-hooks from main at [TMPDIR]/repo.feature-with-hooks
+πŸ”„ Running post-start:
  echo 'test command executed'
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap
index 2a6e25558..643d2a444 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap
@@ -2,6 +2,6 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-βœ… Created new worktree for feature-bg from main at [TMPDIR]/repo.feature-bg
-πŸ”„ Running post-start:
+βœ… Created new worktree for feature-bg from main at [TMPDIR]/repo.feature-bg
+πŸ”„ Running post-start:
  echo 'background task'
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__already_approved_skip_prompt.snap b/tests/snapshots/integration__integration_tests__approval_ui__already_approved_skip_prompt.snap
index 39b4eed3f..a5c13e946 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__already_approved_skip_prompt.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__already_approved_skip_prompt.snap
@@ -25,7 +25,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Running post-create:
+πŸ”„ Running post-create:
  echo 'approved' > output.txt
-βœ… Created new worktree for test-approved from main at [REPO].test-approved
-πŸ’‘ Run `wt config shell install` to enable automatic cd
+βœ… Created new worktree for test-approved from main at [REPO].test-approved
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__force_bypasses_tty_check.snap b/tests/snapshots/integration__integration_tests__approval_ui__force_bypasses_tty_check.snap
index f5325fd95..af0d991ae 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__force_bypasses_tty_check.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__force_bypasses_tty_check.snap
@@ -26,8 +26,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Running post-create:
+πŸ”„ Running post-create:
  echo 'test command'
test command
-βœ… Created new worktree for test-force-tty from main at [REPO].test-force-tty
-πŸ’‘ Run `wt config shell install` to enable automatic cd
+βœ… Created new worktree for test-force-tty from main at [REPO].test-force-tty
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_first_run.snap b/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_first_run.snap
index 46dacf56f..dfebbd1dd 100644
--- a/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_first_run.snap
+++ b/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_first_run.snap
@@ -26,7 +26,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Running post-create:
+πŸ”„ Running post-create:
  echo 'test command' > output.txt
-βœ… Created new worktree for test-force from main at [REPO].test-force
-πŸ’‘ Run `wt config shell install` to enable automatic cd
+βœ… Created new worktree for test-force from main at [REPO].test-force
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__approvals__add_approvals_force.snap b/tests/snapshots/integration__integration_tests__approvals__add_approvals_force.snap
index 1f6e087d3..dfc9d4dd4 100644
--- a/tests/snapshots/integration__integration_tests__approvals__add_approvals_force.snap
+++ b/tests/snapshots/integration__integration_tests__approvals__add_approvals_force.snap
@@ -26,4 +26,4 @@ exit_code: 0
----- stdout -----
----- stderr -----
-βœ… Commands approved; not saved (--force)
+βœ… Commands approved; not saved (--force)
diff --git a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_global_with_approvals.snap b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_global_with_approvals.snap
index c75de670d..00a3ed768 100644
--- a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_global_with_approvals.snap
+++ b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_global_with_approvals.snap
@@ -26,4 +26,4 @@ exit_code: 0
----- stdout -----
----- stderr -----
-βœ… Cleared approvals for 1 project
+βœ… Cleared approvals for 1 project
diff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap
index da192f9a8..1bc7f66f3 100644
--- a/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap
+++ b/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap
@@ -26,9 +26,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
+βœ… Merged to main (1 commit, 1 file, +1)
βšͺ Worktree preserved (--no-remove)
diff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap
index 447d80c99..fffad5bd4 100644
--- a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap
+++ b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap
@@ -26,9 +26,9 @@ exit_code: 0
cd '[PATH]'
----- stderr -----
-πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
-πŸ”„ Removing feature worktree & branch in background
+βœ… Merged to main (1 commit, 1 file, +1)
+πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap
index f52e6b8b4..6934a8b4a 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap
@@ -24,15 +24,15 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Squashing 2 commits & working tree changes into a single commit (2 files, +2)...
-πŸ’‘ Backup created @ 330ccd6
-πŸ”„ Generating squash commit message...
+πŸ”„ Squashing 2 commits & working tree changes into a single commit (2 files, +2)...
+πŸ’‘ Backup created @ 330ccd6
+πŸ”„ Generating squash commit message...
  fix: update file 1 content
-βœ… Squashed @ b54183b
-πŸ”„ Merging 1 commit to main @ b54183b (no rebase needed)
+βœ… Squashed @ b54183b
+πŸ”„ Merging 1 commit to main @ b54183b (no rebase needed)
  * b54183b fix: update file 1 content
  file1.txt | 1 +
  file2.txt | 1 +
  2 files changed, 2 insertions(+)
-βœ… Merged to main (1 commit, 2 files, +2)
-πŸ”„ Removing feature worktree & branch in background
+βœ… Merged to main (1 commit, 2 files, +2)
+πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap
index 24eeb6ff5..0e7925cab 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap
@@ -24,18 +24,18 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Squashing 1 commit & working tree changes into a single commit (1 file, +1)...
-πŸ’‘ Backup created @ b18c23e
-πŸ”„ Generating squash commit message...
-πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
+πŸ”„ Squashing 1 commit & working tree changes into a single commit (1 file, +1)...
+πŸ’‘ Backup created @ b18c23e
+πŸ”„ Generating squash commit message...
+πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
  Squash commits from main
 
  Combined commits:
  - feat: initial feature
-βœ… Squashed @ d118927
-πŸ”„ Merging 1 commit to main @ d118927 (no rebase needed)
+βœ… Squashed @ d118927
+πŸ”„ Merging 1 commit to main @ d118927 (no rebase needed)
  * d118927 Squash commits from main
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
-πŸ”„ Removing feature worktree & branch in background
+βœ… Merged to main (1 commit, 1 file, +1)
+πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap
index db1ac2de1..5e5bca9b7 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap
@@ -24,14 +24,14 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Squashing 1 commit & working tree changes into a single commit (1 file, +1)...
-πŸ’‘ Backup created @ 967330a
-πŸ”„ Generating squash commit message...
+πŸ”„ Squashing 1 commit & working tree changes into a single commit (1 file, +1)...
+πŸ’‘ Backup created @ 967330a
+πŸ”„ Generating squash commit message...
  fix: improve auth validation logic
-βœ… Squashed @ 1e3993e
-πŸ”„ Merging 1 commit to main @ 1e3993e (no rebase needed)
+βœ… Squashed @ 1e3993e
+πŸ”„ Merging 1 commit to main @ 1e3993e (no rebase needed)
  * 1e3993e fix: improve auth validation logic
  auth.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
-πŸ”„ Removing feature worktree & branch in background
+βœ… Merged to main (1 commit, 1 file, +1)
+πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap b/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap
index d61ed713b..0b33dc47e 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap
@@ -24,15 +24,15 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🟑 Auto-staging 1 untracked file:
+🟑 Auto-staging 1 untracked file:
  dirty.txt
-πŸ”„ Committing changes with default message... (1 file, +1, no squashing needed)
-πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
+πŸ”„ Committing changes with default message... (1 file, +1, no squashing needed)
+πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
  Changes to dirty.txt
-βœ… Committed changes @ c1126ec
-πŸ”„ Merging 1 commit to main @ c1126ec (no rebase needed)
+βœ… Committed changes @ c1126ec
+πŸ”„ Merging 1 commit to main @ c1126ec (no rebase needed)
  * c1126ec Changes to dirty.txt
  dirty.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
-πŸ”„ Removing feature worktree & branch in background
+βœ… Merged to main (1 commit, 1 file, +1)
+πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
index d98ecdafb..50c590a22 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
@@ -24,9 +24,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
-πŸ”„ Removing feature worktree & branch in background
+βœ… Merged to main (1 commit, 1 file, +1)
+πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap
index cf7a0e821..0b14bc7e3 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap
@@ -25,4 +25,4 @@ exit_code: 0
----- stderr -----
βšͺ Already up to date with main (no new commits, no rebase needed)
-πŸ”„ Removing no-commits worktree & branch in background
+πŸ”„ Removing no-commits worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap
index ec2b7409d..075808305 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap
@@ -24,15 +24,15 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🟑 Auto-staging 1 untracked file:
+🟑 Auto-staging 1 untracked file:
  newfile.txt
-πŸ”„ Committing changes with default message... (1 file, +1, no squashing needed)
-πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
+πŸ”„ Committing changes with default message... (1 file, +1, no squashing needed)
+πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
  Changes to newfile.txt
-βœ… Committed changes @ 96ddfbc
-πŸ”„ Merging 1 commit to main @ 96ddfbc (no rebase needed)
+βœ… Committed changes @ 96ddfbc
+πŸ”„ Merging 1 commit to main @ 96ddfbc (no rebase needed)
  * 96ddfbc Changes to newfile.txt
  newfile.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
-πŸ”„ Removing no-commits-dirty worktree & branch in background
+βœ… Merged to main (1 commit, 1 file, +1)
+πŸ”„ Removing no-commits-dirty worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap
index ae831ba48..fa3c73c12 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap
@@ -23,9 +23,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
-πŸ”„ Removing feature worktree & branch in background
+βœ… Merged to main (1 commit, 1 file, +1)
+πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
index b19a84ec3..6a4a0cd71 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
@@ -25,11 +25,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Merging 2 commits to main @ bf212d3 (no commit/squash/rebase needed)
+πŸ”„ Merging 2 commits to main @ bf212d3 (no commit/squash/rebase needed)
  * bf212d3 feat: add file 2
  * 123e46c feat: add file 1
  file1.txt | 1 +
  file2.txt | 1 +
  2 files changed, 2 insertions(+)
-βœ… Merged to main (2 commits, 2 files, +2)
-πŸ”„ Removing feature worktree & branch in background
+βœ… Merged to main (2 commits, 2 files, +2)
+πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap
index 5b2d76943..eafe6edfb 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap
@@ -24,9 +24,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Merging 1 commit to main @ 4af48f0 (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ 4af48f0 (no commit/squash/rebase needed)
  * 4af48f0 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
-πŸ”„ Removing feature worktree & branch in background
+βœ… Merged to main (1 commit, 1 file, +1)
+πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap
index e5609b41b..89dfe5b51 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap
@@ -25,15 +25,15 @@ exit_code: 1
----- stdout -----
----- stderr -----
-πŸ”„ Merging 1 commit to main @ cdb002e (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ cdb002e (no commit/squash/rebase needed)
  * cdb002e Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
-πŸ”„ Removing feature worktree & branch in background
-πŸ”„ Running post-merge:
+βœ… Merged to main (1 commit, 1 file, +1)
+πŸ”„ Removing feature worktree & branch in background
+πŸ”„ Running post-merge:
  exit 1
-🟑 Command failed: exit status: 1
+🟑 Command failed: exit status: 1
❌ post-merge command failed: exit status: 1
πŸ’‘ Use --no-verify to skip post-merge commands
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap
index 0a148cbd9..2ad322280 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap
@@ -25,14 +25,14 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Merging 1 commit to main @ 8609b84 (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ 8609b84 (no commit/squash/rebase needed)
  * 8609b84 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
-πŸ”„ Removing feature worktree & branch in background
-πŸ”„ Running post-merge notify:
+βœ… Merged to main (1 commit, 1 file, +1)
+πŸ”„ Removing feature worktree & branch in background
+πŸ”„ Running post-merge notify:
  echo 'Merge to main complete' > notify.txt
-πŸ”„ Running post-merge deploy:
+πŸ”„ Running post-merge deploy:
  echo 'Deploying branch feature' > deploy.txt

diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_no_verify.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_no_verify.snap
index 96e60ddf2..5f5318c1d 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_no_verify.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_no_verify.snap
@@ -26,9 +26,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Merging 1 commit to main @ 72ff5fc (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ 72ff5fc (no commit/squash/rebase needed)
  * 72ff5fc Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
-πŸ”„ Removing feature worktree & branch in background
+βœ… Merged to main (1 commit, 1 file, +1)
+πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap
index cb89787b1..5db07497e 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap
@@ -25,12 +25,12 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Merging 1 commit to main @ 72ff5fc (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ 72ff5fc (no commit/squash/rebase needed)
  * 72ff5fc Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
-πŸ”„ Removing feature worktree & branch in background
-πŸ”„ Running post-merge:
+βœ… Merged to main (1 commit, 1 file, +1)
+πŸ”„ Removing feature worktree & branch in background
+πŸ”„ Running post-merge:
  echo 'merged feature to main' > post-merge-ran.txt

diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_from_main_branch.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_from_main_branch.snap
index bb35e1137..371b01b8f 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_from_main_branch.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_from_main_branch.snap
@@ -26,6 +26,6 @@ exit_code: 0
----- stderr -----
βšͺ Already up to date with main (no new commits, no rebase needed)
βšͺ Worktree preserved (on main branch)
-πŸ”„ Running post-merge:
+πŸ”„ Running post-merge:
  echo 'post-merge ran from main' > post-merge-ran.txt

diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_with_nothing_to_merge.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_with_nothing_to_merge.snap
index daddee8df..6c91c3560 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_with_nothing_to_merge.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_with_nothing_to_merge.snap
@@ -26,7 +26,7 @@ exit_code: 0
----- stderr -----
βšͺ Already up to date with main (no new commits, no rebase needed)
-πŸ”„ Removing feature worktree & branch in background
-πŸ”„ Running post-merge:
+πŸ”„ Removing feature worktree & branch in background
+πŸ”„ Running post-merge:
  echo 'post-merge ran' > post-merge-ran.txt

diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snap
index 5d3bfc300..eb59221f3 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snap
@@ -25,9 +25,9 @@ exit_code: 1
----- stdout -----
----- stderr -----
-🟑 Auto-staging 1 untracked file:
+🟑 Auto-staging 1 untracked file:
  feature.txt
-πŸ”„ Running pre-commit:
+πŸ”„ Running pre-commit:
  exit 1
❌ pre-commit command failed: exit status: 1
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 d5827cd33..0f783877f 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap
@@ -25,18 +25,18 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🟑 Auto-staging 1 untracked file:
+🟑 Auto-staging 1 untracked file:
  feature.txt
-πŸ”„ Running pre-commit:
+πŸ”„ Running pre-commit:
  echo 'Pre-commit check passed'
Pre-commit check passed
-πŸ”„ Committing changes with default message... (1 file, +1, no squashing needed)
-πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
+πŸ”„ Committing changes with default message... (1 file, +1, no squashing needed)
+πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
  Changes to feature.txt
-βœ… Committed changes @ cdc8f90
-πŸ”„ Merging 1 commit to main @ cdc8f90 (no rebase needed)
+βœ… Committed changes @ cdc8f90
+πŸ”„ Merging 1 commit to main @ cdc8f90 (no rebase needed)
  * cdc8f90 Changes to feature.txt
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
-πŸ”„ Removing feature worktree & branch in background
+βœ… Merged to main (1 commit, 1 file, +1)
+πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap
index 4b9863d01..b61bbfdbd 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap
@@ -25,7 +25,7 @@ exit_code: 1
----- stdout -----
----- stderr -----
-πŸ”„ Running pre-merge:
+πŸ”„ Running pre-merge:
  exit 1
❌ pre-merge command failed: exit status: 1
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap
index 3ef51e65e..caf31508e 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap
@@ -25,15 +25,15 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Running pre-merge format:
+πŸ”„ Running pre-merge format:
  exit 0
-πŸ”„ Running pre-merge lint:
+πŸ”„ Running pre-merge lint:
  exit 0
-πŸ”„ Running pre-merge test:
+πŸ”„ Running pre-merge test:
  exit 0
-πŸ”„ Merging 1 commit to main @ 2cbe2a2 (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ 2cbe2a2 (no commit/squash/rebase needed)
  * 2cbe2a2 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
-πŸ”„ Removing feature worktree & branch in background
+βœ… Merged to main (1 commit, 1 file, +1)
+πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap
index 01f669d1b..eb852d5c3 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap
@@ -25,11 +25,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Running pre-merge:
+πŸ”„ Running pre-merge:
  exit 0
-πŸ”„ Merging 1 commit to main @ 4b1199c (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ 4b1199c (no commit/squash/rebase needed)
  * 4b1199c Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
-πŸ”„ Removing feature worktree & branch in background
+βœ… Merged to main (1 commit, 1 file, +1)
+πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snap
index 51256108a..45b49decc 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snap
@@ -25,7 +25,7 @@ exit_code: 1
----- stdout -----
----- stderr -----
-πŸ”„ Running pre-commit:
+πŸ”„ Running pre-commit:
  exit 1
❌ pre-commit command failed: exit status: 1
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap
index c6c55d430..da61082e3 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap
@@ -25,12 +25,12 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Running pre-commit:
+πŸ”„ Running pre-commit:
  echo 'Pre-commit check passed'
Pre-commit check passed
-πŸ”„ Merging 1 commit to main @ 726717f (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ 726717f (no commit/squash/rebase needed)
  * 726717f Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
-πŸ”„ Removing feature worktree & branch in background
+βœ… Merged to main (1 commit, 1 file, +1)
+πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snap b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snap
index 9e29d33de..0dbfba7ab 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snap
@@ -24,9 +24,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
-πŸ”„ Removing feature-from-develop worktree & branch in background
+βœ… Merged to main (1 commit, 1 file, +1)
+πŸ”„ Removing feature-from-develop worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snap b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snap
index 8b97a8960..3797693e3 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snap
@@ -24,11 +24,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Rebasing onto main...
-βœ… Rebased onto main
-πŸ”„ Merging 1 commit to main @ 76778cc (no commit/squash needed)
+πŸ”„ Rebasing onto main...
+βœ… Rebased onto main
+πŸ”„ Merging 1 commit to main @ 76778cc (no commit/squash needed)
  * 76778cc Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
-πŸ”„ Removing feature-dirty-primary worktree & branch in background
+βœ… Merged to main (1 commit, 1 file, +1)
+πŸ”„ Removing feature-dirty-primary worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_race_condition_before_new_commit.snap b/tests/snapshots/integration__integration_tests__merge__merge_race_condition_before_new_commit.snap
index 9908dac11..d659f4c17 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_race_condition_before_new_commit.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_race_condition_before_new_commit.snap
@@ -25,9 +25,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
+βœ… Merged to main (1 commit, 1 file, +1)
βšͺ Worktree preserved (--no-remove)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap b/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap
index 27c927360..b3b7d7964 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap
@@ -24,7 +24,7 @@ exit_code: 1
----- stdout -----
----- stderr -----
-πŸ”„ Rebasing onto main...
+πŸ”„ Rebasing onto main...
❌ Rebase onto main incomplete
  Rebasing (1/1)
  error: could not apply c661874... Update shared.txt in feature
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_rebase_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_rebase_fast_forward.snap
index 9a55ac6ac..df83fdc39 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_rebase_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_rebase_fast_forward.snap
@@ -24,6 +24,6 @@ exit_code: 0
----- stdout -----
----- stderr -----
-βœ… Fast-forwarded to main
+βœ… Fast-forwarded to main
βšͺ Already up to date with main (no new commits)
-πŸ”„ Removing fast-forward-test worktree & branch in background
+πŸ”„ Removing fast-forward-test worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_rebase_true_rebase.snap b/tests/snapshots/integration__integration_tests__merge__merge_rebase_true_rebase.snap
index 6afe37fa4..2a4f1e12d 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_rebase_true_rebase.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_rebase_true_rebase.snap
@@ -24,11 +24,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Rebasing onto main...
-βœ… Rebased onto main
-πŸ”„ Merging 1 commit to main @ ae48a8e (no commit/squash needed)
+πŸ”„ Rebasing onto main...
+βœ… Rebased onto main
+πŸ”„ Merging 1 commit to main @ ae48a8e (no commit/squash needed)
  * ae48a8e Add feature
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
-πŸ”„ Removing true-rebase-test worktree & branch in background
+βœ… Merged to main (1 commit, 1 file, +1)
+πŸ”„ Removing true-rebase-test worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
index ca35232a7..3125ce605 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
@@ -24,21 +24,21 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Squashing 3 commits into a single commit (3 files, +3)...
-πŸ”„ Generating squash commit message...
-πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
+πŸ”„ Squashing 3 commits into a single commit (3 files, +3)...
+πŸ”„ Generating squash commit message...
+πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
  Squash commits from main
 
  Combined commits:
  - feat: add file 1
  - fix: update logic
  - docs: update readme
-βœ… Squashed @ 27eb169
-πŸ”„ Merging 1 commit to main @ 27eb169 (no rebase needed)
+βœ… Squashed @ 27eb169
+πŸ”„ Merging 1 commit to main @ 27eb169 (no rebase needed)
  * 27eb169 Squash commits from main
  file1.txt | 1 +
  file2.txt | 1 +
  file3.txt | 1 +
  3 files changed, 3 insertions(+)
-βœ… Merged to main (1 commit, 3 files, +3)
-πŸ”„ Removing feature worktree & branch in background
+βœ… Merged to main (1 commit, 3 files, +3)
+πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap
index 1ceb1c099..0b3bd8253 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap
@@ -24,15 +24,15 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Squashing 3 commits into a single commit...
-πŸ”„ Generating squash commit message...
-πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
+πŸ”„ Squashing 3 commits into a single commit...
+πŸ”„ Generating squash commit message...
+πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
  Squash commits from main
 
  Combined commits:
  - Change 1
  - Change 2
  - Revert to initial
-βšͺ No changes after squashing 3 commits
+βšͺ No changes after squashing 3 commits
βšͺ Already up to date with main (no new commits, no rebase needed)
-πŸ”„ Removing feature worktree & branch in background
+πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_error.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_error.snap
index e73fbe31a..42c14d1ad 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_error.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_error.snap
@@ -24,8 +24,8 @@ exit_code: 1
----- stdout -----
----- stderr -----
-πŸ”„ Squashing 2 commits into a single commit (2 files, +2)...
-πŸ”„ Generating squash commit message...
+πŸ”„ Squashing 2 commits into a single commit (2 files, +2)...
+πŸ”„ Generating squash commit message...
❌ Commit generation command failed
  Error: connection refused
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap
index fd899c343..fe52de61a 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap
@@ -25,19 +25,19 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Squashing 2 commits into a single commit (2 files, +2)...
-πŸ”„ Generating squash commit message...
-πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
+πŸ”„ Squashing 2 commits into a single commit (2 files, +2)...
+πŸ”„ Generating squash commit message...
+πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
  Squash commits from main
 
  Combined commits:
  - feat: new feature
  - fix: bug fix
-βœ… Squashed @ 091f0c5
-πŸ”„ Merging 1 commit to main @ 091f0c5 (no rebase needed)
+βœ… Squashed @ 091f0c5
+πŸ”„ Merging 1 commit to main @ 091f0c5 (no rebase needed)
  * 091f0c5 Squash commits from main
  file1.txt | 1 +
  file2.txt | 1 +
  2 files changed, 2 insertions(+)
-βœ… Merged to main (1 commit, 2 files, +2)
-πŸ”„ Removing feature worktree & branch in background
+βœ… Merged to main (1 commit, 2 files, +2)
+πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap
index 6dcec2b8f..318ea5d87 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap
@@ -24,9 +24,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Merging 1 commit to main @ 525a81f (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ 525a81f (no commit/squash/rebase needed)
  * 525a81f feat: single commit
  file1.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
-πŸ”„ Removing feature worktree & branch in background
+βœ… Merged to main (1 commit, 1 file, +1)
+πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap
index b377bcd7b..e96874add 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap
@@ -24,13 +24,13 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Squashing 2 commits into a single commit (1 file, +1)...
-πŸ”„ Generating squash commit message...
+πŸ”„ Squashing 2 commits into a single commit (1 file, +1)...
+πŸ”„ Generating squash commit message...
  feat: implement user authentication system
-βœ… Squashed @ d42412f
-πŸ”„ Merging 1 commit to main @ d42412f (no rebase needed)
+βœ… Squashed @ d42412f
+πŸ”„ Merging 1 commit to main @ d42412f (no rebase needed)
  * d42412f feat: implement user authentication system
  auth.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
-πŸ”„ Removing feature worktree & branch in background
+βœ… Merged to main (1 commit, 1 file, +1)
+πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snap
index d0c267dfd..d81ba6a59 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snap
@@ -26,20 +26,20 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Squashing 2 commits & working tree changes into a single commit (2 files, +2)...
-πŸ’‘ Backup created @ 330ccd6
-πŸ”„ Generating squash commit message...
-πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
+πŸ”„ Squashing 2 commits & working tree changes into a single commit (2 files, +2)...
+πŸ’‘ Backup created @ 330ccd6
+πŸ”„ Generating squash commit message...
+πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
  Squash commits from main
 
  Combined commits:
  - feat: add file 1
  - feat: add file 2
-βœ… Squashed @ d34e4c3
-πŸ”„ Merging 1 commit to main @ d34e4c3 (no rebase needed)
+βœ… Squashed @ d34e4c3
+πŸ”„ Merging 1 commit to main @ d34e4c3 (no rebase needed)
  * d34e4c3 Squash commits from main
  file1.txt | 1 +
  file2.txt | 1 +
  2 files changed, 2 insertions(+)
-βœ… Merged to main (1 commit, 2 files, +2)
-πŸ”„ Removing feature worktree & branch in background
+βœ… Merged to main (1 commit, 2 files, +2)
+πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
index ae831ba48..fa3c73c12 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
@@ -23,9 +23,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
-πŸ”„ Removing feature worktree & branch in background
+βœ… Merged to main (1 commit, 1 file, +1)
+πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_to_non_default_target.snap b/tests/snapshots/integration__integration_tests__merge__merge_to_non_default_target.snap
index ba3c4670f..b95ed7434 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_to_non_default_target.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_non_default_target.snap
@@ -24,11 +24,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Rebasing onto staging...
-βœ… Rebased onto staging
-πŸ”„ Merging 1 commit to staging @ 8280b9e (no commit/squash needed)
+πŸ”„ Rebasing onto staging...
+βœ… Rebased onto staging
+πŸ”„ Merging 1 commit to staging @ 8280b9e (no commit/squash needed)
  * 8280b9e Add feature for staging
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to staging (1 commit, 1 file, +1)
-πŸ”„ Removing feature-for-staging worktree & branch in background
+βœ… Merged to staging (1 commit, 1 file, +1)
+πŸ”„ Removing feature-for-staging worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_when_primary_not_on_default_but_default_has_worktree.snap b/tests/snapshots/integration__integration_tests__merge__merge_when_primary_not_on_default_but_default_has_worktree.snap
index d98ecdafb..50c590a22 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_when_primary_not_on_default_but_default_has_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_when_primary_not_on_default_but_default_has_worktree.snap
@@ -24,9 +24,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
-πŸ”„ Removing feature worktree & branch in background
+βœ… Merged to main (1 commit, 1 file, +1)
+πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap
index 0c21f9b8a..f0b8f6d19 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap
@@ -24,9 +24,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
-πŸ”„ Removing feature worktree & branch in background
+βœ… Merged to main (1 commit, 1 file, +1)
+πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap
index 9908dac11..d659f4c17 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap
@@ -25,9 +25,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ 6551244 (no commit/squash/rebase needed)
  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Merged to main (1 commit, 1 file, +1)
+βœ… Merged to main (1 commit, 1 file, +1)
βšͺ Worktree preserved (--no-remove)
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap
index 85585f509..f4967b20e 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap
@@ -26,23 +26,23 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🟑 Auto-staging 2 untracked files:
+🟑 Auto-staging 2 untracked files:
  untracked1.txt
  untracked2.txt
-πŸ”„ Squashing 1 commit & working tree changes into a single commit (3 files, +3)...
-πŸ’‘ Backup created @ 4967998
-πŸ”„ Generating squash commit message...
-πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
+πŸ”„ Squashing 1 commit & working tree changes into a single commit (3 files, +3)...
+πŸ’‘ Backup created @ 4967998
+πŸ”„ Generating squash commit message...
+πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
  Squash commits from main
 
  Combined commits:
  - feat: add file 1
-βœ… Squashed @ fbfc726
-πŸ”„ Merging 1 commit to main @ fbfc726 (no rebase needed)
+βœ… Squashed @ fbfc726
+πŸ”„ Merging 1 commit to main @ fbfc726 (no rebase needed)
  * fbfc726 Squash commits from main
  file1.txt | 1 +
  untracked1.txt | 1 +
  untracked2.txt | 1 +
  3 files changed, 3 insertions(+)
-βœ… Merged to main (1 commit, 3 files, +3)
-πŸ”„ Removing feature worktree & branch in background
+βœ… Merged to main (1 commit, 3 files, +3)
+πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
index cb4a85d68..1746604e4 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
@@ -26,8 +26,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Squashing 3 commits into a single commit (3 files, +33)...
-πŸ”„ Generating squash commit message...
+πŸ”„ Squashing 3 commits into a single commit (3 files, +33)...
+πŸ”„ Generating squash commit message...
  feat(auth): Implement JWT authentication system
 
  Add comprehensive JWT token handling including validation, refresh logic,
@@ -37,8 +37,8 @@ exit_code: 0
  - Implement token refresh mechanism with expiry handling
  - Add JWT encoding/decoding with signature verification
  - Create test suite covering all authentication flows
-βœ… Squashed @ 95c3316
-πŸ”„ Running pre-merge test:
+βœ… Squashed @ 95c3316
+πŸ”„ Running pre-merge test:
  cargo test
 Finished test [unoptimized + debuginfo] target(s) in 0.12s
Running unittests src/lib.rs (target/debug/deps/worktrunk-abc123)
@@ -50,19 +50,19 @@ test auth::tests::test_token_refresh ... ok
test auth::tests::test_token_validation ... ok
test result: ok. 18 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.08s
-πŸ”„ Running pre-merge lint:
+πŸ”„ Running pre-merge lint:
  cargo clippy
 Checking worktrunk v0.1.0
Finished dev [unoptimized + debuginfo] target(s) in 1.23s
-πŸ”„ Merging 1 commit to main @ 95c3316 (no rebase needed)
+πŸ”„ Merging 1 commit to main @ 95c3316 (no rebase needed)
  * 95c3316 feat(auth): Implement JWT authentication system
  auth.rs | 8 ++++++++
  auth_test.rs | 17 +++++++++++++++++
  jwt.rs | 8 ++++++++
  3 files changed, 33 insertions(+)
-βœ… Merged to main (1 commit, 3 files, +33)
-πŸ”„ Removing feature-auth worktree & branch in background
-πŸ”„ Running post-merge install:
+βœ… Merged to main (1 commit, 3 files, +33)
+πŸ”„ Removing feature-auth worktree & branch in background
+πŸ”„ Running post-merge install:
  cargo install --path .
 Installing worktrunk v0.1.0
Compiling worktrunk v0.1.0
diff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_post_create.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_post_create.snap
index 1d3bebb24..300f0e0bf 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_post_create.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_post_create.snap
@@ -27,12 +27,12 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Running post-create install:
+πŸ”„ Running post-create install:
  uv sync

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

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

All checks passed!
-πŸ”„ Merging 1 commit to main @ 69200cc (no rebase needed)
+πŸ”„ Merging 1 commit to main @ 69200cc (no rebase needed)
  * 69200cc feat(api): Add user authentication endpoints
  api/auth.py | 31 +++++++++++++++++++++++++++++++
  tests/test_auth.py | 14 ++++++++++++++
  2 files changed, 45 insertions(+)
-βœ… Merged to main (1 commit, 2 files, +45)
-πŸ”„ Removing feature-auth worktree & branch in background
+βœ… Merged to main (1 commit, 2 files, +45)
+πŸ”„ Removing feature-auth worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap
index be5a08902..73ab76258 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap
@@ -24,9 +24,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Merging 1 commit to main @ d29e0fd (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ d29e0fd (no commit/squash/rebase needed)
  * d29e0fd Implement JWT validation
  auth.rs | 13 +++++++++++++
  1 file changed, 13 insertions(+)
-βœ… Merged to main (1 commit, 1 file, +13)
-πŸ”„ Removing fix-auth worktree & branch in background
+βœ… Merged to main (1 commit, 1 file, +13)
+πŸ”„ Removing fix-auth worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_simple_switch.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_simple_switch.snap
index b2f06dafc..d04231d9c 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_simple_switch.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_simple_switch.snap
@@ -25,5 +25,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-βœ… Created new worktree for fix-auth from main at [REPO].fix-auth
-πŸ’‘ Run `wt config shell install` to enable automatic cd
+βœ… Created new worktree for fix-auth from main at [REPO].fix-auth
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__merge__step_commit_both_flags.snap b/tests/snapshots/integration__integration_tests__merge__step_commit_both_flags.snap
index eeb58674a..cff76e6c8 100644
--- a/tests/snapshots/integration__integration_tests__merge__step_commit_both_flags.snap
+++ b/tests/snapshots/integration__integration_tests__merge__step_commit_both_flags.snap
@@ -28,8 +28,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ’‘ Skipping pre-commit hook (--no-verify)
-πŸ”„ Committing tracked changes with default message... (1 file, +1, -1)
-πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
+πŸ’‘ Skipping pre-commit hook (--no-verify)
+πŸ”„ Committing tracked changes with default message... (1 file, +1, -1)
+πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
  Changes to tracked.txt
-βœ… Committed changes @ a5890cb
+βœ… 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 e09dea863..c5a9add2b 100644
--- a/tests/snapshots/integration__integration_tests__merge__step_commit_no_verify.snap
+++ b/tests/snapshots/integration__integration_tests__merge__step_commit_no_verify.snap
@@ -27,11 +27,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ’‘ Skipping pre-commit hook (--no-verify)
-🟑 Auto-staging 2 untracked files:
+πŸ’‘ Skipping pre-commit hook (--no-verify)
+🟑 Auto-staging 2 untracked files:
  .config/
  file1.txt
-πŸ”„ Committing changes with default message... (2 files, +2)
-πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
+πŸ”„ Committing changes with default message... (2 files, +2)
+πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
  Changes to wt.toml & file1.txt
-βœ… Committed changes @ 3dbcd5d
+βœ… 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 05f247264..a350373c5 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,8 +27,8 @@ exit_code: 1
----- stdout -----
----- stderr -----
-πŸ”„ Committing changes with default message...
-πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
+πŸ”„ Committing changes with default message...
+πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
  WIP: Changes
❌ Failed to commit
  On branch main
diff --git a/tests/snapshots/integration__integration_tests__merge__step_commit_stage_tracked.snap b/tests/snapshots/integration__integration_tests__merge__step_commit_stage_tracked.snap
index 920ba75d0..a9ca2ba81 100644
--- a/tests/snapshots/integration__integration_tests__merge__step_commit_stage_tracked.snap
+++ b/tests/snapshots/integration__integration_tests__merge__step_commit_stage_tracked.snap
@@ -27,7 +27,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Committing tracked changes with default message... (1 file, +1, -1)
-πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
+πŸ”„ Committing tracked changes with default message... (1 file, +1, -1)
+πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
  Changes to tracked.txt
-βœ… Committed changes @ 7d441f0
+βœ… 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 775f131c5..8452ff0e2 100644
--- a/tests/snapshots/integration__integration_tests__merge__step_squash_both_flags.snap
+++ b/tests/snapshots/integration__integration_tests__merge__step_squash_both_flags.snap
@@ -28,14 +28,14 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ’‘ Skipping pre-commit hook (--no-verify)
-πŸ”„ Squashing 2 commits & tracked changes into a single commit (3 files, +3)...
-πŸ’‘ Backup created @ 31e06e8
-πŸ”„ Generating squash commit message...
-πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
+πŸ’‘ Skipping pre-commit hook (--no-verify)
+πŸ”„ Squashing 2 commits & tracked changes into a single commit (3 files, +3)...
+πŸ’‘ Backup created @ 31e06e8
+πŸ”„ Generating squash commit message...
+πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
  Squash commits from main
 
  Combined commits:
  - feat: add file 1
  - feat: add file 2
-βœ… Squashed @ 9f7a3e2
+βœ… Squashed @ 9f7a3e2
diff --git a/tests/snapshots/integration__integration_tests__merge__step_squash_no_verify.snap b/tests/snapshots/integration__integration_tests__merge__step_squash_no_verify.snap
index 4203cff43..d51bc7d85 100644
--- a/tests/snapshots/integration__integration_tests__merge__step_squash_no_verify.snap
+++ b/tests/snapshots/integration__integration_tests__merge__step_squash_no_verify.snap
@@ -27,13 +27,13 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ’‘ Skipping pre-commit hook (--no-verify)
-πŸ”„ Squashing 2 commits into a single commit (3 files, +3)...
-πŸ”„ Generating squash commit message...
-πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
+πŸ’‘ Skipping pre-commit hook (--no-verify)
+πŸ”„ Squashing 2 commits into a single commit (3 files, +3)...
+πŸ”„ Generating squash commit message...
+πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
  Squash commits from main
 
  Combined commits:
  - feat: add file 1
  - feat: add file 2
-βœ… Squashed @ 588aa53
+βœ… Squashed @ 588aa53
diff --git a/tests/snapshots/integration__integration_tests__merge__step_squash_stage_tracked.snap b/tests/snapshots/integration__integration_tests__merge__step_squash_stage_tracked.snap
index 9b25e4a19..ff3596848 100644
--- a/tests/snapshots/integration__integration_tests__merge__step_squash_stage_tracked.snap
+++ b/tests/snapshots/integration__integration_tests__merge__step_squash_stage_tracked.snap
@@ -27,13 +27,13 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Squashing 2 commits & tracked changes into a single commit (2 files, +2)...
-πŸ’‘ Backup created @ ba1424b
-πŸ”„ Generating squash commit message...
-πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
+πŸ”„ Squashing 2 commits & tracked changes into a single commit (2 files, +2)...
+πŸ’‘ Backup created @ ba1424b
+πŸ”„ Generating squash commit message...
+πŸ’‘ Using fallback commit message. Run 'wt config --help' for LLM setup guide
  Squash commits from main
 
  Combined commits:
  - feat: add file 1
  - feat: add file 2
-βœ… Squashed @ 6c0b38b
+βœ… Squashed @ 6c0b38b
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snap b/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snap
index 94602687b..068d05fa2 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snap
@@ -26,9 +26,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Running post-create:
+πŸ”„ Running post-create:
  echo 'Setup done' > setup.txt
-βœ… Created new worktree for feature from main at [REPO].feature
-πŸ’‘ Run `wt config shell install` to enable automatic cd
-πŸ”„ Running post-start server:
+βœ… Created new worktree for feature from main at [REPO].feature
+πŸ’‘ Run `wt config shell install` to enable automatic cd
+πŸ”„ Running post-start server:
  sleep 0.05 && echo 'Server running' > server.txt
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap b/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap
index 2dd243d7a..9c9a68b04 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap
@@ -28,8 +28,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
-βœ… Created new worktree for feature from main at [REPO].feature
-πŸ”„ Running post-start:
+βœ… Created new worktree for feature from main at [REPO].feature
+πŸ”„ Running post-start:
  echo 'Background task' > background.txt
-πŸ”„ Executing (--execute):
+πŸ”„ Executing (--execute):
  echo 'Execute flag' > execute.txt
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snap
index 4d75b6633..9ec9173e7 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snap
@@ -26,8 +26,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Running post-create:
+πŸ”„ Running post-create:
  exit 1
-🟑 Command failed: exit status: 1
-βœ… Created new worktree for feature from main at [REPO].feature
-πŸ’‘ Run `wt config shell install` to enable automatic cd
+🟑 Command failed: exit status: 1
+βœ… Created new worktree for feature from main at [REPO].feature
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiline_control_structure.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiline_control_structure.snap
index 163f28bb3..62ec83cee 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiline_control_structure.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiline_control_structure.snap
@@ -26,11 +26,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Running post-create:
+πŸ”„ Running post-create:
  if [ ! -f test.txt ]; then
  echo 'File does not exist' > result.txt
  else
  echo 'File exists' > result.txt
  fi
-βœ… Created new worktree for feature from main at [REPO].feature
-πŸ’‘ Run `wt config shell install` to enable automatic cd
+βœ… Created new worktree for feature from main at [REPO].feature
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiple_commands_array.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiple_commands_array.snap
index 2a023d3d7..69cda577e 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiple_commands_array.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiple_commands_array.snap
@@ -26,11 +26,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Running post-create:
+πŸ”„ Running post-create:
  echo 'First'
First
-πŸ”„ Running post-create:
+πŸ”„ Running post-create:
  echo 'Second'
Second
-βœ… Created new worktree for feature from main at [REPO].feature
-πŸ’‘ Run `wt config shell install` to enable automatic cd
+βœ… Created new worktree for feature from main at [REPO].feature
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_named_commands.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_named_commands.snap
index bd56526f7..b3f469b02 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_named_commands.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_named_commands.snap
@@ -26,11 +26,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Running post-create install:
+πŸ”„ Running post-create install:
  echo 'Installing deps'
Installing deps
-πŸ”„ Running post-create setup:
+πŸ”„ Running post-create setup:
  echo 'Running setup'
Running setup
-βœ… Created new worktree for feature from main at [REPO].feature
-πŸ’‘ Run `wt config shell install` to enable automatic cd
+βœ… Created new worktree for feature from main at [REPO].feature
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_no_config.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_no_config.snap
index 1f41f03dc..68c7ebddd 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_no_config.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_no_config.snap
@@ -26,5 +26,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-βœ… Created new worktree for feature from main at [REPO].feature
-πŸ’‘ Run `wt config shell install` to enable automatic cd
+βœ… Created new worktree for feature from main at [REPO].feature
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_single_command.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_single_command.snap
index 0689fa3d5..d8c496cb6 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_single_command.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_single_command.snap
@@ -26,8 +26,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Running post-create:
+πŸ”„ Running post-create:
  echo 'Setup complete'
Setup complete
-βœ… Created new worktree for feature from main at [REPO].feature
-πŸ’‘ Run `wt config shell install` to enable automatic cd
+βœ… Created new worktree for feature from main at [REPO].feature
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snap
index ab0800a3f..053d81e52 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snap
@@ -26,13 +26,13 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Running post-create:
+πŸ”„ Running post-create:
  echo 'Repo: repo' > info.txt
-πŸ”„ Running post-create:
+πŸ”„ Running post-create:
  echo 'Branch: feature-test' >> info.txt
-πŸ”„ Running post-create:
+πŸ”„ Running post-create:
  echo 'Worktree: [REPO].feature-test' >> info.txt
-πŸ”„ Running post-create:
+πŸ”„ Running post-create:
  echo 'Root: [REPO]' >> info.txt
-βœ… Created new worktree for feature/test from main at [REPO].feature-test
-πŸ’‘ Run `wt config shell install` to enable automatic cd
+βœ… Created new worktree for feature/test from main at [REPO].feature-test
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_complex_shell.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_complex_shell.snap
index ba985c73e..e92d93179 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_complex_shell.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_complex_shell.snap
@@ -26,9 +26,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
-βœ… Created new worktree for feature from main at [REPO].feature
-πŸ’‘ Run `wt config shell install` to enable automatic cd
-πŸ”„ Running post-start:
+βœ… Created new worktree for feature from main at [REPO].feature
+πŸ’‘ Run `wt config shell install` to enable automatic cd
+πŸ”„ Running post-start:
  echo 'line1
  line2
  line3' | grep line2 > filtered.txt
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_create_with_command.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_create_with_command.snap
index a73c4691e..b223fc4f8 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_create_with_command.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_create_with_command.snap
@@ -26,7 +26,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-βœ… Created new worktree for feature from main at [REPO].feature
-πŸ’‘ Run `wt config shell install` to enable automatic cd
-πŸ”„ Running post-start:
+βœ… Created new worktree for feature from main at [REPO].feature
+πŸ’‘ Run `wt config shell install` to enable automatic cd
+πŸ”„ Running post-start:
  echo 'POST-START-RAN' > post_start_marker.txt
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_invalid_command.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_invalid_command.snap
index fd6da2eb7..c2f4e57e0 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_invalid_command.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_invalid_command.snap
@@ -26,7 +26,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-βœ… Created new worktree for feature from main at [REPO].feature
-πŸ’‘ Run `wt config shell install` to enable automatic cd
-πŸ”„ Running post-start:
+βœ… Created new worktree for feature from main at [REPO].feature
+πŸ’‘ Run `wt config shell install` to enable automatic cd
+πŸ”„ Running post-start:
  echo 'unclosed quote
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_log_captures_output.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_log_captures_output.snap
index a7c957528..238679a60 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_log_captures_output.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_log_captures_output.snap
@@ -26,7 +26,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-βœ… Created new worktree for feature from main at [REPO].feature
-πŸ’‘ Run `wt config shell install` to enable automatic cd
-πŸ”„ Running post-start:
+βœ… Created new worktree for feature from main at [REPO].feature
+πŸ’‘ Run `wt config shell install` to enable automatic cd
+πŸ”„ Running post-start:
  echo 'stdout output' && echo 'stderr output' >&2
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiline_with_newlines.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiline_with_newlines.snap
index 7d032f3a7..be773fb24 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiline_with_newlines.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiline_with_newlines.snap
@@ -26,9 +26,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
-βœ… Created new worktree for feature from main at [REPO].feature
-πŸ’‘ Run `wt config shell install` to enable automatic cd
-πŸ”„ Running post-start:
+βœ… Created new worktree for feature from main at [REPO].feature
+πŸ’‘ Run `wt config shell install` to enable automatic cd
+πŸ”„ Running post-start:
  echo 'first line' > multiline.txt
  echo 'second line' >> multiline.txt
  echo 'third line' >> multiline.txt
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_background.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_background.snap
index 02d0681d7..4a2a9da6d 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_background.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_background.snap
@@ -26,9 +26,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
-βœ… Created new worktree for feature from main at [REPO].feature
-πŸ’‘ Run `wt config shell install` to enable automatic cd
-πŸ”„ Running post-start task1:
+βœ… Created new worktree for feature from main at [REPO].feature
+πŸ’‘ Run `wt config shell install` to enable automatic cd
+πŸ”„ Running post-start task1:
  echo 'Task 1 running' > task1.txt
-πŸ”„ Running post-start task2:
+πŸ”„ Running post-start task2:
  echo 'Task 2 running' > task2.txt
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_separate_logs.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_separate_logs.snap
index c92c7308a..151256189 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_separate_logs.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_separate_logs.snap
@@ -26,11 +26,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
-βœ… Created new worktree for feature from main at [REPO].feature
-πŸ’‘ Run `wt config shell install` to enable automatic cd
-πŸ”„ Running post-start task1:
+βœ… Created new worktree for feature from main at [REPO].feature
+πŸ’‘ Run `wt config shell install` to enable automatic cd
+πŸ”„ Running post-start task1:
  echo 'TASK1_OUTPUT'
-πŸ”„ Running post-start task2:
+πŸ”„ Running post-start task2:
  echo 'TASK2_OUTPUT'
-πŸ”„ Running post-start task3:
+πŸ”„ Running post-start task3:
  echo 'TASK3_OUTPUT'
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_single_background.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_single_background.snap
index fca1260e0..3f1dd1189 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_single_background.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_single_background.snap
@@ -26,7 +26,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-βœ… Created new worktree for feature from main at [REPO].feature
-πŸ’‘ Run `wt config shell install` to enable automatic cd
-πŸ”„ Running post-start:
+βœ… Created new worktree for feature from main at [REPO].feature
+πŸ’‘ Run `wt config shell install` to enable automatic cd
+πŸ”„ Running post-start:
  sleep 0.1 && echo 'Background task done' > background.txt
diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_skip_existing.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_skip_existing.snap
index 10325d739..785903b3d 100644
--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_skip_existing.snap
+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_skip_existing.snap
@@ -25,5 +25,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🟑 Worktree for feature at [REPO].feature; cannot cd (no shell integration)
-πŸ’‘ Run `wt config shell install` to enable automatic cd
+🟑 Worktree for feature at [REPO].feature; cannot cd (no shell integration)
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__push__push_dirty_target_autostash.snap b/tests/snapshots/integration__integration_tests__push__push_dirty_target_autostash.snap
index 0a83ad3cf..b6368135f 100644
--- a/tests/snapshots/integration__integration_tests__push__push_dirty_target_autostash.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_dirty_target_autostash.snap
@@ -25,10 +25,10 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Stashing changes in [REPO]...
-πŸ”„ Pushing 1 commit to main @ 6551244
+πŸ”„ Stashing changes in [REPO]...
+πŸ”„ Pushing 1 commit to main @ 6551244
  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-πŸ”„ Restoring stashed changes in [REPO]...
-βœ… Pushed to main (1 commit, 1 file, +1)
+πŸ”„ Restoring stashed changes in [REPO]...
+βœ… Pushed to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap
index 7b28df25d..38947b3f3 100644
--- a/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap
@@ -25,8 +25,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Pushing 1 commit to main @ c2e2bcc
+πŸ”„ Pushing 1 commit to main @ c2e2bcc
  * c2e2bcc Add test file
  test.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Pushed to main (1 commit, 1 file, +1)
+βœ… Pushed to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__push__push_no_remote.snap b/tests/snapshots/integration__integration_tests__push__push_no_remote.snap
index 6e30f4e38..2624df73d 100644
--- a/tests/snapshots/integration__integration_tests__push__push_no_remote.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_no_remote.snap
@@ -24,8 +24,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Pushing 1 commit to main @ 6551244
+πŸ”„ Pushing 1 commit to main @ 6551244
  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Pushed to main (1 commit, 1 file, +1)
+βœ… Pushed to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap
index 3e538b44b..1a394203c 100644
--- a/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap
@@ -25,8 +25,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Pushing 1 commit to main @ 4af48f0
+πŸ”„ Pushing 1 commit to main @ 4af48f0
  * 4af48f0 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Pushed to main (1 commit, 1 file, +1)
+βœ… Pushed to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__push__push_to_default.snap b/tests/snapshots/integration__integration_tests__push__push_to_default.snap
index 6e30f4e38..2624df73d 100644
--- a/tests/snapshots/integration__integration_tests__push__push_to_default.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_to_default.snap
@@ -24,8 +24,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Pushing 1 commit to main @ 6551244
+πŸ”„ Pushing 1 commit to main @ 6551244
  * 6551244 Add feature file
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
-βœ… Pushed to main (1 commit, 1 file, +1)
+βœ… Pushed to main (1 commit, 1 file, +1)
diff --git a/tests/snapshots/integration__integration_tests__push__push_with_merge_commits_allowed.snap b/tests/snapshots/integration__integration_tests__push__push_with_merge_commits_allowed.snap
index 8a8534efd..787e41cde 100644
--- a/tests/snapshots/integration__integration_tests__push__push_with_merge_commits_allowed.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_with_merge_commits_allowed.snap
@@ -26,7 +26,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Pushing 3 commits to main @ 13bed7b (merge commits allowed)
+πŸ”„ Pushing 3 commits to main @ 13bed7b (merge commits allowed)
  * 13bed7b Merge temp
  |/
  | * 1f38fab Commit 2
@@ -35,4 +35,4 @@ exit_code: 0
  file1.txt | 1 +
  file2.txt | 1 +
  2 files changed, 2 insertions(+)
-βœ… Pushed to main (3 commits, 2 files, +2)
+βœ… Pushed to main (3 commits, 2 files, +2)
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_already_on_default.snap b/tests/snapshots/integration__integration_tests__remove__remove_already_on_default.snap
index ea9d15404..868b46fcc 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_already_on_default.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_already_on_default.snap
@@ -23,4 +23,4 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Removing main worktree & branch in background
+πŸ”„ Removing main worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_branch_matching_tree_content.snap b/tests/snapshots/integration__integration_tests__remove__remove_branch_matching_tree_content.snap
index dcd56baa3..736b79373 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_branch_matching_tree_content.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_branch_matching_tree_content.snap
@@ -25,4 +25,4 @@ exit_code: 0
----- stderr -----
βšͺ No worktree found for branch feature-squashed
-βœ… Removed branch feature-squashed
+βœ… Removed branch feature-squashed
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_branch_not_fully_merged.snap b/tests/snapshots/integration__integration_tests__remove__remove_branch_not_fully_merged.snap
index c68c9ff65..e4311567c 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_branch_not_fully_merged.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_branch_not_fully_merged.snap
@@ -24,4 +24,4 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Removing feature-unmerged worktree in background; retaining unmerged branch
+πŸ”„ Removing feature-unmerged worktree in background; retaining unmerged branch
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_branch_only_force_delete.snap b/tests/snapshots/integration__integration_tests__remove__remove_branch_only_force_delete.snap
index 4a8283a07..ee8650f9d 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_branch_only_force_delete.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_branch_only_force_delete.snap
@@ -26,4 +26,4 @@ exit_code: 0
----- stderr -----
βšͺ No worktree found for branch feature-force
-βœ… Removed branch feature-force (--force-delete)
+βœ… Removed branch feature-force (--force-delete)
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_branch_only_merged.snap b/tests/snapshots/integration__integration_tests__remove__remove_branch_only_merged.snap
index d42cd9080..4cad342cb 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_branch_only_merged.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_branch_only_merged.snap
@@ -25,4 +25,4 @@ exit_code: 0
----- stderr -----
βšͺ No worktree found for branch feature-merged
-βœ… Removed branch feature-merged
+βœ… Removed branch feature-merged
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_branch_only_unmerged.snap b/tests/snapshots/integration__integration_tests__remove__remove_branch_only_unmerged.snap
index 7e95bdabf..13430d509 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_branch_only_unmerged.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_branch_only_unmerged.snap
@@ -25,5 +25,5 @@ exit_code: 0
----- stderr -----
βšͺ No worktree found for branch feature-unmerged
-🟑 Could not delete branch feature-unmerged
+🟑 Could not delete branch feature-unmerged
  error: the branch 'feature-unmerged' is not fully merged
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_main.snap b/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_main.snap
index 68b1d290b..4cd5b7815 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_main.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_main.snap
@@ -24,4 +24,4 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Removing feature-a worktree & branch in background
+πŸ”„ Removing feature-a worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_other_worktree.snap b/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_other_worktree.snap
index 817ee54e6..0cfdc5b2f 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_other_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_other_worktree.snap
@@ -24,4 +24,4 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Removing feature-b worktree & branch in background
+πŸ”„ Removing feature-b worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_current_by_name.snap b/tests/snapshots/integration__integration_tests__remove__remove_current_by_name.snap
index 9bd68b5c0..2afcdf6f0 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_current_by_name.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_current_by_name.snap
@@ -24,4 +24,4 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Removing feature-current worktree & branch in background
+πŸ”„ Removing feature-current worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_foreground.snap b/tests/snapshots/integration__integration_tests__remove__remove_foreground.snap
index 4d26d627e..f219c6630 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_foreground.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_foreground.snap
@@ -25,5 +25,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Removing worktree for feature-fg...
-βœ… Removed worktree & branch for feature-fg
+πŸ”„ Removing worktree for feature-fg...
+βœ… Removed worktree & branch for feature-fg
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap b/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap
index 9709f7f06..093f19c3c 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap
@@ -23,4 +23,4 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Removing feature-wt worktree & branch in background
+πŸ”„ Removing feature-wt worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap b/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap
index 21c645e7b..2af863d94 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap
@@ -25,4 +25,4 @@ exit_code: 0
cd '[REPO]'
----- stderr -----
-πŸ”„ Removing feature-internal worktree & branch in background
+πŸ”„ Removing feature-internal worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_multiple_including_current.snap b/tests/snapshots/integration__integration_tests__remove__remove_multiple_including_current.snap
index 42f074f07..b5955f9bc 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_multiple_including_current.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_multiple_including_current.snap
@@ -26,6 +26,6 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Removing feature-b worktree & branch in background
-πŸ”„ Removing feature-c worktree & branch in background
-πŸ”„ Removing feature-a worktree & branch in background
+πŸ”„ Removing feature-b worktree & branch in background
+πŸ”„ Removing feature-c worktree & branch in background
+πŸ”„ Removing feature-a worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap
index 5283e05ad..da5b852ad 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap
@@ -26,6 +26,6 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Removing feature-a worktree & branch in background
-πŸ”„ Removing feature-b worktree & branch in background
-πŸ”„ Removing feature-c worktree & branch in background
+πŸ”„ Removing feature-a worktree & branch in background
+πŸ”„ Removing feature-b worktree & branch in background
+πŸ”„ Removing feature-c worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_no_delete_branch.snap b/tests/snapshots/integration__integration_tests__remove__remove_no_delete_branch.snap
index 65c760d8a..f4b6d5df4 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_no_delete_branch.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_no_delete_branch.snap
@@ -25,4 +25,4 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Removing feature-keep worktree in background; retaining branch (--no-delete-branch)
+πŸ”„ Removing feature-keep worktree in background; retaining branch (--no-delete-branch)
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_switch_to_default.snap b/tests/snapshots/integration__integration_tests__remove__remove_switch_to_default.snap
index e2a85b762..4069c36ed 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_switch_to_default.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_switch_to_default.snap
@@ -23,4 +23,4 @@ exit_code: 0
----- stdout -----
----- stderr -----
-πŸ”„ Removing feature worktree & branch in background
+πŸ”„ Removing feature worktree & branch in background
diff --git a/tests/snapshots/integration__integration_tests__switch__create_with_base_main.snap b/tests/snapshots/integration__integration_tests__switch__create_with_base_main.snap
index 622745952..28d72e443 100644
--- a/tests/snapshots/integration__integration_tests__switch__create_with_base_main.snap
+++ b/tests/snapshots/integration__integration_tests__switch__create_with_base_main.snap
@@ -28,5 +28,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-βœ… Created new worktree for new-feature from main at [REPO].new-feature
-πŸ’‘ Run `wt config shell install` to enable automatic cd
+βœ… Created new worktree for new-feature from main at [REPO].new-feature
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_base_without_create.snap b/tests/snapshots/integration__integration_tests__switch__switch_base_without_create.snap
index cf88b6150..d06dd288c 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_base_without_create.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_base_without_create.snap
@@ -27,5 +27,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🟑 --base flag is only used with --create, ignoring
+🟑 --base flag is only used with --create, ignoring
βšͺ Already on worktree for main at [REPO]
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_create_new.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_new.snap
index 430086b0c..7eb0fe546 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_create_new.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_create_new.snap
@@ -26,5 +26,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-βœ… Created new worktree for feature-x from main at [REPO].feature-x
-πŸ’‘ Run `wt config shell install` to enable automatic cd
+βœ… Created new worktree for feature-x from main at [REPO].feature-x
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_create_no_remote.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_no_remote.snap
index 42bac9371..b236eaad8 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_create_no_remote.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_create_no_remote.snap
@@ -26,5 +26,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-βœ… Created new worktree for feature from main at [REPO].feature
-πŸ’‘ Run `wt config shell install` to enable automatic cd
+βœ… Created new worktree for feature from main at [REPO].feature
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_create_remote_only.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_remote_only.snap
index 9ef1b3bb7..dab704d13 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_create_remote_only.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_create_remote_only.snap
@@ -26,7 +26,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🟑 Branch remote-feature exists on remote (origin/remote-feature); creating new branch from base instead
-πŸ’‘ Use 'wt switch remote-feature' (without --create) to switch to the remote branch
-βœ… Created new worktree for remote-feature from main at [REPO].remote-feature
-πŸ’‘ Run `wt config shell install` to enable automatic cd
+🟑 Branch remote-feature exists on remote (origin/remote-feature); creating new branch from base instead
+πŸ’‘ Use 'wt switch remote-feature' (without --create) to switch to the remote branch
+βœ… Created new worktree for remote-feature from main at [REPO].remote-feature
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_default_branch_missing_worktree.snap b/tests/snapshots/integration__integration_tests__switch__switch_default_branch_missing_worktree.snap
index 9aa1f7f30..c0b8d9abe 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_default_branch_missing_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_default_branch_missing_worktree.snap
@@ -25,5 +25,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-βœ… Switched to worktree for main at [REPO].main
-πŸ’‘ Run `wt config shell install` to enable automatic cd
+βœ… Switched to worktree for main at [REPO].main
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snap
index 1fcce9193..366ff4533 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snap
@@ -28,6 +28,6 @@ exit_code: 0
----- stdout -----
----- stderr -----
-βœ… Created new worktree for file-test from main at [REPO].file-test
-πŸ”„ Executing (--execute):
+βœ… Created new worktree for file-test from main at [REPO].file-test
+πŸ”„ Executing (--execute):
  echo 'test content' > test.txt
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap
index add03ce87..5a8d4d654 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap
@@ -27,6 +27,6 @@ exit_code: 0
----- stdout -----
----- stderr -----
-βœ… Switched to worktree for existing-exec at [REPO].existing-exec
-πŸ”„ Executing (--execute):
+βœ… Switched to worktree for existing-exec at [REPO].existing-exec
+πŸ”„ Executing (--execute):
  echo 'existing worktree' > existing.txt
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap
index ad139ba7f..f9d76a538 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap
@@ -28,6 +28,6 @@ exit_code: 1
----- stdout -----
----- stderr -----
-βœ… Created new worktree for fail-test from main at [REPO].fail-test
-πŸ”„ Executing (--execute):
+βœ… Created new worktree for fail-test from main at [REPO].fail-test
+πŸ”„ Executing (--execute):
  exit 1
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap
index dd8dba354..43c4a99f4 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap
@@ -31,8 +31,8 @@ line2
line3
----- stderr -----
-βœ… Created new worktree for multiline-test from main at [REPO].multiline-test
-πŸ”„ Executing (--execute):
+βœ… Created new worktree for multiline-test from main at [REPO].multiline-test
+πŸ”„ Executing (--execute):
  echo 'line1'
  echo 'line2'
  echo 'line3'
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap
index acd3e9bf0..1d79474f1 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap
@@ -29,6 +29,6 @@ exit_code: 0
test output
----- stderr -----
-βœ… Created new worktree for exec-test from main at [REPO].exec-test
-πŸ”„ Executing (--execute):
+βœ… Created new worktree for exec-test from main at [REPO].exec-test
+πŸ”„ Executing (--execute):
  echo 'test output'
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snap b/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snap
index 573a0df19..db9530005 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snap
@@ -25,5 +25,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🟑 Worktree for feature-z at [REPO].feature-z; cannot cd (no shell integration)
-πŸ’‘ Run `wt config shell install` to enable automatic cd
+🟑 Worktree for feature-z at [REPO].feature-z; cannot cd (no shell integration)
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_existing_internal.snap b/tests/snapshots/integration__integration_tests__switch__switch_existing_internal.snap
index 24ffc6481..c024c2d5b 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_existing_internal.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_existing_internal.snap
@@ -27,4 +27,4 @@ exit_code: 0
cd '[REPO].existing-wt'
----- stderr -----
-βœ… Switched to worktree for existing-wt at [REPO].existing-wt
+βœ… Switched to worktree for existing-wt at [REPO].existing-wt
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_existing_with_shell_configured.snap b/tests/snapshots/integration__integration_tests__switch__switch_existing_with_shell_configured.snap
index 72773bd58..45c7902d7 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_existing_with_shell_configured.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_existing_with_shell_configured.snap
@@ -25,4 +25,4 @@ exit_code: 0
----- stdout -----
----- stderr -----
-βœ… Switched to worktree for shell-configured at [REPO].shell-configured
+βœ… Switched to worktree for shell-configured at [REPO].shell-configured
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_exit_code.snap b/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_exit_code.snap
index 75e0fd2af..ec99cbd7f 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_exit_code.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_exit_code.snap
@@ -31,6 +31,6 @@ cd '[REPO].exit-code-test'
exit 42
----- stderr -----
-βœ… Created new worktree for exit-code-test from main at [REPO].exit-code-test
-πŸ”„ Executing (--execute):
+βœ… Created new worktree for exit-code-test from main at [REPO].exit-code-test
+πŸ”„ Executing (--execute):
  exit 42
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_output_then_exit.snap b/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_output_then_exit.snap
index 4ae99c130..2c8443cad 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_output_then_exit.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_output_then_exit.snap
@@ -32,7 +32,7 @@ echo 'doing work'
exit 7
----- stderr -----
-βœ… Created new worktree for output-exit-test from main at [REPO].output-exit-test
-πŸ”„ Executing (--execute):
+βœ… Created new worktree for output-exit-test from main at [REPO].output-exit-test
+πŸ”„ Executing (--execute):
  echo 'doing work'
  exit 7
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_internal_mode.snap b/tests/snapshots/integration__integration_tests__switch__switch_internal_mode.snap
index dac2f49f5..1ba8bbe95 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_internal_mode.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_internal_mode.snap
@@ -28,4 +28,4 @@ exit_code: 0
cd '[REPO].internal-test'
----- stderr -----
-βœ… Created new worktree for internal-test from main at [REPO].internal-test
+βœ… Created new worktree for internal-test from main at [REPO].internal-test
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snap b/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snap
index afa8e3326..d886a39f3 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snap
@@ -32,7 +32,7 @@ echo 'line1'
echo 'line2'
----- stderr -----
-βœ… Created new worktree for exec-internal from main at [REPO].exec-internal
-πŸ”„ Executing (--execute):
+βœ… Created new worktree for exec-internal from main at [REPO].exec-internal
+πŸ”„ Executing (--execute):
  echo 'line1'
  echo 'line2'
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_main_branch_to_feature.snap b/tests/snapshots/integration__integration_tests__switch__switch_main_branch_to_feature.snap
index 11b2d860d..671c8a594 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_main_branch_to_feature.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_main_branch_to_feature.snap
@@ -25,5 +25,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-βœ… Switched to worktree for feature-a at [REPO].feature-a
-πŸ’‘ Run `wt config shell install` to enable automatic cd
+βœ… Switched to worktree for feature-a at [REPO].feature-a
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch.snap b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch.snap
index f07208264..c1de5e918 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch.snap
@@ -25,5 +25,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🟑 Worktree for feature-a at [REPO].feature-a; cannot cd (no shell integration)
-πŸ’‘ Run `wt config shell install` to enable automatic cd
+🟑 Worktree for feature-a at [REPO].feature-a; cannot cd (no shell integration)
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_first.snap b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_first.snap
index 11b2d860d..671c8a594 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_first.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_first.snap
@@ -25,5 +25,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-βœ… Switched to worktree for feature-a at [REPO].feature-a
-πŸ’‘ Run `wt config shell install` to enable automatic cd
+βœ… Switched to worktree for feature-a at [REPO].feature-a
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_second.snap b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_second.snap
index e3b2509e8..b52e14419 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_second.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_second.snap
@@ -25,5 +25,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-βœ… Switched to worktree for feature-b at [REPO].feature-b
-πŸ’‘ Run `wt config shell install` to enable automatic cd
+βœ… Switched to worktree for feature-b at [REPO].feature-b
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_with_worktrunk_history_back.snap b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_with_worktrunk_history_back.snap
index aac1adc38..bfbb6bb1d 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_with_worktrunk_history_back.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_with_worktrunk_history_back.snap
@@ -25,5 +25,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🟑 Worktree for feature-x at [REPO].feature-x; cannot cd (no shell integration)
-πŸ’‘ Run `wt config shell install` to enable automatic cd
+🟑 Worktree for feature-x at [REPO].feature-x; cannot cd (no shell integration)
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_with_worktrunk_history_first.snap b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_with_worktrunk_history_first.snap
index 38a1d787b..4da1f3f01 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_with_worktrunk_history_first.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_with_worktrunk_history_first.snap
@@ -25,5 +25,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-βœ… Switched to worktree for feature-x at [REPO].feature-x
-πŸ’‘ Run `wt config shell install` to enable automatic cd
+βœ… Switched to worktree for feature-x at [REPO].feature-x
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_with_worktrunk_history_second.snap b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_with_worktrunk_history_second.snap
index 78a9fc444..16bfd6f81 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_with_worktrunk_history_second.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_with_worktrunk_history_second.snap
@@ -25,5 +25,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-βœ… Switched to worktree for feature-y at [REPO].feature-y
-πŸ’‘ Run `wt config shell install` to enable automatic cd
+βœ… Switched to worktree for feature-y at [REPO].feature-y
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_primary_on_different_branch.snap b/tests/snapshots/integration__integration_tests__switch__switch_primary_on_different_branch.snap
index c6b6cddc3..cfa159ba6 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_primary_on_different_branch.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_primary_on_different_branch.snap
@@ -26,5 +26,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-βœ… Created new worktree for feature-from-main from main at [REPO].feature-from-main
-πŸ’‘ Run `wt config shell install` to enable automatic cd
+βœ… Created new worktree for feature-from-main from main at [REPO].feature-from-main
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_to_existing_primary_on_different_branch.snap b/tests/snapshots/integration__integration_tests__switch__switch_to_existing_primary_on_different_branch.snap
index 18883e992..8c36ac93f 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_to_existing_primary_on_different_branch.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_to_existing_primary_on_different_branch.snap
@@ -25,5 +25,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🟑 Worktree for existing-branch at [REPO].existing-branch; cannot cd (no shell integration)
-πŸ’‘ Run `wt config shell install` to enable automatic cd
+🟑 Worktree for existing-branch at [REPO].existing-branch; cannot cd (no shell integration)
+πŸ’‘ Run `wt config shell install` to enable automatic cd
diff --git a/tests/snapshots/integration__integration_tests__switch__switch_with_base.snap b/tests/snapshots/integration__integration_tests__switch__switch_with_base.snap
index 809b3ade1..c4f9d69d1 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_with_base.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_with_base.snap
@@ -28,5 +28,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-βœ… Created new worktree for feature-with-base from main at [REPO].feature-with-base
-πŸ’‘ Run `wt config shell install` to enable automatic cd
+βœ… Created new worktree for feature-with-base from main at [REPO].feature-with-base
+πŸ’‘ Run `wt config shell install` to enable automatic cd