Skip to content

Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows

fix(output): name the destination when a removal deletes the caller's directory (#4163)

Worktrunk Bot386e57b99f07
diff --git a/src/output/handlers.rs b/src/output/handlers.rs
index 3fe637381..6ecded615 100644
--- a/src/output/handlers.rs
+++ b/src/output/handlers.rs
@@ -926,7 +926,12 @@ fn flag_note(
///
/// # Warning Message Format
///
-/// Uses the standard "Cannot change directory — {reason}" pattern.
+/// Uses the standard "Worktree for X @ path, but cannot change directory —
+/// {reason}" pattern, the same shape `wt switch` uses for an existing worktree.
+/// Naming the destination matters more here than anywhere else: the removal
+/// deleted the directory the caller is standing in, and unless a post-merge or
+/// post-remove hook announcement happens to name its working directory, no
+/// other line of the run prints a path to move to.
/// See [`compute_shell_warning_reason`] for the full list of reasons.
fn print_switch_message_if_changed(
changed_directory: bool,
@@ -959,9 +964,9 @@ fn print_switch_message_if_changed(
// Running as `git wt` - explain why cd can't work
eprintln!(
"{}",
- warning_message(
- "Cannot change directory — ran git wt; running through git prevents cd",
- )
+ warning_message(cformat!(
+ "Worktree for <bold>{dest_branch}</> @ <bold>{path_display}</>, but cannot change directory — ran git wt; running through git prevents cd"
+ ))
);
eprintln!("{}", hint_message(git_subcommand_warning()));
} else {
@@ -969,7 +974,9 @@ fn print_switch_message_if_changed(
let reason = compute_shell_warning_reason();
eprintln!(
"{}",
- warning_message(cformat!("Cannot change directory — {reason}"))
+ warning_message(cformat!(
+ "Worktree for <bold>{dest_branch}</> @ <bold>{path_display}</>, but cannot change directory — {reason}"
+ ))
);
// Show appropriate hint based on invocation mode
if super::retired_shell_wrapper_active() {
@@ -1049,7 +1056,10 @@ pub struct SwitchDisplayPaths {
/// - `AlreadyAt` — user is already in the target directory
/// - Shell integration IS active — cd will happen automatically
///
-/// **Warning format:** `Cannot change directory — {reason}`
+/// **Warning format:** `Existing` shares the switch-to-existing shape,
+/// `Worktree for X @ path, but cannot change directory — {reason}`; `Created`
+/// warns with the bare `Cannot change directory — {reason}`, because the
+/// success line printed above it already names the path.
///
/// See [`compute_shell_warning_reason`] for the full list of reasons.
///
diff --git a/src/output/shell_integration.rs b/src/output/shell_integration.rs
index c897a37d8..19a85f343 100644
--- a/src/output/shell_integration.rs
+++ b/src/output/shell_integration.rs
@@ -28,13 +28,20 @@
//!
//! ## After Merge/Remove (switching to main worktree)
//!
+//! The warning names the destination, as the switch-to-existing case does.
+//! Both the `--create` success line and the switch-to-existing warning already
+//! print a path; a removal prints one only where a post-merge / post-remove
+//! hook announcement names its working directory, and it has just deleted the
+//! directory the caller is standing in — so without the path a caller without
+//! shell integration has nowhere to `cd`.
+//!
//! | Condition | Warning | Hint |
//! |-----------|---------|------|
//! | Shell active | (info) `Switched to worktree for main @ path` | (none) |
-//! | Outdated wrapper | `Cannot change directory — shell wrapper is out of date` | `To update the shell wrapper, run wt config shell install` |
-//! | Git subcommand | `Cannot change directory — ran git wt; running through git prevents cd` | `For automatic cd, invoke directly (with the -): git-wt` |
-//! | Explicit path | `Cannot change directory — ran ./wt; shell integration wraps wt` | `To change directory, run wt switch main` |
-//! | Other | `Cannot change directory — {reason}` | `To enable automatic cd, run wt config shell install` |
+//! | Outdated wrapper | `Worktree for main @ path, but cannot change directory — shell wrapper is out of date` | `To update the shell wrapper, run wt config shell install` |
+//! | Git subcommand | `Worktree for main @ path, but cannot change directory — ran git wt; running through git prevents cd` | `For automatic cd, invoke directly (with the -): git-wt` |
+//! | Explicit path | `Worktree for main @ path, but cannot change directory — ran ./wt; shell integration wraps wt` | `To change directory, run wt switch main` |
+//! | Other | `Worktree for main @ path, but cannot change directory — {reason}` | `To enable automatic cd, run wt config shell install` |
//!
//! ## Prompt Decision Flow
//!
diff --git a/tests/integration_tests/merge.rs b/tests/integration_tests/merge.rs
index 19334a7fc..cd5de3321 100644
--- a/tests/integration_tests/merge.rs
+++ b/tests/integration_tests/merge.rs
@@ -5,6 +5,7 @@ use crate::common::{
repo_with_remote, setup_snapshot_settings, wait_for_file, wait_for_file_content,
wait_for_worktree_removed,
};
+use ansi_str::AnsiStr;
use insta::assert_snapshot;
use insta_cmd::assert_cmd_snapshot;
use path_slash::PathExt as _;
@@ -926,6 +927,51 @@ fn test_merge_cwd_removed_hint_no_recovery(mut repo: TestRepo) {
assert_cmd_snapshot!(cmd);
}
+/// A merge that removes the worktree the caller is standing in must name the
+/// destination it could not cd to.
+///
+/// Without shell integration the caller is left in a deleted directory, and
+/// unless a post-merge hook announcement names the destination, no other line
+/// of the merge output prints a path to move to — `wt switch ^` does not
+/// recover from wt's own clean removal, because the removal prunes the admin
+/// entry that deleted-CWD recovery matches on. The warning is what un-strands
+/// the caller.
+#[rstest]
+fn test_merge_cwd_removed_warning_names_destination(mut repo: TestRepo) {
+ let feature_wt = repo.add_feature();
+
+ let output = repo
+ .wt_command()
+ .args(["merge", "main", "--yes", "--no-hooks"])
+ .current_dir(&feature_wt)
+ .env("PWD", &feature_wt)
+ .output()
+ .unwrap();
+ assert!(
+ output.status.success(),
+ "merge should succeed; stderr:\n{}",
+ String::from_utf8_lossy(&output.stderr)
+ );
+
+ let stderr = String::from_utf8_lossy(&output.stderr);
+ let plain = stderr.ansi_strip();
+ let warning = plain
+ .lines()
+ .find(|line| line.contains("hange directory"))
+ .unwrap_or_else(|| panic!("merge should warn that it cannot cd; stderr:\n{stderr}"));
+ // `format_path_for_display` renders the destination home-relative, so match
+ // on the primary worktree's directory name rather than the tempdir prefix.
+ let named = warning
+ .split_once(" @ ")
+ .and_then(|(_, rest)| rest.split_once(", but "))
+ .map(|(path, _)| path);
+ let root_name = repo.root_path().file_name().unwrap().to_string_lossy();
+ assert!(
+ named.is_some_and(|path| path.ends_with(&*root_name)),
+ "the warning must name the destination worktree, since the removal deleted the caller's cwd; stderr:\n{stderr}"
+ );
+}
+
#[rstest]
fn test_merge_post_merge_command_named(mut repo: TestRepo) {
// Create project config with named post-merge commands
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 e7a1b1fef..23c8b33e7 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
@@ -66,5 +66,5 @@ exit_code: 0
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
◎ Removing feature worktree & branch in background (same commit as main, _)
-▲ Cannot change directory — ran git wt; running through git prevents cd
+▲ Worktree for main @ _REPO_, but 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 3f0fede83..3390e9c91 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
@@ -71,5 +71,5 @@ exit_code: 0
  2 files changed, 2 insertions(+)
✓ Merged to main (1 commit, 2 files, +2)
◎ Removing feature worktree & branch in background (same commit as main, _)
-▲ Cannot change directory — shell integration not installed
+▲ Worktree for main @ _REPO_, but 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 972e9923d..07432bf07 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
@@ -74,5 +74,5 @@ exit_code: 0
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
◎ Removing feature worktree & branch in background (same commit as main, _)
-▲ Cannot change directory — shell integration not installed
+▲ Worktree for main @ _REPO_, but 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 2ac3c9ba4..f6891c01e 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
@@ -70,5 +70,5 @@ exit_code: 0
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
◎ Removing feature worktree & branch in background (same commit as main, _)
-▲ Cannot change directory — shell integration not installed
+▲ Worktree for main @ _REPO_, but 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 0147186e2..703bea3eb 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
@@ -67,6 +67,6 @@ exit_code: 0
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
◎ Removing feature worktree & branch in background (same commit as main, _)
-▲ Cannot change directory — shell integration not installed
+▲ Worktree for main @ _REPO_, but cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Running post-merge: project @ _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 0147186e2..703bea3eb 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
@@ -67,6 +67,6 @@ exit_code: 0
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
◎ Removing feature worktree & branch in background (same commit as main, _)
-▲ Cannot change directory — shell integration not installed
+▲ Worktree for main @ _REPO_, but cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Running post-merge: project @ _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 9ad4068cd..e1cb787c3 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
@@ -71,5 +71,5 @@ exit_code: 0
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
◎ Removing feature worktree & branch in background (same commit as main, _)
-▲ Cannot change directory — shell integration not installed
+▲ Worktree for main @ _REPO_, but 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 7d4dfe6e3..f271c8695 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
@@ -65,5 +65,5 @@ exit_code: 0
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
◎ Removing feature worktree & branch in background (same commit as main, _)
-▲ Cannot change directory — shell integration not installed
+▲ Worktree for main @ _REPO_, but 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 9529b1a2c..7c0339bfd 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap
@@ -61,5 +61,5 @@ 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, _)
-▲ Cannot change directory — shell integration not installed
+▲ Worktree for main @ _REPO_, but 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 26a0b6926..fa048928c 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
@@ -71,5 +71,5 @@ exit_code: 0
  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, _)
-▲ Cannot change directory — shell integration not installed
+▲ Worktree for main @ _REPO_, but 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 232f3a745..f47a9515c 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
@@ -66,5 +66,5 @@ exit_code: 0
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
◎ Removing feature worktree & branch in background (same commit as main, _)
-▲ Cannot change directory — shell integration not installed
+▲ Worktree for main @ _REPO_, but 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 4938d8191..f22e5794e 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
@@ -68,5 +68,5 @@ exit_code: 0
  2 files changed, 2 insertions(+)
✓ Merged to main (2 commits, 2 files, +2)
◎ Removing feature worktree & branch in background (same commit as main, _)
-▲ Cannot change directory — shell integration not installed
+▲ Worktree for main @ _REPO_, but 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 0147186e2..703bea3eb 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
@@ -67,6 +67,6 @@ exit_code: 0
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
◎ Removing feature worktree & branch in background (same commit as main, _)
-▲ Cannot change directory — shell integration not installed
+▲ Worktree for main @ _REPO_, but cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Running post-merge: project @ _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 c26e02057..7350238cb 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
@@ -66,6 +66,6 @@ exit_code: 0
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
◎ Removing feature worktree & branch in background (same commit as main, _)
-▲ Cannot change directory — shell integration not installed
+▲ Worktree for main @ _REPO_, but cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Running post-merge: notify & deploy (project) @ _REPO_
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_skipped_with_no_hooks.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_skipped_with_no_hooks.snap
index 1c3fe6b58..8c5586f9d 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_skipped_with_no_hooks.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_skipped_with_no_hooks.snap
@@ -67,5 +67,5 @@ exit_code: 0
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
◎ Removing feature worktree & branch in background (same commit as main, _)
-▲ Cannot change directory — shell integration not installed
+▲ Worktree for main @ _REPO_, but 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 bc3cc07e8..babea87c7 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
@@ -66,6 +66,6 @@ exit_code: 0
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
◎ Removing feature worktree & branch in background (same commit as main, _)
-▲ Cannot change directory — shell integration not installed
+▲ Worktree for main @ _REPO_, but cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Running post-merge: project @ _REPO_
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_pipeline_serial_ordering.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_pipeline_serial_ordering.snap
index 54f3fe390..ec1e0b274 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_pipeline_serial_ordering.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_pipeline_serial_ordering.snap
@@ -66,6 +66,6 @@ exit_code: 0
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
◎ Removing feature worktree & branch in background (same commit as main, _)
-▲ Cannot change directory — shell integration not installed
+▲ Worktree for main @ _REPO_, but cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Running post-merge: project ×2 @ _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 dbb141dd8..bfcea6667 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
@@ -62,6 +62,6 @@ 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, _)
-▲ Cannot change directory — shell integration not installed
+▲ Worktree for main @ _REPO_, but cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Running post-merge: project @ _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 84ed3c863..b5a4b70df 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
@@ -81,5 +81,5 @@ exit_code: 0
  3 files changed, 3 insertions(+)
✓ Merged to main (1 commit, 3 files, +3)
◎ Removing feature worktree & branch in background (same commit as main, _)
-▲ Cannot change directory — shell integration not installed
+▲ Worktree for main @ _REPO_, but 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 4b4c213dd..4d56ebf2f 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
@@ -75,5 +75,5 @@ exit_code: 0
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
◎ Removing feature worktree & branch in background (same commit as main, _)
-▲ Cannot change directory — shell integration not installed
+▲ Worktree for main @ _REPO_, but 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 b699592be..d8325447e 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
@@ -72,5 +72,5 @@ exit_code: 0
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
◎ Removing feature worktree & branch in background (same commit as main, _)
-▲ Cannot change directory — shell integration not installed
+▲ Worktree for main @ _REPO_, but 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 2d16c509c..c052af3e9 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
@@ -66,5 +66,5 @@ exit_code: 0
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
◎ Removing feature worktree & branch in background (same commit as main, _)
-▲ Cannot change directory — shell integration not installed
+▲ Worktree for main @ _REPO_, but 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 89e74956a..caf30dff1 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
@@ -68,5 +68,5 @@ exit_code: 0
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
◎ Removing feature worktree & branch in background (same commit as main, _)
-▲ Cannot change directory — shell integration not installed
+▲ Worktree for main @ _REPO_, but 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 1d2134401..abe21f4f4 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
@@ -69,5 +69,5 @@ exit_code: 0
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
◎ Removing feature worktree & branch in background (same commit as main, _)
-▲ Cannot change directory — shell integration not installed
+▲ Worktree for main @ _REPO_, but 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 7d4dfe6e3..a6e472a46 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
@@ -65,5 +65,5 @@ exit_code: 0
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
◎ Removing feature worktree & branch in background (same commit as main, _)
-▲ Cannot change directory — shell integration not installed
+▲ Worktree for main @ _REPO_.main-wt, but 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 d62a7125f..76bd88057 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
@@ -65,5 +65,5 @@ exit_code: 0
  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, _)
-▲ Cannot change directory — shell integration not installed
+▲ Worktree for develop @ _REPO_, but 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 4f3b7f908..4fe384e64 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
@@ -67,5 +67,5 @@ exit_code: 0
  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, _)
-▲ Cannot change directory — shell integration not installed
+▲ Worktree for develop @ _REPO_, but 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 fd5019740..ba9a2c0be 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
@@ -62,5 +62,5 @@ exit_code: 0
✓ 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, _)
-▲ Cannot change directory — shell integration not installed
+▲ Worktree for main @ _REPO_, but 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 22e4ca20d..d19fb20eb 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
@@ -67,5 +67,5 @@ exit_code: 0
  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, _)
