Skip to content

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

feat: Hide empty `Working` and `Remote` columns

Maximilian Roos8e93a8d7285e
diff --git a/src/commands/list/layout.rs b/src/commands/list/layout.rs
index 9e96725d9..4deb09f1e 100644
--- a/src/commands/list/layout.rs
+++ b/src/commands/list/layout.rs
@@ -144,23 +144,34 @@ pub const HEADER_MESSAGE: &str = "Message";
/// 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.
+/// Ensures column width fits header text, unless data_width is 0 (empty column).
+///
+/// CRITICAL: Returns 0 when data_width is 0. This ensures empty columns don't
+/// allocate space for headers, allowing ColumnIdeal to return None, which prevents
+/// allocation even at low priority (12+) due to EMPTY_PENALTY.
fn fit_header(header: &str, data_width: usize) -> usize {
use unicode_width::UnicodeWidthStr;
+ if data_width == 0 {
+ // Empty column - don't allocate space for header
+ return 0;
+ }
data_width.max(header.width())
}
/// Calculates width for a diff-style column (format: "+added -deleted" or "↑ahead ↓behind").
///
/// Returns DiffWidths with:
-/// - total: width including header minimum ("+{added} -{deleted}")
+/// - total: width including header minimum ("+{added} -{deleted}"), or 0 if no data
/// - added_digits/deleted_digits: number of digits for each part
+///
+/// Empty columns (both digits = 0) have total = 0, which causes ColumnIdeal::diff()
+/// to return None, preventing allocation even at low priority (12+).
fn calculate_diff_width(header: &str, added_digits: usize, deleted_digits: usize) -> DiffWidths {
let has_data = added_digits > 0 || deleted_digits > 0;
let data_width = if has_data {
1 + added_digits + 1 + 1 + deleted_digits // "+added -deleted"
} else {
- 0
+ 0 // fit_header will return 0 for empty columns
};
let total = fit_header(header, data_width);
@@ -775,15 +786,6 @@ mod tests {
previous_end = column.start + column.width;
}
- let states_visible = layout
- .columns
- .iter()
- .any(|col| col.kind == ColumnKind::States);
- assert!(
- states_visible,
- "States column should be visible in wide layout"
- );
-
let path_column = layout
.columns
.iter()
@@ -853,8 +855,8 @@ mod tests {
.any(|kind| layout.columns.iter().any(|col| &col.kind == kind));
assert!(
- empty_columns_visible,
- "At least some empty columns should be visible with sufficient terminal width"
+ !empty_columns_visible,
+ "Empty columns should be hidden (not allocated) when they have no data"
);
let path_visible = layout
diff --git a/src/commands/list/render.rs b/src/commands/list/render.rs
index 7e2af8137..b360a5813 100644
--- a/src/commands/list/render.rs
+++ b/src/commands/list/render.rs
@@ -237,9 +237,14 @@ pub fn format_header_line(layout: &LayoutConfig) {
let style = Style::new();
let mut line = StyledLine::new();
- for column in &layout.columns {
+ for (i, column) in layout.columns.iter().enumerate() {
line.pad_to(column.start);
- let header = format!("{:width$}", column.header, width = column.width);
+ let is_last = i == layout.columns.len() - 1;
+ let header = if is_last {
+ column.header.to_string()
+ } else {
+ format!("{:width$}", column.header, width = column.width)
+ };
line.push_styled(header, style);
}
@@ -327,12 +332,18 @@ pub fn format_list_item_line(
};
let mut line = StyledLine::new();
- for column in &layout.columns {
+ let num_columns = layout.columns.len();
+ for (i, column) in layout.columns.iter().enumerate() {
line.pad_to(column.start);
+ let is_last = i == num_columns - 1;
match (column.kind, column.format) {
(ColumnKind::Branch, _) => {
- let branch_text = format!("{:width$}", item.branch_name(), width = column.width);
+ let branch_text = if is_last {
+ item.branch_name().to_string()
+ } else {
+ format!("{:width$}", item.branch_name(), width = column.width)
+ };
if let Some(style) = text_style {
line.push_styled(branch_text, style);
} else {
@@ -352,7 +363,7 @@ pub fn format_list_item_line(
DELETION,
);
append_line(&mut line, segment);
- } else {
+ } else if !is_last {
push_blank(&mut line, column.width);
}
}
@@ -369,7 +380,7 @@ pub fn format_list_item_line(
dim_deletion,
);
append_line(&mut line, segment);
- } else {
+ } else if !is_last {
push_blank(&mut line, column.width);
}
}
@@ -385,33 +396,41 @@ pub fn format_list_item_line(
DELETION,
);
append_line(&mut line, segment);
- } else {
+ } else if !is_last {
push_blank(&mut line, column.width);
}
}
(ColumnKind::States, _) => {
let states = format_all_states(item);
if !states.is_empty() {
- let states_text = format!("{:width$}", states, width = column.width);
+ let states_text = if is_last {
+ states
+ } else {
+ format!("{:width$}", states, width = column.width)
+ };
if let Some(style) = text_style {
line.push_styled(states_text, style);
} else {
line.push_raw(states_text);
}
- } else {
+ } else if !is_last {
push_blank(&mut line, column.width);
}
}
(ColumnKind::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 = column.width);
+ let path_text = if is_last {
+ path_str
+ } else {
+ format!("{:width$}", path_str, width = column.width)
+ };
if let Some(style) = text_style {
line.push_styled(path_text, style);
} else {
line.push_raw(path_text);
}
- } else {
+ } else if !is_last {
push_blank(&mut line, column.width);
}
}
@@ -428,40 +447,54 @@ pub fn format_list_item_line(
dim_deletion,
);
append_line(&mut line, segment);
- } else {
+ } else if !is_last {
push_blank(&mut line, column.width);
}
}
(ColumnKind::Time, _) => {
- let time_str = format!(
- "{:width$}",
- format_relative_time(commit.timestamp),
- width = column.width
- );
+ let time_str = if is_last {
+ format_relative_time(commit.timestamp)
+ } else {
+ format!(
+ "{:width$}",
+ format_relative_time(commit.timestamp),
+ width = column.width
+ )
+ };
line.push_styled(time_str, Style::new().dimmed());
}
(ColumnKind::CiStatus, _) => {
if let Some(pr_status) = item.pr_status() {
let mut ci_segment = format_ci_status(pr_status);
- ci_segment.pad_to(column.width);
+ if !is_last {
+ ci_segment.pad_to(column.width);
+ }
append_line(&mut line, ci_segment);
- } else {
+ } else if !is_last {
push_blank(&mut line, column.width);
}
}
(ColumnKind::Commit, _) => {
- let commit_text = format!("{:width$}", short_head, width = column.width);
+ let commit_text = if is_last {
+ short_head.to_string()
+ } else {
+ format!("{:width$}", short_head, width = column.width)
+ };
line.push_styled(commit_text, Style::new().dimmed());
}
(ColumnKind::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());
- line.pad_to(msg_start + column.width);
+ if !is_last {
+ line.pad_to(msg_start + column.width);
+ }
}
// Fallback for diff columns when format is unexpectedly Text
(_, _) => {
- push_blank(&mut line, column.width);
+ if !is_last {
+ push_blank(&mut line, column.width);
+ }
}
}
}
diff --git a/tests/snapshots/integration__integration_tests__list__detached_head.snap b/tests/snapshots/integration__integration_tests__list__detached_head.snap
index 6bad3a530..ba358e9ed 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/.tmp5MUqjf/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp9kyyQr/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Working ± Main ↕ State Path Remote ↕ Commit Age Message
-(detached) .  b834638e 10 months ago Initial commit
+Branch Path Commit Age Message
+(detached) .  b834638e 10 months ago 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 3285414ef..b74652f83 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/.tmpN2MM4G/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpm5Z8TG/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Working ± Main ↕ State Path Remote ↕ Commit Age Message
-main  ./test-repo  b834638e 10 months ago Initial commit
-locked-no-reason (matches main) (locked) ./locked-no-reason b834638e 10 months ago Initial commit
+Branch State Path Commit Age Message
+main  ./test-repo  b834638e 10 months ago Initial commit
+locked-no-reason (matches main) (locked) ./locked-no-reason b834638e 10 months ago Initial commit
Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__locked_worktree.snap b/tests/snapshots/integration__integration_tests__list__locked_worktree.snap
index e99a026a6..d896c0928 100644
--- a/tests/snapshots/integration__integration_tests__list__locked_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__locked_worktree.snap
@@ -15,14 +15,14 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpbMyoNo/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpH3KVhs/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Working ± Main ↕ State Path Commit Age Message
-main  ./test-repo  b834638e 10 months ago Initial commit
-locked-feature (matches main) (locked: Testing lock functionality) ./locked-feature b834638e 10 months ago Initial commit
+Branch State Path Commit Age Message
+main  ./test-repo  b834638e 10 months ago Initial commit
+locked-feature (matches main) (locked: Testing lock functionality) ./locked-feature b834638e 10 months ago Initial commit
Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__long_commit_message.snap b/tests/snapshots/integration__integration_tests__list__long_commit_message.snap
index 687c947c0..f579a767d 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/.tmpH391bB/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpbOZfFC/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Working ± Main ↕ State Path Remote ↕ Commit Age Message
-main  ./test-repo 1310bfb9 10 months ago Short message
-feature-a ↓1 (no commits) ./feature-a f078644e 10 months ago This is a very long commit message that should test...
+Branch Main ↕ State Path Commit Age Message
+main  ./test-repo 1310bfb9 10 months ago Short message
+feature-a ↓1 (no commits) ./feature-a f078644e 10 months ago This is a very long commit message that should test how the message column...
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 81c73b8fb..57c67503a 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/.tmpCFNrJl/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpfEt1q1/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Working ± Main ↕ State Path Remote ↕ Commit Age Message
-main  ./test-repo  b834638e 10 months ago Initial commit
-medium-name  (matches main) ./medium-name  b834638e 10 months ago Initial commit
-short  (matches main) ./short  b834638e 10 months ago Initial commit
-very-long-branch-name-here (matches main) ./very-long-branch-name-here b834638e 10 months ago Initial commit
-with-changes  (matches main) ./with-changes  b834638e 10 months ago Initial commit
+Branch State Path Commit Age Message
+main  ./test-repo  b834638e 10 months ago Initial commit
+medium-name  (matches main) ./medium-name  b834638e 10 months ago Initial commit
+short  (matches main) ./short  b834638e 10 months ago Initial commit
+very-long-branch-name-here (matches main) ./very-long-branch-name-here b834638e 10 months ago Initial commit
+with-changes  (matches main) ./with-changes  b834638e 10 months ago Initial commit
Showing 5 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap
index 77a990eae..2eef464e6 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/.tmpp9Qt9M/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpntTHhG/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Working ± Main ↕ State Path Remote ↕ Commit Age Message
-main  ./test-repo b834638e 10 months ago Initial commit
-feature-a (matches main) ./feature-a b834638e 10 months ago Initial commit
-feature-b (matches main) ./feature-b b834638e 10 months ago Initial commit
+Branch State Path Commit Age Message
+main  ./test-repo b834638e 10 months ago Initial commit
+feature-a (matches main) ./feature-a b834638e 10 months ago Initial commit
+feature-b (matches main) ./feature-b b834638e 10 months ago 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 62200913e..ac0c01e98 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/.tmpfAKKJa/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpYsAFzr/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Working ± Main ↕ State Path Remote ↕ Commit Age Message
-main  .  b834638e 10 months ago Initial commit
+Branch Path Commit Age Message
+main  .  b834638e 10 months ago 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 2e540ec6c..5c35d480f 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/.tmp8Ik4NN/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpCkMNDp/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Working ± Main ↕ State Path Remote ↕ Commit Age Message
-main  ./test-repo  e4614cb7 10 months ago Fix bug with café ☕ handling
-feature-test ↓1 (no commits) ./feature-test 0c53695b 10 months ago Add support for 日本語 and émoji 🎉
+Branch Main ↕ State Path Commit Age Message
+main  ./test-repo  e4614cb7 10 months ago Fix bug with café ☕ handling
+feature-test ↓1 (no commits) ./feature-test 0c53695b 10 months ago Add support for 日本語 and émoji 🎉
Showing 2 worktrees, 1 behind
diff --git a/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap b/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap
index a4265d492..59dd4fc98 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/.tmpVxZcGT/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpziiThz/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Working ± Main ↕ State Path Remote ↕ Commit Age Message
-main  ./test-repo  b834638e 10 months ago Initial commit
-feature-with-worktree  (matches main) ./feature-with-worktree b834638e 10 months ago Initial commit
-another-branch  b834638e 10 months ago Initial commit
-feature-without-worktree b834638e 10 months ago Initial commit
-fix-bug  b834638e 10 months ago Initial commit
+Branch State Path Commit Age Message
+main  ./test-repo  b834638e 10 months ago Initial commit
+feature-with-worktree  (matches main) ./feature-with-worktree b834638e 10 months ago Initial commit
+another-branch  b834638e 10 months ago Initial commit
+feature-without-worktree b834638e 10 months ago Initial commit
+fix-bug  b834638e 10 months ago Initial commit
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 19393921f..4ba55b97d 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/.tmpm3kV5K/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpp7S4F5/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Working ± Main ↕ State Path Remote ↕ Commit Age Message
-main  ./test-repo b834638e 10 months ago Initial commit
-feature-a (matches main) ./feature-a b834638e 10 months ago Initial commit
-feature-b (matches main) ./feature-b b834638e 10 months ago Initial commit
+Branch State Path Commit Age Message
+main  ./test-repo b834638e 10 months ago Initial commit
+feature-a (matches main) ./feature-a b834638e 10 months ago Initial commit
+feature-b (matches main) ./feature-b b834638e 10 months ago 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 72077d06c..ee743a866 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/.tmpaApej7/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpvuFXfC/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Working ± Main ↕ State Path Remote ↕ Commit Age Message
-main  .  b834638e 10 months ago Initial commit
-branch-alpha b834638e 10 months ago Initial commit
-branch-beta  b834638e 10 months ago Initial commit
-branch-gamma b834638e 10 months ago Initial commit
+Branch Path Commit Age Message
+main  .  b834638e 10 months ago Initial commit
+branch-alpha b834638e 10 months ago Initial commit
+branch-beta  b834638e 10 months ago Initial commit
+branch-gamma b834638e 10 months ago 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 9205b07cc..f0d7bdb0f 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/.tmpJqCsvu/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp51zxeb/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Working ± Main ↕ State Path Remote ↕ Commit Age Message
-main  ./test-repo [SHA] 10 months ago Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
-feature (matches main) ./feature  [SHA] 10 months ago Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
+Branch State Path Commit Age Message
+main  ./test-repo [SHA] 10 months ago Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
+feature (matches main) ./feature  [SHA] 10 months ago 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 a8557041c..d95df5abe 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/.tmpBwKFlH/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpp2SzwS/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Working ± Main ↕ State Path Remote ↕ Commit Age Message
-main  .  b834638e 10 months ago Initial commit
+Branch Path Commit Age Message
+main  .  b834638e 10 months ago 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 a4d426008..b8af05aa4 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/.tmpxTmTQ9/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpkunaMG/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Working ± Main ↕ State Path Remote ↕ Commit Age Message
-main  ./test-repo  b834638e 10 months ago Initial commit
-also-no-changes (matches main) ./also-no-changes b834638e 10 months ago Initial commit
-no-changes  (matches main) ./no-changes  b834638e 10 months ago Initial commit
-with-changes +1 -1 ./with-changes b834638e 10 months ago Initial commit
+Branch Working ± State Path Commit Age Message
+main  ./test-repo  b834638e 10 months ago Initial commit
+also-no-changes (matches main) ./also-no-changes b834638e 10 months ago Initial commit
+no-changes  (matches main) ./no-changes  b834638e 10 months ago Initial commit
+with-changes +1 -1 ./with-changes b834638e 10 months ago Initial commit
Showing 4 worktrees, 1 with changes
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_extreme_diffs.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_extreme_diffs.snap
index a2daae586..0a2ba4c82 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/.tmpVm3njK/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpZQeFoQ/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Working ± Main ↕ State Path Remote ↕ Commit Age Message
-main  ./test-repo b834638e 10 months ago Initial commit
-huge  (matches main) ./huge  b834638e 10 months ago Initial commit
-tiny +1 -1 ./tiny b834638e 10 months ago Initial commit
+Branch Working ± State Path Commit Age Message
+main  ./test-repo b834638e 10 months ago Initial commit
+huge  (matches main) ./huge  b834638e 10 months ago Initial commit
+tiny +1 -1 ./tiny b834638e 10 months ago Initial commit
Showing 3 worktrees, 1 with changes
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_varying_diffs.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_varying_diffs.snap
index bf94cfb72..5f6c08a27 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/.tmp6JpNNt/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpfdJXms/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Working ± Main ↕ State Path Remote ↕ Commit Age Message
-main  ./test-repo  b834638e 10 months ago Initial commit
-feature-large  (matches main) ./feature-large  b834638e 10 months ago Initial commit
-feature-medium (matches main) ./feature-medium b834638e 10 months ago Initial commit
-feature-small  (matches main) ./feature-small  b834638e 10 months ago Initial commit
+Branch State Path Commit Age Message
+main  ./test-repo  b834638e 10 months ago Initial commit
+feature-large  (matches main) ./feature-large  b834638e 10 months ago Initial commit
+feature-medium (matches main) ./feature-medium b834638e 10 months ago Initial commit
+feature-small  (matches main) ./feature-small  b834638e 10 months ago Initial commit
Showing 4 worktrees
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__long_branch_names.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__long_branch_names.snap
index 382da7931..f1ff6992c 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__long_branch_names.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__long_branch_names.snap
@@ -15,16 +15,16 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp9SdodL/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpKYccoz/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Working ± Main ↕ State Path Commit Age Message
-main  ./test-repo  b834638e 10 months ago Initial commit
-another-extremely-long-name-here (matches main) ./another-extremely-long-name-here b834638e 10 months ago Initial commit
-short  (matches main) ./short  b834638e 10 months ago Initial commit
-very-long-feature-branch-name  (matches main) ./very-long-feature-branch-name  b834638e 10 months ago Initial commit
+Branch State Path Commit Age Message
+main  ./test-repo  b834638e 10 months ago Initial commit
+another-extremely-long-name-here (matches main) ./another-extremely-long-name-here b834638e 10 months ago Initial commit
+short  (matches main) ./short  b834638e 10 months ago Initial commit
+very-long-feature-branch-name  (matches main) ./very-long-feature-branch-name  b834638e 10 months ago Initial commit
Showing 4 worktrees
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__mixed_length_branch_names.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__mixed_length_branch_names.snap
index 47c42ddb0..d163fc64e 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__mixed_length_branch_names.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__mixed_length_branch_names.snap
@@ -15,16 +15,16 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpwxJfVH/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpCVzfqk/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Working ± Main ↕ State Path Commit Age Message
-main  ./test-repo  b834638e 10 months ago Initial commit
-long  (matches main) ./extremely-long-branch-name-that-might-cause-layout-issues b834638e 10 months ago Initial commit
-medium (matches main) ./medium-length-name  b834638e 10 months ago Initial commit
-x  (matches main) ./x  b834638e 10 months ago Initial commit
+Branch State Path Commit Age Message
+main  ./test-repo  b834638e 10 months ago Initial commit
+long  (matches main) ./extremely-long-branch-name-that-might-cause-layout-issues b834638e 10 months ago Initial commit
+medium (matches main) ./medium-length-name  b834638e 10 months ago Initial commit
+x  (matches main) ./x  b834638e 10 months ago Initial commit
Showing 4 worktrees
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__short_branch_names.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__short_branch_names.snap
index baafc581a..a11a1d0b8 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/.tmpVFT2Yw/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpF28T1a/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Working ± Main ↕ State Path Remote ↕ Commit Age Message
-main  ./test-repo b834638e 10 months ago Initial commit
-a  (matches main) ./a  b834638e 10 months ago Initial commit
-bb  (matches main) ./bb  b834638e 10 months ago Initial commit
-ccc  (matches main) ./ccc  b834638e 10 months ago Initial commit
+Branch State Path Commit Age Message
+main  ./test-repo b834638e 10 months ago Initial commit
+a  (matches main) ./a  b834638e 10 months ago Initial commit
+bb  (matches main) ./bb  b834638e 10 months ago Initial commit
+ccc  (matches main) ./ccc  b834638e 10 months ago Initial commit
Showing 4 worktrees
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_120.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_120.snap
index 99556f96c..3b9870bfb 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/.tmpEuCxwf/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpCLmF0T/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Main ↕ State Path Commit Age Message
-main  ./test-repo a7bc47ca 10 months ago Initial commit with a reasonably long message
-feature-a (matches main) ./feature-a a7bc47ca 10 months ago Initial commit with a reasonably long message
-feature-b (matches main) ./feature-b a7bc47ca 10 months ago Initial commit with a reasonably long message
+Branch State Path Commit Age Message
+main  ./test-repo a7bc47ca 10 months ago Initial commit with a reasonably long message
+feature-a (matches main) ./feature-a a7bc47ca 10 months ago Initial commit with a reasonably long message
+feature-b (matches main) ./feature-b a7bc47ca 10 months ago Initial commit with a reasonably long message
Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_150.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_150.snap
index 9a8540b83..ae94cdd82 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/.tmpZM5HzU/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpJhYCfe/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Working ± Main ↕ State Path Remote ↕ Commit Age Message
-main  ./test-repo a7bc47ca 10 months ago Initial commit with a reasonably long message
-feature-a (matches main) ./feature-a a7bc47ca 10 months ago Initial commit with a reasonably long message
-feature-b (matches main) ./feature-b a7bc47ca 10 months ago Initial commit with a reasonably long message
+Branch State Path Commit Age Message
+main  ./test-repo a7bc47ca 10 months ago Initial commit with a reasonably long message
+feature-a (matches main) ./feature-a a7bc47ca 10 months ago Initial commit with a reasonably long message
+feature-b (matches main) ./feature-b a7bc47ca 10 months ago Initial commit with a reasonably long message
Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_80.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_80.snap
index 7c149af6e..8b08087cc 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_80.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__terminal_width_80.snap
@@ -15,15 +15,15 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpT4OjpO/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp4CvjSU/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Working ± State Path Commit Age
-main  ./test-repo a7bc47ca 10 months ago
-feature-a (matches main) ./feature-a a7bc47ca 10 months ago
-feature-b (matches main) ./feature-b a7bc47ca 10 months ago
+Branch State Path Commit Age
+main  ./test-repo a7bc47ca 10 months ago
+feature-a (matches main) ./feature-a a7bc47ca 10 months ago
+feature-b (matches main) ./feature-b a7bc47ca 10 months ago
Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__unicode_branch_names.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__unicode_branch_names.snap
index ee06200d4..cec617376 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/.tmpSaL67x/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp9frU3o/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Working ± Main ↕ State Path Remote ↕ Commit Age Message
-main  ./test-repo b834638e 10 months ago Initial commit
-cafe  (matches main) ./café  b834638e 10 months ago Initial commit
-naive  (matches main) ./naïve  b834638e 10 months ago Initial commit
-resume (matches main) ./résumé  b834638e 10 months ago Initial commit
+Branch State Path Commit Age Message
+main  ./test-repo b834638e 10 months ago Initial commit
+cafe  (matches main) ./café  b834638e 10 months ago Initial commit
+naive  (matches main) ./naïve  b834638e 10 months ago Initial commit
+resume (matches main) ./résumé  b834638e 10 months ago Initial commit
Showing 4 worktrees