Skip to content

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

refactor: Consolidate branch and git operation states

Maximilian Roosd1c546958b30
diff --git a/src/commands/list/collect.rs b/src/commands/list/collect.rs
index 4a678b371..f630f1801 100644
--- a/src/commands/list/collect.rs
+++ b/src/commands/list/collect.rs
@@ -26,7 +26,7 @@ use worktrunk::styling::INFO_EMOJI;
use super::ci_status::PrStatus;
use super::model::{
- AheadBehind, BranchDiffTotals, BranchState, CommitDetails, GitOperation, ItemKind, ListItem,
+ AheadBehind, BranchDiffTotals, BranchOpState, CommitDetails, ItemKind, ListItem,
MainDivergence, StatusSymbols, UpstreamDivergence, UpstreamStatus,
};
@@ -167,36 +167,37 @@ fn compute_divergences(
/// Determine branch state for a worktree.
///
/// Returns:
-/// - `BranchState::None` if main worktree or no base branch
-/// - `BranchState::MatchesMain` if working tree matches main exactly (no commits, no diff)
-/// - `BranchState::NoCommits` if no commits and working tree is clean
-/// - `BranchState::None` otherwise
-fn determine_worktree_branch_state(
+/// - `BranchOpState::None` if main worktree or no base branch
+/// - `BranchOpState::NoCommits` if no commits ahead and working tree is clean
+/// - `BranchOpState::MatchesMain` if ahead == 0 but dirty tree happens to match main (rare)
+/// - `BranchOpState::None` otherwise
+fn determine_worktree_base_state(
is_main: bool,
default_branch: Option<&str>,
ahead: usize,
working_tree_diff: Option<&LineDiff>,
working_tree_diff_with_main: &Option<Option<LineDiff>>,
-) -> BranchState {
+) -> BranchOpState {
if is_main || default_branch.is_none() {
- return BranchState::None;
+ return BranchOpState::None;
}
let is_clean = working_tree_diff.map(|d| d.is_empty()).unwrap_or(true);
+ // Check if no commits and clean working tree (most common removable state)
+ if ahead == 0 && is_clean {
+ return BranchOpState::NoCommits;
+ }
+
// Check if working tree matches main exactly (requires diff with main to be computed)
+ // This is rare - only when ahead == 0, tree is dirty, but dirty changes happen to match main
if let Some(Some(mdiff)) = working_tree_diff_with_main.as_ref()
&& mdiff.is_empty()
&& ahead == 0
{
- return BranchState::MatchesMain;
- }
-
- // Check if no commits and clean working tree
- if ahead == 0 && is_clean {
- BranchState::NoCommits
+ BranchOpState::MatchesMain
} else {
- BranchState::None
+ BranchOpState::None
}
}
@@ -205,7 +206,7 @@ fn determine_worktree_branch_state(
/// This is idempotent and can be called multiple times as new data arrives.
/// It will recompute with the latest available data.
///
-/// Branches get a subset of status symbols (no working tree, git operation, or worktree attrs).
+/// Branches get a subset of status symbols (no working tree changes or worktree attrs).
// TODO(status-indicator): show a status glyph when a worktree's checked-out branch
// differs from the branch name we associate with it (e.g., worktree exists but on another branch).
fn compute_item_status_symbols(
@@ -228,8 +229,8 @@ fn compute_item_status_symbols(
// Full status computation for worktrees
// Use default_branch directly (None for main worktree)
- // Item attributes - priority: prunable > locked (1 char max)
- let item_attrs = if data.prunable.is_some() {
+ // Worktree state - priority: prunable > locked (1 char max)
+ let worktree_state = if data.prunable.is_some() {
"⌫".to_string() // Prunable (directory missing)
} else if data.locked.is_some() {
"⊠".to_string() // Locked (protected)
@@ -237,8 +238,8 @@ fn compute_item_status_symbols(
String::new()
};
- // Determine branch state (only for non-main worktrees with base branch)
- let branch_state = determine_worktree_branch_state(
+ // Determine base branch state (only for non-main worktrees with base branch)
+ let base_state = determine_worktree_base_state(
data.is_main,
default_branch,
counts.ahead,
@@ -246,20 +247,17 @@ fn compute_item_status_symbols(
&data.working_tree_diff_with_main,
);
- // Determine git operation
- let git_operation = match data.worktree_state.as_deref() {
- Some("rebase") => GitOperation::Rebase,
- Some("merge") => GitOperation::Merge,
- _ => GitOperation::None,
- };
-
- // Combine conflicts and branch state (mutually exclusive)
- let branch_state = if has_conflicts {
- BranchState::Conflicts
+ // Apply priority: Conflicts > Rebase > Merge > MergeTreeConflicts > base_state
+ let branch_op_state = if has_conflicts {
+ BranchOpState::Conflicts
+ } else if data.worktree_state.as_deref() == Some("rebase") {
+ BranchOpState::Rebase
+ } else if data.worktree_state.as_deref() == Some("merge") {
+ BranchOpState::Merge
} else if has_merge_tree_conflicts {
- BranchState::MergeTreeConflicts
+ BranchOpState::MergeTreeConflicts
} else {
- branch_state
+ base_state
};
// Override main_divergence for the main worktree
@@ -270,9 +268,8 @@ fn compute_item_status_symbols(
};
item.status_symbols = Some(StatusSymbols {
- branch_state,
- git_operation,
- item_attrs,
+ branch_op_state,
+ worktree_state,
main_divergence,
upstream_divergence,
working_tree: working_tree_symbols.unwrap_or("").to_string(),
@@ -283,24 +280,23 @@ fn compute_item_status_symbols(
// Simplified status computation for branches
// Only compute symbols that apply to branches (no working tree, git operation, or worktree attrs)
- // Branch state - branches can only show Conflicts or NoCommits
+ // Branch op state - branches can only show MergeTreeConflicts or NoCommits
// (MatchesMain only applies to worktrees since branches don't have working trees)
- let branch_state = if has_merge_tree_conflicts {
- BranchState::MergeTreeConflicts
+ let branch_op_state = if has_merge_tree_conflicts {
+ BranchOpState::MergeTreeConflicts
} else if let Some(ref c) = item.counts {
if c.ahead == 0 {
- BranchState::NoCommits
+ BranchOpState::NoCommits
} else {
- BranchState::None
+ BranchOpState::None
}
} else {
- BranchState::None
+ BranchOpState::None
};
item.status_symbols = Some(StatusSymbols {
- branch_state,
- git_operation: GitOperation::None,
- item_attrs: "⎇".to_string(), // Branch indicator
+ branch_op_state,
+ worktree_state: "⎇".to_string(), // Branch indicator
main_divergence,
upstream_divergence,
working_tree: String::new(),
diff --git a/src/commands/list/collect_progressive_impl.rs b/src/commands/list/collect_progressive_impl.rs
index d35a2bd44..9b987402a 100644
--- a/src/commands/list/collect_progressive_impl.rs
+++ b/src/commands/list/collect_progressive_impl.rs
@@ -437,22 +437,18 @@ fn parse_status_for_symbols(status_output: &str) -> (String, bool, bool) {
}
}
- // Build working tree string
+ // Build working tree string (priority order: staged > modified > untracked)
+ // Only show top 3 most actionable symbols to save space
+ // Renamed (») and deleted (✘) are still detected for is_dirty but not displayed
let mut working_tree = String::new();
- if has_untracked {
- working_tree.push('?');
- }
- if has_modified {
- working_tree.push('!');
- }
if has_staged {
working_tree.push('+');
}
- if has_renamed {
- working_tree.push('»');
+ if has_modified {
+ working_tree.push('!');
}
- if has_deleted {
- working_tree.push('✘');
+ if has_untracked {
+ working_tree.push('?');
}
let is_dirty = has_untracked || has_modified || has_staged || has_renamed || has_deleted;
diff --git a/src/commands/list/model.rs b/src/commands/list/model.rs
index 3a4668753..e98264832 100644
--- a/src/commands/list/model.rs
+++ b/src/commands/list/model.rs
@@ -346,38 +346,42 @@ impl serde::Serialize for UpstreamDivergence {
}
}
-/// Branch state including conflicts
+/// Combined branch and operation state
///
-/// These states are mutually exclusive:
-/// - Conflicts (✖ or ⚠) indicate changes that conflict with main
-/// - MatchesMain (≡) means identical to main (can't have conflicts)
-/// - NoCommits (∅) means nothing ahead of main (can't conflict)
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Default, serde::Serialize)]
-#[serde(rename_all = "lowercase")]
-pub enum BranchState {
- /// Normal working branch (no conflicts, doesn't match main, has commits)
+/// 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
+/// 5. MatchesMain (≡) - removable
+/// 6. NoCommits (∅) - removable
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
+pub enum BranchOpState {
+ /// Normal working branch
#[default]
- #[serde(rename = "")]
None,
/// Actual merge conflicts with main (unmerged paths in working tree)
- #[serde(rename = "✖")]
Conflicts,
+ /// Rebase in progress
+ Rebase,
+ /// Merge in progress
+ Merge,
/// Merge-tree conflicts with main (simulated via git merge-tree)
- #[serde(rename = "⚠")]
MergeTreeConflicts,
/// Working tree identical to main branch
- #[serde(rename = "≡")]
MatchesMain,
/// No commits ahead and clean working tree (not matching main)
- #[serde(rename = "∅")]
NoCommits,
}
-impl std::fmt::Display for BranchState {
+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::MatchesMain => write!(f, "≡"),
Self::NoCommits => write!(f, "∅"),
@@ -385,31 +389,7 @@ impl std::fmt::Display for BranchState {
}
}
-/// Git operation in progress
-///
-/// Represents active rebase or merge operations.
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
-pub enum GitOperation {
- /// No git operation in progress
- #[default]
- None,
- /// Rebase in progress
- Rebase,
- /// Merge in progress
- Merge,
-}
-
-impl std::fmt::Display for GitOperation {
- fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
- match self {
- Self::None => Ok(()),
- Self::Rebase => write!(f, "↻"),
- Self::Merge => write!(f, "⋈"),
- }
- }
-}
-
-impl serde::Serialize for GitOperation {
+impl serde::Serialize for BranchOpState {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: serde::Serializer,
@@ -425,35 +405,38 @@ impl serde::Serialize for GitOperation {
/// 1. Only allocate space for positions that have data
/// 2. Pad each position to a consistent width for vertical alignment
///
-/// Stores maximum character width for each of 7 positions (including user status).
+/// Stores maximum character width for each of 8 positions (including user status).
/// A width of 0 means the position is unused.
#[derive(Debug, Clone, Copy, Default)]
pub struct PositionMask {
- /// Maximum width for each position: [0, 1, 2, 3, 4, 5, 6]
+ /// Maximum width for each position: [0, 1, 2, 3, 4, 5, 6, 7]
/// 0 = position unused, >0 = max characters needed
- widths: [usize; 7],
+ widths: [usize; 8],
}
impl PositionMask {
- // Render order indices (0-6) - symbols appear in this order left-to-right
- const WORKING_TREE: usize = 0;
- const BRANCH_STATE: usize = 1;
- const GIT_OPERATION: usize = 2;
- const MAIN_DIVERGENCE: usize = 3;
- const UPSTREAM_DIVERGENCE: usize = 4;
- const ITEM_ATTRS: usize = 5;
- const USER_STATUS: usize = 6;
+ // Render order indices (0-7) - symbols appear in this order left-to-right
+ // Working tree split into 3 fixed positions for vertical alignment
+ const STAGED: usize = 0; // + (staged changes)
+ const MODIFIED: usize = 1; // ! (modified files)
+ const UNTRACKED: usize = 2; // ? (untracked files)
+ const BRANCH_OP_STATE: usize = 3; // Combined: branch state + git operation
+ const MAIN_DIVERGENCE: usize = 4;
+ const UPSTREAM_DIVERGENCE: usize = 5;
+ const WORKTREE_STATE: usize = 6;
+ const USER_STATUS: usize = 7;
/// Full mask with all positions enabled (for JSON output and progressive rendering)
/// Allocates realistic widths based on common symbol sizes to ensure proper grid alignment
pub const FULL: Self = Self {
widths: [
- 5, // WORKING_TREE: ?!+»✘ (max 5 symbols)
- 1, // BRANCH_STATE: ✖⚠≡∅ (1 char, mutually exclusive)
- 1, // GIT_OPERATION: ↻ or ⋈ (1 char)
+ 1, // STAGED: + (1 char)
+ 1, // MODIFIED: ! (1 char)
+ 1, // UNTRACKED: ? (1 char)
+ 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, // ITEM_ATTRS: ⎇ for branches, ⌫⊠ for worktrees (priority-only: prunable > locked)
+ 1, // WORKTREE_STATE: ⎇ for branches, ⌫⊠ for worktrees (priority-only: prunable > locked)
2, // USER_STATUS: single emoji or two chars (allocate 2)
],
};
@@ -467,19 +450,25 @@ impl PositionMask {
/// Structured status symbols for aligned rendering
///
/// Symbols are categorized to enable vertical alignment in table output:
-/// - Working tree: ?, !, +, », ✘
-/// - Branch state: ✖, ⚠, ≡, ∅ (mutually exclusive)
-/// - Git operation: ↻, ⋈
+/// - Working tree: +, !, ? (staged, modified, untracked - priority order)
+/// - Branch/op state: ✖, ↻, ⋈, ⚠, ≡, ∅ (combined position with priority)
/// - Main divergence: ^, ↑, ↓, ↕
/// - Upstream divergence: ⇡, ⇣, ⇅
-/// - Item attributes: ⎇ for branches, ⌫⊠ for worktrees (priority-only)
+/// - Worktree state: ⎇ for branches, ⌫⊠ for worktrees (priority-only)
/// - User status: custom labels, emoji
///
/// ## 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)
+/// - ≡: Matches main (removable)
+/// - ∅: No commits (removable)
+///
/// **Mutually exclusive (enforced by type system):**
-/// - ✖ vs ⚠ vs ≡ vs ∅: BranchState enum (combined position)
-/// - ↻ vs ⋈: Git operation (GitOperation enum)
/// - ^ vs ↑ vs ↓ vs ↕: Main divergence (MainDivergence enum)
/// - ⇡ vs ⇣ vs ⇅: Upstream divergence (UpstreamDivergence enum)
///
@@ -488,19 +477,16 @@ impl PositionMask {
/// - ⎇: Branch indicator (mutually exclusive with ⌫⊠ as branches can't have worktree attrs)
///
/// **NOT mutually exclusive (can co-occur):**
-/// - All working tree symbols (?!+»✘): Can have multiple types of changes
+/// - Working tree symbols (+!?): Can have multiple types of changes
#[derive(Debug, Clone, Default)]
pub struct StatusSymbols {
- /// Branch state including conflicts (mutually exclusive)
- /// Priority: Conflicts (✖) > MergeTreeConflicts (⚠) > MatchesMain (≡) > NoCommits (∅)
- pub(crate) branch_state: BranchState,
-
- /// Git operation in progress (mutually exclusive)
- pub(crate) git_operation: GitOperation,
+ /// Combined branch and operation state (mutually exclusive with priority)
+ /// Priority: Conflicts (✖) > Rebase (↻) > Merge (⋈) > MergeTreeConflicts (⚠) > MatchesMain (≡) > NoCommits (∅)
+ pub(crate) branch_op_state: BranchOpState,
- /// Item type attributes: ⎇ for branches, ⌫⊠ for worktrees (priority-only: prunable > locked)
+ /// Worktree state: ⎇ for branches, ⌫⊠ for worktrees (priority-only: prunable > locked)
/// Priority-only rendering (shows highest priority symbol when multiple states exist)
- pub(crate) item_attrs: String,
+ pub(crate) worktree_state: String,
/// Main branch divergence state (mutually exclusive)
pub(crate) main_divergence: MainDivergence,
@@ -508,7 +494,7 @@ pub struct StatusSymbols {
/// Remote/upstream divergence state (mutually exclusive)
pub(crate) upstream_divergence: UpstreamDivergence,
- /// Working tree changes: ?, !, +, », ✘ (NOT mutually exclusive, can have multiple)
+ /// Working tree changes: +, !, ? (NOT mutually exclusive, can have multiple)
pub(crate) working_tree: String,
/// User-defined status annotation (custom labels, e.g., 💬, 🤖)
@@ -549,17 +535,14 @@ impl StatusSymbols {
// - Yellow (WARNING): Potential conflicts, git operations, locked/prunable (active/stuck states)
// - Cyan: Working tree changes (activity)
// - Dimmed (HINT): Branch state symbols that indicate removability + divergence arrows (low urgency)
- let branch_state_str = match self.branch_state {
- BranchState::Conflicts => format!("{ERROR}✖{ERROR:#}"),
- BranchState::MergeTreeConflicts => format!("{WARNING}⚠{WARNING:#}"),
- BranchState::MatchesMain => format!("{HINT}≡{HINT:#}"),
- BranchState::NoCommits => format!("{HINT}∅{HINT:#}"),
- BranchState::None => String::new(),
- };
- let git_operation_str = if self.git_operation != GitOperation::None {
- format!("{WARNING}{}{WARNING:#}", self.git_operation)
- } else {
- String::new()
+ let (branch_op_state_str, has_branch_op_state) = match self.branch_op_state {
+ BranchOpState::None => (String::new(), false),
+ BranchOpState::Conflicts => (format!("{ERROR}✖{ERROR:#}"), true),
+ BranchOpState::Rebase => (format!("{WARNING}↻{WARNING:#}"), true),
+ BranchOpState::Merge => (format!("{WARNING}⋈{WARNING:#}"), true),
+ BranchOpState::MergeTreeConflicts => (format!("{WARNING}⚠{WARNING:#}"), true),
+ BranchOpState::MatchesMain => (format!("{HINT}≡{HINT:#}"), true),
+ BranchOpState::NoCommits => (format!("{HINT}∅{HINT:#}"), true),
};
let main_divergence_str = if self.main_divergence != MainDivergence::None {
format!("{HINT}{}{HINT:#}", self.main_divergence)
@@ -571,17 +554,31 @@ impl StatusSymbols {
} else {
String::new()
};
- let working_tree_str = if !self.working_tree.is_empty() {
- format!("{CYAN}{}{CYAN:#}", self.working_tree)
+ // Working tree symbols split into 3 fixed columns for vertical alignment
+ let has_staged = self.working_tree.contains('+');
+ let has_modified = self.working_tree.contains('!');
+ let has_untracked = self.working_tree.contains('?');
+ let staged_str = if has_staged {
+ format!("{CYAN}+{CYAN:#}")
+ } else {
+ String::new()
+ };
+ let modified_str = if has_modified {
+ format!("{CYAN}!{CYAN:#}")
} else {
String::new()
};
- let item_attrs_str = if !self.item_attrs.is_empty() {
+ let untracked_str = if has_untracked {
+ format!("{CYAN}?{CYAN:#}")
+ } else {
+ String::new()
+ };
+ let worktree_state_str = if !self.worktree_state.is_empty() {
// Branch indicator (⎇) is informational (dimmed), worktree attrs (⌫⊠) are warnings (yellow)
- if self.item_attrs == "⎇" {
- format!("{HINT}{}{HINT:#}", self.item_attrs)
+ if self.worktree_state == "⎇" {
+ format!("{HINT}{}{HINT:#}", self.worktree_state)
} else {
- format!("{WARNING}{}{WARNING:#}", self.item_attrs)
+ format!("{WARNING}{}{WARNING:#}", self.worktree_state)
}
} else {
String::new()
@@ -591,24 +588,17 @@ impl StatusSymbols {
// Position data: (position_mask, styled_content, has_data)
// StyledLine handles width tracking automatically via .width()
//
- // CRITICAL: Display order is working_tree first, then other symbols.
+ // CRITICAL: Display order is working_tree first (staged, modified, untracked), then other symbols.
// NEVER change this order - it ensures progressive and final rendering match exactly.
// Tests will break if you change this, but that's expected - update the tests, not this order.
- let positions_data: [(usize, String, bool); 7] = [
- (
- PositionMask::WORKING_TREE,
- working_tree_str,
- !self.working_tree.is_empty(),
- ),
- (
- PositionMask::BRANCH_STATE,
- branch_state_str,
- self.branch_state != BranchState::None,
- ),
+ let positions_data: [(usize, String, bool); 8] = [
+ (PositionMask::STAGED, staged_str, has_staged),
+ (PositionMask::MODIFIED, modified_str, has_modified),
+ (PositionMask::UNTRACKED, untracked_str, has_untracked),
(
- PositionMask::GIT_OPERATION,
- git_operation_str,
- self.git_operation != GitOperation::None,
+ PositionMask::BRANCH_OP_STATE,
+ branch_op_state_str,
+ has_branch_op_state,
),
(
PositionMask::MAIN_DIVERGENCE,
@@ -621,9 +611,9 @@ impl StatusSymbols {
self.upstream_divergence != UpstreamDivergence::None,
),
(
- PositionMask::ITEM_ATTRS,
- item_attrs_str,
- !self.item_attrs.is_empty(),
+ PositionMask::WORKTREE_STATE,
+ worktree_state_str,
+ !self.worktree_state.is_empty(),
),
(
PositionMask::USER_STATUS,
@@ -658,9 +648,8 @@ impl StatusSymbols {
/// Check if symbols are empty
pub fn is_empty(&self) -> bool {
- self.branch_state == BranchState::None
- && self.git_operation == GitOperation::None
- && self.item_attrs.is_empty()
+ self.branch_op_state == BranchOpState::None
+ && self.worktree_state.is_empty()
&& self.main_divergence == MainDivergence::None
&& self.upstream_divergence == UpstreamDivergence::None
&& self.working_tree.is_empty()
@@ -692,29 +681,28 @@ impl WorkingTreeChanges {
/// Status variant names (for queryability)
///
-/// Field order matches display order in STATUS SYMBOLS: working_tree → branch_state → ...
+/// Field order matches display order in STATUS SYMBOLS: working_tree → branch_op_state → ...
#[derive(Debug, Clone, serde::Serialize)]
struct QueryableStatus {
working_tree: WorkingTreeChanges,
- branch_state: &'static str,
- git_operation: &'static str,
+ branch_op_state: &'static str,
main_divergence: &'static str,
upstream_divergence: &'static str,
+ worktree_state: &'static str,
#[serde(skip_serializing_if = "Option::is_none")]
user_status: Option<String>,
}
/// Status symbols (for display)
///
-/// Field order matches display order in STATUS SYMBOLS: working_tree → branch_state → ...
+/// Field order matches display order in STATUS SYMBOLS: working_tree → branch_op_state → ...
#[derive(Debug, Clone, serde::Serialize)]
struct DisplaySymbols {
working_tree: String,
- branch_state: String,
- git_operation: String,
+ branch_op_state: String,
main_divergence: String,
upstream_divergence: String,
- worktree_attrs: String,
+ worktree_state: String,
#[serde(skip_serializing_if = "Option::is_none")]
user_status: Option<String>,
}
@@ -728,18 +716,14 @@ impl serde::Serialize for StatusSymbols {
let mut state = serializer.serialize_struct("StatusSymbols", 2)?;
// Status variant names
- let branch_state_variant = match self.branch_state {
- BranchState::None => "",
- BranchState::Conflicts => "Conflicts",
- BranchState::MergeTreeConflicts => "MergeTreeConflicts",
- BranchState::MatchesMain => "MatchesMain",
- BranchState::NoCommits => "NoCommits",
- };
-
- let git_operation_variant = match self.git_operation {
- GitOperation::None => "",
- GitOperation::Rebase => "Rebase",
- GitOperation::Merge => "Merge",
+ let branch_op_state_variant = match self.branch_op_state {
+ BranchOpState::None => "",
+ BranchOpState::Conflicts => "Conflicts",
+ BranchOpState::Rebase => "Rebase",
+ BranchOpState::Merge => "Merge",
+ BranchOpState::MergeTreeConflicts => "MergeTreeConflicts",
+ BranchOpState::MatchesMain => "MatchesMain",
+ BranchOpState::NoCommits => "NoCommits",
};
let main_divergence_variant = match self.main_divergence {
@@ -757,22 +741,32 @@ impl serde::Serialize for StatusSymbols {
UpstreamDivergence::Diverged => "Diverged",
};
+ // Worktree state: ⎇ = Branch, ⌫ = Prunable, ⊠ = Locked
+ let worktree_state_variant = if self.worktree_state.contains('⌫') {
+ "Prunable"
+ } else if self.worktree_state.contains('⊠') {
+ "Locked"
+ } else if self.worktree_state.contains('⎇') {
+ "Branch"
+ } else {
+ ""
+ };
+
let queryable_status = QueryableStatus {
working_tree: WorkingTreeChanges::from_symbols(&self.working_tree),
- branch_state: branch_state_variant,
- git_operation: git_operation_variant,
+ branch_op_state: branch_op_state_variant,
main_divergence: main_divergence_variant,
upstream_divergence: upstream_divergence_variant,
+ worktree_state: worktree_state_variant,
user_status: self.user_status.clone(),
};
let display_symbols = DisplaySymbols {
working_tree: self.working_tree.clone(),
- branch_state: self.branch_state.to_string(),
- git_operation: self.git_operation.to_string(),
+ branch_op_state: self.branch_op_state.to_string(),
main_divergence: self.main_divergence.to_string(),
upstream_divergence: self.upstream_divergence.to_string(),
- worktree_attrs: self.item_attrs.clone(),
+ worktree_state: self.worktree_state.clone(),
user_status: self.user_status.clone(),
};
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.snap
index f471f722b..cf45df61e 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: C
NO_COLOR: ""
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpIMf2uD/test-config.toml
+ WORKTRUNK_CONFIG: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpRMLzJS/test-config.toml
---
success: true
exit_code: 0
@@ -22,7 +22,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo.main 6c3da842 10mo Initial commit on main
-+ feature ↑ ↑1 ./test-repo.feature 72413a3b 10mo Work on feature
+@ main ^ ./test-repo.main 6c3da842 10mo Initial commit on main
++ feature ↑ ↑1 ./test-repo.feature 72413a3b 10mo Work on feature
⚪ Showing 2 worktrees, 1 ahead
diff --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.snap
index cd8cdf718..8183001d3 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,13 +10,13 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_GLOBAL: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpZvsLTf/test-gitconfig
+ GIT_CONFIG_GLOBAL: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmph0YeBy/test-gitconfig
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpZvsLTf/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmph0YeBy/test-config.toml
---
success: true
exit_code: 0
@@ -24,6 +24,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . b834638e 10mo Initial commit
+@ main ^ . b834638e 10mo Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snap b/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snap
index 12c690bd8..0d291085d 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
@@ -24,7 +24,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . b834638e 10mo Initial commit
- branch-only ∅ ⎇ b834638e 10mo Initial commit
+@ main ^ . b834638e 10mo Initial commit
+ branch-only ∅ ⎇ b834638e 10mo Initial commit
⚪ Showing 1 worktrees, 1 branches
diff --git a/tests/snapshots/integration__integration_tests__list__default_branch_missing_worktree.snap b/tests/snapshots/integration__integration_tests__list__default_branch_missing_worktree.snap
index c164a637f..d556cb7d8 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 -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ develop ^ . b834638e 10mo Initial commit
+@ develop ^ . b834638e 10mo Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list__detached_head.snap b/tests/snapshots/integration__integration_tests__list__detached_head.snap
index d84919265..968c66c2d 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 -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ - ^ . b834638e 10mo Initial commit
+@ - ^ . b834638e 10mo Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list__json_with_display_fields.snap b/tests/snapshots/integration__integration_tests__list__json_with_display_fields.snap
index 831ba79c2..5569d956f 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
@@ -45,18 +45,17 @@ exit_code: 0
"renamed": false,
"deleted": false
},
- "branch_state": "",
- "git_operation": "",
+ "branch_op_state": "",
"main_divergence": "IsMain",
- "upstream_divergence": ""
+ "upstream_divergence": "",
+ "worktree_state": ""
},
"status_symbols": {
"working_tree": "",
- "branch_state": "",
- "git_operation": "",
+ "branch_op_state": "",
"main_divergence": "^",
"upstream_divergence": "",
- "worktree_attrs": ""
+ "worktree_state": ""
},
"type": "worktree",
"path": "[REPO]",
@@ -96,18 +95,17 @@ exit_code: 0
"renamed": false,
"deleted": false
},
- "branch_state": "",
- "git_operation": "",
+ "branch_op_state": "",
"main_divergence": "Diverged",
- "upstream_divergence": ""
+ "upstream_divergence": "",
+ "worktree_state": ""
},
"status_symbols": {
- "working_tree": "?!",
- "branch_state": "",
- "git_operation": "",
+ "working_tree": "!?",
+ "branch_op_state": "",
"main_divergence": "↕",
"upstream_divergence": "",
- "worktree_attrs": ""
+ "worktree_state": ""
},
"commits_display": "/u001b[32m↑2/u001b[0m /u001b[2m/u001b[31m↓2/u001b[0m",
"branch_diff_display": "/u001b[32m+1/u001b[0m",
@@ -147,18 +145,17 @@ exit_code: 0
"renamed": false,
"deleted": false
},
- "branch_state": "NoCommits",
- "git_operation": "",
+ "branch_op_state": "NoCommits",
"main_divergence": "Behind",
- "upstream_divergence": ""
+ "upstream_divergence": "",
+ "worktree_state": ""
},
"status_symbols": {
"working_tree": "",
- "branch_state": "∅",
- "git_operation": "",
+ "branch_op_state": "∅",
"main_divergence": "↓",
"upstream_divergence": "",
- "worktree_attrs": ""
+ "worktree_state": ""
},
"commits_display": "/u001b[2m/u001b[31m↓2/u001b[0m",
"type": "worktree",
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 23d32bf21..b39c848e4 100644
--- a/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap
+++ b/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap
@@ -45,18 +45,17 @@ exit_code: 0
"renamed": false,
"deleted": false
},
- "branch_state": "",
- "git_operation": "",
+ "branch_op_state": "",
"main_divergence": "IsMain",
- "upstream_divergence": ""
+ "upstream_divergence": "",
+ "worktree_state": ""
},
"status_symbols": {
"working_tree": "",
- "branch_state": "",
- "git_operation": "",
+ "branch_op_state": "",
"main_divergence": "^",
"upstream_divergence": "",
- "worktree_attrs": ""
+ "worktree_state": ""
},
"type": "worktree",
"path": "[REPO]",
@@ -96,18 +95,17 @@ exit_code: 0
"renamed": false,
"deleted": false
},
- "branch_state": "MatchesMain",
- "git_operation": "",
+ "branch_op_state": "NoCommits",
"main_divergence": "",
- "upstream_divergence": ""
+ "upstream_divergence": "",
+ "worktree_state": ""
},
"status_symbols": {
"working_tree": "",
- "branch_state": "≡",
- "git_operation": "",
+ "branch_op_state": "∅",
"main_divergence": "",
"upstream_divergence": "",
- "worktree_attrs": ""
+ "worktree_state": ""
},
"type": "worktree",
"path": "[WORKTREE_FEATURE_DETACHED]",
@@ -147,18 +145,17 @@ exit_code: 0
"renamed": false,
"deleted": false
},
- "branch_state": "MatchesMain",
- "git_operation": "",
+ "branch_op_state": "NoCommits",
"main_divergence": "",
- "upstream_divergence": ""
+ "upstream_divergence": "",
+ "worktree_state": "Locked"
},
"status_symbols": {
"working_tree": "",
- "branch_state": "≡",
- "git_operation": "",
+ "branch_op_state": "∅",
"main_divergence": "",
"upstream_divergence": "",
- "worktree_attrs": "⊠"
+ "worktree_state": "⊠"
},
"type": "worktree",
"path": "[WORKTREE_LOCKED_FEATURE]",
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.snap
index 3faa5db46..39053cf5b 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
@@ -45,18 +45,17 @@ exit_code: 0
"renamed": false,
"deleted": false
},
- "branch_state": "",
- "git_operation": "",
+ "branch_op_state": "",
"main_divergence": "IsMain",
- "upstream_divergence": ""
+ "upstream_divergence": "",
+ "worktree_state": ""
},
"status_symbols": {
"working_tree": "",
- "branch_state": "",
- "git_operation": "",
+ "branch_op_state": "",
"main_divergence": "^",
"upstream_divergence": "",
- "worktree_attrs": ""
+ "worktree_state": ""
},
"type": "worktree",
"path": "[REPO]",
@@ -96,19 +95,18 @@ exit_code: 0
"renamed": false,
"deleted": false
},
- "branch_state": "MatchesMain",
- "git_operation": "",
+ "branch_op_state": "NoCommits",
"main_divergence": "",
"upstream_divergence": "",
+ "worktree_state": "",
"user_status": "🔧"
},
"status_symbols": {
"working_tree": "",
- "branch_state": "≡",
- "git_operation": "",
+ "branch_op_state": "∅",
"main_divergence": "",
"upstream_divergence": "",
- "worktree_attrs": "",
+ "worktree_state": "",
"user_status": "🔧"
},
"type": "worktree",
@@ -149,18 +147,17 @@ exit_code: 0
"renamed": false,
"deleted": false
},
- "branch_state": "MatchesMain",
- "git_operation": "",
+ "branch_op_state": "NoCommits",
"main_divergence": "",
- "upstream_divergence": ""
+ "upstream_divergence": "",
+ "worktree_state": ""
},
"status_symbols": {
"working_tree": "",
- "branch_state": "≡",
- "git_operation": "",
+ "branch_op_state": "∅",
"main_divergence": "",
"upstream_divergence": "",
- "worktree_attrs": ""
+ "worktree_state": ""
},
"type": "worktree",
"path": "[WORKTREE_WITHOUT_STATUS]",
diff --git a/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap b/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap
index 928bf5efe..3ff44e167 100644
--- a/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap
+++ b/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap
@@ -23,9 +23,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ diverged ! ↑ 💬 +40 -60 ↑1 ./diverged 8ba5aa92 10mo Diverged commit
-+ feature-changes ?! ↑ 🤖 +50 -100 ↑1 ./feature-changes b854b166 10mo Add 100 lines
-+ fix ? ≡ 💬 ./fix b834638e 10mo Initial commit
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ diverged ! ↑ 💬 +40 -60 ↑1 ./diverged 8ba5aa92 10mo Diverged commit
++ feature-changes !? ↑ 🤖 +50 -100 ↑1 ./feature-changes b854b166 10mo Add 100 lines
++ fix ?∅ 💬 ./fix b834638e 10mo Initial commit
⚪ Showing 4 worktrees, 2 with changes, 2 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap b/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap
index 90059fc3b..8ad0dd6a6 100644
--- a/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap
@@ -23,10 +23,10 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-^ main ^ ./test-repo 6c3da842 10mo Initial commit on main
-@ feature-current ↑ ↑1 ./feature-current fc28a4d1 9mo Commit at 01:00
-+ feature-newest ↑ ↑1 ./feature-newest 136358eb 9mo Commit at 03:00
-+ feature-middle ↑ ↑1 ./feature-middle a0a4851a 9mo Commit at 02:00
-+ feature-oldest ↑ ↑1 ./feature-oldest 1b1a2d78 9mo Commit at 00:30
+^ main ^ ./test-repo 6c3da842 10mo Initial commit on main
+@ feature-current ↑ ↑1 ./feature-current fc28a4d1 9mo Commit at 01:00
++ feature-newest ↑ ↑1 ./feature-newest 136358eb 9mo Commit at 03:00
++ feature-middle ↑ ↑1 ./feature-middle a0a4851a 9mo Commit at 02:00
++ feature-oldest ↑ ↑1 ./feature-oldest 1b1a2d78 9mo Commit at 00:30
⚪ Showing 5 worktrees, 4 ahead
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 6b6473ec8..c6f47178c 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,8 +23,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ develop ^ ./test-repo b834638e 10mo Initial commit
-+ feature-a ≡ ./feature-a b834638e 10mo Initial commit
-+ feature-b ≡ ./feature-b b834638e 10mo Initial commit
+@ develop ^ ./test-repo b834638e 10mo Initial commit
++ feature-a ∅ ./feature-a b834638e 10mo Initial commit
++ feature-b ∅ ./feature-b b834638e 10mo Initial commit
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snap b/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snap
index 240aaaad4..8766aa1c1 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: wt
args:
- "-C"
- - /private/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpmlu8gY/test-repo
+ - /private/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpXmLBZf/test-repo
- list
env:
CLICOLOR_FORCE: "1"
@@ -17,8 +17,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ feature-a ≡ ./feature-a b834638e 10mo Initial commit
-+ feature-b ≡ ./feature-b b834638e 10mo Initial commit
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ feature-a ∅ ./feature-a b834638e 10mo Initial commit
++ feature-b ∅ ./feature-b b834638e 10mo Initial commit
⚪ Showing 3 worktrees
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 33d468f6b..8bcdf3a9a 100644
--- a/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap
+++ b/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap
@@ -23,7 +23,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ locked-no-reason ≡ ⊠ ./locked-no-reason b834638e 10mo Initial commit
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ locked-no-reason ∅ ⊠ ./locked-no-reason b834638e 10mo 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 950e809a3..285f4f3dd 100644
--- a/tests/snapshots/integration__integration_tests__list__locked_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__locked_worktree.snap
@@ -23,7 +23,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ locked-feature ≡ ⊠ ./locked-feature b834638e 10mo Initial commit
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ locked-feature ∅ ⊠ ./locked-feature b834638e 10mo Initial commit
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__long_commit_message.snap b/tests/snapshots/integration__integration_tests__list__long_commit_message.snap
index 65403ef31..9b2ad59d9 100644
--- a/tests/snapshots/integration__integration_tests__list__long_commit_message.snap
+++ b/tests/snapshots/integration__integration_tests__list__long_commit_message.snap
@@ -23,7 +23,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo 1310bfb9 10mo Short message
-+ feature-a ∅ ↓ ↓1 ./feature-a f078644e 10mo This is a very long commit message that should test how…
+@ main ^ ./test-repo 1310bfb9 10mo Short message
++ feature-a ∅↓ ↓1 ./feature-a f078644e 10mo This is a very long commit message that should test how…
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap b/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap
index b671c3058..4ab26e9d6 100644
--- a/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap
+++ b/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap
@@ -23,10 +23,10 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ medium-name ≡ ./medium-name b834638e 10mo Initial commit
-+ short ≡ ./short b834638e 10mo Initial commit
-+ very-long-branch-name-here ≡ ./very-long-branch-name-here b834638e 10mo Initial commit
-+ with-changes ≡ ./with-changes b834638e 10mo Initial commit
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ medium-name ∅ ./medium-name b834638e 10mo Initial commit
++ short ∅ ./short b834638e 10mo Initial commit
++ very-long-branch-name-here ∅ ./very-long-branch-name-here b834638e 10mo Initial commit
++ with-changes ∅ ./with-changes b834638e 10mo Initial commit
⚪ Showing 5 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 06422e169..323e2716b 100644
--- a/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap
+++ b/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap
@@ -24,7 +24,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^⇡ ./test-repo ↑1 ↓0 85ed6d3d 10mo Main advances
-+ feature ?!+»✘⚠ ↕⇅⊠🤖 +2 -2 ↑2 ↓1 +3 -1 ./feature ↑1 ↓1 4afb2b9e 10mo Local commit
+@ main ^⇡ ./test-repo ↑1 ↓0 85ed6d3d 10mo Main advances
++ feature +!?⚠↕⇅⊠🤖 +2 -2 ↑2 ↓1 +3 -1 ./feature ↑1 ↓1 4afb2b9e 10mo 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 6f5c6d106..5e91348d2 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
@@ -24,7 +24,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ ./test-repo b7c14ce1 10mo Main conflicting changes
-+ feature ?!+ ✖↻ ⊠🤖 +7 ./feature b7c14ce1 10mo Main conflicting changes
+@ main ^ ./test-repo b7c14ce1 10mo Main conflicting changes
++ feature +!?✖ ⊠🤖 +7 ./feature b7c14ce1 10mo Main conflicting changes
⚪ Showing 2 worktrees, 1 with changes
diff --git a/tests/snapshots/integration__integration_tests__list__maximum_working_tree_symbols.snap b/tests/snapshots/integration__integration_tests__list__maximum_working_tree_symbols.snap
index 5100d4d6c..4632c7f95 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
@@ -23,7 +23,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ feature ?!+»✘ ↑ +2 -3 ↑1 ./feature 689c2504 10mo Add files
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ feature +!? ↑ +2 -3 ↑1 ./feature 689c2504 10mo Add files
⚪ Showing 2 worktrees, 1 with changes, 1 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap
index fec92b933..6d9b10367 100644
--- a/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap
@@ -23,8 +23,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ feature-a ≡ ./feature-a b834638e 10mo Initial commit
-+ feature-b ≡ ./feature-b b834638e 10mo Initial commit
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ feature-a ∅ ./feature-a b834638e 10mo Initial commit
++ feature-b ∅ ./feature-b b834638e 10mo Initial commit
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap b/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap
index f4052e9bd..07d4e525d 100644
--- a/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap
@@ -24,7 +24,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ feature ≡ ./feature b834638e 10mo Initial commit
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ feature ∅ ./feature b834638e 10mo Initial commit
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__progressive_flag.snap b/tests/snapshots/integration__integration_tests__list__progressive_flag.snap
index b3923d88a..9bd657fa8 100644
--- a/tests/snapshots/integration__integration_tests__list__progressive_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__progressive_flag.snap
@@ -24,8 +24,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ feature-a ≡ ./feature-a b834638e 10mo Initial commit
-+ feature-b ≡ ./feature-b b834638e 10mo Initial commit
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ feature-a ∅ ./feature-a b834638e 10mo Initial commit
++ feature-b ∅ ./feature-b b834638e 10mo Initial commit
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap b/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap
index b2079ae85..ea9a60142 100644
--- a/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap
@@ -25,9 +25,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ feature-a ≡ ./feature-a b834638e 10mo Initial commit
- orphan-1 ∅ ⎇ b834638e 10mo Initial commit
- orphan-2 ∅ ⎇ b834638e 10mo Initial commit
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ feature-a ∅ ./feature-a b834638e 10mo Initial commit
+ orphan-1 ∅ ⎇ b834638e 10mo Initial commit
+ orphan-2 ∅ ⎇ b834638e 10mo Initial commit
⚪ Showing 2 worktrees, 2 branches
diff --git a/tests/snapshots/integration__integration_tests__list__readme_example_simple_list.snap b/tests/snapshots/integration__integration_tests__list__readme_example_simple_list.snap
index 7cd803f27..274d1d136 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
@@ -23,8 +23,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo ↑0 ↓0 b834638e 10mo Initial commit
-+ bugfix-y ↑ ↑1 ./bugfix-y 412a27c8 10mo Fix bug
-+ feature-x + ↑ +5 ↑3 ./feature-x 7fd821aa 10mo Add file 3
+@ main ^ ./test-repo ↑0 ↓0 b834638e 10mo Initial commit
++ bugfix-y ↑ ↑1 ./bugfix-y 412a27c8 10mo Fix bug
++ feature-x + ↑ +5 ↑3 ./feature-x 7fd821aa 10mo Add file 3
⚪ Showing 3 worktrees, 1 with changes, 2 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__single_worktree.snap b/tests/snapshots/integration__integration_tests__list__single_worktree.snap
index 8c7efbb28..ccf14f2db 100644
--- a/tests/snapshots/integration__integration_tests__list__single_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__single_worktree.snap
@@ -23,6 +23,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . b834638e 10mo Initial commit
+@ main ^ . b834638e 10mo Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list__status_column_padding_emoji.snap b/tests/snapshots/integration__integration_tests__list__status_column_padding_emoji.snap
index 0c3482ea1..d72323d69 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
@@ -23,9 +23,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ main-symbol ↑ 💬 ↑1 ./main-symbol 579fcd0b 10mo Symbol commit
-+ pr-link ↑ 🤖 ↑1 ./pr-link e17e7d2d 10mo PR commit
-+ wli-sequence ?! ↑ 🤖 +1 -112 ↑1 ./wli-sequence a2483ffd 10mo Initial content
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ main-symbol ↑ 💬 ↑1 ./main-symbol 579fcd0b 10mo Symbol commit
++ pr-link ↑ 🤖 ↑1 ./pr-link e17e7d2d 10mo PR commit
++ wli-sequence !? ↑ 🤖 +1 -112 ↑1 ./wli-sequence a2483ffd 10mo Initial content
⚪ Showing 4 worktrees, 1 with changes, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_detached_head.snap b/tests/snapshots/integration__integration_tests__list__task_dag_detached_head.snap
index 2c12c3107..43860750b 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 -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ - ^ . b834638e 10mo Initial commit
+@ - ^ . b834638e 10mo Initial commit
⚪ Showing 1 worktree
diff --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.snap
index 9f8ced41f..8b330cd24 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
@@ -25,8 +25,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ feature-a ? ≡ ./feature-a b834638e 10mo Initial commit
-+ feature-b ↑ ↑1 +1 -1 ./feature-b 2d37ca75 10mo Test commit
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ feature-a ?∅ ./feature-a b834638e 10mo Initial commit
++ feature-b ↑ ↑1 +1 -1 ./feature-b 2d37ca75 10mo Test commit
⚪ Showing 3 worktrees, 1 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_many_worktrees.snap b/tests/snapshots/integration__integration_tests__list__task_dag_many_worktrees.snap
index 1c49f44ce..17409a632 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
@@ -24,16 +24,16 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ feature-1 ≡ ./feature-1 b834638e 10mo Initial commit
-+ feature-10 ≡ ./feature-10 b834638e 10mo Initial commit
-+ feature-2 ≡ ./feature-2 b834638e 10mo Initial commit
-+ feature-3 ≡ ./feature-3 b834638e 10mo Initial commit
-+ feature-4 ≡ ./feature-4 b834638e 10mo Initial commit
-+ feature-5 ≡ ./feature-5 b834638e 10mo Initial commit
-+ feature-6 ≡ ./feature-6 b834638e 10mo Initial commit
-+ feature-7 ≡ ./feature-7 b834638e 10mo Initial commit
-+ feature-8 ≡ ./feature-8 b834638e 10mo Initial commit
-+ feature-9 ≡ ./feature-9 b834638e 10mo Initial commit
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ feature-1 ∅ ./feature-1 b834638e 10mo Initial commit
++ feature-10 ∅ ./feature-10 b834638e 10mo Initial commit
++ feature-2 ∅ ./feature-2 b834638e 10mo Initial commit
++ feature-3 ∅ ./feature-3 b834638e 10mo Initial commit
++ feature-4 ∅ ./feature-4 b834638e 10mo Initial commit
++ feature-5 ∅ ./feature-5 b834638e 10mo Initial commit
++ feature-6 ∅ ./feature-6 b834638e 10mo Initial commit
++ feature-7 ∅ ./feature-7 b834638e 10mo Initial commit
++ feature-8 ∅ ./feature-8 b834638e 10mo Initial commit
++ feature-9 ∅ ./feature-9 b834638e 10mo Initial commit
⚪ Showing 11 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__list__task_dag_multiple_worktrees.snap
index 166a995bd..1c5205238 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
@@ -24,9 +24,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ feature-a ≡ ./feature-a b834638e 10mo Initial commit
-+ feature-b ≡ ./feature-b b834638e 10mo Initial commit
-+ feature-c ≡ ./feature-c b834638e 10mo Initial commit
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ feature-a ∅ ./feature-a b834638e 10mo Initial commit
++ feature-b ∅ ./feature-b b834638e 10mo Initial commit
++ feature-c ∅ ./feature-c b834638e 10mo Initial commit
⚪ Showing 4 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_ordering_stability.snap b/tests/snapshots/integration__integration_tests__list__task_dag_ordering_stability.snap
index 9cb6f8505..79fc95cc9 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
@@ -24,10 +24,10 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-^ main ^ ./test-repo 6c3da842 10mo Initial commit on main
-@ feature-current ↑ ↑1 ./feature-current fc28a4d1 9mo Commit at 01:00
-+ feature-newest ↑ ↑1 ./feature-newest 136358eb 9mo Commit at 03:00
-+ feature-middle ↑ ↑1 ./feature-middle a0a4851a 9mo Commit at 02:00
-+ feature-oldest ↑ ↑1 ./feature-oldest 1b1a2d78 9mo Commit at 00:30
+^ main ^ ./test-repo 6c3da842 10mo Initial commit on main
+@ feature-current ↑ ↑1 ./feature-current fc28a4d1 9mo Commit at 01:00
++ feature-newest ↑ ↑1 ./feature-newest 136358eb 9mo Commit at 03:00
++ feature-middle ↑ ↑1 ./feature-middle a0a4851a 9mo Commit at 02:00
++ feature-oldest ↑ ↑1 ./feature-oldest 1b1a2d78 9mo Commit at 00:30
⚪ Showing 5 worktrees, 4 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_single_worktree.snap b/tests/snapshots/integration__integration_tests__list__task_dag_single_worktree.snap
index bca190f78..bcc378671 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
@@ -24,6 +24,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . b834638e 10mo Initial commit
+@ main ^ . b834638e 10mo Initial commit
⚪ Showing 1 worktree
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 bfab0ec5d..1b3402fdd 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
@@ -24,8 +24,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ locked ≡ ⊠ ./locked b834638e 10mo Initial commit
-+ normal ≡ ./normal b834638e 10mo Initial commit
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ locked ∅ ⊠ ./locked b834638e 10mo Initial commit
++ normal ∅ ./normal b834638e 10mo Initial commit
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap b/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap
index f9cc2a1b0..a9948707f 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
@@ -25,8 +25,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ ./test-repo ↑0 ↓0 6c3da842 10mo Initial commit on main
-+ ahead ↑⇡ ↑1 +1 ./ahead ↑1 ↓0 2fff52c2 10mo Ahead commit
-+ in-sync ≡ ./in-sync ↑0 ↓0 6c3da842 10mo Initial commit on main
+@ main ^ ./test-repo ↑0 ↓0 6c3da842 10mo Initial commit on main
++ ahead ↑⇡ ↑1 +1 ./ahead ↑1 ↓0 2fff52c2 10mo Ahead commit
++ in-sync ∅ ./in-sync ↑0 ↓0 6c3da842 10mo Initial commit on main
⚪ Showing 3 worktrees, 1 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap
index 396854114..400cc52f3 100644
--- a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap
+++ b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap
@@ -23,7 +23,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo e4614cb7 10mo Fix bug with café ☕ handling
-+ feature-test ∅ ↓ ↓1 ./feature-test 0c53695b 10mo Add support for 日本語 and émoji 🎉
+@ main ^ ./test-repo e4614cb7 10mo Fix bug with café ☕ handling
++ feature-test ∅↓ ↓1 ./feature-test 0c53695b 10mo Add support for 日本語 and émoji 🎉
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__user_status_special_chars.snap b/tests/snapshots/integration__integration_tests__list__user_status_special_chars.snap
index 8114fdcf2..b2875ccd6 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
@@ -23,8 +23,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ emoji ≡ 🔄 ./emoji b834638e 10mo Initial commit
-+ multi ≡ 👨‍💻 ./multi b834638e 10mo Initial commit
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ emoji ∅ 🔄 ./emoji b834638e 10mo Initial commit
++ multi ∅ 👨‍💻 ./multi b834638e 10mo Initial commit
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap b/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap
index b3d5015fb..0aeccd6f6 100644
--- a/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap
@@ -24,10 +24,10 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ feature-with-worktree ≡ ./feature-with-worktree b834638e 10mo Initial commit
- another-branch ∅ ⎇ b834638e 10mo Initial commit
- feature-without-worktree ∅ ⎇ b834638e 10mo Initial commit
- fix-bug ∅ ⎇ b834638e 10mo Initial commit
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ feature-with-worktree ∅ ./feature-with-worktree b834638e 10mo Initial commit
+ another-branch ∅ ⎇ b834638e 10mo Initial commit
+ feature-without-worktree ∅ ⎇ b834638e 10mo Initial commit
+ fix-bug ∅ ⎇ b834638e 10mo Initial commit
⚪ Showing 2 worktrees, 3 branches
diff --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.snap
index 7ff8784a3..0cf981686 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
@@ -24,8 +24,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ feature-a ≡ ./feature-a b834638e 10mo Initial commit
-+ feature-b ≡ ./feature-b b834638e 10mo Initial commit
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ feature-a ∅ ./feature-a b834638e 10mo Initial commit
++ feature-b ∅ ./feature-b b834638e 10mo Initial commit
⚪ Showing 3 worktrees
diff --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.snap
index 0a451953b..4b4995510 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
@@ -24,9 +24,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . b834638e 10mo Initial commit
- branch-alpha ∅ ⎇ b834638e 10mo Initial commit
- branch-beta ∅ ⎇ b834638e 10mo Initial commit
- branch-gamma ∅ ⎇ b834638e 10mo Initial commit
+@ main ^ . b834638e 10mo Initial commit
+ branch-alpha ∅ ⎇ b834638e 10mo Initial commit
+ branch-beta ∅ ⎇ b834638e 10mo Initial commit
+ branch-gamma ∅ ⎇ b834638e 10mo Initial commit
⚪ Showing 1 worktrees, 3 branches
diff --git a/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap b/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap
index f41e5469c..2f474904b 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
@@ -25,10 +25,10 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . ↑0 ↓0 b834638e 10mo Initial commit
- local-only-1 ∅ ⎇ b834638e 10mo Initial commit
- local-only-2 ∅ ⎇ b834638e 10mo Initial commit
- origin/remote-only-1 ∅ ⎇ b834638e 10mo Initial commit
- origin/remote-only-2 ∅ ⎇ b834638e 10mo Initial commit
+@ main ^ . ↑0 ↓0 b834638e 10mo Initial commit
+ local-only-1 ∅ ⎇ b834638e 10mo Initial commit
+ local-only-2 ∅ ⎇ b834638e 10mo Initial commit
+ origin/remote-only-1 ∅ ⎇ b834638e 10mo Initial commit
+ origin/remote-only-2 ∅ ⎇ b834638e 10mo Initial commit
⚪ Showing 1 worktrees, 2 branches, 2 remote branches
diff --git a/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap b/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap
index 37eb7ecd0..9649f2293 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
@@ -24,8 +24,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo ↑0 ↓0 b834638e 10mo Initial commit
-+ feature-with-worktree ≡ ./feature-with-worktree b834638e 10mo Initial commit
- origin/remote-only ∅ ⎇ b834638e 10mo Initial commit
+@ main ^ ./test-repo ↑0 ↓0 b834638e 10mo Initial commit
++ feature-with-worktree ∅ ./feature-with-worktree b834638e 10mo Initial commit
+ origin/remote-only ∅ ⎇ b834638e 10mo Initial commit
⚪ Showing 2 worktrees, 1 remote branches
diff --git a/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap b/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap
index 230a35a90..ed162e4e2 100644
--- a/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap
@@ -24,8 +24,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . ↑0 ↓0 b834638e 10mo Initial commit
- origin/remote-feature-1 ∅ ⎇ b834638e 10mo Initial commit
- origin/remote-feature-2 ∅ ⎇ b834638e 10mo Initial commit
+@ main ^ . ↑0 ↓0 b834638e 10mo Initial commit
+ origin/remote-feature-1 ∅ ⎇ b834638e 10mo Initial commit
+ origin/remote-feature-2 ∅ ⎇ b834638e 10mo Initial commit
⚪ Showing 1 worktrees, 2 remote branches
diff --git a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
index 61da2d801..8df460736 100644
--- a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
@@ -11,14 +11,14 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_GLOBAL: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0AUoHf/test-gitconfig
+ GIT_CONFIG_GLOBAL: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp5rI3t8/test-gitconfig
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
LANG: C
LC_ALL: C
- PATH: "/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0AUoHf/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/.tmp5rI3t8/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/.tmp0AUoHf/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp5rI3t8/test-config.toml
---
success: true
exit_code: 0
@@ -26,11 +26,11 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ ./test-repo ↑0 ↓0 6c3da842 10mo Initial commit on main
-+ ahead ↑⇡ ↑2 +2 ./ahead ↑2 ↓0 8d8f4673 10mo Ahead commit 2
-+ behind ≡ ⇣ ./behind ↑0 ↓1 6c3da842 10mo Initial commit on main
-+ diverged ↑⇅ ↑1 +1 ./diverged ↑1 ↓1 ca7cb696 10mo Diverged local commit
-+ in-sync ≡ ./in-sync ↑0 ↓0 6c3da842 10mo Initial commit on main
-+ no-upstream ≡ ./no-upstream 6c3da842 10mo Initial commit on main
+@ main ^ ./test-repo ↑0 ↓0 6c3da842 10mo Initial commit on main
++ ahead ↑⇡ ↑2 +2 ./ahead ↑2 ↓0 8d8f4673 10mo Ahead commit 2
++ behind ∅ ⇣ ./behind ↑0 ↓1 6c3da842 10mo Initial commit on main
++ diverged ↑⇅ ↑1 +1 ./diverged ↑1 ↓1 ca7cb696 10mo Diverged local commit
++ in-sync ∅ ./in-sync ↑0 ↓0 6c3da842 10mo Initial commit on main
++ no-upstream ∅ ./no-upstream 6c3da842 10mo Initial commit on main
⚪ Showing 6 worktrees, 2 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__with_user_status.snap b/tests/snapshots/integration__integration_tests__list__with_user_status.snap
index 06204e14d..f6d47ee72 100644
--- a/tests/snapshots/integration__integration_tests__list__with_user_status.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_user_status.snap
@@ -23,10 +23,10 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ clean-no-status ≡ ./clean-no-status b834638e 10mo Initial commit
-+ clean-with-status ≡ 💬 ./clean-with-status b834638e 10mo Initial commit
-+ dirty-no-status ! +1 -1 ./dirty-no-status b834638e 10mo Initial commit
-+ dirty-with-status ? ≡ 🤖 ./dirty-with-status b834638e 10mo Initial commit
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ clean-no-status ∅ ./clean-no-status b834638e 10mo Initial commit
++ clean-with-status ∅ 💬 ./clean-with-status b834638e 10mo Initial commit
++ dirty-no-status ! +1 -1 ./dirty-no-status b834638e 10mo Initial commit
++ dirty-with-status ?∅ 🤖 ./dirty-with-status b834638e 10mo Initial commit
⚪ Showing 5 worktrees, 1 with changes
diff --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.snap
index cc19afcd5..ba1e23ae7 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
@@ -25,6 +25,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . [SHA] 10mo Initial commit
+@ main ^ . [SHA] 10mo Initial commit
⚪ Showing 1 worktree
diff --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.snap
index dc520db5d..e8f9983d4 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
@@ -26,7 +26,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . [SHA] 10mo Initial commit
- feature ∅ ⎇ [SHA] 10mo Initial commit
+@ main ^ . [SHA] 10mo Initial commit
+ feature ∅ ⎇ [SHA] 10mo Initial commit
⚪ Showing 1 worktrees, 1 branches
diff --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.snap
index cc19afcd5..ba1e23ae7 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
@@ -25,6 +25,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . [SHA] 10mo Initial commit
+@ main ^ . [SHA] 10mo Initial commit
⚪ Showing 1 worktree
diff --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.snap
index cc19afcd5..ba1e23ae7 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
@@ -25,6 +25,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . [SHA] 10mo Initial commit
+@ main ^ . [SHA] 10mo Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_no_config.snap b/tests/snapshots/integration__integration_tests__list_config__list_no_config.snap
index cc19afcd5..ba1e23ae7 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
@@ -25,6 +25,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . [SHA] 10mo Initial commit
+@ main ^ . [SHA] 10mo Initial commit
⚪ Showing 1 worktree
diff --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.snap
index 87eaceeea..d083d3b0f 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
@@ -23,7 +23,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo [SHA] 10mo Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
-+ feature ≡ ./feature [SHA] 10mo Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
+@ main ^ ./test-repo [SHA] 10mo Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
++ feature ∅ ./feature [SHA] 10mo Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
⚪ Showing 2 worktrees
diff --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.snap
index 5d7b478b1..c4e74dde7 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
@@ -23,6 +23,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . [SHA] 10mo Initial commit
+@ main ^ . [SHA] 10mo Initial commit
⚪ Showing 1 worktree
diff --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.snap
index 6bc5ba1b8..69b331b4f 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
@@ -23,9 +23,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ also-no-changes ≡ ./also-no-changes b834638e 10mo Initial commit
-+ no-changes ≡ ./no-changes b834638e 10mo Initial commit
-+ with-changes ! +1 -1 ./with-changes b834638e 10mo Initial commit
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ also-no-changes ∅ ./also-no-changes b834638e 10mo Initial commit
++ no-changes ∅ ./no-changes b834638e 10mo Initial commit
++ with-changes ! +1 -1 ./with-changes b834638e 10mo Initial commit
⚪ Showing 4 worktrees, 1 with changes
diff --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.snap
index b95a0a206..91b92d451 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
@@ -23,8 +23,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ huge ? ≡ ./huge b834638e 10mo Initial commit
-+ tiny ! +1 -1 ./tiny b834638e 10mo Initial commit
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ huge ?∅ ./huge b834638e 10mo Initial commit
++ tiny ! +1 -1 ./tiny b834638e 10mo Initial commit
⚪ Showing 3 worktrees, 1 with changes
diff --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.snap
index 3bce7a524..8d9374443 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
@@ -23,9 +23,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ feature-large ? ≡ ./feature-large b834638e 10mo Initial commit
-+ feature-medium ? ≡ ./feature-medium b834638e 10mo Initial commit
-+ feature-small ? ≡ ./feature-small b834638e 10mo Initial commit
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ feature-large ?∅ ./feature-large b834638e 10mo Initial commit
++ feature-medium ?∅ ./feature-medium b834638e 10mo Initial commit
++ feature-small ?∅ ./feature-small b834638e 10mo Initial commit
⚪ Showing 4 worktrees
diff --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.snap
index 4d5d056a4..4f4a05a48 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
@@ -23,9 +23,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age
-@ main ^ ./test-repo b834638e 10mo
-+ another-extremely-long-name-here ≡ ./another-extremely-long-name-here b834638e 10mo
-+ short ≡ ./short b834638e 10mo
-+ very-long-feature-branch-name ≡ ./very-long-feature-branch-name b834638e 10mo
+@ main ^ ./test-repo b834638e 10mo
++ another-extremely-long-name-here ∅ ./another-extremely-long-name-here b834638e 10mo
++ short ∅ ./short b834638e 10mo
++ very-long-feature-branch-name ∅ ./very-long-feature-branch-name b834638e 10mo
⚪ Showing 4 worktrees, 1 column hidden
diff --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.snap
index 60302382a..64b7ce274 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
@@ -23,9 +23,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age
-@ main ^ ./test-repo b834638e 10mo
-+ long ≡ ./extremely-long-branch-name-that-might-cause-layout-issues b834638e 10mo
-+ medium ≡ ./medium-length-name b834638e 10mo
-+ x ≡ ./x b834638e 10mo
+@ main ^ ./test-repo b834638e 10mo
++ long ∅ ./extremely-long-branch-name-that-might-cause-layout-issues b834638e 10mo
++ medium ∅ ./medium-length-name b834638e 10mo
++ x ∅ ./x b834638e 10mo
⚪ Showing 4 worktrees, 1 column hidden
diff --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.snap
index 0ba2d5e5a..4b11d5e0e 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
@@ -23,9 +23,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ a ≡ ./a b834638e 10mo Initial commit
-+ bb ≡ ./bb b834638e 10mo Initial commit
-+ ccc ≡ ./ccc b834638e 10mo Initial commit
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ a ∅ ./a b834638e 10mo Initial commit
++ bb ∅ ./bb b834638e 10mo Initial commit
++ ccc ∅ ./ccc b834638e 10mo Initial commit
⚪ Showing 4 worktrees
diff --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.snap
index 5267911e0..8836b0fa5 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
@@ -23,9 +23,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ cafe ≡ ./café b834638e 10mo Initial commit
-+ naive ≡ ./naïve b834638e 10mo Initial commit
-+ resume ≡ ./résumé b834638e 10mo Initial commit
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ cafe ∅ ./café b834638e 10mo Initial commit
++ naive ∅ ./naïve b834638e 10mo Initial commit
++ resume ∅ ./résumé b834638e 10mo Initial commit
⚪ Showing 4 worktrees