Skip to content

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

Fix: Commit hashes use surrounding color to dim

Maximilian Roos094229de7c75
diff --git a/CLAUDE.md b/CLAUDE.md
index 966e5bf25..d34347f6c 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -220,7 +220,7 @@ output.push_str(&format!("{}", anstyle::Reset));
**Principle: Bold what answers the user's question, dim what provides context.**
-Style based on **user intent**, not data type. In messages, branch names are always bold. When a path is part of an action phrase (e.g., "changed directory to {path}"), it's bold because it answers "where?". When shown as supplementary metadata on a separate line (e.g., "Path: ..."), it's dimmed. Commit hashes are always dimmed (reference info).
+Style based on **user intent**, not data type. In messages, branch names are always bold. When a path is part of an action phrase (e.g., "changed directory to {path}"), it's bold because it answers "where?". When shown as supplementary metadata on a separate line (e.g., "Path: ..."), it's dimmed. Commit hashes are always dimmed in their surrounding color (reference info).
Styled elements must maintain their surrounding color. Don't apply just `{bold}` or `{dim}` to elements in colored messages - compose the color with the style using `.bold()` or `.dimmed()` on the color style. Applying a style without color creates a color leak - the styled element loses its context color and appears in default terminal colors (black/white).
@@ -239,8 +239,9 @@ println!("✅ {green}Message {green_bold}{path}{green_bold:#}");
let green_bold = GREEN.bold();
println!("✅ {GREEN}Created worktree, changed directory to {green_bold}{}{green_bold:#}", path.display());
-// Commit hash as reference info (outside colored context - OK to use HINT directly)
-println!("✅ {GREEN}Committed changes{GREEN:#} @ {HINT}{hash}{HINT:#}"); // OK - hash is outside green
+// Commit hash as reference info - dimmed in surrounding color
+let green_dim = GREEN.dimmed();
+println!("✅ {GREEN}Committed changes @ {green_dim}{hash}{green_dim:#}{GREEN:#}");
// Path as supplementary metadata (separate line) - dimmed in unstyled context
let dim = AnstyleStyle::new().dimmed();
diff --git a/src/commands/dev.rs b/src/commands/dev.rs
index f417e37c7..814b2a9e1 100644
--- a/src/commands/dev.rs
+++ b/src/commands/dev.rs
@@ -290,8 +290,9 @@ pub fn handle_dev_squash(
// Show success immediately after completing the squash
use worktrunk::styling::{GREEN, SUCCESS_EMOJI};
+ let green_dim = GREEN.dimmed();
crate::output::success(format!(
- "{SUCCESS_EMOJI} {GREEN}Squashed {commit_count} commits into 1{GREEN:#} @ {HINT}{commit_hash}{HINT:#}"
+ "{SUCCESS_EMOJI} {GREEN}Squashed {commit_count} commits into 1 @ {green_dim}{commit_hash}{green_dim:#}{GREEN:#}"
))?;
Ok(Some(SquashInfo {
diff --git a/src/commands/merge.rs b/src/commands/merge.rs
index 63b279ed7..9b78a848e 100644
--- a/src/commands/merge.rs
+++ b/src/commands/merge.rs
@@ -325,9 +325,10 @@ pub fn commit_with_generated_message(
.trim()
.to_string();
- use worktrunk::styling::{GREEN, HINT, SUCCESS_EMOJI};
+ use worktrunk::styling::{GREEN, SUCCESS_EMOJI};
+ let green_dim = GREEN.dimmed();
crate::output::success(format!(
- "{SUCCESS_EMOJI} {GREEN}Committed changes{GREEN:#} @ {HINT}{commit_hash}{HINT:#}"
+ "{SUCCESS_EMOJI} {GREEN}Committed changes @ {green_dim}{commit_hash}{green_dim:#}{GREEN:#}"
))?;
Ok(())
diff --git a/src/commands/worktree.rs b/src/commands/worktree.rs
index 92b4b1497..ce6ed14f4 100644
--- a/src/commands/worktree.rs
+++ b/src/commands/worktree.rs
@@ -104,8 +104,8 @@ use std::path::PathBuf;
use worktrunk::config::{ProjectConfig, WorktrunkConfig};
use worktrunk::git::{GitError, GitResultExt, Repository};
use worktrunk::styling::{
- ADDITION, AnstyleStyle, CYAN, CYAN_BOLD, DELETION, GREEN, GREEN_BOLD, HINT, SUCCESS_EMOJI,
- WARNING, WARNING_EMOJI, format_bash_with_gutter,
+ ADDITION, AnstyleStyle, CYAN, CYAN_BOLD, DELETION, GREEN, GREEN_BOLD, SUCCESS_EMOJI, WARNING,
+ WARNING_EMOJI, format_bash_with_gutter,
};
use super::command_executor::{CommandContext, prepare_project_commands};
@@ -675,9 +675,10 @@ pub fn handle_push(
}
let operations_text = operations.join(", ");
+ let cyan_dim = CYAN.dimmed();
crate::output::progress(format!(
- "🔄 {CYAN}{verb_ing} {commit_count} {commit_text} to {CYAN_BOLD}{target_branch}{CYAN_BOLD:#}{CYAN:#} @ {HINT}{head_sha}{HINT:#} ({operations_text})\n"
+ "🔄 {CYAN}{verb_ing} {commit_count} {commit_text} to {CYAN_BOLD}{target_branch}{CYAN_BOLD:#} @ {cyan_dim}{head_sha}{cyan_dim:#}{CYAN:#} ({operations_text})\n"
))?;
// Show the commit graph with color
diff --git a/tests/integration_tests/merge.rs b/tests/integration_tests/merge.rs
index 108840f61..409fb8083 100644
--- a/tests/integration_tests/merge.rs
+++ b/tests/integration_tests/merge.rs
@@ -1968,7 +1968,7 @@ fn test_merge_no_commit_with_clean_tree() {
success: true
exit_code: 0
----- stdout -----
- 🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+ 🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) Add feature file
@@ -2075,7 +2075,7 @@ fn test_merge_no_commit_no_squash_no_remove_redundant() {
success: true
exit_code: 0
----- stdout -----
- 🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+ 🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) Add feature file
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap
index 1c922d9a7..5d42f06dc 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_bash.snap
@@ -17,7 +17,7 @@ expression: output.normalized().as_ref()
✓ All 47 tests passed in 2.3s
-🔄 Merging 1 commit to main @ d067f01 (no squashing needed, no rebasing needed)
+🔄 Merging 1 commit to main @ d067f01 (no squashing needed, no rebasing needed)
* d067f01 (HEAD -> feature) Add feature
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_fish.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_fish.snap
index 4b11764a3..789335334 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_fish.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_fish.snap
@@ -14,7 +14,7 @@ expression: output.normalized().as_ref()
  echo '✓ All 47 tests passed in 2.3s'
✓ All 47 tests passed in 2.3s
-🔄 Merging 1 commit to main @ d067f01 (no squashing needed, no rebasing needed)
+🔄 Merging 1 commit to main @ d067f01 (no squashing needed, no rebasing needed)
* d067f01 (HEAD -> feature) Add feature
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap
index 7034c6c0d..57b0142a9 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__shell_wrapper__tests__merge_with_pre_merge_success_zsh.snap
@@ -17,7 +17,7 @@ expression: output.normalized().as_ref()
  echo '✓ All 47 tests passed in 2.3s'
-🔄 Merging 1 commit to main @ d067f01 (no squashing needed, no rebasing needed)
+🔄 Merging 1 commit to main @ d067f01 (no squashing needed, no rebasing needed)
* d067f01 (HEAD -> feature) Add feature
diff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap
index 7a42f82b3..c7d761382 100644
Binary files a/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap and b/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap differ
diff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap
index ebabef9fb..e5a4a7e54 100644
Binary files a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap and b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap differ
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.snap
index 4a58aac45..e7d7f0b10 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,7 +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/.tmpbRZNig/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp8yhROk/test-config.toml
---
success: true
exit_code: 0
@@ -32,8 +32,8 @@ exit_code: 0
  - feat: add file 1
  - feat: add file 2
-✅ Squashed 2 commits into 1 @ [SHA]
-🔄 Merging 1 commit to main @ [SHA] (squashed 2 commits with working tree changes, no rebasing needed)
+✅ Squashed 2 commits into 1 @ [SHA]
+🔄 Merging 1 commit to main @ [SHA] (squashed 2 commits with working tree changes, no rebasing needed)
* [SHA] (HEAD -> feature) Squash commits from main
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 75edf874d..76de22e3f 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
@@ -16,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpwV1dK4/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpAZakNX/test-config.toml
---
success: true
exit_code: 0
@@ -29,8 +29,8 @@ exit_code: 0
  Combined commits:
  - feat: initial feature
-✅ Squashed 1 commits into 1 @ [SHA]
-🔄 Merging 1 commit to main @ [SHA] (combined 1 commit with working tree changes, no rebasing needed)
+✅ Squashed 1 commits into 1 @ [SHA]
+🔄 Merging 1 commit to main @ [SHA] (combined 1 commit with working tree changes, no rebasing needed)
* [SHA] (HEAD -> feature) Squash commits from main
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 afff012a0..2cd661b5a 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
@@ -18,7 +18,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/.tmpGN5GCo/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpOGO2HO/test-config.toml
---
success: true
exit_code: 0
@@ -31,8 +31,8 @@ exit_code: 0
  Combined commits:
  - feat: add authentication
-✅ Squashed 1 commits into 1 @ [SHA]
-🔄 Merging 1 commit to main @ [SHA] (combined 1 commit with working tree changes, no rebasing needed)
+✅ Squashed 1 commits into 1 @ [SHA]
+🔄 Merging 1 commit to main @ [SHA] (combined 1 commit with working tree changes, no rebasing needed)
* [SHA] (HEAD -> feature) Squash commits from main
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 ad892d875..d06bc62be 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
@@ -16,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpCdihbf/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpFYKMyP/test-config.toml
---
success: true
exit_code: 0
@@ -27,8 +27,8 @@ exit_code: 0
💡 Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
  WIP: Auto-commit before merge
-✅ Committed changes @ [SHA]
-🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+✅ Committed changes @ [SHA]
+🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) WIP: Auto-commit before merge
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
index 329149824..d8dd1fabf 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap
@@ -16,12 +16,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpM8kqV3/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmptkSOlk/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) Add feature file
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
index 168116cb6..60969ddbe 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap
@@ -17,12 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpBjZeiA/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp47MZ2i/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-🔄 Merging 2 commits to main @ [SHA] (no squashing needed, no rebasing needed)
+🔄 Merging 2 commits to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) feat: add file 2
* [SHA] feat: add file 1
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.snap
index 901a9a0a4..d3e5a585d 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
@@ -16,12 +16,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpItpg0I/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpngHC1t/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) Add feature file
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.snap
index 5f938f8de..3d61e8b05 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
@@ -17,12 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp1r8BDX/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpVBWqUw/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) Add feature file
diff --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.snap
index c5324285f..bdbbc85e5 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
@@ -17,12 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpVp30eA/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp6gXs9o/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) Add feature file
diff --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.snap
index 140a6e191..c20a31ab5 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
@@ -17,12 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp961yHP/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpcImBnU/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) Add feature file
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 0c80789cf..d21dd9feb 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
@@ -17,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpYjaiYI/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpoZiAbm/test-config.toml
---
success: true
exit_code: 0
@@ -31,8 +31,8 @@ exit_code: 0
💡 Using fallback commit message. Run 'wt config help' to configure LLM-generated messages
  WIP: Auto-commit before merge
