Skip to content

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

fix: Align status column width for list command

Maximilian Roose87561321439
diff --git a/dev/wt-demo-build.sh b/dev/wt-demo-build.sh
index d2b28f968..afaa49580 100755
--- a/dev/wt-demo-build.sh
+++ b/dev/wt-demo-build.sh
@@ -231,6 +231,9 @@ exit 1
GH
chmod +x "$DEMO_HOME/bin/gh"
+ # Build local debug binary
+ cargo build --quiet
+
# Set up user config with LLM and pre-approved commands
local project_id="${BARE_REMOTE%.git}"
mkdir -p "$DEMO_HOME/.config/worktrunk"
@@ -486,6 +489,7 @@ render_tape() {
-e "s|{{REAL_HOME}}|$HOME|g" \
-e "s|{{STARSHIP_CONFIG}}|$STARSHIP_CONFIG_PATH|g" \
-e "s|{{OUTPUT_GIF}}|$OUTPUT_GIF|g" \
+ -e "s|{{TARGET_DEBUG}}|$REPO_ROOT/target/debug|g" \
"$TAPE_TEMPLATE" >"$TAPE_RENDERED"
}
@@ -505,7 +509,7 @@ record_text() {
export RUSTUP_HOME="'"$real_home"'/.rustup"
export CARGO_HOME="'"$real_home"'/.cargo"
export HOME="'"$DEMO_HOME"'"
- export PATH="$HOME/bin:$PATH"
+ export PATH="'"$REPO_ROOT"'/target/debug:$HOME/bin:$PATH"
export STARSHIP_CONFIG="'"$STARSHIP_CONFIG_PATH"'"
export STARSHIP_CACHE="'"$DEMO_ROOT"'"/starship-cache
mkdir -p "$STARSHIP_CACHE"
diff --git a/dev/wt-demo/demo.tape b/dev/wt-demo/demo.tape
index 5e97c94a3..d29557f8e 100644
--- a/dev/wt-demo/demo.tape
+++ b/dev/wt-demo/demo.tape
@@ -24,7 +24,7 @@ Env STARSHIP_CONFIG "{{STARSHIP_CONFIG}}"
Hide
Type "export LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8"
Enter
-Type "export PATH=$HOME/bin:$PATH"
+Type "export PATH={{TARGET_DEBUG}}:$HOME/bin:$PATH"
Enter
Type 'eval "$(starship init zsh)" >/dev/null 2>&1'
Enter
diff --git a/src/commands/list/layout.rs b/src/commands/list/layout.rs
index 0a7bf77a1..60ababfd5 100644
--- a/src/commands/list/layout.rs
+++ b/src/commands/list/layout.rs
@@ -442,8 +442,8 @@ fn build_estimated_widths(max_branch: usize, show_full: bool, fetch_ci: bool) ->
// Values exceeding these widths use compact notation (K suffix)
//
// Status column: Must match PositionMask::FULL width for consistent alignment
- // PositionMask::FULL allocates: 5+1+1+1+1+1+2+2 = 14 chars
- let status_fixed = fit_header(HEADER_STATUS, 14);
+ // PositionMask::FULL allocates: 1+1+1+1+1+1+1+2 = 9 chars
+ let status_fixed = fit_header(HEADER_STATUS, 9);
let working_diff_fixed = fit_header(HEADER_WORKING_DIFF, 9); // "+999 -999"
let ahead_behind_fixed = fit_header(HEADER_AHEAD_BEHIND, 7); // "↑99 ↓99"
let branch_diff_fixed = fit_header(HEADER_BRANCH_DIFF, 9); // "+999 -999"
@@ -670,7 +670,7 @@ fn allocate_columns_with_priority(
/// - Paths (with common prefix removed)
///
/// Pre-allocated estimates (generous to minimize truncation):
-/// - Status: 14 chars (PositionMask::FULL)
+/// - Status: 9 chars (PositionMask::FULL)
/// - Working diff: 9 chars ("+999 -999")
/// - Ahead/behind: 7 chars ("↑99 ↓99")
/// - Branch diff: 9 chars ("+999 -999")
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 cf45df61e..7ddf92e82 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
@@ -14,15 +14,15 @@ info:
LC_ALL: C
NO_COLOR: ""
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpRMLzJS/test-config.toml
+ WORKTRUNK_CONFIG: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmppkxcjs/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo.main 6c3da842 10mo Initial commit on main
-+ feature ↑ ↑1 ./test-repo.feature 72413a3b 10mo Work on feature
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo.main 6c3da842 10mo Initial commit on main
++ feature ↑ ↑1 ./test-repo.feature 72413a3b 10mo Work on feature
⚪ Showing 2 worktrees, 1 ahead
diff --git a/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snap b/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snap
index 8183001d3..2290c9f13 100644
--- a/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snap
+++ b/tests/snapshots/integration__integration_tests__internal_flag__list_with_internal_flag.snap
@@ -10,20 +10,20 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_GLOBAL: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmph0YeBy/test-gitconfig
+ GIT_CONFIG_GLOBAL: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpakZbbN/test-gitconfig
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
LANG: C
LC_ALL: C
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmph0YeBy/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpakZbbN/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ . b834638e 10mo Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snap b/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snap
index 0d291085d..b6c71c73b 100644
--- a/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snap
+++ b/tests/snapshots/integration__integration_tests__list__branch_only_with_status.snap
@@ -23,8 +23,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . b834638e 10mo Initial commit
- branch-only ∅ ⎇ b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ . b834638e 10mo Initial commit
+ branch-only ∅ ⎇ b834638e 10mo Initial commit
⚪ Showing 1 worktrees, 1 branches
diff --git a/tests/snapshots/integration__integration_tests__list__default_branch_missing_worktree.snap b/tests/snapshots/integration__integration_tests__list__default_branch_missing_worktree.snap
index d556cb7d8..876b3df69 100644
--- a/tests/snapshots/integration__integration_tests__list__default_branch_missing_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__default_branch_missing_worktree.snap
@@ -22,7 +22,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ develop ^ . b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ develop ^ . b834638e 10mo Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list__detached_head.snap b/tests/snapshots/integration__integration_tests__list__detached_head.snap
index 968c66c2d..73ef947a5 100644
--- a/tests/snapshots/integration__integration_tests__list__detached_head.snap
+++ b/tests/snapshots/integration__integration_tests__list__detached_head.snap
@@ -22,7 +22,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ - ^ . b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ - ^ . b834638e 10mo Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap b/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap
index 3ff44e167..03bfc12b3 100644
--- a/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap
+++ b/tests/snapshots/integration__integration_tests__list__large_diffs_alignment.snap
@@ -22,10 +22,10 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ diverged ! ↑ 💬 +40 -60 ↑1 ./diverged 8ba5aa92 10mo Diverged commit
-+ feature-changes !? ↑ 🤖 +50 -100 ↑1 ./feature-changes b854b166 10mo Add 100 lines
-+ fix ?∅ 💬 ./fix b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ diverged ! ↑ 💬 +40 -60 ↑1 ./diverged 8ba5aa92 10mo Diverged commit
++ feature-changes !? ↑ 🤖 +50 -100 ↑1 ./feature-changes b854b166 10mo Add 100 lines
++ fix ?∅ 💬 ./fix b834638e 10mo Initial commit
⚪ Showing 4 worktrees, 2 with changes, 2 ahead
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 8ad0dd6a6..6e20fa10e 100644
--- a/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap
@@ -22,11 +22,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-^ main ^ ./test-repo 6c3da842 10mo Initial commit on main
-@ feature-current ↑ ↑1 ./feature-current fc28a4d1 9mo Commit at 01:00
-+ feature-newest ↑ ↑1 ./feature-newest 136358eb 9mo Commit at 03:00
-+ feature-middle ↑ ↑1 ./feature-middle a0a4851a 9mo Commit at 02:00
-+ feature-oldest ↑ ↑1 ./feature-oldest 1b1a2d78 9mo Commit at 00:30
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+^ main ^ ./test-repo 6c3da842 10mo Initial commit on main
+@ feature-current ↑ ↑1 ./feature-current fc28a4d1 9mo Commit at 01:00
++ feature-newest ↑ ↑1 ./feature-newest 136358eb 9mo Commit at 03:00
++ feature-middle ↑ ↑1 ./feature-middle a0a4851a 9mo Commit at 02:00
++ feature-oldest ↑ ↑1 ./feature-oldest 1b1a2d78 9mo 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 c6f47178c..a2135f982 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
@@ -22,9 +22,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ develop ^ ./test-repo b834638e 10mo Initial commit
-+ feature-a ∅ ./feature-a b834638e 10mo Initial commit
-+ feature-b ∅ ./feature-b b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ develop ^ ./test-repo b834638e 10mo Initial commit
++ feature-a ∅ ./feature-a b834638e 10mo Initial commit
++ feature-b ∅ ./feature-b b834638e 10mo Initial commit
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snap b/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snap
index 8766aa1c1..cf872f201 100644
--- a/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snap
@@ -4,7 +4,7 @@ info:
program: wt
args:
- "-C"
- - /private/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpXmLBZf/test-repo
+ - /private/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpN0POMq/test-repo
- list
env:
CLICOLOR_FORCE: "1"
@@ -16,9 +16,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ feature-a ∅ ./feature-a b834638e 10mo Initial commit
-+ feature-b ∅ ./feature-b b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ feature-a ∅ ./feature-a b834638e 10mo Initial commit
++ feature-b ∅ ./feature-b b834638e 10mo 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 8bcdf3a9a..c02f95427 100644
--- a/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap
+++ b/tests/snapshots/integration__integration_tests__list__locked_no_reason.snap
@@ -22,8 +22,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ locked-no-reason ∅ ⊠ ./locked-no-reason b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ locked-no-reason ∅ ⊠ ./locked-no-reason b834638e 10mo 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 285f4f3dd..91ca2914d 100644
--- a/tests/snapshots/integration__integration_tests__list__locked_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__locked_worktree.snap
@@ -22,8 +22,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ locked-feature ∅ ⊠ ./locked-feature b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ locked-feature ∅ ⊠ ./locked-feature b834638e 10mo 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 9b2ad59d9..55c60dc3c 100644
--- a/tests/snapshots/integration__integration_tests__list__long_commit_message.snap
+++ b/tests/snapshots/integration__integration_tests__list__long_commit_message.snap
@@ -22,8 +22,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo 1310bfb9 10mo Short message
-+ feature-a ∅↓ ↓1 ./feature-a f078644e 10mo This is a very long commit message that should test how…
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo 1310bfb9 10mo Short message
++ feature-a ∅↓ ↓1 ./feature-a f078644e 10mo This is a very long commit message that should test how the…
⚪ Showing 2 worktrees
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 4ab26e9d6..220b89a6d 100644
--- a/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap
+++ b/tests/snapshots/integration__integration_tests__list__many_worktrees_varied.snap
@@ -22,11 +22,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ medium-name ∅ ./medium-name b834638e 10mo Initial commit
-+ short ∅ ./short b834638e 10mo Initial commit
-+ very-long-branch-name-here ∅ ./very-long-branch-name-here b834638e 10mo Initial commit
-+ with-changes ∅ ./with-changes b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ medium-name ∅ ./medium-name b834638e 10mo Initial commit
++ short ∅ ./short b834638e 10mo Initial commit
++ very-long-branch-name-here ∅ ./very-long-branch-name-here b834638e 10mo Initial commit
++ with-changes ∅ ./with-changes b834638e 10mo Initial commit
⚪ Showing 5 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap b/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap
index 323e2716b..ef52ec9f0 100644
--- a/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap
+++ b/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap
@@ -23,8 +23,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^⇡ ./test-repo ↑1 ↓0 85ed6d3d 10mo Main advances
-+ feature +!?⚠↕⇅⊠🤖 +2 -2 ↑2 ↓1 +3 -1 ./feature ↑1 ↓1 4afb2b9e 10mo Local commit
+ Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
+@ main ^⇡ ./test-repo ↑1 ↓0 85ed6d3d 10mo Main advances
++ feature +!?⚠↕⇅⊠🤖 +2 -2 ↑2 ↓1 +3 -1 ./feature ↑1 ↓1 4afb2b9e 10mo Local commit
⚪ Showing 2 worktrees, 1 with changes, 1 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__maximum_status_with_git_operation.snap b/tests/snapshots/integration__integration_tests__list__maximum_status_with_git_operation.snap
index 5e91348d2..08ea67123 100644
--- a/tests/snapshots/integration__integration_tests__list__maximum_status_with_git_operation.snap
+++ b/tests/snapshots/integration__integration_tests__list__maximum_status_with_git_operation.snap
@@ -23,8 +23,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ ./test-repo b7c14ce1 10mo Main conflicting changes
-+ feature +!?✖ ⊠🤖 +7 ./feature b7c14ce1 10mo Main conflicting changes
+ Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
+@ main ^ ./test-repo b7c14ce1 10mo Main conflicting changes
++ feature +!?✖ ⊠🤖 +7 ./feature b7c14ce1 10mo Main conflicting changes
⚪ Showing 2 worktrees, 1 with changes
diff --git a/tests/snapshots/integration__integration_tests__list__maximum_working_tree_symbols.snap b/tests/snapshots/integration__integration_tests__list__maximum_working_tree_symbols.snap
index 4632c7f95..80e8de238 100644
--- a/tests/snapshots/integration__integration_tests__list__maximum_working_tree_symbols.snap
+++ b/tests/snapshots/integration__integration_tests__list__maximum_working_tree_symbols.snap
@@ -22,8 +22,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ feature +!? ↑ +2 -3 ↑1 ./feature 689c2504 10mo Add files
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ feature +!? ↑ +2 -3 ↑1 ./feature 689c2504 10mo Add files
⚪ Showing 2 worktrees, 1 with changes, 1 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap
index 6d9b10367..77f7d2cdd 100644
--- a/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__list__multiple_worktrees.snap
@@ -22,9 +22,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ feature-a ∅ ./feature-a b834638e 10mo Initial commit
-+ feature-b ∅ ./feature-b b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ feature-a ∅ ./feature-a b834638e 10mo Initial commit
++ feature-b ∅ ./feature-b b834638e 10mo Initial commit
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap b/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap
index 07d4e525d..3ee49bc5d 100644
--- a/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__no_progressive_flag.snap
@@ -23,8 +23,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ feature ∅ ./feature b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ feature ∅ ./feature b834638e 10mo Initial commit
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__progressive_flag.snap b/tests/snapshots/integration__integration_tests__list__progressive_flag.snap
index 9bd657fa8..f2160c3d1 100644
--- a/tests/snapshots/integration__integration_tests__list__progressive_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__progressive_flag.snap
@@ -23,9 +23,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ feature-a ∅ ./feature-a b834638e 10mo Initial commit
-+ feature-b ∅ ./feature-b b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ feature-a ∅ ./feature-a b834638e 10mo Initial commit
++ feature-b ∅ ./feature-b b834638e 10mo Initial commit
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap b/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap
index ea9a60142..26d92be3d 100644
--- a/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list__progressive_with_branches.snap
@@ -24,10 +24,10 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ feature-a ∅ ./feature-a b834638e 10mo Initial commit
- orphan-1 ∅ ⎇ b834638e 10mo Initial commit
- orphan-2 ∅ ⎇ b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ feature-a ∅ ./feature-a b834638e 10mo Initial commit
+ orphan-1 ∅ ⎇ b834638e 10mo Initial commit
+ orphan-2 ∅ ⎇ b834638e 10mo Initial commit
⚪ Showing 2 worktrees, 2 branches
diff --git a/tests/snapshots/integration__integration_tests__list__readme_example_simple_list.snap b/tests/snapshots/integration__integration_tests__list__readme_example_simple_list.snap
index 274d1d136..c97746416 100644
--- a/tests/snapshots/integration__integration_tests__list__readme_example_simple_list.snap
+++ b/tests/snapshots/integration__integration_tests__list__readme_example_simple_list.snap
@@ -22,9 +22,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo ↑0 ↓0 b834638e 10mo Initial commit
-+ bugfix-y ↑ ↑1 ./bugfix-y 412a27c8 10mo Fix bug
-+ feature-x + ↑ +5 ↑3 ./feature-x 7fd821aa 10mo Add file 3
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo ↑0 ↓0 b834638e 10mo Initial commit
++ bugfix-y ↑ ↑1 ./bugfix-y 412a27c8 10mo Fix bug
++ feature-x + ↑ +5 ↑3 ./feature-x 7fd821aa 10mo Add file 3
⚪ Showing 3 worktrees, 1 with changes, 2 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__single_worktree.snap b/tests/snapshots/integration__integration_tests__list__single_worktree.snap
index ccf14f2db..c795d0650 100644
--- a/tests/snapshots/integration__integration_tests__list__single_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__single_worktree.snap
@@ -22,7 +22,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ . b834638e 10mo Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list__status_column_padding_emoji.snap b/tests/snapshots/integration__integration_tests__list__status_column_padding_emoji.snap
index d72323d69..b6c85418e 100644
--- a/tests/snapshots/integration__integration_tests__list__status_column_padding_emoji.snap
+++ b/tests/snapshots/integration__integration_tests__list__status_column_padding_emoji.snap
@@ -22,10 +22,10 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ main-symbol ↑ 💬 ↑1 ./main-symbol 579fcd0b 10mo Symbol commit
-+ pr-link ↑ 🤖 ↑1 ./pr-link e17e7d2d 10mo PR commit
-+ wli-sequence !? ↑ 🤖 +1 -112 ↑1 ./wli-sequence a2483ffd 10mo Initial content
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ main-symbol ↑ 💬 ↑1 ./main-symbol 579fcd0b 10mo Symbol commit
++ pr-link ↑ 🤖 ↑1 ./pr-link e17e7d2d 10mo PR commit
++ wli-sequence !? ↑ 🤖 +1 -112 ↑1 ./wli-sequence a2483ffd 10mo Initial content
⚪ Showing 4 worktrees, 1 with changes, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_detached_head.snap b/tests/snapshots/integration__integration_tests__list__task_dag_detached_head.snap
index 43860750b..e4f53e756 100644
--- a/tests/snapshots/integration__integration_tests__list__task_dag_detached_head.snap
+++ b/tests/snapshots/integration__integration_tests__list__task_dag_detached_head.snap
@@ -23,7 +23,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ - ^ . b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ - ^ . b834638e 10mo Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_full_with_diffs.snap b/tests/snapshots/integration__integration_tests__list__task_dag_full_with_diffs.snap
index 8b330cd24..4368b3ee2 100644
--- a/tests/snapshots/integration__integration_tests__list__task_dag_full_with_diffs.snap
+++ b/tests/snapshots/integration__integration_tests__list__task_dag_full_with_diffs.snap
@@ -24,9 +24,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ feature-a ?∅ ./feature-a b834638e 10mo Initial commit
-+ feature-b ↑ ↑1 +1 -1 ./feature-b 2d37ca75 10mo Test commit
+ Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ feature-a ?∅ ./feature-a b834638e 10mo Initial commit
++ feature-b ↑ ↑1 +1 -1 ./feature-b 2d37ca75 10mo Test commit
⚪ Showing 3 worktrees, 1 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_many_worktrees.snap b/tests/snapshots/integration__integration_tests__list__task_dag_many_worktrees.snap
index 17409a632..234f0b61b 100644
--- a/tests/snapshots/integration__integration_tests__list__task_dag_many_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__list__task_dag_many_worktrees.snap
@@ -23,17 +23,17 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ feature-1 ∅ ./feature-1 b834638e 10mo Initial commit
-+ feature-10 ∅ ./feature-10 b834638e 10mo Initial commit
-+ feature-2 ∅ ./feature-2 b834638e 10mo Initial commit
-+ feature-3 ∅ ./feature-3 b834638e 10mo Initial commit
-+ feature-4 ∅ ./feature-4 b834638e 10mo Initial commit
-+ feature-5 ∅ ./feature-5 b834638e 10mo Initial commit
-+ feature-6 ∅ ./feature-6 b834638e 10mo Initial commit
-+ feature-7 ∅ ./feature-7 b834638e 10mo Initial commit
-+ feature-8 ∅ ./feature-8 b834638e 10mo Initial commit
-+ feature-9 ∅ ./feature-9 b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ feature-1 ∅ ./feature-1 b834638e 10mo Initial commit
++ feature-10 ∅ ./feature-10 b834638e 10mo Initial commit
++ feature-2 ∅ ./feature-2 b834638e 10mo Initial commit
++ feature-3 ∅ ./feature-3 b834638e 10mo Initial commit
++ feature-4 ∅ ./feature-4 b834638e 10mo Initial commit
++ feature-5 ∅ ./feature-5 b834638e 10mo Initial commit
++ feature-6 ∅ ./feature-6 b834638e 10mo Initial commit
++ feature-7 ∅ ./feature-7 b834638e 10mo Initial commit
++ feature-8 ∅ ./feature-8 b834638e 10mo Initial commit
++ feature-9 ∅ ./feature-9 b834638e 10mo Initial commit
⚪ Showing 11 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__list__task_dag_multiple_worktrees.snap
index 1c5205238..73639d8b1 100644
--- a/tests/snapshots/integration__integration_tests__list__task_dag_multiple_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__list__task_dag_multiple_worktrees.snap
@@ -23,10 +23,10 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ feature-a ∅ ./feature-a b834638e 10mo Initial commit
-+ feature-b ∅ ./feature-b b834638e 10mo Initial commit
-+ feature-c ∅ ./feature-c b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ feature-a ∅ ./feature-a b834638e 10mo Initial commit
++ feature-b ∅ ./feature-b b834638e 10mo Initial commit
++ feature-c ∅ ./feature-c b834638e 10mo Initial commit
⚪ Showing 4 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_ordering_stability.snap b/tests/snapshots/integration__integration_tests__list__task_dag_ordering_stability.snap
index 79fc95cc9..4ca60231e 100644
--- a/tests/snapshots/integration__integration_tests__list__task_dag_ordering_stability.snap
+++ b/tests/snapshots/integration__integration_tests__list__task_dag_ordering_stability.snap
@@ -23,11 +23,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-^ main ^ ./test-repo 6c3da842 10mo Initial commit on main
-@ feature-current ↑ ↑1 ./feature-current fc28a4d1 9mo Commit at 01:00
-+ feature-newest ↑ ↑1 ./feature-newest 136358eb 9mo Commit at 03:00
-+ feature-middle ↑ ↑1 ./feature-middle a0a4851a 9mo Commit at 02:00
-+ feature-oldest ↑ ↑1 ./feature-oldest 1b1a2d78 9mo Commit at 00:30
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+^ main ^ ./test-repo 6c3da842 10mo Initial commit on main
+@ feature-current ↑ ↑1 ./feature-current fc28a4d1 9mo Commit at 01:00
++ feature-newest ↑ ↑1 ./feature-newest 136358eb 9mo Commit at 03:00
++ feature-middle ↑ ↑1 ./feature-middle a0a4851a 9mo Commit at 02:00
++ feature-oldest ↑ ↑1 ./feature-oldest 1b1a2d78 9mo Commit at 00:30
⚪ Showing 5 worktrees, 4 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_single_worktree.snap b/tests/snapshots/integration__integration_tests__list__task_dag_single_worktree.snap
index bcc378671..12027844b 100644
--- a/tests/snapshots/integration__integration_tests__list__task_dag_single_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__task_dag_single_worktree.snap
@@ -23,7 +23,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ . b834638e 10mo Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_with_locked.snap b/tests/snapshots/integration__integration_tests__list__task_dag_with_locked.snap
index 1b3402fdd..fe4ad7271 100644
--- a/tests/snapshots/integration__integration_tests__list__task_dag_with_locked.snap
+++ b/tests/snapshots/integration__integration_tests__list__task_dag_with_locked.snap
@@ -23,9 +23,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ locked ∅ ⊠ ./locked b834638e 10mo Initial commit
-+ normal ∅ ./normal b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ locked ∅ ⊠ ./locked b834638e 10mo Initial commit
++ normal ∅ ./normal b834638e 10mo Initial commit
⚪ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap b/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap
index a9948707f..fa56f8e9f 100644
--- a/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap
+++ b/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap
@@ -24,9 +24,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ ./test-repo ↑0 ↓0 6c3da842 10mo Initial commit on main
-+ ahead ↑⇡ ↑1 +1 ./ahead ↑1 ↓0 2fff52c2 10mo Ahead commit
-+ in-sync ∅ ./in-sync ↑0 ↓0 6c3da842 10mo Initial commit on main
+ Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
+@ main ^ ./test-repo ↑0 ↓0 6c3da842 10mo Initial commit on main
++ ahead ↑⇡ ↑1 +1 ./ahead ↑1 ↓0 2fff52c2 10mo Ahead commit
++ in-sync ∅ ./in-sync ↑0 ↓0 6c3da842 10mo Initial commit on main
⚪ Showing 3 worktrees, 1 ahead
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 400cc52f3..e0b650cd8 100644
--- a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap
+++ b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap
@@ -22,8 +22,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo e4614cb7 10mo Fix bug with café ☕ handling
-+ feature-test ∅↓ ↓1 ./feature-test 0c53695b 10mo Add support for 日本語 and émoji 🎉
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo e4614cb7 10mo Fix bug with café ☕ handling
++ feature-test ∅↓ ↓1 ./feature-test 0c53695b 10mo Add support for 日本語 and émoji 🎉
⚪ Showing 2 worktrees
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 b2875ccd6..d0ad8071c 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
@@ -22,9 +22,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ emoji ∅ 🔄 ./emoji b834638e 10mo Initial commit
-+ multi ∅ 👨‍💻 ./multi b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ emoji ∅ 🔄 ./emoji b834638e 10mo Initial commit
++ multi ∅ 👨‍💻 ./multi b834638e 10mo 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 0aeccd6f6..8ca80d8a6 100644
--- a/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_branches_flag.snap
@@ -23,11 +23,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ feature-with-worktree ∅ ./feature-with-worktree b834638e 10mo Initial commit
- another-branch ∅ ⎇ b834638e 10mo Initial commit
- feature-without-worktree ∅ ⎇ b834638e 10mo Initial commit
- fix-bug ∅ ⎇ b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ feature-with-worktree ∅ ./feature-with-worktree b834638e 10mo Initial commit
+ another-branch ∅ ⎇ b834638e 10mo Initial commit
+ feature-without-worktree ∅ ⎇ b834638e 10mo Initial commit
+ fix-bug ∅ ⎇ b834638e 10mo 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 0cf981686..734182bd0 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
@@ -23,9 +23,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ feature-a ∅ ./feature-a b834638e 10mo Initial commit
-+ feature-b ∅ ./feature-b b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ feature-a ∅ ./feature-a b834638e 10mo Initial commit
++ feature-b ∅ ./feature-b b834638e 10mo 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 4b4995510..712271614 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
@@ -23,10 +23,10 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . b834638e 10mo Initial commit
- branch-alpha ∅ ⎇ b834638e 10mo Initial commit
- branch-beta ∅ ⎇ b834638e 10mo Initial commit
- branch-gamma ∅ ⎇ b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ . b834638e 10mo Initial commit
+ branch-alpha ∅ ⎇ b834638e 10mo Initial commit
+ branch-beta ∅ ⎇ b834638e 10mo Initial commit
+ branch-gamma ∅ ⎇ b834638e 10mo Initial commit
⚪ Showing 1 worktrees, 3 branches
diff --git a/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap b/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap
index 2f474904b..224d6fbe1 100644
--- a/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap
@@ -24,11 +24,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . ↑0 ↓0 b834638e 10mo Initial commit
- local-only-1 ∅ ⎇ b834638e 10mo Initial commit
- local-only-2 ∅ ⎇ b834638e 10mo Initial commit
- origin/remote-only-1 ∅ ⎇ b834638e 10mo Initial commit
- origin/remote-only-2 ∅ ⎇ b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ . ↑0 ↓0 b834638e 10mo Initial commit
+ local-only-1 ∅ ⎇ b834638e 10mo Initial commit
+ local-only-2 ∅ ⎇ b834638e 10mo Initial commit
+ origin/remote-only-1 ∅ ⎇ b834638e 10mo Initial commit
+ origin/remote-only-2 ∅ ⎇ b834638e 10mo Initial commit
⚪ Showing 1 worktrees, 2 branches, 2 remote branches
diff --git a/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap b/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap
index 9649f2293..af86d9c15 100644
--- a/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap
@@ -23,9 +23,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo ↑0 ↓0 b834638e 10mo Initial commit
-+ feature-with-worktree ∅ ./feature-with-worktree b834638e 10mo Initial commit
- origin/remote-only ∅ ⎇ b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo ↑0 ↓0 b834638e 10mo Initial commit
++ feature-with-worktree ∅ ./feature-with-worktree b834638e 10mo Initial commit
+ origin/remote-only ∅ ⎇ b834638e 10mo Initial commit
⚪ Showing 2 worktrees, 1 remote branches
diff --git a/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap b/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap
index ed162e4e2..8a7d95363 100644
--- a/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap
@@ -23,9 +23,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . ↑0 ↓0 b834638e 10mo Initial commit
- origin/remote-feature-1 ∅ ⎇ b834638e 10mo Initial commit
- origin/remote-feature-2 ∅ ⎇ b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ . ↑0 ↓0 b834638e 10mo Initial commit
+ origin/remote-feature-1 ∅ ⎇ b834638e 10mo Initial commit
+ origin/remote-feature-2 ∅ ⎇ b834638e 10mo Initial commit
⚪ Showing 1 worktrees, 2 remote 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 8df460736..49dcbef66 100644
--- a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
@@ -11,26 +11,26 @@ info:
COLUMNS: "150"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
- GIT_CONFIG_GLOBAL: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp5rI3t8/test-gitconfig
+ GIT_CONFIG_GLOBAL: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpHpd2b5/test-gitconfig
GIT_CONFIG_SYSTEM: /dev/null
GIT_EDITOR: ""
LANG: C
LC_ALL: C
- PATH: "/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp5rI3t8/mock-bin:/Users/maximilian/.cargo/bin:/Users/maximilian/.local/bin:/Users/maximilian/.bun/bin:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
+ PATH: "/var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpHpd2b5/mock-bin:/Users/maximilian/.cargo/bin:/Users/maximilian/.local/bin:/Users/maximilian/.bun/bin:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
SOURCE_DATE_EPOCH: "1761609600"
- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp5rI3t8/test-config.toml
+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpHpd2b5/test-config.toml
---
success: true
exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ ./test-repo ↑0 ↓0 6c3da842 10mo Initial commit on main
-+ ahead ↑⇡ ↑2 +2 ./ahead ↑2 ↓0 8d8f4673 10mo Ahead commit 2
-+ behind ∅ ⇣ ./behind ↑0 ↓1 6c3da842 10mo Initial commit on main
-+ diverged ↑⇅ ↑1 +1 ./diverged ↑1 ↓1 ca7cb696 10mo Diverged local commit
-+ in-sync ∅ ./in-sync ↑0 ↓0 6c3da842 10mo Initial commit on main
-+ no-upstream ∅ ./no-upstream 6c3da842 10mo Initial commit on main
+ Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
+@ main ^ ./test-repo ↑0 ↓0 6c3da842 10mo Initial commit on main
++ ahead ↑⇡ ↑2 +2 ./ahead ↑2 ↓0 8d8f4673 10mo Ahead commit 2
++ behind ∅ ⇣ ./behind ↑0 ↓1 6c3da842 10mo Initial commit on main
++ diverged ↑⇅ ↑1 +1 ./diverged ↑1 ↓1 ca7cb696 10mo Diverged local commit
++ in-sync ∅ ./in-sync ↑0 ↓0 6c3da842 10mo Initial commit on main
++ no-upstream ∅ ./no-upstream 6c3da842 10mo 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 f6d47ee72..bf4f5956b 100644
--- a/tests/snapshots/integration__integration_tests__list__with_user_status.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_user_status.snap
@@ -22,11 +22,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ clean-no-status ∅ ./clean-no-status b834638e 10mo Initial commit
-+ clean-with-status ∅ 💬 ./clean-with-status b834638e 10mo Initial commit
-+ dirty-no-status ! +1 -1 ./dirty-no-status b834638e 10mo Initial commit
-+ dirty-with-status ?∅ 🤖 ./dirty-with-status b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ clean-no-status ∅ ./clean-no-status b834638e 10mo Initial commit
++ clean-with-status ∅ 💬 ./clean-with-status b834638e 10mo Initial commit
++ dirty-no-status ! +1 -1 ./dirty-no-status b834638e 10mo Initial commit
++ dirty-with-status ?∅ 🤖 ./dirty-with-status b834638e 10mo Initial commit
⚪ Showing 5 worktrees, 1 with changes
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_branches_enabled.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_branches_enabled.snap
index ba1e23ae7..50bbfc7a9 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_branches_enabled.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_branches_enabled.snap
@@ -24,7 +24,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . [SHA] 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ . [SHA] 10mo Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override.snap
index e8f9983d4..93c895974 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override.snap
@@ -25,8 +25,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . [SHA] 10mo Initial commit
- feature ∅ ⎇ [SHA] 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ . [SHA] 10mo Initial commit
+ feature ∅ ⎇ [SHA] 10mo Initial commit
⚪ Showing 1 worktrees, 1 branches
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_full_and_branches.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_full_and_branches.snap
index ba1e23ae7..50bbfc7a9 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_full_and_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_full_and_branches.snap
@@ -24,7 +24,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . [SHA] 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ . [SHA] 10mo Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_full_enabled.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_full_enabled.snap
index ba1e23ae7..50bbfc7a9 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_full_enabled.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_full_enabled.snap
@@ -24,7 +24,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . [SHA] 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ . [SHA] 10mo Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_no_config.snap b/tests/snapshots/integration__integration_tests__list_config__list_no_config.snap
index ba1e23ae7..50bbfc7a9 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_no_config.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_no_config.snap
@@ -24,7 +24,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . [SHA] 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ . [SHA] 10mo Initial commit
⚪ Showing 1 worktree
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 d083d3b0f..ee8f25234 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
@@ -22,8 +22,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo [SHA] 10mo Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
-+ feature ∅ ./feature [SHA] 10mo Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo [SHA] 10mo Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
++ feature ∅ ./feature [SHA] 10mo 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 c4e74dde7..dc2a07e84 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
@@ -22,7 +22,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . [SHA] 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ . [SHA] 10mo 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 69b331b4f..90f8d4eae 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
@@ -22,10 +22,10 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ also-no-changes ∅ ./also-no-changes b834638e 10mo Initial commit
-+ no-changes ∅ ./no-changes b834638e 10mo Initial commit
-+ with-changes ! +1 -1 ./with-changes b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ also-no-changes ∅ ./also-no-changes b834638e 10mo Initial commit
++ no-changes ∅ ./no-changes b834638e 10mo Initial commit
++ with-changes ! +1 -1 ./with-changes b834638e 10mo 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 91b92d451..92b20e955 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
@@ -22,9 +22,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ huge ?∅ ./huge b834638e 10mo Initial commit
-+ tiny ! +1 -1 ./tiny b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ huge ?∅ ./huge b834638e 10mo Initial commit
++ tiny ! +1 -1 ./tiny b834638e 10mo 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 8d9374443..668c04460 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
@@ -22,10 +22,10 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ feature-large ?∅ ./feature-large b834638e 10mo Initial commit
-+ feature-medium ?∅ ./feature-medium b834638e 10mo Initial commit
-+ feature-small ?∅ ./feature-small b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ feature-large ?∅ ./feature-large b834638e 10mo Initial commit
++ feature-medium ?∅ ./feature-medium b834638e 10mo Initial commit
++ feature-small ?∅ ./feature-small b834638e 10mo 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 4f4a05a48..c78b29667 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
@@ -22,10 +22,10 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age
-@ main ^ ./test-repo b834638e 10mo
-+ another-extremely-long-name-here ∅ ./another-extremely-long-name-here b834638e 10mo
-+ short ∅ ./short b834638e 10mo
-+ very-long-feature-branch-name ∅ ./very-long-feature-branch-name b834638e 10mo
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age
+@ main ^ ./test-repo b834638e 10mo
++ another-extremely-long-name-here ∅ ./another-extremely-long-name-here b834638e 10mo
++ short ∅ ./short b834638e 10mo
++ very-long-feature-branch-name ∅ ./very-long-feature-branch-name b834638e 10mo
⚪ Showing 4 worktrees, 1 column hidden
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 64b7ce274..0b0e1f199 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
@@ -22,10 +22,10 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age
-@ main ^ ./test-repo b834638e 10mo
-+ long ∅ ./extremely-long-branch-name-that-might-cause-layout-issues b834638e 10mo
-+ medium ∅ ./medium-length-name b834638e 10mo
-+ x ∅ ./x b834638e 10mo
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age
+@ main ^ ./test-repo b834638e 10mo
++ long ∅ ./extremely-long-branch-name-that-might-cause-layout-issues b834638e 10mo
++ medium ∅ ./medium-length-name b834638e 10mo
++ x ∅ ./x b834638e 10mo
⚪ Showing 4 worktrees, 1 column hidden
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 4b11d5e0e..f4af668ba 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
@@ -22,10 +22,10 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ a ∅ ./a b834638e 10mo Initial commit
-+ bb ∅ ./bb b834638e 10mo Initial commit
-+ ccc ∅ ./ccc b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ a ∅ ./a b834638e 10mo Initial commit
++ bb ∅ ./bb b834638e 10mo Initial commit
++ ccc ∅ ./ccc b834638e 10mo Initial commit
⚪ Showing 4 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 8836b0fa5..8cdefea48 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
@@ -22,10 +22,10 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo b834638e 10mo Initial commit
-+ cafe ∅ ./café b834638e 10mo Initial commit
-+ naive ∅ ./naïve b834638e 10mo Initial commit
-+ resume ∅ ./résumé b834638e 10mo Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./test-repo b834638e 10mo Initial commit
++ cafe ∅ ./café b834638e 10mo Initial commit
++ naive ∅ ./naïve b834638e 10mo Initial commit
++ resume ∅ ./résumé b834638e 10mo Initial commit
⚪ Showing 4 worktrees