Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Refactor(merge): Improve `wt merge` output clarity
Maximilian Roos656a3aa40cec
diff --git a/src/commands/merge.rs b/src/commands/merge.rsindex 6174d4906..b156a0d9d 100644--- a/src/commands/merge.rs+++ b/src/commands/merge.rs@@ -1,8 +1,7 @@use worktrunk::HookType;use worktrunk::config::{Command, CommandPhase, ProjectConfig};use worktrunk::git::Repository;-use worktrunk::path::format_path_for_display;-use worktrunk::styling::{ERROR, ERROR_EMOJI, GREEN_BOLD, HINT, HINT_EMOJI};+use worktrunk::styling::{ERROR, ERROR_EMOJI, HINT, HINT_EMOJI};use super::command_approval::approve_command_batch;use super::command_executor::CommandContext;@@ -13,6 +12,16 @@ use super::project_config::collect_commands_for_hooks;use super::repository_ext::RepositoryCliExt;use super::worktree::{MergeOperations, RemoveResult, handle_push};+/// Reason why a worktree was preserved (not removed) after merge+enum PreserveReason {+ /// User explicitly passed --no-remove+ NoRemoveFlag,+ /// Running from the main worktree (can't remove main)+ OnMainBranch,+ /// Current branch is the same as the target branch+ AlreadyOnTarget,+}+/// Context for collecting merge commandsstruct MergeCommandCollector<'a> {repo: &'a Repository,@@ -99,7 +108,8 @@ pub fn handle_merge(// When current == target or we're in the main worktree, disable remove (can't remove it)let in_main = !repo.is_in_worktree().unwrap_or(false);- let remove_effective = remove && current_branch != target_branch && !in_main;+ let on_target = current_branch == target_branch;+ let remove_effective = remove && !on_target && !in_main;// Collect and approve all commands upfront for batch permission requestlet (all_commands, project_id) = MergeCommandCollector {@@ -200,7 +210,15 @@ pub fn handle_merge(crate::output::handle_remove_output(&remove_result, Some(¤t_branch), true, true)?;} else {// Print comprehensive summary (worktree preserved)- handle_merge_summary_output(None)?;+ // Priority: main branch > on target > --no-remove flag+ let reason = if in_main {+ PreserveReason::OnMainBranch+ } else if on_target {+ PreserveReason::AlreadyOnTarget+ } else {+ PreserveReason::NoRemoveFlag+ };+ handle_merge_summary_output(reason)?;}if verify {@@ -224,20 +242,13 @@ pub fn handle_merge(}/// Handle output for merge summary using global output context-fn handle_merge_summary_output(main_path: Option<&std::path::Path>) -> anyhow::Result<()> {- use worktrunk::styling::GREEN;-- if let Some(path) = main_path {- // Action completed: moved to main worktree- crate::output::success(format!(- "{GREEN}Returned to main at {GREEN_BOLD}{}{GREEN_BOLD:#}{GREEN:#}",- format_path_for_display(path)- ))?;- } else {- // No action: worktree stayed as-is (acknowledging --no-remove flag)- crate::output::info("Worktree preserved (--no-remove)")?;- }-+fn handle_merge_summary_output(reason: PreserveReason) -> anyhow::Result<()> {+ let message = match reason {+ PreserveReason::OnMainBranch => "Worktree preserved (on main branch)",+ PreserveReason::AlreadyOnTarget => "Worktree preserved (already on target)",+ PreserveReason::NoRemoveFlag => "Worktree preserved (--no-remove)",+ };+ crate::output::info(message)?;crate::output::flush()?;Ok(())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 12264c6a7..3e99edaa5 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@@ -3,4 +3,4 @@ source: tests/integration_tests/shell_wrapper.rsexpression: output.normalized()---⚪ Already up to date with [1mmain[0m (no new commits, no rebase needed)-⚪ Worktree preserved (--no-remove)+⚪ Worktree preserved (on main branch)diff --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 4a1487ec4..244330418 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,12 +15,13 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"+ WORKTRUNK_BIN: ""WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout -----⚪ Already up to date with [1mmain[0m (no new commits, no rebase needed)-⚪ Worktree preserved (--no-remove)+⚪ Worktree preserved (on main branch)----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__merge__merge_default_branch_missing_worktree.snap b/tests/snapshots/integration__integration_tests__merge__merge_default_branch_missing_worktree.snapindex 4a1487ec4..244330418 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_default_branch_missing_worktree.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_default_branch_missing_worktree.snap@@ -15,12 +15,13 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"+ WORKTRUNK_BIN: ""WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0----- stdout -----⚪ Already up to date with [1mmain[0m (no new commits, no rebase needed)-⚪ Worktree preserved (--no-remove)+⚪ Worktree preserved (on main branch)----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_from_main_branch.snap b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_from_main_branch.snapindex f32beadb3..013fa2259 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_from_main_branch.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_post_merge_runs_from_main_branch.snap@@ -23,7 +23,7 @@ success: trueexit_code: 0----- stdout -----⚪ Already up to date with [1mmain[0m (no new commits, no rebase needed)-⚪ Worktree preserved (--no-remove)+⚪ Worktree preserved (on main branch)🔄 [36mRunning post-merge:[0m[107m [0m [2m[0m[2m[34mecho[0m[2m [0m[2m[32m'post-merge ran from main'[0m[2m [0m[2m[36m>[0m[2m post-merge-ran.txt[0m