-▲ Cannot change directory — shell integration not installed
+▲ Worktree for main @ _REPO_, but 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 126532d0b..977a9516f 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
@@ -77,5 +77,5 @@ exit_code: 0
  3 files changed, 3 insertions(+)
✓ Merged to main (1 commit, 3 files, +3)
◎ Removing feature worktree & branch in background (same commit as main, _)
-▲ Cannot change directory — shell integration not installed
+▲ Worktree for main @ _REPO_, but 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 64eb37f26..325fce2d4 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
@@ -71,5 +71,5 @@ exit_code: 0
○ 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, _)
-▲ Cannot change directory — shell integration not installed
+▲ Worktree for main @ _REPO_, but 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 4aca402ef..56bde9c7c 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
@@ -65,5 +65,5 @@ exit_code: 0
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
◎ Removing feature worktree & branch in background (same commit as main, _)
-▲ Cannot change directory — shell integration not installed
+▲ Worktree for main @ _REPO_, but 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 f0f32b5fa..fb944e3cc 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
@@ -69,5 +69,5 @@ exit_code: 0
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
◎ Removing feature worktree & branch in background (same commit as main, _)
-▲ Cannot change directory — shell integration not installed
+▲ Worktree for main @ _REPO_, but 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 347d97977..7033e2860 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
@@ -72,5 +72,5 @@ exit_code: 0
  2 files changed, 2 insertions(+)
