Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Refactor: Improve merge summary output
Maximilian Roosa1d63ab406ec
diff --git a/src/commands/merge.rs b/src/commands/merge.rsindex 7362c6889..96f752915 100644--- a/src/commands/merge.rs+++ b/src/commands/merge.rs@@ -130,14 +130,34 @@ pub fn handle_merge(/// Print a comprehensive summary of the merge operationfn print_merge_summary(- _from_branch: &str,- _to_branch: &str,- _squashed_count: Option<usize>,- _cleaned_up: bool,+ from_branch: &str,+ to_branch: &str,+ squashed_count: Option<usize>,+ cleaned_up: bool,) {let green = AnstyleStyle::new().fg_color(Some(Color::Ansi(AnsiColor::Green)));+ let green_bold = green.bold();+ let dim = AnstyleStyle::new().dimmed();println!("✅ {green}Merge complete{green:#}");+ println!();++ // Show what was merged+ println!(+ " {dim}Merged: {green_bold}{from_branch}{green_bold:#} → {green_bold}{to_branch}{green_bold:#}{dim:#}"+ );++ // Show squash info if applicable+ if let Some(count) = squashed_count {+ println!(" {dim}Squashed: {count} commits into 1{dim:#}");+ }++ // Show worktree status+ if cleaned_up {+ println!(" {dim}Worktree: Removed{dim:#}");+ } else {+ println!(" {dim}Worktree: Kept (use 'wt remove' to clean up){dim:#}");+ }}/// Commit uncommitted changes with LLM-generated messagediff --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 afa916776..351e1e928 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@@ -44,6 +44,10 @@ To enable automatic cd, run: wt configure-shell✅ [32mMerge complete[0m+ [2mMerged: [1m[32mfeature[0m → [1m[32mmain[0m[0m+ [2mSquashed: 3 commits into 1[0m+ [2mWorktree: Removed[0m+----- stderr -----🟡 [33mLLM generation failed, using deterministic message[0m🟡 [33mLLM generation failed, using deterministic message[0mdiff --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 e1a43bb25..f204f85b2 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@@ -39,5 +39,8 @@ To enable automatic cd, run: wt configure-shell✅ [32mMerge complete[0m+ [2mMerged: [1m[32mfeature[0m → [1m[32mmain[0m[0m+ [2mWorktree: Removed[0m+----- stderr -----🟡 [33mLLM generation failed, using deterministic message[0mdiff --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 ee3e2268f..c2596293a 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@@ -41,5 +41,8 @@ To enable automatic cd, run: wt configure-shell✅ [32mMerge complete[0m+ [2mMerged: [1m[32mfeature[0m → [1m[32mmain[0m[0m+ [2mWorktree: Removed[0m+----- stderr -----🟡 [33mLLM generation failed, using deterministic message[0mdiff --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 26b365cb2..b7f8b1a80 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@@ -43,5 +43,8 @@ To enable automatic cd, run: wt configure-shell✅ [32mMerge complete[0m+ [2mMerged: [1m[32mfeature[0m → [1m[32mmain[0m[0m+ [2mWorktree: Removed[0m+----- stderr -----🟡 [33mLLM generation failed, using deterministic message[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snapindex 2162a1c4a..6badecad1 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap@@ -36,4 +36,7 @@ To enable automatic cd, run: wt configure-shell✅ [32mMerge complete[0m+ [2mMerged: [1m[32mfeature[0m → [1m[32mmain[0m[0m+ [2mWorktree: Removed[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 7de053239..4b19e90d7 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@@ -36,4 +36,7 @@ To enable automatic cd, run: wt configure-shell✅ [32mMerge complete[0m+ [2mMerged: [1m[32mfeature[0m → [1m[32mmain[0m[0m+ [2mWorktree: Removed[0m+----- stderr -----diff --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 d8d3809cf..6bda1fd6a 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@@ -40,4 +40,7 @@ To enable automatic cd, run: wt configure-shell✅ [32mMerge complete[0m+ [2mMerged: [1m[32mfeature[0m → [1m[32mmain[0m[0m+ [2mWorktree: Removed[0m+----- stderr -----diff --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 f914636eb..bd0cbea25 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@@ -37,4 +37,7 @@ To enable automatic cd, run: wt configure-shell✅ [32mMerge complete[0m+ [2mMerged: [1m[32mfeature[0m → [1m[32mmain[0m[0m+ [2mWorktree: Removed[0m+----- stderr -----diff --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 967e03a01..2577c824f 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@@ -38,4 +38,7 @@ To enable automatic cd, run: wt configure-shell✅ [32mMerge complete[0m+ [2mMerged: [1m[32mfeature[0m → [1m[32mmain[0m[0m+ [2mWorktree: Removed[0m+----- stderr -----diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snapindex 53a73f275..fb78f237f 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap@@ -41,5 +41,9 @@ To enable automatic cd, run: wt configure-shell✅ [32mMerge complete[0m+ [2mMerged: [1m[32mfeature[0m → [1m[32mmain[0m[0m+ [2mSquashed: 3 commits into 1[0m+ [2mWorktree: Removed[0m+----- stderr -----🟡 [33mLLM generation failed, using deterministic message[0mdiff --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 02d2ffc5f..4ae3eae67 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@@ -41,5 +41,9 @@ To enable automatic cd, run: wt configure-shell✅ [32mMerge complete[0m+ [2mMerged: [1m[32mfeature[0m → [1m[32mmain[0m[0m+ [2mSquashed: 2 commits into 1[0m+ [2mWorktree: Removed[0m+----- stderr -----🟡 [33mLLM generation failed, using deterministic message[0mdiff --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 ede2fdd9c..b981e014b 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@@ -38,4 +38,7 @@ To enable automatic cd, run: wt configure-shell✅ [32mMerge complete[0m+ [2mMerged: [1m[32mfeature[0m → [1m[32mmain[0m[0m+ [2mWorktree: Removed[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 6f54e0f20..f6160df3a 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@@ -42,5 +42,9 @@ To enable automatic cd, run: wt configure-shell✅ [32mMerge complete[0m+ [2mMerged: [1m[32mfeature[0m → [1m[32mmain[0m[0m+ [2mSquashed: 2 commits into 1[0m+ [2mWorktree: Removed[0m+----- stderr -----🟡 [33mLLM generation failed, using deterministic message[0mdiff --git a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snapindex c19a5e421..890450ef8 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap@@ -35,4 +35,7 @@ To enable automatic cd, run: wt configure-shell✅ [32mMerge complete[0m+ [2mMerged: [1m[32mfeature[0m → [1m[32mmain[0m[0m+ [2mWorktree: Removed[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 2c63f861f..4037f58a1 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_with_keep.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_keep.snap@@ -32,4 +32,7 @@ exit_code: 0✅ [32mMerge complete[0m+ [2mMerged: [1m[32mfeature[0m → [1m[32mmain[0m[0m+ [2mWorktree: Kept (use 'wt remove' to clean up)[0m+----- stderr -----