Skip to content

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

Add directory change suffix to async worktree removal output

Maximilian Roose425850d400f
diff --git a/src/output/handlers.rs b/src/output/handlers.rs
index 765d67aad..023b02fe5 100644
--- a/src/output/handlers.rs
+++ b/src/output/handlers.rs
@@ -676,20 +676,28 @@ fn handle_removed_worktree_output(
let flag_text = &flag_note.text;
let flag_after = flag_note.after_cyan();
+ // Directory change suffix: ". Changing directory to path" when we're moving the user
+ let dir_change = if changed_directory {
+ let path_display = format_path_for_display(main_path);
+ cformat!("<cyan>. Changing directory to <bold>{path_display}</></>")
+ } else {
+ String::new()
+ };
+
// Reason in parentheses: user flags shown explicitly, integration reason for automatic cleanup
// Note: We use FormattedMessage directly instead of progress_message() to control
// where cyan styling ends. Symbol must be inside the <cyan> block to get proper coloring.
let action = if deletion_mode.should_keep() {
cformat!(
- "<cyan>◎ Removing <bold>{branch_name}</> worktree in background; retaining branch{flag_text}</>{flag_after}"
+ "<cyan>◎ Removing <bold>{branch_name}</> worktree in background; retaining branch{flag_text}</>{flag_after}{dir_change}"
)
} else if should_delete_branch {
cformat!(
- "<cyan>◎ Removing <bold>{branch_name}</> worktree & branch in background{flag_text}</>{flag_after}"
+ "<cyan>◎ Removing <bold>{branch_name}</> worktree & branch in background{flag_text}</>{flag_after}{dir_change}"
)
} else {
cformat!(
- "<cyan>◎ Removing <bold>{branch_name}</> worktree in background; retaining unmerged branch</>"
+ "<cyan>◎ Removing <bold>{branch_name}</> worktree in background; retaining unmerged branch</>{dir_change}"
)
};
super::print(FormattedMessage::new(action))?;
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap
index a745fdc6d..3bfdd6e41 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_bash.snap
@@ -27,4 +27,4 @@ expression: output.normalized()
  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, _). Changing directory to [TMPDIR]/repo
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap
index a745fdc6d..3bfdd6e41 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_mixed_stdout_stderr_zsh.snap
@@ -27,4 +27,4 @@ expression: output.normalized()
  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, _). Changing directory to [TMPDIR]/repo
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap
index b0ca9ef58..8fa124cf1 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap
@@ -16,4 +16,4 @@ expression: output.normalized()
  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, _). Changing directory to [TMPDIR]/repo
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap
index b0ca9ef58..8fa124cf1 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap
@@ -16,4 +16,4 @@ expression: output.normalized()
  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, _). Changing directory to [TMPDIR]/repo
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_pre_merge.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_pre_merge.snap
index c71cb5c75..a7dfce173 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_pre_merge.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_hooks_pre_merge.snap
@@ -32,4 +32,4 @@ 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, _). Changing directory to [TMPDIR]/repo
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_remove.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_remove.snap
index 95ba61405..68c9d7d73 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_remove.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__readme_example_remove.snap
@@ -2,4 +2,4 @@
source: tests/integration_tests/shell_wrapper.rs
expression: output.normalized()
---
-◎ Removing feature-api worktree & branch in background (same commit as main, _)
+◎ Removing feature-api worktree & branch in background (same commit as main, _). Changing directory to [TMPDIR]/repo
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 e8abea8a3..7312b1869 100644
--- a/tests/snapshots/integration__integration_tests__directives__merge_directive_file.snap
+++ b/tests/snapshots/integration__integration_tests__directives__merge_directive_file.snap
@@ -23,7 +23,7 @@ info:
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
- WORKTRUNK_DIRECTIVE_FILE: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpCUDDF7
+ WORKTRUNK_DIRECTIVE_FILE: "[DIRECTIVE_FILE]"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
@@ -36,4 +36,4 @@ 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, _). Changing directory to _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 176785fea..7312b1869 100644
--- a/tests/snapshots/integration__integration_tests__directives__merge_directive_remove.snap
+++ b/tests/snapshots/integration__integration_tests__directives__merge_directive_remove.snap
@@ -23,7 +23,7 @@ info:
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
- WORKTRUNK_DIRECTIVE_FILE: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpk1oHzo
+ WORKTRUNK_DIRECTIVE_FILE: "[DIRECTIVE_FILE]"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
@@ -36,4 +36,4 @@ 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, _). Changing directory to _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 674302952..93d9e8190 100644
--- a/tests/snapshots/integration__integration_tests__directives__remove_directive_file.snap
+++ b/tests/snapshots/integration__integration_tests__directives__remove_directive_file.snap
@@ -22,7 +22,7 @@ info:
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
- WORKTRUNK_DIRECTIVE_FILE: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp6oa0RG
+ WORKTRUNK_DIRECTIVE_FILE: "[DIRECTIVE_FILE]"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
@@ -30,4 +30,4 @@ 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, _). Changing directory to _REPO_
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 855b23012..81e4850d0 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
@@ -41,4 +41,4 @@ 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, _). Changing directory to _REPO_
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 f31329139..5500939a3 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
@@ -44,4 +44,4 @@ 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, _). Changing directory to _REPO_
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 7a419f9be..7934c3415 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
@@ -40,4 +40,4 @@ 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, _). Changing directory to _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 c11e22e05..9798b7ae0 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
@@ -41,4 +41,4 @@ 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, _). Changing directory to _REPO_
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 c1ce7f4c9..31eb8e3b4 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
@@ -35,4 +35,4 @@ 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, _). Changing directory to _REPO_
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 a50534aba..94a34f2fa 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap
@@ -31,4 +31,4 @@ 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, _). Changing directory to _REPO_
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 089dc06a3..8539c5b3d 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
@@ -41,4 +41,4 @@ 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, _). Changing directory to _REPO_
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_rebase_already_rebased.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_rebase_already_rebased.snap
index f948f2b9e..9882d4625 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_rebase_already_rebased.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_rebase_already_rebased.snap
@@ -36,4 +36,4 @@ 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, _). Changing directory to _REPO_
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 edfb3bae3..7b61bc015 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap
@@ -34,4 +34,4 @@ 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, _). Changing directory to _REPO_
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 28d71ddcb..80a4c4de4 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
@@ -38,4 +38,4 @@ 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, _). Changing directory to _REPO_
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 1c5f11d0e..1752013f9 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
@@ -35,4 +35,4 @@ 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, _). Changing directory to _REPO_
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 cf4dd7820..8bdfcde87 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
@@ -36,7 +36,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, _). Changing directory to _REPO_
◎ Running project post-merge:
  exit 1
