Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Improve `wt merge` output for immediate feedback
Maximilian Roos95f5992daf6a
diff --git a/CLAUDE.md b/CLAUDE.mdindex a867922c2..6c9f28c49 100644--- a/CLAUDE.md+++ b/CLAUDE.md@@ -46,6 +46,58 @@ Five canonical message patterns with their emojis:4. **Warnings**: π‘ + yellow text (non-blocking issues)5. **Hints**: π‘ + dimmed text (helpful suggestions)+### Temporal Locality: Show Success When Actions Complete++**Principle: Emit success messages immediately when operations complete, not just in summaries.**++Users need instant feedback that an operation succeeded. Summaries at the end are useful for context, but immediate feedback at the point of completion is critical for good UX.++**Good pattern:**+```+π Squashing 3 commits into one...+π Generating squash commit message...+ [commit message display]+β Squashed 3 commits into one β Immediate feedback+π Rebasing onto main...+...+β Merged feature β main β Final summary+Squashed 3 commits β Context in summary+```++**Bad pattern:**+```+π Squashing 3 commits into one...+π Generating squash commit message...+ [commit message display]+ β No immediate feedback!+π Rebasing onto main...+...+β Merged feature β main+Squashed 3 commits β Only mentioned in summary+```++**Why this matters:**+- **Temporal locality**: Feedback should appear when the action completes, not minutes later+- **User confidence**: Immediate success messages confirm the operation worked+- **Debugging**: If something fails later, users know which steps succeeded+- **Progress visibility**: Users can see what's done vs. what's still in progress++**Implementation:**+```rust+// After completing a significant operation, emit success immediately+crate::output::success("Squashed 3 commits into one")?;++// The summary can still include this info for context+let summary = format!("Merged {from} β {to}\nSquashed {count} commits\n...");+crate::output::success(summary)?;+```++**Apply this to:**+- Squashing commits: Show "β Squashed N commits" immediately after squashing+- Pushing changes: Show "β Pushed to branch" immediately after pushing+- Committing changes: Show "β Committed changes" immediately after committing+- Any multi-step operation: Show success after each major step completes+### Semantic Style Constants**Style constants defined in `src/styling.rs`:**diff --git a/src/commands/merge.rs b/src/commands/merge.rsindex ad724ea23..21903f100 100644--- a/src/commands/merge.rs+++ b/src/commands/merge.rs@@ -1,14 +1,13 @@use worktrunk::config::{ProjectConfig, WorktrunkConfig};use worktrunk::git::{GitError, Repository};use worktrunk::styling::{- AnstyleStyle, CYAN, CYAN_BOLD, GREEN, SUCCESS_EMOJI, eprint, eprintln, format_with_gutter,- println,+ AnstyleStyle, CYAN, CYAN_BOLD, eprint, eprintln, format_with_gutter, println,};use super::command_executor::{CommandContext, prepare_project_commands};use super::worktree::handle_push;use super::worktree::handle_remove;-use crate::output::{execute_command_in_worktree, handle_remove_output};+use crate::output::execute_command_in_worktree;pub fn handle_merge(target: Option<&str>,@@ -67,12 +66,9 @@ pub fn handle_merge(handle_commit_changes(message, &config.commit_generation)?;}- // Track operations for summary- let mut squashed_count: Option<usize> = None;-// Squash commits if requestedif squash {- squashed_count = handle_squash(&target_branch)?;+ handle_squash(&target_branch)?;}// Rebase onto target@@ -121,8 +117,11 @@ pub fn handle_merge(let result = handle_remove(None)?;- // Display output based on mode- handle_remove_output(&result)?;+ // Set directory for shell integration (but don't print separate success message)+ if let super::worktree::RemoveResult::RemovedWorktree { primary_path } = &result {+ crate::output::change_directory(primary_path)+ .map_err(|e| GitError::CommandFailed(e.to_string()))?;+ }// Check if we need to switch to target branchlet primary_repo = Repository::at(&primary_worktree_dir);@@ -144,58 +143,29 @@ pub fn handle_merge(// Print comprehensive summaryprintln!();- handle_merge_summary_output(¤t_branch, &target_branch, squashed_count, true)?;+ handle_merge_summary_output(Some(&primary_worktree_dir))?;} else {// Print comprehensive summary (worktree preserved)println!();- handle_merge_summary_output(¤t_branch, &target_branch, squashed_count, false)?;+ handle_merge_summary_output(None)?;}Ok(())}/// Format the merge summary message-fn format_merge_summary(- from_branch: &str,- to_branch: &str,- squashed_count: Option<usize>,- cleaned_up: bool,-) -> String {- let bold = AnstyleStyle::new().bold();- let dim = AnstyleStyle::new().dimmed();-- let mut output = "Merge complete\n\n".to_string();-- // Show what was merged- output.push_str(&format!(- "{dim}Merged: {bold}{from_branch}{bold:#} β {bold}{to_branch}{bold:#}{dim:#}\n"- ));-- // Show squash info if applicable- if let Some(count) = squashed_count {- output.push_str(&format!("{dim}Squashed: {count} commits into 1{dim:#}\n"));- }-- // Show worktree status- if cleaned_up {- output.push_str(&format!("{dim}Worktree: Removed{dim:#}"));+fn format_merge_summary(primary_path: Option<&std::path::Path>) -> String {+ // Show where we ended up+ if let Some(path) = primary_path {+ format!("Returned to primary at {}", path.display())} else {- output.push_str(&format!(- "{dim}Worktree: Kept (use 'wt remove' to clean up){dim:#}"- ));+ "Kept worktree (use 'wt remove' to clean up)".to_string()}-- output}/// Handle output for merge summary using global output context-fn handle_merge_summary_output(- from_branch: &str,- to_branch: &str,- squashed_count: Option<usize>,- cleaned_up: bool,-) -> Result<(), GitError> {- let message = format_merge_summary(from_branch, to_branch, squashed_count, cleaned_up);+fn handle_merge_summary_output(primary_path: Option<&std::path::Path>) -> Result<(), GitError> {+ let message = format_merge_summary(primary_path);// Show success message (formatting added by OutputContext)crate::output::success(message).map_err(|e| GitError::CommandFailed(e.to_string()))?;@@ -340,10 +310,10 @@ fn handle_squash(target_branch: &str) -> Result<Option<usize>, GitError> {repo.run_command(&["commit", "-m", &commit_message]).map_err(|e| GitError::CommandFailed(format!("Failed to create squash commit: {}", e)))?;- crate::output::progress(format!(- "{SUCCESS_EMOJI} {GREEN}Squashed {commit_count} commits into one{GREEN:#}"- ))- .map_err(|e| GitError::CommandFailed(e.to_string()))?;+ // Show success immediately after completing the squash+ crate::output::success(format!("Squashed {commit_count} commits into one"))+ .map_err(|e| GitError::CommandFailed(e.to_string()))?;+Ok(Some(commit_count))}diff --git a/tests/integration_tests/directives.rs b/tests/integration_tests/directives.rsindex 9f7e70e15..550f4657b 100644--- a/tests/integration_tests/directives.rs+++ b/tests/integration_tests/directives.rs@@ -173,7 +173,7 @@ fn test_merge_internal_keep() {.arg("--keep").current_dir(&feature_wt);- assert_cmd_snapshot!(cmd, @"success: true\nexit_code: 0\n----- stdout -----\n\nMerge complete\n\nMerged: feature β main\nWorktree: Kept (use 'wt remove' to clean up)\0\n\n----- stderr -----\n\0");+ assert_cmd_snapshot!(cmd, @"success: true\nexit_code: 0\n----- stdout -----\n\nKept worktree (use 'wt remove' to clean up)\0\n\n----- stderr -----\n\0");});}@@ -229,6 +229,6 @@ fn test_merge_internal_remove() {.arg("main").current_dir(&feature_wt);- assert_cmd_snapshot!(cmd, @"success: true\nexit_code: 0\n----- stdout -----\n__WORKTRUNK_CD__[PATH]\0Removed worktree, returned to primary at [REPO]\0\n\nMerge complete\n\nMerged: feature β main\nWorktree: Removed\0\n\n----- stderr -----\n\0\0\0");+ assert_cmd_snapshot!(cmd, @"success: true\nexit_code: 0\n----- stdout -----\n__WORKTRUNK_CD__[PATH]\0\nReturned to primary at [REPO]\0\n\n----- stderr -----\n\0\0");});}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 a371b437e..93b88b85f 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,9 +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/.tmpBc75K7/test-config.toml- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpFOrR5C/test-config.toml- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpFOrR5C/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpPQmSfh/test-config.toml---success: trueexit_code: 0@@ -50,12 +48,7 @@ exit_code: 0β [32mPushed to [1m[32mmain[0m (1 commit, 2 files, [32m+2[0m) [0mπ [36mCleaning up worktree...[0m-β [32mRemoved worktree, returned to primary at [REPO][0m-β [32mMerge complete--[2mMerged: [1mfeature[0m β [1mmain[0m[0m-[2mSquashed: 3 commits into 1[0m-[2mWorktree: Removed[0m[0m+β [32mReturned to primary at [REPO][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 ad426cb05..28962247c 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@@ -15,9 +15,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpYpUqgr/test-config.toml- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpKHguLh/test-config.toml- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpKHguLh/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpiNpbWc/test-config.toml---success: trueexit_code: 0@@ -38,11 +36,7 @@ exit_code: 0β [32mPushed to [1m[32mmain[0m (2 commits, 1 file, [32m+1[0m) [0mπ [36mCleaning up worktree...[0m-β [32mRemoved worktree, returned to primary at [REPO][0m-β [32mMerge complete--[2mMerged: [1mfeature[0m β [1mmain[0m[0m-[2mWorktree: Removed[0m[0m+β [32mReturned to primary at [REPO][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 40d118631..969869332 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@@ -17,9 +17,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/.tmpLxT3f2/test-config.toml- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpVFLmeV/test-config.toml- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpVFLmeV/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpDhKe4G/test-config.toml---success: trueexit_code: 0@@ -40,11 +38,7 @@ exit_code: 0β [32mPushed to [1m[32mmain[0m (2 commits, 1 file, [32m+1[0m) [0mπ [36mCleaning up worktree...[0m-β [32mRemoved worktree, returned to primary at [REPO][0m-β [32mMerge complete--[2mMerged: [1mfeature[0m β [1mmain[0m[0m-[2mWorktree: Removed[0m[0m+β [32mReturned to primary at [REPO][0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_message.snap b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_message.snapindex a0074e171..c603f033f 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_message.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_auto_commit_with_message.snap@@ -19,9 +19,7 @@ info:SOURCE_DATE_EPOCH: "1761609600"WORKTRUNK_COMMIT_GENERATION__ARGS: "feat: complete user dashboard"WORKTRUNK_COMMIT_GENERATION__COMMAND: echo- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpWRwjG2/test-config.toml- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpLigmla/test-config.toml- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpLigmla/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpXgyUGu/test-config.toml---success: trueexit_code: 0@@ -42,11 +40,7 @@ exit_code: 0β [32mPushed to [1m[32mmain[0m (2 commits, 1 file, [32m+1[0m) [0mπ [36mCleaning up worktree...[0m-β [32mRemoved worktree, returned to primary at [REPO][0m-β [32mMerge complete--[2mMerged: [1mfeature[0m β [1mmain[0m[0m-[2mWorktree: Removed[0m[0m+β [32mReturned to primary at [REPO][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 5dfbf9dca..54a34e66c 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@@ -15,7 +15,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpe4mcGW/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpQg4NlV/test-config.toml---success: trueexit_code: 0@@ -35,11 +35,7 @@ exit_code: 0β [32mPushed to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0mπ [36mCleaning up worktree...[0m-β [32mRemoved worktree, returned to primary at [REPO][0m-β [32mMerge complete--[2mMerged: [1mfeature[0m β [1mmain[0m[0m-[2mWorktree: Removed[0m[0m+β [32mReturned to primary at [REPO][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 d359d4ea9..bfd7374e7 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap@@ -15,9 +15,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpVGuNVa/test-config.toml- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpJrMGkO/test-config.toml- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpJrMGkO/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpArATBZ/test-config.toml---success: trueexit_code: 0@@ -33,11 +31,7 @@ exit_code: 0β [32mPushed to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0mπ [36mCleaning up worktree...[0m-β [32mRemoved worktree, returned to primary at [REPO][0m-β [32mMerge complete--[2mMerged: [1mfeature[0m β [1mmain[0m[0m-[2mWorktree: Removed[0m[0m+β [32mReturned to primary at [REPO][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 fdb430870..e8c0077a6 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@@ -15,9 +15,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp85jmlK/test-config.toml- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpl2X1PT/test-config.toml- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpl2X1PT/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpluw7R4/test-config.toml---success: trueexit_code: 0@@ -33,11 +31,7 @@ exit_code: 0β [32mPushed to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0mπ [36mCleaning up worktree...[0m-β [32mRemoved worktree, returned to primary at [REPO][0m-β [32mMerge complete--[2mMerged: [1mfeature[0m β [1mmain[0m[0m-[2mWorktree: Removed[0m[0m+β [32mReturned to primary at [REPO][0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_combined_output.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_combined_output.snapindex 2268cf3a9..ef50723fa 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_combined_output.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_combined_output.snap@@ -22,9 +22,5 @@ STDERR-FROM-SECONDβ [32mPushed to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0mπ [36mCleaning up worktree...[0m-β [32mRemoved worktree, returned to primary at [REPO][0m-β [32mMerge complete--[2mMerged: [1mfeature[0m β [1mmain[0m[0m-[2mWorktree: Removed[0m[0m+β [32mReturned to primary at [REPO][0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_named.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_named.snapindex d1a4db97b..b31bd491f 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_named.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_named.snap@@ -16,9 +16,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpAj55S0/test-config.toml- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmppJZuW8/test-config.toml- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmppJZuW8/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpFgR1cn/test-config.toml---success: trueexit_code: 0@@ -34,12 +32,8 @@ exit_code: 0β [32mPushed to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0mπ [36mCleaning up worktree...[0m-β [32mRemoved worktree, returned to primary at [REPO][0m-β [32mMerge complete--[2mMerged: [1mfeature[0m β [1mmain[0m[0m-[2mWorktree: Removed[0m[0m+β [32mReturned to primary at [REPO][0m----- stderr -----π [36mRunning pre-merge check 'format':[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_no_verify.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_no_verify.snapindex b976cdc15..332fcdf6e 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_no_verify.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_no_verify.snap@@ -16,9 +16,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpsZaFNS/test-config.toml- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp1yonp8/test-config.toml- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp1yonp8/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmplIGifY/test-config.toml---success: trueexit_code: 0@@ -34,11 +32,7 @@ exit_code: 0β [32mPushed to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0mπ [36mCleaning up worktree...[0m-β [32mRemoved worktree, returned to primary at [REPO][0m-β [32mMerge complete--[2mMerged: [1mfeature[0m β [1mmain[0m[0m-[2mWorktree: Removed[0m[0m+β [32mReturned to primary at [REPO][0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_stdout_stderr_ordering.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_stdout_stderr_ordering.snapindex b90f22e1b..08ab7019d 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_stdout_stderr_ordering.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_stdout_stderr_ordering.snap@@ -16,7 +16,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp3LGKMY/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpCZZNL7/test-config.toml---success: trueexit_code: 0@@ -25,19 +25,15 @@ exit_code: 0π [36mRebasing onto [1m[36mmain[0m...[0mπ [36mPushing 1 commit to [1m[36mmain[0m @ [SHA][0m-* [33ma14795a[m[33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file+* [33m0b07a58[m[33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature filefeature.txt | 1 [32m+[m1 file changed, 1 insertion(+)β [32mPushed to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0mπ [36mCleaning up worktree...[0m-β [32mRemoved worktree, returned to primary at [REPO][0m-β [32mMerge complete--[2mMerged: [1mfeature[0m β [1mmain[0m[0m-[2mWorktree: Removed[0m[0m+β [32mReturned to primary at [REPO][0m----- stderr -----π [36mRunning pre-merge check 'check1':[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_success.snapindex d08016d20..053f9a32d 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_success.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_success.snap@@ -16,9 +16,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpjvkiFY/test-config.toml- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpYT5XN3/test-config.toml- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpYT5XN3/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpaQP21s/test-config.toml---success: trueexit_code: 0@@ -34,12 +32,8 @@ exit_code: 0β [32mPushed to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0mπ [36mCleaning up worktree...[0m-β [32mRemoved worktree, returned to primary at [REPO][0m-β [32mMerge complete--[2mMerged: [1mfeature[0m β [1mmain[0m[0m-[2mWorktree: Removed[0m[0m+β [32mReturned to primary at [REPO][0m----- stderr -----π [36mRunning pre-merge check 'cmd':[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snapindex 4b2b48d58..d08faef38 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap@@ -16,9 +16,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpNJv6pO/test-config.toml- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpN8Usiy/test-config.toml- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpN8Usiy/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpTOrTGg/test-config.toml---success: trueexit_code: 0@@ -45,12 +43,7 @@ exit_code: 0β [32mPushed to [1m[32mmain[0m (1 commit, 3 files, [32m+3[0m) [0mπ [36mCleaning up worktree...[0m-β [32mRemoved worktree, returned to primary at [REPO][0m-β [32mMerge complete--[2mMerged: [1mfeature[0m β [1mmain[0m[0m-[2mSquashed: 3 commits into 1[0m-[2mWorktree: Removed[0m[0m+β [32mReturned to primary at [REPO][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 61a223b16..31c83b1bc 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,9 +17,7 @@ info:LC_ALL: CSOURCE_DATE_EPOCH: "1761609600"WORKTRUNK_COMMIT_GENERATION__COMMAND: nonexistent-llm-command- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpXy4aiF/test-config.toml- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpp4BEZk/test-config.toml- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpp4BEZk/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpu2FePE/test-config.toml---success: trueexit_code: 0@@ -44,12 +42,7 @@ exit_code: 0β [32mPushed to [1m[32mmain[0m (1 commit, 2 files, [32m+2[0m) [0mπ [36mCleaning up worktree...[0m-β [32mRemoved worktree, returned to primary at [REPO][0m-β [32mMerge complete--[2mMerged: [1mfeature[0m β [1mmain[0m[0m-[2mSquashed: 2 commits into 1[0m-[2mWorktree: Removed[0m[0m+β [32mReturned to primary at [REPO][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 3c28db07b..b032de5a2 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,9 +16,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpPYH0dT/test-config.toml- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpqauCwm/test-config.toml- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpqauCwm/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpyidtCi/test-config.toml---success: trueexit_code: 0@@ -35,11 +33,7 @@ exit_code: 0β [32mPushed to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0mπ [36mCleaning up worktree...[0m-β [32mRemoved worktree, returned to primary at [REPO][0m-β [32mMerge complete--[2mMerged: [1mfeature[0m β [1mmain[0m[0m-[2mWorktree: Removed[0m[0m+β [32mReturned to primary at [REPO][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 6a6d01c36..7f0cd13bf 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,9 +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/.tmpitobhk/test-config.toml- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpFuLqSF/test-config.toml- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpFuLqSF/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpGQv9EP/test-config.toml---success: trueexit_code: 0@@ -45,12 +43,7 @@ exit_code: 0β [32mPushed to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0mπ [36mCleaning up worktree...[0m-β [32mRemoved worktree, returned to primary at [REPO][0m-β [32mMerge complete--[2mMerged: [1mfeature[0m β [1mmain[0m[0m-[2mSquashed: 2 commits into 1[0m-[2mWorktree: Removed[0m[0m+β [32mReturned to primary at [REPO][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 9534e2995..1e3736f38 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap@@ -14,9 +14,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpSUKNzF/test-config.toml- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpiK1gHz/test-config.toml- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpiK1gHz/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpMFrRDC/test-config.toml---success: trueexit_code: 0@@ -32,11 +30,7 @@ exit_code: 0β [32mPushed to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0mπ [36mCleaning up worktree...[0m-β [32mRemoved worktree, returned to primary at [REPO][0m-β [32mMerge complete--[2mMerged: [1mfeature[0m β [1mmain[0m[0m-[2mWorktree: Removed[0m[0m+β [32mReturned to primary at [REPO][0m----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_keep.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_keep.snapindex 0af1f44c5..63620057e 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_with_keep.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_keep.snap@@ -16,9 +16,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpYZnBXJ/test-config.toml- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpQhrD0r/test-config.toml- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpQhrD0r/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpaMchnL/test-config.toml---success: trueexit_code: 0@@ -34,9 +32,6 @@ exit_code: 0β [32mPushed to [1m[32mmain[0m (1 commit, 1 file, [32m+1[0m) [0m-β [32mMerge complete--[2mMerged: [1mfeature[0m β [1mmain[0m[0m-[2mWorktree: Kept (use 'wt remove' to clean up)[0m[0m+β [32mKept worktree (use 'wt remove' to clean up)[0m----- stderr -----