Skip to content

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

Refine semantic color usage for output messages

Maximilian Roos9c8063e5688e
diff --git a/CLAUDE.md b/CLAUDE.md
index 3e9683c23..0e30216a7 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -166,13 +166,6 @@ show_message_based_on(is_merged);
spawn_background(build_command_that_checks_merge_again()); // Duplicate check!
```
-### The anstyle Ecosystem
-
-All styling uses the **anstyle ecosystem** for composable, auto-detecting terminal output:
-- **`anstream`**: Auto-detecting I/O streams (println!, eprintln! macros)
-- **`anstyle`**: Core styling with inline pattern `{style}text{style:#}`
-- **Color detection**: Respects NO_COLOR, CLICOLOR_FORCE, TTY detection
-
### Message Types
Six canonical message patterns with their emojis:
@@ -273,25 +266,17 @@ perform_squash()?;
output::success("Squashed @ a1b2c3d")?;
```
-### Semantic Style Constants
-
-Style constants defined in `src/styling/constants.rs`:
-- `ERROR`: Red (errors, conflicts)
-- `ERROR_BOLD`: Red + bold
-- `WARNING`: Yellow (warnings)
-- `WARNING_BOLD`: Yellow + bold
-- `HINT`: Dimmed (hints, secondary information)
-- `HINT_BOLD`: Dimmed + bold (avoid - bold+dim renders inconsistently)
-- `CURRENT`: Magenta + bold (current worktree)
-- `ADDITION`: Green (diffs, additions)
-- `DELETION`: Red (diffs, deletions)
-- `CYAN`, `CYAN_BOLD`: Cyan (progress messages)
-- `GREEN`, `GREEN_BOLD`: Green (success messages)
-- `GRAY`: BrightBlack (secondary/metadata text)
+### Style Constants
+
+Style constants in `src/styling/constants.rs` (minimal set for programmatic styling):
+- `ADDITION`: Green (diffs, additions) - used in table rendering
+- `DELETION`: Red (diffs, deletions) - used in table rendering
- `GUTTER`: BrightWhite background (quoted content)
Emoji constants: `PROGRESS_EMOJI` (πŸ”„), `SUCCESS_EMOJI` (βœ…), `ERROR_EMOJI` (❌), `WARNING_EMOJI` (🟑), `HINT_EMOJI` (πŸ’‘), `INFO_EMOJI` (βšͺ)
+For all other styling, use color-print tags in `cformat!`: `<red>`, `<green>`, `<yellow>`, `<cyan>`, `<dim>`, `<bold>`, `<bright-black>`
+
### Styling in Command Code
Use `output::` functions with `cformat!` for styled content. The output function adds the emoji + semantic color, and `cformat!` handles inner styling:
@@ -328,9 +313,10 @@ use worktrunk::styling::eprintln; // Auto-detects color support
### Design Principles
-- **Use the ecosystem, not manual escape codes** - Use `color-print` for command code, `anstyle` for tables/StyledLine. Never manually write ANSI codes (`\x1b[...`)
+- **color-print for all styling** - Use `cformat!` with HTML-like tags (`<green>`, `<bold>`, etc.). Only use anstyle for `StyledLine` table rendering.
- **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
+- **Never manual escape codes** - No `\x1b[...` in code
- **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
diff --git a/src/git/diff.rs b/src/git/diff.rs
index 5f9d49a4d..3872454d1 100644
--- a/src/git/diff.rs
+++ b/src/git/diff.rs
@@ -1,6 +1,6 @@
//! Git diff utilities for parsing and formatting diff statistics.
-use crate::styling::{ADDITION, DELETION};
+use color_print::cformat;
/// Line-level diff totals (added/deleted counts) used across git operations.
#[derive(Debug, Clone, Copy, PartialEq, Eq, Default, serde::Serialize)]
@@ -123,10 +123,10 @@ impl DiffStats {
));
}
if let Some(insertions) = self.insertions {
- parts.push(format!("{ADDITION}+{insertions}{ADDITION:#}"));
+ parts.push(cformat!("<green>+{insertions}</>"));
}
if let Some(deletions) = self.deletions {
- parts.push(format!("{DELETION}-{deletions}{DELETION:#}"));
+ parts.push(cformat!("<red>-{deletions}</>"));
}
parts
diff --git a/src/output/traits.rs b/src/output/traits.rs
index 19b9e27a9..b1a51b557 100644
--- a/src/output/traits.rs
+++ b/src/output/traits.rs
@@ -16,12 +16,10 @@
//! 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 color_print::cformat;
use std::io::{self, Write};
use std::path::Path;
-use worktrunk::styling::{
- CYAN, GREEN, HINT, HINT_EMOJI, INFO_EMOJI, PROGRESS_EMOJI, SUCCESS_EMOJI, WARNING,
- WARNING_EMOJI,
-};
+use worktrunk::styling::{HINT_EMOJI, INFO_EMOJI, PROGRESS_EMOJI, SUCCESS_EMOJI, WARNING_EMOJI};
/// Core output handler trait
///
@@ -33,27 +31,27 @@ pub trait OutputHandler {
/// Emit a success message (automatically wrapped in green)
fn success(&mut self, message: String) -> io::Result<()> {
- self.write_message_line(&format!("{SUCCESS_EMOJI} {GREEN}{message}{GREEN:#}"))
+ self.write_message_line(&cformat!("{SUCCESS_EMOJI} <green>{message}</>"))
}
/// Emit a progress message (automatically wrapped in cyan)
fn progress(&mut self, message: String) -> io::Result<()> {
- self.write_message_line(&format!("{PROGRESS_EMOJI} {CYAN}{message}{CYAN:#}"))
+ self.write_message_line(&cformat!("{PROGRESS_EMOJI} <cyan>{message}</>"))
}
/// Emit a hint message (automatically wrapped in dim)
fn hint(&mut self, message: String) -> io::Result<()> {
- self.write_message_line(&format!("{HINT_EMOJI} {HINT}{message}{HINT:#}"))
+ self.write_message_line(&cformat!("{HINT_EMOJI} <dim>{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}"))
+ self.write_message_line(&cformat!("{INFO_EMOJI} {message}"))
}
/// Emit a warning message (automatically wrapped in yellow)
fn warning(&mut self, message: String) -> io::Result<()> {
- self.write_message_line(&format!("{WARNING_EMOJI} {WARNING}{message}{WARNING:#}"))
+ self.write_message_line(&cformat!("{WARNING_EMOJI} <yellow>{message}</>"))
}
/// Print a message (written as-is)
diff --git a/src/styling/constants.rs b/src/styling/constants.rs
index c301c1c43..341effe98 100644
--- a/src/styling/constants.rs
+++ b/src/styling/constants.rs
@@ -1,12 +1,8 @@
//! Style constants and emojis for terminal output
//!
-//! # Two Styling Approaches
+//! # Styling with color-print
//!
-//! This codebase uses two complementary styling approaches:
-//!
-//! ## 1. `color-print` for format strings (preferred for messages)
-//!
-//! Use `cformat!` with HTML-like tags for user-facing messages. Nesting is automatic:
+//! Use `cformat!` with HTML-like tags for all user-facing messages:
//!
//! ```rust,ignore
//! use color_print::cformat;
@@ -14,7 +10,7 @@
//! // Simple styling
//! cformat!("<green>Success message</>")
//!
-//! // Nested styles - bold inherits green, nesting "just works"
+//! // Nested styles - bold inherits green
//! cformat!("<green>Removed branch <bold>{branch}</> successfully</>")
//!
//! // Semantic mapping:
@@ -23,76 +19,26 @@
//! // - Hints: <dim>...</>
//! // - Progress: <cyan>...</>
//! // - Success: <green>...</>
+//! // - Secondary: <bright-black>...</>
//! ```
//!
-//! ## 2. `anstyle` for programmatic styling
-//!
-//! Use `Style` constants for `StyledLine`, table rendering, and computed styles.
-//!
-//! # Semantic Color Reference
+//! # anstyle constants
//!
-//! | Semantic | color-print tag | anstyle constant |
-//! |----------|-----------------|------------------|
-//! | Error | `<red>` | `ERROR` |
-//! | Warning | `<yellow>` | `WARNING` |
-//! | Hint | `<dim>` | `HINT` |
-//! | Progress | `<cyan>` | `CYAN` |
-//! | Success | `<green>` | `GREEN` |
-//! | Secondary | `<bright-black>` | `GRAY` |
+//! A few `Style` constants remain for programmatic use with `StyledLine` and
+//! table rendering where computed styles are needed at runtime.
use anstyle::{AnsiColor, Color, Style};
// ============================================================================
-// Semantic Style Constants (for programmatic use with StyledLine, etc.)
+// Programmatic Style Constants (for StyledLine, tables, computed styles)
// ============================================================================
-/// Error style (red) - for programmatic use; prefer `<red>` in cformat!
-pub const ERROR: Style = Style::new().fg_color(Some(Color::Ansi(AnsiColor::Red)));
-
-/// Error bold style (red + bold) - for programmatic use
-pub const ERROR_BOLD: Style = Style::new()
- .fg_color(Some(Color::Ansi(AnsiColor::Red)))
- .bold();
-
-/// Warning style (yellow) - for programmatic use; prefer `<yellow>` in cformat!
-pub const WARNING: Style = Style::new().fg_color(Some(Color::Ansi(AnsiColor::Yellow)));
-
-/// Warning bold style (yellow + bold) - for programmatic use
-pub const WARNING_BOLD: Style = Style::new()
- .fg_color(Some(Color::Ansi(AnsiColor::Yellow)))
- .bold();
-
-/// Hint style (dimmed) - for programmatic use; prefer `<dim>` in cformat!
-pub const HINT: Style = Style::new().dimmed();
-
-/// Hint bold style (dimmed + bold) - for programmatic use
-pub const HINT_BOLD: Style = Style::new().dimmed().bold();
-
-/// Addition style for diffs (green)
+/// Addition style for diffs (green) - used in table rendering
pub const ADDITION: Style = Style::new().fg_color(Some(Color::Ansi(AnsiColor::Green)));
-/// Deletion style for diffs (red)
+/// Deletion style for diffs (red) - used in table rendering
pub const DELETION: Style = Style::new().fg_color(Some(Color::Ansi(AnsiColor::Red)));
-/// Cyan style - for programmatic use; prefer `<cyan>` in cformat!
-pub const CYAN: Style = Style::new().fg_color(Some(Color::Ansi(AnsiColor::Cyan)));
-
-/// Cyan bold style - for programmatic use
-pub const CYAN_BOLD: Style = Style::new()
- .fg_color(Some(Color::Ansi(AnsiColor::Cyan)))
- .bold();
-
-/// Green style - for programmatic use; prefer `<green>` in cformat!
-pub const GREEN: Style = Style::new().fg_color(Some(Color::Ansi(AnsiColor::Green)));
-
-/// Green bold style - for programmatic use
-pub const GREEN_BOLD: Style = Style::new()
- .fg_color(Some(Color::Ansi(AnsiColor::Green)))
- .bold();
-
-/// Gray style for secondary/metadata text - for programmatic use; prefer `<bright-black>` in cformat!
-pub const GRAY: Style = Style::new().fg_color(Some(Color::Ansi(AnsiColor::BrightBlack)));
-
/// Gutter style for quoted content (commands, config, error details)
///
/// We wanted the dimmest/most subtle background that works on both dark and light
@@ -108,22 +54,22 @@ pub const GUTTER: Style = Style::new().bg_color(Some(Color::Ansi(AnsiColor::Brig
// Message Emojis
// ============================================================================
-/// Progress emoji: `cprintln!("{PROGRESS_EMOJI} <cyan>message</>");`
+/// Progress emoji: `cformat!("{PROGRESS_EMOJI} <cyan>message</>")`
pub const PROGRESS_EMOJI: &str = "πŸ”„";
-/// Success emoji: `cprintln!("{SUCCESS_EMOJI} <green>message</>");`
+/// Success emoji: `cformat!("{SUCCESS_EMOJI} <green>message</>")`
pub const SUCCESS_EMOJI: &str = "βœ…";
-/// Error emoji: `cprintln!("{ERROR_EMOJI} <red>message</>");`
+/// Error emoji: `cformat!("{ERROR_EMOJI} <red>message</>")`
pub const ERROR_EMOJI: &str = "❌";
-/// Warning emoji: `cprintln!("{WARNING_EMOJI} <yellow>message</>");`
+/// Warning emoji: `cformat!("{WARNING_EMOJI} <yellow>message</>")`
pub const WARNING_EMOJI: &str = "🟑";
-/// Hint emoji: `cprintln!("{HINT_EMOJI} <dim>message</>");`
+/// Hint emoji: `cformat!("{HINT_EMOJI} <dim>message</>")`
pub const HINT_EMOJI: &str = "πŸ’‘";
/// Info emoji - use for neutral status (primary status NOT dimmed, metadata may be dimmed)
/// Primary status: `output::info("All commands already approved")?;`
-/// Metadata: `cprintln!("{INFO_EMOJI} <dim>Showing 5 worktrees...</>");`
+/// Metadata: `cformat!("{INFO_EMOJI} <dim>Showing 5 worktrees...</>")`
pub const INFO_EMOJI: &str = "βšͺ";
diff --git a/tests/integration_tests/config_init.rs b/tests/integration_tests/config_init.rs
index 0bd1eb7f4..43913f0f2 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 08071913e..1c55f955a 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 1f86f9d13..9e1c4f3dc 100644
--- a/tests/integration_tests/configure_shell.rs
+++ b/tests/integration_tests/configure_shell.rs
@@ -33,13 +33,13 @@ fn test_configure_shell_with_yes() {
----- 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
+ 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
+ βœ… Configured 1 shell
+ πŸ’‘ Restart shell or run: source ~/.zshrc
");
});
@@ -79,11 +79,11 @@ fn test_configure_shell_specific_shell() {
----- 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
+ 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
");
});
@@ -303,13 +303,13 @@ fn test_configure_shell_multiple_configs() {
----- 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
+ 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
+ βœ… Configured 2 shells
+ πŸ’‘ Restart shell or run: source ~/.zshrc
");
});
@@ -365,13 +365,13 @@ fn test_configure_shell_mixed_states() {
----- stderr -----
🟑 Completions won't work: zsh's compinit is not enabled.
Add this to ~/.zshrc before the wt line:
- autoload -Uz compinit && compinit
+ 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 7f1251e99..7f6a09680 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 3dba94fda..c0fefebd6 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 e283096f5..7c67f87f1 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 5663b00fc..fa79ad7b0 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 d07ae95a3..8a40103ce 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 4bf9d273b..9e6b3be55 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 c90ae37be..f749dd019 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 9dacd3a83..2313be6bf 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 8bf64226b..df10f9030 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 de28536f8..9edd43cb5 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 a90ad055a..a100dfea3 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 a4a68346c..dcb73b8d5 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 b35b9a6b4..cf52dbcc3 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 ae214e0e7..f3f8565df 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 ae214e0e7..f3f8565df 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 f206874b9..db9509e1f 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap
@@ -2,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 f206874b9..db9509e1f 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap
@@ -2,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 e6ef53404..36f021307 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 e6ef53404..36f021307 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 6c35db3a4..783df959c 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 29c79d7a1..abacf40c2 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 fb31198ac..1dd78f22e 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 12fe24a15..83f3dfa9e 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 7814f0fbe..49a0583f6 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 e6ffa57da..650484bae 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 e6ffa57da..650484bae 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 f13062ee8..e942c09bf 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 2bdcc41ae..4ff0b1934 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 643d2a444..e7d498053 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 a5c13e946..6840e5a43 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 af0d991ae..54f6f1e15 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 dfebbd1dd..e2ef9f60e 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 dfc9d4dd4..1f6e087d3 100644
--- a/tests/snapshots/integration__integration_tests__approvals__add_approvals_force.snap
+++ b/tests/snapshots/integration__integration_tests__approvals__add_approvals_force.snap
@@ -26,4 +26,4 @@ exit_code: 0
----- stdout -----
----- stderr -----
-βœ… Commands approved; not saved (--force)
+βœ… Commands approved; not saved (--force)
diff --git a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_global_with_approvals.snap b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_global_with_approvals.snap
index 00a3ed768..c75de670d 100644
--- a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_global_with_approvals.snap
+++ b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_global_with_approvals.snap
@@ -26,4 +26,4 @@ exit_code: 0
----- stdout -----
----- stderr -----
-βœ… Cleared approvals for 1 project
+βœ… Cleared approvals for 1 project
diff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap
index 1bc7f66f3..90c92edd5 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 fffad5bd4..f7598b697 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 6934a8b4a..f674cba89 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 0e7925cab..c4d5afb9a 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 5e5bca9b7..bd720607b 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 0b33dc47e..482d0eabe 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 50c590a22..9816b7d9a 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 0b14bc7e3..ecc96632b 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 075808305..c33e83326 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 fa3c73c12..05c0b01e8 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 6a4a0cd71..bf90d5585 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 eafe6edfb..cef1a7f25 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 89dfe5b51..95c731a84 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 2ad322280..42378ea67 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 5f5318c1d..09b8f326c 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 5db07497e..9cfe14b44 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 371b01b8f..bb35e1137 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_from_main_branch.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_from_main_branch.snap
@@ -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 6c91c3560..6ddebe421 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 eb59221f3..5d3bfc300 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snap
@@ -25,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 0f783877f..77b59ca51 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 b61bbfdbd..4b9863d01 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap
@@ -25,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 caf31508e..4a7fa59a5 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 eb852d5c3..906d2937e 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 45b49decc..51256108a 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snap
@@ -25,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 da61082e3..26f7d69aa 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 0dbfba7ab..f18224e43 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 3797693e3..44b5936ee 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 d659f4c17..ed9762fbc 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 b3b7d7964..27c927360 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap
@@ -24,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 df83fdc39..f1d2cb74a 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 2a4f1e12d..50af598fc 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 3125ce605..ab8aacdd5 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 0b3bd8253..bb181861a 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,9 +24,9 @@ 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:
@@ -35,4 +35,4 @@ exit_code: 0
  - Revert to initial
βšͺ No changes after squashing 3 commits
βšͺ Already up to date with main (no new commits, no rebase needed)
-πŸ”„ Removing feature worktree & branch in background
+πŸ”„ 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 42c14d1ad..edd1327a9 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 fe52de61a..383a5e206 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 318ea5d87..c04fe02f7 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 e96874add..a91c41792 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 d81ba6a59..3dcb12c6b 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 fa3c73c12..05c0b01e8 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 b95ed7434..e5d13c094 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 50c590a22..9816b7d9a 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 f0b8f6d19..fa8cd3c65 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 d659f4c17..ed9762fbc 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 f4967b20e..99709a0ab 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 1746604e4..0f188124e 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 300f0e0bf..a44106946 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 ae6f88332..85476e237 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 73ab76258..2e661a3db 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 d04231d9c..3274b41ca 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 cff76e6c8..8b3d4ea16 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 c5a9add2b..3f34f7781 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 a350373c5..05f247264 100644
--- a/tests/snapshots/integration__integration_tests__merge__step_commit_nothing_to_commit.snap
+++ b/tests/snapshots/integration__integration_tests__merge__step_commit_nothing_to_commit.snap
@@ -27,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 a9ca2ba81..981caf4b4 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 8452ff0e2..498b108aa 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 d51bc7d85..64a8fef9e 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 ff3596848..0cbf8ad72 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 068d05fa2..fd5ed48aa 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 9c9a68b04..52ec8f78d 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 9ec9173e7..7d25d7034 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 62ec83cee..cf746bd60 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 69cda577e..44bbd29ba 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 b3f469b02..2507d114f 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 68c7ebddd..16690c2a7 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 d8c496cb6..23a7fd0f2 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 053d81e52..478fd3584 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 e92d93179..ae5811597 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 b223fc4f8..bc1b9540c 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 c2f4e57e0..ead48dc54 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 238679a60..066df5e6d 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 be773fb24..7f407c4ab 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 4a2a9da6d..82a0c5629 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 151256189..ed3e89b6d 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 3f1dd1189..1fd29ab14 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 785903b3d..d6e920c4b 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 b6368135f..2227192ad 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 38947b3f3..7a8d2c8a9 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 2624df73d..9c96cae29 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 1a394203c..1c3040cce 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 2624df73d..9c96cae29 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 787e41cde..9cf4fb89b 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 868b46fcc..cb34bd4f4 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 736b79373..c81f2ebba 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 e4311567c..dcffd0d5b 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 ee8650f9d..2aa692f7c 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 4cad342cb..93f370b74 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 13430d509..e648bb4a0 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 4cd5b7815..2ec2b7b12 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 0cfdc5b2f..091bb4497 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 2afcdf6f0..641b1cf53 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 f219c6630..0e8011760 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 093f19c3c..7c2ff31e6 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 2af863d94..baa0521bc 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 b5955f9bc..39d7fbb96 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 da5b852ad..04ad2c312 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 f4b6d5df4..519c423ab 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 4069c36ed..efca7970d 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 28d72e443..5c55a9a96 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 d06dd288c..cf88b6150 100644
--- a/tests/snapshots/integration__integration_tests__switch__switch_base_without_create.snap
+++ b/tests/snapshots/integration__integration_tests__switch__switch_base_without_create.snap
@@ -27,5 +27,5 @@ exit_code: 0
----- stdout -----
----- stderr -----
-🟑 --base flag is only used with --create, ignoring
+🟑 --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 7eb0fe546..46f729b62 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 b236eaad8..390b95da5 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 dab704d13..56c01a1bc 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 c0b8d9abe..082e1a05c 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 366ff4533..3f53efe5a 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 5a8d4d654..18eaa39d8 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 f9d76a538..cc349c614 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 43c4a99f4..d5da87bde 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 1d79474f1..d0c5923b9 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 db9530005..13ca230a0 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 c024c2d5b..81d3817e9 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 45c7902d7..a44a66a7d 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 ec99cbd7f..9c1516b8e 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 2c8443cad..5afa18781 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 1ba8bbe95..4882a14ac 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 d886a39f3..ae66d2686 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 671c8a594..8360a74b2 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 c1de5e918..94f88b0d6 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 671c8a594..8360a74b2 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 b52e14419..59821c28a 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 bfbb6bb1d..2874403aa 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 4da1f3f01..934fb6ae1 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 16bfd6f81..68978f358 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 cfa159ba6..ebd2b6c7e 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 8c36ac93f..a1d929c5e 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 c4f9d69d1..e8dbe2098 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