Skip to content

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

feat(list): Improve column allocation and CI status logic for two-phase allocation

Maximilian Roos85dc5730fcf0
diff --git a/src/commands/list/layout.rs b/src/commands/list/layout.rs
index 2f5462b5c..49686cb85 100644
--- a/src/commands/list/layout.rs
+++ b/src/commands/list/layout.rs
@@ -1,3 +1,122 @@
+//! Column layout and priority allocation for the list command.
+//!
+//! # TODO: Priority System Design & Future Improvements
+//!
+//! ## Current Approach: Priority with Modifiers
+//!
+//! The allocation system uses a **priority scoring model**:
+//! ```text
+//! final_priority = base_priority + modifiers
+//! ```
+//!
+//! **Base priorities** (1-11) are determined by **user need hierarchy** - what questions users need
+//! answered when scanning worktrees:
+//! - 1: Branch (identity - "what is this?")
+//! - 2: Working diff (critical - "do I need to commit?")
+//! - 3: Ahead/behind (critical - "am I out of sync?")
+//! - 4-10: Context (work volume, states, path, time, CI, etc.)
+//! - 11: Message (nice-to-have, space-hungry)
+//!
+//! **Modifiers** adjust priority based on column attributes:
+//! - **Empty penalty**: +10 if column has no data (only header)
+//! - Empty working_diff: 2 + 10 = priority 12
+//! - Empty ahead/behind: 3 + 10 = priority 13
+//! - etc.
+//!
+//! This creates two effective priority tiers:
+//! - **Tier 1 (priorities 1-11)**: Columns with actual data
+//! - **Tier 2 (priorities 12-21)**: Empty columns (visual consistency)
+//!
+//! The empty penalty is large (+10) but not infinite, so empty columns maintain their relative
+//! ordering (empty working_diff still ranks higher than empty ci_status) for visual consistency.
+//!
+//! ## Why This Design?
+//!
+//! **Problem**: Terminal width is limited. We must decide what to show.
+//!
+//! **Goals**:
+//! 1. Show critical data (uncommitted changes, sync status) at any terminal width
+//! 2. Show nice-to-have data (message, commit hash) when space allows
+//! 3. Maintain visual consistency - empty columns in predictable positions at wide widths
+//!
+//! **Key decision**: Message sits at the boundary (priority 11). Empty columns (priority 12+)
+//! rank below message, so:
+//! - Narrow terminals: Data columns + message (hide empty columns)
+//! - Wide terminals: Data columns + message + empty columns (visual consistency)
+//!
+//! ## Current Implementation
+//!
+//! The code implements this as two explicit phases:
+//! ```rust
+//! // Phase 1: Base priorities 1-11 (columns with data)
+//! if data_flags.working_diff { allocate(priority=2) }
+//!
+//! // Message base allocation (priority 11)
+//! allocate_message_base();
+//!
+//! // Phase 2: Base priorities + empty penalty (12-21)
+//! if !data_flags.working_diff { allocate(priority=2+10=12) }
+//!
+//! // Message expansion (uses leftover space)
+//! expand_message_to_max();
+//! ```
+//!
+//! **Pros**:
+//! - Simple, explicit, easy to understand
+//! - Low abstraction overhead
+//! - Easy to modify individual column logic
+//!
+//! **Cons**:
+//! - Priority calculation is implicit (scattered across code)
+//! - Adding new modifiers requires code changes
+//! - Some duplication (Phase 2 repeats allocation logic)
+//!
+//! ## Future: Generalized Priority System?
+//!
+//! **Could we make this more explicit?**
+//! ```rust
+//! struct ColumnPriority {
+//! base: u8, // User need ranking (1-11)
+//! empty_penalty: u8, // +10 if no data
+//! // Future modifiers:
+//! // width_bonus: i8, // -1 if terminal_width > 150
+//! // user_priority: i8, // User-configured adjustments
+//! }
+//!
+//! fn calculate_priority(column: Column, context: &Context) -> u8 {
+//! let base = column.base_priority();
+//! let empty = if column.has_data(context) { 0 } else { 10 };
+//! base + empty
+//! }
+//!
+//! // Sort by priority, then allocate in order
+//! columns.sort_by_key(|c| calculate_priority(c, &context));
+//! for column in columns { allocate(column); }
+//! ```
+//!
+//! **Pros**:
+//! - Priority calculation is explicit and centralized
+//! - Easy to add new modifiers (terminal width, user config, etc.)
+//! - Single allocation loop (no Phase 1/Phase 2 duplication)
+//!
+//! **Cons**:
+//! - More abstraction (struct, enum, sorting)
+//! - Harder to understand at a glance
+//! - Message variable sizing still needs special handling (min/preferred/max)
+//! - Premature generalization? (YAGNI - we don't have other modifiers yet)
+//!
+//! ## Decision: Keep Current Implementation For Now
+//!
+//! The explicit two-phase approach is **clear and sufficient** for current needs. The priority
+//! system is conceptually sound - we just need better documentation.
+//!
+//! **Refactor when**:
+//! - We add a second modifier (terminal width bonus, user config, etc.)
+//! - The duplication becomes painful (more than ~6 empty columns)
+//! - Priority ordering becomes hard to reason about
+//!
+//! Until then: **Simple > Generic**.
+
use crate::display::{find_common_prefix, get_terminal_width};
use std::path::{Path, PathBuf};
use unicode_width::UnicodeWidthStr;
@@ -7,6 +126,31 @@ use super::model::ListItem;
/// Width of short commit hash display (first 8 hex characters)
const COMMIT_HASH_WIDTH: usize = 8;
+/// Column header labels - single source of truth for all column headers.
+/// Both layout calculations and rendering use these constants.
+pub const HEADER_BRANCH: &str = "Branch";
+pub const HEADER_WORKING_DIFF: &str = "Working ±";
+pub const HEADER_AHEAD_BEHIND: &str = "Main ↕";
+pub const HEADER_BRANCH_DIFF: &str = "Main ±";
+pub const HEADER_STATE: &str = "State";
+pub const HEADER_PATH: &str = "Path";
+pub const HEADER_UPSTREAM: &str = "Remote ↕";
+pub const HEADER_AGE: &str = "Age";
+pub const HEADER_CI: &str = "CI";
+pub const HEADER_COMMIT: &str = "Commit";
+pub const HEADER_MESSAGE: &str = "Message";
+
+/// Ensures a column width is at least as wide as its header.
+///
+/// This is the general solution for preventing header overflow: pass the header
+/// string and the calculated data width, and this returns the larger of the two.
+///
+/// Use this for every column width calculation to ensure headers never overflow.
+fn fit_header(header: &str, data_width: usize) -> usize {
+ use unicode_width::UnicodeWidthStr;
+ data_width.max(header.width())
+}
+
/// Helper: Try to allocate space for a column. Returns the allocated width if successful.
/// Updates `remaining` by subtracting the allocated width + spacing.
/// If is_first is true, doesn't require spacing before the column.
@@ -58,7 +202,6 @@ pub struct ColumnWidths {
pub branch: usize,
pub time: usize,
pub ci_status: usize,
- pub conflicts: usize,
pub message: usize,
pub ahead_behind: DiffWidths,
pub working_diff: DiffWidths,
@@ -69,6 +212,17 @@ pub struct ColumnWidths {
pub path: usize,
}
+/// Tracks which columns have actual data (vs just headers)
+#[derive(Clone, Copy, Debug)]
+pub struct ColumnDataFlags {
+ pub working_diff: bool,
+ pub ahead_behind: bool,
+ pub branch_diff: bool,
+ pub upstream: bool,
+ pub states: bool,
+ pub ci_status: bool,
+}
+
/// Absolute column positions for guaranteed alignment
#[derive(Clone, Copy, Debug)]
pub struct ColumnPositions {
@@ -76,7 +230,6 @@ pub struct ColumnPositions {
pub working_diff: usize,
pub ahead_behind: usize,
pub branch_diff: usize,
- pub conflicts: usize,
pub states: usize,
pub path: usize,
pub upstream: usize,
@@ -93,12 +246,15 @@ pub struct LayoutConfig {
pub max_message_len: usize,
}
-pub fn calculate_column_widths(items: &[ListItem]) -> ColumnWidths {
- // Initialize with header label widths to ensure headers always fit
- let mut max_branch = "Branch".width();
- let mut max_time = "Age".width();
- let mut max_message = "Message".width();
- let mut max_states = 0; // Start at 0, will use header width if needed
+pub fn calculate_column_widths(
+ items: &[ListItem],
+ fetch_ci: bool,
+) -> (ColumnWidths, ColumnDataFlags) {
+ // Track maximum data widths (headers are enforced via fit_header() later)
+ let mut max_branch = 0;
+ let mut max_time = 0;
+ let mut max_message = 0;
+ let mut max_states = 0;
// Track diff component widths separately
let mut max_wt_added_digits = 0;
@@ -160,68 +316,64 @@ pub fn calculate_column_widths(items: &[ListItem]) -> ColumnWidths {
max_upstream_behind_digits.max(upstream_behind.to_string().len());
}
- // States (worktrees only)
- if let Some(info) = worktree_info {
- let states = super::render::format_all_states(info);
- if !states.is_empty() {
- max_states = max_states.max(states.width());
- }
+ // States (includes conflicts, worktree states, etc.)
+ let states = super::render::format_all_states(item);
+ if !states.is_empty() {
+ max_states = max_states.max(states.width());
}
}
// Calculate diff widths: "+{added} -{deleted}"
// Format: "+" + digits + " " + "-" + digits
- let working_diff_total = if max_wt_added_digits > 0 || max_wt_deleted_digits > 0 {
- let data_width = 1 + max_wt_added_digits + 1 + 1 + max_wt_deleted_digits;
- data_width.max("Working ±".width()) // Ensure header fits if we have data
+ let has_working_diff_data = max_wt_added_digits > 0 || max_wt_deleted_digits > 0;
+ let working_diff_data_width = if has_working_diff_data {
+ 1 + max_wt_added_digits + 1 + 1 + max_wt_deleted_digits
} else {
- 0 // No data, no column
+ 0
};
- let branch_diff_total = if max_br_added_digits > 0 || max_br_deleted_digits > 0 {
- let data_width = 1 + max_br_added_digits + 1 + 1 + max_br_deleted_digits;
- data_width.max("Main ±".width()) // Ensure header fits if we have data
+ let working_diff_total = fit_header(HEADER_WORKING_DIFF, working_diff_data_width);
+
+ let has_branch_diff_data = max_br_added_digits > 0 || max_br_deleted_digits > 0;
+ let branch_diff_data_width = if has_branch_diff_data {
+ 1 + max_br_added_digits + 1 + 1 + max_br_deleted_digits
} else {
- 0 // No data, no column
+ 0
};
+ let branch_diff_total = fit_header(HEADER_BRANCH_DIFF, branch_diff_data_width);
// Calculate ahead/behind column width (format: "↑n ↓n")
- let ahead_behind_total = if max_ahead_digits > 0 || max_behind_digits > 0 {
- let data_width = 1 + max_ahead_digits + 1 + 1 + max_behind_digits;
- data_width.max("Main ↕".width())
+ let has_ahead_behind_data = max_ahead_digits > 0 || max_behind_digits > 0;
+ let ahead_behind_data_width = if has_ahead_behind_data {
+ 1 + max_ahead_digits + 1 + 1 + max_behind_digits
} else {
0
};
+ let ahead_behind_total = fit_header(HEADER_AHEAD_BEHIND, ahead_behind_data_width);
// Calculate upstream column width (format: "↑n ↓n" or "remote ↑n ↓n")
- let upstream_total = if max_upstream_ahead_digits > 0 || max_upstream_behind_digits > 0 {
+ let has_upstream_data = max_upstream_ahead_digits > 0 || max_upstream_behind_digits > 0;
+ let upstream_data_width = if has_upstream_data {
// Format: "↑" + digits + " " + "↓" + digits
// TODO: Add remote name when show_remote_names is implemented
- let data_width = 1 + max_upstream_ahead_digits + 1 + 1 + max_upstream_behind_digits;
- data_width.max("Remote ↕".width())
+ 1 + max_upstream_ahead_digits + 1 + 1 + max_upstream_behind_digits
} else {
0
};
+ let upstream_total = fit_header(HEADER_UPSTREAM, upstream_data_width);
- let final_states = if max_states > 0 {
- max_states.max("State".width())
- } else {
- 0
- };
-
- // CI status column: Always 2 chars wide if any item has CI status
- let has_ci_status = items.iter().any(|item| item.pr_status().is_some());
- let ci_status_width = if has_ci_status { 2 } else { 0 };
+ let has_states_data = max_states > 0;
+ let final_states = fit_header(HEADER_STATE, max_states);
- // Conflicts column: Always 2 chars wide if any item has conflicts
- let has_conflicts = items.iter().any(|item| item.has_conflicts());
- let conflicts_width = if has_conflicts { 2 } else { 0 };
+ // CI status column: Always 2 chars wide
+ // Only show if we attempted to fetch CI data (regardless of whether any items have status)
+ let has_ci_status = fetch_ci && items.iter().any(|item| item.pr_status().is_some());
+ let ci_status_width = 2; // Fixed width
- ColumnWidths {
- branch: max_branch,
- time: max_time,
- ci_status: ci_status_width,
- conflicts: conflicts_width,
- message: max_message,
+ let widths = ColumnWidths {
+ branch: fit_header(HEADER_BRANCH, max_branch),
+ time: fit_header(HEADER_AGE, max_time),
+ ci_status: fit_header(HEADER_CI, ci_status_width),
+ message: fit_header(HEADER_MESSAGE, max_message),
ahead_behind: DiffWidths {
total: ahead_behind_total,
added_digits: max_ahead_digits,
@@ -245,11 +397,26 @@ pub fn calculate_column_widths(items: &[ListItem]) -> ColumnWidths {
states: final_states,
commit: COMMIT_HASH_WIDTH,
path: 0, // Path width calculated later in responsive layout
- }
+ };
+
+ let data_flags = ColumnDataFlags {
+ working_diff: has_working_diff_data,
+ ahead_behind: has_ahead_behind_data,
+ branch_diff: has_branch_diff_data,
+ upstream: has_upstream_data,
+ states: has_states_data,
+ ci_status: has_ci_status,
+ };
+
+ (widths, data_flags)
}
/// Calculate responsive layout based on terminal width
-pub fn calculate_responsive_layout(items: &[ListItem], show_full: bool) -> LayoutConfig {
+pub fn calculate_responsive_layout(
+ items: &[ListItem],
+ show_full: bool,
+ fetch_ci: bool,
+) -> LayoutConfig {
let terminal_width = get_terminal_width();
let paths: Vec<&Path> = items
.iter()
@@ -257,11 +424,11 @@ pub fn calculate_responsive_layout(items: &[ListItem], show_full: bool) -> Layou
.collect();
let common_prefix = find_common_prefix(&paths);
- // Calculate ideal column widths
- let ideal_widths = calculate_column_widths(items);
+ // Calculate ideal column widths and track which columns have data
+ let (ideal_widths, data_flags) = calculate_column_widths(items, fetch_ci);
// Calculate actual maximum path width (after common prefix removal)
- let max_path_width = items
+ let path_data_width = items
.iter()
.filter_map(|item| item.worktree_path())
.map(|path| {
@@ -270,35 +437,45 @@ pub fn calculate_responsive_layout(items: &[ListItem], show_full: bool) -> Layou
shorten_path(path.as_path(), &common_prefix).width()
})
.max()
- .unwrap_or(20); // fallback to 20 if no paths
+ .unwrap_or(0);
+ let max_path_width = fit_header(HEADER_PATH, path_data_width);
let spacing = 2;
- let commit_width = COMMIT_HASH_WIDTH;
+ let commit_width = fit_header(HEADER_COMMIT, COMMIT_HASH_WIDTH);
- // Priority order for columns (from high to low):
+ // Two-phase priority allocation:
+ // Phase 1: Allocate columns with actual data (in priority order)
+ // Message: Always allocated before empty columns
+ // Phase 2: Allocate empty columns (only if space remains after message)
+ //
+ // Priority order (from high to low):
+ // === Phase 1: Columns with data ===
// 1. branch - identity (what is this?)
// 2. working_diff - uncommitted changes (CRITICAL: do I need to commit?)
// 3. ahead_behind - commits difference (CRITICAL: am I ahead/behind?)
// 4. branch_diff - line diff in commits (work volume in those commits)
- // 5. conflicts - merge conflicts with main (CRITICAL: will merge fail?)
- // 6. states - special states like [rebasing] (rare but urgent when present)
- // 7. path - location (where is this?)
- // 8. upstream - tracking configuration (sync context)
- // 9. time - recency (nice-to-have context)
- // 10. ci_status - CI/PR status (contextual when available)
- // 11. commit - hash (reference info, rarely needed)
- // 12. message - description (nice-to-have, space-hungry)
+ // 5. states - special states like [rebasing], (conflicts) (rare but urgent when present)
+ // 6. path - location (where is this?)
+ // 7. upstream - tracking configuration (sync context)
+ // 8. time - recency (nice-to-have context)
+ // 9. ci_status - CI/PR status (contextual when available)
+ // 10. commit - hash (reference info, rarely needed)
+ // 11. message - description (nice-to-have, space-hungry)
+ // === Phase 2: Empty columns (only if space remains) ===
+ // 12. working_diff (if empty)
+ // 13. ahead_behind (if empty)
+ // 14. branch_diff (if empty)
+ // 15. states (if empty)
+ // 16. upstream (if empty)
+ // 17. ci_status (if empty)
//
- // Note: ahead_behind, branch_diff, and conflicts are adjacent (all describe commits vs main and mergeability)
- // Each column is shown if it has any data (ideal_width > 0) and fits in remaining space.
- // All columns participate in priority allocation - nothing is "essential".
+ // Note: ahead_behind and branch_diff are adjacent (both describe commits vs main)
let mut remaining = terminal_width;
let mut widths = ColumnWidths {
branch: 0,
time: 0,
ci_status: 0,
- conflicts: 0,
message: 0,
ahead_behind: DiffWidths::zero(),
working_diff: DiffWidths::zero(),
@@ -309,35 +486,41 @@ pub fn calculate_responsive_layout(items: &[ListItem], show_full: bool) -> Layou
path: 0,
};
- // Branch column (highest priority - identity)
+ // === PHASE 1: Allocate columns with data ===
+
+ // Branch column (highest priority - identity, always has data)
widths.branch = try_allocate(&mut remaining, ideal_widths.branch, spacing, true);
// Working diff column (critical - uncommitted changes)
- let allocated_width = try_allocate(
- &mut remaining,
- ideal_widths.working_diff.total,
- spacing,
- false,
- );
- if allocated_width > 0 {
- widths.working_diff = ideal_widths.working_diff;
+ if data_flags.working_diff {
+ let allocated_width = try_allocate(
+ &mut remaining,
+ ideal_widths.working_diff.total,
+ spacing,
+ false,
+ );
+ if allocated_width > 0 {
+ widths.working_diff = ideal_widths.working_diff;
+ }
}
// Ahead/behind column (critical sync status)
- let allocated_width = try_allocate(
- &mut remaining,
- ideal_widths.ahead_behind.total,
- spacing,
- false,
- );
- if allocated_width > 0 {
- widths.ahead_behind = ideal_widths.ahead_behind;
+ if data_flags.ahead_behind {
+ let allocated_width = try_allocate(
+ &mut remaining,
+ ideal_widths.ahead_behind.total,
+ spacing,
+ false,
+ );
+ if allocated_width > 0 {
+ widths.ahead_behind = ideal_widths.ahead_behind;
+ }
}
// Branch diff column (work volume in those commits)
// Hidden by default - considered too noisy for typical usage.
// May reconsider showing by default in future based on user feedback.
- if show_full {
+ if show_full && data_flags.branch_diff {
let allocated_width = try_allocate(
&mut remaining,
ideal_widths.branch_diff.total,
@@ -349,31 +532,36 @@ pub fn calculate_responsive_layout(items: &[ListItem], show_full: bool) -> Layou
}
}
- // Conflicts column (merge conflicts indicator - critical for mergeability)
- widths.conflicts = try_allocate(&mut remaining, ideal_widths.conflicts, spacing, false);
-
- // States column (rare but urgent when present)
- widths.states = try_allocate(&mut remaining, ideal_widths.states, spacing, false);
+ // States column (rare but urgent when present, now includes conflicts)
+ if data_flags.states {
+ widths.states = try_allocate(&mut remaining, ideal_widths.states, spacing, false);
+ }
- // Path column (location - important for navigation)
+ // Path column (location - important for navigation, always has data)
widths.path = try_allocate(&mut remaining, max_path_width, spacing, false);
// Upstream column (sync configuration)
- let allocated_width = try_allocate(&mut remaining, ideal_widths.upstream.total, spacing, false);
- if allocated_width > 0 {
- widths.upstream = ideal_widths.upstream;
+ if data_flags.upstream {
+ let allocated_width =
+ try_allocate(&mut remaining, ideal_widths.upstream.total, spacing, false);
+ if allocated_width > 0 {
+ widths.upstream = ideal_widths.upstream;
+ }
}
- // Time column (contextual information)
+ // Time column (contextual information, always has data)
widths.time = try_allocate(&mut remaining, ideal_widths.time, spacing, false);
// CI status column (high priority when present, fixed width)
- widths.ci_status = try_allocate(&mut remaining, ideal_widths.ci_status, spacing, false);
+ if data_flags.ci_status {
+ widths.ci_status = try_allocate(&mut remaining, ideal_widths.ci_status, spacing, false);
+ }
- // Commit column (reference hash - rarely needed)
+ // Commit column (reference hash - rarely needed, always has data)
widths.commit = try_allocate(&mut remaining, commit_width, spacing, false);
// Message column (flexible width: min 20, preferred 50, max 100)
+ // Allocated BEFORE empty columns - message has higher priority than empty columns
const MIN_MESSAGE: usize = 20;
const PREFERRED_MESSAGE: usize = 50;
const MAX_MESSAGE: usize = 100;
@@ -389,14 +577,74 @@ pub fn calculate_responsive_layout(items: &[ListItem], show_full: bool) -> Layou
if message_width > 0 {
remaining = remaining.saturating_sub(message_width + spacing);
widths.message = message_width.min(ideal_widths.message);
+ }
+
+ // === PHASE 2: Allocate empty columns (if space remains after message) ===
- // Expand with any leftover space (up to MAX_MESSAGE total)
- if remaining > 0 {
- let expansion = remaining.min(MAX_MESSAGE.saturating_sub(widths.message));
- widths.message += expansion;
+ // Working diff column (if no data)
+ if !data_flags.working_diff {
+ let allocated_width = try_allocate(
+ &mut remaining,
+ ideal_widths.working_diff.total,
+ spacing,
+ false,
+ );
+ if allocated_width > 0 {
+ widths.working_diff = ideal_widths.working_diff;
}
}
+ // Ahead/behind column (if no data)
+ if !data_flags.ahead_behind {
+ let allocated_width = try_allocate(
+ &mut remaining,
+ ideal_widths.ahead_behind.total,
+ spacing,
+ false,
+ );
+ if allocated_width > 0 {
+ widths.ahead_behind = ideal_widths.ahead_behind;
+ }
+ }
+
+ // Branch diff column (if no data)
+ if show_full && !data_flags.branch_diff {
+ let allocated_width = try_allocate(
+ &mut remaining,
+ ideal_widths.branch_diff.total,
+ spacing,
+ false,
+ );
+ if allocated_width > 0 {
+ widths.branch_diff = ideal_widths.branch_diff;
+ }
+ }
+
+ // States column (if no data)
+ if !data_flags.states {
+ widths.states = try_allocate(&mut remaining, ideal_widths.states, spacing, false);
+ }
+
+ // Upstream column (if no data)
+ if !data_flags.upstream {
+ let allocated_width =
+ try_allocate(&mut remaining, ideal_widths.upstream.total, spacing, false);
+ if allocated_width > 0 {
+ widths.upstream = ideal_widths.upstream;
+ }
+ }
+
+ // CI status column (if no data, but only if we attempted to fetch CI)
+ if fetch_ci && !data_flags.ci_status {
+ widths.ci_status = try_allocate(&mut remaining, ideal_widths.ci_status, spacing, false);
+ }
+
+ // Expand message with any leftover space (up to MAX_MESSAGE total)
+ if widths.message > 0 && widths.message < MAX_MESSAGE && remaining > 0 {
+ let expansion = remaining.min(MAX_MESSAGE - widths.message);
+ widths.message += expansion;
+ }
+
let final_max_message_len = widths.message;
// Calculate absolute column positions (with 2-space gaps between columns)
@@ -419,7 +667,6 @@ pub fn calculate_responsive_layout(items: &[ListItem], show_full: bool) -> Layou
working_diff: advance(widths.working_diff.total),
ahead_behind: advance(widths.ahead_behind.total),
branch_diff: advance(widths.branch_diff.total),
- conflicts: advance(widths.conflicts),
states: advance(widths.states),
path: advance(widths.path),
upstream: advance(widths.upstream.total),
@@ -478,7 +725,8 @@ mod tests {
working_diff_display: None,
};
- let widths = calculate_column_widths(&[super::ListItem::Worktree(info1)]);
+ let (widths, _data_flags) =
+ calculate_column_widths(&[super::ListItem::Worktree(info1)], false);
// "↑3 ↓2" has format "↑3 ↓2" = 1+1+1+1+1 = 5, but header "Main ↕" is 6
assert_eq!(
@@ -551,7 +799,7 @@ mod tests {
};
let items = vec![super::ListItem::Worktree(info)];
- let layout = calculate_responsive_layout(&items, false);
+ let layout = calculate_responsive_layout(&items, false, false);
let pos = &layout.positions;
let widths = &layout.widths;
@@ -560,10 +808,11 @@ mod tests {
// 1. Branch always starts at position 0
assert_eq!(pos.branch, 0, "Branch must start at position 0");
- // 2. States is hidden (no state data), should have position 0
- assert_eq!(
- pos.states, 0,
- "States column should be hidden (no state data)"
+ // 2. States may be visible in Phase 2 (empty but shown if space allows)
+ // Since we have plenty of space in wide terminal, states should be visible
+ assert!(
+ pos.states > 0,
+ "States column should be visible in Phase 2 (empty but shown if space)"
);
// 3. For visible columns, verify correct spacing
@@ -634,26 +883,39 @@ mod tests {
};
let items = vec![super::ListItem::Worktree(info)];
- let layout = calculate_responsive_layout(&items, false);
+ let layout = calculate_responsive_layout(&items, false, false);
let pos = &layout.positions;
// Branch should be at 0
assert_eq!(pos.branch, 0, "Branch always starts at position 0");
- // Hidden columns should have position 0
- assert_eq!(
- pos.working_diff, 0,
- "Working diff should be hidden (no changes)"
+ // With new two-phase allocation, empty columns are shown in Phase 2 if space allows
+ // Since we have a wide terminal (80 chars default) and minimal data, at least some empty columns should be visible
+
+ // Early Phase 2 columns should be visible (highest priority empty columns)
+ assert!(
+ pos.working_diff > 0,
+ "Working diff should be visible in Phase 2 (empty but shown if space)"
);
- assert_eq!(
- pos.ahead_behind, 0,
- "Ahead/behind should be hidden (primary worktree)"
+ assert!(
+ pos.ahead_behind > 0,
+ "Ahead/behind should be visible in Phase 2 (empty but shown if space)"
+ );
+
+ // Later Phase 2 columns might not fit (depending on terminal width)
+ // Just verify that at least some empty columns are visible
+ let empty_columns_visible = pos.working_diff > 0
+ || pos.ahead_behind > 0
+ || pos.branch_diff > 0
+ || pos.states > 0
+ || pos.upstream > 0;
+
+ assert!(
+ empty_columns_visible,
+ "At least some empty columns should be visible in Phase 2"
);
- assert_eq!(pos.branch_diff, 0, "Branch diff should be hidden (no diff)");
- assert_eq!(pos.states, 0, "States should be hidden (no state)");
- assert_eq!(pos.upstream, 0, "Upstream should be hidden (no upstream)");
- // Path should be visible (only visible column besides branch)
+ // Path should be visible (always has data)
assert!(pos.path > 0, "Path should be visible");
}
@@ -697,39 +959,37 @@ mod tests {
};
let items = vec![super::ListItem::Worktree(info)];
- let layout = calculate_responsive_layout(&items, false);
+ let layout = calculate_responsive_layout(&items, false, false);
let pos = &layout.positions;
let widths = &layout.widths;
- // Verify all middle columns are hidden (position = 0)
- assert_eq!(
- pos.working_diff, 0,
- "Working diff should be hidden (no changes)"
- );
- assert_eq!(
- pos.ahead_behind, 0,
- "Ahead/behind should be hidden (primary worktree)"
- );
- assert_eq!(pos.branch_diff, 0, "Branch diff should be hidden (no diff)");
- assert_eq!(pos.states, 0, "States should be hidden (no state)");
+ // With two-phase allocation, empty columns are allocated in Phase 2 (after data columns)
+ // Phase 1: branch (data), path (data), time (data), commit (data), message (data)
+ // Phase 2: working_diff (empty), ahead_behind (empty), branch_diff (empty), states (empty), upstream (empty), ci_status (empty)
- // The critical test: path should come immediately after branch
- // with only one gap, not affected by the hidden columns
- let gap = 2;
- let expected_path_pos = widths.branch + gap;
+ // In Phase 1, path comes after branch immediately (since all middle columns have no data)
+ // Branch, path, time, commit, message are allocated first
- assert_eq!(
- pos.path, expected_path_pos,
- "Path should be positioned immediately after branch (branch_width + gap), \
- skipping all hidden columns. Expected {}, got {}",
- expected_path_pos, pos.path
+ // Path should come early since it has data and is allocated in Phase 1
+ assert!(
+ pos.path > 0,
+ "Path should be visible (allocated in Phase 1)"
);
- // Verify the invariant: hidden columns don't consume position space
- // Only visible columns advance the position counter
+ // With the corrected Phase 2 allocation, empty columns only show if space remains AFTER message
+ // In this test with 80 character width and minimal data:
+ // - Branch, path, time, commit get allocated in Phase 1
+ // - Message gets allocated next (before empty columns)
+ // - Empty columns only allocated if space remains after message
+
+ // Message should be allocated (it comes before empty columns now)
assert!(
- pos.path < widths.branch + gap + 10,
- "Path position should not be inflated by hidden columns"
+ widths.message > 0,
+ "Message should be allocated before empty columns"
);
+
+ // Empty columns may or may not be visible depending on space remaining after message
+ // This is acceptable - message has priority over empty columns
+ // No assertion needed here - it's correct for empty columns to not show if message takes the space
}
}
diff --git a/src/commands/list/mod.rs b/src/commands/list/mod.rs
index 29b8161b5..e50958d03 100644
--- a/src/commands/list/mod.rs
+++ b/src/commands/list/mod.rs
@@ -95,7 +95,7 @@ pub fn handle_list(
println!("{}", json);
}
crate::OutputFormat::Table => {
- let layout = calculate_responsive_layout(&items, show_full);
+ let layout = calculate_responsive_layout(&items, show_full, show_full);
format_header_line(&layout);
for item in &items {
format_list_item_line(item, &layout, current_worktree_path.as_ref());
diff --git a/src/commands/list/render.rs b/src/commands/list/render.rs
index 2ed62fe8a..6a9c5da5a 100644
--- a/src/commands/list/render.rs
+++ b/src/commands/list/render.rs
@@ -3,8 +3,12 @@ use anstyle::{AnsiColor, Color, Style};
use worktrunk::styling::{ADDITION, CURRENT, DELETION, StyledLine, println};
use super::ci_status::{CiStatus, PrStatus};
-use super::layout::{DiffWidths, LayoutConfig};
-use super::model::{ListItem, WorktreeInfo};
+use super::layout::{
+ DiffWidths, HEADER_AGE, HEADER_AHEAD_BEHIND, HEADER_BRANCH, HEADER_BRANCH_DIFF, HEADER_CI,
+ HEADER_COMMIT, HEADER_MESSAGE, HEADER_PATH, HEADER_STATE, HEADER_UPSTREAM, HEADER_WORKING_DIFF,
+ LayoutConfig,
+};
+use super::model::ListItem;
/// Format ahead/behind counts as plain text with ANSI colors (for json-pretty)
pub fn format_ahead_behind_plain(ahead: usize, behind: usize) -> Option<String> {
@@ -222,22 +226,30 @@ fn format_ci_status(pr_status: &PrStatus) -> StyledLine {
segment
}
-pub fn format_all_states(info: &WorktreeInfo) -> String {
+pub fn format_all_states(item: &ListItem) -> String {
let mut states = Vec::new();
- if let Some(state) = info.worktree_state.as_ref() {
- states.push(format!("[{}]", state));
+ // Add conflicts state (applies to both worktrees and branches)
+ if item.has_conflicts() {
+ states.push("(conflicts)".to_string());
}
- if info.worktree.bare {
- states.push("(bare)".to_string());
- }
+ // Worktree-specific states
+ if let Some(info) = item.worktree_info() {
+ if let Some(state) = info.worktree_state.as_ref() {
+ states.push(format!("[{}]", state));
+ }
- if let Some(state) = optional_reason_state("locked", info.worktree.locked.as_deref()) {
- states.push(state);
- }
- if let Some(state) = optional_reason_state("prunable", info.worktree.prunable.as_deref()) {
- states.push(state);
+ if info.worktree.bare {
+ states.push("(bare)".to_string());
+ }
+
+ if let Some(state) = optional_reason_state("locked", info.worktree.locked.as_deref()) {
+ states.push(state);
+ }
+ if let Some(state) = optional_reason_state("prunable", info.worktree.prunable.as_deref()) {
+ states.push(state);
+ }
}
states.join(" ")
@@ -250,56 +262,67 @@ pub fn format_header_line(layout: &LayoutConfig) {
let mut line = StyledLine::new();
// Use absolute positions for guaranteed alignment
- push_header_at(&mut line, "Branch", widths.branch, positions.branch, style);
push_header_at(
&mut line,
- "Working ±",
+ HEADER_BRANCH,
+ widths.branch,
+ positions.branch,
+ style,
+ );
+ push_header_at(
+ &mut line,
+ HEADER_WORKING_DIFF,
widths.working_diff.total,
positions.working_diff,
style,
);
push_header_at(
&mut line,
- "Main ↕",
+ HEADER_AHEAD_BEHIND,
widths.ahead_behind.total,
positions.ahead_behind,
style,
);
push_header_at(
&mut line,
- "Main ±",
+ HEADER_BRANCH_DIFF,
widths.branch_diff.total,
positions.branch_diff,
style,
);
push_header_at(
&mut line,
- "⚠️",
- widths.conflicts,
- positions.conflicts,
+ HEADER_STATE,
+ widths.states,
+ positions.states,
style,
);
- push_header_at(&mut line, "State", widths.states, positions.states, style);
- push_header_at(&mut line, "Path", widths.path, positions.path, style);
+ push_header_at(&mut line, HEADER_PATH, widths.path, positions.path, style);
push_header_at(
&mut line,
- "Remote ↕",
+ HEADER_UPSTREAM,
widths.upstream.total,
positions.upstream,
style,
);
- push_header_at(&mut line, "Age", widths.time, positions.time, style);
+ push_header_at(&mut line, HEADER_AGE, widths.time, positions.time, style);
push_header_at(
&mut line,
- "CI",
+ HEADER_CI,
widths.ci_status,
positions.ci_status,
style,
);
- push_header_at(&mut line, "Commit", widths.commit, positions.commit, style);
push_header_at(
&mut line,
- "Message",
+ HEADER_COMMIT,
+ widths.commit,
+ positions.commit,
+ style,
+ );
+ push_header_at(
+ &mut line,
+ HEADER_MESSAGE,
widths.message,
positions.message,
style,
@@ -434,30 +457,13 @@ pub fn format_list_item_line(
}
}
- // Conflicts indicator
- if widths.conflicts > 0 {
- line.pad_to(positions.conflicts);
- if item.has_conflicts() {
- line.push_styled(
- "⚠️".to_string(),
- Style::new().fg_color(Some(Color::Ansi(AnsiColor::Yellow))),
- );
- } else {
- push_blank(&mut line, widths.conflicts);
- }
- }
-
- // States (worktrees only)
+ // States (includes conflicts)
if widths.states > 0 {
line.pad_to(positions.states);
- if let Some(info) = worktree_info {
- let states = format_all_states(info);
- if !states.is_empty() {
- let states_text = format!("{:width$}", states, width = widths.states);
- line.push_raw(states_text);
- } else {
- push_blank(&mut line, widths.states);
- }
+ let states = format_all_states(item);
+ if !states.is_empty() {
+ let states_text = format!("{:width$}", states, width = widths.states);
+ line.push_raw(states_text);
} else {
push_blank(&mut line, widths.states);
}
diff --git a/tests/integration_tests/column_alignment_verification.rs b/tests/integration_tests/column_alignment_verification.rs
index 777daf62e..912bd7389 100644
--- a/tests/integration_tests/column_alignment_verification.rs
+++ b/tests/integration_tests/column_alignment_verification.rs
@@ -38,6 +38,7 @@ struct ColumnPositions {
impl ColumnPositions {
/// Parse column positions from a header line (without ANSI codes)
+ /// Returns positions as display column indices, not byte indices
fn from_header(header: &str) -> Self {
let mut positions = ColumnPositions {
age: None,
@@ -51,33 +52,37 @@ impl ColumnPositions {
path: None,
};
+ // Helper to convert byte position to display position
+ let byte_to_display_pos = |byte_pos: usize| -> usize { header[..byte_pos].width() };
+
// Find column headers by their known names
- if let Some(pos) = header.find("Age") {
- positions.age = Some(pos);
+ // Note: str.find() returns byte positions, we need display positions
+ if let Some(byte_pos) = header.find("Age") {
+ positions.age = Some(byte_to_display_pos(byte_pos));
}
- if let Some(pos) = header.find("Main-Cmt") {
- positions.cmts = Some(pos);
+ if let Some(byte_pos) = header.find("Main-Cmt") {
+ positions.cmts = Some(byte_to_display_pos(byte_pos));
}
- if let Some(pos) = header.find("Main-Δ") {
- positions.cmt_diff = Some(pos);
+ if let Some(byte_pos) = header.find("Main ↕") {
+ positions.cmt_diff = Some(byte_to_display_pos(byte_pos));
}
- if let Some(pos) = header.find("Dirty") {
- positions.wt_diff = Some(pos);
+ if let Some(byte_pos) = header.find("Working ±") {
+ positions.wt_diff = Some(byte_to_display_pos(byte_pos));
}
- if let Some(pos) = header.find("Remote") {
- positions.remote = Some(pos);
+ if let Some(byte_pos) = header.find("Remote") {
+ positions.remote = Some(byte_to_display_pos(byte_pos));
}
- if let Some(pos) = header.find("Commit") {
- positions.commit = Some(pos);
+ if let Some(byte_pos) = header.find("Commit") {
+ positions.commit = Some(byte_to_display_pos(byte_pos));
}
- if let Some(pos) = header.find("Message") {
- positions.message = Some(pos);
+ if let Some(byte_pos) = header.find("Message") {
+ positions.message = Some(byte_to_display_pos(byte_pos));
}
- if let Some(pos) = header.find("State") {
- positions.state = Some(pos);
+ if let Some(byte_pos) = header.find("State") {
+ positions.state = Some(byte_to_display_pos(byte_pos));
}
- if let Some(pos) = header.find("Path") {
- positions.path = Some(pos);
+ if let Some(byte_pos) = header.find("Path") {
+ positions.path = Some(byte_to_display_pos(byte_pos));
}
positions
@@ -86,38 +91,41 @@ impl ColumnPositions {
/// Extract column boundaries by finding transitions from content to spaces
/// This is a more sophisticated approach that handles sparse columns
+/// Positions are in display columns, not character or byte indices
#[derive(Debug, Clone)]
struct ColumnBoundary {
- start: usize,
- end: usize,
+ start: usize, // Display column position
+ end: usize, // Display column position
content: String,
}
fn find_column_boundaries(line: &str) -> Vec<ColumnBoundary> {
let mut boundaries = Vec::new();
let chars: Vec<char> = line.chars().collect();
- let mut i = 0;
+ let mut char_idx = 0;
+ let mut display_pos = 0;
- while i < chars.len() {
+ while char_idx < chars.len() {
// Skip leading spaces
- while i < chars.len() && chars[i] == ' ' {
- i += 1;
+ while char_idx < chars.len() && chars[char_idx] == ' ' {
+ char_idx += 1;
+ display_pos += 1;
}
- if i >= chars.len() {
+ if char_idx >= chars.len() {
break;
}
// Found start of content
- let start = i;
+ let start_display_pos = display_pos;
let mut content = String::new();
// Collect content until we hit 2+ consecutive spaces or end
- while i < chars.len() {
- if chars[i] == ' ' {
+ while char_idx < chars.len() {
+ if chars[char_idx] == ' ' {
// Check if this is a column separator (2+ spaces)
let mut space_count = 0;
- let mut j = i;
+ let mut j = char_idx;
while j < chars.len() && chars[j] == ' ' {
space_count += 1;
j += 1;
@@ -128,18 +136,22 @@ fn find_column_boundaries(line: &str) -> Vec<ColumnBoundary> {
break;
} else {
// Single space within content
- content.push(chars[i]);
- i += 1;
+ content.push(chars[char_idx]);
+ char_idx += 1;
+ display_pos += 1;
}
} else {
- content.push(chars[i]);
- i += 1;
+ let ch = chars[char_idx];
+ content.push(ch);
+ char_idx += 1;
+ // Add display width of this character
+ display_pos += UnicodeWidthStr::width(ch.to_string().as_str());
}
}
boundaries.push(ColumnBoundary {
- start,
- end: i,
+ start: start_display_pos,
+ end: display_pos,
content: content.trim_end().to_string(),
});
}
@@ -221,22 +233,23 @@ fn verify_table_alignment(output: &str) -> Result<(), String> {
.map(|b| b.start);
// For the Path column specifically, verify it starts exactly where the header says
- if *col_name == "Path" && *expected_pos < row.len() {
+ if *col_name == "Path" {
// Find where the actual path content starts (typically "./")
- if let Some(path_start) =
- row[*expected_pos..].find("./").map(|p| expected_pos + p)
- && path_start != *expected_pos
+ // We need to convert from display position to check the content
+ if let Some(path_boundary) = boundaries.iter().find(|b| {
+ b.start <= *expected_pos
+ && b.end > *expected_pos
+ && b.content.starts_with("./")
+ }) && path_boundary.start != *expected_pos
{
errors.push(format!(
- "Row {}: Path column content starts at position {} but header says it should be at {}. Misalignment: {} characters.\n Row text: '{}'\n At position {}: '{}'\n Actual path: '{}'",
+ "Row {}: Path column content starts at display position {} but header says it should be at {}. Misalignment: {} characters.\n Row text: '{}'\n Path content: '{}'",
row_num,
- path_start,
+ path_boundary.start,
expected_pos,
- path_start - expected_pos,
+ path_boundary.start.abs_diff(*expected_pos),
row,
- expected_pos,
- &row[*expected_pos..(*expected_pos + 20).min(row.len())].replace(' ', "·"),
- &row[path_start..]
+ path_boundary.content
));
}
}
diff --git a/tests/snapshots/integration__integration_tests__list__detached_head.snap b/tests/snapshots/integration__integration_tests__list__detached_head.snap
index 5f0ed167b..e7163d0a4 100644
--- a/tests/snapshots/integration__integration_tests__list__detached_head.snap
+++ b/tests/snapshots/integration__integration_tests__list__detached_head.snap
@@ -15,13 +15,13 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpXpOsRN/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpT8O5UQ/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch PathAge Commit Message
-(detached) . 10 months ago b834638e Initial commit
+Branch Working ± Main ↕ State Path Remote ↕ Age Commit Message
+(detached) .  10 months ago b834638e Initial commit
Showing 1 worktree
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 b06b5907c..a61c10b9a 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/.tmpSJwl1w/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpdhHn78/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch State Path Age Commit Message
-main  ./test-repo  10 months ago b834638e Initial commit
-locked-no-reason (locked) ./locked-no-reason 10 months ago b834638e Initial commit
+Branch Working ± Main ↕ State Path Age Commit Message
+main  ./test-repo  10 months ago b834638e Initial commit
+locked-no-reason (locked) ./locked-no-reason 10 months ago b834638e 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 8505ddabf..a2162e421 100644
--- a/tests/snapshots/integration__integration_tests__list__locked_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__locked_worktree.snap
@@ -15,7 +15,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpSVDzII/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpen0wq9/test-config.toml
---
success: true
exit_code: 0
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 19328facb..839bf12ac 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/.tmp9R1VWO/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp8WdVkp/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Main ↕ Path Age Commit Message
-main  ./test-repo 10 months ago 1310bfb9 Short message
-feature-a ↓1 ./feature-a 10 months ago f078644e This is a very long commit message that should test how the message column handles...
+Branch Working ± Main ↕ State Path Remote ↕ Age Commit Message
+main  ./test-repo 10 months ago 1310bfb9 Short message
+feature-a ↓1 ./feature-a 10 months ago f078644e 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 41070a93a..377b405fb 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/.tmpYrE1WE/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp4sGxpp/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Path Age Commit Message
-main  ./test-repo  10 months ago b834638e Initial commit
-medium-name  ./medium-name  10 months ago b834638e Initial commit
-short  ./short  10 months ago b834638e Initial commit
-very-long-branch-name-here ./very-long-branch-name-here 10 months ago b834638e Initial commit
-with-changes  ./with-changes  10 months ago b834638e Initial commit
+Branch Working ± Path Age Commit Message
+main  ./test-repo  10 months ago b834638e Initial commit
+medium-name  ./medium-name  10 months ago b834638e Initial commit
+short  ./short  10 months ago b834638e Initial commit
+very-long-branch-name-here ./very-long-branch-name-here 10 months ago b834638e Initial commit
+with-changes  ./with-changes  10 months ago b834638e 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 f5637ba13..148d2bc5f 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/.tmpee4uIe/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpKY61Ed/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Path Age Commit Message
-main  ./test-repo 10 months ago b834638e Initial commit
-feature-a ./feature-a 10 months ago b834638e Initial commit
-feature-b ./feature-b 10 months ago b834638e Initial commit
+Branch Working ± Main ↕ State Path Remote ↕ Age Commit Message
+main  ./test-repo 10 months ago b834638e Initial commit
+feature-a ./feature-a 10 months ago b834638e Initial commit
+feature-b ./feature-b 10 months ago b834638e Initial commit
Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__single_worktree.snap b/tests/snapshots/integration__integration_tests__list__single_worktree.snap
index 63661d9f4..777a24bf5 100644
--- a/tests/snapshots/integration__integration_tests__list__single_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__single_worktree.snap
@@ -15,13 +15,13 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpanr76U/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp50pjPK/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch PathAge Commit Message
-main  . 10 months ago b834638e Initial commit
+Branch Working ± Main ↕ State Path Remote ↕ Age Commit Message
+main  .  10 months ago b834638e Initial commit
Showing 1 worktree
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 edaacca14..fee5b93fc 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/.tmp1XehRU/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpxUiV7K/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Main ↕ Path Age Commit Message
-main  ./test-repo  10 months ago e4614cb7 Fix bug with café ☕ handling
-feature-test ↓1 ./feature-test 10 months ago 0c53695b Add support for 日本語 and émoji 🎉
+Branch Working ± Main ↕ State Path Remote ↕ Age Commit Message
+main  ./test-repo  10 months ago e4614cb7 Fix bug with café ☕ handling
+feature-test ↓1 ./feature-test 10 months ago 0c53695b Add support for 日本語 and émoji 🎉
Showing 2 worktrees, 1 behind
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 31eddb574..a09bf621f 100644
--- a/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap
@@ -16,17 +16,17 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpf6rlKS/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpA02oY6/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Path Age Commit Message
-main  ./test-repo  10 months ago b834638e Initial commit
-feature-with-worktree  ./feature-with-worktree 10 months ago b834638e Initial commit
-another-branch  10 months ago b834638e Initial commit
-feature-without-worktree 10 months ago b834638e Initial commit
-fix-bug  10 months ago b834638e Initial commit
+Branch Working ± Main ↕ Path Age Commit Message
+main  ./test-repo  10 months ago b834638e Initial commit
+feature-with-worktree  ./feature-with-worktree 10 months ago b834638e Initial commit
+another-branch  10 months ago b834638e Initial commit
+feature-without-worktree 10 months ago b834638e Initial commit
+fix-bug  10 months ago b834638e Initial commit
Showing 2 worktrees, 3 branches
diff --git a/tests/snapshots/integration__integration_tests__list__with_branches_flag_none_available.snap b/tests/snapshots/integration__integration_tests__list__with_branches_flag_none_available.snap
index 8da229106..b6921385a 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/.tmpZ5v5r6/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpa5vrA2/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Path Age Commit Message
-main  ./test-repo 10 months ago b834638e Initial commit
-feature-a ./feature-a 10 months ago b834638e Initial commit
-feature-b ./feature-b 10 months ago b834638e Initial commit
+Branch Working ± Main ↕ State Path Remote ↕ Age Commit Message
+main  ./test-repo 10 months ago b834638e Initial commit
+feature-a ./feature-a 10 months ago b834638e Initial commit
+feature-b ./feature-b 10 months ago b834638e Initial commit
Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__with_branches_flag_only_branches.snap b/tests/snapshots/integration__integration_tests__list__with_branches_flag_only_branches.snap
index 8a6dacea6..f9ba3c549 100644
--- a/tests/snapshots/integration__integration_tests__list__with_branches_flag_only_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_branches_flag_only_branches.snap
@@ -16,16 +16,16 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp8A7GdE/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpQ3fU33/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch PathAge Commit Message
-main  . 10 months ago b834638e Initial commit
-branch-alpha 10 months ago b834638e Initial commit
-branch-beta  10 months ago b834638e Initial commit
-branch-gamma 10 months ago b834638e Initial commit
+Branch Working ± Main ↕ State Path Remote ↕ Age Commit Message
+main  .  10 months ago b834638e Initial commit
+branch-alpha 10 months ago b834638e Initial commit
+branch-beta  10 months ago b834638e Initial commit
+branch-gamma 10 months ago b834638e Initial commit
Showing 1 worktrees, 3 branches
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 329a6bb66..d1b8d6096 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/.tmp5b5Nqr/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpbbInkc/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Path Age Commit Message
-main  ./test-repo 10 months ago [SHA] Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
-feature ./feature  10 months ago [SHA] Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
+Branch Working ± Main ↕ State Path Remote ↕ Age Commit Message
+main  ./test-repo 10 months ago [SHA] Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
+feature ./feature  10 months ago [SHA] Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__security__path_with_directive_not_executed.snap b/tests/snapshots/integration__integration_tests__security__path_with_directive_not_executed.snap
index 23455ef74..8f2ebfbb1 100644
--- a/tests/snapshots/integration__integration_tests__security__path_with_directive_not_executed.snap
+++ b/tests/snapshots/integration__integration_tests__security__path_with_directive_not_executed.snap
@@ -15,13 +15,13 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpn4LYyL/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpJZMdo2/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch PathAge Commit Message
-main  . 10 months ago b834638e Initial commit
+Branch Working ± Main ↕ State Path Remote ↕ Age Commit Message
+main  .  10 months ago b834638e Initial commit
Showing 1 worktree
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 6672b706e..866df09c9 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/.tmp2juM3W/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpPEBGe4/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Working ± Path Age Commit Message
-main  ./test-repo  10 months ago b834638e Initial commit
-also-no-changes ./also-no-changes 10 months ago b834638e Initial commit
-no-changes  ./no-changes  10 months ago b834638e Initial commit
-with-changes +1 -1 ./with-changes 10 months ago b834638e Initial commit
+Branch Working ± Main ↕ State Path Remote ↕ Age Commit Message
+main  ./test-repo  10 months ago b834638e Initial commit
+also-no-changes ./also-no-changes 10 months ago b834638e Initial commit
+no-changes  ./no-changes  10 months ago b834638e Initial commit
+with-changes +1 -1 ./with-changes 10 months ago b834638e 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 9267a6a6e..988a5ab85 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/.tmpLgpYLD/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpKdCsDD/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Working ± Path Age Commit Message
-main  ./test-repo 10 months ago b834638e Initial commit
-huge  ./huge  10 months ago b834638e Initial commit
-tiny +1 -1 ./tiny 10 months ago b834638e Initial commit
+Branch Working ± Main ↕ State Path Remote ↕ Age Commit Message
+main  ./test-repo 10 months ago b834638e Initial commit
+huge  ./huge  10 months ago b834638e Initial commit
+tiny +1 -1 ./tiny 10 months ago b834638e 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 2eb84cc69..79d76e44a 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/.tmpvaNOsv/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmplPTfTH/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Path Age Commit Message
-main  ./test-repo  10 months ago b834638e Initial commit
-feature-large  ./feature-large  10 months ago b834638e Initial commit
-feature-medium ./feature-medium 10 months ago b834638e Initial commit
-feature-small  ./feature-small  10 months ago b834638e Initial commit
+Branch Working ± Main ↕ State Path Remote ↕ Age Commit Message
+main  ./test-repo  10 months ago b834638e Initial commit
+feature-large  ./feature-large  10 months ago b834638e Initial commit
+feature-medium ./feature-medium 10 months ago b834638e Initial commit
+feature-small  ./feature-small  10 months ago b834638e 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 3d603c6c0..3f2ae3f0b 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__long_branch_names.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__long_branch_names.snap
@@ -15,7 +15,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0A7MAM/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp7WY6vu/test-config.toml
---
success: true
exit_code: 0
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 f1094b05c..0b40b1ca1 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__mixed_length_branch_names.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__mixed_length_branch_names.snap
@@ -15,7 +15,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpbSvlxV/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpGNTDtD/test-config.toml
---
success: true
exit_code: 0
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 3c5e410c7..7af7f6711 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/.tmpXWDdNB/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp9i77HL/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Path Age Commit Message
-main  ./test-repo 10 months ago b834638e Initial commit
-a  ./a  10 months ago b834638e Initial commit
-bb  ./bb  10 months ago b834638e Initial commit
-ccc  ./ccc  10 months ago b834638e Initial commit
+Branch Working ± Main ↕ State Path Remote ↕ Age Commit Message
+main  ./test-repo 10 months ago b834638e Initial commit
+a  ./a  10 months ago b834638e Initial commit
+bb  ./bb  10 months ago b834638e Initial commit
+ccc  ./ccc  10 months ago b834638e 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 ce4c2dd4b..bd7b0c6bc 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/.tmp2stvRt/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpLd88cn/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Path Age Commit Message
-main  ./test-repo 10 months ago a7bc47ca Initial commit with a reasonably long message
-feature-a ./feature-a 10 months ago a7bc47ca Initial commit with a reasonably long message
-feature-b ./feature-b 10 months ago a7bc47ca Initial commit with a reasonably long message
+Branch Working ± Main ↕ Path Age Commit Message
+main  ./test-repo 10 months ago a7bc47ca Initial commit with a reasonably long message
+feature-a ./feature-a 10 months ago a7bc47ca Initial commit with a reasonably long message
+feature-b ./feature-b 10 months ago a7bc47ca 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 cce29d928..4072b9fcb 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/.tmpQquPsf/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpZUMn7V/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Path Age Commit Message
-main  ./test-repo 10 months ago a7bc47ca Initial commit with a reasonably long message
-feature-a ./feature-a 10 months ago a7bc47ca Initial commit with a reasonably long message
-feature-b ./feature-b 10 months ago a7bc47ca Initial commit with a reasonably long message
+Branch Working ± Main ↕ State Path Remote ↕ Age Commit Message
+main  ./test-repo 10 months ago a7bc47ca Initial commit with a reasonably long message
+feature-a ./feature-a 10 months ago a7bc47ca Initial commit with a reasonably long message
+feature-b ./feature-b 10 months ago a7bc47ca 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 14c91d701..9f9f5cef9 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,7 +15,7 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpOqVuJR/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpKVhUmm/test-config.toml
---
success: true
exit_code: 0
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 ad1ae01d7..25a7b59fa 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/.tmpUDTJaG/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmphLxyVi/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Path Age Commit Message
-main  ./test-repo 10 months ago b834638e Initial commit
-cafe  ./café  10 months ago b834638e Initial commit
-naive  ./naïve  10 months ago b834638e Initial commit
-resume ./résumé  10 months ago b834638e Initial commit
+Branch Working ± Main ↕ State Path Remote ↕ Age Commit Message
+main  ./test-repo 10 months ago b834638e Initial commit
+cafe  ./café  10 months ago b834638e Initial commit
+naive  ./naïve  10 months ago b834638e Initial commit
+resume ./résumé  10 months ago b834638e Initial commit
Showing 4 worktrees