Skip to content

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

feat: Support empty columns and updated snapshots

Maximilian Roosef8312bbec51
diff --git a/src/commands/list/layout.rs b/src/commands/list/layout.rs
index ae3e28368..04936b145 100644
--- a/src/commands/list/layout.rs
+++ b/src/commands/list/layout.rs
@@ -145,34 +145,28 @@ 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.
///
-/// 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.
+/// For empty columns (data_width = 0), returns header width. This allows empty
+/// columns to be allocated at low priority (base_priority + EMPTY_PENALTY) for
+/// visual consistency on wide terminals.
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}"), or 0 if no data
+/// - total: width including header minimum ("+{added} -{deleted}"), or just header width 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+).
+/// Empty columns (both digits = 0) get header width and are allocated at low priority
+/// (base_priority + EMPTY_PENALTY) for visual consistency on wide terminals.
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 // fit_header will return 0 for empty columns
+ 0 // fit_header will use header width for empty columns
};
let total = fit_header(header, data_width);
@@ -815,13 +809,13 @@ mod tests {
}
#[test]
- fn test_column_positions_with_hidden_columns() {
+ fn test_column_positions_with_empty_columns() {
use crate::commands::list::model::{
AheadBehind, BranchDiffTotals, CommitDetails, DisplayFields, UpstreamStatus,
WorktreeInfo,
};
- // Create minimal data - most columns will be hidden
+ // Create minimal data - most columns will be empty
let info = WorktreeInfo {
worktree: worktrunk::git::Worktree {
path: PathBuf::from("/test"),
@@ -865,38 +859,28 @@ mod tests {
"Branch column should start at position 0"
);
- let empty_columns_visible = [
- ColumnKind::WorkingDiff,
- ColumnKind::AheadBehind,
- ColumnKind::BranchDiff,
- ColumnKind::States,
- ColumnKind::Upstream,
- ]
- .iter()
- .any(|kind| layout.columns.iter().any(|col| &col.kind == kind));
-
- assert!(
- !empty_columns_visible,
- "Empty columns should be hidden (not allocated) when they have no data"
- );
-
+ // Columns with data should always be visible (Branch, Path, Time, Commit, Message)
let path_visible = layout
.columns
.iter()
.any(|col| col.kind == ColumnKind::Path);
- assert!(path_visible, "Path should always be visible");
+ assert!(path_visible, "Path should always be visible (has data)");
+
+ // Empty columns may or may not be visible depending on terminal width
+ // They have low priority (base_priority + EMPTY_PENALTY) so they're allocated
+ // only if space remains after higher-priority columns
}
#[test]
- fn test_consecutive_hidden_columns_skip_correctly() {
+ fn test_consecutive_empty_columns_have_low_priority() {
use crate::commands::list::model::{
AheadBehind, BranchDiffTotals, CommitDetails, DisplayFields, 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)
+ // Create data where multiple consecutive columns are empty:
+ // visible(branch) → empty(working_diff) → empty(ahead_behind) → empty(branch_diff)
+ // → empty(states) → visible(path)
let info = WorktreeInfo {
worktree: worktrunk::git::Worktree {
path: PathBuf::from("/test/worktree"),
@@ -915,12 +899,12 @@ mod tests {
ahead: 0,
behind: 0,
},
- working_tree_diff: (0, 0), // Hidden: no dirty changes
+ working_tree_diff: (0, 0), // Empty: no dirty changes
working_tree_diff_with_main: Some((0, 0)),
- 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
+ branch_diff: BranchDiffTotals { diff: (0, 0) }, // Empty: no diff
+ is_primary: true, // Empty: no ahead/behind for primary
+ upstream: UpstreamStatus::default(), // Empty: no upstream
+ worktree_state: None, // Empty: no state
pr_status: None,
has_conflicts: false,
status_symbols: String::new(),
@@ -937,7 +921,7 @@ mod tests {
.any(|col| col.kind == ColumnKind::Path);
assert!(
path_visible,
- "Path should be visible (has data, priority 6)"
+ "Path should be visible (has data, priority 7)"
);
let message_visible = layout
@@ -946,10 +930,10 @@ mod tests {
.any(|col| col.kind == ColumnKind::Message);
assert!(
message_visible,
- "Message should be allocated before empty columns"
+ "Message should be allocated before empty columns (priority 12 < empty columns)"
);
// Empty columns (priority 12+) may or may not be visible depending on terminal width.
- // They rank lower than message (priority 11), so message allocates first.
+ // They rank lower than message (priority 12), so message allocates first.
}
}
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snap b/tests/integration_tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snap
index d93ab6e6f..799a91b84 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snap
@@ -12,14 +12,14 @@ info:
LC_ALL: C
NO_COLOR: ""
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp058jKO/test-config.toml
+ WORKTRUNK_CONFIG: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpV36gM5/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Status Main ↕ State Path Commit
-feature ./test-repo.feature 5c078f19
-main ↓ ↓1 (no commits) ./test-repo.main 039e01d8
+Branch Status Working ± Main ↕ State Path Commit
+feature ./test-repo.feature 5c078f19
+main ↓ ↓1 (no commits) ./test-repo.main 039e01d8
Showing 2 worktrees, 1 behind
diff --git a/tests/snapshots/integration__integration_tests__list__detached_head.snap b/tests/snapshots/integration__integration_tests__list__detached_head.snap
index d063cd77b..fbf0423df 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/.tmpnwY2gK/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp380JDp/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Path Commit  Age  Message
-(detached) .  b834638e 10 months ago Initial commit
+Branch  Status Working ± Main ↕ State Path Remote ↕ Commit  Age  Message
+(detached) .  b834638e 10 months ago Initial commit
Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap b/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap
index 0b5c45590..1aee5e10d 100644
--- a/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap
@@ -15,17 +15,17 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0ctBJ2/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpue943Q/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status Main ↕ Path  Commit  Age  Message
-main  ./test-repo  6c3da842 10 months ago Initial commit on main
-feature-current ↑ ↑1 ./feature-current fc28a4d1 9 months ago  Commit at 01:00
-feature-newest ↑ ↑1 ./feature-newest 136358eb 9 months ago  Commit at 03:00
-feature-middle ↑ ↑1 ./feature-middle a0a4851a 9 months ago  Commit at 02:00
-feature-oldest ↑ ↑1 ./feature-oldest 1b1a2d78 9 months ago  Commit at 00:30
+Branch  Status Working ± Main ↕ State Path  Remote ↕ Commit  Age  Message
+main  ./test-repo  6c3da842 10 months ago Initial commit on main
+feature-current ↑ ↑1 ./feature-current fc28a4d1 9 months ago  Commit at 01:00
+feature-newest ↑ ↑1 ./feature-newest 136358eb 9 months ago  Commit at 03:00
+feature-middle ↑ ↑1 ./feature-middle a0a4851a 9 months ago  Commit at 02:00
+feature-oldest ↑ ↑1 ./feature-oldest 1b1a2d78 9 months ago  Commit at 00:30
Showing 5 worktrees, 4 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_primary_on_different_branch.snap b/tests/snapshots/integration__integration_tests__list__list_primary_on_different_branch.snap
index 4a6757ab6..1a14a45c0 100644
--- a/tests/snapshots/integration__integration_tests__list__list_primary_on_different_branch.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_primary_on_different_branch.snap
@@ -15,15 +15,15 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpYTyVFj/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpJU1zHk/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  State  Path  Commit  Age  Message
-develop  ./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  Status Working ± Main ↕ State  Path  Remote ↕ Commit  Age  Message
+develop  ./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__locked_no_reason.snap b/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap
index 01a54a3a6..80d52c8c0 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/.tmppkvTWc/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpAHGSC7/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-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
+Branch  Status 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
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 9a33d4936..1c5d61dbc 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/.tmpURntiJ/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpIL6ViK/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-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
+Branch  Status Working ± 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 c887fdf6b..7a3267174 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/.tmpkokc9o/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpBFgMz4/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status 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...
+Branch  Status 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...
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 55d597335..bf8e602b1 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/.tmpGcclbO/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpDWuoI9/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-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
+Branch  Status 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
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 3a6b6dec3..f94bc49ec 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/.tmps9va1X/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpO22See/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-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
+Branch  Status 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
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 632b404f4..25bb19492 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/.tmp0Ag2cE/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0xhuUS/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Path Commit  Age  Message
-main  .  b834638e 10 months ago Initial commit
+Branch Status Working ± Main ↕ State Path Remote ↕ 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 54358e9eb..979332c4a 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/.tmpmr0coS/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpitGQoB/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status 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 🎉
+Branch  Status 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 🎉
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 ac8ff94d1..4d2c17801 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/.tmpaXFlnD/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpNJpWee/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-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
+Branch  Status 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
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 85a8e6874..b1bc91e10 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/.tmpEWmoPb/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpxteLBR/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-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
+Branch  Status 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
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 dc2442756..b6c29c338 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/.tmpFLN6zt/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpgfQ7GH/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-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
+Branch  Status 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
Showing 1 worktrees, 3 branches
diff --git a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
index 805811996..690b886db 100644
--- a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
@@ -17,18 +17,18 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpuWw6nv/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpPt1GBn/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status Main ↕ Main ± State  Path  Remote ↕ CI Commit  Age  Message
-main  ./test-repo  ↑0 ↓0 6c3da842 10 months ago Initial commit on main
-ahead ↑⇡ ↑2 +2 ./ahead ↑2 ↓0 8d8f4673 10 months ago Ahead commit 2
-behind  ⇣ (matches main) ./behind  ↑0 ↓1 6c3da842 10 months ago Initial commit on main
-diverged ↑⇡⇣ ↑1 +1 ./diverged ↑1 ↓1 ca7cb696 10 months ago Diverged local commit
-in-sync  (matches main) ./in-sync  ↑0 ↓0 6c3da842 10 months ago Initial commit on main
-no-upstream (matches main) ./no-upstream 6c3da842 10 months ago Initial commit on main
+Branch  Status Working ± Main ↕ Main ± State  Path  Remote ↕ CI Commit  Age  Message
+main  ./test-repo  ↑0 ↓0 6c3da842 10 months ago Initial commit on main
+ahead ↑⇡ ↑2 +2 ./ahead ↑2 ↓0 8d8f4673 10 months ago Ahead commit 2
+behind  ⇣ (matches main) ./behind  ↑0 ↓1 6c3da842 10 months ago Initial commit on main
+diverged ↑⇡⇣ ↑1 +1 ./diverged ↑1 ↓1 ca7cb696 10 months ago Diverged local commit
+in-sync  (matches main) ./in-sync  ↑0 ↓0 6c3da842 10 months ago Initial commit on main
+no-upstream (matches main) ./no-upstream 6c3da842 10 months ago Initial commit on main
Showing 6 worktrees, 2 ahead
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 c07c763cc..b51a2c5cf 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/.tmpxPTYUt/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpCwPjPZ/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-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
+Branch  Status Working ± Main ↕ State  Path  Remote ↕ Commit  Age  Message
+main  ./test-repo [SHA] 10 months ago Fix bug __WORKTRUNK_EXEC__echo PWNED >...
+feature (matches main) ./feature  [SHA] 10 months ago Fix bug __WORKTRUNK_EXEC__echo PWNED >...
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 4af3e9215..480e0f0be 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/.tmpkv4qkH/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmppXVT8Z/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Path Commit  Age  Message
-main  .  b834638e 10 months ago Initial commit
+Branch Status Working ± Main ↕ State Path Remote ↕ 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 1ac9e3a7d..aece973b8 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/.tmp19VPVw/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpqAdHeK/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status 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
+Branch  Status 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
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 6d6d9fc6b..e93960399 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/.tmpPvsf6Y/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpV1rC2l/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Status 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
+Branch Status 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
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 19e8c2bdb..16083f0e6 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/.tmpsfUzeC/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpekPSvx/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status 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
+Branch  Status 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
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 aa7816fa4..931a218af 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/.tmpo99RD4/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpBGZEIR/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-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
+Branch  Status Working ± 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 3455b6cc5..07c9943a6 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/.tmpmN1uQ1/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpkIA2B1/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-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
+Branch Status Working ± 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 30b8bc99a..3ed0d33bb 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/.tmptCtAnP/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpiHj6xt/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-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
+Branch Status 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
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 69a2403aa..b3c3cefde 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/.tmpqBzHEQ/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmptyQc9m/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-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
+Branch  Status 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 84e2e7508..02467ba90 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/.tmpzos1Ut/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpehDlRY/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-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
+Branch  Status 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
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 736b0a7dc..ca4323518 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/.tmpRjlLHv/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpdrgrEo/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-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
+Branch  Status Main ↕ 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 b05ac3f49..1745c9eb1 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/.tmpFmn47D/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpmzQlAA/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-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
+Branch Status 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
Showing 4 worktrees