Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Replace emojis with single-width Unicode symbols (#255)
Maximilian Roosad6ec2351b99
diff --git a/.claude/rules/cli-output-formatting.md b/.claude/rules/cli-output-formatting.mdindex c3195e56c..8a7f53707 100644--- a/.claude/rules/cli-output-formatting.md+++ b/.claude/rules/cli-output-formatting.md@@ -162,20 +162,20 @@ spawn_background(build_command_that_checks_merge_again()); // Duplicate check!## Message Types-Seven canonical message patterns with their emojis:+Seven canonical message patterns with their symbols:-1. **Progress**: π (operations in progress)-2. **Success**: β (something was created or changed)-3. **Errors**: β (failures, invalid states)-4. **Warnings**: π‘ (non-blocking issues)-5. **Hints**: π‘ (actionable β user could/should do something)-6. **Info**: βͺ (status β acknowledging state or user choices, no action needed)-7. **Prompts**: β (questions requiring user input)+1. **Progress**: β (operations in progress)+2. **Success**: β (something was created or changed)+3. **Errors**: β (failures, invalid states)+4. **Warnings**: β² (non-blocking issues)+5. **Hints**: β³ (actionable β user could/should do something)+6. **Info**: β (status β acknowledging state or user choices, no action needed)+7. **Prompts**: β― (questions requiring user input)-**Success vs Info decision:** Success (β ) means something was created or-changed. Info (βͺ) means acknowledging state without creating/changing anything.+**Success vs Info decision:** Success (β) means something was created or+changed. Info (β) means acknowledging state without creating/changing anything.-| Success β | Info βͺ |+| Success β | Info β || --------------------------------------- | ------------------------------------- || "Created worktree for feature" | "Switched to worktree for feature" || "Created new worktree for feature" | "Already on worktree for feature" |@@ -184,7 +184,7 @@ changed. Info (βͺ) means acknowledging state without creating/changing anything**Hint vs Info decision:** If the message suggests the user take an action, it'sa hint. If it's acknowledging what happened (including flag effects), it's info.-| Hint π‘ | Info βͺ |+| Hint β³ | Info β || ----------------------------- | ------------------------------------- || "Run `wt merge` to continue" | "Already up to date with main" || "Use `--force` to override" | "Skipping hooks (--no-verify)" |@@ -214,12 +214,12 @@ Use `suggest_command()` from `worktrunk::styling` to build commands with propershell escaping. Include the branch name or other specific arguments so users cancopy-paste.-**Message formatting functions** add emoji AND semantic color. Callers provide+**Message formatting functions** add symbol AND semantic color. Callers providecontent with optional inner styling (like `<bold>`), then pass to`output::print()`:```rust-// Simple message - formatting function adds emoji + color+// Simple message - formatting function adds symbol + coloroutput::print(success_message("Created worktree"))?;output::print(hint_message("Run 'wt config' to configure"))?;@@ -237,11 +237,11 @@ output::print(warning_message(cformat!("Branch <bold>{name}</> not found")))?;- `info_message()` β no color (neutral status)- `error_message()` β red-**Every user-facing message requires either an emoji or a gutter** for+**Every user-facing message requires either a symbol or a gutter** forconsistent visual separation.**Section titles** (experimental): For output with distinct sections (like-`wt hook show`, `wt config show`), use cyan uppercase text without emoji:+`wt hook show`, `wt config show`), use cyan uppercase text without symbol:`<cyan>SECTION TITLE</>`. This distinguishes organizational headers from statusmessages. Currently being trialed β expand to other commands if it works well.@@ -279,7 +279,7 @@ println!("Branch created");Interactive prompts must flush stderr before blocking on stdin:```rust-eprint!("β Allow and remember? [y/N] ");+eprint!("β― Allow and remember? [y/N] ");stderr().flush()?;io::stdin().read_line(&mut response)?;```@@ -303,8 +303,8 @@ for item in items {Bad example (output decoupled from operations):```-π Removing worktree for feature...-π Removing worktree for bugfix...+β Removing worktree for feature...+β Removing worktree for bugfix...β Long delay, no feedbackRemoved worktree for feature β All output at the endRemoved worktree for bugfix@@ -335,8 +335,8 @@ styling):- `DELETION`: Red (diffs, deletions) β used in table rendering- `GUTTER`: BrightWhite background (quoted content)-Emoji constants: `PROGRESS_EMOJI` (π), `SUCCESS_EMOJI` (β ), `ERROR_EMOJI` (β),-`WARNING_EMOJI` (π‘), `HINT_EMOJI` (π‘), `INFO_EMOJI` (βͺ), `PROMPT_EMOJI` (β)+Symbol constants: `PROGRESS_SYMBOL` (β), `SUCCESS_SYMBOL` (β), `ERROR_SYMBOL` (β),+`WARNING_SYMBOL` (β²), `HINT_SYMBOL` (β³), `INFO_SYMBOL` (β), `PROMPT_SYMBOL` (β―)For all other styling, use color-print tags in `cformat!`: `<red>`, `<green>`,`<yellow>`, `<cyan>`, `<dim>`, `<bold>`, `<bright-black>`@@ -344,10 +344,10 @@ For all other styling, use color-print tags in `cformat!`: `<red>`, `<green>`,## Styling in Command CodeUse `output::print()` with message formatting functions. The formatting function-adds the emoji + semantic color, and `cformat!` handles inner styling:+adds the symbol + semantic color, and `cformat!` handles inner styling:```rust-// GOOD - formatting function handles emoji + outer color, cformat! handles inner styling+// GOOD - formatting function handles symbol + outer color, cformat! handles inner stylingoutput::print(success_message(cformat!("Created <bold>{branch}</> from <bold>{base}</>")))?;output::print(warning_message(cformat!("Branch <bold>{name}</> has <dim>uncommitted changes</>")))?;output::print(hint_message(cformat!("Run <bright-black>wt merge</> to continue")))?;@@ -360,11 +360,11 @@ output::print(hint_message("No changes to commit"))?;**Available color-print tags:** `<bold>`, `<dim>`, `<bright-black>`, `<red>`,`<green>`, `<yellow>`, `<cyan>`, `<magenta>`-**Emoji constants in cformat!:** Use `{ERROR_EMOJI}`, `{HINT_EMOJI}`, etc. for+**Symbol constants in cformat!:** Use `{ERROR_SYMBOL}`, `{HINT_SYMBOL}`, etc. formessages that bypass output:: functions (e.g., GitError Display impl):```rust-cformat!("{ERROR_EMOJI} <red>Branch <bold>{branch}</> not found</>")+cformat!("{ERROR_SYMBOL} <red>Branch <bold>{branch}</> not found</>")```Branch names in messages should be bolded. Tables (`wt list`) use `StyledLine`@@ -410,12 +410,12 @@ use worktrunk::styling::eprintln; // Auto-detects color support(`<green>`, `<bold>`, etc.). Only use anstyle for `StyledLine` tablerendering.- **output:: functions over direct printing** β Use output:: for user messages,- which auto-adds emoji + semantic color+ which auto-adds symbol + semantic color- **cformat! for inner styling** β Use `<bold>`, `<dim>` tags within output::calls- **Never manual escape codes** β No `\x1b[...` in code- **YAGNI for presentation** β Most output needs no styling-- **Unicode-aware** β Width calculations respect emoji and CJK characters (via+- **Unicode-aware** β Width calculations respect symbols and CJK characters (via`StyledLine`)- **Graceful degradation** β Must work without color support@@ -517,11 +517,11 @@ Use the `format_error_block` helper in `src/git/error.rs` or follow its pattern:```rust// GOOD - command shown in header, multi-line error in gutter-β Commit generation command 'llm --model claude' failed+β Commit generation command 'llm --model claude' failedβ Error: [Errno 8] nodename nor servname provided, or not known// BAD - multi-line error embedded inline-β Commit generation command 'llm' failed: LLM command failed: Error: [Errno 8]...+β Commit generation command 'llm' failed: LLM command failed: Error: [Errno 8]...```**Implementation:** See `format_error_block()` in `src/git/error.rs` for thediff --git a/.claude/rules/output-system-architecture.md b/.claude/rules/output-system-architecture.mdindex e8bd56c9a..d96388d1f 100644--- a/.claude/rules/output-system-architecture.md+++ b/.claude/rules/output-system-architecture.md@@ -4,7 +4,7 @@Worktrunk supports two output modes, selected once at program startup:-1. **Interactive Mode** β Human-friendly output with colors, emojis, and hints+1. **Interactive Mode** β Human-friendly output with colors, symbols, and hints2. **Directive Mode** β Shell script on stdout (at end), user messages on stderrBoth modes write all messages to stderr. stdout is reserved for structured data@@ -21,7 +21,7 @@ uses enum dispatch β commands call output functions without knowing the mode.```rust// NEVER DO THISif mode == OutputMode::Interactive {- println!("β Success!");+ println!("β Success!");}// ALWAYS DO THIS@@ -48,11 +48,11 @@ output::change_directory(&path)?;The output module (`src/output/global.rs`) provides:- `print(message)` β Write message as-is (use with message formatting functions)-- `shell_integration_hint(message)` β Shell integration hints (π‘, suppressed in+- `shell_integration_hint(message)` β Shell integration hints (β³, suppressed indirective)- `gutter(content)` β Gutter-formatted content (use with `format_with_gutter()`)- `blank()` β Blank line for visual separation-- `data(content)` β Structured data output without emoji (JSON, for piping)+- `data(content)` β Structured data output without symbol (JSON, for piping)- `table(content)` β Table/UI output to stderr- `change_directory(path)` β Request directory change- `execute(command)` β Execute command or buffer for shell script@@ -63,12 +63,12 @@ The output module (`src/output/global.rs`) provides:**Message formatting functions** (from `worktrunk::styling`):-- `success_message(content)` β β green-- `progress_message(content)` β π cyan-- `info_message(content)` β βͺ no color-- `warning_message(content)` β π‘ yellow-- `hint_message(content)` β π‘ dimmed-- `error_message(content)` β β red+- `success_message(content)` β β green+- `progress_message(content)` β β cyan+- `info_message(content)` β β no color+- `warning_message(content)` β β² yellow+- `hint_message(content)` β β³ dimmed+- `error_message(content)` β β redFor the complete API, see `src/output/global.rs` and `src/styling/constants.rs`.diff --git a/docs/content/claude-code.md b/docs/content/claude-code.mdindex afb93ecc6..8641fd824 100644--- a/docs/content/claude-code.md+++ b/docs/content/claude-code.md@@ -22,7 +22,7 @@ The plugin adds status indicators to `wt list`:+ review-ui <span class=c>?</span> <span class=d>β</span> π¬ <span class=g>β1</span> ../repo.review-ui <span class=d>46b6a187</span> <span class=d>1d</span> <span class=d>Add dashboard component</span>+ wip-docs <span class=c>?</span> <span class=d>β</span> ../repo.wip-docs <span class=d>a058e792</span> <span class=d>1d</span> <span class=d>Initial commit</span>-βͺ <span class=d>Showing 4 worktrees, 2 with changes, 2 ahead</span>+<span class=d>β</span> <span class=d>Showing 4 worktrees, 2 with changes, 2 ahead</span>{% end %}<!-- END AUTO-GENERATED -->diff --git a/docs/content/faq.md b/docs/content/faq.mdindex 87397aa87..77f2fc9cb 100644--- a/docs/content/faq.md+++ b/docs/content/faq.md@@ -21,18 +21,15 @@ Commands from project hooks and LLM configuration require approval on first run.<!-- β οΈ AUTO-GENERATED from tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_approval_prompt.snap β edit source to update -->```-π‘ repo needs approval to execute 3 commands:--βͺ post-create install:- echo 'Installing dependencies...'--βͺ post-create build:- echo 'Building project...'--βͺ post-create test:- echo 'Running tests...'--β Allow and remember? [y/N]+β² repo needs approval to execute 3 commands:++β post-create install:+ echo 'Installing dependencies...'+β post-create build:+ echo 'Building project...'+β post-create test:+ echo 'Running tests...'+β― Allow and remember? [y/N]```<!-- END AUTO-GENERATED -->diff --git a/docs/content/hook.md b/docs/content/hook.mdindex c24176441..260aa3365 100644--- a/docs/content/hook.md+++ b/docs/content/hook.md@@ -164,12 +164,12 @@ The JSON includes all template variables plus `hook_type` and `hook_name`.Project commands require approval on first run:```-π‘ repo needs approval to execute 3 commands:+β² repo needs approval to execute 3 commands:-βͺ post-create install:+β post-create install:echo 'Installing dependencies...'-β Allow and remember? [y/N]+β― Allow and remember? [y/N]```- Approvals are saved to user config (`~/.config/worktrunk/config.toml`)diff --git a/docs/content/list.md b/docs/content/list.mdindex 48620dace..649498c8b 100644--- a/docs/content/list.md+++ b/docs/content/list.md@@ -25,7 +25,7 @@ List all worktrees:^ main <span class=d>^</span><span class=d>β </span> <span class=g>β‘1</span> <span class=d><span class=r>β£1</span></span> <span class=d>6088adb3</span> <span class=d>4d</span> <span class=d>Merge fix-auth: hardened toβ¦</span>+ fix-auth <span class=d>β</span><span class=d>|</span> <span class=g>β2</span> <span class=d><span class=r>β1</span></span> <span class=d>|</span> <span class=d>127407de</span> <span class=d>5h</span> <span class=d>Add secure token storage</span>-βͺ <span class=d>Showing 3 worktrees, 1 with changes, 2 ahead, 1 column hidden</span>+<span class=d>β</span> <span class=d>Showing 3 worktrees, 1 with changes, 2 ahead, 1 column hidden</span>{% end %}<!-- END AUTO-GENERATED -->@@ -41,7 +41,7 @@ Include CI status and line diffs:^ main <span class=d>^</span><span class=d>β </span> <span class=g>β‘1</span> <span class=d><span class=r>β£1</span></span> <span class=g>β</span> <span class=d>6088adb3</span> <span class=d>4d</span> <span class=d>Merge fix-auβ¦</span>+ fix-auth <span class=d>β</span><span class=d>|</span> <span class=g>β2</span> <span class=d><span class=r>β1</span></span> <span class=g>+25</span> <span class=r>-11</span> <span class=d>|</span> <span class=g>β</span> <span class=d>127407de</span> <span class=d>5h</span> <span class=d>Add secure tβ¦</span>-βͺ <span class=d>Showing 3 worktrees, 1 with changes, 2 ahead, 1 column hidden</span>+<span class=d>β</span> <span class=d>Showing 3 worktrees, 1 with changes, 2 ahead, 1 column hidden</span>{% end %}<!-- END AUTO-GENERATED -->@@ -59,7 +59,7 @@ Include branches that don't have worktrees:exp <span class=d>/</span><span class=d>β</span> <span class=g>β2</span> <span class=d><span class=r>β1</span></span> <span class=g>+137</span> <span class=d>99e114de</span> <span class=d>2d</span> <span class=d>Add GraphQLβ¦</span>wip <span class=d>/</span><span class=d>β</span> <span class=g>β1</span> <span class=d><span class=r>β1</span></span> <span class=g>+33</span> <span class=d>d62fd0e8</span> <span class=d>3d</span> <span class=d>Start API doβ¦</span>-βͺ <span class=d>Showing 3 worktrees, 2 branches, 1 with changes, 4 ahead, 1 column hidden</span>+<span class=d>β</span> <span class=d>Showing 3 worktrees, 2 branches, 1 with changes, 4 ahead, 1 column hidden</span>{% end %}<!-- END AUTO-GENERATED -->diff --git a/docs/content/llm-commits.md b/docs/content/llm-commits.mdindex d62a6f92b..af0be50da 100644--- a/docs/content/llm-commits.md+++ b/docs/content/llm-commits.md@@ -71,8 +71,8 @@ Squashes all changes (uncommitted + existing commits) into one commit with an LL```bash$ wt merge-π Squashing 3 commits into a single commit (5 files, +48)...-π Generating squash commit message...+β Squashing 3 commits into a single commit (5 files, +48)...+β Generating squash commit message...feat(auth): Implement JWT authentication system...```diff --git a/src/cli.rs b/src/cli.rsindex d1b1acf0a..81921bfe2 100644--- a/src/cli.rs+++ b/src/cli.rs@@ -1593,12 +1593,12 @@ The JSON includes all template variables plus `hook_type` and `hook_name`.Project commands require approval on first run:```-π‘ repo needs approval to execute 3 commands:+β² repo needs approval to execute 3 commands:-βͺ post-create install:+β post-create install:echo 'Installing dependencies...'-β Allow and remember? [y/N]+β― Allow and remember? [y/N]```- Approvals are saved to user config (`~/.config/worktrunk/config.toml`)diff --git a/src/commands/command_approval.rs b/src/commands/command_approval.rsindex 3d83beb4a..02aee2d74 100644--- a/src/commands/command_approval.rs+++ b/src/commands/command_approval.rs@@ -117,7 +117,7 @@ fn prompt_for_batch_approval(commands: &[&Command], project_id: &str) -> anyhow:for cmd in commands {// Format as: {phase} {bold}{name}{bold:#}:// Phase comes from the command itself (e.g., "pre-commit", "pre-merge")- // Uses INFO_EMOJI (βͺ) since this is a preview, not active execution+ // Uses INFO_SYMBOL (β) since this is a preview, not active executionlet phase = cmd.phase.to_string();let label = match &cmd.name {Some(name) => cformat!("{INFO_EMOJI} {phase} <bold>{name}</>:"),diff --git a/src/commands/standalone.rs b/src/commands/standalone.rsindex bce18c390..38482812a 100644--- a/src/commands/standalone.rs+++ b/src/commands/standalone.rs@@ -844,7 +844,7 @@ fn render_hook_commands(false};- // Use β for needs approval, βͺ for approved/user hooks+ // Use β― for needs approval, β for approved/user hookslet (emoji, suffix) = if needs_approval {(PROMPT_EMOJI, cformat!(" <dim>(requires approval)</>"))} else {diff --git a/src/git/error.rs b/src/git/error.rsindex 5eb520641..f9c421842 100644--- a/src/git/error.rs+++ b/src/git/error.rs@@ -662,9 +662,9 @@ mod tests {fn snapshot_detached_head_display() {let err = GitError::DetachedHead { action: None };assert_snapshot!(err.to_string(), @r"- β [31mNot on a branch (detached HEAD)[39m+ [31mβ[39m [31mNot on a branch (detached HEAD)[39m- π‘ [2mTo switch to a branch, run [90mgit switch <branch>[39m[22m+ [2mβ³[22m [2mTo switch to a branch, run [90mgit switch <branch>[39m[22m");}@@ -675,9 +675,9 @@ mod tests {worktree: Some("wt".into()),};assert_snapshot!(err.to_string(), @r"- β [31mCannot merge: [1mwt[22m has uncommitted changes[39m+ [31mβ[39m [31mCannot merge: [1mwt[22m has uncommitted changes[39m- π‘ [2mCommit or stash changes first[22m+ [2mβ³[22m [2mCommit or stash changes first[22m");}@@ -691,9 +691,9 @@ mod tests {let downcast = err.downcast_ref::<GitError>().expect("Should downcast");assert_snapshot!(downcast.to_string(), @r"- β [31mBranch [1mmain[22m already exists[39m+ [31mβ[39m [31mBranch [1mmain[22m already exists[39m- π‘ [2mTo switch to the existing branch, remove [90m--create[39m; run [90mwt switch main[39m[22m+ [2mβ³[22m [2mTo switch to the existing branch, remove [90m--create[39m; run [90mwt switch main[39m[22m");}@@ -718,9 +718,9 @@ mod tests {path: PathBuf::from("/some/path"),};assert_snapshot!(err.to_string(), @r"- β [31mDirectory already exists: [1m/some/path[22m[39m+ [31mβ[39m [31mDirectory already exists: [1m/some/path[22m[39m- π‘ [2mTo remove manually, run [90mrm -rf /some/path[39m; to retry with backup, run [90mwt switch feature --clobber[39m[22m+ [2mβ³[22m [2mTo remove manually, run [90mrm -rf /some/path[39m; to retry with backup, run [90mwt switch feature --clobber[39m[22m");}diff --git a/src/styling/constants.rs b/src/styling/constants.rsindex c2fe26bd8..80e09c679 100644--- a/src/styling/constants.rs+++ b/src/styling/constants.rs@@ -1,4 +1,4 @@-//! Style constants and emojis for terminal output+//! Style constants and symbols for terminal output//!//! # Styling with color-print//!@@ -29,6 +29,7 @@//! table rendering where computed styles are needed at runtime.use anstyle::{AnsiColor, Color, Style};+use color_print::cstr;// ============================================================================// Programmatic Style Constants (for StyledLine, tables, computed styles)@@ -56,32 +57,48 @@ pub const GUTTER: Style = Style::new().bg_color(Some(Color::Ansi(AnsiColor::Brigpub const DEFAULT_HELP_WIDTH: usize = 98;// ============================================================================-// Message Emojis+// Message Symbols// ============================================================================--/// Progress emoji: `cformat!("{PROGRESS_EMOJI} <cyan>message</>")`-pub const PROGRESS_EMOJI: &str = "π";--/// Success emoji: `cformat!("{SUCCESS_EMOJI} <green>message</>")`-pub const SUCCESS_EMOJI: &str = "β ";--/// Error emoji: `cformat!("{ERROR_EMOJI} <red>message</>")`-pub const ERROR_EMOJI: &str = "β";--/// Warning emoji: `cformat!("{WARNING_EMOJI} <yellow>message</>")`-pub const WARNING_EMOJI: &str = "π‘";--/// Hint emoji: `cformat!("{HINT_EMOJI} <dim>message</>")`-pub const HINT_EMOJI: &str = "π‘";--/// Info emoji - use for neutral status (primary status NOT dimmed, metadata may be dimmed)-/// Primary status: `output::info("All commands already approved")?;`-/// Metadata: `cformat!("{INFO_EMOJI} <dim>Showing 5 worktrees...</>")`-pub const INFO_EMOJI: &str = "βͺ";--/// Prompt emoji - use for questions requiring user input-/// `eprint!("{PROMPT_EMOJI} Proceed? [y/N] ")`-pub const PROMPT_EMOJI: &str = "β";+//+// Single-width Unicode symbols for message prefixes with embedded colors.+// Using `cstr!` to create colored `&'static str` constants that work everywhere.++/// Progress symbol (cyan β)+pub const PROGRESS_SYMBOL: &str = cstr!("<cyan>β</>");++/// Success symbol (green β)+pub const SUCCESS_SYMBOL: &str = cstr!("<green>β</>");++/// Error symbol (red β)+pub const ERROR_SYMBOL: &str = cstr!("<red>β</>");++/// Warning symbol (yellow β²)+pub const WARNING_SYMBOL: &str = cstr!("<yellow>β²</>");++/// Hint symbol (dim β³)+pub const HINT_SYMBOL: &str = cstr!("<dim>β³</>");++/// Info symbol (dim β) - for neutral status+pub const INFO_SYMBOL: &str = cstr!("<dim>β</>");++/// Prompt symbol (cyan β―) - for questions requiring user input+pub const PROMPT_SYMBOL: &str = cstr!("<cyan>β―</>");++// Legacy aliases for compatibility during migration+#[doc(hidden)]+pub use ERROR_SYMBOL as ERROR_EMOJI;+#[doc(hidden)]+pub use HINT_SYMBOL as HINT_EMOJI;+#[doc(hidden)]+pub use INFO_SYMBOL as INFO_EMOJI;+#[doc(hidden)]+pub use PROGRESS_SYMBOL as PROGRESS_EMOJI;+#[doc(hidden)]+pub use PROMPT_SYMBOL as PROMPT_EMOJI;+#[doc(hidden)]+pub use SUCCESS_SYMBOL as SUCCESS_EMOJI;+#[doc(hidden)]+pub use WARNING_SYMBOL as WARNING_EMOJI;// ============================================================================// Formatted Message Type@@ -165,7 +182,7 @@ impl From<FormattedMessage> for String {use color_print::cformat;-/// Format an error message with emoji and red styling+/// Format an error message with symbol and red styling////// Content can include inner styling like `<bold>`:/// ```@@ -176,32 +193,32 @@ use color_print::cformat;/// println!("{}", error_message(cformat!("Branch <bold>{name}</> not found")));/// ```pub fn error_message(content: impl AsRef<str>) -> FormattedMessage {- FormattedMessage(cformat!("{ERROR_EMOJI} <red>{}</>", content.as_ref()))+ FormattedMessage(cformat!("{ERROR_SYMBOL} <red>{}</>", content.as_ref()))}-/// Format a hint message with emoji and dim styling+/// Format a hint message with symbol and dim stylingpub fn hint_message(content: impl AsRef<str>) -> FormattedMessage {- FormattedMessage(cformat!("{HINT_EMOJI} <dim>{}</>", content.as_ref()))+ FormattedMessage(cformat!("{HINT_SYMBOL} <dim>{}</>", content.as_ref()))}-/// Format a warning message with emoji and yellow styling+/// Format a warning message with symbol and yellow stylingpub fn warning_message(content: impl AsRef<str>) -> FormattedMessage {- FormattedMessage(cformat!("{WARNING_EMOJI} <yellow>{}</>", content.as_ref()))+ FormattedMessage(cformat!("{WARNING_SYMBOL} <yellow>{}</>", content.as_ref()))}-/// Format a success message with emoji and green styling+/// Format a success message with symbol and green stylingpub fn success_message(content: impl AsRef<str>) -> FormattedMessage {- FormattedMessage(cformat!("{SUCCESS_EMOJI} <green>{}</>", content.as_ref()))+ FormattedMessage(cformat!("{SUCCESS_SYMBOL} <green>{}</>", content.as_ref()))}-/// Format a progress message with emoji and cyan styling+/// Format a progress message with symbol and cyan stylingpub fn progress_message(content: impl AsRef<str>) -> FormattedMessage {- FormattedMessage(cformat!("{PROGRESS_EMOJI} <cyan>{}</>", content.as_ref()))+ FormattedMessage(cformat!("{PROGRESS_SYMBOL} <cyan>{}</>", content.as_ref()))}-/// Format an info message with emoji (no color - neutral status)+/// Format an info message with symbol (no color on text - neutral status)pub fn info_message(content: impl AsRef<str>) -> FormattedMessage {- FormattedMessage(cformat!("{INFO_EMOJI} {}", content.as_ref()))+ FormattedMessage(format!("{INFO_SYMBOL} {}", content.as_ref()))}/// Format a section heading (cyan uppercase text, no emoji)@@ -260,18 +277,19 @@ mod tests {}// ============================================================================- // Emoji Constants Tests+ // Symbol Constants Tests// ============================================================================#[test]- fn test_emoji_constants() {- assert_eq!(PROGRESS_EMOJI, "π");- assert_eq!(SUCCESS_EMOJI, "β ");- assert_eq!(ERROR_EMOJI, "β");- assert_eq!(WARNING_EMOJI, "π‘");- assert_eq!(HINT_EMOJI, "π‘");- assert_eq!(INFO_EMOJI, "βͺ");- assert_eq!(PROMPT_EMOJI, "β");+ fn test_symbol_constants() {+ // Symbols are pre-colored with ANSI codes, but contain the Unicode character+ assert!(PROGRESS_SYMBOL.contains("β"));+ assert!(SUCCESS_SYMBOL.contains("β"));+ assert!(ERROR_SYMBOL.contains("β"));+ assert!(WARNING_SYMBOL.contains("β²"));+ assert!(HINT_SYMBOL.contains("β³"));+ assert!(INFO_SYMBOL.contains("β"));+ assert!(PROMPT_SYMBOL.contains("β―"));}// ============================================================================@@ -281,7 +299,7 @@ mod tests {#[test]fn test_error_message() {let msg = error_message("Something went wrong");- assert!(msg.as_str().contains("β"));+ assert!(msg.as_str().contains(ERROR_SYMBOL));assert!(msg.as_str().contains("Something went wrong"));}@@ -289,7 +307,7 @@ mod tests {fn test_error_message_with_inner_styling() {let name = "feature";let msg = error_message(cformat!("Branch <bold>{name}</> not found"));- assert!(msg.as_str().contains("β"));+ assert!(msg.as_str().contains(ERROR_SYMBOL));assert!(msg.as_str().contains("Branch"));assert!(msg.as_str().contains("feature"));}@@ -297,35 +315,35 @@ mod tests {#[test]fn test_hint_message() {let msg = hint_message("Try running --help");- assert!(msg.as_str().contains("π‘"));+ assert!(msg.as_str().contains(HINT_SYMBOL));assert!(msg.as_str().contains("Try running --help"));}#[test]fn test_warning_message() {let msg = warning_message("Deprecated option");- assert!(msg.as_str().contains("π‘"));+ assert!(msg.as_str().contains(WARNING_SYMBOL));assert!(msg.as_str().contains("Deprecated option"));}#[test]fn test_success_message() {let msg = success_message("Operation completed");- assert!(msg.as_str().contains("β "));+ assert!(msg.as_str().contains(SUCCESS_SYMBOL));assert!(msg.as_str().contains("Operation completed"));}#[test]fn test_progress_message() {let msg = progress_message("Loading data...");- assert!(msg.as_str().contains("π"));+ assert!(msg.as_str().contains(PROGRESS_SYMBOL));assert!(msg.as_str().contains("Loading data..."));}#[test]fn test_info_message() {let msg = info_message("5 items found");- assert!(msg.as_str().contains("βͺ"));+ assert!(msg.as_str().contains(INFO_SYMBOL));assert!(msg.as_str().contains("5 items found"));}diff --git a/src/styling/format.rs b/src/styling/format.rsindex c09c19548..3cb7d5690 100644--- a/src/styling/format.rs+++ b/src/styling/format.rs@@ -14,13 +14,16 @@ use super::{get_terminal_width, visual_width};////// The gutter formatting adds:/// - 1 column: colored space (gutter)-/// - 2 columns: regular spaces for padding+/// - 1 column: regular space for padding///-/// Total: 3 columns+/// Total: 2 columns+///+/// This aligns with message symbols (1 char) + space (1 char) = 2 columns,+/// so gutter content starts at the same column as message text.////// When passing widths to tools like git --stat-width, subtract this overhead/// so the final output (content + gutter) fits within the terminal width.-pub const GUTTER_OVERHEAD: usize = 3;+pub const GUTTER_OVERHEAD: usize = 2;/// Wraps text at word boundaries to fit within the specified width///@@ -99,8 +102,8 @@ pub(super) fn wrap_text_at_width(text: &str, max_width: usize) -> Vec<String> {/// * `left_margin` - Should always be "" (gutter provides all visual separation)/// * `max_width` - Optional maximum width (for testing). If None, auto-detects terminal width.///-/// The gutter appears at column 0, followed by 2 spaces, then the content starts at column 3.-/// This aligns with emoji messages where the emoji (2 columns) + space (1 column) also starts content at column 3.+/// The gutter appears at column 0, followed by 1 space, then the content starts at column 2.+/// This aligns with message symbols (1 column) + space (1 column) = content at column 2.////// # Example/// ```@@ -115,9 +118,9 @@ pub fn format_with_gutter(content: &str, left_margin: &str, max_width: Option<us// Use provided width or detect terminal width (respects COLUMNS env var)let term_width = max_width.unwrap_or_else(get_terminal_width);- // Account for gutter (1) + spaces (2) + left_margin+ // Account for gutter (1) + space (1) + left_marginlet left_margin_width = left_margin.width();- let available_width = term_width.saturating_sub(3 + left_margin_width);+ let available_width = term_width.saturating_sub(2 + left_margin_width);for line in content.lines() {// Wrap the line at word boundaries@@ -125,7 +128,7 @@ pub fn format_with_gutter(content: &str, left_margin: &str, max_width: Option<usfor wrapped_line in wrapped_lines {output.push_str(&format!(- "{left_margin}{gutter} {gutter:#} {wrapped_line}\n"+ "{left_margin}{gutter} {gutter:#} {wrapped_line}\n"));}}@@ -196,7 +199,7 @@ fn format_bash_with_gutter_impl(// Calculate available width for contentlet term_width = width_override.unwrap_or_else(get_terminal_width);let left_margin_width = left_margin.width();- let available_width = term_width.saturating_sub(3 + left_margin_width);+ let available_width = term_width.saturating_sub(2 + left_margin_width);// Set up tree-sitter bash highlightinglet highlight_names = vec![@@ -249,7 +252,7 @@ fn format_bash_with_gutter_impl(styled_line.push_str(line);for wrapped in wrap_styled_text(&styled_line, available_width) {output.push_str(&format!(- "{left_margin}{gutter} {gutter:#} {wrapped}{reset}\n"+ "{left_margin}{gutter} {gutter:#} {wrapped}{reset}\n"));}continue;@@ -304,7 +307,7 @@ fn format_bash_with_gutter_impl(// Wrap and output with gutterfor wrapped in wrap_styled_text(&styled_line, available_width) {output.push_str(&format!(- "{left_margin}{gutter} {gutter:#} {wrapped}{reset}\n"+ "{left_margin}{gutter} {gutter:#} {wrapped}{reset}\n"));}}@@ -437,7 +440,7 @@ mod tests {#[test]fn test_gutter_overhead_constant() {// Verify the overhead matches documented value- assert_eq!(GUTTER_OVERHEAD, 3);+ assert_eq!(GUTTER_OVERHEAD, 2);}#[test]diff --git a/src/styling/mod.rs b/src/styling/mod.rsindex e1e7a1451..42ee00239 100644--- a/src/styling/mod.rs+++ b/src/styling/mod.rs@@ -330,11 +330,11 @@ command = "npm install"let result = format_with_gutter(commit_msg, "", Some(80));insta::assert_snapshot!(result, @r"- [107m [0m This commit refactors the authentication system to use a more secure- [107m [0m token-based approach instead of the previous session-based system which had- [107m [0m several security vulnerabilities that were identified during the security- [107m [0m audit last month. The new implementation follows industry best practices and- [107m [0m includes proper token rotation and expiration handling.+ [107m [0m This commit refactors the authentication system to use a more secure+ [107m [0m token-based approach instead of the previous session-based system which had+ [107m [0m several security vulnerabilities that were identified during the security+ [107m [0m audit last month. The new implementation follows industry best practices and+ [107m [0m includes proper token rotation and expiration handling.");}diff --git a/src/styling/snapshots/worktrunk__styling__tests__format_bash_multiline_command_consistent_styling.snap b/src/styling/snapshots/worktrunk__styling__tests__format_bash_multiline_command_consistent_styling.snapindex e80606f78..50476007b 100644--- a/src/styling/snapshots/worktrunk__styling__tests__format_bash_multiline_command_consistent_styling.snap+++ b/src/styling/snapshots/worktrunk__styling__tests__format_bash_multiline_command_consistent_styling.snap@@ -2,11 +2,11 @@source: src/styling/mod.rsexpression: result----[107m [0m [2m[ -d {{ repo_root }}/target/debug/deps ] && [ ! -e {{ worktree }}/target ] [0m[2m[36m&&[0m[2m[0m[2m[0m-[107m [0m [2m[0m[2m[34mmkdir[0m[2m [0m[2m[36m-p[0m[2m {{ worktree }}/target/debug/deps [0m[2m[36m&&[0m[2m[0m[2m[0m-[107m [0m [2m[0m[2m[34mcp[0m[2m [0m[2m[36m-c[0m[2m {{ repo_root }}/target/debug/deps/*.rlib {{ repo_root [0m-[107m [0m [2m}}/target/debug/deps/*.rmeta {{ worktree[0m-[107m [0m [2m}}/target/debug/deps/[0m[2m [0m[2m[36m&&[0m[2m[0m[2m[0m-[107m [0m [2m[0m[2m[34mcp[0m[2m [0m[2m[36m-cR[0m[2m {{ repo_root }}/target/debug/.fingerprint {{ repo_root [0m-[107m [0m [2m}}/target/debug/build {{ worktree[0m-[107m [0m [2m}}/target/debug/[0m[2m[0m+[107m [0m [2m[ -d {{ repo_root }}/target/debug/deps ] && [ ! -e {{ worktree }}/target ] [0m[2m[36m&&[0m[2m[0m[2m[0m+[107m [0m [2m[0m[2m[34mmkdir[0m[2m [0m[2m[36m-p[0m[2m {{ worktree }}/target/debug/deps [0m[2m[36m&&[0m[2m[0m[2m[0m+[107m [0m [2m[0m[2m[34mcp[0m[2m [0m[2m[36m-c[0m[2m {{ repo_root }}/target/debug/deps/*.rlib {{ repo_root [0m+[107m [0m [2m}}/target/debug/deps/*.rmeta {{ worktree[0m+[107m [0m [2m}}/target/debug/deps/[0m[2m [0m[2m[36m&&[0m[2m[0m[2m[0m+[107m [0m [2m[0m[2m[34mcp[0m[2m [0m[2m[36m-cR[0m[2m {{ repo_root }}/target/debug/.fingerprint {{ repo_root [0m+[107m [0m [2m}}/target/debug/build {{ worktree[0m+[107m [0m [2m}}/target/debug/[0m[2m[0mdiff --git a/src/styling/snapshots/worktrunk__styling__tests__format_bash_with_gutter_template_command.snap b/src/styling/snapshots/worktrunk__styling__tests__format_bash_with_gutter_template_command.snapindex 1240ea465..ca678923a 100644--- a/src/styling/snapshots/worktrunk__styling__tests__format_bash_with_gutter_template_command.snap+++ b/src/styling/snapshots/worktrunk__styling__tests__format_bash_with_gutter_template_command.snap@@ -2,5 +2,5 @@source: src/styling/mod.rsexpression: result----[107m [0m [2m[0m[2m[34mcp[0m[2m [0m[2m[36m-cR[0m[2m {{ repo_root }}/target/debug/.fingerprint {{ repo_root [0m-[107m [0m [2m}}/target/debug/build {{ worktree }}/target/debug/[0m+[107m [0m [2m[0m[2m[34mcp[0m[2m [0m[2m[36m-cR[0m[2m {{ repo_root }}/target/debug/.fingerprint {{ repo_root [0m+[107m [0m [2m}}/target/debug/build {{ worktree }}/target/debug/[0mdiff --git a/src/styling/snapshots/worktrunk__styling__tests__syntax_highlighting_produces_multiple_colors.snap b/src/styling/snapshots/worktrunk__styling__tests__syntax_highlighting_produces_multiple_colors.snapindex 038721474..7f87b9c39 100644--- a/src/styling/snapshots/worktrunk__styling__tests__syntax_highlighting_produces_multiple_colors.snap+++ b/src/styling/snapshots/worktrunk__styling__tests__syntax_highlighting_produces_multiple_colors.snap@@ -2,4 +2,4 @@source: src/styling/mod.rsexpression: result----[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'hello'[0m[2m [0m[2m[36m|[0m[2m [0m[2m[34mgrep[0m[2m hello [0m[2m[36m>[0m[2m output.txt [0m[2m[36m&&[0m[2m [0m[2m[34mcat[0m[2m output.txt[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'hello'[0m[2m [0m[2m[36m|[0m[2m [0m[2m[34mgrep[0m[2m hello [0m[2m[36m>[0m[2m output.txt [0m[2m[36m&&[0m[2m [0m[2m[34mcat[0m[2m output.txt[0mdiff --git a/src/styling/snapshots/worktrunk__styling__tests__unhighlighted_text_has_consistent_dim_across_lines.snap b/src/styling/snapshots/worktrunk__styling__tests__unhighlighted_text_has_consistent_dim_across_lines.snapindex de60d6382..e8df30407 100644--- a/src/styling/snapshots/worktrunk__styling__tests__unhighlighted_text_has_consistent_dim_across_lines.snap+++ b/src/styling/snapshots/worktrunk__styling__tests__unhighlighted_text_has_consistent_dim_across_lines.snap@@ -2,5 +2,5 @@source: src/styling/mod.rsexpression: result----[107m [0m [2m[0m[2m[34mecho[0m[2m {{ worktree[0m-[107m [0m [2m}}/path[0m[2m[0m+[107m [0m [2m[0m[2m[34mecho[0m[2m {{ worktree[0m+[107m [0m [2m}}/path[0m[2m[0mdiff --git a/src/styling/suggest.rs b/src/styling/suggest.rsindex 609a8e022..3a43c221e 100644--- a/src/styling/suggest.rs+++ b/src/styling/suggest.rs@@ -9,7 +9,7 @@//! let branch = "feature";//! let cmd = suggest_command("remove", &[branch], &["--force"]);//! println!("{}", hint_message(cformat!("To force delete, run <bright-black>{cmd}</>")));-//! // β π‘ To force delete, run wt remove feature --force+//! // β β³ To force delete, run wt remove feature --force//! ```//!//! Handles shell escaping and `--` separator for args starting with `-`:diff --git a/tests/integration_tests/config_init.rs b/tests/integration_tests/config_init.rsindex 0c49c2a72..e63bb503e 100644--- a/tests/integration_tests/config_init.rs+++ b/tests/integration_tests/config_init.rs@@ -26,15 +26,15 @@ fn test_config_init_already_exists(temp_home: TempDir) {cmd.arg("config").arg("create");set_temp_home_env(&mut cmd, temp_home.path());- assert_cmd_snapshot!(cmd, @r"+ assert_cmd_snapshot!(cmd, @"success: trueexit_code: 0----- stdout ---------- stderr ------ βͺ User config already exists: [1m~/.config/worktrunk/config.toml[22m+ [2mβ[22m User config already exists: [1m~/.config/worktrunk/config.toml[22m- π‘ [2mFor format reference, run [90mwt config create --help[39m; to view, run [90mwt config show[39m[22m+ [2mβ³[22m [2mFor format reference, run [90mwt config create --help[39m; to view, run [90mwt config show[39m[22m");});}@@ -52,15 +52,15 @@ fn test_config_init_creates_file(temp_home: TempDir) {cmd.arg("config").arg("create");set_temp_home_env(&mut cmd, temp_home.path());- assert_cmd_snapshot!(cmd, @r"+ assert_cmd_snapshot!(cmd, @"success: trueexit_code: 0----- stdout ---------- stderr ------ β [32mCreated user config: [1m~/.config/worktrunk/config.toml[22m[39m+ [32mβ[39m [32mCreated user config: [1m~/.config/worktrunk/config.toml[22m[39m- π‘ [2mEdit this file to customize worktree paths and LLM settings[22m+ [2mβ³[22m [2mEdit this file to customize worktree paths and LLM settings[22m");});@@ -75,16 +75,16 @@ fn test_config_create_project_creates_file(repo: TestRepo) {let settings = setup_snapshot_settings(&repo);settings.bind(|| {let mut cmd = make_snapshot_cmd(&repo, "config", &["create", "--project"], None);- assert_cmd_snapshot!(cmd, @r"+ assert_cmd_snapshot!(cmd, @"success: trueexit_code: 0----- stdout ---------- stderr ------ β [32mCreated project config: [1m_REPO_/.config/wt.toml[22m[39m+ [32mβ[39m [32mCreated project config: [1m_REPO_/.config/wt.toml[22m[39m- π‘ [2mEdit this file to configure hooks for this repository[22m- π‘ [2mSee https://worktrunk.dev/hooks/ for hook documentation[22m+ [2mβ³[22m [2mEdit this file to configure hooks for this repository[22m+ [2mβ³[22m [2mSee https://worktrunk.dev/hooks/ for hook documentation[22m");});@@ -113,15 +113,15 @@ run = "echo hello"let settings = setup_snapshot_settings(&repo);settings.bind(|| {let mut cmd = make_snapshot_cmd(&repo, "config", &["create", "--project"], None);- assert_cmd_snapshot!(cmd, @r"+ assert_cmd_snapshot!(cmd, @"success: trueexit_code: 0----- stdout ---------- stderr ------ βͺ Project config already exists: [1m_REPO_/.config/wt.toml[22m+ [2mβ[22m Project config already exists: [1m_REPO_/.config/wt.toml[22m- π‘ [2mFor format reference, run [90mwt config create --help[39m; to view, run [90mwt config show[39m[22m+ [2mβ³[22m [2mFor format reference, run [90mwt config create --help[39m; to view, run [90mwt config show[39m[22m");});}diff --git a/tests/integration_tests/config_state.rs b/tests/integration_tests/config_state.rsindex 24994b9d3..d0f634ffb 100644--- a/tests/integration_tests/config_state.rs+++ b/tests/integration_tests/config_state.rs@@ -87,7 +87,7 @@ fn test_state_set_default_branch(mut repo: TestRepo) {.output().unwrap();assert!(output.status.success());- assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"β [32mSet default branch to [1mdevelop[22m[39m");+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"[32mβ[39m [32mSet default branch to [1mdevelop[22m[39m");// Verify it was set by checking origin/HEADlet output = repo@@ -109,7 +109,7 @@ fn test_state_clear_default_branch(mut repo: TestRepo) {.output().unwrap();assert!(output.status.success());- assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"β [32mCleared default branch cache[39m");+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"[32mβ[39m [32mCleared default branch cache[39m");// Verify it was cleared - origin/HEAD should not existlet output = repo@@ -130,7 +130,7 @@ fn test_state_clear_default_branch_empty(repo: TestRepo) {.output().unwrap();assert!(output.status.success());- assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"βͺ No default branch cache to clear");+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"[2mβ[22m No default branch cache to clear");}// ============================================================================@@ -153,7 +153,7 @@ fn test_state_set_previous_branch(repo: TestRepo) {.output().unwrap();assert!(output.status.success());- assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"β [32mSet previous branch to [1mfeature[22m[39m");+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"[32mβ[39m [32mSet previous branch to [1mfeature[22m[39m");// Verify it was setlet output = wt_state_cmd(&repo, "previous-branch", "get", &[])@@ -174,7 +174,7 @@ fn test_state_clear_previous_branch(repo: TestRepo) {.output().unwrap();assert!(output.status.success());- assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"β [32mCleared previous branch[39m");+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"[32mβ[39m [32mCleared previous branch[39m");// Verify it was clearedlet output = wt_state_cmd(&repo, "previous-branch", "get", &[])@@ -191,7 +191,7 @@ fn test_state_clear_previous_branch_empty(repo: TestRepo) {.output().unwrap();assert!(output.status.success());- assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"βͺ No previous branch to clear");+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"[2mβ[22m No previous branch to clear");}// ============================================================================@@ -237,7 +237,7 @@ fn test_state_clear_ci_status_all_empty(repo: TestRepo) {.output().unwrap();assert!(output.status.success());- assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"βͺ No CI cache entries to clear");+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"[2mβ[22m No CI cache entries to clear");}#[rstest]@@ -255,7 +255,7 @@ fn test_state_clear_ci_status_branch(repo: TestRepo) {.output().unwrap();assert!(output.status.success());- assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"β [32mCleared CI cache for [1mmain[22m[39m");+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"[32mβ[39m [32mCleared CI cache for [1mmain[22m[39m");}#[rstest]@@ -264,7 +264,7 @@ fn test_state_clear_ci_status_branch_not_cached(repo: TestRepo) {.output().unwrap();assert!(output.status.success());- assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"βͺ No CI cache for [1mmain[22m");+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"[2mβ[22m No CI cache for [1mmain[22m");}// ============================================================================@@ -311,7 +311,7 @@ fn test_state_set_marker_branch_default(repo: TestRepo) {.output().unwrap();assert!(output.status.success());- assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"β [32mSet marker for [1mmain[22m to [1mπ§[22m[39m");+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"[32mβ[39m [32mSet marker for [1mmain[22m to [1mπ§[22m[39m");// Verify it was set (use wt command to parse JSON storage)let output = wt_state_cmd(&repo, "marker", "get", &[]).output().unwrap();@@ -326,7 +326,7 @@ fn test_state_set_marker_branch_specific(repo: TestRepo) {.output().unwrap();assert!(output.status.success());- assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"β [32mSet marker for [1mfeature[22m to [1mπ§[22m[39m");+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"[32mβ[39m [32mSet marker for [1mfeature[22m to [1mπ§[22m[39m");// Verify it was set (use wt command to parse JSON storage)let output = wt_state_cmd(&repo, "marker", "get", &["--branch", "feature"])@@ -344,7 +344,7 @@ fn test_state_clear_marker_branch_default(repo: TestRepo) {.output().unwrap();assert!(output.status.success());- assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"β [32mCleared marker for [1mmain[22m[39m");+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"[32mβ[39m [32mCleared marker for [1mmain[22m[39m");// Verify it was unsetlet output = repo@@ -363,7 +363,7 @@ fn test_state_clear_marker_branch_specific(repo: TestRepo) {.output().unwrap();assert!(output.status.success());- assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"β [32mCleared marker for [1mfeature[22m[39m");+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"[32mβ[39m [32mCleared marker for [1mfeature[22m[39m");// Verify it was unsetlet output = repo@@ -384,7 +384,7 @@ fn test_state_clear_marker_all(repo: TestRepo) {.output().unwrap();assert!(output.status.success());- assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"β [32mCleared [1m3[22m markers[39m");+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"[32mβ[39m [32mCleared [1m3[22m markers[39m");// Verify all were unsetlet output = repo@@ -400,7 +400,7 @@ fn test_state_clear_marker_all_empty(repo: TestRepo) {.output().unwrap();assert!(output.status.success());- assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"βͺ No markers to clear");+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"[2mβ[22m No markers to clear");}// ============================================================================@@ -411,7 +411,7 @@ fn test_state_clear_marker_all_empty(repo: TestRepo) {fn test_state_get_logs_empty(repo: TestRepo) {let output = wt_state_cmd(&repo, "logs", "get", &[]).output().unwrap();assert!(output.status.success());- assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"βͺ No logs");+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"[2mβ[22m No logs");}#[rstest]@@ -442,7 +442,7 @@ fn test_state_get_logs_with_files(repo: TestRepo) {fn test_state_clear_logs_empty(repo: TestRepo) {let output = wt_state_cmd(&repo, "logs", "clear", &[]).output().unwrap();assert!(output.status.success());- assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"βͺ No logs to clear");+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"[2mβ[22m No logs to clear");}#[rstest]@@ -456,7 +456,7 @@ fn test_state_clear_logs_with_files(repo: TestRepo) {let output = wt_state_cmd(&repo, "logs", "clear", &[]).output().unwrap();assert!(output.status.success());- assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"β [32mCleared [1m2[22m log files[39m");+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"[32mβ[39m [32mCleared [1m2[22m log files[39m");// Verify logs are goneassert!(!log_dir.exists());@@ -472,7 +472,7 @@ fn test_state_clear_logs_single_file(repo: TestRepo) {let output = wt_state_cmd(&repo, "logs", "clear", &[]).output().unwrap();assert!(output.status.success());- assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"β [32mCleared [1m1[22m log file[39m");+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"[32mβ[39m [32mCleared [1m1[22m log file[39m");}// ============================================================================@@ -492,7 +492,7 @@ fn test_state_clear_all_empty(repo: TestRepo) {// Clear when no state existslet output = wt_state_clear_all_cmd(&repo).output().unwrap();assert!(output.status.success());- assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"βͺ No stored state to clear");+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"[2mβ[22m No stored state to clear");}#[rstest]@@ -521,7 +521,7 @@ fn test_state_clear_all_comprehensive(repo: TestRepo) {let output = wt_state_clear_all_cmd(&repo).output().unwrap();assert!(output.status.success());- assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"β [32mCleared all stored state[39m");+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"[32mβ[39m [32mCleared all stored state[39m");// Verify everything was clearedassert!(@@ -557,7 +557,7 @@ fn test_state_clear_all_nothing_to_clear(repo: TestRepo) {// Clear again when nothing existslet output = wt_state_clear_all_cmd(&repo).output().unwrap();assert!(output.status.success());- assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"βͺ No stored state to clear");+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"[2mβ[22m No stored state to clear");}// ============================================================================@@ -570,19 +570,19 @@ fn test_state_get_empty(repo: TestRepo) {assert!(output.status.success());assert_snapshot!(String::from_utf8_lossy(&output.stderr), @r"[36mDEFAULT BRANCH[39m- [107m [0m main+ [107m [0m main[36mPREVIOUS BRANCH[39m- [107m [0m (none)+ [107m [0m (none)[36mBRANCH MARKERS[39m- [107m [0m (none)+ [107m [0m (none)[36mCI STATUS CACHE[39m- [107m [0m (none)+ [107m [0m (none)[36mLOG FILES[39m @ .git/wt-logs- [107m [0m (none)+ [107m [0m (none)");}diff --git a/tests/integration_tests/configure_shell.rs b/tests/integration_tests/configure_shell.rsindex 06bf4e0fa..d842f0efc 100644--- a/tests/integration_tests/configure_shell.rs+++ b/tests/integration_tests/configure_shell.rs@@ -33,14 +33,14 @@ fn test_configure_shell_with_yes(repo: TestRepo, temp_home: TempDir) {----- stdout ---------- stderr ------ π‘ [33mCompletions won't work; add to ~/.zshrc before the wt line:[39m- [107m [0m [2m[0m[2m[34mautoload[0m[2m [0m[2m[36m-Uz[0m[2m compinit [0m[2m[36m&&[0m[2m [0m[2m[34mcompinit[0m[2m[0m- β [32mAdded shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m[39m- π‘ [2mSkipped [90mbash[39m; ~/.bashrc not found[22m- π‘ [2mSkipped [90mfish[39m; ~/.config/fish/conf.d not found[22m-- β [32mConfigured 1 shell[39m- π‘ [2mRestart shell or run: source ~/.zshrc[22m+ [33mβ²[39m [33mCompletions won't work; add to ~/.zshrc before the wt line:[39m+ [107m [0m [2m[0m[2m[34mautoload[0m[2m [0m[2m[36m-Uz[0m[2m compinit [0m[2m[36m&&[0m[2m [0m[2m[34mcompinit[0m[2m[0m+ [32mβ[39m [32mAdded shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m[39m+ [2mβ³[22m [2mSkipped [90mbash[39m; ~/.bashrc not found[22m+ [2mβ³[22m [2mSkipped [90mfish[39m; ~/.config/fish/conf.d not found[22m++ [32mβ[39m [32mConfigured 1 shell[39m+ [2mβ³[22m [2mRestart shell or run: source ~/.zshrc[22m");});@@ -77,12 +77,12 @@ fn test_configure_shell_specific_shell(repo: TestRepo, temp_home: TempDir) {----- stdout ---------- stderr ------ π‘ [33mCompletions won't work; add to ~/.zshrc before the wt line:[39m- [107m [0m [2m[0m[2m[34mautoload[0m[2m [0m[2m[36m-Uz[0m[2m compinit [0m[2m[36m&&[0m[2m [0m[2m[34mcompinit[0m[2m[0m- β [32mAdded shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m[39m+ [33mβ²[39m [33mCompletions won't work; add to ~/.zshrc before the wt line:[39m+ [107m [0m [2m[0m[2m[34mautoload[0m[2m [0m[2m[36m-Uz[0m[2m compinit [0m[2m[36m&&[0m[2m [0m[2m[34mcompinit[0m[2m[0m+ [32mβ[39m [32mAdded shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m[39m- β [32mConfigured 1 shell[39m- π‘ [2mRestart shell or run: source ~/.zshrc[22m+ [32mβ[39m [32mConfigured 1 shell[39m+ [2mβ³[22m [2mRestart shell or run: source ~/.zshrc[22m");});@@ -121,8 +121,8 @@ fn test_configure_shell_already_exists(repo: TestRepo, temp_home: TempDir) {----- stdout ---------- stderr ------ βͺ Already configured shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m- β [32mAll shells already configured[39m+ [2mβ[22m Already configured shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m+ [32mβ[39m [32mAll shells already configured[39m");});@@ -154,11 +154,11 @@ fn test_configure_shell_fish(repo: TestRepo, temp_home: TempDir) {----- stdout ---------- stderr ------ β [32mCreated shell extension for [1mfish[22m @ [1m~/.config/fish/conf.d/wt.fish[22m[39m- β [32mCreated completions for [1mfish[22m @ [1m~/.config/fish/completions/wt.fish[22m[39m+ [32mβ[39m [32mCreated shell extension for [1mfish[22m @ [1m~/.config/fish/conf.d/wt.fish[22m[39m+ [32mβ[39m [32mCreated completions for [1mfish[22m @ [1m~/.config/fish/completions/wt.fish[22m[39m- β [32mConfigured 1 shell[39m- π‘ [2mRestart shell to activate[22m+ [32mβ[39m [32mConfigured 1 shell[39m+ [2mβ³[22m [2mRestart shell to activate[22m");});@@ -209,10 +209,10 @@ fn test_configure_shell_fish_extension_exists(repo: TestRepo, temp_home: TempDir----- stdout ---------- stderr ------ βͺ Already configured shell extension for [1mfish[22m @ [1m~/.config/fish/conf.d/wt.fish[22m- β [32mCreated completions for [1mfish[22m @ [1m~/.config/fish/completions/wt.fish[22m[39m+ [2mβ[22m Already configured shell extension for [1mfish[22m @ [1m~/.config/fish/conf.d/wt.fish[22m+ [32mβ[39m [32mCreated completions for [1mfish[22m @ [1m~/.config/fish/completions/wt.fish[22m[39m- β [32mConfigured 1 shell[39m+ [32mβ[39m [32mConfigured 1 shell[39m");});@@ -250,10 +250,10 @@ fn test_configure_shell_no_files(repo: TestRepo, temp_home: TempDir) {----- stdout ---------- stderr ------ π‘ [2mSkipped [90mbash[39m; ~/.bashrc not found[22m- π‘ [2mSkipped [90mzsh[39m; ~/.zshrc not found[22m- π‘ [2mSkipped [90mfish[39m; ~/.config/fish/conf.d not found[22m- β [31mNo shell config files found[39m+ [2mβ³[22m [2mSkipped [90mbash[39m; ~/.bashrc not found[22m+ [2mβ³[22m [2mSkipped [90mzsh[39m; ~/.zshrc not found[22m+ [2mβ³[22m [2mSkipped [90mfish[39m; ~/.config/fish/conf.d not found[22m+ [31mβ[39m [31mNo shell config files found[39m");});}@@ -287,14 +287,14 @@ fn test_configure_shell_multiple_configs(repo: TestRepo, temp_home: TempDir) {----- stdout ---------- stderr ------ π‘ [33mCompletions won't work; add to ~/.zshrc before the wt line:[39m- [107m [0m [2m[0m[2m[34mautoload[0m[2m [0m[2m[36m-Uz[0m[2m compinit [0m[2m[36m&&[0m[2m [0m[2m[34mcompinit[0m[2m[0m- β [32mAdded shell extension & completions for [1mbash[22m @ [1m~/.bashrc[22m[39m- β [32mAdded shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m[39m- π‘ [2mSkipped [90mfish[39m; ~/.config/fish/conf.d not found[22m-- β [32mConfigured 2 shells[39m- π‘ [2mRestart shell or run: source ~/.zshrc[22m+ [33mβ²[39m [33mCompletions won't work; add to ~/.zshrc before the wt line:[39m+ [107m [0m [2m[0m[2m[34mautoload[0m[2m [0m[2m[36m-Uz[0m[2m compinit [0m[2m[36m&&[0m[2m [0m[2m[34mcompinit[0m[2m[0m+ [32mβ[39m [32mAdded shell extension & completions for [1mbash[22m @ [1m~/.bashrc[22m[39m+ [32mβ[39m [32mAdded shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m[39m+ [2mβ³[22m [2mSkipped [90mfish[39m; ~/.config/fish/conf.d not found[22m++ [32mβ[39m [32mConfigured 2 shells[39m+ [2mβ³[22m [2mRestart shell or run: source ~/.zshrc[22m");});@@ -347,14 +347,14 @@ fn test_configure_shell_mixed_states(repo: TestRepo, temp_home: TempDir) {----- stdout ---------- stderr ------ π‘ [33mCompletions won't work; add to ~/.zshrc before the wt line:[39m- [107m [0m [2m[0m[2m[34mautoload[0m[2m [0m[2m[36m-Uz[0m[2m compinit [0m[2m[36m&&[0m[2m [0m[2m[34mcompinit[0m[2m[0m- βͺ Already configured shell extension & completions for [1mbash[22m @ [1m~/.bashrc[22m- β [32mAdded shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m[39m- π‘ [2mSkipped [90mfish[39m; ~/.config/fish/conf.d not found[22m-- β [32mConfigured 1 shell[39m- π‘ [2mRestart shell or run: source ~/.zshrc[22m+ [33mβ²[39m [33mCompletions won't work; add to ~/.zshrc before the wt line:[39m+ [107m [0m [2m[0m[2m[34mautoload[0m[2m [0m[2m[36m-Uz[0m[2m compinit [0m[2m[36m&&[0m[2m [0m[2m[34mcompinit[0m[2m[0m+ [2mβ[22m Already configured shell extension & completions for [1mbash[22m @ [1m~/.bashrc[22m+ [32mβ[39m [32mAdded shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m[39m+ [2mβ³[22m [2mSkipped [90mfish[39m; ~/.config/fish/conf.d not found[22m++ [32mβ[39m [32mConfigured 1 shell[39m+ [2mβ³[22m [2mRestart shell or run: source ~/.zshrc[22m");});@@ -403,13 +403,13 @@ fn test_uninstall_shell(repo: TestRepo, temp_home: TempDir) {----- stdout ---------- stderr ------ β [32mRemoved shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m[39m- π‘ [2mNo [90mbash[39m shell extension & completions in ~/.bashrc[22m- π‘ [2mNo [90mfish[39m shell extension in ~/.config/fish/conf.d/wt.fish[22m- π‘ [2mNo [90mfish[39m completions in ~/.config/fish/completions/wt.fish[22m+ [32mβ[39m [32mRemoved shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m[39m+ [2mβ³[22m [2mNo [90mbash[39m shell extension & completions in ~/.bashrc[22m+ [2mβ³[22m [2mNo [90mfish[39m shell extension in ~/.config/fish/conf.d/wt.fish[22m+ [2mβ³[22m [2mNo [90mfish[39m completions in ~/.config/fish/completions/wt.fish[22m- β [32mRemoved integration from 1 shell[39m- π‘ [2mRestart shell to complete uninstall[22m+ [32mβ[39m [32mRemoved integration from 1 shell[39m+ [2mβ³[22m [2mRestart shell to complete uninstall[22m");});@@ -460,13 +460,13 @@ fn test_uninstall_shell_multiple(repo: TestRepo, temp_home: TempDir) {----- stdout ---------- stderr ------ β [32mRemoved shell extension & completions for [1mbash[22m @ [1m~/.bashrc[22m[39m- β [32mRemoved shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m[39m- π‘ [2mNo [90mfish[39m shell extension in ~/.config/fish/conf.d/wt.fish[22m- π‘ [2mNo [90mfish[39m completions in ~/.config/fish/completions/wt.fish[22m+ [32mβ[39m [32mRemoved shell extension & completions for [1mbash[22m @ [1m~/.bashrc[22m[39m+ [32mβ[39m [32mRemoved shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m[39m+ [2mβ³[22m [2mNo [90mfish[39m shell extension in ~/.config/fish/conf.d/wt.fish[22m+ [2mβ³[22m [2mNo [90mfish[39m completions in ~/.config/fish/completions/wt.fish[22m- β [32mRemoved integration from 2 shells[39m- π‘ [2mRestart shell to complete uninstall[22m+ [32mβ[39m [32mRemoved integration from 2 shells[39m+ [2mβ³[22m [2mRestart shell to complete uninstall[22m");});@@ -510,7 +510,7 @@ fn test_uninstall_shell_not_found(repo: TestRepo, temp_home: TempDir) {----- stdout ---------- stderr ------ π‘ [33mNo shell extension & completions found in ~/.zshrc[39m+ [33mβ²[39m [33mNo shell extension & completions found in ~/.zshrc[39m");});}@@ -547,10 +547,10 @@ fn test_uninstall_shell_fish(repo: TestRepo, temp_home: TempDir) {----- stdout ---------- stderr ------ β [32mRemoved shell extension for [1mfish[22m @ [1m~/.config/fish/conf.d/wt.fish[22m[39m+ [32mβ[39m [32mRemoved shell extension for [1mfish[22m @ [1m~/.config/fish/conf.d/wt.fish[22m[39m- β [32mRemoved integration from 1 shell[39m- π‘ [2mRestart shell to complete uninstall[22m+ [32mβ[39m [32mRemoved integration from 1 shell[39m+ [2mβ³[22m [2mRestart shell to complete uninstall[22m");});@@ -655,10 +655,10 @@ fn test_configure_shell_no_warning_when_compinit_enabled(repo: TestRepo, temp_ho----- stdout ---------- stderr ------ β [32mAdded shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m[39m+ [32mβ[39m [32mAdded shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m[39m- β [32mConfigured 1 shell[39m- π‘ [2mRestart shell or run: source ~/.zshrc[22m+ [32mβ[39m [32mConfigured 1 shell[39m+ [2mβ³[22m [2mRestart shell or run: source ~/.zshrc[22m");});}@@ -692,12 +692,12 @@ fn test_configure_shell_no_warning_for_bash_user(repo: TestRepo, temp_home: Temp----- stdout ---------- stderr ------ β [32mAdded shell extension & completions for [1mbash[22m @ [1m~/.bashrc[22m[39m- β [32mAdded shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m[39m- π‘ [2mSkipped [90mfish[39m; ~/.config/fish/conf.d not found[22m+ [32mβ[39m [32mAdded shell extension & completions for [1mbash[22m @ [1m~/.bashrc[22m[39m+ [32mβ[39m [32mAdded shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m[39m+ [2mβ³[22m [2mSkipped [90mfish[39m; ~/.config/fish/conf.d not found[22m- β [32mConfigured 2 shells[39m- π‘ [2mRestart shell or run: source ~/.bashrc[22m+ [32mβ[39m [32mConfigured 2 shells[39m+ [2mβ³[22m [2mRestart shell or run: source ~/.bashrc[22m");});}@@ -730,10 +730,10 @@ fn test_configure_shell_no_warning_for_fish_install(repo: TestRepo, temp_home: T----- stdout ---------- stderr ------ β [32mCreated shell extension for [1mfish[22m @ [1m~/.config/fish/conf.d/wt.fish[22m[39m- β [32mCreated completions for [1mfish[22m @ [1m~/.config/fish/completions/wt.fish[22m[39m+ [32mβ[39m [32mCreated shell extension for [1mfish[22m @ [1m~/.config/fish/conf.d/wt.fish[22m[39m+ [32mβ[39m [32mCreated completions for [1mfish[22m @ [1m~/.config/fish/completions/wt.fish[22m[39m- β [32mConfigured 1 shell[39m+ [32mβ[39m [32mConfigured 1 shell[39m");});}@@ -769,8 +769,8 @@ fn test_configure_shell_no_warning_when_already_configured(repo: TestRepo, temp_----- stdout ---------- stderr ------ βͺ Already configured shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m- β [32mAll shells already configured[39m+ [2mβ[22m Already configured shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m+ [32mβ[39m [32mAll shells already configured[39m");});}@@ -803,11 +803,11 @@ fn test_configure_shell_no_warning_when_shell_unset(repo: TestRepo, temp_home: T----- stdout ---------- stderr ------ β [32mAdded shell extension & completions for [1mbash[22m @ [1m~/.bashrc[22m[39m- β [32mAdded shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m[39m- π‘ [2mSkipped [90mfish[39m; ~/.config/fish/conf.d not found[22m+ [32mβ[39m [32mAdded shell extension & completions for [1mbash[22m @ [1m~/.bashrc[22m[39m+ [32mβ[39m [32mAdded shell extension & completions for [1mzsh[22m @ [1m~/.zshrc[22m[39m+ [2mβ³[22m [2mSkipped [90mfish[39m; ~/.config/fish/conf.d not found[22m- β [32mConfigured 2 shells[39m+ [32mβ[39m [32mConfigured 2 shells[39m");});}diff --git a/tests/integration_tests/directives.rs b/tests/integration_tests/directives.rsindex 73e4a2e23..64d3312b3 100644--- a/tests/integration_tests/directives.rs+++ b/tests/integration_tests/directives.rs@@ -106,9 +106,9 @@ fn test_switch_internal_directive(repo: TestRepo) {----- stdout ---------- stderr ------ [0mβ [31mBranch [1mmy-feature[22m not found[39m+ [0m[31mβ[39m [31mBranch [1mmy-feature[22m not found[39m- π‘ [2mTo create a new branch, run [90mwt switch my-feature --create[39m; to list branches, run [90mwt list --branches --remotes[39m[22m+ [2mβ³[22m [2mTo create a new branch, run [90mwt switch my-feature --create[39m; to list branches, run [90mwt list --branches --remotes[39m[22m");});}@@ -132,9 +132,9 @@ fn test_switch_without_internal(repo: TestRepo) {----- stdout ---------- stderr ------ β [31mBranch [1mmy-feature[22m not found[39m+ [31mβ[39m [31mBranch [1mmy-feature[22m not found[39m- π‘ [2mTo create a new branch, run [90mwt switch my-feature --create[39m; to list branches, run [90mwt list --branches --remotes[39m[22m+ [2mβ³[22m [2mTo create a new branch, run [90mwt switch my-feature --create[39m; to list branches, run [90mwt list --branches --remotes[39m[22m");});}@@ -161,7 +161,7 @@ fn test_remove_internal_directive(repo: TestRepo) {----- stdout ---------- stderr ------ [0mβ [31mThe main worktree cannot be removed[39m+ [0m[31mβ[39m [31mThe main worktree cannot be removed[39m");});}@@ -183,7 +183,7 @@ fn test_remove_without_internal(repo: TestRepo) {----- stdout ---------- stderr ------ β [31mThe main worktree cannot be removed[39m+ [31mβ[39m [31mThe main worktree cannot be removed[39m");});}diff --git a/tests/integration_tests/merge.rs b/tests/integration_tests/merge.rsindex f118b77b4..216ce697f 100644--- a/tests/integration_tests/merge.rs+++ b/tests/integration_tests/merge.rs@@ -1648,12 +1648,12 @@ fn test_merge_no_commit_with_clean_tree(mut repo_with_feature_worktree: TestRepo----- stdout ---------- stderr ------ π [36mMerging 1 commit to [1mmain[22m @ [2mfc12499[22m (no commit/squash/rebase needed)[39m- [107m [0m * [33mfc12499[m Add feature file- [107m [0m feature.txt | 1 [32m+[m- [107m [0m 1 file changed, 1 insertion(+)- β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m- βͺ Worktree preserved (--no-remove)+ [36mβ[39m [36mMerging 1 commit to [1mmain[22m @ [2mfc12499[22m (no commit/squash/rebase needed)[39m+ [107m [0m * [33mfc12499[m Add feature file+ [107m [0m feature.txt | 1 [32m+[m+ [107m [0m 1 file changed, 1 insertion(+)+ [32mβ[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m+ [2mβ[22m Worktree preserved (--no-remove)");});}@@ -1682,9 +1682,9 @@ fn test_merge_no_commit_with_dirty_tree(mut repo: TestRepo) {----- stdout ---------- stderr ------ β [31mCannot merge with --no-commit: [1mfeature[22m has uncommitted changes[39m+ [31mβ[39m [31mCannot merge with --no-commit: [1mfeature[22m has uncommitted changes[39m- π‘ [2mCommit or stash changes first[22m+ [2mβ³[22m [2mCommit or stash changes first[22m");});}@@ -1709,12 +1709,12 @@ fn test_merge_no_commit_no_squash_no_remove_redundant(mut repo_with_feature_work----- stdout ---------- stderr ------ π [36mMerging 1 commit to [1mmain[22m @ [2mfc12499[22m (no commit/squash/rebase needed)[39m- [107m [0m * [33mfc12499[m Add feature file- [107m [0m feature.txt | 1 [32m+[m- [107m [0m 1 file changed, 1 insertion(+)- β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m- βͺ Worktree preserved (--no-remove)+ [36mβ[39m [36mMerging 1 commit to [1mmain[22m @ [2mfc12499[22m (no commit/squash/rebase needed)[39m+ [107m [0m * [33mfc12499[m Add feature file+ [107m [0m feature.txt | 1 [32m+[m+ [107m [0m 1 file changed, 1 insertion(+)+ [32mβ[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m+ [2mβ[22m 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 96ba8166f..07d30723b 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@@ -4,13 +4,13 @@ expression: normalized---y-π‘ [33m[1mrepo[22m needs approval to execute [1m1[22m command:[39m+[33mβ²[39m [33m[1mrepo[22m needs approval to execute [1m1[22m command:[39m-βͺ post-create:-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test command'[0m[2m[0m-β Allow and remember? [1m[y/N][22m-π [36mRunning project post-create:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test command'[0m[2m[0m+[2mβ[22m post-create:+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test command'[0m[2m[0m+[36mβ―[39m Allow and remember? [1m[y/N][22m+[36mβ[39m [36mRunning project post-create:[39m+[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 @ [1m_REPO_/repo.test-approve[22m[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[32mβ[39m [32mCreated new worktree for [1mtest-approve[22m from [1mmain[22m @ [1m_REPO_/repo.test-approve[22m[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --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 ce7453d67..4e7e15bd3 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@@ -4,11 +4,11 @@ expression: normalized---n-π‘ [33m[1mrepo[22m needs approval to execute [1m1[22m command:[39m+[33mβ²[39m [33m[1mrepo[22m needs approval to execute [1m1[22m command:[39m-βͺ post-create:-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test command'[0m[2m[0m-β Allow and remember? [1m[y/N][22m-βͺ Commands declined, continuing worktree creation-β [32mCreated new worktree for [1mtest-decline[22m from [1mmain[22m @ [1m_REPO_/repo.test-decline[22m[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[2mβ[22m post-create:+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test command'[0m[2m[0m+[36mβ―[39m Allow and remember? [1m[y/N][22m+[2mβ[22m Commands declined, continuing worktree creation+[32mβ[39m [32mCreated new worktree for [1mtest-decline[22m from [1mmain[22m @ [1m_REPO_/repo.test-decline[22m[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --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 b0d341e68..7fc8a8d76 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@@ -4,21 +4,21 @@ expression: normalized---y-π‘ [33m[1mrepo[22m needs approval to execute [1m2[22m commands:[39m+[33mβ²[39m [33m[1mrepo[22m needs approval to execute [1m2[22m commands:[39m-βͺ post-create [1mfirst[22m:-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'First command'[0m[2m[0m-βͺ post-create [1mthird[22m:-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Third command'[0m[2m[0m-β Allow and remember? [1m[y/N][22m-π [36mRunning project post-create [1mfirst[22m:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'First command'[0m[2m[0m+[2mβ[22m post-create [1mfirst[22m:+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'First command'[0m[2m[0m+[2mβ[22m post-create [1mthird[22m:+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Third command'[0m[2m[0m+[36mβ―[39m Allow and remember? [1m[y/N][22m+[36mβ[39m [36mRunning project post-create [1mfirst[22m:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'First command'[0m[2m[0m[0mFirst command-π [36mRunning project post-create [1msecond[22m:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Second command'[0m[2m[0m+[36mβ[39m [36mRunning project post-create [1msecond[22m:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Second command'[0m[2m[0m[0mSecond command-π [36mRunning project post-create [1mthird[22m:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Third command'[0m[2m[0m+[36mβ[39m [36mRunning project post-create [1mthird[22m:[39m+[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 @ [1m_REPO_/repo.test-mixed-accept[22m[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[32mβ[39m [32mCreated new worktree for [1mtest-mixed-accept[22m from [1mmain[22m @ [1m_REPO_/repo.test-mixed-accept[22m[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --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 05cd985fd..cf4d99ca5 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@@ -4,13 +4,13 @@ expression: normalized---n-π‘ [33m[1mrepo[22m needs approval to execute [1m2[22m commands:[39m+[33mβ²[39m [33m[1mrepo[22m needs approval to execute [1m2[22m commands:[39m-βͺ post-create [1mfirst[22m:-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'First command'[0m[2m[0m-βͺ post-create [1mthird[22m:-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Third command'[0m[2m[0m-β Allow and remember? [1m[y/N][22m-βͺ Commands declined, continuing worktree creation-β [32mCreated new worktree for [1mtest-mixed-decline[22m from [1mmain[22m @ [1m_REPO_/repo.test-mixed-decline[22m[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[2mβ[22m post-create [1mfirst[22m:+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'First command'[0m[2m[0m+[2mβ[22m post-create [1mthird[22m:+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Third command'[0m[2m[0m+[36mβ―[39m Allow and remember? [1m[y/N][22m+[2mβ[22m Commands declined, continuing worktree creation+[32mβ[39m [32mCreated new worktree for [1mtest-mixed-decline[22m from [1mmain[22m @ [1m_REPO_/repo.test-mixed-decline[22m[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --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 a8b5d9e00..22cd4189d 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@@ -4,23 +4,23 @@ expression: normalized---y-π‘ [33m[1mrepo[22m needs approval to execute [1m3[22m commands:[39m+[33mβ²[39m [33m[1mrepo[22m needs approval to execute [1m3[22m commands:[39m-βͺ post-create [1mfirst[22m:-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'First command'[0m[2m[0m-βͺ post-create [1msecond[22m:-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Second command'[0m[2m[0m-βͺ post-create [1mthird[22m:-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Third command'[0m[2m[0m-β Allow and remember? [1m[y/N][22m-π [36mRunning project post-create [1mfirst[22m:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'First command'[0m[2m[0m+[2mβ[22m post-create [1mfirst[22m:+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'First command'[0m[2m[0m+[2mβ[22m post-create [1msecond[22m:+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Second command'[0m[2m[0m+[2mβ[22m post-create [1mthird[22m:+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Third command'[0m[2m[0m+[36mβ―[39m Allow and remember? [1m[y/N][22m+[36mβ[39m [36mRunning project post-create [1mfirst[22m:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'First command'[0m[2m[0m[0mFirst command-π [36mRunning project post-create [1msecond[22m:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Second command'[0m[2m[0m+[36mβ[39m [36mRunning project post-create [1msecond[22m:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Second command'[0m[2m[0m[0mSecond command-π [36mRunning project post-create [1mthird[22m:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Third command'[0m[2m[0m+[36mβ[39m [36mRunning project post-create [1mthird[22m:[39m+[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 @ [1m_REPO_/repo.test-multi[22m[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[32mβ[39m [32mCreated new worktree for [1mtest-multi[22m from [1mmain[22m @ [1m_REPO_/repo.test-multi[22m[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --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 08f1e3003..14502a846 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@@ -4,23 +4,23 @@ expression: normalized---y-π‘ [33m[1mrepo[22m needs approval to execute [1m3[22m commands:[39m+[33mβ²[39m [33m[1mrepo[22m needs approval to execute [1m3[22m commands:[39m-βͺ post-create [1minstall[22m:-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Installing dependencies...'[0m[2m[0m-βͺ post-create [1mbuild[22m:-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Building project...'[0m[2m[0m-βͺ post-create [1mtest[22m:-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Running tests...'[0m[2m[0m-β Allow and remember? [1m[y/N][22m-π [36mRunning project post-create [1minstall[22m:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Installing dependencies...'[0m[2m[0m+[2mβ[22m post-create [1minstall[22m:+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Installing dependencies...'[0m[2m[0m+[2mβ[22m post-create [1mbuild[22m:+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Building project...'[0m[2m[0m+[2mβ[22m post-create [1mtest[22m:+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Running tests...'[0m[2m[0m+[36mβ―[39m Allow and remember? [1m[y/N][22m+[36mβ[39m [36mRunning project post-create [1minstall[22m:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Installing dependencies...'[0m[2m[0m[0mInstalling dependencies...-π [36mRunning project post-create [1mbuild[22m:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Building project...'[0m[2m[0m+[36mβ[39m [36mRunning project post-create [1mbuild[22m:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Building project...'[0m[2m[0m[0mBuilding project...-π [36mRunning project post-create [1mtest[22m:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Running tests...'[0m[2m[0m+[36mβ[39m [36mRunning project post-create [1mtest[22m:[39m+[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 @ [1m_REPO_/repo.test-named[22m[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[32mβ[39m [32mCreated new worktree for [1mtest-named[22m from [1mmain[22m @ [1m_REPO_/repo.test-named[22m[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --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 39dd845db..7e18176f7 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@@ -4,15 +4,15 @@ expression: normalized---y-π‘ [33m[1mrepo[22m needs approval to execute [1m1[22m command:[39m+[33mβ²[39m [33m[1mrepo[22m needs approval to execute [1m1[22m command:[39m-βͺ post-create:-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test command'[0m[2m[0m-β Allow and remember? [1m[y/N][22m-π‘ [33mFailed to save command approval: Failed to write config file: Permission denied (os error 13)[39m-π‘ [2mApproval will be requested again next time.[22m-π [36mRunning project post-create:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test command'[0m[2m[0m+[2mβ[22m post-create:+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test command'[0m[2m[0m+[36mβ―[39m Allow and remember? [1m[y/N][22m+[33mβ²[39m [33mFailed to save command approval: Failed to write config file: Permission denied (os error 13)[39m+[2mβ³[22m [2mApproval will be requested again next time.[22m+[36mβ[39m [36mRunning project post-create:[39m+[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 @ [1m_REPO_/repo.test-permission[22m[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[32mβ[39m [32mCreated new worktree for [1mtest-permission[22m from [1mmain[22m @ [1m_REPO_/repo.test-permission[22m[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__config_show_theme__show_theme.snap b/tests/integration_tests/snapshots/integration__integration_tests__config_show_theme__show_theme.snapindex 279865691..cdb25d96b 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__config_show_theme__show_theme.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__config_show_theme__show_theme.snap@@ -10,6 +10,7 @@ info:CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_EDITOR: ""+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"WORKTRUNK_CONFIG_PATH: /nonexistent/test/config.toml---@@ -18,19 +19,19 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRebasing [1mfeature[22m onto [1mmain[22m...[39m-β [32mCreated worktree for [1mfeature[22m @ [1m/path/to/worktree[22m[39m-β [31mBranch [1mfeature[22m not found[39m-π‘ [33mBranch [1mfeature[22m has uncommitted changes[39m-π‘ [2mTo rebase onto main, run [90mwt merge[39m[22m-βͺ Showing [1m5[22m worktrees+[36mβ[39m [36mRebasing [1mfeature[22m onto [1mmain[22m...[39m+[32mβ[39m [32mCreated worktree for [1mfeature[22m @ [1m/path/to/worktree[22m[39m+[31mβ[39m [31mBranch [1mfeature[22m not found[39m+[33mβ²[39m [33mBranch [1mfeature[22m has uncommitted changes[39m+[2mβ³[22m [2mTo rebase onto main, run [90mwt merge[39m[22m+[2mβ[22m Showing [1m5[22m worktrees-βͺ Gutter formatting (quoted content):-[107m [0m [commit-generation]-[107m [0m command = "llm --model claude"+[2mβ[22m Gutter formatting (quoted content):+[107m [0m [commit-generation]+[107m [0m command = "llm --model claude"-βͺ Gutter formatting (shell code):-[107m [0m [2m[0m[2m[34meval[0m[2m [0m[2m[32m"$([0m[2m[34mwt[0m[2m config shell init bash)"[0m[2m[0m+[2mβ[22m Gutter formatting (shell code):+[107m [0m [2m[0m[2m[34meval[0m[2m [0m[2m[32m"$([0m[2m[34mwt[0m[2m config shell init bash)"[0m[2m[0m-βͺ Prompt formatting:-β Proceed? [y/N]+[2mβ[22m Prompt formatting:+[36mβ―[39m Proceed? [y/N]diff --git a/tests/integration_tests/snapshots/integration__integration_tests__config_state__state_get_comprehensive.snap b/tests/integration_tests/snapshots/integration__integration_tests__config_state__state_get_comprehensive.snapindex b2cd881ed..6a6633582 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__config_state__state_get_comprehensive.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__config_state__state_get_comprehensive.snap@@ -3,10 +3,10 @@ source: tests/integration_tests/config_state.rsexpression: "String::from_utf8_lossy(&output.stderr)"---[36mDEFAULT BRANCH[39m-[107m [0m main+[107m [0m main[36mPREVIOUS BRANCH[39m-[107m [0m feature+[107m [0m feature[36mBRANCH MARKERS[39mBranch Marker Agediff --git a/tests/integration_tests/snapshots/integration__integration_tests__config_state__state_get_with_ci_entries.snap b/tests/integration_tests/snapshots/integration__integration_tests__config_state__state_get_with_ci_entries.snapindex 53882f895..22dea34ec 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__config_state__state_get_with_ci_entries.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__config_state__state_get_with_ci_entries.snap@@ -3,13 +3,13 @@ source: tests/integration_tests/config_state.rsexpression: "String::from_utf8_lossy(&output.stderr)"---[36mDEFAULT BRANCH[39m-[107m [0m main+[107m [0m main[36mPREVIOUS BRANCH[39m-[107m [0m (none)+[107m [0m (none)[36mBRANCH MARKERS[39m-[107m [0m (none)+[107m [0m (none)[36mCI STATUS CACHE[39mBranch Status Age Head@@ -19,4 +19,4 @@ expression: "String::from_utf8_lossy(&output.stderr)"main none now deadbeef[36mLOG FILES[39m @ .git/wt-logs-[107m [0m (none)+[107m [0m (none)diff --git a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__branch_already_exists.snap b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__branch_already_exists.snapindex 3ae09d859..2389b9a8b 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__branch_already_exists.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__branch_already_exists.snap@@ -2,6 +2,6 @@source: tests/integration_tests/git_error_display.rsexpression: err.to_string()----β [31mBranch [1mfeature[22m already exists[39m+[31mβ[39m [31mBranch [1mfeature[22m already exists[39m-π‘ [2mTo switch to the existing branch, remove [90m--create[39m; run [90mwt switch feature[39m[22m+[2mβ³[22m [2mTo switch to the existing branch, remove [90m--create[39m; run [90mwt switch feature[39m[22mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__cannot_remove_main_worktree.snap b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__cannot_remove_main_worktree.snapindex 00bac7b26..54ccd1fbe 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__cannot_remove_main_worktree.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__cannot_remove_main_worktree.snap@@ -1,5 +1,5 @@----source: tests/git_error_display.rs+source: tests/integration_tests/git_error_display.rsexpression: err.to_string()----β [31mThe main worktree cannot be removed[39m+[31mβ[39m [31mThe main worktree cannot be removed[39mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__conflicting_changes.snap b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__conflicting_changes.snapindex b3c87f216..7142e6480 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__conflicting_changes.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__conflicting_changes.snap@@ -2,8 +2,8 @@source: tests/integration_tests/git_error_display.rsexpression: err.to_string()----β [31mCannot push: conflicting uncommitted changes in:[39m-[107m [0m src/main.rs-[107m [0m src/lib.rs+[31mβ[39m [31mCannot push: conflicting uncommitted changes in:[39m+[107m [0m src/main.rs+[107m [0m src/lib.rs-π‘ [2mCommit or stash these changes in /tmp/repo.main first[22m+[2mβ³[22m [2mCommit or stash these changes in /tmp/repo.main first[22mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__detached_head.snap b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__detached_head.snapindex f0f5d123d..63da255b6 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__detached_head.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__detached_head.snap@@ -2,6 +2,6 @@source: tests/integration_tests/git_error_display.rsexpression: err.to_string()----β [31mCannot merge: not on a branch (detached HEAD)[39m+[31mβ[39m [31mCannot merge: not on a branch (detached HEAD)[39m-π‘ [2mTo switch to a branch, run [90mgit switch <branch>[39m[22m+[2mβ³[22m [2mTo switch to a branch, run [90mgit switch <branch>[39m[22mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__detached_head_no_action.snap b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__detached_head_no_action.snapindex 4461907c8..510fe705e 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__detached_head_no_action.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__detached_head_no_action.snap@@ -2,6 +2,6 @@source: tests/integration_tests/git_error_display.rsexpression: err.to_string()----β [31mNot on a branch (detached HEAD)[39m+[31mβ[39m [31mNot on a branch (detached HEAD)[39m-π‘ [2mTo switch to a branch, run [90mgit switch <branch>[39m[22m+[2mβ³[22m [2mTo switch to a branch, run [90mgit switch <branch>[39m[22mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__hook_command_failed_with_name.snap b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__hook_command_failed_with_name.snapindex 9b7b8b37e..b86414f51 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__hook_command_failed_with_name.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__hook_command_failed_with_name.snap@@ -2,4 +2,4 @@source: tests/integration_tests/git_error_display.rsexpression: err.to_string()----β [31mpre-merge command failed: [1mtest[22m: exit code 1[39m+[31mβ[39m [31mpre-merge command failed: [1mtest[22m: exit code 1[39mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__hook_command_failed_with_skip_hint.snap b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__hook_command_failed_with_skip_hint.snapindex ea39d9b91..4c1b64af3 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__hook_command_failed_with_skip_hint.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__hook_command_failed_with_skip_hint.snap@@ -2,6 +2,6 @@source: tests/integration_tests/git_error_display.rsexpression: err_with_hint.to_string()----β [31mpre-merge command failed: [1mtest[22m: exit code 1[39m+[31mβ[39m [31mpre-merge command failed: [1mtest[22m: exit code 1[39m-π‘ [2mTo skip pre-merge hooks, re-run with [90m--no-verify[39m[22m+[2mβ³[22m [2mTo skip pre-merge hooks, re-run with [90m--no-verify[39m[22mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__hook_command_failed_without_name.snap b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__hook_command_failed_without_name.snapindex e7fbb7407..92e6989fb 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__hook_command_failed_without_name.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__hook_command_failed_without_name.snap@@ -2,4 +2,4 @@source: tests/integration_tests/git_error_display.rsexpression: err.to_string()----β [31mpost-create command failed: command not found[39m+[31mβ[39m [31mpost-create command failed: command not found[39mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__invalid_reference.snap b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__invalid_reference.snapindex a68c71bf5..662dd6f9c 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__invalid_reference.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__invalid_reference.snap@@ -2,6 +2,6 @@source: tests/integration_tests/git_error_display.rsexpression: err.to_string()----β [31mBranch [1mnonexistent-branch[22m not found[39m+[31mβ[39m [31mBranch [1mnonexistent-branch[22m not found[39m-π‘ [2mTo create a new branch, run [90mwt switch nonexistent-branch --create[39m; to list branches, run [90mwt list --branches --remotes[39m[22m+[2mβ³[22m [2mTo create a new branch, run [90mwt switch nonexistent-branch --create[39m; to list branches, run [90mwt list --branches --remotes[39m[22mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__llm_command_failed.snap b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__llm_command_failed.snapindex 8871aeb25..1b12a21e1 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__llm_command_failed.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__llm_command_failed.snap@@ -1,9 +1,9 @@----source: tests/git_error_display.rs+source: tests/integration_tests/git_error_display.rsexpression: err.to_string()----β [31mCommit generation command failed[39m-[107m [0m Error: API key not found+[31mβ[39m [31mCommit generation command failed[39m+[107m [0m Error: API key not found-βͺ Ran command:-[107m [0m llm --model claude+[2mβ[22m Ran command:+[107m [0m llm --model claudediff --git a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__llm_command_failed_with_reproduction.snap b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__llm_command_failed_with_reproduction.snapindex 5d36bac1a..596b0555d 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__llm_command_failed_with_reproduction.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__llm_command_failed_with_reproduction.snap@@ -2,8 +2,8 @@source: tests/integration_tests/git_error_display.rsexpression: err.to_string()----β [31mCommit generation command failed[39m-[107m [0m Error: API key not found+[31mβ[39m [31mCommit generation command failed[39m+[107m [0m Error: API key not found-βͺ Ran command:-[107m [0m wt step commit --show-prompt | llm --model claude+[2mβ[22m Ran command:+[107m [0m wt step commit --show-prompt | llm --model claudediff --git a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__merge_commits_found.snap b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__merge_commits_found.snapindex 60e883446..6c5a97a19 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__merge_commits_found.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__merge_commits_found.snap@@ -2,6 +2,6 @@source: tests/integration_tests/git_error_display.rsexpression: err.to_string()----β [31mFound merge commits in push range[39m+[31mβ[39m [31mFound merge commits in push range[39m-π‘ [2mTo push non-linear history, run [90mwt merge --allow-merge-commits[39m[22m+[2mβ³[22m [2mTo push non-linear history, run [90mwt merge --allow-merge-commits[39m[22mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__no_worktree_found.snap b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__no_worktree_found.snapindex aae61276b..04c645c93 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__no_worktree_found.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__no_worktree_found.snap@@ -1,5 +1,5 @@----source: tests/git_error_display.rs+source: tests/integration_tests/git_error_display.rsexpression: err.to_string()----β [31mNo worktree found for branch [1mnonexistent[22m[39m+[31mβ[39m [31mNo worktree found for branch [1mnonexistent[22m[39mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__not_fast_forward.snap b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__not_fast_forward.snapindex 28ebeaec9..df6be6655 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__not_fast_forward.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__not_fast_forward.snap@@ -2,8 +2,8 @@source: tests/integration_tests/git_error_display.rsexpression: err.to_string()----β [31mCan't push to local [1mmain[22m branch: it has newer commits[39m-[107m [0m abc1234 Fix bug-[107m [0m def5678 Add feature+[31mβ[39m [31mCan't push to local [1mmain[22m branch: it has newer commits[39m+[107m [0m abc1234 Fix bug+[107m [0m def5678 Add feature-π‘ [2mTo rebase onto [1mmain[22m, run [90mwt step rebase main[39m[22m+[2mβ³[22m [2mTo rebase onto [1mmain[22m, run [90mwt step rebase main[39m[22mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__not_fast_forward_merge_context.snap b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__not_fast_forward_merge_context.snapindex d1dfaffff..a7cef0da0 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__not_fast_forward_merge_context.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__not_fast_forward_merge_context.snap@@ -2,7 +2,7 @@source: tests/integration_tests/git_error_display.rsexpression: err.to_string()----β [31mCan't push to local [1mmain[22m branch: it has newer commits[39m-[107m [0m abc1234 New commit on main+[31mβ[39m [31mCan't push to local [1mmain[22m branch: it has newer commits[39m+[107m [0m abc1234 New commit on main-π‘ [2mTo incorporate these changes, run [90mwt merge main[39m again[22m+[2mβ³[22m [2mTo incorporate these changes, run [90mwt merge main[39m again[22mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__not_interactive.snap b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__not_interactive.snapindex 086a258c4..2cc7c081c 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__not_interactive.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__not_interactive.snap@@ -2,6 +2,6 @@source: tests/integration_tests/git_error_display.rsexpression: err.to_string()----β [31mCannot prompt for approval in non-interactive environment[39m+[31mβ[39m [31mCannot prompt for approval in non-interactive environment[39m-π‘ [2mTo skip prompts in CI/CD, add [90m--force[39m; to pre-approve commands, run [90mwt hook approvals add[39m[22m+[2mβ³[22m [2mTo skip prompts in CI/CD, add [90m--force[39m; to pre-approve commands, run [90mwt hook approvals add[39m[22mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__other.snap b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__other.snapindex 1f683892d..337cf41b8 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__other.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__other.snap@@ -1,5 +1,5 @@----source: tests/git_error_display.rs+source: tests/integration_tests/git_error_display.rsexpression: err.to_string()----β [31mUnexpected git error[39m+[31mβ[39m [31mUnexpected git error[39mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__parse_error.snap b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__parse_error.snapindex a11ba3d1e..6af222a85 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__parse_error.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__parse_error.snap@@ -1,5 +1,5 @@----source: tests/git_error_display.rs+source: tests/integration_tests/git_error_display.rsexpression: err.to_string()----β [31mInvalid branch name format[39m+[31mβ[39m [31mInvalid branch name format[39mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__project_config_not_found.snap b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__project_config_not_found.snapindex 7fa039e82..75f86bc65 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__project_config_not_found.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__project_config_not_found.snap@@ -1,7 +1,7 @@----source: tests/git_error_display.rs+source: tests/integration_tests/git_error_display.rsexpression: err.to_string()----β [31mNo project configuration found[39m+[31mβ[39m [31mNo project configuration found[39m-π‘ [2mCreate a config file at: [1m/tmp/repo/.config/wt.toml[22m[22m+[2mβ³[22m [2mCreate a config file at: [1m/tmp/repo/.config/wt.toml[22m[22mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__push_failed.snap b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__push_failed.snapindex 1fbf662d5..fe1c09988 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__push_failed.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__push_failed.snap@@ -1,8 +1,8 @@----source: tests/git_error_display.rs+source: tests/integration_tests/git_error_display.rsexpression: err.to_string()----β [31mPush failed[39m-[107m [0m To /Users/user/workspace/repo/.git-[107m [0m ! [remote rejected] HEAD -> main (Up-to-date check failed)-[107m [0m error: failed to push some refs to '/Users/user/workspace/repo/.git'+[31mβ[39m [31mPush failed[39m+[107m [0m To /Users/user/workspace/repo/.git+[107m [0m ! [remote rejected] HEAD -> main (Up-to-date check failed)+[107m [0m error: failed to push some refs to '/Users/user/workspace/repo/.git'diff --git a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__rebase_conflict.snap b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__rebase_conflict.snapindex 55ecbdbc7..732df04ec 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__rebase_conflict.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__rebase_conflict.snap@@ -1,6 +1,6 @@----source: tests/git_error_display.rs+source: tests/integration_tests/git_error_display.rsexpression: err.to_string()----β [31mRebase onto [1mmain[22m incomplete[39m-[107m [0m CONFLICT (content): Merge conflict in src/main.rs+[31mβ[39m [31mRebase onto [1mmain[22m incomplete[39m+[107m [0m CONFLICT (content): Merge conflict in src/main.rsdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__remote_only_branch.snap b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__remote_only_branch.snapindex 7c850c80c..c342b75ca 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__remote_only_branch.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__remote_only_branch.snap@@ -2,6 +2,6 @@source: tests/integration_tests/git_error_display.rsexpression: err.to_string()----β [31mBranch [1mfeature[22m exists only on remote (origin/feature)[39m+[31mβ[39m [31mBranch [1mfeature[22m exists only on remote (origin/feature)[39m-π‘ [2mTo create a local worktree, run [90mwt switch feature[39m[22m+[2mβ³[22m [2mTo create a local worktree, run [90mwt switch feature[39m[22mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__uncommitted_changes.snap b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__uncommitted_changes.snapindex f0bf3d5c3..cdfef5602 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__uncommitted_changes.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__uncommitted_changes.snap@@ -1,7 +1,7 @@----source: tests/git_error_display.rs+source: tests/integration_tests/git_error_display.rsexpression: err.to_string()----β [31mCannot remove worktree: working tree has uncommitted changes[39m+[31mβ[39m [31mCannot remove worktree: working tree has uncommitted changes[39m-π‘ [2mCommit or stash changes first[22m+[2mβ³[22m [2mCommit or stash changes first[22mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__uncommitted_changes_with_worktree.snap b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__uncommitted_changes_with_worktree.snapindex c06ea56ee..325594baa 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__uncommitted_changes_with_worktree.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__uncommitted_changes_with_worktree.snap@@ -1,7 +1,7 @@----source: tests/git_error_display.rs+source: tests/integration_tests/git_error_display.rsexpression: err.to_string()----β [31mCannot remove worktree: [1mfeature-branch[22m has uncommitted changes[39m+[31mβ[39m [31mCannot remove worktree: [1mfeature-branch[22m has uncommitted changes[39m-π‘ [2mCommit or stash changes first[22m+[2mβ³[22m [2mCommit or stash changes first[22mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__worktree_creation_failed.snap b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__worktree_creation_failed.snapindex 1d93165c2..8448da68b 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__worktree_creation_failed.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__worktree_creation_failed.snap@@ -1,6 +1,6 @@----source: tests/git_error_display.rs+source: tests/integration_tests/git_error_display.rsexpression: err.to_string()----β [31mFailed to create worktree for [1mfeature-y[22m from base [1mmain[22m[39m-[107m [0m fatal: '/tmp/repo.feature-y' already exists+[31mβ[39m [31mFailed to create worktree for [1mfeature-y[22m from base [1mmain[22m[39m+[107m [0m fatal: '/tmp/repo.feature-y' already existsdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__worktree_missing.snap b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__worktree_missing.snapindex c89c7d8b4..1ac98e844 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__worktree_missing.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__worktree_missing.snap@@ -2,6 +2,6 @@source: tests/integration_tests/git_error_display.rsexpression: err.to_string()----β [31mWorktree directory missing for [1mstale-branch[22m[39m+[31mβ[39m [31mWorktree directory missing for [1mstale-branch[22m[39m-π‘ [2mTo clean up, run [90mgit worktree prune[39m[22m+[2mβ³[22m [2mTo clean up, run [90mgit worktree prune[39m[22mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__worktree_path_exists.snap b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__worktree_path_exists.snapindex 723fbcc1e..2f8d018e2 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__worktree_path_exists.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__worktree_path_exists.snap@@ -2,6 +2,6 @@source: tests/integration_tests/git_error_display.rsexpression: err.to_string()----β [31mDirectory already exists: [1m/tmp/repo.feature[22m[39m+[31mβ[39m [31mDirectory already exists: [1m/tmp/repo.feature[22m[39m-π‘ [2mTo remove manually, run [90mrm -rf /tmp/repo.feature[39m; to retry with backup, run [90mwt switch feature --clobber[39m[22m+[2mβ³[22m [2mTo remove manually, run [90mrm -rf /tmp/repo.feature[39m; to retry with backup, run [90mwt switch feature --clobber[39m[22mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__worktree_path_occupied.snap b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__worktree_path_occupied.snapindex ccb07908e..2fa335057 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__worktree_path_occupied.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__worktree_path_occupied.snap@@ -2,7 +2,7 @@source: tests/integration_tests/git_error_display.rsexpression: err.to_string()----β [31mCannot create worktree for [1mfeature-z[22m: existing worktree at [1m/tmp/repo.feature-z[22m on [1mother-branch[22m[39m+[31mβ[39m [31mCannot create worktree for [1mfeature-z[22m: existing worktree at [1m/tmp/repo.feature-z[22m on [1mother-branch[22m[39m-π‘ [2mTo switch the worktree to this branch:[22m-[107m [0m [2m[0m[2m[34mcd[0m[2m /tmp/repo.feature-z [0m[2m[36m&&[0m[2m [0m[2m[34mgit[0m[2m switch feature-z[0m+[2mβ³[22m [2mTo switch the worktree to this branch:[22m+[107m [0m [2m[0m[2m[34mcd[0m[2m /tmp/repo.feature-z [0m[2m[36m&&[0m[2m [0m[2m[34mgit[0m[2m switch feature-z[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__worktree_removal_failed.snap b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__worktree_removal_failed.snapindex cd442ac7c..b8afe68c0 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__worktree_removal_failed.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__git_error_display__worktree_removal_failed.snap@@ -2,6 +2,6 @@source: tests/integration_tests/git_error_display.rsexpression: err.to_string()----β [31mFailed to remove worktree for [1mfeature-x[22m @ [1m/tmp/repo.feature-x[22m[39m-[107m [0m fatal: worktree is dirty-[107m [0m error: could not remove worktree+[31mβ[39m [31mFailed to remove worktree for [1mfeature-x[22m @ [1m/tmp/repo.feature-x[22m[39m+[107m [0m fatal: worktree is dirty+[107m [0m error: could not remove worktreediff --git a/tests/integration_tests/snapshots/integration__integration_tests__select__select_abort_escape.snap b/tests/integration_tests/snapshots/integration__integration_tests__select__select_abort_escape.snapindex 055778c35..17cad6272 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__select__select_abort_escape.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__select__select_abort_escape.snap@@ -5,7 +5,7 @@ expression: normalized> [QUERY] β[PREVIEW_HEADER]Branch Status HEADΒ± mainβ Remoteβ Commit βEnter: switch | Esc: cancel | ctrl-u/d: scroll | alt-p: tog> @ main ^ a1e809f5 β- ββͺ main has no uncommitted changes+ ββ main has no uncommitted changesβββdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__select__select_multiple_worktrees.snap b/tests/integration_tests/snapshots/integration__integration_tests__select__select_multiple_worktrees.snapindex 602c216f2..f0ff969ee 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__select__select_multiple_worktrees.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__select__select_multiple_worktrees.snap@@ -5,7 +5,7 @@ expression: normalized> [QUERY] β[PREVIEW_HEADER]Branch Status HEADΒ± mainβ Remoteβ Age βEnter: switch | Esc: cancel | ctrl-u/d: scroll | alt-p: tog> @ main ^ 1d β- + feature-one _ 1d ββͺ main has no uncommitted changes+ + feature-one _ 1d ββ main has no uncommitted changes+ feature-two _ 1d βββdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__select__select_with_branches.snap b/tests/integration_tests/snapshots/integration__integration_tests__select__select_with_branches.snapindex a304d5229..22fcca199 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__select__select_with_branches.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__select__select_with_branches.snap@@ -5,7 +5,7 @@ expression: normalized> [QUERY] β[PREVIEW_HEADER]Branch Status HEADΒ± mainβ Remoteβ βEnter: switch | Esc: cancel | ctrl-u/d: scroll | alt-p: tog> @ main ^ β- + active-worktree _ ββͺ main has no uncommitted changes+ + active-worktree _ ββ main has no uncommitted changesorphan-branch /_ βββdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__bash_shell_integration_hint_suppressed.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__bash_shell_integration_hint_suppressed.snapindex a8709db65..6b93eb8e0 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 @ [1m[TMPDIR]/repo.bash-test[22m[39m+[32mβ[39m [32mCreated new worktree for [1mbash-test[22m from [1mmain[22m @ [1m[TMPDIR]/repo.bash-test[22m[39mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__command_failure.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__command_failure.snapindex 04f9be73a..ffe3f5383 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__command_failure.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__command_failure.snap@@ -2,6 +2,6 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()----β [31mBranch [1mexisting[22m already exists[39m+[31mβ[39m [31mBranch [1mexisting[22m already exists[39m-π‘ [2mTo switch to the existing branch, remove [90m--create[39m; run [90mwt switch existing[39m[22m+[2mβ³[22m [2mTo switch to the existing branch, remove [90m--create[39m; run [90mwt switch existing[39m[22mdiff --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 041225d0e..62978819b 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,9 +2,9 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()----β [32mCreated new worktree for [1mfish-multiline[22m from [1mmain[22m @ [1m[TMPDIR]/repo.fish-multiline[22m[39m-π [36mExecuting (--execute):[39m-[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[0m+[32mβ[39m [32mCreated new worktree for [1mfish-multiline[22m from [1mmain[22m @ [1m[TMPDIR]/repo.fish-multiline[22m[39m+[36mβ[39m [36mExecuting (--execute):[39m+[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 2line 3diff --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 8faf7340a..26b62347b 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 @ [1m[TMPDIR]/repo.fish-minimal[22m[39m+[32mβ[39m [32mCreated new worktree for [1mfish-minimal[22m from [1mmain[22m @ [1m[TMPDIR]/repo.fish-minimal[22m[39mdiff --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 4d4cf0bcf..d276754db 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 @ [1m[TMPDIR]/repo.fish-bg[22m[39m-π [36mRunning project post-start:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'fish background task'[0m[2m[0m+[32mβ[39m [32mCreated new worktree for [1mfish-bg[22m from [1mmain[22m @ [1m[TMPDIR]/repo.fish-bg[22m[39m+[36mβ[39m [36mRunning project post-start:[39m+[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.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge.snapindex 03f577b29..0d1ee5188 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge.snap@@ -2,5 +2,5 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()----βͺ Already up to date with [1mmain[22m (no new commits, no rebase needed)-βͺ Worktree preserved (main worktree)+[2mβ[22m Already up to date with [1mmain[22m (no new commits, no rebase needed)+[2mβ[22m Worktree preserved (main worktree)diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snapindex 3b0326ec4..5877225c8 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,8 +2,8 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()----π [36mRunning project pre-merge [1mcheck1[22m:[39m-[107m [0m [2m[0m[2m[34m[TMPDIR]/repo/mixed-output.sh[0m[2m check1 3[0m+[36mβ[39m [36mRunning project pre-merge [1mcheck1[22m:[39m+[107m [0m [2m[0m[2m[34m[TMPDIR]/repo/mixed-output.sh[0m[2m check1 3[0m[check1] stdout line 1[check1] stderr line 1[check1] stdout line 2@@ -12,8 +12,8 @@ expression: output.normalized()[check1] stderr line 3[check1] stdout complete[check1] stderr complete-π [36mRunning project pre-merge [1mcheck2[22m:[39m-[107m [0m [2m[0m[2m[34m[TMPDIR]/repo/mixed-output.sh[0m[2m check2 3[0m+[36mβ[39m [36mRunning project pre-merge [1mcheck2[22m:[39m+[107m [0m [2m[0m[2m[34m[TMPDIR]/repo/mixed-output.sh[0m[2m check2 3[0m[check2] stdout line 1[check2] stderr line 1[check2] stdout line 2@@ -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-[107m [0m * [33m[HASH][m Add feature file-[107m [0m feature.txt | 1 [32m+[m-[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mMerging 1 commit to [1mmain[22m @ [2m[HASH][22m (no commit/squash/rebase needed)[39m+[107m [0m * [33m[HASH][m Add feature file+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)+[32mβ[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m+[36mβ[39m [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --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 3b0326ec4..5877225c8 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,8 +2,8 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()----π [36mRunning project pre-merge [1mcheck1[22m:[39m-[107m [0m [2m[0m[2m[34m[TMPDIR]/repo/mixed-output.sh[0m[2m check1 3[0m+[36mβ[39m [36mRunning project pre-merge [1mcheck1[22m:[39m+[107m [0m [2m[0m[2m[34m[TMPDIR]/repo/mixed-output.sh[0m[2m check1 3[0m[check1] stdout line 1[check1] stderr line 1[check1] stdout line 2@@ -12,8 +12,8 @@ expression: output.normalized()[check1] stderr line 3[check1] stdout complete[check1] stderr complete-π [36mRunning project pre-merge [1mcheck2[22m:[39m-[107m [0m [2m[0m[2m[34m[TMPDIR]/repo/mixed-output.sh[0m[2m check2 3[0m+[36mβ[39m [36mRunning project pre-merge [1mcheck2[22m:[39m+[107m [0m [2m[0m[2m[34m[TMPDIR]/repo/mixed-output.sh[0m[2m check2 3[0m[check2] stdout line 1[check2] stderr line 1[check2] stdout line 2@@ -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-[107m [0m * [33m[HASH][m Add feature file-[107m [0m feature.txt | 1 [32m+[m-[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mMerging 1 commit to [1mmain[22m @ [2m[HASH][22m (no commit/squash/rebase needed)[39m+[107m [0m * [33m[HASH][m Add feature file+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)+[32mβ[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m+[36mβ[39m [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --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 65ff0330f..9cda0dfd0 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,12 +2,12 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()----π [36mRunning project pre-merge [1mformat[22m:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'β Code formatting check passed'[0m[2m[0m+[36mβ[39m [36mRunning project pre-merge [1mformat[22m:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'β Code formatting check passed'[0m[2m[0mβ Code formatting check passed-π [36mRunning project pre-merge [1mtest[22m:[39m-[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+[36mβ[39m [36mRunning project pre-merge [1mtest[22m:[39m+[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[39m+[31mβ[39m [31mpre-merge command failed: [1mtest[22m: exit status: 1[39m-π‘ [2mTo skip pre-merge hooks, re-run with [90m--no-verify[39m[22m+[2mβ³[22m [2mTo skip pre-merge hooks, re-run with [90m--no-verify[39m[22mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_failure_zsh.snapindex 65ff0330f..9cda0dfd0 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,12 +2,12 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()----π [36mRunning project pre-merge [1mformat[22m:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'β Code formatting check passed'[0m[2m[0m+[36mβ[39m [36mRunning project pre-merge [1mformat[22m:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'β Code formatting check passed'[0m[2m[0mβ Code formatting check passed-π [36mRunning project pre-merge [1mtest[22m:[39m-[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+[36mβ[39m [36mRunning project pre-merge [1mtest[22m:[39m+[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[39m+[31mβ[39m [31mpre-merge command failed: [1mtest[22m: exit status: 1[39m-π‘ [2mTo skip pre-merge hooks, re-run with [90m--no-verify[39m[22m+[2mβ³[22m [2mTo skip pre-merge hooks, re-run with [90m--no-verify[39m[22mdiff --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 18158ec6d..33ccb3925 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 project pre-merge [1mformat[22m:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'β Code formatting check passed'[0m[2m[0m+[36mβ[39m [36mRunning project pre-merge [1mformat[22m:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'β Code formatting check passed'[0m[2m[0mβ Code formatting check passed-π [36mRunning project pre-merge [1mlint[22m:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'β Linting passed - no warnings'[0m[2m[0m+[36mβ[39m [36mRunning project pre-merge [1mlint[22m:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'β Linting passed - no warnings'[0m[2m[0mβ Linting passed - no warnings-π [36mRunning project pre-merge [1mtest[22m:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'β All 47 tests passed in 2.3s'[0m[2m[0m+[36mβ[39m [36mRunning project pre-merge [1mtest[22m:[39m+[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-[107m [0m * [33m[HASH][m Add feature file-[107m [0m feature.txt | 1 [32m+[m-[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mMerging 1 commit to [1mmain[22m @ [2m[HASH][22m (no commit/squash/rebase needed)[39m+[107m [0m * [33m[HASH][m Add feature file+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)+[32mβ[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m+[36mβ[39m [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --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 18158ec6d..33ccb3925 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 project pre-merge [1mformat[22m:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'β Code formatting check passed'[0m[2m[0m+[36mβ[39m [36mRunning project pre-merge [1mformat[22m:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'β Code formatting check passed'[0m[2m[0mβ Code formatting check passed-π [36mRunning project pre-merge [1mlint[22m:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'β Linting passed - no warnings'[0m[2m[0m+[36mβ[39m [36mRunning project pre-merge [1mlint[22m:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'β Linting passed - no warnings'[0m[2m[0mβ Linting passed - no warnings-π [36mRunning project pre-merge [1mtest[22m:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'β All 47 tests passed in 2.3s'[0m[2m[0m+[36mβ[39m [36mRunning project pre-merge [1mtest[22m:[39m+[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-[107m [0m * [33m[HASH][m Add feature file-[107m [0m feature.txt | 1 [32m+[m-[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mMerging 1 commit to [1mmain[22m @ [2m[HASH][22m (no commit/squash/rebase needed)[39m+[107m [0m * [33m[HASH][m Add feature file+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)+[32mβ[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m+[36mβ[39m [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_approval_prompt.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_approval_prompt.snapindex 80878f56f..0d6e997c5 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_approval_prompt.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_approval_prompt.snap@@ -2,12 +2,14 @@source: tests/integration_tests/shell_wrapper.rsexpression: prompt_only----π‘ repo needs approval to execute 3 commands:+n-βͺ post-create install:- echo 'Installing dependencies...'-βͺ post-create build:- echo 'Building project...'-βͺ post-create test:- echo 'Running tests...'-β Allow and remember? [y/N]+β² repo needs approval to execute 3 commands:++β post-create install:+ echo 'Installing dependencies...'+β post-create build:+ echo 'Building project...'+β post-create test:+ echo 'Running tests...'+β― Allow and remember? [y/N]diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_post_create.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_post_create.snapindex 218474374..efb562861 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 project post-create [1minstall[22m:[39m-[107m [0m [2m[0m[2m[34muv[0m[2m sync[0m+[36mβ[39m [36mRunning project post-create [1minstall[22m:[39m+[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 @ [1m[TMPDIR]/repo.feature-x[22m[39m-π [36mRunning project post-start [1mdev[22m:[39m-[107m [0m [2m[0m[2m[34muv[0m[2m run dev[0m+[32mβ[39m [32mCreated new worktree for [1mfeature-x[22m from [1mmain[22m @ [1m[TMPDIR]/repo.feature-x[22m[39m+[36mβ[39m [36mRunning project post-start [1mdev[22m:[39m+[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 3bea2f65c..a39f02f0c 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,15 +2,15 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()----π [36mSquashing 3 commits into a single commit [90m(2 files, [32m+45[39m[39m[90m)[39m...[39m-π [36mGenerating squash commit message...[39m-[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][22m[39m-π [36mRunning project pre-merge [1mtest[22m:[39m-[107m [0m [2m[0m[2m[34muv[0m[2m run pytest[0m+[36mβ[39m [36mSquashing 3 commits into a single commit [90m(2 files, [32m+45[39m[39m[90m)[39m...[39m+[36mβ[39m [36mGenerating squash commit message...[39m+[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.+[32mβ[39m [32mSquashed @ [2m[HASH][22m[39m+[36mβ[39m [36mRunning project pre-merge [1mtest[22m:[39m+[107m [0m [2m[0m[2m[34muv[0m[2m run pytest[0m============================= test session starts ==============================collected 3 items@@ -21,15 +21,15 @@ tests/test_auth.py::test_token_validation PASSED [100%]============================== 3 passed in 0.8s ===============================-π [36mRunning project pre-merge [1mlint[22m:[39m-[107m [0m [2m[0m[2m[34muv[0m[2m run ruff check[0m+[36mβ[39m [36mRunning project pre-merge [1mlint[22m:[39m+[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-[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 [90m(1 commit, 2 files, [32m+45[39m[39m[90m)[39m[39m-π [36mRemoving [1mfeature-auth[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mMerging 1 commit to [1mmain[22m @ [2m[HASH][22m (no rebase needed)[39m+[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(+)+[32mβ[39m [32mMerged to [1mmain[22m [90m(1 commit, 2 files, [32m+45[39m[39m[90m)[39m[39m+[36mβ[39m [36mRemoving [1mfeature-auth[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_remove.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_remove.snapindex dc19dd262..1b01dc5e5 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_remove.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_remove.snap@@ -2,4 +2,4 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()----π [36mRemoving [1mfeature-api[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mRemoving [1mfeature-api[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --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 0655e6811..ec4ea0acf 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 @ [1m[TMPDIR]/repo.fix-auth[22m[39m+[32mβ[39m [32mCreated new worktree for [1mfix-auth[22m from [1mmain[22m @ [1m[TMPDIR]/repo.fix-auth[22m[39mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_switch_back.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_switch_back.snapindex ad443d010..cca3a274d 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_switch_back.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_switch_back.snap@@ -2,4 +2,4 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()----βͺ Switched to worktree for [1mfeature-api[22m @ [1m[TMPDIR]/repo.feature-api[22m+[2mβ[22m Switched to worktree for [1mfeature-api[22m @ [1m[TMPDIR]/repo.feature-api[22mdiff --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 a73fdab39..bd93f22ac 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 (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mRemoving [1mto-remove[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__step_for_each.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__step_for_each.snapindex f92ba6424..f2c331299 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__step_for_each.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__step_for_each.snap@@ -2,11 +2,11 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()----π [36mRunning in [1mmain[22m...[39m+[36mβ[39m [36mRunning in [1mmain[22m...[39mBranch: main-π [36mRunning in [1mfeature-a[22m...[39m+[36mβ[39m [36mRunning in [1mfeature-a[22m...[39mBranch: feature-a-π [36mRunning in [1mfeature-b[22m...[39m+[36mβ[39m [36mRunning in [1mfeature-b[22m...[39mBranch: feature-b-β [32mCompleted in 3 worktrees[39m+[32mβ[39m [32mCompleted in 3 worktrees[39mdiff --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 2359e5884..99e856ff0 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 @ [1m[TMPDIR]/repo.feature[22m[39m+[32mβ[39m [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m[TMPDIR]/repo.feature[22m[39mdiff --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 be396fcbb..90f1ba757 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 @ [1m[TMPDIR]/repo.test-exec[22m[39m-π [36mExecuting (--execute):[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m executed[0m+[32mβ[39m [32mCreated new worktree for [1mtest-exec[22m from [1mmain[22m @ [1m[TMPDIR]/repo.test-exec[22m[39m+[36mβ[39m [36mExecuting (--execute):[39m+[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 be396fcbb..90f1ba757 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 @ [1m[TMPDIR]/repo.test-exec[22m[39m-π [36mExecuting (--execute):[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m executed[0m+[32mβ[39m [32mCreated new worktree for [1mtest-exec[22m from [1mmain[22m @ [1m[TMPDIR]/repo.test-exec[22m[39m+[36mβ[39m [36mExecuting (--execute):[39m+[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 58d5affad..363804262 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 project post-create [1minstall[22m:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Installing dependencies...'[0m[2m[0m+[36mβ[39m [36mRunning project post-create [1minstall[22m:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Installing dependencies...'[0m[2m[0mInstalling dependencies...-π [36mRunning project post-create [1mbuild[22m:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Building project...'[0m[2m[0m+[36mβ[39m [36mRunning project post-create [1mbuild[22m:[39m+[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 @ [1m[TMPDIR]/repo.feature-hooks[22m[39m-π [36mRunning project post-start [1mserver[22m:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Starting dev server on port 3000'[0m[2m[0m-π [36mRunning project post-start [1mwatch[22m:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Watching for file changes'[0m[2m[0m+[32mβ[39m [32mCreated new worktree for [1mfeature-hooks[22m from [1mmain[22m @ [1m[TMPDIR]/repo.feature-hooks[22m[39m+[36mβ[39m [36mRunning project post-start [1mserver[22m:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Starting dev server on port 3000'[0m[2m[0m+[36mβ[39m [36mRunning project post-start [1mwatch[22m:[39m+[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 f3ef7a850..a0534abc9 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 @ [1m[TMPDIR]/repo.feature-with-hooks[22m[39m-π [36mRunning project post-start:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test command executed'[0m[2m[0m+[32mβ[39m [32mCreated new worktree for [1mfeature-with-hooks[22m from [1mmain[22m @ [1m[TMPDIR]/repo.feature-with-hooks[22m[39m+[36mβ[39m [36mRunning project post-start:[39m+[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 049297444..0f2f9f997 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 @ [1m[TMPDIR]/repo.feature-bg[22m[39m-π [36mRunning project post-start:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'background task'[0m[2m[0m+[32mβ[39m [32mCreated new worktree for [1mfeature-bg[22m from [1mmain[22m @ [1m[TMPDIR]/repo.feature-bg[22m[39m+[36mβ[39m [36mRunning project post-start:[39m+[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 9c8b7c623..d3f834795 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@@ -20,6 +20,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -30,7 +31,7 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRunning project post-create:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'approved'[0m[2m [0m[2m[36m>[0m[2m output.txt-[0mβ [32mCreated new worktree for [1mtest-approved[22m from [1mmain[22m @ [1m_REPO_.test-approved[22m[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[36mβ[39m [36mRunning project post-create:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'approved'[0m[2m [0m[2m[36m>[0m[2m output.txt+[0m[32mβ[39m [32mCreated new worktree for [1mtest-approved[22m from [1mmain[22m @ [1m_REPO_.test-approved[22m[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_fails_in_non_tty.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_fails_in_non_tty.snapindex a84c61bd1..8f98dadfd 100644--- a/tests/snapshots/integration__integration_tests__approval_ui__approval_fails_in_non_tty.snap+++ b/tests/snapshots/integration__integration_tests__approval_ui__approval_fails_in_non_tty.snap@@ -31,10 +31,10 @@ exit_code: 1----- stdout ---------- stderr ------π‘ [33m[1mrepo[22m needs approval to execute [1m1[22m command:[39m+[33mβ²[39m [33m[1mrepo[22m needs approval to execute [1m1[22m command:[39m-βͺ post-create:-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test command'[0m[2m-β [31mCannot prompt for approval in non-interactive environment[39m+[2mβ[22m post-create:+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test command'[0m[2m+[31mβ[39m [31mCannot prompt for approval in non-interactive environment[39m-π‘ [2mTo skip prompts in CI/CD, add [90m--force[39m; to pre-approve commands, run [90mwt hook approvals add[39m[22m+[2mβ³[22m [2mTo skip prompts in CI/CD, add [90m--force[39m; to pre-approve commands, run [90mwt hook approvals add[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_mixed_approved_unapproved.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_mixed_approved_unapproved.snapindex 1627b4f42..804082950 100644--- a/tests/snapshots/integration__integration_tests__approval_ui__approval_mixed_approved_unapproved.snap+++ b/tests/snapshots/integration__integration_tests__approval_ui__approval_mixed_approved_unapproved.snap@@ -6,12 +6,12 @@ exit_code: 1----- stdout ---------- stderr ------π‘ [33m[1mrepo[22m needs approval to execute [1m2[22m commands:[39m+[33mβ²[39m [33m[1mrepo[22m needs approval to execute [1m2[22m commands:[39m-βͺ post-create [1mfirst[22m:-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'First command'[0m[2m-βͺ post-create [1mthird[22m:-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Third command'[0m[2m-β [31mCannot prompt for approval in non-interactive environment[39m+[2mβ[22m post-create [1mfirst[22m:+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'First command'[0m[2m+[2mβ[22m post-create [1mthird[22m:+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Third command'[0m[2m+[31mβ[39m [31mCannot prompt for approval in non-interactive environment[39m-π‘ [2mTo skip prompts in CI/CD, add [90m--force[39m; to pre-approve commands, run [90mwt hook approvals add[39m[22m+[2mβ³[22m [2mTo skip prompts in CI/CD, add [90m--force[39m; to pre-approve commands, run [90mwt hook approvals add[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_multiple_commands.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_multiple_commands.snapindex 894043ba1..0fca8d96a 100644--- a/tests/snapshots/integration__integration_tests__approval_ui__approval_multiple_commands.snap+++ b/tests/snapshots/integration__integration_tests__approval_ui__approval_multiple_commands.snap@@ -6,16 +6,16 @@ exit_code: 1----- stdout ---------- stderr ------π‘ [33m[1mrepo[22m needs approval to execute [1m4[22m commands:[39m+[33mβ²[39m [33m[1mrepo[22m needs approval to execute [1m4[22m commands:[39m-βͺ post-create [1mbranch[22m:-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Branch: {{ branch }}'[0m[2m-βͺ post-create [1mworktree[22m:-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Worktree: {{ worktree }}'[0m[2m-βͺ post-create [1mrepo[22m:-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Repo: {{ main_worktree }}'[0m[2m-βͺ post-create [1mpwd[22m:-[107m [0m [2m[0m[2m[34mcd[0m[2m {{ worktree }} [0m[2m[36m&&[0m[2m [0m[2m[34mpwd[0m[2m-β [31mCannot prompt for approval in non-interactive environment[39m+[2mβ[22m post-create [1mbranch[22m:+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Branch: {{ branch }}'[0m[2m+[2mβ[22m post-create [1mworktree[22m:+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Worktree: {{ worktree }}'[0m[2m+[2mβ[22m post-create [1mrepo[22m:+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Repo: {{ main_worktree }}'[0m[2m+[2mβ[22m post-create [1mpwd[22m:+[107m [0m [2m[0m[2m[34mcd[0m[2m {{ worktree }} [0m[2m[36m&&[0m[2m [0m[2m[34mpwd[0m[2m+[31mβ[39m [31mCannot prompt for approval in non-interactive environment[39m-π‘ [2mTo skip prompts in CI/CD, add [90m--force[39m; to pre-approve commands, run [90mwt hook approvals add[39m[22m+[2mβ³[22m [2mTo skip prompts in CI/CD, add [90m--force[39m; to pre-approve commands, run [90mwt hook approvals add[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_named_commands.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_named_commands.snapindex 8541cd0d5..317597c10 100644--- a/tests/snapshots/integration__integration_tests__approval_ui__approval_named_commands.snap+++ b/tests/snapshots/integration__integration_tests__approval_ui__approval_named_commands.snap@@ -6,14 +6,14 @@ exit_code: 1----- stdout ---------- stderr ------π‘ [33m[1mrepo[22m needs approval to execute [1m3[22m commands:[39m+[33mβ²[39m [33m[1mrepo[22m needs approval to execute [1m3[22m commands:[39m-βͺ post-create [1minstall[22m:-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Installing dependencies...'[0m[2m-βͺ post-create [1mbuild[22m:-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Building project...'[0m[2m-βͺ post-create [1mtest[22m:-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Running tests...'[0m[2m-β [31mCannot prompt for approval in non-interactive environment[39m+[2mβ[22m post-create [1minstall[22m:+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Installing dependencies...'[0m[2m+[2mβ[22m post-create [1mbuild[22m:+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Building project...'[0m[2m+[2mβ[22m post-create [1mtest[22m:+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Running tests...'[0m[2m+[31mβ[39m [31mCannot prompt for approval in non-interactive environment[39m-π‘ [2mTo skip prompts in CI/CD, add [90m--force[39m; to pre-approve commands, run [90mwt hook approvals add[39m[22m+[2mβ³[22m [2mTo skip prompts in CI/CD, add [90m--force[39m; to pre-approve commands, run [90mwt hook approvals add[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__approval_single_command.snap b/tests/snapshots/integration__integration_tests__approval_ui__approval_single_command.snapindex 4e971f749..264b2f9c7 100644--- a/tests/snapshots/integration__integration_tests__approval_ui__approval_single_command.snap+++ b/tests/snapshots/integration__integration_tests__approval_ui__approval_single_command.snap@@ -6,10 +6,10 @@ exit_code: 1----- stdout ---------- stderr ------π‘ [33m[1mrepo[22m needs approval to execute [1m1[22m command:[39m+[33mβ²[39m [33m[1mrepo[22m needs approval to execute [1m1[22m command:[39m-βͺ post-create:-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Worktree path: {{ worktree }}'[0m[2m-β [31mCannot prompt for approval in non-interactive environment[39m+[2mβ[22m post-create:+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Worktree path: {{ worktree }}'[0m[2m+[31mβ[39m [31mCannot prompt for approval in non-interactive environment[39m-π‘ [2mTo skip prompts in CI/CD, add [90m--force[39m; to pre-approve commands, run [90mwt hook approvals add[39m[22m+[2mβ³[22m [2mTo skip prompts in CI/CD, add [90m--force[39m; to pre-approve commands, run [90mwt hook approvals add[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__decline_approval_skips_only_unapproved.snap b/tests/snapshots/integration__integration_tests__approval_ui__decline_approval_skips_only_unapproved.snapindex 1627b4f42..804082950 100644--- a/tests/snapshots/integration__integration_tests__approval_ui__decline_approval_skips_only_unapproved.snap+++ b/tests/snapshots/integration__integration_tests__approval_ui__decline_approval_skips_only_unapproved.snap@@ -6,12 +6,12 @@ exit_code: 1----- stdout ---------- stderr ------π‘ [33m[1mrepo[22m needs approval to execute [1m2[22m commands:[39m+[33mβ²[39m [33m[1mrepo[22m needs approval to execute [1m2[22m commands:[39m-βͺ post-create [1mfirst[22m:-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'First command'[0m[2m-βͺ post-create [1mthird[22m:-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Third command'[0m[2m-β [31mCannot prompt for approval in non-interactive environment[39m+[2mβ[22m post-create [1mfirst[22m:+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'First command'[0m[2m+[2mβ[22m post-create [1mthird[22m:+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Third command'[0m[2m+[31mβ[39m [31mCannot prompt for approval in non-interactive environment[39m-π‘ [2mTo skip prompts in CI/CD, add [90m--force[39m; to pre-approve commands, run [90mwt hook approvals add[39m[22m+[2mβ³[22m [2mTo skip prompts in CI/CD, add [90m--force[39m; to pre-approve commands, run [90mwt hook approvals add[39m[22mdiff --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 73d9a0434..436ef60ef 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@@ -21,6 +21,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -31,8 +32,8 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRunning project post-create:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test command'[0m[2m+[36mβ[39m [36mRunning project post-create:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test command'[0m[2m[0mtest command-β [32mCreated new worktree for [1mtest-force-tty[22m from [1mmain[22m @ [1m_REPO_.test-force-tty[22m[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[32mβ[39m [32mCreated new worktree for [1mtest-force-tty[22m from [1mmain[22m @ [1m_REPO_.test-force-tty[22m[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --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 d3eaefa53..d3696ae23 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@@ -21,6 +21,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -31,7 +32,7 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRunning project post-create:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test command'[0m[2m [0m[2m[36m>[0m[2m output.txt-[0mβ [32mCreated new worktree for [1mtest-force[22m from [1mmain[22m @ [1m_REPO_.test-force[22m[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[36mβ[39m [36mRunning project post-create:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test command'[0m[2m [0m[2m[36m>[0m[2m output.txt+[0m[32mβ[39m [32mCreated new worktree for [1mtest-force[22m from [1mmain[22m @ [1m_REPO_.test-force[22m[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_second_run.snap b/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_second_run.snapindex 876e4f549..68f32a04f 100644--- a/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_second_run.snap+++ b/tests/snapshots/integration__integration_tests__approval_ui__force_does_not_save_approvals_second_run.snap@@ -6,10 +6,10 @@ exit_code: 1----- stdout ---------- stderr ------π‘ [33m[1mrepo[22m needs approval to execute [1m1[22m command:[39m+[33mβ²[39m [33m[1mrepo[22m needs approval to execute [1m1[22m command:[39m-βͺ post-create:-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test command'[0m[2m [0m[2m[36m>[0m[2m output.txt-β [31mCannot prompt for approval in non-interactive environment[39m+[2mβ[22m post-create:+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test command'[0m[2m [0m[2m[36m>[0m[2m output.txt+[31mβ[39m [31mCannot prompt for approval in non-interactive environment[39m-π‘ [2mTo skip prompts in CI/CD, add [90m--force[39m; to pre-approve commands, run [90mwt hook approvals add[39m[22m+[2mβ³[22m [2mTo skip prompts in CI/CD, add [90m--force[39m; to pre-approve commands, run [90mwt hook approvals add[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__run_hook_post_merge_requires_approval.snap b/tests/snapshots/integration__integration_tests__approval_ui__run_hook_post_merge_requires_approval.snapindex ab97ded6e..d488b934a 100644--- a/tests/snapshots/integration__integration_tests__approval_ui__run_hook_post_merge_requires_approval.snap+++ b/tests/snapshots/integration__integration_tests__approval_ui__run_hook_post_merge_requires_approval.snap@@ -6,10 +6,10 @@ exit_code: 1----- stdout ---------- stderr ------π‘ [33m[1mrepo[22m needs approval to execute [1m1[22m command:[39m+[33mβ²[39m [33m[1mrepo[22m needs approval to execute [1m1[22m command:[39m-βͺ post-merge:-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Post-merge cleanup for {{ branch }}'[0m[2m-β [31mCannot prompt for approval in non-interactive environment[39m+[2mβ[22m post-merge:+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Post-merge cleanup for {{ branch }}'[0m[2m+[31mβ[39m [31mCannot prompt for approval in non-interactive environment[39m-π‘ [2mTo skip prompts in CI/CD, add [90m--force[39m; to pre-approve commands, run [90mwt hook approvals add[39m[22m+[2mβ³[22m [2mTo skip prompts in CI/CD, add [90m--force[39m; to pre-approve commands, run [90mwt hook approvals add[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__run_hook_pre_merge_requires_approval.snap b/tests/snapshots/integration__integration_tests__approval_ui__run_hook_pre_merge_requires_approval.snapindex 0c3177551..50ef6d426 100644--- a/tests/snapshots/integration__integration_tests__approval_ui__run_hook_pre_merge_requires_approval.snap+++ b/tests/snapshots/integration__integration_tests__approval_ui__run_hook_pre_merge_requires_approval.snap@@ -6,10 +6,10 @@ exit_code: 1----- stdout ---------- stderr ------π‘ [33m[1mrepo[22m needs approval to execute [1m1[22m command:[39m+[33mβ²[39m [33m[1mrepo[22m needs approval to execute [1m1[22m command:[39m-βͺ pre-merge:-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Running pre-merge checks on {{ branch }}'[0m[2m-β [31mCannot prompt for approval in non-interactive environment[39m+[2mβ[22m pre-merge:+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Running pre-merge checks on {{ branch }}'[0m[2m+[31mβ[39m [31mCannot prompt for approval in non-interactive environment[39m-π‘ [2mTo skip prompts in CI/CD, add [90m--force[39m; to pre-approve commands, run [90mwt hook approvals add[39m[22m+[2mβ³[22m [2mTo skip prompts in CI/CD, add [90m--force[39m; to pre-approve commands, run [90mwt hook approvals add[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__step_hook_name_filter_on_unnamed.snap b/tests/snapshots/integration__integration_tests__approval_ui__step_hook_name_filter_on_unnamed.snapindex 560d96a1d..a0f9e3747 100644--- a/tests/snapshots/integration__integration_tests__approval_ui__step_hook_name_filter_on_unnamed.snap+++ b/tests/snapshots/integration__integration_tests__approval_ui__step_hook_name_filter_on_unnamed.snap@@ -3,11 +3,12 @@ source: tests/integration_tests/approval_ui.rsinfo:program: wtargs:- - step+ - hook- pre-merge- test- "--force"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -15,14 +16,20 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: falseexit_code: 1----- stdout ---------- stderr ------β [31mNo command named [1mtest[22m (hook has no named commands)[39m+[31mβ[39m [31mNo command named [1mtest[22m (hook has no named commands)[39mdiff --git a/tests/snapshots/integration__integration_tests__approval_ui__step_hook_unknown_name_error.snap b/tests/snapshots/integration__integration_tests__approval_ui__step_hook_unknown_name_error.snapindex 0a5d5a6b0..c84d4cefd 100644--- a/tests/snapshots/integration__integration_tests__approval_ui__step_hook_unknown_name_error.snap+++ b/tests/snapshots/integration__integration_tests__approval_ui__step_hook_unknown_name_error.snap@@ -8,6 +8,7 @@ info:- nonexistent- "--force"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -15,14 +16,20 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: falseexit_code: 1----- stdout ---------- stderr ------β [31mNo command named [1mnonexistent[22m (available: [1mproject:test[22m, [1mproject:lint[22m)[39m+[31mβ[39m [31mNo command named [1mnonexistent[22m (available: [1mproject:test[22m, [1mproject:lint[22m)[39mdiff --git a/tests/snapshots/integration__integration_tests__approvals__add_approvals_all_none_approved.snap b/tests/snapshots/integration__integration_tests__approvals__add_approvals_all_none_approved.snapindex 92f1c4655..364ed1c04 100644--- a/tests/snapshots/integration__integration_tests__approvals__add_approvals_all_none_approved.snap+++ b/tests/snapshots/integration__integration_tests__approvals__add_approvals_all_none_approved.snap@@ -32,10 +32,10 @@ exit_code: 1----- stdout ---------- stderr ------π‘ [33m[1mrepo[22m needs approval to execute [1m1[22m command:[39m+[33mβ²[39m [33m[1mrepo[22m needs approval to execute [1m1[22m command:[39m-βͺ post-create:-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test'[0m[2m-β [31mCannot prompt for approval in non-interactive environment[39m+[2mβ[22m post-create:+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test'[0m[2m+[31mβ[39m [31mCannot prompt for approval in non-interactive environment[39m-π‘ [2mTo skip prompts in CI/CD, add [90m--force[39m; to pre-approve commands, run [90mwt hook approvals add[39m[22m+[2mβ³[22m [2mTo skip prompts in CI/CD, add [90m--force[39m; to pre-approve commands, run [90mwt hook approvals add[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__approvals__add_approvals_empty_config.snap b/tests/snapshots/integration__integration_tests__approvals__add_approvals_empty_config.snapindex d5d05238b..32cc44857 100644--- a/tests/snapshots/integration__integration_tests__approvals__add_approvals_empty_config.snap+++ b/tests/snapshots/integration__integration_tests__approvals__add_approvals_empty_config.snap@@ -7,6 +7,7 @@ info:- approvals- addenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -14,14 +15,20 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0----- stdout ---------- stderr ------βͺ No commands configured in project+[2mβ[22m No commands configured in projectdiff --git a/tests/snapshots/integration__integration_tests__approvals__add_approvals_no_config.snap b/tests/snapshots/integration__integration_tests__approvals__add_approvals_no_config.snapindex b03339879..d1a5ed7cb 100644--- a/tests/snapshots/integration__integration_tests__approvals__add_approvals_no_config.snap+++ b/tests/snapshots/integration__integration_tests__approvals__add_approvals_no_config.snap@@ -7,6 +7,7 @@ info:- approvals- addenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -14,16 +15,22 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: falseexit_code: 1----- stdout ---------- stderr ------β [31mNo project configuration found[39m+[31mβ[39m [31mNo project configuration found[39m-π‘ [2mCreate a config file at: [1m_REPO_/.config/wt.toml[22m[22m+[2mβ³[22m [2mCreate a config file at: [1m_REPO_/.config/wt.toml[22m[22mdiff --git a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_after_clear.snap b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_after_clear.snapindex faa0829d1..777574d7b 100644--- a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_after_clear.snap+++ b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_after_clear.snap@@ -7,6 +7,7 @@ info:- approvals- clearenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -14,14 +15,20 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0----- stdout ---------- stderr ------βͺ No approvals to clear for this project+[2mβ[22m No approvals to clear for this projectdiff --git a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_global_no_approvals.snap b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_global_no_approvals.snapindex 88df60bf7..77dc530ce 100644--- a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_global_no_approvals.snap+++ b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_global_no_approvals.snap@@ -8,6 +8,7 @@ info:- clear- "--global"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -15,14 +16,20 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0----- stdout ---------- stderr ------βͺ No approvals to clear+[2mβ[22m No approvals to cleardiff --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 df8cbae65..a562601f6 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@@ -8,6 +8,7 @@ info:- clear- "--global"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -15,14 +16,20 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0----- stdout ---------- stderr ------β [32mCleared approvals for 1 project[39m+[32mβ[39m [32mCleared approvals for 1 project[39mdiff --git a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_multiple_approvals.snap b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_multiple_approvals.snapindex faa0829d1..777574d7b 100644--- a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_multiple_approvals.snap+++ b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_multiple_approvals.snap@@ -7,6 +7,7 @@ info:- approvals- clearenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -14,14 +15,20 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0----- stdout ---------- stderr ------βͺ No approvals to clear for this project+[2mβ[22m No approvals to clear for this projectdiff --git a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_no_approvals.snap b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_no_approvals.snapindex faa0829d1..777574d7b 100644--- a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_no_approvals.snap+++ b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_no_approvals.snap@@ -7,6 +7,7 @@ info:- approvals- clearenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -14,14 +15,20 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0----- stdout ---------- stderr ------βͺ No approvals to clear for this project+[2mβ[22m No approvals to clear for this projectdiff --git a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_with_approvals.snap b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_with_approvals.snapindex faa0829d1..777574d7b 100644--- a/tests/snapshots/integration__integration_tests__approvals__clear_approvals_with_approvals.snap+++ b/tests/snapshots/integration__integration_tests__approvals__clear_approvals_with_approvals.snap@@ -7,6 +7,7 @@ info:- approvals- clearenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -14,14 +15,20 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0----- stdout ---------- stderr ------βͺ No approvals to clear for this project+[2mβ[22m No approvals to clear for this projectdiff --git a/tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snap b/tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snapindex 7d44e5c84..808feca23 100644--- a/tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snap+++ b/tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snap@@ -13,6 +13,7 @@ info:LANG: CLC_ALL: CNO_COLOR: ""+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---@@ -25,4 +26,4 @@ exit_code: 0@ main ^ . 6c3da842 1d Initial commit on main+ feature β β1 ../feature 72413a3b 1d Work on feature-βͺ Showing 2 worktrees, 1 ahead+β Showing 2 worktrees, 1 aheaddiff --git a/tests/snapshots/integration__integration_tests__ci_status__list_full_filters_by_repo_owner.snap b/tests/snapshots/integration__integration_tests__ci_status__list_full_filters_by_repo_owner.snapindex 2c22a23ea..064e9ddcb 100644--- a/tests/snapshots/integration__integration_tests__ci_status__list_full_filters_by_repo_owner.snap+++ b/tests/snapshots/integration__integration_tests__ci_status__list_full_filters_by_repo_owner.snap@@ -34,4 +34,4 @@ exit_code: 0@ main [2m^[22m . [4m[32m]8;;https://github.com/my-org/test-repo/pull/1/β]8;;/[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ [2mfeature[0m [2m_[22m [2m../repo.feature[0m [4m[32m]8;;https://github.com/my-org/test-repo/pull/1/β]8;;/[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 2 worktrees+[2mβ[22m [2mShowing 2 worktreesdiff --git a/tests/snapshots/integration__integration_tests__ci_status__list_full_with_github_pr_conflicts.snap b/tests/snapshots/integration__integration_tests__ci_status__list_full_with_github_pr_conflicts.snapindex 0e65c8583..803a73b1b 100644--- a/tests/snapshots/integration__integration_tests__ci_status__list_full_with_github_pr_conflicts.snap+++ b/tests/snapshots/integration__integration_tests__ci_status__list_full_with_github_pr_conflicts.snap@@ -34,4 +34,4 @@ exit_code: 0@ main [2m^[22m . [4m[33m]8;;https://github.com/test-owner/test-repo/pull/1/β]8;;/[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ [2mfeature[0m [2m_[22m [2m../repo.feature[0m [4m[33m]8;;https://github.com/test-owner/test-repo/pull/1/β]8;;/[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 2 worktrees+[2mβ[22m [2mShowing 2 worktreesdiff --git a/tests/snapshots/integration__integration_tests__ci_status__list_full_with_github_pr_failed.snap b/tests/snapshots/integration__integration_tests__ci_status__list_full_with_github_pr_failed.snapindex bcd43ccb8..e6d4f1f70 100644--- a/tests/snapshots/integration__integration_tests__ci_status__list_full_with_github_pr_failed.snap+++ b/tests/snapshots/integration__integration_tests__ci_status__list_full_with_github_pr_failed.snap@@ -34,4 +34,4 @@ exit_code: 0@ main [2m^[22m . [4m[31m]8;;https://github.com/test-owner/test-repo/pull/1/β]8;;/[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ [2mfeature[0m [2m_[22m [2m../repo.feature[0m [4m[31m]8;;https://github.com/test-owner/test-repo/pull/1/β]8;;/[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 2 worktrees+[2mβ[22m [2mShowing 2 worktreesdiff --git a/tests/snapshots/integration__integration_tests__ci_status__list_full_with_github_pr_passed.snap b/tests/snapshots/integration__integration_tests__ci_status__list_full_with_github_pr_passed.snapindex b4c99022b..a6f1bf9f2 100644--- a/tests/snapshots/integration__integration_tests__ci_status__list_full_with_github_pr_passed.snap+++ b/tests/snapshots/integration__integration_tests__ci_status__list_full_with_github_pr_passed.snap@@ -34,4 +34,4 @@ exit_code: 0@ main [2m^[22m . [4m[32m]8;;https://github.com/test-owner/test-repo/pull/1/β]8;;/[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ [2mfeature[0m [2m_[22m [2m../repo.feature[0m [4m[32m]8;;https://github.com/test-owner/test-repo/pull/1/β]8;;/[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 2 worktrees+[2mβ[22m [2mShowing 2 worktreesdiff --git a/tests/snapshots/integration__integration_tests__ci_status__list_full_with_github_pr_running.snap b/tests/snapshots/integration__integration_tests__ci_status__list_full_with_github_pr_running.snapindex 68e7b33b7..1e0714119 100644--- a/tests/snapshots/integration__integration_tests__ci_status__list_full_with_github_pr_running.snap+++ b/tests/snapshots/integration__integration_tests__ci_status__list_full_with_github_pr_running.snap@@ -34,4 +34,4 @@ exit_code: 0@ main [2m^[22m . [4m[34m]8;;https://github.com/test-owner/test-repo/pull/1/β]8;;/[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ [2mfeature[0m [2m_[22m [2m../repo.feature[0m [4m[34m]8;;https://github.com/test-owner/test-repo/pull/1/β]8;;/[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 2 worktrees+[2mβ[22m [2mShowing 2 worktreesdiff --git a/tests/snapshots/integration__integration_tests__ci_status__list_full_with_github_workflow_run.snap b/tests/snapshots/integration__integration_tests__ci_status__list_full_with_github_workflow_run.snapindex 18bff7f3f..14f06925e 100644--- a/tests/snapshots/integration__integration_tests__ci_status__list_full_with_github_workflow_run.snap+++ b/tests/snapshots/integration__integration_tests__ci_status__list_full_with_github_workflow_run.snap@@ -34,4 +34,4 @@ exit_code: 0@ main [2m^[22m . [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ [2mfeature[0m [2m_[22m [2m../repo.feature[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 2 worktrees+[2mβ[22m [2mShowing 2 worktreesdiff --git a/tests/snapshots/integration__integration_tests__ci_status__list_full_with_github_workflow_running.snap b/tests/snapshots/integration__integration_tests__ci_status__list_full_with_github_workflow_running.snapindex 18bff7f3f..14f06925e 100644--- a/tests/snapshots/integration__integration_tests__ci_status__list_full_with_github_workflow_running.snap+++ b/tests/snapshots/integration__integration_tests__ci_status__list_full_with_github_workflow_running.snap@@ -34,4 +34,4 @@ exit_code: 0@ main [2m^[22m . [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ [2mfeature[0m [2m_[22m [2m../repo.feature[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 2 worktrees+[2mβ[22m [2mShowing 2 worktreesdiff --git a/tests/snapshots/integration__integration_tests__ci_status__list_full_with_mixed_check_types.snap b/tests/snapshots/integration__integration_tests__ci_status__list_full_with_mixed_check_types.snapindex 68e7b33b7..1e0714119 100644--- a/tests/snapshots/integration__integration_tests__ci_status__list_full_with_mixed_check_types.snap+++ b/tests/snapshots/integration__integration_tests__ci_status__list_full_with_mixed_check_types.snap@@ -34,4 +34,4 @@ exit_code: 0@ main [2m^[22m . [4m[34m]8;;https://github.com/test-owner/test-repo/pull/1/β]8;;/[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ [2mfeature[0m [2m_[22m [2m../repo.feature[0m [4m[34m]8;;https://github.com/test-owner/test-repo/pull/1/β]8;;/[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 2 worktrees+[2mβ[22m [2mShowing 2 worktreesdiff --git a/tests/snapshots/integration__integration_tests__ci_status__list_full_with_no_ci_checks.snap b/tests/snapshots/integration__integration_tests__ci_status__list_full_with_no_ci_checks.snapindex c5ccc0ada..1c389f13d 100644--- a/tests/snapshots/integration__integration_tests__ci_status__list_full_with_no_ci_checks.snap+++ b/tests/snapshots/integration__integration_tests__ci_status__list_full_with_no_ci_checks.snap@@ -34,4 +34,4 @@ exit_code: 0@ main [2m^[22m . [4m[90m]8;;https://github.com/test-owner/test-repo/pull/1/β]8;;/[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ [2mfeature[0m [2m_[22m [2m../repo.feature[0m [4m[90m]8;;https://github.com/test-owner/test-repo/pull/1/β]8;;/[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 2 worktrees+[2mβ[22m [2mShowing 2 worktreesdiff --git a/tests/snapshots/integration__integration_tests__ci_status__list_full_with_stale_pr.snap b/tests/snapshots/integration__integration_tests__ci_status__list_full_with_stale_pr.snapindex f590d5bff..a12faa365 100644--- a/tests/snapshots/integration__integration_tests__ci_status__list_full_with_stale_pr.snap+++ b/tests/snapshots/integration__integration_tests__ci_status__list_full_with_stale_pr.snap@@ -34,4 +34,4 @@ exit_code: 0@ main [2m^[22m . [2m[4m[32m]8;;https://github.com/test-owner/test-repo/pull/1/β]8;;/[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ feature [2mβ[22m [32mβ1[0m [32m+1[0m ../repo.feature [2m[4m[32m]8;;https://github.com/test-owner/test-repo/pull/1/β]8;;/[0m [2m1b2eaadd[0m [2m1d[0m [2mLocal commit-βͺ [2mShowing 2 worktrees, 1 ahead+[2mβ[22m [2mShowing 2 worktrees, 1 aheaddiff --git a/tests/snapshots/integration__integration_tests__ci_status__list_full_with_status_context_failure.snap b/tests/snapshots/integration__integration_tests__ci_status__list_full_with_status_context_failure.snapindex bcd43ccb8..e6d4f1f70 100644--- a/tests/snapshots/integration__integration_tests__ci_status__list_full_with_status_context_failure.snap+++ b/tests/snapshots/integration__integration_tests__ci_status__list_full_with_status_context_failure.snap@@ -34,4 +34,4 @@ exit_code: 0@ main [2m^[22m . [4m[31m]8;;https://github.com/test-owner/test-repo/pull/1/β]8;;/[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ [2mfeature[0m [2m_[22m [2m../repo.feature[0m [4m[31m]8;;https://github.com/test-owner/test-repo/pull/1/β]8;;/[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 2 worktrees+[2mβ[22m [2mShowing 2 worktreesdiff --git a/tests/snapshots/integration__integration_tests__ci_status__list_full_with_status_context_pending.snap b/tests/snapshots/integration__integration_tests__ci_status__list_full_with_status_context_pending.snapindex 68e7b33b7..1e0714119 100644--- a/tests/snapshots/integration__integration_tests__ci_status__list_full_with_status_context_pending.snap+++ b/tests/snapshots/integration__integration_tests__ci_status__list_full_with_status_context_pending.snap@@ -34,4 +34,4 @@ exit_code: 0@ main [2m^[22m . [4m[34m]8;;https://github.com/test-owner/test-repo/pull/1/β]8;;/[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ [2mfeature[0m [2m_[22m [2m../repo.feature[0m [4m[34m]8;;https://github.com/test-owner/test-repo/pull/1/β]8;;/[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 2 worktrees+[2mβ[22m [2mShowing 2 worktreesdiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_full_command_not_found.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_full_command_not_found.snapindex aa0a0854f..88d9f2ca8 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_full_command_not_found.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_full_command_not_found.snap@@ -15,10 +15,12 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -37,18 +39,18 @@ exit_code: 0[107m [0m args = [[32m"-m"[0m, [32m"test-model"[0m][36mPROJECT CONFIG[39m _REPO_/.config/wt.toml-π‘ [2mNot found[22m+[2mβ³[22m [2mNot found[22m[36mSHELL INTEGRATION[39m-βͺ [2mSkipped bash; ~/.bashrc not found[22m-βͺ [2mSkipped zsh; ~/.zshrc not found[22m-βͺ [2mSkipped fish; ~/.config/fish/conf.d not found[22m+[2mβ[22m [2mSkipped bash; ~/.bashrc not found[22m+[2mβ[22m [2mSkipped zsh; ~/.zshrc not found[22m+[2mβ[22m [2mSkipped fish; ~/.config/fish/conf.d not found[22m[36mDIAGNOSTICS[39m-π‘ [2mCI status requires GitHub or GitLab remote[22m-β [31mCommit generation failed ([1mnonexistent-llm-command-12345 -m test-model[22m)[39m-[107m [0m β [31mCommit generation command failed[39m-[107m [0m [107m [0m Failed to spawn LLM command-[107m [0m-[107m [0m βͺ Ran command:-[107m [0m [107m [0m nonexistent-llm-command-12345 -m test-model+[2mβ³[22m [2mCI status requires GitHub or GitLab remote[22m+[31mβ[39m [31mCommit generation failed ([1mnonexistent-llm-command-12345 -m test-model[22m)[39m+[107m [0m [31mβ[39m [31mCommit generation command failed[39m+[107m [0m [107m [0m Failed to spawn LLM command+[107m [0m+[107m [0m [2mβ[22m Ran command:+[107m [0m [107m [0m nonexistent-llm-command-12345 -m test-modeldiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_full_not_configured.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_full_not_configured.snapindex ebfb92072..b0004a8a9 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_full_not_configured.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_full_not_configured.snap@@ -15,10 +15,12 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -33,13 +35,13 @@ exit_code: 0[107m [0m worktree-path = [32m"../{{ main_worktree }}.{{ branch }}"[36mPROJECT CONFIG[39m _REPO_/.config/wt.toml-π‘ [2mNot found[22m+[2mβ³[22m [2mNot found[22m[36mSHELL INTEGRATION[39m-βͺ [2mSkipped bash; ~/.bashrc not found[22m-βͺ [2mSkipped zsh; ~/.zshrc not found[22m-βͺ [2mSkipped fish; ~/.config/fish/conf.d not found[22m+[2mβ[22m [2mSkipped bash; ~/.bashrc not found[22m+[2mβ[22m [2mSkipped zsh; ~/.zshrc not found[22m+[2mβ[22m [2mSkipped fish; ~/.config/fish/conf.d not found[22m[36mDIAGNOSTICS[39m-π‘ [2mCI status requires GitHub or GitLab remote[22m-π‘ [2mCommit generation not configured[22m+[2mβ³[22m [2mCI status requires GitHub or GitLab remote[22m+[2mβ³[22m [2mCommit generation not configured[22mdiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_github_remote.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_github_remote.snapindex bc2843d69..fb22e0371 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_github_remote.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_github_remote.snap@@ -14,10 +14,12 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -32,9 +34,9 @@ exit_code: 0[107m [0m worktree-path = [32m"../{{ main_worktree }}.{{ branch }}"[36mPROJECT CONFIG[39m _REPO_/.config/wt.toml-π‘ [2mNot found[22m+[2mβ³[22m [2mNot found[22m[36mSHELL INTEGRATION[39m-βͺ [2mSkipped bash; ~/.bashrc not found[22m-βͺ [2mSkipped zsh; ~/.zshrc not found[22m-βͺ [2mSkipped fish; ~/.config/fish/conf.d not found[22m+[2mβ[22m [2mSkipped bash; ~/.bashrc not found[22m+[2mβ[22m [2mSkipped zsh; ~/.zshrc not found[22m+[2mβ[22m [2mSkipped fish; ~/.config/fish/conf.d not found[22mdiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_gitlab_remote.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_gitlab_remote.snapindex bc2843d69..fb22e0371 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_gitlab_remote.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_gitlab_remote.snap@@ -14,10 +14,12 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -32,9 +34,9 @@ exit_code: 0[107m [0m worktree-path = [32m"../{{ main_worktree }}.{{ branch }}"[36mPROJECT CONFIG[39m _REPO_/.config/wt.toml-π‘ [2mNot found[22m+[2mβ³[22m [2mNot found[22m[36mSHELL INTEGRATION[39m-βͺ [2mSkipped bash; ~/.bashrc not found[22m-βͺ [2mSkipped zsh; ~/.zshrc not found[22m-βͺ [2mSkipped fish; ~/.config/fish/conf.d not found[22m+[2mβ[22m [2mSkipped bash; ~/.bashrc not found[22m+[2mβ[22m [2mSkipped zsh; ~/.zshrc not found[22m+[2mβ[22m [2mSkipped fish; ~/.config/fish/conf.d not found[22mdiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_no_project_config.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_no_project_config.snapindex bc2843d69..fb22e0371 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_no_project_config.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_no_project_config.snap@@ -14,10 +14,12 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -32,9 +34,9 @@ exit_code: 0[107m [0m worktree-path = [32m"../{{ main_worktree }}.{{ branch }}"[36mPROJECT CONFIG[39m _REPO_/.config/wt.toml-π‘ [2mNot found[22m+[2mβ³[22m [2mNot found[22m[36mSHELL INTEGRATION[39m-βͺ [2mSkipped bash; ~/.bashrc not found[22m-βͺ [2mSkipped zsh; ~/.zshrc not found[22m-βͺ [2mSkipped fish; ~/.config/fish/conf.d not found[22m+[2mβ[22m [2mSkipped bash; ~/.bashrc not found[22m+[2mβ[22m [2mSkipped zsh; ~/.zshrc not found[22m+[2mβ[22m [2mSkipped fish; ~/.config/fish/conf.d not found[22mdiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_outside_git_repo.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_outside_git_repo.snapindex 7b0f43fef..15b7944c6 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_outside_git_repo.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_outside_git_repo.snap@@ -12,6 +12,7 @@ info:GIT_EDITOR: ""HOME: "[TEST_HOME]"PATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -28,6 +29,6 @@ exit_code: 0[2m[36mPROJECT CONFIG[39m Not in a git repository[22m[36mSHELL INTEGRATION[39m-βͺ [2mSkipped bash; ~/.bashrc not found[22m-βͺ [2mSkipped zsh; ~/.zshrc not found[22m-βͺ [2mSkipped fish; ~/.config/fish/conf.d not found[22m+[2mβ[22m [2mSkipped bash; ~/.bashrc not found[22m+[2mβ[22m [2mSkipped zsh; ~/.zshrc not found[22m+[2mβ[22m [2mSkipped fish; ~/.config/fish/conf.d not found[22mdiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_partial_shell_config_shows_hint.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_partial_shell_config_shows_hint.snapindex 7090c20a9..4d126e686 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_partial_shell_config_shows_hint.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_partial_shell_config_shows_hint.snap@@ -19,6 +19,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -31,14 +32,14 @@ exit_code: 0----- stderr -----[36mUSER CONFIG[39m ~/.config/worktrunk/config.toml-π‘ [2mEmpty file (using defaults)[22m+[2mβ³[22m [2mEmpty file (using defaults)[22m[36mPROJECT CONFIG[39m _REPO_/.config/wt.toml-π‘ [2mNot found[22m+[2mβ³[22m [2mNot found[22m[36mSHELL INTEGRATION[39m-π‘ [2mNot configured shell extension & completions for bash @ ~/.bashrc[22m-βͺ Already configured shell extension & completions for [1mzsh[22m @ ~/.zshrc-βͺ [2mSkipped fish; ~/.config/fish/conf.d not found[22m+[2mβ³[22m [2mNot configured shell extension & completions for bash @ ~/.bashrc[22m+[2mβ[22m Already configured shell extension & completions for [1mzsh[22m @ ~/.zshrc+[2mβ[22m [2mSkipped fish; ~/.config/fish/conf.d not found[22m-π‘ [2mTo enable shell integration, run [90mwt config shell install[39m[22m+[2mβ³[22m [2mTo enable shell integration, run [90mwt config shell install[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_warns_unknown_project_keys.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_warns_unknown_project_keys.snapindex dfdf7bc6d..05e39c7af 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_warns_unknown_project_keys.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_warns_unknown_project_keys.snap@@ -14,10 +14,12 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -32,11 +34,11 @@ exit_code: 0[107m [0m worktree-path = [32m"../{{ main_worktree }}.{{ branch }}"[36mPROJECT CONFIG[39m _REPO_/.config/wt.toml-π‘ [33mUnknown key [1mpost-merge-command[22m will be ignored[39m+[33mβ²[39m [33mUnknown key [1mpost-merge-command[22m will be ignored[39m[107m [0m [1m[36m[post-merge-command][107m [0m deploy = [32m"task deploy"[36mSHELL INTEGRATION[39m-βͺ [2mSkipped bash; ~/.bashrc not found[22m-βͺ [2mSkipped zsh; ~/.zshrc not found[22m-βͺ [2mSkipped fish; ~/.config/fish/conf.d not found[22m+[2mβ[22m [2mSkipped bash; ~/.bashrc not found[22m+[2mβ[22m [2mSkipped zsh; ~/.zshrc not found[22m+[2mβ[22m [2mSkipped fish; ~/.config/fish/conf.d not found[22mdiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_warns_unknown_user_keys.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_warns_unknown_user_keys.snapindex 486e76619..3bf5b3826 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_warns_unknown_user_keys.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_warns_unknown_user_keys.snap@@ -14,10 +14,12 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -29,16 +31,16 @@ exit_code: 0----- stderr -----[36mUSER CONFIG[39m ~/.config/worktrunk/config.toml-π‘ [33mUnknown key [1mcommit-gen[22m will be ignored[39m+[33mβ²[39m [33mUnknown key [1mcommit-gen[22m will be ignored[39m[107m [0m worktree-path = [32m"../{{ main_worktree }}.{{ branch }}"[107m [0m[107m [0m [1m[36m[commit-gen][107m [0m command = [32m"llm"[36mPROJECT CONFIG[39m _REPO_/.config/wt.toml-π‘ [2mNot found[22m+[2mβ³[22m [2mNot found[22m[36mSHELL INTEGRATION[39m-βͺ [2mSkipped bash; ~/.bashrc not found[22m-βͺ [2mSkipped zsh; ~/.zshrc not found[22m-βͺ [2mSkipped fish; ~/.config/fish/conf.d not found[22m+[2mβ[22m [2mSkipped bash; ~/.bashrc not found[22m+[2mβ[22m [2mSkipped zsh; ~/.zshrc not found[22m+[2mβ[22m [2mSkipped fish; ~/.config/fish/conf.d not found[22mdiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_with_project_config.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_with_project_config.snapindex 6d3acd2ea..9c33fdecd 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_with_project_config.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_with_project_config.snap@@ -14,10 +14,12 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -41,6 +43,6 @@ exit_code: 0[107m [0m server = [32m"npm run dev"[36mSHELL INTEGRATION[39m-βͺ [2mSkipped bash; ~/.bashrc not found[22m-βͺ [2mSkipped zsh; ~/.zshrc not found[22m-βͺ [2mSkipped fish; ~/.config/fish/conf.d not found[22m+[2mβ[22m [2mSkipped bash; ~/.bashrc not found[22m+[2mβ[22m [2mSkipped zsh; ~/.zshrc not found[22m+[2mβ[22m [2mSkipped fish; ~/.config/fish/conf.d not found[22mdiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_correct_order.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_correct_order.snapindex 9f872b75b..0c914cd9c 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_correct_order.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_correct_order.snap@@ -14,10 +14,12 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -30,12 +32,12 @@ exit_code: 0----- stderr -----[36mUSER CONFIG[39m ~/.config/worktrunk/config.toml-π‘ [2mEmpty file (using defaults)[22m+[2mβ³[22m [2mEmpty file (using defaults)[22m[36mPROJECT CONFIG[39m _REPO_/.config/wt.toml-π‘ [2mNot found[22m+[2mβ³[22m [2mNot found[22m[36mSHELL INTEGRATION[39m-βͺ Already configured shell extension & completions for [1mzsh[22m @ ~/.zshrc-βͺ [2mSkipped bash; ~/.bashrc not found[22m-βͺ [2mSkipped fish; ~/.config/fish/conf.d not found[22m+[2mβ[22m Already configured shell extension & completions for [1mzsh[22m @ ~/.zshrc+[2mβ[22m [2mSkipped bash; ~/.bashrc not found[22m+[2mβ[22m [2mSkipped fish; ~/.config/fish/conf.d not found[22mdiff --git a/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_warning.snap b/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_warning.snapindex d6ce454cd..833b25a1e 100644--- a/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_warning.snap+++ b/tests/snapshots/integration__integration_tests__config_show__config_show_zsh_compinit_warning.snap@@ -14,10 +14,12 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -30,14 +32,14 @@ exit_code: 0----- stderr -----[36mUSER CONFIG[39m ~/.config/worktrunk/config.toml-π‘ [2mEmpty file (using defaults)[22m+[2mβ³[22m [2mEmpty file (using defaults)[22m[36mPROJECT CONFIG[39m _REPO_/.config/wt.toml-π‘ [2mNot found[22m+[2mβ³[22m [2mNot found[22m[36mSHELL INTEGRATION[39m-βͺ Already configured shell extension & completions for [1mzsh[22m @ ~/.zshrc-π‘ [33mCompletions won't work; add to ~/.zshrc before the wt line:[39m-[107m [0m autoload -Uz compinit && compinit-βͺ [2mSkipped bash; ~/.bashrc not found[22m-βͺ [2mSkipped fish; ~/.config/fish/conf.d not found[22m+[2mβ[22m Already configured shell extension & completions for [1mzsh[22m @ ~/.zshrc+[33mβ²[39m [33mCompletions won't work; add to ~/.zshrc before the wt line:[39m+[107m [0m autoload -Uz compinit && compinit+[2mβ[22m [2mSkipped bash; ~/.bashrc not found[22m+[2mβ[22m [2mSkipped fish; ~/.config/fish/conf.d not found[22mdiff --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 fb24f91fd..7edb5299b 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@@ -16,10 +16,12 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -30,9 +32,9 @@ exit_code: 0----- stdout ---------- stderr ------π [36mMerging 1 commit to [1mmain[22m @ [2mfc12499[22m (no commit/squash/rebase needed)[39m-[107m [0m * [33mfc12499[m Add feature file-[107m [0m feature.txt | 1 [32m+[m-[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-βͺ Worktree preserved (--no-remove)+[36mβ[39m [36mMerging 1 commit to [1mmain[22m @ [2mfc12499[22m (no commit/squash/rebase needed)[39m+[107m [0m * [33mfc12499[m Add feature file+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)+[32mβ[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m+[2mβ[22m Worktree preserved (--no-remove)diff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_powershell_directive.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_powershell_directive.snapindex 40f2e209e..7a45286a2 100644--- a/tests/snapshots/integration__integration_tests__directives__merge_internal_powershell_directive.snap+++ b/tests/snapshots/integration__integration_tests__directives__merge_internal_powershell_directive.snap@@ -32,9 +32,9 @@ exit_code: 0Set-Location _REPO_----- stderr ------π [36mMerging 1 commit to [1mmain[22m @ [2mfc12499[22m (no commit/squash/rebase needed)[39m-[107m [0m * [33mfc12499[m Add feature file-[107m [0m feature.txt | 1 [32m+[m-[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mMerging 1 commit to [1mmain[22m @ [2mfc12499[22m (no commit/squash/rebase needed)[39m+[107m [0m * [33mfc12499[m Add feature file+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)+[32mβ[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m+[36mβ[39m [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snapindex ce91659f5..a439a1beb 100644--- a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap+++ b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap@@ -32,9 +32,9 @@ exit_code: 0cd _REPO_----- stderr ------π [36mMerging 1 commit to [1mmain[22m @ [2mfc12499[22m (no commit/squash/rebase needed)[39m-[107m [0m * [33mfc12499[m Add feature file-[107m [0m feature.txt | 1 [32m+[m-[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mMerging 1 commit to [1mmain[22m @ [2mfc12499[22m (no commit/squash/rebase needed)[39m+[107m [0m * [33mfc12499[m Add feature file+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)+[32mβ[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m+[36mβ[39m [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --git a/tests/snapshots/integration__integration_tests__directives__remove_internal_powershell_directive.snap b/tests/snapshots/integration__integration_tests__directives__remove_internal_powershell_directive.snapindex 048afc8aa..2761765f0 100644--- a/tests/snapshots/integration__integration_tests__directives__remove_internal_powershell_directive.snap+++ b/tests/snapshots/integration__integration_tests__directives__remove_internal_powershell_directive.snap@@ -31,4 +31,4 @@ exit_code: 0Set-Location _REPO_----- stderr ------π [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --git a/tests/snapshots/integration__integration_tests__directives__switch_internal_powershell_directive.snap b/tests/snapshots/integration__integration_tests__directives__switch_internal_powershell_directive.snapindex 2a4060610..dbfb1cc3e 100644--- a/tests/snapshots/integration__integration_tests__directives__switch_internal_powershell_directive.snap+++ b/tests/snapshots/integration__integration_tests__directives__switch_internal_powershell_directive.snap@@ -32,4 +32,4 @@ exit_code: 0Set-Location _REPO_.feature----- stderr ------βͺ Switched to worktree for [1mfeature[22m @ [1m_REPO_.feature[22m+[2mβ[22m Switched to worktree for [1mfeature[22m @ [1m_REPO_.feature[22mdiff --git a/tests/snapshots/integration__integration_tests__for_each__for_each_command_fails.snap b/tests/snapshots/integration__integration_tests__for_each__for_each_command_fails.snapindex 0c881bfbb..ed43bb700 100644--- a/tests/snapshots/integration__integration_tests__for_each__for_each_command_fails.snap+++ b/tests/snapshots/integration__integration_tests__for_each__for_each_command_fails.snap@@ -18,10 +18,12 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -32,17 +34,17 @@ exit_code: 1----- stdout ---------- stderr ------π [36mRunning in [1mmain[22m...[39m+[36mβ[39m [36mRunning in [1mmain[22m...[39mfatal: ambiguous argument 'nonexistent-ref': unknown revision or path not in the working tree.Use '--' to separate paths from revisions, like this:'git <command> [<revision>...] -- [<file>...]'-β [31mFailed in [1m[1mmain[22m[22m (exit code 128)[39m-π [36mRunning in [1mfeature[22m...[39m+[31mβ[39m [31mFailed in [1m[1mmain[22m[22m (exit code 128)[39m+[36mβ[39m [36mRunning in [1mfeature[22m...[39mfatal: ambiguous argument 'nonexistent-ref': unknown revision or path not in the working tree.Use '--' to separate paths from revisions, like this:'git <command> [<revision>...] -- [<file>...]'-β [31mFailed in [1m[1mfeature[22m[22m (exit code 128)[39m+[31mβ[39m [31mFailed in [1m[1mfeature[22m[22m (exit code 128)[39m-π‘ [33m2 of 2 worktrees failed[39m-[107m [0m [1mmain[22m-[107m [0m [1mfeature[22m+[33mβ²[39m [33m2 of 2 worktrees failed[39m+[107m [0m [1mmain[22m+[107m [0m [1mfeature[22mdiff --git a/tests/snapshots/integration__integration_tests__for_each__for_each_detached_branch_variable.snap b/tests/snapshots/integration__integration_tests__for_each__for_each_detached_branch_variable.snapindex b7fde8539..c154a055a 100644--- a/tests/snapshots/integration__integration_tests__for_each__for_each_detached_branch_variable.snap+++ b/tests/snapshots/integration__integration_tests__for_each__for_each_detached_branch_variable.snap@@ -17,10 +17,12 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -31,9 +33,9 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRunning in [1mmain[22m...[39m+[36mβ[39m [36mRunning in [1mmain[22m...[39mBranch: main-π [36mRunning in [1mrepo.detached-test[22m (detached)...[39m+[36mβ[39m [36mRunning in [1mrepo.detached-test[22m (detached)...[39mBranch: HEAD-β [32mCompleted in 2 worktrees[39m+[32mβ[39m [32mCompleted in 2 worktrees[39mdiff --git a/tests/snapshots/integration__integration_tests__for_each__for_each_multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__for_each__for_each_multiple_worktrees.snapindex 038708a03..8f8ead8f0 100644--- a/tests/snapshots/integration__integration_tests__for_each__for_each_multiple_worktrees.snap+++ b/tests/snapshots/integration__integration_tests__for_each__for_each_multiple_worktrees.snap@@ -10,6 +10,7 @@ info:- branch- "--show-current"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -17,21 +18,27 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0----- stdout ---------- stderr ------π [36mRunning in [1mmain[22m...[39m+[36mβ[39m [36mRunning in [1mmain[22m...[39mmain-π [36mRunning in [1mfeature-a[22m...[39m+[36mβ[39m [36mRunning in [1mfeature-a[22m...[39mfeature-a-π [36mRunning in [1mfeature-b[22m...[39m+[36mβ[39m [36mRunning in [1mfeature-b[22m...[39mfeature-b-β [32mCompleted in 3 worktrees[39m+[32mβ[39m [32mCompleted in 3 worktrees[39mdiff --git a/tests/snapshots/integration__integration_tests__for_each__for_each_single_worktree.snap b/tests/snapshots/integration__integration_tests__for_each__for_each_single_worktree.snapindex b813f0907..8c4c04da6 100644--- a/tests/snapshots/integration__integration_tests__for_each__for_each_single_worktree.snap+++ b/tests/snapshots/integration__integration_tests__for_each__for_each_single_worktree.snap@@ -18,10 +18,12 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -32,6 +34,6 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRunning in [1mmain[22m...[39m+[36mβ[39m [36mRunning in [1mmain[22m...[39m-β [32mCompleted in 1 worktree[39m+[32mβ[39m [32mCompleted in 1 worktree[39mdiff --git a/tests/snapshots/integration__integration_tests__for_each__for_each_with_detached.snap b/tests/snapshots/integration__integration_tests__for_each__for_each_with_detached.snapindex 0b57b8fae..3358e4cf6 100644--- a/tests/snapshots/integration__integration_tests__for_each__for_each_with_detached.snap+++ b/tests/snapshots/integration__integration_tests__for_each__for_each_with_detached.snap@@ -18,10 +18,12 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -32,7 +34,7 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRunning in [1mmain[22m...[39m-π [36mRunning in [1mrepo.detached-test[22m (detached)...[39m+[36mβ[39m [36mRunning in [1mmain[22m...[39m+[36mβ[39m [36mRunning in [1mrepo.detached-test[22m (detached)...[39m-β [32mCompleted in 2 worktrees[39m+[32mβ[39m [32mCompleted in 2 worktrees[39mdiff --git a/tests/snapshots/integration__integration_tests__for_each__for_each_with_template.snap b/tests/snapshots/integration__integration_tests__for_each__for_each_with_template.snapindex d21b5d2fb..2c9da2c7f 100644--- a/tests/snapshots/integration__integration_tests__for_each__for_each_with_template.snap+++ b/tests/snapshots/integration__integration_tests__for_each__for_each_with_template.snap@@ -9,6 +9,7 @@ info:- echo- "Branch: {{ branch }}"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -16,17 +17,23 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0----- stdout ---------- stderr ------π [36mRunning in [1mmain[22m...[39m+[36mβ[39m [36mRunning in [1mmain[22m...[39mBranch: main-β [32mCompleted in 1 worktree[39m+[32mβ[39m [32mCompleted in 1 worktree[39mdiff --git a/tests/snapshots/integration__integration_tests__hook_show__error_with_context_formatting.snap b/tests/snapshots/integration__integration_tests__hook_show__error_with_context_formatting.snapindex 5af2f15b0..c3258f050 100644--- a/tests/snapshots/integration__integration_tests__hook_show__error_with_context_formatting.snap+++ b/tests/snapshots/integration__integration_tests__hook_show__error_with_context_formatting.snap@@ -10,6 +10,7 @@ info:COLUMNS: "150"GIT_EDITOR: ""HOME: "[TEST_HOME]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -20,5 +21,5 @@ exit_code: 1----- stdout ---------- stderr ------β [31mFailed to remove worktree[39m-[107m [0m fatal: not a git repository (or any of the parent directories): .git+[31mβ[39m [31mFailed to remove worktree[39m+[107m [0m fatal: not a git repository (or any of the parent directories): .gitdiff --git a/tests/snapshots/integration__integration_tests__hook_show__hook_show_approval_status.snap b/tests/snapshots/integration__integration_tests__hook_show__hook_show_approval_status.snapindex 0784e5ae0..5b6e24c3d 100644--- a/tests/snapshots/integration__integration_tests__hook_show__hook_show_approval_status.snap+++ b/tests/snapshots/integration__integration_tests__hook_show__hook_show_approval_status.snap@@ -6,6 +6,7 @@ info:- hook- showenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,9 +14,12 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -27,10 +31,10 @@ exit_code: 0----- stderr -----[36mUSER HOOKS[39m ~/.config/worktrunk/config.toml-π‘ [2m(none configured)[22m+[2mβ³[22m [2m(none configured)[22m[36mPROJECT HOOKS[39m _REPO_/.config/wt.toml-βͺ pre-merge [1mbuild[22m:-[107m [0m [2m[0m[2m[34mcargo[0m[2m build-β pre-merge [1mtest[22m: [2m(requires approval)[22m-[107m [0m [2m[0m[2m[34mcargo[0m[2m test+[2mβ[22m pre-merge [1mbuild[22m:+[107m [0m [2m[0m[2m[34mcargo[0m[2m build+[36mβ―[39m pre-merge [1mtest[22m: [2m(requires approval)[22m+[107m [0m [2m[0m[2m[34mcargo[0m[2m testdiff --git a/tests/snapshots/integration__integration_tests__hook_show__hook_show_filter_by_type.snap b/tests/snapshots/integration__integration_tests__hook_show__hook_show_filter_by_type.snapindex afe4b61e4..2b603969b 100644--- a/tests/snapshots/integration__integration_tests__hook_show__hook_show_filter_by_type.snap+++ b/tests/snapshots/integration__integration_tests__hook_show__hook_show_filter_by_type.snap@@ -7,6 +7,7 @@ info:- show- pre-mergeenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -14,9 +15,12 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -28,10 +32,10 @@ exit_code: 0----- stderr -----[TEST_CONFIG]-π‘ [2m(none configured)[22m+[2mβ³[22m [2m(none configured)[22m[36mPROJECT HOOKS[39m _REPO_/.config/wt.toml-β pre-merge [1mbuild[22m: [2m(requires approval)[22m-[107m [0m [2m[0m[2m[34mcargo[0m[2m build-β pre-merge [1mtest[22m: [2m(requires approval)[22m-[107m [0m [2m[0m[2m[34mcargo[0m[2m test+[36mβ―[39m pre-merge [1mbuild[22m: [2m(requires approval)[22m+[107m [0m [2m[0m[2m[34mcargo[0m[2m build+[36mβ―[39m pre-merge [1mtest[22m: [2m(requires approval)[22m+[107m [0m [2m[0m[2m[34mcargo[0m[2m testdiff --git a/tests/snapshots/integration__integration_tests__hook_show__hook_show_no_hooks.snap b/tests/snapshots/integration__integration_tests__hook_show__hook_show_no_hooks.snapindex ef0fae4dc..0a575ae3b 100644--- a/tests/snapshots/integration__integration_tests__hook_show__hook_show_no_hooks.snap+++ b/tests/snapshots/integration__integration_tests__hook_show__hook_show_no_hooks.snap@@ -6,6 +6,7 @@ info:- hook- showenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,10 +14,14 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---@@ -26,7 +31,7 @@ exit_code: 0----- stderr -----[TEST_CONFIG]-π‘ [2m(none configured)[22m+[2mβ³[22m [2m(none configured)[22m[36mPROJECT HOOKS[39m _REPO_/.config/wt.toml-π‘ [2m(not found)[22m+[2mβ³[22m [2m(not found)[22mdiff --git a/tests/snapshots/integration__integration_tests__hook_show__hook_show_outside_git_repo.snap b/tests/snapshots/integration__integration_tests__hook_show__hook_show_outside_git_repo.snapindex 2a17a87dc..e7ad06d23 100644--- a/tests/snapshots/integration__integration_tests__hook_show__hook_show_outside_git_repo.snap+++ b/tests/snapshots/integration__integration_tests__hook_show__hook_show_outside_git_repo.snap@@ -11,6 +11,7 @@ info:COLUMNS: "150"GIT_EDITOR: ""HOME: "[TEST_HOME]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -21,4 +22,4 @@ exit_code: 1----- stdout ---------- stderr ------β [31mfatal: not a git repository (or any of the parent directories): .git[39m+[31mβ[39m [31mfatal: not a git repository (or any of the parent directories): .git[39mdiff --git a/tests/snapshots/integration__integration_tests__hook_show__hook_show_with_both_configs.snap b/tests/snapshots/integration__integration_tests__hook_show__hook_show_with_both_configs.snapindex d94cdb928..c0b3dcf11 100644--- a/tests/snapshots/integration__integration_tests__hook_show__hook_show_with_both_configs.snap+++ b/tests/snapshots/integration__integration_tests__hook_show__hook_show_with_both_configs.snap@@ -6,6 +6,7 @@ info:- hook- showenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,9 +14,12 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -27,12 +31,12 @@ exit_code: 0----- stderr -----[TEST_CONFIG]-π‘ [2m(none configured)[22m+[2mβ³[22m [2m(none configured)[22m[36mPROJECT HOOKS[39m _REPO_/.config/wt.toml-β post-start [1mdeps[22m: [2m(requires approval)[22m-[107m [0m [2m[0m[2m[34mnpm[0m[2m install-β pre-merge [1mbuild[22m: [2m(requires approval)[22m-[107m [0m [2m[0m[2m[34mcargo[0m[2m build-β pre-merge [1mtest[22m: [2m(requires approval)[22m-[107m [0m [2m[0m[2m[34mcargo[0m[2m test+[36mβ―[39m post-start [1mdeps[22m: [2m(requires approval)[22m+[107m [0m [2m[0m[2m[34mnpm[0m[2m install+[36mβ―[39m pre-merge [1mbuild[22m: [2m(requires approval)[22m+[107m [0m [2m[0m[2m[34mcargo[0m[2m build+[36mβ―[39m pre-merge [1mtest[22m: [2m(requires approval)[22m+[107m [0m [2m[0m[2m[34mcargo[0m[2m testdiff --git a/tests/snapshots/integration__integration_tests__internal_flag__config_show_with_internal_flag.snap b/tests/snapshots/integration__integration_tests__internal_flag__config_show_with_internal_flag.snapindex 7dc434d98..983ed01c6 100644--- a/tests/snapshots/integration__integration_tests__internal_flag__config_show_with_internal_flag.snap+++ b/tests/snapshots/integration__integration_tests__internal_flag__config_show_with_internal_flag.snap@@ -15,10 +15,12 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -33,9 +35,9 @@ exit_code: 0[107m [0m worktree-path = [32m"../{{ main_worktree }}.{{ branch }}"[36mPROJECT CONFIG[39m _REPO_/.config/wt.toml-π‘ [2mNot found[22m+[2mβ³[22m [2mNot found[22m[36mSHELL INTEGRATION[39m-βͺ [2mSkipped bash; ~/.bashrc not found[22m-βͺ [2mSkipped zsh; ~/.zshrc not found[22m-βͺ [2mSkipped fish; ~/.config/fish/conf.d not found[22m+[2mβ[22m [2mSkipped bash; ~/.bashrc not found[22m+[2mβ[22m [2mSkipped zsh; ~/.zshrc not found[22m+[2mβ[22m [2mSkipped fish; ~/.config/fish/conf.d not found[22mdiff --git a/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snap b/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snapindex 9c7ab9a53..e32ab44a1 100644--- a/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snap+++ b/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snap@@ -33,4 +33,4 @@ exit_code: 0[1mBranch[0m [1mStatus[0m [1mHEADΒ±[0m [1mmainβ[0m [1mPath[0m [1mRemoteβ [0m [1mCommit[0m [1mAge[0m [1mMessage@ main [2m^[22m . [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 1 worktree+[2mβ[22m [2mShowing 1 worktreediff --git a/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snap b/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snapindex 683eec8d1..17ba23c2d 100644--- a/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snap+++ b/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snap@@ -34,4 +34,4 @@ exit_code: 0@ main [2m^[22m . [2ma1e809f5[0m [2m1d[0m [2mInitial commit[2mbranch-only[0m [2m/[22m[2m_[22m [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 1 worktrees, 1 branches+[2mβ[22m [2mShowing 1 worktrees, 1 branchesdiff --git a/tests/snapshots/integration__integration_tests__list__default_branch_missing_worktree.snap b/tests/snapshots/integration__integration_tests__list__default_branch_missing_worktree.snapindex 4933b3a5a..7de2a8746 100644--- a/tests/snapshots/integration__integration_tests__list__default_branch_missing_worktree.snap+++ b/tests/snapshots/integration__integration_tests__list__default_branch_missing_worktree.snap@@ -32,4 +32,4 @@ exit_code: 0[1mBranch[0m [1mStatus[0m [1mHEADΒ±[0m [1mmainβ[0m [1mPath[0m [1mRemoteβ [0m [1mCommit[0m [1mAge[0m [1mMessage@ develop [31mβ[39m[2m^[22m . [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 1 worktree+[2mβ[22m [2mShowing 1 worktreediff --git a/tests/snapshots/integration__integration_tests__list__detached_head.snap b/tests/snapshots/integration__integration_tests__list__detached_head.snapindex 25e3f6d1d..a7e1c7704 100644--- a/tests/snapshots/integration__integration_tests__list__detached_head.snap+++ b/tests/snapshots/integration__integration_tests__list__detached_head.snap@@ -32,4 +32,4 @@ exit_code: 0[1mBranch[0m [1mStatus[0m [1mHEADΒ±[0m [1mmainβ[0m [1mPath[0m [1mRemoteβ [0m [1mCommit[0m [1mAge[0m [1mMessage@ - [31mβ[39m[2m^[22m . [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 1 worktree+[2mβ[22m [2mShowing 1 worktreediff --git a/tests/snapshots/integration__integration_tests__list__detached_head_in_worktree.snap b/tests/snapshots/integration__integration_tests__list__detached_head_in_worktree.snapindex beadf91e8..f49d18693 100644--- a/tests/snapshots/integration__integration_tests__list__detached_head_in_worktree.snap+++ b/tests/snapshots/integration__integration_tests__list__detached_head_in_worktree.snap@@ -33,4 +33,4 @@ exit_code: 0@ main [2m^[22m . [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ [2m-[0m [31mβ[39m[2m_[22m [2m../repo.feature[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 2 worktrees+[2mβ[22m [2mShowing 2 worktreesdiff --git a/tests/snapshots/integration__integration_tests__list__git_error_warning.snap b/tests/snapshots/integration__integration_tests__list__git_error_warning.snapindex b39779bc5..0a7fd0e96 100644--- a/tests/snapshots/integration__integration_tests__list__git_error_warning.snap+++ b/tests/snapshots/integration__integration_tests__list__git_error_warning.snap@@ -33,12 +33,12 @@ exit_code: 0@ main [2m^[22m . [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ feature [33mβ[39m ../repo.feature [2m00000000[0m [2m55y[0m [2m-βͺ [2mShowing 2 worktrees-π‘ [33mSome git operations failed:-[107m [0m [1mfeature[22m: commit-details (fatal: bad object 0000000000000000000000000000000000000000)-[107m [0m [1mfeature[22m: ahead-behind (fatal: Invalid symmetric difference expression main...0000000000000000000000000000000000000000)-[107m [0m [1mfeature[22m: committed-trees-match (fatal: ambiguous argument '0000000000000000000000000000000000000000^{tree}': unknown revision or path not in the-[107m [0m working tree.)-[107m [0m [1mfeature[22m: has-file-changes (fatal: Invalid symmetric difference expression main...feature)-[107m [0m [1mfeature[22m: working-tree-diff (fatal: bad object HEAD)+[2mβ[22m [2mShowing 2 worktrees+[33mβ²[39m [33mSome git operations failed:+[107m [0m [1mfeature[22m: commit-details (fatal: bad object 0000000000000000000000000000000000000000)+[107m [0m [1mfeature[22m: ahead-behind (fatal: Invalid symmetric difference expression main...0000000000000000000000000000000000000000)+[107m [0m [1mfeature[22m: committed-trees-match (fatal: ambiguous argument '0000000000000000000000000000000000000000^{tree}': unknown revision or path not in the+[107m [0m working tree.)+[107m [0m [1mfeature[22m: has-file-changes (fatal: Invalid symmetric difference expression main...feature)+[107m [0m [1mfeature[22m: working-tree-diff (fatal: bad object HEAD)[39mdiff --git a/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap b/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snapindex 35184f6ce..81ad87825 100644--- a/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap+++ b/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap@@ -35,4 +35,4 @@ exit_code: 0+ feature-changes [36m![39m[36m?[39m [2mβ[22m π€ [32m+50[0m [31m-100[0m [32mβ1[0m ../repo.feature-changes [2m38944dae[0m [2m1d[0m [2mAdd 100 lines+ fix [36m?[39m [2mβ[22m π¬ ../repo.fix [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 4 worktrees, 3 with changes, 2 ahead+[2mβ[22m [2mShowing 4 worktrees, 3 with changes, 2 aheaddiff --git a/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap b/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snapindex 4d140ba10..037dc80f7 100644--- a/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap+++ b/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap@@ -36,4 +36,4 @@ exit_code: 0+ feature-middle [2mβ[22m [32mβ1[0m ../repo.feature-middle [2ma84219ce[0m [2m22h[0m [2mCommit at 02:00+ feature-oldest [2mβ[22m [32mβ1[0m ../repo.feature-oldest [2m9777b5e4[0m [2m23h[0m [2mCommit at 00:30-βͺ [2mShowing 5 worktrees, 4 ahead+[2mβ[22m [2mShowing 5 worktrees, 4 aheaddiff --git a/tests/snapshots/integration__integration_tests__list__list_primary_on_different_branch.snap b/tests/snapshots/integration__integration_tests__list__list_primary_on_different_branch.snapindex 301a9090f..b1d3492c4 100644--- a/tests/snapshots/integration__integration_tests__list__list_primary_on_different_branch.snap+++ b/tests/snapshots/integration__integration_tests__list__list_primary_on_different_branch.snap@@ -34,4 +34,4 @@ exit_code: 0+ [2mfeature-a[0m [2m_[22m [2m../repo.feature-a[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ [2mfeature-b[0m [2m_[22m [2m../repo.feature-b[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 3 worktrees+[2mβ[22m [2mShowing 3 worktreesdiff --git a/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snap b/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snapindex 3cb77be39..25e7407fd 100644--- a/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snap+++ b/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snap@@ -24,4 +24,4 @@ exit_code: 0+ [2mfeature-a[0m [2m_[22m [2m../repo.feature-a[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ [2mfeature-b[0m [2m_[22m [2m../repo.feature-b[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 3 worktrees+[2mβ[22m [2mShowing 3 worktreesdiff --git a/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap b/tests/snapshots/integration__integration_tests__list__locked_no_reason.snapindex 0bd64c2a9..d043b7164 100644--- a/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap+++ b/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap@@ -33,4 +33,4 @@ exit_code: 0@ main [2m^[22m . [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ [2mlocked-no-reason[0m [33mβ[39m[2m_[22m [2m../repo.locked-no-reason[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 2 worktrees+[2mβ[22m [2mShowing 2 worktreesdiff --git a/tests/snapshots/integration__integration_tests__list__locked_worktree.snap b/tests/snapshots/integration__integration_tests__list__locked_worktree.snapindex 6f58e4d86..b721c8afe 100644--- a/tests/snapshots/integration__integration_tests__list__locked_worktree.snap+++ b/tests/snapshots/integration__integration_tests__list__locked_worktree.snap@@ -33,4 +33,4 @@ exit_code: 0@ main [2m^[22m . [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ [2mlocked-feature[0m [33mβ[39m[2m_[22m [2m../repo.locked-feature[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 2 worktrees+[2mβ[22m [2mShowing 2 worktreesdiff --git a/tests/snapshots/integration__integration_tests__list__long_commit_message.snap b/tests/snapshots/integration__integration_tests__list__long_commit_message.snapindex f49fdf707..a5e93f2be 100644--- a/tests/snapshots/integration__integration_tests__list__long_commit_message.snap+++ b/tests/snapshots/integration__integration_tests__list__long_commit_message.snap@@ -33,4 +33,4 @@ exit_code: 0@ main [2m^[22m . [2mc80da958[0m [2m1d[0m [2mShort message+ [2mfeature-a[0m [2mβ[22m [2m[31mβ1[0m [2m../repo.feature-a[0m [2m0fcd1a46[0m [2m1d[0m [2mThis is a very long commit message that should test how the meβ¦-βͺ [2mShowing 2 worktrees+[2mβ[22m [2mShowing 2 worktreesdiff --git a/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap b/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snapindex 34e1c8892..d74226f7a 100644--- a/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap+++ b/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap@@ -36,4 +36,4 @@ exit_code: 0+ [2mvery-long-branch-name-here[0m [2m_[22m [2m../repo.very-long-branch-name-here[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ [2mwith-changes[0m [2m_[22m [2m../repo.with-changes[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 5 worktrees+[2mβ[22m [2mShowing 5 worktreesdiff --git a/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap b/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snapindex 3de4f33d0..ad6a6da67 100644--- a/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap+++ b/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap@@ -34,4 +34,4 @@ exit_code: 0@ main [2m^[22m[2mβ‘[22m . [32mβ‘1[0m [2m9dd6c628[0m [2m1d[0m [2mMain advances+ feature [36m+[39m[36m![39m[36m?[39m[33mβ[39m[33mβ[39m[2mβ [22mπ€ [32m+2[0m [31m-2[0m [32mβ2[0m [2m[31mβ1[0m [32m+3[0m [31m-1[0m ../repo.feature [32mβ‘1[0m [2m[31mβ£1[0m [2m88205002[0m [2m1d[0m [2mLocal commit-βͺ [2mShowing 2 worktrees, 1 with changes, 1 ahead+[2mβ[22m [2mShowing 2 worktrees, 1 with changes, 1 aheaddiff --git a/tests/snapshots/integration__integration_tests__list__maximum_status_with_git_operation.snap b/tests/snapshots/integration__integration_tests__list__maximum_status_with_git_operation.snapindex 87da5d2c2..88ab15e8a 100644--- a/tests/snapshots/integration__integration_tests__list__maximum_status_with_git_operation.snap+++ b/tests/snapshots/integration__integration_tests__list__maximum_status_with_git_operation.snap@@ -34,4 +34,4 @@ exit_code: 0@ main [2m^[22m . [2m1c3b3fec[0m [2m1d[0m [2mMain conflicting changes+ feature [36m+[39m[36m![39m[36m?[39m[31mβ[39m[2mβ[22m π€ [32m+7[0m ../repo.feature [2m1c3b3fec[0m [2m1d[0m [2mMain conflicting changes-βͺ [2mShowing 2 worktrees, 1 with changes+[2mβ[22m [2mShowing 2 worktrees, 1 with changesdiff --git a/tests/snapshots/integration__integration_tests__list__maximum_working_tree_symbols.snap b/tests/snapshots/integration__integration_tests__list__maximum_working_tree_symbols.snapindex cf2637ceb..0570da7ae 100644--- a/tests/snapshots/integration__integration_tests__list__maximum_working_tree_symbols.snap+++ b/tests/snapshots/integration__integration_tests__list__maximum_working_tree_symbols.snap@@ -33,4 +33,4 @@ exit_code: 0@ main [2m^[22m . [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ feature [36m+[39m[36m![39m[36m?[39m [2mβ[22m [32m+2[0m [31m-3[0m [32mβ1[0m ../repo.feature [2m095602ce[0m [2m1d[0m [2mAdd files-βͺ [2mShowing 2 worktrees, 1 with changes, 1 ahead+[2mβ[22m [2mShowing 2 worktrees, 1 with changes, 1 aheaddiff --git a/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snapindex 83d6a13b5..28572c2ce 100644--- a/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap+++ b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap@@ -34,4 +34,4 @@ exit_code: 0+ [2mfeature-a[0m [2m_[22m [2m../repo.feature-a[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ [2mfeature-b[0m [2m_[22m [2m../repo.feature-b[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 3 worktrees+[2mβ[22m [2mShowing 3 worktreesdiff --git a/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap b/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snapindex 7a22c98e1..ba4ad4014 100644--- a/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap+++ b/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap@@ -34,4 +34,4 @@ exit_code: 0@ main [2m^[22m . [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ [2mfeature[0m [2m_[22m [2m../repo.feature[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 2 worktrees+[2mβ[22m [2mShowing 2 worktreesdiff --git a/tests/snapshots/integration__integration_tests__list__previous_worktree_gutter.snap b/tests/snapshots/integration__integration_tests__list__previous_worktree_gutter.snapindex dd11d5529..1205ff460 100644--- a/tests/snapshots/integration__integration_tests__list__previous_worktree_gutter.snap+++ b/tests/snapshots/integration__integration_tests__list__previous_worktree_gutter.snap@@ -33,4 +33,4 @@ exit_code: 0@ main [2m^[22m . [2ma1e809f5[0m [2m1d[0m [2mInitial commit- [2mfeature[0m [2m_[22m [2m../repo.feature[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 2 worktrees+[2mβ[22m [2mShowing 2 worktreesdiff --git a/tests/snapshots/integration__integration_tests__list__progressive_flag.snap b/tests/snapshots/integration__integration_tests__list__progressive_flag.snapindex efe881ac8..bdc221894 100644--- a/tests/snapshots/integration__integration_tests__list__progressive_flag.snap+++ b/tests/snapshots/integration__integration_tests__list__progressive_flag.snap@@ -35,4 +35,4 @@ exit_code: 0+ [2mfeature-a[0m [2m_[22m [2m../repo.feature-a[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ [2mfeature-b[0m [2m_[22m [2m../repo.feature-b[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 3 worktrees+[2mβ[22m [2mShowing 3 worktreesdiff --git a/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap b/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snapindex 175e2481d..e6847bd0f 100644--- a/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap+++ b/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap@@ -37,4 +37,4 @@ exit_code: 0[2morphan-1[0m [2m/[22m[2m_[22m [2ma1e809f5[0m [2m1d[0m [2mInitial commit[2morphan-2[0m [2m/[22m[2m_[22m [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 2 worktrees, 2 branches+[2mβ[22m [2mShowing 2 worktrees, 2 branchesdiff --git a/tests/snapshots/integration__integration_tests__list__readme_example_list.snap b/tests/snapshots/integration__integration_tests__list__readme_example_list.snapindex 2e1cc4132..1a86011f7 100644--- a/tests/snapshots/integration__integration_tests__list__readme_example_list.snap+++ b/tests/snapshots/integration__integration_tests__list__readme_example_list.snap@@ -34,4 +34,4 @@ exit_code: 0^ main [2m^[22m[2mβ [22m [32mβ‘1[0m [2m[31mβ£1[0m [2m6088adb3[0m [2m4d[0m [2mMerge fix-auth: hardened toβ¦+ fix-auth [2mβ[22m[2m|[22m [32mβ2[0m [2m[31mβ1[0m [2m|[0m [2m127407de[0m [2m5h[0m [2mAdd secure token storage-βͺ [2mShowing 3 worktrees, 1 with changes, 2 ahead, 1 column hidden+[2mβ[22m [2mShowing 3 worktrees, 1 with changes, 2 ahead, 1 column hiddendiff --git a/tests/snapshots/integration__integration_tests__list__readme_example_list_branches.snap b/tests/snapshots/integration__integration_tests__list__readme_example_list_branches.snapindex 259157131..790d5fe70 100644--- a/tests/snapshots/integration__integration_tests__list__readme_example_list_branches.snap+++ b/tests/snapshots/integration__integration_tests__list__readme_example_list_branches.snap@@ -38,4 +38,4 @@ exit_code: 0exp [2m/[22m[2mβ[22m [32mβ2[0m [2m[31mβ1[0m [32m+137[0m [2m99e114de[0m [2m2d[0m [2mAdd GraphQLβ¦wip [2m/[22m[2mβ[22m [32mβ1[0m [2m[31mβ1[0m [32m+33[0m [2md62fd0e8[0m [2m3d[0m [2mStart API doβ¦-βͺ [2mShowing 3 worktrees, 2 branches, 1 with changes, 4 ahead, 1 column hidden+[2mβ[22m [2mShowing 3 worktrees, 2 branches, 1 with changes, 4 ahead, 1 column hiddendiff --git a/tests/snapshots/integration__integration_tests__list__readme_example_list_full.snap b/tests/snapshots/integration__integration_tests__list__readme_example_list_full.snapindex ec8ef7451..331b2fad2 100644--- a/tests/snapshots/integration__integration_tests__list__readme_example_list_full.snap+++ b/tests/snapshots/integration__integration_tests__list__readme_example_list_full.snap@@ -35,4 +35,4 @@ exit_code: 0^ main [2m^[22m[2mβ [22m [32mβ‘1[0m [2m[31mβ£1[0m [32mβ[0m [2m6088adb3[0m [2m4d[0m [2mMerge fix-auβ¦+ fix-auth [2mβ[22m[2m|[22m [32mβ2[0m [2m[31mβ1[0m [32m+25[0m [31m-11[0m [2m|[0m [32mβ[0m [2m127407de[0m [2m5h[0m [2mAdd secure tβ¦-βͺ [2mShowing 3 worktrees, 1 with changes, 2 ahead, 1 column hidden+[2mβ[22m [2mShowing 3 worktrees, 1 with changes, 2 ahead, 1 column hiddendiff --git a/tests/snapshots/integration__integration_tests__list__single_worktree.snap b/tests/snapshots/integration__integration_tests__list__single_worktree.snapindex b36979769..d62679c60 100644--- a/tests/snapshots/integration__integration_tests__list__single_worktree.snap+++ b/tests/snapshots/integration__integration_tests__list__single_worktree.snap@@ -32,4 +32,4 @@ exit_code: 0[1mBranch[0m [1mStatus[0m [1mHEADΒ±[0m [1mmainβ[0m [1mPath[0m [1mRemoteβ [0m [1mCommit[0m [1mAge[0m [1mMessage@ main [2m^[22m . [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 1 worktree+[2mβ[22m [2mShowing 1 worktreediff --git a/tests/snapshots/integration__integration_tests__list__status_column_padding_emoji.snap b/tests/snapshots/integration__integration_tests__list__status_column_padding_emoji.snapindex ea92dba02..cd97124d4 100644--- a/tests/snapshots/integration__integration_tests__list__status_column_padding_emoji.snap+++ b/tests/snapshots/integration__integration_tests__list__status_column_padding_emoji.snap@@ -35,4 +35,4 @@ exit_code: 0+ pr-link [2mβ[22m π€ [32mβ1[0m ../repo.pr-link [2mf42f2185[0m [2m1d[0m [2mPR commit+ wli-sequence [36m![39m[36m?[39m [2mβ[22m π€ [32m+1[0m [31m-112[0m [32mβ1[0m ../repo.wli-sequence [2mc73070d4[0m [2m1d[0m [2mInitial content-βͺ [2mShowing 4 worktrees, 1 with changes, 3 ahead+[2mβ[22m [2mShowing 4 worktrees, 1 with changes, 3 aheaddiff --git a/tests/snapshots/integration__integration_tests__list__task_dag_detached_head.snap b/tests/snapshots/integration__integration_tests__list__task_dag_detached_head.snapindex bbf4a4540..f1023831d 100644--- a/tests/snapshots/integration__integration_tests__list__task_dag_detached_head.snap+++ b/tests/snapshots/integration__integration_tests__list__task_dag_detached_head.snap@@ -33,4 +33,4 @@ exit_code: 0[1mBranch[0m [1mStatus[0m [1mHEADΒ±[0m [1mmainβ[0m [1mPath[0m [1mRemoteβ [0m [1mCommit[0m [1mAge[0m [1mMessage@ - [31mβ[39m[2m^[22m . [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 1 worktree+[2mβ[22m [2mShowing 1 worktreediff --git a/tests/snapshots/integration__integration_tests__list__task_dag_full_with_diffs.snap b/tests/snapshots/integration__integration_tests__list__task_dag_full_with_diffs.snapindex 5338e436a..66149637e 100644--- a/tests/snapshots/integration__integration_tests__list__task_dag_full_with_diffs.snap+++ b/tests/snapshots/integration__integration_tests__list__task_dag_full_with_diffs.snap@@ -36,4 +36,4 @@ exit_code: 0+ feature-a [36m?[39m [2mβ[22m ../repo.feature-a [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ feature-b [2mβ[22m [32mβ1[0m [32m+1[0m [31m-1[0m ../repo.feature-b [2m86bdffd3[0m [2m1d[0m [2mTest commit-βͺ [2mShowing 3 worktrees, 1 with changes, 1 ahead+[2mβ[22m [2mShowing 3 worktrees, 1 with changes, 1 aheaddiff --git a/tests/snapshots/integration__integration_tests__list__task_dag_many_worktrees.snap b/tests/snapshots/integration__integration_tests__list__task_dag_many_worktrees.snapindex 632ee9371..90cbbfade 100644--- a/tests/snapshots/integration__integration_tests__list__task_dag_many_worktrees.snap+++ b/tests/snapshots/integration__integration_tests__list__task_dag_many_worktrees.snap@@ -43,4 +43,4 @@ exit_code: 0+ [2mfeature-8[0m [2m_[22m [2m../repo.feature-8[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ [2mfeature-9[0m [2m_[22m [2m../repo.feature-9[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 11 worktrees+[2mβ[22m [2mShowing 11 worktreesdiff --git a/tests/snapshots/integration__integration_tests__list__task_dag_multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__list__task_dag_multiple_worktrees.snapindex 37e915897..489ab1a61 100644--- a/tests/snapshots/integration__integration_tests__list__task_dag_multiple_worktrees.snap+++ b/tests/snapshots/integration__integration_tests__list__task_dag_multiple_worktrees.snap@@ -36,4 +36,4 @@ exit_code: 0+ [2mfeature-b[0m [2m_[22m [2m../repo.feature-b[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ [2mfeature-c[0m [2m_[22m [2m../repo.feature-c[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 4 worktrees+[2mβ[22m [2mShowing 4 worktreesdiff --git a/tests/snapshots/integration__integration_tests__list__task_dag_ordering_stability.snap b/tests/snapshots/integration__integration_tests__list__task_dag_ordering_stability.snapindex dfe79fea5..141dd6934 100644--- a/tests/snapshots/integration__integration_tests__list__task_dag_ordering_stability.snap+++ b/tests/snapshots/integration__integration_tests__list__task_dag_ordering_stability.snap@@ -37,4 +37,4 @@ exit_code: 0+ feature-middle [2mβ[22m [32mβ1[0m ../repo.feature-middle [2ma84219ce[0m [2m22h[0m [2mCommit at 02:00+ feature-oldest [2mβ[22m [32mβ1[0m ../repo.feature-oldest [2m9777b5e4[0m [2m23h[0m [2mCommit at 00:30-βͺ [2mShowing 5 worktrees, 4 ahead+[2mβ[22m [2mShowing 5 worktrees, 4 aheaddiff --git a/tests/snapshots/integration__integration_tests__list__task_dag_single_worktree.snap b/tests/snapshots/integration__integration_tests__list__task_dag_single_worktree.snapindex b4c39d1e8..ab0ae7630 100644--- a/tests/snapshots/integration__integration_tests__list__task_dag_single_worktree.snap+++ b/tests/snapshots/integration__integration_tests__list__task_dag_single_worktree.snap@@ -33,4 +33,4 @@ exit_code: 0[1mBranch[0m [1mStatus[0m [1mHEADΒ±[0m [1mmainβ[0m [1mPath[0m [1mRemoteβ [0m [1mCommit[0m [1mAge[0m [1mMessage@ main [2m^[22m . [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 1 worktree+[2mβ[22m [2mShowing 1 worktreediff --git a/tests/snapshots/integration__integration_tests__list__task_dag_with_locked.snap b/tests/snapshots/integration__integration_tests__list__task_dag_with_locked.snapindex 34d1e79f3..3133197f6 100644--- a/tests/snapshots/integration__integration_tests__list__task_dag_with_locked.snap+++ b/tests/snapshots/integration__integration_tests__list__task_dag_with_locked.snap@@ -35,4 +35,4 @@ exit_code: 0+ [2mlocked[0m [33mβ[39m[2m_[22m [2m../repo.locked[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ [2mnormal[0m [2m_[22m [2m../repo.normal[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 3 worktrees+[2mβ[22m [2mShowing 3 worktreesdiff --git a/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap b/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snapindex 5ec3db586..7aed55027 100644--- a/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap+++ b/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap@@ -36,4 +36,4 @@ exit_code: 0+ ahead [2mβ[22m[2mβ‘[22m [32mβ1[0m [32m+1[0m ../repo.ahead [32mβ‘1[0m [2ma66d3071[0m [2m1d[0m [2mAhead commit+ [2min-sync[0m [2m_[22m[2m|[22m [2m../repo.in-sync[0m [2m|[0m [2mb8b9f445[0m [2m1d[0m [2mInitial commit on main-βͺ [2mShowing 3 worktrees, 1 ahead+[2mβ[22m [2mShowing 3 worktrees, 1 aheaddiff --git a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snapindex 2e6ee0668..ca3b8fa58 100644--- a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap+++ b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap@@ -33,4 +33,4 @@ exit_code: 0@ main [2m^[22m . [2md167d3cc[0m [2m1d[0m [2mFix bug with cafΓ© β handling+ [2mfeature-test[0m [2mβ[22m [2m[31mβ1[0m [2m../repo.feature-test[0m [2m96b95eab[0m [2m1d[0m [2mAdd support for ζ₯ζ¬θͺ and Γ©moji π-βͺ [2mShowing 2 worktrees+[2mβ[22m [2mShowing 2 worktreesdiff --git a/tests/snapshots/integration__integration_tests__list__user_marker_special_chars.snap b/tests/snapshots/integration__integration_tests__list__user_marker_special_chars.snapindex a2cadc0e9..ee3abe95a 100644--- a/tests/snapshots/integration__integration_tests__list__user_marker_special_chars.snap+++ b/tests/snapshots/integration__integration_tests__list__user_marker_special_chars.snap@@ -34,4 +34,4 @@ exit_code: 0+ [2memoji[0m [2m_[22m π [2m../repo.emoji[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ [2mmulti[0m [2m_[22m π¨βπ» [2m../repo.multi[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 3 worktrees+[2mβ[22m [2mShowing 3 worktreesdiff --git a/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap b/tests/snapshots/integration__integration_tests__list__with_branches_flag.snapindex 4d5647116..42f440a82 100644--- a/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap+++ b/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap@@ -37,4 +37,4 @@ exit_code: 0[2mfeature-without-worktree[0m [2m/[22m[2m_[22m [2ma1e809f5[0m [2m1d[0m [2mInitial commit[2mfix-bug[0m [2m/[22m[2m_[22m [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 2 worktrees, 3 branches+[2mβ[22m [2mShowing 2 worktrees, 3 branchesdiff --git a/tests/snapshots/integration__integration_tests__list__with_branches_flag_none_available.snap b/tests/snapshots/integration__integration_tests__list__with_branches_flag_none_available.snapindex 78330d0c8..7c571fc56 100644--- a/tests/snapshots/integration__integration_tests__list__with_branches_flag_none_available.snap+++ b/tests/snapshots/integration__integration_tests__list__with_branches_flag_none_available.snap@@ -35,4 +35,4 @@ exit_code: 0+ [2mfeature-a[0m [2m_[22m [2m../repo.feature-a[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ [2mfeature-b[0m [2m_[22m [2m../repo.feature-b[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 3 worktrees+[2mβ[22m [2mShowing 3 worktreesdiff --git a/tests/snapshots/integration__integration_tests__list__with_branches_flag_only_branches.snap b/tests/snapshots/integration__integration_tests__list__with_branches_flag_only_branches.snapindex 2020e44cd..02a221287 100644--- a/tests/snapshots/integration__integration_tests__list__with_branches_flag_only_branches.snap+++ b/tests/snapshots/integration__integration_tests__list__with_branches_flag_only_branches.snap@@ -36,4 +36,4 @@ exit_code: 0[2mbranch-beta[0m [2m/[22m[2m_[22m [2ma1e809f5[0m [2m1d[0m [2mInitial commit[2mbranch-gamma[0m [2m/[22m[2m_[22m [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 1 worktrees, 3 branches+[2mβ[22m [2mShowing 1 worktrees, 3 branchesdiff --git a/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap b/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snapindex e35bf95f7..a6139ef39 100644--- a/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap+++ b/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap@@ -38,4 +38,4 @@ exit_code: 0[2morigin/remote-only-1[0m [2m/[22m[2m_[22m [2ma1e809f5[0m [2m1d[0m [2mInitial commit[2morigin/remote-only-2[0m [2m/[22m[2m_[22m [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 1 worktrees, 2 branches, 2 remote branches+[2mβ[22m [2mShowing 1 worktrees, 2 branches, 2 remote branchesdiff --git a/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap b/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snapindex fe2ea545b..f63753802 100644--- a/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap+++ b/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap@@ -35,4 +35,4 @@ exit_code: 0+ [2mfeature-with-worktree[0m [2m_[22m [2m../repo.feature-with-worktree[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit[2morigin/remote-only[0m [2m/[22m[2m_[22m [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 2 worktrees, 1 remote branches+[2mβ[22m [2mShowing 2 worktrees, 1 remote branchesdiff --git a/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap b/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snapindex d9670389e..14149963a 100644--- a/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap+++ b/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap@@ -35,4 +35,4 @@ exit_code: 0[2morigin/remote-feature-1[0m [2m/[22m[2m_[22m [2ma1e809f5[0m [2m1d[0m [2mInitial commit[2morigin/remote-feature-2[0m [2m/[22m[2m_[22m [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 1 worktrees, 2 remote branches+[2mβ[22m [2mShowing 1 worktrees, 2 remote branchesdiff --git a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snapindex f3b30985d..c6d6e38c3 100644--- a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap+++ b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap@@ -39,4 +39,4 @@ exit_code: 0+ [2min-sync[0m [2m_[22m[2m|[22m [2m../repo.in-sync[0m [2m|[0m [2mb8b9f445[0m [2m1d[0m [2mInitial commit on main+ [2mno-upstream[0m [2m_[22m [2m../repo.no-upstream[0m [2mb8b9f445[0m [2m1d[0m [2mInitial commit on main-βͺ [2mShowing 6 worktrees, 2 ahead+[2mβ[22m [2mShowing 6 worktrees, 2 aheaddiff --git a/tests/snapshots/integration__integration_tests__list__with_user_marker.snap b/tests/snapshots/integration__integration_tests__list__with_user_marker.snapindex e11afdde1..909913042 100644--- a/tests/snapshots/integration__integration_tests__list__with_user_marker.snap+++ b/tests/snapshots/integration__integration_tests__list__with_user_marker.snap@@ -35,4 +35,4 @@ exit_code: 0+ review-ui [36m?[39m [2mβ[22m π¬ [32mβ1[0m ../repo.review-ui [2m46b6a187[0m [2m1d[0m [2mAdd dashboard component+ wip-docs [36m?[39m [2mβ[22m ../repo.wip-docs [2ma058e792[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 4 worktrees, 2 with changes, 2 ahead+[2mβ[22m [2mShowing 4 worktrees, 2 with changes, 2 aheaddiff --git a/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_alignment_check.snap b/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_alignment_check.snapindex 2865ab351..230dcedad 100644--- a/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_alignment_check.snap+++ b/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_alignment_check.snap@@ -33,4 +33,4 @@ exit_code: 0@ main [2m^[22m . [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ test [36m![39m[36m?[39m [2mβ[22m [32m+1[0m [31m-1[0m [32mβ1[0m ../repo.test [2m689d5d16[0m [2m1d[0m [2mTest-βͺ [2mShowing 2 worktrees, 1 with changes, 1 ahead+[2mβ[22m [2mShowing 2 worktrees, 1 with changes, 1 aheaddiff --git a/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_width_consistency.snap b/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_width_consistency.snapindex e231e8317..317419da2 100644--- a/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_width_consistency.snap+++ b/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_width_consistency.snap@@ -34,4 +34,4 @@ exit_code: 0+ complex [36m+[39m [36m?[39m [2mβ[22m [32m+1[0m [31m-1[0m [32mβ1[0m ../repo.complex [2m42162296[0m [2m1d[0m [2mComplex+ simple [36m?[39m [2mβ[22m [32mβ1[0m ../repo.simple [2m63ee5cb5[0m [2m1d[0m [2mSimple-βͺ [2mShowing 3 worktrees, 2 with changes, 2 ahead+[2mβ[22m [2mShowing 3 worktrees, 2 with changes, 2 aheaddiff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_branches_enabled.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_branches_enabled.snapindex f13a9afa1..f31d8ff4d 100644--- a/tests/snapshots/integration__integration_tests__list_config__list_config_branches_enabled.snap+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_branches_enabled.snap@@ -32,4 +32,4 @@ exit_code: 0[1mBranch[0m [1mStatus[0m [1mHEADΒ±[0m [1mmainβ[0m [1mPath[0m [1mRemoteβ [0m [1mCommit[0m [1mAge[0m [1mMessage@ main [2m^[22m . [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 1 worktree+[2mβ[22m [2mShowing 1 worktreediff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override.snapindex 83aed125b..d7bc4de41 100644--- a/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override.snap+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override.snap@@ -34,4 +34,4 @@ exit_code: 0@ main [2m^[22m . [2ma1e809f5[0m [2m1d[0m [2mInitial commit[2mfeature[0m [2m/[22m[2m_[22m [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 1 worktrees, 1 branches+[2mβ[22m [2mShowing 1 worktrees, 1 branchesdiff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_full_and_branches.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_full_and_branches.snapindex f13a9afa1..f31d8ff4d 100644--- a/tests/snapshots/integration__integration_tests__list_config__list_config_full_and_branches.snap+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_full_and_branches.snap@@ -32,4 +32,4 @@ exit_code: 0[1mBranch[0m [1mStatus[0m [1mHEADΒ±[0m [1mmainβ[0m [1mPath[0m [1mRemoteβ [0m [1mCommit[0m [1mAge[0m [1mMessage@ main [2m^[22m . [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 1 worktree+[2mβ[22m [2mShowing 1 worktreediff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_full_enabled.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_full_enabled.snapindex f13a9afa1..f31d8ff4d 100644--- a/tests/snapshots/integration__integration_tests__list_config__list_config_full_enabled.snap+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_full_enabled.snap@@ -32,4 +32,4 @@ exit_code: 0[1mBranch[0m [1mStatus[0m [1mHEADΒ±[0m [1mmainβ[0m [1mPath[0m [1mRemoteβ [0m [1mCommit[0m [1mAge[0m [1mMessage@ main [2m^[22m . [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 1 worktree+[2mβ[22m [2mShowing 1 worktreediff --git a/tests/snapshots/integration__integration_tests__list_config__list_no_config.snap b/tests/snapshots/integration__integration_tests__list_config__list_no_config.snapindex f13a9afa1..f31d8ff4d 100644--- a/tests/snapshots/integration__integration_tests__list_config__list_no_config.snap+++ b/tests/snapshots/integration__integration_tests__list_config__list_no_config.snap@@ -32,4 +32,4 @@ exit_code: 0[1mBranch[0m [1mStatus[0m [1mHEADΒ±[0m [1mmainβ[0m [1mPath[0m [1mRemoteβ [0m [1mCommit[0m [1mAge[0m [1mMessage@ main [2m^[22m . [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 1 worktree+[2mβ[22m [2mShowing 1 worktreediff --git a/tests/snapshots/integration__integration_tests__merge__merge_already_on_target.snap b/tests/snapshots/integration__integration_tests__merge__merge_already_on_target.snapindex 42d4cd376..fd1a08cc2 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_already_on_target.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_already_on_target.snap@@ -5,6 +5,7 @@ info:args:- mergeenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -12,15 +13,21 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0----- stdout ---------- stderr ------βͺ Already up to date with [1mmain[22m (no new commits, no rebase needed)-βͺ Worktree preserved (main worktree)+[2mβ[22m Already up to date with [1mmain[22m (no new commits, no rebase needed)+[2mβ[22m Worktree preserved (main worktree)diff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snapindex 644844160..f4ad7c098 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@@ -30,15 +30,15 @@ exit_code: 0----- stdout ---------- stderr ------π [36mSquashing 2 commits & working tree changes into a single commit [90m(2 files, [32m+2[39m[39m[90m)[39m...[39m-π‘ [2mBackup created @ 14fc72d[22m-π [36mGenerating squash commit message...[39m-[107m [0m [1mfix: update file 1 content[22m-β [32mSquashed @ [2mf1c474c[22m[39m-π [36mMerging 1 commit to [1mmain[22m @ [2mf1c474c[22m (no rebase needed)[39m-[107m [0m * [33mf1c474c[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 [90m(1 commit, 2 files, [32m+2[39m[39m[90m)[39m[39m-π [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mSquashing 2 commits & working tree changes into a single commit [90m(2 files, [32m+2[39m[39m[90m)[39m...[39m+[2mβ³[22m [2mBackup created @ 14fc72d[22m+[36mβ[39m [36mGenerating squash commit message...[39m+[107m [0m [1mfix: update file 1 content[22m+[32mβ[39m [32mSquashed @ [2mf1c474c[22m[39m+[36mβ[39m [36mMerging 1 commit to [1mmain[22m @ [2mf1c474c[22m (no rebase needed)[39m+[107m [0m * [33mf1c474c[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(+)+[32mβ[39m [32mMerged to [1mmain[22m [90m(1 commit, 2 files, [32m+2[39m[39m[90m)[39m[39m+[36mβ[39m [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --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 646b25373..ea3ddf795 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@@ -30,18 +30,18 @@ exit_code: 0----- stdout ---------- stderr ------π [36mSquashing 1 commit & working tree changes into a single commit [90m(1 file, [32m+1[39m[39m[90m)[39m...[39m-π‘ [2mBackup created @ 183cc8b[22m-π [36mGenerating squash commit message...[39m-π‘ [2mUsing fallback commit message. Run [90mwt config --help[39m for LLM setup guide[22m-[107m [0m [1mSquash commits from main[22m-[107m [0m-[107m [0m Combined commits:-[107m [0m - feat: initial feature-β [32mSquashed @ [2md3582c0[22m[39m-π [36mMerging 1 commit to [1mmain[22m @ [2md3582c0[22m (no rebase needed)[39m-[107m [0m * [33md3582c0[m Squash commits from main-[107m [0m feature.txt | 1 [32m+[m-[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mSquashing 1 commit & working tree changes into a single commit [90m(1 file, [32m+1[39m[39m[90m)[39m...[39m+[2mβ³[22m [2mBackup created @ 183cc8b[22m+[36mβ[39m [36mGenerating squash commit message...[39m+[2mβ³[22m [2mUsing fallback commit message. Run [90mwt config --help[39m for LLM setup guide[22m+[107m [0m [1mSquash commits from main[22m+[107m [0m+[107m [0m Combined commits:+[107m [0m - feat: initial feature+[32mβ[39m [32mSquashed @ [2md3582c0[22m[39m+[36mβ[39m [36mMerging 1 commit to [1mmain[22m @ [2md3582c0[22m (no rebase needed)[39m+[107m [0m * [33md3582c0[m Squash commits from main+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)+[32mβ[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m+[36mβ[39m [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --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 9bc91a73a..a812e373e 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@@ -30,14 +30,14 @@ exit_code: 0----- stdout ---------- stderr ------π [36mSquashing 1 commit & working tree changes into a single commit [90m(1 file, [32m+1[39m[39m[90m)[39m...[39m-π‘ [2mBackup created @ 5e120d3[22m-π [36mGenerating squash commit message...[39m-[107m [0m [1mfix: improve auth validation logic[22m-β [32mSquashed @ [2m88fed03[22m[39m-π [36mMerging 1 commit to [1mmain[22m @ [2m88fed03[22m (no rebase needed)[39m-[107m [0m * [33m88fed03[m fix: improve auth validation logic-[107m [0m auth.txt | 1 [32m+[m-[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mSquashing 1 commit & working tree changes into a single commit [90m(1 file, [32m+1[39m[39m[90m)[39m...[39m+[2mβ³[22m [2mBackup created @ 5e120d3[22m+[36mβ[39m [36mGenerating squash commit message...[39m+[107m [0m [1mfix: improve auth validation logic[22m+[32mβ[39m [32mSquashed @ [2m88fed03[22m[39m+[36mβ[39m [36mMerging 1 commit to [1mmain[22m @ [2m88fed03[22m (no rebase needed)[39m+[107m [0m * [33m88fed03[m fix: improve auth validation logic+[107m [0m auth.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)+[32mβ[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m+[36mβ[39m [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_default_branch_missing_worktree.snap b/tests/snapshots/integration__integration_tests__merge__merge_default_branch_missing_worktree.snapindex 42d4cd376..fd1a08cc2 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_default_branch_missing_worktree.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_default_branch_missing_worktree.snap@@ -5,6 +5,7 @@ info:args:- mergeenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -12,15 +13,21 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0----- stdout ---------- stderr ------βͺ Already up to date with [1mmain[22m (no new commits, no rebase needed)-βͺ Worktree preserved (main worktree)+[2mβ[22m Already up to date with [1mmain[22m (no new commits, no rebase needed)+[2mβ[22m Worktree preserved (main worktree)diff --git a/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap b/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snapindex e7b1aeb18..f83751c7f 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@@ -30,15 +30,15 @@ exit_code: 0----- stdout ---------- stderr ------π‘ [33mAuto-staging 1 untracked path:[39m-[107m [0m dirty.txt-π [36mCommitting changes with default message... [90m(1 file, [32m+1[39m, no squashing needed[39m[90m)[39m[39m-π‘ [2mUsing fallback commit message. Run [90mwt config --help[39m for LLM setup guide[22m-[107m [0m [1mChanges to dirty.txt[22m-β [32mCommitted changes @ [2mb44b09f[22m[39m-π [36mMerging 1 commit to [1mmain[22m @ [2mb44b09f[22m (no rebase needed)[39m-[107m [0m * [33mb44b09f[m Changes to dirty.txt-[107m [0m dirty.txt | 1 [32m+[m-[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[33mβ²[39m [33mAuto-staging 1 untracked path:[39m+[107m [0m dirty.txt+[36mβ[39m [36mCommitting changes with default message... [90m(1 file, [32m+1[39m, no squashing needed[39m[90m)[39m[39m+[2mβ³[22m [2mUsing fallback commit message. Run [90mwt config --help[39m for LLM setup guide[22m+[107m [0m [1mChanges to dirty.txt[22m+[32mβ[39m [32mCommitted changes @ [2mb44b09f[22m[39m+[36mβ[39m [36mMerging 1 commit to [1mmain[22m @ [2mb44b09f[22m (no rebase needed)[39m+[107m [0m * [33mb44b09f[m Changes to dirty.txt+[107m [0m dirty.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)+[32mβ[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m+[36mβ[39m [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_error_conflicting_changes.snap b/tests/snapshots/integration__integration_tests__merge__merge_error_conflicting_changes.snapindex 43f44da46..b54867156 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_error_conflicting_changes.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_error_conflicting_changes.snap@@ -30,7 +30,7 @@ exit_code: 1----- stdout ---------- stderr ------β [31mCannot push: conflicting uncommitted changes in:[39m-[107m [0m shared.txt+[31mβ[39m [31mCannot push: conflicting uncommitted changes in:[39m+[107m [0m shared.txt-π‘ [2mCommit or stash these changes in _REPO_.main-wt first[22m+[2mβ³[22m [2mCommit or stash these changes in _REPO_.main-wt first[22mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_error_detached_head.snap b/tests/snapshots/integration__integration_tests__merge__merge_error_detached_head.snapindex a492d52db..bbe419474 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_error_detached_head.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_error_detached_head.snap@@ -30,6 +30,6 @@ exit_code: 1----- stdout ---------- stderr ------β [31mCannot merge: not on a branch (detached HEAD)[39m+[31mβ[39m [31mCannot merge: not on a branch (detached HEAD)[39m-π‘ [2mTo switch to a branch, run [90mgit switch <branch>[39m[22m+[2mβ³[22m [2mTo switch to a branch, run [90mgit switch <branch>[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_error_uncommitted_changes_no_commit.snap b/tests/snapshots/integration__integration_tests__merge__merge_error_uncommitted_changes_no_commit.snapindex 65a4e4ac9..5b227932e 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_error_uncommitted_changes_no_commit.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_error_uncommitted_changes_no_commit.snap@@ -8,6 +8,7 @@ info:- "--no-commit"- "--no-remove"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -15,16 +16,22 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: falseexit_code: 1----- stdout ---------- stderr ------β [31mCannot merge with --no-commit: [1mfeature[22m has uncommitted changes[39m+[31mβ[39m [31mCannot merge with --no-commit: [1mfeature[22m has uncommitted changes[39m-π‘ [2mCommit or stash changes first[22m+[2mβ³[22m [2mCommit or stash changes first[22mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snapindex 9b2cd4c3d..03c572500 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap@@ -30,9 +30,9 @@ exit_code: 0----- stdout ---------- stderr ------π [36mMerging 1 commit to [1mmain[22m @ [2mfc12499[22m (no commit/squash/rebase needed)[39m-[107m [0m * [33mfc12499[m Add feature file-[107m [0m feature.txt | 1 [32m+[m-[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mMerging 1 commit to [1mmain[22m @ [2mfc12499[22m (no commit/squash/rebase needed)[39m+[107m [0m * [33mfc12499[m Add feature file+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)+[32mβ[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m+[36mβ[39m [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_commit_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_commit_not_fast_forward.snapindex f6ec57fbc..0f1a1349f 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_no_commit_not_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_commit_not_fast_forward.snap@@ -16,10 +16,12 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -30,11 +32,11 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRebasing onto [1mmain[22m...[39m-β [32mRebased onto [1mmain[22m[39m-π [36mMerging 1 commit to [1mmain[22m @ [2m430212e[22m (no commit/squash needed)[39m-[107m [0m * [33m430212e[m Add feature file-[107m [0m feature.txt | 1 [32m+[m-[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-βͺ Worktree preserved (--no-remove)+[36mβ[39m [36mRebasing onto [1mmain[22m...[39m+[32mβ[39m [32mRebased onto [1mmain[22m[39m+[36mβ[39m [36mMerging 1 commit to [1mmain[22m @ [2m430212e[22m (no commit/squash needed)[39m+[107m [0m * [33m430212e[m Add feature file+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)+[32mβ[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m+[2mβ[22m Worktree preserved (--no-remove)diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snapindex b7a19391b..a4c0123c7 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap@@ -30,5 +30,5 @@ exit_code: 0----- stdout ---------- stderr ------βͺ Already up to date with [1mmain[22m (no new commits, no rebase needed)-π [36mRemoving [1mno-commits[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[2mβ[22m Already up to date with [1mmain[22m (no new commits, no rebase needed)+[36mβ[39m [36mRemoving [1mno-commits[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --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 402cd7733..3a8d884e2 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@@ -30,15 +30,15 @@ exit_code: 0----- stdout ---------- stderr ------π‘ [33mAuto-staging 1 untracked path:[39m-[107m [0m newfile.txt-π [36mCommitting changes with default message... [90m(1 file, [32m+1[39m, no squashing needed[39m[90m)[39m[39m-π‘ [2mUsing fallback commit message. Run [90mwt config --help[39m for LLM setup guide[22m-[107m [0m [1mChanges to newfile.txt[22m-β [32mCommitted changes @ [2mbbcee27[22m[39m-π [36mMerging 1 commit to [1mmain[22m @ [2mbbcee27[22m (no rebase needed)[39m-[107m [0m * [33mbbcee27[m Changes to newfile.txt-[107m [0m newfile.txt | 1 [32m+[m-[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36mRemoving [1mno-commits-dirty[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[33mβ²[39m [33mAuto-staging 1 untracked path:[39m+[107m [0m newfile.txt+[36mβ[39m [36mCommitting changes with default message... [90m(1 file, [32m+1[39m, no squashing needed[39m[90m)[39m[39m+[2mβ³[22m [2mUsing fallback commit message. Run [90mwt config --help[39m for LLM setup guide[22m+[107m [0m [1mChanges to newfile.txt[22m+[32mβ[39m [32mCommitted changes @ [2mbbcee27[22m[39m+[36mβ[39m [36mMerging 1 commit to [1mmain[22m @ [2mbbcee27[22m (no rebase needed)[39m+[107m [0m * [33mbbcee27[m Changes to newfile.txt+[107m [0m newfile.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)+[32mβ[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m+[36mβ[39m [36mRemoving [1mno-commits-dirty[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_rebase_already_rebased.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_rebase_already_rebased.snapindex 66f5d3cef..baa399434 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_no_rebase_already_rebased.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_rebase_already_rebased.snap@@ -31,9 +31,9 @@ exit_code: 0----- stdout ---------- stderr ------π [36mMerging 1 commit to [1mmain[22m @ [2mfc12499[22m (no commit/squash/rebase needed)[39m-[107m [0m * [33mfc12499[m Add feature file-[107m [0m feature.txt | 1 [32m+[m-[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mMerging 1 commit to [1mmain[22m @ [2mfc12499[22m (no commit/squash/rebase needed)[39m+[107m [0m * [33mfc12499[m Add feature file+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)+[32mβ[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m+[36mβ[39m [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_rebase_not_rebased.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_rebase_not_rebased.snapindex 747c309bc..05a7df60f 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_no_rebase_not_rebased.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_rebase_not_rebased.snap@@ -20,6 +20,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -30,6 +31,6 @@ exit_code: 1----- stdout ---------- stderr ------β [31mBranch not rebased onto [1mmain[22m[39m+[31mβ[39m [31mBranch not rebased onto [1mmain[22m[39m-π‘ [2mRemove [90m--no-rebase[39m; or to rebase first, run [90mwt step rebase main[39m[22m+[2mβ³[22m [2mRemove [90m--no-rebase[39m; or to rebase first, run [90mwt step rebase main[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snapindex 18be53cd4..e93a373b7 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap@@ -29,9 +29,9 @@ exit_code: 0----- stdout ---------- stderr ------π [36mMerging 1 commit to [1mmain[22m @ [2mfc12499[22m (no commit/squash/rebase needed)[39m-[107m [0m * [33mfc12499[m Add feature file-[107m [0m feature.txt | 1 [32m+[m-[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mMerging 1 commit to [1mmain[22m @ [2mfc12499[22m (no commit/squash/rebase needed)[39m+[107m [0m * [33mfc12499[m Add feature file+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)+[32mβ[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m+[36mβ[39m [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snapindex 4f2fe00f4..2ac124f2c 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap@@ -31,11 +31,11 @@ exit_code: 0----- stdout ---------- stderr ------π [36mMerging 2 commits to [1mmain[22m @ [2mf0d31ff[22m (no commit/squash/rebase needed)[39m-[107m [0m * [33mf0d31ff[m feat: add file 2-[107m [0m * [33m65fe669[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 [90m(2 commits, 2 files, [32m+2[39m[39m[90m)[39m[39m-π [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mMerging 2 commits to [1mmain[22m @ [2mf0d31ff[22m (no commit/squash/rebase needed)[39m+[107m [0m * [33mf0d31ff[m feat: add file 2+[107m [0m * [33m65fe669[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(+)+[32mβ[39m [32mMerged to [1mmain[22m [90m(2 commits, 2 files, [32m+2[39m[39m[90m)[39m[39m+[36mβ[39m [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --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 e7eaf5c65..b3e0a9e8b 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@@ -30,9 +30,9 @@ exit_code: 0----- stdout ---------- stderr ------π [36mMerging 1 commit to [1mmain[22m @ [2m430212e[22m (no commit/squash/rebase needed)[39m-[107m [0m * [33m430212e[m Add feature file-[107m [0m feature.txt | 1 [32m+[m-[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mMerging 1 commit to [1mmain[22m @ [2m430212e[22m (no commit/squash/rebase needed)[39m+[107m [0m * [33m430212e[m Add feature file+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)+[32mβ[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m+[36mβ[39m [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snapindex 059f6a53e..d7026efcb 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@@ -31,15 +31,15 @@ exit_code: 1----- stdout ---------- stderr ------π [36mMerging 1 commit to [1mmain[22m @ [2m623e1f1[22m (no commit/squash/rebase needed)[39m-[107m [0m * [33m623e1f1[m Add feature file-[107m [0m feature.txt | 1 [32m+[m-[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m-π [36mRunning project post-merge:[39m-[107m [0m [2m[0m[2m[34mexit[0m[2m 1-[0mπ‘ [33mCommand failed: exit status: 1[39m-β [31mpost-merge command failed: exit status: 1[39m+[36mβ[39m [36mMerging 1 commit to [1mmain[22m @ [2m623e1f1[22m (no commit/squash/rebase needed)[39m+[107m [0m * [33m623e1f1[m Add feature file+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)+[32mβ[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m+[36mβ[39m [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mRunning project post-merge:[39m+[107m [0m [2m[0m[2m[34mexit[0m[2m 1+[0m[33mβ²[39m [33mCommand failed: exit status: 1[39m+[31mβ[39m [31mpost-merge command failed: exit status: 1[39m-π‘ [2mTo skip post-merge hooks, re-run with [90m--no-verify[39m[22m+[2mβ³[22m [2mTo skip post-merge hooks, re-run with [90m--no-verify[39m[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 4d7332ef9..7c3bee066 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@@ -31,13 +31,13 @@ exit_code: 0----- stdout ---------- stderr ------π [36mMerging 1 commit to [1mmain[22m @ [2m40d535b[22m (no commit/squash/rebase needed)[39m-[107m [0m * [33m40d535b[m Add feature file-[107m [0m feature.txt | 1 [32m+[m-[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m-π [36mRunning project post-merge [1mnotify[22m:[39m-[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π [36mRunning project post-merge [1mdeploy[22m:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Deploying branch feature'[0m[2m [0m[2m[36m>[0m[2m deploy.txt+[36mβ[39m [36mMerging 1 commit to [1mmain[22m @ [2m40d535b[22m (no commit/squash/rebase needed)[39m+[107m [0m * [33m40d535b[m Add feature file+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)+[32mβ[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m+[36mβ[39m [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mRunning project post-merge [1mnotify[22m:[39m+[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[36mβ[39m [36mRunning project post-merge [1mdeploy[22m:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Deploying branch feature'[0m[2m [0m[2m[36m>[0m[2m deploy.txtdiff --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 2868b08fa..2c3cbc076 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@@ -32,9 +32,9 @@ exit_code: 0----- stdout ---------- stderr ------π [36mMerging 1 commit to [1mmain[22m @ [2m75e8546[22m (no commit/squash/rebase needed)[39m-[107m [0m * [33m75e8546[m Add feature file-[107m [0m feature.txt | 1 [32m+[m-[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mMerging 1 commit to [1mmain[22m @ [2m75e8546[22m (no commit/squash/rebase needed)[39m+[107m [0m * [33m75e8546[m Add feature file+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)+[32mβ[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m+[36mβ[39m [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --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 4e4ba9b96..24ca351c6 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@@ -31,11 +31,11 @@ exit_code: 0----- stdout ---------- stderr ------π [36mMerging 1 commit to [1mmain[22m @ [2m75e8546[22m (no commit/squash/rebase needed)[39m-[107m [0m * [33m75e8546[m Add feature file-[107m [0m feature.txt | 1 [32m+[m-[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m-π [36mRunning project post-merge:[39m-[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+[36mβ[39m [36mMerging 1 commit to [1mmain[22m @ [2m75e8546[22m (no commit/squash/rebase needed)[39m+[107m [0m * [33m75e8546[m Add feature file+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)+[32mβ[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m+[36mβ[39m [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mRunning project post-merge:[39m+[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.txtdiff --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 93751d129..7c87dc087 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@@ -6,6 +6,7 @@ info:- merge- "--force"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,17 +14,23 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0----- stdout ---------- stderr ------βͺ Already up to date with [1mmain[22m (no new commits, no rebase needed)-βͺ Worktree preserved (main worktree)-π [36mRunning project post-merge:[39m-[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+[2mβ[22m Already up to date with [1mmain[22m (no new commits, no rebase needed)+[2mβ[22m Worktree preserved (main worktree)+[36mβ[39m [36mRunning project post-merge:[39m+[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.txtdiff --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 bccc65150..f03413584 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@@ -31,7 +31,7 @@ exit_code: 0----- stdout ---------- stderr ------βͺ Already up to date with [1mmain[22m (no new commits, no rebase needed)-π [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m-π [36mRunning project post-merge:[39m-[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+[2mβ[22m Already up to date with [1mmain[22m (no new commits, no rebase needed)+[36mβ[39m [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mRunning project post-merge:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'post-merge ran'[0m[2m [0m[2m[36m>[0m[2m post-merge-ran.txtdiff --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 721ed8e8d..8069e32c4 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@@ -31,10 +31,10 @@ exit_code: 1----- stdout ---------- stderr ------π‘ [33mAuto-staging 1 untracked path:[39m-[107m [0m feature.txt-π [36mRunning project pre-commit:[39m-[107m [0m [2m[0m[2m[34mexit[0m[2m 1-[0mβ [31mpre-commit command failed: exit status: 1[39m+[33mβ²[39m [33mAuto-staging 1 untracked path:[39m+[107m [0m feature.txt+[36mβ[39m [36mRunning project pre-commit:[39m+[107m [0m [2m[0m[2m[34mexit[0m[2m 1+[0m[31mβ[39m [31mpre-commit command failed: exit status: 1[39m-π‘ [2mTo skip pre-commit hooks, re-run with [90m--no-verify[39m[22m+[2mβ³[22m [2mTo skip pre-commit hooks, re-run with [90m--no-verify[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snapindex 9665b3f5b..245f8946b 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@@ -31,18 +31,18 @@ exit_code: 0----- stdout ---------- stderr ------π‘ [33mAuto-staging 1 untracked path:[39m-[107m [0m feature.txt-π [36mRunning project pre-commit:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Pre-commit check passed'[0m[2m+[33mβ²[39m [33mAuto-staging 1 untracked path:[39m+[107m [0m feature.txt+[36mβ[39m [36mRunning project pre-commit:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Pre-commit check passed'[0m[2m[0mPre-commit check passed-π [36mCommitting changes with default message... [90m(1 file, [32m+1[39m, no squashing needed[39m[90m)[39m[39m-π‘ [2mUsing fallback commit message. Run [90mwt config --help[39m for LLM setup guide[22m-[107m [0m [1mChanges to feature.txt[22m-β [32mCommitted changes @ [2mfce4243[22m[39m-π [36mMerging 1 commit to [1mmain[22m @ [2mfce4243[22m (no rebase needed)[39m-[107m [0m * [33mfce4243[m Changes to feature.txt-[107m [0m feature.txt | 1 [32m+[m-[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mCommitting changes with default message... [90m(1 file, [32m+1[39m, no squashing needed[39m[90m)[39m[39m+[2mβ³[22m [2mUsing fallback commit message. Run [90mwt config --help[39m for LLM setup guide[22m+[107m [0m [1mChanges to feature.txt[22m+[32mβ[39m [32mCommitted changes @ [2mfce4243[22m[39m+[36mβ[39m [36mMerging 1 commit to [1mmain[22m @ [2mfce4243[22m (no rebase needed)[39m+[107m [0m * [33mfce4243[m Changes to feature.txt+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)+[32mβ[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m+[36mβ[39m [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_failure.snapindex a9bc26161..663d7c47c 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@@ -31,8 +31,8 @@ exit_code: 1----- stdout ---------- stderr ------π [36mRunning project pre-merge:[39m-[107m [0m [2m[0m[2m[34mexit[0m[2m 1-[0mβ [31mpre-merge command failed: exit status: 1[39m+[36mβ[39m [36mRunning project pre-merge:[39m+[107m [0m [2m[0m[2m[34mexit[0m[2m 1+[0m[31mβ[39m [31mpre-merge command failed: exit status: 1[39m-π‘ [2mTo skip pre-merge hooks, re-run with [90m--no-verify[39m[22m+[2mβ³[22m [2mTo skip pre-merge hooks, re-run with [90m--no-verify[39m[22mdiff --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 66c81166f..22f9562f1 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@@ -31,15 +31,15 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRunning project pre-merge [1mformat[22m:[39m-[107m [0m [2m[0m[2m[34mexit[0m[2m 0-[0mπ [36mRunning project pre-merge [1mlint[22m:[39m-[107m [0m [2m[0m[2m[34mexit[0m[2m 0-[0mπ [36mRunning project pre-merge [1mtest[22m:[39m-[107m [0m [2m[0m[2m[34mexit[0m[2m 0-[0mπ [36mMerging 1 commit to [1mmain[22m @ [2m4a48dbd[22m (no commit/squash/rebase needed)[39m-[107m [0m * [33m4a48dbd[m Add feature file-[107m [0m feature.txt | 1 [32m+[m-[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mRunning project pre-merge [1mformat[22m:[39m+[107m [0m [2m[0m[2m[34mexit[0m[2m 0+[0m[36mβ[39m [36mRunning project pre-merge [1mlint[22m:[39m+[107m [0m [2m[0m[2m[34mexit[0m[2m 0+[0m[36mβ[39m [36mRunning project pre-merge [1mtest[22m:[39m+[107m [0m [2m[0m[2m[34mexit[0m[2m 0+[0m[36mβ[39m [36mMerging 1 commit to [1mmain[22m @ [2m4a48dbd[22m (no commit/squash/rebase needed)[39m+[107m [0m * [33m4a48dbd[m Add feature file+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)+[32mβ[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m+[36mβ[39m [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_no_hooks.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_no_hooks.snapindex eb1911a23..026d4793d 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_no_hooks.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_no_hooks.snap@@ -31,9 +31,9 @@ exit_code: 0----- stdout ---------- stderr ------π [36mMerging 1 commit to [1mmain[22m @ [2ma3a6eaf[22m (no commit/squash/rebase needed)[39m-[107m [0m * [33ma3a6eaf[m Add feature file-[107m [0m feature.txt | 1 [32m+[m-[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mMerging 1 commit to [1mmain[22m @ [2ma3a6eaf[22m (no commit/squash/rebase needed)[39m+[107m [0m * [33ma3a6eaf[m Add feature file+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)+[32mβ[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m+[36mβ[39m [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --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 4e1bdf003..37af7b6b0 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@@ -31,11 +31,11 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRunning project pre-merge:[39m-[107m [0m [2m[0m[2m[34mexit[0m[2m 0-[0mπ [36mMerging 1 commit to [1mmain[22m @ [2m4f5863f[22m (no commit/squash/rebase needed)[39m-[107m [0m * [33m4f5863f[m Add feature file-[107m [0m feature.txt | 1 [32m+[m-[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mRunning project pre-merge:[39m+[107m [0m [2m[0m[2m[34mexit[0m[2m 0+[0m[36mβ[39m [36mMerging 1 commit to [1mmain[22m @ [2m4f5863f[22m (no commit/squash/rebase needed)[39m+[107m [0m * [33m4f5863f[m Add feature file+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)+[32mβ[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m+[36mβ[39m [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --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 d8b4e3a8a..82ce3be4f 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@@ -31,8 +31,8 @@ exit_code: 1----- stdout ---------- stderr ------π [36mRunning project pre-commit:[39m-[107m [0m [2m[0m[2m[34mexit[0m[2m 1-[0mβ [31mpre-commit command failed: exit status: 1[39m+[36mβ[39m [36mRunning project pre-commit:[39m+[107m [0m [2m[0m[2m[34mexit[0m[2m 1+[0m[31mβ[39m [31mpre-commit command failed: exit status: 1[39m-π‘ [2mTo skip pre-commit hooks, re-run with [90m--no-verify[39m[22m+[2mβ³[22m [2mTo skip pre-commit hooks, re-run with [90m--no-verify[39m[22mdiff --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 bd819c2b7..277711cbd 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@@ -31,12 +31,12 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRunning project pre-commit:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Pre-commit check passed'[0m[2m+[36mβ[39m [36mRunning project pre-commit:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Pre-commit check passed'[0m[2m[0mPre-commit check passed-π [36mMerging 1 commit to [1mmain[22m @ [2mef627f5[22m (no commit/squash/rebase needed)[39m-[107m [0m * [33mef627f5[m Add feature file-[107m [0m feature.txt | 1 [32m+[m-[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mMerging 1 commit to [1mmain[22m @ [2mef627f5[22m (no commit/squash/rebase needed)[39m+[107m [0m * [33mef627f5[m Add feature file+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)+[32mβ[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m+[36mβ[39m [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --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 d3bde84ff..6246639ad 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@@ -30,9 +30,9 @@ exit_code: 0----- stdout ---------- stderr ------π [36mMerging 1 commit to [1mmain[22m @ [2mfc12499[22m (no commit/squash/rebase needed)[39m-[107m [0m * [33mfc12499[m Add feature file-[107m [0m feature.txt | 1 [32m+[m-[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36mRemoving [1mfeature-from-develop[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mMerging 1 commit to [1mmain[22m @ [2mfc12499[22m (no commit/squash/rebase needed)[39m+[107m [0m * [33mfc12499[m Add feature file+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)+[32mβ[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m+[36mβ[39m [36mRemoving [1mfeature-from-develop[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --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 e5820f0b6..8cf3e8c07 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@@ -30,11 +30,11 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRebasing onto [1mmain[22m...[39m-β [32mRebased onto [1mmain[22m[39m-π [36mMerging 1 commit to [1mmain[22m @ [2meadc502[22m (no commit/squash needed)[39m-[107m [0m * [33meadc502[m Add feature file-[107m [0m feature.txt | 1 [32m+[m-[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36mRemoving [1mfeature-dirty-primary[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mRebasing onto [1mmain[22m...[39m+[32mβ[39m [32mRebased onto [1mmain[22m[39m+[36mβ[39m [36mMerging 1 commit to [1mmain[22m @ [2meadc502[22m (no commit/squash needed)[39m+[107m [0m * [33meadc502[m Add feature file+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)+[32mβ[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m+[36mβ[39m [36mRemoving [1mfeature-dirty-primary[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --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 0c21149b2..e54cb51cf 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@@ -15,10 +15,12 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -29,9 +31,9 @@ exit_code: 0----- stdout ---------- stderr ------π [36mMerging 1 commit to [1mmain[22m @ [2mfc12499[22m (no commit/squash/rebase needed)[39m-[107m [0m * [33mfc12499[m Add feature file-[107m [0m feature.txt | 1 [32m+[m-[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-βͺ Worktree preserved (--no-remove)+[36mβ[39m [36mMerging 1 commit to [1mmain[22m @ [2mfc12499[22m (no commit/squash/rebase needed)[39m+[107m [0m * [33mfc12499[m Add feature file+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)+[32mβ[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m+[2mβ[22m 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 a34b96200..4bd561697 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap@@ -14,10 +14,12 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -28,10 +30,10 @@ exit_code: 1----- stdout ---------- stderr ------π [36mRebasing onto [1mmain[22m...[39m-β [31mRebase onto [1mmain[22m incomplete[39m-[107m [0m Rebasing (1/1)-[107m [0m error: could not apply bed6661... Update shared.txt in feature-[107m [0m Could not apply bed6661... # Update shared.txt in feature-[107m [0m Auto-merging shared.txt-[107m [0m CONFLICT (content): Merge conflict in shared.txt+[36mβ[39m [36mRebasing onto [1mmain[22m...[39m+[31mβ[39m [31mRebase onto [1mmain[22m incomplete[39m+[107m [0m Rebasing (1/1)+[107m [0m error: could not apply bed6661... Update shared.txt in feature+[107m [0m Could not apply bed6661... # Update shared.txt in feature+[107m [0m Auto-merging shared.txt+[107m [0m CONFLICT (content): Merge conflict in shared.txtdiff --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 a464105a5..9d69eee0c 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@@ -30,6 +30,6 @@ exit_code: 0----- stdout ---------- stderr ------β [32mFast-forwarded to [1mmain[22m[39m-βͺ Already up to date with [1mmain[22m (no new commits)-π [36mRemoving [1mfast-forward-test[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[32mβ[39m [32mFast-forwarded to [1mmain[22m[39m+[2mβ[22m Already up to date with [1mmain[22m (no new commits)+[36mβ[39m [36mRemoving [1mfast-forward-test[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --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 c13d3b7c2..4c62365c3 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@@ -30,11 +30,11 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRebasing onto [1mmain[22m...[39m-β [32mRebased onto [1mmain[22m[39m-π [36mMerging 1 commit to [1mmain[22m @ [2ma5e5492[22m (no commit/squash needed)[39m-[107m [0m * [33ma5e5492[m Add feature-[107m [0m feature.txt | 1 [32m+[m-[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36mRemoving [1mtrue-rebase-test[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mRebasing onto [1mmain[22m...[39m+[32mβ[39m [32mRebased onto [1mmain[22m[39m+[36mβ[39m [36mMerging 1 commit to [1mmain[22m @ [2ma5e5492[22m (no commit/squash needed)[39m+[107m [0m * [33ma5e5492[m Add feature+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)+[32mβ[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m+[36mβ[39m [36mRemoving [1mtrue-rebase-test[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snapindex 40c849a3c..cbce6cfa1 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap@@ -30,21 +30,21 @@ exit_code: 0----- stdout ---------- stderr ------π [36mSquashing 3 commits into a single commit [90m(3 files, [32m+3[39m[39m[90m)[39m...[39m-π [36mGenerating squash commit message...[39m-π‘ [2mUsing fallback commit message. Run [90mwt config --help[39m for LLM setup guide[22m-[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 @ [2maf8c227[22m[39m-π [36mMerging 1 commit to [1mmain[22m @ [2maf8c227[22m (no rebase needed)[39m-[107m [0m * [33maf8c227[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 [90m(1 commit, 3 files, [32m+3[39m[39m[90m)[39m[39m-π [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mSquashing 3 commits into a single commit [90m(3 files, [32m+3[39m[39m[90m)[39m...[39m+[36mβ[39m [36mGenerating squash commit message...[39m+[2mβ³[22m [2mUsing fallback commit message. Run [90mwt config --help[39m for LLM setup guide[22m+[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+[32mβ[39m [32mSquashed @ [2maf8c227[22m[39m+[36mβ[39m [36mMerging 1 commit to [1mmain[22m @ [2maf8c227[22m (no rebase needed)[39m+[107m [0m * [33maf8c227[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(+)+[32mβ[39m [32mMerged to [1mmain[22m [90m(1 commit, 3 files, [32m+3[39m[39m[90m)[39m[39m+[36mβ[39m [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --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 84974210d..13d4a7de7 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@@ -30,15 +30,15 @@ exit_code: 0----- stdout ---------- stderr ------π [36mSquashing 3 commits into a single commit...[39m-π [36mGenerating squash commit message...[39m-π‘ [2mUsing fallback commit message. Run [90mwt config --help[39m for LLM setup guide[22m-[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-βͺ 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 (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mSquashing 3 commits into a single commit...[39m+[36mβ[39m [36mGenerating squash commit message...[39m+[2mβ³[22m [2mUsing fallback commit message. Run [90mwt config --help[39m for LLM setup guide[22m+[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+[2mβ[22m No changes after squashing 3 commits+[2mβ[22m Already up to date with [1mmain[22m (no new commits, no rebase needed)+[36mβ[39m [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_command_not_found.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_command_not_found.snapindex 8ee215862..70d450c74 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_command_not_found.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_command_not_found.snap@@ -14,10 +14,12 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_COMMIT_GENERATION__COMMAND: nonexistent-llm-command@@ -29,10 +31,10 @@ exit_code: 1----- stdout ---------- stderr ------π [36mSquashing 2 commits into a single commit [90m(2 files, [32m+2[39m[39m[90m)[39m...[39m-π [36mGenerating squash commit message...[39m-β [31mCommit generation command failed[39m-[107m [0m Failed to spawn LLM command+[36mβ[39m [36mSquashing 2 commits into a single commit [90m(2 files, [32m+2[39m[39m[90m)[39m...[39m+[36mβ[39m [36mGenerating squash commit message...[39m+[31mβ[39m [31mCommit generation command failed[39m+[107m [0m Failed to spawn LLM command-βͺ Ran command:-[107m [0m wt step squash --show-prompt | nonexistent-llm-command+[2mβ[22m Ran command:+[107m [0m wt step squash --show-prompt | nonexistent-llm-commanddiff --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 709916070..19ebfe06b 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@@ -14,10 +14,12 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -28,10 +30,10 @@ exit_code: 1----- stdout ---------- stderr ------π [36mSquashing 2 commits into a single commit [90m(2 files, [32m+2[39m[39m[90m)[39m...[39m-π [36mGenerating squash commit message...[39m-β [31mCommit generation command failed[39m-[107m [0m Error: connection refused+[36mβ[39m [36mSquashing 2 commits into a single commit [90m(2 files, [32m+2[39m[39m[90m)[39m...[39m+[36mβ[39m [36mGenerating squash commit message...[39m+[31mβ[39m [31mCommit generation command failed[39m+[107m [0m Error: connection refused-βͺ Ran command:-[107m [0m wt step squash --show-prompt | sh -c cat > /dev/null; echo 'Error: connection refused' >&2 && exit 1+[2mβ[22m Ran command:+[107m [0m wt step squash --show-prompt | sh -c cat > /dev/null; echo 'Error: connection refused' >&2 && exit 1diff --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 b21d47c7d..56dc03cf1 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@@ -30,9 +30,9 @@ exit_code: 0----- stdout ---------- stderr ------π [36mMerging 1 commit to [1mmain[22m @ [2mc2e3582[22m (no commit/squash/rebase needed)[39m-[107m [0m * [33mc2e3582[m feat: single commit-[107m [0m file1.txt | 1 [32m+[m-[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mMerging 1 commit to [1mmain[22m @ [2mc2e3582[22m (no commit/squash/rebase needed)[39m+[107m [0m * [33mc2e3582[m feat: single commit+[107m [0m file1.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)+[32mβ[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m+[36mβ[39m [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --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 7b821db17..2be380e97 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@@ -30,13 +30,13 @@ exit_code: 0----- stdout ---------- stderr ------π [36mSquashing 2 commits into a single commit [90m(1 file, [32m+1[39m[39m[90m)[39m...[39m-π [36mGenerating squash commit message...[39m-[107m [0m [1mfeat: implement user authentication system[22m-β [32mSquashed @ [2m785d1ff[22m[39m-π [36mMerging 1 commit to [1mmain[22m @ [2m785d1ff[22m (no rebase needed)[39m-[107m [0m * [33m785d1ff[m feat: implement user authentication system-[107m [0m auth.txt | 1 [32m+[m-[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mSquashing 2 commits into a single commit [90m(1 file, [32m+1[39m[39m[90m)[39m...[39m+[36mβ[39m [36mGenerating squash commit message...[39m+[107m [0m [1mfeat: implement user authentication system[22m+[32mβ[39m [32mSquashed @ [2m785d1ff[22m[39m+[36mβ[39m [36mMerging 1 commit to [1mmain[22m @ [2m785d1ff[22m (no rebase needed)[39m+[107m [0m * [33m785d1ff[m feat: implement user authentication system+[107m [0m auth.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)+[32mβ[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m+[36mβ[39m [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --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 c43b3af43..1cd4d8299 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@@ -32,15 +32,15 @@ exit_code: 0----- stdout ---------- stderr ------π [36mSquashing 2 commits & working tree changes into a single commit [90m(2 files, [32m+2[39m[39m[90m)[39m...[39m-π‘ [2mBackup created @ 14fc72d[22m-π [36mGenerating squash commit message...[39m-[107m [0m [1mfix: update files[22m-β [32mSquashed @ [2m257ac9f[22m[39m-π [36mMerging 1 commit to [1mmain[22m @ [2m257ac9f[22m (no rebase needed)[39m-[107m [0m * [33m257ac9f[m fix: update files-[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 [90m(1 commit, 2 files, [32m+2[39m[39m[90m)[39m[39m-π [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mSquashing 2 commits & working tree changes into a single commit [90m(2 files, [32m+2[39m[39m[90m)[39m...[39m+[2mβ³[22m [2mBackup created @ 14fc72d[22m+[36mβ[39m [36mGenerating squash commit message...[39m+[107m [0m [1mfix: update files[22m+[32mβ[39m [32mSquashed @ [2m257ac9f[22m[39m+[36mβ[39m [36mMerging 1 commit to [1mmain[22m @ [2m257ac9f[22m (no rebase needed)[39m+[107m [0m * [33m257ac9f[m fix: update files+[107m [0m file1.txt | 1 [32m+[m+[107m [0m file2.txt | 1 [32m+[m+[107m [0m 2 files changed, 2 insertions(+)+[32mβ[39m [32mMerged to [1mmain[22m [90m(1 commit, 2 files, [32m+2[39m[39m[90m)[39m[39m+[36mβ[39m [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snapindex 18be53cd4..e93a373b7 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap@@ -29,9 +29,9 @@ exit_code: 0----- stdout ---------- stderr ------π [36mMerging 1 commit to [1mmain[22m @ [2mfc12499[22m (no commit/squash/rebase needed)[39m-[107m [0m * [33mfc12499[m Add feature file-[107m [0m feature.txt | 1 [32m+[m-[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mMerging 1 commit to [1mmain[22m @ [2mfc12499[22m (no commit/squash/rebase needed)[39m+[107m [0m * [33mfc12499[m Add feature file+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)+[32mβ[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m+[36mβ[39m [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --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 2ae40d824..b0cf2c005 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@@ -30,11 +30,11 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRebasing onto [1mstaging[22m...[39m-β [32mRebased onto [1mstaging[22m[39m-π [36mMerging 1 commit to [1mstaging[22m @ [2m278a642[22m (no commit/squash needed)[39m-[107m [0m * [33m278a642[m Add feature for staging-[107m [0m feature.txt | 1 [32m+[m-[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mstaging[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36mRemoving [1mfeature-for-staging[22m worktree & branch in background (same commit as [1mstaging[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mRebasing onto [1mstaging[22m...[39m+[32mβ[39m [32mRebased onto [1mstaging[22m[39m+[36mβ[39m [36mMerging 1 commit to [1mstaging[22m @ [2m278a642[22m (no commit/squash needed)[39m+[107m [0m * [33m278a642[m Add feature for staging+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)+[32mβ[39m [32mMerged to [1mstaging[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m+[36mβ[39m [36mRemoving [1mfeature-for-staging[22m worktree & branch in background (same commit as [1mstaging[22m,[39m [2m_[22m[36m)[39mdiff --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 9b2cd4c3d..03c572500 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@@ -30,9 +30,9 @@ exit_code: 0----- stdout ---------- stderr ------π [36mMerging 1 commit to [1mmain[22m @ [2mfc12499[22m (no commit/squash/rebase needed)[39m-[107m [0m * [33mfc12499[m Add feature file-[107m [0m feature.txt | 1 [32m+[m-[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mMerging 1 commit to [1mmain[22m @ [2mfc12499[22m (no commit/squash/rebase needed)[39m+[107m [0m * [33mfc12499[m Add feature file+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)+[32mβ[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m+[36mβ[39m [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snapindex 171838ee7..2ea4f7ebd 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap@@ -30,9 +30,9 @@ exit_code: 0----- stdout ---------- stderr ------π [36mMerging 1 commit to [1mmain[22m @ [2mfc12499[22m (no commit/squash/rebase needed)[39m-[107m [0m * [33mfc12499[m Add feature file-[107m [0m feature.txt | 1 [32m+[m-[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-π [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mMerging 1 commit to [1mmain[22m @ [2mfc12499[22m (no commit/squash/rebase needed)[39m+[107m [0m * [33mfc12499[m Add feature file+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)+[32mβ[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m+[36mβ[39m [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --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 0c21149b2..e54cb51cf 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@@ -15,10 +15,12 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -29,9 +31,9 @@ exit_code: 0----- stdout ---------- stderr ------π [36mMerging 1 commit to [1mmain[22m @ [2mfc12499[22m (no commit/squash/rebase needed)[39m-[107m [0m * [33mfc12499[m Add feature file-[107m [0m feature.txt | 1 [32m+[m-[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-βͺ Worktree preserved (--no-remove)+[36mβ[39m [36mMerging 1 commit to [1mmain[22m @ [2mfc12499[22m (no commit/squash/rebase needed)[39m+[107m [0m * [33mfc12499[m Add feature file+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)+[32mβ[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m+[2mβ[22m 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 1edbfebae..6d7009a1f 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@@ -32,19 +32,19 @@ exit_code: 0----- stdout ---------- stderr ------π‘ [33mAuto-staging 2 untracked paths:[39m-[107m [0m untracked1.txt-[107m [0m untracked2.txt-π [36mSquashing 1 commit & working tree changes into a single commit [90m(3 files, [32m+3[39m[39m[90m)[39m...[39m-π‘ [2mBackup created @ fefa700[22m-π [36mGenerating squash commit message...[39m-[107m [0m [1mfix: commit changes[22m-β [32mSquashed @ [2m69f015f[22m[39m-π [36mMerging 1 commit to [1mmain[22m @ [2m69f015f[22m (no rebase needed)[39m-[107m [0m * [33m69f015f[m fix: commit changes-[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 [90m(1 commit, 3 files, [32m+3[39m[39m[90m)[39m[39m-π [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[33mβ²[39m [33mAuto-staging 2 untracked paths:[39m+[107m [0m untracked1.txt+[107m [0m untracked2.txt+[36mβ[39m [36mSquashing 1 commit & working tree changes into a single commit [90m(3 files, [32m+3[39m[39m[90m)[39m...[39m+[2mβ³[22m [2mBackup created @ fefa700[22m+[36mβ[39m [36mGenerating squash commit message...[39m+[107m [0m [1mfix: commit changes[22m+[32mβ[39m [32mSquashed @ [2m69f015f[22m[39m+[36mβ[39m [36mMerging 1 commit to [1mmain[22m @ [2m69f015f[22m (no rebase needed)[39m+[107m [0m * [33m69f015f[m fix: commit changes+[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(+)+[32mβ[39m [32mMerged to [1mmain[22m [90m(1 commit, 3 files, [32m+3[39m[39m[90m)[39m[39m+[36mβ[39m [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snapindex 18ea7f4db..0de3973e6 100644--- a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap@@ -31,20 +31,20 @@ exit_code: 0----- stdout ---------- stderr ------π [36mSquashing 3 commits into a single commit [90m(3 files, [32m+33[39m[39m[90m)[39m...[39m-π [36mGenerating squash commit message...[39m-[107m [0m [1mfeat(auth): Implement JWT authentication system[22m-[107m [0m-[107m [0m Add comprehensive JWT token handling including validation, refresh logic,-[107m [0m and authentication tests. This establishes the foundation for secure-[107m [0m API authentication.-[107m [0m-[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 @ [2m85d3884[22m[39m-π [36mRunning project pre-merge [1mtest[22m:[39m-[107m [0m [2m[0m[2m[34mcargo[0m[2m test+[36mβ[39m [36mSquashing 3 commits into a single commit [90m(3 files, [32m+33[39m[39m[90m)[39m...[39m+[36mβ[39m [36mGenerating squash commit message...[39m+[107m [0m [1mfeat(auth): Implement JWT authentication system[22m+[107m [0m+[107m [0m Add comprehensive JWT token handling including validation, refresh logic,+[107m [0m and authentication tests. This establishes the foundation for secure+[107m [0m API authentication.+[107m [0m+[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+[32mβ[39m [32mSquashed @ [2m85d3884[22m[39m+[36mβ[39m [36mRunning project pre-merge [1mtest[22m:[39m+[107m [0m [2m[0m[2m[34mcargo[0m[2m test[0m Finished test [unoptimized + debuginfo] target(s) in 0.12sRunning unittests src/lib.rs (target/debug/deps/worktrunk-abc123)@@ -55,20 +55,20 @@ 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 project pre-merge [1mlint[22m:[39m-[107m [0m [2m[0m[2m[34mcargo[0m[2m clippy+[36mβ[39m [36mRunning project pre-merge [1mlint[22m:[39m+[107m [0m [2m[0m[2m[34mcargo[0m[2m clippy[0m Checking worktrunk v0.1.0Finished dev [unoptimized + debuginfo] target(s) in 1.23s-π [36mMerging 1 commit to [1mmain[22m @ [2m85d3884[22m (no rebase needed)[39m-[107m [0m * [33m85d3884[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 [90m(1 commit, 3 files, [32m+33[39m[39m[90m)[39m[39m-π [36mRemoving [1mfeature-auth[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m-π [36mRunning project post-merge [1minstall[22m:[39m-[107m [0m [2m[0m[2m[34mcargo[0m[2m install [0m[2m[36m--path[0m[2m .+[36mβ[39m [36mMerging 1 commit to [1mmain[22m @ [2m85d3884[22m (no rebase needed)[39m+[107m [0m * [33m85d3884[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(+)+[32mβ[39m [32mMerged to [1mmain[22m [90m(1 commit, 3 files, [32m+33[39m[39m[90m)[39m[39m+[36mβ[39m [36mRemoving [1mfeature-auth[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mRunning project post-merge [1minstall[22m:[39m+[107m [0m [2m[0m[2m[34mcargo[0m[2m install [0m[2m[36m--path[0m[2m .[0m Installing worktrunk v0.1.0Compiling worktrunk v0.1.0Finished release [optimized] target(s) in 2.34sdiff --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 a7a5007b8..2f93338be 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@@ -21,6 +21,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -31,12 +32,12 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRunning project post-create [1minstall[22m:[39m-[107m [0m [2m[0m[2m[34muv[0m[2m sync+[36mβ[39m [36mRunning project post-create [1minstall[22m:[39m+[107m [0m [2m[0m[2m[34muv[0m[2m syncResolved 24 packages in 145msInstalled 24 packages in 1.2s-β [32mCreated new worktree for [1mfeature-x[22m from [1mmain[22m @ [1m_REPO_.feature-x[22m[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m-π [36mRunning project post-start [1mdev[22m:[39m-[107m [0m [2m[0m[2m[34muv[0m[2m run dev+[32mβ[39m [32mCreated new worktree for [1mfeature-x[22m from [1mmain[22m @ [1m_REPO_.feature-x[22m[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[36mβ[39m [36mRunning project post-start [1mdev[22m:[39m+[107m [0m [2m[0m[2m[34muv[0m[2m run devdiff --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 f5cdaf4e7..d13779fe1 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@@ -31,15 +31,15 @@ exit_code: 0----- stdout ---------- stderr ------π [36mSquashing 3 commits into a single commit [90m(2 files, [32m+45[39m[39m[90m)[39m...[39m-π [36mGenerating squash commit message...[39m-[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 @ [2m7323bc5[22m[39m-π [36mRunning project pre-merge [1mtest[22m:[39m-[107m [0m [2m[0m[2m[34muv[0m[2m run pytest+[36mβ[39m [36mSquashing 3 commits into a single commit [90m(2 files, [32m+45[39m[39m[90m)[39m...[39m+[36mβ[39m [36mGenerating squash commit message...[39m+[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.+[32mβ[39m [32mSquashed @ [2m7323bc5[22m[39m+[36mβ[39m [36mRunning project pre-merge [1mtest[22m:[39m+[107m [0m [2m[0m[2m[34muv[0m[2m run pytest============================= test session starts ==============================collected 3 items@@ -50,15 +50,15 @@ tests/test_auth.py::test_token_validation PASSED [100%]============================== 3 passed in 0.8s ===============================-π [36mRunning project pre-merge [1mlint[22m:[39m-[107m [0m [2m[0m[2m[34muv[0m[2m run ruff check+[36mβ[39m [36mRunning project pre-merge [1mlint[22m:[39m+[107m [0m [2m[0m[2m[34muv[0m[2m run ruff checkAll checks passed!-π [36mMerging 1 commit to [1mmain[22m @ [2m7323bc5[22m (no rebase needed)[39m-[107m [0m * [33m7323bc5[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 [90m(1 commit, 2 files, [32m+45[39m[39m[90m)[39m[39m-π [36mRemoving [1mfeature-auth[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mMerging 1 commit to [1mmain[22m @ [2m7323bc5[22m (no rebase needed)[39m+[107m [0m * [33m7323bc5[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(+)+[32mβ[39m [32mMerged to [1mmain[22m [90m(1 commit, 2 files, [32m+45[39m[39m[90m)[39m[39m+[36mβ[39m [36mRemoving [1mfeature-auth[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snapindex 170e648e6..73c09320d 100644--- a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap@@ -30,9 +30,9 @@ exit_code: 0----- stdout ---------- stderr ------π [36mMerging 1 commit to [1mmain[22m @ [2m8f777c3[22m (no commit/squash/rebase needed)[39m-[107m [0m * [33m8f777c3[m Implement JWT validation-[107m [0m auth.rs | 13 [32m+++++++++++++[m-[107m [0m 1 file changed, 13 insertions(+)-β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+13[39m[39m[90m)[39m[39m-π [36mRemoving [1mfix-auth[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mMerging 1 commit to [1mmain[22m @ [2m8f777c3[22m (no commit/squash/rebase needed)[39m+[107m [0m * [33m8f777c3[m Implement JWT validation+[107m [0m auth.rs | 13 [32m+++++++++++++[m+[107m [0m 1 file changed, 13 insertions(+)+[32mβ[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+13[39m[39m[90m)[39m[39m+[36mβ[39m [36mRemoving [1mfix-auth[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --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 8d8dae71a..356e85615 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@@ -20,6 +20,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -30,5 +31,5 @@ exit_code: 0----- stdout ---------- stderr ------β [32mCreated new worktree for [1mfix-auth[22m from [1mmain[22m @ [1m_REPO_.fix-auth[22m[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[32mβ[39m [32mCreated new worktree for [1mfix-auth[22m from [1mmain[22m @ [1m_REPO_.fix-auth[22m[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --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 2e68bfac5..cca81e126 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@@ -16,10 +16,12 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_COMMIT_GENERATION__ARGS: "fix: update file"@@ -32,7 +34,7 @@ exit_code: 0----- stdout ---------- stderr ------βͺ Skipping pre-commit hooks ([90m--no-verify[39m)-π [36mGenerating commit message and committing tracked changes... [90m(1 file, [32m+1[39m, [31m-1[39m[39m[90m)[39m[39m-[107m [0m [1mfix: update file[22m-β [32mCommitted changes @ [2mb92c41b[22m[39m+[2mβ[22m Skipping pre-commit hooks ([90m--no-verify[39m)+[36mβ[39m [36mGenerating commit message and committing tracked changes... [90m(1 file, [32m+1[39m, [31m-1[39m[39m[90m)[39m[39m+[107m [0m [1mfix: update file[22m+[32mβ[39m [32mCommitted changes @ [2mb92c41b[22m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__step_commit_no_verify.snap b/tests/snapshots/integration__integration_tests__merge__step_commit_no_verify.snapindex 009104392..87e44002b 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@@ -15,10 +15,12 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_COMMIT_GENERATION__ARGS: "feat: add file"@@ -31,10 +33,10 @@ exit_code: 0----- stdout ---------- stderr ------βͺ Skipping pre-commit hooks ([90m--no-verify[39m)-π‘ [33mAuto-staging 2 untracked paths:[39m-[107m [0m .config/-[107m [0m file1.txt-π [36mGenerating commit message and committing changes... [90m(2 files, [32m+2[39m[39m[90m)[39m[39m-[107m [0m [1mfeat: add file[22m-β [32mCommitted changes @ [2m388183d[22m[39m+[2mβ[22m Skipping pre-commit hooks ([90m--no-verify[39m)+[33mβ²[39m [33mAuto-staging 2 untracked paths:[39m+[107m [0m .config/+[107m [0m file1.txt+[36mβ[39m [36mGenerating commit message and committing changes... [90m(2 files, [32m+2[39m[39m[90m)[39m[39m+[107m [0m [1mfeat: add file[22m+[32mβ[39m [32mCommitted changes @ [2m388183d[22m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__step_commit_nothing_to_commit.snap b/tests/snapshots/integration__integration_tests__merge__step_commit_nothing_to_commit.snapindex 800dc9422..785fb0f34 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@@ -7,6 +7,7 @@ info:- commit- "--stage=none"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -14,16 +15,22 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_COMMIT_GENERATION__ARGS: "feat: this should fail"WORKTRUNK_COMMIT_GENERATION__COMMAND: echoWORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: falseexit_code: 1----- stdout ---------- stderr ------β [31mNothing to commit[39m+[31mβ[39m [31mNothing to commit[39mdiff --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 fc8d4eb78..44b1b5865 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@@ -15,10 +15,12 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_COMMIT_GENERATION__ARGS: "fix: update tracked file"@@ -31,6 +33,6 @@ exit_code: 0----- stdout ---------- stderr ------π [36mGenerating commit message and committing tracked changes... [90m(1 file, [32m+1[39m, [31m-1[39m[39m[90m)[39m[39m-[107m [0m [1mfix: update tracked file[22m-β [32mCommitted changes @ [2m0495397[22m[39m+[36mβ[39m [36mGenerating commit message and committing tracked changes... [90m(1 file, [32m+1[39m, [31m-1[39m[39m[90m)[39m[39m+[107m [0m [1mfix: update tracked file[22m+[32mβ[39m [32mCommitted changes @ [2m0495397[22m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__step_squash_both_flags.snap b/tests/snapshots/integration__integration_tests__merge__step_squash_both_flags.snapindex 8a4462b1a..b053ca82e 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@@ -16,10 +16,12 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_COMMIT_GENERATION__ARGS: "squash: combined commits"@@ -32,9 +34,9 @@ exit_code: 0----- stdout ---------- stderr ------βͺ Skipping pre-commit hooks ([90m--no-verify[39m)-π [36mSquashing 2 commits & tracked changes into a single commit [90m(3 files, [32m+3[39m[39m[90m)[39m...[39m-π‘ [2mBackup created @ ef0df66[22m-π [36mGenerating squash commit message...[39m-[107m [0m [1msquash: combined commits[22m-β [32mSquashed @ [2m3c1afb6[22m[39m+[2mβ[22m Skipping pre-commit hooks ([90m--no-verify[39m)+[36mβ[39m [36mSquashing 2 commits & tracked changes into a single commit [90m(3 files, [32m+3[39m[39m[90m)[39m...[39m+[2mβ³[22m [2mBackup created @ ef0df66[22m+[36mβ[39m [36mGenerating squash commit message...[39m+[107m [0m [1msquash: combined commits[22m+[32mβ[39m [32mSquashed @ [2m3c1afb6[22m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__step_squash_no_commits.snap b/tests/snapshots/integration__integration_tests__merge__step_squash_no_commits.snapindex 71e9108cd..79c4641c2 100644--- a/tests/snapshots/integration__integration_tests__merge__step_squash_no_commits.snap+++ b/tests/snapshots/integration__integration_tests__merge__step_squash_no_commits.snap@@ -6,6 +6,7 @@ info:- step- squashenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,14 +14,20 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0----- stdout ---------- stderr ------βͺ Nothing to squash; no commits ahead of main+[2mβ[22m Nothing to squash; no commits ahead of maindiff --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 76ab7c15c..04b0794a3 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@@ -15,10 +15,12 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_COMMIT_GENERATION__ARGS: "squash: combined commits"@@ -31,8 +33,8 @@ exit_code: 0----- stdout ---------- stderr ------βͺ Skipping pre-commit hooks ([90m--no-verify[39m)-π [36mSquashing 2 commits into a single commit [90m(3 files, [32m+3[39m[39m[90m)[39m...[39m-π [36mGenerating squash commit message...[39m-[107m [0m [1msquash: combined commits[22m-β [32mSquashed @ [2mfc99904[22m[39m+[2mβ[22m Skipping pre-commit hooks ([90m--no-verify[39m)+[36mβ[39m [36mSquashing 2 commits into a single commit [90m(3 files, [32m+3[39m[39m[90m)[39m...[39m+[36mβ[39m [36mGenerating squash commit message...[39m+[107m [0m [1msquash: combined commits[22m+[32mβ[39m [32mSquashed @ [2mfc99904[22m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__step_squash_single_commit.snap b/tests/snapshots/integration__integration_tests__merge__step_squash_single_commit.snapindex 6959bf404..140661ae4 100644--- a/tests/snapshots/integration__integration_tests__merge__step_squash_single_commit.snap+++ b/tests/snapshots/integration__integration_tests__merge__step_squash_single_commit.snap@@ -6,6 +6,7 @@ info:- step- squashenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,14 +14,20 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0----- stdout ---------- stderr ------βͺ Nothing to squash; already a single commit+[2mβ[22m Nothing to squash; already a single commitdiff --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 a81cc839f..a5d276333 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@@ -15,10 +15,12 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_COMMIT_GENERATION__ARGS: "squash: combined commits"@@ -31,8 +33,8 @@ exit_code: 0----- stdout ---------- stderr ------π [36mSquashing 2 commits & tracked changes into a single commit [90m(2 files, [32m+2[39m[39m[90m)[39m...[39m-π‘ [2mBackup created @ 6aa1805[22m-π [36mGenerating squash commit message...[39m-[107m [0m [1msquash: combined commits[22m-β [32mSquashed @ [2m7335b29[22m[39m+[36mβ[39m [36mSquashing 2 commits & tracked changes into a single commit [90m(2 files, [32m+2[39m[39m[90m)[39m...[39m+[2mβ³[22m [2mBackup created @ 6aa1805[22m+[36mβ[39m [36mGenerating squash commit message...[39m+[107m [0m [1msquash: combined commits[22m+[32mβ[39m [32mSquashed @ [2m7335b29[22m[39mdiff --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 759f1c02c..a4fbec8a6 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@@ -20,6 +20,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -30,9 +31,9 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRunning project post-create:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Setup done'[0m[2m [0m[2m[36m>[0m[2m setup.txt-[0mβ [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m-π [36mRunning project post-start [1mserver[22m:[39m-[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+[36mβ[39m [36mRunning project post-create:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Setup done'[0m[2m [0m[2m[36m>[0m[2m setup.txt+[0m[32mβ[39m [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[36mβ[39m [36mRunning project post-start [1mserver[22m:[39m+[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.txtdiff --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 700aa3fe8..efdbcbb11 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@@ -22,6 +22,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -32,8 +33,8 @@ exit_code: 0----- stdout ---------- stderr ------β [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m-π [36mRunning project post-start:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Background task'[0m[2m [0m[2m[36m>[0m[2m background.txt-π [36mExecuting (--execute):[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Execute flag'[0m[2m [0m[2m[36m>[0m[2m execute.txt+[32mβ[39m [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m+[36mβ[39m [36mRunning project post-start:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Background task'[0m[2m [0m[2m[36m>[0m[2m background.txt+[36mβ[39m [36mExecuting (--execute):[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Execute flag'[0m[2m [0m[2m[36m>[0m[2m execute.txtdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__invalid_toml.snap b/tests/snapshots/integration__integration_tests__post_start_commands__invalid_toml.snapindex 2c8ad6924..88ad900c1 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__invalid_toml.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__invalid_toml.snap@@ -7,6 +7,7 @@ info:- "--create"- featureenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -14,20 +15,25 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: falseexit_code: 1----- stdout ---------- stderr ------β [31mFailed to load project config[39m-[107m [0m Failed to parse TOML: TOML parse error at line 1, column 31-[107m [0m |-[107m [0m 1 | post-create = [invalid syntax-[107m [0m | ^-[107m [0m unclosed array, expected `]`+[31mβ[39m [31mFailed to load project config[39m+[107m [0m Failed to parse TOML: TOML parse error at line 1, column 31+[107m [0m |+[107m [0m 1 | post-create = [invalid syntax+[107m [0m | ^+[107m [0m unclosed array, expected `]`diff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_default_branch_template.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_default_branch_template.snapindex 80bfe8a4a..30c7a63e9 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_default_branch_template.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_default_branch_template.snap@@ -21,6 +21,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -31,7 +32,7 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRunning project post-create:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Default: main'[0m[2m [0m[2m[36m>[0m[2m default.txt-[0mβ [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[36mβ[39m [36mRunning project post-create:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Default: main'[0m[2m [0m[2m[36m>[0m[2m default.txt+[0m[32mβ[39m [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --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 89f0c2851..e46e71ae3 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@@ -20,6 +20,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -30,8 +31,8 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRunning project post-create:[39m-[107m [0m [2m[0m[2m[34mexit[0m[2m 1-[0mπ‘ [33mCommand failed: exit status: 1[39m-β [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[36mβ[39m [36mRunning project post-create:[39m+[107m [0m [2m[0m[2m[34mexit[0m[2m 1+[0m[33mβ²[39m [33mCommand failed: exit status: 1[39m+[32mβ[39m [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_git_variables_template.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_git_variables_template.snapindex f918cdaf0..3efc3110c 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_git_variables_template.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_git_variables_template.snap@@ -21,6 +21,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -31,13 +32,13 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRunning project post-create [1mcommit[22m:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Commit: 5caad75ed9319b7bd5c35c626d7051d252f987e7'[0m[2m [0m[2m[36m>[0m[2m git_vars.txt-[0mπ [36mRunning project post-create [1mshort[22m:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Short: 5caad75'[0m[2m [0m[2m[36m>>[0m[2m git_vars.txt-[0mπ [36mRunning project post-create [1mremote[22m:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Remote: origin'[0m[2m [0m[2m[36m>>[0m[2m git_vars.txt-[0mπ [36mRunning project post-create [1mworktree_name[22m:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Worktree Name: repo.feature'[0m[2m [0m[2m[36m>>[0m[2m git_vars.txt-[0mβ [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[36mβ[39m [36mRunning project post-create [1mcommit[22m:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Commit: 5caad75ed9319b7bd5c35c626d7051d252f987e7'[0m[2m [0m[2m[36m>[0m[2m git_vars.txt+[0m[36mβ[39m [36mRunning project post-create [1mshort[22m:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Short: 5caad75'[0m[2m [0m[2m[36m>>[0m[2m git_vars.txt+[0m[36mβ[39m [36mRunning project post-create [1mremote[22m:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Remote: origin'[0m[2m [0m[2m[36m>>[0m[2m git_vars.txt+[0m[36mβ[39m [36mRunning project post-create [1mworktree_name[22m:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Worktree Name: repo.feature'[0m[2m [0m[2m[36m>>[0m[2m git_vars.txt+[0m[32mβ[39m [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --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 3f233057b..cc510a3af 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@@ -20,6 +20,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -30,11 +31,11 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRunning project post-create:[39m-[107m [0m [2m[0m[2m[35mif[0m[2m [ ! -f test.txt ]; [0m[2m[35mthen[0m[2m[0m[2m-[107m [0m [2m [0m[2m[34mecho[0m[2m [0m[2m[32m'File does not exist'[0m[2m [0m[2m[36m>[0m[2m result.txt-[107m [0m [2m[0m[2m[34melse[0m[2m-[107m [0m [2m [0m[2m[34mecho[0m[2m [0m[2m[32m'File exists'[0m[2m [0m[2m[36m>[0m[2m result.txt-[107m [0m [2m[0m[2m[34mfi[0m[2m-[0mβ [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[36mβ[39m [36mRunning project post-create:[39m+[107m [0m [2m[0m[2m[35mif[0m[2m [ ! -f test.txt ]; [0m[2m[35mthen[0m[2m[0m[2m+[107m [0m [2m [0m[2m[34mecho[0m[2m [0m[2m[32m'File does not exist'[0m[2m [0m[2m[36m>[0m[2m result.txt+[107m [0m [2m[0m[2m[34melse[0m[2m+[107m [0m [2m [0m[2m[34mecho[0m[2m [0m[2m[32m'File exists'[0m[2m [0m[2m[36m>[0m[2m result.txt+[107m [0m [2m[0m[2m[34mfi[0m[2m+[0m[32mβ[39m [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --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 26645245d..0270dbfb9 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@@ -20,6 +20,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -30,11 +31,11 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRunning project post-create [1minstall[22m:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Installing deps'[0m[2m+[36mβ[39m [36mRunning project post-create [1minstall[22m:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Installing deps'[0m[2m[0mInstalling deps-π [36mRunning project post-create [1msetup[22m:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Running setup'[0m[2m+[36mβ[39m [36mRunning project post-create [1msetup[22m:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Running setup'[0m[2m[0mRunning setup-β [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[32mβ[39m [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --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 fa5465068..f7275e522 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@@ -20,6 +20,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -30,5 +31,5 @@ exit_code: 0----- stdout ---------- stderr ------β [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[32mβ[39m [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --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 f2f92fac3..efac0ae7a 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@@ -20,6 +20,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -30,8 +31,8 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRunning project post-create:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Setup complete'[0m[2m+[36mβ[39m [36mRunning project post-create:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Setup complete'[0m[2m[0mSetup complete-β [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[32mβ[39m [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --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 969966af4..7a28da131 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@@ -20,6 +20,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -30,13 +31,13 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRunning project post-create [1mrepo[22m:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Repo: repo'[0m[2m [0m[2m[36m>[0m[2m info.txt-[0mπ [36mRunning project post-create [1mbranch[22m:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Branch: feature-test'[0m[2m [0m[2m[36m>>[0m[2m info.txt-[0mπ [36mRunning project post-create [1mworktree[22m:[39m-[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π [36mRunning project post-create [1mroot[22m:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Root: _REPO_'[0m[2m [0m[2m[36m>>[0m[2m info.txt-[0mβ [32mCreated new worktree for [1mfeature/test[22m from [1mmain[22m @ [1m_REPO_.feature-test[22m[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[36mβ[39m [36mRunning project post-create [1mrepo[22m:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Repo: repo'[0m[2m [0m[2m[36m>[0m[2m info.txt+[0m[36mβ[39m [36mRunning project post-create [1mbranch[22m:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Branch: feature-test'[0m[2m [0m[2m[36m>>[0m[2m info.txt+[0m[36mβ[39m [36mRunning project post-create [1mworktree[22m:[39m+[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[36mβ[39m [36mRunning project post-create [1mroot[22m:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Root: _REPO_'[0m[2m [0m[2m[36m>>[0m[2m info.txt+[0m[32mβ[39m [32mCreated new worktree for [1mfeature/test[22m from [1mmain[22m @ [1m_REPO_.feature-test[22m[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_upstream_template.snap b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_upstream_template.snapindex 8fa2c9588..de3de8cd6 100644--- a/tests/snapshots/integration__integration_tests__post_start_commands__post_create_upstream_template.snap+++ b/tests/snapshots/integration__integration_tests__post_start_commands__post_create_upstream_template.snap@@ -21,6 +21,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -31,7 +32,7 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRunning project post-create:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Upstream: '[0m[2m [0m[2m[36m>[0m[2m upstream.txt-[0mβ [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[36mβ[39m [36mRunning project post-create:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Upstream: '[0m[2m [0m[2m[36m>[0m[2m upstream.txt+[0m[32mβ[39m [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --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 53a394bd5..7d4e05087 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@@ -20,6 +20,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -30,9 +31,9 @@ exit_code: 0----- stdout ---------- stderr ------β [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m-π [36mRunning project post-start:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m 'line1-[107m [0m [2m[0m[2m[34mline2[0m[2m-[107m [0m [2m[0m[2m[34mline3[0m[2m' | grep line2 > filtered.txt+[32mβ[39m [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[36mβ[39m [36mRunning project post-start:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m 'line1+[107m [0m [2m[0m[2m[34mline2[0m[2m+[107m [0m [2m[0m[2m[34mline3[0m[2m' | grep line2 > filtered.txtdiff --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 892fdf393..7f40e35cd 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@@ -20,6 +20,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -30,7 +31,7 @@ exit_code: 0----- stdout ---------- stderr ------β [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m-π [36mRunning project post-start:[39m-[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+[32mβ[39m [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[36mβ[39m [36mRunning project post-start:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'POST-START-RAN'[0m[2m [0m[2m[36m>[0m[2m post_start_marker.txtdiff --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 c61bdb140..fa3d57d82 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@@ -20,6 +20,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -30,7 +31,7 @@ exit_code: 0----- stdout ---------- stderr ------β [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m-π [36mRunning project post-start:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m 'unclosed quote+[32mβ[39m [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[36mβ[39m [36mRunning project post-start:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m 'unclosed quotediff --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 58304754c..bdf92d2bc 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@@ -20,6 +20,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -30,7 +31,7 @@ exit_code: 0----- stdout ---------- stderr ------β [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m-π [36mRunning project post-start:[39m-[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+[32mβ[39m [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[36mβ[39m [36mRunning project post-start:[39m+[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 >&2diff --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 14af782c0..ee568d6ea 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@@ -20,6 +20,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -30,9 +31,9 @@ exit_code: 0----- stdout ---------- stderr ------β [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m-π [36mRunning project post-start:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'first line'[0m[2m [0m[2m[36m>[0m[2m multiline.txt-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'second line'[0m[2m [0m[2m[36m>>[0m[2m multiline.txt-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'third line'[0m[2m [0m[2m[36m>>[0m[2m multiline.txt+[32mβ[39m [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[36mβ[39m [36mRunning project post-start:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'first line'[0m[2m [0m[2m[36m>[0m[2m multiline.txt+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'second line'[0m[2m [0m[2m[36m>>[0m[2m multiline.txt+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'third line'[0m[2m [0m[2m[36m>>[0m[2m multiline.txtdiff --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 a64f47b37..fdb6347e2 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@@ -20,6 +20,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -30,9 +31,9 @@ exit_code: 0----- stdout ---------- stderr ------β [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m-π [36mRunning project post-start [1mtask1[22m:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Task 1 running'[0m[2m [0m[2m[36m>[0m[2m task1.txt-π [36mRunning project post-start [1mtask2[22m:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Task 2 running'[0m[2m [0m[2m[36m>[0m[2m task2.txt+[32mβ[39m [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[36mβ[39m [36mRunning project post-start [1mtask1[22m:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Task 1 running'[0m[2m [0m[2m[36m>[0m[2m task1.txt+[36mβ[39m [36mRunning project post-start [1mtask2[22m:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Task 2 running'[0m[2m [0m[2m[36m>[0m[2m task2.txtdiff --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 d7ded16a1..fed639a0b 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@@ -20,6 +20,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -30,11 +31,11 @@ exit_code: 0----- stdout ---------- stderr ------β [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m-π [36mRunning project post-start [1mtask1[22m:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'TASK1_OUTPUT'[0m[2m-π [36mRunning project post-start [1mtask2[22m:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'TASK2_OUTPUT'[0m[2m-π [36mRunning project post-start [1mtask3[22m:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'TASK3_OUTPUT'[0m[2m+[32mβ[39m [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[36mβ[39m [36mRunning project post-start [1mtask1[22m:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'TASK1_OUTPUT'[0m[2m+[36mβ[39m [36mRunning project post-start [1mtask2[22m:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'TASK2_OUTPUT'[0m[2m+[36mβ[39m [36mRunning project post-start [1mtask3[22m:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'TASK3_OUTPUT'[0m[2mdiff --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 babac8732..92cd4bac3 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@@ -20,6 +20,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -30,7 +31,7 @@ exit_code: 0----- stdout ---------- stderr ------β [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m-π [36mRunning project post-start:[39m-[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+[32mβ[39m [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[36mβ[39m [36mRunning project post-start:[39m+[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.txtdiff --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 a20627018..4ae917d78 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@@ -19,6 +19,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -29,5 +30,5 @@ exit_code: 0----- stdout ---------- stderr ------π‘ [33mWorktree for [1mfeature[22m @ [1m_REPO_.feature[22m, but cannot change directory β shell integration not installed[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[33mβ²[39m [33mWorktree for [1mfeature[22m @ [1m_REPO_.feature[22m, but cannot change directory β shell integration not installed[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --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 de5eb4b0d..7757111b2 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@@ -15,10 +15,12 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -29,10 +31,10 @@ exit_code: 0----- stdout ---------- stderr ------π [36mStashing changes in [1m_REPO_[22m...[39m-π [36mPushing 1 commit to [1mmain[22m @ [2mfc12499[22m[39m-[107m [0m * [33mfc12499[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 [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m+[36mβ[39m [36mStashing changes in [1m_REPO_[22m...[39m+[36mβ[39m [36mPushing 1 commit to [1mmain[22m @ [2mfc12499[22m[39m+[107m [0m * [33mfc12499[m Add feature file+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)+[36mβ[39m [36mRestoring stashed changes in [1m_REPO_[22m...[39m+[32mβ[39m [32mPushed to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__push__push_dirty_target_overlap.snap b/tests/snapshots/integration__integration_tests__push__push_dirty_target_overlap.snapindex 8843475cf..f7f2f52d0 100644--- a/tests/snapshots/integration__integration_tests__push__push_dirty_target_overlap.snap+++ b/tests/snapshots/integration__integration_tests__push__push_dirty_target_overlap.snap@@ -31,7 +31,7 @@ exit_code: 1----- stdout ---------- stderr ------β [31mCannot push: conflicting uncommitted changes in:[39m-[107m [0m conflict.txt+[31mβ[39m [31mCannot push: conflicting uncommitted changes in:[39m+[107m [0m conflict.txt-π‘ [2mCommit or stash these changes in _REPO_ first[22m+[2mβ³[22m [2mCommit or stash these changes in _REPO_ first[22mdiff --git a/tests/snapshots/integration__integration_tests__push__push_dirty_target_overlap_renamed_file.snap b/tests/snapshots/integration__integration_tests__push__push_dirty_target_overlap_renamed_file.snapindex fffb3c8ee..020b00cc6 100644--- a/tests/snapshots/integration__integration_tests__push__push_dirty_target_overlap_renamed_file.snap+++ b/tests/snapshots/integration__integration_tests__push__push_dirty_target_overlap_renamed_file.snap@@ -31,7 +31,7 @@ exit_code: 1----- stdout ---------- stderr ------β [31mCannot push: conflicting uncommitted changes in:[39m-[107m [0m file.txt+[31mβ[39m [31mCannot push: conflicting uncommitted changes in:[39m+[107m [0m file.txt-π‘ [2mCommit or stash these changes in _REPO_ first[22m+[2mβ³[22m [2mCommit or stash these changes in _REPO_ first[22mdiff --git a/tests/snapshots/integration__integration_tests__push__push_error_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_error_not_fast_forward.snapindex 883bd5a99..79872c330 100644--- a/tests/snapshots/integration__integration_tests__push__push_error_not_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__push__push_error_not_fast_forward.snap@@ -20,6 +20,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -30,7 +31,7 @@ exit_code: 1----- stdout ---------- stderr ------β [31mCan't push to local [1mmain[22m branch: it has newer commits[39m-[107m [0m * [33m54bc2d7[m Main commit+[31mβ[39m [31mCan't push to local [1mmain[22m branch: it has newer commits[39m+[107m [0m * [33m54bc2d7[m Main commit-π‘ [2mTo rebase onto [1mmain[22m, run [90mwt step rebase main[39m[22m+[2mβ³[22m [2mTo rebase onto [1mmain[22m, run [90mwt step rebase main[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__push__push_error_with_merge_commits.snap b/tests/snapshots/integration__integration_tests__push__push_error_with_merge_commits.snapindex 29f47a913..6ac694107 100644--- a/tests/snapshots/integration__integration_tests__push__push_error_with_merge_commits.snap+++ b/tests/snapshots/integration__integration_tests__push__push_error_with_merge_commits.snap@@ -31,6 +31,6 @@ exit_code: 1----- stdout ---------- stderr ------β [31mFound merge commits in push range[39m+[31mβ[39m [31mFound merge commits in push range[39m-π‘ [2mTo push non-linear history, run [90mwt merge --allow-merge-commits[39m[22m+[2mβ³[22m [2mTo push non-linear history, run [90mwt merge --allow-merge-commits[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_fast_forward.snapindex 4a7c2b135..8a9627ed1 100644--- a/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap@@ -15,10 +15,12 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -29,8 +31,8 @@ exit_code: 0----- stdout ---------- stderr ------π [36mPushing 1 commit to [1mmain[22m @ [2me26c61d[22m[39m-[107m [0m * [33me26c61d[m Add test file-[107m [0m test.txt | 1 [32m+[m-[107m [0m 1 file changed, 1 insertion(+)-β [32mPushed to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m+[36mβ[39m [36mPushing 1 commit to [1mmain[22m @ [2me26c61d[22m[39m+[107m [0m * [33me26c61d[m Add test file+[107m [0m test.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)+[32mβ[39m [32mPushed to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__push__push_no_remote.snap b/tests/snapshots/integration__integration_tests__push__push_no_remote.snapindex a5782f71b..2ddeb07f5 100644--- a/tests/snapshots/integration__integration_tests__push__push_no_remote.snap+++ b/tests/snapshots/integration__integration_tests__push__push_no_remote.snap@@ -14,10 +14,12 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -28,8 +30,8 @@ exit_code: 0----- stdout ---------- stderr ------π [36mPushing 1 commit to [1mmain[22m @ [2mfc12499[22m[39m-[107m [0m * [33mfc12499[m Add feature file-[107m [0m feature.txt | 1 [32m+[m-[107m [0m 1 file changed, 1 insertion(+)-β [32mPushed to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m+[36mβ[39m [36mPushing 1 commit to [1mmain[22m @ [2mfc12499[22m[39m+[107m [0m * [33mfc12499[m Add feature file+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)+[32mβ[39m [32mPushed to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39mdiff --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 35b0c1c31..011193fec 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@@ -15,10 +15,12 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -29,8 +31,8 @@ exit_code: 0----- stdout ---------- stderr ------π [36mPushing 1 commit to [1mmain[22m @ [2m430212e[22m[39m-[107m [0m * [33m430212e[m Add feature file-[107m [0m feature.txt | 1 [32m+[m-[107m [0m 1 file changed, 1 insertion(+)-β [32mPushed to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m+[36mβ[39m [36mPushing 1 commit to [1mmain[22m @ [2m430212e[22m[39m+[107m [0m * [33m430212e[m Add feature file+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)+[32mβ[39m [32mPushed to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__push__push_to_default.snap b/tests/snapshots/integration__integration_tests__push__push_to_default.snapindex a5782f71b..2ddeb07f5 100644--- a/tests/snapshots/integration__integration_tests__push__push_to_default.snap+++ b/tests/snapshots/integration__integration_tests__push__push_to_default.snap@@ -14,10 +14,12 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -28,8 +30,8 @@ exit_code: 0----- stdout ---------- stderr ------π [36mPushing 1 commit to [1mmain[22m @ [2mfc12499[22m[39m-[107m [0m * [33mfc12499[m Add feature file-[107m [0m feature.txt | 1 [32m+[m-[107m [0m 1 file changed, 1 insertion(+)-β [32mPushed to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m+[36mβ[39m [36mPushing 1 commit to [1mmain[22m @ [2mfc12499[22m[39m+[107m [0m * [33mfc12499[m Add feature file+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)+[32mβ[39m [32mPushed to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39mdiff --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 6cb665dbb..025aa0e52 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@@ -16,10 +16,12 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -30,13 +32,13 @@ exit_code: 0----- stdout ---------- stderr ------π [36mPushing 3 commits to [1mmain[22m @ [2m2489484[22m (merge commits allowed)[39m-[107m [0m * [33m2489484[m Merge temp-[107m [0m [31m|[m[32m/[m-[107m [0m [31m|[m * [33me03c938[m Commit 2-[107m [0m [31m|[m[31m/[m-[107m [0m * [33m9ca7ddd[m Commit 1-[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 [90m(3 commits, 2 files, [32m+2[39m[39m[90m)[39m[39m+[36mβ[39m [36mPushing 3 commits to [1mmain[22m @ [2m2489484[22m (merge commits allowed)[39m+[107m [0m * [33m2489484[m Merge temp+[107m [0m [31m|[m[32m/[m+[107m [0m [31m|[m * [33me03c938[m Commit 2+[107m [0m [31m|[m[31m/[m+[107m [0m * [33m9ca7ddd[m Commit 1+[107m [0m file1.txt | 1 [32m+[m+[107m [0m file2.txt | 1 [32m+[m+[107m [0m 2 files changed, 2 insertions(+)+[32mβ[39m [32mPushed to [1mmain[22m [90m(3 commits, 2 files, [32m+2[39m[39m[90m)[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_executes.snap b/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_executes.snapindex 21bd1d641..3d7b08967 100644--- a/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_executes.snap+++ b/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_executes.snap@@ -31,8 +31,8 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRemoving [1mfeature-hook[22m worktree...[39m-π [36mRunning project pre-remove:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'About to remove worktree'[0m[2m+[36mβ[39m [36mRemoving [1mfeature-hook[22m worktree...[39m+[36mβ[39m [36mRunning project pre-remove:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'About to remove worktree'[0m[2m[0mAbout to remove worktree-β [32mRemoved [1mfeature-hook[22m worktree & branch (same commit as [1mmain[22m,[39m [2m_[22m[32m)[39m+[32mβ[39m [32mRemoved [1mfeature-hook[22m worktree & branch (same commit as [1mmain[22m,[39m [2m_[22m[32m)[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_failure_aborts.snap b/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_failure_aborts.snapindex 42ab57819..d860b081b 100644--- a/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_failure_aborts.snap+++ b/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_failure_aborts.snap@@ -31,9 +31,9 @@ exit_code: 1----- stdout ---------- stderr ------π [36mRemoving [1mfeature-fail[22m worktree...[39m-π [36mRunning project pre-remove:[39m-[107m [0m [2m[0m[2m[34mexit[0m[2m 1-[0mβ [31mpre-remove command failed: exit status: 1[39m+[36mβ[39m [36mRemoving [1mfeature-fail[22m worktree...[39m+[36mβ[39m [36mRunning project pre-remove:[39m+[107m [0m [2m[0m[2m[34mexit[0m[2m 1+[0m[31mβ[39m [31mpre-remove command failed: exit status: 1[39m-π‘ [2mTo skip pre-remove hooks, re-run with [90m--no-verify[39m[22m+[2mβ³[22m [2mTo skip pre-remove hooks, re-run with [90m--no-verify[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_runs_for_detached_head.snap b/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_runs_for_detached_head.snapindex 9c1f393d7..210d12872 100644--- a/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_runs_for_detached_head.snap+++ b/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_runs_for_detached_head.snap@@ -6,6 +6,7 @@ info:- remove- "--no-background"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,17 +14,23 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0----- stdout ---------- stderr ------π [36mRemoving current worktree...[39m-π [36mRunning project pre-remove:[39m-[107m [0m [2m[0m[2m[34mtouch[0m[2m _REPO_/m.txt-[0mβ [32mRemoved worktree (detached HEAD, no branch to delete)[39m+[36mβ[39m [36mRemoving current worktree...[39m+[36mβ[39m [36mRunning project pre-remove:[39m+[107m [0m [2m[0m[2m[34mtouch[0m[2m _REPO_/m.txt+[0m[32mβ[39m [32mRemoved worktree (detached HEAD, no branch to delete)[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_runs_for_detached_head_background.snap b/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_runs_for_detached_head_background.snapindex 8d1b3378b..fafaedbfd 100644--- a/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_runs_for_detached_head_background.snap+++ b/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_runs_for_detached_head_background.snap@@ -5,6 +5,7 @@ info:args:- removeenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -12,16 +13,22 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0----- stdout ---------- stderr ------π [36mRunning project pre-remove:[39m-[107m [0m [2m[0m[2m[34mtouch[0m[2m _REPO_/detached-bg-hook-marker.txt-[0mπ [36mRemoving worktree in background (detached HEAD, no branch to delete)[39m+[36mβ[39m [36mRunning project pre-remove:[39m+[107m [0m [2m[0m[2m[34mtouch[0m[2m _REPO_/detached-bg-hook-marker.txt+[0m[36mβ[39m [36mRemoving worktree in background (detached HEAD, no branch to delete)[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_skipped_with_no_verify.snap b/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_skipped_with_no_verify.snapindex ce2d43ff6..924d4a1e8 100644--- a/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_skipped_with_no_verify.snap+++ b/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_skipped_with_no_verify.snap@@ -32,5 +32,5 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRemoving [1mfeature-skip[22m worktree...[39m-β [32mRemoved [1mfeature-skip[22m worktree & branch (same commit as [1mmain[22m,[39m [2m_[22m[32m)[39m+[36mβ[39m [36mRemoving [1mfeature-skip[22m worktree...[39m+[32mβ[39m [32mRemoved [1mfeature-skip[22m worktree & branch (same commit as [1mmain[22m,[39m [2m_[22m[32m)[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_template_variables.snap b/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_template_variables.snapindex 28a145b78..8291106c9 100644--- a/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_template_variables.snap+++ b/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_template_variables.snap@@ -31,14 +31,14 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRemoving [1mfeature-templates[22m worktree...[39m-π [36mRunning project pre-remove [1mbranch[22m:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Branch: feature-templates'[0m[2m+[36mβ[39m [36mRemoving [1mfeature-templates[22m worktree...[39m+[36mβ[39m [36mRunning project pre-remove [1mbranch[22m:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Branch: feature-templates'[0m[2m[0mBranch: feature-templates-π [36mRunning project pre-remove [1mworktree[22m:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Worktree: _REPO_.feature-templates'[0m[2m+[36mβ[39m [36mRunning project pre-remove [1mworktree[22m:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Worktree: _REPO_.feature-templates'[0m[2m[0mWorktree: _REPO_.feature-templates-π [36mRunning project pre-remove [1mworktree_name[22m:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Name: repo.feature-templates'[0m[2m+[36mβ[39m [36mRunning project pre-remove [1mworktree_name[22m:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Name: repo.feature-templates'[0m[2m[0mName: repo.feature-templates-β [32mRemoved [1mfeature-templates[22m worktree & branch (same commit as [1mmain[22m,[39m [2m_[22m[32m)[39m+[32mβ[39m [32mRemoved [1mfeature-templates[22m worktree & branch (same commit as [1mmain[22m,[39m [2m_[22m[32m)[39mdiff --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 3fcc166c7..be583f7db 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@@ -5,6 +5,7 @@ info:args:- removeenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -12,14 +13,20 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: falseexit_code: 1----- stdout ---------- stderr ------β [31mThe main worktree cannot be removed[39m+[31mβ[39m [31mThe main worktree cannot be removed[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_at_from_detached_head_in_worktree.snap b/tests/snapshots/integration__integration_tests__remove__remove_at_from_detached_head_in_worktree.snapindex e1eddcb21..1b56a41ac 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_at_from_detached_head_in_worktree.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_at_from_detached_head_in_worktree.snap@@ -6,6 +6,7 @@ info:- remove- "@"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,14 +14,20 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0----- stdout ---------- stderr ------π [36mRemoving worktree in background (detached HEAD, no branch to delete)[39m+[36mβ[39m [36mRemoving worktree in background (detached HEAD, no branch to delete)[39mdiff --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 f849dea2b..8db6e5f88 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@@ -30,5 +30,5 @@ exit_code: 0----- stdout ---------- stderr ------π‘ [33mNo worktree found for branch [1mfeature-squashed[22m[39m-β [32mRemoved branch [1mfeature-squashed[22m (tree matches [1mmain[22m,[39m [2mβ[22m[32m)[39m+[33mβ²[39m [33mNo worktree found for branch [1mfeature-squashed[22m[39m+[32mβ[39m [32mRemoved branch [1mfeature-squashed[22m (tree matches [1mmain[22m,[39m [2mβ[22m[32m)[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_branch_no_worktree_path_occupied.snap b/tests/snapshots/integration__integration_tests__remove__remove_branch_no_worktree_path_occupied.snapindex db10dcf74..5b8145d4e 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_branch_no_worktree_path_occupied.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_branch_no_worktree_path_occupied.snap@@ -30,5 +30,5 @@ exit_code: 0----- stdout ---------- stderr ------π‘ [33mNo worktree found for branch [1mnpm[22m[39m-β [32mRemoved branch [1mnpm[22m (same commit as [1mmain[22m,[39m [2m_[22m[32m)[39m+[33mβ²[39m [33mNo worktree found for branch [1mnpm[22m[39m+[32mβ[39m [32mRemoved branch [1mnpm[22m (same commit as [1mmain[22m,[39m [2m_[22m[32m)[39mdiff --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 ec9ddf0eb..0aa250224 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@@ -19,6 +19,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -29,5 +30,5 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRemoving [1mfeature-unmerged[22m worktree in background; retaining unmerged branch[39m-π‘ [2mTo delete the unmerged branch, run [90mwt remove feature-unmerged -D[39m[22m+[36mβ[39m [36mRemoving [1mfeature-unmerged[22m worktree in background; retaining unmerged branch[39m+[2mβ³[22m [2mTo delete the unmerged branch, run [90mwt remove feature-unmerged -D[39m[22mdiff --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 05385e4c5..2b9fc96f2 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@@ -31,5 +31,5 @@ exit_code: 0----- stdout ---------- stderr ------π‘ [33mNo worktree found for branch [1mfeature-force[22m[39m-β [32mRemoved branch [1mfeature-force[22m (--force-delete)[39m+[33mβ²[39m [33mNo worktree found for branch [1mfeature-force[22m[39m+[32mβ[39m [32mRemoved branch [1mfeature-force[22m (--force-delete)[39mdiff --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 d9ffec465..a65e344e6 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@@ -30,5 +30,5 @@ exit_code: 0----- stdout ---------- stderr ------π‘ [33mNo worktree found for branch [1mfeature-merged[22m[39m-β [32mRemoved branch [1mfeature-merged[22m (same commit as [1mmain[22m,[39m [2m_[22m[32m)[39m+[33mβ²[39m [33mNo worktree found for branch [1mfeature-merged[22m[39m+[32mβ[39m [32mRemoved branch [1mfeature-merged[22m (same commit as [1mmain[22m,[39m [2m_[22m[32m)[39mdiff --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 dc36351f0..7ece6a682 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@@ -19,6 +19,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -29,6 +30,6 @@ exit_code: 0----- stdout ---------- stderr ------π‘ [33mNo worktree found for branch [1mfeature-unmerged[22m[39m-βͺ Branch [1mfeature-unmerged[22m retained; has unmerged changes-π‘ [2mTo delete the unmerged branch, run [90mwt remove feature-unmerged -D[39m[22m+[33mβ²[39m [33mNo worktree found for branch [1mfeature-unmerged[22m[39m+[2mβ[22m Branch [1mfeature-unmerged[22m retained; has unmerged changes+[2mβ³[22m [2mTo delete the unmerged branch, run [90mwt remove feature-unmerged -D[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_by_name_dirty_target.snap b/tests/snapshots/integration__integration_tests__remove__remove_by_name_dirty_target.snapindex 53c536966..3019ab140 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_by_name_dirty_target.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_by_name_dirty_target.snap@@ -6,6 +6,7 @@ info:- remove- feature-dirtyenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,16 +14,22 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: falseexit_code: 1----- stdout ---------- stderr ------β [31mCannot remove worktree: [1mfeature-dirty[22m has uncommitted changes[39m+[31mβ[39m [31mCannot remove worktree: [1mfeature-dirty[22m has uncommitted changes[39m-π‘ [2mCommit or stash changes first[22m+[2mβ³[22m [2mCommit or stash changes first[22mdiff --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 ee27cc94c..1ac2e6c8f 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@@ -30,4 +30,4 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRemoving [1mfeature-a[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mRemoving [1mfeature-a[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --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 77ed7c0cb..2dae5dce8 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@@ -30,4 +30,4 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRemoving [1mfeature-b[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mRemoving [1mfeature-b[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --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 408b6d2f3..217eab5d0 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@@ -30,4 +30,4 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRemoving [1mfeature-current[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mRemoving [1mfeature-current[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_default_branch_no_tautology.snap b/tests/snapshots/integration__integration_tests__remove__remove_default_branch_no_tautology.snapindex fcd0b7f04..1f957c3d7 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_default_branch_no_tautology.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_default_branch_no_tautology.snap@@ -25,5 +25,5 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRemoving [1mmain[22m worktree...[39m-β [32mRemoved [1mmain[22m worktree & branch[39m+[36mβ[39m [36mRemoving [1mmain[22m worktree...[39m+[32mβ[39m [32mRemoved [1mmain[22m worktree & branch[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_dirty_working_tree.snap b/tests/snapshots/integration__integration_tests__remove__remove_dirty_working_tree.snapindex 3fcc166c7..be583f7db 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_dirty_working_tree.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_dirty_working_tree.snap@@ -5,6 +5,7 @@ info:args:- removeenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -12,14 +13,20 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: falseexit_code: 1----- stdout ---------- stderr ------β [31mThe main worktree cannot be removed[39m+[31mβ[39m [31mThe main worktree cannot be removed[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_foreground.snap b/tests/snapshots/integration__integration_tests__remove__remove_foreground.snapindex e8991e508..3f8ac588e 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_foreground.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_foreground.snap@@ -31,5 +31,5 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRemoving [1mfeature-fg[22m worktree...[39m-β [32mRemoved [1mfeature-fg[22m worktree & branch (same commit as [1mmain[22m,[39m [2m_[22m[32m)[39m+[36mβ[39m [36mRemoving [1mfeature-fg[22m worktree...[39m+[32mβ[39m [32mRemoved [1mfeature-fg[22m worktree & branch (same commit as [1mmain[22m,[39m [2m_[22m[32m)[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_foreground_unmerged.snap b/tests/snapshots/integration__integration_tests__remove__remove_foreground_unmerged.snapindex d31d8feec..6e9ed1581 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_foreground_unmerged.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_foreground_unmerged.snap@@ -31,6 +31,6 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRemoving [1mfeature-unmerged-fg[22m worktree...[39m-β [32mRemoved [1mfeature-unmerged-fg[22m worktree; retaining unmerged branch[39m-π‘ [2mTo delete the unmerged branch, run [90mwt remove feature-unmerged-fg -D[39m[22m+[36mβ[39m [36mRemoving [1mfeature-unmerged-fg[22m worktree...[39m+[32mβ[39m [32mRemoved [1mfeature-unmerged-fg[22m worktree; retaining unmerged branch[39m+[2mβ³[22m [2mTo delete the unmerged branch, run [90mwt remove feature-unmerged-fg -D[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_from_detached_head_in_worktree.snap b/tests/snapshots/integration__integration_tests__remove__remove_from_detached_head_in_worktree.snapindex b3d30a0fc..4a830e54c 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_from_detached_head_in_worktree.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_from_detached_head_in_worktree.snap@@ -5,6 +5,7 @@ info:args:- removeenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -12,14 +13,20 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: trueexit_code: 0----- stdout ---------- stderr ------π [36mRemoving worktree in background (detached HEAD, no branch to delete)[39m+[36mβ[39m [36mRemoving worktree in background (detached HEAD, no branch to delete)[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap b/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snapindex 919e60620..f0a65f057 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap@@ -29,4 +29,4 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRemoving [1mfeature-wt[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mRemoving [1mfeature-wt[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap b/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snapindex 90cb65958..2ee3bba32 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap@@ -31,4 +31,4 @@ exit_code: 0cd _REPO_----- stderr ------π [36mRemoving [1mfeature-internal[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mRemoving [1mfeature-internal[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_main_vs_linked__from_linked_succeeds.snap b/tests/snapshots/integration__integration_tests__remove__remove_main_vs_linked__from_linked_succeeds.snapindex a05e3fb2c..aaaa8f9f9 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_main_vs_linked__from_linked_succeeds.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_main_vs_linked__from_linked_succeeds.snap@@ -19,6 +19,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -29,5 +30,5 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRemoving current worktree...[39m-β [32mRemoved [1mfeature[22m worktree & branch; changed directory to [1m_REPO_[22m (same commit as [1mmain[22m,[39m [2m_[22m[32m)[39m+[36mβ[39m [36mRemoving current worktree...[39m+[32mβ[39m [32mRemoved [1mfeature[22m worktree & branch; changed directory to [1m_REPO_[22m (same commit as [1mmain[22m,[39m [2m_[22m[32m)[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_main_vs_linked__from_main_by_name_succeeds.snap b/tests/snapshots/integration__integration_tests__remove__remove_main_vs_linked__from_main_by_name_succeeds.snapindex 5680c5be4..2d06c39e1 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_main_vs_linked__from_main_by_name_succeeds.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_main_vs_linked__from_main_by_name_succeeds.snap@@ -30,4 +30,4 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRemoving [1mfeature2[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mRemoving [1mfeature2[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_main_vs_linked__main_on_default_fails.snap b/tests/snapshots/integration__integration_tests__remove__remove_main_vs_linked__main_on_default_fails.snapindex 3fcc166c7..be583f7db 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_main_vs_linked__main_on_default_fails.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_main_vs_linked__main_on_default_fails.snap@@ -5,6 +5,7 @@ info:args:- removeenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -12,14 +13,20 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: falseexit_code: 1----- stdout ---------- stderr ------β [31mThe main worktree cannot be removed[39m+[31mβ[39m [31mThe main worktree cannot be removed[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_main_vs_linked__main_on_feature_fails.snap b/tests/snapshots/integration__integration_tests__remove__remove_main_vs_linked__main_on_feature_fails.snapindex 3fcc166c7..be583f7db 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_main_vs_linked__main_on_feature_fails.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_main_vs_linked__main_on_feature_fails.snap@@ -5,6 +5,7 @@ info:args:- removeenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -12,14 +13,20 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: falseexit_code: 1----- stdout ---------- stderr ------β [31mThe main worktree cannot be removed[39m+[31mβ[39m [31mThe main worktree cannot be removed[39mdiff --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 ff35c6218..515d30afd 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@@ -32,6 +32,6 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRemoving [1mfeature-b[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m-π [36mRemoving [1mfeature-c[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m-π [36mRemoving [1mfeature-a[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mRemoving [1mfeature-b[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mRemoving [1mfeature-c[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mRemoving [1mfeature-a[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_multiple_nonexistent_force.snap b/tests/snapshots/integration__integration_tests__remove__remove_multiple_nonexistent_force.snapindex b28c58332..3d0d3bafb 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_multiple_nonexistent_force.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_multiple_nonexistent_force.snap@@ -22,6 +22,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -32,6 +33,6 @@ exit_code: 1----- stdout ---------- stderr ------β [31mNo worktree found for branch [1mfoo[22m[39m-β [31mNo worktree found for branch [1mbar[22m[39m-β [31mNo worktree found for branch [1mbaz[22m[39m+[31mβ[39m [31mNo worktree found for branch [1mfoo[22m[39m+[31mβ[39m [31mNo worktree found for branch [1mbar[22m[39m+[31mβ[39m [31mNo worktree found for branch [1mbaz[22m[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snapindex b47badecf..c6a7e7111 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap@@ -32,6 +32,6 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRemoving [1mfeature-a[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m-π [36mRemoving [1mfeature-b[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m-π [36mRemoving [1mfeature-c[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mRemoving [1mfeature-a[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mRemoving [1mfeature-b[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36mβ[39m [36mRemoving [1mfeature-c[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --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 832c81699..14d02ed1a 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@@ -31,4 +31,4 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRemoving [1mfeature-keep[22m worktree in background; retaining branch (--no-delete-branch)[39m+[36mβ[39m [36mRemoving [1mfeature-keep[22m worktree in background; retaining branch (--no-delete-branch)[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_nonexistent_branch.snap b/tests/snapshots/integration__integration_tests__remove__remove_nonexistent_branch.snapindex 8dbec42b8..2da2674a2 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_nonexistent_branch.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_nonexistent_branch.snap@@ -19,6 +19,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -29,4 +30,4 @@ exit_code: 1----- stdout ---------- stderr ------β [31mNo worktree found for branch [1mnonexistent[22m[39m+[31mβ[39m [31mNo worktree found for branch [1mnonexistent[22m[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_nonexistent_worktree.snap b/tests/snapshots/integration__integration_tests__remove__remove_nonexistent_worktree.snapindex 40cf0d236..2da2674a2 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_nonexistent_worktree.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_nonexistent_worktree.snap@@ -6,6 +6,7 @@ info:- remove- nonexistentenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,14 +14,20 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: falseexit_code: 1----- stdout ---------- stderr ------β [31mNo worktree found for branch [1mnonexistent[22m[39m+[31mβ[39m [31mNo worktree found for branch [1mnonexistent[22m[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_partial_success.snap b/tests/snapshots/integration__integration_tests__remove__remove_partial_success.snapindex 3c5848ed5..fbc00f000 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_partial_success.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_partial_success.snap@@ -31,5 +31,5 @@ exit_code: 1----- stdout ---------- stderr ------π [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m-β [31mNo worktree found for branch [1mnonexistent[22m[39m+[36mβ[39m [36mRemoving [1mfeature[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[31mβ[39m [31mNo worktree found for branch [1mnonexistent[22m[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_remote_only_branch.snap b/tests/snapshots/integration__integration_tests__remove__remove_remote_only_branch.snapindex f76715bb0..ffc37de37 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_remote_only_branch.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_remote_only_branch.snap@@ -19,6 +19,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -29,6 +30,6 @@ exit_code: 1----- stdout ---------- stderr ------β [31mBranch [1mremote-feature[22m exists only on remote (origin/remote-feature)[39m+[31mβ[39m [31mBranch [1mremote-feature[22m exists only on remote (origin/remote-feature)[39m-π‘ [2mTo create a local worktree, run [90mwt switch remote-feature[39m[22m+[2mβ³[22m [2mTo create a local worktree, run [90mwt switch remote-feature[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_squash_merged_then_main_advanced.snap b/tests/snapshots/integration__integration_tests__remove__remove_squash_merged_then_main_advanced.snapindex 210bf55a3..e5b31cb5d 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_squash_merged_then_main_advanced.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_squash_merged_then_main_advanced.snap@@ -30,5 +30,5 @@ exit_code: 0----- stdout ---------- stderr ------π‘ [33mNo worktree found for branch [1mfeature-squash[22m[39m-β [32mRemoved branch [1mfeature-squash[22m (all changes in [1mmain[22m,[39m [2mβ[22m[32m)[39m+[33mβ²[39m [33mNo worktree found for branch [1mfeature-squash[22m[39m+[32mβ[39m [32mRemoved branch [1mfeature-squash[22m (all changes in [1mmain[22m,[39m [2mβ[22m[32m)[39mdiff --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 3fcc166c7..be583f7db 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@@ -5,6 +5,7 @@ info:args:- removeenv:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -12,14 +13,20 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"+ HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: falseexit_code: 1----- stdout ---------- stderr ------β [31mThe main worktree cannot be removed[39m+[31mβ[39m [31mThe main worktree cannot be removed[39mdiff --git a/tests/snapshots/integration__integration_tests__security__branch_name_with_cd_directive_not_executed.snap b/tests/snapshots/integration__integration_tests__security__branch_name_with_cd_directive_not_executed.snapindex 1e44c94ab..aa7aa2272 100644--- a/tests/snapshots/integration__integration_tests__security__branch_name_with_cd_directive_not_executed.snap+++ b/tests/snapshots/integration__integration_tests__security__branch_name_with_cd_directive_not_executed.snap@@ -32,6 +32,6 @@ exit_code: 1----- stdout ---------- stderr ------[0mβ [31mBranch [1m__WORKTRUNK_CD__/tmp[22m already exists[39m+[0m[31mβ[39m [31mBranch [1m__WORKTRUNK_CD__/tmp[22m already exists[39m-π‘ [2mTo switch to the existing branch, remove [90m--create[39m; run [90mwt switch __WORKTRUNK_CD__/tmp[39m[22m+[2mβ³[22m [2mTo switch to the existing branch, remove [90m--create[39m; run [90mwt switch __WORKTRUNK_CD__/tmp[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__security__commit_message_with_directive_not_executed.snap b/tests/snapshots/integration__integration_tests__security__commit_message_with_directive_not_executed.snapindex cbc667961..d11e9e718 100644--- a/tests/snapshots/integration__integration_tests__security__commit_message_with_directive_not_executed.snap+++ b/tests/snapshots/integration__integration_tests__security__commit_message_with_directive_not_executed.snap@@ -33,4 +33,4 @@ exit_code: 0@ main [2m^[22m . [2m85d55864[0m [2m1d[0m [2mFix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4+ [2mfeature[0m [2m_[22m [2m../repo.feature[0m [2m85d55864[0m [2m1d[0m [2mFix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4-βͺ [2mShowing 2 worktrees+[2mβ[22m [2mShowing 2 worktreesdiff --git a/tests/snapshots/integration__integration_tests__security__error_message_with_directive_not_executed.snap b/tests/snapshots/integration__integration_tests__security__error_message_with_directive_not_executed.snapindex 503f337e6..9d74ae57a 100644--- a/tests/snapshots/integration__integration_tests__security__error_message_with_directive_not_executed.snap+++ b/tests/snapshots/integration__integration_tests__security__error_message_with_directive_not_executed.snap@@ -20,6 +20,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -30,6 +31,6 @@ exit_code: 1----- stdout ---------- stderr ------[0mβ [31mBranch [1m__WORKTRUNK_EXEC__echo PWNED > /tmp/hacked6[22m not found[39m+[0m[31mβ[39m [31mBranch [1m__WORKTRUNK_EXEC__echo PWNED > /tmp/hacked6[22m not found[39m-π‘ [2mTo create a new branch, run [90mwt switch '__WORKTRUNK_EXEC__echo PWNED > /tmp/hacked6' --create[39m; to list branches, run [90mwt list --branches --remotes[39m[22m+[2mβ³[22m [2mTo create a new branch, run [90mwt switch '__WORKTRUNK_EXEC__echo PWNED > /tmp/hacked6' --create[39m; to list branches, run [90mwt list --branches --remotes[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__security__path_with_directive_not_executed.snap b/tests/snapshots/integration__integration_tests__security__path_with_directive_not_executed.snapindex 7bcd55005..7abd64ca4 100644--- a/tests/snapshots/integration__integration_tests__security__path_with_directive_not_executed.snap+++ b/tests/snapshots/integration__integration_tests__security__path_with_directive_not_executed.snap@@ -32,4 +32,4 @@ exit_code: 0[1mBranch[0m [1mStatus[0m [1mHEADΒ±[0m [1mmainβ[0m [1mPath[0m [1mRemoteβ [0m [1mCommit[0m [1mAge[0m [1mMessage@ main [2m^[22m . [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 1 worktree+[2mβ[22m [2mShowing 1 worktreediff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_empty_diffs.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_empty_diffs.snapindex 86c6f8f3a..09be55850 100644--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_empty_diffs.snap+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_empty_diffs.snap@@ -35,4 +35,4 @@ exit_code: 0+ [2mno-changes[0m [2m_[22m [2m../repo.no-changes[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ with-changes [36m![39m [2mβ[22m [32m+1[0m [31m-1[0m ../repo.with-changes [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 4 worktrees, 1 with changes+[2mβ[22m [2mShowing 4 worktrees, 1 with changesdiff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_extreme_diffs.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_extreme_diffs.snapindex c165cf8a7..8f74779dc 100644--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_extreme_diffs.snap+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_extreme_diffs.snap@@ -34,4 +34,4 @@ exit_code: 0+ huge [36m?[39m [2mβ[22m ../repo.huge [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ tiny [36m![39m [2mβ[22m [32m+1[0m [31m-1[0m ../repo.tiny [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 3 worktrees, 2 with changes+[2mβ[22m [2mShowing 3 worktrees, 2 with changesdiff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_varying_diffs.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_varying_diffs.snapindex 3088b5f26..4bfac9b63 100644--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_varying_diffs.snap+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_varying_diffs.snap@@ -35,4 +35,4 @@ exit_code: 0+ feature-medium [36m?[39m [2mβ[22m ../repo.feature-medium [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ feature-small [36m?[39m [2mβ[22m ../repo.feature-small [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 4 worktrees, 3 with changes+[2mβ[22m [2mShowing 4 worktrees, 3 with changesdiff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__long_branch_names.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__long_branch_names.snapindex 497c0a525..4c171556a 100644--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__long_branch_names.snap+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__long_branch_names.snap@@ -35,4 +35,4 @@ exit_code: 0+ [2mshort[0m [2m_[22m [2m../repo.short[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ [2mvery-long-feature-branch-name[0m [2m_[22m [2m../repo.very-long-feature-branch-name[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 4 worktrees+[2mβ[22m [2mShowing 4 worktreesdiff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__mixed_length_branch_names.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__mixed_length_branch_names.snapindex f4606750a..f02e367c6 100644--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__mixed_length_branch_names.snap+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__mixed_length_branch_names.snap@@ -35,4 +35,4 @@ exit_code: 0+ [2mmedium[0m [2m_[22m [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ [2mx[0m [2m_[22m [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 4 worktrees, 1 column hidden+[2mβ[22m [2mShowing 4 worktrees, 1 column hiddendiff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__short_branch_names.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__short_branch_names.snapindex 09eeccc4d..3a6da02fe 100644--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__short_branch_names.snap+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__short_branch_names.snap@@ -35,4 +35,4 @@ exit_code: 0+ [2mbb[0m [2m_[22m [2m../repo.bb[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ [2mccc[0m [2m_[22m [2m../repo.ccc[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 4 worktrees+[2mβ[22m [2mShowing 4 worktreesdiff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__unicode_branch_names.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__unicode_branch_names.snapindex 55251111a..75c84b0e7 100644--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__unicode_branch_names.snap+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__unicode_branch_names.snap@@ -35,4 +35,4 @@ exit_code: 0+ [2mnaive[0m [2m_[22m [2m../repo.naive[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit+ [2mresume[0m [2m_[22m [2m../repo.resume[0m [2ma1e809f5[0m [2m1d[0m [2mInitial commit-βͺ [2mShowing 4 worktrees+[2mβ[22m [2mShowing 4 worktreesdiff --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 298f070c4..eac790ae4 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@@ -22,6 +22,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -32,5 +33,5 @@ exit_code: 0----- stdout ---------- stderr ------β [32mCreated new worktree for [1mnew-feature[22m from [1mmain[22m @ [1m_REPO_.new-feature[22m[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[32mβ[39m [32mCreated new worktree for [1mnew-feature[22m from [1mmain[22m @ [1m_REPO_.new-feature[22m[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__ping_pong_1_main_to_feature_a.snap b/tests/snapshots/integration__integration_tests__switch__ping_pong_1_main_to_feature_a.snapindex 7b860e918..9b87b462c 100644--- a/tests/snapshots/integration__integration_tests__switch__ping_pong_1_main_to_feature_a.snap+++ b/tests/snapshots/integration__integration_tests__switch__ping_pong_1_main_to_feature_a.snap@@ -19,6 +19,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -29,5 +30,5 @@ exit_code: 0----- stdout ---------- stderr ------β [32mSwitched to worktree for [1mfeature-a[22m @ [1m_REPO_.feature-a[22m[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[32mβ[39m [32mSwitched to worktree for [1mfeature-a[22m @ [1m_REPO_.feature-a[22m[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__ping_pong_2_feature_a_to_main.snap b/tests/snapshots/integration__integration_tests__switch__ping_pong_2_feature_a_to_main.snapindex 10d11731c..c2759bf33 100644--- a/tests/snapshots/integration__integration_tests__switch__ping_pong_2_feature_a_to_main.snap+++ b/tests/snapshots/integration__integration_tests__switch__ping_pong_2_feature_a_to_main.snap@@ -19,6 +19,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -29,5 +30,5 @@ exit_code: 0----- stdout ---------- stderr ------π‘ [33mWorktree for [1mmain[22m @ [1m_REPO_[22m, but cannot change directory β shell integration not installed[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[33mβ²[39m [33mWorktree for [1mmain[22m @ [1m_REPO_[22m, but cannot change directory β shell integration not installed[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__ping_pong_3_dash_to_feature_a.snap b/tests/snapshots/integration__integration_tests__switch__ping_pong_3_dash_to_feature_a.snapindex f59557a5e..42cde3c7f 100644--- a/tests/snapshots/integration__integration_tests__switch__ping_pong_3_dash_to_feature_a.snap+++ b/tests/snapshots/integration__integration_tests__switch__ping_pong_3_dash_to_feature_a.snap@@ -19,6 +19,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -29,5 +30,5 @@ exit_code: 0----- stdout ---------- stderr ------π‘ [33mWorktree for [1mfeature-a[22m @ [1m_REPO_.feature-a[22m, but cannot change directory β shell integration not installed[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[33mβ²[39m [33mWorktree for [1mfeature-a[22m @ [1m_REPO_.feature-a[22m, but cannot change directory β shell integration not installed[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__ping_pong_4_dash_to_main.snap b/tests/snapshots/integration__integration_tests__switch__ping_pong_4_dash_to_main.snapindex 0d3758a08..6ba02d4a7 100644--- a/tests/snapshots/integration__integration_tests__switch__ping_pong_4_dash_to_main.snap+++ b/tests/snapshots/integration__integration_tests__switch__ping_pong_4_dash_to_main.snap@@ -19,6 +19,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -29,5 +30,5 @@ exit_code: 0----- stdout ---------- stderr ------π‘ [33mWorktree for [1mmain[22m @ [1m_REPO_[22m, but cannot change directory β shell integration not installed[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[33mβ²[39m [33mWorktree for [1mmain[22m @ [1m_REPO_[22m, but cannot change directory β shell integration not installed[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__ping_pong_5_dash_to_feature_a_again.snap b/tests/snapshots/integration__integration_tests__switch__ping_pong_5_dash_to_feature_a_again.snapindex f59557a5e..42cde3c7f 100644--- a/tests/snapshots/integration__integration_tests__switch__ping_pong_5_dash_to_feature_a_again.snap+++ b/tests/snapshots/integration__integration_tests__switch__ping_pong_5_dash_to_feature_a_again.snap@@ -19,6 +19,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -29,5 +30,5 @@ exit_code: 0----- stdout ---------- stderr ------π‘ [33mWorktree for [1mfeature-a[22m @ [1m_REPO_.feature-a[22m, but cannot change directory β shell integration not installed[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[33mβ²[39m [33mWorktree for [1mfeature-a[22m @ [1m_REPO_.feature-a[22m, but cannot change directory β shell integration not installed[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --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 749378a03..a27fb282d 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@@ -16,10 +16,12 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -30,5 +32,5 @@ exit_code: 0----- stdout ---------- stderr ------π‘ [33m--base flag is only used with --create, ignoring[39m-βͺ Already on worktree for [1mmain[22m @ [1m_REPO_[22m+[33mβ²[39m [33m--base flag is only used with --create, ignoring[39m+[2mβ[22m Already on worktree for [1mmain[22m @ [1m_REPO_[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_clobber_error_backup_exists.snap b/tests/snapshots/integration__integration_tests__switch__switch_clobber_error_backup_exists.snapindex 1183f5ffc..f081ab6ec 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_clobber_error_backup_exists.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_clobber_error_backup_exists.snap@@ -21,6 +21,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -31,4 +32,4 @@ exit_code: 1----- stdout ---------- stderr ------β [31mBackup path already exists: _REPO_.clobber-backup-exists.bak.20250102-000000[39m+[31mβ[39m [31mBackup path already exists: _REPO_.clobber-backup-exists.bak.20250102-000000[39mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_clobber_path_with_extension.snap b/tests/snapshots/integration__integration_tests__switch__switch_clobber_path_with_extension.snapindex f26c6e1b4..2811d8822 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_clobber_path_with_extension.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_clobber_path_with_extension.snap@@ -21,6 +21,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -31,6 +32,6 @@ exit_code: 0----- stdout ---------- stderr ------π‘ [33mMoving [1m_REPO_.clobber-ext.txt[22m to [1m_REPO_.clobber-ext.txt.bak.20250102-000000[22m ([90m--clobber[39m)[39m-β [32mCreated new worktree for [1mclobber-ext.txt[22m from [1mmain[22m @ [1m_REPO_.clobber-ext.txt[22m[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[33mβ²[39m [33mMoving [1m_REPO_.clobber-ext.txt[22m to [1m_REPO_.clobber-ext.txt.bak.20250102-000000[22m ([90m--clobber[39m)[39m+[32mβ[39m [32mCreated new worktree for [1mclobber-ext.txt[22m from [1mmain[22m @ [1m_REPO_.clobber-ext.txt[22m[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_clobber_removes_stale_dir.snap b/tests/snapshots/integration__integration_tests__switch__switch_clobber_removes_stale_dir.snapindex 207c9d835..e899ff1ec 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_clobber_removes_stale_dir.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_clobber_removes_stale_dir.snap@@ -21,6 +21,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -31,6 +32,6 @@ exit_code: 0----- stdout ---------- stderr ------π‘ [33mMoving [1m_REPO_.clobber-dir-test[22m to [1m_REPO_.clobber-dir-test.bak.20250102-000000[22m ([90m--clobber[39m)[39m-β [32mCreated new worktree for [1mclobber-dir-test[22m from [1mmain[22m @ [1m_REPO_.clobber-dir-test[22m[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[33mβ²[39m [33mMoving [1m_REPO_.clobber-dir-test[22m to [1m_REPO_.clobber-dir-test.bak.20250102-000000[22m ([90m--clobber[39m)[39m+[32mβ[39m [32mCreated new worktree for [1mclobber-dir-test[22m from [1mmain[22m @ [1m_REPO_.clobber-dir-test[22m[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_clobber_removes_stale_file.snap b/tests/snapshots/integration__integration_tests__switch__switch_clobber_removes_stale_file.snapindex 53db300bd..9aca47923 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_clobber_removes_stale_file.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_clobber_removes_stale_file.snap@@ -21,6 +21,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -31,6 +32,6 @@ exit_code: 0----- stdout ---------- stderr ------π‘ [33mMoving [1m_REPO_.clobber-file-test[22m to [1m_REPO_.clobber-file-test.bak.20250102-000000[22m ([90m--clobber[39m)[39m-β [32mCreated new worktree for [1mclobber-file-test[22m from [1mmain[22m @ [1m_REPO_.clobber-file-test[22m[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[33mβ²[39m [33mMoving [1m_REPO_.clobber-file-test[22m to [1m_REPO_.clobber-file-test.bak.20250102-000000[22m ([90m--clobber[39m)[39m+[32mβ[39m [32mCreated new worktree for [1mclobber-file-test[22m from [1mmain[22m @ [1m_REPO_.clobber-file-test[22m[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_create_existing_error.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_existing_error.snapindex 41bec5ee6..f436adb95 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_create_existing_error.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_create_existing_error.snap@@ -31,6 +31,6 @@ exit_code: 1----- stdout ---------- stderr ------β [31mBranch [1mfeature-y[22m already exists[39m+[31mβ[39m [31mBranch [1mfeature-y[22m already exists[39m-π‘ [2mTo switch to the existing branch, remove [90m--create[39m; run [90mwt switch feature-y[39m[22m+[2mβ³[22m [2mTo switch to the existing branch, remove [90m--create[39m; run [90mwt switch feature-y[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_create_new.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_new.snapindex f66222413..8d9703e86 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_create_new.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_create_new.snap@@ -20,6 +20,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -30,5 +31,5 @@ exit_code: 0----- stdout ---------- stderr ------β [32mCreated new worktree for [1mfeature-x[22m from [1mmain[22m @ [1m_REPO_.feature-x[22m[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[32mβ[39m [32mCreated new worktree for [1mfeature-x[22m from [1mmain[22m @ [1m_REPO_.feature-x[22m[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --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 5ed479565..b59c6ad34 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@@ -20,6 +20,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -30,5 +31,5 @@ exit_code: 0----- stdout ---------- stderr ------β [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[32mβ[39m [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_create_remote_only.snap b/tests/snapshots/integration__integration_tests__switch__switch_create_remote_only.snapindex 24fe99c3d..a4ebfc611 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@@ -20,6 +20,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -30,7 +31,7 @@ exit_code: 0----- stdout ---------- stderr ------π‘ [33mBranch [1mremote-feature[22m exists on remote (origin/remote-feature); creating new branch from base instead[39m-π‘ [2mTo switch to the remote branch, remove [90m--create[39m; run [90mwt switch remote-feature[39m[22m-β [32mCreated new worktree for [1mremote-feature[22m from [1mmain[22m @ [1m_REPO_.remote-feature[22m[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[33mβ²[39m [33mBranch [1mremote-feature[22m exists on remote (origin/remote-feature); creating new branch from base instead[39m+[2mβ³[22m [2mTo switch to the remote branch, remove [90m--create[39m; run [90mwt switch remote-feature[39m[22m+[32mβ[39m [32mCreated new worktree for [1mremote-feature[22m from [1mmain[22m @ [1m_REPO_.remote-feature[22m[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_error_main_worktree_on_different_branch.snap b/tests/snapshots/integration__integration_tests__switch__switch_error_main_worktree_on_different_branch.snapindex 6fac9b143..443f029cf 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_error_main_worktree_on_different_branch.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_error_main_worktree_on_different_branch.snap@@ -31,7 +31,7 @@ exit_code: 1----- stdout ---------- stderr ------[0mβ [31mCannot create worktree for [1mmain[22m: existing worktree at [1m_REPO_[22m on [1mfeature[22m[39m+[0m[31mβ[39m [31mCannot create worktree for [1mmain[22m: existing worktree at [1m_REPO_[22m on [1mfeature[22m[39m-π‘ [2mTo switch the worktree to this branch:[22m-[107m [0m [2m[0m[2m[34mcd[0m[2m _REPO_ [0m[2m[36m&&[0m[2m [0m[2m[34mgit[0m[2m switch main+[2mβ³[22m [2mTo switch the worktree to this branch:[22m+[107m [0m [2m[0m[2m[34mcd[0m[2m _REPO_ [0m[2m[36m&&[0m[2m [0m[2m[34mgit[0m[2m switch maindiff --git a/tests/snapshots/integration__integration_tests__switch__switch_error_missing_directory.snap b/tests/snapshots/integration__integration_tests__switch__switch_error_missing_directory.snapindex a0c43da04..88a0d96c8 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_error_missing_directory.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_error_missing_directory.snap@@ -19,6 +19,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -29,6 +30,6 @@ exit_code: 1----- stdout ---------- stderr ------β [31mWorktree directory missing for [1mmissing-wt[22m[39m+[31mβ[39m [31mWorktree directory missing for [1mmissing-wt[22m[39m-π‘ [2mTo clean up, run [90mgit worktree prune[39m[22m+[2mβ³[22m [2mTo clean up, run [90mgit worktree prune[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_error_path_occupied.snap b/tests/snapshots/integration__integration_tests__switch__switch_error_path_occupied.snapindex 671bef5b1..3095aae31 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_error_path_occupied.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_error_path_occupied.snap@@ -31,6 +31,6 @@ exit_code: 1----- stdout ---------- stderr ------β [31mDirectory already exists: [1m_REPO_.occupied-branch[22m[39m+[31mβ[39m [31mDirectory already exists: [1m_REPO_.occupied-branch[22m[39m-π‘ [2mTo remove manually, run [90mrm -rf _REPO_.occupied-branch[39m; to retry with backup, run [90mwt switch occupied-branch --clobber[39m[22m+[2mβ³[22m [2mTo remove manually, run [90mrm -rf _REPO_.occupied-branch[39m; to retry with backup, run [90mwt switch occupied-branch --clobber[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_error_path_occupied_detached.snap b/tests/snapshots/integration__integration_tests__switch__switch_error_path_occupied_detached.snapindex 0b197d2d9..1a24f5ca5 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_error_path_occupied_detached.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_error_path_occupied_detached.snap@@ -31,7 +31,7 @@ exit_code: 1----- stdout ---------- stderr ------[0mβ [31mCannot create worktree for [1mfeature[22m: existing worktree at [1m_REPO_.feature[22m, detached[39m+[0m[31mβ[39m [31mCannot create worktree for [1mfeature[22m: existing worktree at [1m_REPO_.feature[22m, detached[39m-π‘ [2mTo switch the worktree to this branch:[22m-[107m [0m [2m[0m[2m[34mcd[0m[2m _REPO_.feature [0m[2m[36m&&[0m[2m [0m[2m[34mgit[0m[2m switch feature+[2mβ³[22m [2mTo switch the worktree to this branch:[22m+[107m [0m [2m[0m[2m[34mcd[0m[2m _REPO_.feature [0m[2m[36m&&[0m[2m [0m[2m[34mgit[0m[2m switch featurediff --git a/tests/snapshots/integration__integration_tests__switch__switch_error_path_occupied_different_branch.snap b/tests/snapshots/integration__integration_tests__switch__switch_error_path_occupied_different_branch.snapindex 90b921fa7..ae314a8ac 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_error_path_occupied_different_branch.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_error_path_occupied_different_branch.snap@@ -31,7 +31,7 @@ exit_code: 1----- stdout ---------- stderr ------[0mβ [31mCannot create worktree for [1mfeature[22m: existing worktree at [1m_REPO_.feature[22m on [1mbugfix[22m[39m+[0m[31mβ[39m [31mCannot create worktree for [1mfeature[22m: existing worktree at [1m_REPO_.feature[22m on [1mbugfix[22m[39m-π‘ [2mTo switch the worktree to this branch:[22m-[107m [0m [2m[0m[2m[34mcd[0m[2m _REPO_.feature [0m[2m[36m&&[0m[2m [0m[2m[34mgit[0m[2m switch feature+[2mβ³[22m [2mTo switch the worktree to this branch:[22m+[107m [0m [2m[0m[2m[34mcd[0m[2m _REPO_.feature [0m[2m[36m&&[0m[2m [0m[2m[34mgit[0m[2m switch featurediff --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 55f2eff63..7a5523b58 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@@ -22,6 +22,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -32,6 +33,6 @@ exit_code: 0----- stdout ---------- stderr ------β [32mCreated new worktree for [1mfile-test[22m from [1mmain[22m @ [1m_REPO_.file-test[22m[39m-π [36mExecuting (--execute):[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test content'[0m[2m [0m[2m[36m>[0m[2m test.txt+[32mβ[39m [32mCreated new worktree for [1mfile-test[22m from [1mmain[22m @ [1m_REPO_.file-test[22m[39m+[36mβ[39m [36mExecuting (--execute):[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test content'[0m[2m [0m[2m[36m>[0m[2m test.txtdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snapindex a813e31c8..4b4ce34cd 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_existing.snap@@ -21,6 +21,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -31,6 +32,6 @@ exit_code: 0----- stdout ---------- stderr ------βͺ Switched to worktree for [1mexisting-exec[22m @ [1m_REPO_.existing-exec[22m-π [36mExecuting (--execute):[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'existing worktree'[0m[2m [0m[2m[36m>[0m[2m existing.txt+[2mβ[22m Switched to worktree for [1mexisting-exec[22m @ [1m_REPO_.existing-exec[22m+[36mβ[39m [36mExecuting (--execute):[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'existing worktree'[0m[2m [0m[2m[36m>[0m[2m existing.txtdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snapindex 79a06c8e4..0796b7804 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_failure.snap@@ -22,6 +22,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -32,6 +33,6 @@ exit_code: 1----- stdout ---------- stderr ------β [32mCreated new worktree for [1mfail-test[22m from [1mmain[22m @ [1m_REPO_.fail-test[22m[39m-π [36mExecuting (--execute):[39m-[107m [0m [2m[0m[2m[34mexit[0m[2m 1+[32mβ[39m [32mCreated new worktree for [1mfail-test[22m from [1mmain[22m @ [1m_REPO_.fail-test[22m[39m+[36mβ[39m [36mExecuting (--execute):[39m+[107m [0m [2m[0m[2m[34mexit[0m[2m 1diff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snapindex 564a395c6..af868ee0d 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_multiline.snap@@ -22,6 +22,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -35,8 +36,8 @@ line2line3----- stderr ------β [32mCreated new worktree for [1mmultiline-test[22m from [1mmain[22m @ [1m_REPO_.multiline-test[22m[39m-π [36mExecuting (--execute):[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'line1'[0m[2m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'line2'[0m[2m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'line3'[0m[2m+[32mβ[39m [32mCreated new worktree for [1mmultiline-test[22m from [1mmain[22m @ [1m_REPO_.multiline-test[22m[39m+[36mβ[39m [36mExecuting (--execute):[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'line1'[0m[2m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'line2'[0m[2m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'line3'[0m[2mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap b/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snapindex 52f296e72..8c4752e0d 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_execute_success.snap@@ -22,6 +22,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -33,6 +34,6 @@ exit_code: 0test output----- stderr ------β [32mCreated new worktree for [1mexec-test[22m from [1mmain[22m @ [1m_REPO_.exec-test[22m[39m-π [36mExecuting (--execute):[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test output'[0m[2m+[32mβ[39m [32mCreated new worktree for [1mexec-test[22m from [1mmain[22m @ [1m_REPO_.exec-test[22m[39m+[36mβ[39m [36mExecuting (--execute):[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'test output'[0m[2mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snap b/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snapindex 377b6f78c..350ac3635 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_existing_branch.snap@@ -19,6 +19,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -29,5 +30,5 @@ exit_code: 0----- stdout ---------- stderr ------π‘ [33mWorktree for [1mfeature-z[22m @ [1m_REPO_.feature-z[22m, but cannot change directory β shell integration not installed[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[33mβ²[39m [33mWorktree for [1mfeature-z[22m @ [1m_REPO_.feature-z[22m, but cannot change directory β shell integration not installed[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_existing_internal.snap b/tests/snapshots/integration__integration_tests__switch__switch_existing_internal.snapindex 31eeffe05..ad51c726a 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_existing_internal.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_existing_internal.snap@@ -32,4 +32,4 @@ exit_code: 0cd _REPO_.existing-wt----- stderr ------βͺ Switched to worktree for [1mexisting-wt[22m @ [1m_REPO_.existing-wt[22m+[2mβ[22m Switched to worktree for [1mexisting-wt[22m @ [1m_REPO_.existing-wt[22mdiff --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 3f28ce05b..d47f1d87e 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@@ -19,6 +19,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -29,4 +30,4 @@ exit_code: 0----- stdout ---------- stderr ------π‘ [33mWorktree for [1mshell-configured[22m @ [1m_REPO_.shell-configured[22m, but cannot change directory β shell integration not active[39m+[33mβ²[39m [33mWorktree for [1mshell-configured[22m @ [1m_REPO_.shell-configured[22m, but cannot change directory β shell integration not active[39mdiff --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 5d78ebaee..33f1b96a3 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@@ -36,6 +36,6 @@ cd _REPO_.exit-code-testexit 42----- stderr ------β [32mCreated new worktree for [1mexit-code-test[22m from [1mmain[22m @ [1m_REPO_.exit-code-test[22m[39m-π [36mExecuting (--execute):[39m-[107m [0m [2m[0m[2m[34mexit[0m[2m 42+[32mβ[39m [32mCreated new worktree for [1mexit-code-test[22m from [1mmain[22m @ [1m_REPO_.exit-code-test[22m[39m+[36mβ[39m [36mExecuting (--execute):[39m+[107m [0m [2m[0m[2m[34mexit[0m[2m 42diff --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 387ade1b9..c57701442 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@@ -37,7 +37,7 @@ echo 'doing work'exit 7----- stderr ------β [32mCreated new worktree for [1moutput-exit-test[22m from [1mmain[22m @ [1m_REPO_.output-exit-test[22m[39m-π [36mExecuting (--execute):[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'doing work'[0m[2m-[107m [0m [2m[0m[2m[34mexit[0m[2m 7+[32mβ[39m [32mCreated new worktree for [1moutput-exit-test[22m from [1mmain[22m @ [1m_REPO_.output-exit-test[22m[39m+[36mβ[39m [36mExecuting (--execute):[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'doing work'[0m[2m+[107m [0m [2m[0m[2m[34mexit[0m[2m 7diff --git a/tests/snapshots/integration__integration_tests__switch__switch_internal_mode.snap b/tests/snapshots/integration__integration_tests__switch__switch_internal_mode.snapindex 62370c6e2..df32f5170 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_internal_mode.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_internal_mode.snap@@ -33,4 +33,4 @@ exit_code: 0cd _REPO_.internal-test----- stderr ------β [32mCreated new worktree for [1minternal-test[22m from [1mmain[22m @ [1m_REPO_.internal-test[22m[39m+[32mβ[39m [32mCreated new worktree for [1minternal-test[22m from [1mmain[22m @ [1m_REPO_.internal-test[22m[39mdiff --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 5362ecffd..9d55d1289 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@@ -37,7 +37,7 @@ echo 'line1'echo 'line2'----- stderr ------β [32mCreated new worktree for [1mexec-internal[22m from [1mmain[22m @ [1m_REPO_.exec-internal[22m[39m-π [36mExecuting (--execute):[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'line1'[0m[2m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'line2'[0m[2m+[32mβ[39m [32mCreated new worktree for [1mexec-internal[22m from [1mmain[22m @ [1m_REPO_.exec-internal[22m[39m+[36mβ[39m [36mExecuting (--execute):[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'line1'[0m[2m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'line2'[0m[2mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_main_branch.snap b/tests/snapshots/integration__integration_tests__switch__switch_main_branch.snapindex 65cffe062..13091ab33 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_main_branch.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_main_branch.snap@@ -14,10 +14,12 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -28,4 +30,4 @@ exit_code: 0----- stdout ---------- stderr ------βͺ Already on worktree for [1mmain[22m @ [1m_REPO_[22m+[2mβ[22m Already on worktree for [1mmain[22m @ [1m_REPO_[22mdiff --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 7b860e918..9b87b462c 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@@ -19,6 +19,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -29,5 +30,5 @@ exit_code: 0----- stdout ---------- stderr ------β [32mSwitched to worktree for [1mfeature-a[22m @ [1m_REPO_.feature-a[22m[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[32mβ[39m [32mSwitched to worktree for [1mfeature-a[22m @ [1m_REPO_.feature-a[22m[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_execute_still_runs.snap b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_execute_still_runs.snapindex 3a1c6c3f9..5b0534b03 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_execute_still_runs.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_execute_still_runs.snap@@ -23,6 +23,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -34,6 +35,6 @@ exit_code: 0execute command runs----- stderr ------β [32mCreated new worktree for [1mno-hooks-test[22m from [1mmain[22m @ [1m_REPO_.no-hooks-test[22m[39m-π [36mExecuting (--execute):[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'execute command runs'[0m[2m+[32mβ[39m [32mCreated new worktree for [1mno-hooks-test[22m from [1mmain[22m @ [1m_REPO_.no-hooks-test[22m[39m+[36mβ[39m [36mExecuting (--execute):[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'execute command runs'[0m[2mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_existing.snap b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_existing.snapindex 6361fd5ac..1a8e0542c 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_existing.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_existing.snap@@ -22,6 +22,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -33,6 +34,6 @@ exit_code: 0execute still runs----- stderr ------βͺ Switched to worktree for [1mexisting-no-hooks[22m @ [1m_REPO_.existing-no-hooks[22m-π [36mExecuting (--execute):[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'execute still runs'[0m[2m+[2mβ[22m Switched to worktree for [1mexisting-no-hooks[22m @ [1m_REPO_.existing-no-hooks[22m+[36mβ[39m [36mExecuting (--execute):[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'execute still runs'[0m[2mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_skips_post_start.snap b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_skips_post_start.snapindex 57ed85a83..3284ddb69 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_skips_post_start.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_skips_post_start.snap@@ -21,6 +21,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -31,5 +32,5 @@ exit_code: 0----- stdout ---------- stderr ------β [32mCreated new worktree for [1mno-post-start[22m from [1mmain[22m @ [1m_REPO_.no-post-start[22m[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[32mβ[39m [32mCreated new worktree for [1mno-post-start[22m from [1mmain[22m @ [1m_REPO_.no-post-start[22m[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_with_force.snap b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_with_force.snapindex 742448af9..193a500a6 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_with_force.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_no_hooks_with_force.snap@@ -22,6 +22,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -32,5 +33,5 @@ exit_code: 0----- stdout ---------- stderr ------β [32mCreated new worktree for [1mforce-no-hooks[22m from [1mmain[22m @ [1m_REPO_.force-no-hooks[22m[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[32mβ[39m [32mCreated new worktree for [1mforce-no-hooks[22m from [1mmain[22m @ [1m_REPO_.force-no-hooks[22m[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_no_warning_when_branch_matches.snap b/tests/snapshots/integration__integration_tests__switch__switch_no_warning_when_branch_matches.snapindex 681e2bf44..81ddf4ee4 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_no_warning_when_branch_matches.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_no_warning_when_branch_matches.snap@@ -32,4 +32,4 @@ exit_code: 0cd _REPO_.feature----- stderr ------βͺ Switched to worktree for [1mfeature[22m @ [1m_REPO_.feature[22m+[2mβ[22m Switched to worktree for [1mfeature[22m @ [1m_REPO_.feature[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_outside_git_repo.snap b/tests/snapshots/integration__integration_tests__switch__switch_outside_git_repo.snapindex 6d5931c9c..f6684cee0 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_outside_git_repo.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_outside_git_repo.snap@@ -12,6 +12,7 @@ info:COLUMNS: "150"GIT_EDITOR: ""HOME: "[TEST_HOME]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -22,5 +23,5 @@ exit_code: 1----- stdout ---------- stderr ------β [31mFailed to switch worktree[39m-[107m [0m fatal: not a git repository (or any of the parent directories): .git+[31mβ[39m [31mFailed to switch worktree[39m+[107m [0m fatal: not a git repository (or any of the parent directories): .gitdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_path_mismatch_shows_hint.snap b/tests/snapshots/integration__integration_tests__switch__switch_path_mismatch_shows_hint.snapindex 207433543..713a70e46 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_path_mismatch_shows_hint.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_path_mismatch_shows_hint.snap@@ -20,6 +20,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -31,5 +32,5 @@ exit_code: 0cd '[PROJECT_ID]'----- stderr ------βͺ Switched to worktree for [1mfeature[22m @ [1m[PROJECT_ID][22m-π‘ [33mWorktree path doesn't match branch name; expected [1m_REPO_.feature[22m [31mβ[39m[39m+[2mβ[22m Switched to worktree for [1mfeature[22m @ [1m[PROJECT_ID][22m+[33mβ²[39m [33mWorktree path doesn't match branch name; expected [1m_REPO_.feature[22m [31mβ[39m[39mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_no_history.snap b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_no_history.snapindex 6ec3e5cb9..a0b7a3546 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_no_history.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_previous_branch_no_history.snap@@ -6,6 +6,7 @@ info:- switch- "-"env:+ APPDATA: "[TEST_CONFIG_HOME]"CLICOLOR_FORCE: "1"COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"@@ -13,15 +14,20 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: CLC_ALL: C+ PATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"+ USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"---success: falseexit_code: 1----- stdout ---------- stderr ------β [31mNo previous branch found in history. Use 'wt list' to see available worktrees.[39m+[31mβ[39m [31mNo previous branch found in history. Use 'wt list' to see available worktrees.[39mdiff --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 cf4e2a3e6..84e547e22 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@@ -20,6 +20,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -30,5 +31,5 @@ exit_code: 0----- stdout ---------- stderr ------β [32mCreated new worktree for [1mfeature-from-main[22m from [1mmain[22m @ [1m_REPO_.feature-from-main[22m[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[32mβ[39m [32mCreated new worktree for [1mfeature-from-main[22m from [1mmain[22m @ [1m_REPO_.feature-from-main[22m[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_stale_history_first_dash.snap b/tests/snapshots/integration__integration_tests__switch__switch_stale_history_first_dash.snapindex 8c25b9807..b46e251e4 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_stale_history_first_dash.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_stale_history_first_dash.snap@@ -19,6 +19,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -29,5 +30,5 @@ exit_code: 0----- stdout ---------- stderr ------π‘ [33mWorktree for [1mbranch-a[22m @ [1m_REPO_.branch-a[22m, but cannot change directory β shell integration not installed[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[33mβ²[39m [33mWorktree for [1mbranch-a[22m @ [1m_REPO_.branch-a[22m, but cannot change directory β shell integration not installed[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_stale_history_second_dash.snap b/tests/snapshots/integration__integration_tests__switch__switch_stale_history_second_dash.snapindex 75e468235..70e32746e 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_stale_history_second_dash.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_stale_history_second_dash.snap@@ -14,10 +14,12 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -28,4 +30,4 @@ exit_code: 0----- stdout ---------- stderr ------βͺ Already on worktree for [1mmain[22m @ [1m_REPO_[22m+[2mβ[22m Already on worktree for [1mmain[22m @ [1m_REPO_[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_stale_history_to_a.snap b/tests/snapshots/integration__integration_tests__switch__switch_stale_history_to_a.snapindex 2e7a7aaf5..5f3090f40 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_stale_history_to_a.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_stale_history_to_a.snap@@ -19,6 +19,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -29,5 +30,5 @@ exit_code: 0----- stdout ---------- stderr ------β [32mSwitched to worktree for [1mbranch-a[22m @ [1m_REPO_.branch-a[22m[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[32mβ[39m [32mSwitched to worktree for [1mbranch-a[22m @ [1m_REPO_.branch-a[22m[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_stale_history_to_b.snap b/tests/snapshots/integration__integration_tests__switch__switch_stale_history_to_b.snapindex 61a4dcdb5..3c9dd6868 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_stale_history_to_b.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_stale_history_to_b.snap@@ -19,6 +19,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -29,5 +30,5 @@ exit_code: 0----- stdout ---------- stderr ------β [32mSwitched to worktree for [1mbranch-b[22m @ [1m_REPO_.branch-b[22m[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[32mβ[39m [32mSwitched to worktree for [1mbranch-b[22m @ [1m_REPO_.branch-b[22m[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --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 1e8a22d11..7de09fe8a 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@@ -19,6 +19,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -29,5 +30,5 @@ exit_code: 0----- stdout ---------- stderr ------π‘ [33mWorktree for [1mexisting-branch[22m @ [1m_REPO_.existing-branch[22m, but cannot change directory β shell integration not installed[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[33mβ²[39m [33mWorktree for [1mexisting-branch[22m @ [1m_REPO_.existing-branch[22m, but cannot change directory β shell integration not installed[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__switch__switch_with_base.snap b/tests/snapshots/integration__integration_tests__switch__switch_with_base.snapindex 942e45a19..326e55159 100644--- a/tests/snapshots/integration__integration_tests__switch__switch_with_base.snap+++ b/tests/snapshots/integration__integration_tests__switch__switch_with_base.snap@@ -22,6 +22,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -32,5 +33,5 @@ exit_code: 0----- stdout ---------- stderr ------β [32mCreated new worktree for [1mfeature-with-base[22m from [1mmain[22m @ [1m_REPO_.feature-with-base[22m[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[32mβ[39m [32mCreated new worktree for [1mfeature-with-base[22m from [1mmain[22m @ [1m_REPO_.feature-with-base[22m[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__user_hooks__no_verify_skips_all_hooks.snap b/tests/snapshots/integration__integration_tests__user_hooks__no_verify_skips_all_hooks.snapindex 0c91b299c..a6966a57e 100644--- a/tests/snapshots/integration__integration_tests__user_hooks__no_verify_skips_all_hooks.snap+++ b/tests/snapshots/integration__integration_tests__user_hooks__no_verify_skips_all_hooks.snap@@ -21,6 +21,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -31,5 +32,5 @@ exit_code: 0----- stdout ---------- stderr ------β [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[32mβ[39m [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_and_project_post_start.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_and_project_post_start.snapindex 2b4fd5db6..52d9cee97 100644--- a/tests/snapshots/integration__integration_tests__user_hooks__user_and_project_post_start.snap+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_and_project_post_start.snap@@ -20,6 +20,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -30,9 +31,9 @@ exit_code: 0----- stdout ---------- stderr ------β [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m-π [36mRunning user post-start [1mbg[22m:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'USER_POST_START'[0m[2m [0m[2m[36m>[0m[2m user_bg.txt-π [36mRunning project post-start:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'PROJECT_POST_START'[0m[2m [0m[2m[36m>[0m[2m project_bg.txt+[32mβ[39m [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[36mβ[39m [36mRunning user post-start [1mbg[22m:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'USER_POST_START'[0m[2m [0m[2m[36m>[0m[2m user_bg.txt+[36mβ[39m [36mRunning project post-start:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'PROJECT_POST_START'[0m[2m [0m[2m[36m>[0m[2m project_bg.txtdiff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_hook_template_vars.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_hook_template_vars.snapindex b9de72a25..8f933bdd2 100644--- a/tests/snapshots/integration__integration_tests__user_hooks__user_hook_template_vars.snap+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_hook_template_vars.snap@@ -20,6 +20,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -30,7 +31,7 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRunning user post-create [1mvars[22m:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'repo=repo branch=feature'[0m[2m [0m[2m[36m>[0m[2m template_vars.txt-[0mβ [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[36mβ[39m [36mRunning user post-create [1mvars[22m:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'repo=repo branch=feature'[0m[2m [0m[2m[36m>[0m[2m template_vars.txt+[0m[32mβ[39m [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_hooks_before_project.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_hooks_before_project.snapindex 8537a661f..aa4a45642 100644--- a/tests/snapshots/integration__integration_tests__user_hooks__user_hooks_before_project.snap+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_hooks_before_project.snap@@ -20,6 +20,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -30,9 +31,9 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRunning user post-create [1mlog[22m:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'USER_HOOK'[0m[2m [0m[2m[36m>>[0m[2m hook_order.txt-[0mπ [36mRunning project post-create:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'PROJECT_HOOK'[0m[2m [0m[2m[36m>>[0m[2m hook_order.txt-[0mβ [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[36mβ[39m [36mRunning user post-create [1mlog[22m:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'USER_HOOK'[0m[2m [0m[2m[36m>>[0m[2m hook_order.txt+[0m[36mβ[39m [36mRunning project post-create:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'PROJECT_HOOK'[0m[2m [0m[2m[36m>>[0m[2m hook_order.txt+[0m[32mβ[39m [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_hooks_no_approval.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_hooks_no_approval.snapindex 9b2200a2e..fdbb83cb0 100644--- a/tests/snapshots/integration__integration_tests__user_hooks__user_hooks_no_approval.snap+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_hooks_no_approval.snap@@ -20,6 +20,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -30,7 +31,7 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRunning user post-create [1msetup[22m:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'NO_APPROVAL_NEEDED'[0m[2m [0m[2m[36m>[0m[2m no_approval.txt-[0mβ [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[36mβ[39m [36mRunning user post-create [1msetup[22m:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'NO_APPROVAL_NEEDED'[0m[2m [0m[2m[36m>[0m[2m no_approval.txt+[0m[32mβ[39m [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_post_create_executes.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_post_create_executes.snapindex daa33b2bf..5eb847663 100644--- a/tests/snapshots/integration__integration_tests__user_hooks__user_post_create_executes.snap+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_post_create_executes.snap@@ -20,6 +20,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -30,7 +31,7 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRunning user post-create [1mlog[22m:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'USER_POST_CREATE_RAN'[0m[2m [0m[2m[36m>[0m[2m user_hook_marker.txt-[0mβ [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[36mβ[39m [36mRunning user post-create [1mlog[22m:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'USER_POST_CREATE_RAN'[0m[2m [0m[2m[36m>[0m[2m user_hook_marker.txt+[0m[32mβ[39m [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_post_create_failure.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_post_create_failure.snapindex 029613bcc..489657972 100644--- a/tests/snapshots/integration__integration_tests__user_hooks__user_post_create_failure.snap+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_post_create_failure.snap@@ -20,6 +20,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -30,8 +31,8 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRunning user post-create [1mfailing[22m:[39m-[107m [0m [2m[0m[2m[34mexit[0m[2m 1-[0mπ‘ [33mCommand [1mfailing[22m failed: exit status: 1[39m-β [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[36mβ[39m [36mRunning user post-create [1mfailing[22m:[39m+[107m [0m [2m[0m[2m[34mexit[0m[2m 1+[0m[33mβ²[39m [33mCommand [1mfailing[22m failed: exit status: 1[39m+[32mβ[39m [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_post_merge_executes.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_post_merge_executes.snapindex 36b982425..767b7410f 100644--- a/tests/snapshots/integration__integration_tests__user_hooks__user_post_merge_executes.snap+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_post_merge_executes.snap@@ -16,10 +16,12 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -30,11 +32,11 @@ exit_code: 0----- stdout ---------- stderr ------π [36mMerging 1 commit to [1mmain[22m @ [2md233817[22m (no commit/squash/rebase needed)[39m-[107m [0m * [33md233817[m Add feature-[107m [0m feature.txt | 1 [32m+[m-[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-βͺ Worktree preserved (--no-remove)-π [36mRunning user post-merge [1mnotify[22m:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'USER_POST_MERGE_RAN'[0m[2m [0m[2m[36m>[0m[2m user_postmerge.txt+[36mβ[39m [36mMerging 1 commit to [1mmain[22m @ [2md233817[22m (no commit/squash/rebase needed)[39m+[107m [0m * [33md233817[m Add feature+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)+[32mβ[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m+[2mβ[22m Worktree preserved (--no-remove)+[36mβ[39m [36mRunning user post-merge [1mnotify[22m:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'USER_POST_MERGE_RAN'[0m[2m [0m[2m[36m>[0m[2m user_postmerge.txtdiff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_post_start_executes.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_post_start_executes.snapindex fa3897aee..159fec153 100644--- a/tests/snapshots/integration__integration_tests__user_hooks__user_post_start_executes.snap+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_post_start_executes.snap@@ -20,6 +20,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -30,7 +31,7 @@ exit_code: 0----- stdout ---------- stderr ------β [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m-π [36mRunning user post-start [1mbg[22m:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'USER_POST_START_RAN'[0m[2m [0m[2m[36m>[0m[2m user_bg_marker.txt+[32mβ[39m [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[36mβ[39m [36mRunning user post-start [1mbg[22m:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'USER_POST_START_RAN'[0m[2m [0m[2m[36m>[0m[2m user_bg_marker.txtdiff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_post_start_skipped_no_verify.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_post_start_skipped_no_verify.snapindex 0c91b299c..a6966a57e 100644--- a/tests/snapshots/integration__integration_tests__user_hooks__user_post_start_skipped_no_verify.snap+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_post_start_skipped_no_verify.snap@@ -21,6 +21,7 @@ info:LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -31,5 +32,5 @@ exit_code: 0----- stdout ---------- stderr ------β [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m-π‘ [2mRun [90mwt config shell install[39m to enable automatic cd[22m+[32mβ[39m [32mCreated new worktree for [1mfeature[22m from [1mmain[22m @ [1m_REPO_.feature[22m[39m+[2mβ³[22m [2mRun [90mwt config shell install[39m to enable automatic cd[22mdiff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_commit_executes.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_commit_executes.snapindex dab841df3..e41e8d7c4 100644--- a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_commit_executes.snap+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_commit_executes.snap@@ -16,10 +16,12 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -30,17 +32,17 @@ exit_code: 0----- stdout ---------- stderr ------π‘ [33mAuto-staging 1 untracked path:[39m-[107m [0m uncommitted.txt-π [36mRunning user pre-commit [1mlint[22m:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'USER_PRE_COMMIT_RAN'[0m[2m [0m[2m[36m>[0m[2m user_precommit.txt-[0mπ [36mCommitting changes with default message... [90m(1 file, [32m+1[39m, no squashing needed[39m[90m)[39m[39m-π‘ [2mUsing fallback commit message. Run [90mwt config --help[39m for LLM setup guide[22m-[107m [0m [1mChanges to uncommitted.txt[22m-β [32mCommitted changes @ [2mfc0fed2[22m[39m-π [36mMerging 1 commit to [1mmain[22m @ [2mfc0fed2[22m (no rebase needed)[39m-[107m [0m * [33mfc0fed2[m Changes to uncommitted.txt-[107m [0m uncommitted.txt | 1 [32m+[m-[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-βͺ Worktree preserved (--no-remove)+[33mβ²[39m [33mAuto-staging 1 untracked path:[39m+[107m [0m uncommitted.txt+[36mβ[39m [36mRunning user pre-commit [1mlint[22m:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'USER_PRE_COMMIT_RAN'[0m[2m [0m[2m[36m>[0m[2m user_precommit.txt+[0m[36mβ[39m [36mCommitting changes with default message... [90m(1 file, [32m+1[39m, no squashing needed[39m[90m)[39m[39m+[2mβ³[22m [2mUsing fallback commit message. Run [90mwt config --help[39m for LLM setup guide[22m+[107m [0m [1mChanges to uncommitted.txt[22m+[32mβ[39m [32mCommitted changes @ [2mfc0fed2[22m[39m+[36mβ[39m [36mMerging 1 commit to [1mmain[22m @ [2mfc0fed2[22m (no rebase needed)[39m+[107m [0m * [33mfc0fed2[m Changes to uncommitted.txt+[107m [0m uncommitted.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)+[32mβ[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m+[2mβ[22m Worktree preserved (--no-remove)diff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_commit_failure.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_commit_failure.snapindex 53fae67bd..b1352d119 100644--- a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_commit_failure.snap+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_commit_failure.snap@@ -32,10 +32,10 @@ exit_code: 1----- stdout ---------- stderr ------π‘ [33mAuto-staging 1 untracked path:[39m-[107m [0m uncommitted.txt-π [36mRunning user pre-commit [1mlint[22m:[39m-[107m [0m [2m[0m[2m[34mexit[0m[2m 1-[0mβ [31mpre-commit command failed: [1mlint[22m: exit status: 1[39m+[33mβ²[39m [33mAuto-staging 1 untracked path:[39m+[107m [0m uncommitted.txt+[36mβ[39m [36mRunning user pre-commit [1mlint[22m:[39m+[107m [0m [2m[0m[2m[34mexit[0m[2m 1+[0m[31mβ[39m [31mpre-commit command failed: [1mlint[22m: exit status: 1[39m-π‘ [2mTo skip pre-commit hooks, re-run with [90m--no-verify[39m[22m+[2mβ³[22m [2mTo skip pre-commit hooks, re-run with [90m--no-verify[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_merge_executes.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_merge_executes.snapindex 8dec7b179..19589ab33 100644--- a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_merge_executes.snap+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_merge_executes.snap@@ -16,10 +16,12 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -30,11 +32,11 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRunning user pre-merge [1mcheck[22m:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'USER_PRE_MERGE_RAN'[0m[2m [0m[2m[36m>[0m[2m user_premerge.txt-[0mπ [36mMerging 1 commit to [1mmain[22m @ [2md233817[22m (no commit/squash/rebase needed)[39m-[107m [0m * [33md233817[m Add feature-[107m [0m feature.txt | 1 [32m+[m-[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-βͺ Worktree preserved (--no-remove)+[36mβ[39m [36mRunning user pre-merge [1mcheck[22m:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'USER_PRE_MERGE_RAN'[0m[2m [0m[2m[36m>[0m[2m user_premerge.txt+[0m[36mβ[39m [36mMerging 1 commit to [1mmain[22m @ [2md233817[22m (no commit/squash/rebase needed)[39m+[107m [0m * [33md233817[m Add feature+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)+[32mβ[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m+[2mβ[22m Worktree preserved (--no-remove)diff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_merge_failure.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_merge_failure.snapindex 39d4e1f49..da687b426 100644--- a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_merge_failure.snap+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_merge_failure.snap@@ -32,8 +32,8 @@ exit_code: 1----- stdout ---------- stderr ------π [36mRunning user pre-merge [1mcheck[22m:[39m-[107m [0m [2m[0m[2m[34mexit[0m[2m 1-[0mβ [31mpre-merge command failed: [1mcheck[22m: exit status: 1[39m+[36mβ[39m [36mRunning user pre-merge [1mcheck[22m:[39m+[107m [0m [2m[0m[2m[34mexit[0m[2m 1+[0m[31mβ[39m [31mpre-merge command failed: [1mcheck[22m: exit status: 1[39m-π‘ [2mTo skip pre-merge hooks, re-run with [90m--no-verify[39m[22m+[2mβ³[22m [2mTo skip pre-merge hooks, re-run with [90m--no-verify[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_merge_skipped_no_verify.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_merge_skipped_no_verify.snapindex 3182df837..edc6ec342 100644--- a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_merge_skipped_no_verify.snap+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_merge_skipped_no_verify.snap@@ -17,10 +17,12 @@ info:GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/nullGIT_EDITOR: ""+ GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: CLC_ALL: CPATH: "[PATH]"+ RUST_LOG: warnSOURCE_DATE_EPOCH: "1735776000"USERPROFILE: "[TEST_HOME]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"@@ -31,9 +33,9 @@ exit_code: 0----- stdout ---------- stderr ------π [36mMerging 1 commit to [1mmain[22m @ [2md233817[22m (no commit/squash/rebase needed)[39m-[107m [0m * [33md233817[m Add feature-[107m [0m feature.txt | 1 [32m+[m-[107m [0m 1 file changed, 1 insertion(+)-β [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m-βͺ Worktree preserved (--no-remove)+[36mβ[39m [36mMerging 1 commit to [1mmain[22m @ [2md233817[22m (no commit/squash/rebase needed)[39m+[107m [0m * [33md233817[m Add feature+[107m [0m feature.txt | 1 [32m+[m+[107m [0m 1 file changed, 1 insertion(+)+[32mβ[39m [32mMerged to [1mmain[22m [90m(1 commit, 1 file, [32m+1[39m[39m[90m)[39m[39m+[2mβ[22m Worktree preserved (--no-remove)diff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_remove_executes.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_remove_executes.snapindex 1ce5b136a..b3b07659b 100644--- a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_remove_executes.snap+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_remove_executes.snap@@ -31,6 +31,6 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRunning user pre-remove [1mcleanup[22m:[39m-[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'USER_PRE_REMOVE_RAN'[0m[2m [0m[2m[36m>[0m[2m ../user_preremove_marker.txt-[0mπ [36mRemoving [1mfeature[22m worktree & branch in background (--force-delete)[39m+[36mβ[39m [36mRunning user pre-remove [1mcleanup[22m:[39m+[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'USER_PRE_REMOVE_RAN'[0m[2m [0m[2m[36m>[0m[2m ../user_preremove_marker.txt+[0m[36mβ[39m [36mRemoving [1mfeature[22m worktree & branch in background (--force-delete)[39mdiff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_remove_failure.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_remove_failure.snapindex a4bef58d0..f2000d501 100644--- a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_remove_failure.snap+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_remove_failure.snap@@ -31,8 +31,8 @@ exit_code: 1----- stdout ---------- stderr ------π [36mRunning user pre-remove [1mblock[22m:[39m-[107m [0m [2m[0m[2m[34mexit[0m[2m 1-[0mβ [31mpre-remove command failed: [1mblock[22m: exit status: 1[39m+[36mβ[39m [36mRunning user pre-remove [1mblock[22m:[39m+[107m [0m [2m[0m[2m[34mexit[0m[2m 1+[0m[31mβ[39m [31mpre-remove command failed: [1mblock[22m: exit status: 1[39m-π‘ [2mTo skip pre-remove hooks, re-run with [90m--no-verify[39m[22m+[2mβ³[22m [2mTo skip pre-remove hooks, re-run with [90m--no-verify[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_remove_skipped_no_verify.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_remove_skipped_no_verify.snapindex 068bdd12b..3baa6083f 100644--- a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_remove_skipped_no_verify.snap+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_remove_skipped_no_verify.snap@@ -32,4 +32,4 @@ exit_code: 0----- stdout ---------- stderr ------π [36mRemoving [1mfeature[22m worktree & branch in background (--force-delete)[39m+[36mβ[39m [36mRemoving [1mfeature[22m worktree & branch in background (--force-delete)[39m