Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Change path mismatch symbol from ⚐ to ⚑ and apply red styling
Maximilian Roos0db5dec2d2fd
diff --git a/docs/content/list.md b/docs/content/list.mdindex 588928ed7..e94334863 100644--- a/docs/content/list.md+++ b/docs/content/list.md@@ -63,6 +63,7 @@ Symbols appear in the Status column in this order:**Other:**- `⎇` — Branch without worktree+- `⚑` — Path mismatch (not at expected location)- `⌫` — Prunable (directory missing)- `⊠` — Locked worktreediff --git a/src/commands/list/model.rs b/src/commands/list/model.rsindex bdf5bb4fd..2e3db9ae8 100644--- a/src/commands/list/model.rs+++ b/src/commands/list/model.rs@@ -728,7 +728,7 @@ pub enum WorktreeState {/// Normal worktree (path matches template, not locked or prunable)#[default]None,- /// Path doesn't match what the template would generate (white flag = "not at home")+ /// Path doesn't match what the template would generate (red flag = "not at home")PathMismatch,/// Prunable (worktree directory missing)Prunable,@@ -742,7 +742,7 @@ impl std::fmt::Display for WorktreeState {fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {match self {Self::None => Ok(()),- Self::PathMismatch => write!(f, "⚐"),+ Self::PathMismatch => write!(f, "⚑"),Self::Prunable => write!(f, "⌫"),Self::Locked => write!(f, "⊠"),Self::Branch => write!(f, "⎇"),@@ -887,7 +887,7 @@ impl PositionMask {1, // BRANCH_OP_STATE: ✖↻⋈⚠≡_ (1 char, priority: conflicts > rebase > merge > merge-tree > no-commits > matches)1, // MAIN_DIVERGENCE: ^, ↑, ↓, ↕ (1 char)1, // UPSTREAM_DIVERGENCE: ⇡, ⇣, ⇅ (1 char)- 1, // WORKTREE_STATE: ⎇ for branches, ⚐⌫⊠ for worktrees (priority: path_mismatch > prunable > locked)+ 1, // WORKTREE_STATE: ⎇ for branches, ⚑⌫⊠ for worktrees (priority: path_mismatch > prunable > locked)2, // USER_MARKER: single emoji or two chars (allocate 2)],};@@ -905,7 +905,7 @@ impl PositionMask {/// - Branch/op state: ✖, ↻, ⋈, ⚠, ≡, _ (combined position with priority)/// - Main divergence: ^, ↑, ↓, ↕/// - Upstream divergence: ⇡, ⇣, ⇅-/// - Worktree state: ⎇ for branches, ⚐⌫⊠ for worktrees (priority-only)+/// - Worktree state: ⎇ for branches, ⚑⌫⊠ for worktrees (priority-only)/// - User marker: custom labels, emoji////// ## Mutual Exclusivity@@ -924,8 +924,8 @@ impl PositionMask {/// - ⇡ vs ⇣ vs ⇅: Upstream divergence (UpstreamDivergence enum)////// **Priority-only (can co-occur but only highest priority shown):**-/// - ⚐ vs ⌫ vs ⊠: Worktree attrs (priority: path_mismatch ⚐ > prunable ⌫ > locked ⊠)-/// - ⎇: Branch indicator (mutually exclusive with ⚐⌫⊠ as branches can't have worktree attrs)+/// - ⚑ vs ⌫ vs ⊠: Worktree attrs (priority: path_mismatch ⚑ > prunable ⌫ > locked ⊠)+/// - ⎇: Branch indicator (mutually exclusive with ⚑⌫⊠ as branches can't have worktree attrs)////// **NOT mutually exclusive (can co-occur):**/// - Working tree symbols (+!?): Can have multiple types of changes@@ -935,7 +935,7 @@ pub struct StatusSymbols {/// Priority: Conflicts (✖) > Rebase (↻) > Merge (⋈) > MergeTreeConflicts (⊘) > MatchesMain (≡) > NoCommits (∅)pub(crate) branch_op_state: BranchOpState,- /// Worktree state: ⎇ for branches, ⚐⌫⊠ for worktrees (priority: path_mismatch > prunable > locked)+ /// Worktree state: ⎇ for branches, ⚑⌫⊠ for worktrees (priority: path_mismatch > prunable > locked)pub(crate) worktree_state: WorktreeState,/// Main branch divergence state (mutually exclusive)@@ -1054,7 +1054,9 @@ impl StatusSymbols {WorktreeState::None => String::new(),// Branch indicator (⎇) is informational (dimmed)WorktreeState::Branch => cformat!("<dim>{}</>", self.worktree_state),- // Worktree attrs (⚐⌫⊠) are warnings (yellow)+ // Path mismatch (⚑) is a stronger warning (red)+ WorktreeState::PathMismatch => cformat!("<red>{}</>", self.worktree_state),+ // Other worktree attrs (⌫⊠) are warnings (yellow)_ => cformat!("<yellow>{}</>", self.worktree_state),};diff --git a/tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snap b/tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snapindex 47a1d0f9e..750610be9 100644--- a/tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snap+++ b/tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snap@@ -23,6 +23,6 @@ exit_code: 0----- stderr -----Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message@ main ^ ./repo.main 6c3da842 1d Initial commit on main-+ feature ↑ ⚐ ↑1 ./repo.feature 72413a3b 1d Work on feature++ feature ↑ ⚑ ↑1 ./repo.feature 72413a3b 1d Work on feature⚪ Showing 2 worktrees, 1 aheaddiff --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 7a915db7b..62af36d2c 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@@ -23,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-@ [1mdevelop[0m [2m^[22m [33m⚐[39m [1m.[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+@ [1mdevelop[0m [2m^[22m [31m⚑[39m [1m.[0m [2mb834638e[0m [2m1d[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 1b080145a..9bfa9bc2d 100644--- a/tests/snapshots/integration__integration_tests__list__detached_head.snap+++ b/tests/snapshots/integration__integration_tests__list__detached_head.snap@@ -23,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-[0m [2m^[22m [33m⚐[39m [1m.[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+@ [1m-[0m [2m^[22m [31m⚑[39m [1m.[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 1 worktree[0mdiff --git a/tests/snapshots/integration__integration_tests__list__detached_head_in_worktree.snap b/tests/snapshots/integration__integration_tests__list__detached_head_in_worktree.snapindex 51f334b81..cac815fd1 100644--- a/tests/snapshots/integration__integration_tests__list__detached_head_in_worktree.snap+++ b/tests/snapshots/integration__integration_tests__list__detached_head_in_worktree.snap@@ -24,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@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m-+ [2m-[0m [2m_[22m [33m⚐[39m [2m./repo.feature[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m++ [2m-[0m [2m_[22m [31m⚑[39m [2m./repo.feature[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 2 worktrees[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 bf3d47f78..ae3e4c78b 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@@ -23,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-@ [1mdevelop[0m [2m^[22m [33m⚐[39m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+@ [1mdevelop[0m [2m^[22m [31m⚑[39m [1m./repo[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+ [2mfeature-a[0m [2m_[22m [2m./repo.feature-a[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+ [2mfeature-b[0m [2m_[22m [2m./repo.feature-b[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[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 074dec68e..0b9f70b9b 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@@ -24,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-[0m [2m^[22m [33m⚐[39m [1m.[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+@ [1m-[0m [2m^[22m [31m⚑[39m [1m.[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 1 worktree[0m