Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
feat: Remove emojis from progress and success messages
Maximilian Roos7c965d8a29da
diff --git a/src/commands/dev.rs b/src/commands/dev.rsindex a398e490b..fbaacbe7b 100644--- a/src/commands/dev.rs+++ b/src/commands/dev.rs@@ -200,8 +200,8 @@ pub fn handle_dev_squash(// Handle different scenariosif commit_count == 0 && !has_staged {// No commits and no staged changes - nothing to squash- crate::output::progress(format!(- "{HINT_EMOJI} {HINT}No commits to squash - already at merge base{HINT:#}"+ crate::output::hint(format!(+ "{HINT}No commits to squash - already at merge base{HINT:#}"))?;return Ok(false);}@@ -237,11 +237,11 @@ pub fn handle_dev_squash(""};let squash_progress = match stats_parts.is_empty() {- true => format!(- "π {CYAN}Squashing {commit_count} {commit_text}{with_changes} into 1...{CYAN:#}"- ),+ true => {+ format!("{CYAN}Squashing {commit_count} {commit_text}{with_changes} into 1...{CYAN:#}")+ }false => format!(- "π {CYAN}Squashing {commit_count} {commit_text}{with_changes} into 1{CYAN:#} ({})...",+ "{CYAN}Squashing {commit_count} {commit_text}{with_changes} into 1{CYAN:#} ({})...",stats_parts.join(", ")),};@@ -251,9 +251,7 @@ pub fn handle_dev_squash(let subjects = repo.commit_subjects(&range)?;// Generate squash commit message- crate::output::progress(format!(- "π {CYAN}Generating squash commit message...{CYAN:#}"- ))?;+ crate::output::progress(format!("{CYAN}Generating squash commit message...{CYAN:#}"))?;show_llm_config_hint_if_needed(&config.commit_generation)?;@@ -344,7 +342,7 @@ pub fn handle_dev_rebase(target: Option<&str>) -> Result<bool, GitError> {// Rebase onto targetcrate::output::progress(format!(- "π {CYAN}Rebasing onto {CYAN_BOLD}{target_branch}{CYAN_BOLD:#}{CYAN}...{CYAN:#}"+ "{CYAN}Rebasing onto {CYAN_BOLD}{target_branch}{CYAN_BOLD:#}{CYAN}...{CYAN:#}"))?;let rebase_result = repo.run_command(&["rebase", &target_branch]);@@ -395,7 +393,6 @@ pub fn handle_dev_rebase(target: Option<&str>) -> Result<bool, GitError> {pub fn handle_dev_ask_approvals(force: bool, show_all: bool) -> Result<(), GitError> {use super::command_approval::approve_command_batch;use worktrunk::config::{CommandPhase, WorktrunkConfig};- use worktrunk::styling::INFO_EMOJI;let repo = Repository::current();let project_id = repo.project_identifier()?;@@ -434,9 +431,7 @@ pub fn handle_dev_ask_approvals(force: bool, show_all: bool) -> Result<(), GitErif commands.is_empty() {let dim = worktrunk::styling::AnstyleStyle::new().dimmed();- crate::output::success(format!(- "{INFO_EMOJI} {dim}No commands configured in project{dim:#}"- ))?;+ crate::output::info(format!("{dim}No commands configured in project{dim:#}"))?;return Ok(());}@@ -449,9 +444,7 @@ pub fn handle_dev_ask_approvals(force: bool, show_all: bool) -> Result<(), GitErif unapproved.is_empty() {let dim = worktrunk::styling::AnstyleStyle::new().dimmed();- crate::output::success(format!(- "{INFO_EMOJI} {dim}All commands already approved{dim:#}"- ))?;+ crate::output::info(format!("{dim}All commands already approved{dim:#}"))?;return Ok(());}diff --git a/src/commands/merge.rs b/src/commands/merge.rsindex 29cd867f0..ba3a209cb 100644--- a/src/commands/merge.rs+++ b/src/commands/merge.rs@@ -136,10 +136,10 @@ pub fn handle_merge(// Check if already on target branchif current_branch == target_branch {- use worktrunk::styling::{GREEN, SUCCESS_EMOJI};+ use worktrunk::styling::GREEN;let green_bold = GREEN.bold();crate::output::success(format!(- "{SUCCESS_EMOJI} {GREEN}Already on {green_bold}{target_branch}{green_bold:#}, nothing to merge{GREEN:#}"+ "{GREEN}Already on {green_bold}{target_branch}{green_bold:#}, nothing to merge{GREEN:#}"))?;return Ok(());}@@ -246,10 +246,10 @@ pub fn handle_merge(crate::output::flush()?;// Show success message now that user has been cd'd to primary- use worktrunk::styling::{GREEN, SUCCESS_EMOJI};+ use worktrunk::styling::GREEN;let green_bold = GREEN.bold();crate::output::success(format!(- "{SUCCESS_EMOJI} {GREEN}Returned to primary at {green_bold}{}{green_bold:#}{GREEN:#}",+ "{GREEN}Returned to primary at {green_bold}{}{green_bold:#}{GREEN:#}",primary_worktree_dir.display()))?;@@ -258,7 +258,7 @@ pub fn handle_merge(let new_branch = primary_repo.current_branch()?;if new_branch.as_deref() != Some(&target_branch) {crate::output::progress(format!(- "π {CYAN}Switching to {CYAN_BOLD}{target_branch}{CYAN_BOLD:#}{CYAN}...{CYAN:#}"+ "{CYAN}Switching to {CYAN_BOLD}{target_branch}{CYAN_BOLD:#}{CYAN}...{CYAN:#}"))?;primary_repo.run_command(&["switch", &target_branch])@@ -298,19 +298,19 @@ pub fn handle_merge(Ok(())}-/// Format the merge summary message (includes emoji and color for consistency)+/// Format the merge summary message (no emoji - output system adds it)fn format_merge_summary(primary_path: Option<&std::path::Path>) -> String {- use worktrunk::styling::{GREEN, SUCCESS_EMOJI};+ use worktrunk::styling::GREEN;let green_bold = GREEN.bold();// Show where we ended upif let Some(path) = primary_path {format!(- "{SUCCESS_EMOJI} {GREEN}Returned to primary at {green_bold}{}{green_bold:#}{GREEN:#}",+ "{GREEN}Returned to primary at {green_bold}{}{green_bold:#}{GREEN:#}",path.display())} else {- format!("{SUCCESS_EMOJI} {GREEN}Worktree preserved (--no-remove){GREEN:#}")+ format!("{GREEN}Worktree preserved (--no-remove){GREEN:#}")}}@@ -356,7 +356,7 @@ pub fn show_llm_config_hint_if_needed() -> Result<(), GitError> {if !commit_generation_config.is_configured() {crate::output::hint(format!(- "{HINT_EMOJI} {HINT}Using fallback commit message. Run 'wt config help' to configure LLM-generated messages{HINT:#}"+ "{HINT}Using fallback commit message. Run 'wt config help' to configure LLM-generated messages{HINT:#}"))?;}Ok(())@@ -393,9 +393,9 @@ pub fn commit_staged_changes(}let full_progress_msg = if parts.is_empty() {- format!("π {CYAN}{action}{CYAN:#}")+ format!("{CYAN}{action}{CYAN:#}")} else {- format!("π {CYAN}{action}{CYAN:#} ({})", parts.join(", "))+ format!("{CYAN}{action}{CYAN:#} ({})", parts.join(", "))};crate::output::progress(full_progress_msg)?;@@ -415,10 +415,10 @@ pub fn commit_staged_changes(.trim().to_string();- use worktrunk::styling::{GREEN, SUCCESS_EMOJI};+ use worktrunk::styling::GREEN;let green_dim = GREEN.dimmed();crate::output::success(format!(- "{SUCCESS_EMOJI} {GREEN}Committed changes @ {green_dim}{commit_hash}{green_dim:#}{GREEN:#}"+ "{GREEN}Committed changes @ {green_dim}{commit_hash}{green_dim:#}{GREEN:#}"))?;Ok(())diff --git a/src/commands/worktree.rs b/src/commands/worktree.rsindex 411dd0f4c..d00c4263f 100644--- a/src/commands/worktree.rs+++ b/src/commands/worktree.rs@@ -104,8 +104,7 @@ use std::path::PathBuf;use worktrunk::config::{CommandPhase, ProjectConfig, WorktrunkConfig};use worktrunk::git::{GitError, GitResultExt, Repository};use worktrunk::styling::{- ADDITION, CYAN, CYAN_BOLD, DELETION, GREEN, GREEN_BOLD, SUCCESS_EMOJI, WARNING,- format_bash_with_gutter,+ ADDITION, CYAN, CYAN_BOLD, DELETION, GREEN, GREEN_BOLD, WARNING, format_bash_with_gutter,};use super::command_executor::{CommandContext, prepare_project_commands};@@ -289,9 +288,9 @@ pub fn handle_remove(// Show progress with resolved namelet cyan_bold = CYAN.bold();let progress_msg = if let Some(ref b) = resolved_name {- format!("π {CYAN}Removing worktree for {cyan_bold}{b}{cyan_bold:#}...{CYAN:#}")+ format!("{CYAN}Removing worktree for {cyan_bold}{b}{cyan_bold:#}...{CYAN:#}")} else {- format!("π {CYAN}Removing worktree...{CYAN:#}")+ format!("{CYAN}Removing worktree...{CYAN:#}")};crate::output::progress(progress_msg)?;@@ -734,7 +733,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_dim}{head_sha}{cyan_dim:#}{CYAN:#}{operations_note}\n"))?;// Show the commit graph with color@@ -786,13 +785,13 @@ pub fn handle_push()];summary_parts.extend(stats.format_summary());- crate::output::progress(format!(- "{SUCCESS_EMOJI} {GREEN}{verb} {GREEN_BOLD}{target_branch}{GREEN_BOLD:#}{GREEN:#} ({})",+ crate::output::success(format!(+ "{GREEN}{verb} {GREEN_BOLD}{target_branch}{GREEN_BOLD:#}{GREEN:#} ({})",summary_parts.join(", ")))?;} else {- crate::output::progress(format!(- "{SUCCESS_EMOJI} {GREEN}{verb} {GREEN_BOLD}{target_branch}{GREEN_BOLD:#}{GREEN:#}"+ crate::output::success(format!(+ "{GREEN}{verb} {GREEN_BOLD}{target_branch}{GREEN_BOLD:#}{GREEN:#}"))?;}diff --git a/tests/integration_tests/directives.rs b/tests/integration_tests/directives.rsindex f75bf11fd..f2165269d 100644--- a/tests/integration_tests/directives.rs+++ b/tests/integration_tests/directives.rs@@ -80,7 +80,7 @@ fn test_remove_internal_directive() {.arg("remove").current_dir(repo.root_path());- assert_cmd_snapshot!(cmd, @"success: true\nexit_code: 0\n----- stdout -----\nπ π \u{1b}[36mRemoving worktree...\u{1b}[0m\0β β \u{1b}[32mAlready on default branch \u{1b}[1m\u{1b}[32mmain\u{1b}[0m\u{1b}[0m\0\n----- stderr -----");+ assert_cmd_snapshot!(cmd, @"success: true\nexit_code: 0\n----- stdout -----\nπ \u{1b}[36mRemoving worktree...\u{1b}[0m\0β β \u{1b}[32mAlready on default branch \u{1b}[1m\u{1b}[32mmain\u{1b}[0m\u{1b}[0m\0\n----- stderr -----");});}@@ -102,7 +102,7 @@ fn test_remove_without_internal() {success: trueexit_code: 0----- stdout ------ π π [36mRemoving worktree...[0m+ π [36mRemoving worktree...[0mβ β [32mAlready on default branch [1m[32mmain[0m[0m----- stderr -----diff --git a/tests/integration_tests/merge.rs b/tests/integration_tests/merge.rsindex 7628882dd..7dd2e1bc1 100644--- a/tests/integration_tests/merge.rs+++ b/tests/integration_tests/merge.rs@@ -1972,15 +1972,15 @@ fn test_merge_no_commit_with_clean_tree() {success: trueexit_code: 0----- stdout ------ π π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)+ π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)π * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature fileπ feature.txt | 1 [32m+[m1 file changed, 1 insertion(+)- π β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)- β β [32mWorktree preserved (--no-remove)[0m+ β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+ β [32mWorktree preserved (--no-remove)[0m----- stderr -----");@@ -2079,15 +2079,15 @@ fn test_merge_no_commit_no_squash_no_remove_redundant() {success: trueexit_code: 0----- stdout ------ π π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)+ π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)π * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature fileπ feature.txt | 1 [32m+[m1 file changed, 1 insertion(+)- π β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)- β β [32mWorktree preserved (--no-remove)[0m+ β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+ β [32mWorktree preserved (--no-remove)[0m----- stderr -----");diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge.snapindex 56f071dca..a470fe25a 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge.snap@@ -2,4 +2,4 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()----β β [32mAlready on [1m[32mmain[0m, nothing to merge[0m+β [32mAlready on [1m[32mmain[0m, nothing to merge[0mdiff --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.snapindex 03db442c0..66fbf2b5c 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,13 +17,13 @@ expression: output.normalized()β All 47 tests passed in 2.3s-π π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[36md067f01[0m[0m (no commit/squash/rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[36md067f01[0m[0m (no commit/squash/rebase needed)π * [33md067f01[m[33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add featureπ feature.txt | 1 [32m+[m1 file changed, 1 insertion(+)-π β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)-β β [32mReturned to primary at [1m[32m[TMPDIR]/test-repo[0m[0m+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mReturned to primary at [1m[32m[TMPDIR]/test-repo[0m[0mπ [36mRemoving worktree & branch...[0mdiff --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.snapindex db9e198b0..af31e0d1a 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,13 +17,13 @@ expression: output.normalized()π [40m [0m [1m[34mecho[0m [32m'β All 47 tests passed in 2.3s'[0m[0m-π π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[36md067f01[0m[0m (no commit/squash/rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[36md067f01[0m[0m (no commit/squash/rebase needed)π * [33md067f01[m[33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add featureπ feature.txt | 1 [32m+[m1 file changed, 1 insertion(+)-π β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)-β β [32mReturned to primary at [1m[32m[TMPDIR]/test-repo[0m[0m+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mReturned to primary at [1m[32m[TMPDIR]/test-repo[0m[0mπ [36mRemoving worktree & branch...[0mdiff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__remove.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__remove.snapindex 773ff82ea..2e9bdd29c 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__remove.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__remove.snap@@ -2,5 +2,5 @@source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()----π π [36mRemoving worktree for [1m[36mto-remove[0m...[0m+π [36mRemoving worktree for [1m[36mto-remove[0m...[0mβ β [32mRemoved worktree & branch for [1m[32mto-remove[0m[0mdiff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snapindex 82d266794..ab109a4de 100644Binary 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 differdiff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snapindex 67c624c06..d47eac154 100644Binary files a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap and b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap differdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_already_on_target.snap b/tests/snapshots/integration__integration_tests__merge__merge_already_on_target.snapindex 48f7f7fab..62266671e 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_already_on_target.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_already_on_target.snap@@ -15,11 +15,11 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpCmpGOp/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp9cXob6/test-config.toml---success: trueexit_code: 0----- stdout ------β β [32mAlready on [1m[32mmain[0m, nothing to merge[0m+β [32mAlready on [1m[32mmain[0m, nothing to merge[0m----- stderr -----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.snapindex c71b60be6..34661d0c1 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,21 +18,21 @@ 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/.tmppEdO19/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpInKJSF/test-config.toml---success: trueexit_code: 0----- stdout ------π π [36mSquashing 2 commits with working tree changes into 1[0m (2 files, [32m+2[0m)...-π π [36mGenerating squash commit message...[0m-π‘ π‘ [2mUsing fallback commit message. Run 'wt config help' to configure LLM-generated messages[0m+π [36mSquashing 2 commits with working tree changes into 1[0m (2 files, [32m+2[0m)...+π [36mGenerating squash commit message...[0m+π‘ [2mUsing fallback commit message. Run 'wt config help' to configure LLM-generated messages[0m[40m [0m [1mSquash commits from main[0m[40m [0m[40m [0m Combined commits:[40m [0m - feat: add file 1[40m [0m - feat: add file 2β [32mSquashed @ [2m[SHA][0m-π π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no rebase needed)π * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from main@@ -40,8 +40,8 @@ exit_code: 0file2.txt | 1 [32m+[m2 files changed, 2 insertions(+)-π β [32mMerged to [1m[32mmain[0m[0m (1 commit, 2 files, [32m+2[0m)-β β [32mReturned to primary at [1m[32m[REPO][0m[0m+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 2 files, [32m+2[0m)+β [32mReturned to primary at [1m[32m[REPO][0m[0mπ [36mRemoving worktree & branch...[0m----- stderr -----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.snapindex b85ea8e4f..e179bc401 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,28 +16,28 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpplv8io/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpDEJArm/test-config.toml---success: trueexit_code: 0----- stdout ------π π [36mSquashing 1 commit with working tree changes into 1[0m (1 file, [32m+1[0m)...-π π [36mGenerating squash commit message...[0m-π‘ π‘ [2mUsing fallback commit message. Run 'wt config help' to configure LLM-generated messages[0m+π [36mSquashing 1 commit with working tree changes into 1[0m (1 file, [32m+1[0m)...+π [36mGenerating squash commit message...[0m+π‘ [2mUsing fallback commit message. Run 'wt config help' to configure LLM-generated messages[0m[40m [0m [1mSquash commits from main[0m[40m [0m[40m [0m Combined commits:[40m [0m - feat: initial featureβ [32mSquashed @ [2m[SHA][0m-π π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no rebase needed)π * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from mainπ feature.txt | 1 [32m+[m1 file changed, 1 insertion(+)-π β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)-β β [32mReturned to primary at [1m[32m[REPO][0m[0m+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mReturned to primary at [1m[32m[REPO][0m[0mπ [36mRemoving worktree & branch...[0m----- stderr -----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.snapindex a88944b2c..ed77f82d0 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,28 +18,28 @@ 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/.tmp86EBno/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0Tm40z/test-config.toml---success: trueexit_code: 0----- stdout ------π π [36mSquashing 1 commit with working tree changes into 1[0m (1 file, [32m+1[0m)...-π π [36mGenerating squash commit message...[0m-π‘ π‘ [2mUsing fallback commit message. Run 'wt config help' to configure LLM-generated messages[0m+π [36mSquashing 1 commit with working tree changes into 1[0m (1 file, [32m+1[0m)...+π [36mGenerating squash commit message...[0m+π‘ [2mUsing fallback commit message. Run 'wt config help' to configure LLM-generated messages[0m[40m [0m [1mSquash commits from main[0m[40m [0m[40m [0m Combined commits:[40m [0m - feat: add authenticationβ [32mSquashed @ [2m[SHA][0m-π π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no rebase needed)π * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from mainπ auth.txt | 1 [32m+[m1 file changed, 1 insertion(+)-π β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)-β β [32mReturned to primary at [1m[32m[REPO][0m[0m+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mReturned to primary at [1m[32m[REPO][0m[0mπ [36mRemoving worktree & branch...[0m----- stderr -----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.snapindex 9c0021e98..28a54688a 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,25 +16,25 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpQy91S9/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp2h8Sxg/test-config.toml---success: trueexit_code: 0----- stdout -----π‘ [33mAuto-staging untracked files: dirty.txt[0m-π π [36mCommitting with default message...[0m (1 file, [32m+1[0m, no squashing needed)-π‘ π‘ [2mUsing fallback commit message. Run 'wt config help' to configure LLM-generated messages[0m+π [36mCommitting with default message...[0m (1 file, [32m+1[0m, no squashing needed)+π‘ [2mUsing fallback commit message. Run 'wt config help' to configure LLM-generated messages[0m[40m [0m [1mChanges to dirty.txt[0m-β β [32mCommitted changes @ [2m[SHA][0m-π π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no rebase needed)+β [32mCommitted changes @ [2m[SHA][0m+π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no rebase needed)π * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Changes to dirty.txtπ dirty.txt | 1 [32m+[m1 file changed, 1 insertion(+)-π β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)-β β [32mReturned to primary at [1m[32m[REPO][0m[0m+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mReturned to primary at [1m[32m[REPO][0m[0mπ [36mRemoving worktree & branch...[0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snapindex 920f95bee..4a3763021 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap@@ -16,20 +16,20 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpoZFcot/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpjnzd04/test-config.toml---success: trueexit_code: 0----- stdout ------π π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)π * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature fileπ feature.txt | 1 [32m+[m1 file changed, 1 insertion(+)-π β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)-β β [32mReturned to primary at [1m[32m[REPO][0m[0m+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mReturned to primary at [1m[32m[REPO][0m[0mπ [36mRemoving worktree & branch...[0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snapindex 41f75308c..65e95c7e3 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_commits.snap@@ -16,14 +16,14 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpNXe71F/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp9DMRlM/test-config.toml---success: trueexit_code: 0----- stdout ------π π‘ [2mNo commits to squash - already at merge base[0m-π β [32mMerged to [1m[32mmain[0m[0m-β β [32mReturned to primary at [1m[32m[REPO][0m[0m+π‘ [2mNo commits to squash - already at merge base[0m+β [32mMerged to [1m[32mmain[0m[0m+β [32mReturned to primary at [1m[32m[REPO][0m[0mπ [36mRemoving worktree & branch...[0m----- stderr -----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.snapindex 14a4e18ba..e12fdca27 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,25 +16,25 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp1hD6up/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpi0Vvwb/test-config.toml---success: trueexit_code: 0----- stdout -----π‘ [33mAuto-staging untracked files: newfile.txt[0m-π π [36mCommitting with default message...[0m (1 file, [32m+1[0m, no squashing needed)-π‘ π‘ [2mUsing fallback commit message. Run 'wt config help' to configure LLM-generated messages[0m+π [36mCommitting with default message...[0m (1 file, [32m+1[0m, no squashing needed)+π‘ [2mUsing fallback commit message. Run 'wt config help' to configure LLM-generated messages[0m[40m [0m [1mChanges to newfile.txt[0m-β β [32mCommitted changes @ [2m[SHA][0m-π π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no rebase needed)+β [32mCommitted changes @ [2m[SHA][0m+π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no rebase needed)π * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mno-commits-dirty[m[33m)[m Changes to newfile.txtπ newfile.txt | 1 [32m+[m1 file changed, 1 insertion(+)-π β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)-β β [32mReturned to primary at [1m[32m[REPO][0m[0m+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mReturned to primary at [1m[32m[REPO][0m[0mπ [36mRemoving worktree & branch...[0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snapindex 368b24c19..b717104c4 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_remote.snap@@ -15,11 +15,11 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpRtmWn8/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpQgOXQf/test-config.toml---success: trueexit_code: 0----- stdout ------β β [32mAlready on [1m[32mfeature[0m, nothing to merge[0m+β [32mAlready on [1m[32mfeature[0m, nothing to merge[0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snapindex bfa18defc..62254da96 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: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpDcvA7I/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpBieB8i/test-config.toml---success: trueexit_code: 0----- stdout ------π π [36mMerging 2 commits to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)+π [36mMerging 2 commits to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)π * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m feat: add file 2* [SHA] feat: add file 1@@ -31,8 +31,8 @@ exit_code: 0file2.txt | 1 [32m+[m2 files changed, 2 insertions(+)-π β [32mMerged to [1m[32mmain[0m[0m (2 commits, 2 files, [32m+2[0m)-β β [32mReturned to primary at [1m[32m[REPO][0m[0m+β [32mMerged to [1m[32mmain[0m[0m (2 commits, 2 files, [32m+2[0m)+β [32mReturned to primary at [1m[32m[REPO][0m[0mπ [36mRemoving worktree & branch...[0m----- stderr -----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.snapindex b0367d4c3..66799889a 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,20 +16,20 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpr6o2gy/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp41NhF2/test-config.toml---success: trueexit_code: 0----- stdout ------π π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)π * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature fileπ feature.txt | 1 [32m+[m1 file changed, 1 insertion(+)-π β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)-β β [32mReturned to primary at [1m[32m[REPO][0m[0m+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mReturned to primary at [1m[32m[REPO][0m[0mπ [36mRemoving worktree & branch...[0m----- stderr -----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.snapindex d22d6dbc2..25bc16a06 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,20 +17,20 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpVjRbEt/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpAGPRPL/test-config.toml---success: trueexit_code: 0----- stdout ------π π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)π * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature fileπ feature.txt | 1 [32m+[m1 file changed, 1 insertion(+)-π β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)-β β [32mReturned to primary at [1m[32m[REPO][0m[0m+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mReturned to primary at [1m[32m[REPO][0m[0mπ [36mRemoving worktree & branch...[0mπ [36mRunning post-merge:[0mπ [40m [0m [1m[34mexit[0m 1[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_named.snapindex 6c9ef5570..4f002516e 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,20 +17,20 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpVtCz1t/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmppLhkLE/test-config.toml---success: trueexit_code: 0----- stdout ------π π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)π * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature fileπ feature.txt | 1 [32m+[m1 file changed, 1 insertion(+)-π β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)-β β [32mReturned to primary at [1m[32m[REPO][0m[0m+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mReturned to primary at [1m[32m[REPO][0m[0mπ [36mRemoving worktree & branch...[0mπ [36mRunning post-merge: [1mnotify[0m[0mπ [40m [0m [1m[34mecho[0m [32m'Merge to main complete'[0m [36m>[0m notify.txt[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_command_success.snapindex 420a21707..7230f2258 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,20 +17,20 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpRdhFMO/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpFyQGsp/test-config.toml---success: trueexit_code: 0----- stdout ------π π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)π * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature fileπ feature.txt | 1 [32m+[m1 file changed, 1 insertion(+)-π β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)-β β [32mReturned to primary at [1m[32m[REPO][0m[0m+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mReturned to primary at [1m[32m[REPO][0m[0mπ [36mRemoving worktree & branch...[0mπ [36mRunning post-merge:[0mπ [40m [0m [1m[34mecho[0m [32m'merged feature to main'[0m [36m>[0m post-merge-ran.txt[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_commit_command_success.snapindex 8103f0b46..b78f0b12f 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: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpCqa2rJ/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpp0vxlZ/test-config.toml---success: trueexit_code: 0@@ -26,19 +26,19 @@ exit_code: 0π [36mRunning pre-commit:[0mπ [40m [0m [1m[34mecho[0m [32m'Pre-commit check passed'[0m[0m-π π [36mCommitting with default message...[0m (1 file, [32m+1[0m, no squashing needed)-π‘ π‘ [2mUsing fallback commit message. Run 'wt config help' to configure LLM-generated messages[0m+π [36mCommitting with default message...[0m (1 file, [32m+1[0m, no squashing needed)+π‘ [2mUsing fallback commit message. Run 'wt config help' to configure LLM-generated messages[0m[40m [0m [1mChanges to feature.txt[0m-β β [32mCommitted changes @ [2m[SHA][0m-π π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no rebase needed)+β [32mCommitted changes @ [2m[SHA][0m+π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no rebase needed)π * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Changes to feature.txtπ feature.txt | 1 [32m+[m1 file changed, 1 insertion(+)-π β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)-β β [32mReturned to primary at [1m[32m[REPO][0m[0m+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mReturned to primary at [1m[32m[REPO][0m[0mπ [36mRemoving worktree & branch...[0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_combined_output.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_combined_output.snapindex 5ae8d86e8..56b8342bf 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_combined_output.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_combined_output.snap@@ -13,13 +13,13 @@ STDERR-FROM-FIRST[0mSTDOUT-FROM-SECONDSTDERR-FROM-SECOND-π π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)π * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature fileπ feature.txt | 1 [32m+[m1 file changed, 1 insertion(+)-π β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)-β β [32mReturned to primary at [1m[32m[REPO][0m[0m+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mReturned to primary at [1m[32m[REPO][0m[0mπ [36mRemoving worktree & branch...[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snapindex 008617ded..90b4ae82f 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: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp1B7870/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpylBXX6/test-config.toml---success: trueexit_code: 0@@ -31,15 +31,15 @@ exit_code: 0π [36mRunning pre-merge: [1mtest[0m[0mπ [40m [0m [1m[34mexit[0m 0[0m-π π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)π * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature fileπ feature.txt | 1 [32m+[m1 file changed, 1 insertion(+)-π β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)-β β [32mReturned to primary at [1m[32m[REPO][0m[0m+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mReturned to primary at [1m[32m[REPO][0m[0mπ [36mRemoving worktree & branch...[0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snapindex 621734e03..82cdaccda 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snap@@ -17,7 +17,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpWyCe3V/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpMX1QtW/test-config.toml---success: trueexit_code: 0@@ -28,15 +28,15 @@ exit_code: 0π [36mRunning pre-merge: [1mcheck2[0m[0mπ [40m [0m [1m[34m[PROJECT_ROOT]/tests/fixtures/mixed-output.sh[0m check2 3[0m-π π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)π * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature fileπ feature.txt | 1 [32m+[m1 file changed, 1 insertion(+)-π β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)-β β [32mReturned to primary at [1m[32m[REPO][0m[0m+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mReturned to primary at [1m[32m[REPO][0m[0mπ [36mRemoving worktree & branch...[0m----- stderr -----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.snapindex 128385ff2..a35f3b560 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,7 +17,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmphKE9jN/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpZDeVL4/test-config.toml---success: trueexit_code: 0@@ -25,15 +25,15 @@ exit_code: 0π [36mRunning pre-merge:[0mπ [40m [0m [1m[34mexit[0m 0[0m-π π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)π * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature fileπ feature.txt | 1 [32m+[m1 file changed, 1 insertion(+)-π β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)-β β [32mReturned to primary at [1m[32m[REPO][0m[0m+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mReturned to primary at [1m[32m[REPO][0m[0mπ [36mRemoving worktree & branch...[0m----- stderr -----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.snapindex caeb84a40..6cc54177b 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,7 +17,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpHastTN/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpLUNrRm/test-config.toml---success: trueexit_code: 0@@ -25,15 +25,15 @@ exit_code: 0π [36mRunning pre-commit:[0mπ [40m [0m [1m[34mecho[0m [32m'Pre-commit check passed'[0m[0m-π π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)π * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature fileπ feature.txt | 1 [32m+[m1 file changed, 1 insertion(+)-π β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)-β β [32mReturned to primary at [1m[32m[REPO][0m[0m+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mReturned to primary at [1m[32m[REPO][0m[0mπ [36mRemoving worktree & branch...[0m----- stderr -----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.snapindex 466e0be05..eb2dcb147 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,21 +16,21 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpE0afXD/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp2fCYFK/test-config.toml---success: trueexit_code: 0----- stdout ------π π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)π * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature-from-develop[m[33m)[m Add feature fileπ feature.txt | 1 [32m+[m1 file changed, 1 insertion(+)-π β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)-β β [32mReturned to primary at [1m[32m[REPO][0m[0m-π π [36mSwitching to [1m[36mmain[0m[36m...[0m+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mReturned to primary at [1m[32m[REPO][0m[0m+π [36mSwitching to [1m[36mmain[0m[36m...[0mπ [36mRemoving worktree & branch...[0m----- stderr -----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.snapindex 431fb4119..d62a11587 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,23 +16,23 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpdi5Uuq/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp69yWpu/test-config.toml---success: falseexit_code: 1----- stdout ------π π [36mRebasing onto [1m[36mmain[0m[36m...[0m+π [36mRebasing onto [1m[36mmain[0m[36m...[0mβ [32mRebased onto [1m[32mmain[0m[0m-π π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash needed)+π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash needed)π * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature-dirty-primary[m[33m)[m Add feature fileπ feature.txt | 1 [32m+[m1 file changed, 1 insertion(+)-π β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)-β β [32mReturned to primary at [1m[32m[REPO][0m[0m-π π [36mSwitching to [1m[36mmain[0m[36m...[0m+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mReturned to primary at [1m[32m[REPO][0m[0m+π [36mSwitching to [1m[36mmain[0m[36m...[0m----- stderr -----Failed to switch to 'main': error: Your local changes to the following files would be overwritten by checkout: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.snapindex 5ccf7d118..8d2f644ff 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,19 +17,19 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpiPw2hi/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpEtoOIi/test-config.toml---success: trueexit_code: 0----- stdout ------π π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)π * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature fileπ feature.txt | 1 [32m+[m1 file changed, 1 insertion(+)-π β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)-β β [32mWorktree preserved (--no-remove)[0m+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mWorktree preserved (--no-remove)[0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap b/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snapindex 02fd21c2a..16b35122f 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_rebase_conflict.snap@@ -16,12 +16,12 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpBEhib3/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpWYDNLt/test-config.toml---success: falseexit_code: 1----- stdout ------π π [36mRebasing onto [1m[36mmain[0m[36m...[0m+π [36mRebasing onto [1m[36mmain[0m[36m...[0m----- stderr -----β [31mRebase onto [1m[31mmain[0m[31m incomplete[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snapindex b4d833dcf..ea09e38b6 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap@@ -16,14 +16,14 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpKclpE4/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpkwTopA/test-config.toml---success: trueexit_code: 0----- stdout ------π π [36mSquashing 3 commits into 1[0m (3 files, [32m+3[0m)...-π π [36mGenerating squash commit message...[0m-π‘ π‘ [2mUsing fallback commit message. Run 'wt config help' to configure LLM-generated messages[0m+π [36mSquashing 3 commits into 1[0m (3 files, [32m+3[0m)...+π [36mGenerating squash commit message...[0m+π‘ [2mUsing fallback commit message. Run 'wt config help' to configure LLM-generated messages[0m[40m [0m [1mSquash commits from main[0m[40m [0m[40m [0m Combined commits:@@ -31,7 +31,7 @@ exit_code: 0[40m [0m - fix: update logic[40m [0m - docs: update readmeβ [32mSquashed @ [2m[SHA][0m-π π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no rebase needed)π * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from main@@ -40,8 +40,8 @@ exit_code: 0file3.txt | 1 [32m+[m3 files changed, 3 insertions(+)-π β [32mMerged to [1m[32mmain[0m[0m (1 commit, 3 files, [32m+3[0m)-β β [32mReturned to primary at [1m[32m[REPO][0m[0m+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 3 files, [32m+3[0m)+β [32mReturned to primary at [1m[32m[REPO][0m[0mπ [36mRemoving worktree & branch...[0m----- stderr -----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.snapindex 6d24b66e4..6839a1894 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@@ -16,14 +16,14 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpWdfMsb/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpCjfzoX/test-config.toml---success: trueexit_code: 0----- stdout ------π π [36mSquashing 3 commits into 1...[0m-π π [36mGenerating squash commit message...[0m-π‘ π‘ [2mUsing fallback commit message. Run 'wt config help' to configure LLM-generated messages[0m+π [36mSquashing 3 commits into 1...[0m+π [36mGenerating squash commit message...[0m+π‘ [2mUsing fallback commit message. Run 'wt config help' to configure LLM-generated messages[0m[40m [0m [1mSquash commits from main[0m[40m [0m[40m [0m Combined commits:@@ -31,8 +31,8 @@ exit_code: 0[40m [0m - Change 2[40m [0m - Revert to initialβͺ [2mNo changes after squashing 3 commits (commits resulted in no net changes)[0m-π β [32mMerged to [1m[32mmain[0m[0m-β β [32mReturned to primary at [1m[32m[REPO][0m[0m+β [32mMerged to [1m[32mmain[0m[0m+β [32mReturned to primary at [1m[32m[REPO][0m[0mπ [36mRemoving worktree & branch...[0m----- stderr -----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.snapindex 5fc5ba45a..28a4e62b0 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,21 +17,21 @@ info:LC_ALL: CSOURCE_DATE_EPOCH: "1761609600"WORKTRUNK_COMMIT_GENERATION__COMMAND: nonexistent-llm-command- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpda5EoJ/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpF7NUsh/test-config.toml---success: trueexit_code: 0----- stdout ------π π [36mSquashing 2 commits into 1[0m (2 files, [32m+2[0m)...-π π [36mGenerating squash commit message...[0m-π‘ π‘ [2mUsing fallback commit message. Run 'wt config help' to configure LLM-generated messages[0m+π [36mSquashing 2 commits into 1[0m (2 files, [32m+2[0m)...+π [36mGenerating squash commit message...[0m+π‘ [2mUsing fallback commit message. Run 'wt config help' to configure LLM-generated messages[0m[40m [0m [1mSquash commits from main[0m[40m [0m[40m [0m Combined commits:[40m [0m - feat: new feature[40m [0m - fix: bug fixβ [32mSquashed @ [2m[SHA][0m-π π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no rebase needed)π * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from main@@ -39,8 +39,8 @@ exit_code: 0file2.txt | 1 [32m+[m2 files changed, 2 insertions(+)-π β [32mMerged to [1m[32mmain[0m[0m (1 commit, 2 files, [32m+2[0m)-β β [32mReturned to primary at [1m[32m[REPO][0m[0m+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 2 files, [32m+2[0m)+β [32mReturned to primary at [1m[32m[REPO][0m[0mπ [36mRemoving worktree & branch...[0m----- stderr -----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.snapindex edbc2a06c..a95b5bab3 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,20 +16,20 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpM4qLtp/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpdQXpWE/test-config.toml---success: trueexit_code: 0----- stdout ------π π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)π * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m feat: single commitπ file1.txt | 1 [32m+[m1 file changed, 1 insertion(+)-π β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)-β β [32mReturned to primary at [1m[32m[REPO][0m[0m+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mReturned to primary at [1m[32m[REPO][0m[0mπ [36mRemoving worktree & branch...[0m----- stderr -----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.snapindex b24198715..d6c85a331 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,29 +19,29 @@ 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/.tmp6gu5HM/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp6aovjw/test-config.toml---success: trueexit_code: 0----- stdout ------π π [36mSquashing 2 commits into 1[0m (1 file, [32m+1[0m)...-π π [36mGenerating squash commit message...[0m-π‘ π‘ [2mUsing fallback commit message. Run 'wt config help' to configure LLM-generated messages[0m+π [36mSquashing 2 commits into 1[0m (1 file, [32m+1[0m)...+π [36mGenerating squash commit message...[0m+π‘ [2mUsing fallback commit message. Run 'wt config help' to configure LLM-generated messages[0m[40m [0m [1mSquash commits from main[0m[40m [0m[40m [0m Combined commits:[40m [0m - feat: add authentication[40m [0m - fix: handle edge caseβ [32mSquashed @ [2m[SHA][0m-π π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no rebase needed)π * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from mainπ auth.txt | 1 [32m+[m1 file changed, 1 insertion(+)-π β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)-β β [32mReturned to primary at [1m[32m[REPO][0m[0m+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mReturned to primary at [1m[32m[REPO][0m[0mπ [36mRemoving worktree & branch...[0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snapindex 9578f2e23..4016deab3 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap@@ -15,20 +15,20 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmphxdBF3/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0euT5E/test-config.toml---success: trueexit_code: 0----- stdout ------π π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)π * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature fileπ feature.txt | 1 [32m+[m1 file changed, 1 insertion(+)-π β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)-β β [32mReturned to primary at [1m[32m[REPO][0m[0m+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mReturned to primary at [1m[32m[REPO][0m[0mπ [36mRemoving worktree & branch...[0m----- stderr -----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.snapindex 87d8103aa..c5170435f 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,19 +17,19 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmprKuuVp/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp9B4Efz/test-config.toml---success: trueexit_code: 0----- stdout ------π π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)π * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature fileπ feature.txt | 1 [32m+[m1 file changed, 1 insertion(+)-π β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)-β β [32mWorktree preserved (--no-remove)[0m+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mWorktree preserved (--no-remove)[0m----- stderr -----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.snapindex 013b885ff..a11bedd29 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,21 +18,21 @@ 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/.tmpJM6Rcw/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpgQoUu4/test-config.toml---success: trueexit_code: 0----- stdout -----π‘ [33mAuto-staging untracked files: untracked1.txt, untracked2.txt[0m-π π [36mSquashing 1 commit with working tree changes into 1[0m (1 file, [32m+1[0m)...-π π [36mGenerating squash commit message...[0m-π‘ π‘ [2mUsing fallback commit message. Run 'wt config help' to configure LLM-generated messages[0m+π [36mSquashing 1 commit with working tree changes into 1[0m (1 file, [32m+1[0m)...+π [36mGenerating squash commit message...[0m+π‘ [2mUsing fallback commit message. Run 'wt config help' to configure LLM-generated messages[0m[40m [0m [1mSquash commits from main[0m[40m [0m[40m [0m Combined commits:[40m [0m - feat: add file 1β [32mSquashed @ [2m[SHA][0m-π π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no rebase needed)π * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from main@@ -41,8 +41,8 @@ exit_code: 0untracked2.txt | 1 [32m+[m3 files changed, 3 insertions(+)-π β [32mMerged to [1m[32mmain[0m[0m (1 commit, 3 files, [32m+3[0m)-β β [32mReturned to primary at [1m[32m[REPO][0m[0m+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 3 files, [32m+3[0m)+β [32mReturned to primary at [1m[32m[REPO][0m[0mπ [36mRemoving worktree & branch...[0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snapindex d67e0dda2..5c91578f3 100644--- a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap@@ -16,15 +16,15 @@ info:GIT_EDITOR: ""LANG: CLC_ALL: C- PATH: "/private/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmplXVBIC/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/.tmpDTrfO7/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/.tmplXVBIC/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpDTrfO7/test-config.toml---success: trueexit_code: 0----- stdout ------π π [36mSquashing 3 commits into 1[0m (3 files, [32m+3[0m)...-π π [36mGenerating squash commit message...[0m+π [36mSquashing 3 commits into 1[0m (3 files, [32m+3[0m)...+π [36mGenerating squash commit message...[0m[40m [0m [1mfeat(auth): Implement JWT authentication system[0m[40m [0m[40m [0m Add comprehensive JWT token handling including validation, refresh logic,@@ -41,7 +41,7 @@ exit_code: 0π [36mRunning pre-merge: [1mlint[0m[0mπ [40m [0m [1m[34mcargo[0m clippy[0m-π π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no rebase needed)π * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature-auth[m[33m)[m feat(auth): Implement JWT authentication system@@ -50,8 +50,8 @@ exit_code: 0jwt.rs | 1 [32m+[m3 files changed, 3 insertions(+)-π β [32mMerged to [1m[32mmain[0m[0m (1 commit, 3 files, [32m+3[0m)-β β [32mReturned to primary at [1m[32m[REPO][0m[0m+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 3 files, [32m+3[0m)+β [32mReturned to primary at [1m[32m[REPO][0m[0mπ [36mRemoving worktree & branch...[0mπ [36mRunning post-merge: [1minstall[0m[0mπ [40m [0m [1m[34mcargo[0m install [36m--path[0m .[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snapindex b5d99c653..5b7753944 100644--- a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap@@ -16,20 +16,20 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpS9UuWD/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpN3FmHS/test-config.toml---success: trueexit_code: 0----- stdout ------π π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)+π [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)π * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfix-auth[m[33m)[m Implement JWT validationπ auth.rs | 1 [32m+[m1 file changed, 1 insertion(+)-π β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)-β β [32mReturned to primary at [1m[32m[REPO][0m[0m+β [32mMerged to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mReturned to primary at [1m[32m[REPO][0m[0mπ [36mRemoving worktree & branch...[0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_fast_forward.snapindex 8be55a50c..7a7220ced 100644--- a/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap@@ -17,18 +17,18 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpSjBaMW/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpcYbzll/test-config.toml---success: trueexit_code: 0----- stdout ------π π [36mPushing 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)+π [36mPushing 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)π * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add test fileπ test.txt | 1 [32m+[m1 file changed, 1 insertion(+)-π β [32mPushed to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mPushed to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__push__push_no_remote.snap b/tests/snapshots/integration__integration_tests__push__push_no_remote.snapindex fe9ccc0c1..e35aad59a 100644--- a/tests/snapshots/integration__integration_tests__push__push_no_remote.snap+++ b/tests/snapshots/integration__integration_tests__push__push_no_remote.snap@@ -16,11 +16,11 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpHXGRjT/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpSnvgpB/test-config.toml---success: trueexit_code: 0----- stdout ------π β [32mPushed to [1m[32mfeature[0m[0m+β [32mPushed to [1m[32mfeature[0m[0m----- stderr -----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.snapindex b2a8187db..c9c00912b 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,18 +17,18 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpk8RAcp/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp7iNBHC/test-config.toml---success: trueexit_code: 0----- stdout ------π π [36mPushing 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)+π [36mPushing 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)π * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature fileπ feature.txt | 1 [32m+[m1 file changed, 1 insertion(+)-π β [32mPushed to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mPushed to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__push__push_to_default.snap b/tests/snapshots/integration__integration_tests__push__push_to_default.snapindex c951191c9..5c8f2c743 100644--- a/tests/snapshots/integration__integration_tests__push__push_to_default.snap+++ b/tests/snapshots/integration__integration_tests__push__push_to_default.snap@@ -16,18 +16,18 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmps7hTpJ/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp1K8qVe/test-config.toml---success: trueexit_code: 0----- stdout ------π π [36mPushing 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)+π [36mPushing 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed)π * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature fileπ feature.txt | 1 [32m+[m1 file changed, 1 insertion(+)-π β [32mPushed to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)+β [32mPushed to [1m[32mmain[0m[0m (1 commit, 1 file, [32m+1[0m)----- stderr -----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.snapindex d4a56d72a..9c018b112 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: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpFypu81/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpYUwVaA/test-config.toml---success: trueexit_code: 0----- stdout ------π π [36mPushing 3 commits to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed, merge commits allowed)+π [36mPushing 3 commits to [1m[36mmain[0m @ [2m[SHA][0m (no commit/squash/rebase needed, merge commits allowed)π * [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Merge temp[31m|[m[32m/[m@@ -35,6 +35,6 @@ exit_code: 0file2.txt | 1 [32m+[m2 files changed, 2 insertions(+)-π β [32mPushed to [1m[32mmain[0m[0m (3 commits, 2 files, [32m+2[0m)+β [32mPushed to [1m[32mmain[0m[0m (3 commits, 2 files, [32m+2[0m)----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__remove__remove_already_on_default.snap b/tests/snapshots/integration__integration_tests__remove__remove_already_on_default.snapindex a97d55519..0310f2873 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_already_on_default.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_already_on_default.snap@@ -15,12 +15,12 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpYindqm/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpUmNht0/test-config.toml---success: trueexit_code: 0----- stdout ------π π [36mRemoving worktree...[0m+π [36mRemoving worktree...[0mβ β [32mAlready on default branch [1m[32mmain[0m[0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__remove__remove_by_name_dirty_target.snap b/tests/snapshots/integration__integration_tests__remove__remove_by_name_dirty_target.snapindex 2c167dc10..e6a813b02 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_by_name_dirty_target.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_by_name_dirty_target.snap@@ -16,12 +16,12 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpTNWqm5/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpvceEcL/test-config.toml---success: falseexit_code: 1----- stdout ------π π [36mRemoving worktree for [1m[36mfeature-dirty[0m...[0m+π [36mRemoving worktree for [1m[36mfeature-dirty[0m...[0m----- stderr -----β [31mWorking tree has uncommitted changes[0mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_main.snap b/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_main.snapindex 8ec579b7f..96b979c5c 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_main.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_main.snap@@ -16,12 +16,12 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpjuErOv/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpKsfTBj/test-config.toml---success: trueexit_code: 0----- stdout ------π π [36mRemoving worktree for [1m[36mfeature-a[0m...[0m+π [36mRemoving worktree for [1m[36mfeature-a[0m...[0mβ β [32mRemoved worktree & branch for [1m[32mfeature-a[0m[0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_other_worktree.snap b/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_other_worktree.snapindex 3f3736346..888001737 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_other_worktree.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_by_name_from_other_worktree.snap@@ -16,12 +16,12 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpKqQe91/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmplc34cH/test-config.toml---success: trueexit_code: 0----- stdout ------π π [36mRemoving worktree for [1m[36mfeature-b[0m...[0m+π [36mRemoving worktree for [1m[36mfeature-b[0m...[0mβ β [32mRemoved worktree & branch for [1m[32mfeature-b[0m[0m----- stderr -----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.snapindex ab3843e8a..c2e0a8539 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@@ -16,12 +16,12 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpxgosAA/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpGz0hkH/test-config.toml---success: trueexit_code: 0----- stdout ------π π [36mRemoving worktree for [1m[36mfeature-current[0m...[0m+π [36mRemoving worktree for [1m[36mfeature-current[0m...[0mβ β [32mRemoved worktree & branch for [1m[32mfeature-current[0m, returned to primary at [1m[32m[REPO][0m[0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__remove__remove_dirty_working_tree.snap b/tests/snapshots/integration__integration_tests__remove__remove_dirty_working_tree.snapindex f04e356a5..da9a74a5c 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_dirty_working_tree.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_dirty_working_tree.snap@@ -15,12 +15,12 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpbyiI9Y/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpVXZt9Q/test-config.toml---success: falseexit_code: 1----- stdout ------π π [36mRemoving worktree...[0m+π [36mRemoving worktree...[0m----- stderr -----β [31mWorking tree has uncommitted changes[0mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap b/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snapindex 2bf4f1c00..d6e0c6102 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_from_worktree.snap@@ -15,12 +15,12 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpsz7fJr/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpNuuPWw/test-config.toml---success: trueexit_code: 0----- stdout ------π π [36mRemoving worktree...[0m+π [36mRemoving worktree...[0mβ β [32mRemoved worktree & branch for [1m[32mfeature-wt[0m, returned to primary at [1m[32m[REPO][0m[0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap b/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snapindex 5240a10c6..31a18b277 100644Binary files a/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap and b/tests/snapshots/integration__integration_tests__remove__remove_internal_mode.snap differdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_multiple_including_current.snap b/tests/snapshots/integration__integration_tests__remove__remove_multiple_including_current.snapindex 9217f89ca..98b207b3c 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@@ -18,16 +18,16 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpTkCjKE/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmptlr4dc/test-config.toml---success: trueexit_code: 0----- stdout ------π π [36mRemoving worktree for [1m[36mfeature-b[0m...[0m+π [36mRemoving worktree for [1m[36mfeature-b[0m...[0mβ β [32mRemoved worktree & branch for [1m[32mfeature-b[0m[0m-π π [36mRemoving worktree for [1m[36mfeature-c[0m...[0m+π [36mRemoving worktree for [1m[36mfeature-c[0m...[0mβ β [32mRemoved worktree & branch for [1m[32mfeature-c[0m[0m-π π [36mRemoving worktree for [1m[36mfeature-a[0m...[0m+π [36mRemoving worktree for [1m[36mfeature-a[0m...[0mβ β [32mRemoved worktree & branch for [1m[32mfeature-a[0m, returned to primary at [1m[32m[REPO][0m[0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snapindex df66c2258..81a26d0e5 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_multiple_worktrees.snap@@ -18,16 +18,16 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpJ9KBYG/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpNqZafK/test-config.toml---success: trueexit_code: 0----- stdout ------π π [36mRemoving worktree for [1m[36mfeature-a[0m...[0m+π [36mRemoving worktree for [1m[36mfeature-a[0m...[0mβ β [32mRemoved worktree & branch for [1m[32mfeature-a[0m[0m-π π [36mRemoving worktree for [1m[36mfeature-b[0m...[0m+π [36mRemoving worktree for [1m[36mfeature-b[0m...[0mβ β [32mRemoved worktree & branch for [1m[32mfeature-b[0m[0m-π π [36mRemoving worktree for [1m[36mfeature-c[0m...[0m+π [36mRemoving worktree for [1m[36mfeature-c[0m...[0mβ β [32mRemoved worktree & branch for [1m[32mfeature-c[0m[0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__remove__remove_nonexistent_worktree.snap b/tests/snapshots/integration__integration_tests__remove__remove_nonexistent_worktree.snapindex 454b86e77..77c5a8fd5 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_nonexistent_worktree.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_nonexistent_worktree.snap@@ -16,12 +16,12 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpILb7fx/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpdA1ymC/test-config.toml---success: falseexit_code: 1----- stdout ------π π [36mRemoving worktree for [1m[36mnonexistent[0m...[0m+π [36mRemoving worktree for [1m[36mnonexistent[0m...[0m----- stderr -----β [31mNo worktree found for branch [1m[31mnonexistent[0m[0mdiff --git a/tests/snapshots/integration__integration_tests__remove__remove_switch_to_default.snap b/tests/snapshots/integration__integration_tests__remove__remove_switch_to_default.snapindex 1d8eae592..e8624c0d5 100644--- a/tests/snapshots/integration__integration_tests__remove__remove_switch_to_default.snap+++ b/tests/snapshots/integration__integration_tests__remove__remove_switch_to_default.snap@@ -15,12 +15,12 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpaVjhhZ/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpH3JouT/test-config.toml---success: trueexit_code: 0----- stdout ------π π [36mRemoving worktree...[0m+π [36mRemoving worktree...[0mβ β [32mSwitched to default branch [1m[32mmain[0m[0m----- stderr -----