Skip to content

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.md
index 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.md
index 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.md
index 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.rs
index 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.rs
index 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 indicator
diff --git a/src/commands/list/model.rs b/src/commands/list/model.rs
index 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 alignment
pub 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 empty
pub 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.snap
index 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: C
NO_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: true
exit_code: 0
@@ -23,6 +23,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
feature ./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 worktrees
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 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
@@ -25,6 +25,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
main . b834638e 10 months ago Initial commit
-branch-only ∅ ⎇ b834638e 10 months ago Initial commit
+branch-only ∅ ⎇ b834638e 10 months ago Initial commit
⚪ Showing 1 worktrees, 1 branches
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 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/null
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_EDITOR: ""
LANG: C
LC_ALL: C
SOURCE_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: true
exit_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.snap
index 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/null
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_EDITOR: ""
LANG: C
LC_ALL: C
SOURCE_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: true
exit_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.snap
index 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/null
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_EDITOR: ""
LANG: C
LC_ALL: C
SOURCE_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: true
exit_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.snap
index 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
@@ -24,8 +24,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
main ./test-repo b834638e 10 months ago Initial commit
-diverged ! ↑ 💬 +40 -60 ↑1 ./diverged 8ba5aa92 10 months ago Diverged commit
-feature-changes ?! ↑ 🤖 +50 -100 ↑1 ./feature-changes b854b166 10 months ago Add 100 lines
-fix ? ≡ 💬 ./fix b834638e 10 months ago Initial commit
+diverged ! ↑ 💬 +40 -60 ↑1 ./diverged 8ba5aa92 10 months ago Diverged commit
+feature-changes ?! ↑ 🤖 +50 -100 ↑1 ./feature-changes b854b166 10 months ago Add 100 lines
+fix ? ≡ 💬 ./fix b834638e 10 months ago 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 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
@@ -24,9 +24,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
main ./test-repo 6c3da842 10 months ago Initial commit on main
-feature-current ↑ ↑1 ./feature-current fc28a4d1 9 months ago Commit at 01:00
-feature-newest ↑ ↑1 ./feature-newest 136358eb 9 months ago Commit at 03:00
-feature-middle ↑ ↑1 ./feature-middle a0a4851a 9 months ago Commit at 02:00
-feature-oldest ↑ ↑1 ./feature-oldest 1b1a2d78 9 months ago Commit at 00:30
+feature-current ↑ ↑1 ./feature-current fc28a4d1 9 months ago Commit at 01:00
+feature-newest ↑ ↑1 ./feature-newest 136358eb 9 months ago Commit at 03:00
+feature-middle ↑ ↑1 ./feature-middle a0a4851a 9 months ago Commit at 02:00
+feature-oldest ↑ ↑1 ./feature-oldest 1b1a2d78 9 months ago 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 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
@@ -24,7 +24,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
develop ./test-repo b834638e 10 months ago Initial commit
-feature-a ≡ ./feature-a b834638e 10 months ago Initial commit
-feature-b ≡ ./feature-b b834638e 10 months ago Initial commit
+feature-a ≡ ./feature-a b834638e 10 months ago Initial commit
+feature-b ≡ ./feature-b b834638e 10 months ago 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 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: wt
args:
- "-C"
- - /private/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp4g1SVX/test-repo
+ - /private/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpURVuoh/test-repo
- list
env:
CLICOLOR_FORCE: "1"
@@ -18,7 +18,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
main ./test-repo b834638e 10 months ago Initial commit
-feature-a ≡ ./feature-a b834638e 10 months ago Initial commit
-feature-b ≡ ./feature-b b834638e 10 months ago Initial commit
+feature-a ≡ ./feature-a b834638e 10 months ago Initial commit
+feature-b ≡ ./feature-b b834638e 10 months ago 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 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
@@ -24,6 +24,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
main ./test-repo b834638e 10 months ago Initial commit
-locked-no-reason ≡ ⊠ ./locked-no-reason b834638e 10 months ago Initial commit
+locked-no-reason ≡ ⊠ ./locked-no-reason b834638e 10 months ago 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 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
@@ -24,6 +24,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
main ./test-repo b834638e 10 months ago Initial commit
-locked-feature ≡ ⊠ ./locked-feature b834638e 10 months ago Initial commit
+locked-feature ≡ ⊠ ./locked-feature b834638e 10 months ago 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 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
@@ -24,6 +24,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
main ./test-repo 1310bfb9 10 months ago Short message
-feature-a ∅ ↓ ↓1 ./feature-a f078644e 10 months ago This is a very long commit message that should…
+feature-a ∅ ↓ ↓1 ./feature-a f078644e 10 months ago This is a very long commit message that should…
⚪ 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 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
@@ -24,9 +24,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age
main ./test-repo b834638e 10 months ago
-medium-name ≡ ./medium-name b834638e 10 months ago
-short ≡ ./short b834638e 10 months ago
-very-long-branch-name-here ≡ ./very-long-branch-name-here b834638e 10 months ago
-with-changes ≡ ./with-changes b834638e 10 months ago
+medium-name ≡ ./medium-name b834638e 10 months ago
+short ≡ ./short b834638e 10 months ago
+very-long-branch-name-here ≡ ./very-long-branch-name-here b834638e 10 months ago
+with-changes ≡ ./with-changes b834638e 10 months ago
⚪ Showing 5 worktrees, 1 column hidden
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 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
@@ -24,6 +24,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
main ./test-repo 85ed6d3d 10 months ago Main advances
-feature ?!+»✘= ⊠ ↕⇅🤖 +2 -2 ↑2 ↓1 +3 -1 ./feature ↑2 ↓1 21dc61ca 10 months ago Local only commit
+feature ?!+»✘= ↕⇅⊠ 🤖 +2 -2 ↑2 ↓1 +3 -1 ./feature ↑2 ↓1 21dc61ca 10 months ago Local only 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 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
@@ -25,6 +25,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
main ./test-repo b7c14ce1 10 months ago Main conflicting changes
-feature ?!+ ↻⊠ 🤖 +7 ./feature b7c14ce1 10 months ago Main conflicting changes
+feature ?!+ ↻ ⊠ 🤖 +7 ./feature b7c14ce1 10 months ago 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 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
@@ -24,6 +24,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
main ./test-repo b834638e 10 months ago Initial commit
-feature ?!+»✘ ↑ +2 -3 ↑1 ./feature 689c2504 10 months ago Add files
+feature ?!+»✘ ↑ +2 -3 ↑1 ./feature 689c2504 10 months ago 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 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
@@ -24,7 +24,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
main ./test-repo b834638e 10 months ago Initial commit
-feature-a ≡ ./feature-a b834638e 10 months ago Initial commit
-feature-b ≡ ./feature-b b834638e 10 months ago Initial commit
+feature-a ≡ ./feature-a b834638e 10 months ago Initial commit
+feature-b ≡ ./feature-b b834638e 10 months ago 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 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
@@ -25,6 +25,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
main ./test-repo b834638e 10 months ago Initial commit
-feature ≡ ./feature b834638e 10 months ago Initial commit
+feature ≡ ./feature b834638e 10 months ago 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 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
@@ -25,7 +25,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
main ./test-repo b834638e 10 months ago Initial commit
-feature-a ≡ ./feature-a b834638e 10 months ago Initial commit
-feature-b ≡ ./feature-b b834638e 10 months ago Initial commit
+feature-a ≡ ./feature-a b834638e 10 months ago Initial commit
+feature-b ≡ ./feature-b b834638e 10 months ago 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 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
@@ -26,8 +26,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
main ./test-repo b834638e 10 months ago Initial commit
-feature-a ≡ ./feature-a b834638e 10 months ago Initial commit
-orphan-1 ∅ ⎇ b834638e 10 months ago Initial commit
-orphan-2 ∅ ⎇ b834638e 10 months ago Initial commit
+feature-a ≡ ./feature-a b834638e 10 months ago Initial commit
+orphan-1 ∅ ⎇ b834638e 10 months ago Initial commit
+orphan-2 ∅ ⎇ b834638e 10 months ago 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 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
@@ -24,7 +24,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
main ./test-repo ↑0 ↓0 b834638e 10 months ago Initial commit
-bugfix-y ↑ ↑1 ./bugfix-y 412a27c8 10 months ago Fix bug
-feature-x + ↑ +5 ↑3 ./feature-x 7fd821aa 10 months ago Add file 3
+bugfix-y ↑ ↑1 ./bugfix-y 412a27c8 10 months ago Fix bug
+feature-x + ↑ +5 ↑3 ./feature-x 7fd821aa 10 months ago Add file 3
⚪ Showing 3 worktrees, 1 with changes, 2 ahead
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 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
@@ -24,8 +24,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
main ./test-repo b834638e 10 months ago Initial commit
-main-symbol ↑ 💬 ↑1 ./main-symbol 579fcd0b 10 months ago Symbol commit
-pr-link ↑ 🤖 ↑1 ./pr-link e17e7d2d 10 months ago PR commit
-wli-sequence ?! ↑ 🤖 +1 -112 ↑1 ./wli-sequence a2483ffd 10 months ago Initial content
+main-symbol ↑ 💬 ↑1 ./main-symbol 579fcd0b 10 months ago Symbol commit
+pr-link ↑ 🤖 ↑1 ./pr-link e17e7d2d 10 months ago PR commit
+wli-sequence ?! ↑ 🤖 +1 -112 ↑1 ./wli-sequence a2483ffd 10 months ago Initial content
⚪ Showing 4 worktrees, 1 with changes, 3 ahead
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 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
@@ -26,7 +26,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
main ./test-repo b834638e 10 months ago Initial commit
-feature-a ? ≡ ./feature-a b834638e 10 months ago Initial commit
-feature-b ↑ ↑1 +1 -1 ./feature-b 2d37ca75 10 months ago Test commit
+feature-a ? ≡ ./feature-a b834638e 10 months ago Initial commit
+feature-b ↑ ↑1 +1 -1 ./feature-b 2d37ca75 10 months ago 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 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
@@ -25,15 +25,15 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
main ./test-repo b834638e 10 months ago Initial commit
-feature-1 ≡ ./feature-1 b834638e 10 months ago Initial commit
-feature-10 ≡ ./feature-10 b834638e 10 months ago Initial commit
-feature-2 ≡ ./feature-2 b834638e 10 months ago Initial commit
-feature-3 ≡ ./feature-3 b834638e 10 months ago Initial commit
-feature-4 ≡ ./feature-4 b834638e 10 months ago Initial commit
-feature-5 ≡ ./feature-5 b834638e 10 months ago Initial commit
-feature-6 ≡ ./feature-6 b834638e 10 months ago Initial commit
-feature-7 ≡ ./feature-7 b834638e 10 months ago Initial commit
-feature-8 ≡ ./feature-8 b834638e 10 months ago Initial commit
-feature-9 ≡ ./feature-9 b834638e 10 months ago Initial commit
+feature-1 ≡ ./feature-1 b834638e 10 months ago Initial commit
+feature-10 ≡ ./feature-10 b834638e 10 months ago Initial commit
+feature-2 ≡ ./feature-2 b834638e 10 months ago Initial commit
+feature-3 ≡ ./feature-3 b834638e 10 months ago Initial commit
+feature-4 ≡ ./feature-4 b834638e 10 months ago Initial commit
+feature-5 ≡ ./feature-5 b834638e 10 months ago Initial commit
+feature-6 ≡ ./feature-6 b834638e 10 months ago Initial commit
+feature-7 ≡ ./feature-7 b834638e 10 months ago Initial commit
+feature-8 ≡ ./feature-8 b834638e 10 months ago Initial commit
+feature-9 ≡ ./feature-9 b834638e 10 months ago 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 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
@@ -25,8 +25,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
main ./test-repo b834638e 10 months ago Initial commit
-feature-a ≡ ./feature-a b834638e 10 months ago Initial commit
-feature-b ≡ ./feature-b b834638e 10 months ago Initial commit
-feature-c ≡ ./feature-c b834638e 10 months ago Initial commit
+feature-a ≡ ./feature-a b834638e 10 months ago Initial commit
+feature-b ≡ ./feature-b b834638e 10 months ago Initial commit
+feature-c ≡ ./feature-c b834638e 10 months ago 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 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
@@ -25,9 +25,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
main ./test-repo 6c3da842 10 months ago Initial commit on main
-feature-current ↑ ↑1 ./feature-current fc28a4d1 9 months ago Commit at 01:00
-feature-newest ↑ ↑1 ./feature-newest 136358eb 9 months ago Commit at 03:00
-feature-middle ↑ ↑1 ./feature-middle a0a4851a 9 months ago Commit at 02:00
-feature-oldest ↑ ↑1 ./feature-oldest 1b1a2d78 9 months ago Commit at 00:30
+feature-current ↑ ↑1 ./feature-current fc28a4d1 9 months ago Commit at 01:00
+feature-newest ↑ ↑1 ./feature-newest 136358eb 9 months ago Commit at 03:00
+feature-middle ↑ ↑1 ./feature-middle a0a4851a 9 months ago Commit at 02:00
+feature-oldest ↑ ↑1 ./feature-oldest 1b1a2d78 9 months ago Commit at 00:30
⚪ Showing 5 worktrees, 4 ahead
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 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
@@ -25,7 +25,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
main ./test-repo b834638e 10 months ago Initial commit
-locked ≡ ⊠ ./locked b834638e 10 months ago Initial commit
-normal ≡ ./normal b834638e 10 months ago Initial commit
+locked ≡ ⊠ ./locked b834638e 10 months ago Initial commit
+normal ≡ ./normal b834638e 10 months ago 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 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
@@ -26,7 +26,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
main ./test-repo ↑0 ↓0 6c3da842 10 months ago Initial commit on main
-ahead ↑⇡ ↑1 +1 ./ahead ↑1 ↓0 2fff52c2 10 months ago Ahead commit
-in-sync ≡ ./in-sync ↑0 ↓0 6c3da842 10 months ago Initial commit on main
+ahead ↑⇡ ↑1 +1 ./ahead ↑1 ↓0 2fff52c2 10 months ago Ahead commit
+in-sync ≡ ./in-sync ↑0 ↓0 6c3da842 10 months ago 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 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
@@ -24,6 +24,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
main ./test-repo e4614cb7 10 months ago Fix bug with café ☕ handling
-feature-test ∅ ↓ ↓1 ./feature-test 0c53695b 10 months ago Add support for 日本語 and émoji 🎉
+feature-test ∅ ↓ ↓1 ./feature-test 0c53695b 10 months ago 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 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
@@ -24,7 +24,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
main ./test-repo b834638e 10 months ago Initial commit
-emoji ≡ 🔄 ./emoji b834638e 10 months ago Initial commit
-multi ≡ 👨‍💻 ./multi b834638e 10 months ago Initial commit
+emoji ≡ 🔄 ./emoji b834638e 10 months ago Initial commit
+multi ≡ 👨‍💻 ./multi b834638e 10 months ago 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 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
@@ -25,9 +25,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
main ./test-repo b834638e 10 months ago Initial commit
-feature-with-worktree ≡ ./feature-with-worktree b834638e 10 months ago Initial commit
-another-branch ∅ ⎇ b834638e 10 months ago Initial commit
-feature-without-worktree ∅ ⎇ b834638e 10 months ago Initial commit
-fix-bug ∅ ⎇ b834638e 10 months ago Initial commit
+feature-with-worktree ≡ ./feature-with-worktree b834638e 10 months ago Initial commit
+another-branch ∅ ⎇ b834638e 10 months ago Initial commit
+feature-without-worktree ∅ ⎇ b834638e 10 months ago Initial commit
+fix-bug ∅ ⎇ b834638e 10 months ago 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 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
@@ -25,7 +25,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
main ./test-repo b834638e 10 months ago Initial commit
-feature-a ≡ ./feature-a b834638e 10 months ago Initial commit
-feature-b ≡ ./feature-b b834638e 10 months ago Initial commit
+feature-a ≡ ./feature-a b834638e 10 months ago Initial commit
+feature-b ≡ ./feature-b b834638e 10 months ago 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 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
@@ -25,8 +25,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
main . b834638e 10 months ago Initial commit
-branch-alpha ∅ ⎇ b834638e 10 months ago Initial commit
-branch-beta ∅ ⎇ b834638e 10 months ago Initial commit
-branch-gamma ∅ ⎇ b834638e 10 months ago Initial commit
+branch-alpha ∅ ⎇ b834638e 10 months ago Initial commit
+branch-beta ∅ ⎇ b834638e 10 months ago Initial commit
+branch-gamma ∅ ⎇ b834638e 10 months ago Initial commit
⚪ Showing 1 worktrees, 3 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 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: C
LC_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: true
exit_code: 0
@@ -27,10 +27,10 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
main ./test-repo ↑0 ↓0 6c3da842 10 months ago Initial commit on main
-ahead ↑⇡ ↑2 +2 ./ahead ↑2 ↓0 8d8f4673 10 months ago Ahead commit 2
-behind ≡ ⇣ ./behind ↑0 ↓1 6c3da842 10 months ago Initial commit on main
-diverged ↑⇅ ↑1 +1 ./diverged ↑1 ↓1 ca7cb696 10 months ago Diverged local commit
-in-sync ≡ ./in-sync ↑0 ↓0 6c3da842 10 months ago Initial commit on main
-no-upstream ≡ ./no-upstream 6c3da842 10 months ago Initial commit on main
+ahead ↑⇡ ↑2 +2 ./ahead ↑2 ↓0 8d8f4673 10 months ago Ahead commit 2
+behind ≡ ⇣ ./behind ↑0 ↓1 6c3da842 10 months ago Initial commit on main
+diverged ↑⇅ ↑1 +1 ./diverged ↑1 ↓1 ca7cb696 10 months ago Diverged local commit
+in-sync ≡ ./in-sync ↑0 ↓0 6c3da842 10 months ago Initial commit on main
+no-upstream ≡ ./no-upstream 6c3da842 10 months ago 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 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
@@ -24,9 +24,9 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
main ./test-repo b834638e 10 months ago Initial commit
-clean-no-status ≡ ./clean-no-status b834638e 10 months ago Initial commit
-clean-with-status ≡ 💬 ./clean-with-status b834638e 10 months ago Initial commit
+clean-no-status ≡ ./clean-no-status b834638e 10 months ago Initial commit
+clean-with-status ≡ 💬 ./clean-with-status b834638e 10 months ago Initial commit
dirty-no-status ! +1 -1 ./dirty-no-status b834638e 10 months ago Initial commit
-dirty-with-status ? ≡ 🤖 ./dirty-with-status b834638e 10 months ago Initial commit
+dirty-with-status ? ≡ 🤖 ./dirty-with-status b834638e 10 months ago Initial commit
⚪ Showing 5 worktrees, 1 with changes
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 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
@@ -24,6 +24,6 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
main ./test-repo [SHA] 10 months ago Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
-feature ≡ ./feature [SHA] 10 months ago Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
+feature ≡ ./feature [SHA] 10 months ago Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
⚪ Showing 2 worktrees
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 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
@@ -24,8 +24,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
main ./test-repo b834638e 10 months ago Initial commit
-also-no-changes ≡ ./also-no-changes b834638e 10 months ago Initial commit
-no-changes ≡ ./no-changes b834638e 10 months ago Initial commit
+also-no-changes ≡ ./also-no-changes b834638e 10 months ago Initial commit
+no-changes ≡ ./no-changes b834638e 10 months ago Initial commit
with-changes ! +1 -1 ./with-changes b834638e 10 months ago 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 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
@@ -24,7 +24,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
main ./test-repo b834638e 10 months ago Initial commit
-huge ? ≡ ./huge b834638e 10 months ago Initial commit
+huge ? ≡ ./huge b834638e 10 months ago Initial commit
tiny ! +1 -1 ./tiny b834638e 10 months ago 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 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
@@ -24,8 +24,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
main ./test-repo b834638e 10 months ago Initial commit
-feature-large ? ≡ ./feature-large b834638e 10 months ago Initial commit
-feature-medium ? ≡ ./feature-medium b834638e 10 months ago Initial commit
-feature-small ? ≡ ./feature-small b834638e 10 months ago Initial commit
+feature-large ? ≡ ./feature-large b834638e 10 months ago Initial commit
+feature-medium ? ≡ ./feature-medium b834638e 10 months ago Initial commit
+feature-small ? ≡ ./feature-small b834638e 10 months ago 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 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
@@ -24,8 +24,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age
main ./test-repo b834638e 10 months ago
-another-extremely-long-name-here ≡ ./another-extremely-long-name-here b834638e 10 months ago
-short ≡ ./short b834638e 10 months ago
-very-long-feature-branch-name ≡ ./very-long-feature-branch-name b834638e 10 months ago
+another-extremely-long-name-here ≡ ./another-extremely-long-name-here b834638e 10 months ago
+short ≡ ./short b834638e 10 months ago
+very-long-feature-branch-name ≡ ./very-long-feature-branch-name b834638e 10 months ago
⚪ 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 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
@@ -24,8 +24,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age
main ./test-repo b834638e 10 months ago
-long ≡ ./extremely-long-branch-name-that-might-cause-layout-issues b834638e 10 months ago
-medium ≡ ./medium-length-name b834638e 10 months ago
-x ≡ ./x b834638e 10 months ago
+long ≡ ./extremely-long-branch-name-that-might-cause-layout-issues b834638e 10 months ago
+medium ≡ ./medium-length-name b834638e 10 months ago
+x ≡ ./x b834638e 10 months ago
⚪ 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 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
@@ -24,8 +24,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
main ./test-repo b834638e 10 months ago Initial commit
-a ≡ ./a b834638e 10 months ago Initial commit
-bb ≡ ./bb b834638e 10 months ago Initial commit
-ccc ≡ ./ccc b834638e 10 months ago Initial commit
+a ≡ ./a b834638e 10 months ago Initial commit
+bb ≡ ./bb b834638e 10 months ago Initial commit
+ccc ≡ ./ccc b834638e 10 months ago 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 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: C
LC_ALL: C
SOURCE_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: true
exit_code: 0
@@ -24,8 +24,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
main ./test-repo b834638e 10 months ago Initial commit
-cafe ≡ ./café b834638e 10 months ago Initial commit
-naive ≡ ./naïve b834638e 10 months ago Initial commit
-resume ≡ ./résumé b834638e 10 months ago Initial commit
+cafe ≡ ./café b834638e 10 months ago Initial commit
+naive ≡ ./naïve b834638e 10 months ago Initial commit
+resume ≡ ./résumé b834638e 10 months ago Initial commit
⚪ Showing 4 worktrees