✓ Merged to main (1 commit, 2 files, +2)
◎ Removing feature worktree & branch in background (same commit as main, _)
-▲ Cannot change directory — shell integration not installed
+▲ Worktree for main @ _REPO_, but 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 77c7c470d..a24043db5 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
@@ -64,5 +64,5 @@ exit_code: 0
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
◎ Removing feature worktree & branch in background (same commit as main, _)
-▲ Cannot change directory — shell integration not installed
+▲ Worktree for main @ _REPO_, but 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 fa4f66861..ef653b3e0 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
@@ -67,5 +67,5 @@ exit_code: 0
  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, _)
-▲ Cannot change directory — shell integration not installed
+▲ Worktree for staging @ _REPO_.staging-wt, but 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 b2edb5de8..30a923d6a 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
@@ -65,5 +65,5 @@ exit_code: 0
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
◎ Removing feature worktree & branch in background (same commit as main, _)
-▲ Cannot change directory — shell integration not installed
+▲ Worktree for main @ _REPO_, but 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 880c70c42..8d609b1b2 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
@@ -76,5 +76,5 @@ exit_code: 0
  3 files changed, 3 insertions(+)
✓ Merged to main (1 commit, 3 files, +3)
◎ Removing feature worktree & branch in background (same commit as main, _)
-▲ Cannot change directory — shell integration not installed
+▲ Worktree for main @ _REPO_, but 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 4359a505c..f99a35c65 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
@@ -96,6 +96,6 @@ test result: ok. 18 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out; fin
  3 files changed, 33 insertions(+)