-✅ Committed changes @ [SHA]
-🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+✅ Committed changes @ [SHA]
+🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) WIP: Auto-commit before merge
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_combined_output.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_combined_output.snap
index 64985206d..1dbbb6038 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_combined_output.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_combined_output.snap
@@ -13,7 +13,7 @@ STDERR-FROM-FIRST
STDOUT-FROM-SECOND
STDERR-FROM-SECOND
-🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) Add feature file
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap
index 03d5fb91b..a44a6112d 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_named.snap
@@ -17,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0RRBRD/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp4PryQs/test-config.toml
---
success: true
exit_code: 0
@@ -31,7 +31,7 @@ exit_code: 0
🔄 Running pre-merge: test
  exit 0
-🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) Add feature file
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snap
index e0521b626..e2b760749 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_stdout_stderr_ordering.snap
@@ -17,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpJT7T2l/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpbWSGVM/test-config.toml
---
success: true
exit_code: 0
@@ -28,7 +28,7 @@ exit_code: 0
🔄 Running pre-merge: check2
  [PROJECT_ROOT]/tests/fixtures/mixed-output.sh check2 3
-🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) Add feature file
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap
index 0519586f1..e168cf5bd 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_success.snap
@@ -17,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp5C34Tk/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpPR90Ag/test-config.toml
---
success: true
exit_code: 0
@@ -25,7 +25,7 @@ exit_code: 0
🔄 Running pre-merge:
  exit 0
-🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) Add feature file
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap
index 398804bc4..b391b5ce4 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_squash_command_success.snap
@@ -17,7 +17,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp56K4n2/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpKeJKcc/test-config.toml
---
success: true
exit_code: 0
@@ -25,7 +25,7 @@ exit_code: 0
🔄 Running pre-commit:
  echo 'Pre-commit check passed'
-🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) Add feature file
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
index 6d5535645..73aa1015b 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap
@@ -16,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpufA4BS/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpQT9qyX/test-config.toml
---
success: true
exit_code: 0
@@ -31,8 +31,8 @@ exit_code: 0
  - fix: update logic
  - docs: update readme
-✅ Squashed 3 commits into 1 @ [SHA]
-🔄 Merging 1 commit to main @ [SHA] (squashed from 3 commits, no rebasing needed)
+✅ Squashed 3 commits into 1 @ [SHA]
+🔄 Merging 1 commit to main @ [SHA] (squashed from 3 commits, no rebasing needed)
* [SHA] (HEAD -> feature) Squash commits from main
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.snap
index e5db4e74e..1562597c1 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,7 +17,7 @@ info:
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
WORKTRUNK_COMMIT_GENERATION__COMMAND: nonexistent-llm-command
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpQJT4pD/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpXtwNZq/test-config.toml
---
success: true
exit_code: 0
@@ -31,8 +31,8 @@ exit_code: 0
  - feat: new feature
  - fix: bug fix
