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.mdindex 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 contextlet dim = AnstyleStyle::new().dimmed();diff --git a/src/commands/dev.rs b/src/commands/dev.rsindex 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 squashuse 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.rsindex 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.rsindex 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 colordiff --git a/tests/integration_tests/merge.rs b/tests/integration_tests/merge.rsindex 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: trueexit_code: 0----- stdout ------ 🔄 [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA] (no squashing needed, no rebasing needed)+ 🔄 [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no squashing needed, no rebasing needed)* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file@@ -2075,7 +2075,7 @@ fn test_merge_no_commit_no_squash_no_remove_redundant() {success: trueexit_code: 0----- stdout ------ 🔄 [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA] (no squashing needed, no rebasing needed)+ 🔄 [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no squashing needed, no rebasing needed)* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature filediff --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.snapindex 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-🔄 [36mMerging 1 commit to [1m[36mmain[0m[0m @ [2md067f01[0m (no squashing needed, no rebasing needed)+🔄 [36mMerging 1 commit to [1m[36mmain[0m @ [2m[36md067f01[0m[0m (no squashing needed, no rebasing needed)* [33md067f01[m[33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add featurediff --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.snapindex 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()[0m[40m [0m [1m[34mecho[0m [32m'✓ All 47 tests passed in 2.3s'[0m[0m✓ All 47 tests passed in 2.3s-🔄 [36mMerging 1 commit to [1m[36mmain[0m[0m @ [2md067f01[0m (no squashing needed, no rebasing needed)+🔄 [36mMerging 1 commit to [1m[36mmain[0m @ [2m[36md067f01[0m[0m (no squashing needed, no rebasing needed)* [33md067f01[m[33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add featurediff --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.snapindex 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()[40m [0m [1m[34mecho[0m [32m'✓ All 47 tests passed in 2.3s'[0m[0m-🔄 [36mMerging 1 commit to [1m[36mmain[0m[0m @ [2md067f01[0m (no squashing needed, no rebasing needed)+🔄 [36mMerging 1 commit to [1m[36mmain[0m @ [2m[36md067f01[0m[0m (no squashing needed, no rebasing needed)* [33md067f01[m[33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add featurediff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_no_remove.snapindex 7a42f82b3..c7d761382 100644Binary 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 differdiff --git a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snapindex ebabef9fb..e5a4a7e54 100644Binary files a/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap and b/tests/snapshots/integration__integration_tests__directives__merge_internal_remove.snap differdiff --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 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: trueexit_code: 0@@ -32,8 +32,8 @@ exit_code: 0[40m [0m - feat: add file 1[40m [0m - feat: add file 2-✅ [32mSquashed 2 commits into 1[0m @ [SHA]-🔄 [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA] (squashed 2 commits with working tree changes, no rebasing needed)+✅ [32mSquashed 2 commits into 1 @ [2m[SHA][0m+🔄 [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (squashed 2 commits with working tree changes, no rebasing needed)* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from maindiff --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 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: CLC_ALL: CSOURCE_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: trueexit_code: 0@@ -29,8 +29,8 @@ exit_code: 0[40m [0m Combined commits:[40m [0m - feat: initial feature-✅ [32mSquashed 1 commits into 1[0m @ [SHA]-🔄 [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA] (combined 1 commit with working tree changes, no rebasing needed)+✅ [32mSquashed 1 commits into 1 @ [2m[SHA][0m+🔄 [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (combined 1 commit with working tree changes, no rebasing needed)* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from maindiff --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 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: trueexit_code: 0@@ -31,8 +31,8 @@ exit_code: 0[40m [0m Combined commits:[40m [0m - feat: add authentication-✅ [32mSquashed 1 commits into 1[0m @ [SHA]-🔄 [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA] (combined 1 commit with working tree changes, no rebasing needed)+✅ [32mSquashed 1 commits into 1 @ [2m[SHA][0m+🔄 [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (combined 1 commit with working tree changes, no rebasing needed)* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from maindiff --git a/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snap b/tests/snapshots/integration__integration_tests__merge__merge_dirty_working_tree.snapindex 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: CLC_ALL: CSOURCE_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: trueexit_code: 0@@ -27,8 +27,8 @@ exit_code: 0💡 [2mUsing fallback commit message. Run 'wt config help' to configure LLM-generated messages[0m[40m [0m [1mWIP: Auto-commit before merge[0m-✅ [32mCommitted changes[0m @ [SHA]-🔄 [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA] (no squashing needed, no rebasing needed)+✅ [32mCommitted changes @ [2m[SHA][0m+🔄 [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no squashing needed, no rebasing needed)* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m WIP: Auto-commit before mergediff --git a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snapindex 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: CLC_ALL: CSOURCE_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: trueexit_code: 0----- stdout ------🔄 [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA] (no squashing needed, no rebasing needed)+🔄 [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no squashing needed, no rebasing needed)* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature filediff --git a/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snap b/tests/snapshots/integration__integration_tests__merge__merge_no_squash.snapindex 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: CLC_ALL: CSOURCE_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: trueexit_code: 0----- stdout ------🔄 [36mMerging 2 commits to [1m[36mmain[0m[0m @ [SHA] (no squashing needed, no rebasing needed)+🔄 [36mMerging 2 commits to [1m[36mmain[0m @ [2m[SHA][0m (no squashing needed, no rebasing needed)* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m feat: add file 2* [SHA] feat: add file 1diff --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 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: CLC_ALL: CSOURCE_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: trueexit_code: 0----- stdout ------🔄 [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA] (no squashing needed, no rebasing needed)+🔄 [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no squashing needed, no rebasing needed)* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature filediff --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 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: CLC_ALL: CSOURCE_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: trueexit_code: 0----- stdout ------🔄 [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA] (no squashing needed, no rebasing needed)+🔄 [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no squashing needed, no rebasing needed)* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature filediff --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 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: CLC_ALL: CSOURCE_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: trueexit_code: 0----- stdout ------🔄 [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA] (no squashing needed, no rebasing needed)+🔄 [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no squashing needed, no rebasing needed)* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature filediff --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 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: CLC_ALL: CSOURCE_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: trueexit_code: 0----- stdout ------🔄 [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA] (no squashing needed, no rebasing needed)+🔄 [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no squashing needed, no rebasing needed)* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature filediff --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.snapindex 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: CLC_ALL: CSOURCE_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: trueexit_code: 0@@ -31,8 +31,8 @@ exit_code: 0💡 [2mUsing fallback commit message. Run 'wt config help' to configure LLM-generated messages[0m[40m [0m [1mWIP: Auto-commit before merge[0m-✅ [32mCommitted changes[0m @ [SHA]-🔄 [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA] (no squashing needed, no rebasing needed)+✅ [32mCommitted changes @ [2m[SHA][0m+🔄 [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no squashing needed, no rebasing needed)* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m WIP: Auto-commit before mergediff --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.snapindex 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[0mSTDOUT-FROM-SECONDSTDERR-FROM-SECOND-🔄 [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA] (no squashing needed, no rebasing needed)+🔄 [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no squashing needed, no rebasing needed)* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature filediff --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.snapindex 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: CLC_ALL: CSOURCE_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: trueexit_code: 0@@ -31,7 +31,7 @@ exit_code: 0🔄 [36mRunning pre-merge: [1mtest[0m[0m[40m [0m [1m[34mexit[0m 0[0m-🔄 [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA] (no squashing needed, no rebasing needed)+🔄 [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no squashing needed, no rebasing needed)* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature filediff --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.snapindex 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: CLC_ALL: CSOURCE_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: trueexit_code: 0@@ -28,7 +28,7 @@ exit_code: 0🔄 [36mRunning pre-merge: [1mcheck2[0m[0m[40m [0m [1m[34m[PROJECT_ROOT]/tests/fixtures/mixed-output.sh[0m check2 3[0m-🔄 [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA] (no squashing needed, no rebasing needed)+🔄 [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no squashing needed, no rebasing needed)* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature filediff --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.snapindex 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: CLC_ALL: CSOURCE_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: trueexit_code: 0@@ -25,7 +25,7 @@ exit_code: 0🔄 [36mRunning pre-merge:[0m[40m [0m [1m[34mexit[0m 0[0m-🔄 [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA] (no squashing needed, no rebasing needed)+🔄 [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no squashing needed, no rebasing needed)* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature filediff --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.snapindex 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: CLC_ALL: CSOURCE_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: trueexit_code: 0@@ -25,7 +25,7 @@ exit_code: 0🔄 [36mRunning pre-commit:[0m[40m [0m [1m[34mecho[0m [32m'Pre-commit check passed'[0m[0m-🔄 [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA] (no squashing needed, no rebasing needed)+🔄 [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no squashing needed, no rebasing needed)* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature filediff --git a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snapindex 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: CLC_ALL: CSOURCE_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: trueexit_code: 0@@ -31,8 +31,8 @@ exit_code: 0[40m [0m - fix: update logic[40m [0m - docs: update readme-✅ [32mSquashed 3 commits into 1[0m @ [SHA]-🔄 [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA] (squashed from 3 commits, no rebasing needed)+✅ [32mSquashed 3 commits into 1 @ [2m[SHA][0m+🔄 [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (squashed from 3 commits, no rebasing needed)* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from maindiff --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 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: CSOURCE_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: trueexit_code: 0@@ -31,8 +31,8 @@ exit_code: 0[40m [0m - feat: new feature[40m [0m - fix: bug fix-✅ [32mSquashed 2 commits into 1[0m @ [SHA]-🔄 [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA] (squashed from 2 commits, no rebasing needed)+✅ [32mSquashed 2 commits into 1 @ [2m[SHA][0m+🔄 [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (squashed from 2 commits, no rebasing needed)* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from maindiff --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 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: CLC_ALL: CSOURCE_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: trueexit_code: 0----- stdout ------🔄 [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA] (no squashing needed, no rebasing needed)+🔄 [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no squashing needed, no rebasing needed)* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m feat: single commitdiff --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 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: trueexit_code: 0@@ -33,8 +33,8 @@ exit_code: 0[40m [0m - feat: add authentication[40m [0m - fix: handle edge case-✅ [32mSquashed 2 commits into 1[0m @ [SHA]-🔄 [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA] (squashed from 2 commits, no rebasing needed)+✅ [32mSquashed 2 commits into 1 @ [2m[SHA][0m+🔄 [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (squashed from 2 commits, no rebasing needed)* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from maindiff --git a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snapindex 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: CLC_ALL: CSOURCE_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: trueexit_code: 0----- stdout ------🔄 [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA] (no squashing needed, no rebasing needed)+🔄 [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no squashing needed, no rebasing needed)* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature filediff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_no_remove.snapindex 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: CLC_ALL: CSOURCE_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: trueexit_code: 0----- stdout ------🔄 [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA] (no squashing needed, no rebasing needed)+🔄 [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no squashing needed, no rebasing needed)* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature filediff --git a/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_untracked_files.snapindex 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: trueexit_code: 0@@ -32,8 +32,8 @@ exit_code: 0[40m [0m Combined commits:[40m [0m - feat: add file 1-✅ [32mSquashed 1 commits into 1[0m @ [SHA]-🔄 [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA] (combined 1 commit with working tree changes, no rebasing needed)+✅ [32mSquashed 1 commits into 1 @ [2m[SHA][0m+🔄 [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (combined 1 commit with working tree changes, no rebasing needed)* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Squash commits from maindiff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_complex.snapindex 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: CLC_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: trueexit_code: 0@@ -35,14 +35,14 @@ exit_code: 0[40m [0m - Add JWT encoding/decoding with signature verification[40m [0m - Create test suite covering all authentication flows-✅ [32mSquashed 3 commits into 1[0m @ [SHA]+✅ [32mSquashed 3 commits into 1 @ [2m[SHA][0m🔄 [36mRunning pre-merge: [1mlint[0m[0m[40m [0m [1m[34mcargo[0m clippy[0m🔄 [36mRunning pre-merge: [1mtest[0m[0m[40m [0m [1m[34mcargo[0m test[0m-🔄 [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA] (squashed from 3 commits, no rebasing needed)+🔄 [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (squashed from 3 commits, no rebasing needed)* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature-auth[m[33m)[m feat(auth): Implement JWT authentication systemdiff --git a/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snap b/tests/snapshots/integration__integration_tests__merge__readme_example_simple.snapindex 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: CLC_ALL: CSOURCE_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: trueexit_code: 0----- stdout ------🔄 [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA] (no squashing needed, no rebasing needed)+🔄 [36mMerging 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no squashing needed, no rebasing needed)* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfix-auth[m[33m)[m Implement JWT validationdiff --git a/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_fast_forward.snapindex 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.rsinfo:program: wtargs:+ - dev- push- mainenv:@@ -16,12 +17,12 @@ info:LANG: CLC_ALL: CSOURCE_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: trueexit_code: 0----- stdout ------🔄 [36mPushing 1 commit to [1m[36mmain[0m[0m @ [SHA] (no squashing needed, no rebasing needed)+🔄 [36mPushing 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no squashing needed, no rebasing needed)* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add test filediff --git a/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_not_fast_forward.snapindex 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.rsinfo:program: wtargs:+ - dev- push- mainenv:@@ -16,12 +17,12 @@ info:LANG: CLC_ALL: CSOURCE_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: trueexit_code: 0----- stdout ------🔄 [36mPushing 1 commit to [1m[36mmain[0m[0m @ [SHA] (no squashing needed, no rebasing needed)+🔄 [36mPushing 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no squashing needed, no rebasing needed)* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature filediff --git a/tests/snapshots/integration__integration_tests__push__push_to_default.snap b/tests/snapshots/integration__integration_tests__push__push_to_default.snapindex 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.rsinfo:program: wtargs:+ - dev- pushenv:CLICOLOR_FORCE: "1"@@ -15,12 +16,12 @@ info:LANG: CLC_ALL: CSOURCE_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: trueexit_code: 0----- stdout ------🔄 [36mPushing 1 commit to [1m[36mmain[0m[0m @ [SHA] (no squashing needed, no rebasing needed)+🔄 [36mPushing 1 commit to [1m[36mmain[0m @ [2m[SHA][0m (no squashing needed, no rebasing needed)* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature file