Skip to content

Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows

Update worktree state symbols for clarity

Maximilian Roosc4f8070a2896
diff --git a/docs/content/list.md b/docs/content/list.md
index 964787405..1ba19f802 100644
--- a/docs/content/list.md
+++ b/docs/content/list.md
@@ -124,8 +124,8 @@ The Status column has multiple subcolumns. Within each, only the first matching
| | `⇣` | Behind remote |
| Worktree state | `/` | Branch without worktree |
| | `⚑` | Path doesn't match template |
-| | `⌫` | Prunable (directory missing) |
-| | `⊠` | Locked worktree |
+| | `⊟` | Prunable (directory missing) |
+| | `⊞` | Locked worktree |
Rows are dimmed when the branch [content is already in main](@/remove.md#branch-cleanup) (`·` same commit or `⊂` content integrated).
diff --git a/src/cli.rs b/src/cli.rs
index def054b14..622a32fa3 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -1397,8 +1397,8 @@ The Status column has multiple subcolumns. Within each, only the first matching
| | `⇣` | Behind remote |
| Worktree state | `/` | Branch without worktree |
| | `⚑` | Path doesn't match template |
-| | `⌫` | Prunable (directory missing) |
-| | `⊠` | Locked worktree |
+| | `⊟` | Prunable (directory missing) |
+| | `⊞` | Locked worktree |
Rows are dimmed when the branch [content is already in main](@/remove.md#branch-cleanup) (`·` same commit or `⊂` content integrated).
diff --git a/src/commands/list/model.rs b/src/commands/list/model.rs
index 22dc9cc86..ea2904cc7 100644
--- a/src/commands/list/model.rs
+++ b/src/commands/list/model.rs
@@ -842,8 +842,8 @@ impl std::fmt::Display for WorktreeState {
match self {
Self::None => Ok(()),
Self::PathMismatch => write!(f, "⚑"),
- Self::Prunable => write!(f, "⌫"),
- Self::Locked => write!(f, "⊠"),
+ Self::Prunable => write!(f, "⊟"),
+ Self::Locked => write!(f, "⊞"),
Self::Branch => write!(f, "/"),
}
}
@@ -1017,7 +1017,7 @@ impl PositionMask {
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)
+ 1, // WORKTREE_STATE: / for branches, ⚑⊟⊞ for worktrees (priority: path_mismatch > prunable > locked)
2, // USER_MARKER: single emoji or two chars (allocate 2)
],
};
@@ -1035,7 +1035,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
@@ -1054,8 +1054,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
@@ -1065,7 +1065,7 @@ pub struct StatusSymbols {
/// Priority: Conflicts (✘) > Rebase (⤴) > Merge (⤵) > MergeTreeConflicts (✗) > SameCommit (·) > others (⊂)
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)
@@ -1186,7 +1186,7 @@ impl StatusSymbols {
WorktreeState::Branch => cformat!("<dim>{}</>", self.worktree_state),
// Path mismatch (⚑) is a stronger warning (red)
WorktreeState::PathMismatch => cformat!("<red>{}</>", self.worktree_state),
- // Other worktree attrs (⌫⊠) are warnings (yellow)
+ // Other worktree attrs (⊟⊞) are warnings (yellow)
_ => cformat!("<yellow>{}</>", self.worktree_state),
};
diff --git a/src/md_help.rs b/src/md_help.rs
index fa8918585..72487c9de 100644
--- a/src/md_help.rs
+++ b/src/md_help.rs
@@ -309,8 +309,8 @@ fn colorize_status_symbols(text: &str) -> String {
// Worktree state: PathMismatch (red), Prunable/Locked (yellow)
result = replace_dim(result, "⚑", error);
- result = replace_dim(result, "⌫", warning);
- result = replace_dim(result, "⊠", warning);
+ result = replace_dim(result, "⊟", warning);
+ result = replace_dim(result, "⊞", warning);
// CI status circles: replace dimmed ● followed by color name
let dimmed_bullet = format!("{dim}●{dim:#}");
diff --git a/tests/snapshots/integration__integration_tests__help__help_list_long.snap b/tests/snapshots/integration__integration_tests__help__help_list_long.snap
index d6f9dd53a..112e9972f 100644
--- a/tests/snapshots/integration__integration_tests__help__help_list_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_list_long.snap
@@ -133,8 +133,8 @@ The Status column has multiple subcolumns. Within each, only the first matching
⇣ Behind remote
Worktree state / Branch without worktree
⚑ Path doesn't match template
- ⌫ Prunable (directory missing)
- ⊠ Locked worktree
+ ⊟ Prunable (directory missing)
+ ⊞ Locked worktree
Rows are dimmed when the branch content is already in main (· same commit or ⊂ content integrated).
diff --git a/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap b/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap
index f5afca8dc..2071eaf61 100644
--- a/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap
+++ b/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap
@@ -144,9 +144,9 @@ exit_code: 0
"branch_op_state": "·",
"main_divergence": "",
"upstream_divergence": "",
- "worktree_state": "⊠"
+ "worktree_state": "⊞"
},
- "status_line": "locked-feature /u001b[2m·/u001b[22m/u001b[33m⊠/u001b[39m",
+ "status_line": "locked-feature /u001b[2m·/u001b[22m/u001b[33m⊞/u001b[39m",
"type": "worktree",
"path": "[REPO].locked-feature",
"bare": false,
diff --git a/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap b/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap
index 9617dbec5..1fc884124 100644
--- a/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap
+++ b/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap
@@ -24,6 +24,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo b834638e 1d Initial commit
-+ locked-no-reason · ⊠ ./repo.locked-no-reason b834638e 1d Initial commit
++ locked-no-reason · ⊞ ./repo.locked-no-reason b834638e 1d Initial commit
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__locked_worktree.snap b/tests/snapshots/integration__integration_tests__list__locked_worktree.snap
index 66767cc1c..5701b76e0 100644
--- a/tests/snapshots/integration__integration_tests__list__locked_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__locked_worktree.snap
@@ -24,6 +24,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo b834638e 1d Initial commit
-+ locked-feature · ⊠ ./repo.locked-feature b834638e 1d Initial commit
++ locked-feature · ⊞ ./repo.locked-feature b834638e 1d Initial commit
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap b/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap
index 6f8e2ec77..2f96f52c9 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 -----
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
@ main ^⇡ ./repo ⇡1 85ed6d3d 1d Main advances
-+ feature +!?✗↕⇅⊠🤖 +2 -2 ↑2 ↓1 +3 -1 ./repo.feature ⇡1 ⇣1 4afb2b9e 1d Local commit
++ feature +!?✗↕⇅⊞🤖 +2 -2 ↑2 ↓1 +3 -1 ./repo.feature ⇡1 ⇣1 4afb2b9e 1d Local commit
⚪ Showing 2 worktrees, 1 with changes, 1 ahead
diff --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.snap
index c4edb30b9..789c55818 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 -----
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
@ main ^ ./repo b7c14ce1 1d Main conflicting changes
-+ feature +!?✘ ⊠🤖 +7 ./repo.feature b7c14ce1 1d Main conflicting changes
++ feature +!?✘ ⊞🤖 +7 ./repo.feature b7c14ce1 1d Main conflicting changes
⚪ Showing 2 worktrees, 1 with changes
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_with_locked.snap b/tests/snapshots/integration__integration_tests__list__task_dag_with_locked.snap
index fc17f9aee..01e1ec259 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
@@ -25,7 +25,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
@ main ^ ./repo b834638e 1d Initial commit
-+ locked · ⊠ ./repo.locked b834638e 1d Initial commit
++ locked · ⊞ ./repo.locked b834638e 1d Initial commit
+ normal · ./repo.normal b834638e 1d Initial commit
⚪ Showing 3 worktrees