Skip to content

Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows

fix(output): Prevent nested colors in progress messages

Maximilian Roosdeb724efd604
diff --git a/src/commands/merge.rs b/src/commands/merge.rs
index 653bd2adc..9099ef0bf 100644
--- a/src/commands/merge.rs
+++ b/src/commands/merge.rs
@@ -245,12 +245,17 @@ fn commit_with_generated_message(
let stats_parts = stats.format_summary();
// Format progress message with stats
+ // Don't nest styles - stats already contain ADDITION/DELETION colors
let full_progress_msg = match stats_parts.is_empty() {
- true => progress_msg.to_string(),
- false => format!("{} ({})", progress_msg, stats_parts.join(", ")),
+ true => format!("πŸ”„ {CYAN}{progress_msg}{CYAN:#}"),
+ false => format!(
+ "πŸ”„ {CYAN}{}{CYAN:#} ({})",
+ progress_msg,
+ stats_parts.join(", ")
+ ),
};
- crate::output::progress(format!("πŸ”„ {CYAN}{full_progress_msg}{CYAN:#}"))?;
+ crate::output::progress(full_progress_msg)?;
crate::output::progress(format!("πŸ”„ {CYAN}Generating commit message...{CYAN:#}"))?;
show_llm_config_hint_if_needed(commit_generation_config)?;
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.snap
index f5e6e9633..c7ed9e2b6 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
@@ -12,15 +12,16 @@ info:
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_EDITOR: ""
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpC1vIGz/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpSGnUHI/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Committing changes... (1 file, +1, -1)
+πŸ”„ Committing changes... (1 file, +1, -1)
πŸ”„ Generating commit message...
πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
  WIP: Auto-commit before merge
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.snap
index 997dd1e22..70f8b3733 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
@@ -12,17 +12,18 @@ info:
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_EDITOR: ""
LANG: C
LC_ALL: C
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/.tmpOz5jBP/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpYlKXRB/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Committing changes... (1 file, +1, -1)
+πŸ”„ Committing changes... (1 file, +1, -1)
πŸ”„ Generating commit message...
πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
  WIP: Auto-commit before merge
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.snap
index 5e79e6632..d3cd0dbd8 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
@@ -12,15 +12,16 @@ info:
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_EDITOR: ""
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0tLDRd/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpycnuaa/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-πŸ”„ Committing changes... (1 file, +1)
+πŸ”„ Committing changes... (1 file, +1)
πŸ”„ Generating commit message...
πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
  WIP: Auto-commit before merge
diff --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.snap
index 730c449aa..412c1b99b 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
@@ -13,10 +13,11 @@ info:
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
GIT_CONFIG_GLOBAL: /dev/null
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_EDITOR: ""
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpGPXr1M/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpIalCkw/test-config.toml
---
success: true
exit_code: 0
@@ -24,7 +25,7 @@ exit_code: 0
πŸ”„ Running pre-commit command:
  echo 'Pre-commit check passed'
-πŸ”„ Committing changes... (1 file, +1)
+πŸ”„ Committing changes... (1 file, +1)
πŸ”„ Generating commit message...
πŸ’‘ Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
  WIP: Auto-commit before merge