Skip to content

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

feat: Add styling to Status symbols

Maximilian Roosf8bf96781b91
diff --git a/src/commands/list/layout.rs b/src/commands/list/layout.rs
index 51c8e2fdf..c42a37aaf 100644
--- a/src/commands/list/layout.rs
+++ b/src/commands/list/layout.rs
@@ -572,16 +572,15 @@ pub fn calculate_column_widths(items: &[ListItem], fetch_ci: bool) -> LayoutMeta
// Calculate Status column width: maximum rendered width across all items
// Now that user_status is Position 4 in the grid, render_with_mask() includes it
+ // Note: render_with_mask() returns styled strings with ANSI codes, so we need to
+ // strip them before calculating visual width
let status_data_width = items
.iter()
.filter_map(|item| {
if let Some(info) = item.worktree_info() {
// Worktrees: render all symbols including user_status
- Some(
- info.status_symbols
- .render_with_mask(&status_position_mask)
- .width(),
- )
+ let rendered = info.status_symbols.render_with_mask(&status_position_mask);
+ Some(worktrunk::styling::strip_ansi_codes(&rendered).width())
} else if let ListItem::Branch(branch_info) = item {
// Branches: create minimal StatusSymbols with just user_status
branch_info.user_status.as_ref().map(|user_status| {
@@ -590,9 +589,8 @@ pub fn calculate_column_widths(items: &[ListItem], fetch_ci: bool) -> LayoutMeta
user_status: Some(user_status.clone()),
..Default::default()
};
- branch_symbols
- .render_with_mask(&status_position_mask)
- .width()
+ let rendered = branch_symbols.render_with_mask(&status_position_mask);
+ worktrunk::styling::strip_ansi_codes(&rendered).width()
})
} else {
None
diff --git a/src/commands/list/model.rs b/src/commands/list/model.rs
index 64f2da2f5..ee813b0f1 100644
--- a/src/commands/list/model.rs
+++ b/src/commands/list/model.rs
@@ -667,6 +667,8 @@ impl StatusSymbols {
/// This ensures vertical scannability - each symbol type appears at the same
/// column position across all rows, while minimizing wasted space.
pub fn render_with_mask(&self, mask: &PositionMask) -> String {
+ use worktrunk::styling::{CYAN, ERROR, HINT, WARNING};
+
let mut result = String::with_capacity(12);
if self.is_empty() {
@@ -675,56 +677,89 @@ 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)
+ // - Cyan: Working tree changes (activity)
+ // - Dimmed (HINT): Branch state symbols that indicate removability
let conflicts_str = if self.has_conflicts {
- "=".to_string()
+ format!("{ERROR}={ERROR:#}")
+ } else {
+ String::new()
+ };
+ let git_operation_str = if self.git_operation != GitOperation::None {
+ format!("{WARNING}{}{WARNING:#}", self.git_operation)
} else {
String::new()
};
- let git_operation_str = self.git_operation.to_string();
let main_divergence_str = self.main_divergence.to_string();
let upstream_divergence_str = self.upstream_divergence.to_string();
- let branch_state_str = self.branch_state.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 {
+ String::new()
+ };
+ let worktree_attrs_str = if !self.worktree_attrs.is_empty() {
+ format!("{WARNING}{}{WARNING:#}", self.worktree_attrs)
+ } else {
+ String::new()
+ };
let user_status_str = self.user_status.as_deref().unwrap_or("").to_string();
- let positions_data = [
+ // Track (position, styled_content, visual_width, has_data)
+ // visual_width is the actual display width without ANSI codes
+ let positions_data: [(usize, &str, usize, bool); 8] = [
(
PositionMask::POS_3_WORKING_TREE,
- &self.working_tree,
+ working_tree_str.as_str(),
+ self.working_tree.width(),
!self.working_tree.is_empty(),
),
(
PositionMask::POS_0A_CONFLICTS,
- &conflicts_str,
+ conflicts_str.as_str(),
+ if self.has_conflicts { 1 } else { 0 },
self.has_conflicts,
),
(
PositionMask::POS_0C_GIT_OPERATION,
- &git_operation_str,
+ git_operation_str.as_str(),
+ self.git_operation.to_string().width(),
self.git_operation != GitOperation::None,
),
(
PositionMask::POS_1_MAIN_DIVERGENCE,
- &main_divergence_str,
+ main_divergence_str.as_str(),
+ self.main_divergence.to_string().width(),
self.main_divergence != MainDivergence::None,
),
(
PositionMask::POS_2_UPSTREAM_DIVERGENCE,
- &upstream_divergence_str,
+ upstream_divergence_str.as_str(),
+ self.upstream_divergence.to_string().width(),
self.upstream_divergence != UpstreamDivergence::None,
),
(
PositionMask::POS_0B_BRANCH_STATE,
- &branch_state_str,
+ branch_state_str.as_str(),
+ self.branch_state.to_string().width(),
self.branch_state != BranchState::None,
),
(
PositionMask::POS_0D_WORKTREE_ATTRS,
- &self.worktree_attrs,
+ worktree_attrs_str.as_str(),
+ self.worktree_attrs.width(),
!self.worktree_attrs.is_empty(),
),
(
PositionMask::POS_4_USER_STATUS,
- &user_status_str,
+ user_status_str.as_str(),
+ self.user_status.as_ref().map(|s| s.width()).unwrap_or(0),
self.user_status.is_some(),
),
];
@@ -734,7 +769,7 @@ impl StatusSymbols {
// - If row has no content at position: fill with spaces to allocated width
use unicode_width::UnicodeWidthStr;
- for (pos, content, has_data) in positions_data.iter() {
+ for (pos, styled_content, visual_width, has_data) in positions_data.iter() {
if !mask.includes(*pos) {
continue; // Skip positions not in mask
}
@@ -742,10 +777,10 @@ impl StatusSymbols {
let allocated_width = mask.width(*pos);
if *has_data {
- result.push_str(content);
+ result.push_str(styled_content);
// Pad to allocated width (use saturating_sub to handle edge cases)
- let content_width = content.width();
- let padding = allocated_width.saturating_sub(content_width);
+ // Use visual_width (without ANSI codes) for padding calculation
+ let padding = allocated_width.saturating_sub(*visual_width);
for _ in 0..padding {
result.push(' ');
}
diff --git a/src/commands/list/status_column_tests.rs b/src/commands/list/status_column_tests.rs
index b8dd138bc..96f14b473 100644
--- a/src/commands/list/status_column_tests.rs
+++ b/src/commands/list/status_column_tests.rs
@@ -23,9 +23,21 @@
#[cfg(test)]
mod status_column_rendering_tests {
+ use worktrunk::styling::strip_ansi_codes;
+
+ /// Helper to check visual output (strips ANSI codes for comparison)
+ fn assert_visual_eq(actual: &str, expected_visual: &str) {
+ let actual_visual = strip_ansi_codes(actual);
+ assert_eq!(
+ actual_visual, expected_visual,
+ "Visual output mismatch:\n actual (with ANSI): {:?}\n actual (visual): {:?}\n expected (visual): {:?}",
+ actual, actual_visual, expected_visual
+ );
+ }
+
/// Test 1: Single symbol at position 0b (branch state)
// Row 1: ≡ (synced with remote)
- // Expected: "≡"
+ // Expected: "≡" (dimmed)
#[test]
fn test_single_symbol_position_0b() {
use super::super::model::{BranchState, StatusSymbols};
@@ -33,7 +45,7 @@ mod status_column_rendering_tests {
// Symbols: [≡]
// Max git width: 1
// User status: None
- // Expected: "≡" (no padding, no user status)
+ // Expected: dimmed "≡" (no padding, no user status)
let symbols = StatusSymbols {
branch_state: BranchState::MatchesMain,
..Default::default()
@@ -42,12 +54,13 @@ mod status_column_rendering_tests {
let mask = symbols.position_mask();
let result = symbols.render_with_mask(&mask);
- assert_eq!(result, "≡");
+ // Check visual output (symbols should be styled, but we compare visual content)
+ assert_visual_eq(&result, "≡");
}
/// Test 2: Single symbol at position 3 (working tree)
// Row 1: ! (uncommitted changes)
- // Expected: "!"
+ // Expected: "!" (cyan)
#[test]
fn test_single_symbol_position_3() {
use super::super::model::StatusSymbols;
@@ -55,7 +68,7 @@ mod status_column_rendering_tests {
// Symbols: [!]
// Max git width: 1
// User status: None
- // Expected: "!" (no padding, no user status)
+ // Expected: cyan "!" (no padding, no user status)
let symbols = StatusSymbols {
working_tree: "!".to_string(),
..Default::default()
@@ -64,7 +77,8 @@ mod status_column_rendering_tests {
let mask = symbols.position_mask();
let result = symbols.render_with_mask(&mask);
- assert_eq!(result, "!");
+ // Check visual output (symbols should be styled, but we compare visual content)
+ assert_visual_eq(&result, "!");
}
/// Test 3: Two symbols at different positions create alignment grid
@@ -97,14 +111,14 @@ mod status_column_rendering_tests {
branch_state: BranchState::MatchesMain,
..Default::default()
};
- assert_eq!(row1.render_with_mask(&mask), " ≡");
+ assert_visual_eq(&row1.render_with_mask(&mask), " ≡");
// Row 2: only position 0 (working tree)
let row2 = StatusSymbols {
working_tree: "!".to_string(),
..Default::default()
};
- assert_eq!(row2.render_with_mask(&mask), "! ");
+ assert_visual_eq(&row2.render_with_mask(&mask), "! ");
}
/// Test 4: Same position symbols - single column grid
@@ -134,14 +148,14 @@ mod status_column_rendering_tests {
working_tree: "!".to_string(),
..Default::default()
};
- assert_eq!(row1.render_with_mask(&mask), "!");
+ assert_visual_eq(&row1.render_with_mask(&mask), "!");
// Row 2: ? at position 3
let row2 = StatusSymbols {
working_tree: "?".to_string(),
..Default::default()
};
- assert_eq!(row2.render_with_mask(&mask), "?");
+ assert_visual_eq(&row2.render_with_mask(&mask), "?");
}
/// Test 5: Multiple symbols in one row fill multiple columns
@@ -164,7 +178,7 @@ mod status_column_rendering_tests {
};
let mask = row.position_mask();
- assert_eq!(row.render_with_mask(&mask), "?≡");
+ assert_visual_eq(&row.render_with_mask(&mask), "?≡");
}
/// Test 6: Grid with some columns empty
@@ -197,7 +211,7 @@ mod status_column_rendering_tests {
branch_state: BranchState::MatchesMain,
..Default::default()
};
- assert_eq!(row1.render_with_mask(&mask), " ≡");
+ assert_visual_eq(&row1.render_with_mask(&mask), " ≡");
// Row 2: both positions
let row2 = StatusSymbols {
@@ -205,7 +219,7 @@ mod status_column_rendering_tests {
working_tree: "!".to_string(),
..Default::default()
};
- assert_eq!(row2.render_with_mask(&mask), "!≡");
+ assert_visual_eq(&row2.render_with_mask(&mask), "!≡");
}
/// Test 12: Empty status (no symbols, no user status)
@@ -220,7 +234,7 @@ mod status_column_rendering_tests {
let symbols = StatusSymbols::default();
let mask = symbols.position_mask();
- assert_eq!(symbols.render_with_mask(&mask), "");
+ assert_visual_eq(&symbols.render_with_mask(&mask), "");
}
/// Test 14: Three positions create 3-column grid
@@ -254,21 +268,21 @@ mod status_column_rendering_tests {
branch_state: BranchState::MatchesMain,
..Default::default()
};
- assert_eq!(row1.render_with_mask(&mask), " ≡");
+ assert_visual_eq(&row1.render_with_mask(&mask), " ≡");
// Row 2: only position 3 (main divergence)
let row2 = StatusSymbols {
main_divergence: MainDivergence::Behind,
..Default::default()
};
- assert_eq!(row2.render_with_mask(&mask), " ↓ ");
+ assert_visual_eq(&row2.render_with_mask(&mask), " ↓ ");
// Row 3: only position 0 (working tree)
let row3 = StatusSymbols {
working_tree: "!".to_string(),
..Default::default()
};
- assert_eq!(row3.render_with_mask(&mask), "! ");
+ assert_visual_eq(&row3.render_with_mask(&mask), "! ");
}
/// Test 15: Adjacent positions (2 git_operation and 5 branch_state)
@@ -288,7 +302,7 @@ mod status_column_rendering_tests {
};
let mask = row.position_mask();
- assert_eq!(row.render_with_mask(&mask), "↻≡");
+ assert_visual_eq(&row.render_with_mask(&mask), "↻≡");
}
/// Test 16: Non-adjacent positions with all filled
@@ -308,7 +322,7 @@ mod status_column_rendering_tests {
};
let mask = row.position_mask();
- assert_eq!(row.render_with_mask(&mask), "!+≡");
+ assert_visual_eq(&row.render_with_mask(&mask), "!+≡");
}
/// Test 17: Real-world complex case 1
@@ -347,14 +361,14 @@ mod status_column_rendering_tests {
working_tree: "?".to_string(),
..Default::default()
};
- assert_eq!(row1.render_with_mask(&mask), "? ≡");
+ assert_visual_eq(&row1.render_with_mask(&mask), "? ≡");
// Row 2: only position 0 (working tree)
let row2 = StatusSymbols {
working_tree: "!".to_string(),
..Default::default()
};
- assert_eq!(row2.render_with_mask(&mask), "! ");
+ assert_visual_eq(&row2.render_with_mask(&mask), "! ");
// Row 3: position 0 (working tree) and 3 (main divergence)
let row3 = StatusSymbols {
@@ -362,7 +376,7 @@ mod status_column_rendering_tests {
working_tree: "!+".to_string(),
..Default::default()
};
- assert_eq!(row3.render_with_mask(&mask), "!+↓ ");
+ assert_visual_eq(&row3.render_with_mask(&mask), "!+↓ ");
}
/// Test 18: THE FAILING TEST - 2-column grid with partial fills
@@ -397,14 +411,14 @@ mod status_column_rendering_tests {
working_tree: "?".to_string(),
..Default::default()
};
- assert_eq!(row1.render_with_mask(&mask), "?≡");
+ assert_visual_eq(&row1.render_with_mask(&mask), "?≡");
// Row 2: only position 0 (working tree) (col 0 filled, col 1 empty→space)
let row2 = StatusSymbols {
working_tree: "!".to_string(),
..Default::default()
};
- assert_eq!(row2.render_with_mask(&mask), "! ");
+ assert_visual_eq(&row2.render_with_mask(&mask), "! ");
}
/// Test 20: Position mask creates minimal grid
@@ -442,8 +456,7 @@ mod status_column_rendering_tests {
..Default::default()
};
let result1 = row1.render_with_mask(&mask);
- assert_eq!(result1, " ≡");
- assert_eq!(result1.chars().count(), 2); // 2 chars, not 8
+ assert_visual_eq(&result1, " ≡");
// Row 2: only position 0 (working tree)
let row2 = StatusSymbols {
@@ -451,7 +464,6 @@ mod status_column_rendering_tests {
..Default::default()
};
let result2 = row2.render_with_mask(&mask);
- assert_eq!(result2, "! ");
- assert_eq!(result2.chars().count(), 2); // 2 chars, not 8
+ assert_visual_eq(&result2, "! ");
}
}
diff --git a/src/styling/format.rs b/src/styling/format.rs
index d9078dbb5..b6895cb62 100644
--- a/src/styling/format.rs
+++ b/src/styling/format.rs
@@ -24,7 +24,7 @@ const DEFAULT_TERMINAL_WIDTH: usize = 80;
pub const GUTTER_OVERHEAD: usize = 3;
/// Strip ANSI escape codes from a string using strip-ansi-escapes
-fn strip_ansi_codes(s: &str) -> String {
+pub fn strip_ansi_codes(s: &str) -> String {
strip_ansi_escapes::strip_str(s)
}
diff --git a/src/styling/mod.rs b/src/styling/mod.rs
index f08b2a0b1..d8e210fbe 100644
--- a/src/styling/mod.rs
+++ b/src/styling/mod.rs
@@ -26,7 +26,7 @@ pub use anstyle::Style as AnstyleStyle;
// Re-export our public types
pub use constants::*;
-pub use format::{GUTTER_OVERHEAD, format_bash_with_gutter, format_with_gutter};
+pub use format::{GUTTER_OVERHEAD, format_bash_with_gutter, format_with_gutter, strip_ansi_codes};
pub use highlighting::format_toml;
pub use line::{StyledLine, StyledString};
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 9570a96d0..fdf736ba9 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/.tmpAWt3Oq/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpDIjjzc/test-config.toml
---
success: true
exit_code: 0
@@ -105,7 +105,7 @@ exit_code: 0
},
"commits_display": "/u001b[32m↑2/u001b[0m /u001b[2m/u001b[31m↓2/u001b[0m",
"branch_diff_display": "/u001b[32m+1/u001b[0m",
- "status_display": "?! ↕ ",
+ "status_display": "/u001b[36m?!/u001b[0m ↕ ",
"working_diff_display": "/u001b[32m+1/u001b[0m /u001b[31m-1/u001b[0m"
},
{
@@ -147,7 +147,7 @@ exit_code: 0
"user_status": null
},
"commits_display": "/u001b[2m/u001b[31m↓2/u001b[0m",
- "status_display": " ↓ ∅ "
+ "status_display": " ↓ /u001b[2m∅/u001b[0m "
}
]
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 32e90d0a5..93185c133 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/.tmpglj0lC/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpNSZOFm/test-config.toml
---
success: true
exit_code: 0
@@ -107,7 +107,7 @@ exit_code: 0
"working_tree": "",
"user_status": null
},
- "status_display": " ≡ "
+ "status_display": " /u001b[2m≡/u001b[0m "
},
{
"type": "worktree",
@@ -151,7 +151,7 @@ exit_code: 0
"working_tree": "",
"user_status": null
},
- "status_display": " ≡⊠ "
+ "status_display": " /u001b[2m≡/u001b[0m/u001b[33m⊠/u001b[0m "
}
]
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 ff2904e16..7526a3c2a 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/.tmpdnC2sy/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpcTmZuL/test-config.toml
---
success: true
exit_code: 0
@@ -107,7 +107,7 @@ exit_code: 0
"working_tree": "",
"user_status": "🔧"
},
- "status_display": " ≡ 🔧"
+ "status_display": " /u001b[2m≡/u001b[0m 🔧"
},
{
"type": "worktree",
@@ -151,7 +151,7 @@ exit_code: 0
"working_tree": "",
"user_status": null
},
- "status_display": " ≡ "
+ "status_display": " /u001b[2m≡/u001b[0m "
}
]
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 e5a9f44d4..96e4244c9 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/.tmpTBdkX2/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpn2Ky9f/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__list_with_c_flag.snap b/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snap
index 67cb0a989..cd64f5d8f 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/.tmpo4Vz4F/test-repo
+ - /private/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpxvzlCG/test-repo
- list
env:
CLICOLOR_FORCE: "1"
@@ -16,8 +16,8 @@ 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__locked_no_reason.snap b/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap
index c41e7f071..85884ad1f 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/.tmp9tK1a8/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp2t0qWp/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 93937ebff..3026d4345 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/.tmpkYuC3g/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmptcut9H/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 e897f6809..eeb8f7b97 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/.tmprFrv2K/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0Jg3w4/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
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 815244177..bb6df7964 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/.tmpdHphhD/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpsGoyzk/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 13907bc19..9d7de9f3a 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/.tmpza5aJR/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpQreEDm/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__readme_example_simple_list.snap b/tests/snapshots/integration__integration_tests__list__readme_example_simple_list.snap
index 586e92213..aa6644650 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/.tmpRauRta/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpwFDA4j/test-config.toml
---
success: true
exit_code: 0
@@ -23,7 +23,7 @@ exit_code: 0
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
+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__unicode_commit_message.snap b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap
index fbf8d9e9b..9c532076f 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/.tmpfohlMP/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpJxwHmB/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
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 3816c6a3c..ff87932ad 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
@@ -11,18 +11,19 @@ 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/.tmpYGYUv1/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpXzaYQA/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 4bf27935e..fa68db35d 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/.tmp1nffpe/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpA2nHxV/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 45a33bb62..c127c54dc 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/.tmpUsgzoM/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpHDByIR/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 147d29066..50225d912 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/.tmpNXg1bA/mock-bin:/Users/maximilian/.cargo/bin:/Users/maximilian/.local/bin:/Users/maximilian/.bun/bin:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
+ PATH: "/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpUb65WQ/mock-bin:/Users/maximilian/.cargo/bin:/Users/maximilian/.local/bin:/Users/maximilian/.bun/bin:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpNXg1bA/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpUb65WQ/test-config.toml
---
success: true
exit_code: 0
@@ -26,10 +26,10 @@ exit_code: 0
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
+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
+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 3219ed922..2bc91a4f7 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/.tmptbUu5e/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpWE5JFJ/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
+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 af4e917d3..14d1fe1c8 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/.tmpZ7d8IN/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpxpTfkt/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 b1051f794..06dad69f1 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/.tmpJLFZ2o/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp1uRldo/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
+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 f60e1fbe9..0675b71bd 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/.tmpNeliRA/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpS1kIx7/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 cae01c6d6..93f18960d 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/.tmplJ42h4/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp6Vlapm/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
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 b97136a62..52dee9bf2 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/.tmpHXFmr9/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpCpEYl4/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 79bf7ed53..fbada3f01 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/.tmpE7N5Oj/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpOOtT28/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 ebb50d22d..1da2fe775 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/.tmpRryRwU/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp6DiobG/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__unicode_branch_names.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__unicode_branch_names.snap
index e33d34cb3..a9dbc80e7 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/.tmpO9wv2m/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpMIPLBV/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