Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
feat(status): Enhance command execution and consolidate state symbols
Maximilian Roos84c56df07a73
diff --git a/.claude-plugin/skills/worktrunk/reference/README.md b/.claude-plugin/skills/worktrunk/reference/README.mdindex d8f36d574..01565e9da 100644--- a/.claude-plugin/skills/worktrunk/reference/README.md+++ b/.claude-plugin/skills/worktrunk/reference/README.md@@ -579,36 +579,58 @@ Options:**STATUS SYMBOLS:**-The Status column shows git repository state using compact symbols. Symbol order indicates priority: conflicts (blocking) → worktree state → git operations → branch divergence → working tree changes.--**Symbol order:** `= ≡∅ ↻⋈ ◇⊠⚠ ↑↓ ⇡⇣ ?!+»✘`--| Symbol | Meaning | Category | Dimmed? |-| ------ | ---------------------------------------------------------------------------------- | ------------------ | ------- |-| `·` | Branch without worktree | N/A | No |-| `=` | Conflicts with main | Blocking | No |-| `≡` | Working tree matches main (identical to main branch, regardless of commit history) | Worktree state | Yes |-| `∅` | No commits (no commits ahead AND no uncommitted changes) | Worktree state | Yes |-| `↻` | Rebase in progress | Git operation | No |-| `⋈` | Merge in progress | Git operation | No |-| `◇` | Bare worktree (no working directory) | Worktree attribute | No |-| `⊠` | Locked worktree | Worktree attribute | No |-| `⚠` | Prunable worktree | Worktree attribute | No |-| `↑` | Commits ahead of main | Branch divergence | No |-| `↓` | Commits behind main | Branch divergence | No |-| `⇡` | Commits ahead of remote | Remote divergence | No |-| `⇣` | Commits behind remote | Remote divergence | No |-| `?` | Untracked files | Working tree | No |-| `!` | Modified files (unstaged) | Working tree | No |-| `+` | Staged files | Working tree | No |-| `»` | Renamed files | Working tree | No |-| `✘` | Deleted files | Working tree | No |--Symbols combine to show complete state (e.g., `≡↓!` means matches main, behind main, and has unstaged changes).--**Dimming logic:** Dimmed rows indicate worktrees with no marginal information beyond main (no unique work). Lines dim when they have either `≡` (matches main) OR `∅` (no commits). Both conditions use OR logic: either is sufficient to dim. This focuses attention on worktrees containing work.--**Branch-only entries:** Branches without worktrees show `·` in the Status column, indicating git status is not applicable (no working directory to check).+Order: `=≠ ≡∅ ↻⋈ ⎇⊠⚠ ↑↓ ⇡⇣ ?!+»✘`++- `·` Branch without worktree (no working directory to check)+- `=` **Merge conflicts** (unmerged paths in working tree)+- `≠` **Potential conflicts** with main (`--full` only, detected via `git merge-tree`)+- `≡` Working tree matches main (identical contents, regardless of commit history)+- `∅` No commits (no commits ahead AND no uncommitted changes)+- `↻` Rebase in progress+- `⋈` Merge in progress+- `⎇` Branch indicator (shown for branches without worktrees)+- `⊠` Locked worktree+- `⚠` Prunable worktree+- `↑` Ahead of main branch+- `↓` Behind main branch+- `⇡` Ahead of remote tracking branch+- `⇣` Behind remote tracking branch+- `?` Untracked files present+- `!` Modified files (unstaged changes)+- `+` Staged files (ready to commit)+- `»` Renamed files+- `✘` Deleted files++*Rows are dimmed when no unique work (≡ matches main OR ∅ no commits).*++**JSON OUTPUT:**++Use `--format=json` for structured data. The `status_symbols` object provides:++- `has_conflicts`: boolean - true when branch has conflicts with main+- `branch_state`: "" | "=" (conflicts) | "≠" (potential) | "≡" (matches main) | "∅" (no commits)+- `git_operation`: "" | "↻" (rebase) | "⋈" (merge)+- `worktree_attrs`: "⎇" (branch) or combination of "⊠" (locked), "⚠" (prunable)+- `main_divergence`: "" | "↑" (ahead) | "↓" (behind) | "↕" (diverged)+- `upstream_divergence`: "" | "⇡" (ahead) | "⇣" (behind) | "⇅" (diverged)+- `working_tree`: combination of "?" (untracked), "!" (modified), "+" (staged), "»" (renamed), "✘" (deleted)+- `user_status`: custom status from git config (optional)++**Query examples:**++```bash+# Find worktrees with conflicts+jq '.[] | select(.type == "worktree" and .status_symbols.has_conflicts)'++# Find worktrees with uncommitted changes+jq '.[] | select(.type == "worktree" and .working_tree_diff.added > 0)'++# Find worktrees in rebase or merge+jq '.[] | select(.type == "worktree" and .status_symbols.git_operation != "")'++# Get branches ahead of main+jq '.[] | select(.ahead > 0) | {branch: (.branch // .name), ahead}'+```</details>diff --git a/CLAUDE.md b/CLAUDE.mdindex fb95e1e9f..a77b5e067 100644--- a/CLAUDE.md+++ b/CLAUDE.md@@ -515,17 +515,11 @@ Use `wt list --format=json` for structured data access. The output is an array o- `name`: branch name-### Status Symbols Structure+### JSON Field Documentation-The `status_symbols` object provides structured access to status indicators (available for both worktrees and branches):--- `has_conflicts`: boolean-- `branch_state`: "" | "≡" (matches main) | "∅" (no commits and clean)-- `git_operation`: "" | "↻" (rebase) | "⋈" (merge)-- `worktree_attrs`: "⎇" for branches, or combination of "◇" (bare), "⊠" (locked), "⚠" (prunable) for worktrees-- `main_divergence`: "" | "↑" (ahead) | "↓" (behind) | "↕" (diverged)-- `upstream_divergence`: "" | "⇡" (ahead) | "⇣" (behind) | "⇅" (diverged)-- `working_tree`: combination of "?" (untracked), "!" (modified), "+" (staged), "»" (renamed), "✘" (deleted)+**For status symbols and query examples, see:**+- `wt list --help` - authoritative source of truth+- README.md - copy of help text for quick reference### Display Fields (json-pretty format only)@@ -534,25 +528,3 @@ ANSI-formatted strings for human-readable output:- `upstream_display`, `ci_status_display` (optional)- `status_display`: rendered status symbols + user status- `working_diff_display` (worktrees only, optional)--### Query Examples--```bash-# Find worktrees with uncommitted changes-jq '.[] | select(.type == "worktree" and .working_tree_diff.added > 0)'--# Find worktrees with conflicts-jq '.[] | select(.type == "worktree" and .status_symbols.has_conflicts)'--# Find worktrees in rebase or merge-jq '.[] | select(.type == "worktree" and .status_symbols.git_operation != "")'--# Get branches ahead of main-jq '.[] | select(.ahead > 0) | {branch: (.branch // .name), ahead}'--# Find branches without worktrees-jq '.[] | select(.type == "branch") | .name'--# Get worktrees that match main exactly-jq '.[] | select(.type == "worktree" and .working_tree_diff_with_main.added == 0 and .working_tree_diff_with_main.deleted == 0)'-```diff --git a/README.md b/README.mdindex d8f36d574..01565e9da 100644--- a/README.md+++ b/README.md@@ -579,36 +579,58 @@ Options:**STATUS SYMBOLS:**-The Status column shows git repository state using compact symbols. Symbol order indicates priority: conflicts (blocking) → worktree state → git operations → branch divergence → working tree changes.--**Symbol order:** `= ≡∅ ↻⋈ ◇⊠⚠ ↑↓ ⇡⇣ ?!+»✘`--| Symbol | Meaning | Category | Dimmed? |-| ------ | ---------------------------------------------------------------------------------- | ------------------ | ------- |-| `·` | Branch without worktree | N/A | No |-| `=` | Conflicts with main | Blocking | No |-| `≡` | Working tree matches main (identical to main branch, regardless of commit history) | Worktree state | Yes |-| `∅` | No commits (no commits ahead AND no uncommitted changes) | Worktree state | Yes |-| `↻` | Rebase in progress | Git operation | No |-| `⋈` | Merge in progress | Git operation | No |-| `◇` | Bare worktree (no working directory) | Worktree attribute | No |-| `⊠` | Locked worktree | Worktree attribute | No |-| `⚠` | Prunable worktree | Worktree attribute | No |-| `↑` | Commits ahead of main | Branch divergence | No |-| `↓` | Commits behind main | Branch divergence | No |-| `⇡` | Commits ahead of remote | Remote divergence | No |-| `⇣` | Commits behind remote | Remote divergence | No |-| `?` | Untracked files | Working tree | No |-| `!` | Modified files (unstaged) | Working tree | No |-| `+` | Staged files | Working tree | No |-| `»` | Renamed files | Working tree | No |-| `✘` | Deleted files | Working tree | No |--Symbols combine to show complete state (e.g., `≡↓!` means matches main, behind main, and has unstaged changes).--**Dimming logic:** Dimmed rows indicate worktrees with no marginal information beyond main (no unique work). Lines dim when they have either `≡` (matches main) OR `∅` (no commits). Both conditions use OR logic: either is sufficient to dim. This focuses attention on worktrees containing work.--**Branch-only entries:** Branches without worktrees show `·` in the Status column, indicating git status is not applicable (no working directory to check).+Order: `=≠ ≡∅ ↻⋈ ⎇⊠⚠ ↑↓ ⇡⇣ ?!+»✘`++- `·` Branch without worktree (no working directory to check)+- `=` **Merge conflicts** (unmerged paths in working tree)+- `≠` **Potential conflicts** with main (`--full` only, detected via `git merge-tree`)+- `≡` Working tree matches main (identical contents, regardless of commit history)+- `∅` No commits (no commits ahead AND no uncommitted changes)+- `↻` Rebase in progress+- `⋈` Merge in progress+- `⎇` Branch indicator (shown for branches without worktrees)+- `⊠` Locked worktree+- `⚠` Prunable worktree+- `↑` Ahead of main branch+- `↓` Behind main branch+- `⇡` Ahead of remote tracking branch+- `⇣` Behind remote tracking branch+- `?` Untracked files present+- `!` Modified files (unstaged changes)+- `+` Staged files (ready to commit)+- `»` Renamed files+- `✘` Deleted files++*Rows are dimmed when no unique work (≡ matches main OR ∅ no commits).*++**JSON OUTPUT:**++Use `--format=json` for structured data. The `status_symbols` object provides:++- `has_conflicts`: boolean - true when branch has conflicts with main+- `branch_state`: "" | "=" (conflicts) | "≠" (potential) | "≡" (matches main) | "∅" (no commits)+- `git_operation`: "" | "↻" (rebase) | "⋈" (merge)+- `worktree_attrs`: "⎇" (branch) or combination of "⊠" (locked), "⚠" (prunable)+- `main_divergence`: "" | "↑" (ahead) | "↓" (behind) | "↕" (diverged)+- `upstream_divergence`: "" | "⇡" (ahead) | "⇣" (behind) | "⇅" (diverged)+- `working_tree`: combination of "?" (untracked), "!" (modified), "+" (staged), "»" (renamed), "✘" (deleted)+- `user_status`: custom status from git config (optional)++**Query examples:**++```bash+# Find worktrees with conflicts+jq '.[] | select(.type == "worktree" and .status_symbols.has_conflicts)'++# Find worktrees with uncommitted changes+jq '.[] | select(.type == "worktree" and .working_tree_diff.added > 0)'++# Find worktrees in rebase or merge+jq '.[] | select(.type == "worktree" and .status_symbols.git_operation != "")'++# Get branches ahead of main+jq '.[] | select(.ahead > 0) | {branch: (.branch // .name), ahead}'+```</details>diff --git a/src/cli.rs b/src/cli.rsindex 55eb82a00..f3fa270e9 100644--- a/src/cli.rs+++ b/src/cli.rs@@ -361,7 +361,7 @@ Displays worktrees in a table format with status information, commit details, an## STATUS SYMBOLS-Order: `=≠ ≡∅ ↻⋈ ⊠⚠ ↑↓ ⇡⇣ ?!+»✘`+Order: `=≠ ≡∅ ↻⋈ ⎇⊠⚠ ↑↓ ⇡⇣ ?!+»✘`- `·` Branch without worktree (no working directory to check)- `=` **Merge conflicts** (unmerged paths in working tree)@@ -370,6 +370,7 @@ Order: `=≠ ≡∅ ↻⋈ ⊠⚠ ↑↓ ⇡⇣ ?!+»✘`- `∅` No commits (no commits ahead AND no uncommitted changes)- `↻` Rebase in progress- `⋈` Merge in progress+- `⎇` Branch indicator (shown for branches without worktrees)- `⊠` Locked worktree- `⚠` Prunable worktree- `↑` Ahead of main branch@@ -382,7 +383,34 @@ Order: `=≠ ≡∅ ↻⋈ ⊠⚠ ↑↓ ⇡⇣ ?!+»✘`- `»` Renamed files- `✘` Deleted files-*Rows are dimmed when no unique work (≡ matches main OR ∅ no commits).*")]+*Rows are dimmed when no unique work (≡ matches main OR ∅ no commits).*++## JSON OUTPUT++Use `--format=json` for structured data. The `status_symbols` object provides:++- `has_conflicts`: boolean - true when branch has conflicts with main+- `branch_state`: \"\" | \"=\" (conflicts) | \"≠\" (potential) | \"≡\" (matches main) | \"∅\" (no commits)+- `git_operation`: \"\" | \"↻\" (rebase) | \"⋈\" (merge)+- `worktree_attrs`: \"⎇\" (branch) or combination of \"⊠\" (locked), \"⚠\" (prunable)+- `main_divergence`: \"\" | \"↑\" (ahead) | \"↓\" (behind) | \"↕\" (diverged)+- `upstream_divergence`: \"\" | \"⇡\" (ahead) | \"⇣\" (behind) | \"⇅\" (diverged)+- `working_tree`: combination of \"?\" (untracked), \"!\" (modified), \"+\" (staged), \"»\" (renamed), \"✘\" (deleted)+- `user_status`: custom status from git config (optional)++**Query examples:**++ # Find worktrees with conflicts+ jq '.[] | select(.type == \"worktree\" and .status_symbols.has_conflicts)'++ # Find worktrees with uncommitted changes+ jq '.[] | select(.type == \"worktree\" and .working_tree_diff.added > 0)'++ # Find worktrees in rebase or merge+ jq '.[] | select(.type == \"worktree\" and .status_symbols.git_operation != \"\")'++ # Get branches ahead of main+ jq '.[] | select(.ahead > 0) | {branch: (.branch // .name), ahead}'")]List {/// Output format#[arg(long, value_enum, default_value = "table")]diff --git a/src/commands/list/collect.rs b/src/commands/list/collect.rsindex 52549a137..ab41019f7 100644--- a/src/commands/list/collect.rs+++ b/src/commands/list/collect.rs@@ -224,9 +224,16 @@ fn compute_item_status_symbols(item: &mut ListItem, base_branch: Option<&str>) {upstream.active().map(|(_, a, b)| (a, b)).unwrap_or((0, 0));let upstream_divergence = compute_upstream_divergence(upstream_ahead, upstream_behind);+ // Combine conflicts and branch state (mutually exclusive)+ let branch_state = if has_conflicts {+ BranchState::Conflicts+ } else {+ // has_potential_conflicts is always false currently (--full not implemented)+ // but when implemented, it would go here as: else if has_potential_conflicts { PotentialConflicts }+ branch_state+ };+item.status_symbols = Some(StatusSymbols {- has_conflicts,- has_potential_conflicts: false,branch_state,git_operation,worktree_attrs,@@ -252,16 +259,21 @@ fn compute_item_status_symbols(item: &mut ListItem, base_branch: Option<&str>) {upstream.active().map(|(_, a, b)| (a, b)).unwrap_or((0, 0));let upstream_divergence = compute_upstream_divergence(upstream_ahead, upstream_behind);- // Branch state - only compute if we have actual counts data- // Branches without worktrees can only show NoCommits (no unique commits) or None- let branch_state = match item.counts {- Some(ref c) if c.ahead == 0 => BranchState::NoCommits,- _ => BranchState::None,+ // Branch state - branches can only show Conflicts or NoCommits+ // (MatchesMain only applies to worktrees since branches don't have working trees)+ let branch_state = if has_conflicts {+ BranchState::Conflicts+ } else if let Some(ref c) = item.counts {+ if c.ahead == 0 {+ BranchState::NoCommits+ } else {+ BranchState::None+ }+ } else {+ BranchState::None};item.status_symbols = Some(StatusSymbols {- has_conflicts,- has_potential_conflicts: false,branch_state,git_operation: GitOperation::None,worktree_attrs: "⎇".to_string(), // Branch indicatordiff --git a/src/commands/list/model.rs b/src/commands/list/model.rsindex d5a065919..5612548d8 100644--- a/src/commands/list/model.rs+++ b/src/commands/list/model.rs@@ -352,17 +352,32 @@ impl serde::Serialize for UpstreamDivergence {}}-/// Branch state relative to main/primary branch+/// Branch state including conflicts///-/// Represents whether the branch matches main or has no commits.-#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]+/// These states are mutually exclusive:+/// - Conflicts (= or ≠) indicate changes that differ from 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 branch state (neither matches main nor empty)+ /// Normal working branch (no conflicts, doesn't match main, has commits)#[default]+ #[serde(rename = "")]None,+ /// Actual merge conflicts with main (unmerged paths in working tree)+ #[serde(rename = "=")]+ Conflicts,+ /// Potential conflicts with main (detected via --full, using git merge-tree)+ /// TODO: Implement when --full mode is complete+ #[allow(dead_code)]+ #[serde(rename = "≠")]+ PotentialConflicts,/// Working tree identical to main branch+ #[serde(rename = "≡")]MatchesMain,/// No commits ahead and clean working tree (not matching main)+ #[serde(rename = "∅")]NoCommits,}@@ -370,21 +385,14 @@ impl std::fmt::Display for BranchState {fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {match self {Self::None => Ok(()),+ Self::Conflicts => write!(f, "="),+ Self::PotentialConflicts => write!(f, "≠"),Self::MatchesMain => write!(f, "≡"),Self::NoCommits => write!(f, "∅"),}}}-impl serde::Serialize for BranchState {- fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>- where- S: serde::Serializer,- {- serializer.serialize_str(&self.to_string())- }-}-/// Git operation in progress////// Represents active rebase or merge operations.@@ -425,36 +433,34 @@ 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 8 positions (including user status).+/// Stores maximum character width for each of 7 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, 7]+ /// Maximum width for each position: [0, 1, 2, 3, 4, 5, 6]/// 0 = position unused, >0 = max characters needed- widths: [usize; 8],+ widths: [usize; 7],}impl PositionMask {const POS_3_WORKING_TREE: usize = 0;- const POS_0A_CONFLICTS: usize = 1;+ const POS_0A_BRANCH_STATE: usize = 1;const POS_0C_GIT_OPERATION: usize = 2;const POS_1_MAIN_DIVERGENCE: usize = 3;const POS_2_UPSTREAM_DIVERGENCE: usize = 4;- const POS_0B_BRANCH_STATE: usize = 5;- const POS_0D_WORKTREE_ATTRS: usize = 6;- const POS_4_USER_STATUS: usize = 7;+ const POS_0D_WORKTREE_ATTRS: usize = 5;+ const POS_4_USER_STATUS: usize = 6;/// Full mask with all positions enabled (for JSON output and progressive rendering)/// Allocates realistic widths based on common symbol sizes to ensure proper grid alignmentpub const FULL: Self = Self {widths: [5, // POS_3_WORKING_TREE: ?!+»✘ (max 5 symbols)- 1, // POS_0A_CONFLICTS: = (1 char)+ 1, // POS_0A_BRANCH_STATE: =≠≡∅ (1 char, mutually exclusive)1, // POS_0C_GIT_OPERATION: ↻ or ⋈ (1 char)1, // POS_1_MAIN_DIVERGENCE: ↑, ↓, ↕ (1 char)1, // POS_2_UPSTREAM_DIVERGENCE: ⇡, ⇣, ⇅ (1 char)- 1, // POS_0B_BRANCH_STATE: ≡ or ∅ (1 char)- 2, // POS_0D_WORKTREE_ATTRS: ⎇ for branches (1 char), ⊠⚠ for worktrees (max 2)+ 2, // POS_0D_WORKTREE_ATTRS: ⎇ for branches (1 char), ⊠⚠ for worktrees (max 2, bare filtered out)2, // POS_4_USER_STATUS: single emoji or two chars (allocate 2)],};@@ -468,8 +474,7 @@ impl PositionMask {/// Structured status symbols for aligned rendering////// Symbols are categorized to enable vertical alignment in table output:-/// - Position 0a: Conflicts (=)-/// - Position 0b: Branch state (≡, ∅)+/// - Position 0a: Conflicts or branch state (=, ≠, ≡, ∅) - mutually exclusive/// - Position 0c: Git operation (↻, ⋈)/// - Position 0d: Item attributes (⎇ for branches, ⊠⚠ for worktrees)/// - Position 1: Main branch divergence (↑, ↓, ↕)@@ -480,28 +485,20 @@ impl PositionMask {/// ## Mutual Exclusivity////// **Mutually exclusive (enforced by type system):**-/// - ≡ vs ∅: Branch state (BranchState enum)+/// - = vs ≠ vs ≡ vs ∅: ConflictsOrBranchState enum (combined position)/// - ↻ vs ⋈: Git operation (GitOperation enum)/// - ↑ vs ↓ vs ↕: Main divergence (MainDivergence enum)/// - ⇡ vs ⇣ vs ⇅: Upstream divergence (UpstreamDivergence enum)////// **NOT mutually exclusive (can co-occur):**-/// - = can occur with any other symbol/// - ⊠, ⚠: Worktree can be locked+prunable (bare is filtered out)/// - ⎇: Branch indicator (mutually exclusive with ⊠⚠ as branches can't have worktree attrs)/// - All working tree symbols (?!+»✘): Can have multiple types of changes-#[derive(Debug, Clone, Default, serde::Serialize)]+#[derive(Debug, Clone, Default)]pub struct StatusSymbols {- /// Actual merge conflicts in working tree (unmerged paths)- /// Position 0a - Boolean flag (= or empty)- pub(crate) has_conflicts: bool,-- /// Potential conflicts with main branch (detected via --full)- /// Position 0a2 - Boolean flag (≠ or empty)- pub(crate) has_potential_conflicts: bool,-- /// Branch state relative to main- /// Position 0b - MUTUALLY EXCLUSIVE (enforced by enum)+ /// Branch state including conflicts (mutually exclusive)+ /// Position 0a - BranchState enum+ /// Priority: Conflicts (=) > PotentialConflicts (≠) > MatchesMain (≡) > NoCommits (∅)pub(crate) branch_state: BranchState,/// Git operation in progress@@ -542,8 +539,7 @@ impl StatusSymbols {////// Aligns all symbol types at fixed positions, but only includes positions/// that are present in the mask:- /// - Position 0a: Conflicts (= or space)- /// - Position 0b: Branch state (≡, ∅, or space)+ /// - Position 0a: Conflicts or branch state (=, ≠, ≡, ∅)/// - Position 0c: Git operation (↻, ⋈, or space)/// - Position 0d: Worktree attributes (⊠⚠ or space)/// - Position 1: Main divergence (↑, ↓, ↕, or space)@@ -566,16 +562,16 @@ impl StatusSymbols {// Build list of (position_index, content, has_data) tuples// Ordered by importance/actionability// Apply colors based on semantic meaning:- // - Red (ERROR): Conflicts (blocking problems)- // - Yellow (WARNING): Git operations, locked/prunable (active/stuck states)+ // - Red (ERROR): Actual conflicts (blocking problems)+ // - Yellow (WARNING): Potential conflicts, git operations, locked/prunable (active/stuck states)// - Cyan: Working tree changes (activity)// - Dimmed (HINT): Branch state symbols that indicate removability- let conflicts_str = if self.has_conflicts {- format!("{ERROR}={ERROR:#}")- } else if self.has_potential_conflicts {- format!("{WARNING}≠{WARNING:#}")- } else {- String::new()+ let branch_state_str = match self.branch_state {+ BranchState::Conflicts => format!("{ERROR}={ERROR:#}"),+ BranchState::PotentialConflicts => 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)@@ -584,11 +580,6 @@ impl StatusSymbols {};let main_divergence_str = self.main_divergence.to_string();let upstream_divergence_str = self.upstream_divergence.to_string();- let branch_state_str = if self.branch_state != BranchState::None {- format!("{HINT}{}{HINT:#}", self.branch_state)- } else {- String::new()- };let working_tree_str = if !self.working_tree.is_empty() {format!("{CYAN}{}{CYAN:#}", self.working_tree)} else {@@ -612,7 +603,7 @@ impl StatusSymbols {// CRITICAL: Display order is working_tree first, 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, &str, usize, bool); 8] = [+ let positions_data: [(usize, &str, usize, bool); 7] = [(PositionMask::POS_3_WORKING_TREE,working_tree_str.as_str(),@@ -620,19 +611,13 @@ impl StatusSymbols {!self.working_tree.is_empty(),),(- PositionMask::POS_0A_CONFLICTS,- conflicts_str.as_str(),- if self.has_conflicts || self.has_potential_conflicts {+ PositionMask::POS_0A_BRANCH_STATE,+ branch_state_str.as_str(),+ if self.branch_state != BranchState::None {1} else {0},- self.has_conflicts || self.has_potential_conflicts,- ),- (- PositionMask::POS_0B_BRANCH_STATE,- branch_state_str.as_str(),- self.branch_state.to_string().width(),self.branch_state != BranchState::None,),(@@ -641,12 +626,6 @@ impl StatusSymbols {self.git_operation.to_string().width(),self.git_operation != GitOperation::None,),- (- PositionMask::POS_0D_WORKTREE_ATTRS,- worktree_attrs_str.as_str(),- self.worktree_attrs.width(),- !self.worktree_attrs.is_empty(),- ),(PositionMask::POS_1_MAIN_DIVERGENCE,main_divergence_str.as_str(),@@ -659,6 +638,12 @@ impl StatusSymbols {self.upstream_divergence.to_string().width(),self.upstream_divergence != UpstreamDivergence::None,),+ (+ PositionMask::POS_0D_WORKTREE_ATTRS,+ worktree_attrs_str.as_str(),+ self.worktree_attrs.width(),+ !self.worktree_attrs.is_empty(),+ ),(PositionMask::POS_4_USER_STATUS,user_status_str.as_str(),@@ -694,9 +679,7 @@ impl StatusSymbols {/// Check if symbols are emptypub fn is_empty(&self) -> bool {- !self.has_conflicts- && !self.has_potential_conflicts- && self.branch_state == BranchState::None+ self.branch_state == BranchState::None&& self.git_operation == GitOperation::None&& self.worktree_attrs.is_empty()&& self.main_divergence == MainDivergence::None@@ -705,3 +688,30 @@ impl StatusSymbols {&& self.user_status.is_none()}}++impl serde::Serialize for StatusSymbols {+ fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>+ where+ S: serde::Serializer,+ {+ use serde::ser::SerializeStruct;+ let mut state = serializer.serialize_struct("StatusSymbols", 8)?;++ // Convenience boolean - derived from branch_state+ let has_conflicts = matches!(+ self.branch_state,+ BranchState::Conflicts | BranchState::PotentialConflicts+ );+ state.serialize_field("has_conflicts", &has_conflicts)?;++ state.serialize_field("branch_state", &self.branch_state)?;+ state.serialize_field("git_operation", &self.git_operation)?;+ state.serialize_field("worktree_attrs", &self.worktree_attrs)?;+ state.serialize_field("main_divergence", &self.main_divergence)?;+ state.serialize_field("upstream_divergence", &self.upstream_divergence)?;+ state.serialize_field("working_tree", &self.working_tree)?;+ state.serialize_field("user_status", &self.user_status)?;++ state.end()+ }+}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.snapindex abd0fc6a5..6b04798cc 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: CNO_COLOR: ""SOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpGH3IK9/test-config.toml+ WORKTRUNK_CONFIG: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpkoXSyA/test-config.toml---success: trueexit_code: 0@@ -23,6 +23,6 @@ exit_code: 0----- stderr -----Branch Status HEAD± main↕ Path Remote⇅ Commit Age Messagefeature ./test-repo.feature 72413a3b 10 months ago Work on feature-main ∅ ↓ ↓1 ./test-repo.main 6c3da842 10 months ago Initial commit on main+main ∅ ↓ ↓1 ./test-repo.main 6c3da842 10 months ago Initial commit on main⚪ Showing 2 worktreesdiff --git a/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snap b/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snapindex 497aa4866..0370dacc1 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@@ -16,7 +16,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpRLtk2g/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpfYxelM/test-config.toml---success: trueexit_code: 0@@ -25,6 +25,6 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m[1m[35mmain[0m [1m[35m.[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mbranch-only[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mbranch-only[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 1 worktrees, 1 branches[0mdiff --git a/tests/snapshots/integration__integration_tests__list__json_with_display_fields.snap b/tests/snapshots/integration__integration_tests__list__json_with_display_fields.snapindex b79842ea1..0c2e843be 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@@ -12,10 +12,11 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpYxhIJh/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp5JH1mZ/test-config.toml---success: trueexit_code: 0@@ -33,7 +34,6 @@ exit_code: 0"has_conflicts": false,"status_symbols": {"has_conflicts": false,- "has_potential_conflicts": false,"branch_state": "","git_operation": "","worktree_attrs": "",@@ -77,7 +77,6 @@ exit_code: 0"has_conflicts": false,"status_symbols": {"has_conflicts": false,- "has_potential_conflicts": false,"branch_state": "","git_operation": "","worktree_attrs": "",@@ -121,7 +120,6 @@ exit_code: 0"has_conflicts": false,"status_symbols": {"has_conflicts": false,- "has_potential_conflicts": false,"branch_state": "∅","git_operation": "","worktree_attrs": "",diff --git a/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap b/tests/snapshots/integration__integration_tests__list__json_with_metadata.snapindex b20d74df9..fd88ef4fb 100644--- a/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap+++ b/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap@@ -12,10 +12,11 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpxMKsWA/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpg2614S/test-config.toml---success: trueexit_code: 0@@ -33,7 +34,6 @@ exit_code: 0"has_conflicts": false,"status_symbols": {"has_conflicts": false,- "has_potential_conflicts": false,"branch_state": "","git_operation": "","worktree_attrs": "",@@ -77,7 +77,6 @@ exit_code: 0"has_conflicts": false,"status_symbols": {"has_conflicts": false,- "has_potential_conflicts": false,"branch_state": "≡","git_operation": "","worktree_attrs": "",@@ -121,7 +120,6 @@ exit_code: 0"has_conflicts": false,"status_symbols": {"has_conflicts": false,- "has_potential_conflicts": false,"branch_state": "≡","git_operation": "","worktree_attrs": "⊠",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.snapindex 2fe16f71b..adfa3035c 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@@ -12,10 +12,11 @@ info:GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"GIT_CONFIG_GLOBAL: /dev/nullGIT_CONFIG_SYSTEM: /dev/null+ GIT_EDITOR: ""LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpPlVPx6/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp8q3SVO/test-config.toml---success: trueexit_code: 0@@ -33,7 +34,6 @@ exit_code: 0"has_conflicts": false,"status_symbols": {"has_conflicts": false,- "has_potential_conflicts": false,"branch_state": "","git_operation": "","worktree_attrs": "",@@ -78,7 +78,6 @@ exit_code: 0"user_status": "🔧","status_symbols": {"has_conflicts": false,- "has_potential_conflicts": false,"branch_state": "≡","git_operation": "","worktree_attrs": "",@@ -122,7 +121,6 @@ exit_code: 0"has_conflicts": false,"status_symbols": {"has_conflicts": false,- "has_potential_conflicts": false,"branch_state": "≡","git_operation": "","worktree_attrs": "",diff --git a/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap b/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snapindex c5eb72598..c66f99463 100644--- a/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap+++ b/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap@@ -15,7 +15,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpSW0NBE/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpxDz88E/test-config.toml---success: trueexit_code: 0@@ -24,8 +24,8 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m[1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-diverged [36m![0m ↑ 💬 [32m+40[0m [31m-60[0m [32m↑1[0m ./diverged [2m8ba5aa92[0m [2m10 months ago[0m [2mDiverged commit[0m-feature-changes [36m?![0m ↑ 🤖 [32m+50[0m [31m-100[0m [32m↑1[0m ./feature-changes [2mb854b166[0m [2m10 months ago[0m [2mAdd 100 lines[0m-[2mfix[0m [36m?[0m [2m≡[0m 💬 [2m./fix[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+diverged [36m![0m ↑ 💬 [32m+40[0m [31m-60[0m [32m↑1[0m ./diverged [2m8ba5aa92[0m [2m10 months ago[0m [2mDiverged commit[0m+feature-changes [36m?![0m ↑ 🤖 [32m+50[0m [31m-100[0m [32m↑1[0m ./feature-changes [2mb854b166[0m [2m10 months ago[0m [2mAdd 100 lines[0m+[2mfix[0m [36m?[0m [2m≡[0m 💬 [2m./fix[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 4 worktrees, 2 with changes, 2 ahead[0mdiff --git a/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap b/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snapindex 5542c431c..f6a56e317 100644--- a/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap+++ b/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap@@ -15,7 +15,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmplgPGUb/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpPVlyPb/test-config.toml---success: trueexit_code: 0@@ -24,9 +24,9 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m[36mmain[0m [36m./test-repo[0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0m-[1m[35mfeature-current[0m ↑ [32m↑1[0m [1m[35m./feature-current[0m [2mfc28a4d1[0m [2m9 months ago[0m [2mCommit at 01:00[0m-feature-newest ↑ [32m↑1[0m ./feature-newest [2m136358eb[0m [2m9 months ago[0m [2mCommit at 03:00[0m-feature-middle ↑ [32m↑1[0m ./feature-middle [2ma0a4851a[0m [2m9 months ago[0m [2mCommit at 02:00[0m-feature-oldest ↑ [32m↑1[0m ./feature-oldest [2m1b1a2d78[0m [2m9 months ago[0m [2mCommit at 00:30[0m+[1m[35mfeature-current[0m ↑ [32m↑1[0m [1m[35m./feature-current[0m [2mfc28a4d1[0m [2m9 months ago[0m [2mCommit at 01:00[0m+feature-newest ↑ [32m↑1[0m ./feature-newest [2m136358eb[0m [2m9 months ago[0m [2mCommit at 03:00[0m+feature-middle ↑ [32m↑1[0m ./feature-middle [2ma0a4851a[0m [2m9 months ago[0m [2mCommit at 02:00[0m+feature-oldest ↑ [32m↑1[0m ./feature-oldest [2m1b1a2d78[0m [2m9 months ago[0m [2mCommit at 00:30[0m⚪ [2mShowing 5 worktrees, 4 ahead[0mdiff --git a/tests/snapshots/integration__integration_tests__list__list_primary_on_different_branch.snap b/tests/snapshots/integration__integration_tests__list__list_primary_on_different_branch.snapindex 881164b2b..6ce209ae7 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@@ -15,7 +15,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpocb3A3/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpzlHn2H/test-config.toml---success: trueexit_code: 0@@ -24,7 +24,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m[1m[35mdevelop[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-a[0m [2m≡[0m [2m./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-b[0m [2m≡[0m [2m./feature-b[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature-a[0m [2m≡[0m [2m./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature-b[0m [2m≡[0m [2m./feature-b[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 3 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snap b/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snapindex 4421f495e..226dae5c4 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: wtargs:- "-C"- - /private/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp4g1SVX/test-repo+ - /private/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpURVuoh/test-repo- listenv:CLICOLOR_FORCE: "1"@@ -18,7 +18,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m[1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-a[0m [2m≡[0m [2m./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-b[0m [2m≡[0m [2m./feature-b[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature-a[0m [2m≡[0m [2m./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature-b[0m [2m≡[0m [2m./feature-b[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 3 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap b/tests/snapshots/integration__integration_tests__list__locked_no_reason.snapindex 8a0a04a05..40d4c7dad 100644--- a/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap+++ b/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap@@ -15,7 +15,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpFPXLby/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpd36y3T/test-config.toml---success: trueexit_code: 0@@ -24,6 +24,6 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m[1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mlocked-no-reason[0m [2m≡[0m [33m⊠[0m [2m./locked-no-reason[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mlocked-no-reason[0m [2m≡[0m [33m⊠[0m [2m./locked-no-reason[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 2 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__locked_worktree.snap b/tests/snapshots/integration__integration_tests__list__locked_worktree.snapindex 9752b14ac..79e8e0024 100644--- a/tests/snapshots/integration__integration_tests__list__locked_worktree.snap+++ b/tests/snapshots/integration__integration_tests__list__locked_worktree.snap@@ -15,7 +15,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp9KzsCB/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpgkoR15/test-config.toml---success: trueexit_code: 0@@ -24,6 +24,6 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m[1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mlocked-feature[0m [2m≡[0m [33m⊠[0m [2m./locked-feature[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mlocked-feature[0m [2m≡[0m [33m⊠[0m [2m./locked-feature[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 2 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__long_commit_message.snap b/tests/snapshots/integration__integration_tests__list__long_commit_message.snapindex 0df516b31..875d78f7e 100644--- a/tests/snapshots/integration__integration_tests__list__long_commit_message.snap+++ b/tests/snapshots/integration__integration_tests__list__long_commit_message.snap@@ -15,7 +15,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpDOC51Z/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpO4JnM9/test-config.toml---success: trueexit_code: 0@@ -24,6 +24,6 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m[1m[35mmain[0m [1m[35m./test-repo[0m [2m1310bfb9[0m [2m10 months ago[0m [2mShort message[0m-[2mfeature-a[0m [2m∅[0m ↓ [2m[31m↓1[0m [2m./feature-a[0m [2mf078644e[0m [2m10 months ago[0m [2mThis is a very long commit message that should…[0m+[2mfeature-a[0m [2m∅[0m ↓ [2m[31m↓1[0m [2m./feature-a[0m [2mf078644e[0m [2m10 months ago[0m [2mThis is a very long commit message that should…[0m⚪ [2mShowing 2 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap b/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snapindex dad070fe5..c5228fd33 100644--- a/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap+++ b/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap@@ -15,7 +15,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpIcZQdN/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpd4J8uD/test-config.toml---success: trueexit_code: 0@@ -24,9 +24,9 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m[1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m-[2mmedium-name[0m [2m≡[0m [2m./medium-name[0m [2mb834638e[0m [2m10 months ago[0m-[2mshort[0m [2m≡[0m [2m./short[0m [2mb834638e[0m [2m10 months ago[0m-[2mvery-long-branch-name-here[0m [2m≡[0m [2m./very-long-branch-name-here[0m [2mb834638e[0m [2m10 months ago[0m-[2mwith-changes[0m [2m≡[0m [2m./with-changes[0m [2mb834638e[0m [2m10 months ago[0m+[2mmedium-name[0m [2m≡[0m [2m./medium-name[0m [2mb834638e[0m [2m10 months ago[0m+[2mshort[0m [2m≡[0m [2m./short[0m [2mb834638e[0m [2m10 months ago[0m+[2mvery-long-branch-name-here[0m [2m≡[0m [2m./very-long-branch-name-here[0m [2mb834638e[0m [2m10 months ago[0m+[2mwith-changes[0m [2m≡[0m [2m./with-changes[0m [2mb834638e[0m [2m10 months ago[0m⚪ [2mShowing 5 worktrees, 1 column hidden[0mdiff --git a/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap b/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snapindex 889cfd724..dcdea5714 100644--- a/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap+++ b/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap@@ -15,7 +15,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmplwNBai/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpd2Hu4U/test-config.toml---success: trueexit_code: 0@@ -24,6 +24,6 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mmain…±[0m [1mPath[0m [1mRemote⇅[0m [1mCI[0m [1mCommit[0m [1mAge[0m [1mMessage[0m[1m[35mmain[0m [1m[35m./test-repo[0m [2m85ed6d3d[0m [2m10 months ago[0m [2mMain advances[0m-feature [36m?!+»✘[0m[31m=[0m [33m⊠[0m ↕⇅🤖 [32m+2[0m [31m-2[0m [32m↑2[0m [2m[31m↓1[0m [32m+3[0m [31m-1[0m ./feature [32m↑2[0m [2m[31m↓1[0m [2m21dc61ca[0m [2m10 months ago[0m [2mLocal only commit[0m+feature [36m?!+»✘[0m[31m=[0m ↕⇅[33m⊠[0m 🤖 [32m+2[0m [31m-2[0m [32m↑2[0m [2m[31m↓1[0m [32m+3[0m [31m-1[0m ./feature [32m↑2[0m [2m[31m↓1[0m [2m21dc61ca[0m [2m10 months ago[0m [2mLocal only commit[0m⚪ [2mShowing 2 worktrees, 1 with changes, 1 ahead[0mdiff --git a/tests/snapshots/integration__integration_tests__list__maximum_status_with_git_operation.snap b/tests/snapshots/integration__integration_tests__list__maximum_status_with_git_operation.snapindex d9414f87b..b7fec3954 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@@ -16,7 +16,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpRwYcGl/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpAe8Z2r/test-config.toml---success: trueexit_code: 0@@ -25,6 +25,6 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mmain…±[0m [1mPath[0m [1mRemote⇅[0m [1mCI[0m [1mCommit[0m [1mAge[0m [1mMessage[0m[1m[35mmain[0m [1m[35m./test-repo[0m [2mb7c14ce1[0m [2m10 months ago[0m [2mMain conflicting changes[0m-feature [36m?!+[0m [33m↻[0m[33m⊠[0m 🤖 [32m+7[0m ./feature [2mb7c14ce1[0m [2m10 months ago[0m [2mMain conflicting changes[0m+feature [36m?!+[0m [33m↻[0m [33m⊠[0m 🤖 [32m+7[0m ./feature [2mb7c14ce1[0m [2m10 months ago[0m [2mMain conflicting changes[0m⚪ [2mShowing 2 worktrees, 1 with changes[0mdiff --git a/tests/snapshots/integration__integration_tests__list__maximum_working_tree_symbols.snap b/tests/snapshots/integration__integration_tests__list__maximum_working_tree_symbols.snapindex 78f5ce8c6..e748372a2 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@@ -15,7 +15,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpatXx8Z/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpQIhBES/test-config.toml---success: trueexit_code: 0@@ -24,6 +24,6 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m[1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-feature [36m?!+»✘[0m ↑ [32m+2[0m [31m-3[0m [32m↑1[0m ./feature [2m689c2504[0m [2m10 months ago[0m [2mAdd files[0m+feature [36m?!+»✘[0m ↑ [32m+2[0m [31m-3[0m [32m↑1[0m ./feature [2m689c2504[0m [2m10 months ago[0m [2mAdd files[0m⚪ [2mShowing 2 worktrees, 1 with changes, 1 ahead[0mdiff --git a/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snapindex 5efefe5a9..340c3181c 100644--- a/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap+++ b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap@@ -15,7 +15,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp8ZsoiA/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpqOgvlT/test-config.toml---success: trueexit_code: 0@@ -24,7 +24,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m[1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-a[0m [2m≡[0m [2m./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-b[0m [2m≡[0m [2m./feature-b[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature-a[0m [2m≡[0m [2m./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature-b[0m [2m≡[0m [2m./feature-b[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 3 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap b/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snapindex 3ebfc56dd..1377090ca 100644--- a/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap+++ b/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap@@ -16,7 +16,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpEuDs0c/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpEbbYbM/test-config.toml---success: trueexit_code: 0@@ -25,6 +25,6 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m[1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature[0m [2m≡[0m [2m./feature[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature[0m [2m≡[0m [2m./feature[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 2 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__progressive_flag.snap b/tests/snapshots/integration__integration_tests__list__progressive_flag.snapindex 3ca809a7a..24339ddd4 100644--- a/tests/snapshots/integration__integration_tests__list__progressive_flag.snap+++ b/tests/snapshots/integration__integration_tests__list__progressive_flag.snap@@ -16,7 +16,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpppdMPk/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpWs3Y1G/test-config.toml---success: trueexit_code: 0@@ -25,7 +25,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m[1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-a[0m [2m≡[0m [2m./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-b[0m [2m≡[0m [2m./feature-b[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature-a[0m [2m≡[0m [2m./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature-b[0m [2m≡[0m [2m./feature-b[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 3 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap b/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snapindex 8f5389f2a..71ff73cf3 100644--- a/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap+++ b/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap@@ -17,7 +17,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpz3HzJx/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpSJGOYG/test-config.toml---success: trueexit_code: 0@@ -26,8 +26,8 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m[1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-a[0m [2m≡[0m [2m./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2morphan-1[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2morphan-2[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature-a[0m [2m≡[0m [2m./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2morphan-1[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2morphan-2[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 2 worktrees, 2 branches[0mdiff --git a/tests/snapshots/integration__integration_tests__list__readme_example_simple_list.snap b/tests/snapshots/integration__integration_tests__list__readme_example_simple_list.snapindex a6d5e75ac..4c1c0e07c 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@@ -15,7 +15,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpbWzXm1/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpXN0aAS/test-config.toml---success: trueexit_code: 0@@ -24,7 +24,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m[1m[35mmain[0m [1m[35m./test-repo[0m [32m↑0[0m [2m[31m↓0[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-bugfix-y ↑ [32m↑1[0m ./bugfix-y [2m412a27c8[0m [2m10 months ago[0m [2mFix bug[0m-feature-x [36m+[0m ↑ [32m+5[0m [32m↑3[0m ./feature-x [2m7fd821aa[0m [2m10 months ago[0m [2mAdd file 3[0m+bugfix-y ↑ [32m↑1[0m ./bugfix-y [2m412a27c8[0m [2m10 months ago[0m [2mFix bug[0m+feature-x [36m+[0m ↑ [32m+5[0m [32m↑3[0m ./feature-x [2m7fd821aa[0m [2m10 months ago[0m [2mAdd file 3[0m⚪ [2mShowing 3 worktrees, 1 with changes, 2 ahead[0mdiff --git a/tests/snapshots/integration__integration_tests__list__status_column_padding_emoji.snap b/tests/snapshots/integration__integration_tests__list__status_column_padding_emoji.snapindex b3ff371e8..57ac3da68 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@@ -15,7 +15,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpcjkyAw/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpb8va56/test-config.toml---success: trueexit_code: 0@@ -24,8 +24,8 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m[1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-main-symbol ↑ 💬 [32m↑1[0m ./main-symbol [2m579fcd0b[0m [2m10 months ago[0m [2mSymbol commit[0m-pr-link ↑ 🤖 [32m↑1[0m ./pr-link [2me17e7d2d[0m [2m10 months ago[0m [2mPR commit[0m-wli-sequence [36m?![0m ↑ 🤖 [32m+1[0m [31m-112[0m [32m↑1[0m ./wli-sequence [2ma2483ffd[0m [2m10 months ago[0m [2mInitial content[0m+main-symbol ↑ 💬 [32m↑1[0m ./main-symbol [2m579fcd0b[0m [2m10 months ago[0m [2mSymbol commit[0m+pr-link ↑ 🤖 [32m↑1[0m ./pr-link [2me17e7d2d[0m [2m10 months ago[0m [2mPR commit[0m+wli-sequence [36m?![0m ↑ 🤖 [32m+1[0m [31m-112[0m [32m↑1[0m ./wli-sequence [2ma2483ffd[0m [2m10 months ago[0m [2mInitial content[0m⚪ [2mShowing 4 worktrees, 1 with changes, 3 ahead[0mdiff --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.snapindex 5931fcaba..3852bd2db 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@@ -17,7 +17,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpUw4Gfu/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpqSD520/test-config.toml---success: trueexit_code: 0@@ -26,7 +26,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mmain…±[0m [1mPath[0m [1mRemote⇅[0m [1mCI[0m [1mCommit[0m [1mAge[0m [1mMessage[0m[1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-a[0m [36m?[0m [2m≡[0m [2m./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-feature-b ↑ [32m↑1[0m [32m+1[0m [31m-1[0m ./feature-b [2m2d37ca75[0m [2m10 months ago[0m [2mTest commit[0m+[2mfeature-a[0m [36m?[0m [2m≡[0m [2m./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+feature-b ↑ [32m↑1[0m [32m+1[0m [31m-1[0m ./feature-b [2m2d37ca75[0m [2m10 months ago[0m [2mTest commit[0m⚪ [2mShowing 3 worktrees, 1 ahead[0mdiff --git a/tests/snapshots/integration__integration_tests__list__task_dag_many_worktrees.snap b/tests/snapshots/integration__integration_tests__list__task_dag_many_worktrees.snapindex 7f33fa5a8..c751adb30 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@@ -16,7 +16,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpRpBog2/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpN9oSzM/test-config.toml---success: trueexit_code: 0@@ -25,15 +25,15 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m[1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-1[0m [2m≡[0m [2m./feature-1[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-10[0m [2m≡[0m [2m./feature-10[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-2[0m [2m≡[0m [2m./feature-2[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-3[0m [2m≡[0m [2m./feature-3[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-4[0m [2m≡[0m [2m./feature-4[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-5[0m [2m≡[0m [2m./feature-5[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-6[0m [2m≡[0m [2m./feature-6[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-7[0m [2m≡[0m [2m./feature-7[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-8[0m [2m≡[0m [2m./feature-8[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-9[0m [2m≡[0m [2m./feature-9[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature-1[0m [2m≡[0m [2m./feature-1[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature-10[0m [2m≡[0m [2m./feature-10[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature-2[0m [2m≡[0m [2m./feature-2[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature-3[0m [2m≡[0m [2m./feature-3[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature-4[0m [2m≡[0m [2m./feature-4[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature-5[0m [2m≡[0m [2m./feature-5[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature-6[0m [2m≡[0m [2m./feature-6[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature-7[0m [2m≡[0m [2m./feature-7[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature-8[0m [2m≡[0m [2m./feature-8[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature-9[0m [2m≡[0m [2m./feature-9[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 11 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__task_dag_multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__list__task_dag_multiple_worktrees.snapindex aae0a3f6a..531bc0177 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@@ -16,7 +16,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpO098of/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpouKNbj/test-config.toml---success: trueexit_code: 0@@ -25,8 +25,8 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m[1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-a[0m [2m≡[0m [2m./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-b[0m [2m≡[0m [2m./feature-b[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-c[0m [2m≡[0m [2m./feature-c[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature-a[0m [2m≡[0m [2m./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature-b[0m [2m≡[0m [2m./feature-b[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature-c[0m [2m≡[0m [2m./feature-c[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 4 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__task_dag_ordering_stability.snap b/tests/snapshots/integration__integration_tests__list__task_dag_ordering_stability.snapindex c3495ad79..0652003c1 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@@ -16,7 +16,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp9UJhm0/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpu19sav/test-config.toml---success: trueexit_code: 0@@ -25,9 +25,9 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m[36mmain[0m [36m./test-repo[0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0m-[1m[35mfeature-current[0m ↑ [32m↑1[0m [1m[35m./feature-current[0m [2mfc28a4d1[0m [2m9 months ago[0m [2mCommit at 01:00[0m-feature-newest ↑ [32m↑1[0m ./feature-newest [2m136358eb[0m [2m9 months ago[0m [2mCommit at 03:00[0m-feature-middle ↑ [32m↑1[0m ./feature-middle [2ma0a4851a[0m [2m9 months ago[0m [2mCommit at 02:00[0m-feature-oldest ↑ [32m↑1[0m ./feature-oldest [2m1b1a2d78[0m [2m9 months ago[0m [2mCommit at 00:30[0m+[1m[35mfeature-current[0m ↑ [32m↑1[0m [1m[35m./feature-current[0m [2mfc28a4d1[0m [2m9 months ago[0m [2mCommit at 01:00[0m+feature-newest ↑ [32m↑1[0m ./feature-newest [2m136358eb[0m [2m9 months ago[0m [2mCommit at 03:00[0m+feature-middle ↑ [32m↑1[0m ./feature-middle [2ma0a4851a[0m [2m9 months ago[0m [2mCommit at 02:00[0m+feature-oldest ↑ [32m↑1[0m ./feature-oldest [2m1b1a2d78[0m [2m9 months ago[0m [2mCommit at 00:30[0m⚪ [2mShowing 5 worktrees, 4 ahead[0mdiff --git a/tests/snapshots/integration__integration_tests__list__task_dag_with_locked.snap b/tests/snapshots/integration__integration_tests__list__task_dag_with_locked.snapindex cfbf2c906..f73b44bfe 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@@ -16,7 +16,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpTOeXJS/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0M0Loq/test-config.toml---success: trueexit_code: 0@@ -25,7 +25,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m[1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mlocked[0m [2m≡[0m [33m⊠[0m [2m./locked[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mnormal[0m [2m≡[0m [2m./normal[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mlocked[0m [2m≡[0m [33m⊠[0m [2m./locked[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mnormal[0m [2m≡[0m [2m./normal[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 3 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap b/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snapindex 149c53572..8248004ec 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@@ -17,7 +17,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpV6T48S/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpfQLfw5/test-config.toml---success: trueexit_code: 0@@ -26,7 +26,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mmain…±[0m [1mPath[0m [1mRemote⇅[0m [1mCI[0m [1mCommit[0m [1mAge[0m [1mMessage[0m[1m[35mmain[0m [1m[35m./test-repo[0m [32m↑0[0m [2m[31m↓0[0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0m-ahead ↑⇡ [32m↑1[0m [32m+1[0m ./ahead [32m↑1[0m [2m[31m↓0[0m [2m2fff52c2[0m [2m10 months ago[0m [2mAhead commit[0m-[2min-sync[0m [2m≡[0m [2m./in-sync[0m [32m↑0[0m [2m[31m↓0[0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0m+ahead ↑⇡ [32m↑1[0m [32m+1[0m ./ahead [32m↑1[0m [2m[31m↓0[0m [2m2fff52c2[0m [2m10 months ago[0m [2mAhead commit[0m+[2min-sync[0m [2m≡[0m [2m./in-sync[0m [32m↑0[0m [2m[31m↓0[0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0m⚪ [2mShowing 3 worktrees, 1 ahead[0mdiff --git a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snapindex 732580397..d7e5ad4d5 100644--- a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap+++ b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap@@ -15,7 +15,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpnGHV6t/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpjeVWna/test-config.toml---success: trueexit_code: 0@@ -24,6 +24,6 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m[1m[35mmain[0m [1m[35m./test-repo[0m [2me4614cb7[0m [2m10 months ago[0m [2mFix bug with café ☕ handling[0m-[2mfeature-test[0m [2m∅[0m ↓ [2m[31m↓1[0m [2m./feature-test[0m [2m0c53695b[0m [2m10 months ago[0m [2mAdd support for 日本語 and émoji 🎉[0m+[2mfeature-test[0m [2m∅[0m ↓ [2m[31m↓1[0m [2m./feature-test[0m [2m0c53695b[0m [2m10 months ago[0m [2mAdd support for 日本語 and émoji 🎉[0m⚪ [2mShowing 2 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__user_status_special_chars.snap b/tests/snapshots/integration__integration_tests__list__user_status_special_chars.snapindex f8a2772bf..eaf56c3ab 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@@ -15,7 +15,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmppdXNaP/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpF2UQYP/test-config.toml---success: trueexit_code: 0@@ -24,7 +24,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m[1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2memoji[0m [2m≡[0m 🔄 [2m./emoji[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mmulti[0m [2m≡[0m 👨💻 [2m./multi[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2memoji[0m [2m≡[0m 🔄 [2m./emoji[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mmulti[0m [2m≡[0m 👨💻 [2m./multi[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 3 worktrees[0mdiff --git a/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap b/tests/snapshots/integration__integration_tests__list__with_branches_flag.snapindex cf11e28fa..ea709e2fe 100644--- a/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap+++ b/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap@@ -16,7 +16,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmppIf8Tj/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpKOx3bh/test-config.toml---success: trueexit_code: 0@@ -25,9 +25,9 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m[1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-with-worktree[0m [2m≡[0m [2m./feature-with-worktree[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2manother-branch[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-without-worktree[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfix-bug[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature-with-worktree[0m [2m≡[0m [2m./feature-with-worktree[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2manother-branch[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature-without-worktree[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfix-bug[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 2 worktrees, 3 branches[0mdiff --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.snapindex bb182027b..fd038b4d7 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@@ -16,7 +16,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpYDiBBO/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmph6NuBW/test-config.toml---success: trueexit_code: 0@@ -25,7 +25,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m[1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-a[0m [2m≡[0m [2m./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-b[0m [2m≡[0m [2m./feature-b[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature-a[0m [2m≡[0m [2m./feature-a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature-b[0m [2m≡[0m [2m./feature-b[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 3 worktrees[0mdiff --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.snapindex 904827629..0635ee7e0 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@@ -16,7 +16,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmplnzpws/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpVMSTK9/test-config.toml---success: trueexit_code: 0@@ -25,8 +25,8 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m[1m[35mmain[0m [1m[35m.[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mbranch-alpha[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mbranch-beta[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mbranch-gamma[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mbranch-alpha[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mbranch-beta[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mbranch-gamma[0m [2m∅[0m [2m⎇[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 1 worktrees, 3 branches[0mdiff --git a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snapindex 404eb79a6..bbc00ee23 100644--- a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap+++ b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap@@ -16,9 +16,9 @@ info:GIT_EDITOR: ""LANG: CLC_ALL: C- PATH: "/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpaaM9so/mock-bin:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"+ PATH: "/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpwVmPMD/mock-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/.tmpaaM9so/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpwVmPMD/test-config.toml---success: trueexit_code: 0@@ -27,10 +27,10 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mmain…±[0m [1mPath[0m [1mRemote⇅[0m [1mCI[0m [1mCommit[0m [1mAge[0m [1mMessage[0m[1m[35mmain[0m [1m[35m./test-repo[0m [32m↑0[0m [2m[31m↓0[0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0m-ahead ↑⇡ [32m↑2[0m [32m+2[0m ./ahead [32m↑2[0m [2m[31m↓0[0m [2m8d8f4673[0m [2m10 months ago[0m [2mAhead commit 2[0m-[2mbehind[0m [2m≡[0m ⇣ [2m./behind[0m [32m↑0[0m [2m[31m↓1[0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0m-diverged ↑⇅ [32m↑1[0m [32m+1[0m ./diverged [32m↑1[0m [2m[31m↓1[0m [2mca7cb696[0m [2m10 months ago[0m [2mDiverged local commit[0m-[2min-sync[0m [2m≡[0m [2m./in-sync[0m [32m↑0[0m [2m[31m↓0[0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0m-[2mno-upstream[0m [2m≡[0m [2m./no-upstream[0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0m+ahead ↑⇡ [32m↑2[0m [32m+2[0m ./ahead [32m↑2[0m [2m[31m↓0[0m [2m8d8f4673[0m [2m10 months ago[0m [2mAhead commit 2[0m+[2mbehind[0m [2m≡[0m ⇣ [2m./behind[0m [32m↑0[0m [2m[31m↓1[0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0m+diverged ↑⇅ [32m↑1[0m [32m+1[0m ./diverged [32m↑1[0m [2m[31m↓1[0m [2mca7cb696[0m [2m10 months ago[0m [2mDiverged local commit[0m+[2min-sync[0m [2m≡[0m [2m./in-sync[0m [32m↑0[0m [2m[31m↓0[0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0m+[2mno-upstream[0m [2m≡[0m [2m./no-upstream[0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0m⚪ [2mShowing 6 worktrees, 2 ahead[0mdiff --git a/tests/snapshots/integration__integration_tests__list__with_user_status.snap b/tests/snapshots/integration__integration_tests__list__with_user_status.snapindex 6d0c64291..3916b1e2e 100644--- a/tests/snapshots/integration__integration_tests__list__with_user_status.snap+++ b/tests/snapshots/integration__integration_tests__list__with_user_status.snap@@ -15,7 +15,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpYhKkNW/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpnByLU2/test-config.toml---success: trueexit_code: 0@@ -24,9 +24,9 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m[1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mclean-no-status[0m [2m≡[0m [2m./clean-no-status[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mclean-with-status[0m [2m≡[0m 💬 [2m./clean-with-status[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mclean-no-status[0m [2m≡[0m [2m./clean-no-status[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mclean-with-status[0m [2m≡[0m 💬 [2m./clean-with-status[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0mdirty-no-status [36m![0m [32m+1[0m [31m-1[0m ./dirty-no-status [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mdirty-with-status[0m [36m?[0m [2m≡[0m 🤖 [2m./dirty-with-status[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mdirty-with-status[0m [36m?[0m [2m≡[0m 🤖 [2m./dirty-with-status[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 5 worktrees, 1 with changes[0mdiff --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.snapindex cf6a82f20..1df5766f6 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@@ -15,7 +15,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpLWwjBd/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpVgHmav/test-config.toml---success: trueexit_code: 0@@ -24,6 +24,6 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m[1m[35mmain[0m [1m[35m./test-repo[0m [SHA] [2m10 months ago[0m [2mFix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4[0m-[2mfeature[0m [2m≡[0m [2m./feature[0m [SHA] [2m10 months ago[0m [2mFix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4[0m+[2mfeature[0m [2m≡[0m [2m./feature[0m [SHA] [2m10 months ago[0m [2mFix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4[0m⚪ [2mShowing 2 worktrees[0mdiff --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.snapindex eac8f59b1..1431755d5 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@@ -15,7 +15,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp30A0KE/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmprjYnZC/test-config.toml---success: trueexit_code: 0@@ -24,8 +24,8 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m[1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2malso-no-changes[0m [2m≡[0m [2m./also-no-changes[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mno-changes[0m [2m≡[0m [2m./no-changes[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2malso-no-changes[0m [2m≡[0m [2m./also-no-changes[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mno-changes[0m [2m≡[0m [2m./no-changes[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0mwith-changes [36m![0m [32m+1[0m [31m-1[0m ./with-changes [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 4 worktrees, 1 with changes[0mdiff --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.snapindex e0839dd78..24a482259 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@@ -15,7 +15,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpRW0dW3/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpQ0lNEB/test-config.toml---success: trueexit_code: 0@@ -24,7 +24,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m[1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mhuge[0m [36m?[0m [2m≡[0m [2m./huge[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mhuge[0m [36m?[0m [2m≡[0m [2m./huge[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0mtiny [36m![0m [32m+1[0m [31m-1[0m ./tiny [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 3 worktrees, 1 with changes[0mdiff --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.snapindex 94beb2ba7..34bfce481 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@@ -15,7 +15,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpXXqnnR/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmptTwLx3/test-config.toml---success: trueexit_code: 0@@ -24,8 +24,8 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m[1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-large[0m [36m?[0m [2m≡[0m [2m./feature-large[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-medium[0m [36m?[0m [2m≡[0m [2m./feature-medium[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-small[0m [36m?[0m [2m≡[0m [2m./feature-small[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature-large[0m [36m?[0m [2m≡[0m [2m./feature-large[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature-medium[0m [36m?[0m [2m≡[0m [2m./feature-medium[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature-small[0m [36m?[0m [2m≡[0m [2m./feature-small[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 4 worktrees[0mdiff --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.snapindex 9edfcde95..1f88bd9e0 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@@ -15,7 +15,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpl89LNk/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpvNnqEB/test-config.toml---success: trueexit_code: 0@@ -24,8 +24,8 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m[1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m-[2manother-extremely-long-name-here[0m [2m≡[0m [2m./another-extremely-long-name-here[0m [2mb834638e[0m [2m10 months ago[0m-[2mshort[0m [2m≡[0m [2m./short[0m [2mb834638e[0m [2m10 months ago[0m-[2mvery-long-feature-branch-name[0m [2m≡[0m [2m./very-long-feature-branch-name[0m [2mb834638e[0m [2m10 months ago[0m+[2manother-extremely-long-name-here[0m [2m≡[0m [2m./another-extremely-long-name-here[0m [2mb834638e[0m [2m10 months ago[0m+[2mshort[0m [2m≡[0m [2m./short[0m [2mb834638e[0m [2m10 months ago[0m+[2mvery-long-feature-branch-name[0m [2m≡[0m [2m./very-long-feature-branch-name[0m [2mb834638e[0m [2m10 months ago[0m⚪ [2mShowing 4 worktrees, 1 column hidden[0mdiff --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.snapindex a06e41d03..8a8690080 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@@ -15,7 +15,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpmBj2He/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpkyLFtT/test-config.toml---success: trueexit_code: 0@@ -24,8 +24,8 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m[1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m-[2mlong[0m [2m≡[0m [2m./extremely-long-branch-name-that-might-cause-layout-issues[0m [2mb834638e[0m [2m10 months ago[0m-[2mmedium[0m [2m≡[0m [2m./medium-length-name[0m [2mb834638e[0m [2m10 months ago[0m-[2mx[0m [2m≡[0m [2m./x[0m [2mb834638e[0m [2m10 months ago[0m+[2mlong[0m [2m≡[0m [2m./extremely-long-branch-name-that-might-cause-layout-issues[0m [2mb834638e[0m [2m10 months ago[0m+[2mmedium[0m [2m≡[0m [2m./medium-length-name[0m [2mb834638e[0m [2m10 months ago[0m+[2mx[0m [2m≡[0m [2m./x[0m [2mb834638e[0m [2m10 months ago[0m⚪ [2mShowing 4 worktrees, 1 column hidden[0mdiff --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.snapindex 2ae1deac1..8e34a9e0b 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@@ -15,7 +15,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmptLlznB/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpUxBech/test-config.toml---success: trueexit_code: 0@@ -24,8 +24,8 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m[1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2ma[0m [2m≡[0m [2m./a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mbb[0m [2m≡[0m [2m./bb[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mccc[0m [2m≡[0m [2m./ccc[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2ma[0m [2m≡[0m [2m./a[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mbb[0m [2m≡[0m [2m./bb[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mccc[0m [2m≡[0m [2m./ccc[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 4 worktrees[0mdiff --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.snapindex 1ba637154..a78c8315d 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@@ -15,7 +15,7 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpsrCvCW/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpXu9wKC/test-config.toml---success: trueexit_code: 0@@ -24,8 +24,8 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m[1m[35mmain[0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mcafe[0m [2m≡[0m [2m./café[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mnaive[0m [2m≡[0m [2m./naïve[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mresume[0m [2m≡[0m [2m./résumé[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mcafe[0m [2m≡[0m [2m./café[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mnaive[0m [2m≡[0m [2m./naïve[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mresume[0m [2m≡[0m [2m./résumé[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m⚪ [2mShowing 4 worktrees[0m