▲ Command failed: exit status: 1
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 27307f3aa..2d2fe2876 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
@@ -36,7 +36,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, _). Changing directory to _REPO_
◎ Running project post-merge notify:
  echo 'Merge to main complete' > notify.txt
◎ Running project post-merge deploy:
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_no_verify.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_no_verify.snap
index aa9bd9144..62ec7c19f 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_no_verify.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_no_verify.snap
@@ -37,4 +37,4 @@ 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, _). Changing directory to _REPO_
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 9d70023ca..ab5b3b89d 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
@@ -36,6 +36,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, _). Changing directory to _REPO_
◎ Running project post-merge:
  echo 'merged feature to main' > post-merge-ran.txt
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 f98ffddb7..1bab4e3b6 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
@@ -32,6 +32,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, _)
+◎ Removing feature worktree & branch in background (same commit as main, _). Changing directory to _REPO_
◎ Running project post-merge:
  echo 'post-merge ran' > post-merge-ran.txt
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 5c138c1a1..ec2e6c1e0 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
@@ -45,4 +45,4 @@ 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, _). Changing directory to _REPO_
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 1ebaf9b27..9092fca17 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
@@ -42,4 +42,4 @@ 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, _). Changing directory to _REPO_
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 869e43b9b..bab8bb071 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
@@ -36,4 +36,4 @@ 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, _). Changing directory to _REPO_
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 38e9992f4..c275dae04 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
@@ -38,4 +38,4 @@ 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, _). Changing directory to _REPO_
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 3b330252f..e152c8069 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
@@ -39,4 +39,4 @@ 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, _). Changing directory to _REPO_
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 c38408c56..95b80889d 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
@@ -35,4 +35,4 @@ 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, _). Changing directory to _REPO_
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 fdb9956ff..664485177 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
@@ -37,4 +37,4 @@ 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, _). Changing directory to _REPO_
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 c7277cb22..dd709f2d7 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
@@ -32,4 +32,4 @@ 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, _). Changing directory to _REPO_
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 5fd7e3557..dd38e1154 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
@@ -37,4 +37,4 @@ 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, _). Changing directory to _REPO_
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 3b1cf5094..9450bbc5a 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
@@ -47,4 +47,4 @@ 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, _). Changing directory to _REPO_
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 473e83344..4239933dc 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
@@ -41,4 +41,4 @@ 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, _). Changing directory to _REPO_
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 c51116cfe..e4103caca 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
@@ -35,4 +35,4 @@ 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, _). Changing directory to _REPO_
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 25262b824..c8fb2130a 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
@@ -39,4 +39,4 @@ 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, _). Changing directory to _REPO_
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 97d077df7..ea6ad75ec 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
@@ -43,4 +43,4 @@ 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, _). Changing directory to _REPO_
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
index edfb3bae3..7b61bc015 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
@@ -34,4 +34,4 @@ 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, _). Changing directory to _REPO_
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 24f4d7616..1808b90c0 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
@@ -37,4 +37,4 @@ 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, _). Changing directory to _REPO_
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_when_primary_not_on_default_but_default_has_worktree.snap b/tests/snapshots/integration__integration_tests__merge__merge_when_primary_not_on_default_but_default_has_worktree.snap
index c1ce7f4c9..1738db88c 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_when_primary_not_on_default_but_default_has_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_when_primary_not_on_default_but_default_has_worktree.snap
@@ -35,4 +35,4 @@ 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, _). Changing directory to _REPO_.main-wt
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap
index e894e48ca..4c1ca66f1 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_caret.snap
@@ -35,4 +35,4 @@ 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, _). Changing directory to _REPO_
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 13796f98d..4235c511a 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
@@ -47,4 +47,4 @@ 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, _). Changing directory to _REPO_
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 734066c10..cd9a5d548 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
@@ -66,7 +66,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, _). Changing directory to _REPO_
◎ Running project post-merge install:
  cargo install --path .
 Installing worktrunk v0.1.0
