Skip to content

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

feat(list): Implement absolute column positioning and refine column width calculations

Maximilian Roos7168e3032592
diff --git a/src/commands/list/layout.rs b/src/commands/list/layout.rs
index cba63a36f..300ef7f10 100644
--- a/src/commands/list/layout.rs
+++ b/src/commands/list/layout.rs
@@ -4,6 +4,9 @@ use unicode_width::UnicodeWidthStr;
use super::model::ListItem;
+/// Width of short commit hash display (first 8 hex characters)
+const COMMIT_HASH_WIDTH: usize = 8;
+
/// 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.
@@ -65,8 +68,25 @@ pub struct ColumnWidths {
pub path: usize,
}
+/// Absolute column positions for guaranteed alignment
+#[derive(Clone, Copy, Debug)]
+pub struct ColumnPositions {
+ pub branch: usize,
+ pub working_diff: usize,
+ pub ahead_behind: usize,
+ pub branch_diff: usize,
+ pub states: usize,
+ pub path: usize,
+ pub upstream: usize,
+ pub time: usize,
+ pub ci_status: usize,
+ pub commit: usize,
+ pub message: usize,
+}
+
pub struct LayoutConfig {
pub widths: ColumnWidths,
+ pub positions: ColumnPositions,
pub common_prefix: PathBuf,
pub max_message_len: usize,
}
@@ -151,13 +171,13 @@ pub fn calculate_column_widths(items: &[ListItem]) -> ColumnWidths {
// 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("WT +/-".width()) // Ensure header fits if we have data
+ data_width.max("Working ±".width()) // Ensure header fits if we have data
} else {
0 // No data, no column
};
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("Branch +/-".width()) // Ensure header fits if we have data
+ data_width.max("Main ±".width()) // Ensure header fits if we have data
} else {
0 // No data, no column
};
@@ -165,7 +185,7 @@ pub fn calculate_column_widths(items: &[ListItem]) -> ColumnWidths {
// 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("Commits".width())
+ data_width.max("Main ↕".width())
} else {
0
};
@@ -175,7 +195,7 @@ pub fn calculate_column_widths(items: &[ListItem]) -> ColumnWidths {
// 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())
+ data_width.max("Remote ↕".width())
} else {
0
};
@@ -216,8 +236,8 @@ pub fn calculate_column_widths(items: &[ListItem]) -> ColumnWidths {
deleted_digits: max_upstream_behind_digits,
},
states: final_states,
- commit: 8, // Fixed width for short commit hash
- path: 0, // Path width calculated later in responsive layout
+ commit: COMMIT_HASH_WIDTH,
+ path: 0, // Path width calculated later in responsive layout
}
}
@@ -246,7 +266,7 @@ pub fn calculate_responsive_layout(items: &[ListItem]) -> LayoutConfig {
.unwrap_or(20); // fallback to 20 if no paths
let spacing = 2;
- let commit_width = 8; // Short commit hash
+ let commit_width = COMMIT_HASH_WIDTH;
// Priority order for columns (from high to low):
// 1. branch - identity (what is this?)
@@ -362,8 +382,38 @@ pub fn calculate_responsive_layout(items: &[ListItem]) -> LayoutConfig {
let final_max_message_len = widths.message;
+ // Calculate absolute column positions (with 2-space gaps between columns)
+ let gap = 2;
+ let mut pos = 0;
+
+ // Helper closure to advance position for a column
+ // Returns the column's start position, or 0 if column is hidden (width=0)
+ let mut advance = |width: usize| -> usize {
+ if width == 0 {
+ return 0;
+ }
+ let column_pos = if pos == 0 { 0 } else { pos + gap };
+ pos = column_pos + width;
+ column_pos
+ };
+
+ let positions = ColumnPositions {
+ branch: advance(widths.branch),
+ working_diff: advance(widths.working_diff.total),
+ ahead_behind: advance(widths.ahead_behind.total),
+ branch_diff: advance(widths.branch_diff.total),
+ states: advance(widths.states),
+ path: advance(widths.path),
+ upstream: advance(widths.upstream.total),
+ time: advance(widths.time),
+ ci_status: advance(widths.ci_status),
+ commit: advance(widths.commit),
+ message: advance(widths.message),
+ };
+
LayoutConfig {
widths,
+ positions,
common_prefix,
max_message_len: final_max_message_len,
}
@@ -413,33 +463,259 @@ mod tests {
let widths = calculate_column_widths(&[super::ListItem::Worktree(info1)]);
- // "↑3 ↓2" has format "↑3 ↓2" = 1+1+1+1+1 = 5, but header "Commits" is 7
+ // "↑3 ↓2" has format "↑3 ↓2" = 1+1+1+1+1 = 5, but header "Main ↕" is 6
assert_eq!(
- widths.ahead_behind.total, 7,
- "Ahead/behind column should fit header 'Commits' (width 7)"
+ widths.ahead_behind.total, 6,
+ "Ahead/behind column should fit header 'Main ↕' (width 6)"
);
assert_eq!(widths.ahead_behind.added_digits, 1, "3 has 1 digit");
assert_eq!(widths.ahead_behind.deleted_digits, 1, "2 has 1 digit");
- // "+100 -50" has width 8
- assert_eq!(widths.working_diff.total, 8, "+100 -50 should have width 8");
+ // "+100 -50" has width 8, but header "Working ±" is 9, so column width is 9
+ assert_eq!(
+ widths.working_diff.total, 9,
+ "Working diff column should fit header 'Working ±' (width 9)"
+ );
assert_eq!(widths.working_diff.added_digits, 3, "100 has 3 digits");
assert_eq!(widths.working_diff.deleted_digits, 2, "50 has 2 digits");
- // "+200 -30" has width 8, but header "Branch +/-" is 10, so column width is 10
+ // "+200 -30" has width 8, but header "Main ±" is 6, so column width is 8
assert_eq!(
- widths.branch_diff.total, 10,
- "Branch diff column should fit header 'Branch +/-' (width 10)"
+ widths.branch_diff.total, 8,
+ "Branch diff column should fit header 'Main ±' (width 6)"
);
assert_eq!(widths.branch_diff.added_digits, 3, "200 has 3 digits");
assert_eq!(widths.branch_diff.deleted_digits, 2, "30 has 2 digits");
- // Upstream: "↑4 ↓0" = "↑" (1) + "4" (1) + " " (1) + "↓" (1) + "0" (1) = 5, but header "Remote" = 6
+ // Upstream: "↑4 ↓0" = "↑" (1) + "4" (1) + " " (1) + "↓" (1) + "0" (1) = 5, but header "Remote ↕" = 8
assert_eq!(
- widths.upstream.total, 6,
- "Upstream column should fit header 'Remote' (width 6)"
+ widths.upstream.total, 8,
+ "Upstream column should fit header 'Remote ↕' (width 8)"
);
assert_eq!(widths.upstream.added_digits, 1, "4 has 1 digit");
assert_eq!(widths.upstream.deleted_digits, 1, "0 has 1 digit");
}
+
+ #[test]
+ fn test_visible_columns_follow_gap_rule() {
+ use crate::commands::list::model::{
+ AheadBehind, BranchDiffTotals, CommitDetails, UpstreamStatus, WorktreeInfo,
+ };
+
+ // Create test data with specific widths to verify position calculation
+ let info = WorktreeInfo {
+ worktree: worktrunk::git::Worktree {
+ path: PathBuf::from("/test/path"),
+ head: "abc12345".to_string(),
+ branch: Some("feature".to_string()),
+ bare: false,
+ detached: false,
+ locked: None,
+ prunable: None,
+ },
+ commit: CommitDetails {
+ timestamp: 1234567890,
+ commit_message: "Test commit message".to_string(),
+ },
+ counts: AheadBehind {
+ ahead: 5,
+ behind: 10,
+ },
+ working_tree_diff: (100, 50),
+ branch_diff: BranchDiffTotals { diff: (200, 30) },
+ is_primary: false,
+ upstream: UpstreamStatus::from_parts(Some("origin".to_string()), 4, 2),
+ worktree_state: None,
+ pr_status: None,
+ commits_display: None,
+ working_diff_display: None,
+ branch_diff_display: None,
+ upstream_display: None,
+ ci_status_display: None,
+ };
+
+ let items = vec![super::ListItem::Worktree(info)];
+ let layout = calculate_responsive_layout(&items);
+ let pos = &layout.positions;
+ let widths = &layout.widths;
+
+ // Test key invariants of position calculation
+
+ // 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)"
+ );
+
+ // 3. For visible columns, verify correct spacing
+ // Each visible column should be at: previous_position + previous_width + gap(2)
+ let gap = 2;
+
+ if widths.working_diff.total > 0 && pos.working_diff > 0 {
+ assert_eq!(
+ pos.working_diff,
+ pos.branch + widths.branch + gap,
+ "Working diff position should follow branch with 2-space gap"
+ );
+ }
+
+ if widths.ahead_behind.total > 0 && pos.ahead_behind > 0 {
+ let prev_col_end = if pos.working_diff > 0 {
+ pos.working_diff + widths.working_diff.total
+ } else {
+ pos.branch + widths.branch
+ };
+ assert_eq!(
+ pos.ahead_behind,
+ prev_col_end + gap,
+ "Ahead/behind position should follow previous visible column with 2-space gap"
+ );
+ }
+
+ // 4. Path must be visible and have position > 0 (it's always shown)
+ assert!(pos.path > 0, "Path column must be visible");
+ assert!(widths.path > 0, "Path column must have width > 0");
+ }
+
+ #[test]
+ fn test_column_positions_with_hidden_columns() {
+ use crate::commands::list::model::{
+ AheadBehind, BranchDiffTotals, CommitDetails, UpstreamStatus, WorktreeInfo,
+ };
+
+ // Create minimal data - most columns will be hidden
+ let info = WorktreeInfo {
+ worktree: worktrunk::git::Worktree {
+ path: PathBuf::from("/test"),
+ head: "abc12345".to_string(),
+ branch: Some("main".to_string()),
+ bare: false,
+ detached: false,
+ locked: None,
+ prunable: None,
+ },
+ commit: CommitDetails {
+ timestamp: 1234567890,
+ commit_message: "Test".to_string(),
+ },
+ counts: AheadBehind {
+ ahead: 0,
+ behind: 0,
+ },
+ working_tree_diff: (0, 0),
+ branch_diff: BranchDiffTotals { diff: (0, 0) },
+ is_primary: true, // Primary worktree: no ahead/behind shown
+ upstream: UpstreamStatus::default(),
+ worktree_state: None,
+ pr_status: None,
+ commits_display: None,
+ working_diff_display: None,
+ branch_diff_display: None,
+ upstream_display: None,
+ ci_status_display: None,
+ };
+
+ let items = vec![super::ListItem::Worktree(info)];
+ let layout = calculate_responsive_layout(&items);
+ 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)"
+ );
+ 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)");
+ assert_eq!(pos.upstream, 0, "Upstream should be hidden (no upstream)");
+
+ // Path should be visible (only visible column besides branch)
+ assert!(pos.path > 0, "Path should be visible");
+ }
+
+ #[test]
+ fn test_consecutive_hidden_columns_skip_correctly() {
+ use crate::commands::list::model::{
+ AheadBehind, BranchDiffTotals, CommitDetails, UpstreamStatus, WorktreeInfo,
+ };
+
+ // Create data where multiple consecutive columns are hidden:
+ // visible(branch) → hidden(working_diff) → hidden(ahead_behind) → hidden(branch_diff)
+ // → hidden(states) → visible(path)
+ let info = WorktreeInfo {
+ worktree: worktrunk::git::Worktree {
+ path: PathBuf::from("/test/worktree"),
+ head: "abc12345".to_string(),
+ branch: Some("feature-x".to_string()),
+ bare: false,
+ detached: false,
+ locked: None,
+ prunable: None,
+ },
+ commit: CommitDetails {
+ timestamp: 1234567890,
+ commit_message: "Test commit".to_string(),
+ },
+ counts: AheadBehind {
+ ahead: 0,
+ behind: 0,
+ },
+ working_tree_diff: (0, 0), // Hidden: no dirty changes
+ branch_diff: BranchDiffTotals { diff: (0, 0) }, // Hidden: no diff
+ is_primary: true, // Hidden: no ahead/behind for primary
+ upstream: UpstreamStatus::default(), // Hidden: no upstream
+ worktree_state: None, // Hidden: no state
+ pr_status: None,
+ commits_display: None,
+ working_diff_display: None,
+ branch_diff_display: None,
+ upstream_display: None,
+ ci_status_display: None,
+ };
+
+ let items = vec![super::ListItem::Worktree(info)];
+ let layout = calculate_responsive_layout(&items);
+ 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)");
+
+ // 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;
+
+ 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
+ );
+
+ // Verify the invariant: hidden columns don't consume position space
+ // Only visible columns advance the position counter
+ assert!(
+ pos.path < widths.branch + gap + 10,
+ "Path position should not be inflated by hidden columns"
+ );
+ }
}
diff --git a/src/commands/list/render.rs b/src/commands/list/render.rs
index 5ebb541ab..2c95667be 100644
--- a/src/commands/list/render.rs
+++ b/src/commands/list/render.rs
@@ -196,10 +196,6 @@ fn append_line(target: &mut StyledLine, source: StyledLine) {
}
}
-fn push_gap(line: &mut StyledLine) {
- line.push_raw(" ");
-}
-
fn push_blank(line: &mut StyledLine, width: usize) {
if width > 0 {
line.push_raw(" ".repeat(width));
@@ -260,20 +256,46 @@ pub fn format_all_states(info: &WorktreeInfo) -> String {
pub fn format_header_line(layout: &LayoutConfig) {
let widths = &layout.widths;
- let style = Style::new();
+ let positions = &layout.positions;
+ let dim = Style::new().dimmed();
let mut line = StyledLine::new();
- push_optional_header(&mut line, "Branch", widths.branch, style);
- push_optional_header(&mut line, "WT +/-", widths.working_diff.total, style);
- push_optional_header(&mut line, "Commits", widths.ahead_behind.total, style);
- push_optional_header(&mut line, "Branch +/-", widths.branch_diff.total, style);
- push_optional_header(&mut line, "State", widths.states, style);
- push_optional_header(&mut line, "Path", widths.path, style);
- push_optional_header(&mut line, "Remote", widths.upstream.total, style);
- push_optional_header(&mut line, "Age", widths.time, style);
- push_optional_header(&mut line, "CI", widths.ci_status, style);
- push_optional_header(&mut line, "Commit", widths.commit, style);
- push_optional_header(&mut line, "Message", widths.message, style);
+ // Use absolute positions for guaranteed alignment
+ push_header_at(&mut line, "Branch", widths.branch, positions.branch, dim);
+ push_header_at(
+ &mut line,
+ "Working ±",
+ widths.working_diff.total,
+ positions.working_diff,
+ dim,
+ );
+ push_header_at(
+ &mut line,
+ "Main ↕",
+ widths.ahead_behind.total,
+ positions.ahead_behind,
+ dim,
+ );
+ push_header_at(
+ &mut line,
+ "Main ±",
+ widths.branch_diff.total,
+ positions.branch_diff,
+ dim,
+ );
+ push_header_at(&mut line, "State", widths.states, positions.states, dim);
+ push_header_at(&mut line, "Path", widths.path, positions.path, dim);
+ push_header_at(
+ &mut line,
+ "Remote ↕",
+ widths.upstream.total,
+ positions.upstream,
+ dim,
+ );
+ push_header_at(&mut line, "Age", widths.time, positions.time, dim);
+ push_header_at(&mut line, "CI", widths.ci_status, positions.ci_status, dim);
+ push_header_at(&mut line, "Commit", widths.commit, positions.commit, dim);
+ push_header_at(&mut line, "Message", widths.message, positions.message, dim);
println!("{}", line.render());
}
@@ -288,15 +310,14 @@ fn optional_reason_state(label: &str, reason: Option<&str>) -> Option<String> {
})
}
-fn push_header(line: &mut StyledLine, label: &str, width: usize, dim: Style) {
- let header = format!("{:width$}", label, width = width);
- line.push_styled(header, dim);
- line.push_raw(" ");
-}
-
-fn push_optional_header(line: &mut StyledLine, label: &str, width: usize, dim: Style) {
+/// Push a header at an absolute column position
+fn push_header_at(line: &mut StyledLine, label: &str, width: usize, position: usize, dim: Style) {
if width > 0 {
- push_header(line, label, width, dim);
+ // Pad to absolute position
+ line.pad_to(position);
+ // Add header content padded to width
+ let header = format!("{:width$}", label, width = width);
+ line.push_styled(header, dim);
}
}
@@ -349,31 +370,35 @@ pub fn format_list_item_line(
text_style
};
- // Start building the line
+ // Start building the line using absolute column positions
let mut line = StyledLine::new();
-
- // Branch name
- let branch_text = format!("{:width$}", item.branch_name(), width = widths.branch);
- if let Some(style) = text_style {
- line.push_styled(branch_text, style);
- } else {
- line.push_raw(branch_text);
+ let positions = &layout.positions;
+
+ // Branch name (dimmed if removable)
+ if widths.branch > 0 {
+ line.pad_to(positions.branch);
+ let branch_text = format!("{:width$}", item.branch_name(), width = widths.branch);
+ if let Some(style) = text_style {
+ line.push_styled(branch_text, style);
+ } else {
+ line.push_raw(branch_text);
+ }
}
- push_gap(&mut line);
// Working tree diff (worktrees only)
if widths.working_diff.total > 0 {
+ line.pad_to(positions.working_diff);
if let Some(info) = worktree_info {
let (wt_added, wt_deleted) = info.working_tree_diff;
push_diff(&mut line, wt_added, wt_deleted, &widths.working_diff);
} else {
push_blank(&mut line, widths.working_diff.total);
}
- push_gap(&mut line);
}
// Ahead/behind (commits difference) - green ahead, dim red behind
if widths.ahead_behind.total > 0 {
+ line.pad_to(positions.ahead_behind);
if !item.is_primary() && (counts.ahead > 0 || counts.behind > 0) {
let dim_deletion = DELETION.dimmed();
append_line(
@@ -389,11 +414,21 @@ pub fn format_list_item_line(
} else {
push_blank(&mut line, widths.ahead_behind.total);
}
- push_gap(&mut line);
+ }
+
+ // Branch diff (line diff in commits)
+ if widths.branch_diff.total > 0 {
+ line.pad_to(positions.branch_diff);
+ if !item.is_primary() {
+ push_diff(&mut line, branch_diff.0, branch_diff.1, &widths.branch_diff);
+ } else {
+ push_blank(&mut line, widths.branch_diff.total);
+ }
}
// States (worktrees only)
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() {
@@ -405,11 +440,11 @@ pub fn format_list_item_line(
} else {
push_blank(&mut line, widths.states);
}
- push_gap(&mut line);
}
// Path (worktrees only)
if widths.path > 0 {
+ line.pad_to(positions.path);
if let Some(info) = worktree_info {
let path_str = shorten_path(&info.worktree.path, &layout.common_prefix);
let path_text = format!("{:width$}", path_str, width = widths.path);
@@ -421,21 +456,11 @@ pub fn format_list_item_line(
} else {
push_blank(&mut line, widths.path);
}
- push_gap(&mut line);
- }
-
- // Branch diff (line diff in commits)
- if widths.branch_diff.total > 0 {
- if !item.is_primary() {
- push_diff(&mut line, branch_diff.0, branch_diff.1, &widths.branch_diff);
- } else {
- push_blank(&mut line, widths.branch_diff.total);
- }
- push_gap(&mut line);
}
// Upstream tracking
if widths.upstream.total > 0 {
+ line.pad_to(positions.upstream);
if let Some((_remote_name, upstream_ahead, upstream_behind)) = upstream.active() {
let dim_deletion = DELETION.dimmed();
// TODO: Handle show_remote_names when implemented
@@ -452,22 +477,22 @@ pub fn format_list_item_line(
} else {
push_blank(&mut line, widths.upstream.total);
}
- push_gap(&mut line);
}
// Age (Time)
if widths.time > 0 {
+ line.pad_to(positions.time);
let time_str = format!(
"{:width$}",
format_relative_time(commit.timestamp),
width = widths.time
);
line.push_styled(time_str, Style::new().dimmed());
- push_gap(&mut line);
}
// CI status
if widths.ci_status > 0 {
+ line.pad_to(positions.ci_status);
if let Some(pr_status) = item.pr_status() {
let mut ci_segment = format_ci_status(pr_status);
ci_segment.pad_to(widths.ci_status);
@@ -475,18 +500,17 @@ pub fn format_list_item_line(
} else {
push_blank(&mut line, widths.ci_status);
}
- push_gap(&mut line);
}
// Commit (short HEAD) - always dimmed (reference info)
if widths.commit > 0 {
- let commit_text = format!("{:width$}", short_head, width = widths.commit);
- line.push_styled(commit_text, Style::new().dimmed());
- push_gap(&mut line);
+ line.pad_to(positions.commit);
+ line.push_styled(short_head, Style::new().dimmed());
}
// Message
if widths.message > 0 {
+ line.pad_to(positions.message);
let msg = truncate_at_word_boundary(&commit.commit_message, layout.max_message_len);
let msg_start = line.width();
line.push_styled(msg, Style::new().dimmed());
diff --git a/tests/integration_tests/column_alignment_verification.rs b/tests/integration_tests/column_alignment_verification.rs
index 33d34dc6b..777daf62e 100644
--- a/tests/integration_tests/column_alignment_verification.rs
+++ b/tests/integration_tests/column_alignment_verification.rs
@@ -55,13 +55,13 @@ impl ColumnPositions {
if let Some(pos) = header.find("Age") {
positions.age = Some(pos);
}
- if let Some(pos) = header.find("Commits") {
+ if let Some(pos) = header.find("Main-Cmt") {
positions.cmts = Some(pos);
}
- if let Some(pos) = header.find("Branch +/-") {
+ if let Some(pos) = header.find("Main-Δ") {
positions.cmt_diff = Some(pos);
}
- if let Some(pos) = header.find("WT +/-") {
+ if let Some(pos) = header.find("Dirty") {
positions.wt_diff = Some(pos);
}
if let Some(pos) = header.find("Remote") {
@@ -198,9 +198,9 @@ fn verify_table_alignment(output: &str) -> Result<(), String> {
let positions = [
("Branch", Some(0usize)), // Branch always starts at 0
("Age", header_positions.age),
- ("Commits", header_positions.cmts),
- ("Branch +/-", header_positions.cmt_diff),
- ("WT +/-", header_positions.wt_diff),
+ ("Main-Cmt", header_positions.cmts),
+ ("Main-Δ", header_positions.cmt_diff),
+ ("Dirty", header_positions.wt_diff),
("Remote", header_positions.remote),
("Commit", header_positions.commit),
("Message", header_positions.message),
@@ -449,7 +449,7 @@ fn test_alignment_real_world_scenario() {
repo.add_worktree("no-changes", "no-changes");
// No changes on this one
- // Run wt list at a width where WT +/- is visible
+ // Run wt list at a width where Dirty column is visible
let mut cmd = Command::new(get_cargo_bin("wt"));
repo.clean_cli_env(&mut cmd);
cmd.arg("list")
diff --git a/tests/integration_tests/spacing_edge_cases.rs b/tests/integration_tests/spacing_edge_cases.rs
index 917eb72bc..f5b55b28c 100644
--- a/tests/integration_tests/spacing_edge_cases.rs
+++ b/tests/integration_tests/spacing_edge_cases.rs
@@ -181,7 +181,7 @@ fn test_column_alignment_varying_diff_widths() {
std::fs::write(large_path.join(format!("file{}.txt", i)), "content").unwrap();
}
- // Test at a width where WT +/- column is visible
+ // Test at a width where Dirty column is visible
snapshot_list_with_width("alignment_varying_diffs", &repo, 180);
}
diff --git a/tests/snapshots/integration__integration_tests__list__detached_head.snap b/tests/snapshots/integration__integration_tests__list__detached_head.snap
index e7a21daa7..5c32e66c7 100644
--- a/tests/snapshots/integration__integration_tests__list__detached_head.snap
+++ b/tests/snapshots/integration__integration_tests__list__detached_head.snap
@@ -15,12 +15,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpKHPrLL/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpBKtDvQ/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Path Age Commit Message
+Branch  PathAge  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 edbae0efc..299314bae 100644
--- a/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap
+++ b/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap
@@ -15,12 +15,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpQuHYob/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpNYx2sC/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch State Path Age Commit Message
+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
diff --git a/tests/snapshots/integration__integration_tests__list__locked_worktree.snap b/tests/snapshots/integration__integration_tests__list__locked_worktree.snap
index dd3c831ba..fd66cddd3 100644
--- a/tests/snapshots/integration__integration_tests__list__locked_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__locked_worktree.snap
@@ -15,12 +15,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp6gKopt/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpPoSnTS/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch State Path Age Commit Message
+Branch  State  Path  Age  Commit  Message 
main  ./test-repo  10 months ago b834638e Initial commit
locked-feature (locked: Testing lock functionality) ./locked-feature 10 months ago b834638e Initial commit
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 bb9d63974..a4c02b4dd 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/.tmpzSQcCg/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpQgEDYU/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Commits 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  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...
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 3d9630be5..b3c6dfedd 100644
--- a/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap
+++ b/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap
@@ -15,12 +15,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpb1eLSM/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpCvU6ml/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Path Age Commit Message
+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
diff --git a/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap
index bc83f6dd3..42df75dbd 100644
--- a/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap
@@ -15,12 +15,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpSOwMLp/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpLLmUM9/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Path Age Commit Message
+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
diff --git a/tests/snapshots/integration__integration_tests__list__single_worktree.snap b/tests/snapshots/integration__integration_tests__list__single_worktree.snap
index 0404a0816..02f5513a8 100644
--- a/tests/snapshots/integration__integration_tests__list__single_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__single_worktree.snap
@@ -15,12 +15,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpMtokrM/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp6eAagZ/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Path Age Commit Message
+Branch PathAge  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 59b9cb40c..c29850dd4 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/.tmpojpfFN/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmphTp3kX/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Commits 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  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 🎉
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 39898cfe8..290dbf8df 100644
--- a/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap
@@ -16,12 +16,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpgGbWKU/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpDIL3wZ/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Path Age Commit Message
+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
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 ea06ac1c5..9c7c3c1c7 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,12 +16,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpTVkS0m/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmphwXIPX/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Path Age Commit Message
+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
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 92bfd92de..45c20cb86 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,12 +16,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpzuq96i/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp37Kz9N/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Path Age Commit Message
+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
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 20cb949b9..b7800713e 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,12 +15,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpQ4udUO/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpLNNWGl/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Path Age Commit Message
+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
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 de6732bb5..2b729a9a0 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,12 +15,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpDJASt3/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpJ6GAsz/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Path Age Commit Message
+Branch PathAge  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 a6e8342d9..6415d6661 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/.tmpsbbeMI/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpFBLRVg/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch WT +/- 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 ± 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
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 ff851e57b..916f13809 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/.tmpMwkKEw/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpMPIBA3/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch WT +/- 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 ± 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
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 62a0928d2..185e79fe2 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,12 +15,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpvmNXPF/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpwlY9Xm/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Path Age Commit Message
+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
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 cbcf0963e..7a43b7a35 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,12 +15,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpKrwbd6/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpCOYry0/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Path Age Commit Message
+Branch  Path  Age  Commit  Message 
main  ./test-repo  10 months ago b834638e Initial commit
another-extremely-long-name-here ./another-extremely-long-name-here 10 months ago b834638e Initial commit
short  ./short  10 months ago b834638e Initial commit
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 dfeb518fd..44d5e7784 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,12 +15,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpheeEhj/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp4Tqlyu/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Path Age Commit Message
+Branch Path  Age  Commit  Message 
main  ./test-repo  10 months ago b834638e Initial commit
long  ./extremely-long-branch-name-that-might-cause-layout-issues 10 months ago b834638e Initial commit
medium ./medium-length-name  10 months ago b834638e Initial commit
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 4f37a035b..ad05e8d23 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,12 +15,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpxzB0gf/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpPVJRCP/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Path Age Commit Message
+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
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 2e3d17822..fb6cf3fc6 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,12 +15,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpCHtRN2/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpiZjU6X/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Path Age Commit Message
+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
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 2545ad4f9..6a772b606 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,12 +15,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpbN8j3S/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpZSZ6se/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Path Age Commit Message
+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
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 c210727cf..be89e3386 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,12 +15,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpjUcfrm/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpeBR5po/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Path Age Commit Message
+Branch  Path  Age  Commit  Message 
main  ./test-repo 10 months ago a7bc47ca Initial commit with a...
feature-a ./feature-a 10 months ago a7bc47ca Initial commit with a...
feature-b ./feature-b 10 months ago a7bc47ca Initial commit with a...
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 579c3a45a..a76e85cf9 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,12 +15,12 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpArK5sf/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpI0B2V3/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Path Age Commit Message
+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