Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Remove --no-background, promote --no-progressive, carry foreground through (#1381)
Maximilian Roosfe56eaa33577
diff --git a/docs/content/list.md b/docs/content/list.mdindex 400a77a99..0344e94f1 100644--- a/docs/content/list.md+++ b/docs/content/list.md@@ -313,7 +313,8 @@ Usage: <b><span class=c>wt list</span></b> <span class=c>[OPTIONS]</span>Show fast info immediately, update with slow infoDisplays local data (branches, paths, status) first, then updates with- remote data (CI, upstream) as it arrives. Auto-enabled for TTY.+ remote data (CI, upstream) as it arrives. Use --no-progressive to+ force buffered rendering. Auto-enabled for TTY.<b><span class=c>-h</span></b>, <b><span class=c>--help</span></b>Print help (see a summary with '-h')diff --git a/docs/content/worktrunk.md b/docs/content/worktrunk.mdindex b7710fef8..5ff188da4 100644--- a/docs/content/worktrunk.md+++ b/docs/content/worktrunk.md@@ -191,7 +191,7 @@ wt remove # after PR is merged<span style='background:var(--bright-white,#fff)'> </span> lib.rs | 2 <span class=g>++</span><span style='background:var(--bright-white,#fff)'> </span> 2 files changed, 53 insertions(+)<span class=g>✓</span> <span class=g>Merged to <b>main</b> <span style='color:var(--bright-black,#555)'>(1 commit, 2 files, +53</span></span><span style='color:var(--bright-black,#555)'>)</span>-<span class=c>◎ Removing <b>feature-auth</b> worktree & branch in background (same commit as <b>main</b>,</span> <span class=d>_</span><span class=c>)</span>+<span class=c>◎</span> <span class=c>Removing <b>feature-auth</b> worktree & branch in background (same commit as <b>main</b>,</span> <span class=d>_</span><span class=c>)</span><span class=d>○</span> Switched to worktree for <b>main</b> @ <b>repo</b>{% end %}diff --git a/skills/worktrunk/reference/list.md b/skills/worktrunk/reference/list.mdindex 9bde8f47d..62b40181d 100644--- a/skills/worktrunk/reference/list.md+++ b/skills/worktrunk/reference/list.md@@ -280,7 +280,8 @@ Usage: <b><span class=c>wt list</span></b> <span class=c>[OPTIONS]</span>Show fast info immediately, update with slow infoDisplays local data (branches, paths, status) first, then updates with- remote data (CI, upstream) as it arrives. Auto-enabled for TTY.+ remote data (CI, upstream) as it arrives. Use --no-progressive to+ force buffered rendering. Auto-enabled for TTY.<b><span class=c>-h</span></b>, <b><span class=c>--help</span></b>Print help (see a summary with '-h')diff --git a/skills/worktrunk/reference/worktrunk.md b/skills/worktrunk/reference/worktrunk.mdindex 153ed4112..b7e174348 100644--- a/skills/worktrunk/reference/worktrunk.md+++ b/skills/worktrunk/reference/worktrunk.md@@ -158,7 +158,7 @@ wt remove # after PR is merged<span style='background:var(--bright-white,#fff)'> </span> lib.rs | 2 <span class=g>++</span><span style='background:var(--bright-white,#fff)'> </span> 2 files changed, 53 insertions(+)<span class=g>✓</span> <span class=g>Merged to <b>main</b> <span style='color:var(--bright-black,#555)'>(1 commit, 2 files, +53</span></span><span style='color:var(--bright-black,#555)'>)</span>-<span class=c>◎ Removing <b>feature-auth</b> worktree & branch in background (same commit as <b>main</b>,</span> <span class=d>_</span><span class=c>)</span>+<span class=c>◎</span> <span class=c>Removing <b>feature-auth</b> worktree & branch in background (same commit as <b>main</b>,</span> <span class=d>_</span><span class=c>)</span><span class=d>○</span> Switched to worktree for <b>main</b> @ <b>repo</b>{% end %}diff --git a/src/cli/hook.rs b/src/cli/hook.rsindex 9c039c7fa..59a84fd35 100644--- a/src/cli/hook.rs+++ b/src/cli/hook.rs@@ -89,10 +89,6 @@ pub enum HookCommand {#[arg(long)]foreground: bool,- /// Deprecated: use --foreground instead- #[arg(long = "no-background", hide = true)]- no_background: bool,-/// Override built-in template variable (KEY=VALUE)#[arg(long = "var", value_name = "KEY=VALUE", value_parser = super::parse_key_val, action = clap::ArgAction::Append)]vars: Vec<(String, String)>,@@ -121,10 +117,6 @@ pub enum HookCommand {#[arg(long)]foreground: bool,- /// Deprecated: use --foreground instead- #[arg(long = "no-background", hide = true)]- no_background: bool,-/// Override built-in template variable (KEY=VALUE)#[arg(long = "var", value_name = "KEY=VALUE", value_parser = super::parse_key_val, action = clap::ArgAction::Append)]vars: Vec<(String, String)>,diff --git a/src/cli/mod.rs b/src/cli/mod.rsindex f70445fa0..fefa2a19c 100644--- a/src/cli/mod.rs+++ b/src/cli/mod.rs@@ -733,7 +733,8 @@ Missing a field that would be generally useful? Open an issue at https://github./// Show fast info immediately, update with slow info////// Displays local data (branches, paths, status) first, then updates- /// with remote data (CI, upstream) as it arrives. Auto-enabled for TTY.+ /// with remote data (CI, upstream) as it arrives. Use --no-progressive+ /// to force buffered rendering. Auto-enabled for TTY.#[arg(long, overrides_with = "no_progressive")]progressive: bool,@@ -835,10 +836,6 @@ Removal runs in the background by default (returns immediately). Logs are writte#[arg(long)]foreground: bool,- /// Deprecated: use --foreground instead- #[arg(long = "no-background", hide = true)]- no_background: bool,-/// Skip approval prompts#[arg(short, long, help_heading = "Automation")]yes: bool,diff --git a/src/commands/merge.rs b/src/commands/merge.rsindex ed14a1e9c..bd0db367f 100644--- a/src/commands/merge.rs+++ b/src/commands/merge.rs@@ -269,7 +269,7 @@ pub fn handle_merge(opts: MergeOptions<'_>) -> anyhow::Result<()> {};// Run hooks during merge removal (pass through verify flag)// Approval was handled at the gate (collect_merge_commands)- crate::output::handle_remove_output(&remove_result, true, verify, false)?;+ crate::output::handle_remove_output(&remove_result, false, verify, false)?;} else {// Worktree preserved - show reason (priority: main worktree > on target > --no-remove flag)let message = if in_main {diff --git a/src/commands/select/mod.rs b/src/commands/select/mod.rsindex 545898f17..4c405d5b1 100644--- a/src/commands/select/mod.rs+++ b/src/commands/select/mod.rs@@ -333,7 +333,7 @@ pub fn handle_select(.context("Failed to remove worktree")?;// Execute removal in foreground, no hooks, not quiet- handle_remove_output(&result, false, false, false)?;+ handle_remove_output(&result, true, false, false)?;}PickerAction::Create | PickerAction::Switch => {let should_create = matches!(action, PickerAction::Create);diff --git a/src/commands/step_commands.rs b/src/commands/step_commands.rsindex 291c1d36b..aa157f11b 100644--- a/src/commands/step_commands.rs+++ b/src/commands/step_commands.rs@@ -1451,7 +1451,7 @@ pub fn step_prune(dry_run: bool, yes: bool, min_age: &str, foreground: bool) ->return Ok(false);}};- handle_remove_output(&plan, !foreground, run_hooks, true)?;+ handle_remove_output(&plan, foreground, run_hooks, true)?;Ok(true)}diff --git a/src/completion.rs b/src/completion.rsindex b5f13e96b..756d80949 100644--- a/src/completion.rs+++ b/src/completion.rs@@ -11,11 +11,6 @@ use crate::display::format_relative_time_short;use worktrunk::config::{ProjectConfig, UserConfig};use worktrunk::git::{BranchCategory, HookType, Repository};-/// Deprecated args that should never appear in completions.-/// These are hidden from help AND completions, unlike other hidden args-/// that appear when completing `--`.-const DEPRECATED_ARGS: &[&str] = &["--no-background"];-/// Handle shell-initiated completion requests via `COMPLETE=$SHELL wt`pub(crate) fn maybe_handle_env_completion() -> bool {let Some(shell_name) = std::env::var_os("COMPLETE") else {@@ -109,15 +104,6 @@ pub(crate) fn maybe_handle_env_completion() -> bool {completions};- // Filter out deprecated args - they should never appear in completions- let completions: Vec<_> = completions- .into_iter()- .filter(|c| {- let value = c.get_value().to_string_lossy();- !DEPRECATED_ARGS.contains(&value.as_ref())- })- .collect();-// Write completions in the appropriate format for the shelllet shell_name = shell_name.to_string_lossy();let ifs = std::env::var("_CLAP_IFS").ok();diff --git a/src/main.rs b/src/main.rsindex a2706d9d6..a7a7ed506 100644--- a/src/main.rs+++ b/src/main.rs@@ -66,9 +66,6 @@ use cli::{};use worktrunk::HookType;-const NO_BACKGROUND_DEPRECATED_MSG: &str =- "--no-background is deprecated; use --foreground instead";-/// Enhance clap errors with command-specific hints, then exit.////// For unrecognized subcommands that match nested commands, suggests the full path.@@ -95,10 +92,6 @@ fn enhance_and_exit_error(err: clap::Error) -> ! {err.exit()}-fn warn_no_background_deprecated() {- eprintln!("{}", warning_message(NO_BACKGROUND_DEPRECATED_MSG));-}-#[cfg(not(unix))]fn print_windows_picker_unavailable() {eprintln!(@@ -111,13 +104,6 @@ fn print_windows_picker_unavailable() {);}-fn is_foreground_mode(foreground: bool, no_background: bool) -> bool {- if no_background {- warn_no_background_deprecated();- }- foreground || no_background-}-fn flag_pair(positive: bool, negative: bool) -> Option<bool> {match (positive, negative) {(true, _) => Some(true),@@ -141,11 +127,9 @@ fn run_toggleable_hook(yes: bool,dry_run: bool,foreground: bool,- no_background: bool,name: Option<&str>,vars: &[(String, String)],) -> anyhow::Result<()> {- let foreground = is_foreground_mode(foreground, no_background);run_hook(hook_type, yes, Some(foreground), dry_run, name, vars)}@@ -179,14 +163,12 @@ fn handle_hook_command(action: HookCommand) -> anyhow::Result<()> {yes,dry_run,foreground,- no_background,vars,} => run_toggleable_hook(HookType::PostStart,yes,dry_run,foreground,- no_background,name.as_deref(),&vars,),@@ -195,14 +177,12 @@ fn handle_hook_command(action: HookCommand) -> anyhow::Result<()> {yes,dry_run,foreground,- no_background,vars,} => run_toggleable_hook(HookType::PostSwitch,yes,dry_run,foreground,- no_background,name.as_deref(),&vars,),@@ -780,11 +760,7 @@ fn main() {None => (|| {let (repo, _recovered) = current_or_recover()?;- let progressive_opt = match (progressive, no_progressive) {- (true, _) => Some(true),- (_, true) => Some(false),- _ => None,- };+ let progressive_opt = flag_pair(progressive, no_progressive);let render_mode = RenderMode::detect(progressive_opt);handle_list(repo, format, branches, remotes, full, render_mode)})(),@@ -842,15 +818,12 @@ fn main() {delete_branch,force_delete,foreground,- no_background,verify,yes,force,} => UserConfig::load().context("Failed to load config").and_then(|config| {- let background = !is_foreground_mode(foreground, no_background);-// Validate conflicting flagsif !delete_branch && force_delete {return Err(worktrunk::git::GitError::Other {@@ -894,7 +867,7 @@ fn main() {// "Approve at the Gate": approval happens AFTER validation passeslet run_hooks = verify && approve_remove(yes)?;- handle_remove_output(&result, background, run_hooks, false)+ handle_remove_output(&result, foreground, run_hooks, false)} else {// Multi-worktree removal: validate ALL first, then approve, then execute// This supports partial success - some may fail validation while others succeed.@@ -1013,17 +986,17 @@ fn main() {// Phase 3: Execute all validated plans// Remove other worktrees firstfor result in plans_others {- handle_remove_output(&result, background, run_hooks, false)?;+ handle_remove_output(&result, foreground, run_hooks, false)?;}// Handle branch-only casesfor result in plans_branch_only {- handle_remove_output(&result, background, run_hooks, false)?;+ handle_remove_output(&result, foreground, run_hooks, false)?;}// Remove current worktree last (if it was in the list)if let Some(result) = plan_current {- handle_remove_output(&result, background, run_hooks, false)?;+ handle_remove_output(&result, foreground, run_hooks, false)?;}// Exit with failure if any validation errors occurreddiff --git a/src/output/handlers.rs b/src/output/handlers.rsindex 8200fd67c..34efa4a61 100644--- a/src/output/handlers.rs+++ b/src/output/handlers.rs@@ -640,7 +640,7 @@ pub fn execute_user_command(command: &str, display_path: Option<&Path>) -> anyho/// like "No worktree found for branch X" that are noise in batch operations.pub fn handle_remove_output(result: &RemoveResult,- background: bool,+ foreground: bool,verify: bool,quiet: bool,) -> anyhow::Result<()> {@@ -667,7 +667,7 @@ pub fn handle_remove_output(force_worktree: *force_worktree,expected_path: expected_path.as_deref(),removed_commit: removed_commit.as_deref(),- background,+ foreground,verify,}),RemoveResult::BranchOnly {@@ -932,7 +932,7 @@ impl RemovalDisplayInfo {}/// Print the removal message (progress for background, success for foreground).- fn print_message(&self, branch_name: &str, is_background: bool) -> anyhow::Result<()> {+ fn print_message(&self, branch_name: &str, foreground: bool) -> anyhow::Result<()> {let flag_note = get_flag_note(if self.branch_deleted() {BranchDeletionMode::SafeDelete // Doesn't matter, outcome already determined@@ -948,33 +948,31 @@ impl RemovalDisplayInfo {""};- if is_background {- let flag_text = &flag_note.text;- let flag_after = flag_note.after_cyan();- let msg = if self.branch_deleted() {- cformat!(- "<cyan>◎ Removing <bold>{branch_name}</> worktree{force_text} & branch in background{flag_text}</>{flag_after}"- )- } else {- cformat!(- "<cyan>◎ Removing <bold>{branch_name}</> worktree{force_text} in background</>"- )- };- eprintln!("{}", FormattedMessage::new(msg));- Ok(())- } else {- let msg = if self.branch_deleted() {+ let msg = if foreground {+ if self.branch_deleted() {let flag_text = &flag_note.text;- let flag_after = flag_note.after_green();- cformat!(- "<green>✓ Removed <bold>{branch_name}</> worktree{force_text} & branch{flag_text}</>{flag_after}"- )+ success_message(cformat!(+ "Removed <bold>{branch_name}</> worktree{force_text} & branch{flag_text}"+ ))+ .append(&flag_note.after_green())} else {- cformat!("<green>✓ Removed <bold>{branch_name}</> worktree{force_text}</>")- };- eprintln!("{}", FormattedMessage::new(msg));- Ok(())- }+ success_message(cformat!(+ "Removed <bold>{branch_name}</> worktree{force_text}"+ ))+ }+ } else if self.branch_deleted() {+ let flag_text = &flag_note.text;+ progress_message(cformat!(+ "Removing <bold>{branch_name}</> worktree{force_text} & branch in background{flag_text}"+ ))+ .append(&flag_note.after_cyan())+ } else {+ progress_message(cformat!(+ "Removing <bold>{branch_name}</> worktree{force_text} in background"+ ))+ };+ eprintln!("{msg}");+ Ok(())}/// Print hints about branch status (why it was kept, how to force delete).@@ -1033,7 +1031,7 @@ struct RemovedWorktreeOutputContext<'a> {force_worktree: bool,expected_path: Option<&'a Path>,removed_commit: Option<&'a str>,- background: bool,+ foreground: bool,verify: bool,}@@ -1050,7 +1048,7 @@ fn handle_removed_worktree_output(ctx: RemovedWorktreeOutputContext<'_>) -> anyhforce_worktree,expected_path,removed_commit,- background,+ foreground,verify,} = ctx;@@ -1098,32 +1096,7 @@ fn handle_removed_worktree_output(ctx: RemovedWorktreeOutputContext<'_>) -> anyh// Handle detached HEAD case (no branch known)let Some(branch_name) = branch_name else {// No branch associated - just remove the worktree- if background {- let path_display = format_path_for_display(worktree_path);- eprintln!(- "{}",- progress_message(cformat!(- "Removing worktree @ <bold>{path_display}</> in background (detached HEAD, no branch to delete)"- ))- );-- // Stop fsmonitor daemon BEFORE rename (must happen while path still exists)- let _ = repo- .worktree_at(worktree_path)- .run_command(&["fsmonitor--daemon", "stop"]);-- let remove_command =- execute_instant_removal_or_fallback(&repo, worktree_path, None, force_worktree);-- spawn_detached(- &repo,- main_path,- &remove_command,- "detached",- &HookLog::internal(InternalOp::Remove),- None,- )?;- } else {+ if foreground {// Progress message after pre-remove hooks, before actual removaleprintln!("{}",@@ -1151,75 +1124,46 @@ fn handle_removed_worktree_output(ctx: RemovedWorktreeOutputContext<'_>) -> anyhformat_path_for_display(worktree_path))));- }- // Post-remove hooks for detached HEAD use "HEAD" as the branch identifier- spawn_hooks_after_remove(- main_path,- worktree_path,- "HEAD",- removed_commit,- verify,- changed_directory,- )?;- stderr().flush()?;- return Ok(());- };-- if background {- // Background mode: show warning before decision announcement- if let Some(expected) = expected_path {+ } else {+ let path_display = format_path_for_display(worktree_path);eprintln!("{}",- format_path_mismatch_warning(branch_name, worktree_path, expected)+ progress_message(cformat!(+ "Removing worktree @ <bold>{path_display}</> in background (detached HEAD, no branch to delete)"+ )));- }- // Background mode: spawn detached process- let display_info = RemovalDisplayInfo::from_precomputed(- deletion_mode,- pre_computed_integration,- target_branch,- force_worktree,- );-- display_info.print_message(branch_name, true)?;- display_info.print_hints(branch_name, deletion_mode, pre_computed_integration)?;- print_switch_message_if_changed(changed_directory, main_path)?;-- // Stop fsmonitor daemon BEFORE rename (must happen while path still exists).- // Best effort - ignore errors. This prevents zombie daemons from accumulating.- let _ = repo- .worktree_at(worktree_path)- .run_command(&["fsmonitor--daemon", "stop"]);-- let remove_command = execute_instant_removal_or_fallback(- &repo,- worktree_path,- display_info.branch_deleted().then_some(branch_name),- force_worktree,- );+ // Stop fsmonitor daemon BEFORE rename (must happen while path still exists)+ let _ = repo+ .worktree_at(worktree_path)+ .run_command(&["fsmonitor--daemon", "stop"]);- // Spawn the removal in background - runs from main_path (where we cd'd to)- spawn_detached(- &repo,- main_path,- &remove_command,- branch_name,- &HookLog::internal(InternalOp::Remove),- None,- )?;+ let remove_command =+ execute_instant_removal_or_fallback(&repo, worktree_path, None, force_worktree);+ spawn_detached(+ &repo,+ main_path,+ &remove_command,+ "detached",+ &HookLog::internal(InternalOp::Remove),+ None,+ )?;+ }+ // Post-remove hooks for detached HEAD use "HEAD" as the branch identifierspawn_hooks_after_remove(main_path,worktree_path,- branch_name,+ "HEAD",removed_commit,verify,changed_directory,)?;stderr().flush()?;- Ok(())- } else {+ return Ok(());+ };++ if foreground {// Foreground mode: remove immediately and report actual results// Progress message after pre-remove hooks, before actual removal@@ -1261,10 +1205,64 @@ fn handle_removed_worktree_output(ctx: RemovedWorktreeOutputContext<'_>) -> anyhforce_worktree,)?;+ display_info.print_message(branch_name, true)?;+ display_info.print_hints(branch_name, deletion_mode, pre_computed_integration)?;+ print_switch_message_if_changed(changed_directory, main_path)?;++ spawn_hooks_after_remove(+ main_path,+ worktree_path,+ branch_name,+ removed_commit,+ verify,+ changed_directory,+ )?;+ stderr().flush()?;+ Ok(())+ } else {+ // Background mode: show warning before decision announcement+ if let Some(expected) = expected_path {+ eprintln!(+ "{}",+ format_path_mismatch_warning(branch_name, worktree_path, expected)+ );+ }++ // Background mode: spawn detached process+ let display_info = RemovalDisplayInfo::from_precomputed(+ deletion_mode,+ pre_computed_integration,+ target_branch,+ force_worktree,+ );+display_info.print_message(branch_name, false)?;display_info.print_hints(branch_name, deletion_mode, pre_computed_integration)?;print_switch_message_if_changed(changed_directory, main_path)?;+ // Stop fsmonitor daemon BEFORE rename (must happen while path still exists).+ // Best effort - ignore errors. This prevents zombie daemons from accumulating.+ let _ = repo+ .worktree_at(worktree_path)+ .run_command(&["fsmonitor--daemon", "stop"]);++ let remove_command = execute_instant_removal_or_fallback(+ &repo,+ worktree_path,+ display_info.branch_deleted().then_some(branch_name),+ force_worktree,+ );++ // Spawn the removal in background - runs from main_path (where we cd'd to)+ spawn_detached(+ &repo,+ main_path,+ &remove_command,+ branch_name,+ &HookLog::internal(InternalOp::Remove),+ None,+ )?;+spawn_hooks_after_remove(main_path,worktree_path,diff --git a/src/styling/constants.rs b/src/styling/constants.rsindex cf0e50a4a..83511c2ea 100644--- a/src/styling/constants.rs+++ b/src/styling/constants.rs@@ -132,6 +132,15 @@ impl FormattedMessage {self.0}+ /// Append raw content after the formatted message.+ ///+ /// Used when content must appear outside the message's color span,+ /// e.g., integration symbols that need their native dim styling.+ pub fn append(mut self, suffix: &str) -> Self {+ self.0.push_str(suffix);+ self+ }+/// Borrow the inner string for inspection (e.g., in tests).////// Note: This does NOT implement `AsRef<str>` to prevent accidentallydiff --git a/tests/integration_tests/completion.rs b/tests/integration_tests/completion.rsindex b54c4e6bb..9d01455bc 100644--- a/tests/integration_tests/completion.rs+++ b/tests/integration_tests/completion.rs@@ -1152,82 +1152,6 @@ fn test_complete_single_dash_shows_both_short_and_long_flags(repo: TestRepo) {}}-/// Deprecated args should never appear in completions.-///-/// Args like `--no-background` are deprecated and hidden from help. They should also-/// be hidden from tab completion, even when completing `--` (which shows other hidden args).-#[rstest]-fn test_complete_excludes_deprecated_args(repo: TestRepo) {- repo.commit("initial");-- // Deprecated args that should never appear- let deprecated = ["--no-background"];-- for shell in ["bash", "zsh", "fish", "nu"] {- // Test: wt remove --<cursor> - should NOT show --no-background- let output = repo- .completion_cmd_for_shell(&["wt", "remove", "--"], shell)- .output()- .unwrap();- assert!(output.status.success(), "{shell}: completion failed");- let stdout = String::from_utf8_lossy(&output.stdout);-- // Should have regular options- assert!(- stdout.contains("--foreground"),- "{shell}: should show --foreground, got:\n{stdout}"- );-- // Should NOT have deprecated options- for arg in &deprecated {- assert!(- !stdout.contains(arg),- "{shell}: should NOT show deprecated {arg}, got:\n{stdout}"- );- }-- // Test: wt hook post-start --<cursor> - same behavior- let output = repo- .completion_cmd_for_shell(&["wt", "hook", "post-start", "--"], shell)- .output()- .unwrap();- assert!(output.status.success(), "{shell}: completion failed");- let stdout = String::from_utf8_lossy(&output.stdout);-- assert!(- stdout.contains("--foreground"),- "{shell}: hook post-start should show --foreground, got:\n{stdout}"- );-- for arg in &deprecated {- assert!(- !stdout.contains(arg),- "{shell}: hook post-start should NOT show deprecated {arg}, got:\n{stdout}"- );- }-- // Test: wt hook post-switch --<cursor> - same behavior- let output = repo- .completion_cmd_for_shell(&["wt", "hook", "post-switch", "--"], shell)- .output()- .unwrap();- assert!(output.status.success(), "{shell}: completion failed");- let stdout = String::from_utf8_lossy(&output.stdout);-- assert!(- stdout.contains("--foreground"),- "{shell}: hook post-switch should show --foreground, got:\n{stdout}"- );-- for arg in &deprecated {- assert!(- !stdout.contains(arg),- "{shell}: hook post-switch should NOT show deprecated {arg}, got:\n{stdout}"- );- }- }-}-/// Test static shell completions command for package managers.////// The `wt config shell completions <shell>` command outputs static completiondiff --git a/tests/integration_tests/remove.rs b/tests/integration_tests/remove.rsindex 38838c9a1..d7041fea9 100644--- a/tests/integration_tests/remove.rs+++ b/tests/integration_tests/remove.rs@@ -573,21 +573,6 @@ fn test_remove_foreground(mut repo: TestRepo) {));}-/// Tests deprecated --no-background flag shows warning but still works-#[rstest]-fn test_remove_no_background_deprecated(mut repo: TestRepo) {- // Create a worktree- let _worktree_path = repo.add_worktree("feature-deprecated");-- // Remove it with deprecated --no-background flag from main repo- assert_cmd_snapshot!(make_snapshot_cmd(- &repo,- "remove",- &["--no-background", "feature-deprecated"],- None- ));-}-/// Tests that --force-delete and --no-delete-branch are mutually exclusive#[rstest]fn test_remove_conflicting_branch_flags(repo: TestRepo) {diff --git a/tests/integration_tests/user_hooks.rs b/tests/integration_tests/user_hooks.rsindex ee2d1c96c..cef4aed0b 100644--- a/tests/integration_tests/user_hooks.rs+++ b/tests/integration_tests/user_hooks.rs@@ -1155,71 +1155,6 @@ fn test_standalone_hook_post_start_foreground(repo: TestRepo) {);}-#[rstest]-fn test_standalone_hook_post_start_no_background_deprecated(repo: TestRepo) {- // Test that --no-background still works but shows deprecation warning- repo.write_project_config(- r#"post-start = "echo 'DEPRECATED_FLAG' && echo 'marker' > hook_ran.txt""#,- );-- let mut cmd = crate::common::wt_command();- cmd.current_dir(repo.root_path());- cmd.env("WORKTRUNK_CONFIG_PATH", repo.test_config_path());- cmd.args(["hook", "post-start", "--yes", "--no-background"]);-- let output = cmd.output().unwrap();- assert!(- output.status.success(),- "wt hook post-start --no-background should succeed"- );-- // With --no-background, marker file should exist immediately (no waiting)- let marker = repo.root_path().join("hook_ran.txt");- assert!(- marker.exists(),- "hook should have completed synchronously with --no-background"- );-- // Output should contain deprecation warning- let stderr = String::from_utf8_lossy(&output.stderr);- assert!(- stderr.contains("--no-background is deprecated"),- "should show deprecation warning, got: {stderr}"- );-- // Hook output should still appear- assert!(- stderr.contains("DEPRECATED_FLAG"),- "hook stdout should appear in command output, got: {stderr}"- );-}--#[rstest]-fn test_standalone_hook_post_switch_no_background_deprecated(repo: TestRepo) {- // Test that --no-background still works but shows deprecation warning for post-switch- repo.write_project_config(- r#"post-switch = "echo 'SWITCH_DEPRECATED' && echo 'marker' > hook_ran.txt""#,- );-- let mut cmd = crate::common::wt_command();- cmd.current_dir(repo.root_path());- cmd.env("WORKTRUNK_CONFIG_PATH", repo.test_config_path());- cmd.args(["hook", "post-switch", "--yes", "--no-background"]);-- let output = cmd.output().unwrap();- assert!(- output.status.success(),- "wt hook post-switch --no-background should succeed"- );-- // Output should contain deprecation warning- let stderr = String::from_utf8_lossy(&output.stderr);- assert!(- stderr.contains("--no-background is deprecated"),- "should show deprecation warning, got: {stderr}"- );-}-#[rstest]fn test_standalone_hook_pre_commit(repo: TestRepo) {// Write project config with pre-commit hookdiff --git a/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_remove_decline.snap b/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_remove_decline.snapindex b861a2492..6b7d2f1cf 100644--- a/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_remove_decline.snap+++ b/tests/snapshots/integration__integration_tests__approval_pty__approval_prompt_remove_decline.snap@@ -8,4 +8,4 @@ expression: "&output"[36m❯[39m [36mAllow and remember? [1m[y/N][22m[39m n[2m○[22m Commands declined, continuing removal-[36m◎ Removing [1mto-remove[22m worktree & branch in background (ancestor of [1mmain[22m,[39m [2m⊂[22m[36m)[39m+[36m◎[39m [36mRemoving [1mto-remove[22m worktree & branch in background (ancestor of [1mmain[22m,[39m [2m⊂[22m[36m)[39mdiff --git a/tests/snapshots/integration__integration_tests__directives__merge_directive_file.snap b/tests/snapshots/integration__integration_tests__directives__merge_directive_file.snapindex d1c14f941..9f094d87a 100644--- a/tests/snapshots/integration__integration_tests__directives__merge_directive_file.snap+++ b/tests/snapshots/integration__integration_tests__directives__merge_directive_file.snap@@ -19,17 +19,21 @@ info:LANG: CLC_ALL: CMOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"+ NO_COLOR: ""PATH: "[PATH]"PSModulePath: ""RUST_LOG: warnSHELL: ""TERM: alacrittyUSERPROFILE: "[TEST_HOME]"+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"WORKTRUNK_DIRECTIVE_FILE: "[DIRECTIVE_FILE]"+ 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]"@@ -44,5 +48,5 @@ exit_code: 0[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◎ Removing [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)[39m[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22mdiff --git a/tests/snapshots/integration__integration_tests__directives__merge_directive_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_directive_remove.snapindex d1c14f941..9f094d87a 100644--- a/tests/snapshots/integration__integration_tests__directives__merge_directive_remove.snap+++ b/tests/snapshots/integration__integration_tests__directives__merge_directive_remove.snap@@ -19,17 +19,21 @@ info:LANG: CLC_ALL: CMOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"+ NO_COLOR: ""PATH: "[PATH]"PSModulePath: ""RUST_LOG: warnSHELL: ""TERM: alacrittyUSERPROFILE: "[TEST_HOME]"+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"WORKTRUNK_DIRECTIVE_FILE: "[DIRECTIVE_FILE]"+ 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]"@@ -44,5 +48,5 @@ exit_code: 0[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◎ Removing [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)[39m[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22mdiff --git a/tests/snapshots/integration__integration_tests__directives__remove_directive_file.snap b/tests/snapshots/integration__integration_tests__directives__remove_directive_file.snapindex 6d1b0461d..10b0494f5 100644--- a/tests/snapshots/integration__integration_tests__directives__remove_directive_file.snap+++ b/tests/snapshots/integration__integration_tests__directives__remove_directive_file.snap@@ -18,17 +18,21 @@ info:LANG: CLC_ALL: CMOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"+ NO_COLOR: ""PATH: "[PATH]"PSModulePath: ""RUST_LOG: warnSHELL: ""TERM: alacrittyUSERPROFILE: "[TEST_HOME]"+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"WORKTRUNK_DIRECTIVE_FILE: "[DIRECTIVE_FILE]"+ 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]"@@ -38,5 +42,5 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎ Removing [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)[39m[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22mdiff --git a/tests/snapshots/integration__integration_tests__help__help_list_long.snap b/tests/snapshots/integration__integration_tests__help__help_list_long.snapindex 7f9ee27b0..f7384b6c4 100644--- a/tests/snapshots/integration__integration_tests__help__help_list_long.snap+++ b/tests/snapshots/integration__integration_tests__help__help_list_long.snap@@ -57,7 +57,7 @@ Usage: [1m[36mwt list[0m [36m[OPTIONS][0m[1m[36m--progressive[0mShow fast info immediately, update with slow info[0m- Displays local data (branches, paths, status) first, then updates with remote data (CI, upstream) as it arrives. Auto-enabled for TTY.[0m+ Displays local data (branches, paths, status) first, then updates with remote data (CI, upstream) as it arrives. Use --no-progressive to force buffered rendering. Auto-enabled for TTY.[0m[1m[36m-h[0m, [1m[36m--help[0mPrint help (see a summary with '-h')diff --git a/tests/snapshots/integration__integration_tests__help__help_list_narrow_80.snap b/tests/snapshots/integration__integration_tests__help__help_list_narrow_80.snapindex 305086cca..dcb544743 100644--- a/tests/snapshots/integration__integration_tests__help__help_list_narrow_80.snap+++ b/tests/snapshots/integration__integration_tests__help__help_list_narrow_80.snap@@ -58,7 +58,8 @@ Usage: [1m[36mwt list[0m [36m[OPTIONS][0mShow fast info immediately, update with slow info[0mDisplays local data (branches, paths, status) first, then updates with- remote data (CI, upstream) as it arrives. Auto-enabled for TTY.[0m+ remote data (CI, upstream) as it arrives. Use --no-progressive to+ force buffered rendering. Auto-enabled for TTY.[0m[1m[36m-h[0m, [1m[36m--help[0mPrint help (see a summary with '-h')diff --git a/tests/snapshots/integration__integration_tests__help__help_list_short.snap b/tests/snapshots/integration__integration_tests__help__help_list_short.snapindex 55b0b9a29..986b35eea 100644--- a/tests/snapshots/integration__integration_tests__help__help_list_short.snap+++ b/tests/snapshots/integration__integration_tests__help__help_list_short.snap@@ -11,6 +11,7 @@ info:GIT_EDITOR: ""LANG: CLC_ALL: C+ NO_COLOR: ""PSModulePath: ""RUST_LOG: warnSHELL: ""diff --git a/tests/snapshots/integration__integration_tests__list__quickstart_merge.snap b/tests/snapshots/integration__integration_tests__list__quickstart_merge.snapindex 710ed3eb3..46c688ce0 100644--- a/tests/snapshots/integration__integration_tests__list__quickstart_merge.snap+++ b/tests/snapshots/integration__integration_tests__list__quickstart_merge.snap@@ -19,18 +19,22 @@ info:LANG: CLC_ALL: CMOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"+ NO_COLOR: ""PATH: "[PATH]"PSModulePath: ""RUST_LOG: warnSHELL: ""TERM: alacrittyUSERPROFILE: "[TEST_HOME]"- WORKTRUNK_COMMIT__GENERATION__COMMAND: /private/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpZfznjl/mock-bin/llm+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"+ WORKTRUNK_COMMIT__GENERATION__COMMAND: /private/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpEbYGzs/mock-bin/llmWORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"WORKTRUNK_DIRECTIVE_FILE: "[DIRECTIVE_FILE]"+ 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]"@@ -49,5 +53,5 @@ exit_code: 0[107m [0m lib.rs | 2 [32m++[m[107m [0m 2 files changed, 53 insertions(+)[32m✓[39m [32mMerged to [1mmain[22m [90m(1 commit, 2 files, [32m+53[39m[39m[90m)[39m[39m-[36m◎ Removing [1mfeature-auth[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36m◎[39m [36mRemoving [1mfeature-auth[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_as_git_subcommand.snap b/tests/snapshots/integration__integration_tests__merge__merge_as_git_subcommand.snapindex fc50941bd..9df0e15b3 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_as_git_subcommand.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_as_git_subcommand.snap@@ -48,6 +48,6 @@ exit_code: 0[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◎ Removing [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)[39m[33m▲[39m [33mCannot change directory — ran git wt; running through git prevents cd[39m[2m↳[22m [2mFor automatic cd, invoke directly (with the [4m-[24m): [4mgit-wt[24m[22mdiff --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 226611a45..2d4bab9fe 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@@ -53,6 +53,6 @@ exit_code: 0[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◎ Removing [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)[39m[33m▲[39m [33mCannot change directory — shell integration not installed[39m[2m↳[22m [2mTo enable automatic cd, run [4mwt config shell install[24m[22mdiff --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 e289d3c76..94dde07d3 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@@ -13,6 +13,7 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: C@@ -55,6 +56,6 @@ exit_code: 0[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◎ Removing [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)[39m[33m▲[39m [33mCannot change directory — shell integration not installed[39m[2m↳[22m [2mTo enable automatic cd, run [4mwt config shell install[24m[22mdiff --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 220fe1ebb..f644c51b7 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@@ -52,6 +52,6 @@ exit_code: 0[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◎ Removing [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)[39m[33m▲[39m [33mCannot change directory — shell integration not installed[39m[2m↳[22m [2mTo enable automatic cd, run [4mwt config shell install[24m[22mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_cwd_removed_hint_fallback_to_list.snap b/tests/snapshots/integration__integration_tests__merge__merge_cwd_removed_hint_fallback_to_list.snapindex 15c47dd4d..4a814c2d3 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_cwd_removed_hint_fallback_to_list.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_cwd_removed_hint_fallback_to_list.snap@@ -23,7 +23,7 @@ info:NO_COLOR: ""PATH: "[PATH]"PSModulePath: ""- PWD: /private/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpYtmzJU/repo+ PWD: /private/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpSjn7z3/repoRUST_LOG: warnSHELL: ""TERM: alacritty@@ -49,7 +49,7 @@ exit_code: 1[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◎ Removing [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)[39m[33m▲[39m [33mCannot change directory — shell integration not installed[39m[2m↳[22m [2mTo enable automatic cd, run [4mwt config shell install[24m[22m[36m◎[39m [36mRunning post-merge project hook @ [1m_REPO_[22m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_cwd_removed_hint_no_recovery.snap b/tests/snapshots/integration__integration_tests__merge__merge_cwd_removed_hint_no_recovery.snapindex 78ab21133..9af90342b 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_cwd_removed_hint_no_recovery.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_cwd_removed_hint_no_recovery.snap@@ -23,7 +23,7 @@ info:NO_COLOR: ""PATH: "[PATH]"PSModulePath: ""- PWD: /private/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpGIcxkv/repo.feature+ PWD: /private/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpJw8YUo/repo.featureRUST_LOG: warnSHELL: ""TERM: alacritty@@ -49,7 +49,7 @@ exit_code: 1[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◎ Removing [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)[39m[33m▲[39m [33mCannot change directory — shell integration not installed[39m[2m↳[22m [2mTo enable automatic cd, run [4mwt config shell install[24m[22m[36m◎[39m [36mRunning post-merge project hook @ [1m_REPO_[22m[39mdiff --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 63ab91549..4fc569538 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@@ -53,6 +53,6 @@ exit_code: 0[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◎ Removing [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)[39m[33m▲[39m [33mCannot change directory — shell integration not installed[39m[2m↳[22m [2mTo enable automatic cd, run [4mwt config shell install[24m[22mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snapindex f375ec207..9a30b192a 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap@@ -47,6 +47,6 @@ exit_code: 0[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◎ Removing [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)[39m[33m▲[39m [33mCannot change directory — shell integration not installed[39m[2m↳[22m [2mTo enable automatic cd, run [4mwt config shell install[24m[22mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snapindex 696b18d62..6120af804 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap@@ -43,6 +43,6 @@ exit_code: 0----- stderr -----[2m○[22m Already up to date with [1mmain[22m (no new commits, no rebase needed)-[36m◎ Removing [1mno-commits[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36m◎[39m [36mRemoving [1mno-commits[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[33m▲[39m [33mCannot change directory — shell integration not installed[39m[2m↳[22m [2mTo enable automatic cd, run [4mwt config shell install[24m[22mdiff --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 1316d14a7..cc8d927c0 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@@ -53,6 +53,6 @@ exit_code: 0[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◎ Removing [1mno-commits-dirty[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36m◎[39m [36mRemoving [1mno-commits-dirty[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[33m▲[39m [33mCannot change directory — shell integration not installed[39m[2m↳[22m [2mTo enable automatic cd, run [4mwt config shell install[24m[22mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_rebase_when_already_rebased.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_rebase_when_already_rebased.snapindex 1a7810b48..e8030a59f 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_no_rebase_when_already_rebased.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_rebase_when_already_rebased.snap@@ -48,6 +48,6 @@ exit_code: 0[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◎ Removing [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)[39m[33m▲[39m [33mCannot change directory — shell integration not installed[39m[2m↳[22m [2mTo enable automatic cd, run [4mwt config shell install[24m[22mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snapindex 6db757cef..285dbb677 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap@@ -46,6 +46,6 @@ exit_code: 0[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◎ Removing [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)[39m[33m▲[39m [33mCannot change directory — shell integration not installed[39m[2m↳[22m [2mTo enable automatic cd, run [4mwt config shell install[24m[22mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snapindex 3e2af3e9b..890d4edcd 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap@@ -50,6 +50,6 @@ exit_code: 0[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◎ Removing [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)[39m[33m▲[39m [33mCannot change directory — shell integration not installed[39m[2m↳[22m [2mTo enable automatic cd, run [4mwt config shell install[24m[22mdiff --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 f375ec207..9a30b192a 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@@ -47,6 +47,6 @@ exit_code: 0[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◎ Removing [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)[39m[33m▲[39m [33mCannot change directory — shell integration not installed[39m[2m↳[22m [2mTo enable automatic cd, run [4mwt config shell install[24m[22mdiff --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 54fff8989..6eed0bd54 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@@ -23,7 +23,7 @@ info:NO_COLOR: ""PATH: "[PATH]"PSModulePath: ""- PWD: /private/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp97byTt/repo+ PWD: /private/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpzZbDpM/repoRUST_LOG: warnSHELL: ""TERM: alacritty@@ -49,7 +49,7 @@ exit_code: 1[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◎ Removing [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)[39m[33m▲[39m [33mCannot change directory — shell integration not installed[39m[2m↳[22m [2mTo enable automatic cd, run [4mwt config shell install[24m[22m[36m◎[39m [36mRunning post-merge project hook @ [1m_REPO_[22m[39mdiff --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 7de001b79..63db5f20b 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@@ -48,7 +48,7 @@ exit_code: 0[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◎ Removing [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)[39m[33m▲[39m [33mCannot change directory — shell integration not installed[39m[2m↳[22m [2mTo enable automatic cd, run [4mwt config shell install[24m[22m[36m◎[39m [36mRunning post-merge [1mproject:notify[22m @ [1m_REPO_[22m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_skipped_with_no_verify.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_skipped_with_no_verify.snapindex c75f68113..89b292d00 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_skipped_with_no_verify.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_skipped_with_no_verify.snap@@ -49,6 +49,6 @@ exit_code: 0[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◎ Removing [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)[39m[33m▲[39m [33mCannot change directory — shell integration not installed[39m[2m↳[22m [2mTo enable automatic cd, run [4mwt config shell install[24m[22mdiff --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 3622a7c76..2d05a058d 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@@ -48,7 +48,7 @@ exit_code: 0[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◎ Removing [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)[39m[33m▲[39m [33mCannot change directory — shell integration not installed[39m[2m↳[22m [2mTo enable automatic cd, run [4mwt config shell install[24m[22m[36m◎[39m [36mRunning post-merge project hook @ [1m_REPO_[22m[39mdiff --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 5cbfda0a3..3046e620f 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@@ -44,7 +44,7 @@ exit_code: 0----- stderr -----[2m○[22m Already up to date with [1mmain[22m (no new commits, no rebase needed)-[36m◎ Removing [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)[39m[33m▲[39m [33mCannot change directory — shell integration not installed[39m[2m↳[22m [2mTo enable automatic cd, run [4mwt config shell install[24m[22m[36m◎[39m [36mRunning post-merge project hook @ [1m_REPO_[22m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_collected_for_squash_clean_worktree.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_collected_for_squash_clean_worktree.snapindex 702a099ec..4280cb6dd 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_collected_for_squash_clean_worktree.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_collected_for_squash_clean_worktree.snap@@ -14,6 +14,7 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: C@@ -62,6 +63,6 @@ exit_code: 0[107m [0m file2.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◎ Removing [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)[39m[33m▲[39m [33mCannot change directory — shell integration not installed[39m[2m↳[22m [2mTo enable automatic cd, run [4mwt config shell install[24m[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 a210e3f10..3391a1f88 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@@ -57,6 +57,6 @@ exit_code: 0[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◎ Removing [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)[39m[33m▲[39m [33mCannot change directory — shell integration not installed[39m[2m↳[22m [2mTo enable automatic cd, run [4mwt config shell install[24m[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 f9411b68f..a908cce47 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@@ -54,6 +54,6 @@ exit_code: 0[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◎ Removing [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)[39m[33m▲[39m [33mCannot change directory — shell integration not installed[39m[2m↳[22m [2mTo enable automatic cd, run [4mwt config shell install[24m[22mdiff --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 d1458472a..0da5afced 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@@ -48,6 +48,6 @@ exit_code: 0[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◎ Removing [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)[39m[33m▲[39m [33mCannot change directory — shell integration not installed[39m[2m↳[22m [2mTo enable automatic cd, run [4mwt config shell install[24m[22mdiff --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 38b884b29..a9f4bfa8a 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@@ -50,6 +50,6 @@ exit_code: 0[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◎ Removing [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)[39m[33m▲[39m [33mCannot change directory — shell integration not installed[39m[2m↳[22m [2mTo enable automatic cd, run [4mwt config shell install[24m[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 8af60155f..9baf208c7 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@@ -51,6 +51,6 @@ exit_code: 0[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◎ Removing [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)[39m[33m▲[39m [33mCannot change directory — shell integration not installed[39m[2m↳[22m [2mTo enable automatic cd, run [4mwt config shell install[24m[22mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_primary_not_on_default_with_default_worktree.snap b/tests/snapshots/integration__integration_tests__merge__merge_primary_not_on_default_with_default_worktree.snapindex f375ec207..9a30b192a 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_primary_not_on_default_with_default_worktree.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_primary_not_on_default_with_default_worktree.snap@@ -47,6 +47,6 @@ exit_code: 0[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◎ Removing [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)[39m[33m▲[39m [33mCannot change directory — shell integration not installed[39m[2m↳[22m [2mTo enable automatic cd, run [4mwt config shell install[24m[22mdiff --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 3ad757eac..344d431e6 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@@ -47,6 +47,6 @@ exit_code: 0[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◎ Removing [1mfeature-from-develop[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36m◎[39m [36mRemoving [1mfeature-from-develop[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[33m▲[39m [33mCannot change directory — shell integration not installed[39m[2m↳[22m [2mTo enable automatic cd, run [4mwt config shell install[24m[22mdiff --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 76c83c8f1..a67b64f08 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@@ -49,6 +49,6 @@ exit_code: 0[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◎ Removing [1mfeature-dirty-primary[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36m◎[39m [36mRemoving [1mfeature-dirty-primary[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[33m▲[39m [33mCannot change directory — shell integration not installed[39m[2m↳[22m [2mTo enable automatic cd, run [4mwt config shell install[24m[22mdiff --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 6c48e4630..f24165b69 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@@ -44,6 +44,6 @@ exit_code: 0----- stderr -----[32m✓[39m [32mFast-forwarded to [1mmain[22m[39m[2m○[22m Already up to date with [1mmain[22m (no new commits)-[36m◎ Removing [1mfast-forward-test[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36m◎[39m [36mRemoving [1mfast-forward-test[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[33m▲[39m [33mCannot change directory — shell integration not installed[39m[2m↳[22m [2mTo enable automatic cd, run [4mwt config shell install[24m[22mdiff --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 224814836..10b9880d5 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@@ -49,6 +49,6 @@ exit_code: 0[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◎ Removing [1mtrue-rebase-test[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36m◎[39m [36mRemoving [1mtrue-rebase-test[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[33m▲[39m [33mCannot change directory — shell integration not installed[39m[2m↳[22m [2mTo enable automatic cd, run [4mwt config shell install[24m[22mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snapindex 7ca3f946e..c4fb2e5c7 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap@@ -13,6 +13,7 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: C@@ -58,6 +59,6 @@ exit_code: 0[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◎ Removing [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)[39m[33m▲[39m [33mCannot change directory — shell integration not installed[39m[2m↳[22m [2mTo enable automatic cd, run [4mwt config shell install[24m[22mdiff --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 a91d2e851..712b76fd3 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@@ -13,6 +13,7 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""GIT_TERMINAL_PROMPT: "0"HOME: "[TEST_HOME]"LANG: C@@ -52,6 +53,6 @@ exit_code: 0[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◎ Removing [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)[39m[33m▲[39m [33mCannot change directory — shell integration not installed[39m[2m↳[22m [2mTo enable automatic cd, run [4mwt config shell install[24m[22mdiff --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 df25ef476..720ba8c57 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@@ -47,6 +47,6 @@ exit_code: 0[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◎ Removing [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)[39m[33m▲[39m [33mCannot change directory — shell integration not installed[39m[2m↳[22m [2mTo enable automatic cd, run [4mwt config shell install[24m[22mdiff --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 241c4b939..b6a09c196 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@@ -51,6 +51,6 @@ exit_code: 0[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◎ Removing [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)[39m[33m▲[39m [33mCannot change directory — shell integration not installed[39m[2m↳[22m [2mTo enable automatic cd, run [4mwt config shell install[24m[22mdiff --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 4a0d35ab0..54d3e02d6 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@@ -54,6 +54,6 @@ exit_code: 0[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◎ Removing [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)[39m[33m▲[39m [33mCannot change directory — shell integration not installed[39m[2m↳[22m [2mTo enable automatic cd, run [4mwt config shell install[24m[22mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_to_default_branch.snap b/tests/snapshots/integration__integration_tests__merge__merge_to_default_branch.snapindex 6db757cef..285dbb677 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_to_default_branch.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_default_branch.snap@@ -46,6 +46,6 @@ exit_code: 0[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◎ Removing [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)[39m[33m▲[39m [33mCannot change directory — shell integration not installed[39m[2m↳[22m [2mTo enable automatic cd, run [4mwt config shell install[24m[22mdiff --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 03b167051..deb7e93cf 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@@ -49,6 +49,6 @@ exit_code: 0[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◎ Removing [1mfeature-for-staging[22m worktree & branch in background (same commit as [1mstaging[22m,[39m [2m_[22m[36m)[39m+[36m◎[39m [36mRemoving [1mfeature-for-staging[22m worktree & branch in background (same commit as [1mstaging[22m,[39m [2m_[22m[36m)[39m[33m▲[39m [33mCannot change directory — shell integration not installed[39m[2m↳[22m [2mTo enable automatic cd, run [4mwt config shell install[24m[22mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_caret_symbol.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_caret_symbol.snapindex 6a6e49e07..7b685c1ed 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_with_caret_symbol.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_caret_symbol.snap@@ -47,6 +47,6 @@ exit_code: 0[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◎ Removing [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)[39m[33m▲[39m [33mCannot change directory — shell integration not installed[39m[2m↳[22m [2mTo enable automatic cd, run [4mwt config shell install[24m[22mdiff --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 4f1cc3fbc..e99027dac 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@@ -58,6 +58,6 @@ exit_code: 0[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◎ Removing [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)[39m[33m▲[39m [33mCannot change directory — shell integration not installed[39m[2m↳[22m [2mTo enable automatic cd, run [4mwt config shell install[24m[22mdiff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snapindex e1e231592..e13e0bd97 100644--- a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap@@ -78,7 +78,7 @@ test result: ok. 18 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; fin[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◎ Removing [1mfeature-auth[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36m◎[39m [36mRemoving [1mfeature-auth[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[33m▲[39m [33mCannot change directory — shell integration not installed[39m[2m↳[22m [2mTo enable automatic cd, run [4mwt config shell install[24m[22m[36m◎[39m [36mRunning post-merge [1mproject:install[22m @ [1m_REPO_[22m[39mdiff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snapindex 5fbef47be..f1164c0c9 100644--- a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap@@ -47,6 +47,6 @@ exit_code: 0[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◎ Removing [1mfix-auth[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36m◎[39m [36mRemoving [1mfix-auth[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[33m▲[39m [33mCannot change directory — shell integration not installed[39m[2m↳[22m [2mTo enable automatic cd, run [4mwt config shell install[24m[22mdiff --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 4e9715dd4..3b65c48d1 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@@ -20,16 +20,20 @@ info:LANG: CLC_ALL: CMOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"+ NO_COLOR: ""PATH: "[PATH]"PSModulePath: ""RUST_LOG: warnSHELL: ""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]"@@ -43,4 +47,4 @@ exit_code: 0[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'About to remove worktree'[0m[2m[0mAbout to remove worktree[36m◎[39m [36mRemoving [1mfeature-hook[22m worktree...[39m-[32m✓ Removed [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_skipped_with_no_verify.snap b/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_skipped_with_no_verify.snapindex b67d4357b..44df80129 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@@ -21,16 +21,20 @@ info:LANG: CLC_ALL: CMOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"+ NO_COLOR: ""PATH: "[PATH]"PSModulePath: ""RUST_LOG: warnSHELL: ""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]"@@ -41,4 +45,4 @@ exit_code: 0----- stderr -----[36m◎[39m [36mRemoving [1mfeature-skip[22m worktree...[39m-[32m✓ Removed [1mfeature-skip[22m worktree & branch (same commit as [1mmain[22m,[39m [2m_[22m[32m)[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 177bf8602..a4f849b79 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@@ -20,16 +20,20 @@ info:LANG: CLC_ALL: CMOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"+ NO_COLOR: ""PATH: "[PATH]"PSModulePath: ""RUST_LOG: warnSHELL: ""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]"@@ -49,4 +53,4 @@ exit_code: 0[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'Name: repo.feature-templates'[0m[2m[0mName: repo.feature-templates[36m◎[39m [36mRemoving [1mfeature-templates[22m worktree...[39m-[32m✓ Removed [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_as_git_subcommand.snap b/tests/snapshots/integration__integration_tests__remove__remove_as_git_subcommand.snapindex d8d272efe..15d9677cd 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_as_git_subcommand.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_as_git_subcommand.snap@@ -42,6 +42,6 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎ Removing [1mfeature-git-subcmd[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36m◎[39m [36mRemoving [1mfeature-git-subcmd[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[33m▲[39m [33mCannot change directory — ran git wt; running through git prevents cd[39m[2m↳[22m [2mFor automatic cd, invoke directly (with the [4m-[24m): [4mgit-wt[24m[22mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_at_symbol_via_symlink.snap b/tests/snapshots/integration__integration_tests__remove__remove_at_symbol_via_symlink.snapindex 8408fea13..f911e2d9c 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_at_symbol_via_symlink.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_at_symbol_via_symlink.snap@@ -42,6 +42,6 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎ Removing [1mfeature-symlink[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36m◎[39m [36mRemoving [1mfeature-symlink[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[33m▲[39m [33mCannot change directory — shell integration not installed[39m[2m↳[22m [2mTo enable automatic cd, run [4mwt config shell install[24m[22mdiff --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 fed195187..dd62e855c 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@@ -42,5 +42,5 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎ Removing [1mfeature-unmerged[22m worktree in background[39m+[36m◎[39m [36mRemoving [1mfeature-unmerged[22m worktree in background[39m[2m↳[22m [2mBranch unmerged; to delete, run [4mwt remove -D feature-unmerged[24m[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 58de3dc03..12074a263 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@@ -42,5 +42,5 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎ Removing [1mfeature-a[22m worktree in background[39m+[36m◎[39m [36mRemoving [1mfeature-a[22m worktree in background[39m[2m↳[22m [2mBranch unmerged; to delete, run [4mwt remove -D feature-a[24m[22mdiff --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 03391c191..a4ffc94a0 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@@ -42,5 +42,5 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎ Removing [1mfeature-b[22m worktree in background[39m+[36m◎[39m [36mRemoving [1mfeature-b[22m worktree in background[39m[2m↳[22m [2mBranch unmerged; to delete, run [4mwt remove -D feature-b[24m[22mdiff --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 23145cb93..99ed2db4c 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@@ -42,6 +42,6 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎ Removing [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)[39m[33m▲[39m [33mCannot change directory — shell integration not installed[39m[2m↳[22m [2mTo enable automatic cd, run [4mwt config shell install[24m[22mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_detached_worktree_in_multi.snap b/tests/snapshots/integration__integration_tests__remove__remove_detached_worktree_in_multi.snapindex 9e1fafb54..80f6f8141 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_detached_worktree_in_multi.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_detached_worktree_in_multi.snap@@ -43,7 +43,7 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎ Removing [1mfeature-a[22m worktree in background[39m+[36m◎[39m [36mRemoving [1mfeature-a[22m worktree in background[39m[2m↳[22m [2mBranch unmerged; to delete, run [4mwt remove -D feature-a[24m[22m[2m○[22m No worktree found for branch [1mfeature-b[22m[2m○[22m Branch [1mfeature-b[22m retained; has unmerged changesdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_force_with_force_delete.snap b/tests/snapshots/integration__integration_tests__remove__remove_force_with_force_delete.snapindex 56511e164..0b0236c47 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_force_with_force_delete.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_force_with_force_delete.snap@@ -21,16 +21,20 @@ info:LANG: CLC_ALL: CMOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"+ NO_COLOR: ""PATH: "[PATH]"PSModulePath: ""RUST_LOG: warnSHELL: ""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 +44,4 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎ Removing [1mfeature-dirty-unmerged[22m worktree (--force) & branch in background (--force-delete)[39m+[36m◎[39m [36mRemoving [1mfeature-dirty-unmerged[22m worktree (--force) & branch in background (--force-delete)[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_force_with_modified_files.snap b/tests/snapshots/integration__integration_tests__remove__remove_force_with_modified_files.snapindex 73f6f15f7..e6d519100 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_force_with_modified_files.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_force_with_modified_files.snap@@ -43,5 +43,5 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎ Removing [1mfeature-modified[22m worktree (--force) in background[39m+[36m◎[39m [36mRemoving [1mfeature-modified[22m worktree (--force) in background[39m[2m↳[22m [2mBranch unmerged; to delete, run [4mwt remove -D feature-modified[24m[22mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_force_with_staged_files.snap b/tests/snapshots/integration__integration_tests__remove__remove_force_with_staged_files.snapindex 1a588e3b9..a89356fb2 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_force_with_staged_files.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_force_with_staged_files.snap@@ -20,16 +20,20 @@ info:LANG: CLC_ALL: CMOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"+ NO_COLOR: ""PATH: "[PATH]"PSModulePath: ""RUST_LOG: warnSHELL: ""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,4 +43,4 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎ Removing [1mfeature-staged[22m worktree (--force) & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36m◎[39m [36mRemoving [1mfeature-staged[22m worktree (--force) & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_force_with_untracked_files.snap b/tests/snapshots/integration__integration_tests__remove__remove_force_with_untracked_files.snapindex 61fdd729c..2b003fbdb 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_force_with_untracked_files.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_force_with_untracked_files.snap@@ -20,16 +20,20 @@ info:LANG: CLC_ALL: CMOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"+ NO_COLOR: ""PATH: "[PATH]"PSModulePath: ""RUST_LOG: warnSHELL: ""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,4 +43,4 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎ Removing [1mfeature-untracked[22m worktree (--force) & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36m◎[39m [36mRemoving [1mfeature-untracked[22m worktree (--force) & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_foreground.snap b/tests/snapshots/integration__integration_tests__remove__remove_foreground.snapindex 023b619cc..1ed9cf4e6 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_foreground.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_foreground.snap@@ -20,16 +20,20 @@ info:LANG: CLC_ALL: CMOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"+ NO_COLOR: ""PATH: "[PATH]"PSModulePath: ""RUST_LOG: warnSHELL: ""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 +44,4 @@ exit_code: 0----- stderr -----[36m◎[39m [36mRemoving [1mfeature-fg[22m worktree...[39m-[32m✓ Removed [1mfeature-fg[22m worktree & branch (same commit as [1mmain[22m,[39m [2m_[22m[32m)[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_no_delete_branch.snap b/tests/snapshots/integration__integration_tests__remove__remove_foreground_no_delete_branch.snapindex 51db8de1a..c8be39617 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@@ -45,5 +45,5 @@ exit_code: 0----- stderr -----[36m◎[39m [36mRemoving [1mfeature-fg-keep[22m worktree...[39m-[32m✓ Removed [1mfeature-fg-keep[22m worktree[39m+[32m✓[39m [32mRemoved [1mfeature-fg-keep[22m worktree[39m[2m↳[22m [2mBranch integrated (same commit as [4mmain[24m, [2m_[22m); retained with [4m--no-delete-branch[24m[22mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_foreground_no_delete_branch_unmerged.snap b/tests/snapshots/integration__integration_tests__remove__remove_foreground_no_delete_branch_unmerged.snapindex 7a6efee9f..4b08563f2 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_foreground_no_delete_branch_unmerged.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_foreground_no_delete_branch_unmerged.snap@@ -21,16 +21,20 @@ info:LANG: CLC_ALL: CMOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"+ NO_COLOR: ""PATH: "[PATH]"PSModulePath: ""RUST_LOG: warnSHELL: ""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]"@@ -41,4 +45,4 @@ exit_code: 0----- stderr -----[36m◎[39m [36mRemoving [1mfeature-fg-unmerged-keep[22m worktree...[39m-[32m✓ Removed [1mfeature-fg-unmerged-keep[22m worktree[39m+[32m✓[39m [32mRemoved [1mfeature-fg-unmerged-keep[22m worktree[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_foreground_unmerged.snap b/tests/snapshots/integration__integration_tests__remove__remove_foreground_unmerged.snapindex 0bda2384f..75f820c73 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_foreground_unmerged.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_foreground_unmerged.snap@@ -44,5 +44,5 @@ exit_code: 0----- stderr -----[36m◎[39m [36mRemoving [1mfeature-unmerged-fg[22m worktree...[39m-[32m✓ Removed [1mfeature-unmerged-fg[22m worktree[39m+[32m✓[39m [32mRemoved [1mfeature-unmerged-fg[22m worktree[39m[2m↳[22m [2mBranch unmerged; to delete, run [4mwt remove -D feature-unmerged-fg[24m[22mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap b/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snapindex b21c02821..cc21f282e 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap@@ -41,6 +41,6 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎ Removing [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)[39m[33m▲[39m [33mCannot change directory — shell integration not installed[39m[2m↳[22m [2mTo enable automatic cd, run [4mwt config shell install[24m[22mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap b/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snapindex e08194596..22c6876aa 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap@@ -18,17 +18,21 @@ info:LANG: CLC_ALL: CMOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"+ NO_COLOR: ""PATH: "[PATH]"PSModulePath: ""RUST_LOG: warnSHELL: ""TERM: alacrittyUSERPROFILE: "[TEST_HOME]"+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"WORKTRUNK_DIRECTIVE_FILE: "[DIRECTIVE_FILE]"+ 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]"@@ -38,5 +42,5 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎ Removing [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)[39m[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_locked_detached_multi.snap b/tests/snapshots/integration__integration_tests__remove__remove_locked_detached_multi.snapindex 956e8f700..c11f51bad 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_locked_detached_multi.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_locked_detached_multi.snap@@ -45,4 +45,4 @@ exit_code: 1----- stderr -----[31m✗[39m [31mCannot remove [1mrepo.locked-detached[22m, worktree is locked (Locked detached)[39m[2m↳[22m [2mTo unlock, run [4mgit worktree unlock _REPO_.locked-detached[24m[22m-[36m◎ Removing [1mother[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36m◎[39m [36mRemoving [1mother[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 435eaf937..beec10eb0 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@@ -43,6 +43,6 @@ exit_code: 0----- stderr -----[36m◎[39m [36mRemoving [1mfeature[22m worktree...[39m-[32m✓ Removed [1mfeature[22m worktree & branch (same commit as [1mmain[22m,[39m [2m_[22m[32m)[39m+[32m✓[39m [32mRemoved [1mfeature[22m worktree & branch (same commit as [1mmain[22m,[39m [2m_[22m[32m)[39m[33m▲[39m [33mCannot change directory — shell integration not installed[39m[2m↳[22m [2mTo enable automatic cd, run [4mwt config shell install[24m[22mdiff --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 a72d1d092..1b0ba88ba 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@@ -19,16 +19,20 @@ info:LANG: CLC_ALL: CMOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"+ NO_COLOR: ""PATH: "[PATH]"PSModulePath: ""RUST_LOG: warnSHELL: ""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]"@@ -38,4 +42,4 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎ Removing [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_multiple_including_current.snap b/tests/snapshots/integration__integration_tests__remove__remove_multiple_including_current.snapindex 526dddd9b..3bcc9ce68 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@@ -44,11 +44,11 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎ Removing [1mfeature-b[22m worktree in background[39m+[36m◎[39m [36mRemoving [1mfeature-b[22m worktree in background[39m[2m↳[22m [2mBranch unmerged; to delete, run [4mwt remove -D feature-b[24m[22m-[36m◎ Removing [1mfeature-c[22m worktree in background[39m+[36m◎[39m [36mRemoving [1mfeature-c[22m worktree in background[39m[2m↳[22m [2mBranch unmerged; to delete, run [4mwt remove -D feature-c[24m[22m-[36m◎ Removing [1mfeature-a[22m worktree in background[39m+[36m◎[39m [36mRemoving [1mfeature-a[22m worktree in background[39m[2m↳[22m [2mBranch unmerged; to delete, run [4mwt remove -D feature-a[24m[22m[33m▲[39m [33mCannot change directory — shell integration not installed[39m[2m↳[22m [2mTo enable automatic cd, run [4mwt config shell install[24m[22mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snapindex b291aac08..9077524c4 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap@@ -44,9 +44,9 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎ Removing [1mfeature-a[22m worktree in background[39m+[36m◎[39m [36mRemoving [1mfeature-a[22m worktree in background[39m[2m↳[22m [2mBranch unmerged; to delete, run [4mwt remove -D feature-a[24m[22m-[36m◎ Removing [1mfeature-b[22m worktree in background[39m+[36m◎[39m [36mRemoving [1mfeature-b[22m worktree in background[39m[2m↳[22m [2mBranch unmerged; to delete, run [4mwt remove -D feature-b[24m[22m-[36m◎ Removing [1mfeature-c[22m worktree in background[39m+[36m◎[39m [36mRemoving [1mfeature-c[22m worktree in background[39m[2m↳[22m [2mBranch unmerged; to delete, run [4mwt remove -D feature-c[24m[22mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_no_background_deprecated.snap b/tests/snapshots/integration__integration_tests__remove__remove_no_background_deprecated.snapdeleted file mode 100644index d268f17a3..000000000--- a/tests/snapshots/integration__integration_tests__remove__remove_no_background_deprecated.snap+++ /dev/null@@ -1,44 +0,0 @@-----source: tests/integration_tests/remove.rs-info:- program: wt- args:- - remove- - "--no-background"- - feature-deprecated- env:- APPDATA: "[TEST_CONFIG_HOME]"- CLICOLOR_FORCE: "1"- COLUMNS: "500"- GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"- GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"- GIT_CONFIG_SYSTEM: /dev/null- GIT_EDITOR: ""- GIT_TERMINAL_PROMPT: "0"- HOME: "[TEST_HOME]"- LANG: C- LC_ALL: C- MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"- PATH: "[PATH]"- PSModulePath: ""- RUST_LOG: warn- SHELL: ""- TERM: alacritty- USERPROFILE: "[TEST_HOME]"- WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"- WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"- WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"- WORKTRUNK_TEST_EPOCH: "1735776000"- WORKTRUNK_TEST_POWERSHELL_ENV: "0"- WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"- XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"-----success: true-exit_code: 0------ stdout ------------ stderr ------[33m▲[39m [33m--no-background is deprecated; use --foreground instead[39m-[36m◎[39m [36mRemoving [1mfeature-deprecated[22m worktree...[39m-[32m✓ Removed [1mfeature-deprecated[22m worktree & branch (same commit as [1mmain[22m,[39m [2m_[22m[32m)[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 15d718de0..150251650 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@@ -43,5 +43,5 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎ Removing [1mfeature-keep[22m worktree in background[39m+[36m◎[39m [36mRemoving [1mfeature-keep[22m worktree in background[39m[2m↳[22m [2mBranch integrated (same commit as [4mmain[24m, [2m_[22m); retained with [4m--no-delete-branch[24m[22mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_no_delete_branch_unmerged.snap b/tests/snapshots/integration__integration_tests__remove__remove_no_delete_branch_unmerged.snapindex e142ff0e6..5a4cce5c6 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_no_delete_branch_unmerged.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_no_delete_branch_unmerged.snap@@ -20,16 +20,20 @@ info:LANG: CLC_ALL: CMOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"+ NO_COLOR: ""PATH: "[PATH]"PSModulePath: ""RUST_LOG: warnSHELL: ""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,4 +43,4 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎ Removing [1mfeature-unmerged-keep[22m worktree in background[39m+[36m◎[39m [36mRemoving [1mfeature-unmerged-keep[22m worktree in background[39mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_partial_success.snap b/tests/snapshots/integration__integration_tests__remove__remove_partial_success.snapindex 18e1b0e9e..8994bd5c8 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_partial_success.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_partial_success.snap@@ -45,4 +45,4 @@ exit_code: 1----- stderr -----[31m✗[39m [31mNo branch named [1mnonexistent[22m[39m[2m↳[22m [2mTo list branches, run [4mwt list --branches --remotes[24m[22m-[36m◎ Removing [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__remove__remove_path_mismatch_warning.snap b/tests/snapshots/integration__integration_tests__remove__remove_path_mismatch_warning.snapindex ec59fc180..90b8eca1d 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_path_mismatch_warning.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_path_mismatch_warning.snap@@ -43,4 +43,4 @@ exit_code: 0----- stderr -----[33m▲[39m [33mBranch-worktree mismatch: [1mfeature[22m @ [1m_PARENT_/weird-path-for-feature[22m, expected @ [1m_REPO_.feature[22m [31m⚑[39m[39m-[36m◎ Removing [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__remove__remove_path_mismatch_warning_foreground.snap b/tests/snapshots/integration__integration_tests__remove__remove_path_mismatch_warning_foreground.snapindex 24b6788a1..d6d2a34f3 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_path_mismatch_warning_foreground.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_path_mismatch_warning_foreground.snap@@ -45,4 +45,4 @@ exit_code: 0----- stderr -----[36m◎[39m [36mRemoving [1mfeature-fg[22m worktree...[39m[33m▲[39m [33mBranch-worktree mismatch: [1mfeature-fg[22m @ [1m_PARENT_/another-weird-path[22m, expected @ [1m_REPO_.feature-fg[22m [31m⚑[39m[39m-[32m✓ Removed [1mfeature-fg[22m worktree & branch (same commit as [1mmain[22m,[39m [2m_[22m[32m)[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__shell_wrapper__unix_tests__merge_with_mixed_stdout_stderr_bash.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__merge_with_mixed_stdout_stderr_bash.snapindex 852692109..4a3ee20de 100644--- a/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__merge_with_mixed_stdout_stderr_bash.snap+++ b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__merge_with_mixed_stdout_stderr_bash.snap@@ -28,5 +28,5 @@ expression: "&output.combined"[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◎ Removing [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)[39m[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22mdiff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__merge_with_mixed_stdout_stderr_zsh.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__merge_with_mixed_stdout_stderr_zsh.snapindex 852692109..4a3ee20de 100644--- a/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__merge_with_mixed_stdout_stderr_zsh.snap+++ b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__merge_with_mixed_stdout_stderr_zsh.snap@@ -28,5 +28,5 @@ expression: "&output.combined"[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◎ Removing [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)[39m[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22mdiff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__merge_with_pre_merge_success_bash.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__merge_with_pre_merge_success_bash.snapindex e0f21cabf..3fb138910 100644--- a/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__merge_with_pre_merge_success_bash.snap+++ b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__merge_with_pre_merge_success_bash.snap@@ -17,5 +17,5 @@ expression: "&output.combined"[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◎ Removing [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)[39m[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22mdiff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__merge_with_pre_merge_success_zsh.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__merge_with_pre_merge_success_zsh.snapindex e0f21cabf..3fb138910 100644--- a/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__merge_with_pre_merge_success_zsh.snap+++ b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__merge_with_pre_merge_success_zsh.snap@@ -17,5 +17,5 @@ expression: "&output.combined"[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◎ Removing [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)[39m[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22mdiff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__readme_example_hooks_pre_merge.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__readme_example_hooks_pre_merge.snapindex e4e298924..22f6af13b 100644--- a/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__readme_example_hooks_pre_merge.snap+++ b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__readme_example_hooks_pre_merge.snap@@ -33,5 +33,5 @@ All checks passed![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◎ Removing [1mfeature-auth[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36m◎[39m [36mRemoving [1mfeature-auth[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22mdiff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__readme_example_remove.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__readme_example_remove.snapindex fd254a17c..8f88992ea 100644--- a/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__readme_example_remove.snap+++ b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__readme_example_remove.snap@@ -3,5 +3,5 @@ source: tests/integration_tests/shell_wrapper.rsexpression: "&output.combined"----[36m◎ Removing [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)[39m[2m○[22m Switched to worktree for [1mmain[22m @ [1m_REPO_[22mdiff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__remove.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__remove.snapindex c009d2e8f..2ea5a2a09 100644--- a/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__remove.snap+++ b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__remove.snap@@ -3,4 +3,4 @@ source: tests/integration_tests/shell_wrapper.rsexpression: "&output.combined"----[36m◎ Removing [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/snapshots/integration__integration_tests__step_prune__prune_current_worktree.snap b/tests/snapshots/integration__integration_tests__step_prune__prune_current_worktree.snapindex 1b99b93df..6122fdac7 100644--- a/tests/snapshots/integration__integration_tests__step_prune__prune_current_worktree.snap+++ b/tests/snapshots/integration__integration_tests__step_prune__prune_current_worktree.snap@@ -44,7 +44,7 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎ Removing [1mcurrent-merged[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36m◎[39m [36mRemoving [1mcurrent-merged[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[33m▲[39m [33mCannot change directory — shell integration not installed[39m[2m↳[22m [2mTo enable automatic cd, run [4mwt config shell install[24m[22m[32m✓[39m [32mPruned 1 worktree & branch[39mdiff --git a/tests/snapshots/integration__integration_tests__step_prune__prune_during_rebase.snap b/tests/snapshots/integration__integration_tests__step_prune__prune_during_rebase.snapindex 78affa194..9cd4429de 100644--- a/tests/snapshots/integration__integration_tests__step_prune__prune_during_rebase.snap+++ b/tests/snapshots/integration__integration_tests__step_prune__prune_during_rebase.snap@@ -44,5 +44,5 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎ Removing [1mmerged-wt[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36m◎[39m [36mRemoving [1mmerged-wt[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[32m✓[39m [32mPruned 1 worktree & branch[39mdiff --git a/tests/snapshots/integration__integration_tests__step_prune__prune_mixed_worktree_and_orphan_branch.snap b/tests/snapshots/integration__integration_tests__step_prune__prune_mixed_worktree_and_orphan_branch.snapindex 196a4a13b..e45557092 100644--- a/tests/snapshots/integration__integration_tests__step_prune__prune_mixed_worktree_and_orphan_branch.snap+++ b/tests/snapshots/integration__integration_tests__step_prune__prune_mixed_worktree_and_orphan_branch.snap@@ -44,6 +44,6 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎ Removing [1mmerged-mixed[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36m◎[39m [36mRemoving [1mmerged-mixed[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[32m✓ Removed branch [1morphan-mixed[22m (same commit as [1mmain[22m,[39m [2m_[22m[32m)[39m[32m✓[39m [32mPruned 1 worktree & branch, 1 branch[39mdiff --git a/tests/snapshots/integration__integration_tests__step_prune__prune_multiple.snap b/tests/snapshots/integration__integration_tests__step_prune__prune_multiple.snapindex 842bd60f4..952e8fcb3 100644--- a/tests/snapshots/integration__integration_tests__step_prune__prune_multiple.snap+++ b/tests/snapshots/integration__integration_tests__step_prune__prune_multiple.snap@@ -44,7 +44,7 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎ Removing [1mmerged-a[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m-[36m◎ Removing [1mmerged-b[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m-[36m◎ Removing [1mmerged-c[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36m◎[39m [36mRemoving [1mmerged-a[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36m◎[39m [36mRemoving [1mmerged-b[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36m◎[39m [36mRemoving [1mmerged-c[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[32m✓[39m [32mPruned 3 worktrees & branches[39mdiff --git a/tests/snapshots/integration__integration_tests__step_prune__prune_removes_merged.snap b/tests/snapshots/integration__integration_tests__step_prune__prune_removes_merged.snapindex 03c26cc10..d7c0e1157 100644--- a/tests/snapshots/integration__integration_tests__step_prune__prune_removes_merged.snap+++ b/tests/snapshots/integration__integration_tests__step_prune__prune_removes_merged.snap@@ -44,5 +44,5 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎ Removing [1mmerged-branch[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36m◎[39m [36mRemoving [1mmerged-branch[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[32m✓[39m [32mPruned 1 worktree & branch[39mdiff --git a/tests/snapshots/integration__integration_tests__step_prune__prune_skips_dirty.snap b/tests/snapshots/integration__integration_tests__step_prune__prune_skips_dirty.snapindex 54aa6928d..99d6be134 100644--- a/tests/snapshots/integration__integration_tests__step_prune__prune_skips_dirty.snap+++ b/tests/snapshots/integration__integration_tests__step_prune__prune_skips_dirty.snap@@ -44,5 +44,5 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎ Removing [1mclean-merged[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36m◎[39m [36mRemoving [1mclean-merged[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[32m✓[39m [32mPruned 1 worktree & branch[39mdiff --git a/tests/snapshots/integration__integration_tests__step_prune__prune_skips_locked.snap b/tests/snapshots/integration__integration_tests__step_prune__prune_skips_locked.snapindex 03c26cc10..d7c0e1157 100644--- a/tests/snapshots/integration__integration_tests__step_prune__prune_skips_locked.snap+++ b/tests/snapshots/integration__integration_tests__step_prune__prune_skips_locked.snap@@ -44,5 +44,5 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎ Removing [1mmerged-branch[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36m◎[39m [36mRemoving [1mmerged-branch[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[32m✓[39m [32mPruned 1 worktree & branch[39mdiff --git a/tests/snapshots/integration__integration_tests__step_prune__prune_skips_unmerged.snap b/tests/snapshots/integration__integration_tests__step_prune__prune_skips_unmerged.snapindex 39020f9ae..77bb56cb3 100644--- a/tests/snapshots/integration__integration_tests__step_prune__prune_skips_unmerged.snap+++ b/tests/snapshots/integration__integration_tests__step_prune__prune_skips_unmerged.snap@@ -44,5 +44,5 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎ Removing [1mmerged-one[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m+[36m◎[39m [36mRemoving [1mmerged-one[22m worktree & branch in background (same commit as [1mmain[22m,[39m [2m_[22m[36m)[39m[32m✓[39m [32mPruned 1 worktree & branch[39mdiff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_post_remove_executes.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_post_remove_executes.snapindex d7a10bd7b..be9aee07f 100644--- a/tests/snapshots/integration__integration_tests__user_hooks__user_post_remove_executes.snap+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_post_remove_executes.snap@@ -20,16 +20,20 @@ info:LANG: CLC_ALL: CMOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"+ NO_COLOR: ""PATH: "[PATH]"PSModulePath: ""RUST_LOG: warnSHELL: ""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,5 +43,5 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎ Removing [1mfeature[22m worktree & branch in background (--force-delete)[39m+[36m◎[39m [36mRemoving [1mfeature[22m worktree & branch in background (--force-delete)[39m[36m◎[39m [36mRunning post-remove: [1muser:cleanup[22m[39mdiff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_post_remove_no_verify.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_post_remove_no_verify.snapindex 4022d92c4..1a6ff8599 100644--- a/tests/snapshots/integration__integration_tests__user_hooks__user_post_remove_no_verify.snap+++ b/tests/snapshots/integration__integration_tests__user_hooks__user_post_remove_no_verify.snap@@ -21,16 +21,20 @@ info:LANG: CLC_ALL: CMOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"+ NO_COLOR: ""PATH: "[PATH]"PSModulePath: ""RUST_LOG: warnSHELL: ""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 +44,4 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎ Removing [1mfeature[22m worktree & branch in background (--force-delete)[39m+[36m◎[39m [36mRemoving [1mfeature[22m worktree & branch in background (--force-delete)[39mdiff --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 74dce8802..17fcfba08 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@@ -20,16 +20,20 @@ info:LANG: CLC_ALL: CMOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"+ NO_COLOR: ""PATH: "[PATH]"PSModulePath: ""RUST_LOG: warnSHELL: ""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]"@@ -41,4 +45,4 @@ exit_code: 0----- stderr -----[36m◎[39m [36mRunning pre-remove [1muser:cleanup[22m @ [1m_REPO_.feature[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◎ Removing [1mfeature[22m worktree & branch in background (--force-delete)[39m+[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_skipped_no_verify.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_remove_skipped_no_verify.snapindex 4022d92c4..1a6ff8599 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@@ -21,16 +21,20 @@ info:LANG: CLC_ALL: CMOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"+ NO_COLOR: ""PATH: "[PATH]"PSModulePath: ""RUST_LOG: warnSHELL: ""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 +44,4 @@ exit_code: 0----- stdout ---------- stderr ------[36m◎ Removing [1mfeature[22m worktree & branch in background (--force-delete)[39m+[36m◎[39m [36mRemoving [1mfeature[22m worktree & branch in background (--force-delete)[39m