Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
feat: Auto-wrap messages in semantic colors and update docs
Maximilian Roose497344c0887
diff --git a/CLAUDE.md b/CLAUDE.mdindex 4d6ad903d..3e9683c23 100644--- a/CLAUDE.md+++ b/CLAUDE.md@@ -184,20 +184,24 @@ Six canonical message patterns with their emojis:5. **Hints**: π‘ (actionable suggestions, tips for user)6. **Info**: βͺ (neutral status, system feedback, metadata)-**All message methods just add the emoji prefix** - callers handle their own styling:+**Output functions automatically add emoji AND semantic color.** Callers provide content with optional inner styling (like `<bold>`):+```rust-// Caller provides the styling-output::success(format!("{GREEN}Created worktree{GREEN:#}"))?;-output::hint(format!("{HINT}Run 'wt config' to configure{HINT:#}"))?;+// Simple message - function adds emoji + color+output::success("Created worktree")?;+output::hint("Run 'wt config' to configure")?;++// With inner styling - use cformat! for bold/dim within the message+output::success(cformat!("Created worktree for <bold>{branch}</>"))?;+output::warning(cformat!("Branch <bold>{name}</> not found"))?;```-**Styling conventions by type:**-- Progress β cyan (`{CYAN}...{CYAN:#}`)-- Success β green (`{GREEN}...{GREEN:#}`)-- Errors β red (`{ERROR}...{ERROR:#}`)-- Warnings β yellow (`{WARNING}...{WARNING:#}`)-- Hints β dimmed (`{HINT}...{HINT:#}`), avoid `HINT_BOLD` (renders inconsistently)-- Info β unstyled or dimmed for supplementary metadata+**Semantic colors added automatically:**+- `success()` β green+- `progress()` β cyan+- `hint()` β dimmed+- `warning()` β yellow+- `info()` β no color (neutral status)**Every user-facing message requires either an emoji or a gutter** for consistent visual separation.@@ -241,7 +245,7 @@ Output should appear immediately adjacent to the operations it describes. ProgreSequential operations should show immediate feedback:```rustfor item in items {- output::progress(format!("π Removing {item}..."))?;+ output::progress(format!("Removing {item}..."))?;perform_operation(item)?;output::success(format!("Removed {item}"))?; // Immediate feedback}@@ -264,9 +268,9 @@ Progress messages should include all relevant details (what's being done, counts```rust// β GOOD - detailed progress, minimal success-output::progress("π Squashing 3 commits & working tree changes into a single commit (5 files, +60)...")?;+output::progress("Squashing 3 commits & working tree changes into a single commit (5 files, +60)...")?;perform_squash()?;-output::success("β Squashed @ a1b2c3d")?;+output::success("Squashed @ a1b2c3d")?;```### Semantic Style Constants@@ -288,55 +292,45 @@ Style constants defined in `src/styling/constants.rs`:Emoji constants: `PROGRESS_EMOJI` (π), `SUCCESS_EMOJI` (β ), `ERROR_EMOJI` (β), `WARNING_EMOJI` (π‘), `HINT_EMOJI` (π‘), `INFO_EMOJI` (βͺ)-### Inline Formatting Pattern+### Styling in Command Code-Use anstyle's inline pattern `{style}text{style:#}` where `#` means reset:+Use `output::` functions with `cformat!` for styled content. The output function adds the emoji + semantic color, and `cformat!` handles inner styling:```rust-use worktrunk::styling::{println, CYAN, ERROR, ERROR_EMOJI, HINT, HINT_EMOJI};+// β GOOD - output:: handles emoji + outer color, cformat! handles inner styling+output::success(cformat!("Created <bold>{branch}</> from <bold>{base}</>"))?;+output::warning(cformat!("Branch <bold>{name}</> has <dim>uncommitted changes</>"))?;+output::hint(cformat!("Run '<bold>wt merge</>' to continue"))?;-println!("π {CYAN}Rebasing onto main...{CYAN:#}");-println!("{ERROR_EMOJI} {ERROR}Working tree has uncommitted changes{ERROR:#}");-println!("{HINT_EMOJI} {HINT}Use 'wt list' to see all worktrees{HINT:#}");+// β GOOD - plain strings work too (no inner styling needed)+output::progress("Rebasing onto main...")?;```-### Composing Styles--Compose styles using anstyle methods (`.bold()`, `.fg_color()`, etc.). Branch names in messages (not tables) should be bolded. Tables (`wt list`) use conditional styling for branch names to indicate worktree state (current/main/other).+**Available color-print tags:** `<bold>`, `<dim>`, `<red>`, `<green>`, `<yellow>`, `<cyan>`, `<magenta>`-Nested style resets leak color. Compose attributes into a single style, then re-apply the surrounding style after the reset:+**Emoji constants in cformat!:** Use `{ERROR_EMOJI}`, `{HINT_EMOJI}`, etc. for messages that bypass output:: functions (e.g., GitError Display impl):```rust-// β BAD - nested bold loses surrounding color, text after reset is unstyled-"{WARNING}Text with {bold}nested{bold:#} styles{WARNING:#}"-// β GOOD - use composed style and re-apply surrounding style after reset-"{WARNING}Text with {WARNING_BOLD}composed{WARNING_BOLD:#}{WARNING} styles{WARNING:#}"-// β ALSO GOOD - styled element at end (no text after reset needs styling)-"{WARNING}Message: {WARNING_BOLD}{value}{WARNING_BOLD:#}{WARNING:#}"+cformat!("{ERROR_EMOJI} <red>Branch <bold>{branch}</> not found</>")```-**Key insight**: `{STYLE:#}` always resets to default, not to the surrounding style. Re-apply the surrounding style after any composed style reset if there's more text to style.+Branch names in messages should be bolded. Tables (`wt list`) use `StyledLine` with conditional styling for branch names.### Color Detection-Colors automatically adjust based on environment (NO_COLOR, CLICOLOR_FORCE, TTY detection) via `anstream` macros.+Colors automatically adjust based on environment (NO_COLOR, CLICOLOR_FORCE, TTY detection). When using `output::` functions, this is handled automatically.-Styled print macros must be imported from `worktrunk::styling`, not stdlib:+For direct terminal I/O (rare - mainly internal output system code), import print macros from `worktrunk::styling`:```rust-// β BAD - uses standard library macro, bypasses anstream-eprintln!("{}", styled_text);-// β GOOD - import and use anstream-wrapped version-use worktrunk::styling::eprintln;-eprintln!("{}", styled_text);+use worktrunk::styling::eprintln; // Auto-detects color support```### Design Principles-- **Use the ecosystem, not manual escape codes** - Use `anstyle` for colors, `osc8` for hyperlinks, `strip-ansi-escapes` for stripping. Never manually write ANSI codes (`\x1b[...`)-- **Inline over wrappers** - Use `{style}text{style:#}` pattern, not wrapper functions-- **Composition over special cases** - Use `.bold()`, `.fg_color()`, not `format_X_with_Y()`-- **Semantic constants** - Use `ERROR`, `WARNING`, not raw colors+- **Use the ecosystem, not manual escape codes** - Use `color-print` for command code, `anstyle` for tables/StyledLine. Never manually write ANSI codes (`\x1b[...`)+- **output:: functions over direct printing** - Use output:: for user messages, which auto-adds emoji + semantic color+- **cformat! for inner styling** - Use `<bold>`, `<dim>` tags within output:: calls- **YAGNI for presentation** - Most output needs no styling- **Unicode-aware** - Width calculations respect emoji and CJK characters (via `StyledLine`)- **Graceful degradation** - Must work without color support@@ -364,21 +358,19 @@ Use `format_with_gutter()` for quoted content. Gutter content displays external```rust// Show warning message, then external error in gutter-super::warning(format!(- "{WARNING}Could not delete branch {WARNING_BOLD}{branch_name}{WARNING_BOLD:#}{WARNING:#}"-))?;-super::gutter(format_with_gutter(&e.to_string(), "", None))?;+output::warning(cformat!("Could not delete branch <bold>{branch_name}</>"))?;+output::gutter(format_with_gutter(&e.to_string(), "", None))?;```**Linebreaks:** Gutter content requires a single newline before it, never double newlines. Output functions (`progress()`, `success()`, etc.) use `println!()` internally, adding a trailing newline. Messages passed to these functions should not include `\n`:```rust// β GOOD - no trailing \n-output::progress(format!("{CYAN}Merging...{CYAN:#}"))?;+output::progress("Merging...")?;output::gutter(format_with_gutter(&log, "", None))?;// β BAD - trailing \n creates blank line-output::progress(format!("{CYAN}Merging...{CYAN:#}\n"))?;+output::progress("Merging...\n")?;```### Error Message Formattingdiff --git a/src/commands/command_approval.rs b/src/commands/command_approval.rsindex c6ff3fd94..75546a5b2 100644--- a/src/commands/command_approval.rs+++ b/src/commands/command_approval.rs@@ -66,9 +66,7 @@ pub fn approve_command_batch(if updated && let Err(e) = fresh_config.save() {let _ = output::warning(format!("Failed to save command approval: {e}"));- let _ = output::hint(cformat!(- "<dim>Approval will be requested again next time.</>"- ));+ let _ = output::hint("Approval will be requested again next time.");}}diff --git a/src/commands/commit.rs b/src/commands/commit.rsindex 00fc8f8da..f70b26684 100644--- a/src/commands/commit.rs+++ b/src/commands/commit.rs@@ -67,9 +67,9 @@ impl<'a> CommitGenerator<'a> {pub fn emit_hint_if_needed(&self) -> anyhow::Result<()> {if !self.config.is_configured() {- crate::output::hint(cformat!(- "<dim>Using fallback commit message. Run 'wt config --help' for LLM setup guide</>"- ))?;+ crate::output::hint(+ "Using fallback commit message. Run 'wt config --help' for LLM setup guide",+ )?;}Ok(())}@@ -103,9 +103,12 @@ impl<'a> CommitGenerator<'a> {}let full_progress_msg = if parts.is_empty() {- cformat!("<cyan>{action}</>")+ action} else {- cformat!("<cyan>{action} ({})</>", parts.join(", "))+ // Gray parenthetical with separate cformat for closing paren (avoids optimizer)+ let parts_str = parts.join(", ");+ let paren_close = cformat!("<bright-black>)</>");+ cformat!("{action} <bright-black>({parts_str}</>{paren_close}")};crate::output::progress(full_progress_msg)?;@@ -124,9 +127,7 @@ impl<'a> CommitGenerator<'a> {.trim().to_string();- crate::output::success(cformat!(- "<green>Committed changes @ <dim>{commit_hash}</></>"- ))?;+ crate::output::success(cformat!("Committed changes @ <dim>{commit_hash}</>"))?;Ok(())}@@ -142,7 +143,7 @@ impl CommitOptions<'_> {.unwrap_or(false);if self.no_verify && has_pre_commit {- crate::output::hint(cformat!("<dim>Skipping pre-commit hook (--no-verify)</>"))?;+ crate::output::hint("Skipping pre-commit hook (--no-verify)")?;} else if let Some(ref config) = project_config {let pipeline = HookPipeline::new(*self.ctx);pipeline.run_pre_commit(config, self.target_branch, self.auto_trust)?;diff --git a/src/commands/config.rs b/src/commands/config.rsindex bf8c546ed..36b36847c 100644--- a/src/commands/config.rs+++ b/src/commands/config.rs@@ -55,12 +55,8 @@ pub fn handle_config_create() -> anyhow::Result<()> {format_path_for_display(&config_path)))?;output::blank()?;- output::hint(cformat!(- "<dim>Use 'wt config show' to view existing configuration</>"- ))?;- output::hint(cformat!(- "<dim>Use 'wt config create --help' for config format reference</>"- ))?;+ output::hint("Use 'wt config show' to view existing configuration")?;+ output::hint("Use 'wt config create --help' for config format reference")?;return Ok(());}@@ -76,13 +72,11 @@ pub fn handle_config_create() -> anyhow::Result<()> {// Success messageoutput::success(cformat!(- "<green>Created config file: <bold>{}</></>",+ "Created config file: <bold>{}</>",format_path_for_display(&config_path)))?;output::blank()?;- output::hint(cformat!(- "<dim>Edit this file to customize worktree paths and LLM settings</>"- ))?;+ output::hint("Edit this file to customize worktree paths and LLM settings")?;Ok(())}@@ -417,7 +411,7 @@ pub fn handle_config_status_set(value: String, branch: Option<String>) -> anyhowrepo.run_command(&["config", &config_key, &value])?;crate::output::success(cformat!(- "<green>Set status for <bold>{branch_name}</> to <bold>{value}</></>"+ "Set status for <bold>{branch_name}</> to <bold>{value}</>"))?;Ok(())@@ -445,7 +439,7 @@ pub fn handle_config_status_unset(target: String) -> anyhow::Result<()> {crate::output::info("No statuses to clear")?;} else {crate::output::success(cformat!(- "<green>Cleared <bold>{cleared_count}</> status{}</>",+ "Cleared <bold>{cleared_count}</> status{}",if cleared_count == 1 { "" } else { "es" }))?;}@@ -461,9 +455,7 @@ pub fn handle_config_status_unset(target: String) -> anyhow::Result<()> {repo.run_command(&["config", "--unset", &config_key]).context("Failed to unset status (may not be set)")?;- crate::output::success(cformat!(- "<green>Cleared status for <bold>{branch_name}</></>"- ))?;+ crate::output::success(cformat!("Cleared status for <bold>{branch_name}</>"))?;}Ok(())@@ -519,7 +511,7 @@ pub fn handle_cache_clear(cache_type: Option<String>) -> anyhow::Result<()> {crate::output::info("No CI cache entries to clear")?;} else {crate::output::success(cformat!(- "<green>Cleared <bold>{cleared}</> CI cache entr{}</>",+ "Cleared <bold>{cleared}</> CI cache entr{}",if cleared == 1 { "y" } else { "ies" }))?;}@@ -529,7 +521,7 @@ pub fn handle_cache_clear(cache_type: Option<String>) -> anyhow::Result<()> {.run_command(&["config", "--unset", "worktrunk.defaultBranch"]).is_ok(){- crate::output::success(cformat!("<green>Cleared default branch cache</>"))?;+ crate::output::success("Cleared default branch cache")?;} else {crate::output::info("No default branch cache to clear")?;}@@ -541,7 +533,7 @@ pub fn handle_cache_clear(cache_type: Option<String>) -> anyhow::Result<()> {let cleared_ci = CachedCiStatus::clear_all(&repo) > 0;if cleared_default || cleared_ci {- crate::output::success(cformat!("<green>Cleared all caches</>"))?;+ crate::output::success("Cleared all caches")?;} else {crate::output::info("No caches to clear")?;}@@ -558,11 +550,11 @@ pub fn handle_cache_clear(cache_type: Option<String>) -> anyhow::Result<()> {pub fn handle_cache_refresh() -> anyhow::Result<()> {let repo = Repository::current();- crate::output::progress(cformat!("<cyan>Querying remote for default branch...</>"))?;+ crate::output::progress("Querying remote for default branch...")?;let branch = repo.refresh_default_branch()?;- crate::output::success(cformat!("<green>Cache refreshed: <bold>{branch}</></>"))?;+ crate::output::success(cformat!("Cache refreshed: <bold>{branch}</>"))?;Ok(())}diff --git a/src/commands/configure_shell.rs b/src/commands/configure_shell.rsindex 520c2d8c1..541e21c36 100644--- a/src/commands/configure_shell.rs+++ b/src/commands/configure_shell.rs@@ -173,15 +173,11 @@ pub fn handle_configure_shell(// Only show advisory if we positively detect it's missing (Some(false)).// If detection fails (None), stay silent - we can't be sure.if shell::detect_zsh_compinit() == Some(false) {- use color_print::cformat;- let _ = crate::output::warning(cformat!(- "<yellow>Completions won't work: zsh's compinit is not enabled.</>"- ));- let _ = crate::output::print(cformat!(- "<yellow> Add this to ~/.zshrc before the wt line:</>"- ));- let _ =- crate::output::print(cformat!("<yellow> autoload -Uz compinit && compinit</>"));+ let _ = crate::output::warning(+ "Completions won't work: zsh's compinit is not enabled.\n\+ Add this to ~/.zshrc before the wt line:\n\+ autoload -Uz compinit && compinit",+ );}}diff --git a/src/commands/hooks.rs b/src/commands/hooks.rsindex f5803c845..88682e4e2 100644--- a/src/commands/hooks.rs+++ b/src/commands/hooks.rs@@ -60,7 +60,7 @@ impl<'a> HookPipeline<'a> {for prepared in commands {let label =crate::commands::format_command_label(label_prefix, prepared.name.as_deref());- crate::output::progress(cformat!("<cyan>{label}:</>"))?;+ crate::output::progress(format!("{label}:"))?;crate::output::gutter(format_bash_with_gutter(&prepared.expanded, ""))?;if let Err(err) =@@ -92,9 +92,9 @@ impl<'a> HookPipeline<'a> {HookFailureStrategy::Warn => {let message = match &prepared.name {Some(name) => {- cformat!("<yellow>Command <bold>{name}</> failed: {err_msg}</>")+ cformat!("Command <bold>{name}</> failed: {err_msg}")}- None => cformat!("<yellow>Command failed: {err_msg}</>"),+ None => format!("Command failed: {err_msg}"),};crate::output::warning(message)?;@@ -142,7 +142,7 @@ impl<'a> HookPipeline<'a> {for prepared in commands {let label =crate::commands::format_command_label(label_prefix, prepared.name.as_deref());- crate::output::progress(cformat!("<cyan>{label}:</>"))?;+ crate::output::progress(format!("{label}:"))?;crate::output::gutter(format_bash_with_gutter(&prepared.expanded, ""))?;let name = prepared.name.as_deref().unwrap_or("cmd");@@ -156,10 +156,8 @@ impl<'a> HookPipeline<'a> {) {let err_msg = err.to_string();let message = match &prepared.name {- Some(name) => {- cformat!("<yellow>Failed to spawn \"{name}\": {err_msg}</>")- }- None => cformat!("<yellow>Failed to spawn command: {err_msg}</>"),+ Some(name) => format!("Failed to spawn \"{name}\": {err_msg}"),+ None => format!("Failed to spawn command: {err_msg}"),};crate::output::warning(message)?;}diff --git a/src/commands/repository_ext.rs b/src/commands/repository_ext.rsindex d1954e0fa..da186a633 100644--- a/src/commands/repository_ext.rs+++ b/src/commands/repository_ext.rs@@ -168,7 +168,7 @@ impl RepositoryCliExt for Repository {);crate::output::progress(cformat!(- "<cyan>Stashing changes in <bold>{}</><cyan>...</>",+ "Stashing changes in <bold>{}</>...",format_path_for_display(wt_path)))?;@@ -231,9 +231,7 @@ impl AutoStageWarning {let count = self.files.len();let file_word = if count == 1 { "file" } else { "files" };- crate::output::warning(cformat!(- "<yellow>Auto-staging {count} untracked {file_word}:</>"- ))?;+ crate::output::warning(format!("Auto-staging {count} untracked {file_word}:"))?;let joined_files = self.files.join("\n");crate::output::gutter(format_with_gutter(&joined_files, "", None))?;@@ -259,7 +257,7 @@ impl TargetWorktreeStash {pub(crate) fn restore(self) -> anyhow::Result<()> {crate::output::progress(cformat!(- "<cyan>Restoring stashed changes in <bold>{}</><cyan>...</>",+ "Restoring stashed changes in <bold>{}</>...",format_path_for_display(&self.path)))?;@@ -268,7 +266,7 @@ impl TargetWorktreeStash {.run_command(&["stash", "pop", "--quiet", &self.stash_ref]){crate::output::warning(cformat!(- "<yellow>Failed to restore stash <bold>{stash_ref}</> - run 'git stash pop {stash_ref}' in <bold>{path}</></>",+ "Failed to restore stash <bold>{stash_ref}</> - run 'git stash pop {stash_ref}' in <bold>{path}</>",stash_ref = self.stash_ref,path = format_path_for_display(&self.path),))?;diff --git a/src/commands/standalone.rs b/src/commands/standalone.rsindex baca02c6b..59d3e6a7b 100644--- a/src/commands/standalone.rs+++ b/src/commands/standalone.rs@@ -142,7 +142,7 @@ pub fn handle_squash(.unwrap_or(false);if skip_pre_commit && has_pre_commit {- crate::output::hint(cformat!("<dim>Skipping pre-commit hook (--no-verify)</>"))?;+ crate::output::hint("Skipping pre-commit hook (--no-verify)")?;} else if let Some(ref config) = project_config {HookPipeline::new(ctx).run_pre_commit(config, Some(&target_branch), auto_trust)?;}@@ -203,13 +203,13 @@ pub fn handle_squash(let parts = total_stats;let squash_progress = if parts.is_empty() {- cformat!(- "<cyan>Squashing {commit_count} {commit_text}{with_changes} into a single commit...</>"- )+ format!("Squashing {commit_count} {commit_text}{with_changes} into a single commit...")} else {+ // Gray parenthetical with separate cformat for closing paren (avoids optimizer)+ let parts_str = parts.join(", ");+ let paren_close = cformat!("<bright-black>)</>");cformat!(- "<cyan>Squashing {commit_count} {commit_text}{with_changes} into a single commit ({})...</>",- parts.join(", ")+ "Squashing {commit_count} {commit_text}{with_changes} into a single commit <bright-black>({parts_str}</>{paren_close}...")};crate::output::progress(squash_progress)?;@@ -218,14 +218,14 @@ pub fn handle_squash(if has_staged {let backup_message = format!("{} β {} (squash)", current_branch, target_branch);let (sha, _restore_cmd) = repo.create_safety_backup(&backup_message)?;- crate::output::hint(cformat!("<dim>Backup created @ {sha}</>"))?;+ crate::output::hint(format!("Backup created @ {sha}"))?;}// Get commit subjects for the squash messagelet subjects = repo.commit_subjects(&range)?;// Generate squash commit message- crate::output::progress(cformat!("<cyan>Generating squash commit message...</>"))?;+ crate::output::progress("Generating squash commit message...")?;generator.emit_hint_if_needed()?;@@ -254,8 +254,8 @@ pub fn handle_squash(// Check if there are actually any changes to commitif !repo.has_staged_changes()? {- crate::output::info(cformat!(- "<dim>No changes after squashing {commit_count} {commit_text}</>"+ crate::output::info(format!(+ "No changes after squashing {commit_count} {commit_text}"))?;return Ok(SquashResult::NoNetChanges);}@@ -271,7 +271,7 @@ pub fn handle_squash(.to_string();// Show success immediately after completing the squash- crate::output::success(cformat!("<green>Squashed @ <dim>{commit_hash}</></>"))?;+ crate::output::success(cformat!("Squashed @ <dim>{commit_hash}</>"))?;Ok(SquashResult::Squashed)}@@ -309,9 +309,7 @@ pub fn handle_rebase(target: Option<&str>) -> anyhow::Result<RebaseResult> {// Only show progress for true rebases (fast-forwards are instant)if !is_fast_forward {- crate::output::progress(cformat!(- "<cyan>Rebasing onto <bold>{target_branch}</>...</>"- ))?;+ crate::output::progress(cformat!("Rebasing onto <bold>{target_branch}</>..."))?;}let rebase_result = repo.run_command(&["rebase", &target_branch]);@@ -348,11 +346,9 @@ pub fn handle_rebase(target: Option<&str>) -> anyhow::Result<RebaseResult> {// Successif is_fast_forward {- crate::output::success(cformat!(- "<green>Fast-forwarded to <bold>{target_branch}</></>"- ))?;+ crate::output::success(cformat!("Fast-forwarded to <bold>{target_branch}</>"))?;} else {- crate::output::success(cformat!("<green>Rebased onto <bold>{target_branch}</></>"))?;+ crate::output::success(cformat!("Rebased onto <bold>{target_branch}</>"))?;}Ok(RebaseResult::Rebased)@@ -412,10 +408,10 @@ pub fn handle_standalone_add_approvals(force: bool, show_all: bool) -> anyhow::Rif approved {if force {// When using --force, commands aren't saved to config- crate::output::success(cformat!("<green>Commands approved; not saved (--force)</>"))?;+ crate::output::success("Commands approved; not saved (--force)")?;} else {// Interactive approval - commands were saved to config (unless save failed)- crate::output::success(cformat!("<green>Commands approved & saved to config</>"))?;+ crate::output::success("Commands approved & saved to config")?;}} else {crate::output::info("Commands declined")?;@@ -442,8 +438,8 @@ pub fn handle_standalone_clear_approvals(global: bool) -> anyhow::Result<()> {config.projects.clear();config.save().context("Failed to save config")?;- crate::output::success(cformat!(- "<green>Cleared approvals for {project_count} project{}</>",+ crate::output::success(format!(+ "Cleared approvals for {project_count} project{}",if project_count == 1 { "" } else { "s" }))?;} else {@@ -470,8 +466,8 @@ pub fn handle_standalone_clear_approvals(global: bool) -> anyhow::Result<()> {.revoke_project(&project_id).context("Failed to clear project approvals")?;- crate::output::success(cformat!(- "<green>Cleared {approval_count} approval{} for this project</>",+ crate::output::success(format!(+ "Cleared {approval_count} approval{} for this project",if approval_count == 1 { "" } else { "s" }))?;}diff --git a/src/commands/worktree.rs b/src/commands/worktree.rsindex c8f4f17ab..6aa864224 100644--- a/src/commands/worktree.rs+++ b/src/commands/worktree.rs@@ -234,19 +234,17 @@ pub fn handle_switch(if !remotes.is_empty() {let remote_ref = format!("{}/{}", remotes[0], resolved_branch);crate::output::warning(cformat!(- "<yellow>Branch <bold>{resolved_branch}</> exists on remote ({remote_ref}); creating new branch from base instead</>"+ "Branch <bold>{resolved_branch}</> exists on remote ({remote_ref}); creating new branch from base instead"))?;- crate::output::hint(cformat!(- "<dim>Use 'wt switch {resolved_branch}' (without --create) to switch to the remote branch</>"+ crate::output::hint(format!(+ "Use 'wt switch {resolved_branch}' (without --create) to switch to the remote branch"))?;}}// Check if base flag was provided without create flagif resolved_base.is_some() && !create {- crate::output::warning(cformat!(- "<yellow>--base flag is only used with --create, ignoring</>"- ))?;+ crate::output::warning("--base flag is only used with --create, ignoring")?;}// Check if worktree already exists for this branch@@ -641,7 +639,7 @@ pub fn handle_push(};crate::output::progress(cformat!(- "<cyan>{verb_ing} {commit_count} {commit_text} to <bold>{target_branch}</> @ <dim>{head_sha}</>{operations_note}</>"+ "{verb_ing} {commit_count} {commit_text} to <bold>{target_branch}</> @ <dim>{head_sha}</>{operations_note}"))?;// Show the commit graph with color@@ -694,9 +692,12 @@ pub fn handle_push()];summary_parts.extend(stats_summary);+ // Re-apply bright-black after stats (which end with a reset) so ) is also gray+ let stats_str = summary_parts.join(", ");+ let paren_close = cformat!("<bright-black>)</>"); // Separate to avoid cformat optimizationcrate::output::success(cformat!(- "<green>{verb} <bold>{target_branch}</> ({})</>",- summary_parts.join(", ")+ "{verb} <bold>{target_branch}</> <bright-black>({stats_str}</>{}",+ paren_close))?;} else {// For merge workflow context, explain why nothing was pusheddiff --git a/src/main.rs b/src/main.rsindex 40db028b4..4e7175a59 100644--- a/src/main.rs+++ b/src/main.rs@@ -301,7 +301,7 @@ fn main() {for (shell, path) in &scan_result.skipped {let path = format_path_for_display(path);crate::output::hint(cformat!(- "<dim>Skipped <bold>{shell}</>; {path} not found</>"+ "Skipped <bold>{shell}</>; {path} not found"))?;}@@ -350,11 +350,11 @@ fn main() {// Fish auto-sources from conf.d, so just say "Restart shell"// Bash/Zsh can source directly for immediate activationif matches!(result.shell, worktrunk::shell::Shell::Fish) {- crate::output::hint(cformat!("<dim>Restart shell to activate</>"))?;+ crate::output::hint("Restart shell to activate")?;} else {let path = format_path_for_display(&result.path);- crate::output::hint(cformat!(- "<dim>Restart shell or run: source {path}</>"+ crate::output::hint(format!(+ "Restart shell or run: source {path}"))?;}}@@ -421,8 +421,8 @@ fn main() {"No {what} found in {path}"))?;} else {- crate::output::hint(cformat!(- "<dim>No {shell} {what} in {path}</>"+ crate::output::hint(format!(+ "No {shell} {what} in {path}"))?;}}@@ -442,8 +442,8 @@ fn main() {"No completions found in {path}"))?;} else {- crate::output::hint(cformat!(- "<dim>No {shell} completions in {path}</>"+ crate::output::hint(format!(+ "No {shell} completions in {path}"))?;}}@@ -454,9 +454,9 @@ fn main() {if total_changes == 0 {if all_not_found == 0 {crate::output::blank()?;- crate::output::hint(cformat!(- "<dim>No shell integration found to remove</>"- ))?;+ crate::output::hint(+ "No shell integration found to remove",+ )?;}return Ok(());}@@ -481,9 +481,7 @@ fn main() {});if current_shell_affected {- crate::output::hint(cformat!(- "<dim>Restart shell to complete uninstall</>"- ))?;+ crate::output::hint("Restart shell to complete uninstall")?;}Ok(())})diff --git a/src/output/traits.rs b/src/output/traits.rsindex b71186f1d..19b9e27a9 100644--- a/src/output/traits.rs+++ b/src/output/traits.rs@@ -3,10 +3,25 @@//! This trait extracts common patterns between Interactive and Directive output modes.//! The fundamental operation is `write_message_line` - implementations control where//! messages go (stdout for interactive, stderr for directive).+//!+//! # Semantic Colors+//!+//! Output functions automatically wrap content in semantic colors:+//! - success β green+//! - progress β cyan+//! - hint β dimmed+//! - warning β yellow+//! - info β no color (neutral status)+//!+//! Callers provide content with optional inner styling (like `<bold>`) using `cformat!`.+//! The trait adds the outer semantic color, so callers don't repeat `<green>...</>` etc.use std::io::{self, Write};use std::path::Path;-use worktrunk::styling::{HINT_EMOJI, INFO_EMOJI, PROGRESS_EMOJI, SUCCESS_EMOJI, WARNING_EMOJI};+use worktrunk::styling::{+ CYAN, GREEN, HINT, HINT_EMOJI, INFO_EMOJI, PROGRESS_EMOJI, SUCCESS_EMOJI, WARNING,+ WARNING_EMOJI,+};/// Core output handler trait///@@ -16,29 +31,29 @@ pub trait OutputHandler {/// Write a single logical message line to the primary user streamfn write_message_line(&mut self, line: &str) -> io::Result<()>;- /// Emit a success message+ /// Emit a success message (automatically wrapped in green)fn success(&mut self, message: String) -> io::Result<()> {- self.write_message_line(&format!("{SUCCESS_EMOJI} {message}"))+ self.write_message_line(&format!("{SUCCESS_EMOJI} {GREEN}{message}{GREEN:#}"))}- /// Emit a progress message+ /// Emit a progress message (automatically wrapped in cyan)fn progress(&mut self, message: String) -> io::Result<()> {- self.write_message_line(&format!("{PROGRESS_EMOJI} {message}"))+ self.write_message_line(&format!("{PROGRESS_EMOJI} {CYAN}{message}{CYAN:#}"))}- /// Emit a hint message+ /// Emit a hint message (automatically wrapped in dim)fn hint(&mut self, message: String) -> io::Result<()> {- self.write_message_line(&format!("{HINT_EMOJI} {message}"))+ self.write_message_line(&format!("{HINT_EMOJI} {HINT}{message}{HINT:#}"))}- /// Emit an info message+ /// Emit an info message (no color - neutral status)fn info(&mut self, message: String) -> io::Result<()> {self.write_message_line(&format!("{INFO_EMOJI} {message}"))}- /// Emit a warning message+ /// Emit a warning message (automatically wrapped in yellow)fn warning(&mut self, message: String) -> io::Result<()> {- self.write_message_line(&format!("{WARNING_EMOJI} {message}"))+ self.write_message_line(&format!("{WARNING_EMOJI} {WARNING}{message}{WARNING:#}"))}/// Print a message (written as-is)diff --git a/tests/integration_tests/config_init.rs b/tests/integration_tests/config_init.rsindex 4c208e445..0bd1eb7f4 100644--- a/tests/integration_tests/config_init.rs+++ b/tests/integration_tests/config_init.rs@@ -32,8 +32,8 @@ fn test_config_init_already_exists() {----- stderr -----βͺ Global config already exists: [1m~/.config/worktrunk/config.toml[22m- π‘ [2mUse 'wt config show' to view existing configuration[22m- π‘ [2mUse 'wt config create --help' for config format reference[22m+ π‘ [2mUse 'wt config show' to view existing configuration[0m+ π‘ [2mUse 'wt config create --help' for config format reference[0m");});}@@ -59,9 +59,9 @@ fn test_config_init_creates_file() {----- stdout ---------- stderr ------ β [32mCreated config file: [1m~/.config/worktrunk/config.toml[39m[22m+ β [32mCreated config file: [1m~/.config/worktrunk/config.toml[22m[0m- π‘ [2mEdit this file to customize worktree paths and LLM settings[22m+ π‘ [2mEdit this file to customize worktree paths and LLM settings[0m");});diff --git a/tests/integration_tests/config_status.rs b/tests/integration_tests/config_status.rsindex 192e44941..08071913e 100644--- a/tests/integration_tests/config_status.rs+++ b/tests/integration_tests/config_status.rs@@ -20,7 +20,7 @@ fn test_config_status_set_branch_default() {.output().unwrap();assert!(output.status.success());- assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"β [32mSet status for [1mmain[22m to [1mπ§[39m[22m");+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"β [32mSet status for [1mmain[22m to [1mπ§[22m[0m");// Verify it was setlet output = repo@@ -40,7 +40,7 @@ fn test_config_status_set_branch_specific() {.output().unwrap();assert!(output.status.success());- assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"β [32mSet status for [1mfeature[22m to [1mπ§[39m[22m");+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"β [32mSet status for [1mfeature[22m to [1mπ§[22m[0m");// Verify it was setlet output = repo@@ -62,7 +62,7 @@ fn test_config_status_unset_branch_default() {let output = wt_config_status_cmd(&repo, &["unset"]).output().unwrap();assert!(output.status.success());- assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"β [32mCleared status for [1mmain[39m[22m");+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"β [32mCleared status for [1mmain[22m[0m");// Verify it was unsetlet output = repo@@ -86,7 +86,7 @@ fn test_config_status_unset_branch_specific() {.output().unwrap();assert!(output.status.success());- assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"β [32mCleared status for [1mfeature[39m[22m");+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"β [32mCleared status for [1mfeature[22m[0m");// Verify it was unsetlet output = repo@@ -116,7 +116,7 @@ fn test_config_status_unset_all() {.output().unwrap();assert!(output.status.success());- assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"β [32mCleared [1m3[22m statuses[39m");+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"β [32mCleared [1m3[22m statuses[0m");// Verify all were unsetlet output = repodiff --git a/tests/integration_tests/configure_shell.rs b/tests/integration_tests/configure_shell.rsindex 535357b13..1f86f9d13 100644--- a/tests/integration_tests/configure_shell.rs+++ b/tests/integration_tests/configure_shell.rs@@ -31,15 +31,15 @@ fn test_configure_shell_with_yes() {----- stdout ---------- stderr ------ π‘ [33mCompletions won't work: zsh's compinit is not enabled.[39m- [33m Add this to ~/.zshrc before the wt line:[39m- [33m autoload -Uz compinit && compinit[39m- β Added shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m- π‘ [2mSkipped [1mbash[22m; ~/.bashrc not found[22m- π‘ [2mSkipped [1mfish[22m; ~/.config/fish/conf.d not found[22m-- β Configured 1 shell- π‘ [2mRestart shell or run: source ~/.zshrc[22m+ π‘ [33mCompletions won't work: zsh's compinit is not enabled.+ Add this to ~/.zshrc before the wt line:+ autoload -Uz compinit && compinit[0m+ β [32mAdded shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m[0m+ π‘ [2mSkipped [1mbash[22m; ~/.bashrc not found[0m+ π‘ [2mSkipped [1mfish[22m; ~/.config/fish/conf.d not found[0m++ β [32mConfigured 1 shell[0m+ π‘ [2mRestart shell or run: source ~/.zshrc[0m");});@@ -77,13 +77,13 @@ fn test_configure_shell_specific_shell() {----- stdout ---------- stderr ------ π‘ [33mCompletions won't work: zsh's compinit is not enabled.[39m- [33m Add this to ~/.zshrc before the wt line:[39m- [33m autoload -Uz compinit && compinit[39m- β Added shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m+ π‘ [33mCompletions won't work: zsh's compinit is not enabled.+ Add this to ~/.zshrc before the wt line:+ autoload -Uz compinit && compinit[0m+ β [32mAdded shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m[0m- β Configured 1 shell- π‘ [2mRestart shell or run: source ~/.zshrc[22m+ β [32mConfigured 1 shell[0m+ π‘ [2mRestart shell or run: source ~/.zshrc[0m");});@@ -161,11 +161,11 @@ fn test_configure_shell_fish() {----- stdout ---------- stderr ------ β Created shell extension for [1mfish[22m @ [1m~/.config/fish/conf.d/wt.fish[22m- β Created completions for [1mfish[22m @ [1m~/.config/fish/completions/wt.fish[22m+ β [32mCreated shell extension for [1mfish[22m @ [1m~/.config/fish/conf.d/wt.fish[22m[0m+ β [32mCreated completions for [1mfish[22m @ [1m~/.config/fish/completions/wt.fish[22m[0m- β Configured 1 shell- π‘ [2mRestart shell to activate[22m+ β [32mConfigured 1 shell[0m+ π‘ [2mRestart shell to activate[0m");});@@ -220,9 +220,9 @@ fn test_configure_shell_fish_extension_exists() {----- stderr -----βͺ Already configured shell extension for [1mfish[22m @ [1m~/.config/fish/conf.d/wt.fish[22m- β Created completions for [1mfish[22m @ [1m~/.config/fish/completions/wt.fish[22m+ β [32mCreated completions for [1mfish[22m @ [1m~/.config/fish/completions/wt.fish[22m[0m- β Configured 1 shell+ β [32mConfigured 1 shell[0m");});@@ -263,9 +263,9 @@ fn test_configure_shell_no_files() {----- stdout ---------- stderr ------ π‘ [2mSkipped [1mbash[22m; ~/.bashrc not found[22m- π‘ [2mSkipped [1mzsh[22m; ~/.zshrc not found[22m- π‘ [2mSkipped [1mfish[22m; ~/.config/fish/conf.d not found[22m+ π‘ [2mSkipped [1mbash[22m; ~/.bashrc not found[0m+ π‘ [2mSkipped [1mzsh[22m; ~/.zshrc not found[0m+ π‘ [2mSkipped [1mfish[22m; ~/.config/fish/conf.d not found[0mβ [31mNo shell config files found[39m");});@@ -301,15 +301,15 @@ fn test_configure_shell_multiple_configs() {----- stdout ---------- stderr ------ π‘ [33mCompletions won't work: zsh's compinit is not enabled.[39m- [33m Add this to ~/.zshrc before the wt line:[39m- [33m autoload -Uz compinit && compinit[39m- β Added shell extension & completions for [1mbash[22m @ [1m~/.bashrc[22m- β Added shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m- π‘ [2mSkipped [1mfish[22m; ~/.config/fish/conf.d not found[22m-- β Configured 2 shells- π‘ [2mRestart shell or run: source ~/.zshrc[22m+ π‘ [33mCompletions won't work: zsh's compinit is not enabled.+ Add this to ~/.zshrc before the wt line:+ autoload -Uz compinit && compinit[0m+ β [32mAdded shell extension & completions for [1mbash[22m @ [1m~/.bashrc[22m[0m+ β [32mAdded shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m[0m+ π‘ [2mSkipped [1mfish[22m; ~/.config/fish/conf.d not found[0m++ β [32mConfigured 2 shells[0m+ π‘ [2mRestart shell or run: source ~/.zshrc[0m");});@@ -363,15 +363,15 @@ fn test_configure_shell_mixed_states() {----- stdout ---------- stderr ------ π‘ [33mCompletions won't work: zsh's compinit is not enabled.[39m- [33m Add this to ~/.zshrc before the wt line:[39m- [33m autoload -Uz compinit && compinit[39m+ π‘ [33mCompletions won't work: zsh's compinit is not enabled.+ Add this to ~/.zshrc before the wt line:+ autoload -Uz compinit && compinit[0mβͺ Already configured shell extension & completions for [1mbash[22m @ [1m~/.bashrc[22m- β Added shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m- π‘ [2mSkipped [1mfish[22m; ~/.config/fish/conf.d not found[22m+ β [32mAdded shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m[0m+ π‘ [2mSkipped [1mfish[22m; ~/.config/fish/conf.d not found[0m- β Configured 1 shell- π‘ [2mRestart shell or run: source ~/.zshrc[22m+ β [32mConfigured 1 shell[0m+ π‘ [2mRestart shell or run: source ~/.zshrc[0m");});@@ -423,13 +423,13 @@ fn test_uninstall_shell() {----- stdout ---------- stderr ------ β Removed shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m- π‘ [2mNo bash shell extension & completions in ~/.bashrc[22m- π‘ [2mNo fish shell extension in ~/.config/fish/conf.d/wt.fish[22m- π‘ [2mNo fish completions in ~/.config/fish/completions/wt.fish[22m+ β [32mRemoved shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m[0m+ π‘ [2mNo bash shell extension & completions in ~/.bashrc[0m+ π‘ [2mNo fish shell extension in ~/.config/fish/conf.d/wt.fish[0m+ π‘ [2mNo fish completions in ~/.config/fish/completions/wt.fish[0m- β Removed integration from 1 shell- π‘ [2mRestart shell to complete uninstall[22m+ β [32mRemoved integration from 1 shell[0m+ π‘ [2mRestart shell to complete uninstall[0m");});@@ -483,13 +483,13 @@ fn test_uninstall_shell_multiple() {----- stdout ---------- stderr ------ β Removed shell extension & completions for [1mbash[22m @ [1m~/.bashrc[22m- β Removed shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m- π‘ [2mNo fish shell extension in ~/.config/fish/conf.d/wt.fish[22m- π‘ [2mNo fish completions in ~/.config/fish/completions/wt.fish[22m+ β [32mRemoved shell extension & completions for [1mbash[22m @ [1m~/.bashrc[22m[0m+ β [32mRemoved shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m[0m+ π‘ [2mNo fish shell extension in ~/.config/fish/conf.d/wt.fish[0m+ π‘ [2mNo fish completions in ~/.config/fish/completions/wt.fish[0m- β Removed integration from 2 shells- π‘ [2mRestart shell to complete uninstall[22m+ β [32mRemoved integration from 2 shells[0m+ π‘ [2mRestart shell to complete uninstall[0m");});@@ -536,7 +536,7 @@ fn test_uninstall_shell_not_found() {----- stdout ---------- stderr ------ π‘ No shell extension & completions found in ~/.zshrc+ π‘ [33mNo shell extension & completions found in ~/.zshrc[0m");});}@@ -576,10 +576,10 @@ fn test_uninstall_shell_fish() {----- stdout ---------- stderr ------ β Removed shell extension for [1mfish[22m @ [1m~/.config/fish/conf.d/wt.fish[22m+ β [32mRemoved shell extension for [1mfish[22m @ [1m~/.config/fish/conf.d/wt.fish[22m[0m- β Removed integration from 1 shell- π‘ [2mRestart shell to complete uninstall[22m+ β [32mRemoved integration from 1 shell[0m+ π‘ [2mRestart shell to complete uninstall[0m");});@@ -690,10 +690,10 @@ fn test_configure_shell_no_warning_when_compinit_enabled() {----- stdout ---------- stderr ------ β Added shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m+ β [32mAdded shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m[0m- β Configured 1 shell- π‘ [2mRestart shell or run: source ~/.zshrc[22m+ β [32mConfigured 1 shell[0m+ π‘ [2mRestart shell or run: source ~/.zshrc[0m");});}@@ -730,12 +730,12 @@ fn test_configure_shell_no_warning_for_bash_user() {----- stdout ---------- stderr ------ β Added shell extension & completions for [1mbash[22m @ [1m~/.bashrc[22m- β Added shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m- π‘ [2mSkipped [1mfish[22m; ~/.config/fish/conf.d not found[22m+ β [32mAdded shell extension & completions for [1mbash[22m @ [1m~/.bashrc[22m[0m+ β [32mAdded shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m[0m+ π‘ [2mSkipped [1mfish[22m; ~/.config/fish/conf.d not found[0m- β Configured 2 shells- π‘ [2mRestart shell or run: source ~/.bashrc[22m+ β [32mConfigured 2 shells[0m+ π‘ [2mRestart shell or run: source ~/.bashrc[0m");});}@@ -771,10 +771,10 @@ fn test_configure_shell_no_warning_for_fish_install() {----- stdout ---------- stderr ------ β Created shell extension for [1mfish[22m @ [1m~/.config/fish/conf.d/wt.fish[22m- β Created completions for [1mfish[22m @ [1m~/.config/fish/completions/wt.fish[22m+ β [32mCreated shell extension for [1mfish[22m @ [1m~/.config/fish/conf.d/wt.fish[22m[0m+ β [32mCreated completions for [1mfish[22m @ [1m~/.config/fish/completions/wt.fish[22m[0m- β Configured 1 shell+ β [32mConfigured 1 shell[0m");});}@@ -850,11 +850,11 @@ fn test_configure_shell_no_warning_when_shell_unset() {----- stdout ---------- stderr ------ β Added shell extension & completions for [1mbash[22m @ [1m~/.bashrc[22m- β Added shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m- π‘ [2mSkipped [1mfish[22m; ~/.config/fish/conf.d not found[22m+ β [32mAdded shell extension & completions for [1mbash[22m @ [1m~/.bashrc[22m[0m+ β [32mAdded shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m[0m+ π‘ [2mSkipped [1mfish[22m; ~/.config/fish/conf.d not found[0m- β Configured 2 shells+ β [32mConfigured 2 shells[0m");});}diff --git a/tests/integration_tests/directives.rs b/tests/integration_tests/directives.rsindex b57e778f2..7f1251e99 100644--- a/tests/integration_tests/directives.rs+++ b/tests/integration_tests/directives.rs@@ -91,7 +91,7 @@ fn test_remove_internal_directive() {cd '[PATH]'----- stderr ------ π [36mRemoving [1mmain[22m worktree & branch in background[39m+ π [36m[36mRemoving [1mmain[22m worktree & branch in background[39m[0m");});}@@ -116,7 +116,7 @@ fn test_remove_without_internal() {----- stdout ---------- stderr ------ π [36mRemoving [1mmain[22m worktree & branch in background[39m+ π [36m[36mRemoving [1mmain[22m worktree & branch in background[39m[0m");});}diff --git a/tests/integration_tests/merge.rs b/tests/integration_tests/merge.rsindex 1f814aa5c..3dba94fda 100644--- a/tests/integration_tests/merge.rs+++ b/tests/integration_tests/merge.rs@@ -2454,11 +2454,11 @@ fn test_merge_no_commit_with_clean_tree() {----- stdout ---------- stderr ------ π [36mMerging 1 commit to [1mmain[22m @ [2m6551244[22m (no commit/squash/rebase needed)[39m+ π [36mMerging 1 commit to [1mmain[22m @ [2m6551244[22m (no commit/squash/rebase needed)[0m[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)- β [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m+ β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[0m[39m[90m)[39m[0mβͺ Worktree preserved (--no-remove)");});@@ -2557,11 +2557,11 @@ fn test_merge_no_commit_no_squash_no_remove_redundant() {----- stdout ---------- stderr ------ π [36mMerging 1 commit to [1mmain[22m @ [2m6551244[22m (no commit/squash/rebase needed)[39m+ π [36mMerging 1 commit to [1mmain[22m @ [2m6551244[22m (no commit/squash/rebase needed)[0m[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)- β [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m+ β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[0m[39m[90m)[39m[0mβͺ Worktree preserved (--no-remove)");});diff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snapindex 79400930f..e283096f5 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_accept.snap@@ -10,8 +10,8 @@ y[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test command'[0m[2m[0mπ‘ Allow and remember? [1m[y/N][22m-π [36mRunning post-create:[39m+π [36mRunning post-create:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test command'[0m[2m[0m[0mtest command-β [32mCreated new worktree for [1mtest-approve[22m from [1mmain[22m at [1m[REPO]/repo.test-approve[39m[22m-π‘ [2mRun `wt config shell install` to enable automatic cd[22m+β [32m[32mCreated new worktree for [1mtest-approve[22m from [1mmain[22m at [1m[REPO]/repo.test-approve[39m[22m[0m+π‘ [2m[2mRun `wt config shell install` to enable automatic cd[22m[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snapindex 2d808bfff..5663b00fc 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_decline.snap@@ -11,5 +11,5 @@ nπ‘ Allow and remember? [1m[y/N][22mβͺ Commands declined, continuing worktree creation-β [32mCreated new worktree for [1mtest-decline[22m from [1mmain[22m at [1m[REPO]/repo.test-decline[39m[22m-π‘ [2mRun `wt config shell install` to enable automatic cd[22m+β [32m[32mCreated new worktree for [1mtest-decline[22m from [1mmain[22m at [1m[REPO]/repo.test-decline[39m[22m[0m+π‘ [2m[2mRun `wt config shell install` to enable automatic cd[22m[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snapindex 2b5e00f39..d07ae95a3 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_accept.snap@@ -13,14 +13,14 @@ y[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Third command'[0m[2m[0mπ‘ Allow and remember? [1m[y/N][22m-π [36mRunning post-create:[39m+π [36mRunning post-create:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'First command'[0m[2m[0m[0mFirst command-π [36mRunning post-create:[39m+π [36mRunning post-create:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Second command'[0m[2m[0m[0mSecond command-π [36mRunning post-create:[39m+π [36mRunning post-create:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Third command'[0m[2m[0m[0mThird command-β [32mCreated new worktree for [1mtest-mixed-accept[22m from [1mmain[22m at [1m[REPO]/repo.test-mixed-accept[39m[22m-π‘ [2mRun `wt config shell install` to enable automatic cd[22m+β [32m[32mCreated new worktree for [1mtest-mixed-accept[22m from [1mmain[22m at [1m[REPO]/repo.test-mixed-accept[39m[22m[0m+π‘ [2m[2mRun `wt config shell install` to enable automatic cd[22m[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snapindex f6aa93785..4bf9d273b 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_mixed_approved_unapproved_decline.snap@@ -14,5 +14,5 @@ nπ‘ Allow and remember? [1m[y/N][22mβͺ Commands declined, continuing worktree creation-β [32mCreated new worktree for [1mtest-mixed-decline[22m from [1mmain[22m at [1m[REPO]/repo.test-mixed-decline[39m[22m-π‘ [2mRun `wt config shell install` to enable automatic cd[22m+β [32m[32mCreated new worktree for [1mtest-mixed-decline[22m from [1mmain[22m at [1m[REPO]/repo.test-mixed-decline[39m[22m[0m+π‘ [2m[2mRun `wt config shell install` to enable automatic cd[22m[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snapindex aec98d35b..c90ae37be 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_multiple_commands.snap@@ -16,14 +16,14 @@ y[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Third command'[0m[2m[0mπ‘ Allow and remember? [1m[y/N][22m-π [36mRunning post-create:[39m+π [36mRunning post-create:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'First command'[0m[2m[0m[0mFirst command-π [36mRunning post-create:[39m+π [36mRunning post-create:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Second command'[0m[2m[0m[0mSecond command-π [36mRunning post-create:[39m+π [36mRunning post-create:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Third command'[0m[2m[0m[0mThird command-β [32mCreated new worktree for [1mtest-multi[22m from [1mmain[22m at [1m[REPO]/repo.test-multi[39m[22m-π‘ [2mRun `wt config shell install` to enable automatic cd[22m+β [32m[32mCreated new worktree for [1mtest-multi[22m from [1mmain[22m at [1m[REPO]/repo.test-multi[39m[22m[0m+π‘ [2m[2mRun `wt config shell install` to enable automatic cd[22m[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snapindex 04af4db18..9dacd3a83 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_named_commands.snap@@ -16,14 +16,14 @@ y[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Running tests...'[0m[2m[0mπ‘ Allow and remember? [1m[y/N][22m-π [36mRunning post-create [1minstall[22m:[39m+π [36mRunning post-create [1minstall[22m:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Installing dependencies...'[0m[2m[0m[0mInstalling dependencies...-π [36mRunning post-create [1mbuild[22m:[39m+π [36mRunning post-create [1mbuild[22m:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Building project...'[0m[2m[0m[0mBuilding project...-π [36mRunning post-create [1mtest[22m:[39m+π [36mRunning post-create [1mtest[22m:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Running tests...'[0m[2m[0m[0mRunning tests...-β [32mCreated new worktree for [1mtest-named[22m from [1mmain[22m at [1m[REPO]/repo.test-named[39m[22m-π‘ [2mRun `wt config shell install` to enable automatic cd[22m+β [32m[32mCreated new worktree for [1mtest-named[22m from [1mmain[22m at [1m[REPO]/repo.test-named[39m[22m[0m+π‘ [2m[2mRun `wt config shell install` to enable automatic cd[22m[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snap b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snapindex 5bd4e8a01..8bf64226b 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_permission_error.snap@@ -10,10 +10,10 @@ y[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test command'[0m[2m[0mπ‘ Allow and remember? [1m[y/N][22m-π‘ Failed to save command approval: Failed to write config file: Permission denied (os error 13)-π‘ [2mApproval will be requested again next time.[22m-π [36mRunning post-create:[39m+π‘ [33mFailed to save command approval: Failed to write config file: Permission denied (os error 13)[0m+π‘ [2mApproval will be requested again next time.[0m+π [36mRunning post-create:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test command'[0m[2m[0m[0mtest command-β [32mCreated new worktree for [1mtest-permission[22m from [1mmain[22m at [1m[REPO]/repo.test-permission[39m[22m-π‘ [2mRun `wt config shell install` to enable automatic cd[22m+β [32m[32mCreated new worktree for [1mtest-permission[22m from [1mmain[22m at [1m[REPO]/repo.test-permission[39m[22m[0m+π‘ [2m[2mRun `wt config shell install` to enable automatic cd[22m[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__bash_shell_integration_hint_suppressed.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__bash_shell_integration_hint_suppressed.snapindex b812bd367..de28536f8 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__bash_shell_integration_hint_suppressed.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__bash_shell_integration_hint_suppressed.snap@@ -2,4 +2,4 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()----β [32mCreated new worktree for [1mbash-test[22m from [1mmain[22m at [1m[TMPDIR]/repo.bash-test[39m[22m+β [32m[32mCreated new worktree for [1mbash-test[22m from [1mmain[22m at [1m[TMPDIR]/repo.bash-test[39m[22m[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_multiline_command_execution.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_multiline_command_execution.snapindex d8ba731b9..a90ad055a 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_multiline_command_execution.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_multiline_command_execution.snap@@ -2,8 +2,8 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()----β [32mCreated new worktree for [1mfish-multiline[22m from [1mmain[22m at [1m[TMPDIR]/repo.fish-multiline[39m[22m-π [36mExecuting (--execute):[39m+β [32m[32mCreated new worktree for [1mfish-multiline[22m from [1mmain[22m at [1m[TMPDIR]/repo.fish-multiline[39m[22m[0m+π [36m[36mExecuting (--execute):[39m[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'line 1'[0m[2m; [0m[2m[34mecho[0m[2m [0m[2m[32m'line 2'[0m[2m; [0m[2m[34mecho[0m[2m [0m[2m[32m'line 3'[0m[2m[0mline 1line 2diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_handles_empty_chunks.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_handles_empty_chunks.snapindex cd78a4ba8..a4a68346c 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_handles_empty_chunks.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_handles_empty_chunks.snap@@ -2,4 +2,4 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()----β [32mCreated new worktree for [1mfish-minimal[22m from [1mmain[22m at [1m[TMPDIR]/repo.fish-minimal[39m[22m+β [32m[32mCreated new worktree for [1mfish-minimal[22m from [1mmain[22m at [1m[TMPDIR]/repo.fish-minimal[39m[22m[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snapindex 581a91aea..b35b9a6b4 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__fish_wrapper_preserves_progress_messages.snap@@ -2,6 +2,6 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()----β [32mCreated new worktree for [1mfish-bg[22m from [1mmain[22m at [1m[TMPDIR]/repo.fish-bg[39m[22m-π [36mRunning post-start:[39m+β [32m[32mCreated new worktree for [1mfish-bg[22m from [1mmain[22m at [1m[TMPDIR]/repo.fish-bg[39m[22m[0m+π [36mRunning post-start:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'fish background task'[0m[2m[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snapindex 665ee74cf..ae214e0e7 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap@@ -2,7 +2,7 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()----π [36mRunning pre-merge [1mcheck1[22m:[39m+π [36mRunning pre-merge [1mcheck1[22m:[0m[107m [0m [2m[0m[2m[34m[TMPDIR]/repo/mixed-output.sh[0m[2m check1 3[0m[check1] stdout line 1[check1] stderr line 1@@ -12,7 +12,7 @@ expression: output.normalized()[check1] stderr line 3[check1] stdout complete[check1] stderr complete-π [36mRunning pre-merge [1mcheck2[22m:[39m+π [36mRunning pre-merge [1mcheck2[22m:[0m[107m [0m [2m[0m[2m[34m[TMPDIR]/repo/mixed-output.sh[0m[2m check2 3[0m[check2] stdout line 1[check2] stderr line 1@@ -22,9 +22,9 @@ expression: output.normalized()[check2] stderr line 3[check2] stdout complete[check2] stderr complete-π [36mMerging 1 commit to [1mmain[22m @ [2m[HASH][22m (no commit/squash/rebase needed)[39m+π [36mMerging 1 commit to [1mmain[22m @ [2m[HASH][22m (no commit/squash/rebase needed)[0m[107m [0m * [33m[HASH][m Add feature[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m-π [36mRemoving [1mfeature[22m worktree & branch in background[39m+β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[0m[39m[90m)[39m[0m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background[39m[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snapindex 665ee74cf..ae214e0e7 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap@@ -2,7 +2,7 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()----π [36mRunning pre-merge [1mcheck1[22m:[39m+π [36mRunning pre-merge [1mcheck1[22m:[0m[107m [0m [2m[0m[2m[34m[TMPDIR]/repo/mixed-output.sh[0m[2m check1 3[0m[check1] stdout line 1[check1] stderr line 1@@ -12,7 +12,7 @@ expression: output.normalized()[check1] stderr line 3[check1] stdout complete[check1] stderr complete-π [36mRunning pre-merge [1mcheck2[22m:[39m+π [36mRunning pre-merge [1mcheck2[22m:[0m[107m [0m [2m[0m[2m[34m[TMPDIR]/repo/mixed-output.sh[0m[2m check2 3[0m[check2] stdout line 1[check2] stderr line 1@@ -22,9 +22,9 @@ expression: output.normalized()[check2] stderr line 3[check2] stdout complete[check2] stderr complete-π [36mMerging 1 commit to [1mmain[22m @ [2m[HASH][22m (no commit/squash/rebase needed)[39m+π [36mMerging 1 commit to [1mmain[22m @ [2m[HASH][22m (no commit/squash/rebase needed)[0m[107m [0m * [33m[HASH][m Add feature[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m-π [36mRemoving [1mfeature[22m worktree & branch in background[39m+β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[0m[39m[90m)[39m[0m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background[39m[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snapindex db9509e1f..f206874b9 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_bash.snap@@ -2,10 +2,10 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()----π [36mRunning pre-merge [1mformat[22m:[39m+π [36mRunning pre-merge [1mformat[22m:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'β Code formatting check passed'[0m[2m[0mβ Code formatting check passed-π [36mRunning pre-merge [1mtest[22m:[39m+π [36mRunning pre-merge [1mtest[22m:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'β Test suite failed: 3 tests failing'[0m[2m [0m[2m[36m&&[0m[2m [0m[2m[34mexit[0m[2m 1[0mβ Test suite failed: 3 tests failingβ [31mpre-merge command failed: [1mtest[22m: exit status: 1[39mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snapindex db9509e1f..f206874b9 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap@@ -2,10 +2,10 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()----π [36mRunning pre-merge [1mformat[22m:[39m+π [36mRunning pre-merge [1mformat[22m:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'β Code formatting check passed'[0m[2m[0mβ Code formatting check passed-π [36mRunning pre-merge [1mtest[22m:[39m+π [36mRunning pre-merge [1mtest[22m:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'β Test suite failed: 3 tests failing'[0m[2m [0m[2m[36m&&[0m[2m [0m[2m[34mexit[0m[2m 1[0mβ Test suite failed: 3 tests failingβ [31mpre-merge command failed: [1mtest[22m: exit status: 1[39mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snapindex 61ab244f2..e6ef53404 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap@@ -2,18 +2,18 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()----π [36mRunning pre-merge [1mformat[22m:[39m+π [36mRunning pre-merge [1mformat[22m:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'β Code formatting check passed'[0m[2m[0mβ Code formatting check passed-π [36mRunning pre-merge [1mlint[22m:[39m+π [36mRunning pre-merge [1mlint[22m:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'β Linting passed - no warnings'[0m[2m[0mβ Linting passed - no warnings-π [36mRunning pre-merge [1mtest[22m:[39m+π [36mRunning pre-merge [1mtest[22m:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'β All 47 tests passed in 2.3s'[0m[2m[0mβ All 47 tests passed in 2.3s-π [36mMerging 1 commit to [1mmain[22m @ [2m[HASH][22m (no commit/squash/rebase needed)[39m+π [36mMerging 1 commit to [1mmain[22m @ [2m[HASH][22m (no commit/squash/rebase needed)[0m[107m [0m * [33m[HASH][m Add feature[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m-π [36mRemoving [1mfeature[22m worktree & branch in background[39m+β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[0m[39m[90m)[39m[0m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background[39m[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snapindex 61ab244f2..e6ef53404 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap@@ -2,18 +2,18 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()----π [36mRunning pre-merge [1mformat[22m:[39m+π [36mRunning pre-merge [1mformat[22m:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'β Code formatting check passed'[0m[2m[0mβ Code formatting check passed-π [36mRunning pre-merge [1mlint[22m:[39m+π [36mRunning pre-merge [1mlint[22m:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'β Linting passed - no warnings'[0m[2m[0mβ Linting passed - no warnings-π [36mRunning pre-merge [1mtest[22m:[39m+π [36mRunning pre-merge [1mtest[22m:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'β All 47 tests passed in 2.3s'[0m[2m[0mβ All 47 tests passed in 2.3s-π [36mMerging 1 commit to [1mmain[22m @ [2m[HASH][22m (no commit/squash/rebase needed)[39m+π [36mMerging 1 commit to [1mmain[22m @ [2m[HASH][22m (no commit/squash/rebase needed)[0m[107m [0m * [33m[HASH][m Add feature[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m-π [36mRemoving [1mfeature[22m worktree & branch in background[39m+β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[0m[39m[90m)[39m[0m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background[39m[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_post_create.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_post_create.snapindex 83d578ae7..6c35db3a4 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_post_create.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_post_create.snap@@ -2,11 +2,11 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()----π [36mRunning post-create [1minstall[22m:[39m+π [36mRunning post-create [1minstall[22m:[0m[107m [0m [2m[0m[2m[34muv[0m[2m sync[0mResolved 24 packages in 145msInstalled 24 packages in 1.2s-β [32mCreated new worktree for [1mfeature-x[22m from [1mmain[22m at [1m[TMPDIR]/repo.feature-x[39m[22m-π [36mRunning post-start [1mdev[22m:[39m+β [32m[32mCreated new worktree for [1mfeature-x[22m from [1mmain[22m at [1m[TMPDIR]/repo.feature-x[39m[22m[0m+π [36mRunning post-start [1mdev[22m:[0m[107m [0m [2m[0m[2m[34muv[0m[2m run dev[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_pre_merge.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_pre_merge.snapindex d5bb13ae3..29c79d7a1 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_pre_merge.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_pre_merge.snap@@ -2,14 +2,14 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()----π [36mSquashing 3 commits into a single commit (2 files, [32m+45[0m)...[39m-π [36mGenerating squash commit message...[39m+π [36mSquashing 3 commits into a single commit [90m(2 files, [32m+45[0m[39m[90m)[39m...[0m+π [36mGenerating squash commit message...[0m[107m [0m [1mfeat(api): Add user authentication endpoints[22m[107m [0m[107m [0m Implement login and token refresh endpoints with JWT validation.[107m [0m Includes comprehensive test coverage and input validation.-β [32mSquashed @ [2m[HASH][39m[22m-π [36mRunning pre-merge [1mtest[22m:[39m+β [32mSquashed @ [2m[HASH][22m[0m+π [36mRunning pre-merge [1mtest[22m:[0m[107m [0m [2m[0m[2m[34muv[0m[2m run pytest[0m============================= test session starts ==============================@@ -21,15 +21,15 @@ tests/test_auth.py::test_token_validation PASSED [100%]============================== 3 passed in 0.8s ===============================-π [36mRunning pre-merge [1mlint[22m:[39m+π [36mRunning pre-merge [1mlint[22m:[0m[107m [0m [2m[0m[2m[34muv[0m[2m run ruff check[0mAll checks passed!-π [36mMerging 1 commit to [1mmain[22m @ [2m[HASH][22m (no rebase needed)[39m+π [36mMerging 1 commit to [1mmain[22m @ [2m[HASH][22m (no rebase needed)[0m[107m [0m * [33m[HASH][m feat(api): Add user authentication endpoints[107m [0m api/auth.py | 31 [32m+++++++++++++++++++++++++++++++[m[107m [0m tests/test_auth.py | 14 [32m++++++++++++++[m[107m [0m 2 files changed, 45 insertions(+)-β [32mMerged to [1mmain[22m (1 commit, 2 files, [32m+45[0m)[39m-π [36mRemoving [1mfeature-auth[22m worktree & branch in background[39m+β [32mMerged to [1mmain[22m [90m(1 commit, 2 files, [32m+45[0m[39m[90m)[39m[0m+π [36m[36mRemoving [1mfeature-auth[22m worktree & branch in background[39m[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_simple_switch.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_simple_switch.snapindex 28b83dcae..fb31198ac 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_simple_switch.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_simple_switch.snap@@ -2,4 +2,4 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()----β [32mCreated new worktree for [1mfix-auth[22m from [1mmain[22m at [1m[TMPDIR]/repo.fix-auth[39m[22m+β [32m[32mCreated new worktree for [1mfix-auth[22m from [1mmain[22m at [1m[TMPDIR]/repo.fix-auth[39m[22m[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__remove.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__remove.snapindex 8914b925e..12fe24a15 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__remove.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__remove.snap@@ -2,4 +2,4 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()----π [36mRemoving [1mto-remove[22m worktree & branch in background[39m+π [36m[36mRemoving [1mto-remove[22m worktree & branch in background[39m[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_create.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_create.snapindex 859c4e56b..7814f0fbe 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_create.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_create.snap@@ -2,4 +2,4 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()----β [32mCreated new worktree for [1mfeature[22m from [1mmain[22m at [1m[TMPDIR]/repo.feature[39m[22m+β [32m[32mCreated new worktree for [1mfeature[22m from [1mmain[22m at [1m[TMPDIR]/repo.feature[39m[22m[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute.snapindex 5b1ed3ab4..e6ffa57da 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute.snap@@ -2,7 +2,7 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()----β [32mCreated new worktree for [1mtest-exec[22m from [1mmain[22m at [1m[TMPDIR]/repo.test-exec[39m[22m-π [36mExecuting (--execute):[39m+β [32m[32mCreated new worktree for [1mtest-exec[22m from [1mmain[22m at [1m[TMPDIR]/repo.test-exec[39m[22m[0m+π [36m[36mExecuting (--execute):[39m[0m[107m [0m [2m[0m[2m[34mecho[0m[2m executed[0mexecuteddiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_through_wrapper.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_through_wrapper.snapindex 5b1ed3ab4..e6ffa57da 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_through_wrapper.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_execute_through_wrapper.snap@@ -2,7 +2,7 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()----β [32mCreated new worktree for [1mtest-exec[22m from [1mmain[22m at [1m[TMPDIR]/repo.test-exec[39m[22m-π [36mExecuting (--execute):[39m+β [32m[32mCreated new worktree for [1mtest-exec[22m from [1mmain[22m at [1m[TMPDIR]/repo.test-exec[39m[22m[0m+π [36m[36mExecuting (--execute):[39m[0m[107m [0m [2m[0m[2m[34mecho[0m[2m executed[0mexecuteddiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snapindex 0497f89ab..f13062ee8 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_hooks_zsh.snap@@ -2,14 +2,14 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()----π [36mRunning post-create:[39m+π [36mRunning post-create:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Installing dependencies...'[0m[2m[0mInstalling dependencies...-π [36mRunning post-create:[39m+π [36mRunning post-create:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Building project...'[0m[2m[0mBuilding project...-β [32mCreated new worktree for [1mfeature-hooks[22m from [1mmain[22m at [1m[TMPDIR]/repo.feature-hooks[39m[22m-π [36mRunning post-start [1mserver[22m:[39m+β [32m[32mCreated new worktree for [1mfeature-hooks[22m from [1mmain[22m at [1m[TMPDIR]/repo.feature-hooks[39m[22m[0m+π [36mRunning post-start [1mserver[22m:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Starting dev server on port 3000'[0m[2m[0m-π [36mRunning post-start [1mwatch[22m:[39m+π [36mRunning post-start [1mwatch[22m:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Watching for file changes'[0m[2m[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snapindex e241a3f0d..2bdcc41ae 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__switch_with_post_start_command_no_directive_leak.snap@@ -2,6 +2,6 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()----β [32mCreated new worktree for [1mfeature-with-hooks[22m from [1mmain[22m at [1m[TMPDIR]/repo.feature-with-hooks[39m[22m-π [36mRunning post-start:[39m+β [32m[32mCreated new worktree for [1mfeature-with-hooks[22m from [1mmain[22m at [1m[TMPDIR]/repo.feature-with-hooks[39m[22m[0m+π [36mRunning post-start:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test command executed'[0m[2m[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snapindex 2a6e25558..643d2a444 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__wrapper_preserves_progress_messages.snap@@ -2,6 +2,6 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()----β [32mCreated new worktree for [1mfeature-bg[22m from [1mmain[22m at [1m[TMPDIR]/repo.feature-bg[39m[22m-π [36mRunning post-start:[39m+β [32m[32mCreated new worktree for [1mfeature-bg[22m from [1mmain[22m at [1m[TMPDIR]/repo.feature-bg[39m[22m[0m+π [36mRunning post-start:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'background task'[0m[2m[0mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__already_approved_skip_prompt.snap b/tests/snapshots/integration__integration_tests__approval_ui__already_approved_skip_prompt.snapindex 39b4eed3f..a5c13e946 100644--- a/tests/snapshots/integration__integration_tests__approval_ui__already_approved_skip_prompt.snap+++ b/tests/snapshots/integration__integration_tests__approval_ui__already_approved_skip_prompt.snap@@ -25,7 +25,7 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRunning post-create:[39m+π [36mRunning post-create:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'approved'[0m[2m [0m[2m[36m>[0m[2m output.txt[0m-[0mβ [32mCreated new worktree for [1mtest-approved[22m from [1mmain[22m at [1m[REPO].test-approved[39m[22m-π‘ [2mRun `wt config shell install` to enable automatic cd[22m+[0mβ [32m[32mCreated new worktree for [1mtest-approved[22m from [1mmain[22m at [1m[REPO].test-approved[39m[22m[0m+π‘ [2m[2mRun `wt config shell install` to enable automatic cd[22m[0mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__force_bypasses_tty_check.snap b/tests/snapshots/integration__integration_tests__approval_ui__force_bypasses_tty_check.snapindex f5325fd95..af0d991ae 100644--- a/tests/snapshots/integration__integration_tests__approval_ui__force_bypasses_tty_check.snap+++ b/tests/snapshots/integration__integration_tests__approval_ui__force_bypasses_tty_check.snap@@ -26,8 +26,8 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRunning post-create:[39m+π [36mRunning post-create:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test command'[0m[2m[0m[0mtest command-β [32mCreated new worktree for [1mtest-force-tty[22m from [1mmain[22m at [1m[REPO].test-force-tty[39m[22m-π‘ [2mRun `wt config shell install` to enable automatic cd[22m+β [32m[32mCreated new worktree for [1mtest-force-tty[22m from [1mmain[22m at [1m[REPO].test-force-tty[39m[22m[0m+π‘ [2m[2mRun `wt config shell install` to enable automatic cd[22m[0mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_first_run.snap b/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_first_run.snapindex 46dacf56f..dfebbd1dd 100644--- a/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_first_run.snap+++ b/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_first_run.snap@@ -26,7 +26,7 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRunning post-create:[39m+π [36mRunning post-create:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test command'[0m[2m [0m[2m[36m>[0m[2m output.txt[0m-[0mβ [32mCreated new worktree for [1mtest-force[22m from [1mmain[22m at [1m[REPO].test-force[39m[22m-π‘ [2mRun `wt config shell install` to enable automatic cd[22m+[0mβ [32m[32mCreated new worktree for [1mtest-force[22m from [1mmain[22m at [1m[REPO].test-force[39m[22m[0m+π‘ [2m[2mRun `wt config shell install` to enable automatic cd[22m[0mdiff --git a/tests/snapshots/integration__integration_tests__approvals__add_approvals_force.snap b/tests/snapshots/integration__integration_tests__approvals__add_approvals_force.snapindex 1f6e087d3..dfc9d4dd4 100644--- a/tests/snapshots/integration__integration_tests__approvals__add_approvals_force.snap+++ b/tests/snapshots/integration__integration_tests__approvals__add_approvals_force.snap@@ -26,4 +26,4 @@ exit_code: 0----- stdout ---------- stderr ------β [32mCommands approved; not saved (--force)[39m+β [32mCommands approved; not saved (--force)[0mdiff --git a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_global_with_approvals.snap b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_global_with_approvals.snapindex c75de670d..00a3ed768 100644--- a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_global_with_approvals.snap+++ b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_global_with_approvals.snap@@ -26,4 +26,4 @@ exit_code: 0----- stdout ---------- stderr ------β [32mCleared approvals for 1 project[39m+β [32mCleared approvals for 1 project[0mdiff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snapindex da192f9a8..1bc7f66f3 100644--- a/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap+++ b/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap@@ -26,9 +26,9 @@ exit_code: 0----- stdout ---------- stderr ------π [36mMerging 1 commit to [1mmain[22m @ [2m6551244[22m (no commit/squash/rebase needed)[39m+π [36mMerging 1 commit to [1mmain[22m @ [2m6551244[22m (no commit/squash/rebase needed)[0m[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m+β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[0m[39m[90m)[39m[0mβͺ Worktree preserved (--no-remove)diff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snapindex 447d80c99..fffad5bd4 100644--- a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap+++ b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap@@ -26,9 +26,9 @@ exit_code: 0cd '[PATH]'----- stderr ------π [36mMerging 1 commit to [1mmain[22m @ [2m6551244[22m (no commit/squash/rebase needed)[39m+π [36mMerging 1 commit to [1mmain[22m @ [2m6551244[22m (no commit/squash/rebase needed)[0m[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m-π [36mRemoving [1mfeature[22m worktree & branch in background[39m+β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[0m[39m[90m)[39m[0m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background[39m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snapindex f52e6b8b4..6934a8b4a 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap@@ -24,15 +24,15 @@ exit_code: 0----- stdout ---------- stderr ------π [36mSquashing 2 commits & working tree changes into a single commit (2 files, [32m+2[0m)...[39m-π‘ [2mBackup created @ 330ccd6[22m-π [36mGenerating squash commit message...[39m+π [36mSquashing 2 commits & working tree changes into a single commit [90m(2 files, [32m+2[0m[39m[90m)[39m...[0m+π‘ [2mBackup created @ 330ccd6[0m+π [36mGenerating squash commit message...[0m[107m [0m [1mfix: update file 1 content[22m-β [32mSquashed @ [2mb54183b[39m[22m-π [36mMerging 1 commit to [1mmain[22m @ [2mb54183b[22m (no rebase needed)[39m+β [32mSquashed @ [2mb54183b[22m[0m+π [36mMerging 1 commit to [1mmain[22m @ [2mb54183b[22m (no rebase needed)[0m[107m [0m * [33mb54183b[m fix: update file 1 content[107m [0m file1.txt | 1 [32m+[m[107m [0m file2.txt | 1 [32m+[m[107m [0m 2 files changed, 2 insertions(+)-β [32mMerged to [1mmain[22m (1 commit, 2 files, [32m+2[0m)[39m-π [36mRemoving [1mfeature[22m worktree & branch in background[39m+β [32mMerged to [1mmain[22m [90m(1 commit, 2 files, [32m+2[0m[39m[90m)[39m[0m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background[39m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snapindex 24eeb6ff5..0e7925cab 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap@@ -24,18 +24,18 @@ exit_code: 0----- stdout ---------- stderr ------π [36mSquashing 1 commit & working tree changes into a single commit (1 file, [32m+1[0m)...[39m-π‘ [2mBackup created @ b18c23e[22m-π [36mGenerating squash commit message...[39m-π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[22m+π [36mSquashing 1 commit & working tree changes into a single commit [90m(1 file, [32m+1[0m[39m[90m)[39m...[0m+π‘ [2mBackup created @ b18c23e[0m+π [36mGenerating squash commit message...[0m+π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[107m [0m [1mSquash commits from main[22m[107m [0m[107m [0m Combined commits:[107m [0m - feat: initial feature-β [32mSquashed @ [2md118927[39m[22m-π [36mMerging 1 commit to [1mmain[22m @ [2md118927[22m (no rebase needed)[39m+β [32mSquashed @ [2md118927[22m[0m+π [36mMerging 1 commit to [1mmain[22m @ [2md118927[22m (no rebase needed)[0m[107m [0m * [33md118927[m Squash commits from main[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m-π [36mRemoving [1mfeature[22m worktree & branch in background[39m+β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[0m[39m[90m)[39m[0m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background[39m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snapindex db1ac2de1..5e5bca9b7 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap@@ -24,14 +24,14 @@ exit_code: 0----- stdout ---------- stderr ------π [36mSquashing 1 commit & working tree changes into a single commit (1 file, [32m+1[0m)...[39m-π‘ [2mBackup created @ 967330a[22m-π [36mGenerating squash commit message...[39m+π [36mSquashing 1 commit & working tree changes into a single commit [90m(1 file, [32m+1[0m[39m[90m)[39m...[0m+π‘ [2mBackup created @ 967330a[0m+π [36mGenerating squash commit message...[0m[107m [0m [1mfix: improve auth validation logic[22m-β [32mSquashed @ [2m1e3993e[39m[22m-π [36mMerging 1 commit to [1mmain[22m @ [2m1e3993e[22m (no rebase needed)[39m+β [32mSquashed @ [2m1e3993e[22m[0m+π [36mMerging 1 commit to [1mmain[22m @ [2m1e3993e[22m (no rebase needed)[0m[107m [0m * [33m1e3993e[m fix: improve auth validation logic[107m [0m auth.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m-π [36mRemoving [1mfeature[22m worktree & branch in background[39m+β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[0m[39m[90m)[39m[0m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background[39m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap b/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snapindex d61ed713b..0b33dc47e 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap@@ -24,15 +24,15 @@ exit_code: 0----- stdout ---------- stderr ------π‘ [33mAuto-staging 1 untracked file:[39m+π‘ [33mAuto-staging 1 untracked file:[0m[107m [0m dirty.txt-π [36mCommitting changes with default message... (1 file, [32m+1[0m, no squashing needed)[39m-π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[22m+π [36mCommitting changes with default message... [90m(1 file, [32m+1[0m, no squashing needed[39m[90m)[39m[0m+π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[107m [0m [1mChanges to dirty.txt[22m-β [32mCommitted changes @ [2mc1126ec[39m[22m-π [36mMerging 1 commit to [1mmain[22m @ [2mc1126ec[22m (no rebase needed)[39m+β [32mCommitted changes @ [2mc1126ec[22m[0m+π [36mMerging 1 commit to [1mmain[22m @ [2mc1126ec[22m (no rebase needed)[0m[107m [0m * [33mc1126ec[m Changes to dirty.txt[107m [0m dirty.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m-π [36mRemoving [1mfeature[22m worktree & branch in background[39m+β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[0m[39m[90m)[39m[0m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background[39m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snapindex d98ecdafb..50c590a22 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap@@ -24,9 +24,9 @@ exit_code: 0----- stdout ---------- stderr ------π [36mMerging 1 commit to [1mmain[22m @ [2m6551244[22m (no commit/squash/rebase needed)[39m+π [36mMerging 1 commit to [1mmain[22m @ [2m6551244[22m (no commit/squash/rebase needed)[0m[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m-π [36mRemoving [1mfeature[22m worktree & branch in background[39m+β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[0m[39m[90m)[39m[0m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background[39m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snapindex cf7a0e821..0b14bc7e3 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap@@ -25,4 +25,4 @@ exit_code: 0----- stderr -----βͺ Already up to date with [1mmain[22m (no new commits, no rebase needed)-π [36mRemoving [1mno-commits[22m worktree & branch in background[39m+π [36m[36mRemoving [1mno-commits[22m worktree & branch in background[39m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snapindex ec2b7409d..075808305 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap@@ -24,15 +24,15 @@ exit_code: 0----- stdout ---------- stderr ------π‘ [33mAuto-staging 1 untracked file:[39m+π‘ [33mAuto-staging 1 untracked file:[0m[107m [0m newfile.txt-π [36mCommitting changes with default message... (1 file, [32m+1[0m, no squashing needed)[39m-π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[22m+π [36mCommitting changes with default message... [90m(1 file, [32m+1[0m, no squashing needed[39m[90m)[39m[0m+π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[107m [0m [1mChanges to newfile.txt[22m-β [32mCommitted changes @ [2m96ddfbc[39m[22m-π [36mMerging 1 commit to [1mmain[22m @ [2m96ddfbc[22m (no rebase needed)[39m+β [32mCommitted changes @ [2m96ddfbc[22m[0m+π [36mMerging 1 commit to [1mmain[22m @ [2m96ddfbc[22m (no rebase needed)[0m[107m [0m * [33m96ddfbc[m Changes to newfile.txt[107m [0m newfile.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m-π [36mRemoving [1mno-commits-dirty[22m worktree & branch in background[39m+β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[0m[39m[90m)[39m[0m+π [36m[36mRemoving [1mno-commits-dirty[22m worktree & branch in background[39m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snapindex ae831ba48..fa3c73c12 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap@@ -23,9 +23,9 @@ exit_code: 0----- stdout ---------- stderr ------π [36mMerging 1 commit to [1mmain[22m @ [2m6551244[22m (no commit/squash/rebase needed)[39m+π [36mMerging 1 commit to [1mmain[22m @ [2m6551244[22m (no commit/squash/rebase needed)[0m[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m-π [36mRemoving [1mfeature[22m worktree & branch in background[39m+β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[0m[39m[90m)[39m[0m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background[39m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snapindex b19a84ec3..6a4a0cd71 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap@@ -25,11 +25,11 @@ exit_code: 0----- stdout ---------- stderr ------π [36mMerging 2 commits to [1mmain[22m @ [2mbf212d3[22m (no commit/squash/rebase needed)[39m+π [36mMerging 2 commits to [1mmain[22m @ [2mbf212d3[22m (no commit/squash/rebase needed)[0m[107m [0m * [33mbf212d3[m feat: add file 2[107m [0m * [33m123e46c[m feat: add file 1[107m [0m file1.txt | 1 [32m+[m[107m [0m file2.txt | 1 [32m+[m[107m [0m 2 files changed, 2 insertions(+)-β [32mMerged to [1mmain[22m (2 commits, 2 files, [32m+2[0m)[39m-π [36mRemoving [1mfeature[22m worktree & branch in background[39m+β [32mMerged to [1mmain[22m [90m(2 commits, 2 files, [32m+2[0m[39m[90m)[39m[0m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background[39m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snapindex 5b2d76943..eafe6edfb 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap@@ -24,9 +24,9 @@ exit_code: 0----- stdout ---------- stderr ------π [36mMerging 1 commit to [1mmain[22m @ [2m4af48f0[22m (no commit/squash/rebase needed)[39m+π [36mMerging 1 commit to [1mmain[22m @ [2m4af48f0[22m (no commit/squash/rebase needed)[0m[107m [0m * [33m4af48f0[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m-π [36mRemoving [1mfeature[22m worktree & branch in background[39m+β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[0m[39m[90m)[39m[0m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background[39m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snapindex e5609b41b..89dfe5b51 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap@@ -25,15 +25,15 @@ exit_code: 1----- stdout ---------- stderr ------π [36mMerging 1 commit to [1mmain[22m @ [2mcdb002e[22m (no commit/squash/rebase needed)[39m+π [36mMerging 1 commit to [1mmain[22m @ [2mcdb002e[22m (no commit/squash/rebase needed)[0m[107m [0m * [33mcdb002e[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m-π [36mRemoving [1mfeature[22m worktree & branch in background[39m-π [36mRunning post-merge:[39m+β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[0m[39m[90m)[39m[0m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background[39m[0m+π [36mRunning post-merge:[0m[107m [0m [2m[0m[2m[34mexit[0m[2m 1[0m-[0mπ‘ [33mCommand failed: exit status: 1[39m+[0mπ‘ [33mCommand failed: exit status: 1[0mβ [31mpost-merge command failed: exit status: 1[39mπ‘ [2mUse --no-verify to skip post-merge commands[22mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snapindex 0a148cbd9..2ad322280 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap@@ -25,14 +25,14 @@ exit_code: 0----- stdout ---------- stderr ------π [36mMerging 1 commit to [1mmain[22m @ [2m8609b84[22m (no commit/squash/rebase needed)[39m+π [36mMerging 1 commit to [1mmain[22m @ [2m8609b84[22m (no commit/squash/rebase needed)[0m[107m [0m * [33m8609b84[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m-π [36mRemoving [1mfeature[22m worktree & branch in background[39m-π [36mRunning post-merge [1mnotify[22m:[39m+β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[0m[39m[90m)[39m[0m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background[39m[0m+π [36mRunning post-merge [1mnotify[22m:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Merge to main complete'[0m[2m [0m[2m[36m>[0m[2m notify.txt[0m-[0mπ [36mRunning post-merge [1mdeploy[22m:[39m+[0mπ [36mRunning post-merge [1mdeploy[22m:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Deploying branch feature'[0m[2m [0m[2m[36m>[0m[2m deploy.txt[0m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_no_verify.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_no_verify.snapindex 96e60ddf2..5f5318c1d 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_no_verify.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_no_verify.snap@@ -26,9 +26,9 @@ exit_code: 0----- stdout ---------- stderr ------π [36mMerging 1 commit to [1mmain[22m @ [2m72ff5fc[22m (no commit/squash/rebase needed)[39m+π [36mMerging 1 commit to [1mmain[22m @ [2m72ff5fc[22m (no commit/squash/rebase needed)[0m[107m [0m * [33m72ff5fc[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m-π [36mRemoving [1mfeature[22m worktree & branch in background[39m+β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[0m[39m[90m)[39m[0m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background[39m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snapindex cb89787b1..5db07497e 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap@@ -25,12 +25,12 @@ exit_code: 0----- stdout ---------- stderr ------π [36mMerging 1 commit to [1mmain[22m @ [2m72ff5fc[22m (no commit/squash/rebase needed)[39m+π [36mMerging 1 commit to [1mmain[22m @ [2m72ff5fc[22m (no commit/squash/rebase needed)[0m[107m [0m * [33m72ff5fc[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m-π [36mRemoving [1mfeature[22m worktree & branch in background[39m-π [36mRunning post-merge:[39m+β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[0m[39m[90m)[39m[0m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background[39m[0m+π [36mRunning post-merge:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'merged feature to main'[0m[2m [0m[2m[36m>[0m[2m post-merge-ran.txt[0m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_from_main_branch.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_from_main_branch.snapindex bb35e1137..371b01b8f 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_from_main_branch.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_from_main_branch.snap@@ -26,6 +26,6 @@ exit_code: 0----- stderr -----βͺ Already up to date with [1mmain[22m (no new commits, no rebase needed)βͺ Worktree preserved (on main branch)-π [36mRunning post-merge:[39m+π [36mRunning post-merge:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'post-merge ran from main'[0m[2m [0m[2m[36m>[0m[2m post-merge-ran.txt[0m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_with_nothing_to_merge.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_with_nothing_to_merge.snapindex daddee8df..6c91c3560 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_with_nothing_to_merge.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_with_nothing_to_merge.snap@@ -26,7 +26,7 @@ exit_code: 0----- stderr -----βͺ Already up to date with [1mmain[22m (no new commits, no rebase needed)-π [36mRemoving [1mfeature[22m worktree & branch in background[39m-π [36mRunning post-merge:[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background[39m[0m+π [36mRunning post-merge:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'post-merge ran'[0m[2m [0m[2m[36m>[0m[2m post-merge-ran.txt[0m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snapindex 5d3bfc300..eb59221f3 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_failure.snap@@ -25,9 +25,9 @@ exit_code: 1----- stdout ---------- stderr ------π‘ [33mAuto-staging 1 untracked file:[39m+π‘ [33mAuto-staging 1 untracked file:[0m[107m [0m feature.txt-π [36mRunning pre-commit:[39m+π [36mRunning pre-commit:[0m[107m [0m [2m[0m[2m[34mexit[0m[2m 1[0m[0mβ [31mpre-commit command failed: exit status: 1[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snapindex d5827cd33..0f783877f 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap@@ -25,18 +25,18 @@ exit_code: 0----- stdout ---------- stderr ------π‘ [33mAuto-staging 1 untracked file:[39m+π‘ [33mAuto-staging 1 untracked file:[0m[107m [0m feature.txt-π [36mRunning pre-commit:[39m+π [36mRunning pre-commit:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Pre-commit check passed'[0m[2m[0m[0mPre-commit check passed-π [36mCommitting changes with default message... (1 file, [32m+1[0m, no squashing needed)[39m-π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[22m+π [36mCommitting changes with default message... [90m(1 file, [32m+1[0m, no squashing needed[39m[90m)[39m[0m+π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[107m [0m [1mChanges to feature.txt[22m-β [32mCommitted changes @ [2mcdc8f90[39m[22m-π [36mMerging 1 commit to [1mmain[22m @ [2mcdc8f90[22m (no rebase needed)[39m+β [32mCommitted changes @ [2mcdc8f90[22m[0m+π [36mMerging 1 commit to [1mmain[22m @ [2mcdc8f90[22m (no rebase needed)[0m[107m [0m * [33mcdc8f90[m Changes to feature.txt[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m-π [36mRemoving [1mfeature[22m worktree & branch in background[39m+β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[0m[39m[90m)[39m[0m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background[39m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snapindex 4b9863d01..b61bbfdbd 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap@@ -25,7 +25,7 @@ exit_code: 1----- stdout ---------- stderr ------π [36mRunning pre-merge:[39m+π [36mRunning pre-merge:[0m[107m [0m [2m[0m[2m[34mexit[0m[2m 1[0m[0mβ [31mpre-merge command failed: exit status: 1[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snapindex 3ef51e65e..caf31508e 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap@@ -25,15 +25,15 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRunning pre-merge [1mformat[22m:[39m+π [36mRunning pre-merge [1mformat[22m:[0m[107m [0m [2m[0m[2m[34mexit[0m[2m 0[0m-[0mπ [36mRunning pre-merge [1mlint[22m:[39m+[0mπ [36mRunning pre-merge [1mlint[22m:[0m[107m [0m [2m[0m[2m[34mexit[0m[2m 0[0m-[0mπ [36mRunning pre-merge [1mtest[22m:[39m+[0mπ [36mRunning pre-merge [1mtest[22m:[0m[107m [0m [2m[0m[2m[34mexit[0m[2m 0[0m-[0mπ [36mMerging 1 commit to [1mmain[22m @ [2m2cbe2a2[22m (no commit/squash/rebase needed)[39m+[0mπ [36mMerging 1 commit to [1mmain[22m @ [2m2cbe2a2[22m (no commit/squash/rebase needed)[0m[107m [0m * [33m2cbe2a2[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m-π [36mRemoving [1mfeature[22m worktree & branch in background[39m+β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[0m[39m[90m)[39m[0m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background[39m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snapindex 01f669d1b..eb852d5c3 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap@@ -25,11 +25,11 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRunning pre-merge:[39m+π [36mRunning pre-merge:[0m[107m [0m [2m[0m[2m[34mexit[0m[2m 0[0m-[0mπ [36mMerging 1 commit to [1mmain[22m @ [2m4b1199c[22m (no commit/squash/rebase needed)[39m+[0mπ [36mMerging 1 commit to [1mmain[22m @ [2m4b1199c[22m (no commit/squash/rebase needed)[0m[107m [0m * [33m4b1199c[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m-π [36mRemoving [1mfeature[22m worktree & branch in background[39m+β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[0m[39m[90m)[39m[0m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background[39m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snapindex 51256108a..45b49decc 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_failure.snap@@ -25,7 +25,7 @@ exit_code: 1----- stdout ---------- stderr ------π [36mRunning pre-commit:[39m+π [36mRunning pre-commit:[0m[107m [0m [2m[0m[2m[34mexit[0m[2m 1[0m[0mβ [31mpre-commit command failed: exit status: 1[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snapindex c6c55d430..da61082e3 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap@@ -25,12 +25,12 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRunning pre-commit:[39m+π [36mRunning pre-commit:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Pre-commit check passed'[0m[2m[0m[0mPre-commit check passed-π [36mMerging 1 commit to [1mmain[22m @ [2m726717f[22m (no commit/squash/rebase needed)[39m+π [36mMerging 1 commit to [1mmain[22m @ [2m726717f[22m (no commit/squash/rebase needed)[0m[107m [0m * [33m726717f[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m-π [36mRemoving [1mfeature[22m worktree & branch in background[39m+β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[0m[39m[90m)[39m[0m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background[39m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snap b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snapindex 9e29d33de..0dbfba7ab 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snap@@ -24,9 +24,9 @@ exit_code: 0----- stdout ---------- stderr ------π [36mMerging 1 commit to [1mmain[22m @ [2m6551244[22m (no commit/squash/rebase needed)[39m+π [36mMerging 1 commit to [1mmain[22m @ [2m6551244[22m (no commit/squash/rebase needed)[0m[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m-π [36mRemoving [1mfeature-from-develop[22m worktree & branch in background[39m+β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[0m[39m[90m)[39m[0m+π [36m[36mRemoving [1mfeature-from-develop[22m worktree & branch in background[39m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snap b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snapindex 8b97a8960..3797693e3 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snap@@ -24,11 +24,11 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRebasing onto [1mmain[22m...[39m-β [32mRebased onto [1mmain[39m[22m-π [36mMerging 1 commit to [1mmain[22m @ [2m76778cc[22m (no commit/squash needed)[39m+π [36mRebasing onto [1mmain[22m...[0m+β [32mRebased onto [1mmain[22m[0m+π [36mMerging 1 commit to [1mmain[22m @ [2m76778cc[22m (no commit/squash needed)[0m[107m [0m * [33m76778cc[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m-π [36mRemoving [1mfeature-dirty-primary[22m worktree & branch in background[39m+β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[0m[39m[90m)[39m[0m+π [36m[36mRemoving [1mfeature-dirty-primary[22m worktree & branch in background[39m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_race_condition_before_new_commit.snap b/tests/snapshots/integration__integration_tests__merge__merge_race_condition_before_new_commit.snapindex 9908dac11..d659f4c17 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_race_condition_before_new_commit.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_race_condition_before_new_commit.snap@@ -25,9 +25,9 @@ exit_code: 0----- stdout ---------- stderr ------π [36mMerging 1 commit to [1mmain[22m @ [2m6551244[22m (no commit/squash/rebase needed)[39m+π [36mMerging 1 commit to [1mmain[22m @ [2m6551244[22m (no commit/squash/rebase needed)[0m[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m+β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[0m[39m[90m)[39m[0mβͺ Worktree preserved (--no-remove)diff --git a/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap b/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snapindex 27c927360..b3b7d7964 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap@@ -24,7 +24,7 @@ exit_code: 1----- stdout ---------- stderr ------π [36mRebasing onto [1mmain[22m...[39m+π [36mRebasing onto [1mmain[22m...[0mβ [31mRebase onto [1mmain[22m incomplete[39m[107m [0m Rebasing (1/1)[107m [0m error: could not apply c661874... Update shared.txt in featurediff --git a/tests/snapshots/integration__integration_tests__merge__merge_rebase_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_rebase_fast_forward.snapindex 9a55ac6ac..df83fdc39 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_rebase_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_rebase_fast_forward.snap@@ -24,6 +24,6 @@ exit_code: 0----- stdout ---------- stderr ------β [32mFast-forwarded to [1mmain[39m[22m+β [32mFast-forwarded to [1mmain[22m[0mβͺ Already up to date with [1mmain[22m (no new commits)-π [36mRemoving [1mfast-forward-test[22m worktree & branch in background[39m+π [36m[36mRemoving [1mfast-forward-test[22m worktree & branch in background[39m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_rebase_true_rebase.snap b/tests/snapshots/integration__integration_tests__merge__merge_rebase_true_rebase.snapindex 6afe37fa4..2a4f1e12d 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_rebase_true_rebase.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_rebase_true_rebase.snap@@ -24,11 +24,11 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRebasing onto [1mmain[22m...[39m-β [32mRebased onto [1mmain[39m[22m-π [36mMerging 1 commit to [1mmain[22m @ [2mae48a8e[22m (no commit/squash needed)[39m+π [36mRebasing onto [1mmain[22m...[0m+β [32mRebased onto [1mmain[22m[0m+π [36mMerging 1 commit to [1mmain[22m @ [2mae48a8e[22m (no commit/squash needed)[0m[107m [0m * [33mae48a8e[m Add feature[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m-π [36mRemoving [1mtrue-rebase-test[22m worktree & branch in background[39m+β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[0m[39m[90m)[39m[0m+π [36m[36mRemoving [1mtrue-rebase-test[22m worktree & branch in background[39m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snapindex ca35232a7..3125ce605 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap@@ -24,21 +24,21 @@ exit_code: 0----- stdout ---------- stderr ------π [36mSquashing 3 commits into a single commit (3 files, [32m+3[0m)...[39m-π [36mGenerating squash commit message...[39m-π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[22m+π [36mSquashing 3 commits into a single commit [90m(3 files, [32m+3[0m[39m[90m)[39m...[0m+π [36mGenerating squash commit message...[0m+π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[107m [0m [1mSquash commits from main[22m[107m [0m[107m [0m Combined commits:[107m [0m - feat: add file 1[107m [0m - fix: update logic[107m [0m - docs: update readme-β [32mSquashed @ [2m27eb169[39m[22m-π [36mMerging 1 commit to [1mmain[22m @ [2m27eb169[22m (no rebase needed)[39m+β [32mSquashed @ [2m27eb169[22m[0m+π [36mMerging 1 commit to [1mmain[22m @ [2m27eb169[22m (no rebase needed)[0m[107m [0m * [33m27eb169[m Squash commits from main[107m [0m file1.txt | 1 [32m+[m[107m [0m file2.txt | 1 [32m+[m[107m [0m file3.txt | 1 [32m+[m[107m [0m 3 files changed, 3 insertions(+)-β [32mMerged to [1mmain[22m (1 commit, 3 files, [32m+3[0m)[39m-π [36mRemoving [1mfeature[22m worktree & branch in background[39m+β [32mMerged to [1mmain[22m [90m(1 commit, 3 files, [32m+3[0m[39m[90m)[39m[0m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background[39m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snapindex 1ceb1c099..0b3bd8253 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap@@ -24,15 +24,15 @@ exit_code: 0----- stdout ---------- stderr ------π [36mSquashing 3 commits into a single commit...[39m-π [36mGenerating squash commit message...[39m-π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[22m+π [36mSquashing 3 commits into a single commit...[0m+π [36mGenerating squash commit message...[0m+π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[107m [0m [1mSquash commits from main[22m[107m [0m[107m [0m Combined commits:[107m [0m - Change 1[107m [0m - Change 2[107m [0m - Revert to initial-βͺ [2mNo changes after squashing 3 commits[22m+βͺ No changes after squashing 3 commitsβͺ Already up to date with [1mmain[22m (no new commits, no rebase needed)-π [36mRemoving [1mfeature[22m worktree & branch in background[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background[39m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_error.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_error.snapindex e73fbe31a..42c14d1ad 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_error.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_error.snap@@ -24,8 +24,8 @@ exit_code: 1----- stdout ---------- stderr ------π [36mSquashing 2 commits into a single commit (2 files, [32m+2[0m)...[39m-π [36mGenerating squash commit message...[39m+π [36mSquashing 2 commits into a single commit [90m(2 files, [32m+2[0m[39m[90m)[39m...[0m+π [36mGenerating squash commit message...[0mβ [31mCommit generation command failed[39m[107m [0m Error: connection refuseddiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snapindex fd899c343..fe52de61a 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap@@ -25,19 +25,19 @@ exit_code: 0----- stdout ---------- stderr ------π [36mSquashing 2 commits into a single commit (2 files, [32m+2[0m)...[39m-π [36mGenerating squash commit message...[39m-π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[22m+π [36mSquashing 2 commits into a single commit [90m(2 files, [32m+2[0m[39m[90m)[39m...[0m+π [36mGenerating squash commit message...[0m+π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[107m [0m [1mSquash commits from main[22m[107m [0m[107m [0m Combined commits:[107m [0m - feat: new feature[107m [0m - fix: bug fix-β [32mSquashed @ [2m091f0c5[39m[22m-π [36mMerging 1 commit to [1mmain[22m @ [2m091f0c5[22m (no rebase needed)[39m+β [32mSquashed @ [2m091f0c5[22m[0m+π [36mMerging 1 commit to [1mmain[22m @ [2m091f0c5[22m (no rebase needed)[0m[107m [0m * [33m091f0c5[m Squash commits from main[107m [0m file1.txt | 1 [32m+[m[107m [0m file2.txt | 1 [32m+[m[107m [0m 2 files changed, 2 insertions(+)-β [32mMerged to [1mmain[22m (1 commit, 2 files, [32m+2[0m)[39m-π [36mRemoving [1mfeature[22m worktree & branch in background[39m+β [32mMerged to [1mmain[22m [90m(1 commit, 2 files, [32m+2[0m[39m[90m)[39m[0m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background[39m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snapindex 6dcec2b8f..318ea5d87 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap@@ -24,9 +24,9 @@ exit_code: 0----- stdout ---------- stderr ------π [36mMerging 1 commit to [1mmain[22m @ [2m525a81f[22m (no commit/squash/rebase needed)[39m+π [36mMerging 1 commit to [1mmain[22m @ [2m525a81f[22m (no commit/squash/rebase needed)[0m[107m [0m * [33m525a81f[m feat: single commit[107m [0m file1.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m-π [36mRemoving [1mfeature[22m worktree & branch in background[39m+β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[0m[39m[90m)[39m[0m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background[39m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snapindex b377bcd7b..e96874add 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap@@ -24,13 +24,13 @@ exit_code: 0----- stdout ---------- stderr ------π [36mSquashing 2 commits into a single commit (1 file, [32m+1[0m)...[39m-π [36mGenerating squash commit message...[39m+π [36mSquashing 2 commits into a single commit [90m(1 file, [32m+1[0m[39m[90m)[39m...[0m+π [36mGenerating squash commit message...[0m[107m [0m [1mfeat: implement user authentication system[22m-β [32mSquashed @ [2md42412f[39m[22m-π [36mMerging 1 commit to [1mmain[22m @ [2md42412f[22m (no rebase needed)[39m+β [32mSquashed @ [2md42412f[22m[0m+π [36mMerging 1 commit to [1mmain[22m @ [2md42412f[22m (no rebase needed)[0m[107m [0m * [33md42412f[m feat: implement user authentication system[107m [0m auth.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m-π [36mRemoving [1mfeature[22m worktree & branch in background[39m+β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[0m[39m[90m)[39m[0m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background[39m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snapindex d0c267dfd..d81ba6a59 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snap@@ -26,20 +26,20 @@ exit_code: 0----- stdout ---------- stderr ------π [36mSquashing 2 commits & working tree changes into a single commit (2 files, [32m+2[0m)...[39m-π‘ [2mBackup created @ 330ccd6[22m-π [36mGenerating squash commit message...[39m-π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[22m+π [36mSquashing 2 commits & working tree changes into a single commit [90m(2 files, [32m+2[0m[39m[90m)[39m...[0m+π‘ [2mBackup created @ 330ccd6[0m+π [36mGenerating squash commit message...[0m+π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[107m [0m [1mSquash commits from main[22m[107m [0m[107m [0m Combined commits:[107m [0m - feat: add file 1[107m [0m - feat: add file 2-β [32mSquashed @ [2md34e4c3[39m[22m-π [36mMerging 1 commit to [1mmain[22m @ [2md34e4c3[22m (no rebase needed)[39m+β [32mSquashed @ [2md34e4c3[22m[0m+π [36mMerging 1 commit to [1mmain[22m @ [2md34e4c3[22m (no rebase needed)[0m[107m [0m * [33md34e4c3[m Squash commits from main[107m [0m file1.txt | 1 [32m+[m[107m [0m file2.txt | 1 [32m+[m[107m [0m 2 files changed, 2 insertions(+)-β [32mMerged to [1mmain[22m (1 commit, 2 files, [32m+2[0m)[39m-π [36mRemoving [1mfeature[22m worktree & branch in background[39m+β [32mMerged to [1mmain[22m [90m(1 commit, 2 files, [32m+2[0m[39m[90m)[39m[0m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background[39m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snapindex ae831ba48..fa3c73c12 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap@@ -23,9 +23,9 @@ exit_code: 0----- stdout ---------- stderr ------π [36mMerging 1 commit to [1mmain[22m @ [2m6551244[22m (no commit/squash/rebase needed)[39m+π [36mMerging 1 commit to [1mmain[22m @ [2m6551244[22m (no commit/squash/rebase needed)[0m[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m-π [36mRemoving [1mfeature[22m worktree & branch in background[39m+β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[0m[39m[90m)[39m[0m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background[39m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_to_non_default_target.snap b/tests/snapshots/integration__integration_tests__merge__merge_to_non_default_target.snapindex ba3c4670f..b95ed7434 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_to_non_default_target.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_non_default_target.snap@@ -24,11 +24,11 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRebasing onto [1mstaging[22m...[39m-β [32mRebased onto [1mstaging[39m[22m-π [36mMerging 1 commit to [1mstaging[22m @ [2m8280b9e[22m (no commit/squash needed)[39m+π [36mRebasing onto [1mstaging[22m...[0m+β [32mRebased onto [1mstaging[22m[0m+π [36mMerging 1 commit to [1mstaging[22m @ [2m8280b9e[22m (no commit/squash needed)[0m[107m [0m * [33m8280b9e[m Add feature for staging[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mstaging[22m (1 commit, 1 file, [32m+1[0m)[39m-π [36mRemoving [1mfeature-for-staging[22m worktree & branch in background[39m+β [32mMerged to [1mstaging[22m [90m(1 commit, 1 file, [32m+1[0m[39m[90m)[39m[0m+π [36m[36mRemoving [1mfeature-for-staging[22m worktree & branch in background[39m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_when_primary_not_on_default_but_default_has_worktree.snap b/tests/snapshots/integration__integration_tests__merge__merge_when_primary_not_on_default_but_default_has_worktree.snapindex d98ecdafb..50c590a22 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_when_primary_not_on_default_but_default_has_worktree.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_when_primary_not_on_default_but_default_has_worktree.snap@@ -24,9 +24,9 @@ exit_code: 0----- stdout ---------- stderr ------π [36mMerging 1 commit to [1mmain[22m @ [2m6551244[22m (no commit/squash/rebase needed)[39m+π [36mMerging 1 commit to [1mmain[22m @ [2m6551244[22m (no commit/squash/rebase needed)[0m[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m-π [36mRemoving [1mfeature[22m worktree & branch in background[39m+β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[0m[39m[90m)[39m[0m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background[39m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snapindex 0c21f9b8a..f0b8f6d19 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap@@ -24,9 +24,9 @@ exit_code: 0----- stdout ---------- stderr ------π [36mMerging 1 commit to [1mmain[22m @ [2m6551244[22m (no commit/squash/rebase needed)[39m+π [36mMerging 1 commit to [1mmain[22m @ [2m6551244[22m (no commit/squash/rebase needed)[0m[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m-π [36mRemoving [1mfeature[22m worktree & branch in background[39m+β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[0m[39m[90m)[39m[0m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background[39m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snapindex 9908dac11..d659f4c17 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap@@ -25,9 +25,9 @@ exit_code: 0----- stdout ---------- stderr ------π [36mMerging 1 commit to [1mmain[22m @ [2m6551244[22m (no commit/squash/rebase needed)[39m+π [36mMerging 1 commit to [1mmain[22m @ [2m6551244[22m (no commit/squash/rebase needed)[0m[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m+β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[0m[39m[90m)[39m[0mβͺ Worktree preserved (--no-remove)diff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snapindex 85585f509..f4967b20e 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap@@ -26,23 +26,23 @@ exit_code: 0----- stdout ---------- stderr ------π‘ [33mAuto-staging 2 untracked files:[39m+π‘ [33mAuto-staging 2 untracked files:[0m[107m [0m untracked1.txt[107m [0m untracked2.txt-π [36mSquashing 1 commit & working tree changes into a single commit (3 files, [32m+3[0m)...[39m-π‘ [2mBackup created @ 4967998[22m-π [36mGenerating squash commit message...[39m-π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[22m+π [36mSquashing 1 commit & working tree changes into a single commit [90m(3 files, [32m+3[0m[39m[90m)[39m...[0m+π‘ [2mBackup created @ 4967998[0m+π [36mGenerating squash commit message...[0m+π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[107m [0m [1mSquash commits from main[22m[107m [0m[107m [0m Combined commits:[107m [0m - feat: add file 1-β [32mSquashed @ [2mfbfc726[39m[22m-π [36mMerging 1 commit to [1mmain[22m @ [2mfbfc726[22m (no rebase needed)[39m+β [32mSquashed @ [2mfbfc726[22m[0m+π [36mMerging 1 commit to [1mmain[22m @ [2mfbfc726[22m (no rebase needed)[0m[107m [0m * [33mfbfc726[m Squash commits from main[107m [0m file1.txt | 1 [32m+[m[107m [0m untracked1.txt | 1 [32m+[m[107m [0m untracked2.txt | 1 [32m+[m[107m [0m 3 files changed, 3 insertions(+)-β [32mMerged to [1mmain[22m (1 commit, 3 files, [32m+3[0m)[39m-π [36mRemoving [1mfeature[22m worktree & branch in background[39m+β [32mMerged to [1mmain[22m [90m(1 commit, 3 files, [32m+3[0m[39m[90m)[39m[0m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background[39m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snapindex cb4a85d68..1746604e4 100644--- a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap@@ -26,8 +26,8 @@ exit_code: 0----- stdout ---------- stderr ------π [36mSquashing 3 commits into a single commit (3 files, [32m+33[0m)...[39m-π [36mGenerating squash commit message...[39m+π [36mSquashing 3 commits into a single commit [90m(3 files, [32m+33[0m[39m[90m)[39m...[0m+π [36mGenerating squash commit message...[0m[107m [0m [1mfeat(auth): Implement JWT authentication system[22m[107m [0m[107m [0m Add comprehensive JWT token handling including validation, refresh logic,@@ -37,8 +37,8 @@ exit_code: 0[107m [0m - Implement token refresh mechanism with expiry handling[107m [0m - Add JWT encoding/decoding with signature verification[107m [0m - Create test suite covering all authentication flows-β [32mSquashed @ [2m95c3316[39m[22m-π [36mRunning pre-merge [1mtest[22m:[39m+β [32mSquashed @ [2m95c3316[22m[0m+π [36mRunning pre-merge [1mtest[22m:[0m[107m [0m [2m[0m[2m[34mcargo[0m[2m test[0m[0m Finished test [unoptimized + debuginfo] target(s) in 0.12sRunning unittests src/lib.rs (target/debug/deps/worktrunk-abc123)@@ -50,19 +50,19 @@ test auth::tests::test_token_refresh ... oktest auth::tests::test_token_validation ... oktest result: ok. 18 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.08s-π [36mRunning pre-merge [1mlint[22m:[39m+π [36mRunning pre-merge [1mlint[22m:[0m[107m [0m [2m[0m[2m[34mcargo[0m[2m clippy[0m[0m Checking worktrunk v0.1.0Finished dev [unoptimized + debuginfo] target(s) in 1.23s-π [36mMerging 1 commit to [1mmain[22m @ [2m95c3316[22m (no rebase needed)[39m+π [36mMerging 1 commit to [1mmain[22m @ [2m95c3316[22m (no rebase needed)[0m[107m [0m * [33m95c3316[m feat(auth): Implement JWT authentication system[107m [0m auth.rs | 8 [32m++++++++[m[107m [0m auth_test.rs | 17 [32m+++++++++++++++++[m[107m [0m jwt.rs | 8 [32m++++++++[m[107m [0m 3 files changed, 33 insertions(+)-β [32mMerged to [1mmain[22m (1 commit, 3 files, [32m+33[0m)[39m-π [36mRemoving [1mfeature-auth[22m worktree & branch in background[39m-π [36mRunning post-merge [1minstall[22m:[39m+β [32mMerged to [1mmain[22m [90m(1 commit, 3 files, [32m+33[0m[39m[90m)[39m[0m+π [36m[36mRemoving [1mfeature-auth[22m worktree & branch in background[39m[0m+π [36mRunning post-merge [1minstall[22m:[0m[107m [0m [2m[0m[2m[34mcargo[0m[2m install [0m[2m[36m--path[0m[2m .[0m[0m Installing worktrunk v0.1.0Compiling worktrunk v0.1.0diff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_post_create.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_post_create.snapindex 1d3bebb24..300f0e0bf 100644--- a/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_post_create.snap+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_post_create.snap@@ -27,12 +27,12 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRunning post-create [1minstall[22m:[39m+π [36mRunning post-create [1minstall[22m:[0m[107m [0m [2m[0m[2m[34muv[0m[2m sync[0m[0mResolved 24 packages in 145msInstalled 24 packages in 1.2s-β [32mCreated new worktree for [1mfeature-x[22m from [1mmain[22m at [1m[REPO].feature-x[39m[22m-π‘ [2mRun `wt config shell install` to enable automatic cd[22m-π [36mRunning post-start [1mdev[22m:[39m+β [32m[32mCreated new worktree for [1mfeature-x[22m from [1mmain[22m at [1m[REPO].feature-x[39m[22m[0m+π‘ [2m[2mRun `wt config shell install` to enable automatic cd[22m[0m+π [36mRunning post-start [1mdev[22m:[0m[107m [0m [2m[0m[2m[34muv[0m[2m run dev[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_pre_merge.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_pre_merge.snapindex 7e6e4c82d..ae6f88332 100644--- a/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_pre_merge.snap+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_pre_merge.snap@@ -26,14 +26,14 @@ exit_code: 0----- stdout ---------- stderr ------π [36mSquashing 3 commits into a single commit (2 files, [32m+45[0m)...[39m-π [36mGenerating squash commit message...[39m+π [36mSquashing 3 commits into a single commit [90m(2 files, [32m+45[0m[39m[90m)[39m...[0m+π [36mGenerating squash commit message...[0m[107m [0m [1mfeat(api): Add user authentication endpoints[22m[107m [0m[107m [0m Implement login and token refresh endpoints with JWT validation.[107m [0m Includes comprehensive test coverage and input validation.-β [32mSquashed @ [2m69200cc[39m[22m-π [36mRunning pre-merge [1mtest[22m:[39m+β [32mSquashed @ [2m69200cc[22m[0m+π [36mRunning pre-merge [1mtest[22m:[0m[107m [0m [2m[0m[2m[34muv[0m[2m run pytest[0m[0m============================= test session starts ==============================@@ -45,15 +45,15 @@ tests/test_auth.py::test_token_validation PASSED [100%]============================== 3 passed in 0.8s ===============================-π [36mRunning pre-merge [1mlint[22m:[39m+π [36mRunning pre-merge [1mlint[22m:[0m[107m [0m [2m[0m[2m[34muv[0m[2m run ruff check[0m[0mAll checks passed!-π [36mMerging 1 commit to [1mmain[22m @ [2m69200cc[22m (no rebase needed)[39m+π [36mMerging 1 commit to [1mmain[22m @ [2m69200cc[22m (no rebase needed)[0m[107m [0m * [33m69200cc[m feat(api): Add user authentication endpoints[107m [0m api/auth.py | 31 [32m+++++++++++++++++++++++++++++++[m[107m [0m tests/test_auth.py | 14 [32m++++++++++++++[m[107m [0m 2 files changed, 45 insertions(+)-β [32mMerged to [1mmain[22m (1 commit, 2 files, [32m+45[0m)[39m-π [36mRemoving [1mfeature-auth[22m worktree & branch in background[39m+β [32mMerged to [1mmain[22m [90m(1 commit, 2 files, [32m+45[0m[39m[90m)[39m[0m+π [36m[36mRemoving [1mfeature-auth[22m worktree & branch in background[39m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snapindex be5a08902..73ab76258 100644--- a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap@@ -24,9 +24,9 @@ exit_code: 0----- stdout ---------- stderr ------π [36mMerging 1 commit to [1mmain[22m @ [2md29e0fd[22m (no commit/squash/rebase needed)[39m+π [36mMerging 1 commit to [1mmain[22m @ [2md29e0fd[22m (no commit/squash/rebase needed)[0m[107m [0m * [33md29e0fd[m Implement JWT validation[107m [0m auth.rs | 13 [32m+++++++++++++[m[107m [0m 1 file changed, 13 insertions(+)-β [32mMerged to [1mmain[22m (1 commit, 1 file, [32m+13[0m)[39m-π [36mRemoving [1mfix-auth[22m worktree & branch in background[39m+β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+13[0m[39m[90m)[39m[0m+π [36m[36mRemoving [1mfix-auth[22m worktree & branch in background[39m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_simple_switch.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_simple_switch.snapindex b2f06dafc..d04231d9c 100644--- a/tests/snapshots/integration__integration_tests__merge__readme_example_simple_switch.snap+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_simple_switch.snap@@ -25,5 +25,5 @@ exit_code: 0----- stdout ---------- stderr ------β [32mCreated new worktree for [1mfix-auth[22m from [1mmain[22m at [1m[REPO].fix-auth[39m[22m-π‘ [2mRun `wt config shell install` to enable automatic cd[22m+β [32m[32mCreated new worktree for [1mfix-auth[22m from [1mmain[22m at [1m[REPO].fix-auth[39m[22m[0m+π‘ [2m[2mRun `wt config shell install` to enable automatic cd[22m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__step_commit_both_flags.snap b/tests/snapshots/integration__integration_tests__merge__step_commit_both_flags.snapindex eeb58674a..cff76e6c8 100644--- a/tests/snapshots/integration__integration_tests__merge__step_commit_both_flags.snap+++ b/tests/snapshots/integration__integration_tests__merge__step_commit_both_flags.snap@@ -28,8 +28,8 @@ exit_code: 0----- stdout ---------- stderr ------π‘ [2mSkipping pre-commit hook (--no-verify)[22m-π [36mCommitting tracked changes with default message... (1 file, [32m+1[0m, [31m-1[0m)[39m-π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[22m+π‘ [2mSkipping pre-commit hook (--no-verify)[0m+π [36mCommitting tracked changes with default message... [90m(1 file, [32m+1[0m, [31m-1[0m[39m[90m)[39m[0m+π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[107m [0m [1mChanges to tracked.txt[22m-β [32mCommitted changes @ [2ma5890cb[39m[22m+β [32mCommitted changes @ [2ma5890cb[22m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__step_commit_no_verify.snap b/tests/snapshots/integration__integration_tests__merge__step_commit_no_verify.snapindex e09dea863..c5a9add2b 100644--- a/tests/snapshots/integration__integration_tests__merge__step_commit_no_verify.snap+++ b/tests/snapshots/integration__integration_tests__merge__step_commit_no_verify.snap@@ -27,11 +27,11 @@ exit_code: 0----- stdout ---------- stderr ------π‘ [2mSkipping pre-commit hook (--no-verify)[22m-π‘ [33mAuto-staging 2 untracked files:[39m+π‘ [2mSkipping pre-commit hook (--no-verify)[0m+π‘ [33mAuto-staging 2 untracked files:[0m[107m [0m .config/[107m [0m file1.txt-π [36mCommitting changes with default message... (2 files, [32m+2[0m)[39m-π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[22m+π [36mCommitting changes with default message... [90m(2 files, [32m+2[0m[39m[90m)[39m[0m+π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[107m [0m [1mChanges to wt.toml & file1.txt[22m-β [32mCommitted changes @ [2m3dbcd5d[39m[22m+β [32mCommitted changes @ [2m3dbcd5d[22m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__step_commit_nothing_to_commit.snap b/tests/snapshots/integration__integration_tests__merge__step_commit_nothing_to_commit.snapindex 05f247264..a350373c5 100644--- a/tests/snapshots/integration__integration_tests__merge__step_commit_nothing_to_commit.snap+++ b/tests/snapshots/integration__integration_tests__merge__step_commit_nothing_to_commit.snap@@ -27,8 +27,8 @@ exit_code: 1----- stdout ---------- stderr ------π [36mCommitting changes with default message...[39m-π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[22m+π [36mCommitting changes with default message...[0m+π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[107m [0m [1mWIP: Changes[22mβ [31mFailed to commit[39m[107m [0m On branch maindiff --git a/tests/snapshots/integration__integration_tests__merge__step_commit_stage_tracked.snap b/tests/snapshots/integration__integration_tests__merge__step_commit_stage_tracked.snapindex 920ba75d0..a9ca2ba81 100644--- a/tests/snapshots/integration__integration_tests__merge__step_commit_stage_tracked.snap+++ b/tests/snapshots/integration__integration_tests__merge__step_commit_stage_tracked.snap@@ -27,7 +27,7 @@ exit_code: 0----- stdout ---------- stderr ------π [36mCommitting tracked changes with default message... (1 file, [32m+1[0m, [31m-1[0m)[39m-π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[22m+π [36mCommitting tracked changes with default message... [90m(1 file, [32m+1[0m, [31m-1[0m[39m[90m)[39m[0m+π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[107m [0m [1mChanges to tracked.txt[22m-β [32mCommitted changes @ [2m7d441f0[39m[22m+β [32mCommitted changes @ [2m7d441f0[22m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__step_squash_both_flags.snap b/tests/snapshots/integration__integration_tests__merge__step_squash_both_flags.snapindex 775f131c5..8452ff0e2 100644--- a/tests/snapshots/integration__integration_tests__merge__step_squash_both_flags.snap+++ b/tests/snapshots/integration__integration_tests__merge__step_squash_both_flags.snap@@ -28,14 +28,14 @@ exit_code: 0----- stdout ---------- stderr ------π‘ [2mSkipping pre-commit hook (--no-verify)[22m-π [36mSquashing 2 commits & tracked changes into a single commit (3 files, [32m+3[0m)...[39m-π‘ [2mBackup created @ 31e06e8[22m-π [36mGenerating squash commit message...[39m-π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[22m+π‘ [2mSkipping pre-commit hook (--no-verify)[0m+π [36mSquashing 2 commits & tracked changes into a single commit [90m(3 files, [32m+3[0m[39m[90m)[39m...[0m+π‘ [2mBackup created @ 31e06e8[0m+π [36mGenerating squash commit message...[0m+π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[107m [0m [1mSquash commits from main[22m[107m [0m[107m [0m Combined commits:[107m [0m - feat: add file 1[107m [0m - feat: add file 2-β [32mSquashed @ [2m9f7a3e2[39m[22m+β [32mSquashed @ [2m9f7a3e2[22m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__step_squash_no_verify.snap b/tests/snapshots/integration__integration_tests__merge__step_squash_no_verify.snapindex 4203cff43..d51bc7d85 100644--- a/tests/snapshots/integration__integration_tests__merge__step_squash_no_verify.snap+++ b/tests/snapshots/integration__integration_tests__merge__step_squash_no_verify.snap@@ -27,13 +27,13 @@ exit_code: 0----- stdout ---------- stderr ------π‘ [2mSkipping pre-commit hook (--no-verify)[22m-π [36mSquashing 2 commits into a single commit (3 files, [32m+3[0m)...[39m-π [36mGenerating squash commit message...[39m-π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[22m+π‘ [2mSkipping pre-commit hook (--no-verify)[0m+π [36mSquashing 2 commits into a single commit [90m(3 files, [32m+3[0m[39m[90m)[39m...[0m+π [36mGenerating squash commit message...[0m+π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[107m [0m [1mSquash commits from main[22m[107m [0m[107m [0m Combined commits:[107m [0m - feat: add file 1[107m [0m - feat: add file 2-β [32mSquashed @ [2m588aa53[39m[22m+β [32mSquashed @ [2m588aa53[22m[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__step_squash_stage_tracked.snap b/tests/snapshots/integration__integration_tests__merge__step_squash_stage_tracked.snapindex 9b25e4a19..ff3596848 100644--- a/tests/snapshots/integration__integration_tests__merge__step_squash_stage_tracked.snap+++ b/tests/snapshots/integration__integration_tests__merge__step_squash_stage_tracked.snap@@ -27,13 +27,13 @@ exit_code: 0----- stdout ---------- stderr ------π [36mSquashing 2 commits & tracked changes into a single commit (2 files, [32m+2[0m)...[39m-π‘ [2mBackup created @ ba1424b[22m-π [36mGenerating squash commit message...[39m-π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[22m+π [36mSquashing 2 commits & tracked changes into a single commit [90m(2 files, [32m+2[0m[39m[90m)[39m...[0m+π‘ [2mBackup created @ ba1424b[0m+π [36mGenerating squash commit message...[0m+π‘ [2mUsing fallback commit message. Run 'wt config --help' for LLM setup guide[0m[107m [0m [1mSquash commits from main[22m[107m [0m[107m [0m Combined commits:[107m [0m - feat: add file 1[107m [0m - feat: add file 2-β [32mSquashed @ [2m6c0b38b[39m[22m+β [32mSquashed @ [2m6c0b38b[22m[0mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snap b/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snapindex 94602687b..068d05fa2 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__both_create_and_start.snap@@ -26,9 +26,9 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRunning post-create:[39m+π [36mRunning post-create:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Setup done'[0m[2m [0m[2m[36m>[0m[2m setup.txt[0m-[0mβ [32mCreated new worktree for [1mfeature[22m from [1mmain[22m at [1m[REPO].feature[39m[22m-π‘ [2mRun `wt config shell install` to enable automatic cd[22m-π [36mRunning post-start [1mserver[22m:[39m+[0mβ [32m[32mCreated new worktree for [1mfeature[22m from [1mmain[22m at [1m[REPO].feature[39m[22m[0m+π‘ [2m[2mRun `wt config shell install` to enable automatic cd[22m[0m+π [36mRunning post-start [1mserver[22m:[0m[107m [0m [2m[0m[2m[34msleep[0m[2m 0.05 [0m[2m[36m&&[0m[2m [0m[2m[34mecho[0m[2m [0m[2m[32m'Server running'[0m[2m [0m[2m[36m>[0m[2m server.txt[0mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap b/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snapindex 2dd243d7a..9c9a68b04 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__execute_with_post_start.snap@@ -28,8 +28,8 @@ exit_code: 0----- stdout ---------- stderr ------β [32mCreated new worktree for [1mfeature[22m from [1mmain[22m at [1m[REPO].feature[39m[22m-π [36mRunning post-start:[39m+β [32m[32mCreated new worktree for [1mfeature[22m from [1mmain[22m at [1m[REPO].feature[39m[22m[0m+π [36mRunning post-start:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Background task'[0m[2m [0m[2m[36m>[0m[2m background.txt[0m-π [36mExecuting (--execute):[39m+π [36m[36mExecuting (--execute):[39m[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Execute flag'[0m[2m [0m[2m[36m>[0m[2m execute.txt[0mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snapindex 4d75b6633..9ec9173e7 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_failing_command.snap@@ -26,8 +26,8 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRunning post-create:[39m+π [36mRunning post-create:[0m[107m [0m [2m[0m[2m[34mexit[0m[2m 1[0m-[0mπ‘ [33mCommand failed: exit status: 1[39m-β [32mCreated new worktree for [1mfeature[22m from [1mmain[22m at [1m[REPO].feature[39m[22m-π‘ [2mRun `wt config shell install` to enable automatic cd[22m+[0mπ‘ [33mCommand failed: exit status: 1[0m+β [32m[32mCreated new worktree for [1mfeature[22m from [1mmain[22m at [1m[REPO].feature[39m[22m[0m+π‘ [2m[2mRun `wt config shell install` to enable automatic cd[22m[0mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiline_control_structure.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiline_control_structure.snapindex 163f28bb3..62ec83cee 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiline_control_structure.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiline_control_structure.snap@@ -26,11 +26,11 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRunning post-create:[39m+π [36mRunning post-create:[0m[107m [0m [2m[0m[2m[35mif[0m[2m [ ! -f test.txt ]; [0m[2m[35mthen[0m[2m[0m[2m[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'File does not exist'[0m[2m [0m[2m[36m>[0m[2m result.txt[0m[107m [0m [2m[0m[2m[34melse[0m[2m[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'File exists'[0m[2m [0m[2m[36m>[0m[2m result.txt[0m[107m [0m [2m[0m[2m[34mfi[0m[2m[0m-[0mβ [32mCreated new worktree for [1mfeature[22m from [1mmain[22m at [1m[REPO].feature[39m[22m-π‘ [2mRun `wt config shell install` to enable automatic cd[22m+[0mβ [32m[32mCreated new worktree for [1mfeature[22m from [1mmain[22m at [1m[REPO].feature[39m[22m[0m+π‘ [2m[2mRun `wt config shell install` to enable automatic cd[22m[0mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiple_commands_array.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiple_commands_array.snapindex 2a023d3d7..69cda577e 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiple_commands_array.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_multiple_commands_array.snap@@ -26,11 +26,11 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRunning post-create:[39m+π [36mRunning post-create:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'First'[0m[2m[0m[0mFirst-π [36mRunning post-create:[39m+π [36mRunning post-create:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Second'[0m[2m[0m[0mSecond-β [32mCreated new worktree for [1mfeature[22m from [1mmain[22m at [1m[REPO].feature[39m[22m-π‘ [2mRun `wt config shell install` to enable automatic cd[22m+β [32m[32mCreated new worktree for [1mfeature[22m from [1mmain[22m at [1m[REPO].feature[39m[22m[0m+π‘ [2m[2mRun `wt config shell install` to enable automatic cd[22m[0mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_named_commands.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_named_commands.snapindex bd56526f7..b3f469b02 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_named_commands.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_named_commands.snap@@ -26,11 +26,11 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRunning post-create [1minstall[22m:[39m+π [36mRunning post-create [1minstall[22m:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Installing deps'[0m[2m[0m[0mInstalling deps-π [36mRunning post-create [1msetup[22m:[39m+π [36mRunning post-create [1msetup[22m:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Running setup'[0m[2m[0m[0mRunning setup-β [32mCreated new worktree for [1mfeature[22m from [1mmain[22m at [1m[REPO].feature[39m[22m-π‘ [2mRun `wt config shell install` to enable automatic cd[22m+β [32m[32mCreated new worktree for [1mfeature[22m from [1mmain[22m at [1m[REPO].feature[39m[22m[0m+π‘ [2m[2mRun `wt config shell install` to enable automatic cd[22m[0mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_no_config.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_no_config.snapindex 1f41f03dc..68c7ebddd 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_no_config.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_no_config.snap@@ -26,5 +26,5 @@ exit_code: 0----- stdout ---------- stderr ------β [32mCreated new worktree for [1mfeature[22m from [1mmain[22m at [1m[REPO].feature[39m[22m-π‘ [2mRun `wt config shell install` to enable automatic cd[22m+β [32m[32mCreated new worktree for [1mfeature[22m from [1mmain[22m at [1m[REPO].feature[39m[22m[0m+π‘ [2m[2mRun `wt config shell install` to enable automatic cd[22m[0mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_single_command.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_single_command.snapindex 0689fa3d5..d8c496cb6 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_single_command.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_single_command.snap@@ -26,8 +26,8 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRunning post-create:[39m+π [36mRunning post-create:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Setup complete'[0m[2m[0m[0mSetup complete-β [32mCreated new worktree for [1mfeature[22m from [1mmain[22m at [1m[REPO].feature[39m[22m-π‘ [2mRun `wt config shell install` to enable automatic cd[22m+β [32m[32mCreated new worktree for [1mfeature[22m from [1mmain[22m at [1m[REPO].feature[39m[22m[0m+π‘ [2m[2mRun `wt config shell install` to enable automatic cd[22m[0mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snapindex ab0800a3f..053d81e52 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_template_expansion.snap@@ -26,13 +26,13 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRunning post-create:[39m+π [36mRunning post-create:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Repo: repo'[0m[2m [0m[2m[36m>[0m[2m info.txt[0m-[0mπ [36mRunning post-create:[39m+[0mπ [36mRunning post-create:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Branch: feature-test'[0m[2m [0m[2m[36m>>[0m[2m info.txt[0m-[0mπ [36mRunning post-create:[39m+[0mπ [36mRunning post-create:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Worktree: [REPO].feature-test'[0m[2m [0m[2m[36m>>[0m[2m info.txt[0m-[0mπ [36mRunning post-create:[39m+[0mπ [36mRunning post-create:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Root: [REPO]'[0m[2m [0m[2m[36m>>[0m[2m info.txt[0m-[0mβ [32mCreated new worktree for [1mfeature/test[22m from [1mmain[22m at [1m[REPO].feature-test[39m[22m-π‘ [2mRun `wt config shell install` to enable automatic cd[22m+[0mβ [32m[32mCreated new worktree for [1mfeature/test[22m from [1mmain[22m at [1m[REPO].feature-test[39m[22m[0m+π‘ [2m[2mRun `wt config shell install` to enable automatic cd[22m[0mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_complex_shell.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_complex_shell.snapindex ba985c73e..e92d93179 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_complex_shell.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_complex_shell.snap@@ -26,9 +26,9 @@ exit_code: 0----- stdout ---------- stderr ------β [32mCreated new worktree for [1mfeature[22m from [1mmain[22m at [1m[REPO].feature[39m[22m-π‘ [2mRun `wt config shell install` to enable automatic cd[22m-π [36mRunning post-start:[39m+β [32m[32mCreated new worktree for [1mfeature[22m from [1mmain[22m at [1m[REPO].feature[39m[22m[0m+π‘ [2m[2mRun `wt config shell install` to enable automatic cd[22m[0m+π [36mRunning post-start:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m 'line1[0m[107m [0m [2m[0m[2m[34mline2[0m[2m[0m[107m [0m [2m[0m[2m[34mline3[0m[2m' | grep line2 > filtered.txt[0mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_create_with_command.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_create_with_command.snapindex a73c4691e..b223fc4f8 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_create_with_command.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_create_with_command.snap@@ -26,7 +26,7 @@ exit_code: 0----- stdout ---------- stderr ------β [32mCreated new worktree for [1mfeature[22m from [1mmain[22m at [1m[REPO].feature[39m[22m-π‘ [2mRun `wt config shell install` to enable automatic cd[22m-π [36mRunning post-start:[39m+β [32m[32mCreated new worktree for [1mfeature[22m from [1mmain[22m at [1m[REPO].feature[39m[22m[0m+π‘ [2m[2mRun `wt config shell install` to enable automatic cd[22m[0m+π [36mRunning post-start:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'POST-START-RAN'[0m[2m [0m[2m[36m>[0m[2m post_start_marker.txt[0mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_invalid_command.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_invalid_command.snapindex fd6da2eb7..c2f4e57e0 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_invalid_command.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_invalid_command.snap@@ -26,7 +26,7 @@ exit_code: 0----- stdout ---------- stderr ------β [32mCreated new worktree for [1mfeature[22m from [1mmain[22m at [1m[REPO].feature[39m[22m-π‘ [2mRun `wt config shell install` to enable automatic cd[22m-π [36mRunning post-start:[39m+β [32m[32mCreated new worktree for [1mfeature[22m from [1mmain[22m at [1m[REPO].feature[39m[22m[0m+π‘ [2m[2mRun `wt config shell install` to enable automatic cd[22m[0m+π [36mRunning post-start:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m 'unclosed quote[0mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_log_captures_output.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_log_captures_output.snapindex a7c957528..238679a60 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_log_captures_output.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_log_captures_output.snap@@ -26,7 +26,7 @@ exit_code: 0----- stdout ---------- stderr ------β [32mCreated new worktree for [1mfeature[22m from [1mmain[22m at [1m[REPO].feature[39m[22m-π‘ [2mRun `wt config shell install` to enable automatic cd[22m-π [36mRunning post-start:[39m+β [32m[32mCreated new worktree for [1mfeature[22m from [1mmain[22m at [1m[REPO].feature[39m[22m[0m+π‘ [2m[2mRun `wt config shell install` to enable automatic cd[22m[0m+π [36mRunning post-start:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'stdout output'[0m[2m [0m[2m[36m&&[0m[2m [0m[2m[34mecho[0m[2m [0m[2m[32m'stderr output'[0m[2m >&2[0mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiline_with_newlines.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiline_with_newlines.snapindex 7d032f3a7..be773fb24 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiline_with_newlines.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiline_with_newlines.snap@@ -26,9 +26,9 @@ exit_code: 0----- stdout ---------- stderr ------β [32mCreated new worktree for [1mfeature[22m from [1mmain[22m at [1m[REPO].feature[39m[22m-π‘ [2mRun `wt config shell install` to enable automatic cd[22m-π [36mRunning post-start:[39m+β [32m[32mCreated new worktree for [1mfeature[22m from [1mmain[22m at [1m[REPO].feature[39m[22m[0m+π‘ [2m[2mRun `wt config shell install` to enable automatic cd[22m[0m+π [36mRunning post-start:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'first line'[0m[2m [0m[2m[36m>[0m[2m multiline.txt[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'second line'[0m[2m [0m[2m[36m>>[0m[2m multiline.txt[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'third line'[0m[2m [0m[2m[36m>>[0m[2m multiline.txt[0mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_background.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_background.snapindex 02d0681d7..4a2a9da6d 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_background.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_multiple_background.snap@@ -26,9 +26,9 @@ exit_code: 0----- stdout ---------- stderr ------β [32mCreated new worktree for [1mfeature[22m from [1mmain[22m at [1m[REPO].feature[39m[22m-π‘ [2mRun `wt config shell install` to enable automatic cd[22m-π [36mRunning post-start [1mtask1[22m:[39m+β [32m[32mCreated new worktree for [1mfeature[22m from [1mmain[22m at [1m[REPO].feature[39m[22m[0m+π‘ [2m[2mRun `wt config shell install` to enable automatic cd[22m[0m+π [36mRunning post-start [1mtask1[22m:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Task 1 running'[0m[2m [0m[2m[36m>[0m[2m task1.txt[0m-π [36mRunning post-start [1mtask2[22m:[39m+π [36mRunning post-start [1mtask2[22m:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Task 2 running'[0m[2m [0m[2m[36m>[0m[2m task2.txt[0mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_separate_logs.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_separate_logs.snapindex c92c7308a..151256189 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_separate_logs.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_separate_logs.snap@@ -26,11 +26,11 @@ exit_code: 0----- stdout ---------- stderr ------β [32mCreated new worktree for [1mfeature[22m from [1mmain[22m at [1m[REPO].feature[39m[22m-π‘ [2mRun `wt config shell install` to enable automatic cd[22m-π [36mRunning post-start [1mtask1[22m:[39m+β [32m[32mCreated new worktree for [1mfeature[22m from [1mmain[22m at [1m[REPO].feature[39m[22m[0m+π‘ [2m[2mRun `wt config shell install` to enable automatic cd[22m[0m+π [36mRunning post-start [1mtask1[22m:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'TASK1_OUTPUT'[0m[2m[0m-π [36mRunning post-start [1mtask2[22m:[39m+π [36mRunning post-start [1mtask2[22m:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'TASK2_OUTPUT'[0m[2m[0m-π [36mRunning post-start [1mtask3[22m:[39m+π [36mRunning post-start [1mtask3[22m:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'TASK3_OUTPUT'[0m[2m[0mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_single_background.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_single_background.snapindex fca1260e0..3f1dd1189 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_single_background.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_single_background.snap@@ -26,7 +26,7 @@ exit_code: 0----- stdout ---------- stderr ------β [32mCreated new worktree for [1mfeature[22m from [1mmain[22m at [1m[REPO].feature[39m[22m-π‘ [2mRun `wt config shell install` to enable automatic cd[22m-π [36mRunning post-start:[39m+β [32m[32mCreated new worktree for [1mfeature[22m from [1mmain[22m at [1m[REPO].feature[39m[22m[0m+π‘ [2m[2mRun `wt config shell install` to enable automatic cd[22m[0m+π [36mRunning post-start:[0m[107m [0m [2m[0m[2m[34msleep[0m[2m 0.1 [0m[2m[36m&&[0m[2m [0m[2m[34mecho[0m[2m [0m[2m[32m'Background task done'[0m[2m [0m[2m[36m>[0m[2m background.txt[0mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_skip_existing.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_skip_existing.snapindex 10325d739..785903b3d 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_start_skip_existing.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_start_skip_existing.snap@@ -25,5 +25,5 @@ exit_code: 0----- stdout ---------- stderr ------π‘ [33mWorktree for [1mfeature[22m at [1m[REPO].feature[22m; cannot cd (no shell integration)[39m-π‘ [2mRun `wt config shell install` to enable automatic cd[22m+π‘ [33m[33mWorktree for [1mfeature[22m at [1m[REPO].feature[22m; cannot cd (no shell integration)[39m[0m+π‘ [2m[2mRun `wt config shell install` to enable automatic cd[22m[0mdiff --git a/tests/snapshots/integration__integration_tests__push__push_dirty_target_autostash.snap b/tests/snapshots/integration__integration_tests__push__push_dirty_target_autostash.snapindex 0a83ad3cf..b6368135f 100644--- a/tests/snapshots/integration__integration_tests__push__push_dirty_target_autostash.snap+++ b/tests/snapshots/integration__integration_tests__push__push_dirty_target_autostash.snap@@ -25,10 +25,10 @@ exit_code: 0----- stdout ---------- stderr ------π [36mStashing changes in [1m[REPO][22m...[39m-π [36mPushing 1 commit to [1mmain[22m @ [2m6551244[22m[39m+π [36mStashing changes in [1m[REPO][22m...[0m+π [36mPushing 1 commit to [1mmain[22m @ [2m6551244[22m[0m[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-π [36mRestoring stashed changes in [1m[REPO][22m...[39m-β [32mPushed to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m+π [36mRestoring stashed changes in [1m[REPO][22m...[0m+β [32mPushed to [1mmain[22m [90m(1 commit, 1 file, [32m+1[0m[39m[90m)[39m[0mdiff --git a/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_fast_forward.snapindex 7b28df25d..38947b3f3 100644--- a/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap@@ -25,8 +25,8 @@ exit_code: 0----- stdout ---------- stderr ------π [36mPushing 1 commit to [1mmain[22m @ [2mc2e2bcc[22m[39m+π [36mPushing 1 commit to [1mmain[22m @ [2mc2e2bcc[22m[0m[107m [0m * [33mc2e2bcc[m Add test file[107m [0m test.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mPushed to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m+β [32mPushed to [1mmain[22m [90m(1 commit, 1 file, [32m+1[0m[39m[90m)[39m[0mdiff --git a/tests/snapshots/integration__integration_tests__push__push_no_remote.snap b/tests/snapshots/integration__integration_tests__push__push_no_remote.snapindex 6e30f4e38..2624df73d 100644--- a/tests/snapshots/integration__integration_tests__push__push_no_remote.snap+++ b/tests/snapshots/integration__integration_tests__push__push_no_remote.snap@@ -24,8 +24,8 @@ exit_code: 0----- stdout ---------- stderr ------π [36mPushing 1 commit to [1mmain[22m @ [2m6551244[22m[39m+π [36mPushing 1 commit to [1mmain[22m @ [2m6551244[22m[0m[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mPushed to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m+β [32mPushed to [1mmain[22m [90m(1 commit, 1 file, [32m+1[0m[39m[90m)[39m[0mdiff --git a/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snapindex 3e538b44b..1a394203c 100644--- a/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap@@ -25,8 +25,8 @@ exit_code: 0----- stdout ---------- stderr ------π [36mPushing 1 commit to [1mmain[22m @ [2m4af48f0[22m[39m+π [36mPushing 1 commit to [1mmain[22m @ [2m4af48f0[22m[0m[107m [0m * [33m4af48f0[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mPushed to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m+β [32mPushed to [1mmain[22m [90m(1 commit, 1 file, [32m+1[0m[39m[90m)[39m[0mdiff --git a/tests/snapshots/integration__integration_tests__push__push_to_default.snap b/tests/snapshots/integration__integration_tests__push__push_to_default.snapindex 6e30f4e38..2624df73d 100644--- a/tests/snapshots/integration__integration_tests__push__push_to_default.snap+++ b/tests/snapshots/integration__integration_tests__push__push_to_default.snap@@ -24,8 +24,8 @@ exit_code: 0----- stdout ---------- stderr ------π [36mPushing 1 commit to [1mmain[22m @ [2m6551244[22m[39m+π [36mPushing 1 commit to [1mmain[22m @ [2m6551244[22m[0m[107m [0m * [33m6551244[m Add feature file[107m [0m feature.txt | 1 [32m+[m[107m [0m 1 file changed, 1 insertion(+)-β [32mPushed to [1mmain[22m (1 commit, 1 file, [32m+1[0m)[39m+β [32mPushed to [1mmain[22m [90m(1 commit, 1 file, [32m+1[0m[39m[90m)[39m[0mdiff --git a/tests/snapshots/integration__integration_tests__push__push_with_merge_commits_allowed.snap b/tests/snapshots/integration__integration_tests__push__push_with_merge_commits_allowed.snapindex 8a8534efd..787e41cde 100644--- a/tests/snapshots/integration__integration_tests__push__push_with_merge_commits_allowed.snap+++ b/tests/snapshots/integration__integration_tests__push__push_with_merge_commits_allowed.snap@@ -26,7 +26,7 @@ exit_code: 0----- stdout ---------- stderr ------π [36mPushing 3 commits to [1mmain[22m @ [2m13bed7b[22m (merge commits allowed)[39m+π [36mPushing 3 commits to [1mmain[22m @ [2m13bed7b[22m (merge commits allowed)[0m[107m [0m * [33m13bed7b[m Merge temp[107m [0m [31m|[m[32m/[m[107m [0m [31m|[m * [33m1f38fab[m Commit 2@@ -35,4 +35,4 @@ exit_code: 0[107m [0m file1.txt | 1 [32m+[m[107m [0m file2.txt | 1 [32m+[m[107m [0m 2 files changed, 2 insertions(+)-β [32mPushed to [1mmain[22m (3 commits, 2 files, [32m+2[0m)[39m+β [32mPushed to [1mmain[22m [90m(3 commits, 2 files, [32m+2[0m[39m[90m)[39m[0mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_already_on_default.snap b/tests/snapshots/integration__integration_tests__remove__remove_already_on_default.snapindex ea9d15404..868b46fcc 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_already_on_default.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_already_on_default.snap@@ -23,4 +23,4 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRemoving [1mmain[22m worktree & branch in background[39m+π [36m[36mRemoving [1mmain[22m worktree & branch in background[39m[0mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_branch_matching_tree_content.snap b/tests/snapshots/integration__integration_tests__remove__remove_branch_matching_tree_content.snapindex dcd56baa3..736b79373 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_branch_matching_tree_content.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_branch_matching_tree_content.snap@@ -25,4 +25,4 @@ exit_code: 0----- stderr -----βͺ [90mNo worktree found for branch feature-squashed[39m-β [32mRemoved branch [1mfeature-squashed[22m[39m+β [32m[32mRemoved branch [1mfeature-squashed[22m[39m[0mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_branch_not_fully_merged.snap b/tests/snapshots/integration__integration_tests__remove__remove_branch_not_fully_merged.snapindex c68c9ff65..e4311567c 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_branch_not_fully_merged.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_branch_not_fully_merged.snap@@ -24,4 +24,4 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRemoving [1mfeature-unmerged[22m worktree in background; retaining unmerged branch[39m+π [36m[36mRemoving [1mfeature-unmerged[22m worktree in background; retaining unmerged branch[39m[0mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_branch_only_force_delete.snap b/tests/snapshots/integration__integration_tests__remove__remove_branch_only_force_delete.snapindex 4a8283a07..ee8650f9d 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_branch_only_force_delete.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_branch_only_force_delete.snap@@ -26,4 +26,4 @@ exit_code: 0----- stderr -----βͺ [90mNo worktree found for branch feature-force[39m-β [32mRemoved branch [1mfeature-force[22m (--force-delete)[39m+β [32m[32mRemoved branch [1mfeature-force[22m (--force-delete)[39m[0mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_branch_only_merged.snap b/tests/snapshots/integration__integration_tests__remove__remove_branch_only_merged.snapindex d42cd9080..4cad342cb 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_branch_only_merged.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_branch_only_merged.snap@@ -25,4 +25,4 @@ exit_code: 0----- stderr -----βͺ [90mNo worktree found for branch feature-merged[39m-β [32mRemoved branch [1mfeature-merged[22m[39m+β [32m[32mRemoved branch [1mfeature-merged[22m[39m[0mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_branch_only_unmerged.snap b/tests/snapshots/integration__integration_tests__remove__remove_branch_only_unmerged.snapindex 7e95bdabf..13430d509 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_branch_only_unmerged.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_branch_only_unmerged.snap@@ -25,5 +25,5 @@ exit_code: 0----- stderr -----βͺ [90mNo worktree found for branch feature-unmerged[39m-π‘ [33mCould not delete branch [1mfeature-unmerged[39m[22m+π‘ [33m[33mCould not delete branch [1mfeature-unmerged[39m[22m[0m[107m [0m error: the branch 'feature-unmerged' is not fully mergeddiff --git a/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_main.snap b/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_main.snapindex 68b1d290b..4cd5b7815 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_main.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_main.snap@@ -24,4 +24,4 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRemoving [1mfeature-a[22m worktree & branch in background[39m+π [36m[36mRemoving [1mfeature-a[22m worktree & branch in background[39m[0mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_other_worktree.snap b/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_other_worktree.snapindex 817ee54e6..0cfdc5b2f 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_other_worktree.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_other_worktree.snap@@ -24,4 +24,4 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRemoving [1mfeature-b[22m worktree & branch in background[39m+π [36m[36mRemoving [1mfeature-b[22m worktree & branch in background[39m[0mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_current_by_name.snap b/tests/snapshots/integration__integration_tests__remove__remove_current_by_name.snapindex 9bd68b5c0..2afcdf6f0 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_current_by_name.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_current_by_name.snap@@ -24,4 +24,4 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRemoving [1mfeature-current[22m worktree & branch in background[39m+π [36m[36mRemoving [1mfeature-current[22m worktree & branch in background[39m[0mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_foreground.snap b/tests/snapshots/integration__integration_tests__remove__remove_foreground.snapindex 4d26d627e..f219c6630 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_foreground.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_foreground.snap@@ -25,5 +25,5 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRemoving worktree for [1mfeature-fg[22m...[39m-β [32mRemoved worktree & branch for [1mfeature-fg[22m[39m+π [36m[36mRemoving worktree for [1mfeature-fg[22m...[39m[0m+β [32m[32mRemoved worktree & branch for [1mfeature-fg[22m[39m[0mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap b/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snapindex 9709f7f06..093f19c3c 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap@@ -23,4 +23,4 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRemoving [1mfeature-wt[22m worktree & branch in background[39m+π [36m[36mRemoving [1mfeature-wt[22m worktree & branch in background[39m[0mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap b/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snapindex 21c645e7b..2af863d94 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap@@ -25,4 +25,4 @@ exit_code: 0cd '[REPO]'----- stderr ------π [36mRemoving [1mfeature-internal[22m worktree & branch in background[39m+π [36m[36mRemoving [1mfeature-internal[22m worktree & branch in background[39m[0mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_multiple_including_current.snap b/tests/snapshots/integration__integration_tests__remove__remove_multiple_including_current.snapindex 42f074f07..b5955f9bc 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_multiple_including_current.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_multiple_including_current.snap@@ -26,6 +26,6 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRemoving [1mfeature-b[22m worktree & branch in background[39m-π [36mRemoving [1mfeature-c[22m worktree & branch in background[39m-π [36mRemoving [1mfeature-a[22m worktree & branch in background[39m+π [36m[36mRemoving [1mfeature-b[22m worktree & branch in background[39m[0m+π [36m[36mRemoving [1mfeature-c[22m worktree & branch in background[39m[0m+π [36m[36mRemoving [1mfeature-a[22m worktree & branch in background[39m[0mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snapindex 5283e05ad..da5b852ad 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap@@ -26,6 +26,6 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRemoving [1mfeature-a[22m worktree & branch in background[39m-π [36mRemoving [1mfeature-b[22m worktree & branch in background[39m-π [36mRemoving [1mfeature-c[22m worktree & branch in background[39m+π [36m[36mRemoving [1mfeature-a[22m worktree & branch in background[39m[0m+π [36m[36mRemoving [1mfeature-b[22m worktree & branch in background[39m[0m+π [36m[36mRemoving [1mfeature-c[22m worktree & branch in background[39m[0mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_no_delete_branch.snap b/tests/snapshots/integration__integration_tests__remove__remove_no_delete_branch.snapindex 65c760d8a..f4b6d5df4 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_no_delete_branch.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_no_delete_branch.snap@@ -25,4 +25,4 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRemoving [1mfeature-keep[22m worktree in background; retaining branch (--no-delete-branch)[39m+π [36m[36mRemoving [1mfeature-keep[22m worktree in background; retaining branch (--no-delete-branch)[39m[0mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_switch_to_default.snap b/tests/snapshots/integration__integration_tests__remove__remove_switch_to_default.snapindex e2a85b762..4069c36ed 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_switch_to_default.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_switch_to_default.snap@@ -23,4 +23,4 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRemoving [1mfeature[22m worktree & branch in background[39m+π [36m[36mRemoving [1mfeature[22m worktree & branch in background[39m[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__create_with_base_main.snap b/tests/snapshots/integration__integration_tests__switch__create_with_base_main.snapindex 622745952..28d72e443 100644--- a/tests/snapshots/integration__integration_tests__switch__create_with_base_main.snap+++ b/tests/snapshots/integration__integration_tests__switch__create_with_base_main.snap@@ -28,5 +28,5 @@ exit_code: 0----- stdout ---------- stderr ------β [32mCreated new worktree for [1mnew-feature[22m from [1mmain[22m at [1m[REPO].new-feature[39m[22m-π‘ [2mRun `wt config shell install` to enable automatic cd[22m+β [32m[32mCreated new worktree for [1mnew-feature[22m from [1mmain[22m at [1m[REPO].new-feature[39m[22m[0m+π‘ [2m[2mRun `wt config shell install` to enable automatic cd[22m[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_base_without_create.snap b/tests/snapshots/integration__integration_tests__switch__switch_base_without_create.snapindex cf88b6150..d06dd288c 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_base_without_create.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_base_without_create.snap@@ -27,5 +27,5 @@ exit_code: 0----- stdout ---------- stderr ------π‘ [33m--base flag is only used with --create, ignoring[39m+π‘ [33m--base flag is only used with --create, ignoring[0mβͺ Already on worktree for [1mmain[22m at [1m[REPO][22mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_create_new.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_new.snapindex 430086b0c..7eb0fe546 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_create_new.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_create_new.snap@@ -26,5 +26,5 @@ exit_code: 0----- stdout ---------- stderr ------β [32mCreated new worktree for [1mfeature-x[22m from [1mmain[22m at [1m[REPO].feature-x[39m[22m-π‘ [2mRun `wt config shell install` to enable automatic cd[22m+β [32m[32mCreated new worktree for [1mfeature-x[22m from [1mmain[22m at [1m[REPO].feature-x[39m[22m[0m+π‘ [2m[2mRun `wt config shell install` to enable automatic cd[22m[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_create_no_remote.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_no_remote.snapindex 42bac9371..b236eaad8 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_create_no_remote.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_create_no_remote.snap@@ -26,5 +26,5 @@ exit_code: 0----- stdout ---------- stderr ------β [32mCreated new worktree for [1mfeature[22m from [1mmain[22m at [1m[REPO].feature[39m[22m-π‘ [2mRun `wt config shell install` to enable automatic cd[22m+β [32m[32mCreated new worktree for [1mfeature[22m from [1mmain[22m at [1m[REPO].feature[39m[22m[0m+π‘ [2m[2mRun `wt config shell install` to enable automatic cd[22m[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_create_remote_only.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_remote_only.snapindex 9ef1b3bb7..dab704d13 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_create_remote_only.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_create_remote_only.snap@@ -26,7 +26,7 @@ exit_code: 0----- stdout ---------- stderr ------π‘ [33mBranch [1mremote-feature[22m exists on remote (origin/remote-feature); creating new branch from base instead[39m-π‘ [2mUse 'wt switch remote-feature' (without --create) to switch to the remote branch[22m-β [32mCreated new worktree for [1mremote-feature[22m from [1mmain[22m at [1m[REPO].remote-feature[39m[22m-π‘ [2mRun `wt config shell install` to enable automatic cd[22m+π‘ [33mBranch [1mremote-feature[22m exists on remote (origin/remote-feature); creating new branch from base instead[0m+π‘ [2mUse 'wt switch remote-feature' (without --create) to switch to the remote branch[0m+β [32m[32mCreated new worktree for [1mremote-feature[22m from [1mmain[22m at [1m[REPO].remote-feature[39m[22m[0m+π‘ [2m[2mRun `wt config shell install` to enable automatic cd[22m[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_default_branch_missing_worktree.snap b/tests/snapshots/integration__integration_tests__switch__switch_default_branch_missing_worktree.snapindex 9aa1f7f30..c0b8d9abe 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_default_branch_missing_worktree.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_default_branch_missing_worktree.snap@@ -25,5 +25,5 @@ exit_code: 0----- stdout ---------- stderr ------β [32mSwitched to worktree for [1mmain[22m at [1m[REPO].main[39m[22m-π‘ [2mRun `wt config shell install` to enable automatic cd[22m+β [32m[32mSwitched to worktree for [1mmain[22m at [1m[REPO].main[39m[22m[0m+π‘ [2m[2mRun `wt config shell install` to enable automatic cd[22m[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snapindex 1fcce9193..366ff4533 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_creates_file.snap@@ -28,6 +28,6 @@ exit_code: 0----- stdout ---------- stderr ------β [32mCreated new worktree for [1mfile-test[22m from [1mmain[22m at [1m[REPO].file-test[39m[22m-π [36mExecuting (--execute):[39m+β [32m[32mCreated new worktree for [1mfile-test[22m from [1mmain[22m at [1m[REPO].file-test[39m[22m[0m+π [36m[36mExecuting (--execute):[39m[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test content'[0m[2m [0m[2m[36m>[0m[2m test.txt[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snapindex add03ce87..5a8d4d654 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap@@ -27,6 +27,6 @@ exit_code: 0----- stdout ---------- stderr ------β [32mSwitched to worktree for [1mexisting-exec[22m at [1m[REPO].existing-exec[39m[22m-π [36mExecuting (--execute):[39m+β [32m[32mSwitched to worktree for [1mexisting-exec[22m at [1m[REPO].existing-exec[39m[22m[0m+π [36m[36mExecuting (--execute):[39m[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'existing worktree'[0m[2m [0m[2m[36m>[0m[2m existing.txt[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snapindex ad139ba7f..f9d76a538 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap@@ -28,6 +28,6 @@ exit_code: 1----- stdout ---------- stderr ------β [32mCreated new worktree for [1mfail-test[22m from [1mmain[22m at [1m[REPO].fail-test[39m[22m-π [36mExecuting (--execute):[39m+β [32m[32mCreated new worktree for [1mfail-test[22m from [1mmain[22m at [1m[REPO].fail-test[39m[22m[0m+π [36m[36mExecuting (--execute):[39m[0m[107m [0m [2m[0m[2m[34mexit[0m[2m 1[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snapindex dd8dba354..43c4a99f4 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap@@ -31,8 +31,8 @@ line2line3----- stderr ------β [32mCreated new worktree for [1mmultiline-test[22m from [1mmain[22m at [1m[REPO].multiline-test[39m[22m-π [36mExecuting (--execute):[39m+β [32m[32mCreated new worktree for [1mmultiline-test[22m from [1mmain[22m at [1m[REPO].multiline-test[39m[22m[0m+π [36m[36mExecuting (--execute):[39m[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'line1'[0m[2m[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'line2'[0m[2m[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'line3'[0m[2m[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snapindex acd3e9bf0..1d79474f1 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap@@ -29,6 +29,6 @@ exit_code: 0test output----- stderr ------β [32mCreated new worktree for [1mexec-test[22m from [1mmain[22m at [1m[REPO].exec-test[39m[22m-π [36mExecuting (--execute):[39m+β [32m[32mCreated new worktree for [1mexec-test[22m from [1mmain[22m at [1m[REPO].exec-test[39m[22m[0m+π [36m[36mExecuting (--execute):[39m[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test output'[0m[2m[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snap b/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snapindex 573a0df19..db9530005 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snap@@ -25,5 +25,5 @@ exit_code: 0----- stdout ---------- stderr ------π‘ [33mWorktree for [1mfeature-z[22m at [1m[REPO].feature-z[22m; cannot cd (no shell integration)[39m-π‘ [2mRun `wt config shell install` to enable automatic cd[22m+π‘ [33m[33mWorktree for [1mfeature-z[22m at [1m[REPO].feature-z[22m; cannot cd (no shell integration)[39m[0m+π‘ [2m[2mRun `wt config shell install` to enable automatic cd[22m[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_existing_internal.snap b/tests/snapshots/integration__integration_tests__switch__switch_existing_internal.snapindex 24ffc6481..c024c2d5b 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_existing_internal.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_existing_internal.snap@@ -27,4 +27,4 @@ exit_code: 0cd '[REPO].existing-wt'----- stderr ------β [32mSwitched to worktree for [1mexisting-wt[22m at [1m[REPO].existing-wt[39m[22m+β [32m[32mSwitched to worktree for [1mexisting-wt[22m at [1m[REPO].existing-wt[39m[22m[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_existing_with_shell_configured.snap b/tests/snapshots/integration__integration_tests__switch__switch_existing_with_shell_configured.snapindex 72773bd58..45c7902d7 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_existing_with_shell_configured.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_existing_with_shell_configured.snap@@ -25,4 +25,4 @@ exit_code: 0----- stdout ---------- stderr ------β [32mSwitched to worktree for [1mshell-configured[22m at [1m[REPO].shell-configured[39m[22m+β [32m[32mSwitched to worktree for [1mshell-configured[22m at [1m[REPO].shell-configured[39m[22m[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_exit_code.snap b/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_exit_code.snapindex 75e0fd2af..ec99cbd7f 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_exit_code.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_exit_code.snap@@ -31,6 +31,6 @@ cd '[REPO].exit-code-test'exit 42----- stderr ------β [32mCreated new worktree for [1mexit-code-test[22m from [1mmain[22m at [1m[REPO].exit-code-test[39m[22m-π [36mExecuting (--execute):[39m+β [32m[32mCreated new worktree for [1mexit-code-test[22m from [1mmain[22m at [1m[REPO].exit-code-test[39m[22m[0m+π [36m[36mExecuting (--execute):[39m[0m[107m [0m [2m[0m[2m[34mexit[0m[2m 42[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_output_then_exit.snap b/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_output_then_exit.snapindex 4ae99c130..2c8443cad 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_output_then_exit.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_internal_execute_output_then_exit.snap@@ -32,7 +32,7 @@ echo 'doing work'exit 7----- stderr ------β [32mCreated new worktree for [1moutput-exit-test[22m from [1mmain[22m at [1m[REPO].output-exit-test[39m[22m-π [36mExecuting (--execute):[39m+β [32m[32mCreated new worktree for [1moutput-exit-test[22m from [1mmain[22m at [1m[REPO].output-exit-test[39m[22m[0m+π [36m[36mExecuting (--execute):[39m[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'doing work'[0m[2m[0m[107m [0m [2m[0m[2m[34mexit[0m[2m 7[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_internal_mode.snap b/tests/snapshots/integration__integration_tests__switch__switch_internal_mode.snapindex dac2f49f5..1ba8bbe95 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_internal_mode.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_internal_mode.snap@@ -28,4 +28,4 @@ exit_code: 0cd '[REPO].internal-test'----- stderr ------β [32mCreated new worktree for [1minternal-test[22m from [1mmain[22m at [1m[REPO].internal-test[39m[22m+β [32m[32mCreated new worktree for [1minternal-test[22m from [1mmain[22m at [1m[REPO].internal-test[39m[22m[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snap b/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snapindex afa8e3326..d886a39f3 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_internal_with_execute.snap@@ -32,7 +32,7 @@ echo 'line1'echo 'line2'----- stderr ------β [32mCreated new worktree for [1mexec-internal[22m from [1mmain[22m at [1m[REPO].exec-internal[39m[22m-π [36mExecuting (--execute):[39m+β [32m[32mCreated new worktree for [1mexec-internal[22m from [1mmain[22m at [1m[REPO].exec-internal[39m[22m[0m+π [36m[36mExecuting (--execute):[39m[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'line1'[0m[2m[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'line2'[0m[2m[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_main_branch_to_feature.snap b/tests/snapshots/integration__integration_tests__switch__switch_main_branch_to_feature.snapindex 11b2d860d..671c8a594 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_main_branch_to_feature.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_main_branch_to_feature.snap@@ -25,5 +25,5 @@ exit_code: 0----- stdout ---------- stderr ------β [32mSwitched to worktree for [1mfeature-a[22m at [1m[REPO].feature-a[39m[22m-π‘ [2mRun `wt config shell install` to enable automatic cd[22m+β [32m[32mSwitched to worktree for [1mfeature-a[22m at [1m[REPO].feature-a[39m[22m[0m+π‘ [2m[2mRun `wt config shell install` to enable automatic cd[22m[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch.snap b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch.snapindex f07208264..c1de5e918 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch.snap@@ -25,5 +25,5 @@ exit_code: 0----- stdout ---------- stderr ------π‘ [33mWorktree for [1mfeature-a[22m at [1m[REPO].feature-a[22m; cannot cd (no shell integration)[39m-π‘ [2mRun `wt config shell install` to enable automatic cd[22m+π‘ [33m[33mWorktree for [1mfeature-a[22m at [1m[REPO].feature-a[22m; cannot cd (no shell integration)[39m[0m+π‘ [2m[2mRun `wt config shell install` to enable automatic cd[22m[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_first.snap b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_first.snapindex 11b2d860d..671c8a594 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_first.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_first.snap@@ -25,5 +25,5 @@ exit_code: 0----- stdout ---------- stderr ------β [32mSwitched to worktree for [1mfeature-a[22m at [1m[REPO].feature-a[39m[22m-π‘ [2mRun `wt config shell install` to enable automatic cd[22m+β [32m[32mSwitched to worktree for [1mfeature-a[22m at [1m[REPO].feature-a[39m[22m[0m+π‘ [2m[2mRun `wt config shell install` to enable automatic cd[22m[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_second.snap b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_second.snapindex e3b2509e8..b52e14419 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_second.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_second.snap@@ -25,5 +25,5 @@ exit_code: 0----- stdout ---------- stderr ------β [32mSwitched to worktree for [1mfeature-b[22m at [1m[REPO].feature-b[39m[22m-π‘ [2mRun `wt config shell install` to enable automatic cd[22m+β [32m[32mSwitched to worktree for [1mfeature-b[22m at [1m[REPO].feature-b[39m[22m[0m+π‘ [2m[2mRun `wt config shell install` to enable automatic cd[22m[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_with_worktrunk_history_back.snap b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_with_worktrunk_history_back.snapindex aac1adc38..bfbb6bb1d 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_with_worktrunk_history_back.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_with_worktrunk_history_back.snap@@ -25,5 +25,5 @@ exit_code: 0----- stdout ---------- stderr ------π‘ [33mWorktree for [1mfeature-x[22m at [1m[REPO].feature-x[22m; cannot cd (no shell integration)[39m-π‘ [2mRun `wt config shell install` to enable automatic cd[22m+π‘ [33m[33mWorktree for [1mfeature-x[22m at [1m[REPO].feature-x[22m; cannot cd (no shell integration)[39m[0m+π‘ [2m[2mRun `wt config shell install` to enable automatic cd[22m[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_with_worktrunk_history_first.snap b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_with_worktrunk_history_first.snapindex 38a1d787b..4da1f3f01 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_with_worktrunk_history_first.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_with_worktrunk_history_first.snap@@ -25,5 +25,5 @@ exit_code: 0----- stdout ---------- stderr ------β [32mSwitched to worktree for [1mfeature-x[22m at [1m[REPO].feature-x[39m[22m-π‘ [2mRun `wt config shell install` to enable automatic cd[22m+β [32m[32mSwitched to worktree for [1mfeature-x[22m at [1m[REPO].feature-x[39m[22m[0m+π‘ [2m[2mRun `wt config shell install` to enable automatic cd[22m[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_with_worktrunk_history_second.snap b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_with_worktrunk_history_second.snapindex 78a9fc444..16bfd6f81 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_with_worktrunk_history_second.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_with_worktrunk_history_second.snap@@ -25,5 +25,5 @@ exit_code: 0----- stdout ---------- stderr ------β [32mSwitched to worktree for [1mfeature-y[22m at [1m[REPO].feature-y[39m[22m-π‘ [2mRun `wt config shell install` to enable automatic cd[22m+β [32m[32mSwitched to worktree for [1mfeature-y[22m at [1m[REPO].feature-y[39m[22m[0m+π‘ [2m[2mRun `wt config shell install` to enable automatic cd[22m[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_primary_on_different_branch.snap b/tests/snapshots/integration__integration_tests__switch__switch_primary_on_different_branch.snapindex c6b6cddc3..cfa159ba6 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_primary_on_different_branch.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_primary_on_different_branch.snap@@ -26,5 +26,5 @@ exit_code: 0----- stdout ---------- stderr ------β [32mCreated new worktree for [1mfeature-from-main[22m from [1mmain[22m at [1m[REPO].feature-from-main[39m[22m-π‘ [2mRun `wt config shell install` to enable automatic cd[22m+β [32m[32mCreated new worktree for [1mfeature-from-main[22m from [1mmain[22m at [1m[REPO].feature-from-main[39m[22m[0m+π‘ [2m[2mRun `wt config shell install` to enable automatic cd[22m[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_to_existing_primary_on_different_branch.snap b/tests/snapshots/integration__integration_tests__switch__switch_to_existing_primary_on_different_branch.snapindex 18883e992..8c36ac93f 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_to_existing_primary_on_different_branch.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_to_existing_primary_on_different_branch.snap@@ -25,5 +25,5 @@ exit_code: 0----- stdout ---------- stderr ------π‘ [33mWorktree for [1mexisting-branch[22m at [1m[REPO].existing-branch[22m; cannot cd (no shell integration)[39m-π‘ [2mRun `wt config shell install` to enable automatic cd[22m+π‘ [33m[33mWorktree for [1mexisting-branch[22m at [1m[REPO].existing-branch[22m; cannot cd (no shell integration)[39m[0m+π‘ [2m[2mRun `wt config shell install` to enable automatic cd[22m[0mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_with_base.snap b/tests/snapshots/integration__integration_tests__switch__switch_with_base.snapindex 809b3ade1..c4f9d69d1 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_with_base.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_with_base.snap@@ -28,5 +28,5 @@ exit_code: 0----- stdout ---------- stderr ------β [32mCreated new worktree for [1mfeature-with-base[22m from [1mmain[22m at [1m[REPO].feature-with-base[39m[22m-π‘ [2mRun `wt config shell install` to enable automatic cd[22m+β [32m[32mCreated new worktree for [1mfeature-with-base[22m from [1mmain[22m at [1m[REPO].feature-with-base[39m[22m[0m+π‘ [2m[2mRun `wt config shell install` to enable automatic cd[22m[0m