✓ Merged to main (1 commit, 3 files, +33)
◎ Removing feature-auth worktree & branch in background (same commit as main, _)
-▲ Cannot change directory — shell integration not installed
+▲ Worktree for main @ _REPO_, but cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Running post-merge: install (project) @ _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 e3d57a8cb..69bef5c62 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap
@@ -65,5 +65,5 @@ exit_code: 0
  1 file changed, 13 insertions(+)
✓ Merged to main (1 commit, 1 file, +13)
◎ Removing fix-auth worktree & branch in background (same commit as main, _)
-▲ Cannot change directory — shell integration not installed
+▲ Worktree for main @ _REPO_, but 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_as_git_subcommand.snap b/tests/snapshots/integration__integration_tests__remove__remove_as_git_subcommand.snap
index 9dde1e38f..6748e87fd 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
@@ -60,5 +60,5 @@ exit_code: 0
----- stderr -----
◎ Removing feature-git-subcmd worktree & branch in background (same commit as main, _)
-▲ Cannot change directory — ran git wt; running through git prevents cd
+▲ Worktree for main @ _REPO_, but 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 243e83912..367a02494 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
@@ -60,5 +60,5 @@ exit_code: 0
----- stderr -----
◎ Removing feature-symlink worktree & branch in background (same commit as main, _)
-▲ Cannot change directory — shell integration not installed
+▲ Worktree for main @ _REPO_, but 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_current_by_name.snap b/tests/snapshots/integration__integration_tests__remove__remove_current_by_name.snap
index 679453fed..d786bf24f 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
@@ -60,5 +60,5 @@ exit_code: 0
----- stderr -----
◎ Removing feature-current worktree & branch in background (same commit as main, _)
-▲ Cannot change directory — shell integration not installed
+▲ Worktree for main @ _REPO_, but 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_from_worktree.snap b/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap
index 3f6921570..8ce595741 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap
@@ -59,5 +59,5 @@ exit_code: 0
----- stderr -----
◎ Removing feature-wt worktree & branch in background (same commit as main, _)
-▲ Cannot change directory — shell integration not installed
+▲ Worktree for main @ _REPO_, but 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_linked_succeeds.snap b/tests/snapshots/integration__integration_tests__remove__remove_main_vs_linked__from_linked_succeeds.snap
index 0af7f53d1..e9bed8b94 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
@@ -61,5 +61,5 @@ exit_code: 0
----- stderr -----
◎ Removing feature worktree...
✓ Removed feature worktree & branch (same commit as main, _) (3 files · [BYTES] B)
-▲ Cannot change directory — shell integration not installed
+▲ Worktree for main @ _REPO_, but 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_including_current.snap b/tests/snapshots/integration__integration_tests__remove__remove_multiple_including_current.snap
index d6717d115..445e5b827 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
@@ -67,5 +67,5 @@ exit_code: 0
↳ Branch unmerged; to delete, run wt remove -D feature-c
◎ Removing feature-a worktree in background
↳ Branch unmerged; to delete, run wt remove -D feature-a
-▲ Cannot change directory — shell integration not installed
+▲ Worktree for main @ _REPO_, but cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
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 a1bcc8c52..411037c1a 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
@@ -62,6 +62,6 @@ exit_code: 0
----- stderr -----
◎ Removing current-merged worktree & branch in background (same commit as main, _)
-▲ Cannot change directory — shell integration not installed
+▲ Worktree for main @ _REPO_, but 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_skips_default_branch_orphan.snap b/tests/snapshots/integration__integration_tests__step_prune__prune_skips_default_branch_orphan.snap
index f90713eed..6ac2f3f3a 100644
--- a/tests/snapshots/integration__integration_tests__step_prune__prune_skips_default_branch_orphan.snap
+++ b/tests/snapshots/integration__integration_tests__step_prune__prune_skips_default_branch_orphan.snap
@@ -52,6 +52,6 @@ exit_code: 0
----- stderr -----
◎ Removing feature worktree & branch in background (same commit as main, _)
-▲ Cannot change directory — shell integration not installed
+▲ Worktree for main @ [TEMP]/repo, but 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__user_hooks__combined_post_remove_and_post_switch.snap b/tests/snapshots/integration__integration_tests__user_hooks__combined_post_remove_and_post_switch.snap
index 396f88735..c2d9fcf12 100644
--- a/tests/snapshots/integration__integration_tests__user_hooks__combined_post_remove_and_post_switch.snap
+++ b/tests/snapshots/integration__integration_tests__user_hooks__combined_post_remove_and_post_switch.snap
@@ -61,6 +61,6 @@ exit_code: 0
----- stderr -----
◎ Removing feature worktree & branch in background (--force-delete)
-▲ Cannot change directory — shell integration not installed
+▲ Worktree for main @ _REPO_, but cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Running post-remove: cleanup (user); post-switch: notify (user) @ _REPO_
diff --git a/tests/snapshots/integration__integration_tests__user_hooks__combined_post_remove_and_post_switch_verbose.snap b/tests/snapshots/integration__integration_tests__user_hooks__combined_post_remove_and_post_switch_verbose.snap
index 7df063373..5e9c713a1 100644
--- a/tests/snapshots/integration__integration_tests__user_hooks__combined_post_remove_and_post_switch_verbose.snap
+++ b/tests/snapshots/integration__integration_tests__user_hooks__combined_post_remove_and_post_switch_verbose.snap
@@ -62,7 +62,7 @@ exit_code: 0
----- stderr -----
◎ Removing feature worktree & branch in background (--force-delete)
-▲ Cannot change directory — shell integration not installed
+▲ Worktree for main @ _REPO_, but cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
○ post-remove template variables:
  branch = feature