diff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_pre_merge.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_pre_merge.snap
index d6ae90586..df2722571 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_pre_merge.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_hooks_pre_merge.snap
@@ -61,4 +61,4 @@ 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, _). Changing directory to _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 b530c0971..2855ac573 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap
@@ -35,4 +35,4 @@ 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, _). Changing directory to _REPO_
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 f0fffe225..5317733fc 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_current_by_name.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_current_by_name.snap
@@ -30,4 +30,4 @@ exit_code: 0
----- stdout -----
----- stderr -----
-◎ Removing feature-current worktree & branch in background (same commit as main, _)
+◎ Removing feature-current worktree & branch in background (same commit as main, _). Changing directory to _REPO_
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 ae981527d..838eda50a 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap
@@ -29,4 +29,4 @@ exit_code: 0
----- stdout -----
----- stderr -----
-◎ Removing feature-wt worktree & branch in background (same commit as main, _)
+◎ Removing feature-wt worktree & branch in background (same commit as main, _). Changing directory to _REPO_
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 af053c6fd..94699a997 100644
--- a/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap
+++ b/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap
@@ -22,7 +22,7 @@ info:
SOURCE_DATE_EPOCH: "1735776000"
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
- WORKTRUNK_DIRECTIVE_FILE: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpjdyPXG
+ WORKTRUNK_DIRECTIVE_FILE: "[DIRECTIVE_FILE]"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
@@ -30,4 +30,4 @@ 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, _). Changing directory to _REPO_
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 bfe80899c..a1b664daa 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
@@ -34,4 +34,4 @@ exit_code: 0
----- stderr -----
◎ Removing feature-b worktree & branch in background (same commit as main, _)
◎ Removing feature-c worktree & branch in background (same commit as main, _)
-◎ Removing feature-a worktree & branch in background (same commit as main, _)
+◎ Removing feature-a worktree & branch in background (same commit as main, _). Changing directory to _REPO_