Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
fix: align user-facing output with formatting guidelines (#1138)
Maximilian Roosbba3a209b8df
diff --git a/docs/content/hook.md b/docs/content/hook.mdindex ad00945e4..beb915bb1 100644--- a/docs/content/hook.md+++ b/docs/content/hook.md@@ -35,7 +35,7 @@ The most common starting point is `post-start` — it runs background tasks (dev### pre-switch-Runs before every `wt switch` — before branch validation or worktree creation. Useful for ensuring the repository is up to date before switching. Template variables reflect the current worktree (where you're switching from), not the destination. Failure aborts the switch.+Runs before every `wt switch` — before branch validation or worktree creation. Useful for ensuring the repository is up to date before switching. Template variables reflect the current worktree (the source), not the destination. Failure aborts the switch.```toml[pre-switch]diff --git a/docs/content/switch.md b/docs/content/switch.mdindex 5006178ea..c2010fd41 100644--- a/docs/content/switch.md+++ b/docs/content/switch.md@@ -33,7 +33,7 @@ wt switch pr:123 # Switch to PR #123's branchThe `--create` flag creates a new branch from the `--base` branch (defaults to default branch). Without `--create`, the branch must already exist.-**Upstream tracking:** Branches created with `--create` have no upstream tracking configured. This prevents accidental pushes to the wrong branch — for example, `--base origin/main` would otherwise make `git push` target `main`. Use `git push -u origin <branch>` to set up tracking when you're ready.+**Upstream tracking:** Branches created with `--create` have no upstream tracking configured. This prevents accidental pushes to the wrong branch — for example, `--base origin/main` would otherwise make `git push` target `main`. Use `git push -u origin <branch>` to set up tracking as needed.Without `--create`, switching to a remote branch (e.g., `wt switch feature` when only `origin/feature` exists) creates a local branch tracking the remote — this is the standard git behavior and is preserved.diff --git a/skills/worktrunk/reference/hook.md b/skills/worktrunk/reference/hook.mdindex 2ff952acf..0639e184c 100644--- a/skills/worktrunk/reference/hook.md+++ b/skills/worktrunk/reference/hook.md@@ -27,7 +27,7 @@ The most common starting point is `post-start` — it runs background tasks (dev### pre-switch-Runs before every `wt switch` — before branch validation or worktree creation. Useful for ensuring the repository is up to date before switching. Template variables reflect the current worktree (where you're switching from), not the destination. Failure aborts the switch.+Runs before every `wt switch` — before branch validation or worktree creation. Useful for ensuring the repository is up to date before switching. Template variables reflect the current worktree (the source), not the destination. Failure aborts the switch.```toml[pre-switch]diff --git a/skills/worktrunk/reference/switch.md b/skills/worktrunk/reference/switch.mdindex c689cfaf7..99dedad84 100644--- a/skills/worktrunk/reference/switch.md+++ b/skills/worktrunk/reference/switch.md@@ -18,7 +18,7 @@ wt switch pr:123 # Switch to PR #123's branchThe `--create` flag creates a new branch from the `--base` branch (defaults to default branch). Without `--create`, the branch must already exist.-**Upstream tracking:** Branches created with `--create` have no upstream tracking configured. This prevents accidental pushes to the wrong branch — for example, `--base origin/main` would otherwise make `git push` target `main`. Use `git push -u origin <branch>` to set up tracking when you're ready.+**Upstream tracking:** Branches created with `--create` have no upstream tracking configured. This prevents accidental pushes to the wrong branch — for example, `--base origin/main` would otherwise make `git push` target `main`. Use `git push -u origin <branch>` to set up tracking as needed.Without `--create`, switching to a remote branch (e.g., `wt switch feature` when only `origin/feature` exists) creates a local branch tracking the remote — this is the standard git behavior and is preserved.diff --git a/src/cli/mod.rs b/src/cli/mod.rsindex e91e90554..bd7d40175 100644--- a/src/cli/mod.rs+++ b/src/cli/mod.rs@@ -266,7 +266,7 @@ wt switch pr:123 # Switch to PR #123's branchThe `--create` flag creates a new branch from the `--base` branch (defaults to default branch). Without `--create`, the branch must already exist.-**Upstream tracking:** Branches created with `--create` have no upstream tracking configured. This prevents accidental pushes to the wrong branch — for example, `--base origin/main` would otherwise make `git push` target `main`. Use `git push -u origin <branch>` to set up tracking when you're ready.+**Upstream tracking:** Branches created with `--create` have no upstream tracking configured. This prevents accidental pushes to the wrong branch — for example, `--base origin/main` would otherwise make `git push` target `main`. Use `git push -u origin <branch>` to set up tracking as needed.Without `--create`, switching to a remote branch (e.g., `wt switch feature` when only `origin/feature` exists) creates a local branch tracking the remote — this is the standard git behavior and is preserved.@@ -1072,7 +1072,7 @@ The most common starting point is `post-start` — it runs background tasks (dev### pre-switch-Runs before every `wt switch` — before branch validation or worktree creation. Useful for ensuring the repository is up to date before switching. Template variables reflect the current worktree (where you're switching from), not the destination. Failure aborts the switch.+Runs before every `wt switch` — before branch validation or worktree creation. Useful for ensuring the repository is up to date before switching. Template variables reflect the current worktree (the source), not the destination. Failure aborts the switch.```toml[pre-switch]diff --git a/src/commands/relocate.rs b/src/commands/relocate.rsindex 6bf2ac788..28643bf43 100644--- a/src/commands/relocate.rs+++ b/src/commands/relocate.rs@@ -244,7 +244,7 @@ pub fn validate_candidates(eprintln!("{}",hint_message(cformat!(- "Use <bright-black>--commit</> to auto-commit changes before relocating"+ "To auto-commit changes before relocating, use <bright-black>--commit</>")));skipped += 1;@@ -343,8 +343,12 @@ impl RelocationExecutor {"{}",progress_message(cformat!("Backing up {src} → {dest}")));- std::fs::rename(expected_path, &backup_path)- .with_context(|| format!("Failed to backup {}", expected_path.display()))?;+ std::fs::rename(expected_path, &backup_path).with_context(|| {+ format!(+ "Failed to backup {}",+ format_path_for_display(expected_path)+ )+ })?;} else {let blocked_path = format_path_for_display(expected_path);let msg = cformat!("Skipping <bold>{branch}</> (target blocked: {blocked_path})");@@ -352,7 +356,7 @@ impl RelocationExecutor {eprintln!("{}",hint_message(cformat!(- "Use <bright-black>--clobber</> to backup blocking paths"+ "To backup blocking paths, use <bright-black>--clobber</>")));blocked.insert(i);diff --git a/src/commands/step_commands.rs b/src/commands/step_commands.rsindex 943930e7d..b6a3a1973 100644--- a/src/commands/step_commands.rs+++ b/src/commands/step_commands.rs@@ -18,6 +18,7 @@ use ignore::gitignore::GitignoreBuilder;use worktrunk::HookType;use worktrunk::config::UserConfig;use worktrunk::git::Repository;+use worktrunk::path::format_path_for_display;use worktrunk::styling::{eprintln, format_with_gutter, hint_message, info_message, progress_message, success_message,verbosity,@@ -655,7 +656,7 @@ pub fn step_copy_ignored(.strip_prefix(&source_path).unwrap_or(src_entry.as_path());let entry_type = if *is_dir { "dir" } else { "file" };- format!("{} ({})", relative.display(), entry_type)+ format!("{} ({})", format_path_for_display(relative), entry_type)}).collect();let entry_word = if items.len() == 1 { "entry" } else { "entries" };@@ -683,13 +684,18 @@ pub fn step_copy_ignored(let dest_entry = dest_path.join(relative);if *is_dir {- copy_dir_recursive(src_entry, &dest_entry, force)- .with_context(|| format!("copying directory {}", relative.display()))?;+ copy_dir_recursive(src_entry, &dest_entry, force).with_context(|| {+ format!("copying directory {}", format_path_for_display(relative))+ })?;copied_count += 1;} else {if let Some(parent) = dest_entry.parent() {- fs::create_dir_all(parent)- .with_context(|| format!("creating directory for {}", relative.display()))?;+ fs::create_dir_all(parent).with_context(|| {+ format!(+ "creating directory for {}",+ format_path_for_display(relative)+ )+ })?;}if force {remove_if_exists(&dest_entry)?;@@ -699,9 +705,8 @@ pub fn step_copy_ignored(Ok(_) => copied_count += 1,Err(e) if e.kind() == std::io::ErrorKind::AlreadyExists => {}Err(e) => {- return Err(- anyhow::Error::from(e).context(format!("copying {}", relative.display()))- );+ return Err(anyhow::Error::from(e)+ .context(format!("copying {}", format_path_for_display(relative))));}}}diff --git a/src/config/user/mod.rs b/src/config/user/mod.rsindex 558e37d6d..43178a6ff 100644--- a/src/config/user/mod.rs+++ b/src/config/user/mod.rs@@ -184,7 +184,7 @@ impl UserConfig {"{}",crate::styling::warning_message(format!("Config file not found: {}",- config_path.display()+ crate::path::format_path_for_display(config_path))));}diff --git a/src/git/error.rs b/src/git/error.rsindex 5706a14ce..8c5bdea58 100644--- a/src/git/error.rs+++ b/src/git/error.rs@@ -644,7 +644,7 @@ impl GitError {f,"\n{}",hint_message(cformat!(- "To rebase onto <bold>{target_branch}</>, run <bright-black>{rebase_cmd}</>"+ "To rebase onto <bright-black>{target_branch}</>, run <bright-black>{rebase_cmd}</>")))}@@ -759,7 +759,9 @@ impl GitError {f,"{}\n{}",error_message("No project configuration found"),- hint_message(cformat!("Create a config file at: <bold>{path_display}</>"))+ hint_message(cformat!(+ "Create a config file at: <bright-black>{path_display}</>"+ )))}diff --git a/src/main.rs b/src/main.rsindex 434cdae7b..6f6fce157 100644--- a/src/main.rs+++ b/src/main.rs@@ -77,7 +77,7 @@ fn enhance_and_exit_error(err: clap::Error) -> ! {if let Some(suggestion) = cli::suggest_nested_subcommand(&cmd, &unknown.to_string()) {ceprintln!("{}- <yellow>tip:</> did you mean <cyan,bold>{suggestion}</cyan,bold>?",+ <yellow>tip:</> perhaps <cyan,bold>{suggestion}</cyan,bold>?",err.render().ansi());process::exit(2);diff --git a/src/output/handlers.rs b/src/output/handlers.rsindex 05029829b..e8a106cd2 100644--- a/src/output/handlers.rs+++ b/src/output/handlers.rs@@ -913,7 +913,7 @@ impl RemovalDisplayInfo {eprintln!("{}",hint_message(cformat!(- "Branch integrated ({desc} <bold>{target}</>, <dim>{symbol}</>); retained with <bright-black>--no-delete-branch</>"+ "Branch integrated ({desc} <bright-black>{target}</>, <dim>{symbol}</>); retained with <bright-black>--no-delete-branch</>")));}diff --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 ef77cc17c..53971bac5 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@@ -5,4 +5,4 @@ expression: err.to_string()[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-[2m↳[22m [2mTo rebase onto [1mmain[22m, run [90mwt step rebase main[39m[22m+[2m↳[22m [2mTo rebase onto [90mmain[39m, run [90mwt step rebase main[39m[22mdiff --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 aef6b86db..04b26f174 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@@ -3,4 +3,4 @@ source: tests/integration_tests/git_error_display.rsexpression: err.to_string()---[31m✗[39m [31mNo project configuration found[39m-[2m↳[22m [2mCreate a config file at: [1m/tmp/repo/.config/wt.toml[22m[22m+[2m↳[22m [2mCreate a config file at: [90m/tmp/repo/.config/wt.toml[39m[22mdiff --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 40ac0e029..964fdb6c6 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@@ -26,10 +26,13 @@ info:SHELL: ""TERM: alacrittyUSERPROFILE: "[TEST_HOME]"+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"WORKTRUNK_TEST_EPOCH: "1735776000"+ WORKTRUNK_TEST_NUSHELL_ENV: "0"WORKTRUNK_TEST_POWERSHELL_ENV: "0"WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"@@ -40,4 +43,4 @@ exit_code: 1----- stderr -----[31m✗[39m [31mNo project configuration found[39m-[2m↳[22m [2mCreate a config file at: [1m_REPO_/.config/wt.toml[22m[22m+[2m↳[22m [2mCreate a config file at: [90m_REPO_/.config/wt.toml[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__help__help_switch_long.snap b/tests/snapshots/integration__integration_tests__help__help_switch_long.snapindex 78c78643f..3988488d4 100644--- a/tests/snapshots/integration__integration_tests__help__help_switch_long.snap+++ b/tests/snapshots/integration__integration_tests__help__help_switch_long.snap@@ -117,7 +117,7 @@ Worktrees are addressed by branch name; paths are computed from a configurable tThe [2m--create[0m flag creates a new branch from the [2m--base[0m branch (defaults to default branch). Without [2m--create[0m, the branch must already exist.-[1mUpstream tracking:[0m Branches created with [2m--create[0m have no upstream tracking configured. This prevents accidental pushes to the wrong branch — for example, [2m--base origin/main[0m would otherwise make [2mgit push[0m target [2mmain[0m. Use [2mgit push -u origin <branch>[0m to set up tracking when you're ready.+[1mUpstream tracking:[0m Branches created with [2m--create[0m have no upstream tracking configured. This prevents accidental pushes to the wrong branch — for example, [2m--base origin/main[0m would otherwise make [2mgit push[0m target [2mmain[0m. Use [2mgit push -u origin <branch>[0m to set up tracking as needed.Without [2m--create[0m, switching to a remote branch (e.g., [2mwt switch feature[0m when only [2morigin/feature[0m exists) creates a local branch tracking the remote — this is the standard git behavior and is preserved.diff --git a/tests/snapshots/integration__integration_tests__help__nested_subcommand_hook_post_create.snap b/tests/snapshots/integration__integration_tests__help__nested_subcommand_hook_post_create.snapindex 3b55af19d..76b855650 100644--- a/tests/snapshots/integration__integration_tests__help__nested_subcommand_hook_post_create.snap+++ b/tests/snapshots/integration__integration_tests__help__nested_subcommand_hook_post_create.snap@@ -14,10 +14,13 @@ info:RUST_LOG: warnSHELL: ""TERM: alacritty+ WORKTRUNK_APPROVALS_PATH: /nonexistent/test/approvals.tomlWORKTRUNK_CONFIG_PATH: /nonexistent/test/config.toml+ WORKTRUNK_SYSTEM_CONFIG_PATH: /etc/xdg/worktrunk/config.tomlWORKTRUNK_TEST_CLAUDE_INSTALLED: "0"WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"WORKTRUNK_TEST_EPOCH: "1735776000"+ WORKTRUNK_TEST_NUSHELL_ENV: "0"WORKTRUNK_TEST_POWERSHELL_ENV: "0"WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"---@@ -32,4 +35,4 @@ exit_code: 2For more information, try '[1m[36m--help[0m'.- [33mtip:[39m did you mean [36m[1mwt hook post-create[39m[22m?+ [33mtip:[39m perhaps [36m[1mwt hook post-create[39m[22m?diff --git a/tests/snapshots/integration__integration_tests__help__nested_subcommand_hook_pre_merge.snap b/tests/snapshots/integration__integration_tests__help__nested_subcommand_hook_pre_merge.snapindex 8c4ebf262..d6e7eea3a 100644--- a/tests/snapshots/integration__integration_tests__help__nested_subcommand_hook_pre_merge.snap+++ b/tests/snapshots/integration__integration_tests__help__nested_subcommand_hook_pre_merge.snap@@ -14,10 +14,13 @@ info:RUST_LOG: warnSHELL: ""TERM: alacritty+ WORKTRUNK_APPROVALS_PATH: /nonexistent/test/approvals.tomlWORKTRUNK_CONFIG_PATH: /nonexistent/test/config.toml+ WORKTRUNK_SYSTEM_CONFIG_PATH: /etc/xdg/worktrunk/config.tomlWORKTRUNK_TEST_CLAUDE_INSTALLED: "0"WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"WORKTRUNK_TEST_EPOCH: "1735776000"+ WORKTRUNK_TEST_NUSHELL_ENV: "0"WORKTRUNK_TEST_POWERSHELL_ENV: "0"WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"---@@ -34,4 +37,4 @@ exit_code: 2For more information, try '[1m[36m--help[0m'.- [33mtip:[39m did you mean [36m[1mwt hook pre-merge[39m[22m?+ [33mtip:[39m perhaps [36m[1mwt hook pre-merge[39m[22m?diff --git a/tests/snapshots/integration__integration_tests__help__nested_subcommand_step_commit.snap b/tests/snapshots/integration__integration_tests__help__nested_subcommand_step_commit.snapindex 7404646dd..c7e1d6fc4 100644--- a/tests/snapshots/integration__integration_tests__help__nested_subcommand_step_commit.snap+++ b/tests/snapshots/integration__integration_tests__help__nested_subcommand_step_commit.snap@@ -14,10 +14,13 @@ info:RUST_LOG: warnSHELL: ""TERM: alacritty+ WORKTRUNK_APPROVALS_PATH: /nonexistent/test/approvals.tomlWORKTRUNK_CONFIG_PATH: /nonexistent/test/config.toml+ WORKTRUNK_SYSTEM_CONFIG_PATH: /etc/xdg/worktrunk/config.tomlWORKTRUNK_TEST_CLAUDE_INSTALLED: "0"WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"WORKTRUNK_TEST_EPOCH: "1735776000"+ WORKTRUNK_TEST_NUSHELL_ENV: "0"WORKTRUNK_TEST_POWERSHELL_ENV: "0"WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"---@@ -32,4 +35,4 @@ exit_code: 2For more information, try '[1m[36m--help[0m'.- [33mtip:[39m did you mean [36m[1mwt step commit[39m[22m?+ [33mtip:[39m perhaps [36m[1mwt step commit[39m[22m?diff --git a/tests/snapshots/integration__integration_tests__help__nested_subcommand_step_squash.snap b/tests/snapshots/integration__integration_tests__help__nested_subcommand_step_squash.snapindex f4218057c..4a4c17b9a 100644--- a/tests/snapshots/integration__integration_tests__help__nested_subcommand_step_squash.snap+++ b/tests/snapshots/integration__integration_tests__help__nested_subcommand_step_squash.snap@@ -14,10 +14,13 @@ info:RUST_LOG: warnSHELL: ""TERM: alacritty+ WORKTRUNK_APPROVALS_PATH: /nonexistent/test/approvals.tomlWORKTRUNK_CONFIG_PATH: /nonexistent/test/config.toml+ WORKTRUNK_SYSTEM_CONFIG_PATH: /etc/xdg/worktrunk/config.tomlWORKTRUNK_TEST_CLAUDE_INSTALLED: "0"WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"WORKTRUNK_TEST_EPOCH: "1735776000"+ WORKTRUNK_TEST_NUSHELL_ENV: "0"WORKTRUNK_TEST_POWERSHELL_ENV: "0"WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"---@@ -32,4 +35,4 @@ exit_code: 2For more information, try '[1m[36m--help[0m'.- [33mtip:[39m did you mean [36m[1mwt step squash[39m[22m?+ [33mtip:[39m perhaps [36m[1mwt step squash[39m[22m?diff --git a/tests/snapshots/integration__integration_tests__push__push_error_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_error_not_fast_forward.snapindex 8545c4730..7b527dee2 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@@ -28,6 +28,7 @@ info:USERPROFILE: "[TEST_HOME]"WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"WORKTRUNK_TEST_EPOCH: "1735776000"@@ -43,4 +44,4 @@ exit_code: 1----- stderr -----[31m✗[39m [31mCan't push to local [1mmain[22m branch: it has newer commits[39m[107m [0m * [33m[HASH][m Main commit-[2m↳[22m [2mTo rebase onto [1mmain[22m, run [90mwt step rebase main[39m[22m+[2m↳[22m [2mTo rebase onto [90mmain[39m, run [90mwt step rebase main[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_foreground_no_delete_branch.snap b/tests/snapshots/integration__integration_tests__remove__remove_foreground_no_delete_branch.snapindex aef67091d..df19f64a7 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_foreground_no_delete_branch.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_foreground_no_delete_branch.snap@@ -27,10 +27,13 @@ info:SHELL: ""TERM: alacrittyUSERPROFILE: "[TEST_HOME]"+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"WORKTRUNK_TEST_EPOCH: "1735776000"+ WORKTRUNK_TEST_NUSHELL_ENV: "0"WORKTRUNK_TEST_POWERSHELL_ENV: "0"WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"@@ -42,4 +45,4 @@ exit_code: 0----- stderr -----[36m◎[39m [36mRemoving [1mfeature-fg-keep[22m worktree...[39m[32m✓ Removed [1mfeature-fg-keep[22m worktree[39m-[2m↳[22m [2mBranch integrated (same commit as [1mmain[22m, [2m_[22m); retained with [90m--no-delete-branch[39m[22m+[2m↳[22m [2mBranch integrated (same commit as [90mmain[39m, [2m_[22m); retained with [90m--no-delete-branch[39m[22mdiff --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 7cfe67a12..de5b3515a 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@@ -26,10 +26,13 @@ info:SHELL: ""TERM: alacrittyUSERPROFILE: "[TEST_HOME]"+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"WORKTRUNK_TEST_EPOCH: "1735776000"+ WORKTRUNK_TEST_NUSHELL_ENV: "0"WORKTRUNK_TEST_POWERSHELL_ENV: "0"WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"@@ -40,4 +43,4 @@ exit_code: 0----- stderr -----[36m◎ Removing [1mfeature-keep[22m worktree in background[39m-[2m↳[22m [2mBranch integrated (same commit as [1mmain[22m, [2m_[22m); retained with [90m--no-delete-branch[39m[22m+[2m↳[22m [2mBranch integrated (same commit as [90mmain[39m, [2m_[22m); retained with [90m--no-delete-branch[39m[22mdiff --git a/tests/snapshots/integration__integration_tests__step_relocate__relocate_dirty_without_commit.snap b/tests/snapshots/integration__integration_tests__step_relocate__relocate_dirty_without_commit.snapindex 98065a99d..fd1e6e73f 100644--- a/tests/snapshots/integration__integration_tests__step_relocate__relocate_dirty_without_commit.snap+++ b/tests/snapshots/integration__integration_tests__step_relocate__relocate_dirty_without_commit.snap@@ -25,10 +25,13 @@ info:SHELL: ""TERM: alacrittyUSERPROFILE: "[TEST_HOME]"+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"WORKTRUNK_TEST_EPOCH: "1735776000"+ WORKTRUNK_TEST_NUSHELL_ENV: "0"WORKTRUNK_TEST_POWERSHELL_ENV: "0"WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"@@ -39,6 +42,6 @@ exit_code: 0----- stderr -----[33m▲[39m [33mSkipping [1mfeature[22m (uncommitted changes)[39m-[2m↳[22m [2mUse [90m--commit[39m to auto-commit changes before relocating[22m+[2m↳[22m [2mTo auto-commit changes before relocating, use [90m--commit[39m[22m[2m○[22m Skipped 1 worktreediff --git a/tests/snapshots/integration__integration_tests__step_relocate__relocate_target_exists.snap b/tests/snapshots/integration__integration_tests__step_relocate__relocate_target_exists.snapindex 55bd6dfd2..1fd770cc6 100644--- a/tests/snapshots/integration__integration_tests__step_relocate__relocate_target_exists.snap+++ b/tests/snapshots/integration__integration_tests__step_relocate__relocate_target_exists.snap@@ -25,10 +25,13 @@ info:SHELL: ""TERM: alacrittyUSERPROFILE: "[TEST_HOME]"+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"WORKTRUNK_TEST_EPOCH: "1735776000"+ WORKTRUNK_TEST_NUSHELL_ENV: "0"WORKTRUNK_TEST_POWERSHELL_ENV: "0"WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"@@ -39,6 +42,6 @@ exit_code: 0----- stderr -----[33m▲[39m [33mSkipping [1mfeature[22m (target blocked: _REPO_.feature)[39m-[2m↳[22m [2mUse [90m--clobber[39m to backup blocking paths[22m+[2m↳[22m [2mTo backup blocking paths, use [90m--clobber[39m[22m[2m○[22m Relocated 0 worktrees, skipped 1 worktree