diff --git a/tests/snapshots/integration__integration_tests__user_hooks__merge_auto_commit_combines_post_remove_post_switch_post_merge.snap b/tests/snapshots/integration__integration_tests__user_hooks__merge_auto_commit_combines_post_remove_post_switch_post_merge.snap
index 61c18e8e2..3917e1378 100644
--- a/tests/snapshots/integration__integration_tests__user_hooks__merge_auto_commit_combines_post_remove_post_switch_post_merge.snap
+++ b/tests/snapshots/integration__integration_tests__user_hooks__merge_auto_commit_combines_post_remove_post_switch_post_merge.snap
@@ -75,7 +75,7 @@ exit_code: 0
  2 files changed, 2 insertions(+)
✓ Merged to main (2 commits, 2 files, +2)
◎ Removing feature worktree & branch in background (same commit as main, _)
-▲ Cannot change directory — shell integration not installed
+▲ Worktree for main @ _REPO_, but cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
▲ Skipped post-commit: mark (user) — worktree removed @ _REPO_.feature
↳ To run commands in a worktree before it is removed, use pre-remove
diff --git a/tests/snapshots/integration__integration_tests__user_hooks__merge_combines_post_remove_post_switch_post_merge.snap b/tests/snapshots/integration__integration_tests__user_hooks__merge_combines_post_remove_post_switch_post_merge.snap
index 48e94427a..93dc84e2c 100644
--- a/tests/snapshots/integration__integration_tests__user_hooks__merge_combines_post_remove_post_switch_post_merge.snap
+++ b/tests/snapshots/integration__integration_tests__user_hooks__merge_combines_post_remove_post_switch_post_merge.snap
@@ -66,6 +66,6 @@ exit_code: 0
  1 file changed, 1 insertion(+)
