Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
feat(styling): Consistently dim commit hashes in output
Maximilian Roos461e72962032
diff --git a/CLAUDE.md b/CLAUDE.mdindex 5792531c9..6ee0d7b59 100644--- a/CLAUDE.md+++ b/CLAUDE.md@@ -176,25 +176,27 @@ println!("{HINT_EMOJI} {HINT}Use 'wt list' to see all worktrees{HINT:#}");### Composing Styles-Compose styles using anstyle methods (`.bold()`, `.fg_color()`, etc.). **Always bold branch names:**+Compose styles using anstyle methods (`.bold()`, `.fg_color()`, etc.). **In messages (not tables), always bold branch names:**```rustuse worktrunk::styling::{println, AnstyleStyle, ERROR};-// Error with bold branch name+// Error message with bold branch namelet error_bold = ERROR.bold();println!("β Branch '{error_bold}{branch}{error_bold:#}' already exists");-// Just bold (no color)+// Success message with bold branch namelet bold = AnstyleStyle::new().bold();println!("Switched to worktree: {bold}{branch}{bold:#}");```+Tables (`wt list`) use conditional styling for branch names to indicate worktree state (current/primary/other), not bold.+### Information Hierarchy & Path Styling**Principle: Bold what answers the user's question, dim what provides context.**-Style based on **user intent**, not data type. Branch names are always bold. Paths are bold when they're the answer (`wt config list`), dimmed when they're context (`wt switch` output).+Style based on **user intent**, not data type. In messages, branch names are always bold. Paths are bold when they're the answer (`wt config list`), dimmed when they're context (`wt switch` output). Commit hashes are always dimmed (reference info).```rust// Path as primary answerdiff --git a/src/commands/list/render.rs b/src/commands/list/render.rsindex d44b11869..e69ab8cab 100644--- a/src/commands/list/render.rs+++ b/src/commands/list/render.rs@@ -241,12 +241,8 @@ pub fn format_list_item_line(push_gap(&mut line);}- // Commit (short HEAD)- if let Some(style) = text_style {- line.push_styled(short_head, style);- } else {- line.push_styled(short_head, Style::new().dimmed());- }+ // Commit (short HEAD) - always dimmed (reference info)+ line.push_styled(short_head, Style::new().dimmed());push_gap(&mut line);// Messagediff --git a/src/commands/merge.rs b/src/commands/merge.rsindex d81ad14ef..a2b7af2c7 100644--- a/src/commands/merge.rs+++ b/src/commands/merge.rs@@ -268,9 +268,9 @@ fn commit_with_generated_message(.trim().to_string();- use worktrunk::styling::{GREEN, SUCCESS_EMOJI};+ use worktrunk::styling::{GREEN, HINT, SUCCESS_EMOJI};crate::output::success(format!(- "{SUCCESS_EMOJI} {GREEN}Committed changes @ {commit_hash}{GREEN:#}"+ "{SUCCESS_EMOJI} {GREEN}Committed changes{GREEN:#} @ {HINT}{commit_hash}{HINT:#}"))?;Ok(())@@ -429,9 +429,9 @@ fn handle_squash(.to_string();// Show success immediately after completing the squash- use worktrunk::styling::{GREEN, SUCCESS_EMOJI};+ use worktrunk::styling::{GREEN, HINT, SUCCESS_EMOJI};crate::output::success(format!(- "{SUCCESS_EMOJI} {GREEN}Squashed {commit_count} commits into 1 @ {commit_hash}{GREEN:#}"+ "{SUCCESS_EMOJI} {GREEN}Squashed {commit_count} commits into 1{GREEN:#} @ {HINT}{commit_hash}{HINT:#}"))?;Ok(Some(commit_count))diff --git a/src/commands/worktree.rs b/src/commands/worktree.rsindex 4f71e7972..af1519370 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, SUCCESS_EMOJI, WARNING,- WARNING_EMOJI, format_bash_with_gutter,+ ADDITION, AnstyleStyle, CYAN, CYAN_BOLD, DELETION, GREEN, GREEN_BOLD, HINT, SUCCESS_EMOJI,+ WARNING, WARNING_EMOJI, format_bash_with_gutter,};use super::command_executor::{CommandContext, prepare_project_commands};@@ -618,7 +618,7 @@ pub fn handle_push("Pushing"};crate::output::progress(format!(- "π {CYAN}{verb_ing} {commit_count} {commit_text} to {CYAN_BOLD}{target_branch}{CYAN_BOLD:#} @ {head_sha}{CYAN:#}\n"+ "π {CYAN}{verb_ing} {commit_count} {commit_text} to {CYAN_BOLD}{target_branch}{CYAN_BOLD:#}{CYAN:#} @ {HINT}{head_sha}{HINT:#}\n"))?;// Show the commit graph with colordiff --git a/tests/common/mod.rs b/tests/common/mod.rsindex 0fc56f7b9..c7e7d48f7 100644--- a/tests/common/mod.rs+++ b/tests/common/mod.rs@@ -405,8 +405,9 @@ pub fn setup_snapshot_settings(repo: &TestRepo) -> insta::Settings {// Normalize git SHAs and backslashes// First filter SHAs wrapped in ANSI color codes (more specific pattern)- // Match: ESC[COLORmSHAESC[m (e.g., \x1b[33m0b07a58\x1b[m)- settings.add_filter(r"\x1b\[[0-9;]*m[0-9a-f]{7,40}\x1b\[m", "[SHA]");+ // Match: ESC[COLORmSHAESC[RESETm where RESET can be empty, 0, or other codes+ // Examples: \x1b[33m0b07a58\x1b[m or \x1b[2m0b07a58\x1b[0m+ settings.add_filter(r"\x1b\[[0-9;]*m[0-9a-f]{7,40}\x1b\[[0-9;]*m", "[SHA]");// Then filter plain SHAs (more general pattern)settings.add_filter(r"\b[0-9a-f]{7,40}\b", "[SHA]");settings.add_filter(r"\\", "/");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.snapindex 929558450..f246b0d01 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@@ -18,7 +18,7 @@ expression: output.normalized().as_ref()β All 47 tests passed in 2.3sπ [36mRebasing onto [1m[36mmain[0m...[0m-π [36mMerging 1 commit to [1m[36mmain[0m @ d067f01[0m+π [36mMerging 1 commit to [1m[36mmain[0m[0m @ [2md067f01[0m* [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 b22da6638..e8167e084 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@@ -15,7 +15,7 @@ expression: output.normalized().as_ref()β All 47 tests passed in 2.3sπ [36mRebasing onto [1m[36mmain[0m...[0m-π [36mMerging 1 commit to [1m[36mmain[0m @ d067f01[0m+π [36mMerging 1 commit to [1m[36mmain[0m[0m @ [2md067f01[0m* [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 0e9f1c799..92a95eaf8 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@@ -18,7 +18,7 @@ expression: output.normalized().as_ref()π [36mRebasing onto [1m[36mmain[0m...[0m-π [36mMerging 1 commit to [1m[36mmain[0m @ d067f01[0m+π [36mMerging 1 commit to [1m[36mmain[0m[0m @ [2md067f01[0m* [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_keep.snap b/tests/snapshots/integration__integration_tests__directives__merge_internal_keep.snapindex 458f64ea0..f26a96836 100644Binary files a/tests/snapshots/integration__integration_tests__directives__merge_internal_keep.snap and b/tests/snapshots/integration__integration_tests__directives__merge_internal_keep.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 a4620d677..559a0e79b 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__list__detached_head.snap b/tests/snapshots/integration__integration_tests__list__detached_head.snapindex 7b72675cc..7b5e713b1 100644--- a/tests/snapshots/integration__integration_tests__list__detached_head.snap+++ b/tests/snapshots/integration__integration_tests__list__detached_head.snap@@ -6,20 +6,22 @@ info:- listenv:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpWyUX78/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpfBULGg/test-config.toml---success: trueexit_code: 0----- stdout -----[2mBranch [0m [2mAge [0m [2mCommit [0m [2mMessage [0m [2mPath[0m-[1m[35m(detached)[0m [2m10 months ago[0m [1m[35mb834638e[0m [2mInitial commit[0m [1m[35m.[0m+[1m[35m(detached)[0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m [1m[35m.[0m[2mShowing 1 worktree[0mdiff --git a/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap b/tests/snapshots/integration__integration_tests__list__locked_no_reason.snapindex d214babbb..ea7b89609 100644--- a/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap+++ b/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap@@ -15,13 +15,13 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpKMuXWG/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpPw5Q3N/test-config.toml---success: trueexit_code: 0----- stdout -----[2mBranch [0m [2mAge [0m [2mCommit [0m [2mMessage [0m [2mState [0m [2mPath[0m-[1m[35mmain [0m [2m10 months ago[0m [1m[35mb834638e[0m [2mInitial commit[0m [1m[35m./test-repo[0m+[1m[35mmain [0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m [1m[35m./test-repo[0mlocked-no-reason [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m (locked) ./locked-no-reason[2mShowing 2 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__locked_worktree.snap b/tests/snapshots/integration__integration_tests__list__locked_worktree.snapindex c57e731cd..0b6cd9da2 100644--- a/tests/snapshots/integration__integration_tests__list__locked_worktree.snap+++ b/tests/snapshots/integration__integration_tests__list__locked_worktree.snap@@ -15,13 +15,13 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp8CpaX3/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpilr8FV/test-config.toml---success: trueexit_code: 0----- stdout -----[2mBranch [0m [2mAge [0m [2mCommit [0m [2mMessage [0m [2mState [0m [2mPath[0m-[1m[35mmain [0m [2m10 months ago[0m [1m[35mb834638e[0m [2mInitial commit[0m [1m[35m./test-repo[0m+[1m[35mmain [0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m [1m[35m./test-repo[0mlocked-feature [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m (locked: Testing lock functionality) ./locked-feature[2mShowing 2 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__long_commit_message.snap b/tests/snapshots/integration__integration_tests__list__long_commit_message.snapindex 335c662db..9e85073d7 100644--- a/tests/snapshots/integration__integration_tests__list__long_commit_message.snap+++ b/tests/snapshots/integration__integration_tests__list__long_commit_message.snap@@ -15,13 +15,13 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmptdCPqR/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp5QSYCO/test-config.toml---success: trueexit_code: 0----- stdout -----[2mBranch [0m [2mAge [0m [2mCmts [0m [2mCommit [0m [2mMessage [0m [2mPath[0m-[1m[35mmain [0m [2m10 months ago[0m [1m[35m1310bfb9[0m [2mShort message[0m [1m[35m./test-repo[0m+[1m[35mmain [0m [2m10 months ago[0m [2m1310bfb9[0m [2mShort message[0m [1m[35m./test-repo[0mfeature-a [2m10 months ago[0m [33mβ0 β1[0m [2mf078644e[0m [2mThis is a very long commit message that should...[0m ./feature-a[2mShowing 2 worktrees, 1 behind[0mdiff --git a/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap b/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snapindex 50ba51442..6acd57893 100644--- a/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap+++ b/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap@@ -15,13 +15,13 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp9lYhHU/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp57rBrF/test-config.toml---success: trueexit_code: 0----- stdout -----[2mBranch [0m [2mAge [0m [2mCommit [0m [2mMessage [0m [2mPath[0m-[1m[35mmain [0m [2m10 months ago[0m [1m[35mb834638e[0m [2mInitial commit[0m [1m[35m./test-repo[0m+[1m[35mmain [0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m [1m[35m./test-repo[0mmedium-name [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./medium-nameshort [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./shortvery-long-branch-name-here [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./very-long-branch-name-herediff --git a/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snapindex b89ebbeb1..70cbb30b8 100644--- a/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap+++ b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap@@ -6,20 +6,22 @@ info:- listenv:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp2lNVfx/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpF3BHBv/test-config.toml---success: trueexit_code: 0----- stdout -----[2mBranch [0m [2mAge [0m [2mCommit [0m [2mMessage [0m [2mPath[0m-[1m[35mmain [0m [2m10 months ago[0m [1m[35mb834638e[0m [2mInitial commit[0m [1m[35m./test-repo[0m+[1m[35mmain [0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m [1m[35m./test-repo[0mfeature-a [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./feature-afeature-b [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./feature-bdiff --git a/tests/snapshots/integration__integration_tests__list__single_worktree.snap b/tests/snapshots/integration__integration_tests__list__single_worktree.snapindex 326cd8e82..ace1b2b60 100644--- a/tests/snapshots/integration__integration_tests__list__single_worktree.snap+++ b/tests/snapshots/integration__integration_tests__list__single_worktree.snap@@ -6,20 +6,22 @@ info:- listenv:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpLgY0kv/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpXvtpOP/test-config.toml---success: trueexit_code: 0----- stdout -----[2mBranch[0m [2mAge [0m [2mCommit [0m [2mMessage [0m [2mPath[0m-[1m[35mmain [0m [2m10 months ago[0m [1m[35mb834638e[0m [2mInitial commit[0m [1m[35m.[0m+[1m[35mmain [0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m [1m[35m.[0m[2mShowing 1 worktree[0mdiff --git a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snapindex 2c1bd19cf..d2b061f4e 100644--- a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap+++ b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap@@ -15,13 +15,13 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpVBlTvV/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpTb7dXk/test-config.toml---success: trueexit_code: 0----- stdout -----[2mBranch [0m [2mAge [0m [2mCmts [0m [2mCommit [0m [2mMessage [0m [2mPath[0m-[1m[35mmain [0m [2m10 months ago[0m [1m[35me4614cb7[0m [2mFix bug with cafΓ© β handling[0m [1m[35m./test-repo[0m+[1m[35mmain [0m [2m10 months ago[0m [2me4614cb7[0m [2mFix bug with cafΓ© β handling[0m [1m[35m./test-repo[0mfeature-test [2m10 months ago[0m [33mβ0 β1[0m [2m0c53695b[0m [2mAdd support for ζ₯ζ¬θͺ and...[0m ./feature-test[2mShowing 2 worktrees, 1 behind[0mdiff --git a/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap b/tests/snapshots/integration__integration_tests__list__with_branches_flag.snapindex 0a833c2a9..4e111b0e3 100644--- a/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap+++ b/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap@@ -16,13 +16,13 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0bKwSg/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp7sIyMZ/test-config.toml---success: trueexit_code: 0----- stdout -----[2mBranch [0m [2mAge [0m [2mCommit [0m [2mMessage [0m [2mPath[0m-[1m[35mmain [0m [2m10 months ago[0m [1m[35mb834638e[0m [2mInitial commit[0m [1m[35m./test-repo[0m+[1m[35mmain [0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m [1m[35m./test-repo[0mfeature-with-worktree [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./feature-with-worktreeanother-branch [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0mfeature-without-worktree [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0mdiff --git a/tests/snapshots/integration__integration_tests__list__with_branches_flag_none_available.snap b/tests/snapshots/integration__integration_tests__list__with_branches_flag_none_available.snapindex f39cdd921..9c2cf9cdd 100644--- a/tests/snapshots/integration__integration_tests__list__with_branches_flag_none_available.snap+++ b/tests/snapshots/integration__integration_tests__list__with_branches_flag_none_available.snap@@ -7,20 +7,22 @@ info:- "--branches"env:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp1Iw3U2/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmphPAgwk/test-config.toml---success: trueexit_code: 0----- stdout -----[2mBranch [0m [2mAge [0m [2mCommit [0m [2mMessage [0m [2mPath[0m-[1m[35mmain [0m [2m10 months ago[0m [1m[35mb834638e[0m [2mInitial commit[0m [1m[35m./test-repo[0m+[1m[35mmain [0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m [1m[35m./test-repo[0mfeature-a [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./feature-afeature-b [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./feature-bdiff --git a/tests/snapshots/integration__integration_tests__list__with_branches_flag_only_branches.snap b/tests/snapshots/integration__integration_tests__list__with_branches_flag_only_branches.snapindex d59ef8d66..340385fb3 100644--- a/tests/snapshots/integration__integration_tests__list__with_branches_flag_only_branches.snap+++ b/tests/snapshots/integration__integration_tests__list__with_branches_flag_only_branches.snap@@ -7,20 +7,22 @@ info:- "--branches"env:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpEaGsTo/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpcu13Lb/test-config.toml---success: trueexit_code: 0----- stdout -----[2mBranch [0m [2mAge [0m [2mCommit [0m [2mMessage [0m [2mPath[0m-[1m[35mmain [0m [2m10 months ago[0m [1m[35mb834638e[0m [2mInitial commit[0m [1m[35m.[0m+[1m[35mmain [0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m [1m[35m.[0mbranch-alpha [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0mbranch-beta [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0mbranch-gamma [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0mdiff --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 5dd1bc581..b311c37a4 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@@ -19,7 +19,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/.tmpcStXH3/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpGIeJXC/test-config.toml---success: trueexit_code: 0@@ -33,9 +33,9 @@ exit_code: 0[40m [0m - feat: add file 1[40m [0m - feat: add file 2-β [32mSquashed 2 commits into 1 @ [SHA][0m+β [32mSquashed 2 commits into 1[0m @ [SHA]π [36mRebasing onto [1m[36mmain[0m...[0m-π [36mMerging 1 commit to [1m[36mmain[0m @ [SHA][0m+π [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [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 89c65e0a4..ba2730b16 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/.tmpihdRQG/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpodbChs/test-config.toml---success: trueexit_code: 0@@ -26,9 +26,9 @@ 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 @ [SHA][0m+β [32mCommitted changes[0m @ [SHA]π [36mRebasing onto [1m[36mmain[0m...[0m-π [36mMerging 2 commits to [1m[36mmain[0m @ [SHA][0m+π [36mMerging 2 commits to [1m[36mmain[0m[0m @ [SHA]* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m WIP: Auto-commit before merge* [SHA] feat: initial featurediff --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 e1a165802..255bf2069 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/.tmpKEHACQ/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpxZUCEr/test-config.toml---success: trueexit_code: 0@@ -28,9 +28,9 @@ 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 @ [SHA][0m+β [32mCommitted changes[0m @ [SHA]π [36mRebasing onto [1m[36mmain[0m...[0m-π [36mMerging 2 commits to [1m[36mmain[0m @ [SHA][0m+π [36mMerging 2 commits to [1m[36mmain[0m[0m @ [SHA]* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m WIP: Auto-commit before merge* [SHA] feat: add authenticationdiff --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 d7cb802b9..4b52aef9a 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/.tmpRNzM33/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp7Dsi4E/test-config.toml---success: trueexit_code: 0@@ -26,9 +26,9 @@ 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 @ [SHA][0m+β [32mCommitted changes[0m @ [SHA]π [36mRebasing onto [1m[36mmain[0m...[0m-π [36mMerging 1 commit to [1m[36mmain[0m @ [SHA][0m+π [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [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 a96b855b9..b90830fb1 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_fast_forward.snap@@ -16,13 +16,13 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp2LUcmx/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpTqcYRR/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mRebasing onto [1m[36mmain[0m...[0m-π [36mMerging 1 commit to [1m[36mmain[0m @ [SHA][0m+π [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [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_not_fast_forward.snap b/tests/snapshots/integration__integration_tests__merge__merge_not_fast_forward.snapindex aed34e706..0e93db4cb 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,13 +16,13 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmppgXnRW/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpWqopvB/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mRebasing onto [1m[36mmain[0m...[0m-π [36mMerging 1 commit to [1m[36mmain[0m @ [SHA][0m+π [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [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 39d1e8287..f7cb1c925 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,13 +17,13 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp44Y4sI/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpyCBIMe/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mRebasing onto [1m[36mmain[0m...[0m-π [36mMerging 1 commit to [1m[36mmain[0m @ [SHA][0m+π [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [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 3de31f1a7..c7e672ac8 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,13 +17,13 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpEGCnAp/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpKb79NL/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mRebasing onto [1m[36mmain[0m...[0m-π [36mMerging 1 commit to [1m[36mmain[0m @ [SHA][0m+π [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [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 c3b57d39d..84c5d77a5 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,13 +17,13 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp3cHHCs/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpu70TEh/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mRebasing onto [1m[36mmain[0m...[0m-π [36mMerging 1 commit to [1m[36mmain[0m @ [SHA][0m+π [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [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 62ce75908..85d5dafa1 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/.tmp0nZSev/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpq6Fqrm/test-config.toml---success: trueexit_code: 0@@ -30,9 +30,9 @@ 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 @ [SHA][0m+β [32mCommitted changes[0m @ [SHA]π [36mRebasing onto [1m[36mmain[0m...[0m-π [36mMerging 1 commit to [1m[36mmain[0m @ [SHA][0m+π [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [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 a74a91ea5..d402fe669 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@@ -14,7 +14,7 @@ STDERR-FROM-FIRSTSTDOUT-FROM-SECONDSTDERR-FROM-SECONDπ [36mRebasing onto [1m[36mmain[0m...[0m-π [36mMerging 1 commit to [1m[36mmain[0m @ [SHA][0m+π [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [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 74ce28029..d55bbd990 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/.tmpySXfo5/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpPrCPpK/test-config.toml---success: trueexit_code: 0@@ -32,7 +32,7 @@ exit_code: 0[40m [0m [1m[34mexit 0π [36mRebasing onto [1m[36mmain[0m...[0m-π [36mMerging 1 commit to [1m[36mmain[0m @ [SHA][0m+π [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [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_no_hooks.snap b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_no_hooks.snapindex a86014f55..24a3b5e4e 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_no_hooks.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_pre_merge_command_no_hooks.snap@@ -17,13 +17,13 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpJUdrZx/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpb7lKGC/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mRebasing onto [1m[36mmain[0m...[0m-π [36mMerging 1 commit to [1m[36mmain[0m @ [SHA][0m+π [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [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 f11e0548f..d2dd57f17 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/.tmpQtLd9m/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpFCOghX/test-config.toml---success: trueexit_code: 0@@ -29,7 +29,7 @@ exit_code: 0[40m [0m [1m[34m[PROJECT_ROOT]/tests/fixtures/mixed-output.sh check2 3π [36mRebasing onto [1m[36mmain[0m...[0m-π [36mMerging 1 commit to [1m[36mmain[0m @ [SHA][0m+π [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [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 cf3b29f2f..f6e24bd9c 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/.tmpOMFxAN/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpEcOa0w/test-config.toml---success: trueexit_code: 0@@ -26,7 +26,7 @@ exit_code: 0[40m [0m [1m[34mexit 0π [36mRebasing onto [1m[36mmain[0m...[0m-π [36mMerging 1 commit to [1m[36mmain[0m @ [SHA][0m+π [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [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 3c6e0b735..fdf980ab0 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@@ -18,7 +18,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp2Pp0c4/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpFRZNsw/test-config.toml---success: trueexit_code: 0@@ -28,7 +28,7 @@ exit_code: 0π‘ [2mOnly 1 commit since [1m[36mmain[0m - no squashing needed[0mπ [36mRebasing onto [1m[36mmain[0m...[0m-π [36mMerging 1 commit to [1m[36mmain[0m @ [SHA][0m+π [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [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 21d8de3af..260dbac68 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_squash_deterministic.snap@@ -17,7 +17,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpzPj54S/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0Vk3gf/test-config.toml---success: trueexit_code: 0@@ -32,9 +32,9 @@ exit_code: 0[40m [0m - fix: update logic[40m [0m - docs: update readme-β [32mSquashed 3 commits into 1 @ [SHA][0m+β [32mSquashed 3 commits into 1[0m @ [SHA]π [36mRebasing onto [1m[36mmain[0m...[0m-π [36mMerging 1 commit to [1m[36mmain[0m @ [SHA][0m+π [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [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 7cf32c810..1e00b1609 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@@ -18,7 +18,7 @@ info:LC_ALL: CSOURCE_DATE_EPOCH: "1761609600"WORKTRUNK_COMMIT_GENERATION__COMMAND: nonexistent-llm-command- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpcSbP5q/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpPUipYd/test-config.toml---success: trueexit_code: 0@@ -32,9 +32,9 @@ exit_code: 0[40m [0m - feat: new feature[40m [0m - fix: bug fix-β [32mSquashed 2 commits into 1 @ [SHA][0m+β [32mSquashed 2 commits into 1[0m @ [SHA]π [36mRebasing onto [1m[36mmain[0m...[0m-π [36mMerging 1 commit to [1m[36mmain[0m @ [SHA][0m+π [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [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 5361e071f..8b740a754 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@@ -17,14 +17,14 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpjRu5dO/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpyYVGir/test-config.toml---success: trueexit_code: 0----- stdout -----π‘ [2mOnly 1 commit since [1m[36mmain[0m - no squashing needed[0mπ [36mRebasing onto [1m[36mmain[0m...[0m-π [36mMerging 1 commit to [1m[36mmain[0m @ [SHA][0m+π [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [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 89d0758ae..69e798e82 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@@ -20,7 +20,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/.tmp1sT6wJ/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpUoVJyx/test-config.toml---success: trueexit_code: 0@@ -34,9 +34,9 @@ exit_code: 0[40m [0m - feat: add authentication[40m [0m - fix: handle edge case-β [32mSquashed 2 commits into 1 @ [SHA][0m+β [32mSquashed 2 commits into 1[0m @ [SHA]π [36mRebasing onto [1m[36mmain[0m...[0m-π [36mMerging 1 commit to [1m[36mmain[0m @ [SHA][0m+π [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [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 c9c30fa49..0cf5045f9 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_to_default.snap@@ -15,13 +15,13 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp8rFQyH/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp6kCcxR/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mRebasing onto [1m[36mmain[0m...[0m-π [36mMerging 1 commit to [1m[36mmain[0m @ [SHA][0m+π [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [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_keep.snap b/tests/snapshots/integration__integration_tests__merge__merge_with_keep.snapindex e0601b29c..381f678ff 100644--- a/tests/snapshots/integration__integration_tests__merge__merge_with_keep.snap+++ b/tests/snapshots/integration__integration_tests__merge__merge_with_keep.snap@@ -17,13 +17,13 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpOXbS7l/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpdJ8MB6/test-config.toml---success: trueexit_code: 0----- stdout -----π [36mRebasing onto [1m[36mmain[0m...[0m-π [36mMerging 1 commit to [1m[36mmain[0m @ [SHA][0m+π [36mMerging 1 commit to [1m[36mmain[0m[0m @ [SHA]* [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_fast_forward.snap b/tests/snapshots/integration__integration_tests__push__push_fast_forward.snapindex c99f6b7bb..abdc7807a 100644--- a/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap+++ b/tests/snapshots/integration__integration_tests__push__push_fast_forward.snap@@ -7,19 +7,21 @@ info:- mainenv:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpPzjGj4/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmprzvDes/test-config.toml---success: trueexit_code: 0----- stdout ------π [36mPushing 1 commit to [1m[36mmain[0m @ [SHA][0m+π [36mPushing 1 commit to [1m[36mmain[0m[0m @ [SHA]* [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 92518dabf..ac540c37e 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@@ -7,19 +7,21 @@ info:- mainenv:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpOTPr9A/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0RHF3w/test-config.toml---success: trueexit_code: 0----- stdout ------π [36mPushing 1 commit to [1m[36mmain[0m @ [SHA][0m+π [36mPushing 1 commit to [1m[36mmain[0m[0m @ [SHA]* [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 a191b2459..937345cf7 100644--- a/tests/snapshots/integration__integration_tests__push__push_to_default.snap+++ b/tests/snapshots/integration__integration_tests__push__push_to_default.snap@@ -6,19 +6,21 @@ info:- pushenv:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpcNkUmR/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpIMg60w/test-config.toml---success: trueexit_code: 0----- stdout ------π [36mPushing 1 commit to [1m[36mmain[0m @ [SHA][0m+π [36mPushing 1 commit to [1m[36mmain[0m[0m @ [SHA]* [SHA][33m ([m[1;36mHEAD[m[33m -> [m[1;32mfeature[m[33m)[m Add feature filediff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_empty_diffs.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_empty_diffs.snapindex f89761921..d0c1d82fa 100644--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_empty_diffs.snap+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_empty_diffs.snap@@ -11,16 +11,17 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpbebCfO/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpGSIXL4/test-config.toml---success: trueexit_code: 0----- stdout -----[2mBranch [0m [2mAge [0m [2mWT +/-[0m [2mCommit [0m [2mMessage [0m [2mPath[0m-[1m[35mmain [0m [2m10 months ago[0m [1m[35mb834638e[0m [2mInitial commit[0m [1m[35m./test-repo[0m+[1m[35mmain [0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m [1m[35m./test-repo[0malso-no-changes [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./also-no-changesno-changes [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./no-changeswith-changes [2m10 months ago[0m [32m+1[0m [31m-1[0m [2mb834638e[0m [2mInitial commit[0m ./with-changesdiff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_extreme_diffs.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_extreme_diffs.snapindex 264d9dd5f..923cf3adc 100644--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_extreme_diffs.snap+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_extreme_diffs.snap@@ -11,16 +11,17 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpXM5mjB/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpYfRjbN/test-config.toml---success: trueexit_code: 0----- stdout -----[2mBranch[0m [2mAge [0m [2mWT +/-[0m [2mCommit [0m [2mMessage [0m [2mPath[0m-[1m[35mmain [0m [2m10 months ago[0m [1m[35mb834638e[0m [2mInitial commit[0m [1m[35m./test-repo[0m+[1m[35mmain [0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m [1m[35m./test-repo[0mhuge [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./hugetiny [2m10 months ago[0m [32m+1[0m [31m-1[0m [2mb834638e[0m [2mInitial commit[0m ./tinydiff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_varying_diffs.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_varying_diffs.snapindex 4d30d491b..bf9f3b117 100644--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_varying_diffs.snap+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_varying_diffs.snap@@ -11,16 +11,17 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpjaWmpc/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmplxKChq/test-config.toml---success: trueexit_code: 0----- stdout -----[2mBranch [0m [2mAge [0m [2mCommit [0m [2mMessage [0m [2mPath[0m-[1m[35mmain [0m [2m10 months ago[0m [1m[35mb834638e[0m [2mInitial commit[0m [1m[35m./test-repo[0m+[1m[35mmain [0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m [1m[35m./test-repo[0mfeature-large [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./feature-largefeature-medium [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./feature-mediumfeature-small [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./feature-smalldiff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__long_branch_names.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__long_branch_names.snapindex c25cd3f3e..c76001c19 100644--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__long_branch_names.snap+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__long_branch_names.snap@@ -15,13 +15,13 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp9fmblF/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpwvBiav/test-config.toml---success: trueexit_code: 0----- stdout -----[2mBranch [0m [2mAge [0m [2mCommit [0m [2mMessage [0m [2mPath[0m-[1m[35mmain [0m [2m10 months ago[0m [1m[35mb834638e[0m [2mInitial commit[0m [1m[35m./test-repo[0m+[1m[35mmain [0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m [1m[35m./test-repo[0manother-extremely-long-name-here [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./another-extremely-long-name-hereshort [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./shortvery-long-feature-branch-name [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./very-long-feature-branch-namediff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__mixed_length_branch_names.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__mixed_length_branch_names.snapindex c6bb6eac6..0db560194 100644--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__mixed_length_branch_names.snap+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__mixed_length_branch_names.snap@@ -15,13 +15,13 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpLwaTxi/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpjsxP59/test-config.toml---success: trueexit_code: 0----- stdout -----[2mBranch[0m [2mAge [0m [2mCommit [0m [2mMessage [0m [2mPath[0m-[1m[35mmain [0m [2m10 months ago[0m [1m[35mb834638e[0m [2mInitial commit[0m [1m[35m./test-repo[0m+[1m[35mmain [0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m [1m[35m./test-repo[0mlong [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./extremely-long-branch-name-that-might-cause-layout-issuesmedium [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./medium-length-namex [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./xdiff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__short_branch_names.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__short_branch_names.snapindex ba02440e0..a55b99844 100644--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__short_branch_names.snap+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__short_branch_names.snap@@ -6,20 +6,22 @@ info:- listenv:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp8GTF6X/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpI8zC5b/test-config.toml---success: trueexit_code: 0----- stdout -----[2mBranch[0m [2mAge [0m [2mCommit [0m [2mMessage [0m [2mPath[0m-[1m[35mmain [0m [2m10 months ago[0m [1m[35mb834638e[0m [2mInitial commit[0m [1m[35m./test-repo[0m+[1m[35mmain [0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m [1m[35m./test-repo[0ma [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./abb [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./bbccc [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./cccdiff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_120.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_120.snapindex c0f2a3f38..071cc961a 100644--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_120.snap+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_120.snap@@ -11,16 +11,17 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpiLx3pr/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpD3scqm/test-config.toml---success: trueexit_code: 0----- stdout -----[2mBranch [0m [2mAge [0m [2mCommit [0m [2mMessage [0m [2mPath[0m-[1m[35mmain [0m [2m10 months ago[0m [1m[35ma7bc47ca[0m [2mInitial commit with a reasonably long message[0m [1m[35m./test-repo[0m+[1m[35mmain [0m [2m10 months ago[0m [2ma7bc47ca[0m [2mInitial commit with a reasonably long message[0m [1m[35m./test-repo[0mfeature-a [2m10 months ago[0m [2ma7bc47ca[0m [2mInitial commit with a reasonably long message[0m ./feature-afeature-b [2m10 months ago[0m [2ma7bc47ca[0m [2mInitial commit with a reasonably long message[0m ./feature-bdiff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_150.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_150.snapindex 7642c615b..f657bb099 100644--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_150.snap+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_150.snap@@ -11,16 +11,17 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp5ntu1M/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpGaBRvL/test-config.toml---success: trueexit_code: 0----- stdout -----[2mBranch [0m [2mAge [0m [2mCommit [0m [2mMessage [0m [2mPath[0m-[1m[35mmain [0m [2m10 months ago[0m [1m[35ma7bc47ca[0m [2mInitial commit with a reasonably long message[0m [1m[35m./test-repo[0m+[1m[35mmain [0m [2m10 months ago[0m [2ma7bc47ca[0m [2mInitial commit with a reasonably long message[0m [1m[35m./test-repo[0mfeature-a [2m10 months ago[0m [2ma7bc47ca[0m [2mInitial commit with a reasonably long message[0m ./feature-afeature-b [2m10 months ago[0m [2ma7bc47ca[0m [2mInitial commit with a reasonably long message[0m ./feature-bdiff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_80.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_80.snapindex 16f457952..03b1e0b67 100644--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_80.snap+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_80.snap@@ -11,16 +11,17 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpKeLXld/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpjK3f7K/test-config.toml---success: trueexit_code: 0----- stdout -----[2mBranch [0m [2mAge [0m [2mCommit [0m [2mMessage [0m [2mPath[0m-[1m[35mmain [0m [2m10 months ago[0m [1m[35ma7bc47ca[0m [2mInitial commit with a...[0m [1m[35m./test-repo[0m+[1m[35mmain [0m [2m10 months ago[0m [2ma7bc47ca[0m [2mInitial commit with a...[0m [1m[35m./test-repo[0mfeature-a [2m10 months ago[0m [2ma7bc47ca[0m [2mInitial commit with a...[0m ./feature-afeature-b [2m10 months ago[0m [2ma7bc47ca[0m [2mInitial commit with a...[0m ./feature-bdiff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__unicode_branch_names.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__unicode_branch_names.snapindex 15e4a8e83..b206a8d09 100644--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__unicode_branch_names.snap+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__unicode_branch_names.snap@@ -6,20 +6,22 @@ info:- listenv:CLICOLOR_FORCE: "1"+ COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpltIkcg/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpPtgOB7/test-config.toml---success: trueexit_code: 0----- stdout -----[2mBranch[0m [2mAge [0m [2mCommit [0m [2mMessage [0m [2mPath[0m-[1m[35mmain [0m [2m10 months ago[0m [1m[35mb834638e[0m [2mInitial commit[0m [1m[35m./test-repo[0m+[1m[35mmain [0m [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m [1m[35m./test-repo[0mcafe [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./cafΓ©naive [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./naΓ―veresume [2m10 months ago[0m [2mb834638e[0m [2mInitial commit[0m ./rΓ©sumΓ©