Skip to content

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

feat: Structure status symbols for alignment

Maximilian Roos32d43bd203ec
diff --git a/src/commands/list/layout.rs b/src/commands/list/layout.rs
index 3b382888a..2f676d1b1 100644
--- a/src/commands/list/layout.rs
+++ b/src/commands/list/layout.rs
@@ -661,8 +661,8 @@ mod tests {
#[test]
fn test_column_width_calculation_with_unicode() {
use crate::commands::list::model::{
- AheadBehind, BranchDiffTotals, CommitDetails, DisplayFields, UpstreamStatus,
- WorktreeInfo,
+ AheadBehind, BranchDiffTotals, CommitDetails, DisplayFields, StatusSymbols,
+ UpstreamStatus, WorktreeInfo,
};
let info1 = WorktreeInfo {
@@ -691,7 +691,7 @@ mod tests {
worktree_state: None,
pr_status: None,
has_conflicts: false,
- status_symbols: String::new(),
+ status_symbols: StatusSymbols::default(),
user_status: None,
display: DisplayFields::default(),
working_diff_display: None,
@@ -736,8 +736,8 @@ mod tests {
#[test]
fn test_visible_columns_follow_gap_rule() {
use crate::commands::list::model::{
- AheadBehind, BranchDiffTotals, CommitDetails, DisplayFields, UpstreamStatus,
- WorktreeInfo,
+ AheadBehind, BranchDiffTotals, CommitDetails, DisplayFields, StatusSymbols,
+ UpstreamStatus, WorktreeInfo,
};
// Create test data with specific widths to verify position calculation
@@ -767,7 +767,7 @@ mod tests {
worktree_state: None,
pr_status: None,
has_conflicts: false,
- status_symbols: String::new(),
+ status_symbols: StatusSymbols::default(),
user_status: None,
display: DisplayFields::default(),
working_diff_display: None,
@@ -811,8 +811,8 @@ mod tests {
#[test]
fn test_column_positions_with_empty_columns() {
use crate::commands::list::model::{
- AheadBehind, BranchDiffTotals, CommitDetails, DisplayFields, UpstreamStatus,
- WorktreeInfo,
+ AheadBehind, BranchDiffTotals, CommitDetails, DisplayFields, StatusSymbols,
+ UpstreamStatus, WorktreeInfo,
};
// Create minimal data - most columns will be empty
@@ -842,7 +842,7 @@ mod tests {
worktree_state: None,
pr_status: None,
has_conflicts: false,
- status_symbols: String::new(),
+ status_symbols: StatusSymbols::default(),
user_status: None,
display: DisplayFields::default(),
working_diff_display: None,
@@ -875,8 +875,8 @@ mod tests {
#[test]
fn test_consecutive_empty_columns_have_low_priority() {
use crate::commands::list::model::{
- AheadBehind, BranchDiffTotals, CommitDetails, DisplayFields, UpstreamStatus,
- WorktreeInfo,
+ AheadBehind, BranchDiffTotals, CommitDetails, DisplayFields, StatusSymbols,
+ UpstreamStatus, WorktreeInfo,
};
// Create data where multiple consecutive columns are empty:
@@ -908,7 +908,7 @@ mod tests {
worktree_state: None, // Empty: no state
pr_status: None,
has_conflicts: false,
- status_symbols: String::new(),
+ status_symbols: StatusSymbols::default(),
user_status: None,
display: DisplayFields::default(),
working_diff_display: None,
diff --git a/src/commands/list/model.rs b/src/commands/list/model.rs
index 01b648728..d901961c8 100644
--- a/src/commands/list/model.rs
+++ b/src/commands/list/model.rs
@@ -42,7 +42,7 @@ pub struct WorktreeInfo {
pub pr_status: Option<PrStatus>,
pub has_conflicts: bool,
/// Git status symbols (=, ↑, ↓, ⇡, ⇣, ?, !, +, », ✘) indicating working tree state
- pub status_symbols: String,
+ pub status_symbols: StatusSymbols,
/// User-defined status from worktrunk.status git config
#[serde(skip_serializing_if = "Option::is_none")]
pub user_status: Option<String>,
@@ -355,16 +355,121 @@ fn read_user_status(repo: &Repository, branch: Option<&str>) -> Option<String> {
read_branch_keyed_status(repo, branch)
}
+/// 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 3+: Working tree symbols (?, !, +, », ✘)
+///
+/// ## Mutual Exclusivity
+///
+/// Symbols within each position may or may not be mutually exclusive:
+///
+/// **Mutually exclusive:**
+/// - ≡ vs ∅: Can't both match main AND have no commits
+/// - ↻ vs ⋈: Only one git operation at a time
+/// - ↑ vs ↓ vs ↕: Main divergence states (ahead, behind, or both)
+/// - ⇡ vs ⇣ vs ⇅: Upstream divergence states (ahead, behind, or both)
+///
+/// **NOT mutually exclusive (can co-occur):**
+/// - = with ↻/⋈: Can have conflicts during rebase/merge
+/// - ◇, ⊠, ⚠: Worktree can be bare+locked, bare+prunable, etc.
+/// - All working tree symbols (?!+»✘): Can have multiple types of changes
+///
+/// Current implementation uses semantic grouping (co-occurrence allowed) for
+/// compactness. True mutual exclusivity would require ~9 positions.
+#[derive(Debug, Clone, Default, serde::Serialize)]
+pub struct StatusSymbols {
+ /// Blocking and state symbols: =, ≡, ∅, ↻, ⋈, ◇, ⊠, ⚠
+ /// Position 0 - NOT mutually exclusive (can combine like "=↻")
+ prefix: String,
+
+ /// Main branch divergence: ↑ (ahead) OR ↓ (behind) OR ↕ (diverged)
+ /// Position 1 - MUTUALLY EXCLUSIVE (single character)
+ main_divergence: String,
+
+ /// Remote/upstream divergence: ⇡ (ahead) OR ⇣ (behind) OR ⇅ (diverged)
+ /// Position 2 - MUTUALLY EXCLUSIVE (single character)
+ upstream_divergence: String,
+
+ /// Working tree changes: ?, !, +, », ✘
+ /// Position 3+ - NOT mutually exclusive (can have "?!+" etc.)
+ working_tree: String,
+}
+
+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 (!, +, », ?, ✘)
+ ///
+ /// 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 has_any_content = !self.prefix.is_empty()
+ || !self.main_divergence.is_empty()
+ || !self.upstream_divergence.is_empty()
+ || !self.working_tree.is_empty();
+
+ if !has_any_content {
+ return result;
+ }
+
+ // Position 0: Prefix (state symbols)
+ if self.prefix.is_empty() {
+ result.push(' ');
+ } else {
+ result.push_str(&self.prefix);
+ }
+
+ // Position 1: Main divergence (↑ or ↓)
+ if self.main_divergence.is_empty() {
+ // Only add space if we have upstream or working_tree symbols
+ if !self.upstream_divergence.is_empty() || !self.working_tree.is_empty() {
+ result.push(' ');
+ }
+ } else {
+ result.push_str(&self.main_divergence);
+ }
+
+ // Position 2: Upstream divergence (⇡ or ⇣)
+ if self.upstream_divergence.is_empty() {
+ // Only add space if we have working_tree symbols
+ if !self.working_tree.is_empty() {
+ result.push(' ');
+ }
+ } else {
+ result.push_str(&self.upstream_divergence);
+ }
+
+ // Position 3+: Working tree symbols
+ result.push_str(&self.working_tree);
+
+ result
+ }
+
+ /// Check if symbols are empty
+ pub fn is_empty(&self) -> bool {
+ self.prefix.is_empty()
+ && self.main_divergence.is_empty()
+ && self.upstream_divergence.is_empty()
+ && self.working_tree.is_empty()
+ }
+}
+
/// Git status information parsed from `git status --porcelain`
-// TODO: Consider using a struct with bool fields instead of String for symbols
-// (has_untracked, has_modified, has_staged, has_renamed, has_deleted, has_conflicts,
-// main_ahead, main_behind, upstream_ahead, upstream_behind)
-// Would enable querying individual states, but currently only used for display.
struct GitStatusInfo {
/// Whether the working tree has any changes (staged or unstaged)
is_dirty: bool,
- /// Status symbols: · (branch only, no worktree), = (conflicts), ↑ (ahead of main), ↓ (behind main), ⇡ (ahead of remote), ⇣ (behind remote), ? (untracked), ! (modified), + (staged), » (renamed), ✘ (deleted)
- symbols: String,
+ /// Status symbols (structured for alignment)
+ symbols: StatusSymbols,
}
/// Parse git status --porcelain output to determine dirty state and status symbols
@@ -435,41 +540,47 @@ fn parse_git_status(
}
}
- let mut symbols = String::with_capacity(10);
+ // Build structured symbols for aligned rendering
+ let mut symbols = StatusSymbols::default();
- // Symbol order: conflicts (blocking) → branch divergence → working tree changes
- // = (conflicts), ↑↓ (vs main), ⇡⇣ (vs remote), ?!+»✘ (working tree state)
+ // Conflicts go in prefix (blocking indicator)
if has_conflicts {
- symbols.push('=');
+ symbols.prefix.push('=');
}
- // Main branch: simple arrows
- if main_ahead > 0 {
- symbols.push('↑');
- }
- if main_behind > 0 {
- symbols.push('↓');
- }
- // Upstream/remote: double arrows
- if upstream_ahead > 0 {
- symbols.push('⇡');
+
+ // Main branch divergence (↑, ↓, or ↕ for both)
+ // Using single-character representation for mutual exclusivity
+ match (main_ahead > 0, main_behind > 0) {
+ (true, true) => symbols.main_divergence.push('↕'), // Diverged (both ahead and behind)
+ (true, false) => symbols.main_divergence.push('↑'), // Ahead only
+ (false, true) => symbols.main_divergence.push('↓'), // Behind only
+ (false, false) => {} // Up to date
}
- if upstream_behind > 0 {
- symbols.push('⇣');
+
+ // Upstream/remote divergence (⇡, ⇣, or ⇅ for both)
+ // Using single-character representation for mutual exclusivity
+ match (upstream_ahead > 0, upstream_behind > 0) {
+ (true, true) => symbols.upstream_divergence.push('⇅'), // Diverged (both ahead and behind)
+ (true, false) => symbols.upstream_divergence.push('⇡'), // Ahead only
+ (false, true) => symbols.upstream_divergence.push('⇣'), // Behind only
+ (false, false) => {} // Up to date
}
+
+ // Working tree changes (position 3+)
if has_untracked {
- symbols.push('?');
+ symbols.working_tree.push('?');
}
if has_modified {
- symbols.push('!');
+ symbols.working_tree.push('!');
}
if has_staged {
- symbols.push('+');
+ symbols.working_tree.push('+');
}
if has_renamed {
- symbols.push('»');
+ symbols.working_tree.push('»');
}
if has_deleted {
- symbols.push('✘');
+ symbols.working_tree.push('✘');
}
Ok(GitStatusInfo { is_dirty, symbols })
@@ -564,22 +675,18 @@ impl WorktreeInfo {
false
};
- // Build complete status symbols by appending state symbols
- // Order: = ≡∅ ↻⋈ ◇⊠⚠ ↑↓ ⇡⇣ ?!+»✘
+ // Build complete status symbols by adding state symbols to prefix
+ // Order: = ≡∅ ↻⋈ ◇⊠⚠ | ↑↓ | ⇡⇣ | ?!+»✘
+ // ^prefix^ ^main^ ^up^ ^working_tree^
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)
- if has_conflicts && !symbols.contains('=') {
- symbols.insert(0, '=');
+ // (different from git status conflicts which are already in symbols.prefix)
+ if has_conflicts && !symbols.prefix.contains('=') {
+ symbols.prefix.insert(0, '=');
}
- // State symbols (insert after conflicts but before branch divergence)
- // Find insertion point (after '=' if present, otherwise at start)
- let insert_pos = symbols
- .find(|c| ['↑', '↓', '⇡', '⇣', '?', '!', '+', '»', '✘'].contains(&c))
- .unwrap_or(symbols.len());
-
+ // Build state symbols to add to prefix
let mut state_symbols = String::new();
// ≡ matches main (working tree identical to main)
@@ -612,7 +719,8 @@ impl WorktreeInfo {
state_symbols.push('⚠');
}
- symbols.insert_str(insert_pos, &state_symbols);
+ // 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());
@@ -637,13 +745,14 @@ impl WorktreeInfo {
}
/// Combine git status symbols and user-defined status
- /// Returns the combined string (no separator - tools can add spaces if needed)
+ /// Returns the combined string with aligned rendering
pub fn combined_status(&self) -> String {
if !self.status_symbols.is_empty() {
+ let rendered = self.status_symbols.render();
if let Some(ref user_status) = self.user_status {
- format!("{}{}", self.status_symbols, user_status)
+ format!("{}{}", rendered, user_status)
} else {
- self.status_symbols.clone()
+ rendered
}
} else if let Some(ref user_status) = self.user_status {
user_status.clone()
diff --git a/src/commands/select.rs b/src/commands/select.rs
index 2fa74e8c1..ce9419987 100644
--- a/src/commands/select.rs
+++ b/src/commands/select.rs
@@ -222,7 +222,7 @@ pub fn handle_select() -> Result<(), GitError> {
// Add status symbols for worktrees (fixed width)
let status = if let Some(wt_info) = item.worktree_info() {
- format!("{:^8}", wt_info.status_symbols)
+ format!("{:^8}", wt_info.status_symbols.render())
} else {
" ".to_string()
};
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 c5d824d76..d5ae9e1ea 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/.tmpyYEIdg/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpkyetsJ/test-config.toml
---
success: true
exit_code: 0
@@ -56,7 +56,12 @@ exit_code: 0
"worktree_state": null,
"pr_status": null,
"has_conflicts": false,
- "status_symbols": ""
+ "status_symbols": {
+ "prefix": "",
+ "main_divergence": "",
+ "upstream_divergence": "",
+ "working_tree": ""
+ }
},
{
"type": "worktree",
@@ -88,7 +93,12 @@ exit_code: 0
"worktree_state": null,
"pr_status": null,
"has_conflicts": false,
- "status_symbols": "↑↓?!",
+ "status_symbols": {
+ "prefix": "",
+ "main_divergence": "↕",
+ "upstream_divergence": "",
+ "working_tree": "?!"
+ },
"commits_display": "[GREEN]↑2[RESET] [DIM][RED]↓2[RESET]",
"branch_diff_display": "[GREEN]+1[RESET]",
"working_diff_display": "[GREEN]+1[RESET] [RED]-1[RESET]"
@@ -123,7 +133,12 @@ exit_code: 0
"worktree_state": null,
"pr_status": null,
"has_conflicts": false,
- "status_symbols": "∅↓",
+ "status_symbols": {
+ "prefix": "∅",
+ "main_divergence": "↓",
+ "upstream_divergence": "",
+ "working_tree": ""
+ },
"commits_display": "[DIM][RED]↓2[RESET]"
}
]
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 e2b19e2c8..2e1d8b4d8 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/.tmp2v1CoH/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpzqmcHS/test-config.toml
---
success: true
exit_code: 0
@@ -56,7 +56,12 @@ exit_code: 0
"worktree_state": null,
"pr_status": null,
"has_conflicts": false,
- "status_symbols": ""
+ "status_symbols": {
+ "prefix": "",
+ "main_divergence": "",
+ "upstream_divergence": "",
+ "working_tree": ""
+ }
},
{
"type": "worktree",
@@ -92,7 +97,12 @@ exit_code: 0
"worktree_state": null,
"pr_status": null,
"has_conflicts": false,
- "status_symbols": "≡"
+ "status_symbols": {
+ "prefix": "≡",
+ "main_divergence": "",
+ "upstream_divergence": "",
+ "working_tree": ""
+ }
},
{
"type": "worktree",
@@ -128,7 +138,12 @@ exit_code: 0
"worktree_state": null,
"pr_status": null,
"has_conflicts": false,
- "status_symbols": "≡⊠"
+ "status_symbols": {
+ "prefix": "≡⊠",
+ "main_divergence": "",
+ "upstream_divergence": "",
+ "working_tree": ""
+ }
}
]
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 45be8aac4..68569e4ba 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/.tmpoMhttK/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpOJjuiM/test-config.toml
---
success: true
exit_code: 0
@@ -56,7 +56,12 @@ exit_code: 0
"worktree_state": null,
"pr_status": null,
"has_conflicts": false,
- "status_symbols": ""
+ "status_symbols": {
+ "prefix": "",
+ "main_divergence": "",
+ "upstream_divergence": "",
+ "working_tree": ""
+ }
},
{
"type": "worktree",
@@ -92,7 +97,12 @@ exit_code: 0
"worktree_state": null,
"pr_status": null,
"has_conflicts": false,
- "status_symbols": "≡",
+ "status_symbols": {
+ "prefix": "≡",
+ "main_divergence": "",
+ "upstream_divergence": "",
+ "working_tree": ""
+ },
"user_status": "🔧"
},
{
@@ -129,7 +139,12 @@ exit_code: 0
"worktree_state": null,
"pr_status": null,
"has_conflicts": false,
- "status_symbols": "≡"
+ "status_symbols": {
+ "prefix": "≡",
+ "main_divergence": "",
+ "upstream_divergence": "",
+ "working_tree": ""
+ }
}
]
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 4433a0a04..f8b17bf57 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/.tmpYUd3qX/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpUp8l8d/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__with_upstream_tracking.snap b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
index 3a77b6234..ec5295dc0 100644
--- a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
@@ -17,16 +17,16 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpuzjO18/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp45lYCx/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
+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
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 c290b77fe..a5143ba6c 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/.tmpucPrNK/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpSlVINa/test-config.toml
---
success: true
exit_code: 0
@@ -24,8 +24,8 @@ exit_code: 0
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
+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__spacing_edge_cases__alignment_empty_diffs.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_empty_diffs.snap
index f09db986b..fb143ad78 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/.tmpZ5ntdF/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpZSvZRx/test-config.toml
---
success: true
exit_code: 0
@@ -24,7 +24,7 @@ exit_code: 0
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
+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 f5fb7a7bf..5ba98c469 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/.tmp0bpj3J/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmph3eUfq/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
+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 0b88576fb..f90bb5ea8 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/.tmpE1iUhG/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpwQwohH/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
+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