✓ Merged to main (1 commit, 1 file, +1)
◎ Removing feature worktree & branch in background (same commit as main, _)
-▲ Cannot change directory — shell integration not installed
+▲ Worktree for main @ _REPO_, but cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
◎ Running post-remove: cleanup (user); post-switch: notify (user); post-merge: sync (user) @ _REPO_
diff --git a/tests/snapshots/integration__integration_tests__user_hooks__merge_post_commit_worktree_removed.snap b/tests/snapshots/integration__integration_tests__user_hooks__merge_post_commit_worktree_removed.snap
index 7408c15dc..5ac43b945 100644
--- a/tests/snapshots/integration__integration_tests__user_hooks__merge_post_commit_worktree_removed.snap
+++ b/tests/snapshots/integration__integration_tests__user_hooks__merge_post_commit_worktree_removed.snap
@@ -78,7 +78,7 @@ exit_code: 0
  2 files changed, 2 insertions(+)
✓ Merged to main (1 commit, 2 files, +2)
◎ Removing feature worktree & branch in background (same commit as main, _)
-▲ Cannot change directory — shell integration not installed
+▲ Worktree for main @ _REPO_, but cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
▲ Skipped post-commit: mark (user) — worktree removed @ _REPO_/.worktrees/feature
↳ To run commands in a worktree before it is removed, use pre-remove
diff --git a/tests/snapshots/integration__integration_tests__user_hooks__merge_squash_combines_post_remove_post_switch_post_merge.snap b/tests/snapshots/integration__integration_tests__user_hooks__merge_squash_combines_post_remove_post_switch_post_merge.snap
index 328f3adc2..d207bd4a1 100644
--- a/tests/snapshots/integration__integration_tests__user_hooks__merge_squash_combines_post_remove_post_switch_post_merge.snap
+++ b/tests/snapshots/integration__integration_tests__user_hooks__merge_squash_combines_post_remove_post_switch_post_merge.snap
@@ -77,7 +77,7 @@ exit_code: 0
  2 files changed, 2 insertions(+)
✓ Merged to main (1 commit, 2 files, +2)
◎ Removing feature worktree & branch in background (same commit as main, _)
-▲ Cannot change directory — shell integration not installed
+▲ Worktree for main @ _REPO_, but cannot change directory — shell integration not installed
↳ To enable automatic cd, run wt config shell install
▲ Skipped post-commit: mark (user) — worktree removed @ _REPO_.feature
↳ To run commands in a worktree before it is removed, use pre-remove