Skip to content

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

style(list): use a dim outline flag for irregular worktrees (#4334)

Maximilian Roosaf7f54b51488
diff --git a/docs/src/content/docs/list.md b/docs/src/content/docs/list.md
index 598826526..bf0fb9b35 100644
--- a/docs/src/content/docs/list.md
+++ b/docs/src/content/docs/list.md
@@ -166,7 +166,7 @@ Independent flags from `git status`; several can show at once (e.g. `+!?`). Each
### Worktree
-An in-progress git operation, a worktree-location attribute, or a branch with no worktree. One symbol shows, highest priority first (`✘ > ↻ > ⊟ > ⊞ > ⊘ > ⚑ > /`):
+An in-progress git operation, a worktree-location attribute, or a branch with no worktree. One symbol shows, highest priority first (`✘ > ↻ > ⊟ > ⊞ > ⊘ > ⚐ > /`):
| Symbol | JSON | Meaning |
|--------|------|---------|
@@ -175,8 +175,8 @@ An in-progress git operation, a worktree-location attribute, or a branch with no
| `⊟` | `worktree.prunable` | Prunable (worktree directory or its `.git` gone) |
| `⊞` | `worktree.locked` | Locked worktree |
| `⊘` | `worktree.detached` | Detached HEAD |
-| `⚑` | `worktree.duplicate_branch` | Branch checked out in more than one worktree |
-| `⚑` | `worktree.branch_mismatch` | Worktree isn't at the path its branch implies |
+| `⚐` | `worktree.duplicate_branch` | Branch checked out in more than one worktree |
+| `⚐` | `worktree.branch_mismatch` | Worktree isn't at the path its branch implies |
| `/` | no `worktree` object | Branch without a worktree |
### Default branch
diff --git a/docs/src/content/docs/switch.md b/docs/src/content/docs/switch.md
index 33a115e64..d4629882b 100644
--- a/docs/src/content/docs/switch.md
+++ b/docs/src/content/docs/switch.md
@@ -64,7 +64,7 @@ $ wt switch ../dark-mode # Switch by path...
$ wt switch feature/JIRA-1234 # ...or by branch
```
-Worktrunk finds the worktree from git's own records, so commands reach it by branch or path as usual. [`wt list`](/list/#worktree) marks it `⚑`, since it isn't at the path its branch implies, and [`wt step relocate`](/step/#wt-step-relocate) offers to move it back to the template path.
+Worktrunk finds the worktree from git's own records, so commands reach it by branch or path as usual. [`wt list`](/list/#worktree) marks it `⚐`, since it isn't at the path its branch implies, and [`wt step relocate`](/step/#wt-step-relocate) offers to move it back to the template path.
## Naming a worktree
diff --git a/plugins/worktrunk/skills/worktrunk/reference/list.md b/plugins/worktrunk/skills/worktrunk/reference/list.md
index db12f3713..3f2e56acc 100644
--- a/plugins/worktrunk/skills/worktrunk/reference/list.md
+++ b/plugins/worktrunk/skills/worktrunk/reference/list.md
@@ -150,7 +150,7 @@ Independent flags from `git status`; several can show at once (e.g. `+!?`). Each
### Worktree
-An in-progress git operation, a worktree-location attribute, or a branch with no worktree. One symbol shows, highest priority first (`✘ > ↻ > ⊟ > ⊞ > ⊘ > ⚑ > /`):
+An in-progress git operation, a worktree-location attribute, or a branch with no worktree. One symbol shows, highest priority first (`✘ > ↻ > ⊟ > ⊞ > ⊘ > ⚐ > /`):
| Symbol | JSON | Meaning |
|--------|------|---------|
@@ -159,8 +159,8 @@ An in-progress git operation, a worktree-location attribute, or a branch with no
| `⊟` | `worktree.prunable` | Prunable (worktree directory or its `.git` gone) |
| `⊞` | `worktree.locked` | Locked worktree |
| `⊘` | `worktree.detached` | Detached HEAD |
-| `⚑` | `worktree.duplicate_branch` | Branch checked out in more than one worktree |
-| `⚑` | `worktree.branch_mismatch` | Worktree isn't at the path its branch implies |
+| `⚐` | `worktree.duplicate_branch` | Branch checked out in more than one worktree |
+| `⚐` | `worktree.branch_mismatch` | Worktree isn't at the path its branch implies |
| `/` | no `worktree` object | Branch without a worktree |
### Default branch
diff --git a/plugins/worktrunk/skills/worktrunk/reference/switch.md b/plugins/worktrunk/skills/worktrunk/reference/switch.md
index 06ab1815c..b64e58733 100644
--- a/plugins/worktrunk/skills/worktrunk/reference/switch.md
+++ b/plugins/worktrunk/skills/worktrunk/reference/switch.md
@@ -48,7 +48,7 @@ $ wt switch ../dark-mode # Switch by path...
$ wt switch feature/JIRA-1234 # ...or by branch
```
-Worktrunk finds the worktree from git's own records, so commands reach it by branch or path as usual. [`wt list`](https://worktrunk.dev/list/#worktree) marks it `⚑`, since it isn't at the path its branch implies, and [`wt step relocate`](https://worktrunk.dev/step/#wt-step-relocate) offers to move it back to the template path.
+Worktrunk finds the worktree from git's own records, so commands reach it by branch or path as usual. [`wt list`](https://worktrunk.dev/list/#worktree) marks it `⚐`, since it isn't at the path its branch implies, and [`wt step relocate`](https://worktrunk.dev/step/#wt-step-relocate) offers to move it back to the template path.
## Naming a worktree
diff --git a/skills/worktrunk/reference/list.md b/skills/worktrunk/reference/list.md
index db12f3713..3f2e56acc 100644
--- a/skills/worktrunk/reference/list.md
+++ b/skills/worktrunk/reference/list.md
@@ -150,7 +150,7 @@ Independent flags from `git status`; several can show at once (e.g. `+!?`). Each
### Worktree
-An in-progress git operation, a worktree-location attribute, or a branch with no worktree. One symbol shows, highest priority first (`✘ > ↻ > ⊟ > ⊞ > ⊘ > ⚑ > /`):
+An in-progress git operation, a worktree-location attribute, or a branch with no worktree. One symbol shows, highest priority first (`✘ > ↻ > ⊟ > ⊞ > ⊘ > ⚐ > /`):
| Symbol | JSON | Meaning |
|--------|------|---------|
@@ -159,8 +159,8 @@ An in-progress git operation, a worktree-location attribute, or a branch with no
| `⊟` | `worktree.prunable` | Prunable (worktree directory or its `.git` gone) |
| `⊞` | `worktree.locked` | Locked worktree |
| `⊘` | `worktree.detached` | Detached HEAD |
-| `⚑` | `worktree.duplicate_branch` | Branch checked out in more than one worktree |
-| `⚑` | `worktree.branch_mismatch` | Worktree isn't at the path its branch implies |
+| `⚐` | `worktree.duplicate_branch` | Branch checked out in more than one worktree |
+| `⚐` | `worktree.branch_mismatch` | Worktree isn't at the path its branch implies |
| `/` | no `worktree` object | Branch without a worktree |
### Default branch
diff --git a/skills/worktrunk/reference/switch.md b/skills/worktrunk/reference/switch.md
index 06ab1815c..b64e58733 100644
--- a/skills/worktrunk/reference/switch.md
+++ b/skills/worktrunk/reference/switch.md
@@ -48,7 +48,7 @@ $ wt switch ../dark-mode # Switch by path...
$ wt switch feature/JIRA-1234 # ...or by branch
```
-Worktrunk finds the worktree from git's own records, so commands reach it by branch or path as usual. [`wt list`](https://worktrunk.dev/list/#worktree) marks it `⚑`, since it isn't at the path its branch implies, and [`wt step relocate`](https://worktrunk.dev/step/#wt-step-relocate) offers to move it back to the template path.
+Worktrunk finds the worktree from git's own records, so commands reach it by branch or path as usual. [`wt list`](https://worktrunk.dev/list/#worktree) marks it `⚐`, since it isn't at the path its branch implies, and [`wt step relocate`](https://worktrunk.dev/step/#wt-step-relocate) offers to move it back to the template path.
## Naming a worktree
diff --git a/src/cli/mod.rs b/src/cli/mod.rs
index 4c346b4b0..17c64c18d 100644
--- a/src/cli/mod.rs
+++ b/src/cli/mod.rs
@@ -684,7 +684,7 @@ $ wt switch ../dark-mode # Switch by path...
$ wt switch feature/JIRA-1234 # ...or by branch
```
-Worktrunk finds the worktree from git's own records, so commands reach it by branch or path as usual. [`wt list`](/list/#worktree) marks it `⚑`, since it isn't at the path its branch implies, and [`wt step relocate`](/step/#wt-step-relocate) offers to move it back to the template path.
+Worktrunk finds the worktree from git's own records, so commands reach it by branch or path as usual. [`wt list`](/list/#worktree) marks it `⚐`, since it isn't at the path its branch implies, and [`wt step relocate`](/step/#wt-step-relocate) offers to move it back to the template path.
## Naming a worktree
@@ -950,7 +950,7 @@ Independent flags from `git status`; several can show at once (e.g. `+!?`). Each
### Worktree
-An in-progress git operation, a worktree-location attribute, or a branch with no worktree. One symbol shows, highest priority first (`✘ > ↻ > ⊟ > ⊞ > ⊘ > ⚑ > /`):
+An in-progress git operation, a worktree-location attribute, or a branch with no worktree. One symbol shows, highest priority first (`✘ > ↻ > ⊟ > ⊞ > ⊘ > ⚐ > /`):
| Symbol | JSON | Meaning |
|--------|------|---------|
@@ -959,8 +959,8 @@ An in-progress git operation, a worktree-location attribute, or a branch with no
| `⊟` | `worktree.prunable` | Prunable (worktree directory or its `.git` gone) |
| `⊞` | `worktree.locked` | Locked worktree |
| `⊘` | `worktree.detached` | Detached HEAD |
-| `⚑` | `worktree.duplicate_branch` | Branch checked out in more than one worktree |
-| `⚑` | `worktree.branch_mismatch` | Worktree isn't at the path its branch implies |
+| `⚐` | `worktree.duplicate_branch` | Branch checked out in more than one worktree |
+| `⚐` | `worktree.branch_mismatch` | Worktree isn't at the path its branch implies |
| `/` | no `worktree` object | Branch without a worktree |
### Default branch
diff --git a/src/commands/list/collect/mod.rs b/src/commands/list/collect/mod.rs
index bf2fa7b7b..5c6a706b6 100644
--- a/src/commands/list/collect/mod.rs
+++ b/src/commands/list/collect/mod.rs
@@ -1248,7 +1248,7 @@ pub fn collect(
// Check if worktree is at its expected path based on config
// template. A detached worktree has no branch to imply a path, so
// it isn't off-template — it has its own `⊘`, and flagging it here
- // too would spend the `⚑` on a state the row already reports.
+ // too would spend the `⚐` on a state the row already reports.
let branch_worktree_mismatch =
wt.branch.is_some() && !is_worktree_at_expected_path(wt, repo, repo.user_config());
diff --git a/src/commands/list/json_output.rs b/src/commands/list/json_output.rs
index 2b3904a33..4c62be425 100644
--- a/src/commands/list/json_output.rs
+++ b/src/commands/list/json_output.rs
@@ -544,7 +544,7 @@ pub(crate) fn format_raw_symbols(symbols: &super::model::StatusSymbols) -> Strin
}
// Worktree state (gate 2) — operations (✘↻) take priority over
- // location (/⚑⊟⊞). Gate 2 is "operation_state is Some"; the metadata
+ // location (/⚐⊟⊞). Gate 2 is "operation_state is Some"; the metadata
// worktree_state is filled synchronously and always Some by the time
// the operation family is known.
if let Some(op) = symbols.operation_state {
diff --git a/src/commands/list/model/item.rs b/src/commands/list/model/item.rs
index b93e1b705..2d6c217d8 100644
--- a/src/commands/list/model/item.rs
+++ b/src/commands/list/model/item.rs
@@ -24,7 +24,7 @@ use crate::commands::list::layout::{LinkStyle, format_url_cell};
/// (Gate 2) from metadata alone. The decision priority is:
/// `prunable` > `locked` > detached > `duplicate_branch` >
/// `branch_worktree_mismatch` > `None` — the yellow actionable states outrank
-/// the informational (dim yellow) `⊘` and `⚑`. The last two both render `⚑`,
+/// the informational `⊘` (yellow) and `⚐` (dim). The last two both render `⚐`,
/// so their order decides only which cause the JSON `worktree.state` names; a
/// duplicate wins because a force-added worktree lands off-template as a side
/// effect of being force-added, not as the fact worth reporting.
@@ -961,9 +961,9 @@ impl ListItem {
mod tests {
use super::*;
- /// The yellow actionable states outrank the informational (dim yellow)
- /// `⊘` and `⚑`, so a demoted flag can never mask `⊟` or `⊞`. A force-added
- /// duplicate lands off-template too, so the two `⚑` states routinely
+ /// The yellow actionable states outrank the informational `⊘` and `⚐`,
+ /// so a demoted flag can never mask `⊟` or `⊞`. A force-added
+ /// duplicate lands off-template too, so the two `⚐` states routinely
/// co-occur and their order picks the cause the JSON reports.
#[test]
fn test_metadata_worktree_state_priority() {
@@ -1005,7 +1005,7 @@ mod tests {
WorktreeState::Locked
);
- // Off a branch, `⊘` outranks both `⚑` states — nothing else in the
+ // Off a branch, `⊘` outranks both `⚐` states — nothing else in the
// row says the Branch cell is a hash — but still yields to `⊟`/`⊞`.
assert_eq!(
metadata_worktree_state(&duplicate, false),
diff --git a/src/commands/list/model/state.rs b/src/commands/list/model/state.rs
index 253c80f6b..9fa84e41e 100644
--- a/src/commands/list/model/state.rs
+++ b/src/commands/list/model/state.rs
@@ -77,7 +77,7 @@ impl Divergence {
/// Priority order for worktrees: Prunable > Locked > Detached >
/// DuplicateBranch > BranchWorktreeMismatch
///
-/// `DuplicateBranch` and `BranchWorktreeMismatch` share the `⚑` glyph: both
+/// `DuplicateBranch` and `BranchWorktreeMismatch` share the `⚐` glyph: both
/// say this worktree's place in the branch ⇔ worktree map is irregular, and
/// the table already distinguishes them — a repeated Branch cell is the
/// duplicate, an off-template Path cell the mismatch. The variants stay
@@ -110,7 +110,7 @@ impl std::fmt::Display for WorktreeState {
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
match self {
Self::None => Ok(()),
- Self::BranchWorktreeMismatch | Self::DuplicateBranch => write!(f, "⚑"),
+ Self::BranchWorktreeMismatch | Self::DuplicateBranch => write!(f, "⚐"),
Self::Detached => write!(f, "⊘"),
Self::Prunable => write!(f, "⊟"),
Self::Locked => write!(f, "⊞"),
@@ -534,9 +534,9 @@ mod tests {
#[test]
fn test_worktree_state_display() {
assert_eq!(format!("{}", WorktreeState::None), "");
- assert_eq!(format!("{}", WorktreeState::BranchWorktreeMismatch), "⚑");
+ assert_eq!(format!("{}", WorktreeState::BranchWorktreeMismatch), "⚐");
// Shares the mismatch glyph; the JSON state names which cause it was.
- assert_eq!(format!("{}", WorktreeState::DuplicateBranch), "⚑");
+ assert_eq!(format!("{}", WorktreeState::DuplicateBranch), "⚐");
// Its own glyph: the Branch cell holds a short hash, which reads as a
// branch named like one until this column says otherwise.
assert_eq!(format!("{}", WorktreeState::Detached), "⊘");
diff --git a/src/commands/list/model/status_symbols.rs b/src/commands/list/model/status_symbols.rs
index 981de17e3..917dd5e77 100644
--- a/src/commands/list/model/status_symbols.rs
+++ b/src/commands/list/model/status_symbols.rs
@@ -22,7 +22,7 @@
//! | 0 | `STAGED` | `+` | Are there staged changes? |
//! | 1 | `MODIFIED` | `!` | Are there unstaged modifications? |
//! | 2 | `UNTRACKED` | `?` | Are there untracked files? |
-//! | 3 | `WORKTREE_STATE` | `✘ ↻ ⊟ ⊞ ⊘ ⚑ /` | Operation / worktree attribute |
+//! | 3 | `WORKTREE_STATE` | `✘ ↻ ⊟ ⊞ ⊘ ⚐ /` | Operation / worktree attribute |
//! | 4 | `MAIN_STATE` | `^ _ ⊂ ✗ – ↕ ↑ ↓` | Relationship to the default branch |
//! | 5 | `UPSTREAM_DIVERGENCE` | \| ⇅ ⇡ ⇣ | Relationship to the tracked remote |
//! | 6 | `USER_MARKER` | emoji / text | User-defined annotation |
@@ -55,10 +55,10 @@
//!
//! # Gate 2: Worktree state (position 3)
//!
-//! **Renders:** at most one of `✘ ↻ ⊟ ⊞ ⊘ ⚑ /`, priority
-//! `✘ > ↻ > ⊟ > ⊞ > ⊘ > ⚑ > /`. The operation family (`✘↻`) comes from live
-//! task data; the attribute family (`⊟⊞⊘⚑/`) is metadata, always known.
-//! `⚑` covers both irregular-mapping states — a duplicated branch outranks
+//! **Renders:** at most one of `✘ ↻ ⊟ ⊞ ⊘ ⚐ /`, priority
+//! `✘ > ↻ > ⊟ > ⊞ > ⊘ > ⚐ > /`. The operation family (`✘↻`) comes from live
+//! task data; the attribute family (`⊟⊞⊘⚐/`) is metadata, always known.
+//! `⚐` covers both irregular-mapping states — a duplicated branch outranks
//! an off-template path, and the JSON `worktree.state` names which.
//!
//! **Inputs:** `data.has_conflicts`, `data.git_operation`, plus metadata
@@ -75,7 +75,7 @@
//! `↻`, whichever operation it is.
//! 3. `has_conflicts == Some(false)` and `git_operation == Some(None)` and
//! metadata says prunable → `⊟`.
-//! 4. …continuing down through `⊞`, `⊘`, `⚑`, `/`, nothing.
+//! 4. …continuing down through `⊞`, `⊘`, `⚐`, `/`, nothing.
//!
//! Until both `has_conflicts` and `git_operation` are known, we cannot rule
//! out `✘/↻`, so the position renders `·` even if metadata would otherwise
@@ -270,7 +270,7 @@ impl PositionMask {
pub(crate) const STAGED: usize = 0; // + (staged changes)
pub(crate) const MODIFIED: usize = 1; // ! (modified files)
pub(crate) const UNTRACKED: usize = 2; // ? (untracked files)
- pub(crate) const WORKTREE_STATE: usize = 3; // Worktree: ✘↻/⚑⊘⊟⊞
+ pub(crate) const WORKTREE_STATE: usize = 3; // Worktree: ✘↻/⚐⊘⊟⊞
pub(crate) const MAIN_STATE: usize = 4; // Main relationship: ^_⊂✗↕↑↓
pub(crate) const UPSTREAM_DIVERGENCE: usize = 5; // Remote: |⇅⇡⇣
pub(crate) const USER_MARKER: usize = 6;
@@ -282,7 +282,7 @@ impl PositionMask {
1, // STAGED: + (1 char)
1, // MODIFIED: ! (1 char)
1, // UNTRACKED: ? (1 char)
- 1, // WORKTREE_STATE: ✘↻/⊟⊞⊘⚑ (1 char, priority: conflicts > in-progress operation > prunable > locked > detached > duplicate_branch > branch_worktree_mismatch > branch)
+ 1, // WORKTREE_STATE: ✘↻/⊟⊞⊘⚐ (1 char, priority: conflicts > in-progress operation > prunable > locked > detached > duplicate_branch > branch_worktree_mismatch > branch)
1, // MAIN_STATE: ^_⊂✗–↕↑↓ (1 char, priority: is_main > orphan > empty > integrated > would_conflict > same_commit > diverged > ahead > behind)
1, // UPSTREAM_DIVERGENCE: |⇡⇣⇅ (1 char)
2, // USER_MARKER: single emoji or two chars (allocate 2)
@@ -369,7 +369,7 @@ impl WorkingTreeStatus {
/// Symbols are categorized to enable vertical alignment in table output.
/// Display order (left to right):
/// - Working tree: +, !, ? (staged, modified, untracked - NOT mutually exclusive)
-/// - Worktree state: ✘, ↻, /, ⚑, ⊘, ⊟, ⊞ (operations + location)
+/// - Worktree state: ✘, ↻, /, ⚐, ⊘, ⊟, ⊞ (operations + location)
/// - Main state: ^, ✗, _, ⊂, ↕, ↑, ↓ (relationship to default branch - single-stroke vertical arrows)
/// - Upstream divergence: |, ⇅, ⇡, ⇣ (relationship to remote - vertical arrows)
/// - User marker: custom labels, emoji
@@ -377,15 +377,14 @@ impl WorkingTreeStatus {
/// ## Mutual Exclusivity
///
/// **Worktree state (operations take priority over location):**
-/// Priority: ✘ > ↻ > ⊟ > ⊞ > ⊘ > ⚑ > /
+/// Priority: ✘ > ↻ > ⊟ > ⊞ > ⊘ > ⚐ > /
/// - ✘: Actual conflicts (must resolve)
/// - ↻: A git operation is in progress (rebase, merge, cherry-pick, revert, bisect)
/// - ⊟: Prunable (directory or its `.git` gone)
/// - ⊞: Locked worktree
/// - ⊘: Detached HEAD — the worktree is on a commit, not a branch
-/// - ⚑: Irregular branch ⇔ worktree mapping — the branch is checked out in
-/// more than one worktree, or the path is off-template (informational, dim
-/// yellow)
+/// - ⚐: Irregular branch ⇔ worktree mapping — the branch is checked out in
+/// more than one worktree, or the path is off-template (informational, dim)
/// - /: Branch without worktree
///
/// **Main state (single position with priority):**
@@ -567,7 +566,7 @@ impl StatusSymbols {
};
// Gate 2 — worktree state (position 3). Operation family (`✘↻`)
- // takes priority over metadata family (`⚑⊘⊟⊞/`). The gate is
+ // takes priority over metadata family (`⚐⊘⊟⊞/`). The gate is
// `Loading` iff `operation_state` is still `None` — even when
// `worktree_state` metadata would yield `⊟`, we cannot safely show
// it without ruling out a pending operation signal. Once
@@ -581,13 +580,11 @@ impl StatusSymbols {
}
Some(_) => match self.worktree_state {
None | Some(WorktreeState::None) => SlotState::Empty,
- Some(WorktreeState::Branch) => {
- SlotState::Visible(cformat!("<dim>{}</>", WorktreeState::Branch))
- }
Some(
- state
- @ (WorktreeState::BranchWorktreeMismatch | WorktreeState::DuplicateBranch),
- ) => SlotState::Visible(cformat!("<dim,yellow>{state}</>")),
+ state @ (WorktreeState::Branch
+ | WorktreeState::BranchWorktreeMismatch
+ | WorktreeState::DuplicateBranch),
+ ) => SlotState::Visible(cformat!("<dim>{state}</>")),
Some(other) => SlotState::Visible(cformat!("<yellow>{}</>", other)),
},
};
diff --git a/src/commands/step/promote.rs b/src/commands/step/promote.rs
index 709cea8fa..3a96c8976 100644
--- a/src/commands/step/promote.rs
+++ b/src/commands/step/promote.rs
@@ -244,7 +244,7 @@ fn print_promote_announcement(is_restoring: bool, default_branch: Option<&str>)
// Creating mismatch - show warning and how to restore
eprintln!(
"{}",
- warning_message("Promoting creates mismatched worktree state (shown as ⚑ in wt list)",)
+ warning_message("Promoting creates mismatched worktree state (shown as ⚐ in wt list)",)
);
// Only show restore hint if we know the default branch
if let Some(default) = default_branch {
diff --git a/src/git/repository/worktrees.rs b/src/git/repository/worktrees.rs
index 6838128e0..d82e39262 100644
--- a/src/git/repository/worktrees.rs
+++ b/src/git/repository/worktrees.rs
@@ -826,7 +826,7 @@ pub(crate) fn worktree_paths_for_branch(worktrees: &[WorktreeInfo], branch: &str
///
/// The all-at-once counterpart to `worktree_paths_for_branch`, for callers
/// classifying the whole list rather than resolving one branch — `wt list`
-/// flags each affected row with `⚑` so the ambiguity is visible before a
+/// flags each affected row with `⚐` so the ambiguity is visible before a
/// command resolves the branch and warns.
pub fn duplicated_branches(worktrees: &[WorktreeInfo]) -> HashSet<&str> {
let mut seen = HashSet::new();
diff --git a/src/md_help.rs b/src/md_help.rs
index 713dba413..fd7958975 100644
--- a/src/md_help.rs
+++ b/src/md_help.rs
@@ -519,11 +519,9 @@ fn colorize_status_symbols(text: &str) -> String {
result = replace_dim(result, "↻", warning);
result = replace_dim(result, "✗", warning);
- // Worktree state: Prunable/Locked (yellow), the irregular-mapping flag
- // (dim yellow)
+ // Worktree state: Prunable/Locked (yellow)
result = replace_dim(result, "⊟", warning);
result = replace_dim(result, "⊞", warning);
- result = replace_dim(result, "⚑", warning.dimmed());
// CI legend samples: replace dimmed `#` followed by a color name
let dimmed_hash = format!("{dim}#{dim:#}");
diff --git a/tests/integration_tests/list.rs b/tests/integration_tests/list.rs
index c64976a2f..0eec5ab93 100644
--- a/tests/integration_tests/list.rs
+++ b/tests/integration_tests/list.rs
@@ -229,7 +229,7 @@ fn force_duplicate_worktree(repo: &TestRepo, branch: &str) -> std::path::PathBuf
dup_path
}
-/// A branch checked out in two worktrees flags both rows with `⚑`, the same
+/// A branch checked out in two worktrees flags both rows with `⚐`, the same
/// irregular-mapping flag an off-template path earns, and the Path column
/// earns its place: the branch name no longer identifies the row. Before
/// this, only the off-template duplicate was flagged, and the worktree `wt`
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 a04be9900..8ab8a2039 100644
--- a/tests/snapshots/integration__integration_tests__help__help_list_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_list_long.snap
@@ -228,7 +228,7 @@ Independent flags from git status; several can show at once (e.g. +!
Worktree
-An in-progress git operation, a worktree-location attribute, or a branch with no worktree. One symbol shows, highest priority first (✘ > ↻ > ⊟ > ⊞ > ⊘ > ⚑ > /):
+An in-progress git operation, a worktree-location attribute, or a branch with no worktree. One symbol shows, highest priority first (✘ > ↻ > ⊟ > ⊞ > ⊘ > ⚐ > /):
Symbol JSON Meaning
────── ─────────────────────────────────────────────────────────────────────── ───────────────────────────────────────────────────
@@ -237,8 +237,8 @@ An in-progress git operation, a worktree-location attribute, or a branch with no
⊟ worktree.prunable Prunable (worktree directory or its .git gone)
⊞ worktree.locked Locked worktree
⊘ worktree.detached Detached HEAD
- ⚑ worktree.duplicate_branch Branch checked out in more than one worktree
- ⚑ worktree.branch_mismatch Worktree isn't at the path its branch implies
+ ⚐ worktree.duplicate_branch Branch checked out in more than one worktree
+ ⚐ worktree.branch_mismatch Worktree isn't at the path its branch implies
/ no worktree object Branch without a worktree
Default branch
diff --git a/tests/snapshots/integration__integration_tests__help__help_list_narrow_80.snap b/tests/snapshots/integration__integration_tests__help__help_list_narrow_80.snap
index cc45cc79b..9198455e5 100644
--- a/tests/snapshots/integration__integration_tests__help__help_list_narrow_80.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_list_narrow_80.snap
@@ -276,7 +276,7 @@ symbol in the column.
Worktree
An in-progress git operation, a worktree-location attribute, or a branch with no
- worktree. One symbol shows, highest priority first (✘ > ↻ > ⊟ > ⊞ > ⊘ > ⚑ > /):
+ worktree. One symbol shows, highest priority first (✘ > ↻ > ⊟ > ⊞ > ⊘ > ⚐ > /):
Symbol JSON Meaning
────── ───────────────────────── ─────────────────────────────────────────────
@@ -290,8 +290,8 @@ An in-progress git operation, a worktree-location attribute, or a branch with no
gone)
⊞ worktree.locked Locked worktree
⊘ worktree.detached Detached HEAD
- ⚑ worktree.duplicate_branch Branch checked out in more than one worktree
- ⚑ worktree.branch_mismatch Worktree isn't at the path its branch implies
+ ⚐ worktree.duplicate_branch Branch checked out in more than one worktree
+ ⚐ worktree.branch_mismatch Worktree isn't at the path its branch implies
/ no worktree object Branch without a worktree
Default branch
diff --git a/tests/snapshots/integration__integration_tests__help__help_switch_long.snap b/tests/snapshots/integration__integration_tests__help__help_switch_long.snap
index 527f67176..5da984218 100644
--- a/tests/snapshots/integration__integration_tests__help__help_switch_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_switch_long.snap
@@ -184,7 +184,7 @@ If the branch already has a worktree, wt switch changes directories to i
  wt switch ../dark-mode # Switch by path...
  wt switch feature/JIRA-1234 # ...or by branch
-Worktrunk finds the worktree from git's own records, so commands reach it by branch or path as usual. wt list marks it ⚑, since it isn't at the path its branch implies, and wt step relocate offers to move it back to the template path.
+Worktrunk finds the worktree from git's own records, so commands reach it by branch or path as usual. wt list marks it ⚐, since it isn't at the path its branch implies, and wt step relocate offers to move it back to the template path.
Naming a worktree
diff --git a/tests/snapshots/integration__integration_tests__list__list_branches_with_nonexistent_default_branch.snap b/tests/snapshots/integration__integration_tests__list__list_branches_with_nonexistent_default_branch.snap
index 2b3371737..bc0cab4aa 100644
--- a/tests/snapshots/integration__integration_tests__list__list_branches_with_nonexistent_default_branch.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_branches_with_nonexistent_default_branch.snap
@@ -58,7 +58,7 @@ success: true
exit_code: 0
----- stdout -----
Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
-@ main ⚑^| | . 05a4a45 16h Initial commit
+@ main ⚐^| | . 05a4a45 16h Initial commit
+ feature-a ../repo.feature-a 1b87d47 16h Add feature-a file
+ feature-b ../repo.feature-b f62940f 16h Add feature-b file
+ feature-c ../repo.feature-c 345c7c9 16h Add feature-c file
diff --git a/tests/snapshots/integration__integration_tests__list__list_duplicate_branch.snap b/tests/snapshots/integration__integration_tests__list__list_duplicate_branch.snap
index 6fd6150be..631c999a2 100644
--- a/tests/snapshots/integration__integration_tests__list__list_duplicate_branch.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_duplicate_branch.snap
@@ -58,11 +58,11 @@ exit_code: 0
----- stdout -----
Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
@ main ^| | . 05a4a45 16h Initial commit
-+ feature ⚑_ ../repo.feature 05a4a45 16h Initial commit
++ feature ⚐_ ../repo.feature 05a4a45 16h Initial commit
+ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d47 16h Add feature-a file
+ feature-b ↑ ↑1 +1 ../repo.feature-b f62940f 16h Add feature-b file
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c9 16h Add feature-c file
-+ feature ⚑_ ../repo.feature-dup 05a4a45 16h Initial commit
++ feature ⚐_ ../repo.feature-dup 05a4a45 16h Initial commit
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__list__list_full_with_nonexistent_default_branch.snap b/tests/snapshots/integration__integration_tests__list__list_full_with_nonexistent_default_branch.snap
index 97765aa1b..d78707e3d 100644
--- a/tests/snapshots/integration__integration_tests__list__list_full_with_nonexistent_default_branch.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_full_with_nonexistent_default_branch.snap
@@ -58,7 +58,7 @@ success: true
exit_code: 0
----- stdout -----
Branch Status HEAD± main↕ main…± Remote⇅ CI Path Commit Age Message
-@ main ⚑^| | . 05a4a45 16h Initial commit
+@ main ⚐^| | . 05a4a45 16h Initial commit
+ feature-a ../repo.feature-a 1b87d47 16h Add feature-a file
+ feature-b ../repo.feature-b f62940f 16h Add feature-b file
+ feature-c ../repo.feature-c 345c7c9 16h Add feature-c file
diff --git a/tests/snapshots/integration__integration_tests__list__list_nested_worktree_current_indicator.snap b/tests/snapshots/integration__integration_tests__list__list_nested_worktree_current_indicator.snap
index 63f5ef4a3..e680aad84 100644
--- a/tests/snapshots/integration__integration_tests__list__list_nested_worktree_current_indicator.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_nested_worktree_current_indicator.snap
@@ -57,7 +57,7 @@ success: true
exit_code: 0
----- stdout -----
Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
-@ feature ⚑_ ./.worktrees/feature 05a4a45 16h Initial commit
+@ feature ⚐_ ./.worktrees/feature 05a4a45 16h Initial commit
^ main ? ^| +1 | . 05a4a45 16h Initial commit
+ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d47 16h Add feature-a file
+ feature-b ↑ ↑1 +1 ../repo.feature-b f62940f 16h Add feature-b file
diff --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.snap
index c34435ecb..2ef064d97 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
@@ -57,7 +57,7 @@ success: true
exit_code: 0
----- stdout -----
Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
-@ develop ⚑^ . 05a4a45 16h Initial commit
+@ develop ⚐^ . 05a4a45 16h Initial commit
+ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d47 16h Add feature-a file
+ feature-b ↑ ↑1 +1 ../repo.feature-b f62940f 16h Add feature-b file
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c9 16h Add feature-c file
diff --git a/tests/snapshots/integration__integration_tests__list__list_warns_when_default_branch_missing_worktree.snap b/tests/snapshots/integration__integration_tests__list__list_warns_when_default_branch_missing_worktree.snap
index c34435ecb..2ef064d97 100644
--- a/tests/snapshots/integration__integration_tests__list__list_warns_when_default_branch_missing_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_warns_when_default_branch_missing_worktree.snap
@@ -57,7 +57,7 @@ success: true
exit_code: 0
----- stdout -----
Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
-@ develop ⚑^ . 05a4a45 16h Initial commit
+@ develop ⚐^ . 05a4a45 16h Initial commit
+ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d47 16h Add feature-a file
+ feature-b ↑ ↑1 +1 ../repo.feature-b f62940f 16h Add feature-b file
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c9 16h Add feature-c file
diff --git a/tests/snapshots/integration__integration_tests__list__list_with_nonexistent_default_branch.snap b/tests/snapshots/integration__integration_tests__list__list_with_nonexistent_default_branch.snap
index fe429e823..89a11118e 100644
--- a/tests/snapshots/integration__integration_tests__list__list_with_nonexistent_default_branch.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_with_nonexistent_default_branch.snap
@@ -57,7 +57,7 @@ success: true
exit_code: 0
----- stdout -----
Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
-@ main ⚑^| | . 05a4a45 16h Initial commit
+@ main ⚐^| | . 05a4a45 16h Initial commit
+ feature-a ../repo.feature-a 1b87d47 16h Add feature-a file
+ feature-b ../repo.feature-b f62940f 16h Add feature-b file
+ feature-c ../repo.feature-c 345c7c9 16h Add feature-c file
diff --git a/tests/snapshots/integration__integration_tests__step_promote__promote_from_worktree.snap b/tests/snapshots/integration__integration_tests__step_promote__promote_from_worktree.snap
index 18ee3c84d..4697281ab 100644
--- a/tests/snapshots/integration__integration_tests__step_promote__promote_from_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__step_promote__promote_from_worktree.snap
@@ -59,6 +59,6 @@ exit_code: 0
----- stdout -----
----- stderr -----
-▲ Promoting creates mismatched worktree state (shown as ⚑ in wt list)
+▲ Promoting creates mismatched worktree state (shown as ⚐ in wt list)
↳ To restore canonical locations, run wt step promote main
✓ Promoted: main worktree now has feature; _REPO_.feature now has main
diff --git a/tests/snapshots/integration__integration_tests__step_promote__promote_shows_mismatch_in_list.snap b/tests/snapshots/integration__integration_tests__step_promote__promote_shows_mismatch_in_list.snap
index b1b0a39cb..9957112aa 100644
--- a/tests/snapshots/integration__integration_tests__step_promote__promote_shows_mismatch_in_list.snap
+++ b/tests/snapshots/integration__integration_tests__step_promote__promote_shows_mismatch_in_list.snap
@@ -57,8 +57,8 @@ success: true
exit_code: 0
----- stdout -----
Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
-@ feature ⚑^ . 05a4a45 16h Initial commit
-+ main ⚑_| | ../repo.feature 05a4a45 16h Initial commit
+@ feature ⚐^ . 05a4a45 16h Initial commit
++ main ⚐_| | ../repo.feature 05a4a45 16h Initial commit
+ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d47 16h Add feature-a file
+ feature-b ↑ ↑1 +1 ../repo.feature-b f62940f 16h Add feature-b file
+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c9 16h Add feature-c file
diff --git a/tests/snapshots/integration__integration_tests__step_promote__promote_swap_bidirectional.snap b/tests/snapshots/integration__integration_tests__step_promote__promote_swap_bidirectional.snap
index 731d46ec2..f920448e3 100644
--- a/tests/snapshots/integration__integration_tests__step_promote__promote_swap_bidirectional.snap
+++ b/tests/snapshots/integration__integration_tests__step_promote__promote_swap_bidirectional.snap
@@ -60,7 +60,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
-▲ Promoting creates mismatched worktree state (shown as ⚑ in wt list)
+▲ Promoting creates mismatched worktree state (shown as ⚐ in wt list)
↳ To restore canonical locations, run wt step promote main
✓ Promoted: main worktree now has feature; _REPO_.feature now has main
✓ Swapped 4 gitignored paths
diff --git a/tests/snapshots/integration__integration_tests__step_promote__promote_swap_no_ignored_files.snap b/tests/snapshots/integration__integration_tests__step_promote__promote_swap_no_ignored_files.snap
index c078980c2..daded8f3f 100644
--- a/tests/snapshots/integration__integration_tests__step_promote__promote_swap_no_ignored_files.snap
+++ b/tests/snapshots/integration__integration_tests__step_promote__promote_swap_no_ignored_files.snap
@@ -60,6 +60,6 @@ exit_code: 0
----- stdout -----
----- stderr -----
-▲ Promoting creates mismatched worktree state (shown as ⚑ in wt list)
+▲ Promoting creates mismatched worktree state (shown as ⚐ in wt list)
↳ To restore canonical locations, run wt step promote main
✓ Promoted: main worktree now has feature; _REPO_.feature now has main
diff --git a/tests/snapshots/integration__integration_tests__step_promote__promote_with_branch_argument.snap b/tests/snapshots/integration__integration_tests__step_promote__promote_with_branch_argument.snap
index c078980c2..daded8f3f 100644
--- a/tests/snapshots/integration__integration_tests__step_promote__promote_with_branch_argument.snap
+++ b/tests/snapshots/integration__integration_tests__step_promote__promote_with_branch_argument.snap
@@ -60,6 +60,6 @@ exit_code: 0
----- stdout -----
----- stderr -----
-▲ Promoting creates mismatched worktree state (shown as ⚑ in wt list)
+▲ Promoting creates mismatched worktree state (shown as ⚐ in wt list)
↳ To restore canonical locations, run wt step promote main
✓ Promoted: main worktree now has feature; _REPO_.feature now has main