Skip to content

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.md
index 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 info
Displays 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 &#39;-h&#39;)
diff --git a/docs/content/worktrunk.md b/docs/content/worktrunk.md
index 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 &amp; 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 &amp; 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.md
index 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 info
Displays 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 &#39;-h&#39;)
diff --git a/skills/worktrunk/reference/worktrunk.md b/skills/worktrunk/reference/worktrunk.md
index 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 &amp; 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 &amp; 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.rs
index 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.rs
index 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.rs
index 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.rs
index 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.rs
index 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.rs
index 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 shell
let shell_name = shell_name.to_string_lossy();
let ifs = std::env::var("_CLAP_IFS").ok();
diff --git a/src/main.rs b/src/main.rs
index 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 flags
if !delete_branch && force_delete {
return Err(worktrunk::git::GitError::Other {
@@ -894,7 +867,7 @@ fn main() {
// "Approve at the Gate": approval happens AFTER validation passes
let 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 first
for result in plans_others {
- handle_remove_output(&result, background, run_hooks, false)?;
+ handle_remove_output(&result, foreground, run_hooks, false)?;
}
// Handle branch-only cases
for 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 occurred
diff --git a/src/output/handlers.rs b/src/output/handlers.rs
index 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<'_>) -> anyh
force_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 removal
eprintln!(
"{}",
@@ -1151,75 +1124,46 @@ fn handle_removed_worktree_output(ctx: RemovedWorktreeOutputContext<'_>) -> anyh
format_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 identifier
spawn_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<'_>) -> anyh
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)?;
+
+ 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.rs
index 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 accidentally
diff --git a/tests/integration_tests/completion.rs b/tests/integration_tests/completion.rs
index 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 completion
diff --git a/tests/integration_tests/remove.rs b/tests/integration_tests/remove.rs
index 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.rs
index 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 hook
diff --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.snap
index 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"
❯ Allow and remember? [y/N] n
○ Commands declined, continuing removal
-◎ Removing to-remove worktree & branch in background (ancestor of main, ⊂)
+◎ Removing to-remove worktree & branch in background (ancestor of main, ⊂)
diff --git a/tests/snapshots/integration__integration_tests__directives__merge_directive_file.snap b/tests/snapshots/integration__integration_tests__directives__merge_directive_file.snap
index 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: C
LC_ALL: C
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
+ NO_COLOR: ""
PATH: "[PATH]"
PSModulePath: ""
RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[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
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
-◎ Removing feature worktree & branch in background (same commit as main, _)
+◎ Removing feature worktree & branch in background (same commit as main, _)
○ Switched to worktree for main @ _REPO_
diff --git a/tests/snapshots/integration__integration_tests__directives__merge_directive_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_directive_remove.snap
index 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: C
LC_ALL: C
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
+ NO_COLOR: ""
PATH: "[PATH]"
PSModulePath: ""
RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[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
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
-◎ Removing feature worktree & branch in background (same commit as main, _)
+◎ Removing feature worktree & branch in background (same commit as main, _)
○ Switched to worktree for main @ _REPO_
diff --git a/tests/snapshots/integration__integration_tests__directives__remove_directive_file.snap b/tests/snapshots/integration__integration_tests__directives__remove_directive_file.snap
index 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: C
LC_ALL: C
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
+ NO_COLOR: ""
PATH: "[PATH]"
PSModulePath: ""
RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[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 -----
-◎ Removing feature worktree & branch in background (same commit as main, _)
+◎ Removing feature worktree & branch in background (same commit as main, _)
○ Switched to worktree for main @ _REPO_
diff --git a/tests/snapshots/integration__integration_tests__help__help_list_long.snap b/tests/snapshots/integration__integration_tests__help__help_list_long.snap
index 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: wt list [OPTIONS]
--progressive
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.
+ 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.
-h, --help
Print 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.snap
index 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: wt list [OPTIONS]
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.
+ remote data (CI, upstream) as it arrives. Use --no-progressive to
+ force buffered rendering. Auto-enabled for TTY.
-h, --help
Print 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.snap
index 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: C
LC_ALL: C
+ NO_COLOR: ""
PSModulePath: ""
RUST_LOG: warn
SHELL: ""
diff --git a/tests/snapshots/integration__integration_tests__list__quickstart_merge.snap b/tests/snapshots/integration__integration_tests__list__quickstart_merge.snap
index 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: C
LC_ALL: C
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
+ NO_COLOR: ""
PATH: "[PATH]"
PSModulePath: ""
RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[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/llm
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]"
@@ -49,5 +53,5 @@ exit_code: 0
  lib.rs | 2 ++
  2 files changed, 53 insertions(+)
✓ Merged to main (1 commit, 2 files, +53)
-◎ Removing feature-auth worktree & branch in background (same commit as main, _)
+◎ Removing feature-auth worktree & branch in background (same commit as main, _)
○ Switched to worktree for main @ _REPO_
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_as_git_subcommand.snap b/tests/snapshots/integration__integration_tests__merge__merge_as_git_subcommand.snap
index 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
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
-◎ Removing feature worktree & branch in background (same commit as main, _)
+◎ Removing feature worktree & branch in background (same commit as main, _)
▲ Cannot change directory — ran git wt; running through git prevents cd
↳ For automatic cd, invoke directly (with the -): git-wt
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_and_squash.snap
index 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
  file2.txt | 1 +
  2 files changed, 2 insertions(+)
✓ Merged to main (1 commit, 2 files, +2)
-◎ Removing feature worktree & branch in background (same commit as main, _)
+◎ Removing feature worktree & branch in background (same commit as main, _)
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_deterministic.snap
index 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
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
-◎ Removing feature worktree & branch in background (same commit as main, _)
+◎ Removing feature worktree & branch in background (same commit as main, _)
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_llm.snap
index 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
  auth.txt | 1 +
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
-◎ Removing feature worktree & branch in background (same commit as main, _)
+◎ Removing feature worktree & branch in background (same commit as main, _)
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --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.snap
index 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/repo
RUST_LOG: warn
SHELL: ""
TERM: alacritty
@@ -49,7 +49,7 @@ exit_code: 1
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
-◎ Removing feature worktree & branch in background (same commit as main, _)
+◎ Removing feature worktree & branch in background (same commit as main, _)
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Running post-merge project hook @ _REPO_
diff --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.snap
index 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.feature
RUST_LOG: warn
SHELL: ""
TERM: alacritty
@@ -49,7 +49,7 @@ exit_code: 1
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
-◎ Removing feature worktree & branch in background (same commit as main, _)
+◎ Removing feature worktree & branch in background (same commit as main, _)
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Running post-merge project hook @ _REPO_
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap b/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap
index 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
  dirty.txt | 1 +
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
-◎ Removing feature worktree & branch in background (same commit as main, _)
+◎ Removing feature worktree & branch in background (same commit as main, _)
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
index 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
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
-◎ Removing feature worktree & branch in background (same commit as main, _)
+◎ Removing feature worktree & branch in background (same commit as main, _)
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap
index 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 -----
○ Already up to date with main (no new commits, no rebase needed)
-◎ Removing no-commits worktree & branch in background (same commit as main, _)
+◎ Removing no-commits worktree & branch in background (same commit as main, _)
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_commits_with_changes.snap
index 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
  newfile.txt | 1 +
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
-◎ Removing no-commits-dirty worktree & branch in background (same commit as main, _)
+◎ Removing no-commits-dirty worktree & branch in background (same commit as main, _)
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --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.snap
index 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
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
-◎ Removing feature worktree & branch in background (same commit as main, _)
+◎ Removing feature worktree & branch in background (same commit as main, _)
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap
index 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
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
-◎ Removing feature worktree & branch in background (same commit as main, _)
+◎ Removing feature worktree & branch in background (same commit as main, _)
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
index 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
  file2.txt | 1 +
  2 files changed, 2 insertions(+)
✓ Merged to main (2 commits, 2 files, +2)
-◎ Removing feature worktree & branch in background (same commit as main, _)
+◎ Removing feature worktree & branch in background (same commit as main, _)
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snap
index 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
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
-◎ Removing feature worktree & branch in background (same commit as main, _)
+◎ Removing feature worktree & branch in background (same commit as main, _)
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_failure.snap
index 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/repo
RUST_LOG: warn
SHELL: ""
TERM: alacritty
@@ -49,7 +49,7 @@ exit_code: 1
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
-◎ Removing feature worktree & branch in background (same commit as main, _)
+◎ Removing feature worktree & branch in background (same commit as main, _)
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Running post-merge project hook @ _REPO_
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap
index 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
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
-◎ Removing feature worktree & branch in background (same commit as main, _)
+◎ Removing feature worktree & branch in background (same commit as main, _)
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Running post-merge project:notify @ _REPO_
diff --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.snap
index 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
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
-◎ Removing feature worktree & branch in background (same commit as main, _)
+◎ Removing feature worktree & branch in background (same commit as main, _)
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap
index 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
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
-◎ Removing feature worktree & branch in background (same commit as main, _)
+◎ Removing feature worktree & branch in background (same commit as main, _)
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Running post-merge project hook @ _REPO_
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_with_nothing_to_merge.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_with_nothing_to_merge.snap
index 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 -----
○ Already up to date with main (no new commits, no rebase needed)
-◎ Removing feature worktree & branch in background (same commit as main, _)
+◎ Removing feature worktree & branch in background (same commit as main, _)
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Running post-merge project hook @ _REPO_
diff --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.snap
index 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
  file2.txt | 1 +
  3 files changed, 3 insertions(+)
✓ Merged to main (1 commit, 3 files, +3)
-◎ Removing feature worktree & branch in background (same commit as main, _)
+◎ Removing feature worktree & branch in background (same commit as main, _)
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap
index 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
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
-◎ Removing feature worktree & branch in background (same commit as main, _)
+◎ Removing feature worktree & branch in background (same commit as main, _)
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap
index 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
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
-◎ Removing feature worktree & branch in background (same commit as main, _)
+◎ Removing feature worktree & branch in background (same commit as main, _)
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --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.snap
index 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
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
-◎ Removing feature worktree & branch in background (same commit as main, _)
+◎ Removing feature worktree & branch in background (same commit as main, _)
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap
index 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
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
-◎ Removing feature worktree & branch in background (same commit as main, _)
+◎ Removing feature worktree & branch in background (same commit as main, _)
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap
index 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
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
-◎ Removing feature worktree & branch in background (same commit as main, _)
+◎ Removing feature worktree & branch in background (same commit as main, _)
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --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.snap
index 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
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
-◎ Removing feature worktree & branch in background (same commit as main, _)
+◎ Removing feature worktree & branch in background (same commit as main, _)
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snap b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch.snap
index 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
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
-◎ Removing feature-from-develop worktree & branch in background (same commit as main, _)
+◎ Removing feature-from-develop worktree & branch in background (same commit as main, _)
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snap b/tests/snapshots/integration__integration_tests__merge__merge_primary_on_different_branch_dirty.snap
index 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
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
-◎ Removing feature-dirty-primary worktree & branch in background (same commit as main, _)
+◎ Removing feature-dirty-primary worktree & branch in background (same commit as main, _)
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_rebase_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_rebase_fast_forward.snap
index 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 -----
✓ Fast-forwarded to main
○ Already up to date with main (no new commits)
-◎ Removing fast-forward-test worktree & branch in background (same commit as main, _)
+◎ Removing fast-forward-test worktree & branch in background (same commit as main, _)
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_rebase_true_rebase.snap b/tests/snapshots/integration__integration_tests__merge__merge_rebase_true_rebase.snap
index 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
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
-◎ Removing true-rebase-test worktree & branch in background (same commit as main, _)
+◎ Removing true-rebase-test worktree & branch in background (same commit as main, _)
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
index 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
  file3.txt | 1 +
  3 files changed, 3 insertions(+)
✓ Merged to main (1 commit, 3 files, +3)
-◎ Removing feature worktree & branch in background (same commit as main, _)
+◎ Removing feature worktree & branch in background (same commit as main, _)
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_empty_changes.snap
index 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
  - Revert to initial
○ No changes after squashing 3 commits
○ Already up to date with main (no new commits, no rebase needed)
-◎ Removing feature worktree & branch in background (same commit as main, _)
+◎ Removing feature worktree & branch in background (same commit as main, _)
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_single_commit.snap
index 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
  file1.txt | 1 +
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
-◎ Removing feature worktree & branch in background (same commit as main, _)
+◎ Removing feature worktree & branch in background (same commit as main, _)
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_llm.snap
index 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
  auth.txt | 1 +
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
-◎ Removing feature worktree & branch in background (same commit as main, _)
+◎ Removing feature worktree & branch in background (same commit as main, _)
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_with_working_tree_creates_backup.snap
index 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
  file2.txt | 1 +
  2 files changed, 2 insertions(+)
✓ Merged to main (1 commit, 2 files, +2)
-◎ Removing feature worktree & branch in background (same commit as main, _)
+◎ Removing feature worktree & branch in background (same commit as main, _)
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_to_default_branch.snap b/tests/snapshots/integration__integration_tests__merge__merge_to_default_branch.snap
index 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
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
-◎ Removing feature worktree & branch in background (same commit as main, _)
+◎ Removing feature worktree & branch in background (same commit as main, _)
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_to_non_default_target.snap b/tests/snapshots/integration__integration_tests__merge__merge_to_non_default_target.snap
index 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
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✓ Merged to staging (1 commit, 1 file, +1)
-◎ Removing feature-for-staging worktree & branch in background (same commit as staging, _)
+◎ Removing feature-for-staging worktree & branch in background (same commit as staging, _)
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_caret_symbol.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_caret_symbol.snap
index 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
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
-◎ Removing feature worktree & branch in background (same commit as main, _)
+◎ Removing feature worktree & branch in background (same commit as main, _)
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap
index 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
  untracked2.txt | 1 +
  3 files changed, 3 insertions(+)
✓ Merged to main (1 commit, 3 files, +3)
-◎ Removing feature worktree & branch in background (same commit as main, _)
+◎ Removing feature worktree & branch in background (same commit as main, _)
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
index 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
  jwt.rs | 8 ++++++++
  3 files changed, 33 insertions(+)
✓ Merged to main (1 commit, 3 files, +33)
-◎ Removing feature-auth worktree & branch in background (same commit as main, _)
+◎ Removing feature-auth worktree & branch in background (same commit as main, _)
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Running post-merge project:install @ _REPO_
diff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap
index 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
  auth.rs | 13 +++++++++++++
  1 file changed, 13 insertions(+)
✓ Merged to main (1 commit, 1 file, +13)
-◎ Removing fix-auth worktree & branch in background (same commit as main, _)
+◎ Removing fix-auth worktree & branch in background (same commit as main, _)
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_executes.snap b/tests/snapshots/integration__integration_tests__remove__pre_remove_hook_executes.snap
index 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: C
LC_ALL: C
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
+ NO_COLOR: ""
PATH: "[PATH]"
PSModulePath: ""
RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ 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
  echo 'About to remove worktree'
About to remove worktree
◎ Removing feature-hook worktree...
-✓ Removed feature-hook worktree & branch (same commit as main, _)
+✓ Removed feature-hook worktree & branch (same commit as main, _)
diff --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.snap
index 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: C
LC_ALL: C
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
+ NO_COLOR: ""
PATH: "[PATH]"
PSModulePath: ""
RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ 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 -----
◎ Removing feature-skip worktree...
-✓ Removed feature-skip worktree & branch (same commit as main, _)
+✓ Removed feature-skip worktree & branch (same commit as main, _)
diff --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.snap
index 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: C
LC_ALL: C
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
+ NO_COLOR: ""
PATH: "[PATH]"
PSModulePath: ""
RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ 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
  echo 'Name: repo.feature-templates'
Name: repo.feature-templates
◎ Removing feature-templates worktree...
-✓ Removed feature-templates worktree & branch (same commit as main, _)
+✓ Removed feature-templates worktree & branch (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_as_git_subcommand.snap b/tests/snapshots/integration__integration_tests__remove__remove_as_git_subcommand.snap
index 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 -----
-◎ Removing feature-git-subcmd worktree & branch in background (same commit as main, _)
+◎ Removing feature-git-subcmd worktree & branch in background (same commit as main, _)
▲ Cannot change directory — ran git wt; running through git prevents cd
↳ For automatic cd, invoke directly (with the -): git-wt
diff --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.snap
index 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 -----
-◎ Removing feature-symlink worktree & branch in background (same commit as main, _)
+◎ Removing feature-symlink worktree & branch in background (same commit as main, _)
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_branch_not_fully_merged.snap b/tests/snapshots/integration__integration_tests__remove__remove_branch_not_fully_merged.snap
index 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 -----
-◎ Removing feature-unmerged worktree in background
+◎ Removing feature-unmerged worktree in background
↳ Branch unmerged; to delete, run wt remove -D feature-unmerged
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_main.snap b/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_main.snap
index 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 -----
-◎ Removing feature-a worktree in background
+◎ Removing feature-a worktree in background
↳ Branch unmerged; to delete, run wt remove -D feature-a
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_other_worktree.snap b/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_other_worktree.snap
index 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 -----
-◎ Removing feature-b worktree in background
+◎ Removing feature-b worktree in background
↳ Branch unmerged; to delete, run wt remove -D feature-b
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_current_by_name.snap b/tests/snapshots/integration__integration_tests__remove__remove_current_by_name.snap
index 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 -----
-◎ Removing feature-current worktree & branch in background (same commit as main, _)
+◎ Removing feature-current worktree & branch in background (same commit as main, _)
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --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.snap
index 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 -----
-◎ Removing feature-a worktree in background
+◎ Removing feature-a worktree in background
↳ Branch unmerged; to delete, run wt remove -D feature-a
○ No worktree found for branch feature-b
○ Branch feature-b retained; has unmerged changes
diff --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.snap
index 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: C
LC_ALL: C
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
+ NO_COLOR: ""
PATH: "[PATH]"
PSModulePath: ""
RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ 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 -----
-◎ Removing feature-dirty-unmerged worktree (--force) & branch in background (--force-delete)
+◎ Removing feature-dirty-unmerged worktree (--force) & branch in background (--force-delete)
diff --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.snap
index 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 -----
-◎ Removing feature-modified worktree (--force) in background
+◎ Removing feature-modified worktree (--force) in background
↳ Branch unmerged; to delete, run wt remove -D feature-modified
diff --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.snap
index 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: C
LC_ALL: C
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
+ NO_COLOR: ""
PATH: "[PATH]"
PSModulePath: ""
RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ 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 -----
-◎ Removing feature-staged worktree (--force) & branch in background (same commit as main, _)
+◎ Removing feature-staged worktree (--force) & branch in background (same commit as main, _)
diff --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.snap
index 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: C
LC_ALL: C
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
+ NO_COLOR: ""
PATH: "[PATH]"
PSModulePath: ""
RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ 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 -----
-◎ Removing feature-untracked worktree (--force) & branch in background (same commit as main, _)
+◎ Removing feature-untracked worktree (--force) & branch in background (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_foreground.snap b/tests/snapshots/integration__integration_tests__remove__remove_foreground.snap
index 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: C
LC_ALL: C
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
+ NO_COLOR: ""
PATH: "[PATH]"
PSModulePath: ""
RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ 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 -----
◎ Removing feature-fg worktree...
-✓ Removed feature-fg worktree & branch (same commit as main, _)
+✓ Removed feature-fg worktree & branch (same commit as main, _)
diff --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.snap
index 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 -----
◎ Removing feature-fg-keep worktree...
-✓ Removed feature-fg-keep worktree
+✓ Removed feature-fg-keep worktree
↳ Branch integrated (same commit as main, _); retained with --no-delete-branch
diff --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.snap
index 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: C
LC_ALL: C
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
+ NO_COLOR: ""
PATH: "[PATH]"
PSModulePath: ""
RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ 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 -----
◎ Removing feature-fg-unmerged-keep worktree...
-✓ Removed feature-fg-unmerged-keep worktree
+✓ Removed feature-fg-unmerged-keep worktree
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_foreground_unmerged.snap b/tests/snapshots/integration__integration_tests__remove__remove_foreground_unmerged.snap
index 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 -----
◎ Removing feature-unmerged-fg worktree...
-✓ Removed feature-unmerged-fg worktree
+✓ Removed feature-unmerged-fg worktree
↳ Branch unmerged; to delete, run wt remove -D feature-unmerged-fg
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap b/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap
index 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 -----
-◎ Removing feature-wt worktree & branch in background (same commit as main, _)
+◎ Removing feature-wt worktree & branch in background (same commit as main, _)
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap b/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap
index 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: C
LC_ALL: C
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
+ NO_COLOR: ""
PATH: "[PATH]"
PSModulePath: ""
RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[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 -----
-◎ Removing feature-internal worktree & branch in background (same commit as main, _)
+◎ Removing feature-internal worktree & branch in background (same commit as main, _)
○ Switched to worktree for main @ _REPO_
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_locked_detached_multi.snap b/tests/snapshots/integration__integration_tests__remove__remove_locked_detached_multi.snap
index 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 -----
✗ Cannot remove repo.locked-detached, worktree is locked (Locked detached)
↳ To unlock, run git worktree unlock _REPO_.locked-detached
-◎ Removing other worktree & branch in background (same commit as main, _)
+◎ Removing other worktree & branch in background (same commit as main, _)
diff --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.snap
index 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 -----
◎ Removing feature worktree...
-✓ Removed feature worktree & branch (same commit as main, _)
+✓ Removed feature worktree & branch (same commit as main, _)
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --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.snap
index 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: C
LC_ALL: C
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
+ NO_COLOR: ""
PATH: "[PATH]"
PSModulePath: ""
RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ 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 -----
-◎ Removing feature2 worktree & branch in background (same commit as main, _)
+◎ Removing feature2 worktree & branch in background (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_multiple_including_current.snap b/tests/snapshots/integration__integration_tests__remove__remove_multiple_including_current.snap
index 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 -----
-◎ Removing feature-b worktree in background
+◎ Removing feature-b worktree in background
↳ Branch unmerged; to delete, run wt remove -D feature-b
-◎ Removing feature-c worktree in background
+◎ Removing feature-c worktree in background
↳ Branch unmerged; to delete, run wt remove -D feature-c
-◎ Removing feature-a worktree in background
+◎ Removing feature-a worktree in background
↳ Branch unmerged; to delete, run wt remove -D feature-a
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap
index 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 -----
-◎ Removing feature-a worktree in background
+◎ Removing feature-a worktree in background
↳ Branch unmerged; to delete, run wt remove -D feature-a
-◎ Removing feature-b worktree in background
+◎ Removing feature-b worktree in background
↳ Branch unmerged; to delete, run wt remove -D feature-b
-◎ Removing feature-c worktree in background
+◎ Removing feature-c worktree in background
↳ Branch unmerged; to delete, run wt remove -D feature-c
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_no_background_deprecated.snap b/tests/snapshots/integration__integration_tests__remove__remove_no_background_deprecated.snap
deleted file mode 100644
index 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 -----
-▲ --no-background is deprecated; use --foreground instead
-◎ Removing feature-deprecated worktree...
-✓ Removed feature-deprecated worktree & branch (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_no_delete_branch.snap b/tests/snapshots/integration__integration_tests__remove__remove_no_delete_branch.snap
index 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 -----
-◎ Removing feature-keep worktree in background
+◎ Removing feature-keep worktree in background
↳ Branch integrated (same commit as main, _); retained with --no-delete-branch
diff --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.snap
index 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: C
LC_ALL: C
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
+ NO_COLOR: ""
PATH: "[PATH]"
PSModulePath: ""
RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ 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 -----
-◎ Removing feature-unmerged-keep worktree in background
+◎ Removing feature-unmerged-keep worktree in background
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_partial_success.snap b/tests/snapshots/integration__integration_tests__remove__remove_partial_success.snap
index 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 -----
✗ No branch named nonexistent
↳ To list branches, run wt list --branches --remotes
-◎ Removing feature worktree & branch in background (same commit as main, _)
+◎ Removing feature worktree & branch in background (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__remove__remove_path_mismatch_warning.snap b/tests/snapshots/integration__integration_tests__remove__remove_path_mismatch_warning.snap
index 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 -----
▲ Branch-worktree mismatch: feature @ _PARENT_/weird-path-for-feature, expected @ _REPO_.feature ⚑
-◎ Removing feature worktree & branch in background (same commit as main, _)
+◎ Removing feature worktree & branch in background (same commit as main, _)
diff --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.snap
index 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 -----
◎ Removing feature-fg worktree...
▲ Branch-worktree mismatch: feature-fg @ _PARENT_/another-weird-path, expected @ _REPO_.feature-fg ⚑
-✓ Removed feature-fg worktree & branch (same commit as main, _)
+✓ Removed feature-fg worktree & branch (same commit as main, _)
diff --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.snap
index 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"
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
-◎ Removing feature worktree & branch in background (same commit as main, _)
+◎ Removing feature worktree & branch in background (same commit as main, _)
○ Switched to worktree for main @ _REPO_
diff --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.snap
index 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"
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
-◎ Removing feature worktree & branch in background (same commit as main, _)
+◎ Removing feature worktree & branch in background (same commit as main, _)
○ Switched to worktree for main @ _REPO_
diff --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.snap
index 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"
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
-◎ Removing feature worktree & branch in background (same commit as main, _)
+◎ Removing feature worktree & branch in background (same commit as main, _)
○ Switched to worktree for main @ _REPO_
diff --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.snap
index 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"
  feature.txt | 1 +
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
-◎ Removing feature worktree & branch in background (same commit as main, _)
+◎ Removing feature worktree & branch in background (same commit as main, _)
○ Switched to worktree for main @ _REPO_
diff --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.snap
index 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!
  tests/test_auth.py | 14 ++++++++++++++
  2 files changed, 45 insertions(+)
✓ Merged to main (1 commit, 2 files, +45)
-◎ Removing feature-auth worktree & branch in background (same commit as main, _)
+◎ Removing feature-auth worktree & branch in background (same commit as main, _)
○ Switched to worktree for main @ _REPO_
diff --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.snap
index 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.rs
expression: "&output.combined"
---
-◎ Removing feature-api worktree & branch in background (same commit as main, _)
+◎ Removing feature-api worktree & branch in background (same commit as main, _)
○ Switched to worktree for main @ _REPO_
diff --git a/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__remove.snap b/tests/snapshots/integration__integration_tests__shell_wrapper__unix_tests__remove.snap
index 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.rs
expression: "&output.combined"
---
-◎ Removing to-remove worktree & branch in background (same commit as main, _)
+◎ Removing to-remove worktree & branch in background (same commit as main, _)
diff --git a/tests/snapshots/integration__integration_tests__step_prune__prune_current_worktree.snap b/tests/snapshots/integration__integration_tests__step_prune__prune_current_worktree.snap
index 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 -----
-◎ Removing current-merged worktree & branch in background (same commit as main, _)
+◎ Removing current-merged worktree & branch in background (same commit as main, _)
▲ Cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
✓ Pruned 1 worktree & branch
diff --git a/tests/snapshots/integration__integration_tests__step_prune__prune_during_rebase.snap b/tests/snapshots/integration__integration_tests__step_prune__prune_during_rebase.snap
index 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 -----
-◎ Removing merged-wt worktree & branch in background (same commit as main, _)
+◎ Removing merged-wt worktree & branch in background (same commit as main, _)
✓ Pruned 1 worktree & branch
diff --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.snap
index 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 -----
-◎ Removing merged-mixed worktree & branch in background (same commit as main, _)
+◎ Removing merged-mixed worktree & branch in background (same commit as main, _)
✓ Removed branch orphan-mixed (same commit as main, _)
✓ Pruned 1 worktree & branch, 1 branch
diff --git a/tests/snapshots/integration__integration_tests__step_prune__prune_multiple.snap b/tests/snapshots/integration__integration_tests__step_prune__prune_multiple.snap
index 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 -----
-◎ Removing merged-a worktree & branch in background (same commit as main, _)
-◎ Removing merged-b worktree & branch in background (same commit as main, _)
-◎ Removing merged-c worktree & branch in background (same commit as main, _)
+◎ Removing merged-a worktree & branch in background (same commit as main, _)
+◎ Removing merged-b worktree & branch in background (same commit as main, _)
+◎ Removing merged-c worktree & branch in background (same commit as main, _)
✓ Pruned 3 worktrees & branches
diff --git a/tests/snapshots/integration__integration_tests__step_prune__prune_removes_merged.snap b/tests/snapshots/integration__integration_tests__step_prune__prune_removes_merged.snap
index 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 -----
-◎ Removing merged-branch worktree & branch in background (same commit as main, _)
+◎ Removing merged-branch worktree & branch in background (same commit as main, _)
✓ Pruned 1 worktree & branch
diff --git a/tests/snapshots/integration__integration_tests__step_prune__prune_skips_dirty.snap b/tests/snapshots/integration__integration_tests__step_prune__prune_skips_dirty.snap
index 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 -----
-◎ Removing clean-merged worktree & branch in background (same commit as main, _)
+◎ Removing clean-merged worktree & branch in background (same commit as main, _)
✓ Pruned 1 worktree & branch
diff --git a/tests/snapshots/integration__integration_tests__step_prune__prune_skips_locked.snap b/tests/snapshots/integration__integration_tests__step_prune__prune_skips_locked.snap
index 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 -----
-◎ Removing merged-branch worktree & branch in background (same commit as main, _)
+◎ Removing merged-branch worktree & branch in background (same commit as main, _)
✓ Pruned 1 worktree & branch
diff --git a/tests/snapshots/integration__integration_tests__step_prune__prune_skips_unmerged.snap b/tests/snapshots/integration__integration_tests__step_prune__prune_skips_unmerged.snap
index 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 -----
-◎ Removing merged-one worktree & branch in background (same commit as main, _)
+◎ Removing merged-one worktree & branch in background (same commit as main, _)
✓ Pruned 1 worktree & branch
diff --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.snap
index 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: C
LC_ALL: C
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
+ NO_COLOR: ""
PATH: "[PATH]"
PSModulePath: ""
RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ 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 -----
-◎ Removing feature worktree & branch in background (--force-delete)
+◎ Removing feature worktree & branch in background (--force-delete)
◎ Running post-remove: user:cleanup
diff --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.snap
index 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: C
LC_ALL: C
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
+ NO_COLOR: ""
PATH: "[PATH]"
PSModulePath: ""
RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ 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 -----
-◎ Removing feature worktree & branch in background (--force-delete)
+◎ Removing feature worktree & branch in background (--force-delete)
diff --git a/tests/snapshots/integration__integration_tests__user_hooks__user_pre_remove_executes.snap b/tests/snapshots/integration__integration_tests__user_hooks__user_pre_remove_executes.snap
index 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: C
LC_ALL: C
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
+ NO_COLOR: ""
PATH: "[PATH]"
PSModulePath: ""
RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ 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 -----
◎ Running pre-remove user:cleanup @ _REPO_.feature
  echo 'USER_PRE_REMOVE_RAN' > ../user_preremove_marker.txt
-◎ Removing feature worktree & branch in background (--force-delete)
+◎ Removing feature worktree & branch in background (--force-delete)
diff --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.snap
index 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: C
LC_ALL: C
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
+ NO_COLOR: ""
PATH: "[PATH]"
PSModulePath: ""
RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ 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 -----
-◎ Removing feature worktree & branch in background (--force-delete)
+◎ Removing feature worktree & branch in background (--force-delete)