Skip to content

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

Reorganize status column symbols for better scannability

Maximilian Roos5053af880804
diff --git a/README.md b/README.md
index a89e8172e..850d1b9b9 100644
--- a/README.md
+++ b/README.md
@@ -85,10 +85,10 @@ See all worktrees at a glance:
```console
$ wt list
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 ./repo.feature-api ⇡3 28d38c20 30m Add API tests
-^ main ^⇅ ./repo ⇡1 ⇣1 2e6b7a8f 4d Merge fix-auth:…
-+ fix-auth ↕| ↑2 ↓1 ./repo.fix-auth | 1d697d5b 5h Add secure token…
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 ./repo.feature-api ⇡3 28d38c20 30m Add API tests
+^ main ^⇅ ./repo ⇡1 ⇣1 2e6b7a8f 4d Merge fix-auth:…
++ fix-auth ↕| ↑2 ↓1 ./repo.fix-auth | 1d697d5b 5h Add secure token…
⚪ Showing 3 worktrees, 1 with changes, 2 ahead
```
diff --git a/docs/content/claude-code.md b/docs/content/claude-code.md
index e8929c38c..bdb01c6ec 100644
--- a/docs/content/claude-code.md
+++ b/docs/content/claude-code.md
@@ -16,11 +16,11 @@ The plugin adds status indicators to `wt list`:
{% terminal() %}
<span class="prompt">$</span> <span class="cmd">wt list</span>
- <b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>Path</b> <b>Remote⇅</b> <b>Commit</b> <b>Age</b> <b>Message</b>
-@ <b>main</b> <span class=d>^</span> <b>./repo</b> <span class=d>b834638e</span> <span class=d>1d</span> <span class=d>Initial commit</span>
-+ feature-api <span class=d>↑</span> 🤖 <span class=g>↑1</span> ./repo.feature-api <span class=d>9606cd0f</span> <span class=d>1d</span> <span class=d>Add REST API endpoints</span>
-+ review-ui <span class=c>?</span> <span class=d>↑</span> 💬 <span class=g>↑1</span> ./repo.review-ui <span class=d>afd3b353</span> <span class=d>1d</span> <span class=d>Add dashboard component</span>
-+ <span class=d>wip-docs</span> <span class=c>?</span><span class=d>_</span> <span class=d>./repo.wip-docs</span> <span class=d>b834638e</span> <span class=d>1d</span> <span class=d>Initial commit</span>
+ <b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>Path</b> <b>Remote⇅</b> <b>Commit</b> <b>Age</b> <b>Message</b>
+@ <b>main</b> <span class=d>^</span> <b>./repo</b> <span class=d>b834638e</span> <span class=d>1d</span> <span class=d>Initial commit</span>
++ feature-api <span class=d>↑</span> 🤖 <span class=g>↑1</span> ./repo.feature-api <span class=d>9606cd0f</span> <span class=d>1d</span> <span class=d>Add REST API endpoints</span>
++ review-ui <span class=c>?</span> <span class=d>↑</span> 💬 <span class=g>↑1</span> ./repo.review-ui <span class=d>afd3b353</span> <span class=d>1d</span> <span class=d>Add dashboard component</span>
++ <span class=d>wip-docs</span> <span class=c>?</span> <span class=d>_</span> <span class=d>./repo.wip-docs</span> <span class=d>b834638e</span> <span class=d>1d</span> <span class=d>Initial commit</span>
⚪ <span class=d>Showing 4 worktrees, 2 ahead</span>
{% end %}
diff --git a/docs/content/list.md b/docs/content/list.md
index 8055e3bc8..f296e8089 100644
--- a/docs/content/list.md
+++ b/docs/content/list.md
@@ -20,10 +20,10 @@ List all worktrees:
{% terminal() %}
<span class="prompt">$</span> <span class="cmd">wt list</span>
- <b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>Path</b> <b>Remote⇅</b> <b>Commit</b> <b>Age</b> <b>Message</b>
-@ <b>feature-api</b> <span class=c>+</span> <span class=d>↕</span><span class=d>⇡</span> <span class=g>+54</span> <span class=r>-5</span> <span class=g>↑4</span> <span class=d><span class=r>↓1</span></span> <b>./repo.feature-api</b> <span class=g>⇡3</span> <span class=d>28d38c20</span> <span class=d>30m</span> <span class=d>Add API tests</span>
-^ main <span class=d>^</span><span class=d>⇅</span> ./repo <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=d>2e6b7a8f</span> <span class=d>4d</span> <span class=d>Merge fix-auth:…</span>
-+ fix-auth <span class=d>↕</span><span class=d>|</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> ./repo.fix-auth <span class=d>|</span> <span class=d>1d697d5b</span> <span class=d>5h</span> <span class=d>Add secure token…</span>
+ <b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>Path</b> <b>Remote⇅</b> <b>Commit</b> <b>Age</b> <b>Message</b>
+@ <b>feature-api</b> <span class=c>+</span> <span class=d>↕</span><span class=d>⇡</span> <span class=g>+54</span> <span class=r>-5</span> <span class=g>↑4</span> <span class=d><span class=r>↓1</span></span> <b>./repo.feature-api</b> <span class=g>⇡3</span> <span class=d>28d38c20</span> <span class=d>30m</span> <span class=d>Add API tests</span>
+^ main <span class=d>^</span><span class=d>⇅</span> ./repo <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=d>2e6b7a8f</span> <span class=d>4d</span> <span class=d>Merge fix-auth:…</span>
++ fix-auth <span class=d>↕</span><span class=d>|</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> ./repo.fix-auth <span class=d>|</span> <span class=d>1d697d5b</span> <span class=d>5h</span> <span class=d>Add secure token…</span>
⚪ <span class=d>Showing 3 worktrees, 1 with changes, 2 ahead</span>
{% end %}
@@ -36,10 +36,10 @@ Include CI status and line diffs:
{% terminal() %}
<span class="prompt">$</span> <span class="cmd">wt list --full</span>
- <b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>main…±</b> <b>Path</b> <b>Remote⇅</b> <b>CI</b> <b>Commit</b> <b>Age</b>
-@ <b>feature-api</b> <span class=c>+</span> <span class=d>↕</span><span class=d>⇡</span> <span class=g>+54</span> <span class=r>-5</span> <span class=g>↑4</span> <span class=d><span class=r>↓1</span></span> <span class=g>+234</span> <span class=r>-24</span> <b>./repo.feature-api</b> <span class=g>⇡3</span> <span class=d><span style='color:var(--blue,#00a)'>●</span></span> <span class=d>28d38c20</span> <span class=d>30m</span>
-^ main <span class=d>^</span><span class=d>⇅</span> ./repo <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=g>●</span> <span class=d>2e6b7a8f</span> <span class=d>4d</span>
-+ fix-auth <span class=d>↕</span><span class=d>|</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> <span class=g>+25</span> <span class=r>-11</span> ./repo.fix-auth <span class=d>|</span> <span class=g>●</span> <span class=d>1d697d5b</span> <span class=d>5h</span>
+ <b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>main…±</b> <b>Path</b> <b>Remote⇅</b> <b>CI</b> <b>Commit</b> <b>Age</b>
+@ <b>feature-api</b> <span class=c>+</span> <span class=d>↕</span><span class=d>⇡</span> <span class=g>+54</span> <span class=r>-5</span> <span class=g>↑4</span> <span class=d><span class=r>↓1</span></span> <span class=g>+234</span> <span class=r>-24</span> <b>./repo.feature-api</b> <span class=g>⇡3</span> <span class=d><span style='color:var(--blue,#00a)'>●</span></span> <span class=d>28d38c20</span> <span class=d>30m</span>
+^ main <span class=d>^</span><span class=d>⇅</span> ./repo <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=g>●</span> <span class=d>2e6b7a8f</span> <span class=d>4d</span>
++ fix-auth <span class=d>↕</span><span class=d>|</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> <span class=g>+25</span> <span class=r>-11</span> ./repo.fix-auth <span class=d>|</span> <span class=g>●</span> <span class=d>1d697d5b</span> <span class=d>5h</span>
⚪ <span class=d>Showing 3 worktrees, 1 with changes, 2 ahead, 1 column hidden</span>
{% end %}
@@ -52,12 +52,12 @@ Include branches that don't have worktrees:
{% terminal() %}
<span class="prompt">$</span> <span class="cmd">wt list --branches --full</span>
- <b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>main…±</b> <b>Path</b> <b>Remote⇅</b> <b>CI</b> <b>Commit</b> <b>Age</b>
-@ <b>feature-api</b> <span class=c>+</span> <span class=d>↕</span><span class=d>⇡</span> <span class=g>+54</span> <span class=r>-5</span> <span class=g>↑4</span> <span class=d><span class=r>↓1</span></span> <span class=g>+234</span> <span class=r>-24</span> <b>./repo.feature-api</b> <span class=g>⇡3</span> <span class=d><span style='color:var(--blue,#00a)'>●</span></span> <span class=d>28d38c20</span> <span class=d>30m</span>
-^ main <span class=d>^</span><span class=d>⇅</span> ./repo <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=g>●</span> <span class=d>2e6b7a8f</span> <span class=d>4d</span>
-+ fix-auth <span class=d>↕</span><span class=d>|</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> <span class=g>+25</span> <span class=r>-11</span> ./repo.fix-auth <span class=d>|</span> <span class=g>●</span> <span class=d>1d697d5b</span> <span class=d>5h</span>
- exp <span class=d>↕</span> <span class=d>/</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> <span class=g>+137</span> <span class=d>32936618</span> <span class=d>2d</span>
- wip <span class=d>↕</span> <span class=d>/</span> <span class=g>↑1</span> <span class=d><span class=r>↓1</span></span> <span class=g>+33</span> <span class=d>6844b101</span> <span class=d>3d</span>
+ <b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>main…±</b> <b>Path</b> <b>Remote⇅</b> <b>CI</b> <b>Commit</b> <b>Age</b>
+@ <b>feature-api</b> <span class=c>+</span> <span class=d>↕</span><span class=d>⇡</span> <span class=g>+54</span> <span class=r>-5</span> <span class=g>↑4</span> <span class=d><span class=r>↓1</span></span> <span class=g>+234</span> <span class=r>-24</span> <b>./repo.feature-api</b> <span class=g>⇡3</span> <span class=d><span style='color:var(--blue,#00a)'>●</span></span> <span class=d>28d38c20</span> <span class=d>30m</span>
+^ main <span class=d>^</span><span class=d>⇅</span> ./repo <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=g>●</span> <span class=d>2e6b7a8f</span> <span class=d>4d</span>
++ fix-auth <span class=d>↕</span><span class=d>|</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> <span class=g>+25</span> <span class=r>-11</span> ./repo.fix-auth <span class=d>|</span> <span class=g>●</span> <span class=d>1d697d5b</span> <span class=d>5h</span>
+ exp <span class=d>/</span><span class=d>↕</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> <span class=g>+137</span> <span class=d>32936618</span> <span class=d>2d</span>
+ wip <span class=d>/</span><span class=d>↕</span> <span class=g>↑1</span> <span class=d><span class=r>↓1</span></span> <span class=g>+33</span> <span class=d>6844b101</span> <span class=d>3d</span>
⚪ <span class=d>Showing 3 worktrees, 2 branches, 1 with changes, 4 ahead, 1 column hidden</span>
{% end %}
@@ -110,24 +110,24 @@ The Status column has multiple subcolumns. Within each, only the first matching
| Working tree (1) | `+` | Staged files |
| Working tree (2) | `!` | Modified files (unstaged) |
| Working tree (3) | `?` | Untracked files |
-| Branch state | `✘` | Merge conflicts |
+| Worktree | `✘` | Merge conflicts |
| | `⤴` | Rebase in progress |
| | `⤵` | Merge in progress |
+| | `/` | Branch without worktree |
+| | `⚑` | Path doesn't match template |
+| | `⊟` | Prunable (directory missing) |
+| | `⊞` | Locked worktree |
+| Main | `^` | Is the main branch |
| | `✗` | Would conflict if merged to main |
| | `_` | Same commit as main |
| | `⊂` | [Content integrated](@/remove.md#branch-cleanup) (`--full` detects additional cases) |
-| Main divergence | `^` | Is the main branch |
| | `↕` | Diverged from main |
| | `↑` | Ahead of main |
| | `↓` | Behind main |
-| Remote divergence | `\|` | In sync with remote |
+| Remote | `\|` | In sync with remote |
| | `⇅` | Diverged from remote |
| | `⇡` | Ahead of remote |
| | `⇣` | Behind remote |
-| Worktree state | `/` | Branch without worktree |
-| | `⚑` | Path doesn't match template |
-| | `⊟` | Prunable (directory missing) |
-| | `⊞` | Locked worktree |
Rows are dimmed when the branch [content is already in main](@/remove.md#branch-cleanup) (`_` same commit or `⊂` content integrated).
@@ -136,8 +136,8 @@ Rows are dimmed when the branch [content is already in main](@/remove.md#branch-
Query structured data with `--format=json`:
```bash
-# Worktrees with conflicts
-wt list --format=json | jq '.[] | select(.branch_state == "conflicts")'
+# Worktrees with merge conflicts
+wt list --format=json | jq '.[] | select(.operation_state == "conflicts")'
# Uncommitted changes
wt list --format=json | jq '.[] | select(.working_tree.modified)'
@@ -149,7 +149,7 @@ wt list --format=json | jq '.[] | select(.is_current)'
wt list --format=json | jq '.[] | select(.main.ahead > 0)'
# Integrated branches (ready to clean up)
-wt list --format=json | jq '.[] | select(.branch_state == "integrated" or .branch_state == "same_commit")'
+wt list --format=json | jq '.[] | select(.main_state == "integrated" or .main_state == "same_commit")'
```
**Fields:**
@@ -161,8 +161,9 @@ wt list --format=json | jq '.[] | select(.branch_state == "integrated" or .branc
| `kind` | `"worktree"` or `"branch"` |
| `commit` | `{sha, short_sha, message, timestamp}` |
| `working_tree` | `{staged, modified, untracked, renamed, deleted, diff, diff_vs_main}` |
-| `branch_state` | `"conflicts"` `"rebase"` `"merge"` `"would_conflict"` `"same_commit"` `"integrated"` |
-| `integration_reason` | `"ancestor"` `"trees_match"` `"no_added_changes"` `"merge_adds_nothing"` (when `branch_state == "integrated"`) |
+| `main_state` | `"is_main"` `"would_conflict"` `"same_commit"` `"integrated"` `"diverged"` `"ahead"` `"behind"` |
+| `integration_reason` | `"ancestor"` `"trees_match"` `"no_added_changes"` `"merge_adds_nothing"` (when `main_state == "integrated"`) |
+| `operation_state` | `"conflicts"` `"rebase"` `"merge"` (absent when no operation in progress) |
| `main` | `{ahead, behind, diff}` (absent when `is_main`) |
| `remote` | `{name, branch, ahead, behind}` (absent when no tracking branch) |
| `worktree` | `{state, reason, detached, bare}` |
diff --git a/docs/content/why-worktrunk.md b/docs/content/why-worktrunk.md
index e8e8f8102..d0f1798a2 100644
--- a/docs/content/why-worktrunk.md
+++ b/docs/content/why-worktrunk.md
@@ -72,10 +72,10 @@ See all worktrees at a glance:
{% terminal() %}
<span class="prompt">$</span> <span class="cmd">wt list</span>
- <b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>Path</b> <b>Remote⇅</b> <b>Commit</b> <b>Age</b> <b>Message</b>
-@ <b>feature-api</b> <span class=c>+</span> <span class=d>↕</span><span class=d>⇡</span> <span class=g>+54</span> <span class=r>-5</span> <span class=g>↑4</span> <span class=d><span class=r>↓1</span></span> <b>./repo.feature-api</b> <span class=g>⇡3</span> <span class=d>28d38c20</span> <span class=d>30m</span> <span class=d>Add API tests</span>
-^ main <span class=d>^</span><span class=d>⇅</span> ./repo <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=d>2e6b7a8f</span> <span class=d>4d</span> <span class=d>Merge fix-auth:…</span>
-+ fix-auth <span class=d>↕</span><span class=d>|</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> ./repo.fix-auth <span class=d>|</span> <span class=d>1d697d5b</span> <span class=d>5h</span> <span class=d>Add secure token…</span>
+ <b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>Path</b> <b>Remote⇅</b> <b>Commit</b> <b>Age</b> <b>Message</b>
+@ <b>feature-api</b> <span class=c>+</span> <span class=d>↕</span><span class=d>⇡</span> <span class=g>+54</span> <span class=r>-5</span> <span class=g>↑4</span> <span class=d><span class=r>↓1</span></span> <b>./repo.feature-api</b> <span class=g>⇡3</span> <span class=d>28d38c20</span> <span class=d>30m</span> <span class=d>Add API tests</span>
+^ main <span class=d>^</span><span class=d>⇅</span> ./repo <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=d>2e6b7a8f</span> <span class=d>4d</span> <span class=d>Merge fix-auth:…</span>
++ fix-auth <span class=d>↕</span><span class=d>|</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> ./repo.fix-auth <span class=d>|</span> <span class=d>1d697d5b</span> <span class=d>5h</span> <span class=d>Add secure token…</span>
⚪ <span class=d>Showing 3 worktrees, 1 with changes, 2 ahead</span>
{% end %}
diff --git a/src/cli.rs b/src/cli.rs
index 4e92aec39..913089d53 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -1425,24 +1425,24 @@ The Status column has multiple subcolumns. Within each, only the first matching
| Working tree (1) | `+` | Staged files |
| Working tree (2) | `!` | Modified files (unstaged) |
| Working tree (3) | `?` | Untracked files |
-| Branch state | `✘` | Merge conflicts |
+| Worktree | `✘` | Merge conflicts |
| | `⤴` | Rebase in progress |
| | `⤵` | Merge in progress |
+| | `/` | Branch without worktree |
+| | `⚑` | Path doesn't match template |
+| | `⊟` | Prunable (directory missing) |
+| | `⊞` | Locked worktree |
+| Main | `^` | Is the main branch |
| | `✗` | Would conflict if merged to main |
| | `_` | Same commit as main |
| | `⊂` | [Content integrated](@/remove.md#branch-cleanup) (`--full` detects additional cases) |
-| Main divergence | `^` | Is the main branch |
| | `↕` | Diverged from main |
| | `↑` | Ahead of main |
| | `↓` | Behind main |
-| Remote divergence | `\|` | In sync with remote |
+| Remote | `\|` | In sync with remote |
| | `⇅` | Diverged from remote |
| | `⇡` | Ahead of remote |
| | `⇣` | Behind remote |
-| Worktree state | `/` | Branch without worktree |
-| | `⚑` | Path doesn't match template |
-| | `⊟` | Prunable (directory missing) |
-| | `⊞` | Locked worktree |
Rows are dimmed when the branch [content is already in main](@/remove.md#branch-cleanup) (`_` same commit or `⊂` content integrated).
@@ -1451,8 +1451,8 @@ Rows are dimmed when the branch [content is already in main](@/remove.md#branch-
Query structured data with `--format=json`:
```console
-# Worktrees with conflicts
-wt list --format=json | jq '.[] | select(.branch_state == "conflicts")'
+# Worktrees with merge conflicts
+wt list --format=json | jq '.[] | select(.operation_state == "conflicts")'
# Uncommitted changes
wt list --format=json | jq '.[] | select(.working_tree.modified)'
@@ -1464,7 +1464,7 @@ wt list --format=json | jq '.[] | select(.is_current)'
wt list --format=json | jq '.[] | select(.main.ahead > 0)'
# Integrated branches (ready to clean up)
-wt list --format=json | jq '.[] | select(.branch_state == "integrated" or .branch_state == "same_commit")'
+wt list --format=json | jq '.[] | select(.main_state == "integrated" or .main_state == "same_commit")'
```
**Fields:**
@@ -1476,8 +1476,9 @@ wt list --format=json | jq '.[] | select(.branch_state == "integrated" or .branc
| `kind` | `"worktree"` or `"branch"` |
| `commit` | `{sha, short_sha, message, timestamp}` |
| `working_tree` | `{staged, modified, untracked, renamed, deleted, diff, diff_vs_main}` |
-| `branch_state` | `"conflicts"` `"rebase"` `"merge"` `"would_conflict"` `"same_commit"` `"integrated"` |
-| `integration_reason` | `"ancestor"` `"trees_match"` `"no_added_changes"` `"merge_adds_nothing"` (when `branch_state == "integrated"`) |
+| `main_state` | `"is_main"` `"would_conflict"` `"same_commit"` `"integrated"` `"diverged"` `"ahead"` `"behind"` |
+| `integration_reason` | `"ancestor"` `"trees_match"` `"no_added_changes"` `"merge_adds_nothing"` (when `main_state == "integrated"`) |
+| `operation_state` | `"conflicts"` `"rebase"` `"merge"` (absent when no operation in progress) |
| `main` | `{ahead, behind, diff}` (absent when `is_main`) |
| `remote` | `{name, branch, ahead, behind}` (absent when no tracking branch) |
| `worktree` | `{state, reason, detached, bare}` |
diff --git a/src/commands/list/json_output.rs b/src/commands/list/json_output.rs
index 2d6f95473..1ef902461 100644
--- a/src/commands/list/json_output.rs
+++ b/src/commands/list/json_output.rs
@@ -9,8 +9,9 @@
//!
//! Fields are organized by concept, matching the status display subcolumns:
//! - `working_tree`: staged/modified/untracked changes
-//! - `branch_state`: conflicts, rebase, merge, would_conflict, same_commit, integrated
-//! - `main`: relationship to main branch (ahead/behind/diff)
+//! - `main_state`: relationship to main (would_conflict, same_commit, integrated, diverged, ahead, behind)
+//! - `operation_state`: git operations in progress (conflicts, rebase, merge)
+//! - `main`: relationship to main branch (ahead/behind/diff counts)
//! - `remote`: relationship to tracking branch
//! - `worktree`: worktree-specific state (locked, prunable, etc.)
@@ -42,15 +43,20 @@ pub struct JsonItem {
#[serde(skip_serializing_if = "Option::is_none")]
pub working_tree: Option<JsonWorkingTree>,
- /// Branch state: conflicts, rebase, merge, would_conflict, same_commit, integrated
+ /// Main branch relationship: would_conflict, same_commit, integrated, diverged, ahead, behind
+ /// (null for main branch itself)
#[serde(skip_serializing_if = "Option::is_none")]
- pub branch_state: Option<&'static str>,
+ pub main_state: Option<&'static str>,
- /// Why branch is integrated (only present when branch_state == "integrated")
+ /// Why branch is integrated (only present when main_state == "integrated")
/// Values: ancestor, trees_match, no_added_changes, merge_adds_nothing
#[serde(skip_serializing_if = "Option::is_none")]
pub integration_reason: Option<&'static str>,
+ /// Git operation in progress: conflicts, rebase, merge (null when none)
+ #[serde(skip_serializing_if = "Option::is_none")]
+ pub operation_state: Option<&'static str>,
+
/// Relationship to main branch (absent when is_main == true)
#[serde(skip_serializing_if = "Option::is_none")]
pub main: Option<JsonMain>,
@@ -263,20 +269,23 @@ impl JsonItem {
})
});
- // Branch state and integration reason - now directly from BranchState
- let (branch_state, integration_reason) = item
+ // Main state and integration reason
+ let (main_state, integration_reason) = item
.status_symbols
.as_ref()
.map(|symbols| {
- let state = symbols.branch_state.as_json_str();
- let reason = symbols
- .branch_state
- .integration_reason()
- .map(|r| r.as_json_str());
+ let state = symbols.main_state.as_json_str();
+ let reason = symbols.main_state.integration_reason().map(|r| r.into());
(state, reason)
})
.unwrap_or((None, None));
+ // Operation state (conflicts, rebase, merge)
+ let operation_state = item
+ .status_symbols
+ .as_ref()
+ .and_then(|symbols| symbols.operation_state.as_json_str());
+
// Main relationship (absent when is_main)
let main = if is_main {
None
@@ -329,8 +338,9 @@ impl JsonItem {
kind: kind_str,
commit,
working_tree,
- branch_state,
+ main_state,
integration_reason,
+ operation_state,
main,
remote,
worktree,
@@ -424,16 +434,10 @@ fn format_raw_symbols(symbols: &super::model::StatusSymbols) -> String {
result.push_str(&wt_symbols);
}
- // Branch state
- let branch_state = symbols.branch_state.to_string();
- if !branch_state.is_empty() {
- result.push_str(&branch_state);
- }
-
- // Main divergence
- let main_div = symbols.main_divergence.symbol(DivergenceContext::Main);
- if !main_div.is_empty() {
- result.push_str(main_div);
+ // Main state (merged: ^✗_⊂↕↑↓)
+ let main_state = symbols.main_state.to_string();
+ if !main_state.is_empty() {
+ result.push_str(&main_state);
}
// Upstream divergence
@@ -444,10 +448,15 @@ fn format_raw_symbols(symbols: &super::model::StatusSymbols) -> String {
result.push_str(upstream_div);
}
- // Worktree state
- let wt_state = symbols.worktree_state.to_string();
- if !wt_state.is_empty() {
- result.push_str(&wt_state);
+ // Worktree state (operations ✘⤴⤵ take priority over location /⚑⊟⊞)
+ let op_state = symbols.operation_state.to_string();
+ if !op_state.is_empty() {
+ result.push_str(&op_state);
+ } else {
+ let wt_state = symbols.worktree_state.to_string();
+ if !wt_state.is_empty() {
+ result.push_str(&wt_state);
+ }
}
// User marker
diff --git a/src/commands/list/layout.rs b/src/commands/list/layout.rs
index e6f5435c6..2f5be7f4a 100644
--- a/src/commands/list/layout.rs
+++ b/src/commands/list/layout.rs
@@ -15,11 +15,11 @@
//! - Empty positions render as single space for grid alignment
//! - No leading spaces before the first symbol
//!
-//! Example with branch_state, working_tree, and user_marker used:
+//! Example with working_tree, main_state, and user_marker used:
//! ```text
-//! Row 1: "_ 🤖" (branch=_, working=space, user=🤖)
-//! Row 2: "_?! " (branch=_, working=?!, user=space)
-//! Row 3: " 💬" (branch=space, working=space, user=💬)
+//! Row 1: " _🤖" (working=space, main=_, user=🤖)
+//! Row 2: "?! _ " (working=?!, main=_, user=space)
+//! Row 3: " 💬" (working=space, main=space, user=💬)
//! ```
//!
//! ## Width Calculation
@@ -442,8 +442,8 @@ fn build_estimated_widths(max_branch: usize, skip_tasks: &HashSet<TaskKind>) ->
// Values exceeding these widths use compact notation (K suffix)
//
// Status column: Must match PositionMask::FULL width for consistent alignment
- // PositionMask::FULL allocates: 1+1+1+1+1+1+1+2 = 9 chars
- let status_fixed = fit_header(HEADER_STATUS, 9);
+ // PositionMask::FULL allocates: 1+1+1+1+1+1+2 = 8 chars (7 positions)
+ let status_fixed = fit_header(HEADER_STATUS, 8);
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"
@@ -674,7 +674,7 @@ fn allocate_columns_with_priority(
/// - Paths (with common prefix removed)
///
/// Pre-allocated estimates (generous to minimize truncation):
-/// - Status: 9 chars (PositionMask::FULL)
+/// - Status: 8 chars (PositionMask::FULL, 7 positions)
/// - Working diff: 9 chars ("+999 -999")
/// - Ahead/behind: 7 chars ("↑99 ↓99")
/// - Branch diff: 9 chars ("+999 -999")
diff --git a/src/commands/list/model.rs b/src/commands/list/model.rs
index 3b4132dee..54937283a 100644
--- a/src/commands/list/model.rs
+++ b/src/commands/list/model.rs
@@ -148,21 +148,6 @@ pub struct AheadBehind {
pub behind: usize,
}
-impl AheadBehind {
- /// Compute divergence states from ahead/behind counts and upstream status.
- ///
- /// Returns (main_divergence, upstream_divergence) as a tuple of `Divergence` values.
- pub fn compute_divergences(&self, upstream: &UpstreamStatus) -> (Divergence, Divergence) {
- let main_divergence = Divergence::from_counts(self.ahead, self.behind);
- let upstream_divergence = match upstream.active() {
- None => Divergence::None,
- Some((_, ahead, behind)) => Divergence::from_counts_with_remote(ahead, behind),
- };
-
- (main_divergence, upstream_divergence)
- }
-}
-
#[derive(serde::Serialize, Default, Copy, Clone, Debug)]
pub struct BranchDiffTotals {
#[serde(rename = "branch_diff")]
@@ -505,14 +490,16 @@ impl ListItem {
let default_upstream = UpstreamStatus::default();
let counts = self.counts.as_ref().unwrap_or(&default_counts);
let upstream = self.upstream.as_ref().unwrap_or(&default_upstream);
- let (main_divergence, upstream_divergence) = counts.compute_divergences(upstream);
+ let upstream_divergence = match upstream.active() {
+ None => Divergence::None,
+ Some((_, ahead, behind)) => Divergence::from_counts_with_remote(ahead, behind),
+ };
match &self.kind {
ItemKind::Worktree(data) => {
// Full status computation for worktrees
- // Use default_branch directly (None for main worktree)
- // Worktree state - priority: path_mismatch > prunable > locked
+ // Worktree location state - priority: path_mismatch > prunable > locked
let worktree_state = if data.path_mismatch {
WorktreeState::PathMismatch
} else if data.prunable.is_some() {
@@ -523,8 +510,19 @@ impl ListItem {
WorktreeState::None
};
- // Determine base branch state (only for non-main worktrees with base branch)
- let base_state = determine_worktree_base_state(
+ // Operation state - priority: conflicts > rebase > merge
+ let operation_state = if has_conflicts {
+ OperationState::Conflicts
+ } else if data.git_operation == GitOperationState::Rebase {
+ OperationState::Rebase
+ } else if data.git_operation == GitOperationState::Merge {
+ OperationState::Merge
+ } else {
+ OperationState::None
+ };
+
+ // Determine integration state (for non-main worktrees)
+ let (same_commit, integration_reason) = determine_integration_state(
data.is_main,
default_branch,
self.is_ancestor,
@@ -536,30 +534,20 @@ impl ListItem {
&data.working_tree_diff_with_main,
);
- // Apply priority: Conflicts > Rebase > Merge > WouldConflict > base_state
- let branch_state = if has_conflicts {
- BranchState::Conflicts
- } else if data.git_operation == GitOperationState::Rebase {
- BranchState::Rebase
- } else if data.git_operation == GitOperationState::Merge {
- BranchState::Merge
- } else if has_merge_tree_conflicts {
- BranchState::WouldConflict
- } else {
- base_state
- };
-
- // Override main_divergence for the main worktree
- let main_divergence = if data.is_main {
- Divergence::IsMain
- } else {
- main_divergence
- };
+ // Compute main state: combines is_main, would_conflict, integration, and divergence
+ let main_state = MainState::from_integration_and_counts(
+ data.is_main,
+ has_merge_tree_conflicts,
+ same_commit,
+ integration_reason,
+ counts.ahead,
+ counts.behind,
+ );
self.status_symbols = Some(StatusSymbols {
- branch_state,
+ main_state,
+ operation_state,
worktree_state,
- main_divergence,
upstream_divergence,
working_tree: working_tree_status.unwrap_or_default(),
user_marker,
@@ -569,42 +557,43 @@ impl ListItem {
// Simplified status computation for branches
// Only compute symbols that apply to branches (no working tree, git operation, or worktree attrs)
- // Branch state - branches can show WouldConflict or integration states
- let branch_state = if has_merge_tree_conflicts {
- BranchState::WouldConflict
- } else if self.is_ancestor == Some(true) {
- // Branch HEAD is ancestor of main
+ // Determine integration state for branches
+ let (same_commit, integration_reason) = if self.is_ancestor == Some(true) {
if self.counts.as_ref().is_some_and(|c| c.behind == 0) {
- // Same commit as main
- BranchState::SameCommit
+ (true, None) // Same commit as main
} else {
- // Main has moved past this branch
- BranchState::Integrated(IntegrationReason::Ancestor)
+ (false, Some(IntegrationReason::Ancestor)) // Main has moved past
}
} else if self.has_file_changes == Some(false) {
- // No file changes beyond merge-base - content is integrated
- BranchState::Integrated(IntegrationReason::NoAddedChanges)
+ (false, Some(IntegrationReason::NoAddedChanges))
} else if self.committed_trees_match == Some(true) {
- // Tree SHA matches main - content is identical
- BranchState::Integrated(IntegrationReason::TreesMatch)
+ (false, Some(IntegrationReason::TreesMatch))
} else if self.would_merge_add == Some(false) {
- // Merge simulation shows no changes would be added (--full only)
- BranchState::Integrated(IntegrationReason::MergeAddsNothing)
+ (false, Some(IntegrationReason::MergeAddsNothing))
} else if let Some(ref c) = self.counts {
if c.ahead == 0 && c.behind == 0 {
- // Same commit as main (fallback when is_ancestor not computed)
- BranchState::SameCommit
+ (true, None) // Same commit as main (fallback)
} else {
- BranchState::None
+ (false, None)
}
} else {
- BranchState::None
+ (false, None)
};
+ // Compute main state
+ let main_state = MainState::from_integration_and_counts(
+ false, // not main
+ has_merge_tree_conflicts,
+ same_commit,
+ integration_reason,
+ counts.ahead,
+ counts.behind,
+ );
+
self.status_symbols = Some(StatusSymbols {
- branch_state,
+ main_state,
+ operation_state: OperationState::None,
worktree_state: WorktreeState::Branch,
- main_divergence,
upstream_divergence,
working_tree: WorkingTreeStatus::default(),
user_marker,
@@ -614,25 +603,16 @@ impl ListItem {
}
}
-/// Determine branch state for a worktree.
-///
-/// Returns a [`BranchState`] indicating whether the branch content is integrated into main
-/// and how (via [`IntegrationReason`]).
-///
-/// # States (priority order)
-///
-/// 1. **`SameCommit`**: Branch HEAD is exactly the same commit as main.
-///
-/// 2. **`Integrated(Ancestor)`**: Branch HEAD is ancestor of main (main has moved past).
+/// Determine integration state for a worktree.
///
-/// 3. **`Integrated(NoAddedChanges)`**: Commits exist but no file changes beyond merge-base.
-/// The three-dot diff (`main...branch`) is empty.
+/// Returns `(same_commit, integration_reason)` indicating whether the branch content
+/// is integrated into main and how.
///
-/// 4. **`Integrated(TreesMatch)`**: Tree SHA matches main, or working tree matches main.
-/// Examples: merge commits that pull in main, rebases, squash merges.
+/// # Return values
///
-/// 5. **`Integrated(MergeAddsNothing)`**: Merge simulation adds nothing to main.
-/// Catches squash-merged branches where main has advanced.
+/// - `(true, None)`: Branch HEAD is exactly the same commit as main (SameCommit)
+/// - `(false, Some(reason))`: Content is integrated via the given reason
+/// - `(false, None)`: Not integrated (normal branch)
///
/// # Parameters
///
@@ -644,7 +624,7 @@ impl ListItem {
/// - `working_tree_diff_with_main`: Diff between working tree and main. May be `None` (not
/// computed) or `Some(None)` (skipped). When unavailable, assumes no match.
#[allow(clippy::too_many_arguments)]
-fn determine_worktree_base_state(
+fn determine_integration_state(
is_main: bool,
default_branch: Option<&str>,
is_ancestor: Option<bool>,
@@ -654,31 +634,31 @@ fn determine_worktree_base_state(
would_merge_add: Option<bool>,
working_tree_diff: Option<&LineDiff>,
working_tree_diff_with_main: &Option<Option<LineDiff>>,
-) -> BranchState {
+) -> (bool, Option<IntegrationReason>) {
if is_main || default_branch.is_none() {
- return BranchState::None;
+ return (false, None);
}
let is_clean = working_tree_diff.map(|d| d.is_empty()).unwrap_or(true);
// Priority 1: Branch is exactly the same commit as main (ancestor with 0 behind)
if is_ancestor == Some(true) && behind_main == Some(0) && is_clean {
- return BranchState::SameCommit;
+ return (true, None); // SameCommit
}
// Priority 2: Branch is ancestor of main but main has moved past (already merged)
if is_ancestor == Some(true) && is_clean {
- return BranchState::Integrated(IntegrationReason::Ancestor);
+ return (false, Some(IntegrationReason::Ancestor));
}
// Priority 3: No file changes beyond merge-base (squash-merged)
if has_file_changes == Some(false) && is_clean {
- return BranchState::Integrated(IntegrationReason::NoAddedChanges);
+ return (false, Some(IntegrationReason::NoAddedChanges));
}
// Priority 4: Tree SHA matches main (squash merge/rebase with identical content)
if committed_trees_match && is_clean {
- return BranchState::Integrated(IntegrationReason::TreesMatch);
+ return (false, Some(IntegrationReason::TreesMatch));
}
// Priority 5: Working tree matches main
@@ -688,70 +668,52 @@ fn determine_worktree_base_state(
.is_some_and(|diff| diff.is_empty());
if working_tree_matches_main {
- return BranchState::Integrated(IntegrationReason::TreesMatch);
+ return (false, Some(IntegrationReason::TreesMatch));
}
// Priority 6: Merge simulation shows no changes (--full only)
if would_merge_add == Some(false) && is_clean {
- return BranchState::Integrated(IntegrationReason::MergeAddsNothing);
+ return (false, Some(IntegrationReason::MergeAddsNothing));
}
- BranchState::None
+ (false, None)
}
-/// Divergence state relative to a reference (main branch or upstream remote).
+/// Upstream divergence state relative to remote tracking branch.
///
-/// Unified representation for both main-branch divergence and upstream-remote divergence.
-/// The display symbols differ based on context:
+/// Used only for upstream/remote divergence. Main branch divergence is now
+/// handled by [`MainState`] which combines divergence with integration states.
///
-/// | Variant | Main symbols | Upstream symbols |
-/// |-----------|--------------|------------------|
-/// | None | (empty) | (empty) |
-/// | IsMain | `^` | (not used) |
-/// | InSync | (not used) | `\|` |
-/// | Ahead | `↑` | `⇡` |
-/// | Behind | `↓` | `⇣` |
-/// | Diverged | `↕` | `⇅` |
+/// | Variant | Symbol |
+/// |-----------|--------|
+/// | None | (empty) - no remote configured |
+/// | InSync | `\|` - up-to-date with remote |
+/// | Ahead | `⇡` - has unpushed commits |
+/// | Behind | `⇣` - missing remote commits |
+/// | Diverged | `⇅` - both ahead and behind |
#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
pub enum Divergence {
- /// No relationship to reference (up-to-date for main, no remote configured for upstream)
+ /// No remote tracking branch configured
#[default]
None,
- /// This IS the main branch (only used in Main context)
- IsMain,
- /// In sync with upstream remote (only used in Upstream context)
+ /// In sync with upstream remote
InSync,
- /// Has commits the reference doesn't have
+ /// Has commits the remote doesn't have
Ahead,
- /// Missing commits from the reference
+ /// Missing commits from the remote
Behind,
- /// Both ahead and behind the reference
+ /// Both ahead and behind the remote
Diverged,
}
-/// Context for divergence display (determines which symbols to use)
+/// Context for divergence display (only Upstream is used now)
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum DivergenceContext {
- /// Divergence relative to main branch (uses ↑↓↕^)
- Main,
/// Divergence relative to upstream remote (uses ⇡⇣⇅|)
Upstream,
}
impl Divergence {
- /// Compute divergence state from ahead/behind counts.
- ///
- /// For main context: returns `None` for 0/0 (caller sets `IsMain` for main branch itself)
- /// For upstream context with known remote: use `from_counts_with_remote` instead
- pub fn from_counts(ahead: usize, behind: usize) -> Self {
- match (ahead, behind) {
- (0, 0) => Self::None,
- (_, 0) => Self::Ahead,
- (0, _) => Self::Behind,
- _ => Self::Diverged,
- }
- }
-
/// Compute divergence state when a remote tracking branch exists.
///
/// Returns `InSync` for 0/0 since we know a remote exists.
@@ -765,22 +727,18 @@ impl Divergence {
}
}
- /// Get the display symbol for this divergence state in the given context.
- pub fn symbol(self, ctx: DivergenceContext) -> &'static str {
- match (self, ctx) {
- (Self::None, _) => "",
- (Self::IsMain, _) => "^",
- (Self::InSync, _) => "|",
- (Self::Ahead, DivergenceContext::Main) => "↑",
- (Self::Ahead, DivergenceContext::Upstream) => "⇡",
- (Self::Behind, DivergenceContext::Main) => "↓",
- (Self::Behind, DivergenceContext::Upstream) => "⇣",
- (Self::Diverged, DivergenceContext::Main) => "↕",
- (Self::Diverged, DivergenceContext::Upstream) => "⇅",
+ /// Get the display symbol for this divergence state.
+ pub fn symbol(self, _ctx: DivergenceContext) -> &'static str {
+ match self {
+ Self::None => "",
+ Self::InSync => "|",
+ Self::Ahead => "⇡",
+ Self::Behind => "⇣",
+ Self::Diverged => "⇅",
}
}
- /// Returns styled symbol (dimmed) for the given context, or None for None variant.
+ /// Returns styled symbol (dimmed), or None for None variant.
pub fn styled(self, ctx: DivergenceContext) -> Option<String> {
use color_print::cformat;
if self == Self::None {
@@ -835,67 +793,71 @@ impl serde::Serialize for WorktreeState {
}
}
-/// Branch state: operation states, conflict states, or integration states
+/// Main branch relationship state
+///
+/// Represents the combined relationship to the main branch in a single position.
+/// Uses horizontal arrows (vs vertical arrows for Remote column).
///
-/// Represents the primary state of a branch/worktree in a single position.
-/// Priority order determines which symbol is shown when multiple conditions apply:
-/// 1. Conflicts (✘) - blocking, must resolve
-/// 2. Rebase (⤴) - active operation
-/// 3. Merge (⤵) - active operation
-/// 4. WouldConflict (✗) - potential problem (merge-tree simulation)
-/// 5. SameCommit (_) - removable, branch is exactly the same commit as main
-/// 6. Integrated (⊂) - removable, content is in main via different history
+/// Priority order determines which symbol is shown:
+/// 1. IsMain (^) - this IS the main branch
+/// 2. WouldConflict (✗) - merge-tree simulation shows conflicts
+/// 3. SameCommit (_) - branch HEAD is exactly the same commit as main
+/// 4. Integrated (⊂) - content is in main via different history
+/// 5. Diverged (↕) - both ahead and behind main
+/// 6. Ahead (↑) - has commits main doesn't have
+/// 7. Behind (↓) - missing commits from main
///
/// The `Integrated` variant carries an [`IntegrationReason`] explaining how the
/// content was integrated (ancestor, trees match, no added changes, or merge adds nothing).
#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
-pub enum BranchState {
- /// Normal working branch
+pub enum MainState {
+ /// Normal working branch (up-to-date with main, no special state)
#[default]
None,
- /// Actual merge conflicts with main (unmerged paths in working tree)
- Conflicts,
- /// Rebase in progress
- Rebase,
- /// Merge in progress
- Merge,
+ /// This IS the main branch
+ IsMain,
/// Merge-tree conflicts with main (simulated via git merge-tree)
WouldConflict,
/// Branch HEAD is exactly the same commit as main
SameCommit,
/// Content is integrated into main via different history
Integrated(IntegrationReason),
+ /// Both ahead and behind main
+ Diverged,
+ /// Has commits main doesn't have
+ Ahead,
+ /// Missing commits from main
+ Behind,
}
-impl std::fmt::Display for BranchState {
+impl std::fmt::Display for MainState {
+ /// Single-stroke vertical arrows for Main column (vs double-stroke arrows for Remote column).
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
match self {
Self::None => Ok(()),
- Self::Conflicts => write!(f, "✘"),
- Self::Rebase => write!(f, "⤴"),
- Self::Merge => write!(f, "⤵"),
+ Self::IsMain => write!(f, "^"),
Self::WouldConflict => write!(f, "✗"),
Self::SameCommit => write!(f, "_"),
- // All integration reasons use ⊂ (content is subset of main)
Self::Integrated(_) => write!(f, "⊂"),
+ Self::Diverged => write!(f, "↕"),
+ Self::Ahead => write!(f, "↑"),
+ Self::Behind => write!(f, "↓"),
}
}
}
-impl BranchState {
+impl MainState {
/// Returns styled symbol with appropriate color, or None for None variant.
///
/// Color semantics:
- /// - ERROR (red): Conflicts - blocking problems
- /// - WARNING (yellow): Rebase, Merge, WouldConflict - active/stuck states
- /// - HINT (dimmed): SameCommit, Integrated - low urgency removability indicators
+ /// - WARNING (yellow): WouldConflict - potential problem needing attention
+ /// - HINT (dimmed): All others - informational states
pub fn styled(&self) -> Option<String> {
use color_print::cformat;
match self {
Self::None => None,
- Self::Conflicts => Some(cformat!("<red>{self}</>")),
- Self::Rebase | Self::Merge | Self::WouldConflict => Some(cformat!("<yellow>{self}</>")),
- Self::SameCommit | Self::Integrated(_) => Some(cformat!("<dim>{self}</>")),
+ Self::WouldConflict => Some(cformat!("<yellow>{self}</>")),
+ _ => Some(cformat!("<dim>{self}</>")),
}
}
@@ -907,21 +869,116 @@ impl BranchState {
}
}
- /// Returns the JSON string representation for branch_state field.
+ /// Returns the JSON string representation for main_state field.
pub fn as_json_str(self) -> Option<&'static str> {
match self {
Self::None => None,
- Self::Conflicts => Some("conflicts"),
- Self::Rebase => Some("rebase"),
- Self::Merge => Some("merge"),
+ Self::IsMain => Some("is_main"),
Self::WouldConflict => Some("would_conflict"),
Self::SameCommit => Some("same_commit"),
Self::Integrated(_) => Some("integrated"),
+ Self::Diverged => Some("diverged"),
+ Self::Ahead => Some("ahead"),
+ Self::Behind => Some("behind"),
+ }
+ }
+
+ /// Compute from divergence counts and integration state.
+ ///
+ /// Priority: WouldConflict > SameCommit > Integrated > Diverged > Ahead > Behind
+ pub fn from_integration_and_counts(
+ is_main: bool,
+ would_conflict: bool,
+ same_commit: bool,
+ integration_reason: Option<IntegrationReason>,
+ ahead: usize,
+ behind: usize,
+ ) -> Self {
+ if is_main {
+ Self::IsMain
+ } else if would_conflict {
+ Self::WouldConflict
+ } else if same_commit {
+ Self::SameCommit
+ } else if let Some(reason) = integration_reason {
+ Self::Integrated(reason)
+ } else {
+ match (ahead, behind) {
+ (0, 0) => Self::None,
+ (_, 0) => Self::Ahead,
+ (0, _) => Self::Behind,
+ _ => Self::Diverged,
+ }
+ }
+ }
+}
+
+impl serde::Serialize for MainState {
+ fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+ where
+ S: serde::Serializer,
+ {
+ serializer.serialize_str(&self.to_string())
+ }
+}
+
+/// Worktree operation state
+///
+/// Represents blocking git operations in progress that require resolution.
+/// These take priority over all other states in the Worktree column.
+///
+/// Priority: Conflicts (✘) > Rebase (⤴) > Merge (⤵)
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
+pub enum OperationState {
+ /// No operation in progress
+ #[default]
+ None,
+ /// Actual merge conflicts (unmerged paths in working tree)
+ Conflicts,
+ /// Rebase in progress
+ Rebase,
+ /// Merge in progress
+ Merge,
+}
+
+impl std::fmt::Display for OperationState {
+ fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+ match self {
+ Self::None => Ok(()),
+ Self::Conflicts => write!(f, "✘"),
+ Self::Rebase => write!(f, "⤴"),
+ Self::Merge => write!(f, "⤵"),
}
}
}
-impl serde::Serialize for BranchState {
+impl OperationState {
+ /// Returns styled symbol with appropriate color, or None for None variant.
+ ///
+ /// Color semantics:
+ /// - ERROR (red): Conflicts - blocking problems
+ /// - WARNING (yellow): Rebase, Merge - active/stuck states
+ pub fn styled(&self) -> Option<String> {
+ use color_print::cformat;
+ match self {
+ Self::None => None,
+ Self::Conflicts => Some(cformat!("<red>{self}</>")),
+ Self::Rebase | Self::Merge => Some(cformat!("<yellow>{self}</>")),
+ }
+ }
+
+ /// Returns the JSON string representation.
+ pub fn as_json_str(self) -> Option<&'static str> {
+ match self {
+ Self::None => None,
+ Self::Conflicts => Some("conflicts"),
+ Self::Rebase => Some("rebase"),
+ Self::Merge => Some("merge"),
+ }
+ }
+}
+
+impl serde::Serialize for OperationState {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: serde::Serializer,
@@ -954,26 +1011,25 @@ pub enum GitOperationState {
/// 1. Only allocate space for positions that have data
/// 2. Pad each position to a consistent width for vertical alignment
///
-/// Stores maximum character width for each of 8 positions (including user marker).
+/// Stores maximum character width for each of 7 positions (including user marker).
/// A width of 0 means the position is unused.
#[derive(Debug, Clone, Copy, Default)]
pub struct PositionMask {
- /// Maximum width for each position: [0, 1, 2, 3, 4, 5, 6, 7]
+ /// Maximum width for each position: [0, 1, 2, 3, 4, 5, 6]
/// 0 = position unused, >0 = max characters needed
- widths: [usize; 8],
+ widths: [usize; 7],
}
impl PositionMask {
- // Render order indices (0-7) - symbols appear in this order left-to-right
+ // Render order indices (0-6) - symbols appear in this order left-to-right
// Working tree split into 3 fixed positions for vertical alignment
const STAGED: usize = 0; // + (staged changes)
const MODIFIED: usize = 1; // ! (modified files)
const UNTRACKED: usize = 2; // ? (untracked files)
- const BRANCH_STATE: usize = 3; // Branch state (conflicts, rebase, merge, integrated, etc.)
- const MAIN_DIVERGENCE: usize = 4;
- const UPSTREAM_DIVERGENCE: usize = 5;
- const WORKTREE_STATE: usize = 6;
- const USER_MARKER: usize = 7;
+ const WORKTREE_STATE: usize = 3; // Worktree: ✘⤴⤵/⚑⊟⊞
+ const MAIN_STATE: usize = 4; // Main relationship: ^✗_⊂↕↑↓
+ const UPSTREAM_DIVERGENCE: usize = 5; // Remote: |⇅⇡⇣
+ const USER_MARKER: usize = 6;
/// Full mask with all positions enabled (for JSON output and progressive rendering)
/// Allocates realistic widths based on common symbol sizes to ensure proper grid alignment
@@ -982,10 +1038,9 @@ impl PositionMask {
1, // STAGED: + (1 char)
1, // MODIFIED: ! (1 char)
1, // UNTRACKED: ? (1 char)
- 1, // BRANCH_STATE: ✘⤴⤵✗_⊂ (1 char, priority: conflicts > rebase > merge > would_conflict > same_commit > integrated)
- 1, // MAIN_DIVERGENCE: ^, ↑, ↓, ↕ (1 char)
- 1, // UPSTREAM_DIVERGENCE: ⇡, ⇣, ⇅ (1 char)
- 1, // WORKTREE_STATE: / for branches, ⚑⊟⊞ for worktrees (priority: path_mismatch > prunable > locked)
+ 1, // WORKTREE_STATE: ✘⤴⤵/⚑⊟⊞ (1 char, priority: conflicts > rebase > merge > path_mismatch > prunable > locked > branch)
+ 1, // MAIN_STATE: ^✗_⊂↕↑↓ (1 char, priority: is_main > would_conflict > same_commit > integrated > diverged > ahead > behind)
+ 1, // UPSTREAM_DIVERGENCE: |⇡⇣⇅ (1 char)
2, // USER_MARKER: single emoji or two chars (allocate 2)
],
};
@@ -998,46 +1053,56 @@ impl PositionMask {
/// Structured status symbols for aligned rendering
///
-/// Symbols are categorized to enable vertical alignment in table output:
-/// - Working tree: +, !, ? (staged, modified, untracked - priority order)
-/// - Branch/op state: ✘, ⤴, ⤵, ✗, _, ⊂ (combined position with priority)
-/// - Main divergence: ^, ↕, ↑, ↓
-/// - Upstream divergence: ⇅, ⇡, ⇣
-/// - Worktree state: / for branches, ⚑⊟⊞ for worktrees (priority-only)
+/// Symbols are categorized to enable vertical alignment in table output.
+/// Display order (left to right):
+/// - Working tree: +, !, ? (staged, modified, untracked - NOT mutually exclusive)
+/// - Worktree state: ✘, ⤴, ⤵, /, ⚑, ⊟, ⊞ (operations + location)
+/// - Main state: ^, ✗, _, ⊂, ↕, ↑, ↓ (relationship to main branch - single-stroke vertical arrows)
+/// - Upstream divergence: |, ⇅, ⇡, ⇣ (relationship to remote - vertical arrows)
/// - User marker: custom labels, emoji
///
/// ## Mutual Exclusivity
///
-/// **Combined with priority (branch state + git operation):**
-/// Priority: ✘ > ⤴ > ⤵ > ✗ > _ > ⊂
+/// **Worktree state (operations take priority over location):**
+/// Priority: ✘ > ⤴ > ⤵ > ⚑ > ⊟ > ⊞ > /
/// - ✘: Actual conflicts (must resolve)
/// - ⤴: Rebase in progress
/// - ⤵: Merge in progress
-/// - ✗: Merge-tree conflicts (potential problem)
+/// - ⚑: Path doesn't match template
+/// - ⊟: Prunable (directory missing)
+/// - ⊞: Locked worktree
+/// - /: Branch without worktree
+///
+/// **Main state (single position with priority):**
+/// Priority: ^ > ✗ > _ > ⊂ > ↕ > ↑ > ↓
+/// - ^: This IS the main branch
+/// - ✗: Would conflict if merged to main
/// - _: Same commit as main (removable)
/// - ⊂: Content integrated (removable)
+/// - ↕: Diverged from main
+/// - ↑: Ahead of main
+/// - ↓: Behind main
///
-/// **Mutually exclusive (enforced by type system):**
-/// - ^ vs ↕ vs ↑ vs ↓: Main divergence (Divergence with Main context)
-/// - ⇅ vs ⇡ vs ⇣: Upstream divergence (Divergence with Upstream context)
-///
-/// **Priority-only (can co-occur but only highest priority shown):**
-/// - ⚑ vs ⊟ vs ⊞: Worktree attrs (priority: path_mismatch ⚑ > prunable ⊟ > locked ⊞)
-/// - /: Branch indicator (mutually exclusive with ⚑⊟⊞ as branches can't have worktree attrs)
+/// **Upstream divergence (enforced by type system):**
+/// - |: In sync with remote
+/// - ⇅: Diverged from remote
+/// - ⇡: Ahead of remote
+/// - ⇣: Behind remote
///
/// **NOT mutually exclusive (can co-occur):**
/// - Working tree symbols (+!?): Can have multiple types of changes
#[derive(Debug, Clone, Default)]
pub struct StatusSymbols {
- /// Branch state (mutually exclusive with priority)
- /// Priority: Conflicts (✘) > Rebase (⤴) > Merge (⤵) > WouldConflict (✗) > SameCommit (_) > Integrated (⊂)
- pub(crate) branch_state: BranchState,
+ /// Main branch relationship state (single position, horizontal arrows)
+ /// Priority: IsMain (^) > WouldConflict (✗) > SameCommit (_) > Integrated (⊂) > Diverged (↕) > Ahead (↑) > Behind (↓)
+ pub(crate) main_state: MainState,
- /// Worktree state: / for branches, ⚑⊟⊞ for worktrees (priority: path_mismatch > prunable > locked)
- pub(crate) worktree_state: WorktreeState,
+ /// Worktree operation and location state (single position)
+ /// Operations (✘⤴⤵) take priority over location states (/⚑⊟⊞)
+ pub(crate) operation_state: OperationState,
- /// Main branch divergence state (mutually exclusive)
- pub(crate) main_divergence: Divergence,
+ /// Worktree location state: / for branches, ⚑⊟⊞ for worktrees
+ pub(crate) worktree_state: WorktreeState,
/// Remote/upstream divergence state (mutually exclusive)
pub(crate) upstream_divergence: Divergence,
@@ -1092,9 +1157,9 @@ impl StatusSymbols {
/// Check if symbols are empty
pub fn is_empty(&self) -> bool {
- self.branch_state == BranchState::None
+ self.main_state == MainState::None
+ && self.operation_state == OperationState::None
&& self.worktree_state == WorktreeState::None
- && self.main_divergence == Divergence::None
&& self.upstream_divergence == Divergence::None
&& !self.working_tree.is_dirty()
&& self.user_marker.is_none()
@@ -1112,15 +1177,16 @@ impl StatusSymbols {
/// Build styled symbols array with position indices.
///
- /// Returns: `[(position_mask, styled_string, has_data); 8]`
+ /// Returns: `[(position_mask, styled_string, has_data); 7]`
///
- /// Order: working_tree (+!?) → branch_op_state → main_divergence → upstream_divergence → worktree_state → user_marker
+ /// Order: working_tree (+!?) → main_state → upstream_divergence → worktree_state → user_marker
///
/// Styling follows semantic meaning:
/// - Cyan: Working tree changes (activity indicator)
- /// - Yellow: Git operations, locked/prunable (stuck states needing attention)
- /// - Dimmed: Branch state symbols + divergence arrows (low urgency)
- fn styled_symbols(&self) -> [(usize, String, bool); 8] {
+ /// - Red: Conflicts (blocking problems)
+ /// - Yellow: Git operations, would_conflict, locked/prunable (states needing attention)
+ /// - Dimmed: Main state symbols, divergence arrows, branch indicator (informational)
+ fn styled_symbols(&self) -> [(usize, String, bool); 7] {
use color_print::cformat;
// Working tree symbols split into 3 fixed columns for vertical alignment
@@ -1135,57 +1201,50 @@ impl StatusSymbols {
let (modified_str, has_modified) = style_working(self.working_tree.modified, '!');
let (untracked_str, has_untracked) = style_working(self.working_tree.untracked, '?');
- let (branch_state_str, has_branch_state) = self
- .branch_state
+ // Main state (merged column: ^✗_⊂↕↑↓)
+ let (main_state_str, has_main_state) = self
+ .main_state
.styled()
.map_or((String::new(), false), |s| (s, true));
- let (main_divergence_str, has_main_divergence) = self
- .main_divergence
- .styled(DivergenceContext::Main)
- .map_or((String::new(), false), |s| (s, true));
+
+ // Upstream divergence (|⇅⇡⇣)
let (upstream_divergence_str, has_upstream_divergence) = self
.upstream_divergence
.styled(DivergenceContext::Upstream)
.map_or((String::new(), false), |s| (s, true));
- let worktree_state_str = match self.worktree_state {
- WorktreeState::None => String::new(),
- // Branch indicator (/) is informational (dimmed)
- WorktreeState::Branch => cformat!("<dim>{}</>", self.worktree_state),
- // Path mismatch (⚑) is a stronger warning (red)
- WorktreeState::PathMismatch => cformat!("<red>{}</>", self.worktree_state),
- // Other worktree attrs (⊟⊞) are warnings (yellow)
- _ => cformat!("<yellow>{}</>", self.worktree_state),
+ // Worktree state: operations (✘⤴⤵) take priority over location (/⚑⊟⊞)
+ let (worktree_str, has_worktree) = if self.operation_state != OperationState::None {
+ // Operation state takes priority
+ (self.operation_state.styled().unwrap_or_default(), true)
+ } else {
+ // Fall back to location state
+ match self.worktree_state {
+ WorktreeState::None => (String::new(), false),
+ // Branch indicator (/) is informational (dimmed)
+ WorktreeState::Branch => (cformat!("<dim>{}</>", self.worktree_state), true),
+ // Path mismatch (⚑) is a stronger warning (red)
+ WorktreeState::PathMismatch => (cformat!("<red>{}</>", self.worktree_state), true),
+ // Other worktree attrs (⊟⊞) are warnings (yellow)
+ _ => (cformat!("<yellow>{}</>", self.worktree_state), true),
+ }
};
let user_marker_str = self.user_marker.as_deref().unwrap_or("").to_string();
- // CRITICAL: Display order is working_tree first (staged, modified, untracked), then other symbols.
- // NEVER change this order - it ensures progressive and final rendering match exactly.
+ // CRITICAL: Display order must match position indices for correct rendering.
+ // Order: Working tree (0-2) → Worktree (3) → Main (4) → Remote (5) → User (6)
[
(PositionMask::STAGED, staged_str, has_staged),
(PositionMask::MODIFIED, modified_str, has_modified),
(PositionMask::UNTRACKED, untracked_str, has_untracked),
- (
- PositionMask::BRANCH_STATE,
- branch_state_str,
- has_branch_state,
- ),
- (
- PositionMask::MAIN_DIVERGENCE,
- main_divergence_str,
- has_main_divergence,
- ),
+ (PositionMask::WORKTREE_STATE, worktree_str, has_worktree),
+ (PositionMask::MAIN_STATE, main_state_str, has_main_state),
(
PositionMask::UPSTREAM_DIVERGENCE,
upstream_divergence_str,
has_upstream_divergence,
),
- (
- PositionMask::WORKTREE_STATE,
- worktree_state_str,
- self.worktree_state != WorktreeState::None,
- ),
(
PositionMask::USER_MARKER,
user_marker_str,
@@ -1322,60 +1381,130 @@ mod tests {
}
#[test]
- fn test_branch_state_as_json_str() {
- assert_eq!(BranchState::None.as_json_str(), None);
- assert_eq!(BranchState::Conflicts.as_json_str(), Some("conflicts"));
- assert_eq!(BranchState::Rebase.as_json_str(), Some("rebase"));
- assert_eq!(BranchState::Merge.as_json_str(), Some("merge"));
+ fn test_main_state_as_json_str() {
+ assert_eq!(MainState::None.as_json_str(), None);
+ assert_eq!(MainState::IsMain.as_json_str(), Some("is_main"));
assert_eq!(
- BranchState::WouldConflict.as_json_str(),
+ MainState::WouldConflict.as_json_str(),
Some("would_conflict")
);
- assert_eq!(BranchState::SameCommit.as_json_str(), Some("same_commit"));
+ assert_eq!(MainState::SameCommit.as_json_str(), Some("same_commit"));
assert_eq!(
- BranchState::Integrated(IntegrationReason::TreesMatch).as_json_str(),
+ MainState::Integrated(IntegrationReason::TreesMatch).as_json_str(),
Some("integrated")
);
+ assert_eq!(MainState::Diverged.as_json_str(), Some("diverged"));
+ assert_eq!(MainState::Ahead.as_json_str(), Some("ahead"));
+ assert_eq!(MainState::Behind.as_json_str(), Some("behind"));
}
#[test]
- fn test_integration_reason_as_json_str() {
- assert_eq!(IntegrationReason::SameCommit.as_json_str(), "same_commit");
- assert_eq!(IntegrationReason::Ancestor.as_json_str(), "ancestor");
- assert_eq!(IntegrationReason::TreesMatch.as_json_str(), "trees_match");
- assert_eq!(
- IntegrationReason::NoAddedChanges.as_json_str(),
- "no_added_changes"
- );
- assert_eq!(
- IntegrationReason::MergeAddsNothing.as_json_str(),
- "merge_adds_nothing"
- );
+ fn test_integration_reason_into_static_str() {
+ let s: &'static str = IntegrationReason::SameCommit.into();
+ assert_eq!(s, "same_commit");
+ let s: &'static str = IntegrationReason::Ancestor.into();
+ assert_eq!(s, "ancestor");
+ let s: &'static str = IntegrationReason::TreesMatch.into();
+ assert_eq!(s, "trees_match");
+ let s: &'static str = IntegrationReason::NoAddedChanges.into();
+ assert_eq!(s, "no_added_changes");
+ let s: &'static str = IntegrationReason::MergeAddsNothing.into();
+ assert_eq!(s, "merge_adds_nothing");
}
#[test]
- fn test_branch_state_integration_reason() {
+ fn test_main_state_integration_reason() {
// Non-integrated states return None
- assert_eq!(BranchState::None.integration_reason(), None);
- assert_eq!(BranchState::Conflicts.integration_reason(), None);
- assert_eq!(BranchState::SameCommit.integration_reason(), None);
+ assert_eq!(MainState::None.integration_reason(), None);
+ assert_eq!(MainState::IsMain.integration_reason(), None);
+ assert_eq!(MainState::WouldConflict.integration_reason(), None);
+ assert_eq!(MainState::SameCommit.integration_reason(), None);
+ assert_eq!(MainState::Diverged.integration_reason(), None);
+ assert_eq!(MainState::Ahead.integration_reason(), None);
+ assert_eq!(MainState::Behind.integration_reason(), None);
// Integrated states return the reason
assert_eq!(
- BranchState::Integrated(IntegrationReason::Ancestor).integration_reason(),
+ MainState::Integrated(IntegrationReason::Ancestor).integration_reason(),
Some(IntegrationReason::Ancestor)
);
assert_eq!(
- BranchState::Integrated(IntegrationReason::TreesMatch).integration_reason(),
+ MainState::Integrated(IntegrationReason::TreesMatch).integration_reason(),
Some(IntegrationReason::TreesMatch)
);
assert_eq!(
- BranchState::Integrated(IntegrationReason::NoAddedChanges).integration_reason(),
+ MainState::Integrated(IntegrationReason::NoAddedChanges).integration_reason(),
Some(IntegrationReason::NoAddedChanges)
);
assert_eq!(
- BranchState::Integrated(IntegrationReason::MergeAddsNothing).integration_reason(),
+ MainState::Integrated(IntegrationReason::MergeAddsNothing).integration_reason(),
Some(IntegrationReason::MergeAddsNothing)
);
}
+
+ #[test]
+ fn test_main_state_from_integration_and_counts() {
+ // IsMain takes priority
+ assert!(matches!(
+ MainState::from_integration_and_counts(true, false, false, None, 5, 3),
+ MainState::IsMain
+ ));
+
+ // WouldConflict next
+ assert!(matches!(
+ MainState::from_integration_and_counts(false, true, false, None, 5, 3),
+ MainState::WouldConflict
+ ));
+
+ // SameCommit next
+ assert!(matches!(
+ MainState::from_integration_and_counts(false, false, true, None, 0, 0),
+ MainState::SameCommit
+ ));
+
+ // Integrated next
+ assert!(matches!(
+ MainState::from_integration_and_counts(
+ false,
+ false,
+ false,
+ Some(IntegrationReason::Ancestor),
+ 0,
+ 5
+ ),
+ MainState::Integrated(IntegrationReason::Ancestor)
+ ));
+
+ // Diverged (both ahead and behind)
+ assert!(matches!(
+ MainState::from_integration_and_counts(false, false, false, None, 3, 2),
+ MainState::Diverged
+ ));
+
+ // Ahead only
+ assert!(matches!(
+ MainState::from_integration_and_counts(false, false, false, None, 3, 0),
+ MainState::Ahead
+ ));
+
+ // Behind only
+ assert!(matches!(
+ MainState::from_integration_and_counts(false, false, false, None, 0, 2),
+ MainState::Behind
+ ));
+
+ // None (in sync)
+ assert!(matches!(
+ MainState::from_integration_and_counts(false, false, false, None, 0, 0),
+ MainState::None
+ ));
+ }
+
+ #[test]
+ fn test_operation_state_as_json_str() {
+ assert_eq!(OperationState::None.as_json_str(), None);
+ assert_eq!(OperationState::Conflicts.as_json_str(), Some("conflicts"));
+ assert_eq!(OperationState::Rebase.as_json_str(), Some("rebase"));
+ assert_eq!(OperationState::Merge.as_json_str(), Some("merge"));
+ }
}
diff --git a/src/git/mod.rs b/src/git/mod.rs
index b5eb811b2..ae82630b6 100644
--- a/src/git/mod.rs
+++ b/src/git/mod.rs
@@ -55,12 +55,14 @@ pub use repository::{Repository, ResolvedWorktree, set_base_path};
/// 3. [`NoAddedChanges`](Self::NoAddedChanges) - three-dot diff (~50-100ms)
/// 4. [`TreesMatch`](Self::TreesMatch) - tree SHA comparison (~100-300ms)
/// 5. [`MergeAddsNothing`](Self::MergeAddsNothing) - merge simulation (~500ms-2s)
-#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize, strum::IntoStaticStr)]
#[serde(rename_all = "snake_case")]
+#[strum(serialize_all = "snake_case")]
pub enum IntegrationReason {
/// Branch HEAD is literally the same commit as target.
///
- /// Symbol in `wt list`: `_`
+ /// Used by `wt remove` to determine if branch is safely deletable.
+ /// In `wt list`, same-commit state is shown via `MainState::SameCommit` (symbol `_`).
SameCommit,
/// Branch HEAD is an ancestor of target (target has moved past this branch).
@@ -98,17 +100,6 @@ impl IntegrationReason {
Self::MergeAddsNothing => "all changes in",
}
}
-
- /// Returns the JSON string representation.
- pub fn as_json_str(self) -> &'static str {
- match self {
- Self::SameCommit => "same_commit",
- Self::Ancestor => "ancestor",
- Self::NoAddedChanges => "no_added_changes",
- Self::TreesMatch => "trees_match",
- Self::MergeAddsNothing => "merge_adds_nothing",
- }
- }
}
/// Category of branch for completion display
diff --git a/src/md_help.rs b/src/md_help.rs
index 5609de744..e214456ed 100644
--- a/src/md_help.rs
+++ b/src/md_help.rs
@@ -345,8 +345,7 @@ fn colorize_status_symbols(text: &str) -> String {
.replace("● no-ci", &format!("{disabled}●{disabled:#} no-ci"));
// Symbols that should remain dimmed are already dimmed from backtick rendering:
- // - Branch state: _ (same commit), ⊂ (content integrated)
- // - Main divergence: ^, ↑, ↓, ↕
+ // - Main state: _ (same commit), ⊂ (content integrated), ^, ↑, ↓, ↕
// - Upstream divergence: |, ⇡, ⇣, ⇅
// - Worktree state: / (branch without worktree)
diff --git a/tests/integration_tests/.statusline.rs.pending-snap b/tests/integration_tests/.statusline.rs.pending-snap
new file mode 100644
index 000000000..9345c4ebc
--- /dev/null
+++ b/tests/integration_tests/.statusline.rs.pending-snap
@@ -0,0 +1,25 @@
+{"run_id":"1765331832-812314000","line":131,"new":{"module_name":"integration__integration_tests__statusline","snapshot_name":"statusline_commits_ahead","metadata":{"source":"tests/integration_tests/statusline.rs","assertion_line":131,"expression":"output"},"snapshot":"feature \u001b[2m↑\u001b[22m \u001b[32m↑2\u001b[0m ^\u001b[32m+2\u001b[0m"},"old":{"module_name":"integration__integration_tests__statusline","metadata":{},"snapshot":"feature \u001b[2m→\u001b[22m \u001b[32m↑2\u001b[0m ^\u001b[32m+2\u001b[0m"}}
+{"run_id":"1765331882-239475000","line":115,"new":null,"old":null}
+{"run_id":"1765331882-239475000","line":172,"new":null,"old":null}
+{"run_id":"1765331882-239475000","line":187,"new":null,"old":null}
+{"run_id":"1765331882-239475000","line":205,"new":null,"old":null}
+{"run_id":"1765331882-239475000","line":122,"new":null,"old":null}
+{"run_id":"1765331882-239475000","line":131,"new":null,"old":null}
+{"run_id":"1765332110-387283000","line":115,"new":null,"old":null}
+{"run_id":"1765332110-387283000","line":187,"new":null,"old":null}
+{"run_id":"1765332110-387283000","line":172,"new":null,"old":null}
+{"run_id":"1765332110-387283000","line":205,"new":null,"old":null}
+{"run_id":"1765332110-387283000","line":122,"new":null,"old":null}
+{"run_id":"1765332110-387283000","line":131,"new":null,"old":null}
+{"run_id":"1765332133-880410000","line":115,"new":null,"old":null}
+{"run_id":"1765332133-880410000","line":187,"new":null,"old":null}
+{"run_id":"1765332133-880410000","line":172,"new":null,"old":null}
+{"run_id":"1765332133-880410000","line":205,"new":null,"old":null}
+{"run_id":"1765332133-880410000","line":122,"new":null,"old":null}
+{"run_id":"1765332133-880410000","line":131,"new":null,"old":null}
+{"run_id":"1765334156-162367000","line":115,"new":null,"old":null}
+{"run_id":"1765334156-162367000","line":172,"new":null,"old":null}
+{"run_id":"1765334156-162367000","line":187,"new":null,"old":null}
+{"run_id":"1765334156-162367000","line":205,"new":null,"old":null}
+{"run_id":"1765334156-162367000","line":122,"new":null,"old":null}
+{"run_id":"1765334156-162367000","line":131,"new":null,"old":null}
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__select__select_abort_escape.snap b/tests/integration_tests/snapshots/integration__integration_tests__select__select_abort_escape.snap
index 301a3e144..55fd9fb42 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__select__select_abort_escape.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__select__select_abort_escape.snap
@@ -3,8 +3,8 @@ source: tests/integration_tests/select.rs
expression: normalized
---
> [QUERY] │[PREVIEW_HEADER]
- Branch Status HEAD± main↕ Path Remote⇅ Co│Enter: switch | Esc: cancel | ctrl-u/d: scroll | alt-p: tog
-> @ main ^ . ..│
+ Branch Status HEAD± main↕ Path Remote⇅ Com│Enter: switch | Esc: cancel | ctrl-u/d: scroll | alt-p: tog
+> @ main ^ . b..│
│⚪ main has no uncommitted changes
│
│
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__select__select_multiple_worktrees.snap b/tests/integration_tests/snapshots/integration__integration_tests__select__select_multiple_worktrees.snap
index 529479382..6e2ffcbf0 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__select__select_multiple_worktrees.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__select__select_multiple_worktrees.snap
@@ -3,10 +3,10 @@ source: tests/integration_tests/select.rs
expression: normalized
---
> [QUERY] │[PREVIEW_HEADER]
- Branch Status HEAD± main↕ Path │Enter: switch | Esc: cancel | ctrl-u/d: scroll | alt-p: tog
-> @ main ^ ./repo ..│
- + feature-one _ ./repo.fea..│⚪ main has no uncommitted changes
- + feature-two _ ./repo.fea..│
+ Branch Status HEAD± main↕ Path │Enter: switch | Esc: cancel | ctrl-u/d: scroll | alt-p: tog
+> @ main ^ ./repo ..│
+ + feature-one _ ./repo.feat..│⚪ main has no uncommitted changes
+ + feature-two _ ./repo.feat..│
│
│
│
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_history.snap b/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_history.snap
index cb8d23bec..11c4f28ad 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_history.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_history.snap
@@ -3,8 +3,8 @@ source: tests/integration_tests/select.rs
expression: normalized
---
> [QUERY] │[PREVIEW_HEADER]
- Branch Status HEAD± main↕ Path │Enter: switch | Esc: cancel | ctrl-u/d: scroll | alt-p: tog
-> + feature ↑ ↑5 ./repo.feature..│
+ Branch Status HEAD± main↕ Path R│Enter: switch | Esc: cancel | ctrl-u/d: scroll | alt-p: tog
+> + feature ↑ ↑5 ./repo.feature ..│
│* b1549b6 (feature) Add file 5 with important changes
│* 111f7e4 Add file 4 with important changes
│* fe8881c Add file 3 with important changes
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_main_diff.snap b/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_main_diff.snap
index 548dc72ea..d32114f93 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_main_diff.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_main_diff.snap
@@ -3,8 +3,8 @@ source: tests/integration_tests/select.rs
expression: normalized
---
> [QUERY] │[PREVIEW_HEADER]
- Branch Status HEAD± main↕ Path │Enter: switch | Esc: cancel | ctrl-u/d: scroll | alt-p: tog
-> + feature ↑ ↑2 ./repo.feature..│
+ Branch Status HEAD± main↕ Path R│Enter: switch | Esc: cancel | ctrl-u/d: scroll | alt-p: tog
+> + feature ↑ ↑2 ./repo.feature ..│
│ feature_code.rs | 6 ++++++
│ tests.rs | 4 ++++
│ 2 files changed, 10 insertions(+)
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_uncommitted.snap b/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_uncommitted.snap
index e5c7b2662..ea8d2cfd3 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_uncommitted.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_uncommitted.snap
@@ -3,8 +3,8 @@ source: tests/integration_tests/select.rs
expression: normalized
---
> [QUERY] │[PREVIEW_HEADER]
- Branch Status HEAD± main↕ Path │Enter: switch | Esc: cancel | ctrl-u/d: scroll | alt-p: tog
-> + feature ! ↑ +3 -1 ↑1 ./repo.feature..│
+ Branch Status HEAD± main↕ Path R│Enter: switch | Esc: cancel | ctrl-u/d: scroll | alt-p: tog
+> + feature ! ↑ +3 -1 ↑1 ./repo.feature ..│
│ tracked.txt | 4 +++-
│ 1 file changed, 3 insertions(+), 1 deletion(-)
│
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__select__select_with_branches.snap b/tests/integration_tests/snapshots/integration__integration_tests__select__select_with_branches.snap
index d8b66af7a..8735a3351 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__select__select_with_branches.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__select__select_with_branches.snap
@@ -3,10 +3,10 @@ source: tests/integration_tests/select.rs
expression: normalized
---
> [QUERY] │[PREVIEW_HEADER]
- Branch Status HEAD± main↕ Path │Enter: switch | Esc: cancel | ctrl-u/d: scroll | alt-p: tog
-> @ main ^ ./repo │
- + active-worktree _ ./repo..│⚪ main has no uncommitted changes
- orphan-branch _ / │
+ Branch Status HEAD± main↕ Path │Enter: switch | Esc: cancel | ctrl-u/d: scroll | alt-p: tog
+> @ main ^ ./repo │
+ + active-worktree _ ./repo...│⚪ main has no uncommitted changes
+ orphan-branch /_ │
│
│
│
diff --git a/tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snap b/tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snap
index 750610be9..5ccb9d88a 100644
--- a/tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_worktrees.snap
@@ -21,8 +21,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo.main 6c3da842 1d Initial commit on main
-+ feature ↑ ⚑ ↑1 ./repo.feature 72413a3b 1d Work on feature
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo.main 6c3da842 1d Initial commit on main
++ feature ⚑↑ ↑1 ./repo.feature 72413a3b 1d Work on feature
⚪ Showing 2 worktrees, 1 ahead
diff --git a/tests/snapshots/integration__integration_tests__help__help_list_long.snap b/tests/snapshots/integration__integration_tests__help__help_list_long.snap
index f069da575..c1a0ff96f 100644
--- a/tests/snapshots/integration__integration_tests__help__help_list_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_list_long.snap
@@ -118,29 +118,29 @@ CI is only checked for branches that track a remote — local-only branches show
The Status column has multiple subcolumns. Within each, only the first matching symbol is shown (listed in priority order):
- Subcolumn Symbol Meaning
- ───────────────── ────── ────────────────────────────────────────────────────
- Working tree (1) + Staged files
- Working tree (2) ! Modified files (unstaged)
- Working tree (3) ? Untracked files
- Branch state ✘ Merge conflicts
- ⤴ Rebase in progress
- ⤵ Merge in progress
- ✗ Would conflict if merged to main
- _ Same commit as main
- ⊂ Content integrated (--full detects additional cases)
- Main divergence ^ Is the main branch
- ↕ Diverged from main
- ↑ Ahead of main
- ↓ Behind main
- Remote divergence | In sync with remote
- ⇅ Diverged from remote
- ⇡ Ahead of remote
- ⇣ Behind remote
- Worktree state / Branch without worktree
- ⚑ Path doesn't match template
- ⊟ Prunable (directory missing)
- ⊞ Locked worktree
+ Subcolumn Symbol Meaning
+ ──────────────── ────── ────────────────────────────────────────────────────
+ Working tree (1) + Staged files
+ Working tree (2) ! Modified files (unstaged)
+ Working tree (3) ? Untracked files
+ Worktree ✘ Merge conflicts
+ ⤴ Rebase in progress
+ ⤵ Merge in progress
+ / Branch without worktree
+ ⚑ Path doesn't match template
+ ⊟ Prunable (directory missing)
+ ⊞ Locked worktree
+ Main ^ Is the main branch
+ ✗ Would conflict if merged to main
+ _ Same commit as main
+ ⊂ Content integrated (--full detects additional cases)
+ ↕ Diverged from main
+ ↑ Ahead of main
+ ↓ Behind main
+ Remote | In sync with remote
+ ⇅ Diverged from remote
+ ⇡ Ahead of remote
+ ⇣ Behind remote
Rows are dimmed when the branch content is already in main (_ same commit or ⊂ content integrated).
@@ -148,8 +148,8 @@ Rows are dimmed when the branch content is already in main (_ same commi
Query structured data with --format=json:
- # Worktrees with conflicts
- wt list --format=json | jq '.[] | select(.branch_state == "conflicts")'
+ # Worktrees with merge conflicts
+ wt list --format=json | jq '.[] | select(.operation_state == "conflicts")'

# Uncommitted changes
wt list --format=json | jq '.[] | select(.working_tree.modified)'
@@ -161,28 +161,29 @@ Query structured data with --format=json:
wt list --format=json | jq '.[] | select(.main.ahead > 0)'

# Integrated branches (ready to clean up)
- wt list --format=json | jq '.[] | select(.branch_state == "integrated" or .branch_state == "same_commit")'
+ wt list --format=json | jq '.[] | select(.main_state == "integrated" or .main_state == "same_commit")'
Fields:
- Field Description
- ────────────────── ────────────────────────────────────────────────────────────────────────────────────────────────────
- branch Branch name (null for detached HEAD)
- path Worktree path (absent for branches without worktrees)
- kind "worktree" or "branch"
- commit {sha, short_sha, message, timestamp}
- working_tree {staged, modified, untracked, renamed, deleted, diff, diff_vs_main}
- branch_state "conflicts" "rebase" "merge" "would_conflict" "same_commit" "integrated"
- integration_reason "ancestor" "trees_match" "no_added_changes" "merge_adds_nothing" (when branch_state == "integrated")
- main {ahead, behind, diff} (absent when is_main)
- remote {name, branch, ahead, behind} (absent when no tracking branch)
- worktree {state, reason, detached, bare}
- is_main Main worktree
- is_current Current worktree
- is_previous Previous worktree from wt switch
- pr {ci, source, stale, url} — CI status from PR or branch (absent when no CI)
- statusline Pre-formatted status with ANSI colors
- symbols Raw status symbols without colors (e.g., "!?↓")
+ Field Description
+ ────────────────── ──────────────────────────────────────────────────────────────────────────────────────────────────
+ branch Branch name (null for detached HEAD)
+ path Worktree path (absent for branches without worktrees)
+ kind "worktree" or "branch"
+ commit {sha, short_sha, message, timestamp}
+ working_tree {staged, modified, untracked, renamed, deleted, diff, diff_vs_main}
+ main_state "is_main" "would_conflict" "same_commit" "integrated" "diverged" "ahead" "behind"
+ integration_reason "ancestor" "trees_match" "no_added_changes" "merge_adds_nothing" (when main_state == "integrated")
+ operation_state "conflicts" "rebase" "merge" (absent when no operation in progress)
+ main {ahead, behind, diff} (absent when is_main)
+ remote {name, branch, ahead, behind} (absent when no tracking branch)
+ worktree {state, reason, detached, bare}
+ is_main Main worktree
+ is_current Current worktree
+ is_previous Previous worktree from wt switch
+ pr {ci, source, stale, url} — CI status from PR or branch (absent when no CI)
+ statusline Pre-formatted status with ANSI colors
+ symbols Raw status symbols without colors (e.g., "!?↓")
See also
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 dd9da4323..25413bb88 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
@@ -23,7 +23,7 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . b834638e 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ . b834638e 1d 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 c07b78759..d5a3e1b34 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 1d Initial commit
- branch-only _ / b834638e 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ . b834638e 1d Initial commit
+ branch-only /_ b834638e 1d 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 62af36d2c..802843507 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 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ develop ⚑^ . b834638e 1d 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 9bfa9bc2d..52eece078 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 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ - ⚑^ . b834638e 1d Initial commit
⚪ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list__detached_head_in_worktree.snap b/tests/snapshots/integration__integration_tests__list__detached_head_in_worktree.snap
index cac815fd1..baaaf7ec1 100644
--- a/tests/snapshots/integration__integration_tests__list__detached_head_in_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__detached_head_in_worktree.snap
@@ -22,8 +22,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ - _ ⚑ ./repo.feature b834638e 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo b834638e 1d Initial commit
++ - ⚑_ ./repo.feature b834638e 1d Initial commit
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__json_tree_matches_main_after_merge.snap b/tests/snapshots/integration__integration_tests__list__json_tree_matches_main_after_merge.snap
index edf05f5f6..1c82ed78a 100644
--- a/tests/snapshots/integration__integration_tests__list__json_tree_matches_main_after_merge.snap
+++ b/tests/snapshots/integration__integration_tests__list__json_tree_matches_main_after_merge.snap
@@ -47,6 +47,7 @@ exit_code: 0
"deleted": 0
}
},
+ "main_state": "is_main",
"worktree": {
"detached": false,
"bare": false
@@ -81,7 +82,7 @@ exit_code: 0
"deleted": 0
}
},
- "branch_state": "integrated",
+ "main_state": "integrated",
"integration_reason": "no_added_changes",
"main": {
"ahead": 2,
@@ -92,8 +93,8 @@ exit_code: 0
"bare": false
},
"is_main": false,
- "statusline": "feature-merged /u001b[2m⊂/u001b[22m/u001b[2m↑/u001b[22m /u001b[32m↑2/u001b[0m",
- "symbols": "⊂↑"
+ "statusline": "feature-merged /u001b[2m⊂/u001b[22m /u001b[32m↑2/u001b[0m",
+ "symbols": "⊂"
}
]
diff --git a/tests/snapshots/integration__integration_tests__list__json_with_display_fields.snap b/tests/snapshots/integration__integration_tests__list__json_with_display_fields.snap
index 1579b2a0d..e55ebb1ee 100644
--- a/tests/snapshots/integration__integration_tests__list__json_with_display_fields.snap
+++ b/tests/snapshots/integration__integration_tests__list__json_with_display_fields.snap
@@ -47,6 +47,7 @@ exit_code: 0
"deleted": 0
}
},
+ "main_state": "is_main",
"worktree": {
"detached": false,
"bare": false
@@ -77,6 +78,7 @@ exit_code: 0
"deleted": 1
}
},
+ "main_state": "diverged",
"main": {
"ahead": 2,
"behind": 2
@@ -110,7 +112,7 @@ exit_code: 0
"deleted": 0
}
},
- "branch_state": "integrated",
+ "main_state": "integrated",
"integration_reason": "ancestor",
"main": {
"ahead": 0,
@@ -121,8 +123,8 @@ exit_code: 0
"bare": false
},
"is_main": false,
- "statusline": "feature-behind /u001b[2m⊂/u001b[22m/u001b[2m↓/u001b[22m /u001b[2m/u001b[31m↓2/u001b[0m",
- "symbols": "⊂↓"
+ "statusline": "feature-behind /u001b[2m⊂/u001b[22m /u001b[2m/u001b[31m↓2/u001b[0m",
+ "symbols": "⊂"
}
]
diff --git a/tests/snapshots/integration__integration_tests__list__json_with_git_operation.snap b/tests/snapshots/integration__integration_tests__list__json_with_git_operation.snap
index d693e9dbb..27105b6c3 100644
--- a/tests/snapshots/integration__integration_tests__list__json_with_git_operation.snap
+++ b/tests/snapshots/integration__integration_tests__list__json_with_git_operation.snap
@@ -47,6 +47,7 @@ exit_code: 0
"deleted": 0
}
},
+ "main_state": "is_main",
"worktree": {
"detached": false,
"bare": false
@@ -81,7 +82,8 @@ exit_code: 0
"deleted": 0
}
},
- "branch_state": "conflicts",
+ "main_state": "same_commit",
+ "operation_state": "conflicts",
"main": {
"ahead": 0,
"behind": 0
@@ -91,8 +93,8 @@ exit_code: 0
"bare": false
},
"is_main": false,
- "statusline": "feature /u001b[31m✘/u001b[39m",
- "symbols": "✘"
+ "statusline": "feature /u001b[31m✘/u001b[39m/u001b[2m_/u001b[22m",
+ "symbols": "_✘"
}
]
diff --git a/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap b/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap
index 4d6d718f5..e2161feae 100644
--- a/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap
+++ b/tests/snapshots/integration__integration_tests__list__json_with_metadata.snap
@@ -47,6 +47,7 @@ exit_code: 0
"deleted": 0
}
},
+ "main_state": "is_main",
"worktree": {
"detached": false,
"bare": false
@@ -81,7 +82,7 @@ exit_code: 0
"deleted": 0
}
},
- "branch_state": "same_commit",
+ "main_state": "same_commit",
"main": {
"ahead": 0,
"behind": 0
@@ -119,7 +120,7 @@ exit_code: 0
"deleted": 0
}
},
- "branch_state": "same_commit",
+ "main_state": "same_commit",
"main": {
"ahead": 0,
"behind": 0
@@ -131,7 +132,7 @@ exit_code: 0
"bare": false
},
"is_main": false,
- "statusline": "locked-feature /u001b[2m_/u001b[22m/u001b[33m⊞/u001b[39m",
+ "statusline": "locked-feature /u001b[33m⊞/u001b[39m/u001b[2m_/u001b[22m",
"symbols": "_⊞"
}
]
diff --git a/tests/snapshots/integration__integration_tests__list__json_with_user_marker.snap b/tests/snapshots/integration__integration_tests__list__json_with_user_marker.snap
index 79d5e68fe..3cce17422 100644
--- a/tests/snapshots/integration__integration_tests__list__json_with_user_marker.snap
+++ b/tests/snapshots/integration__integration_tests__list__json_with_user_marker.snap
@@ -47,6 +47,7 @@ exit_code: 0
"deleted": 0
}
},
+ "main_state": "is_main",
"worktree": {
"detached": false,
"bare": false
@@ -81,7 +82,7 @@ exit_code: 0
"deleted": 0
}
},
- "branch_state": "same_commit",
+ "main_state": "same_commit",
"main": {
"ahead": 0,
"behind": 0
@@ -119,7 +120,7 @@ exit_code: 0
"deleted": 0
}
},
- "branch_state": "same_commit",
+ "main_state": "same_commit",
"main": {
"ahead": 0,
"behind": 0
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 046d34348..c3f99b979 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 ^ ./repo b834638e 1d Initial commit
-+ diverged ! ↑ 💬 +40 -60 ↑1 ./repo.diverged 8ba5aa92 1d Diverged commit
-+ feature-changes !? ↑ 🤖 +50 -100 ↑1 ./repo.feature-changes b854b166 1d Add 100 lines
-+ fix ?_ 💬 ./repo.fix b834638e 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo b834638e 1d Initial commit
++ diverged ! ↑ 💬 +40 -60 ↑1 ./repo.diverged 8ba5aa92 1d Diverged commit
++ feature-changes !? ↑ 🤖 +50 -100 ↑1 ./repo.feature-changes b854b166 1d Add 100 lines
++ fix ? _ 💬 ./repo.fix b834638e 1d 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 1f763eb94..cb42c5dd6 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
-@ feature-current ↑ ↑1 ./repo.feature-current fc28a4d1 23h Commit at 01:00
-^ main ^ ./repo 6c3da842 1d Initial commit on main
-+ feature-newest ↑ ↑1 ./repo.feature-newest 136358eb 21h Commit at 03:00
-+ feature-middle ↑ ↑1 ./repo.feature-middle a0a4851a 22h Commit at 02:00
-+ feature-oldest ↑ ↑1 ./repo.feature-oldest 1b1a2d78 23h Commit at 00:30
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ feature-current ↑ ↑1 ./repo.feature-current fc28a4d1 23h Commit at 01:00
+^ main ^ ./repo 6c3da842 1d Initial commit on main
++ feature-newest ↑ ↑1 ./repo.feature-newest 136358eb 21h Commit at 03:00
++ feature-middle ↑ ↑1 ./repo.feature-middle a0a4851a 22h Commit at 02:00
++ feature-oldest ↑ ↑1 ./repo.feature-oldest 1b1a2d78 23h 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 ae3e4c78b..ca4f9fec4 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 ^ ⚑ ./repo b834638e 1d Initial commit
-+ feature-a _ ./repo.feature-a b834638e 1d Initial commit
-+ feature-b _ ./repo.feature-b b834638e 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ develop ⚑^ ./repo b834638e 1d Initial commit
++ feature-a _ ./repo.feature-a b834638e 1d Initial commit
++ feature-b _ ./repo.feature-b b834638e 1d 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 5ea57fbef..1183ccff9 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
@@ -18,9 +18,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ feature-a _ ./repo.feature-a b834638e 1d Initial commit
-+ feature-b _ ./repo.feature-b b834638e 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo b834638e 1d Initial commit
++ feature-a _ ./repo.feature-a b834638e 1d Initial commit
++ feature-b _ ./repo.feature-b b834638e 1d 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 73d7471c6..a73d3ab8a 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 ^ ./repo b834638e 1d Initial commit
-+ locked-no-reason _ ⊞ ./repo.locked-no-reason b834638e 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo b834638e 1d Initial commit
++ locked-no-reason ⊞_ ./repo.locked-no-reason b834638e 1d 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 faec1955c..c149245e7 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 ^ ./repo b834638e 1d Initial commit
-+ locked-feature _ ⊞ ./repo.locked-feature b834638e 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo b834638e 1d Initial commit
++ locked-feature ⊞_ ./repo.locked-feature b834638e 1d 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 4c0872490..c3daedd16 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 ^ ./repo 1310bfb9 1d Short message
-+ feature-a ⊂↓ ↓1 ./repo.feature-a f078644e 1d This is a very long commit message that should test how the…
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo 1310bfb9 1d Short message
++ feature-a ⊂ ↓1 ./repo.feature-a f078644e 1d 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 eae2672d1..a3da13e18 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 ^ ./repo b834638e 1d Initial commit
-+ medium-name _ ./repo.medium-name b834638e 1d Initial commit
-+ short _ ./repo.short b834638e 1d Initial commit
-+ very-long-branch-name-here _ ./repo.very-long-branch-name-here b834638e 1d Initial commit
-+ with-changes _ ./repo.with-changes b834638e 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo b834638e 1d Initial commit
++ medium-name _ ./repo.medium-name b834638e 1d Initial commit
++ short _ ./repo.short b834638e 1d Initial commit
++ very-long-branch-name-here _ ./repo.very-long-branch-name-here b834638e 1d Initial commit
++ with-changes _ ./repo.with-changes b834638e 1d 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 2f96f52c9..c19f179f4 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 ^⇡ ./repo ⇡1 85ed6d3d 1d Main advances
-+ feature +!?✗↕⇅⊞🤖 +2 -2 ↑2 ↓1 +3 -1 ./repo.feature ⇡1 ⇣1 4afb2b9e 1d Local commit
+ Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
+@ main ^⇡ ./repo ⇡1 85ed6d3d 1d Main advances
++ feature +!?⊞✗⇅🤖 +2 -2 ↑2 ↓1 +3 -1 ./repo.feature ⇡1 ⇣1 4afb2b9e 1d 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 789c55818..5fff8aa35 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 ^ ./repo b7c14ce1 1d Main conflicting changes
-+ feature +!?✘ ⊞🤖 +7 ./repo.feature b7c14ce1 1d Main conflicting changes
+ Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
+@ main ^ ./repo b7c14ce1 1d Main conflicting changes
++ feature +!?✘ 🤖 +7 ./repo.feature b7c14ce1 1d 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 6a4ea4844..402a5b36b 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 ^ ./repo b834638e 1d Initial commit
-+ feature +!? ↑ +2 -3 ↑1 ./repo.feature 689c2504 1d Add files
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo b834638e 1d Initial commit
++ feature +!? ↑ +2 -3 ↑1 ./repo.feature 689c2504 1d 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 c9b32f0ab..7f739a3d6 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 ^ ./repo b834638e 1d Initial commit
-+ feature-a _ ./repo.feature-a b834638e 1d Initial commit
-+ feature-b _ ./repo.feature-b b834638e 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo b834638e 1d Initial commit
++ feature-a _ ./repo.feature-a b834638e 1d Initial commit
++ feature-b _ ./repo.feature-b b834638e 1d 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 08c21b723..4e685e154 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 ^ ./repo b834638e 1d Initial commit
-+ feature _ ./repo.feature b834638e 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo b834638e 1d Initial commit
++ feature _ ./repo.feature b834638e 1d Initial commit
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__previous_worktree_gutter.snap b/tests/snapshots/integration__integration_tests__list__previous_worktree_gutter.snap
index 5b74243ca..aee9a8b2c 100644
--- a/tests/snapshots/integration__integration_tests__list__previous_worktree_gutter.snap
+++ b/tests/snapshots/integration__integration_tests__list__previous_worktree_gutter.snap
@@ -22,8 +22,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-- feature _ ./repo.feature b834638e 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo b834638e 1d Initial commit
+- feature _ ./repo.feature b834638e 1d 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 99e32338f..a52312d3b 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 ^ ./repo b834638e 1d Initial commit
-+ feature-a _ ./repo.feature-a b834638e 1d Initial commit
-+ feature-b _ ./repo.feature-b b834638e 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo b834638e 1d Initial commit
++ feature-a _ ./repo.feature-a b834638e 1d Initial commit
++ feature-b _ ./repo.feature-b b834638e 1d 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 358d0542a..07cea90b0 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 ^ ./repo b834638e 1d Initial commit
-+ feature-a _ ./repo.feature-a b834638e 1d Initial commit
- orphan-1 _ / b834638e 1d Initial commit
- orphan-2 _ / b834638e 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo b834638e 1d Initial commit
++ feature-a _ ./repo.feature-a b834638e 1d Initial commit
+ orphan-1 /_ b834638e 1d Initial commit
+ orphan-2 /_ b834638e 1d Initial commit
⚪ Showing 2 worktrees, 2 branches
diff --git a/tests/snapshots/integration__integration_tests__list__readme_example_list.snap b/tests/snapshots/integration__integration_tests__list__readme_example_list.snap
index 0b9e87bb3..ca7c3bd9e 100644
--- a/tests/snapshots/integration__integration_tests__list__readme_example_list.snap
+++ b/tests/snapshots/integration__integration_tests__list__readme_example_list.snap
@@ -22,9 +22,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 ./repo.feature-api ⇡3 28d38c20 30m Add API tests
-^ main ^⇅ ./repo ⇡1 ⇣1 2e6b7a8f 4d Merge fix-auth:…
-+ fix-auth ↕| ↑2 ↓1 ./repo.fix-auth | 1d697d5b 5h Add secure token…
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 ./repo.feature-api ⇡3 28d38c20 30m Add API tests
+^ main ^⇅ ./repo ⇡1 ⇣1 2e6b7a8f 4d Merge fix-auth:…
++ fix-auth ↕| ↑2 ↓1 ./repo.fix-auth | 1d697d5b 5h Add secure token…
⚪ Showing 3 worktrees, 1 with changes, 2 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__readme_example_list_branches.snap b/tests/snapshots/integration__integration_tests__list__readme_example_list_branches.snap
index bb6880ab6..45d5157dc 100644
--- a/tests/snapshots/integration__integration_tests__list__readme_example_list_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list__readme_example_list_branches.snap
@@ -24,11 +24,11 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age
-@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 +234 -24 ./repo.feature-api ⇡3 ● 28d38c20 30m
-^ main ^⇅ ./repo ⇡1 ⇣1 ● 2e6b7a8f 4d
-+ fix-auth ↕| ↑2 ↓1 +25 -11 ./repo.fix-auth | ● 1d697d5b 5h
- exp ↕ / ↑2 ↓1 +137 32936618 2d
- wip ↕ / ↑1 ↓1 +33 6844b101 3d
+ Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age
+@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 +234 -24 ./repo.feature-api ⇡3 ● 28d38c20 30m
+^ main ^⇅ ./repo ⇡1 ⇣1 ● 2e6b7a8f 4d
++ fix-auth ↕| ↑2 ↓1 +25 -11 ./repo.fix-auth | ● 1d697d5b 5h
+ exp /↕ ↑2 ↓1 +137 32936618 2d
+ wip /↕ ↑1 ↓1 +33 6844b101 3d
⚪ Showing 3 worktrees, 2 branches, 1 with changes, 4 ahead, 1 column hidden
diff --git a/tests/snapshots/integration__integration_tests__list__readme_example_list_full.snap b/tests/snapshots/integration__integration_tests__list__readme_example_list_full.snap
index e7d35d212..6bcd2f243 100644
--- a/tests/snapshots/integration__integration_tests__list__readme_example_list_full.snap
+++ b/tests/snapshots/integration__integration_tests__list__readme_example_list_full.snap
@@ -23,9 +23,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age
-@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 +234 -24 ./repo.feature-api ⇡3 ● 28d38c20 30m
-^ main ^⇅ ./repo ⇡1 ⇣1 ● 2e6b7a8f 4d
-+ fix-auth ↕| ↑2 ↓1 +25 -11 ./repo.fix-auth | ● 1d697d5b 5h
+ Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age
+@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 +234 -24 ./repo.feature-api ⇡3 ● 28d38c20 30m
+^ main ^⇅ ./repo ⇡1 ⇣1 ● 2e6b7a8f 4d
++ fix-auth ↕| ↑2 ↓1 +25 -11 ./repo.fix-auth | ● 1d697d5b 5h
⚪ Showing 3 worktrees, 1 with changes, 2 ahead, 1 column hidden
diff --git a/tests/snapshots/integration__integration_tests__list__single_worktree.snap b/tests/snapshots/integration__integration_tests__list__single_worktree.snap
index 89413add1..1a3d338f4 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 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ . b834638e 1d 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 115289203..fe96ba77f 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 ^ ./repo b834638e 1d Initial commit
-+ main-symbol ↑ 💬 ↑1 ./repo.main-symbol 579fcd0b 1d Symbol commit
-+ pr-link ↑ 🤖 ↑1 ./repo.pr-link e17e7d2d 1d PR commit
-+ wli-sequence !? ↑ 🤖 +1 -112 ↑1 ./repo.wli-sequence a2483ffd 1d Initial content
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo b834638e 1d Initial commit
++ main-symbol ↑ 💬 ↑1 ./repo.main-symbol 579fcd0b 1d Symbol commit
++ pr-link ↑ 🤖 ↑1 ./repo.pr-link e17e7d2d 1d PR commit
++ wli-sequence !? ↑ 🤖 +1 -112 ↑1 ./repo.wli-sequence a2483ffd 1d 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 0b9f70b9b..dcb502a85 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 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ - ⚑^ . b834638e 1d 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 7f1d3b349..8c2a5f423 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 ^ ./repo b834638e 1d Initial commit
-+ feature-a ?_ ./repo.feature-a b834638e 1d Initial commit
-+ feature-b ↑ ↑1 +1 -1 ./repo.feature-b 2d37ca75 1d Test commit
+ Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
+@ main ^ ./repo b834638e 1d Initial commit
++ feature-a ? _ ./repo.feature-a b834638e 1d Initial commit
++ feature-b ↑ ↑1 +1 -1 ./repo.feature-b 2d37ca75 1d 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 82d988e52..17ed84131 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 ^ ./repo b834638e 1d Initial commit
-+ feature-1 _ ./repo.feature-1 b834638e 1d Initial commit
-+ feature-10 _ ./repo.feature-10 b834638e 1d Initial commit
-+ feature-2 _ ./repo.feature-2 b834638e 1d Initial commit
-+ feature-3 _ ./repo.feature-3 b834638e 1d Initial commit
-+ feature-4 _ ./repo.feature-4 b834638e 1d Initial commit
-+ feature-5 _ ./repo.feature-5 b834638e 1d Initial commit
-+ feature-6 _ ./repo.feature-6 b834638e 1d Initial commit
-+ feature-7 _ ./repo.feature-7 b834638e 1d Initial commit
-+ feature-8 _ ./repo.feature-8 b834638e 1d Initial commit
-+ feature-9 _ ./repo.feature-9 b834638e 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo b834638e 1d Initial commit
++ feature-1 _ ./repo.feature-1 b834638e 1d Initial commit
++ feature-10 _ ./repo.feature-10 b834638e 1d Initial commit
++ feature-2 _ ./repo.feature-2 b834638e 1d Initial commit
++ feature-3 _ ./repo.feature-3 b834638e 1d Initial commit
++ feature-4 _ ./repo.feature-4 b834638e 1d Initial commit
++ feature-5 _ ./repo.feature-5 b834638e 1d Initial commit
++ feature-6 _ ./repo.feature-6 b834638e 1d Initial commit
++ feature-7 _ ./repo.feature-7 b834638e 1d Initial commit
++ feature-8 _ ./repo.feature-8 b834638e 1d Initial commit
++ feature-9 _ ./repo.feature-9 b834638e 1d 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 637d492f0..794f31037 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 ^ ./repo b834638e 1d Initial commit
-+ feature-a _ ./repo.feature-a b834638e 1d Initial commit
-+ feature-b _ ./repo.feature-b b834638e 1d Initial commit
-+ feature-c _ ./repo.feature-c b834638e 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo b834638e 1d Initial commit
++ feature-a _ ./repo.feature-a b834638e 1d Initial commit
++ feature-b _ ./repo.feature-b b834638e 1d Initial commit
++ feature-c _ ./repo.feature-c b834638e 1d 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 98ca1fe27..9c21669cc 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
-@ feature-current ↑ ↑1 ./repo.feature-current fc28a4d1 23h Commit at 01:00
-^ main ^ ./repo 6c3da842 1d Initial commit on main
-+ feature-newest ↑ ↑1 ./repo.feature-newest 136358eb 21h Commit at 03:00
-+ feature-middle ↑ ↑1 ./repo.feature-middle a0a4851a 22h Commit at 02:00
-+ feature-oldest ↑ ↑1 ./repo.feature-oldest 1b1a2d78 23h Commit at 00:30
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ feature-current ↑ ↑1 ./repo.feature-current fc28a4d1 23h Commit at 01:00
+^ main ^ ./repo 6c3da842 1d Initial commit on main
++ feature-newest ↑ ↑1 ./repo.feature-newest 136358eb 21h Commit at 03:00
++ feature-middle ↑ ↑1 ./repo.feature-middle a0a4851a 22h Commit at 02:00
++ feature-oldest ↑ ↑1 ./repo.feature-oldest 1b1a2d78 23h 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 4da68538b..f77e987dc 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 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ . b834638e 1d 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 296722ad9..c43e6f024 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 ^ ./repo b834638e 1d Initial commit
-+ locked _ ⊞ ./repo.locked b834638e 1d Initial commit
-+ normal _ ./repo.normal b834638e 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo b834638e 1d Initial commit
++ locked ⊞_ ./repo.locked b834638e 1d Initial commit
++ normal _ ./repo.normal b834638e 1d 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 242cbbac0..3a3b68d69 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 ^| ./repo | 6c3da842 1d Initial commit on main
-+ ahead ↑⇡ ↑1 +1 ./repo.ahead ⇡1 2fff52c2 1d Ahead commit
-+ in-sync _ | ./repo.in-sync | 6c3da842 1d Initial commit on main
+ Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
+@ main ^| ./repo | 6c3da842 1d Initial commit on main
++ ahead ↑⇡ ↑1 +1 ./repo.ahead ⇡1 2fff52c2 1d Ahead commit
++ in-sync _| ./repo.in-sync | 6c3da842 1d 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 6743ba81a..6928483e7 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 ^ ./repo e4614cb7 1d Fix bug with café ☕ handling
-+ feature-test ⊂↓ ↓1 ./repo.feature-test 0c53695b 1d Add support for 日本語 and émoji 🎉
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo e4614cb7 1d Fix bug with café ☕ handling
++ feature-test ⊂ ↓1 ./repo.feature-test 0c53695b 1d Add support for 日本語 and émoji 🎉
⚪ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__user_marker_special_chars.snap b/tests/snapshots/integration__integration_tests__list__user_marker_special_chars.snap
index f85957beb..fe5fd663b 100644
--- a/tests/snapshots/integration__integration_tests__list__user_marker_special_chars.snap
+++ b/tests/snapshots/integration__integration_tests__list__user_marker_special_chars.snap
@@ -22,9 +22,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ emoji _ 🔄 ./repo.emoji b834638e 1d Initial commit
-+ multi _ 👨‍💻 ./repo.multi b834638e 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo b834638e 1d Initial commit
++ emoji _ 🔄 ./repo.emoji b834638e 1d Initial commit
++ multi _ 👨‍💻 ./repo.multi b834638e 1d 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 c0f38dd18..7611b64f4 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 ^ ./repo b834638e 1d Initial commit
-+ feature-with-worktree _ ./repo.feature-with-worktree b834638e 1d Initial commit
- another-branch _ / b834638e 1d Initial commit
- feature-without-worktree _ / b834638e 1d Initial commit
- fix-bug _ / b834638e 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo b834638e 1d Initial commit
++ feature-with-worktree _ ./repo.feature-with-worktree b834638e 1d Initial commit
+ another-branch /_ b834638e 1d Initial commit
+ feature-without-worktree /_ b834638e 1d Initial commit
+ fix-bug /_ b834638e 1d 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 7aab7a879..44849c087 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 ^ ./repo b834638e 1d Initial commit
-+ feature-a _ ./repo.feature-a b834638e 1d Initial commit
-+ feature-b _ ./repo.feature-b b834638e 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo b834638e 1d Initial commit
++ feature-a _ ./repo.feature-a b834638e 1d Initial commit
++ feature-b _ ./repo.feature-b b834638e 1d 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 1e5531c11..4c2fe23c2 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 1d Initial commit
- branch-alpha _ / b834638e 1d Initial commit
- branch-beta _ / b834638e 1d Initial commit
- branch-gamma _ / b834638e 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ . b834638e 1d Initial commit
+ branch-alpha /_ b834638e 1d Initial commit
+ branch-beta /_ b834638e 1d Initial commit
+ branch-gamma /_ b834638e 1d 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 8b3e591b5..46daaa9c7 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 ^| . | b834638e 1d Initial commit
- local-only-1 _ / b834638e 1d Initial commit
- local-only-2 _ / b834638e 1d Initial commit
- origin/remote-only-1 _ / b834638e 1d Initial commit
- origin/remote-only-2 _ / b834638e 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^| . | b834638e 1d Initial commit
+ local-only-1 /_ b834638e 1d Initial commit
+ local-only-2 /_ b834638e 1d Initial commit
+ origin/remote-only-1 /_ b834638e 1d Initial commit
+ origin/remote-only-2 /_ b834638e 1d 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 04ff29d92..124961f8e 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 ^| ./repo | b834638e 1d Initial commit
-+ feature-with-worktree _ ./repo.feature-with-worktree b834638e 1d Initial commit
- origin/remote-only _ / b834638e 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^| ./repo | b834638e 1d Initial commit
++ feature-with-worktree _ ./repo.feature-with-worktree b834638e 1d Initial commit
+ origin/remote-only /_ b834638e 1d 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 a82ad0feb..b06e8e67b 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 ^| . | b834638e 1d Initial commit
- origin/remote-feature-1 _ / b834638e 1d Initial commit
- origin/remote-feature-2 _ / b834638e 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^| . | b834638e 1d Initial commit
+ origin/remote-feature-1 /_ b834638e 1d Initial commit
+ origin/remote-feature-2 /_ b834638e 1d 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 c8595e6f7..bbf4c4159 100644
--- a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
@@ -25,12 +25,12 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^| ./repo | 6c3da842 1d Initial commit on main
-+ ahead ↑⇡ ↑2 +2 ./repo.ahead ⇡2 8d8f4673 1d Ahead commit 2
-+ behind _ ⇣ ./repo.behind ⇣1 6c3da842 1d Initial commit on main
-+ diverged ↑⇅ ↑1 +1 ./repo.diverged ⇡1 ⇣1 ca7cb696 1d Diverged local commit
-+ in-sync _ | ./repo.in-sync | 6c3da842 1d Initial commit on main
-+ no-upstream _ ./repo.no-upstream 6c3da842 1d Initial commit on main
+ Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
+@ main ^| ./repo | 6c3da842 1d Initial commit on main
++ ahead ↑⇡ ↑2 +2 ./repo.ahead ⇡2 8d8f4673 1d Ahead commit 2
++ behind _⇣ ./repo.behind ⇣1 6c3da842 1d Initial commit on main
++ diverged ↑⇅ ↑1 +1 ./repo.diverged ⇡1 ⇣1 ca7cb696 1d Diverged local commit
++ in-sync _| ./repo.in-sync | 6c3da842 1d Initial commit on main
++ no-upstream _ ./repo.no-upstream 6c3da842 1d Initial commit on main
⚪ Showing 6 worktrees, 2 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__with_user_marker.snap b/tests/snapshots/integration__integration_tests__list__with_user_marker.snap
index 879f97661..923b9c28e 100644
--- a/tests/snapshots/integration__integration_tests__list__with_user_marker.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_user_marker.snap
@@ -22,10 +22,10 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ feature-api ↑ 🤖 ↑1 ./repo.feature-api 9606cd0f 1d Add REST API endpoints
-+ review-ui ? ↑ 💬 ↑1 ./repo.review-ui afd3b353 1d Add dashboard component
-+ wip-docs ?_ ./repo.wip-docs b834638e 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo b834638e 1d Initial commit
++ feature-api ↑ 🤖 ↑1 ./repo.feature-api 9606cd0f 1d Add REST API endpoints
++ review-ui ? ↑ 💬 ↑1 ./repo.review-ui afd3b353 1d Add dashboard component
++ wip-docs ? _ ./repo.wip-docs b834638e 1d Initial commit
⚪ Showing 4 worktrees, 2 ahead
diff --git a/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_alignment_check.snap b/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_alignment_check.snap
index bc3646627..d269ab504 100644
--- a/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_alignment_check.snap
+++ b/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_alignment_check.snap
@@ -22,8 +22,8 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ test +!? +1 -1 ./repo.test b834638e 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo b834638e 1d Initial commit
++ test +!? +1 -1 ./repo.test b834638e 1d Initial commit
⚪ Showing 2 worktrees, 1 with changes
diff --git a/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_width_consistency.snap b/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_width_consistency.snap
index b8dfa12fe..f141f1023 100644
--- a/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_width_consistency.snap
+++ b/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_width_consistency.snap
@@ -22,9 +22,9 @@ exit_code: 0
----- stdout -----
----- stderr -----
- Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./repo b834638e 1d Initial commit
-+ complex !? +1 -1 ./repo.complex b834638e 1d Initial commit
-+ simple + ? +1 -1 ./repo.simple b834638e 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo b834638e 1d Initial commit
++ complex !? +1 -1 ./repo.complex b834638e 1d Initial commit
++ simple + ? +1 -1 ./repo.simple b834638e 1d Initial commit
⚪ Showing 3 worktrees, 2 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 09c09cd6d..d7aaf3260 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 ^ . b834638e 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ . b834638e 1d 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 7f335a7d6..dc03be2fd 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 ^ . b834638e 1d Initial commit
- feature _ / b834638e 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ . b834638e 1d Initial commit
+ feature /_ b834638e 1d 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 09c09cd6d..d7aaf3260 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 ^ . b834638e 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ . b834638e 1d 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 09c09cd6d..d7aaf3260 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 ^ . b834638e 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ . b834638e 1d 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 09c09cd6d..d7aaf3260 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 ^ . b834638e 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ . b834638e 1d 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 e0267cda8..7a1f4c6d4 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 ^ ./repo f9d58892 1d Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
-+ feature _ ./repo.feature f9d58892 1d Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo f9d58892 1d Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
++ feature _ ./repo.feature f9d58892 1d 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 fec87ccd1..465616d12 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 ^ . b834638e 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ . b834638e 1d 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 164568228..d3d27abb6 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 ^ ./repo b834638e 1d Initial commit
-+ also-no-changes _ ./repo.also-no-changes b834638e 1d Initial commit
-+ no-changes _ ./repo.no-changes b834638e 1d Initial commit
-+ with-changes ! +1 -1 ./repo.with-changes b834638e 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo b834638e 1d Initial commit
++ also-no-changes _ ./repo.also-no-changes b834638e 1d Initial commit
++ no-changes _ ./repo.no-changes b834638e 1d Initial commit
++ with-changes ! +1 -1 ./repo.with-changes b834638e 1d 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 41d060fb4..a086c489a 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 ^ ./repo b834638e 1d Initial commit
-+ huge ?_ ./repo.huge b834638e 1d Initial commit
-+ tiny ! +1 -1 ./repo.tiny b834638e 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo b834638e 1d Initial commit
++ huge ? _ ./repo.huge b834638e 1d Initial commit
++ tiny ! +1 -1 ./repo.tiny b834638e 1d 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 4d18abf41..60dabebb4 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 ^ ./repo b834638e 1d Initial commit
-+ feature-large ?_ ./repo.feature-large b834638e 1d Initial commit
-+ feature-medium ?_ ./repo.feature-medium b834638e 1d Initial commit
-+ feature-small ?_ ./repo.feature-small b834638e 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo b834638e 1d Initial commit
++ feature-large ? _ ./repo.feature-large b834638e 1d Initial commit
++ feature-medium ? _ ./repo.feature-medium b834638e 1d Initial commit
++ feature-small ? _ ./repo.feature-small b834638e 1d 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 24fcfc36a..f089ebfbc 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 ^ ./repo b834638e 1d
-+ another-extremely-long-name-here _ ./repo.another-extremely-long-name-here b834638e 1d
-+ short _ ./repo.short b834638e 1d
-+ very-long-feature-branch-name _ ./repo.very-long-feature-branch-name b834638e 1d
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age
+@ main ^ ./repo b834638e 1d
++ another-extremely-long-name-here _ ./repo.another-extremely-long-name-here b834638e 1d
++ short _ ./repo.short b834638e 1d
++ very-long-feature-branch-name _ ./repo.very-long-feature-branch-name b834638e 1d
⚪ 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 50c7abfd0..d4963c24e 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↕ Remote⇅ Commit Age Message
-@ main ^ b834638e 1d Initial commit
-+ extremely-long-branch-name-that-might-cause-layout-issues _ b834638e 1d Initial commit
-+ medium _ b834638e 1d Initial commit
-+ x _ b834638e 1d Initial commit
+ Branch Status HEAD± main↕ Remote⇅ Commit Age Message
+@ main ^ b834638e 1d Initial commit
++ extremely-long-branch-name-that-might-cause-layout-issues _ b834638e 1d Initial commit
++ medium _ b834638e 1d Initial commit
++ x _ b834638e 1d Initial commit
⚪ 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 e2ee306bc..ea7dca386 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 ^ ./repo b834638e 1d Initial commit
-+ a _ ./repo.a b834638e 1d Initial commit
-+ bb _ ./repo.bb b834638e 1d Initial commit
-+ ccc _ ./repo.ccc b834638e 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo b834638e 1d Initial commit
++ a _ ./repo.a b834638e 1d Initial commit
++ bb _ ./repo.bb b834638e 1d Initial commit
++ ccc _ ./repo.ccc b834638e 1d 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 3a5b7beef..48e8bc996 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 ^ ./repo b834638e 1d Initial commit
-+ cafe _ ./repo.cafe b834638e 1d Initial commit
-+ naive _ ./repo.naive b834638e 1d Initial commit
-+ resume _ ./repo.resume b834638e 1d Initial commit
+ Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
+@ main ^ ./repo b834638e 1d Initial commit
++ cafe _ ./repo.cafe b834638e 1d Initial commit
++ naive _ ./repo.naive b834638e 1d Initial commit
++ resume _ ./repo.resume b834638e 1d Initial commit
⚪ Showing 4 worktrees