-✅ Squashed 2 commits into 1 @ [SHA]
-🔄 Merging 1 commit to main @ [SHA] (squashed from 2 commits, no rebasing needed)
+✅ Squashed 2 commits into 1 @ [SHA]
+🔄 Merging 1 commit to main @ [SHA] (squashed from 2 commits, no rebasing needed)
* [SHA] (HEAD -> feature) Squash commits from main
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.snap
index f1c97e921..cdc0265a9 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,12 +16,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmphdi9En/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpPUQG2N/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) feat: single commit
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.snap
index 344278e28..e84a689be 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,7 +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/.tmpruk401/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpO7hDMf/test-config.toml
---
success: true
exit_code: 0
@@ -33,8 +33,8 @@ exit_code: 0
  - feat: add authentication
  - fix: handle edge case
-✅ Squashed 2 commits into 1 @ [SHA]
-🔄 Merging 1 commit to main @ [SHA] (squashed from 2 commits, no rebasing needed)
+✅ Squashed 2 commits into 1 @ [SHA]
+🔄 Merging 1 commit to main @ [SHA] (squashed from 2 commits, no rebasing needed)
* [SHA] (HEAD -> feature) Squash commits from main
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
index 9bc71d6c4..f86837b9b 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap
@@ -15,12 +15,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0fiW6U/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpiVCXmB/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) Add feature file
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap
index d17575ba1..37471915c 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap
@@ -17,12 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpM2oDVY/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpj9B9zD/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) Add feature file
diff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap
index c8a62261d..b1f2c9046 100644
--- a/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap
+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap
@@ -18,7 +18,7 @@ info:
SOURCE_DATE_EPOCH: "1761609600"
WORKTRUNK_COMMIT_GENERATION__ARGS: "fix: commit changes"
WORKTRUNK_COMMIT_GENERATION__COMMAND: echo
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpAni2oA/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpQFlXrs/test-config.toml
---
success: true
exit_code: 0
@@ -32,8 +32,8 @@ exit_code: 0
  Combined commits:
  - feat: add file 1
