Skip to content

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

fix: Correct color reset sequence in push command

Maximilian Roosecc7ab7088e9
diff --git a/src/commands/worktree.rs b/src/commands/worktree.rs
index 111921e23..85836dd74 100644
--- a/src/commands/worktree.rs
+++ b/src/commands/worktree.rs
@@ -749,7 +749,7 @@ pub fn handle_push(
};
crate::output::progress(format!(
- "{CYAN}{verb_ing} {commit_count} {commit_text} to {CYAN_BOLD}{target_branch}{CYAN_BOLD:#} @ {cyan_dim}{head_sha}{cyan_dim:#}{CYAN:#}{operations_note}\n"
+ "{CYAN}{verb_ing} {commit_count} {commit_text} to {CYAN_BOLD}{target_branch}{CYAN_BOLD:#}{CYAN} @ {cyan_dim}{head_sha}{cyan_dim:#}{CYAN:#}{operations_note}\n"
))?;
// Show the commit graph with color
diff --git a/tests/integration_tests/merge.rs b/tests/integration_tests/merge.rs
index fc9a198f6..7d4076a2c 100644
--- a/tests/integration_tests/merge.rs
+++ b/tests/integration_tests/merge.rs
@@ -1843,7 +1843,7 @@ fn test_merge_no_commit_with_clean_tree() {
success: true
exit_code: 0
----- stdout -----
- πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+ πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
  * [SHA] (HEAD -> feature) Add feature file
  feature.txt | 1 +
@@ -1948,7 +1948,7 @@ fn test_merge_no_commit_no_squash_no_remove_redundant() {
success: true
exit_code: 0
----- stdout -----
- πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+ πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
  * [SHA] (HEAD -> feature) Add feature file
  feature.txt | 1 +
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 aff496126..dfe863155 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
@@ -26,7 +26,7 @@ expression: output.normalized()
[check2] stdout complete
[check2] stderr complete
-πŸ”„ Merging 1 commit to main @ [HASH] (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ [HASH] (no commit/squash/rebase needed)
  * [HASH] (HEAD -> feature) Add feature
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 4ba0fde4b..0e70fd973 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
@@ -26,7 +26,7 @@ expression: output.normalized()
  [WORKSPACE]/tests/fixtures/mixed-output.sh check2 3
-πŸ”„ Merging 1 commit to main @ [HASH] (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ [HASH] (no commit/squash/rebase needed)
  * [HASH] (HEAD -> feature) Add feature
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 4d56ecb07..985d2e41a 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
@@ -17,7 +17,7 @@ expression: output.normalized()
βœ“ All 47 tests passed in 2.3s
-πŸ”„ Merging 1 commit to main @ [HASH] (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ [HASH] (no commit/squash/rebase needed)
  * [HASH] (HEAD -> feature) Add feature
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 c9252b462..12916cc45 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
@@ -17,7 +17,7 @@ expression: output.normalized()
  echo 'βœ“ All 47 tests passed in 2.3s'
-πŸ”„ Merging 1 commit to main @ [HASH] (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ [HASH] (no commit/squash/rebase needed)
  * [HASH] (HEAD -> feature) Add feature
diff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap
index 7b915fb07..cf4e0fd9b 100644
Binary files a/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap and b/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap differ
diff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap
index 277194134..b26446596 100644
Binary files a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap and b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap differ
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 7e0b53b8f..8ed60b6d4 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
@@ -18,7 +18,7 @@ info:
SOURCE_DATE_EPOCH: "1761609600"
WORKTRUNK_COMMIT_GENERATION__ARGS: "fix: update file 1 content"
WORKTRUNK_COMMIT_GENERATION__COMMAND: echo
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpKXagdp/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpeyVtU9/test-config.toml
---
success: true
exit_code: 0
@@ -32,7 +32,7 @@ exit_code: 0
  - feat: add file 1
  - feat: add file 2
βœ… Squashed @ [SHA]
-πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
+πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
  * [SHA] (HEAD -> feature) Squash commits from main
  file1.txt | 1 +
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 563b7e043..daee579e7 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
@@ -16,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpe5Q9Vb/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpbcFrZs/test-config.toml
---
success: true
exit_code: 0
@@ -29,7 +29,7 @@ exit_code: 0
  Combined commits:
  - feat: initial feature
βœ… Squashed @ [SHA]
-πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
+πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
  * [SHA] (HEAD -> feature) Squash commits from main
  feature.txt | 1 +
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 7b2715811..eb6c120ed 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
@@ -18,7 +18,7 @@ info:
SOURCE_DATE_EPOCH: "1761609600"
WORKTRUNK_COMMIT_GENERATION__ARGS: "fix: improve auth validation logic"
WORKTRUNK_COMMIT_GENERATION__COMMAND: echo
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpAX1BSK/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpq8snjA/test-config.toml
---
success: true
exit_code: 0
@@ -31,7 +31,7 @@ exit_code: 0
  Combined commits:
  - feat: add authentication
βœ… Squashed @ [SHA]
-πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
+πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
  * [SHA] (HEAD -> feature) Squash commits from main
  auth.txt | 1 +
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 f419fdab3..b298b366e 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
@@ -16,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmppSaeUy/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpmwj5X1/test-config.toml
---
success: true
exit_code: 0
@@ -26,7 +26,7 @@ exit_code: 0
πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
  Changes to dirty.txt
βœ… Committed changes @ [SHA]
-πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
+πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
  * [SHA] (HEAD -> feature) Changes to dirty.txt
  dirty.txt | 1 +
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 41de2ff26..c449748fd 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
@@ -16,12 +16,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpH8n3GN/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpWun3DV/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
  * [SHA] (HEAD -> feature) Add feature file
  feature.txt | 1 +
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 daa400e08..23e0e847d 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
@@ -16,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpcRQsvJ/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpsGGSfO/test-config.toml
---
success: true
exit_code: 0
@@ -26,7 +26,7 @@ exit_code: 0
πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
  Changes to newfile.txt
βœ… Committed changes @ [SHA]
-πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
+πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
  * [SHA] (HEAD -> no-commits-dirty) Changes to newfile.txt
  newfile.txt | 1 +
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 3317579f2..79d5c2694 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
@@ -17,12 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp2iCIO8/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp4fTOOw/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 2 commits to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ Merging 2 commits to main @ [SHA] (no commit/squash/rebase needed)
  * [SHA] (HEAD -> feature) feat: add file 2
  * [SHA] feat: add file 1
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 69c48dd18..657fc5ce7 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
@@ -16,12 +16,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmppkHN10/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpJ2t7jw/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
  * [SHA] (HEAD -> feature) Add feature file
  feature.txt | 1 +
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 b5ee2c72c..9569a5ece 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
@@ -17,12 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpSBYurE/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpoWj01b/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
  * [SHA] (HEAD -> feature) Add feature file
  feature.txt | 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 79972d3c9..9c1d2f9ad 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
@@ -17,12 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpKUN4Z2/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp6AIN2v/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
  * [SHA] (HEAD -> feature) Add feature file
  feature.txt | 1 +
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 0d01e13b6..1a7f48f68 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
@@ -17,12 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmppB2RlM/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp39YA7g/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
  * [SHA] (HEAD -> feature) Add feature file
  feature.txt | 1 +
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 c8a0a4d58..e4c0b7879 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
@@ -17,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpDmDnmG/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpzjZyjx/test-config.toml
---
success: true
exit_code: 0
@@ -29,7 +29,7 @@ exit_code: 0
πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
  Changes to feature.txt
βœ… Committed changes @ [SHA]
-πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
+πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
  * [SHA] (HEAD -> feature) Changes to feature.txt
  feature.txt | 1 +
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 19aea7adc..bf7e6a8d2 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
@@ -17,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpkoplU7/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpe7mRQ2/test-config.toml
---
success: true
exit_code: 0
@@ -28,7 +28,7 @@ exit_code: 0
  exit 0
πŸ”„ Running pre-merge: test:
  exit 0
-πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
  * [SHA] (HEAD -> feature) Add feature file
  feature.txt | 1 +
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 d4590b65b..4de93c351 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
@@ -17,14 +17,14 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpnC7dXk/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpPgWk4p/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
πŸ”„ Running pre-merge:
  exit 0
-πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
  * [SHA] (HEAD -> feature) Add feature file
  feature.txt | 1 +
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 9159795c4..2788dbba4 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
@@ -17,14 +17,14 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpfS4Fke/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpXd17GP/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
πŸ”„ Running pre-commit:
  echo 'Pre-commit check passed'
-πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
  * [SHA] (HEAD -> feature) Add feature file
  feature.txt | 1 +
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 b33584c06..6e9564126 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
@@ -16,12 +16,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp1T6B7h/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpswfZkx/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
  * [SHA] (HEAD -> feature-from-develop) Add feature file
  feature.txt | 1 +
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 faf9462a2..acc62fcfa 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
@@ -16,14 +16,14 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpGcR1nI/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpqjkaaK/test-config.toml
---
success: false
exit_code: 1
----- stdout -----
πŸ”„ Rebasing onto main...
βœ… Rebased onto main
-πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash needed)
+πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash needed)
  * [SHA] (HEAD -> feature-dirty-primary) Add feature file
  feature.txt | 1 +
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_race_condition_before_new_commit.snap b/tests/snapshots/integration__integration_tests__merge__merge_race_condition_before_new_commit.snap
index 97b4ff0fd..41d015839 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_race_condition_before_new_commit.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_race_condition_before_new_commit.snap
@@ -17,12 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpzJjuCV/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpxCmHlV/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
  * [SHA] (HEAD -> feature) Add feature file
  feature.txt | 1 +
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 f3ed82bcf..d7ed72e7f 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
@@ -16,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpmvuFwn/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpClPTRx/test-config.toml
---
success: true
exit_code: 0
@@ -31,7 +31,7 @@ exit_code: 0
  - fix: update logic
  - docs: update readme
βœ… Squashed @ [SHA]
-πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
+πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
  * [SHA] (HEAD -> feature) Squash commits from main
  file1.txt | 1 +
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap
index 9e4686f5f..40c642f4f 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_llm_fallback.snap
@@ -17,7 +17,7 @@ info:
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
WORKTRUNK_COMMIT_GENERATION__COMMAND: nonexistent-llm-command
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmptIo2zs/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpV3b84t/test-config.toml
---
success: true
exit_code: 0
@@ -31,7 +31,7 @@ exit_code: 0
  - feat: new feature
  - fix: bug fix
βœ… Squashed @ [SHA]
-πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
+πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
  * [SHA] (HEAD -> feature) Squash commits from main
  file1.txt | 1 +
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 35584e0a5..0ffce9003 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
@@ -16,12 +16,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpJciHzM/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp2JSJE1/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
  * [SHA] (HEAD -> feature) feat: single commit
  file1.txt | 1 +
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 1cd817c35..744aa4f89 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
@@ -19,7 +19,7 @@ info:
WORKTRUNK_COMMIT_GENERATION__ARGS__0: "-c"
WORKTRUNK_COMMIT_GENERATION__ARGS__1: "cat >/dev/null && echo 'feat: implement user authentication system'"
WORKTRUNK_COMMIT_GENERATION__COMMAND: sh
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpYFsnJv/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpROUCaa/test-config.toml
---
success: true
exit_code: 0
@@ -33,7 +33,7 @@ exit_code: 0
  - feat: add authentication
  - fix: handle edge case
βœ… Squashed @ [SHA]
-πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
+πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
  * [SHA] (HEAD -> feature) Squash commits from main
  auth.txt | 1 +
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 7f3b91c68..7b1bc3468 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
@@ -15,12 +15,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpuSlPqK/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp4tLL2R/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
  * [SHA] (HEAD -> feature) Add feature file
  feature.txt | 1 +
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap
index 7fe71d73d..ce493ad4a 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap
@@ -17,12 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpRT3YQw/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpvKi7r5/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
  * [SHA] (HEAD -> feature) Add feature file
  feature.txt | 1 +
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 d99d9fe0e..51d4331c8 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
@@ -18,7 +18,7 @@ info:
SOURCE_DATE_EPOCH: "1761609600"
WORKTRUNK_COMMIT_GENERATION__ARGS: "fix: commit changes"
WORKTRUNK_COMMIT_GENERATION__COMMAND: echo
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpjkNUW9/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpkcZBUO/test-config.toml
---
success: true
exit_code: 0
@@ -32,7 +32,7 @@ exit_code: 0
  Combined commits:
  - feat: add file 1
βœ… Squashed @ [SHA]
-πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
+πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
  * [SHA] (HEAD -> feature) Squash commits from main
  file1.txt | 1 +
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 4ed90d05c..b135b780d 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
@@ -16,9 +16,9 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
- PATH: "/private/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpZUQvTt/test-repo/.bin:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
+ PATH: "/private/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpUXKXPN/test-repo/.bin:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpZUQvTt/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpUXKXPN/test-config.toml
---
success: true
exit_code: 0
@@ -39,7 +39,7 @@ exit_code: 0
  cargo test
πŸ”„ Running pre-merge: lint:
  cargo clippy
-πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
+πŸ”„ Merging 1 commit to main @ [SHA] (no rebase needed)
  * [SHA] (HEAD -> feature-auth) feat(auth): Implement JWT authentication system
  auth.rs | 1 +
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 307576cf0..f148321b6 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap
@@ -16,12 +16,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp8nAyaQ/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpx95nOl/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ Merging 1 commit to main @ [SHA] (no commit/squash/rebase needed)
  * [SHA] (HEAD -> fix-auth) Implement JWT validation
  auth.rs | 1 +
diff --git a/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap
index 3b80e0b7d..5e5b348df 100644
--- a/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap
@@ -17,12 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpQ8Lwnr/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpMEHg8I/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Pushing 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ Pushing 1 commit to main @ [SHA] (no commit/squash/rebase needed)
  * [SHA] (HEAD -> feature) Add test file
  test.txt | 1 +
diff --git a/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap
index 8cf6c44ea..c0565ca11 100644
--- a/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap
@@ -17,12 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpyJ3Qxd/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpaGsNOh/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Pushing 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ Pushing 1 commit to main @ [SHA] (no commit/squash/rebase needed)
  * [SHA] (HEAD -> feature) Add feature file
  feature.txt | 1 +
diff --git a/tests/snapshots/integration__integration_tests__push__push_to_default.snap b/tests/snapshots/integration__integration_tests__push__push_to_default.snap
index 733776952..a26db1649 100644
--- a/tests/snapshots/integration__integration_tests__push__push_to_default.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_to_default.snap
@@ -16,12 +16,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp5LjdN1/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpyt5cTo/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Pushing 1 commit to main @ [SHA] (no commit/squash/rebase needed)
+πŸ”„ Pushing 1 commit to main @ [SHA] (no commit/squash/rebase needed)
  * [SHA] (HEAD -> feature) Add feature file
  feature.txt | 1 +
diff --git a/tests/snapshots/integration__integration_tests__push__push_with_merge_commits_allowed.snap b/tests/snapshots/integration__integration_tests__push__push_with_merge_commits_allowed.snap
index acf313422..8bc59c4b7 100644
--- a/tests/snapshots/integration__integration_tests__push__push_with_merge_commits_allowed.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_with_merge_commits_allowed.snap
@@ -18,12 +18,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpHXJmAx/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpqnDjqt/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Pushing 3 commits to main @ [SHA] (no commit/squash/rebase needed, merge commits allowed)
+πŸ”„ Pushing 3 commits to main @ [SHA] (no commit/squash/rebase needed, merge commits allowed)
  * [SHA] (HEAD -> feature) Merge temp
  |/