Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Update status symbols for improved clarity
Maximilian Roos8483adec6e34
diff --git a/docs/content/list.md b/docs/content/list.mdindex 92ccb9179..964787405 100644--- a/docs/content/list.md+++ b/docs/content/list.md@@ -108,10 +108,10 @@ The Status column has multiple subcolumns. Within each, only the first matching| Working tree (1) | `+` | Staged files || Working tree (2) | `!` | Modified files (unstaged) || Working tree (3) | `?` | Untracked files |-| Branch state | `✖` | Merge conflicts |-| | `↻` | Rebase in progress |-| | `⋈` | Merge in progress |-| | `⚔` | Would conflict if merged to main |+| Branch state | `✘` | Merge conflicts |+| | `⤴` | Rebase in progress |+| | `⤵` | Merge in progress |+| | `✗` | Would conflict if merged to main || | `·` | Same commit || | `⊂` | [Content integrated](@/remove.md#branch-cleanup) (`--full` detects additional cases) || Main divergence | `^` | Is the main branch |diff --git a/src/cli.rs b/src/cli.rsindex 329522e09..def054b14 100644--- a/src/cli.rs+++ b/src/cli.rs@@ -1381,10 +1381,10 @@ The Status column has multiple subcolumns. Within each, only the first matching| Working tree (1) | `+` | Staged files || Working tree (2) | `!` | Modified files (unstaged) || Working tree (3) | `?` | Untracked files |-| Branch state | `✖` | Merge conflicts |-| | `↻` | Rebase in progress |-| | `⋈` | Merge in progress |-| | `⚔` | Would conflict if merged to main |+| Branch state | `✘` | Merge conflicts |+| | `⤴` | Rebase in progress |+| | `⤵` | Merge in progress |+| | `✗` | Would conflict if merged to main || | `·` | Same commit || | `⊂` | [Content integrated](@/remove.md#branch-cleanup) (`--full` detects additional cases) || Main divergence | `^` | Is the main branch |diff --git a/src/commands/list/model.rs b/src/commands/list/model.rsindex 9ccff8acd..22dc9cc86 100644--- a/src/commands/list/model.rs+++ b/src/commands/list/model.rs@@ -862,10 +862,10 @@ impl serde::Serialize for WorktreeState {////// Represents the primary state of a branch/worktree in a single position./// Priority order determines which symbol is shown when multiple conditions apply:-/// 1. Conflicts (✖) - blocking, must resolve-/// 2. Rebase (↻) - active operation-/// 3. Merge (⋈) - active operation-/// 4. MergeTreeConflicts (⚔) - potential problem+/// 1. Conflicts (✘) - blocking, must resolve+/// 2. Rebase (⤴) - active operation+/// 3. Merge (⤵) - active operation+/// 4. MergeTreeConflicts (✗) - potential problem/// 5. SameCommit (·) - removable, maps to [`IntegrationReason::SameCommit`]/// 6. NoAddedChanges (⊂) - removable, maps to [`IntegrationReason::NoAddedChanges`]/// 7. TreesMatch (⊂) - removable, maps to [`IntegrationReason::TreesMatch`]@@ -911,10 +911,10 @@ impl std::fmt::Display for BranchOpState {fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {match self {Self::None => Ok(()),- Self::Conflicts => write!(f, "✖"),- Self::Rebase => write!(f, "↻"),- Self::Merge => write!(f, "⋈"),- Self::MergeTreeConflicts => write!(f, "⚔"),+ Self::Conflicts => write!(f, "✘"),+ Self::Rebase => write!(f, "⤴"),+ Self::Merge => write!(f, "⤵"),+ Self::MergeTreeConflicts => write!(f, "✗"),Self::SameCommit => write!(f, "·"),// All other integration states use ⊂ (content is subset of main)Self::TreesMatch | Self::NoAddedChanges | Self::MergeAddsNothing => write!(f, "⊂"),@@ -1014,7 +1014,7 @@ impl PositionMask {1, // STAGED: + (1 char)1, // MODIFIED: ! (1 char)1, // UNTRACKED: ? (1 char)- 1, // BRANCH_OP_STATE: ✖↻⋈⚔·⊂ (1 char, priority: conflicts > rebase > merge > merge-tree > same-commit > integrated)+ 1, // BRANCH_OP_STATE: ✘⤴⤵✗·⊂ (1 char, priority: conflicts > rebase > merge > merge-tree > same-commit > integrated)1, // MAIN_DIVERGENCE: ^, ↑, ↓, ↕ (1 char)1, // UPSTREAM_DIVERGENCE: ⇡, ⇣, ⇅ (1 char)1, // WORKTREE_STATE: / for branches, ⚑⌫⊠ for worktrees (priority: path_mismatch > prunable > locked)@@ -1032,7 +1032,7 @@ impl PositionMask {////// Symbols are categorized to enable vertical alignment in table output:/// - Working tree: +, !, ? (staged, modified, untracked - priority order)-/// - Branch/op state: ✖, ↻, ⋈, ⚔, ·, ⊂ (combined position with priority)+/// - Branch/op state: ✘, ⤴, ⤵, ✗, ·, ⊂ (combined position with priority)/// - Main divergence: ^, ↕, ↑, ↓/// - Upstream divergence: ⇅, ⇡, ⇣/// - Worktree state: / for branches, ⚑⌫⊠ for worktrees (priority-only)@@ -1041,11 +1041,11 @@ impl PositionMask {/// ## Mutual Exclusivity////// **Combined with priority (branch state + git operation):**-/// Priority: ✖ > ↻ > ⋈ > ⚔ > · > ⊂-/// - ✖: Actual conflicts (must resolve)-/// - ↻: Rebase in progress-/// - ⋈: Merge in progress-/// - ⚔: Merge-tree conflicts (potential problem)+/// Priority: ✘ > ⤴ > ⤵ > ✗ > · > ⊂+/// - ✘: Actual conflicts (must resolve)+/// - ⤴: Rebase in progress+/// - ⤵: Merge in progress+/// - ✗: Merge-tree conflicts (potential problem)/// - ·: Same commit (removable)/// - ⊂: Content integrated (removable)///@@ -1062,7 +1062,7 @@ impl PositionMask {#[derive(Debug, Clone, Default)]pub struct StatusSymbols {/// Combined branch and operation state (mutually exclusive with priority)- /// Priority: Conflicts (✖) > Rebase (↻) > Merge (⋈) > MergeTreeConflicts (⚔) > SameCommit (·) > others (⊂)+ /// Priority: Conflicts (✘) > Rebase (⤴) > Merge (⤵) > MergeTreeConflicts (✗) > SameCommit (·) > others (⊂)pub(crate) branch_op_state: BranchOpState,/// Worktree state: / for branches, ⚑⌫⊠ for worktrees (priority: path_mismatch > prunable > locked)diff --git a/src/md_help.rs b/src/md_help.rsindex e5f83cbce..fa8918585 100644--- a/src/md_help.rs+++ b/src/md_help.rs@@ -300,12 +300,12 @@ fn colorize_status_symbols(text: &str) -> String {result = replace_dim(result, "?", working_tree);// Conflicts: ERROR (red)- result = replace_dim(result, "✖", error);+ result = replace_dim(result, "✘", error);// Git operations, MergeTreeConflicts: WARNING (yellow)- result = replace_dim(result, "↻", warning);- result = replace_dim(result, "⋈", warning);- result = replace_dim(result, "⚔", warning);+ result = replace_dim(result, "⤴", warning);+ result = replace_dim(result, "⤵", warning);+ result = replace_dim(result, "✗", warning);// Worktree state: PathMismatch (red), Prunable/Locked (yellow)result = replace_dim(result, "⚑", error);diff --git a/tests/snapshots/integration__integration_tests__help__help_list_long.snap b/tests/snapshots/integration__integration_tests__help__help_list_long.snapindex 52aee776a..d6f9dd53a 100644--- a/tests/snapshots/integration__integration_tests__help__help_list_long.snap+++ b/tests/snapshots/integration__integration_tests__help__help_list_long.snap@@ -117,10 +117,10 @@ The Status column has multiple subcolumns. Within each, only the first matchingWorking tree (1) [36m+[0m Staged filesWorking tree (2) [36m![0m Modified files (unstaged)Working tree (3) [36m?[0m Untracked files- Branch state [31m✖[0m Merge conflicts- [33m↻[0m Rebase in progress- [33m⋈[0m Merge in progress- [33m⚔[0m Would conflict if merged to main+ Branch state [31m✘[0m Merge conflicts+ [33m⤴[0m Rebase in progress+ [33m⤵[0m Merge in progress+ [33m✗[0m Would conflict if merged to main[2m·[0m Same commit[2m⊂[0m Content integrated ([2m--full[0m detects additional cases)Main divergence [2m^[0m Is the main branchdiff --git a/tests/snapshots/integration__integration_tests__list__json_with_git_operation.snap b/tests/snapshots/integration__integration_tests__list__json_with_git_operation.snapindex f6b234c4a..4541405d1 100644--- a/tests/snapshots/integration__integration_tests__list__json_with_git_operation.snap+++ b/tests/snapshots/integration__integration_tests__list__json_with_git_operation.snap@@ -95,12 +95,12 @@ exit_code: 0},"status_symbols": {"working_tree": "",- "branch_op_state": "✖",+ "branch_op_state": "✘","main_divergence": "","upstream_divergence": "","worktree_state": ""},- "status_line": "feature /u001b[31m✖/u001b[39m",+ "status_line": "feature /u001b[31m✘/u001b[39m","type": "worktree","path": "[REPO].feature","bare": false,diff --git a/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap b/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snapindex 05f0b74b9..6f8e2ec77 100644--- a/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap+++ b/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap@@ -25,6 +25,6 @@ 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@ [1mmain[0m [2m^[22m[2m⇡[22m [1m./repo[0m [32m⇡1[0m [2m85ed6d3d[0m [2m1d[0m [2mMain advances[0m-+ feature [36m+[39m[36m![39m[36m?[39m[33m⚔[39m[2m↕[22m[2m⇅[22m[33m⊠[39m🤖 [32m+2[0m [31m-2[0m [32m↑2[0m [2m[31m↓1[0m [32m+3[0m [31m-1[0m ./repo.feature [32m⇡1[0m [2m[31m⇣1[0m [2m4afb2b9e[0m [2m1d[0m [2mLocal commit[0m++ feature [36m+[39m[36m![39m[36m?[39m[33m✗[39m[2m↕[22m[2m⇅[22m[33m⊠[39m🤖 [32m+2[0m [31m-2[0m [32m↑2[0m [2m[31m↓1[0m [32m+3[0m [31m-1[0m ./repo.feature [32m⇡1[0m [2m[31m⇣1[0m [2m4afb2b9e[0m [2m1d[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 ca60ef156..c4edb30b9 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@@ -25,6 +25,6 @@ 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@ [1mmain[0m [2m^[22m [1m./repo[0m [2mb7c14ce1[0m [2m1d[0m [2mMain conflicting changes[0m-+ feature [36m+[39m[36m![39m[36m?[39m[31m✖[39m [33m⊠[39m🤖 [32m+7[0m ./repo.feature [2mb7c14ce1[0m [2m1d[0m [2mMain conflicting changes[0m++ feature [36m+[39m[36m![39m[36m?[39m[31m✘[39m [33m⊠[39m🤖 [32m+7[0m ./repo.feature [2mb7c14ce1[0m [2m1d[0m [2mMain conflicting changes[0m⚪ [2mShowing 2 worktrees, 1 with changes[0m