Skip to content

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

refactor: Use type-safe enums for status symbols

Maximilian Roosf17f502718ab
diff --git a/src/commands/list/model.rs b/src/commands/list/model.rs
index c3bb610fb..11d166136 100644
--- a/src/commands/list/model.rs
+++ b/src/commands/list/model.rs
@@ -440,35 +440,112 @@ impl serde::Serialize for UpstreamDivergence {
}
}
+/// Branch state relative to main/primary branch
+///
+/// Represents whether the branch matches main or has no commits.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
+pub enum BranchState {
+ /// Normal branch state (neither matches main nor empty)
+ #[default]
+ None,
+ /// Working tree identical to main branch
+ MatchesMain,
+ /// No commits ahead and clean working tree (not matching main)
+ NoCommits,
+}
+
+impl std::fmt::Display for BranchState {
+ fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+ match self {
+ Self::None => Ok(()),
+ 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.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
+pub enum GitOperation {
+ /// No git operation in progress
+ #[default]
+ None,
+ /// Rebase in progress
+ Rebase,
+ /// Merge in progress
+ Merge,
+}
+
+impl std::fmt::Display for GitOperation {
+ fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+ match self {
+ Self::None => Ok(()),
+ Self::Rebase => write!(f, "↻"),
+ Self::Merge => write!(f, "⋈"),
+ }
+ }
+}
+
+impl serde::Serialize for GitOperation {
+ fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+ where
+ S: serde::Serializer,
+ {
+ serializer.serialize_str(&self.to_string())
+ }
+}
+
/// Structured status symbols for aligned rendering
///
/// Symbols are categorized to enable vertical alignment in table output:
-/// - Position 0: Prefix symbols (=, ≡, ∅, ↻, ⋈, ◇, ⊠, ⚠)
-/// - Position 1: Main branch divergence (↑, ↓, or ↕)
-/// - Position 2: Remote/upstream divergence (⇡, ⇣, or ⇅)
+/// - Position 0a: Conflicts (=)
+/// - Position 0b: Branch state (≡, ∅)
+/// - Position 0c: Git operation (↻, ⋈)
+/// - Position 0d: Worktree attributes (◇, ⊠, ⚠)
+/// - Position 1: Main branch divergence (↑, ↓, ↕)
+/// - Position 2: Remote/upstream divergence (⇡, ⇣, ⇅)
/// - Position 3+: Working tree symbols (?, !, +, », ✘)
///
/// ## Mutual Exclusivity
///
-/// Symbols within each position may or may not be mutually exclusive:
-///
/// **Mutually exclusive (enforced by type system):**
-/// - ↑ vs ↓ vs ↕: Main divergence states (MainDivergence enum)
-/// - ⇡ vs ⇣ vs ⇅: Upstream divergence states (UpstreamDivergence enum)
-///
-/// **Mutually exclusive (not yet type-enforced):**
-/// - ≡ vs ∅: Can't both match main AND have no commits
-/// - ↻ vs ⋈: Only one git operation at a time
+/// - ≡ vs ∅: Branch state (BranchState enum)
+/// - ↻ vs ⋈: Git operation (GitOperation enum)
+/// - ↑ vs ↓ vs ↕: Main divergence (MainDivergence enum)
+/// - ⇡ vs ⇣ vs ⇅: Upstream divergence (UpstreamDivergence enum)
///
/// **NOT mutually exclusive (can co-occur):**
-/// - = with ↻/⋈: Can have conflicts during rebase/merge
+/// - = can occur with any other symbol
/// - ◇, ⊠, ⚠: Worktree can be bare+locked, bare+prunable, etc.
/// - All working tree symbols (?!+»✘): Can have multiple types of changes
#[derive(Debug, Clone, Default, serde::Serialize)]
pub struct StatusSymbols {
- /// Blocking and state symbols: =, ≡, ∅, ↻, ⋈, ◇, ⊠, ⚠
- /// Position 0 - NOT mutually exclusive (can combine like "=↻")
- prefix: String,
+ /// Merge conflicts indicator
+ /// Position 0a - Boolean flag (= or empty)
+ has_conflicts: bool,
+
+ /// Branch state relative to main
+ /// Position 0b - MUTUALLY EXCLUSIVE (enforced by enum)
+ branch_state: BranchState,
+
+ /// Git operation in progress
+ /// Position 0c - MUTUALLY EXCLUSIVE (enforced by enum)
+ git_operation: GitOperation,
+
+ /// Worktree attributes: ◇, ⊠, ⚠
+ /// Position 0d - NOT mutually exclusive (can combine like "◇⊠")
+ worktree_attrs: String,
/// Main branch divergence state
/// Position 1 - MUTUALLY EXCLUSIVE (enforced by enum)
@@ -487,30 +564,74 @@ impl StatusSymbols {
/// Render symbols with full alignment
///
/// Aligns all symbol types at fixed positions:
- /// - Position 0: State symbols (=, ≡, ∅, etc.) OR space
- /// - Position 1: Main divergence (↑, ↓, or ↕) OR space
- /// - Position 2: Upstream divergence (⇡, ⇣, or ⇅) OR space
- /// - Position 3+: Working tree symbols (!, +, », ?, ✘)
+ /// - Position 0a: Conflicts (= or space)
+ /// - Position 0b: Branch state (≡, ∅, or space)
+ /// - Position 0c: Git operation (↻, ⋈, or space)
+ /// - Position 0d: Worktree attributes (◇⊠⚠ or space)
+ /// - Position 1: Main divergence (↑, ↓, ↕, or space)
+ /// - Position 2: Upstream divergence (⇡, ⇣, ⇅, or space)
+ /// - Position 3+: Working tree symbols (?, !, +, », ✘)
///
/// This ensures vertical scannability - each symbol type appears at the same
/// column position across all rows.
pub fn render(&self) -> String {
- let mut result = String::with_capacity(10);
+ let mut result = String::with_capacity(12);
- let has_any_content = !self.prefix.is_empty()
+ if self.is_empty() {
+ return result;
+ }
+
+ // Check if we have any symbols after each position (for conditional spacing)
+ let has_post_0a = self.branch_state != BranchState::None
+ || self.git_operation != GitOperation::None
+ || !self.worktree_attrs.is_empty()
|| self.main_divergence != MainDivergence::None
|| self.upstream_divergence != UpstreamDivergence::None
|| !self.working_tree.is_empty();
- if !has_any_content {
- return result;
+ let has_post_0b = self.git_operation != GitOperation::None
+ || !self.worktree_attrs.is_empty()
+ || self.main_divergence != MainDivergence::None
+ || self.upstream_divergence != UpstreamDivergence::None
+ || !self.working_tree.is_empty();
+
+ let has_post_0c = !self.worktree_attrs.is_empty()
+ || self.main_divergence != MainDivergence::None
+ || self.upstream_divergence != UpstreamDivergence::None
+ || !self.working_tree.is_empty();
+
+ let has_post_0d = self.main_divergence != MainDivergence::None
+ || self.upstream_divergence != UpstreamDivergence::None
+ || !self.working_tree.is_empty();
+
+ // Position 0a: Conflicts
+ if self.has_conflicts {
+ result.push('=');
+ } else if has_post_0a {
+ result.push(' ');
}
- // Position 0: Prefix (state symbols)
- if self.prefix.is_empty() {
+ // Position 0b: Branch state (≡ or ∅)
+ let branch_state_str = self.branch_state.to_string();
+ if !branch_state_str.is_empty() {
+ result.push_str(&branch_state_str);
+ } else if has_post_0b {
+ result.push(' ');
+ }
+
+ // Position 0c: Git operation (↻ or ⋈)
+ let git_op_str = self.git_operation.to_string();
+ if !git_op_str.is_empty() {
+ result.push_str(&git_op_str);
+ } else if has_post_0c {
+ result.push(' ');
+ }
+
+ // Position 0d: Worktree attributes (◇⊠⚠)
+ if !self.worktree_attrs.is_empty() {
+ result.push_str(&self.worktree_attrs);
+ } else if has_post_0d {
result.push(' ');
- } else {
- result.push_str(&self.prefix);
}
// Position 1: Main divergence (↑, ↓, or ↕)
@@ -544,7 +665,10 @@ impl StatusSymbols {
/// Check if symbols are empty
pub fn is_empty(&self) -> bool {
- self.prefix.is_empty()
+ !self.has_conflicts
+ && self.branch_state == BranchState::None
+ && self.git_operation == GitOperation::None
+ && self.worktree_attrs.is_empty()
&& self.main_divergence == MainDivergence::None
&& self.upstream_divergence == UpstreamDivergence::None
&& self.working_tree.is_empty()
@@ -627,47 +751,43 @@ fn parse_git_status(
}
}
- // Build structured symbols for aligned rendering
- let mut symbols = StatusSymbols::default();
-
- // Conflicts go in prefix (blocking indicator)
- if has_conflicts {
- symbols.prefix.push('=');
- }
-
- // Main branch divergence - use enum for type safety
- symbols.main_divergence = match (main_ahead > 0, main_behind > 0) {
- (true, true) => MainDivergence::Diverged, // Both ahead and behind
- (true, false) => MainDivergence::Ahead, // Ahead only
- (false, true) => MainDivergence::Behind, // Behind only
- (false, false) => MainDivergence::None, // Up to date
- };
-
- // Upstream/remote divergence - use enum for type safety
- symbols.upstream_divergence = match (upstream_ahead > 0, upstream_behind > 0) {
- (true, true) => UpstreamDivergence::Diverged, // Both ahead and behind
- (true, false) => UpstreamDivergence::Ahead, // Ahead only
- (false, true) => UpstreamDivergence::Behind, // Behind only
- (false, false) => UpstreamDivergence::None, // Up to date
- };
-
- // Working tree changes (position 3+)
+ // Build working tree string
+ let mut working_tree = String::new();
if has_untracked {
- symbols.working_tree.push('?');
+ working_tree.push('?');
}
if has_modified {
- symbols.working_tree.push('!');
+ working_tree.push('!');
}
if has_staged {
- symbols.working_tree.push('+');
+ working_tree.push('+');
}
if has_renamed {
- symbols.working_tree.push('»');
+ working_tree.push('»');
}
if has_deleted {
- symbols.working_tree.push('✘');
+ working_tree.push('✘');
}
+ // Build structured symbols for aligned rendering
+ let symbols = StatusSymbols {
+ has_conflicts,
+ main_divergence: match (main_ahead > 0, main_behind > 0) {
+ (true, true) => MainDivergence::Diverged, // Both ahead and behind
+ (true, false) => MainDivergence::Ahead, // Ahead only
+ (false, true) => MainDivergence::Behind, // Behind only
+ (false, false) => MainDivergence::None, // Up to date
+ },
+ upstream_divergence: match (upstream_ahead > 0, upstream_behind > 0) {
+ (true, true) => UpstreamDivergence::Diverged, // Both ahead and behind
+ (true, false) => UpstreamDivergence::Ahead, // Ahead only
+ (false, true) => UpstreamDivergence::Behind, // Behind only
+ (false, false) => UpstreamDivergence::None, // Up to date
+ },
+ working_tree,
+ ..Default::default()
+ };
+
Ok(GitStatusInfo { is_dirty, symbols })
}
@@ -760,53 +880,46 @@ impl WorktreeInfo {
false
};
- // Build complete status symbols by adding state symbols to prefix
+ // Build complete status symbols with type-safe enums
// Order: = ≡∅ ↻⋈ ◇⊠⚠ | ↑↓ | ⇡⇣ | ?!+»✘
- // ^prefix^ ^main^ ^up^ ^working_tree^
+ // ^0a 0b 0c 0d^ ^1^ ^2^ ^3+^
let mut symbols = status_info.symbols;
// Add merge conflicts indicator if this branch has conflicts with base
- // (different from git status conflicts which are already in symbols.prefix)
- if has_conflicts && !symbols.prefix.contains('=') {
- symbols.prefix.insert(0, '=');
+ // (different from git status conflicts which are already in has_conflicts)
+ if has_conflicts {
+ symbols.has_conflicts = true;
}
- // Build state symbols to add to prefix
- let mut state_symbols = String::new();
-
- // ≡ matches main (working tree identical to main)
- // ∅ no commits (no commits ahead AND clean working tree, AND not matches main)
+ // Branch state: ≡ matches main, ∅ no commits (mutually exclusive)
if !is_primary {
if working_tree_diff_with_main == Some((0, 0)) {
- state_symbols.push('≡');
+ symbols.branch_state = BranchState::MatchesMain;
} else if counts.ahead == 0 && working_tree_diff == (0, 0) {
- state_symbols.push('∅');
+ symbols.branch_state = BranchState::NoCommits;
}
}
- // ↻ rebase, ⋈ merge (git operations in progress)
+ // Git operation: ↻ rebase, ⋈ merge (mutually exclusive)
if let Some(state) = &worktree_state {
if state.contains("rebase") {
- state_symbols.push('↻');
+ symbols.git_operation = GitOperation::Rebase;
} else if state.contains("merge") {
- state_symbols.push('⋈');
+ symbols.git_operation = GitOperation::Merge;
}
}
- // ◇ bare, ⊠ locked, ⚠ prunable (worktree attributes)
+ // Worktree attributes: ◇ bare, ⊠ locked, ⚠ prunable (can combine)
if wt.bare {
- state_symbols.push('◇');
+ symbols.worktree_attrs.push('◇');
}
if wt.locked.is_some() {
- state_symbols.push('⊠');
+ symbols.worktree_attrs.push('⊠');
}
if wt.prunable.is_some() {
- state_symbols.push('⚠');
+ symbols.worktree_attrs.push('⚠');
}
- // Append state symbols to prefix (after any existing conflict marker)
- symbols.prefix.push_str(&state_symbols);
-
// Read user-defined status from git config (worktree-specific or branch-keyed)
let user_status = read_user_status(&wt_repo, wt.branch.as_deref());
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 d574d4bec..9d56fca72 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
@@ -12,14 +12,14 @@ info:
LC_ALL: C
NO_COLOR: ""
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpQaBYb5/test-config.toml
+ WORKTRUNK_CONFIG: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpp0c8s5/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
Branch Status HEAD± main↕ Path Commit Age
feature ./test-repo.feature 72413a3b 10 months ago
-main ∅↓ ↓1 ./test-repo.main 6c3da842 10 months ago
+main ∅ ↓ ↓1 ./test-repo.main 6c3da842 10 months ago
⚪ Showing 2 worktrees, 1 behind, 1 column hidden
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 a42a89a52..856893507 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
@@ -16,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpAlyKoW/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpCfJumZ/test-config.toml
---
success: true
exit_code: 0
@@ -57,7 +57,10 @@ exit_code: 0
"pr_status": null,
"has_conflicts": false,
"status_symbols": {
- "prefix": "",
+ "has_conflicts": false,
+ "branch_state": "",
+ "git_operation": "",
+ "worktree_attrs": "",
"main_divergence": "",
"upstream_divergence": "",
"working_tree": ""
@@ -94,14 +97,17 @@ exit_code: 0
"pr_status": null,
"has_conflicts": false,
"status_symbols": {
- "prefix": "",
+ "has_conflicts": false,
+ "branch_state": "",
+ "git_operation": "",
+ "worktree_attrs": "",
"main_divergence": "↕",
"upstream_divergence": "",
"working_tree": "?!"
},
"commits_display": "[GREEN]↑2[RESET] [DIM][RED]↓2[RESET]",
"branch_diff_display": "[GREEN]+1[RESET]",
- "status_display": " ↕ ?!",
+ "status_display": " ↕ ?!",
"working_diff_display": "[GREEN]+1[RESET] [RED]-1[RESET]"
},
{
@@ -135,13 +141,16 @@ exit_code: 0
"pr_status": null,
"has_conflicts": false,
"status_symbols": {
- "prefix": "∅",
+ "has_conflicts": false,
+ "branch_state": "∅",
+ "git_operation": "",
+ "worktree_attrs": "",
"main_divergence": "↓",
"upstream_divergence": "",
"working_tree": ""
},
"commits_display": "[DIM][RED]↓2[RESET]",
- "status_display": "∅↓"
+ "status_display": " ∅ ↓"
}
]
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 d09b1e631..6057d51f5 100644
--- a/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap
+++ b/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap
@@ -16,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpAfjdPd/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpPl6k2G/test-config.toml
---
success: true
exit_code: 0
@@ -57,7 +57,10 @@ exit_code: 0
"pr_status": null,
"has_conflicts": false,
"status_symbols": {
- "prefix": "",
+ "has_conflicts": false,
+ "branch_state": "",
+ "git_operation": "",
+ "worktree_attrs": "",
"main_divergence": "",
"upstream_divergence": "",
"working_tree": ""
@@ -98,12 +101,15 @@ exit_code: 0
"pr_status": null,
"has_conflicts": false,
"status_symbols": {
- "prefix": "≡",
+ "has_conflicts": false,
+ "branch_state": "≡",
+ "git_operation": "",
+ "worktree_attrs": "",
"main_divergence": "",
"upstream_divergence": "",
"working_tree": ""
},
- "status_display": "≡"
+ "status_display": " ≡"
},
{
"type": "worktree",
@@ -140,12 +146,15 @@ exit_code: 0
"pr_status": null,
"has_conflicts": false,
"status_symbols": {
- "prefix": "≡⊠",
+ "has_conflicts": false,
+ "branch_state": "≡",
+ "git_operation": "",
+ "worktree_attrs": "⊠",
"main_divergence": "",
"upstream_divergence": "",
"working_tree": ""
},
- "status_display": "≡⊠"
+ "status_display": " ≡ ⊠"
}
]
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 92b69d913..aba3c8eee 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
@@ -16,7 +16,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpqBB1rp/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpbITas5/test-config.toml
---
success: true
exit_code: 0
@@ -57,7 +57,10 @@ exit_code: 0
"pr_status": null,
"has_conflicts": false,
"status_symbols": {
- "prefix": "",
+ "has_conflicts": false,
+ "branch_state": "",
+ "git_operation": "",
+ "worktree_attrs": "",
"main_divergence": "",
"upstream_divergence": "",
"working_tree": ""
@@ -98,13 +101,16 @@ exit_code: 0
"pr_status": null,
"has_conflicts": false,
"status_symbols": {
- "prefix": "≡",
+ "has_conflicts": false,
+ "branch_state": "≡",
+ "git_operation": "",
+ "worktree_attrs": "",
"main_divergence": "",
"upstream_divergence": "",
"working_tree": ""
},
"user_status": "🔧",
- "status_display": "≡🔧"
+ "status_display": " ≡🔧"
},
{
"type": "worktree",
@@ -141,12 +147,15 @@ exit_code: 0
"pr_status": null,
"has_conflicts": false,
"status_symbols": {
- "prefix": "≡",
+ "has_conflicts": false,
+ "branch_state": "≡",
+ "git_operation": "",
+ "worktree_attrs": "",
"main_divergence": "",
"upstream_divergence": "",
"working_tree": ""
},
- "status_display": "≡"
+ "status_display": " ≡"
}
]
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 f8b17bf57..bf6c857e9 100644
--- a/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap
@@ -15,17 +15,17 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpUp8l8d/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpVN36Kl/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
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 26a39f857..366280222 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,15 +15,15 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpFYLour/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpvtMChv/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
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__locked_no_reason.snap b/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap
index f42012f7a..49c22269e 100644
--- a/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap
+++ b/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap
@@ -15,14 +15,14 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpsY0W6k/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpOCDTsO/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
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 d71ceaa26..4b00b71e2 100644
--- a/tests/snapshots/integration__integration_tests__list__locked_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__locked_worktree.snap
@@ -15,14 +15,14 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpE4bhkY/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpebk8cU/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
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 1719c3675..e7eeb94e8 100644
--- a/tests/snapshots/integration__integration_tests__list__long_commit_message.snap
+++ b/tests/snapshots/integration__integration_tests__list__long_commit_message.snap
@@ -15,14 +15,14 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmplqfhqe/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpKQlDO1/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
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 test how the...
+feature-a ∅ ↓ ↓1 ./feature-a f078644e 10 months ago This is a very long commit message that should test how the...
⚪ Showing 2 worktrees, 1 behind
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 630801f9f..e260325de 100644
--- a/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap
+++ b/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap
@@ -15,17 +15,17 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpyknZhP/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpRiHv5l/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
Branch  Status HEAD± main↕ Path  Remote↕ Commit  Age  Message
main  ./test-repo  b834638e 10 months ago Initial commit
-medium-name  ≡ ./medium-name  b834638e 10 months ago Initial commit
-short  ≡ ./short  b834638e 10 months ago Initial commit
-very-long-branch-name-here ≡ ./very-long-branch-name-here b834638e 10 months ago Initial commit
-with-changes  ≡ ./with-changes  b834638e 10 months ago Initial commit
+medium-name  ≡ ./medium-name  b834638e 10 months ago Initial commit
+short  ≡ ./short  b834638e 10 months ago Initial commit
+very-long-branch-name-here ≡ ./very-long-branch-name-here b834638e 10 months ago Initial commit
+with-changes  ≡ ./with-changes  b834638e 10 months ago Initial commit
⚪ Showing 5 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap
index 8f32997d1..26bd50b7a 100644
--- a/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap
@@ -15,15 +15,15 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp4zU27l/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpJfdWWQ/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
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__unicode_commit_message.snap b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap
index bf8f01887..e82ca8412 100644
--- a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap
+++ b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap
@@ -15,14 +15,14 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpZMUNzJ/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpS0GJoS/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
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, 1 behind
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 021eadac1..163eca588 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,15 +15,15 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpcgru4Y/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpx9I4mh/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
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 b6ddbb4e7..490ca655d 100644
--- a/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap
@@ -16,14 +16,14 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpexsbOA/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp16jQIn/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
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
+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
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 cc4532ded..43710d63d 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,15 +16,15 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmptOGVK9/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpItc8fM/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
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_upstream_tracking.snap b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
index ec5295dc0..e74b0e1b3 100644
--- a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
@@ -17,18 +17,18 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp45lYCx/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmptaKMqr/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
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 a5143ba6c..7723f8834 100644
--- a/tests/snapshots/integration__integration_tests__list__with_user_status.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_user_status.snap
@@ -15,17 +15,17 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpSlVINa/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp4HxXlx/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-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
-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
+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
+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
⚪ 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 1a33b7384..948b6b7f6 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,14 +15,14 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpSGpBh2/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpkaVyXm/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
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 fb143ad78..f47b71560 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,16 +15,16 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpZSvZRx/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpEx8TAY/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-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
-with-changes ! +1 -1 ./with-changes b834638e 10 months ago Initial commit
+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
+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 5ba98c469..4a8dbac7f 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,15 +15,15 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmph3eUfq/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpCLkMmE/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-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
-tiny ! +1 -1 ./tiny b834638e 10 months ago Initial commit
+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
+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 f90bb5ea8..9c6e04889 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,16 +15,16 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpwQwohH/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpg3s0bf/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-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
+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
⚪ 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 78620dd23..af7477a4f 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,16 +15,16 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpVsPsec/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpHmvr2O/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
Branch  Status HEAD± main↕ Path  Remote↕ Commit  Age  Message
main  ./test-repo  b834638e 10 months ago Initial commit
-another-extremely-long-name-here ≡ ./another-extremely-long-name-here b834638e 10 months ago Initial commit
-short  ≡ ./short  b834638e 10 months ago Initial commit
-very-long-feature-branch-name  ≡ ./very-long-feature-branch-name  b834638e 10 months ago Initial commit
+another-extremely-long-name-here ≡ ./another-extremely-long-name-here b834638e 10 months ago Initial commit
+short  ≡ ./short  b834638e 10 months ago Initial commit
+very-long-feature-branch-name  ≡ ./very-long-feature-branch-name  b834638e 10 months ago Initial commit
⚪ Showing 4 worktrees
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 619f479c1..780b271e3 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,16 +15,16 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpVYD5U5/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpL0U48b/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
Branch Status HEAD± main↕ Path  Remote↕ Commit  Age  Message
main  ./test-repo  b834638e 10 months ago Initial commit
-long  ≡ ./extremely-long-branch-name-that-might-cause-layout-issues b834638e 10 months ago Initial commit
-medium ≡ ./medium-length-name  b834638e 10 months ago Initial commit
-x  ≡ ./x  b834638e 10 months ago Initial commit
+long  ≡ ./extremely-long-branch-name-that-might-cause-layout-issues b834638e 10 months ago Initial commit
+medium ≡ ./medium-length-name  b834638e 10 months ago Initial commit
+x  ≡ ./x  b834638e 10 months ago Initial commit
⚪ Showing 4 worktrees
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 ddaccdaeb..114f68b10 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,16 +15,16 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpkf2RA5/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpvhLesb/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
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__terminal_width_120.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_120.snap
index 0977db957..444bbb3a8 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_120.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_120.snap
@@ -15,15 +15,15 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpPJAlvx/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpWXVUAD/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
Branch  Status HEAD± main↕ Path  Commit  Age  Message
main  ./test-repo a7bc47ca 10 months ago Initial commit with a reasonably long message
-feature-a ≡ ./feature-a a7bc47ca 10 months ago Initial commit with a reasonably long message
-feature-b ≡ ./feature-b a7bc47ca 10 months ago Initial commit with a reasonably long message
+feature-a ≡ ./feature-a a7bc47ca 10 months ago Initial commit with a reasonably long message
+feature-b ≡ ./feature-b a7bc47ca 10 months ago Initial commit with a reasonably long message
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_150.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_150.snap
index 291874552..16d020348 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_150.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_150.snap
@@ -15,15 +15,15 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp65ZXrp/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpLTsKQ3/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
Branch  Status HEAD± main↕ Path  Remote↕ Commit  Age  Message
main  ./test-repo a7bc47ca 10 months ago Initial commit with a reasonably long message
-feature-a ≡ ./feature-a a7bc47ca 10 months ago Initial commit with a reasonably long message
-feature-b ≡ ./feature-b a7bc47ca 10 months ago Initial commit with a reasonably long message
+feature-a ≡ ./feature-a a7bc47ca 10 months ago Initial commit with a reasonably long message
+feature-b ≡ ./feature-b a7bc47ca 10 months ago Initial commit with a reasonably long message
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_80.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_80.snap
index 27e58ecf4..f6ebe4ea1 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_80.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_80.snap
@@ -15,15 +15,15 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpmzs03v/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpZFoKlA/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
Branch  Status Path  Commit  Age  Message
main  ./test-repo a7bc47ca 10 months ago Initial commit with...
-feature-a ≡ ./feature-a a7bc47ca 10 months ago Initial commit with...
-feature-b ≡ ./feature-b a7bc47ca 10 months ago Initial commit with...
+feature-a ≡ ./feature-a a7bc47ca 10 months ago Initial commit with...
+feature-b ≡ ./feature-b a7bc47ca 10 months ago Initial commit with...
⚪ Showing 3 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 357cedb02..4ffc8218c 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,16 +15,16 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpa1jWxK/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmptmS2j8/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
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