Skip to content

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

feat: Simplify column names in `wt list`

Maximilian Roosa4473cb7b903
diff --git a/ISSUE.md b/ISSUE.md
index a415193f6..818cab62a 100644
--- a/ISSUE.md
+++ b/ISSUE.md
@@ -563,7 +563,7 @@ We need external research to help answer:
Current `wt list` output:
```
-Branch Status Working ± Main ↕ State Path
+Branch Status HEAD± main↕ State Path
main ./worktrunk
skim !+ +528 -12 ./worktrunk.skim
refactor ! +57 -108 ./worktrunk.refactor
diff --git a/src/commands/list/layout.rs b/src/commands/list/layout.rs
index 58f40e50e..3b382888a 100644
--- a/src/commands/list/layout.rs
+++ b/src/commands/list/layout.rs
@@ -129,11 +129,11 @@ const COMMIT_HASH_WIDTH: usize = 8;
/// Both layout calculations and rendering use these constants.
pub const HEADER_BRANCH: &str = "Branch";
pub const HEADER_STATUS: &str = "Status";
-pub const HEADER_WORKING_DIFF: &str = "Working ±";
-pub const HEADER_AHEAD_BEHIND: &str = "Main ↕";
-pub const HEADER_BRANCH_DIFF: &str = "Main ±";
+pub const HEADER_WORKING_DIFF: &str = "HEAD±";
+pub const HEADER_AHEAD_BEHIND: &str = "main↕";
+pub const HEADER_BRANCH_DIFF: &str = "main…±";
pub const HEADER_PATH: &str = "Path";
-pub const HEADER_UPSTREAM: &str = "Remote ↕";
+pub const HEADER_UPSTREAM: &str = "Remote↕";
pub const HEADER_AGE: &str = "Age";
pub const HEADER_CI: &str = "CI";
pub const HEADER_COMMIT: &str = "Commit";
@@ -700,34 +700,34 @@ mod tests {
let (widths, _data_flags) =
calculate_column_widths(&[super::ListItem::Worktree(info1)], false);
- // "↑3 ↓2" has format "↑3 ↓2" = 1+1+1+1+1 = 5, but header "Main ↕" is 6
+ // "↑3 ↓2" has format "↑3 ↓2" = 1+1+1+1+1 = 5, header "main↕" is also 5
assert_eq!(
- widths.ahead_behind.total, 6,
- "Ahead/behind column should fit header 'Main ↕' (width 6)"
+ widths.ahead_behind.total, 5,
+ "Ahead/behind column should fit header 'main↕' (width 5)"
);
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, but header "Working ±" is 9, so column width is 9
+ // "+100 -50" has width 8, but header "HEAD±" is 5, so column width is 8
assert_eq!(
- widths.working_diff.total, 9,
- "Working diff column should fit header 'Working ±' (width 9)"
+ widths.working_diff.total, 8,
+ "Working diff column should fit header 'HEAD±' (width 5)"
);
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 "Main ±" is 6, so column width is 8
+ // "+200 -30" has width 8, header "main…±" is 6, so column width is 8
assert_eq!(
widths.branch_diff.total, 8,
- "Branch diff column should fit header 'Main ±' (width 6)"
+ "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 ↕" = 8
+ // Upstream: "↑4 ↓0" = "↑" (1) + "4" (1) + " " (1) + "↓" (1) + "0" (1) = 5, but header "Remote↕" = 7
assert_eq!(
- widths.upstream.total, 8,
- "Upstream column should fit header 'Remote ↕' (width 8)"
+ widths.upstream.total, 7,
+ "Upstream column should fit header 'Remote↕' (width 7)"
);
assert_eq!(widths.upstream.added_digits, 1, "4 has 1 digit");
assert_eq!(widths.upstream.deleted_digits, 1, "0 has 1 digit");
diff --git a/src/commands/select.rs b/src/commands/select.rs
index e43dddf36..2fa74e8c1 100644
--- a/src/commands/select.rs
+++ b/src/commands/select.rs
@@ -15,12 +15,12 @@ use crate::output::handle_switch_output;
/// Each mode shows a different aspect of the worktree:
/// 1. WorkingTree: Uncommitted changes (git diff HEAD --stat)
/// 2. History: Commit history since diverging from main (git log with merge-base)
-/// 3. BranchDiff: Line diffs in commits ahead of main (git diff --stat main...)
+/// 3. BranchDiff: Line diffs in commits ahead of main (git diff --stat main…)
///
/// Loosely aligned with `wt list` columns, though not a perfect match:
-/// - Mode 1 corresponds to "Working ±" column
-/// - Mode 2 shows commits (related to "Main ↕" counts)
-/// - Mode 3 corresponds to "Main ± (--full)" column
+/// - Mode 1 corresponds to "HEAD±" column
+/// - Mode 2 shows commits (related to "main↕" counts)
+/// - Mode 3 corresponds to "main…± (--full)" column
///
/// Note: Order of modes 2 & 3 could potentially be swapped
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
@@ -84,7 +84,7 @@ impl SkimItem for WorktreeSkimItem {
impl WorktreeSkimItem {
/// Render Mode 1: Working tree preview (uncommitted changes vs HEAD)
- /// Matches `wt list` "Working ±" column
+ /// Matches `wt list` "HEAD±" column
fn render_working_tree_preview(&self) -> String {
let mut output = String::new();
let repo = Repository::current();
@@ -110,7 +110,7 @@ impl WorktreeSkimItem {
}
/// Render Mode 3: Branch diff preview (line diffs in commits ahead of main)
- /// Matches `wt list` "Main ± (--full)" column
+ /// Matches `wt list` "main…± (--full)" column
fn render_branch_diff_preview(&self) -> String {
let mut output = String::new();
let repo = Repository::current();
diff --git a/src/main.rs b/src/main.rs
index ad8354085..b6bdeefd0 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -180,11 +180,11 @@ enum Commands {
COLUMNS:
Branch: Branch name
Status: Quick status symbols (see STATUS SYMBOLS below)
- Working ±: Uncommitted changes vs HEAD (+added -deleted lines, staged + unstaged)
- Main ↕: Commit count ahead↑/behind↓ relative to main (commits in HEAD vs main)
- Main ± (--full): Line diffs in commits ahead of main (+added -deleted)
+ HEAD±: Uncommitted changes vs HEAD (+added -deleted lines, staged + unstaged)
+ main↕: Commit count ahead↑/behind↓ relative to main (commits in HEAD vs main)
+ main…± (--full): Line diffs in commits ahead of main (+added -deleted)
Path: Worktree directory location
- Remote ↕: Commits ahead↑/behind↓ relative to tracking branch (e.g. origin/branch)
+ Remote↕: Commits ahead↑/behind↓ relative to tracking branch (e.g. origin/branch)
CI (--full): CI pipeline status (tries PR/MR checks first, falls back to branch workflows)
● passed (green) - All checks passed
● running (blue) - Checks in progress
@@ -229,7 +229,7 @@ Rows are dimmed when no unique work (≡ matches main OR ∅ no commits).")]
/// Show CI status, conflict detection, and complete diff statistics
///
- /// Adds columns: CI (pipeline status), Main ± (line diffs).
+ /// Adds columns: CI (pipeline status), main…± (line diffs).
/// Enables conflict detection (shows "=" symbol in Status column).
/// Requires network requests and git merge-tree operations.
#[arg(long, verbatim_doc_comment)]
diff --git a/tests/integration_tests/column_alignment_verification.rs b/tests/integration_tests/column_alignment_verification.rs
index 912bd7389..273c028e3 100644
--- a/tests/integration_tests/column_alignment_verification.rs
+++ b/tests/integration_tests/column_alignment_verification.rs
@@ -63,10 +63,10 @@ impl ColumnPositions {
if let Some(byte_pos) = header.find("Main-Cmt") {
positions.cmts = Some(byte_to_display_pos(byte_pos));
}
- if let Some(byte_pos) = header.find("Main ↕") {
+ if let Some(byte_pos) = header.find("main↕") {
positions.cmt_diff = Some(byte_to_display_pos(byte_pos));
}
- if let Some(byte_pos) = header.find("Working ±") {
+ if let Some(byte_pos) = header.find("HEAD±") {
positions.wt_diff = Some(byte_to_display_pos(byte_pos));
}
if let Some(byte_pos) = header.find("Remote") {
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 e476d7f45..d574d4bec 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
@@ -17,9 +17,9 @@ info:
success: true
exit_code: 0
----- stdout -----
-Branch Status Working ± Main ↕ Path Commit Age
-feature ./test-repo.feature 72413a3b 10 months ago
-main ∅↓ ↓1 ./test-repo.main 6c3da842 10 months ago
+Branch Status HEAD± main↕ Path Commit Age
+feature ./test-repo.feature 72413a3b 10 months ago
+main ∅↓ ↓1 ./test-repo.main 6c3da842 10 months ago
⚪ Showing 2 worktrees, 1 behind, 1 column hidden
diff --git a/tests/snapshots/integration__integration_tests__list__detached_head.snap b/tests/snapshots/integration__integration_tests__list__detached_head.snap
index b44f047e8..0afbedd8f 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/.tmpIRV9A8/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpG76kUa/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status Working ± Main ↕ Path Remote ↕ Commit  Age  Message
-(detached) .  b834638e 10 months ago Initial commit
+Branch  Status HEAD± main↕ 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 403c7d52c..4433a0a04 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/.tmpVgQzyc/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpYUd3qX/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status Working ± Main ↕ 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
+Branch  Status HEAD± main↕ 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 65aff65d9..26a39f857 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/.tmpXB4cdG/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpFYLour/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status Working ± Main ↕ Path  Remote ↕ Commit  Age  Message
-develop  ./test-repo b834638e 10 months ago Initial commit
-feature-a ≡ ./feature-a b834638e 10 months ago Initial commit
-feature-b ≡ ./feature-b b834638e 10 months ago Initial commit
+Branch  Status HEAD± main↕ Path  Remote↕ Commit  Age  Message
+develop  ./test-repo b834638e 10 months ago Initial commit
+feature-a ≡ ./feature-a b834638e 10 months ago Initial commit
+feature-b ≡ ./feature-b b834638e 10 months ago Initial commit
⚪ 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 9ce7df18a..f42012f7a 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/.tmpzRc36D/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpsY0W6k/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status Working ± Main ↕ Path  Remote ↕ Commit  Age  Message
-main  ./test-repo  b834638e 10 months ago Initial commit
-locked-no-reason ≡⊠ ./locked-no-reason b834638e 10 months ago Initial commit
+Branch  Status HEAD± main↕ Path  Remote↕ Commit  Age  Message
+main  ./test-repo  b834638e 10 months ago Initial commit
+locked-no-reason ≡⊠ ./locked-no-reason b834638e 10 months ago Initial commit
⚪ 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 684450c0b..d71ceaa26 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/.tmpenp93a/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpE4bhkY/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status Working ± Main ↕ Path  Remote ↕ Commit  Age  Message
-main  ./test-repo  b834638e 10 months ago Initial commit
-locked-feature ≡⊠ ./locked-feature b834638e 10 months ago Initial commit
+Branch  Status HEAD± main↕ Path  Remote↕ Commit  Age  Message
+main  ./test-repo  b834638e 10 months ago Initial commit
+locked-feature ≡⊠ ./locked-feature b834638e 10 months ago Initial commit
⚪ 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 bee795fa4..1719c3675 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/.tmpQwhnPD/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmplqfhqe/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status Working ± Main ↕ Path  Remote ↕ Commit  Age  Message
-main  ./test-repo 1310bfb9 10 months ago Short message
-feature-a ∅↓ ↓1 ./feature-a f078644e 10 months ago This is a very long commit message that should test how the...
+Branch  Status HEAD± main↕ Path  Remote↕ Commit  Age  Message
+main  ./test-repo 1310bfb9 10 months ago Short message
+feature-a ∅↓ ↓1 ./feature-a f078644e 10 months ago This is a very long commit message that should test how the...
⚪ 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 89f7bb636..630801f9f 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/.tmpeEOQYZ/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpyknZhP/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status Working ± Main ↕ Path  Remote ↕ Commit  Age  Message
-main  ./test-repo  b834638e 10 months ago Initial commit
-medium-name  ≡ ./medium-name  b834638e 10 months ago Initial commit
-short  ≡ ./short  b834638e 10 months ago Initial commit
-very-long-branch-name-here ≡ ./very-long-branch-name-here b834638e 10 months ago Initial commit
-with-changes  ≡ ./with-changes  b834638e 10 months ago Initial commit
+Branch  Status HEAD± main↕ Path  Remote↕ Commit  Age  Message
+main  ./test-repo  b834638e 10 months ago Initial commit
+medium-name  ≡ ./medium-name  b834638e 10 months ago Initial commit
+short  ≡ ./short  b834638e 10 months ago Initial commit
+very-long-branch-name-here ≡ ./very-long-branch-name-here b834638e 10 months ago Initial commit
+with-changes  ≡ ./with-changes  b834638e 10 months ago Initial commit
⚪ 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 b82d29b75..8f32997d1 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/.tmp3zLndk/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp4zU27l/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status Working ± Main ↕ Path  Remote ↕ Commit  Age  Message
-main  ./test-repo b834638e 10 months ago Initial commit
-feature-a ≡ ./feature-a b834638e 10 months ago Initial commit
-feature-b ≡ ./feature-b b834638e 10 months ago Initial commit
+Branch  Status HEAD± main↕ Path  Remote↕ Commit  Age  Message
+main  ./test-repo b834638e 10 months ago Initial commit
+feature-a ≡ ./feature-a b834638e 10 months ago Initial commit
+feature-b ≡ ./feature-b b834638e 10 months ago Initial commit
⚪ 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 d67159d18..122621f0d 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/.tmp4Akr3k/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpuAbcZl/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Status Working ± Main ↕ Path Remote ↕ Commit  Age  Message
-main  .  b834638e 10 months ago Initial commit
+Branch Status HEAD± main↕ 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 9bc6b5a70..bf8f01887 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/.tmpqjm84Q/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpZMUNzJ/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status Working ± Main ↕ Path  Remote ↕ Commit  Age  Message
-main  ./test-repo  e4614cb7 10 months ago Fix bug with café ☕ handling
-feature-test ∅↓ ↓1 ./feature-test 0c53695b 10 months ago Add support for 日本語 and émoji 🎉
+Branch  Status HEAD± main↕ Path  Remote↕ Commit  Age  Message
+main  ./test-repo  e4614cb7 10 months ago Fix bug with café ☕ handling
+feature-test ∅↓ ↓1 ./feature-test 0c53695b 10 months ago Add support for 日本語 and émoji 🎉
⚪ Showing 2 worktrees, 1 behind
diff --git a/tests/snapshots/integration__integration_tests__list__user_status_special_chars.snap b/tests/snapshots/integration__integration_tests__list__user_status_special_chars.snap
index b1e7a390c..86e96d7af 100644
--- a/tests/snapshots/integration__integration_tests__list__user_status_special_chars.snap
+++ b/tests/snapshots/integration__integration_tests__list__user_status_special_chars.snap
@@ -15,15 +15,15 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpUIEupV/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpb9KQOD/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Status  Working ± Main ↕ Path  Remote ↕ Commit  Age  Message
-main  ./test-repo b834638e 10 months ago Initial commit
-emoji  ≡ 🔄 ./emoji  b834638e 10 months ago Initial commit
-multi  ≡ blocked: needs review ./multi  b834638e 10 months ago Initial commit
+Branch Status  HEAD± main↕ Path  Remote↕ Commit  Age  Message
+main  ./test-repo b834638e 10 months ago Initial commit
+emoji  ≡ 🔄 ./emoji  b834638e 10 months ago Initial commit
+multi  ≡ blocked: needs review ./multi  b834638e 10 months ago Initial commit
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap b/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap
index 83bb9e45c..b6ddbb4e7 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/.tmp2E6Kjt/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpexsbOA/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status Working ± Main ↕ Path  Remote ↕ Commit  Age  Message
-main  ./test-repo  b834638e 10 months ago Initial commit
-feature-with-worktree  ≡ ./feature-with-worktree b834638e 10 months ago Initial commit
-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 HEAD± main↕ Path  Remote↕ Commit  Age  Message
+main  ./test-repo  b834638e 10 months ago Initial commit
+feature-with-worktree  ≡ ./feature-with-worktree b834638e 10 months ago Initial commit
+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 07327ae25..cc4532ded 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/.tmpkMDlsF/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmptOGVK9/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status Working ± Main ↕ Path  Remote ↕ Commit  Age  Message
-main  ./test-repo b834638e 10 months ago Initial commit
-feature-a ≡ ./feature-a b834638e 10 months ago Initial commit
-feature-b ≡ ./feature-b b834638e 10 months ago Initial commit
+Branch  Status HEAD± main↕ Path  Remote↕ Commit  Age  Message
+main  ./test-repo b834638e 10 months ago Initial commit
+feature-a ≡ ./feature-a b834638e 10 months ago Initial commit
+feature-b ≡ ./feature-b b834638e 10 months ago Initial commit
⚪ 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 7ae0a773e..7c66c1e02 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/.tmpzDOuA8/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpg0KIme/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status Working ± Main ↕ 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  Status HEAD± main↕ 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 7d2d63d82..3a77b6234 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/.tmpGd8a1h/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpuzjO18/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status Working ± Main ↕ Main ± Path  Remote ↕ CI Commit  Age  Message
-main  ./test-repo  ↑0 ↓0 6c3da842 10 months ago Initial commit on main
-ahead ↑⇡ ↑2 +2 ./ahead ↑2 ↓0 8d8f4673 10 months ago Ahead commit 2
-behind  ≡⇣ ./behind  ↑0 ↓1 6c3da842 10 months ago Initial commit on main
-diverged ↑⇡⇣ ↑1 +1 ./diverged ↑1 ↓1 ca7cb696 10 months ago Diverged local commit
-in-sync  ≡ ./in-sync  ↑0 ↓0 6c3da842 10 months ago Initial commit on main
-no-upstream ≡ ./no-upstream 6c3da842 10 months ago Initial commit on main
+Branch  Status HEAD± main↕ main…± Path  Remote↕ CI Commit  Age  Message
+main  ./test-repo  ↑0 ↓0 6c3da842 10 months ago Initial commit on main
+ahead ↑⇡ ↑2 +2 ./ahead ↑2 ↓0 8d8f4673 10 months ago Ahead commit 2
+behind  ≡⇣ ./behind  ↑0 ↓1 6c3da842 10 months ago Initial commit on main
+diverged ↑⇡⇣ ↑1 +1 ./diverged ↑1 ↓1 ca7cb696 10 months ago Diverged local commit
+in-sync  ≡ ./in-sync  ↑0 ↓0 6c3da842 10 months ago Initial commit on main
+no-upstream ≡ ./no-upstream 6c3da842 10 months ago Initial commit on main
⚪ Showing 6 worktrees, 2 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__with_user_status.snap b/tests/snapshots/integration__integration_tests__list__with_user_status.snap
index 540895059..0f9a32cb1 100644
--- a/tests/snapshots/integration__integration_tests__list__with_user_status.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_user_status.snap
@@ -15,17 +15,17 @@ info:
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpncp2Cy/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp8yDaqT/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status  Working ± Main ↕ Path  Remote ↕ Commit  Age  Message
-main  ./test-repo  b834638e 10 months ago Initial commit
-clean-no-status  ≡ ./clean-no-status  b834638e 10 months ago Initial commit
-clean-with-status ≡ waiting ./clean-with-status b834638e 10 months ago Initial commit
-dirty-no-status ! +1 -1 ./dirty-no-status b834638e 10 months ago Initial commit
-dirty-with-status ≡? * ./dirty-with-status b834638e 10 months ago Initial commit
+Branch  Status  HEAD± main↕ Path  Remote↕ Commit  Age  Message
+main  ./test-repo  b834638e 10 months ago Initial commit
+clean-no-status  ≡ ./clean-no-status  b834638e 10 months ago Initial commit
+clean-with-status ≡ waiting ./clean-with-status b834638e 10 months ago Initial commit
+dirty-no-status ! +1 -1 ./dirty-no-status b834638e 10 months ago Initial commit
+dirty-with-status ≡? * ./dirty-with-status b834638e 10 months ago Initial commit
⚪ Showing 5 worktrees, 1 with changes
diff --git a/tests/snapshots/integration__integration_tests__security__commit_message_with_directive_not_executed.snap b/tests/snapshots/integration__integration_tests__security__commit_message_with_directive_not_executed.snap
index de0152703..1a33b7384 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/.tmp3LGEqm/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpSGpBh2/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status Working ± Main ↕ Path  Remote ↕ Commit  Age  Message
-main  ./test-repo [SHA] 10 months ago Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
-feature ≡ ./feature  [SHA] 10 months ago Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
+Branch  Status HEAD± main↕ Path  Remote↕ Commit  Age  Message
+main  ./test-repo [SHA] 10 months ago Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
+feature ≡ ./feature  [SHA] 10 months ago Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
⚪ 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 3c99442b1..370045b42 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/.tmpiTqBLx/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpJjkn3z/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Status Working ± Main ↕ Path Remote ↕ Commit  Age  Message
-main  .  b834638e 10 months ago Initial commit
+Branch Status HEAD± main↕ 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 7e0d1f94b..f09db986b 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/.tmpBOoPwl/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpZ5ntdF/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status Working ± Main ↕ Path  Remote ↕ Commit  Age  Message
-main  ./test-repo  b834638e 10 months ago Initial commit
-also-no-changes ≡ ./also-no-changes b834638e 10 months ago Initial commit
-no-changes  ≡ ./no-changes  b834638e 10 months ago Initial commit
-with-changes ! +1 -1 ./with-changes b834638e 10 months ago Initial commit
+Branch  Status HEAD± main↕ Path  Remote↕ Commit  Age  Message
+main  ./test-repo  b834638e 10 months ago Initial commit
+also-no-changes ≡ ./also-no-changes b834638e 10 months ago Initial commit
+no-changes  ≡ ./no-changes  b834638e 10 months ago Initial commit
+with-changes ! +1 -1 ./with-changes b834638e 10 months ago Initial commit
⚪ 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 93e5a714d..f5fb7a7bf 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/.tmpEeUcz2/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0bpj3J/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Status Working ± Main ↕ Path  Remote ↕ Commit  Age  Message
-main  ./test-repo b834638e 10 months ago Initial commit
-huge  ≡? ./huge  b834638e 10 months ago Initial commit
-tiny ! +1 -1 ./tiny b834638e 10 months ago Initial commit
+Branch Status HEAD± main↕ Path  Remote↕ Commit  Age  Message
+main  ./test-repo b834638e 10 months ago Initial commit
+huge  ≡? ./huge  b834638e 10 months ago Initial commit
+tiny ! +1 -1 ./tiny b834638e 10 months ago Initial commit
⚪ 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 123d50db1..0b88576fb 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/.tmp2vJ1Uk/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpE1iUhG/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status Working ± Main ↕ Path  Remote ↕ Commit  Age  Message
-main  ./test-repo  b834638e 10 months ago Initial commit
-feature-large  ≡? ./feature-large  b834638e 10 months ago Initial commit
-feature-medium ≡? ./feature-medium b834638e 10 months ago Initial commit
-feature-small  ≡? ./feature-small  b834638e 10 months ago Initial commit
+Branch  Status HEAD± main↕ Path  Remote↕ Commit  Age  Message
+main  ./test-repo  b834638e 10 months ago Initial commit
+feature-large  ≡? ./feature-large  b834638e 10 months ago Initial commit
+feature-medium ≡? ./feature-medium b834638e 10 months ago Initial commit
+feature-small  ≡? ./feature-small  b834638e 10 months ago Initial commit
⚪ 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 b75819a55..78620dd23 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/.tmp0Vkyip/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpVsPsec/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status Working ± Main ↕ Path  Remote ↕ Commit  Age  Message
-main  ./test-repo  b834638e 10 months ago Initial commit
-another-extremely-long-name-here ≡ ./another-extremely-long-name-here b834638e 10 months ago Initial commit
-short  ≡ ./short  b834638e 10 months ago Initial commit
-very-long-feature-branch-name  ≡ ./very-long-feature-branch-name  b834638e 10 months ago Initial commit
+Branch  Status HEAD± main↕ Path  Remote↕ Commit  Age  Message
+main  ./test-repo  b834638e 10 months ago Initial commit
+another-extremely-long-name-here ≡ ./another-extremely-long-name-here b834638e 10 months ago Initial commit
+short  ≡ ./short  b834638e 10 months ago Initial commit
+very-long-feature-branch-name  ≡ ./very-long-feature-branch-name  b834638e 10 months ago Initial commit
⚪ 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 ebb9a3574..619f479c1 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/.tmppKNFE2/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpVYD5U5/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Status Working ± Main ↕ Path  Remote ↕ Commit  Age  Message
-main  ./test-repo  b834638e 10 months ago Initial commit
-long  ≡ ./extremely-long-branch-name-that-might-cause-layout-issues b834638e 10 months ago Initial commit
-medium ≡ ./medium-length-name  b834638e 10 months ago Initial commit
-x  ≡ ./x  b834638e 10 months ago Initial commit
+Branch Status HEAD± main↕ Path  Remote↕ Commit  Age  Message
+main  ./test-repo  b834638e 10 months ago Initial commit
+long  ≡ ./extremely-long-branch-name-that-might-cause-layout-issues b834638e 10 months ago Initial commit
+medium ≡ ./medium-length-name  b834638e 10 months ago Initial commit
+x  ≡ ./x  b834638e 10 months ago Initial commit
⚪ 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 29b772faa..ddaccdaeb 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/.tmplePMre/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpkf2RA5/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Status Working ± Main ↕ Path  Remote ↕ Commit  Age  Message
-main  ./test-repo b834638e 10 months ago Initial commit
-a  ≡ ./a  b834638e 10 months ago Initial commit
-bb  ≡ ./bb  b834638e 10 months ago Initial commit
-ccc  ≡ ./ccc  b834638e 10 months ago Initial commit
+Branch Status HEAD± main↕ Path  Remote↕ Commit  Age  Message
+main  ./test-repo b834638e 10 months ago Initial commit
+a  ≡ ./a  b834638e 10 months ago Initial commit
+bb  ≡ ./bb  b834638e 10 months ago Initial commit
+ccc  ≡ ./ccc  b834638e 10 months ago Initial commit
⚪ 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 dffb1723e..0977db957 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/.tmpxwy8Jj/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpPJAlvx/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status Working ± Path  Commit  Age  Message
-main  ./test-repo a7bc47ca 10 months ago Initial commit with a reasonably long message
-feature-a ≡ ./feature-a a7bc47ca 10 months ago Initial commit with a reasonably long message
-feature-b ≡ ./feature-b a7bc47ca 10 months ago Initial commit with a reasonably long message
+Branch  Status HEAD± main↕ Path  Commit  Age  Message
+main  ./test-repo a7bc47ca 10 months ago Initial commit with a reasonably long message
+feature-a ≡ ./feature-a a7bc47ca 10 months ago Initial commit with a reasonably long message
+feature-b ≡ ./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 0b671d13a..291874552 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/.tmpxmwA5R/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp65ZXrp/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch  Status Working ± Main ↕ Path  Remote ↕ Commit  Age  Message
-main  ./test-repo a7bc47ca 10 months ago Initial commit with a reasonably long message
-feature-a ≡ ./feature-a a7bc47ca 10 months ago Initial commit with a reasonably long message
-feature-b ≡ ./feature-b a7bc47ca 10 months ago Initial commit with a reasonably long message
+Branch  Status HEAD± main↕ Path  Remote↕ Commit  Age  Message
+main  ./test-repo a7bc47ca 10 months ago Initial commit with a reasonably long message
+feature-a ≡ ./feature-a a7bc47ca 10 months ago Initial commit with a reasonably long message
+feature-b ≡ ./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__unicode_branch_names.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__unicode_branch_names.snap
index 32dc58c96..357cedb02 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/.tmpmi5Xdk/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpa1jWxK/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
-Branch Status Working ± Main ↕ Path  Remote ↕ Commit  Age  Message
-main  ./test-repo b834638e 10 months ago Initial commit
-cafe  ≡ ./café  b834638e 10 months ago Initial commit
-naive  ≡ ./naïve  b834638e 10 months ago Initial commit
-resume ≡ ./résumé  b834638e 10 months ago Initial commit
+Branch Status HEAD± main↕ Path  Remote↕ Commit  Age  Message
+main  ./test-repo b834638e 10 months ago Initial commit
+cafe  ≡ ./café  b834638e 10 months ago Initial commit
+naive  ≡ ./naïve  b834638e 10 months ago Initial commit
+resume ≡ ./résumé  b834638e 10 months ago Initial commit
⚪ Showing 4 worktrees