-✅ Squashed 1 commits into 1 @ [SHA]
-🔄 Merging 1 commit to main @ [SHA] (combined 1 commit with working tree changes, no rebasing needed)
+✅ Squashed 1 commits into 1 @ [SHA]
+🔄 Merging 1 commit to main @ [SHA] (combined 1 commit with working tree changes, no rebasing needed)
* [SHA] (HEAD -> feature) Squash commits from main
diff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
index a2f60599b..302ab49ca 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap
@@ -16,9 +16,9 @@ info:
GIT_EDITOR: ""
LANG: C
LC_ALL: C
- PATH: "/private/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpcj8v04/test-repo/.bin:/Users/maximilian/.cargo/bin:/Users/maximilian/.local/bin:/Users/maximilian/.bun/bin:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
+ PATH: "/private/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpKykrMl/test-repo/.bin:/Users/maximilian/.cargo/bin:/Users/maximilian/.local/bin:/Users/maximilian/.bun/bin:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpcj8v04/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpKykrMl/test-config.toml
---
success: true
exit_code: 0
@@ -35,14 +35,14 @@ exit_code: 0
  - Add JWT encoding/decoding with signature verification
  - Create test suite covering all authentication flows
-✅ Squashed 3 commits into 1 @ [SHA]
+✅ Squashed 3 commits into 1 @ [SHA]
🔄 Running pre-merge: lint
  cargo clippy
🔄 Running pre-merge: test
  cargo test
-🔄 Merging 1 commit to main @ [SHA] (squashed from 3 commits, no rebasing needed)
+🔄 Merging 1 commit to main @ [SHA] (squashed from 3 commits, no rebasing needed)
* [SHA] (HEAD -> feature-auth) feat(auth): Implement JWT authentication system
diff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap
index 9bb73a5b8..46878508d 100644
--- a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap
+++ b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap
@@ -16,12 +16,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp3FpSM5/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmptYhnlT/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+🔄 Merging 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> fix-auth) Implement JWT validation
diff --git a/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap
index 5b8ab238b..740b0856f 100644
--- a/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap
@@ -3,6 +3,7 @@ source: tests/integration_tests/push.rs
info:
program: wt
args:
+ - dev
- push
- main
env:
@@ -16,12 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp4ShPso/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpA6oj6C/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-🔄 Pushing 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+🔄 Pushing 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) Add test file
diff --git a/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap
index 10af99ee0..81d8e57bb 100644
--- a/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap
@@ -3,6 +3,7 @@ source: tests/integration_tests/push.rs
info:
program: wt
args:
+ - dev
- push
- main
env:
@@ -16,12 +17,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpwYqsRl/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpsPgcef/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-🔄 Pushing 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+🔄 Pushing 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) Add feature file
diff --git a/tests/snapshots/integration__integration_tests__push__push_to_default.snap b/tests/snapshots/integration__integration_tests__push__push_to_default.snap
index a70154357..c896668c5 100644
--- a/tests/snapshots/integration__integration_tests__push__push_to_default.snap
+++ b/tests/snapshots/integration__integration_tests__push__push_to_default.snap
@@ -3,6 +3,7 @@ source: tests/integration_tests/push.rs
info:
program: wt
args:
+ - dev
- push
env:
CLICOLOR_FORCE: "1"
@@ -15,12 +16,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpP2HXWU/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpWmwmoT/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-🔄 Pushing 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
+🔄 Pushing 1 commit to main @ [SHA] (no squashing needed, no rebasing needed)
* [SHA] (HEAD -> feature) Add feature file