Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
feat: Indicate main worktree in list output
Maximilian Roos2a56fe64391f
diff --git a/src/commands/list/collect.rs b/src/commands/list/collect.rsindex e72cfcb4f..2fd24592b 100644--- a/src/commands/list/collect.rs+++ b/src/commands/list/collect.rs@@ -262,6 +262,13 @@ fn compute_item_status_symbols(branch_state};+ // Override main_divergence for the main worktree+ let main_divergence = if data.is_main {+ MainDivergence::IsMain+ } else {+ main_divergence+ };+item.status_symbols = Some(StatusSymbols {branch_state,git_operation,diff --git a/src/commands/list/model.rs b/src/commands/list/model.rsindex b5930e6a9..3a4668753 100644--- a/src/commands/list/model.rs+++ b/src/commands/list/model.rs@@ -277,6 +277,8 @@ pub enum MainDivergence {/// Up to date with main branch#[default]None,+ /// This is the main/default branch itself+ IsMain,/// Ahead of main (has commits main doesn't have)Ahead,/// Behind main (missing commits from main)@@ -289,6 +291,7 @@ impl std::fmt::Display for MainDivergence {fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {match self {Self::None => Ok(()),+ Self::IsMain => write!(f, "^"),Self::Ahead => write!(f, "↑"),Self::Behind => write!(f, "↓"),Self::Diverged => write!(f, "↕"),@@ -448,7 +451,7 @@ impl PositionMask {5, // WORKING_TREE: ?!+»✘ (max 5 symbols)1, // BRANCH_STATE: ✖⚠≡∅ (1 char, mutually exclusive)1, // GIT_OPERATION: ↻ or ⋈ (1 char)- 1, // MAIN_DIVERGENCE: ↑, ↓, ↕ (1 char)+ 1, // MAIN_DIVERGENCE: ^, ↑, ↓, ↕ (1 char)1, // UPSTREAM_DIVERGENCE: ⇡, ⇣, ⇅ (1 char)1, // ITEM_ATTRS: ⎇ for branches, ⌫⊠ for worktrees (priority-only: prunable > locked)2, // USER_STATUS: single emoji or two chars (allocate 2)@@ -467,7 +470,7 @@ impl PositionMask {/// - Working tree: ?, !, +, », ✘/// - Branch state: ✖, ⚠, ≡, ∅ (mutually exclusive)/// - Git operation: ↻, ⋈-/// - Main divergence: ↑, ↓, ↕+/// - Main divergence: ^, ↑, ↓, ↕/// - Upstream divergence: ⇡, ⇣, ⇅/// - Item attributes: ⎇ for branches, ⌫⊠ for worktrees (priority-only)/// - User status: custom labels, emoji@@ -477,7 +480,7 @@ impl PositionMask {/// **Mutually exclusive (enforced by type system):**/// - ✖ vs ⚠ vs ≡ vs ∅: BranchState enum (combined position)/// - ↻ vs ⋈: Git operation (GitOperation enum)-/// - ↑ vs ↓ vs ↕: Main divergence (MainDivergence enum)+/// - ^ vs ↑ vs ↓ vs ↕: Main divergence (MainDivergence enum)/// - ⇡ vs ⇣ vs ⇅: Upstream divergence (UpstreamDivergence enum)////// **Priority-only (can co-occur but only highest priority shown):**@@ -741,6 +744,7 @@ impl serde::Serialize for StatusSymbols {let main_divergence_variant = match self.main_divergence {MainDivergence::None => "",+ MainDivergence::IsMain => "IsMain",MainDivergence::Ahead => "Ahead",MainDivergence::Behind => "Behind",MainDivergence::Diverged => "Diverged",diff --git a/tests/common/list_snapshots.rs b/tests/common/list_snapshots.rsindex 2cd84c463..9c53745e5 100644--- a/tests/common/list_snapshots.rs+++ b/tests/common/list_snapshots.rs@@ -10,6 +10,7 @@ fn base_settings(repo: &TestRepo) -> Settings {settings.add_filter(r"\\", "/");// Redact volatile metadata captured by insta-cmd (same as common::setup_snapshot_settings)+ settings.add_redaction(".env.GIT_CONFIG_GLOBAL", "[TEST_GIT_CONFIG]");settings.add_redaction(".env.WORKTRUNK_CONFIG_PATH", "[TEST_CONFIG]");settings.add_redaction(".env.HOME", "[TEST_HOME]");settings.add_redaction(".env.XDG_CONFIG_HOME", "[TEST_CONFIG_HOME]");diff --git a/tests/integration_tests/security.rs b/tests/integration_tests/security.rsindex 2ba92dd85..e56329da8 100644--- a/tests/integration_tests/security.rs+++ b/tests/integration_tests/security.rs@@ -373,6 +373,8 @@ fn test_commit_message_with_directive_not_executed() {#[cfg(unix)]#[test]fn test_path_with_directive_not_executed() {+ use crate::common::setup_snapshot_settings;+let repo = TestRepo::new();repo.commit("Initial commit");@@ -382,8 +384,7 @@ fn test_path_with_directive_not_executed() {.join("__WORKTRUNK_EXEC__echo PWNED > /tmp/hacked5");std::fs::create_dir_all(&malicious_dir).expect("Failed to create malicious directory");- let mut settings = Settings::clone_current();- settings.set_snapshot_path("../snapshots");+ let settings = setup_snapshot_settings(&repo);// Run a command that might display this pathsettings.bind(|| {diff --git a/tests/integration_tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snap b/tests/integration_tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snapindex 26ff5280f..5648c624f 100644--- a/tests/integration_tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snap+++ b/tests/integration_tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snap@@ -14,7 +14,7 @@ info:LC_ALL: CNO_COLOR: ""SOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpRpftLl/test-config.toml+ WORKTRUNK_CONFIG: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpPGzGyI/test-config.toml---success: trueexit_code: 0@@ -22,7 +22,7 @@ exit_code: 0----- stderr -----Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message-@ main ./test-repo.main 6c3da842 10 months ago Initial commit on main+@ main ^ ./test-repo.main 6c3da842 10 months ago Initial commit on main+ feature ↑ ↑1 ./test-repo.feature 72413a3b 10 months ago Work on feature⚪ Showing 2 worktrees, 1 aheaddiff --git a/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snap b/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snapindex c4114d30c..6fdc68fb2 100644--- a/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snap+++ b/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snap@@ -10,16 +10,13 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpOJlRh4/test-gitconfigGIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp7zaUWv/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpOJlRh4/test-config.toml---success: trueexit_code: 0@@ -27,6 +24,6 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1m[35mmain[0m [1m[35m.[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+@ [1m[35mmain[0m [2m^[0m [1m[35m.[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 1 worktree[0mdiff --git a/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snap b/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snapindex 553555146..7ad42a1f8 100644--- a/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snap+++ b/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snap@@ -10,11 +10,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -27,7 +24,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1m[35mmain[0m [1m[35m.[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+@ [1m[35mmain[0m [2m^[0m [1m[35m.[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m[2mbranch-only[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 1 worktrees, 1 branches[0mdiff --git a/tests/snapshots/integration__integration_tests__list__default_branch_missing_worktree.snap b/tests/snapshots/integration__integration_tests__list__default_branch_missing_worktree.snapindex 51b8264d7..2ccf783a5 100644--- a/tests/snapshots/integration__integration_tests__list__default_branch_missing_worktree.snap+++ b/tests/snapshots/integration__integration_tests__list__default_branch_missing_worktree.snap@@ -9,11 +9,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -26,6 +23,6 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1m[35mdevelop[0m [1m[35m.[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+@ [1m[35mdevelop[0m [2m^[0m [1m[35m.[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 1 worktree[0mdiff --git a/tests/snapshots/integration__integration_tests__list__detached_head.snap b/tests/snapshots/integration__integration_tests__list__detached_head.snapindex 5843523cb..3be0333e0 100644--- a/tests/snapshots/integration__integration_tests__list__detached_head.snap+++ b/tests/snapshots/integration__integration_tests__list__detached_head.snap@@ -9,11 +9,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -26,6 +23,6 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1m[35m-[0m [1m[35m.[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+@ [1m[35m-[0m [2m^[0m [1m[35m.[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 1 worktree[0mdiff --git a/tests/snapshots/integration__integration_tests__list__json_with_display_fields.snap b/tests/snapshots/integration__integration_tests__list__json_with_display_fields.snapindex faa6e1270..831ba79c2 100644--- a/tests/snapshots/integration__integration_tests__list__json_with_display_fields.snap+++ b/tests/snapshots/integration__integration_tests__list__json_with_display_fields.snap@@ -10,11 +10,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -50,14 +47,14 @@ exit_code: 0},"branch_state": "","git_operation": "",- "main_divergence": "",+ "main_divergence": "IsMain","upstream_divergence": ""},"status_symbols": {"working_tree": "","branch_state": "","git_operation": "",- "main_divergence": "",+ "main_divergence": "^","upstream_divergence": "","worktree_attrs": ""},diff --git a/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap b/tests/snapshots/integration__integration_tests__list__json_with_metadata.snapindex b023be851..23d32bf21 100644--- a/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap+++ b/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap@@ -10,11 +10,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -50,14 +47,14 @@ exit_code: 0},"branch_state": "","git_operation": "",- "main_divergence": "",+ "main_divergence": "IsMain","upstream_divergence": ""},"status_symbols": {"working_tree": "","branch_state": "","git_operation": "",- "main_divergence": "",+ "main_divergence": "^","upstream_divergence": "","worktree_attrs": ""},diff --git a/tests/snapshots/integration__integration_tests__list__json_with_user_status.snap b/tests/snapshots/integration__integration_tests__list__json_with_user_status.snapindex 6c5b291fd..3faa5db46 100644--- a/tests/snapshots/integration__integration_tests__list__json_with_user_status.snap+++ b/tests/snapshots/integration__integration_tests__list__json_with_user_status.snap@@ -10,11 +10,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -50,14 +47,14 @@ exit_code: 0},"branch_state": "","git_operation": "",- "main_divergence": "",+ "main_divergence": "IsMain","upstream_divergence": ""},"status_symbols": {"working_tree": "","branch_state": "","git_operation": "",- "main_divergence": "",+ "main_divergence": "^","upstream_divergence": "","worktree_attrs": ""},diff --git a/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap b/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snapindex f238edb21..88ef9fb1e 100644--- a/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap+++ b/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap@@ -9,11 +9,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -26,7 +23,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+@ [1m[35mmain[0m [2m^[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ diverged [36m![0m [2m↑[0m 💬 [32m+40[0m [31m-60[0m [32m↑1[0m ./diverged [2m8ba5aa92[0m [2m10 months ago[0m [2mDiverged commit[0m+ feature-changes [36m?![0m [2m↑[0m 🤖 [32m+50[0m [31m-100[0m [32m↑1[0m ./feature-changes [2mb854b166[0m [2m10 months ago[0m [2mAdd 100 lines[0m+ [2mfix[0m [36m?[0m [2m≡[0m 💬 [2m./fix[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0mdiff --git a/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap b/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snapindex 85e542d20..3b2bda961 100644--- a/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap+++ b/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap@@ -9,11 +9,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -26,7 +23,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-^ [36mmain[0m [36m./test-repo[0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0m+^ [36mmain[0m [2m^[0m [36m./test-repo[0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0m@ [1m[35mfeature-current[0m [2m↑[0m [32m↑1[0m [1m[35m./feature-current[0m [2mfc28a4d1[0m [2m9 months ago[0m [2mCommit at 01:00[0m+ feature-newest [2m↑[0m [32m↑1[0m ./feature-newest [2m136358eb[0m [2m9 months ago[0m [2mCommit at 03:00[0m+ feature-middle [2m↑[0m [32m↑1[0m ./feature-middle [2ma0a4851a[0m [2m9 months ago[0m [2mCommit at 02:00[0mdiff --git a/tests/snapshots/integration__integration_tests__list__list_primary_on_different_branch.snap b/tests/snapshots/integration__integration_tests__list__list_primary_on_different_branch.snapindex 7f6edb921..c62fc9852 100644--- a/tests/snapshots/integration__integration_tests__list__list_primary_on_different_branch.snap+++ b/tests/snapshots/integration__integration_tests__list__list_primary_on_different_branch.snap@@ -9,11 +9,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -26,7 +23,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1m[35mdevelop[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+@ [1m[35mdevelop[0m [2m^[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ [2mfeature-a[0m [2m≡[0m [2m./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ [2mfeature-b[0m [2m≡[0m [2m./feature-b[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0mdiff --git a/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snap b/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snapindex fa1ecf4fc..91c51f728 100644--- a/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snap+++ b/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snap@@ -4,7 +4,7 @@ info:program: wtargs:- "-C"- - /private/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmppL7rf6/test-repo+ - /private/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpJ6jRiw/test-repo- listenv:CLICOLOR_FORCE: "1"@@ -17,7 +17,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+@ [1m[35mmain[0m [2m^[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ [2mfeature-a[0m [2m≡[0m [2m./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ [2mfeature-b[0m [2m≡[0m [2m./feature-b[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0mdiff --git a/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap b/tests/snapshots/integration__integration_tests__list__locked_no_reason.snapindex 45723a217..ea2f18df0 100644--- a/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap+++ b/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap@@ -9,11 +9,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -26,7 +23,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+@ [1m[35mmain[0m [2m^[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ [2mlocked-no-reason[0m [2m≡[0m [33m⊠[0m [2m./locked-no-reason[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [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 1c11bf724..f82e234b4 100644--- a/tests/snapshots/integration__integration_tests__list__locked_worktree.snap+++ b/tests/snapshots/integration__integration_tests__list__locked_worktree.snap@@ -9,11 +9,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -26,7 +23,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+@ [1m[35mmain[0m [2m^[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ [2mlocked-feature[0m [2m≡[0m [33m⊠[0m [2m./locked-feature[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [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 c931fdec0..91bfed030 100644--- a/tests/snapshots/integration__integration_tests__list__long_commit_message.snap+++ b/tests/snapshots/integration__integration_tests__list__long_commit_message.snap@@ -9,11 +9,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -26,7 +23,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1m[35mmain[0m [1m[35m./test-repo[0m [2m1310bfb9[0m [2m10 months ago[0m [2mShort message[0m+@ [1m[35mmain[0m [2m^[0m [1m[35m./test-repo[0m [2m1310bfb9[0m [2m10 months ago[0m [2mShort message[0m+ [2mfeature-a[0m [2m∅[0m [2m↓[0m [2m[31m↓1[0m [2m./feature-a[0m [2mf078644e[0m [2m10 months ago[0m [2mThis is a very long commit message that should…[0m⚪ [2mShowing 2 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap b/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snapindex 727da5bb3..b796100d3 100644--- a/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap+++ b/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap@@ -9,11 +9,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -26,7 +23,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m-@ [1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m+@ [1m[35mmain[0m [2m^[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m+ [2mmedium-name[0m [2m≡[0m [2m./medium-name[0m [2mb834638e[0m [2m10 months ago[0m+ [2mshort[0m [2m≡[0m [2m./short[0m [2mb834638e[0m [2m10 months ago[0m+ [2mvery-long-branch-name-here[0m [2m≡[0m [2m./very-long-branch-name-here[0m [2mb834638e[0m [2m10 months ago[0mdiff --git a/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap b/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snapindex e5de3ac8a..40e0677ef 100644--- a/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap+++ b/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap@@ -10,11 +10,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -27,7 +24,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mmain…±[0m [1mPath[0m [1mRemote⇅[0m [1mCI[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1m[35mmain[0m [2m⇡[0m [1m[35m./test-repo[0m [32m↑1[0m [2m[31m↓0[0m [2m85ed6d3d[0m [2m10 months ago[0m [2mMain advances[0m+@ [1m[35mmain[0m [2m^[0m[2m⇡[0m [1m[35m./test-repo[0m [32m↑1[0m [2m[31m↓0[0m [2m85ed6d3d[0m [2m10 months ago[0m [2mMain advances[0m+ feature [36m?!+»✘[0m[33m⚠[0m [2m↕[0m[2m⇅[0m[33m⊠[0m🤖 [32m+2[0m [31m-2[0m [32m↑2[0m [2m[31m↓1[0m [32m+3[0m [31m-1[0m ./feature [32m↑1[0m [2m[31m↓1[0m [2m4afb2b9e[0m [2m10 months ago[0m [2mLocal commit[0m⚪ [2mShowing 2 worktrees, 1 with changes, 1 ahead[0mdiff --git a/tests/snapshots/integration__integration_tests__list__maximum_status_with_git_operation.snap b/tests/snapshots/integration__integration_tests__list__maximum_status_with_git_operation.snapindex bf0a912ea..e018247de 100644--- a/tests/snapshots/integration__integration_tests__list__maximum_status_with_git_operation.snap+++ b/tests/snapshots/integration__integration_tests__list__maximum_status_with_git_operation.snap@@ -10,11 +10,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -27,7 +24,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mmain…±[0m [1mPath[0m [1mRemote⇅[0m [1mCI[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1m[35mmain[0m [1m[35m./test-repo[0m [2mb7c14ce1[0m [2m10 months ago[0m [2mMain conflicting changes[0m+@ [1m[35mmain[0m [2m^[0m [1m[35m./test-repo[0m [2mb7c14ce1[0m [2m10 months ago[0m [2mMain conflicting changes[0m+ feature [36m?!+[0m [31m✖[0m[33m↻[0m [33m⊠[0m🤖 [32m+7[0m ./feature [2mb7c14ce1[0m [2m10 months ago[0m [2mMain conflicting changes[0m⚪ [2mShowing 2 worktrees, 1 with changes[0mdiff --git a/tests/snapshots/integration__integration_tests__list__maximum_working_tree_symbols.snap b/tests/snapshots/integration__integration_tests__list__maximum_working_tree_symbols.snapindex 92b58c020..e9210218c 100644--- a/tests/snapshots/integration__integration_tests__list__maximum_working_tree_symbols.snap+++ b/tests/snapshots/integration__integration_tests__list__maximum_working_tree_symbols.snap@@ -9,11 +9,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -26,7 +23,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+@ [1m[35mmain[0m [2m^[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ feature [36m?!+»✘[0m [2m↑[0m [32m+2[0m [31m-3[0m [32m↑1[0m ./feature [2m689c2504[0m [2m10 months ago[0m [2mAdd files[0m⚪ [2mShowing 2 worktrees, 1 with changes, 1 ahead[0mdiff --git a/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snapindex 67fd45e92..8da52866d 100644--- a/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap+++ b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap@@ -9,11 +9,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -26,7 +23,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+@ [1m[35mmain[0m [2m^[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ [2mfeature-a[0m [2m≡[0m [2m./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ [2mfeature-b[0m [2m≡[0m [2m./feature-b[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0mdiff --git a/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap b/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snapindex 71064d049..67494a7cf 100644--- a/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap+++ b/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap@@ -10,11 +10,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -27,7 +24,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+@ [1m[35mmain[0m [2m^[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ [2mfeature[0m [2m≡[0m [2m./feature[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 2 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__progressive_flag.snap b/tests/snapshots/integration__integration_tests__list__progressive_flag.snapindex 98e0b6e5f..81bbaf267 100644--- a/tests/snapshots/integration__integration_tests__list__progressive_flag.snap+++ b/tests/snapshots/integration__integration_tests__list__progressive_flag.snap@@ -10,11 +10,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -27,7 +24,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+@ [1m[35mmain[0m [2m^[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ [2mfeature-a[0m [2m≡[0m [2m./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ [2mfeature-b[0m [2m≡[0m [2m./feature-b[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0mdiff --git a/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap b/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snapindex ddfa74ed2..213d766bf 100644--- a/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap+++ b/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap@@ -11,11 +11,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -28,7 +25,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+@ [1m[35mmain[0m [2m^[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ [2mfeature-a[0m [2m≡[0m [2m./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m[2morphan-1[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m[2morphan-2[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0mdiff --git a/tests/snapshots/integration__integration_tests__list__readme_example_simple_list.snap b/tests/snapshots/integration__integration_tests__list__readme_example_simple_list.snapindex e1b5a3400..885126d83 100644--- a/tests/snapshots/integration__integration_tests__list__readme_example_simple_list.snap+++ b/tests/snapshots/integration__integration_tests__list__readme_example_simple_list.snap@@ -9,11 +9,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -26,7 +23,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1m[35mmain[0m [1m[35m./test-repo[0m [32m↑0[0m [2m[31m↓0[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+@ [1m[35mmain[0m [2m^[0m [1m[35m./test-repo[0m [32m↑0[0m [2m[31m↓0[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ bugfix-y [2m↑[0m [32m↑1[0m ./bugfix-y [2m412a27c8[0m [2m10 months ago[0m [2mFix bug[0m+ feature-x [36m+[0m [2m↑[0m [32m+5[0m [32m↑3[0m ./feature-x [2m7fd821aa[0m [2m10 months ago[0m [2mAdd file 3[0mdiff --git a/tests/snapshots/integration__integration_tests__list__single_worktree.snap b/tests/snapshots/integration__integration_tests__list__single_worktree.snapindex 23a8d85e8..a00fccd49 100644--- a/tests/snapshots/integration__integration_tests__list__single_worktree.snap+++ b/tests/snapshots/integration__integration_tests__list__single_worktree.snap@@ -9,11 +9,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -26,6 +23,6 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1m[35mmain[0m [1m[35m.[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+@ [1m[35mmain[0m [2m^[0m [1m[35m.[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 1 worktree[0mdiff --git a/tests/snapshots/integration__integration_tests__list__status_column_padding_emoji.snap b/tests/snapshots/integration__integration_tests__list__status_column_padding_emoji.snapindex adc40bd09..113e83cde 100644--- a/tests/snapshots/integration__integration_tests__list__status_column_padding_emoji.snap+++ b/tests/snapshots/integration__integration_tests__list__status_column_padding_emoji.snap@@ -9,11 +9,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -26,7 +23,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+@ [1m[35mmain[0m [2m^[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ main-symbol [2m↑[0m 💬 [32m↑1[0m ./main-symbol [2m579fcd0b[0m [2m10 months ago[0m [2mSymbol commit[0m+ pr-link [2m↑[0m 🤖 [32m↑1[0m ./pr-link [2me17e7d2d[0m [2m10 months ago[0m [2mPR commit[0m+ wli-sequence [36m?![0m [2m↑[0m 🤖 [32m+1[0m [31m-112[0m [32m↑1[0m ./wli-sequence [2ma2483ffd[0m [2m10 months ago[0m [2mInitial content[0mdiff --git a/tests/snapshots/integration__integration_tests__list__task_dag_detached_head.snap b/tests/snapshots/integration__integration_tests__list__task_dag_detached_head.snapindex 22d19223d..5cecd4ee0 100644--- a/tests/snapshots/integration__integration_tests__list__task_dag_detached_head.snap+++ b/tests/snapshots/integration__integration_tests__list__task_dag_detached_head.snap@@ -10,11 +10,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -27,6 +24,6 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1m[35m-[0m [1m[35m.[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+@ [1m[35m-[0m [2m^[0m [1m[35m.[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 1 worktree[0mdiff --git a/tests/snapshots/integration__integration_tests__list__task_dag_full_with_diffs.snap b/tests/snapshots/integration__integration_tests__list__task_dag_full_with_diffs.snapindex 8e2c18645..69f35398d 100644--- a/tests/snapshots/integration__integration_tests__list__task_dag_full_with_diffs.snap+++ b/tests/snapshots/integration__integration_tests__list__task_dag_full_with_diffs.snap@@ -11,11 +11,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -28,7 +25,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mmain…±[0m [1mPath[0m [1mRemote⇅[0m [1mCI[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+@ [1m[35mmain[0m [2m^[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ [2mfeature-a[0m [36m?[0m [2m≡[0m [2m./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ feature-b [2m↑[0m [32m↑1[0m [32m+1[0m [31m-1[0m ./feature-b [2m2d37ca75[0m [2m10 months ago[0m [2mTest commit[0mdiff --git a/tests/snapshots/integration__integration_tests__list__task_dag_many_worktrees.snap b/tests/snapshots/integration__integration_tests__list__task_dag_many_worktrees.snapindex 695f6fb36..04fa595a1 100644--- a/tests/snapshots/integration__integration_tests__list__task_dag_many_worktrees.snap+++ b/tests/snapshots/integration__integration_tests__list__task_dag_many_worktrees.snap@@ -10,11 +10,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -27,7 +24,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+@ [1m[35mmain[0m [2m^[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ [2mfeature-1[0m [2m≡[0m [2m./feature-1[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ [2mfeature-10[0m [2m≡[0m [2m./feature-10[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ [2mfeature-2[0m [2m≡[0m [2m./feature-2[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0mdiff --git a/tests/snapshots/integration__integration_tests__list__task_dag_multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__list__task_dag_multiple_worktrees.snapindex 0f33bf187..74d6ea2fc 100644--- a/tests/snapshots/integration__integration_tests__list__task_dag_multiple_worktrees.snap+++ b/tests/snapshots/integration__integration_tests__list__task_dag_multiple_worktrees.snap@@ -10,11 +10,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -27,7 +24,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+@ [1m[35mmain[0m [2m^[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ [2mfeature-a[0m [2m≡[0m [2m./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ [2mfeature-b[0m [2m≡[0m [2m./feature-b[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ [2mfeature-c[0m [2m≡[0m [2m./feature-c[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0mdiff --git a/tests/snapshots/integration__integration_tests__list__task_dag_ordering_stability.snap b/tests/snapshots/integration__integration_tests__list__task_dag_ordering_stability.snapindex 1782a031f..f14c22654 100644--- a/tests/snapshots/integration__integration_tests__list__task_dag_ordering_stability.snap+++ b/tests/snapshots/integration__integration_tests__list__task_dag_ordering_stability.snap@@ -10,11 +10,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -27,7 +24,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-^ [36mmain[0m [36m./test-repo[0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0m+^ [36mmain[0m [2m^[0m [36m./test-repo[0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0m@ [1m[35mfeature-current[0m [2m↑[0m [32m↑1[0m [1m[35m./feature-current[0m [2mfc28a4d1[0m [2m9 months ago[0m [2mCommit at 01:00[0m+ feature-newest [2m↑[0m [32m↑1[0m ./feature-newest [2m136358eb[0m [2m9 months ago[0m [2mCommit at 03:00[0m+ feature-middle [2m↑[0m [32m↑1[0m ./feature-middle [2ma0a4851a[0m [2m9 months ago[0m [2mCommit at 02:00[0mdiff --git a/tests/snapshots/integration__integration_tests__list__task_dag_single_worktree.snap b/tests/snapshots/integration__integration_tests__list__task_dag_single_worktree.snapindex f479bfeb5..35b92cb6c 100644--- a/tests/snapshots/integration__integration_tests__list__task_dag_single_worktree.snap+++ b/tests/snapshots/integration__integration_tests__list__task_dag_single_worktree.snap@@ -10,11 +10,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -27,6 +24,6 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1m[35mmain[0m [1m[35m.[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+@ [1m[35mmain[0m [2m^[0m [1m[35m.[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 1 worktree[0mdiff --git a/tests/snapshots/integration__integration_tests__list__task_dag_with_locked.snap b/tests/snapshots/integration__integration_tests__list__task_dag_with_locked.snapindex 348b0ab70..837d5cdc7 100644--- a/tests/snapshots/integration__integration_tests__list__task_dag_with_locked.snap+++ b/tests/snapshots/integration__integration_tests__list__task_dag_with_locked.snap@@ -10,11 +10,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -27,7 +24,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+@ [1m[35mmain[0m [2m^[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ [2mlocked[0m [2m≡[0m [33m⊠[0m [2m./locked[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ [2mnormal[0m [2m≡[0m [2m./normal[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0mdiff --git a/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap b/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snapindex a24655849..3ff9eea08 100644--- a/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap+++ b/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap@@ -11,11 +11,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -28,7 +25,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mmain…±[0m [1mPath[0m [1mRemote⇅[0m [1mCI[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1m[35mmain[0m [1m[35m./test-repo[0m [32m↑0[0m [2m[31m↓0[0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0m+@ [1m[35mmain[0m [2m^[0m [1m[35m./test-repo[0m [32m↑0[0m [2m[31m↓0[0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0m+ ahead [2m↑[0m[2m⇡[0m [32m↑1[0m [32m+1[0m ./ahead [32m↑1[0m [2m[31m↓0[0m [2m2fff52c2[0m [2m10 months ago[0m [2mAhead commit[0m+ [2min-sync[0m [2m≡[0m [2m./in-sync[0m [32m↑0[0m [2m[31m↓0[0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0mdiff --git a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snapindex 2a28d65a9..6725130f0 100644--- a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap+++ b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap@@ -9,11 +9,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -26,7 +23,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1m[35mmain[0m [1m[35m./test-repo[0m [2me4614cb7[0m [2m10 months ago[0m [2mFix bug with café ☕ handling[0m+@ [1m[35mmain[0m [2m^[0m [1m[35m./test-repo[0m [2me4614cb7[0m [2m10 months ago[0m [2mFix bug with café ☕ handling[0m+ [2mfeature-test[0m [2m∅[0m [2m↓[0m [2m[31m↓1[0m [2m./feature-test[0m [2m0c53695b[0m [2m10 months ago[0m [2mAdd support for 日本語 and émoji 🎉[0m⚪ [2mShowing 2 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__user_status_special_chars.snap b/tests/snapshots/integration__integration_tests__list__user_status_special_chars.snapindex a74c42084..cc91815bd 100644--- a/tests/snapshots/integration__integration_tests__list__user_status_special_chars.snap+++ b/tests/snapshots/integration__integration_tests__list__user_status_special_chars.snap@@ -9,11 +9,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -26,7 +23,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+@ [1m[35mmain[0m [2m^[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ [2memoji[0m [2m≡[0m 🔄 [2m./emoji[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ [2mmulti[0m [2m≡[0m 👨💻 [2m./multi[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0mdiff --git a/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap b/tests/snapshots/integration__integration_tests__list__with_branches_flag.snapindex 327142768..2e95cfbdb 100644--- a/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap+++ b/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap@@ -10,11 +10,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -27,7 +24,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+@ [1m[35mmain[0m [2m^[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ [2mfeature-with-worktree[0m [2m≡[0m [2m./feature-with-worktree[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m[2manother-branch[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m[2mfeature-without-worktree[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10 months ago[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 780b1dd6b..9547e179e 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@@ -10,11 +10,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -27,7 +24,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+@ [1m[35mmain[0m [2m^[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ [2mfeature-a[0m [2m≡[0m [2m./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ [2mfeature-b[0m [2m≡[0m [2m./feature-b[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0mdiff --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 529debcf5..02f341a3e 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@@ -10,11 +10,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -27,7 +24,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1m[35mmain[0m [1m[35m.[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+@ [1m[35mmain[0m [2m^[0m [1m[35m.[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m[2mbranch-alpha[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m[2mbranch-beta[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m[2mbranch-gamma[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0mdiff --git a/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap b/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snapindex 0752fba90..68f5c34b7 100644--- a/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap+++ b/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap@@ -11,11 +11,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -28,7 +25,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1m[35mmain[0m [1m[35m.[0m [32m↑0[0m [2m[31m↓0[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+@ [1m[35mmain[0m [2m^[0m [1m[35m.[0m [32m↑0[0m [2m[31m↓0[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m[2mlocal-only-1[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m[2mlocal-only-2[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m[2morigin/remote-only-1[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0mdiff --git a/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap b/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snapindex 0ff8ded78..71a517cc9 100644--- a/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap+++ b/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap@@ -10,11 +10,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -27,7 +24,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1m[35mmain[0m [1m[35m./test-repo[0m [32m↑0[0m [2m[31m↓0[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+@ [1m[35mmain[0m [2m^[0m [1m[35m./test-repo[0m [32m↑0[0m [2m[31m↓0[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ [2mfeature-with-worktree[0m [2m≡[0m [2m./feature-with-worktree[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m[2morigin/remote-only[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0mdiff --git a/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap b/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snapindex 112c2eb2c..539cfc8c1 100644--- a/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap+++ b/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap@@ -10,11 +10,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -27,7 +24,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1m[35mmain[0m [1m[35m.[0m [32m↑0[0m [2m[31m↓0[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+@ [1m[35mmain[0m [2m^[0m [1m[35m.[0m [32m↑0[0m [2m[31m↓0[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m[2morigin/remote-feature-1[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m[2morigin/remote-feature-2[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0mdiff --git a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snapindex 5bd45d71e..e0802de55 100644--- a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap+++ b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap@@ -11,17 +11,14 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpuwxwGu/test-gitconfigGIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C- PATH: "/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpZeSbTH/mock-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: "/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpuwxwGu/mock-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/.tmpZeSbTH/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpuwxwGu/test-config.toml---success: trueexit_code: 0@@ -29,7 +26,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mmain…±[0m [1mPath[0m [1mRemote⇅[0m [1mCI[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1m[35mmain[0m [1m[35m./test-repo[0m [32m↑0[0m [2m[31m↓0[0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0m+@ [1m[35mmain[0m [2m^[0m [1m[35m./test-repo[0m [32m↑0[0m [2m[31m↓0[0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0m+ ahead [2m↑[0m[2m⇡[0m [32m↑2[0m [32m+2[0m ./ahead [32m↑2[0m [2m[31m↓0[0m [2m8d8f4673[0m [2m10 months ago[0m [2mAhead commit 2[0m+ [2mbehind[0m [2m≡[0m [2m⇣[0m [2m./behind[0m [32m↑0[0m [2m[31m↓1[0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0m+ diverged [2m↑[0m[2m⇅[0m [32m↑1[0m [32m+1[0m ./diverged [32m↑1[0m [2m[31m↓1[0m [2mca7cb696[0m [2m10 months ago[0m [2mDiverged local commit[0mdiff --git a/tests/snapshots/integration__integration_tests__list__with_user_status.snap b/tests/snapshots/integration__integration_tests__list__with_user_status.snapindex 5d0d16452..70edac3b8 100644--- a/tests/snapshots/integration__integration_tests__list__with_user_status.snap+++ b/tests/snapshots/integration__integration_tests__list__with_user_status.snap@@ -9,11 +9,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -26,7 +23,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+@ [1m[35mmain[0m [2m^[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ [2mclean-no-status[0m [2m≡[0m [2m./clean-no-status[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ [2mclean-with-status[0m [2m≡[0m 💬 [2m./clean-with-status[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ dirty-no-status [36m![0m [32m+1[0m [31m-1[0m ./dirty-no-status [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0mdiff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_branches_enabled.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_branches_enabled.snapindex 057cec232..9fa3ce2a4 100644--- a/tests/snapshots/integration__integration_tests__list_config__list_config_branches_enabled.snap+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_branches_enabled.snap@@ -9,11 +9,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""HOME: "[TEST_HOME]"LANG: C@@ -28,6 +25,6 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1m[35mmain[0m [1m[35m.[0m [SHA] [2m10 months ago[0m [2mInitial commit[0m+@ [1m[35mmain[0m [2m^[0m [1m[35m.[0m [SHA] [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 1 worktree[0mdiff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override.snapindex 49a068567..8e5e70df7 100644--- a/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override.snap+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override.snap@@ -10,11 +10,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""HOME: "[TEST_HOME]"LANG: C@@ -29,7 +26,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1m[35mmain[0m [1m[35m.[0m [SHA] [2m10 months ago[0m [2mInitial commit[0m+@ [1m[35mmain[0m [2m^[0m [1m[35m.[0m [SHA] [2m10 months ago[0m [2mInitial commit[0m[2mfeature[0m [2m∅[0m [2m⎇[0m [SHA] [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 1 worktrees, 1 branches[0mdiff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_full_and_branches.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_full_and_branches.snapindex 057cec232..9fa3ce2a4 100644--- a/tests/snapshots/integration__integration_tests__list_config__list_config_full_and_branches.snap+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_full_and_branches.snap@@ -9,11 +9,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""HOME: "[TEST_HOME]"LANG: C@@ -28,6 +25,6 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1m[35mmain[0m [1m[35m.[0m [SHA] [2m10 months ago[0m [2mInitial commit[0m+@ [1m[35mmain[0m [2m^[0m [1m[35m.[0m [SHA] [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 1 worktree[0mdiff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_full_enabled.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_full_enabled.snapindex 057cec232..9fa3ce2a4 100644--- a/tests/snapshots/integration__integration_tests__list_config__list_config_full_enabled.snap+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_full_enabled.snap@@ -9,11 +9,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""HOME: "[TEST_HOME]"LANG: C@@ -28,6 +25,6 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1m[35mmain[0m [1m[35m.[0m [SHA] [2m10 months ago[0m [2mInitial commit[0m+@ [1m[35mmain[0m [2m^[0m [1m[35m.[0m [SHA] [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 1 worktree[0mdiff --git a/tests/snapshots/integration__integration_tests__list_config__list_no_config.snap b/tests/snapshots/integration__integration_tests__list_config__list_no_config.snapindex 057cec232..9fa3ce2a4 100644--- a/tests/snapshots/integration__integration_tests__list_config__list_no_config.snap+++ b/tests/snapshots/integration__integration_tests__list_config__list_no_config.snap@@ -9,11 +9,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""HOME: "[TEST_HOME]"LANG: C@@ -28,6 +25,6 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1m[35mmain[0m [1m[35m.[0m [SHA] [2m10 months ago[0m [2mInitial commit[0m+@ [1m[35mmain[0m [2m^[0m [1m[35m.[0m [SHA] [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 1 worktree[0mdiff --git a/tests/snapshots/integration__integration_tests__security__commit_message_with_directive_not_executed.snap b/tests/snapshots/integration__integration_tests__security__commit_message_with_directive_not_executed.snapindex cdb9cb00c..68e328308 100644--- a/tests/snapshots/integration__integration_tests__security__commit_message_with_directive_not_executed.snap+++ b/tests/snapshots/integration__integration_tests__security__commit_message_with_directive_not_executed.snap@@ -9,11 +9,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -26,7 +23,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1m[35mmain[0m [1m[35m./test-repo[0m [SHA] [2m10 months ago[0m [2mFix bug __WORKTRUNK_EXEC__echo PWNED >…[0m+@ [1m[35mmain[0m [2m^[0m [1m[35m./test-repo[0m [SHA] [2m10 months ago[0m [2mFix bug __WORKTRUNK_EXEC__echo PWNED >…[0m+ [2mfeature[0m [2m≡[0m [2m./feature[0m [SHA] [2m10 months ago[0m [2mFix bug __WORKTRUNK_EXEC__echo PWNED >…[0m⚪ [2mShowing 2 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__security__path_with_directive_not_executed.snap b/tests/snapshots/integration__integration_tests__security__path_with_directive_not_executed.snapindex 99b8b85bf..45f1e6cd8 100644--- a/tests/snapshots/integration__integration_tests__security__path_with_directive_not_executed.snap+++ b/tests/snapshots/integration__integration_tests__security__path_with_directive_not_executed.snap@@ -9,16 +9,13 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpU2gA5K/test-config.toml+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"---success: trueexit_code: 0@@ -26,6 +23,6 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1m[35mmain[0m [1m[35m.[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+@ [1m[35mmain[0m [2m^[0m [1m[35m.[0m [SHA] [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 1 worktree[0mdiff --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 a1900edfa..2283a5cf6 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@@ -9,11 +9,8 @@ info:COLUMNS: "180"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -26,7 +23,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+@ [1m[35mmain[0m [2m^[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ [2malso-no-changes[0m [2m≡[0m [2m./also-no-changes[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ [2mno-changes[0m [2m≡[0m [2m./no-changes[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ with-changes [36m![0m [32m+1[0m [31m-1[0m ./with-changes [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0mdiff --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 12af58f93..4c038fd38 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@@ -9,11 +9,8 @@ info:COLUMNS: "180"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -26,7 +23,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+@ [1m[35mmain[0m [2m^[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ [2mhuge[0m [36m?[0m [2m≡[0m [2m./huge[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ tiny [36m![0m [32m+1[0m [31m-1[0m ./tiny [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0mdiff --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 552bdb8ac..25a3be712 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@@ -9,11 +9,8 @@ info:COLUMNS: "180"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -26,7 +23,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+@ [1m[35mmain[0m [2m^[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ [2mfeature-large[0m [36m?[0m [2m≡[0m [2m./feature-large[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ [2mfeature-medium[0m [36m?[0m [2m≡[0m [2m./feature-medium[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ [2mfeature-small[0m [36m?[0m [2m≡[0m [2m./feature-small[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0mdiff --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 d5bc078eb..6d7a77a5c 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@@ -9,11 +9,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -26,7 +23,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m-@ [1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m+@ [1m[35mmain[0m [2m^[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m+ [2manother-extremely-long-name-here[0m [2m≡[0m [2m./another-extremely-long-name-here[0m [2mb834638e[0m [2m10 months ago[0m+ [2mshort[0m [2m≡[0m [2m./short[0m [2mb834638e[0m [2m10 months ago[0m+ [2mvery-long-feature-branch-name[0m [2m≡[0m [2m./very-long-feature-branch-name[0m [2mb834638e[0m [2m10 months ago[0mdiff --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 a12e8cc63..8c39f245c 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@@ -9,11 +9,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -26,7 +23,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m-@ [1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m+@ [1m[35mmain[0m [2m^[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m+ [2mlong[0m [2m≡[0m [2m./extremely-long-branch-name-that-might-cause-layout-issues[0m [2mb834638e[0m [2m10 months ago[0m+ [2mmedium[0m [2m≡[0m [2m./medium-length-name[0m [2mb834638e[0m [2m10 months ago[0m+ [2mx[0m [2m≡[0m [2m./x[0m [2mb834638e[0m [2m10 months ago[0mdiff --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 72c423bac..83999771c 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@@ -9,11 +9,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -26,7 +23,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+@ [1m[35mmain[0m [2m^[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ [2ma[0m [2m≡[0m [2m./a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ [2mbb[0m [2m≡[0m [2m./bb[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ [2mccc[0m [2m≡[0m [2m./ccc[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0mdiff --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 5aa7a066b..9a54f7ab3 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@@ -9,11 +9,8 @@ info:COLUMNS: "150"GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"- GIT_CONFIG_COUNT: "1"- GIT_CONFIG_GLOBAL: /dev/null- GIT_CONFIG_KEY_0: advice.mergeConflict+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"GIT_CONFIG_SYSTEM: /dev/null- GIT_CONFIG_VALUE_0: "false"GIT_EDITOR: ""LANG: CLC_ALL: C@@ -26,7 +23,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+@ [1m[35mmain[0m [2m^[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ [2mcafe[0m [2m≡[0m [2m./café[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ [2mnaive[0m [2m≡[0m [2m./naïve[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+ [2mresume[0m [2m≡[0m [2m./résumé[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m