Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
fix: Improve merge command output visibility
Maximilian Roosaaa9979e68d3
diff --git a/src/commands/merge.rs b/src/commands/merge.rsindex cf39128b0..477bd131f 100644--- a/src/commands/merge.rs+++ b/src/commands/merge.rs@@ -237,6 +237,10 @@ fn handle_commit_changes(let formatted_message = format_commit_message_for_display(&commit_message);print!("{}", format_with_gutter(&formatted_message, "", None));+ // Flush stdout to ensure message appears immediately (before any subsequent stderr output)+ use std::io::Write;+ let _ = std::io::stdout().flush();+// Commitrepo.run_command(&["commit", "-m", &commit_message]).map_err(|e| GitError::CommandFailed(format!("Failed to commit: {}", e)))?;@@ -313,6 +317,10 @@ fn handle_squash(target_branch: &str) -> Result<Option<usize>, GitError> {let formatted_message = format_commit_message_for_display(&commit_message);print!("{}", format_with_gutter(&formatted_message, "", None));+ // Flush stdout to ensure message appears immediately (before any subsequent stderr output)+ use std::io::Write;+ let _ = std::io::stdout().flush();+// Reset to merge base (soft reset stages all changes)repo.run_command(&["reset", "--soft", &merge_base]).map_err(|e| GitError::CommandFailed(format!("Failed to reset to merge base: {}", e)))?;@@ -360,7 +368,7 @@ fn run_pre_merge_checks(use worktrunk::styling;eprintln!(- "π {CYAN}Running pre-merge check '{name}':{CYAN:#}",+ "π {CYAN}Running pre-merge check {CYAN_BOLD}{name}{CYAN_BOLD:#}:{CYAN:#}",name = prepared.name);eprint!("{}", format_with_gutter(&prepared.expanded, "", None)); // Gutter at column 0@@ -427,7 +435,10 @@ fn execute_post_merge_commands(// Execute each command sequentially in the main worktreefor prepared in commands {use std::io::Write;- eprintln!("π {CYAN}Executing (post-merge):{CYAN:#}");+ eprintln!(+ "π {CYAN}Running post-merge command {CYAN_BOLD}{name}{CYAN_BOLD:#}:{CYAN:#}",+ name = prepared.name+ );eprint!("{}", format_with_gutter(&prepared.expanded, "", None));let _ = std::io::stderr().flush();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 12a952d97..bc41103af 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@@ -16,7 +16,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmptfDC49/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpQHujNe/test-config.toml---success: trueexit_code: 0@@ -36,6 +36,6 @@ exit_code: 0β [32mReturned to primary at [REPO][0m----- stderr ------π [36mExecuting (post-merge):[0m+π [36mRunning post-merge command [1m[36mcmd[0m:[0m[40m [0m exit 1π‘ [33mCommand [1m[33mcmd[0m failed: Command failed with exit code: exit status: 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 59abe40e0..8c2870d4e 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@@ -16,7 +16,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpAoqM3d/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpqxip1K/test-config.toml---success: trueexit_code: 0@@ -36,7 +36,7 @@ exit_code: 0β [32mReturned to primary at [REPO][0m----- stderr ------π [36mExecuting (post-merge):[0m+π [36mRunning post-merge command [1m[36mdeploy[0m:[0m[40m [0m echo 'Deploying branch feature' > deploy.txt-π [36mExecuting (post-merge):[0m+π [36mRunning post-merge command [1m[36mnotify[0m:[0m[40m [0m echo 'Merge to main complete' > notify.txtdiff --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 737be50a3..9250b7b35 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@@ -16,7 +16,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp1YR6XY/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpMcVP4R/test-config.toml---success: trueexit_code: 0@@ -36,5 +36,5 @@ exit_code: 0β [32mReturned to primary at [REPO][0m----- stderr ------π [36mExecuting (post-merge):[0m+π [36mRunning post-merge command [1m[36mcmd[0m:[0m[40m [0m echo 'merged feature to main' > post-merge-ran.txtdiff --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 f127bf59d..d6e3aabfe 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@@ -4,11 +4,11 @@ expression: output---Exit code: 0π [36mValidating merge...[0m-π [36mRunning pre-merge check 'first':[0m+π [36mRunning pre-merge check [1m[36mfirst[0m:[0m[40m [0m echo 'STDOUT-FROM-FIRST' && echo 'STDERR-FROM-FIRST' >&2STDOUT-FROM-FIRSTSTDERR-FROM-FIRST-π [36mRunning pre-merge check 'second':[0m+π [36mRunning pre-merge check [1m[36msecond[0m:[0m[40m [0m echo 'STDOUT-FROM-SECOND' && echo 'STDERR-FROM-SECOND' >&2STDOUT-FROM-SECONDSTDERR-FROM-SECONDdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_failure.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_failure.snapindex 10385603c..44baf77a1 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_failure.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_check_failure.snap@@ -16,7 +16,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmplG3FdQ/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp1qPE9E/test-config.toml---success: falseexit_code: 1@@ -24,7 +24,7 @@ exit_code: 1π [36mValidating merge...[0m----- stderr ------π [36mRunning pre-merge check 'cmd':[0m+π [36mRunning pre-merge check [1m[36mcmd[0m:[0m[40m [0m exit 1β [31mPre-merge check failed: [1m[31mcmd[0m[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 be5ad9382..c262e6ad5 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,7 +16,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp26Snm7/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpR9oYCy/test-config.toml---success: trueexit_code: 0@@ -36,9 +36,9 @@ exit_code: 0β [32mReturned to primary at [REPO][0m----- stderr ------π [36mRunning pre-merge check 'format':[0m+π [36mRunning pre-merge check [1m[36mformat[0m:[0m[40m [0m exit 0-π [36mRunning pre-merge check 'lint':[0m+π [36mRunning pre-merge check [1m[36mlint[0m:[0m[40m [0m exit 0-π [36mRunning pre-merge check 'test':[0m+π [36mRunning pre-merge check [1m[36mtest[0m:[0m[40m [0m exit 0diff --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 222a00089..d125b2d24 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/.tmpHb5hJx/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpWfdvac/test-config.toml---success: trueexit_code: 0@@ -36,7 +36,7 @@ exit_code: 0β [32mReturned to primary at [REPO][0m----- stderr ------π [36mRunning pre-merge check 'check1':[0m+π [36mRunning pre-merge check [1m[36mcheck1[0m:[0m[40m [0m [PROJECT_ROOT]/tests/fixtures/mixed-output.sh[40m [0m check1 3[check1] stdout line 1@@ -47,7 +47,7 @@ exit_code: 0[check1] stderr line 3[check1] stdout complete[check1] stderr complete-π [36mRunning pre-merge check 'check2':[0m+π [36mRunning pre-merge check [1m[36mcheck2[0m:[0m[40m [0m [PROJECT_ROOT]/tests/fixtures/mixed-output.sh[40m [0m check2 3[check2] stdout line 1diff --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 0a7b1fd69..3ba61ed2b 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,7 +16,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp5SfvkD/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpFUYa5N/test-config.toml---success: trueexit_code: 0@@ -36,5 +36,5 @@ exit_code: 0β [32mReturned to primary at [REPO][0m----- stderr ------π [36mRunning pre-merge check 'cmd':[0m+π [36mRunning pre-merge check [1m[36mcmd[0m:[0m[40m [0m exit 0