Skip to content

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

feat(list): show the main…± column by default; --full gates only off-machine columns (#3236)

Maximilian Roos830cc850dd3f
diff --git a/.typos.toml b/.typos.toml
index 6e3613f49..40f3617c1 100644
--- a/.typos.toml
+++ b/.typos.toml
@@ -1,6 +1,15 @@
[files]
extend-exclude = ["docs/demos/vhs-keystrokes/", "*.snap", "vendor/", "*.log"]
+[default]
+# Generated `wt list` doc embeds (README, docs/content, skills mirrors) truncate
+# long commit messages with a trailing … . The cut leaves a word fragment glued
+# to the ellipsis (e.g. "authenticat…"), which typos would "correct" to the full
+# word — re-breaking the doc-sync test on every run. A token immediately followed
+# by … is a truncation, not a typo; *.snap is already excluded, this covers the
+# rendered mirrors that embed the same output.
+extend-ignore-re = ['\w+…']
+
[default.extend-identifiers]
# "PNGs" is correct (Portable Network Graphics plural). The plural form
# tokenizes to the word "PN", which typos would otherwise correct to "ON";
diff --git a/README.md b/README.md
index 459f4a58c..8280ad58f 100644
--- a/README.md
+++ b/README.md
@@ -163,9 +163,9 @@ This creates a new branch and worktree, then switches to it. Do your work, then
```console
$ wt list
- Branch Status HEAD± main↕ Remote⇅ Commit Age Message
-@ feature-auth + ↑ +27 -8 ↑1 4bc72dc9 2h Add authentication module
-^ main ^⇡ ⇡1 0e631add 1d Initial commit
+ Branch Status HEAD± main↕ main…± Remote⇅ Commit Age Message
+@ feature-auth + ↑ +27 -8 ↑1 +31 4bc72dc9 2h Add authenticat…
+^ main ^⇡ ⇡1 0e631add 1d Initial commit
○ Showing 2 worktrees, 1 with changes, 1 ahead, 1 column hidden
diff --git a/dev/config.example.toml b/dev/config.example.toml
index 2578cb63d..6afddfd1f 100644
--- a/dev/config.example.toml
+++ b/dev/config.example.toml
@@ -95,7 +95,7 @@
# [list]
# summary = false # Enable LLM branch summaries (requires [commit.generation])
#
-# full = false # Show CI, main…± diffstat, and LLM summaries (--full)
+# full = false # Show CI status and LLM summaries (--full)
# branches = false # Include branches without worktrees (--branches)
# remotes = false # Include remote-only branches (--remotes)
#
diff --git a/docs/content/claude-code.md b/docs/content/claude-code.md
index cdbd618d6..53944bc58 100644
--- a/docs/content/claude-code.md
+++ b/docs/content/claude-code.md
@@ -69,11 +69,11 @@ The Claude Code, OpenCode, and Gemini plugins track agent sessions with status m
{% terminal(cmd="wt list") %}
<span class="cmd">wt list</span>
- <b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>Remote⇅</b> <b>Path</b> <b>Commit</b> <b>Age</b> <b>Message</b>
-@ main <span class=d>^</span><span class=d>⇡</span> <span class=g>⇡1</span> . <span class=d>33323bc1</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>70343f03</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>a585d6ed</span> <span class=d>1d</span> <span class=d>Add dashboard component</span>
-+ wip-docs <span class=c>?</span> <span class=d>–</span> ../repo.wip-docs <span class=d>33323bc1</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>main…±</b> <b>Remote⇅</b> <b>Path</b> <b>Commit</b> <b>Age</b> <b>Message</b>
+@ main <span class=d>^</span><span class=d>⇡</span> <span class=g>⇡1</span> . <span class=d>33323bc1</span> <span class=d>1d</span> <span class=d>Initial commit</span>
++ feature-api <span class=d>↑</span> 🤖 <span class=g>↑1</span> <span class=g>+1</span> ../repo.feature-api <span class=d>70343f03</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> <span class=g>+1</span> ../repo.review-ui <span class=d>a585d6ed</span> <span class=d>1d</span> <span class=d>Add dashboard component</span>
++ wip-docs <span class=c>?</span> <span class=d>–</span> ../repo.wip-docs <span class=d>33323bc1</span> <span class=d>1d</span> <span class=d>Initial commit</span>
<span class=d>○</span> <span class=d>Showing 4 worktrees, 2 with changes, 2 ahead</span>
{% end %}
diff --git a/docs/content/config.md b/docs/content/config.md
index aa1a09012..8c821a029 100644
--- a/docs/content/config.md
+++ b/docs/content/config.md
@@ -182,7 +182,7 @@ Persistent flag values for `wt list`. Override on command line as needed.
[list]
summary = false # Enable LLM branch summaries (requires [commit.generation])
-full = false # Show CI, main…± diffstat, and LLM summaries (--full)
+full = false # Show CI status and LLM summaries (--full)
branches = false # Include branches without worktrees (--branches)
remotes = false # Include remote-only branches (--remotes)
@@ -1230,11 +1230,11 @@ Custom status text or emoji shown in the `wt list` Status column.
Markers appear at the end of the Status column, after git symbols:
{% terminal(cmd="wt list") %}
-&#32;&#32;<b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>Remote⇅</b> <b>Commit</b> <b>Age</b> <b>Message</b>
-@ main <span class=d>^</span><span class=d>⇡</span> <span class=g>⇡1</span> <span class=d>33323bc1</span> <span class=d>1d</span> <span class=d>Initial commit</span>
-+ feature-api <span class=d>↑</span> 🤖 <span class=g>↑1</span> <span class=d>70343f03</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> <span class=d>a585d6ed</span> <span class=d>1d</span> <span class=d>Add dashboard component</span>
-+ wip-docs <span class=c>?</span> <span class=d>–</span> <span class=d>33323bc1</span> <span class=d>1d</span> <span class=d>Initial commit</span>
+&#32;&#32;<b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>main…±</b> <b>Remote⇅</b> <b>Commit</b> <b>Age</b> <b>Message</b>
+@ main <span class=d>^</span><span class=d>⇡</span> <span class=g>⇡1</span> <span class=d>33323bc1</span> <span class=d>1d</span> <span class=d>Initial commit</span>
++ feature-api <span class=d>↑</span> 🤖 <span class=g>↑1</span> <span class=g>+1</span> <span class=d>70343f03</span> <span class=d>1d</span> <span class=d>Add REST API end…</span>
++ review-ui <span class=c>?</span> <span class=d>↑</span> 💬 <span class=g>↑1</span> <span class=g>+1</span> <span class=d>a585d6ed</span> <span class=d>1d</span> <span class=d>Add dashboard co…</span>
++ wip-docs <span class=c>?</span> <span class=d>–</span> <span class=d>33323bc1</span> <span class=d>1d</span> <span class=d>Initial commit</span>
<span class=d>○</span> <span class=d>Showing 4 worktrees, 2 with changes, 2 ahead, 1 column hidden</span>
{% end %}
diff --git a/docs/content/list.md b/docs/content/list.md
index 12f5216e2..d53275df8 100644
--- a/docs/content/list.md
+++ b/docs/content/list.md
@@ -24,23 +24,23 @@ The table renders progressively: branch names, paths, and commit hashes appear i
## Full mode
-`--full` adds columns that require network access or LLM calls: [CI status](#ci-status) (GitHub/GitLab pipeline pass/fail), line diffs since the merge-base, and [LLM-generated summaries](#llm-summaries) of each branch's changes.
+`--full` adds the two columns that reach off-machine: [CI status](#ci-status) (GitHub/GitLab pipeline pass/fail, over the network) and [LLM-generated summaries](#llm-summaries) of each branch's changes. The `main…±` line diffs are local git, so they show by default.
## Examples
List all worktrees:
{% terminal(cmd="wt list") %}
-&#32;&#32;<b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>Remote⇅</b> <b>Commit</b> <b>Age</b> <b>Message</b>
-@ feature-api <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>⇡3</span> <span class=d>6814f02a</span> <span class=d>30m</span> <span class=d>Add API tests</span>
-^ main <span class=d>^</span><span class=d>⇅</span> <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=d>41ee0834</span> <span class=d>4d</span> <span class=d>Merge fix-auth: hardened to…</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=d>|</span> <span class=d>b772e68b</span> <span class=d>5h</span> <span class=d>Add secure token storage</span>
-+ <span class=d>fix-typos</span> <span class=d>_</span><span class=d>|</span> <span class=d>|</span> <span class=d>41ee0834</span> <span class=d>4d</span> <span class=d>Merge fix-auth: hardened to…</span>
+&#32;&#32;<b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>main…±</b> <b>Remote⇅</b> <b>Commit</b> <b>Age</b> <b>Message</b>
+@ feature-api <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> <span class=g>⇡3</span> <span class=d>6814f02a</span> <span class=d>30m</span> <span class=d>Add API tests</span>
+^ main <span class=d>^</span><span class=d>⇅</span> <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=d>41ee0834</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> <span class=g>+25</span> <span class=r>-11</span> <span class=d>|</span> <span class=d>b772e68b</span> <span class=d>5h</span> <span class=d>Add secure token…</span>
++ <span class=d>fix-typos</span> <span class=d>_</span><span class=d>|</span> <span class=d>|</span> <span class=d>41ee0834</span> <span class=d>4d</span> <span class=d>Merge fix-auth:…</span>
<span class=d>○</span> <span class=d>Showing 4 worktrees, 1 with changes, 2 ahead, 1 column hidden</span>
{% end %}
-Include CI status, line diffs, and LLM summaries:
+Include CI status and LLM summaries:
{% terminal(cmd="wt list --full") %}
&#32;&#32;<b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>main…±</b> <b>Summary</b> <b>Remote⇅</b> <b>CI</b> <b>Commit</b>
@@ -78,7 +78,7 @@ Output as JSON for scripting:
| Status | Compact symbols (see below) |
| HEAD± | Uncommitted changes: +added -deleted lines |
| main↕ | Commits ahead/behind default branch |
-| main…± | Line diffs since the merge-base (three-dot) with the default branch; `--full` only |
+| main…± | Line diffs since the merge-base (three-dot) with the default branch |
| Summary | LLM-generated branch summary; requires `--full`, `summary = true`, and [`commit.generation`](@/config.md#commit) <span class="badge-experimental"></span> |
| Remote⇅ | Commits ahead/behind tracking branch |
| CI | PR/MR number colored by pipeline status; `--full` only |
@@ -276,7 +276,7 @@ The five change flags map to the [Working tree](#working-tree) symbols (`renamed
|-------|------|-------------|
| `ahead` | number | Commits ahead of the default branch |
| `behind` | number | Commits behind the default branch |
-| `diff` | object | Lines changed vs the default branch: `{added, deleted}`; `--full` only |
+| `diff` | object | Lines changed vs the default branch: `{added, deleted}` |
### remote object
@@ -377,7 +377,7 @@ Usage: <b><span class=c>wt list</span></b> <span class=c>[OPTIONS]</span>
Include remote branches
<b><span class=c>--full</span></b>
- Show CI, diff analysis, and LLM summaries
+ Show CI status and LLM summaries
<b><span class=c>--progressive</span></b>
Show fast info immediately, update with slow info
diff --git a/docs/content/tips-patterns.md b/docs/content/tips-patterns.md
index 26d066fcc..b7ac9efa3 100644
--- a/docs/content/tips-patterns.md
+++ b/docs/content/tips-patterns.md
@@ -65,13 +65,13 @@ The URL column in `wt list` shows each worktree's dev server:
{% terminal(cmd="wt list") %}
<span class="cmd">wt list</span>
- <b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>Remote⇅</b> <b>URL</b> <b>Commit</b> <b>Age</b>
-@ main <span class=c>?</span> <span class=d>^</span><span class=d>⇅</span> <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=d>http://localhost:12107</span> <span class=d>41ee0834</span> <span class=d>4d</span>
-+ feature-api <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>⇡3</span> <span class=d>http://localhost:10703</span> <span class=d>6814f02a</span> <span class=d>30m</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=d>|</span> <span class=d>http://localhost:16460</span> <span class=d>b772e68b</span> <span class=d>5h</span>
-+ <span class=d>fix-typos</span> <span class=d>_</span><span class=d>|</span> <span class=d>|</span> <span class=d>http://localhost:14301</span> <span class=d>41ee0834</span> <span class=d>4d</span>
+ <b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>main…±</b> <b>Remote⇅</b> <b>URL</b> <b>Commit</b>
+@ main <span class=c>?</span> <span class=d>^</span><span class=d>⇅</span> <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=d>http://localhost:12107</span> <span class=d>41ee0834</span>
++ feature-api <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> <span class=g>⇡3</span> <span class=d>http://localhost:10703</span> <span class=d>6814f02a</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> <span class=d>|</span> <span class=d>http://localhost:16460</span> <span class=d>b772e68b</span>
++ <span class=d>fix-typos</span> <span class=d>_</span><span class=d>|</span> <span class=d>|</span> <span class=d>http://localhost:14301</span> <span class=d>41ee0834</span>
-<span class=d>○</span> <span class=d>Showing 4 worktrees, 2 with changes, 2 ahead, 2 columns hidden</span>
+<span class=d>○</span> <span class=d>Showing 4 worktrees, 2 with changes, 2 ahead, 3 columns hidden</span>
{% end %}
<!-- END AUTO-GENERATED -->
diff --git a/docs/content/worktrunk.md b/docs/content/worktrunk.md
index 3ddd4134c..7bff9a242 100644
--- a/docs/content/worktrunk.md
+++ b/docs/content/worktrunk.md
@@ -156,9 +156,9 @@ This creates a new branch and worktree, then switches to it. Do your work, then
{% terminal(cmd="wt list") %}
<span class="cmd">wt list</span>
- <b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>Remote⇅</b> <b>Commit</b> <b>Age</b> <b>Message</b>
-@ feature-auth <span class=c>+</span> <span class=d>↑</span> <span class=g>+27</span> <span class=r>-8</span> <span class=g>↑1</span> <span class=d>4bc72dc9</span> <span class=d>2h</span> <span class=d>Add authentication module</span>
-^ main <span class=d>^</span><span class=d>⇡</span> <span class=g>⇡1</span> <span class=d>0e631add</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>main…±</b> <b>Remote⇅</b> <b>Commit</b> <b>Age</b> <b>Message</b>
+@ feature-auth <span class=c>+</span> <span class=d>↑</span> <span class=g>+27</span> <span class=r>-8</span> <span class=g>↑1</span> <span class=g>+31</span> <span class=d>4bc72dc9</span> <span class=d>2h</span> <span class=d>Add authenticat…</span>
+^ main <span class=d>^</span><span class=d>⇡</span> <span class=g>⇡1</span> <span class=d>0e631add</span> <span class=d>1d</span> <span class=d>Initial commit</span>
<span class=d>○</span> <span class=d>Showing 2 worktrees, 1 with changes, 1 ahead, 1 column hidden</span>
{% end %}
diff --git a/skills/worktrunk/reference/claude-code.md b/skills/worktrunk/reference/claude-code.md
index 93f325707..cabd1ddf5 100644
--- a/skills/worktrunk/reference/claude-code.md
+++ b/skills/worktrunk/reference/claude-code.md
@@ -73,11 +73,11 @@ The Claude Code, OpenCode, and Gemini plugins track agent sessions with status m
```bash
$ wt list
- <b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>Remote⇅</b> <b>Path</b> <b>Commit</b> <b>Age</b> <b>Message</b>
-@ main <span class=d>^</span><span class=d>⇡</span> <span class=g>⇡1</span> . <span class=d>33323bc1</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>70343f03</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>a585d6ed</span> <span class=d>1d</span> <span class=d>Add dashboard component</span>
-+ wip-docs <span class=c>?</span> <span class=d>–</span> ../repo.wip-docs <span class=d>33323bc1</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>main…±</b> <b>Remote⇅</b> <b>Path</b> <b>Commit</b> <b>Age</b> <b>Message</b>
+@ main <span class=d>^</span><span class=d>⇡</span> <span class=g>⇡1</span> . <span class=d>33323bc1</span> <span class=d>1d</span> <span class=d>Initial commit</span>
++ feature-api <span class=d>↑</span> 🤖 <span class=g>↑1</span> <span class=g>+1</span> ../repo.feature-api <span class=d>70343f03</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> <span class=g>+1</span> ../repo.review-ui <span class=d>a585d6ed</span> <span class=d>1d</span> <span class=d>Add dashboard component</span>
++ wip-docs <span class=c>?</span> <span class=d>–</span> ../repo.wip-docs <span class=d>33323bc1</span> <span class=d>1d</span> <span class=d>Initial commit</span>
<span class=d>○</span> <span class=d>Showing 4 worktrees, 2 with changes, 2 ahead</span>
```
diff --git a/skills/worktrunk/reference/config.md b/skills/worktrunk/reference/config.md
index d1f8fc51b..0bc2763b4 100644
--- a/skills/worktrunk/reference/config.md
+++ b/skills/worktrunk/reference/config.md
@@ -181,7 +181,7 @@ Persistent flag values for `wt list`. Override on command line as needed.
[list]
summary = false # Enable LLM branch summaries (requires [commit.generation])
-full = false # Show CI, main…± diffstat, and LLM summaries (--full)
+full = false # Show CI status and LLM summaries (--full)
branches = false # Include branches without worktrees (--branches)
remotes = false # Include remote-only branches (--remotes)
@@ -1276,11 +1276,11 @@ Markers appear at the end of the Status column, after git symbols:
```
$ wt list
- Branch Status HEAD± main↕ Remote⇅ Commit Age Message
-@ main ^⇡ ⇡1 33323bc1 1d Initial commit
-+ feature-api ↑ 🤖 ↑1 70343f03 1d Add REST API endpoints
-+ review-ui ? ↑ 💬 ↑1 a585d6ed 1d Add dashboard component
-+ wip-docs ? – 33323bc1 1d Initial commit
+ Branch Status HEAD± main↕ main…± Remote⇅ Commit Age Message
+@ main ^⇡ ⇡1 33323bc1 1d Initial commit
++ feature-api ↑ 🤖 ↑1 +1 70343f03 1d Add REST API end…
++ review-ui ? ↑ 💬 ↑1 +1 a585d6ed 1d Add dashboard co…
++ wip-docs ? – 33323bc1 1d Initial commit
○ Showing 4 worktrees, 2 with changes, 2 ahead, 1 column hidden
```
diff --git a/skills/worktrunk/reference/list.md b/skills/worktrunk/reference/list.md
index 7d81e6fcc..ed931a1fd 100644
--- a/skills/worktrunk/reference/list.md
+++ b/skills/worktrunk/reference/list.md
@@ -8,7 +8,7 @@ The table renders progressively: branch names, paths, and commit hashes appear i
## Full mode
-`--full` adds columns that require network access or LLM calls: [CI status](#ci-status) (GitHub/GitLab pipeline pass/fail), line diffs since the merge-base, and [LLM-generated summaries](#llm-summaries) of each branch's changes.
+`--full` adds the two columns that reach off-machine: [CI status](#ci-status) (GitHub/GitLab pipeline pass/fail, over the network) and [LLM-generated summaries](#llm-summaries) of each branch's changes. The `main…±` line diffs are local git, so they show by default.
## Examples
@@ -16,16 +16,16 @@ List all worktrees:
```
$ wt list
- Branch Status HEAD± main↕ Remote⇅ Commit Age Message
-@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 ⇡3 6814f02a 30m Add API tests
-^ main ^⇅ ⇡1 ⇣1 41ee0834 4d Merge fix-auth: hardened to…
-+ fix-auth ↕| ↑2 ↓1 | b772e68b 5h Add secure token storage
-+ fix-typos _| | 41ee0834 4d Merge fix-auth: hardened to…
+ Branch Status HEAD± main↕ main…± Remote⇅ Commit Age Message
+@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 +234 -24 ⇡3 6814f02a 30m Add API tests
+^ main ^⇅ ⇡1 ⇣1 41ee0834 4d Merge fix-auth:…
++ fix-auth ↕| ↑2 ↓1 +25 -11 | b772e68b 5h Add secure token…
++ fix-typos _| | 41ee0834 4d Merge fix-auth:…
○ Showing 4 worktrees, 1 with changes, 2 ahead, 1 column hidden
```
-Include CI status, line diffs, and LLM summaries:
+Include CI status and LLM summaries:
```
$ wt list --full
@@ -67,7 +67,7 @@ $ wt list --format=json
| Status | Compact symbols (see below) |
| HEAD± | Uncommitted changes: +added -deleted lines |
| main↕ | Commits ahead/behind default branch |
-| main…± | Line diffs since the merge-base (three-dot) with the default branch; `--full` only |
+| main…± | Line diffs since the merge-base (three-dot) with the default branch |
| Summary | LLM-generated branch summary; requires `--full`, `summary = true`, and [`commit.generation`](https://worktrunk.dev/config/#commit) [experimental] |
| Remote⇅ | Commits ahead/behind tracking branch |
| CI | PR/MR number colored by pipeline status; `--full` only |
@@ -285,7 +285,7 @@ The five change flags map to the [Working tree](#working-tree) symbols (`renamed
|-------|------|-------------|
| `ahead` | number | Commits ahead of the default branch |
| `behind` | number | Commits behind the default branch |
-| `diff` | object | Lines changed vs the default branch: `{added, deleted}`; `--full` only |
+| `diff` | object | Lines changed vs the default branch: `{added, deleted}` |
### remote object
@@ -382,7 +382,7 @@ Options:
Include remote branches
--full
- Show CI, diff analysis, and LLM summaries
+ Show CI status and LLM summaries
--progressive
Show fast info immediately, update with slow info
diff --git a/skills/worktrunk/reference/tips-patterns.md b/skills/worktrunk/reference/tips-patterns.md
index fb13cf9db..80e0780dd 100644
--- a/skills/worktrunk/reference/tips-patterns.md
+++ b/skills/worktrunk/reference/tips-patterns.md
@@ -60,13 +60,13 @@ The URL column in `wt list` shows each worktree's dev server:
```bash
$ wt list
- <b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>Remote⇅</b> <b>URL</b> <b>Commit</b> <b>Age</b>
-@ main <span class=c>?</span> <span class=d>^</span><span class=d>⇅</span> <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=d>http://localhost:12107</span> <span class=d>41ee0834</span> <span class=d>4d</span>
-+ feature-api <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>⇡3</span> <span class=d>http://localhost:10703</span> <span class=d>6814f02a</span> <span class=d>30m</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=d>|</span> <span class=d>http://localhost:16460</span> <span class=d>b772e68b</span> <span class=d>5h</span>
-+ <span class=d>fix-typos</span> <span class=d>_</span><span class=d>|</span> <span class=d>|</span> <span class=d>http://localhost:14301</span> <span class=d>41ee0834</span> <span class=d>4d</span>
+ <b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>main…±</b> <b>Remote⇅</b> <b>URL</b> <b>Commit</b>
+@ main <span class=c>?</span> <span class=d>^</span><span class=d>⇅</span> <span class=g>⇡1</span> <span class=d><span class=r>⇣1</span></span> <span class=d>http://localhost:12107</span> <span class=d>41ee0834</span>
++ feature-api <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> <span class=g>⇡3</span> <span class=d>http://localhost:10703</span> <span class=d>6814f02a</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> <span class=d>|</span> <span class=d>http://localhost:16460</span> <span class=d>b772e68b</span>
++ <span class=d>fix-typos</span> <span class=d>_</span><span class=d>|</span> <span class=d>|</span> <span class=d>http://localhost:14301</span> <span class=d>41ee0834</span>
-<span class=d>○</span> <span class=d>Showing 4 worktrees, 2 with changes, 2 ahead, 2 columns hidden</span>
+<span class=d>○</span> <span class=d>Showing 4 worktrees, 2 with changes, 2 ahead, 3 columns hidden</span>
```
`fix-auth` always gets port 16460, on any machine. The URL dims if the server isn't running.
diff --git a/skills/worktrunk/reference/worktrunk.md b/skills/worktrunk/reference/worktrunk.md
index 2496b0800..70c6b0b45 100644
--- a/skills/worktrunk/reference/worktrunk.md
+++ b/skills/worktrunk/reference/worktrunk.md
@@ -138,9 +138,9 @@ This creates a new branch and worktree, then switches to it. Do your work, then
```bash
$ wt list
- <b>Branch</b> <b>Status</b> <b>HEAD±</b> <b>main↕</b> <b>Remote⇅</b> <b>Commit</b> <b>Age</b> <b>Message</b>
-@ feature-auth <span class=c>+</span> <span class=d>↑</span> <span class=g>+27</span> <span class=r>-8</span> <span class=g>↑1</span> <span class=d>4bc72dc9</span> <span class=d>2h</span> <span class=d>Add authentication module</span>
-^ main <span class=d>^</span><span class=d>⇡</span> <span class=g>⇡1</span> <span class=d>0e631add</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>main…±</b> <b>Remote⇅</b> <b>Commit</b> <b>Age</b> <b>Message</b>
+@ feature-auth <span class=c>+</span> <span class=d>↑</span> <span class=g>+27</span> <span class=r>-8</span> <span class=g>↑1</span> <span class=g>+31</span> <span class=d>4bc72dc9</span> <span class=d>2h</span> <span class=d>Add authenticat…</span>
+^ main <span class=d>^</span><span class=d>⇡</span> <span class=g>⇡1</span> <span class=d>0e631add</span> <span class=d>1d</span> <span class=d>Initial commit</span>
<span class=d>○</span> <span class=d>Showing 2 worktrees, 1 with changes, 1 ahead, 1 column hidden</span>
```
diff --git a/src/cli/mod.rs b/src/cli/mod.rs
index cd3804ce5..eeec9837f 100644
--- a/src/cli/mod.rs
+++ b/src/cli/mod.rs
@@ -450,7 +450,7 @@ pub(crate) struct ListArgs {
#[arg(long)]
pub(crate) remotes: bool,
- /// Show CI, diff analysis, and LLM summaries
+ /// Show CI status and LLM summaries
#[arg(long)]
pub(crate) full: bool,
@@ -746,7 +746,7 @@ The table renders progressively: branch names, paths, and commit hashes appear i
## Full mode
-`--full` adds columns that require network access or LLM calls: [CI status](#ci-status) (GitHub/GitLab pipeline pass/fail), line diffs since the merge-base, and [LLM-generated summaries](#llm-summaries) of each branch's changes.
+`--full` adds the two columns that reach off-machine: [CI status](#ci-status) (GitHub/GitLab pipeline pass/fail, over the network) and [LLM-generated summaries](#llm-summaries) of each branch's changes. The `main…±` line diffs are local git, so they show by default.
## Examples
@@ -755,16 +755,16 @@ List all worktrees:
<!-- wt list -->
```console
$ wt list
- Branch Status HEAD± main↕ Remote⇅ Commit Age Message
-@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 ⇡3 6814f02a 30m Add API tests
-^ main ^⇅ ⇡1 ⇣1 41ee0834 4d Merge fix-auth: hardened to…
-+ fix-auth ↕| ↑2 ↓1 | b772e68b 5h Add secure token storage
-+ fix-typos _| | 41ee0834 4d Merge fix-auth: hardened to…
+ Branch Status HEAD± main↕ main…± Remote⇅ Commit Age Message
+@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 +234 -24 ⇡3 6814f02a 30m Add API tests
+^ main ^⇅ ⇡1 ⇣1 41ee0834 4d Merge fix-auth:…
++ fix-auth ↕| ↑2 ↓1 +25 -11 | b772e68b 5h Add secure token…
++ fix-typos _| | 41ee0834 4d Merge fix-auth:…
○ Showing 4 worktrees, 1 with changes, 2 ahead, 1 column hidden
```
-Include CI status, line diffs, and LLM summaries:
+Include CI status and LLM summaries:
<!-- wt list --full -->
```console
@@ -808,7 +808,7 @@ $ wt list --format=json
| Status | Compact symbols (see below) |
| HEAD± | Uncommitted changes: +added -deleted lines |
| main↕ | Commits ahead/behind default branch |
-| main…± | Line diffs since the merge-base (three-dot) with the default branch; `--full` only |
+| main…± | Line diffs since the merge-base (three-dot) with the default branch |
| Summary | LLM-generated branch summary; requires `--full`, `summary = true`, and [`commit.generation`](@/config.md#commit) [experimental] |
| Remote⇅ | Commits ahead/behind tracking branch |
| CI | PR/MR number colored by pipeline status; `--full` only |
@@ -1026,7 +1026,7 @@ The five change flags map to the [Working tree](#working-tree) symbols (`renamed
|-------|------|-------------|
| `ahead` | number | Commits ahead of the default branch |
| `behind` | number | Commits behind the default branch |
-| `diff` | object | Lines changed vs the default branch: `{added, deleted}`; `--full` only |
+| `diff` | object | Lines changed vs the default branch: `{added, deleted}` |
### remote object
@@ -1904,7 +1904,7 @@ Persistent flag values for `wt list`. Override on command line as needed.
[list]
summary = false # Enable LLM branch summaries (requires [commit.generation])
-full = false # Show CI, main…± diffstat, and LLM summaries (--full)
+full = false # Show CI status and LLM summaries (--full)
branches = false # Include branches without worktrees (--branches)
remotes = false # Include remote-only branches (--remotes)
diff --git a/src/commands/CLAUDE.md b/src/commands/CLAUDE.md
index e82604077..bca1fd18e 100644
--- a/src/commands/CLAUDE.md
+++ b/src/commands/CLAUDE.md
@@ -111,7 +111,7 @@ Keep the first line of flag and argument descriptions brief—aim for 3-6 words.
**Good examples:**
- `/// Skip approval prompts`
-- `/// Show CI and \`main\` diffstat`
+- `/// Show CI status and LLM summaries`
- `/// Target branch (defaults to default branch)`
**Bad examples (too verbose):**
diff --git a/src/commands/list/collect/mod.rs b/src/commands/list/collect/mod.rs
index ff33e888e..d3201488b 100644
--- a/src/commands/list/collect/mod.rs
+++ b/src/commands/list/collect/mod.rs
@@ -816,13 +816,14 @@ pub fn collect(
let skip_tasks: HashSet<TaskKind> = if show_full {
HashSet::new()
} else {
- [
- TaskKind::BranchDiff,
- TaskKind::CiStatus,
- TaskKind::SummaryGenerate,
- ]
- .into_iter()
- .collect()
+ // BranchDiff (the `main…±` column) is pure local git — a cached
+ // `git diff --shortstat` against the merge-base — so it always
+ // runs, under the non-`--full` timeout below as a backstop.
+ // `--full` gates only the off-machine columns: CI status
+ // (network) and LLM branch summaries.
+ [TaskKind::CiStatus, TaskKind::SummaryGenerate]
+ .into_iter()
+ .collect()
};
// Resolve timeouts from merged config (--full disables both)
let (command_timeout, collect_deadline) = if show_full {
diff --git a/src/commands/list/layout.rs b/src/commands/list/layout.rs
index a3161ba0f..704de2bc2 100644
--- a/src/commands/list/layout.rs
+++ b/src/commands/list/layout.rs
@@ -105,12 +105,15 @@
//!
//! Some columns have non-standard behavior that extends beyond the basic two-tier model:
//!
-//! 1. **BranchDiff** and **CiStatus** - Visibility gate (`show_full` flag)
-//! - Both require `show_full=true` (hidden by default as too noisy for typical usage)
-//! - Gated via `skip_tasks`: when `show_full=false`, their `TaskKind` is in `skip_tasks`
-//! and the column is filtered out entirely (bypasses the tier system)
-//! - Within the visibility gate, follows normal two-tier priority
-//! (BranchDiff: 6/16, CiStatus: 5/15)
+//! 1. **CiStatus** and **Summary** - Visibility gate (`show_full` flag)
+//! - Both require `show_full=true` — they reach off-machine (CI status over
+//! the network, branch summaries via the LLM), so they're hidden by default
+//! - Gated via `skip_tasks`: when `show_full=false`, their `TaskKind` is in
+//! `skip_tasks` and the column is filtered out entirely (bypasses the tier
+//! system)
+//! - **BranchDiff** (`main…±`) is pure local git, so it is *not* gated — it
+//! shows by default and follows the normal two-tier priority (6/16);
+//! CiStatus is 5/15
//!
//! 2. **Low-priority columns** yield to Summary
//! - Columns with effective priority > Summary's (10) are dropped to reclaim
@@ -1787,15 +1790,12 @@ mod tests {
)
}
- /// Default skip_tasks for non-full mode (Summary, BranchDiff, CI skipped).
+ /// Default skip_tasks for non-full mode (CI and Summary skipped; BranchDiff
+ /// runs and the `main…±` column shows by default).
fn non_full_skip_tasks() -> HashSet<TaskKind> {
- [
- TaskKind::BranchDiff,
- TaskKind::CiStatus,
- TaskKind::SummaryGenerate,
- ]
- .into_iter()
- .collect()
+ [TaskKind::CiStatus, TaskKind::SummaryGenerate]
+ .into_iter()
+ .collect()
}
/// Full mode skip_tasks (nothing skipped).
diff --git a/src/commands/picker/mod.rs b/src/commands/picker/mod.rs
index 50d90d9b7..28750fee0 100644
--- a/src/commands/picker/mod.rs
+++ b/src/commands/picker/mod.rs
@@ -1186,17 +1186,19 @@ pub fn handle_picker(
orchestrator.spawn_preview(Arc::new(item), PreviewMode::WorkingTree, dims);
}
- // Skip BranchDiff — it walks history per item for a column the picker
- // doesn't surface. Keep the CiStatus task: the picker primes its CI cells
- // from the local cache so the first frame shows cached status (see
- // `populate_from_cache`), then this task fetches live and streams each row's
- // status in behind the frame — the same 30–60s-TTL cache plus live fetch as
- // `wt list --full`. The picker's lifetime is bounded by the user, so a slow forge call
- // never blocks anything (see the "Network Access" notes in CLAUDE.md). The
- // `pr` preview tab reads the same live status. `--prs` rows carry their own
- // number from the explicit `--prs` forge call.
- let skip_tasks: std::collections::HashSet<collect::TaskKind> =
- [collect::TaskKind::BranchDiff].into_iter().collect();
+ // Run every task — the picker is `wt list --full`. `main…±` (BranchDiff) is
+ // now a default `wt list` column, so the picker surfaces it too; it's local
+ // git keyed by a persistent content-addressed cache, so warm rows are instant
+ // and a cold row computes once in the background (its merge-base walk streams
+ // in behind the frame, never blocking the picker). CiStatus is primed from
+ // the local cache so the first frame shows cached status (see
+ // `populate_from_cache`), then fetched live and streamed in — the same
+ // 30–60s-TTL cache plus live fetch as `wt list --full`. The picker's lifetime
+ // is bounded by the user, so a slow forge call never blocks anything (see the
+ // "Network Access" notes in CLAUDE.md). The `pr` preview tab reads the same
+ // live status. `--prs` rows carry their own number from the explicit `--prs`
+ // forge call.
+ let skip_tasks: std::collections::HashSet<collect::TaskKind> = std::collections::HashSet::new();
// Per-task command timeout (bounds any single git invocation) from
// shared `[list]` config. Still applies in progressive mode.
diff --git a/src/commands/picker/preview.rs b/src/commands/picker/preview.rs
index 7be959492..1ef1dbf74 100644
--- a/src/commands/picker/preview.rs
+++ b/src/commands/picker/preview.rs
@@ -29,7 +29,7 @@ use std::sync::atomic::{AtomicU8, Ordering};
/// Loosely aligned with `wt list` columns, though not a perfect match:
/// - Tab 1 corresponds to "HEAD±" column
/// - Tab 2 shows commits (related to "main↕" counts)
-/// - Tab 3 corresponds to "main…± (--full)" column
+/// - Tab 3 corresponds to "main…±" column
/// - Tab 4 corresponds to "Remote⇅" column
/// - Tab 6 corresponds to the "CI" column's PR/MR
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
diff --git a/tests/common/mod.rs b/tests/common/mod.rs
index d3022121b..cbb132bc5 100644
--- a/tests/common/mod.rs
+++ b/tests/common/mod.rs
@@ -590,6 +590,11 @@ pub fn add_standard_env_redactions(settings: &mut insta::Settings) {
);
// OpenCode config directory (platform-independent override for tests)
settings.add_redaction(".env.OPENCODE_CONFIG_DIR", "[TEST_OPENCODE_CONFIG]");
+ // Claude Code config directory: `set_temp_home_env` pins it to the temp
+ // home's `.claude` for hermeticity, so the value is a per-run temp path that
+ // would leak (and fail the host-path guard) when regenerated under an
+ // ambient CLAUDE_CONFIG_DIR. Redact it like its OpenCode sibling above.
+ settings.add_redaction(".env.CLAUDE_CONFIG_DIR", "[TEST_CLAUDE_CONFIG]");
// `wt config show --full` tests inject WORKTRUNK_TEST_LATEST_VERSION = the
// current crate version (so the version-check line reads "Up to date"), which
// would otherwise churn this `info` block on every release bump. Redact any
diff --git a/tests/integration_tests/switch_picker.rs b/tests/integration_tests/switch_picker.rs
index 6c31cf7f4..4f6653c78 100644
--- a/tests/integration_tests/switch_picker.rs
+++ b/tests/integration_tests/switch_picker.rs
@@ -1151,25 +1151,27 @@ fn test_switch_picker_prs_github_list(mut repo: TestRepo) {
&["switch", "--prs"],
repo.root_path(),
&env_vars,
- // Wait for the PR row to stream into the list (the `#42` content gate),
- // then assert on the row itself — deterministic, with no dependency on
- // selecting an async-arrived row.
- &[("", Some("#42"))],
+ // `main…±` now occupies the preview-shown list pane, clipping the CI
+ // column (`#42`) past skim's split. Toggle the preview off (alt-p) so
+ // the list spans full width and renders the number, then gate on it —
+ // deterministic, no dependency on selecting an async-arrived row.
+ &[("\x1bp", Some("#42"))],
);
assert_valid_abort_exit_code(result.exit_code);
- let (list, _preview) = result.panels();
- // `#42` in the CI column; the head branch is truncated in the narrow list.
- assert!(list.contains("#42"), "PR number in list:\n{list}");
- // The title is NOT on the row — it lives in the preview so columns align.
+ // Preview off → full-width list renders the CI column; assert on the whole
+ // screen since `#42` sits past the panel split column.
+ let screen = result.screen();
+ assert!(screen.contains("#42"), "PR number on screen:\n{screen}");
+ // The title lives in the preview (now hidden), never on the row itself.
assert!(
- !list.contains("Retry the flaky network test"),
- "PR title should stay off the row:\n{list}"
+ !screen.contains("Retry the flaky network test"),
+ "PR title should stay off the row:\n{screen}"
);
// The header's loading marker is gone once the rows have streamed in.
assert!(
- !list.contains("loading open PRs"),
- "loading marker cleared once rows arrived:\n{list}"
+ !screen.contains("loading open PRs"),
+ "loading marker cleared once rows arrived:\n{screen}"
);
}
@@ -1193,18 +1195,20 @@ fn test_switch_picker_prs_gitlab_list(mut repo: TestRepo) {
&["switch", "--prs"],
repo.root_path(),
&env_vars,
- // `!7` (GitLab MR ref) is the row's stable substring; the title lives in
- // the preview, not the row.
- &[("", Some("!7"))],
+ // `main…±` clips the CI column (`!7`) past skim's split in the
+ // preview-shown pane. Toggle the preview off (alt-p) so the full-width
+ // list renders the ref, then gate on it.
+ &[("\x1bp", Some("!7"))],
);
assert_valid_abort_exit_code(result.exit_code);
- let (list, _preview) = result.panels();
- // `!7` (GitLab MR ref) in the CI column; source branch truncates.
- assert!(list.contains("!7"), "MR number in list:\n{list}");
+ // Preview off → full-width list renders the CI column; assert on the whole
+ // screen since `!7` sits past the panel split column.
+ let screen = result.screen();
+ assert!(screen.contains("!7"), "MR number on screen:\n{screen}");
assert!(
- !list.contains("Cache the dependency graph"),
- "MR title should stay off the row:\n{list}"
+ !screen.contains("Cache the dependency graph"),
+ "MR title should stay off the row:\n{screen}"
);
}
diff --git a/tests/snapshots/integration__integration_tests__bare_repository__bare_repo_commands_from_bare_directory.snap b/tests/snapshots/integration__integration_tests__bare_repository__bare_repo_commands_from_bare_directory.snap
index 1dc5dd952..474b05917 100644
--- a/tests/snapshots/integration__integration_tests__bare_repository__bare_repo_commands_from_bare_directory.snap
+++ b/tests/snapshots/integration__integration_tests__bare_repository__bare_repo_commands_from_bare_directory.snap
@@ -35,8 +35,8 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-^ main ^ . b834638e 1d Initial commit
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+^ main ^ . b834638e 1d Initial commit
○ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__bare_repository__bare_repo_identifies_primary_correctly.snap b/tests/snapshots/integration__integration_tests__bare_repository__bare_repo_identifies_primary_correctly.snap
index 1ecb84c76..42c316373 100644
--- a/tests/snapshots/integration__integration_tests__bare_repository__bare_repo_identifies_primary_correctly.snap
+++ b/tests/snapshots/integration__integration_tests__bare_repository__bare_repo_identifies_primary_correctly.snap
@@ -35,10 +35,10 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^ . b37a293c 1d Main commit
-+ feature1 _ ../feature1 b37a293c 1d Main commit
-+ feature2 _ ../feature2 b37a293c 1d Main commit
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^ . b37a293c 1d Main commit
++ feature1 _ ../feature1 b37a293c 1d Main commit
++ feature2 _ ../feature2 b37a293c 1d Main commit
○ Showing 3 worktrees
diff --git a/tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_shows_no_bare_entry.snap b/tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_shows_no_bare_entry.snap
index ad4e5c2ba..6ae654d0a 100644
--- a/tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_shows_no_bare_entry.snap
+++ b/tests/snapshots/integration__integration_tests__bare_repository__bare_repo_list_shows_no_bare_entry.snap
@@ -35,8 +35,8 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^ . b834638e 1d Initial commit
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^ . b834638e 1d Initial commit
○ Showing 1 worktree
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 35270ef8f..fac1dc47d 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
@@ -35,9 +35,9 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^ . 6c3da842 1d Initial commit on main
-+ feature ↑ ↑1 ../feature 72413a3b 1d Work on feature
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^ . 6c3da842 1d Initial commit on main
++ feature ↑ ↑1 +1 -1 ../feature 72413a3b 1d Work on feature
○ Showing 2 worktrees, 1 ahead
diff --git a/tests/snapshots/integration__integration_tests__bare_repository__nested_bare_repo_list_snapshot.snap b/tests/snapshots/integration__integration_tests__bare_repository__nested_bare_repo_list_snapshot.snap
index b08312849..161f8c8a4 100644
--- a/tests/snapshots/integration__integration_tests__bare_repository__nested_bare_repo_list_snapshot.snap
+++ b/tests/snapshots/integration__integration_tests__bare_repository__nested_bare_repo_list_snapshot.snap
@@ -35,9 +35,9 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^ . a6c13b13 1d Initial
-+ feature _ ../feature a6c13b13 1d Initial
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^ . a6c13b13 1d Initial
++ feature _ ../feature a6c13b13 1d Initial
○ Showing 2 worktrees
diff --git a/tests/snapshots/integration__integration_tests__config_show__deprecated_commit_generation_project_level_shows_warning.snap b/tests/snapshots/integration__integration_tests__config_show__deprecated_commit_generation_project_level_shows_warning.snap
index 8660cbd99..c2356109f 100644
--- a/tests/snapshots/integration__integration_tests__config_show__deprecated_commit_generation_project_level_shows_warning.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__deprecated_commit_generation_project_level_shows_warning.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,11 +44,11 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
○ Showing 4 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__config_show__deprecated_commit_generation_section_shows_warning.snap b/tests/snapshots/integration__integration_tests__config_show__deprecated_commit_generation_section_shows_warning.snap
index 255dbbcfd..f5ccf07d6 100644
--- a/tests/snapshots/integration__integration_tests__config_show__deprecated_commit_generation_section_shows_warning.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__deprecated_commit_generation_section_shows_warning.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,11 +44,11 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
○ Showing 4 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__config_show__deprecated_template_variables_show_warning.snap b/tests/snapshots/integration__integration_tests__config_show__deprecated_template_variables_show_warning.snap
index c817fc743..d38ee5703 100644
--- a/tests/snapshots/integration__integration_tests__config_show__deprecated_template_variables_show_warning.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__deprecated_template_variables_show_warning.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,11 +44,11 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
○ Showing 4 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__config_show__deprecated_template_variables_verbose_shows_content.snap b/tests/snapshots/integration__integration_tests__config_show__deprecated_template_variables_verbose_shows_content.snap
index 16531ca54..1646d1efc 100644
--- a/tests/snapshots/integration__integration_tests__config_show__deprecated_template_variables_verbose_shows_content.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__deprecated_template_variables_verbose_shows_content.snap
@@ -7,6 +7,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -44,11 +45,11 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
○ Showing 4 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__config_show__explicit_config_path_not_found_shows_warning.snap b/tests/snapshots/integration__integration_tests__config_show__explicit_config_path_not_found_shows_warning.snap
index 40cbb2a26..1fcdf7a54 100644
--- a/tests/snapshots/integration__integration_tests__config_show__explicit_config_path_not_found_shows_warning.snap
+++ b/tests/snapshots/integration__integration_tests__config_show__explicit_config_path_not_found_shows_warning.snap
@@ -8,6 +8,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -45,11 +46,11 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
○ Showing 4 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_create.snap b/tests/snapshots/integration__integration_tests__help__help_config_create.snap
index 5e4b5b12d..8fcf1a8a2 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_create.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_create.snap
@@ -161,7 +161,7 @@ Creates ~/.config/worktrunk/config.toml with the following content:
  # [list]
  # summary = false # Enable LLM branch summaries (requires [commit.generation])
  #
-  # full = false # Show CI, main…± diffstat, and LLM summaries (--full)
+  # full = false # Show CI status and LLM summaries (--full)
  # branches = false # Include branches without worktrees (--branches)
  # remotes = false # Include remote-only branches (--remotes)
  #
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_long.snap b/tests/snapshots/integration__integration_tests__help__help_config_long.snap
index 711204742..03d4f5b48 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_long.snap
@@ -209,7 +209,7 @@ Persistent flag values for wt list. Override on command line as needed.
  [list]
  summary = false # Enable LLM branch summaries (requires [commit.generation])
 
-  full = false # Show CI, main…± diffstat, and LLM summaries (--full)
+  full = false # Show CI status and LLM summaries (--full)
  branches = false # Include branches without worktrees (--branches)
  remotes = false # Include remote-only branches (--remotes)
 
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 4f1a3674d..93d6a1a93 100644
--- a/tests/snapshots/integration__integration_tests__help__help_list_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_list_long.snap
@@ -54,7 +54,7 @@ Usage: wt list [OPTIONS]
Include remote branches
--full
- Show CI, diff analysis, and LLM summaries
+ Show CI status and LLM summaries
--progressive
Show fast info immediately, update with slow info
@@ -86,22 +86,22 @@ The table renders progressively: branch names, paths, and commit hashes appear i
Full mode
---full adds columns that require network access or LLM calls: CI status (GitHub/GitLab pipeline pass/fail), line diffs since the merge-base, and LLM-generated summaries of each branch's changes.
+--full adds the two columns that reach off-machine: CI status (GitHub/GitLab pipeline pass/fail, over the network) and LLM-generated summaries of each branch's changes. The main…± line diffs are local git, so they show by default.
Examples
List all worktrees:
  wt list
-   Branch Status HEAD± main↕ Remote⇅ Commit Age Message
-  @ feature-api + ↕⇡ +54 -5 ↑4 ↓1 ⇡3 6814f02a 30m Add API tests
-  ^ main ^⇅ ⇡1 ⇣1 41ee0834 4d Merge fix-auth: hardened to…
-  + fix-auth ↕| ↑2 ↓1 | b772e68b 5h Add secure token storage
-  + fix-typos _| | 41ee0834 4d Merge fix-auth: hardened to…
+   Branch Status HEAD± main↕ main…± Remote⇅ Commit Age Message
+  @ feature-api + ↕⇡ +54 -5 ↑4 ↓1 +234 -24 ⇡3 6814f02a 30m Add API tests
+  ^ main ^⇅ ⇡1 ⇣1 41ee0834 4d Merge fix-auth:…
+  + fix-auth ↕| ↑2 ↓1 +25 -11 | b772e68b 5h Add secure token…
+  + fix-typos _| | 41ee0834 4d Merge fix-auth:…
  
  ○ Showing 4 worktrees, 1 with changes, 2 ahead, 1 column hidden
-Include CI status, line diffs, and LLM summaries:
+Include CI status and LLM summaries:
  wt list --full
   Branch Status HEAD± main↕ main…± Summary Remote⇅ CI Commit
@@ -137,7 +137,7 @@ Output as JSON for scripting:
Status Compact symbols (see below)
HEAD± Uncommitted changes: +added -deleted lines
main↕ Commits ahead/behind default branch
- main…± Line diffs since the merge-base (three-dot) with the default branch; --full only
+ main…± Line diffs since the merge-base (three-dot) with the default branch
Summary LLM-generated branch summary; requires --full, summary = true, and commit.generation [experimental]
Remote⇅ Commits ahead/behind tracking branch
CI PR/MR number colored by pipeline status; --full only
@@ -348,11 +348,11 @@ The five change flags map to the Working tree symbols (renamed and d
main object
- Field Type Description
- ────── ────── ──────────────────────────────────────────────────────────────────
- ahead number Commits ahead of the default branch
- behind number Commits behind the default branch
- diff object Lines changed vs the default branch: {added, deleted}; --full only
+ Field Type Description
+ ────── ────── ─────────────────────────────────────────────────────
+ ahead number Commits ahead of the default branch
+ behind number Commits behind the default branch
+ diff object Lines changed vs the default branch: {added, deleted}
remote object
diff --git a/tests/snapshots/integration__integration_tests__help__help_list_narrow_80.snap b/tests/snapshots/integration__integration_tests__help__help_list_narrow_80.snap
index 4356a949d..c5af86793 100644
--- a/tests/snapshots/integration__integration_tests__help__help_list_narrow_80.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_list_narrow_80.snap
@@ -54,7 +54,7 @@ Usage: wt list [OPTIONS]
Include remote branches
--full
- Show CI, diff analysis, and LLM summaries
+ Show CI status and LLM summaries
--progressive
Show fast info immediately, update with slow info
@@ -95,24 +95,24 @@ git operations complete.
Full mode
---full adds columns that require network access or LLM calls: CI status
-(GitHub/GitLab pipeline pass/fail), line diffs since the merge-base, and
-LLM-generated summaries of each branch's changes.
+--full adds the two columns that reach off-machine: CI status (GitHub/GitLab
+pipeline pass/fail, over the network) and LLM-generated summaries of each
+branch's changes. The main…± line diffs are local git, so they show by default.
Examples
List all worktrees:
  wt list
-   Branch Status HEAD± main↕ Remote⇅ Commit Age Message
-  @ feature-api + ↕⇡ +54 -5 ↑4 ↓1 ⇡3 6814f02a 30m Add API…
-  ^ main ^⇅ ⇡1 ⇣1 41ee0834 4d Merge f…
-  + fix-auth ↕| ↑2 ↓1 | b772e68b 5h Add sec…
-  + fix-typos _| | 41ee0834 4d Merge f…
+   Branch Status HEAD± main↕ main…± Remote⇅ Commit Ag…
+  @ feature-api + ↕⇡ +54 -5 ↑4 ↓1 +234 -24 ⇡3 6814f02a 30…
+  ^ main ^⇅ ⇡1 ⇣1 41ee0834 4d…
+  + fix-auth ↕| ↑2 ↓1 +25 -11 | b772e68b 5h…
+  + fix-typos _| | 41ee0834 4d…
  
  ○ Showing 4 worktrees, 1 with changes, 2 ahead, 1 column hidden
-Include CI status, line diffs, and LLM summaries:
+Include CI status and LLM summaries:
  wt list --full
   Branch Status HEAD± main↕ main…± Summary …
@@ -148,8 +148,7 @@ Output as JSON for scripting:
Status Compact symbols (see below)
HEAD± Uncommitted changes: +added -deleted lines
main↕ Commits ahead/behind default branch
- main…± Line diffs since the merge-base (three-dot) with the default branch;
- --full only
+ main…± Line diffs since the merge-base (three-dot) with the default branch
Summary LLM-generated branch summary; requires --full, summary = true, and
commit.generation [experimental]
Remote⇅ Commits ahead/behind tracking branch
@@ -426,12 +425,11 @@ none of their own):
main object
- Field Type Description
- ────── ────── ────────────────────────────────────────────────────────────────
- ahead number Commits ahead of the default branch
- behind number Commits behind the default branch
- diff object Lines changed vs the default branch: {added, deleted}; --full
- only
+ Field Type Description
+ ────── ────── ─────────────────────────────────────────────────────
+ ahead number Commits ahead of the default branch
+ behind number Commits behind the default branch
+ diff object Lines changed vs the default branch: {added, deleted}
remote object
diff --git a/tests/snapshots/integration__integration_tests__help__help_list_short.snap b/tests/snapshots/integration__integration_tests__help__help_list_short.snap
index 8c2cfbcb7..723c6cfb5 100644
--- a/tests/snapshots/integration__integration_tests__help__help_list_short.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_list_short.snap
@@ -44,7 +44,7 @@ Usage: wt list [OPTIONS]
--format <FORMAT> Output format [default: table] [possible values: table, json]
--branches Include branches without worktrees
--remotes Include remote branches
- --full Show CI, diff analysis, and LLM summaries
+ --full Show CI status and LLM summaries
--progressive Show fast info immediately, update with slow info
-h, --help Print help (see more with '--help')
diff --git a/tests/snapshots/integration__integration_tests__list__commit_conflicts_without_full.snap b/tests/snapshots/integration__integration_tests__list__commit_conflicts_without_full.snap
index d652477d0..86246b731 100644
--- a/tests/snapshots/integration__integration_tests__list__commit_conflicts_without_full.snap
+++ b/tests/snapshots/integration__integration_tests__list__commit_conflicts_without_full.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,12 +44,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^⇡ ⇡2 . 1edd043e 1d Main changes shared.txt
-+ feature-a ↕ ↑1 ↓2 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↕ ↑1 ↓2 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↕ ↑1 ↓2 ../repo.feature-c 345c7c93 16h Add feature-c file
-+ feature ✗ ↑1 ↓1 ../repo.feature dee7183a 1d Feature changes shared.txt
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^⇡ ⇡2 . 1edd043e 1d Main changes shared.txt
++ feature-a ↕ ↑1 ↓2 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↕ ↑1 ↓2 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↕ ↑1 ↓2 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
++ feature ✗ ↑1 ↓1 +1 -1 ../repo.feature dee7183a 1d Feature changes shared.txt
○ Showing 5 worktrees, 4 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_branch_only_with_status.snap b/tests/snapshots/integration__integration_tests__list__list_branch_only_with_status.snap
index 0a6ace180..8c4923597 100644
--- a/tests/snapshots/integration__integration_tests__list__list_branch_only_with_status.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_branch_only_with_status.snap
@@ -7,6 +7,7 @@ info:
- "--branches"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -44,12 +45,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-/ branch-only /_ 05a4a45d 16h Initial commit
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
+/ branch-only /_ 05a4a45d 16h Initial commit
○ Showing 4 worktrees, 1 branches, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_branches_with_nonexistent_default_branch.snap b/tests/snapshots/integration__integration_tests__list__list_branches_with_nonexistent_default_branch.snap
index 86ec720a9..1666d53f3 100644
--- a/tests/snapshots/integration__integration_tests__list__list_branches_with_nonexistent_default_branch.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_branches_with_nonexistent_default_branch.snap
@@ -7,6 +7,7 @@ info:
- "--branches"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -44,11 +45,11 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ⚑^| | . 05a4a45d 16h Initial commit
-+ feature-a ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ../repo.feature-c 345c7c93 16h Add feature-c file
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ⚑^| | . 05a4a45d 16h Initial commit
++ feature-a ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ../repo.feature-c 345c7c93 16h Add feature-c file
○ Showing 4 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__list_detached_head.snap b/tests/snapshots/integration__integration_tests__list__list_detached_head.snap
index ab28d5910..32684e1c7 100644
--- a/tests/snapshots/integration__integration_tests__list__list_detached_head.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_detached_head.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,11 +44,11 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ - ⚑^ . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ - ⚑^ . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
○ Showing 4 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_detached_head_in_worktree.snap b/tests/snapshots/integration__integration_tests__list__list_detached_head_in_worktree.snap
index b427892e5..0311167dc 100644
--- a/tests/snapshots/integration__integration_tests__list__list_detached_head_in_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_detached_head_in_worktree.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,12 +44,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ - ⚑_ ../repo.feature 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ - ⚑_ ../repo.feature 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_empty_repo.snap b/tests/snapshots/integration__integration_tests__list__list_empty_repo.snap
index 6192b0907..b6ed30c33 100644
--- a/tests/snapshots/integration__integration_tests__list__list_empty_repo.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_empty_repo.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -41,8 +42,8 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main · ·^ · . · ·
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main · ·^ · . · ·
○ Showing 1 worktree
diff --git a/tests/snapshots/integration__integration_tests__list__list_handles_orphan_branch.snap b/tests/snapshots/integration__integration_tests__list__list_handles_orphan_branch.snap
index 0a13649d5..858b6b196 100644
--- a/tests/snapshots/integration__integration_tests__list__list_handles_orphan_branch.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_handles_orphan_branch.snap
@@ -7,6 +7,7 @@ info:
- "--branches"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -44,12 +45,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-/ assets /∅ 50209039 1d Add asset
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
+/ assets /∅ 50209039 1d Add asset
○ Showing 4 worktrees, 1 branches, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_json_tree_matches_main_after_merge.snap b/tests/snapshots/integration__integration_tests__list__list_json_tree_matches_main_after_merge.snap
index 464cc81ae..053f7eff0 100644
--- a/tests/snapshots/integration__integration_tests__list__list_json_tree_matches_main_after_merge.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_json_tree_matches_main_after_merge.snap
@@ -7,6 +7,7 @@ info:
- "--format=json"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -106,7 +107,11 @@ exit_code: 0
"main_state": "diverged",
"main": {
"ahead": 1,
- "behind": 1
+ "behind": 1,
+ "diff": {
+ "added": 1,
+ "deleted": 0
+ }
},
"worktree": {
"detached": false
@@ -114,7 +119,7 @@ exit_code: 0
"is_main": false,
"is_current": false,
"is_previous": false,
- "statusline": "feature-a \u001b[2m↕\u001b[22m \u001b[32m↑1\u001b[0m \u001b[2m\u001b[31m↓1\u001b[0m",
+ "statusline": "feature-a \u001b[2m↕\u001b[22m \u001b[32m↑1\u001b[0m \u001b[2m\u001b[31m↓1\u001b[0m ^\u001b[32m+1\u001b[0m",
"symbols": "↕"
},
{
@@ -141,7 +146,11 @@ exit_code: 0
"main_state": "diverged",
"main": {
"ahead": 1,
- "behind": 1
+ "behind": 1,
+ "diff": {
+ "added": 1,
+ "deleted": 0
+ }
},
"worktree": {
"detached": false
@@ -149,7 +158,7 @@ exit_code: 0
"is_main": false,
"is_current": false,
"is_previous": false,
- "statusline": "feature-b \u001b[2m↕\u001b[22m \u001b[32m↑1\u001b[0m \u001b[2m\u001b[31m↓1\u001b[0m",
+ "statusline": "feature-b \u001b[2m↕\u001b[22m \u001b[32m↑1\u001b[0m \u001b[2m\u001b[31m↓1\u001b[0m ^\u001b[32m+1\u001b[0m",
"symbols": "↕"
},
{
@@ -176,7 +185,11 @@ exit_code: 0
"main_state": "diverged",
"main": {
"ahead": 1,
- "behind": 1
+ "behind": 1,
+ "diff": {
+ "added": 1,
+ "deleted": 0
+ }
},
"worktree": {
"detached": false
@@ -184,7 +197,7 @@ exit_code: 0
"is_main": false,
"is_current": false,
"is_previous": false,
- "statusline": "feature-c \u001b[2m↕\u001b[22m \u001b[32m↑1\u001b[0m \u001b[2m\u001b[31m↓1\u001b[0m",
+ "statusline": "feature-c \u001b[2m↕\u001b[22m \u001b[32m↑1\u001b[0m \u001b[2m\u001b[31m↓1\u001b[0m ^\u001b[32m+1\u001b[0m",
"symbols": "↕"
},
{
@@ -212,7 +225,11 @@ exit_code: 0
"integration_reason": "no-added-changes",
"main": {
"ahead": 2,
- "behind": 0
+ "behind": 0,
+ "diff": {
+ "added": 0,
+ "deleted": 0
+ }
},
"worktree": {
"detached": false
diff --git a/tests/snapshots/integration__integration_tests__list__list_json_with_display_fields.snap b/tests/snapshots/integration__integration_tests__list__list_json_with_display_fields.snap
index 4c0d7a3b1..ffc6b0126 100644
--- a/tests/snapshots/integration__integration_tests__list__list_json_with_display_fields.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_json_with_display_fields.snap
@@ -7,6 +7,7 @@ info:
- "--format=json"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -106,7 +107,11 @@ exit_code: 0
"main_state": "diverged",
"main": {
"ahead": 1,
- "behind": 3
+ "behind": 3,
+ "diff": {
+ "added": 1,
+ "deleted": 0
+ }
},
"worktree": {
"detached": false
@@ -114,7 +119,7 @@ exit_code: 0
"is_main": false,
"is_current": false,
"is_previous": false,
- "statusline": "feature-a \u001b[2m↕\u001b[22m \u001b[32m↑1\u001b[0m \u001b[2m\u001b[31m↓3\u001b[0m",
+ "statusline": "feature-a \u001b[2m↕\u001b[22m \u001b[32m↑1\u001b[0m \u001b[2m\u001b[31m↓3\u001b[0m ^\u001b[32m+1\u001b[0m",
"symbols": "↕"
},
{
@@ -141,7 +146,11 @@ exit_code: 0
"main_state": "diverged",
"main": {
"ahead": 1,
- "behind": 3
+ "behind": 3,
+ "diff": {
+ "added": 1,
+ "deleted": 0
+ }
},
"worktree": {
"detached": false
@@ -149,7 +158,7 @@ exit_code: 0
"is_main": false,
"is_current": false,
"is_previous": false,
- "statusline": "feature-b \u001b[2m↕\u001b[22m \u001b[32m↑1\u001b[0m \u001b[2m\u001b[31m↓3\u001b[0m",
+ "statusline": "feature-b \u001b[2m↕\u001b[22m \u001b[32m↑1\u001b[0m \u001b[2m\u001b[31m↓3\u001b[0m ^\u001b[32m+1\u001b[0m",
"symbols": "↕"
},
{
@@ -176,7 +185,11 @@ exit_code: 0
"main_state": "diverged",
"main": {
"ahead": 1,
- "behind": 3
+ "behind": 3,
+ "diff": {
+ "added": 1,
+ "deleted": 0
+ }
},
"worktree": {
"detached": false
@@ -184,7 +197,7 @@ exit_code: 0
"is_main": false,
"is_current": false,
"is_previous": false,
- "statusline": "feature-c \u001b[2m↕\u001b[22m \u001b[32m↑1\u001b[0m \u001b[2m\u001b[31m↓3\u001b[0m",
+ "statusline": "feature-c \u001b[2m↕\u001b[22m \u001b[32m↑1\u001b[0m \u001b[2m\u001b[31m↓3\u001b[0m ^\u001b[32m+1\u001b[0m",
"symbols": "↕"
},
{
@@ -211,7 +224,11 @@ exit_code: 0
"main_state": "diverged",
"main": {
"ahead": 2,
- "behind": 2
+ "behind": 2,
+ "diff": {
+ "added": 1,
+ "deleted": 0
+ }
},
"worktree": {
"detached": false
@@ -219,7 +236,7 @@ exit_code: 0
"is_main": false,
"is_current": false,
"is_previous": false,
- "statusline": "feature-ahead \u001b[36m!\u001b[39m\u001b[36m?\u001b[39m\u001b[2m↕\u001b[22m @\u001b[32m+1\u001b[0m \u001b[31m-1\u001b[0m \u001b[32m↑2\u001b[0m \u001b[2m\u001b[31m↓2\u001b[0m",
+ "statusline": "feature-ahead \u001b[36m!\u001b[39m\u001b[36m?\u001b[39m\u001b[2m↕\u001b[22m @\u001b[32m+1\u001b[0m \u001b[31m-1\u001b[0m \u001b[32m↑2\u001b[0m \u001b[2m\u001b[31m↓2\u001b[0m ^\u001b[32m+1\u001b[0m",
"symbols": "!?↕"
},
{
@@ -247,7 +264,11 @@ exit_code: 0
"integration_reason": "ancestor",
"main": {
"ahead": 0,
- "behind": 2
+ "behind": 2,
+ "diff": {
+ "added": 0,
+ "deleted": 0
+ }
},
"worktree": {
"detached": false
diff --git a/tests/snapshots/integration__integration_tests__list__list_json_with_git_operation.snap b/tests/snapshots/integration__integration_tests__list__list_json_with_git_operation.snap
index b9b04b6e1..a5ceb3394 100644
--- a/tests/snapshots/integration__integration_tests__list__list_json_with_git_operation.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_json_with_git_operation.snap
@@ -7,6 +7,7 @@ info:
- "--format=json"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -106,7 +107,11 @@ exit_code: 0
"main_state": "diverged",
"main": {
"ahead": 1,
- "behind": 2
+ "behind": 2,
+ "diff": {
+ "added": 1,
+ "deleted": 0
+ }
},
"worktree": {
"detached": false
@@ -114,7 +119,7 @@ exit_code: 0
"is_main": false,
"is_current": false,
"is_previous": false,
- "statusline": "feature-a \u001b[2m↕\u001b[22m \u001b[32m↑1\u001b[0m \u001b[2m\u001b[31m↓2\u001b[0m",
+ "statusline": "feature-a \u001b[2m↕\u001b[22m \u001b[32m↑1\u001b[0m \u001b[2m\u001b[31m↓2\u001b[0m ^\u001b[32m+1\u001b[0m",
"symbols": "↕"
},
{
@@ -141,7 +146,11 @@ exit_code: 0
"main_state": "diverged",
"main": {
"ahead": 1,
- "behind": 2
+ "behind": 2,
+ "diff": {
+ "added": 1,
+ "deleted": 0
+ }
},
"worktree": {
"detached": false
@@ -149,7 +158,7 @@ exit_code: 0
"is_main": false,
"is_current": false,
"is_previous": false,
- "statusline": "feature-b \u001b[2m↕\u001b[22m \u001b[32m↑1\u001b[0m \u001b[2m\u001b[31m↓2\u001b[0m",
+ "statusline": "feature-b \u001b[2m↕\u001b[22m \u001b[32m↑1\u001b[0m \u001b[2m\u001b[31m↓2\u001b[0m ^\u001b[32m+1\u001b[0m",
"symbols": "↕"
},
{
@@ -176,7 +185,11 @@ exit_code: 0
"main_state": "diverged",
"main": {
"ahead": 1,
- "behind": 2
+ "behind": 2,
+ "diff": {
+ "added": 1,
+ "deleted": 0
+ }
},
"worktree": {
"detached": false
@@ -184,7 +197,7 @@ exit_code: 0
"is_main": false,
"is_current": false,
"is_previous": false,
- "statusline": "feature-c \u001b[2m↕\u001b[22m \u001b[32m↑1\u001b[0m \u001b[2m\u001b[31m↓2\u001b[0m",
+ "statusline": "feature-c \u001b[2m↕\u001b[22m \u001b[32m↑1\u001b[0m \u001b[2m\u001b[31m↓2\u001b[0m ^\u001b[32m+1\u001b[0m",
"symbols": "↕"
},
{
@@ -212,7 +225,11 @@ exit_code: 0
"operation_state": "conflicts",
"main": {
"ahead": 1,
- "behind": 1
+ "behind": 1,
+ "diff": {
+ "added": 2,
+ "deleted": 2
+ }
},
"worktree": {
"detached": true
@@ -220,7 +237,7 @@ exit_code: 0
"is_main": false,
"is_current": false,
"is_previous": false,
- "statusline": "feature \u001b[31m✘\u001b[39m\u001b[33m✗\u001b[39m \u001b[32m↑1\u001b[0m \u001b[2m\u001b[31m↓1\u001b[0m",
+ "statusline": "feature \u001b[31m✘\u001b[39m\u001b[33m✗\u001b[39m \u001b[32m↑1\u001b[0m \u001b[2m\u001b[31m↓1\u001b[0m ^\u001b[32m+2\u001b[0m \u001b[31m-2\u001b[0m",
"symbols": "✗✘"
}
]
diff --git a/tests/snapshots/integration__integration_tests__list__list_json_with_metadata.snap b/tests/snapshots/integration__integration_tests__list__list_json_with_metadata.snap
index b1854f886..fe5e08397 100644
--- a/tests/snapshots/integration__integration_tests__list__list_json_with_metadata.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_json_with_metadata.snap
@@ -7,6 +7,7 @@ info:
- "--format=json"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -106,7 +107,11 @@ exit_code: 0
"main_state": "ahead",
"main": {
"ahead": 1,
- "behind": 0
+ "behind": 0,
+ "diff": {
+ "added": 1,
+ "deleted": 0
+ }
},
"worktree": {
"detached": false
@@ -114,7 +119,7 @@ exit_code: 0
"is_main": false,
"is_current": false,
"is_previous": false,
- "statusline": "feature-a \u001b[2m↑\u001b[22m \u001b[32m↑1\u001b[0m",
+ "statusline": "feature-a \u001b[2m↑\u001b[22m \u001b[32m↑1\u001b[0m ^\u001b[32m+1\u001b[0m",
"symbols": "↑"
},
{
@@ -141,7 +146,11 @@ exit_code: 0
"main_state": "ahead",
"main": {
"ahead": 1,
- "behind": 0
+ "behind": 0,
+ "diff": {
+ "added": 1,
+ "deleted": 0
+ }
},
"worktree": {
"detached": false
@@ -149,7 +158,7 @@ exit_code: 0
"is_main": false,
"is_current": false,
"is_previous": false,
- "statusline": "feature-b \u001b[2m↑\u001b[22m \u001b[32m↑1\u001b[0m",
+ "statusline": "feature-b \u001b[2m↑\u001b[22m \u001b[32m↑1\u001b[0m ^\u001b[32m+1\u001b[0m",
"symbols": "↑"
},
{
@@ -176,7 +185,11 @@ exit_code: 0
"main_state": "ahead",
"main": {
"ahead": 1,
- "behind": 0
+ "behind": 0,
+ "diff": {
+ "added": 1,
+ "deleted": 0
+ }
},
"worktree": {
"detached": false
@@ -184,7 +197,7 @@ exit_code: 0
"is_main": false,
"is_current": false,
"is_previous": false,
- "statusline": "feature-c \u001b[2m↑\u001b[22m \u001b[32m↑1\u001b[0m",
+ "statusline": "feature-c \u001b[2m↑\u001b[22m \u001b[32m↑1\u001b[0m ^\u001b[32m+1\u001b[0m",
"symbols": "↑"
},
{
@@ -211,7 +224,11 @@ exit_code: 0
"main_state": "empty",
"main": {
"ahead": 0,
- "behind": 0
+ "behind": 0,
+ "diff": {
+ "added": 0,
+ "deleted": 0
+ }
},
"worktree": {
"detached": false
@@ -246,7 +263,11 @@ exit_code: 0
"main_state": "empty",
"main": {
"ahead": 0,
- "behind": 0
+ "behind": 0,
+ "diff": {
+ "added": 0,
+ "deleted": 0
+ }
},
"worktree": {
"state": "locked",
diff --git a/tests/snapshots/integration__integration_tests__list__list_json_with_user_marker.snap b/tests/snapshots/integration__integration_tests__list__list_json_with_user_marker.snap
index cb4d52fda..39ef572e7 100644
--- a/tests/snapshots/integration__integration_tests__list__list_json_with_user_marker.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_json_with_user_marker.snap
@@ -7,6 +7,7 @@ info:
- "--format=json"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -106,7 +107,11 @@ exit_code: 0
"main_state": "diverged",
"main": {
"ahead": 1,
- "behind": 1
+ "behind": 1,
+ "diff": {
+ "added": 1,
+ "deleted": 0
+ }
},
"worktree": {
"detached": false
@@ -114,7 +119,7 @@ exit_code: 0
"is_main": false,
"is_current": false,
"is_previous": false,
- "statusline": "feature-a \u001b[2m↕\u001b[22m \u001b[32m↑1\u001b[0m \u001b[2m\u001b[31m↓1\u001b[0m",
+ "statusline": "feature-a \u001b[2m↕\u001b[22m \u001b[32m↑1\u001b[0m \u001b[2m\u001b[31m↓1\u001b[0m ^\u001b[32m+1\u001b[0m",
"symbols": "↕"
},
{
@@ -141,7 +146,11 @@ exit_code: 0
"main_state": "diverged",
"main": {
"ahead": 1,
- "behind": 1
+ "behind": 1,
+ "diff": {
+ "added": 1,
+ "deleted": 0
+ }
},
"worktree": {
"detached": false
@@ -149,7 +158,7 @@ exit_code: 0
"is_main": false,
"is_current": false,
"is_previous": false,
- "statusline": "feature-b \u001b[2m↕\u001b[22m \u001b[32m↑1\u001b[0m \u001b[2m\u001b[31m↓1\u001b[0m",
+ "statusline": "feature-b \u001b[2m↕\u001b[22m \u001b[32m↑1\u001b[0m \u001b[2m\u001b[31m↓1\u001b[0m ^\u001b[32m+1\u001b[0m",
"symbols": "↕"
},
{
@@ -176,7 +185,11 @@ exit_code: 0
"main_state": "diverged",
"main": {
"ahead": 1,
- "behind": 1
+ "behind": 1,
+ "diff": {
+ "added": 1,
+ "deleted": 0
+ }
},
"worktree": {
"detached": false
@@ -184,7 +197,7 @@ exit_code: 0
"is_main": false,
"is_current": false,
"is_previous": false,
- "statusline": "feature-c \u001b[2m↕\u001b[22m \u001b[32m↑1\u001b[0m \u001b[2m\u001b[31m↓1\u001b[0m",
+ "statusline": "feature-c \u001b[2m↕\u001b[22m \u001b[32m↑1\u001b[0m \u001b[2m\u001b[31m↓1\u001b[0m ^\u001b[32m+1\u001b[0m",
"symbols": "↕"
},
{
@@ -211,7 +224,11 @@ exit_code: 0
"main_state": "empty",
"main": {
"ahead": 0,
- "behind": 0
+ "behind": 0,
+ "diff": {
+ "added": 0,
+ "deleted": 0
+ }
},
"worktree": {
"detached": false
@@ -246,7 +263,11 @@ exit_code: 0
"main_state": "empty",
"main": {
"ahead": 0,
- "behind": 0
+ "behind": 0,
+ "diff": {
+ "added": 0,
+ "deleted": 0
+ }
},
"worktree": {
"detached": false
diff --git a/tests/snapshots/integration__integration_tests__list__list_large_diffs_alignment.snap b/tests/snapshots/integration__integration_tests__list__list_large_diffs_alignment.snap
index 3d2b97c0f..7f6cb8c87 100644
--- a/tests/snapshots/integration__integration_tests__list__list_large_diffs_alignment.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_large_diffs_alignment.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,14 +44,14 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-+ fix ? – 💬 ../repo.fix 05a4a45d 16h Initial commit
-+ diverged ! ↑ 💬 +40 -60 ↑1 ../repo.diverged 96d1fd92 1d Diverged commit
-+ feature-changes !? ↑ 🤖 +50 -100 ↑1 ../repo.feature-changes f5306ded 1d Add 100 lines
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
++ fix ? – 💬 ../repo.fix 05a4a45d 16h Initial commit
++ diverged ! ↑ 💬 +40 -60 ↑1 +60 ../repo.diverged 96d1fd92 1d Diverged commit
++ feature-changes !? ↑ 🤖 +50 -100 ↑1 +100 ../repo.feature-changes f5306ded 1d Add 100 lines
○ Showing 7 worktrees, 3 with changes, 5 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_locked_no_reason.snap b/tests/snapshots/integration__integration_tests__list__list_locked_no_reason.snap
index 15430db4c..1fe2b9453 100644
--- a/tests/snapshots/integration__integration_tests__list__list_locked_no_reason.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_locked_no_reason.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,12 +44,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-+ locked-no-reason ⊞_ ../repo.locked-no-reason 05a4a45d 16h Initial commit
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
++ locked-no-reason ⊞_ ../repo.locked-no-reason 05a4a45d 16h Initial commit
○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_locked_worktree.snap b/tests/snapshots/integration__integration_tests__list__list_locked_worktree.snap
index 15cb35e3f..19fc1967e 100644
--- a/tests/snapshots/integration__integration_tests__list__list_locked_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_locked_worktree.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,12 +44,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-+ locked-feature ⊞_ ../repo.locked-feature 05a4a45d 16h Initial commit
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
++ locked-feature ⊞_ ../repo.locked-feature 05a4a45d 16h Initial commit
○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_long_commit_message.snap b/tests/snapshots/integration__integration_tests__list__list_long_commit_message.snap
index 48de60ee1..69a9b39d7 100644
--- a/tests/snapshots/integration__integration_tests__list__list_long_commit_message.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_long_commit_message.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,11 +44,11 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^⇡ ⇡2 . 8cf0f3d3 1d Short message
-+ feature-a ↕ ↑1 ↓2 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↕ ↑1 ↓2 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↕ ↑1 ↓2 ../repo.feature-c 345c7c93 16h Add feature-c file
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^⇡ ⇡2 . 8cf0f3d3 1d Short message
++ feature-a ↕ ↑1 ↓2 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↕ ↑1 ↓2 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↕ ↑1 ↓2 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
○ Showing 4 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_many_worktrees_with_varied_stats.snap b/tests/snapshots/integration__integration_tests__list__list_many_worktrees_with_varied_stats.snap
index 726f79d6c..c2145cd1b 100644
--- a/tests/snapshots/integration__integration_tests__list__list_many_worktrees_with_varied_stats.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_many_worktrees_with_varied_stats.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,15 +44,15 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-+ medium-name _ ../repo.medium-name 05a4a45d 16h Initial commit
-+ short _ ../repo.short 05a4a45d 16h Initial commit
-+ very-long-branch-name-here _ ../repo.very-long-branch-name-here 05a4a45d 16h Initial commit
-+ with-changes _ ../repo.with-changes 05a4a45d 16h Initial commit
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
++ medium-name _ ../repo.medium-name 05a4a45d 16h Initial commit
++ short _ ../repo.short 05a4a45d 16h Initial commit
++ very-long-branch-name-here _ ../repo.very-long-branch-name-here 05a4a45d 16h Initial commit
++ with-changes _ ../repo.with-changes 05a4a45d 16h Initial commit
○ Showing 8 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_maximum_working_tree_symbols.snap b/tests/snapshots/integration__integration_tests__list__list_maximum_working_tree_symbols.snap
index 42e7de1c7..ecf2291e7 100644
--- a/tests/snapshots/integration__integration_tests__list__list_maximum_working_tree_symbols.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_maximum_working_tree_symbols.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,12 +44,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-+ feature +!? ↑ +2 -3 ↑1 ../repo.feature da422a12 1d Add files
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
++ feature +!? ↑ +2 -3 ↑1 +4 ../repo.feature da422a12 1d Add files
○ Showing 5 worktrees, 1 with changes, 4 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__list__list_multiple_worktrees.snap
index 1941317f6..37ceb9be6 100644
--- a/tests/snapshots/integration__integration_tests__list__list_multiple_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_multiple_worktrees.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,11 +44,11 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
○ Showing 4 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_nested_worktree_current_indicator.snap b/tests/snapshots/integration__integration_tests__list__list_nested_worktree_current_indicator.snap
index cf6e90f87..34cf2bf80 100644
--- a/tests/snapshots/integration__integration_tests__list__list_nested_worktree_current_indicator.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_nested_worktree_current_indicator.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,12 +44,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ feature ⚑_ ./.worktrees/feature 05a4a45d 16h Initial commit
-^ main ? ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ feature ⚑_ ./.worktrees/feature 05a4a45d 16h Initial commit
+^ main ? ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
○ Showing 5 worktrees, 1 with changes, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_no_progressive_flag.snap b/tests/snapshots/integration__integration_tests__list__list_no_progressive_flag.snap
index 222fb4b19..db20418c9 100644
--- a/tests/snapshots/integration__integration_tests__list__list_no_progressive_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_no_progressive_flag.snap
@@ -7,6 +7,7 @@ info:
- "--no-progressive"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -44,12 +45,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature _ ../repo.feature 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature _ ../repo.feature 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
○ Showing 5 worktrees, 3 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 a61306f2a..521ded888 100644
--- a/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,15 +44,15 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ feature-current ↑ ↑1 ../repo.feature-current f8d9dc91 23h Commit at 01:00
-^ main ^⇡ ⇡1 . 01cab36c 1d Initial commit on main
-+ feature-a ↕ ↑1 ↓1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↕ ↑1 ↓1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↕ ↑1 ↓1 ../repo.feature-c 345c7c93 16h Add feature-c file
-+ feature-newest ↑ ↑1 ../repo.feature-newest 57c29ea7 21h Commit at 03:00
-+ feature-middle ↑ ↑1 ../repo.feature-middle a63f3739 22h Commit at 02:00
-+ feature-oldest ↑ ↑1 ../repo.feature-oldest a9b3e5b7 23h Commit at 00:30
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ feature-current ↑ ↑1 +1 ../repo.feature-current f8d9dc91 23h Commit at 01:00
+^ main ^⇡ ⇡1 . 01cab36c 1d Initial commit on main
++ feature-a ↕ ↑1 ↓1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↕ ↑1 ↓1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↕ ↑1 ↓1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
++ feature-newest ↑ ↑1 +1 ../repo.feature-newest 57c29ea7 21h Commit at 03:00
++ feature-middle ↑ ↑1 +1 ../repo.feature-middle a63f3739 22h Commit at 02:00
++ feature-oldest ↑ ↑1 +1 ../repo.feature-oldest a9b3e5b7 23h Commit at 00:30
○ Showing 8 worktrees, 7 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_previous_worktree_gutter.snap b/tests/snapshots/integration__integration_tests__list__list_previous_worktree_gutter.snap
index a8f57fdf5..d7253f9d0 100644
--- a/tests/snapshots/integration__integration_tests__list__list_previous_worktree_gutter.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_previous_worktree_gutter.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,12 +44,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature _ ../repo.feature 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature _ ../repo.feature 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
○ Showing 5 worktrees, 3 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 418887135..e1e65d027 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
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,11 +44,11 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ develop ⚑^ . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ develop ⚑^ . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
○ Showing 4 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_progressive_flag.snap b/tests/snapshots/integration__integration_tests__list__list_progressive_flag.snap
index e1fb2c1ff..cbc787993 100644
--- a/tests/snapshots/integration__integration_tests__list__list_progressive_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_progressive_flag.snap
@@ -7,6 +7,7 @@ info:
- "--progressive"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -44,11 +45,11 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
○ Showing 4 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_progressive_with_branches.snap b/tests/snapshots/integration__integration_tests__list__list_progressive_with_branches.snap
index 357cb25d0..38c69df67 100644
--- a/tests/snapshots/integration__integration_tests__list__list_progressive_with_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_progressive_with_branches.snap
@@ -8,6 +8,7 @@ info:
- "--branches"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -45,13 +46,13 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-/ orphan-1 /_ 05a4a45d 16h Initial commit
-/ orphan-2 /_ 05a4a45d 16h Initial commit
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
+/ orphan-1 /_ 05a4a45d 16h Initial commit
+/ orphan-2 /_ 05a4a45d 16h Initial commit
○ Showing 4 worktrees, 2 branches, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_shows_warning_on_git_error.snap b/tests/snapshots/integration__integration_tests__list__list_shows_warning_on_git_error.snap
index 17c249915..1b9603b82 100644
--- a/tests/snapshots/integration__integration_tests__list__list_shows_warning_on_git_error.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_shows_warning_on_git_error.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,20 +44,21 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^· · . 05a4a45d · ·
-+ feature · ··· · · · ../repo.feature 00000000 · ·
-+ feature-a ↑· ↑1 · ../repo.feature-a 1b87d473 · ·
-+ feature-b ↑· ↑1 · ../repo.feature-b f62940fc · ·
-+ feature-c ↑· ↑1 · ../repo.feature-c 345c7c93 · ·
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^· · . 05a4a45d · ·
++ feature · ··· · · · · ../repo.feature 00000000 · ·
++ feature-a ↑· ↑1 +1 · ../repo.feature-a 1b87d473 · ·
++ feature-b ↑· ↑1 +1 · ../repo.feature-b f62940fc · ·
++ feature-c ↑· ↑1 +1 · ../repo.feature-c 345c7c93 · ·
-○ Showing 5 worktrees, 3 ahead. 9 tasks failed
+○ Showing 5 worktrees, 3 ahead. 10 tasks failed
----- stderr -----
▲ Failed to batch-fetch commit details: fatal: bad object 0000000000000000000000000000000000000001
▲ Some git operations failed:
  main: upstream (fatal: missing object 0000000000000000000000000000000000000001 for refs/heads/feature)
  feature: ahead-behind (git merge-base failed for 05a4a45d0b981dad5c27db59dca482836d59f89e 0000000000000000000000000000000000000001: fatal: Not a valid commit name 0000000000000000000000000000000000000001)
+  feature: branch-diff (git merge-base failed for 05a4a45d0b981dad5c27db59dca482836d59f89e 0000000000000000000000000000000000000001: fatal: Not a valid commit name 0000000000000000000000000000000000000001)
  feature: working-tree-diff (fatal: bad object HEAD)
  feature: merge-tree-conflicts (fatal: bad object HEAD)
  feature: working-tree-conflicts (fatal: bad object HEAD)
diff --git a/tests/snapshots/integration__integration_tests__list__list_single_worktree.snap b/tests/snapshots/integration__integration_tests__list__list_single_worktree.snap
index 1941317f6..37ceb9be6 100644
--- a/tests/snapshots/integration__integration_tests__list__list_single_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_single_worktree.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,11 +44,11 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
○ Showing 4 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_skips_operations_for_prunable_worktrees.snap b/tests/snapshots/integration__integration_tests__list__list_skips_operations_for_prunable_worktrees.snap
index 6595cbbeb..88680a609 100644
--- a/tests/snapshots/integration__integration_tests__list__list_skips_operations_for_prunable_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_skips_operations_for_prunable_worktrees.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,12 +44,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature ⊟ · · · ../repo.feature 05a4a45d · ·
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature ⊟ · · · · ../repo.feature 05a4a45d · ·
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_status_column_padding_with_emoji.snap b/tests/snapshots/integration__integration_tests__list__list_status_column_padding_with_emoji.snap
index 0c6cd35cd..5c0c0c9be 100644
--- a/tests/snapshots/integration__integration_tests__list__list_status_column_padding_with_emoji.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_status_column_padding_with_emoji.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,14 +44,14 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-+ main-symbol ↑ 💬 ↑1 ../repo.main-symbol 113f1df5 1d Symbol commit
-+ pr-link ↑ 🤖 ↑1 ../repo.pr-link 152b5dea 1d PR commit
-+ wli-sequence !? ↑ 🤖 +1 -112 ↑1 ../repo.wli-sequence 4353e28e 1d Initial content
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
++ main-symbol ↑ 💬 ↑1 +1 ../repo.main-symbol 113f1df5 1d Symbol commit
++ pr-link ↑ 🤖 ↑1 +1 ../repo.pr-link 152b5dea 1d PR commit
++ wli-sequence !? ↑ 🤖 +1 -112 ↑1 +200 ../repo.wli-sequence 4353e28e 1d Initial content
○ Showing 7 worktrees, 1 with changes, 6 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_task_dag_detached_head.snap b/tests/snapshots/integration__integration_tests__list__list_task_dag_detached_head.snap
index ce6824a59..73ebcb4b3 100644
--- a/tests/snapshots/integration__integration_tests__list__list_task_dag_detached_head.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_task_dag_detached_head.snap
@@ -7,6 +7,7 @@ info:
- "--progressive"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -44,11 +45,11 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ - ⚑^ . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ - ⚑^ . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
○ Showing 4 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_task_dag_many_worktrees.snap b/tests/snapshots/integration__integration_tests__list__list_task_dag_many_worktrees.snap
index d87ed669e..a16c3a2b3 100644
--- a/tests/snapshots/integration__integration_tests__list__list_task_dag_many_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_task_dag_many_worktrees.snap
@@ -7,6 +7,7 @@ info:
- "--progressive"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -44,21 +45,21 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-1 _ ../repo.feature-1 05a4a45d 16h Initial commit
-+ feature-10 _ ../repo.feature-10 05a4a45d 16h Initial commit
-+ feature-2 _ ../repo.feature-2 05a4a45d 16h Initial commit
-+ feature-3 _ ../repo.feature-3 05a4a45d 16h Initial commit
-+ feature-4 _ ../repo.feature-4 05a4a45d 16h Initial commit
-+ feature-5 _ ../repo.feature-5 05a4a45d 16h Initial commit
-+ feature-6 _ ../repo.feature-6 05a4a45d 16h Initial commit
-+ feature-7 _ ../repo.feature-7 05a4a45d 16h Initial commit
-+ feature-8 _ ../repo.feature-8 05a4a45d 16h Initial commit
-+ feature-9 _ ../repo.feature-9 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-1 _ ../repo.feature-1 05a4a45d 16h Initial commit
++ feature-10 _ ../repo.feature-10 05a4a45d 16h Initial commit
++ feature-2 _ ../repo.feature-2 05a4a45d 16h Initial commit
++ feature-3 _ ../repo.feature-3 05a4a45d 16h Initial commit
++ feature-4 _ ../repo.feature-4 05a4a45d 16h Initial commit
++ feature-5 _ ../repo.feature-5 05a4a45d 16h Initial commit
++ feature-6 _ ../repo.feature-6 05a4a45d 16h Initial commit
++ feature-7 _ ../repo.feature-7 05a4a45d 16h Initial commit
++ feature-8 _ ../repo.feature-8 05a4a45d 16h Initial commit
++ feature-9 _ ../repo.feature-9 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
○ Showing 14 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_task_dag_multiple_worktrees.snap b/tests/snapshots/integration__integration_tests__list__list_task_dag_multiple_worktrees.snap
index e1fb2c1ff..cbc787993 100644
--- a/tests/snapshots/integration__integration_tests__list__list_task_dag_multiple_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_task_dag_multiple_worktrees.snap
@@ -7,6 +7,7 @@ info:
- "--progressive"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -44,11 +45,11 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
○ Showing 4 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_task_dag_single_worktree.snap b/tests/snapshots/integration__integration_tests__list__list_task_dag_single_worktree.snap
index e1fb2c1ff..cbc787993 100644
--- a/tests/snapshots/integration__integration_tests__list__list_task_dag_single_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_task_dag_single_worktree.snap
@@ -7,6 +7,7 @@ info:
- "--progressive"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -44,11 +45,11 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
○ Showing 4 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_task_dag_with_locked_worktree.snap b/tests/snapshots/integration__integration_tests__list__list_task_dag_with_locked_worktree.snap
index 28bdc2c02..a63883e7c 100644
--- a/tests/snapshots/integration__integration_tests__list__list_task_dag_with_locked_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_task_dag_with_locked_worktree.snap
@@ -7,6 +7,7 @@ info:
- "--progressive"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -44,13 +45,13 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-+ locked ⊞_ ../repo.locked 05a4a45d 16h Initial commit
-+ normal _ ../repo.normal 05a4a45d 16h Initial commit
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
++ locked ⊞_ ../repo.locked 05a4a45d 16h Initial commit
++ normal _ ../repo.normal 05a4a45d 16h Initial commit
○ Showing 6 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_unicode_commit_message.snap b/tests/snapshots/integration__integration_tests__list__list_unicode_commit_message.snap
index 120236b8f..600c3667c 100644
--- a/tests/snapshots/integration__integration_tests__list__list_unicode_commit_message.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_unicode_commit_message.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,12 +44,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^⇡ ⇡2 . ba0edbd5 1d Fix bug with café ☕ handling
-+ feature-a ↕ ↑1 ↓2 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↕ ↑1 ↓2 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↕ ↑1 ↓2 ../repo.feature-c 345c7c93 16h Add feature-c file
-+ feature-test ⊂ ↓1 ../repo.feature-test 4b80044d 1d Add support for 日本語 and émoji 🎉
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^⇡ ⇡2 . ba0edbd5 1d Fix bug with café ☕ handling
++ feature-a ↕ ↑1 ↓2 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↕ ↑1 ↓2 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↕ ↑1 ↓2 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
++ feature-test ⊂ ↓1 ../repo.feature-test 4b80044d 1d Add support for 日本語 and émoji 🎉
○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_user_marker_with_special_characters.snap b/tests/snapshots/integration__integration_tests__list__list_user_marker_with_special_characters.snap
index c3e06d442..3ee64de74 100644
--- a/tests/snapshots/integration__integration_tests__list__list_user_marker_with_special_characters.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_user_marker_with_special_characters.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,13 +44,13 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ emoji _ 🔄 ../repo.emoji 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-+ multi _ 👨‍💻 ../repo.multi 05a4a45d 16h Initial commit
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ emoji _ 🔄 ../repo.emoji 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
++ multi _ 👨‍💻 ../repo.multi 05a4a45d 16h Initial commit
○ Showing 6 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_warns_when_commit_details_batch_fails.snap b/tests/snapshots/integration__integration_tests__list__list_warns_when_commit_details_batch_fails.snap
index 8623ad6cb..e458b64cb 100644
--- a/tests/snapshots/integration__integration_tests__list__list_warns_when_commit_details_batch_fails.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_warns_when_commit_details_batch_fails.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,20 +44,21 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d · ·
-+ - · ·· · · ../repo.feature 00000000 · ·
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 · ·
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc · ·
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 · ·
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d · ·
++ - · ·· · · · ../repo.feature 00000000 · ·
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 · ·
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc · ·
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 · ·
-○ Showing 5 worktrees, 3 ahead. 5 tasks failed
+○ Showing 5 worktrees, 3 ahead. 6 tasks failed
----- stderr -----
▲ Failed to batch-fetch commit details: fatal: bad object 0000000000000000000000000000000000000001
▲ Some git operations failed:
  (detached): ahead-behind (git merge-base failed for 05a4a45d0b981dad5c27db59dca482836d59f89e 0000000000000000000000000000000000000001: fatal: Not a valid commit name 0000000000000000000000000000000000000001)
  (detached): committed-trees-match (fatal: ambiguous argument '0000000000000000000000000000000000000001^{tree}': unknown revision or path not in the working tree.)
+  (detached): branch-diff (git merge-base failed for 05a4a45d0b981dad5c27db59dca482836d59f89e 0000000000000000000000000000000000000001: fatal: Not a valid commit name 0000000000000000000000000000000000000001)
  (detached): working-tree-diff (fatal: bad object HEAD)
  (detached): merge-tree-conflicts (fatal: bad object HEAD)
  (detached): working-tree-conflicts (fatal: bad object HEAD)
diff --git a/tests/snapshots/integration__integration_tests__list__list_warns_when_default_branch_missing_worktree.snap b/tests/snapshots/integration__integration_tests__list__list_warns_when_default_branch_missing_worktree.snap
index 418887135..e1e65d027 100644
--- a/tests/snapshots/integration__integration_tests__list__list_warns_when_default_branch_missing_worktree.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_warns_when_default_branch_missing_worktree.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,11 +44,11 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ develop ⚑^ . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ develop ⚑^ . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
○ Showing 4 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_with_branches_flag.snap b/tests/snapshots/integration__integration_tests__list__list_with_branches_flag.snap
index 9b23f993b..1cc70b555 100644
--- a/tests/snapshots/integration__integration_tests__list__list_with_branches_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_with_branches_flag.snap
@@ -7,6 +7,7 @@ info:
- "--branches"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -44,15 +45,15 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-+ feature-with-worktree _ ../repo.feature-with-worktree 05a4a45d 16h Initial commit
-/ another-branch /_ 05a4a45d 16h Initial commit
-/ feature-without-worktree /_ 05a4a45d 16h Initial commit
-/ fix-bug /_ 05a4a45d 16h Initial commit
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
++ feature-with-worktree _ ../repo.feature-with-worktree 05a4a45d 16h Initial commit
+/ another-branch /_ 05a4a45d 16h Initial commit
+/ feature-without-worktree /_ 05a4a45d 16h Initial commit
+/ fix-bug /_ 05a4a45d 16h Initial commit
○ Showing 5 worktrees, 3 branches, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_with_branches_flag_no_available.snap b/tests/snapshots/integration__integration_tests__list__list_with_branches_flag_no_available.snap
index 5c3921d76..18d054c17 100644
--- a/tests/snapshots/integration__integration_tests__list__list_with_branches_flag_no_available.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_with_branches_flag_no_available.snap
@@ -7,6 +7,7 @@ info:
- "--branches"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -44,11 +45,11 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
○ Showing 4 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_with_branches_flag_only_branches.snap b/tests/snapshots/integration__integration_tests__list__list_with_branches_flag_only_branches.snap
index a58df72fc..2ac24ff3d 100644
--- a/tests/snapshots/integration__integration_tests__list__list_with_branches_flag_only_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_with_branches_flag_only_branches.snap
@@ -7,6 +7,7 @@ info:
- "--branches"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -44,14 +45,14 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-/ branch-alpha /_ 05a4a45d 16h Initial commit
-/ branch-beta /_ 05a4a45d 16h Initial commit
-/ branch-gamma /_ 05a4a45d 16h Initial commit
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
+/ branch-alpha /_ 05a4a45d 16h Initial commit
+/ branch-beta /_ 05a4a45d 16h Initial commit
+/ branch-gamma /_ 05a4a45d 16h Initial commit
○ Showing 4 worktrees, 3 branches, 3 ahead
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 712d6d43c..e1541886b 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
@@ -33,11 +33,11 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
○ Showing 4 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_with_nonexistent_default_branch.snap b/tests/snapshots/integration__integration_tests__list__list_with_nonexistent_default_branch.snap
index 939c2fee5..30bde4ac7 100644
--- a/tests/snapshots/integration__integration_tests__list__list_with_nonexistent_default_branch.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_with_nonexistent_default_branch.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,11 +44,11 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ⚑^| | . 05a4a45d 16h Initial commit
-+ feature-a ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ../repo.feature-c 345c7c93 16h Add feature-c file
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ⚑^| | . 05a4a45d 16h Initial commit
++ feature-a ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ../repo.feature-c 345c7c93 16h Add feature-c file
○ Showing 4 worktrees
diff --git a/tests/snapshots/integration__integration_tests__list__list_with_remotes_and_branches.snap b/tests/snapshots/integration__integration_tests__list__list_with_remotes_and_branches.snap
index be04b3748..969c5eebd 100644
--- a/tests/snapshots/integration__integration_tests__list__list_with_remotes_and_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_with_remotes_and_branches.snap
@@ -8,6 +8,7 @@ info:
- "--remotes"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -45,15 +46,15 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-/ local-only-1 /_ 05a4a45d 16h Initial commit
-/ local-only-2 /_ 05a4a45d 16h Initial commit
-| origin/remote-only-1 /_ 05a4a45d 16h Initial commit
-| origin/remote-only-2 /_ 05a4a45d 16h Initial commit
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
+/ local-only-1 /_ 05a4a45d 16h Initial commit
+/ local-only-2 /_ 05a4a45d 16h Initial commit
+| origin/remote-only-1 /_ 05a4a45d 16h Initial commit
+| origin/remote-only-2 /_ 05a4a45d 16h Initial commit
○ Showing 4 worktrees, 2 branches, 2 remote branches, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_with_remotes_filters_tracked_branches.snap b/tests/snapshots/integration__integration_tests__list__list_with_remotes_filters_tracked_branches.snap
index 5d93638d9..731e2ed26 100644
--- a/tests/snapshots/integration__integration_tests__list__list_with_remotes_filters_tracked_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_with_remotes_filters_tracked_branches.snap
@@ -7,6 +7,7 @@ info:
- "--remotes"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -44,12 +45,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-| origin/remote-only /_ 05a4a45d 16h Initial commit
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
+| origin/remote-only /_ 05a4a45d 16h Initial commit
○ Showing 4 worktrees, 1 remote branches, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_with_remotes_filters_tracked_worktrees.snap b/tests/snapshots/integration__integration_tests__list__list_with_remotes_filters_tracked_worktrees.snap
index 5831353aa..14ce3741b 100644
--- a/tests/snapshots/integration__integration_tests__list__list_with_remotes_filters_tracked_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_with_remotes_filters_tracked_worktrees.snap
@@ -7,6 +7,7 @@ info:
- "--remotes"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -44,13 +45,13 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-+ feature-with-worktree _| | ../repo.feature-with-worktree 05a4a45d 16h Initial commit
-| origin/remote-only /_ 05a4a45d 16h Initial commit
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
++ feature-with-worktree _| | ../repo.feature-with-worktree 05a4a45d 16h Initial commit
+| origin/remote-only /_ 05a4a45d 16h Initial commit
○ Showing 5 worktrees, 1 remote branches, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_with_remotes_flag.snap b/tests/snapshots/integration__integration_tests__list__list_with_remotes_flag.snap
index 32fc190e2..c4705dd99 100644
--- a/tests/snapshots/integration__integration_tests__list__list_with_remotes_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_with_remotes_flag.snap
@@ -7,6 +7,7 @@ info:
- "--remotes"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -44,13 +45,13 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-| origin/remote-feature-1 /_ 05a4a45d 16h Initial commit
-| origin/remote-feature-2 /_ 05a4a45d 16h Initial commit
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
+| origin/remote-feature-1 /_ 05a4a45d 16h Initial commit
+| origin/remote-feature-2 /_ 05a4a45d 16h Initial commit
○ Showing 4 worktrees, 2 remote branches, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_with_user_marker.snap b/tests/snapshots/integration__integration_tests__list__list_with_user_marker.snap
index 620cd3a7a..ebdb20bb7 100644
--- a/tests/snapshots/integration__integration_tests__list__list_with_user_marker.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_with_user_marker.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,11 +44,11 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^⇡ ⇡1 . 33323bc1 1d Initial commit
-+ feature-api ↑ 🤖 ↑1 ../repo.feature-api 70343f03 1d Add REST API endpoints
-+ review-ui ? ↑ 💬 ↑1 ../repo.review-ui a585d6ed 1d Add dashboard component
-+ wip-docs ? – ../repo.wip-docs 33323bc1 1d Initial commit
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^⇡ ⇡1 . 33323bc1 1d Initial commit
++ feature-api ↑ 🤖 ↑1 +1 ../repo.feature-api 70343f03 1d Add REST API endpoints
++ review-ui ? ↑ 💬 ↑1 +1 ../repo.review-ui a585d6ed 1d Add dashboard component
++ wip-docs ? – ../repo.wip-docs 33323bc1 1d Initial commit
○ Showing 4 worktrees, 2 with changes, 2 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__quickstart_list.snap b/tests/snapshots/integration__integration_tests__list__quickstart_list.snap
index 29b297553..633577cf9 100644
--- a/tests/snapshots/integration__integration_tests__list__quickstart_list.snap
+++ b/tests/snapshots/integration__integration_tests__list__quickstart_list.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "98"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,9 +44,9 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Commit Age Message
-@ feature-auth + ↑ +27 -8 ↑1 4bc72dc9 2h Add authentication module
-^ main ^⇡ ⇡1 0e631add 1d Initial commit
+ Branch Status HEAD± main↕ main…± Remote⇅ Commit Age Message
+@ feature-auth + ↑ +27 -8 ↑1 +31 4bc72dc9 2h Add authenticat…
+^ main ^⇡ ⇡1 0e631add 1d Initial commit
○ Showing 2 worktrees, 1 with changes, 1 ahead, 1 column hidden
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 b12096876..f6d1240cd 100644
--- a/tests/snapshots/integration__integration_tests__list__readme_example_list.snap
+++ b/tests/snapshots/integration__integration_tests__list__readme_example_list.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "98"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,11 +44,11 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Commit Age Message
-@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 ⇡3 6814f02a 30m Add API tests
-^ main ^⇅ ⇡1 ⇣1 41ee0834 4d Merge fix-auth: hardened to…
-+ fix-auth ↕| ↑2 ↓1 | b772e68b 5h Add secure token storage
-+ fix-typos _| | 41ee0834 4d Merge fix-auth: hardened to…
+ Branch Status HEAD± main↕ main…± Remote⇅ Commit Age Message
+@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 +234 -24 ⇡3 6814f02a 30m Add API tests
+^ main ^⇅ ⇡1 ⇣1 41ee0834 4d Merge fix-auth:…
++ fix-auth ↕| ↑2 ↓1 +25 -11 | b772e68b 5h Add secure token…
++ fix-typos _| | 41ee0834 4d Merge fix-auth:…
○ Showing 4 worktrees, 1 with changes, 2 ahead, 1 column hidden
diff --git a/tests/snapshots/integration__integration_tests__list__readme_example_list_marker.snap b/tests/snapshots/integration__integration_tests__list__readme_example_list_marker.snap
index a081cb769..a33d45bc3 100644
--- a/tests/snapshots/integration__integration_tests__list__readme_example_list_marker.snap
+++ b/tests/snapshots/integration__integration_tests__list__readme_example_list_marker.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "98"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,11 +44,11 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Commit Age Message
-@ main ^⇡ ⇡1 33323bc1 1d Initial commit
-+ feature-api ↑ 🤖 ↑1 70343f03 1d Add REST API endpoints
-+ review-ui ? ↑ 💬 ↑1 a585d6ed 1d Add dashboard component
-+ wip-docs ? – 33323bc1 1d Initial commit
+ Branch Status HEAD± main↕ main…± Remote⇅ Commit Age Message
+@ main ^⇡ ⇡1 33323bc1 1d Initial commit
++ feature-api ↑ 🤖 ↑1 +1 70343f03 1d Add REST API end…
++ review-ui ? ↑ 💬 ↑1 +1 a585d6ed 1d Add dashboard co…
++ wip-docs ? – 33323bc1 1d Initial commit
○ Showing 4 worktrees, 2 with changes, 2 ahead, 1 column hidden
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 952f9dece..15cfd2b7b 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
@@ -7,6 +7,7 @@ info:
- "--progressive"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -44,15 +45,15 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ feature-current ↑ ↑1 ../repo.feature-current f8d9dc91 23h Commit at 01:00
-^ main ^⇡ ⇡1 . 01cab36c 1d Initial commit on main
-+ feature-a ↕ ↑1 ↓1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↕ ↑1 ↓1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↕ ↑1 ↓1 ../repo.feature-c 345c7c93 16h Add feature-c file
-+ feature-newest ↑ ↑1 ../repo.feature-newest 57c29ea7 21h Commit at 03:00
-+ feature-middle ↑ ↑1 ../repo.feature-middle a63f3739 22h Commit at 02:00
-+ feature-oldest ↑ ↑1 ../repo.feature-oldest a9b3e5b7 23h Commit at 00:30
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ feature-current ↑ ↑1 +1 ../repo.feature-current f8d9dc91 23h Commit at 01:00
+^ main ^⇡ ⇡1 . 01cab36c 1d Initial commit on main
++ feature-a ↕ ↑1 ↓1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↕ ↑1 ↓1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↕ ↑1 ↓1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
++ feature-newest ↑ ↑1 +1 ../repo.feature-newest 57c29ea7 21h Commit at 03:00
++ feature-middle ↑ ↑1 +1 ../repo.feature-middle a63f3739 22h Commit at 02:00
++ feature-oldest ↑ ↑1 +1 ../repo.feature-oldest a9b3e5b7 23h Commit at 00:30
○ Showing 8 worktrees, 7 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__tips_dev_server_workflow.snap b/tests/snapshots/integration__integration_tests__list__tips_dev_server_workflow.snap
index 8cd5172ae..45ef21148 100644
--- a/tests/snapshots/integration__integration_tests__list__tips_dev_server_workflow.snap
+++ b/tests/snapshots/integration__integration_tests__list__tips_dev_server_workflow.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "98"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,12 +44,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ URL Commit Age
-@ main ? ^⇅ ⇡1 ⇣1 http://localhost:12107 41ee0834 4d
-+ feature-api + ↕⇡ +54 -5 ↑4 ↓1 ⇡3 http://localhost:10703 6814f02a 30m
-+ fix-auth ↕| ↑2 ↓1 | http://localhost:16460 b772e68b 5h
-+ fix-typos _| | http://localhost:14301 41ee0834 4d
+ Branch Status HEAD± main↕ main…± Remote⇅ URL Commit
+@ main ? ^⇅ ⇡1 ⇣1 http://localhost:12107 41ee0834
++ feature-api + ↕⇡ +54 -5 ↑4 ↓1 +234 -24 ⇡3 http://localhost:10703 6814f02a
++ fix-auth ↕| ↑2 ↓1 +25 -11 | http://localhost:16460 b772e68b
++ fix-typos _| | http://localhost:14301 41ee0834
-○ Showing 4 worktrees, 2 with changes, 2 ahead, 2 columns hidden
+○ Showing 4 worktrees, 2 with changes, 2 ahead, 3 columns hidden
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__list__working_tree_conflicts_without_full.snap b/tests/snapshots/integration__integration_tests__list__working_tree_conflicts_without_full.snap
index ef6108d60..23fc7b7d1 100644
--- a/tests/snapshots/integration__integration_tests__list__working_tree_conflicts_without_full.snap
+++ b/tests/snapshots/integration__integration_tests__list__working_tree_conflicts_without_full.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,12 +44,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^⇡ ⇡2 . 1edd043e 1d Main changes shared.txt
-+ feature-a ↕ ↑1 ↓2 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↕ ↑1 ↓2 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↕ ↑1 ↓2 ../repo.feature-c 345c7c93 16h Add feature-c file
-+ feature ! ✗ +1 -1 ↓1 ../repo.feature a756a743 1d Initial commit
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^⇡ ⇡2 . 1edd043e 1d Main changes shared.txt
++ feature-a ↕ ↑1 ↓2 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↕ ↑1 ↓2 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↕ ↑1 ↓2 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
++ feature ! ✗ +1 -1 ↓1 ../repo.feature a756a743 1d Initial commit
○ Showing 5 worktrees, 1 with changes, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_alignment_with_header.snap b/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_alignment_with_header.snap
index f1c1312b6..3e69c9125 100644
--- a/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_alignment_with_header.snap
+++ b/tests/snapshots/integration__integration_tests__list_column_alignment__status_column_alignment_with_header.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,12 +44,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-+ test !? ↑ +1 -1 ↑1 ../repo.test 572ec619 1d Test
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
++ test !? ↑ +1 -1 ↑1 +1 -1 ../repo.test 572ec619 1d Test
○ Showing 5 worktrees, 1 with changes, 4 ahead
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 8e88822fb..f535831f9 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
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,13 +44,13 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-+ complex + ? ↑ +1 -1 ↑1 ../repo.complex 0fdc439a 1d Complex
-+ simple ? ↑ ↑1 ../repo.simple 42a9d012 1d Simple
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
++ complex + ? ↑ +1 -1 ↑1 +1 -1 ../repo.complex 0fdc439a 1d Complex
++ simple ? ↑ ↑1 +1 -1 ../repo.simple 42a9d012 1d Simple
○ Showing 6 worktrees, 2 with changes, 5 ahead
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 d688117dc..4475e05ea 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
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,12 +44,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-/ feature /_ 05a4a45d 16h Initial commit
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
+/ feature /_ 05a4a45d 16h Initial commit
○ Showing 4 worktrees, 1 branches, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_branches_flag_overrides_file.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_branches_flag_overrides_file.snap
index f7b3c1805..bdfdccd74 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_branches_flag_overrides_file.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_branches_flag_overrides_file.snap
@@ -7,6 +7,7 @@ info:
- "--branches"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -44,12 +45,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-/ feature /_ 05a4a45d 16h Initial commit
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
+/ feature /_ 05a4a45d 16h Initial commit
○ Showing 4 worktrees, 1 branches, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override_after_subcommand.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override_after_subcommand.snap
index fbd648912..5fb8b0504 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override_after_subcommand.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override_after_subcommand.snap
@@ -8,6 +8,7 @@ info:
- list.branches = true
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -45,12 +46,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-/ feature /_ 05a4a45d 16h Initial commit
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
+/ feature /_ 05a4a45d 16h Initial commit
○ Showing 4 worktrees, 1 branches, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override_beats_file.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override_beats_file.snap
index 2cee0d325..6f1c6bd61 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override_beats_file.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override_beats_file.snap
@@ -3,11 +3,12 @@ source: tests/integration_tests/list_config.rs
info:
program: wt
args:
- - "-c"
+ - "--config-set"
- list.branches = true
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -45,12 +46,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-/ feature /_ 05a4a45d 16h Initial commit
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
+/ feature /_ 05a4a45d 16h Initial commit
○ Showing 4 worktrees, 1 branches, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override_deprecated_key_silently_migrated.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override_deprecated_key_silently_migrated.snap
index 6fc2da7b1..be03323af 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override_deprecated_key_silently_migrated.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override_deprecated_key_silently_migrated.snap
@@ -8,6 +8,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -45,12 +46,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-/ feature /_ 05a4a45d 16h Initial commit
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
+/ feature /_ 05a4a45d 16h Initial commit
○ Showing 4 worktrees, 1 branches, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override_malformed_warns_on_stderr.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override_malformed_warns_on_stderr.snap
index 0358b06db..55e492848 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override_malformed_warns_on_stderr.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_cli_override_malformed_warns_on_stderr.snap
@@ -8,6 +8,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -45,12 +46,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-/ feature /_ 05a4a45d 16h Initial commit
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
+/ feature /_ 05a4a45d 16h Initial commit
○ Showing 4 worktrees, 1 branches, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_columns_env_override_not_yet_supported.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_columns_env_override_not_yet_supported.snap
index f2c284f02..ebb64349e 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_columns_env_override_not_yet_supported.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_columns_env_override_not_yet_supported.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "200"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -44,11 +45,11 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
○ Showing 4 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_env_deprecated_type_mismatch_drops_layer.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_env_deprecated_type_mismatch_drops_layer.snap
index 45d81ff5d..49afa4068 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_env_deprecated_type_mismatch_drops_layer.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_env_deprecated_type_mismatch_drops_layer.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -44,11 +45,11 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
○ Showing 4 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_env_override_bad_value_preserves_file_config.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_env_override_bad_value_preserves_file_config.snap
index 856dead9f..55637c07e 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_env_override_bad_value_preserves_file_config.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_env_override_bad_value_preserves_file_config.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -44,12 +45,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-/ feature /_ 05a4a45d 16h Initial commit
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
+/ feature /_ 05a4a45d 16h Initial commit
○ Showing 4 worktrees, 1 branches, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_env_override_bad_value_warns_on_stderr.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_env_override_bad_value_warns_on_stderr.snap
index ac8f5792e..00f5b4d2d 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_env_override_bad_value_warns_on_stderr.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_env_override_bad_value_warns_on_stderr.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -44,11 +45,11 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
○ Showing 4 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_env_override_preserves_file_fields.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_env_override_preserves_file_fields.snap
index 6a1434127..ed1fa5b5b 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_env_override_preserves_file_fields.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_env_override_preserves_file_fields.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -44,12 +45,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-/ feature /_ 05a4a45d 16h Initial commit
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
+/ feature /_ 05a4a45d 16h Initial commit
○ Showing 4 worktrees, 1 branches, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_env_override_validation_failure.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_env_override_validation_failure.snap
index 7ece85e36..8a41be75a 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_env_override_validation_failure.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_env_override_validation_failure.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -44,11 +45,11 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
○ Showing 4 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_malformed_config_warns_on_stderr.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_malformed_config_warns_on_stderr.snap
index 9eda86fc7..a3a10cdc9 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_malformed_config_warns_on_stderr.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_malformed_config_warns_on_stderr.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,11 +44,11 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
○ Showing 4 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_malformed_non_section_field_warns_on_stderr.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_malformed_non_section_field_warns_on_stderr.snap
index 7d6272f17..9100a4b8d 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_malformed_non_section_field_warns_on_stderr.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_malformed_non_section_field_warns_on_stderr.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,11 +44,11 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
○ Showing 4 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_malformed_system_config_non_section_field.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_malformed_system_config_non_section_field.snap
index b30d84daa..9dba88561 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_malformed_system_config_non_section_field.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_malformed_system_config_non_section_field.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,11 +44,11 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ? ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ? ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
○ Showing 4 worktrees, 1 with changes, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_malformed_system_config_warns_on_stderr.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_malformed_system_config_warns_on_stderr.snap
index db5bd7103..0e5d6c31b 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_malformed_system_config_warns_on_stderr.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_malformed_system_config_warns_on_stderr.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,11 +44,11 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ? ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ? ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
○ Showing 4 worktrees, 1 with changes, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_config_validation_error_warns_on_stderr.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_validation_error_warns_on_stderr.snap
index 8634bf84a..114b35921 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_validation_error_warns_on_stderr.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_validation_error_warns_on_stderr.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,11 +44,11 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
○ Showing 4 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_custom_column_empty_everywhere_dropped.snap b/tests/snapshots/integration__integration_tests__list_config__list_custom_column_empty_everywhere_dropped.snap
index 2addc3b0a..397c5bd61 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_custom_column_empty_everywhere_dropped.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_custom_column_empty_everywhere_dropped.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,11 +44,11 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
○ Showing 4 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_custom_columns.snap b/tests/snapshots/integration__integration_tests__list_config__list_custom_columns.snap
index ce6b80b40..d43ea9b9d 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_custom_columns.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_custom_columns.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,11 +44,11 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Ticket Codename Commit Age Message
-@ main ^| | . mellow-kite 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a JIRA-1234 fearless-iguanodon 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b spirited-mink f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c secure-sicklebill 345c7c93 16h Add feature-c file
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Ticket Codename Commit Age Message
+@ main ^| | . mellow-kite 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a JIRA-1234 fearless-iguanodon 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b spirited-mink f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c secure-sicklebill 345c7c93 16h Add feature-c file
○ Showing 4 worktrees, 3 ahead
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 2addc3b0a..397c5bd61 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
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,11 +44,11 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
○ Showing 4 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list_config__list_project_url_column.snap b/tests/snapshots/integration__integration_tests__list_config__list_project_url_column.snap
index 6b2bed4af..b89c237e6 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_project_url_column.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_project_url_column.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,11 +44,11 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path URL Commit Age Message
-@ main ? ^| | . http://localhost:12107 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a http://localhost:11521 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b http://localhost:14072 f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c http://localhost:14303 345c7c93 16h Add feature-c file
+ Branch Status HEAD± main↕ main…± Remote⇅ Path URL Commit Age Message
+@ main ? ^| | . http://localhost:12107 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a http://localhost:11521 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b http://localhost:14072 f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c http://localhost:14303 345c7c93 16h Add feature-c file
○ Showing 4 worktrees, 1 with changes, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__security__commit_message_with_directive_not_executed.snap b/tests/snapshots/integration__integration_tests__security__commit_message_with_directive_not_executed.snap
index 7c2222181..1e724659e 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
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,12 +44,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^⇡ ⇡1 . 252b848b 1d Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
-+ feature-a ↕ ↑1 ↓1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↕ ↑1 ↓1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↕ ↑1 ↓1 ../repo.feature-c 345c7c93 16h Add feature-c file
-+ feature _ ../repo.feature 252b848b 1d Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^⇡ ⇡1 . 252b848b 1d Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
++ feature-a ↕ ↑1 ↓1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↕ ↑1 ↓1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↕ ↑1 ↓1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
++ feature _ ../repo.feature 252b848b 1d Fix bug __WORKTRUNK_EXEC__echo PWNED > /tmp/hacked4
○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__security__git_ignores_malformed_refs_with_ansi.snap b/tests/snapshots/integration__integration_tests__security__git_ignores_malformed_refs_with_ansi.snap
index 7188b89d6..7ed04f76d 100644
--- a/tests/snapshots/integration__integration_tests__security__git_ignores_malformed_refs_with_ansi.snap
+++ b/tests/snapshots/integration__integration_tests__security__git_ignores_malformed_refs_with_ansi.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,11 +44,11 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
○ Showing 4 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__security__literal_escape_like_branch_names_displayed_safely.snap b/tests/snapshots/integration__integration_tests__security__literal_escape_like_branch_names_displayed_safely.snap
index 298f2a2b7..c67f6f6fc 100644
--- a/tests/snapshots/integration__integration_tests__security__literal_escape_like_branch_names_displayed_safely.snap
+++ b/tests/snapshots/integration__integration_tests__security__literal_escape_like_branch_names_displayed_safely.snap
@@ -7,6 +7,7 @@ info:
- "--branches"
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -44,12 +45,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-/ fix-backslash-x1b-test /_ 05a4a45d 16h Initial commit
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
+/ fix-backslash-x1b-test /_ 05a4a45d 16h Initial commit
○ Showing 4 worktrees, 1 branches, 3 ahead
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 7188b89d6..7ed04f76d 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
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,11 +44,11 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
○ Showing 4 worktrees, 3 ahead
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 1d580405f..0a53b7835 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
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "180"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,14 +44,14 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ also-no-changes _ ../repo.also-no-changes 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-+ no-changes _ ../repo.no-changes 05a4a45d 16h Initial commit
-+ with-changes ! – +1 -1 ../repo.with-changes 05a4a45d 16h Initial commit
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ also-no-changes _ ../repo.also-no-changes 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
++ no-changes _ ../repo.no-changes 05a4a45d 16h Initial commit
++ with-changes ! – +1 -1 ../repo.with-changes 05a4a45d 16h Initial commit
○ Showing 7 worktrees, 1 with changes, 3 ahead
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 07ff0a908..400894fc6 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
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "180"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,13 +44,13 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-+ huge ? – ../repo.huge 05a4a45d 16h Initial commit
-+ tiny ! – +1 -1 ../repo.tiny 05a4a45d 16h Initial commit
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
++ huge ? – ../repo.huge 05a4a45d 16h Initial commit
++ tiny ! – +1 -1 ../repo.tiny 05a4a45d 16h Initial commit
○ Showing 6 worktrees, 2 with changes, 3 ahead
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 d6f56df41..9ae5f47f3 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
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "180"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,14 +44,14 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-+ feature-large ? – ../repo.feature-large 05a4a45d 16h Initial commit
-+ feature-medium ? – ../repo.feature-medium 05a4a45d 16h Initial commit
-+ feature-small ? – ../repo.feature-small 05a4a45d 16h Initial commit
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
++ feature-large ? – ../repo.feature-large 05a4a45d 16h Initial commit
++ feature-medium ? – ../repo.feature-medium 05a4a45d 16h Initial commit
++ feature-small ? – ../repo.feature-small 05a4a45d 16h Initial commit
○ Showing 7 worktrees, 3 with changes, 3 ahead
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 6e817c825..4bcf94b34 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
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,14 +44,14 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ another-extremely-long-name-here _ ../repo.another-extremely-long-name-here 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-+ short _ ../repo.short 05a4a45d 16h Initial commit
-+ very-long-feature-branch-name _ ../repo.very-long-feature-branch-name 05a4a45d 16h Initial commit
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ another-extremely-long-name-here _ ../repo.another-extremely-long-name-here 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
++ short _ ../repo.short 05a4a45d 16h Initial commit
++ very-long-feature-branch-name _ ../repo.very-long-feature-branch-name 05a4a45d 16h Initial commit
○ Showing 7 worktrees, 3 ahead
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 fde610d89..2b3c63b1e 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
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,14 +44,14 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ extremely-long-branch-name-that-might-cause-layout-issues _ ../repo.extremely-long-branch-name-that-might-cause-layout-issues 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-+ medium _ ../repo.medium 05a4a45d 16h Initial commit
-+ x _ ../repo.x 05a4a45d 16h Initial commit
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ extremely-long-branch-name-that-might-cause-layout-issues _ ../repo.extremely-long-branch-name-that-might-cause-layout-issues 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
++ medium _ ../repo.medium 05a4a45d 16h Initial commit
++ x _ ../repo.x 05a4a45d 16h Initial commit
○ Showing 7 worktrees, 3 ahead
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 49a545993..c4f29820e 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
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,14 +44,14 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ a _ ../repo.a 05a4a45d 16h Initial commit
-+ bb _ ../repo.bb 05a4a45d 16h Initial commit
-+ ccc _ ../repo.ccc 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ a _ ../repo.a 05a4a45d 16h Initial commit
++ bb _ ../repo.bb 05a4a45d 16h Initial commit
++ ccc _ ../repo.ccc 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
○ Showing 7 worktrees, 3 ahead
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 4e9a04cde..fc198bced 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
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,14 +44,14 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ cafe _ ../repo.cafe 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-+ naive _ ../repo.naive 05a4a45d 16h Initial commit
-+ resume _ ../repo.resume 05a4a45d 16h Initial commit
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ cafe _ ../repo.cafe 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
++ naive _ ../repo.naive 05a4a45d 16h Initial commit
++ resume _ ../repo.resume 05a4a45d 16h Initial commit
○ Showing 7 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_100.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_100.snap
index e20db955d..2929e9e5f 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_100.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_100.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "100"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,15 +44,15 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Commit Age
-@ main ^| | 05a4a45d 16h
-+ feature-a ↑ ↑1 1b87d473 16h
-+ feature-b ↑ ↑1 f62940fc 16h
-+ feature-c ↑ ↑1 345c7c93 16h
-+ feature/implement-oauth2-social-login ? – 05a4a45d 16h
-+ fix/database-connection-pool-exhaustion _ 05a4a45d 16h
-+ short _ 05a4a45d 16h
+ Branch Status HEAD± main↕ main…± Remote⇅ Age
+@ main ^| | 16h
++ feature-a ↑ ↑1 +1 16h
++ feature-b ↑ ↑1 +1 16h
++ feature-c ↑ ↑1 +1 16h
++ feature/implement-oauth2-social-login ? – 16h
++ fix/database-connection-pool-exhaustion _ 16h
++ short _ 16h
-○ Showing 7 worktrees, 1 with changes, 3 ahead, 2 columns hidden
+○ Showing 7 worktrees, 1 with changes, 3 ahead, 3 columns hidden
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_120.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_120.snap
index 46742fd40..aabd236a9 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_120.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_120.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "120"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,14 +44,14 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Commit Age Message
-@ main ^| | 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 345c7c93 16h Add feature-c file
-+ feature/implement-oauth2-social-login ? – 05a4a45d 16h Initial commit
-+ fix/database-connection-pool-exhaustion _ 05a4a45d 16h Initial commit
-+ short _ 05a4a45d 16h Initial commit
+ Branch Status HEAD± main↕ main…± Remote⇅ Commit Age Message
+@ main ^| | 05a4a45d 16h Initial co…
++ feature-a ↑ ↑1 +1 1b87d473 16h Add featur…
++ feature-b ↑ ↑1 +1 f62940fc 16h Add featur…
++ feature-c ↑ ↑1 +1 345c7c93 16h Add featur…
++ feature/implement-oauth2-social-login ? – 05a4a45d 16h Initial co…
++ fix/database-connection-pool-exhaustion _ 05a4a45d 16h Initial co…
++ short _ 05a4a45d 16h Initial co…
○ Showing 7 worktrees, 1 with changes, 3 ahead, 1 column hidden
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_30.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_30.snap
index 123c01b2e..fc30ecddd 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_30.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_30.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "30"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -52,6 +53,6 @@ exit_code: 0
+ fix/database-connection-poo…
+ short
-○ Showing 7 worktrees, 1 with changes, 3 ahead, 8 columns hidden
+○ Showing 7 worktrees, 1 with changes, 3 ahead, 9 columns hidden
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_40.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_40.snap
index 612b4c3a1..db7a13abd 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_40.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_40.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "40"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -52,6 +53,6 @@ exit_code: 0
+ fix/database-connection-pool-exhausti…
+ short
-○ Showing 7 worktrees, 1 with changes, 3 ahead, 8 columns hidden
+○ Showing 7 worktrees, 1 with changes, 3 ahead, 9 columns hidden
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_50.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_50.snap
index 10c659871..0ca59c3df 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_50.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_50.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "50"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -52,6 +53,6 @@ exit_code: 0
+ fix/database-connection-pool-exhaustion
+ short
-○ Showing 7 worktrees, 1 with changes, 3 ahead, 7 columns hidden
+○ Showing 7 worktrees, 1 with changes, 3 ahead, 8 columns hidden
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_60.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_60.snap
index d29de377d..6471c7032 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_60.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_60.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "60"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -52,6 +53,6 @@ exit_code: 0
+ fix/database-connection-pool-exhaustion _
+ short _
-○ Showing 7 worktrees, 1 with changes, 3 ahead, 6 columns hidden
+○ Showing 7 worktrees, 1 with changes, 3 ahead, 7 columns hidden
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_80.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_80.snap
index e1615527d..e09c41afe 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_80.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_long_80.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "80"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -52,6 +53,6 @@ exit_code: 0
+ fix/database-connection-pool-exhaustion _
+ short _
-○ Showing 7 worktrees, 1 with changes, 3 ahead, 4 columns hidden
+○ Showing 7 worktrees, 1 with changes, 3 ahead, 5 columns hidden
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_100.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_100.snap
index 2f3d76d4f..85ca539dc 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_100.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_100.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "50"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -52,6 +53,6 @@ exit_code: 0
+ feature-c ↑ 16h
+ fix/login-timeout _ 16h
-○ Showing 7 worktrees, 1 with changes, 3 ahead, 5 columns hidden
+○ Showing 7 worktrees, 1 with changes, 3 ahead, 6 columns hidden
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_120.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_120.snap
index efd2cc275..6b3848e2b 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_120.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_120.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "60"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -52,6 +53,6 @@ exit_code: 0
+ feature-c ↑ ↑1 16h
+ fix/login-timeout _ 16h
-○ Showing 7 worktrees, 1 with changes, 3 ahead, 4 columns hidden
+○ Showing 7 worktrees, 1 with changes, 3 ahead, 5 columns hidden
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_160.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_160.snap
index b0f2fd1ca..1317d0572 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_160.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_160.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "80"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,15 +44,15 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Commit Age
-@ main ^| | 05a4a45d 16h
-+ chore/update-deps _ 05a4a45d 16h
-+ feature-a ↑ ↑1 1b87d473 16h
-+ feature/auth-redesign ? – 05a4a45d 16h
-+ feature-b ↑ ↑1 f62940fc 16h
-+ feature-c ↑ ↑1 345c7c93 16h
-+ fix/login-timeout _ 05a4a45d 16h
+ Branch Status HEAD± main↕ main…± Remote⇅ Age
+@ main ^| | 16h
++ chore/update-deps _ 16h
++ feature-a ↑ ↑1 +1 16h
++ feature/auth-redesign ? – 16h
++ feature-b ↑ ↑1 +1 16h
++ feature-c ↑ ↑1 +1 16h
++ fix/login-timeout _ 16h
-○ Showing 7 worktrees, 1 with changes, 3 ahead, 2 columns hidden
+○ Showing 7 worktrees, 1 with changes, 3 ahead, 3 columns hidden
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_60.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_60.snap
index e1134c3e3..24c9b77cf 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_60.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_60.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "30"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -52,6 +53,6 @@ exit_code: 0
+ feature-c 16h
+ fix/login-timeout 16h
-○ Showing 7 worktrees, 1 with changes, 3 ahead, 7 columns hidden
+○ Showing 7 worktrees, 1 with changes, 3 ahead, 8 columns hidden
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_80.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_80.snap
index db38ada79..33a49c6f1 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_80.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_picker_right_80.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "40"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -52,6 +53,6 @@ exit_code: 0
+ feature-c ↑ 16h
+ fix/login-timeout _ 16h
-○ Showing 7 worktrees, 1 with changes, 3 ahead, 6 columns hidden
+○ Showing 7 worktrees, 1 with changes, 3 ahead, 7 columns hidden
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_100.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_100.snap
index 35914744b..adb7c3da8 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_100.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_100.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "100"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,15 +44,15 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Commit Age Message
-@ main ^| | 05a4a45d 16h Initial commit
-+ chore/update-deps _ 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 1b87d473 16h Add feature-a file
-+ feature/auth-redesign ? – 05a4a45d 16h Initial commit
-+ feature-b ↑ ↑1 f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 345c7c93 16h Add feature-c file
-+ fix/login-timeout ? – 05a4a45d 16h Initial commit
+ Branch Status HEAD± main↕ main…± Remote⇅ Commit Age
+@ main ^| | 05a4a45d 16h
++ chore/update-deps _ 05a4a45d 16h
++ feature-a ↑ ↑1 +1 1b87d473 16h
++ feature/auth-redesign ? – 05a4a45d 16h
++ feature-b ↑ ↑1 +1 f62940fc 16h
++ feature-c ↑ ↑1 +1 345c7c93 16h
++ fix/login-timeout ? – 05a4a45d 16h
-○ Showing 7 worktrees, 2 with changes, 3 ahead, 1 column hidden
+○ Showing 7 worktrees, 2 with changes, 3 ahead, 2 columns hidden
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_120.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_120.snap
index 3794bcb3b..38b4f7ee8 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_120.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_120.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "120"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,14 +44,14 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Commit Age Message
-@ main ^| | 05a4a45d 16h Initial commit
-+ chore/update-deps _ 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 1b87d473 16h Add feature-a file
-+ feature/auth-redesign ? – 05a4a45d 16h Initial commit
-+ feature-b ↑ ↑1 f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 345c7c93 16h Add feature-c file
-+ fix/login-timeout ? – 05a4a45d 16h Initial commit
+ Branch Status HEAD± main↕ main…± Remote⇅ Commit Age Message
+@ main ^| | 05a4a45d 16h Initial commit
++ chore/update-deps _ 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 1b87d473 16h Add feature-a file
++ feature/auth-redesign ? – 05a4a45d 16h Initial commit
++ feature-b ↑ ↑1 +1 f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 345c7c93 16h Add feature-c file
++ fix/login-timeout ? – 05a4a45d 16h Initial commit
○ Showing 7 worktrees, 2 with changes, 3 ahead, 1 column hidden
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_30.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_30.snap
index af81abe40..1a6e309ca 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_30.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_30.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "30"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -52,6 +53,6 @@ exit_code: 0
+ feature-c 16h
+ fix/login-timeout 16h
-○ Showing 7 worktrees, 2 with changes, 3 ahead, 7 columns hidden
+○ Showing 7 worktrees, 2 with changes, 3 ahead, 8 columns hidden
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_40.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_40.snap
index e4db87133..c3412f35a 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_40.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_40.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "40"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -52,6 +53,6 @@ exit_code: 0
+ feature-c ↑ 16h
+ fix/login-timeout ? – 16h
-○ Showing 7 worktrees, 2 with changes, 3 ahead, 6 columns hidden
+○ Showing 7 worktrees, 2 with changes, 3 ahead, 7 columns hidden
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_50.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_50.snap
index f44edd141..db36b966e 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_50.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_50.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "50"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -52,6 +53,6 @@ exit_code: 0
+ feature-c ↑ 16h
+ fix/login-timeout ? – 16h
-○ Showing 7 worktrees, 2 with changes, 3 ahead, 5 columns hidden
+○ Showing 7 worktrees, 2 with changes, 3 ahead, 6 columns hidden
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_60.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_60.snap
index 88f40bb8e..f3817bac1 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_60.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_60.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "60"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -52,6 +53,6 @@ exit_code: 0
+ feature-c ↑ ↑1 16h
+ fix/login-timeout ? – 16h
-○ Showing 7 worktrees, 2 with changes, 3 ahead, 4 columns hidden
+○ Showing 7 worktrees, 2 with changes, 3 ahead, 5 columns hidden
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_80.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_80.snap
index 1f93477fb..060f67315 100644
--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_80.snap
+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__width_survey_typical_80.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "80"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,15 +44,15 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Commit Age
-@ main ^| | 05a4a45d 16h
-+ chore/update-deps _ 05a4a45d 16h
-+ feature-a ↑ ↑1 1b87d473 16h
-+ feature/auth-redesign ? – 05a4a45d 16h
-+ feature-b ↑ ↑1 f62940fc 16h
-+ feature-c ↑ ↑1 345c7c93 16h
-+ fix/login-timeout ? – 05a4a45d 16h
+ Branch Status HEAD± main↕ main…± Remote⇅ Age
+@ main ^| | 16h
++ chore/update-deps _ 16h
++ feature-a ↑ ↑1 +1 16h
++ feature/auth-redesign ? – 16h
++ feature-b ↑ ↑1 +1 16h
++ feature-c ↑ ↑1 +1 16h
++ fix/login-timeout ? – 16h
-○ Showing 7 worktrees, 2 with changes, 3 ahead, 2 columns hidden
+○ Showing 7 worktrees, 2 with changes, 3 ahead, 3 columns hidden
----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__step_promote__promote_shows_mismatch_in_list.snap b/tests/snapshots/integration__integration_tests__step_promote__promote_shows_mismatch_in_list.snap
index f33c5de2d..81586f347 100644
--- a/tests/snapshots/integration__integration_tests__step_promote__promote_shows_mismatch_in_list.snap
+++ b/tests/snapshots/integration__integration_tests__step_promote__promote_shows_mismatch_in_list.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,12 +44,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ feature ⚑^ . 05a4a45d 16h Initial commit
-+ main ⚑_| | ../repo.feature 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ feature ⚑^ . 05a4a45d 16h Initial commit
++ main ⚑_| | ../repo.feature 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__switch__list_with_relative_paths.snap b/tests/snapshots/integration__integration_tests__switch__list_with_relative_paths.snap
index f32387103..fb440ce9d 100644
--- a/tests/snapshots/integration__integration_tests__switch__list_with_relative_paths.snap
+++ b/tests/snapshots/integration__integration_tests__switch__list_with_relative_paths.snap
@@ -6,6 +6,7 @@ info:
- list
env:
APPDATA: "[TEST_CONFIG_HOME]"
+ CLAUDE_CONFIG_DIR: "[TEST_CLAUDE_CONFIG]"
CLICOLOR_FORCE: "1"
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
@@ -43,12 +44,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ Remote⇅ Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-a ↑ ↑1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-b ↑ ↑1 ../repo.feature-b f62940fc 16h Add feature-b file
-+ feature-c ↑ ↑1 ../repo.feature-c 345c7c93 16h Add feature-c file
-+ relative-test _ ../repo.relative-test 05a4a45d 16h Initial commit
+ Branch Status HEAD± main↕ main…± Remote⇅ Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-a ↑ ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑ ↑1 +1 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
++ relative-test _ ../repo.relative-test 05a4a45d 16h Initial commit
○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_abort_escape_list.snap b/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_abort_escape_list.snap
index 6f614d143..0bc9789bb 100644
--- a/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_abort_escape_list.snap
+++ b/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_abort_escape_list.snap
@@ -3,5 +3,5 @@ source: tests/integration_tests/switch_picker.rs
expression: list
---
>
- Branch Status HEAD± main↕ Remote⇅ CI P
-> @ main ^ .
+ Branch Status HEAD± main↕ main…± Remote
+> @ main ^
diff --git a/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_alt_l_ignored_list.snap b/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_alt_l_ignored_list.snap
index a22e7fea7..d9c73a430 100644
--- a/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_alt_l_ignored_list.snap
+++ b/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_alt_l_ignored_list.snap
@@ -3,7 +3,7 @@ source: tests/integration_tests/switch_picker.rs
expression: list
---
>
- Branch Status HEAD± main↕ Remote⇅ CI
+ Branch Status HEAD± main↕ main…± R
> @ main ^
+ feature-one _
+ feature-two _
diff --git a/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_multiple_worktrees_list.snap b/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_multiple_worktrees_list.snap
index a22e7fea7..d9c73a430 100644
--- a/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_multiple_worktrees_list.snap
+++ b/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_multiple_worktrees_list.snap
@@ -3,7 +3,7 @@ source: tests/integration_tests/switch_picker.rs
expression: list
---
>
- Branch Status HEAD± main↕ Remote⇅ CI
+ Branch Status HEAD± main↕ main…± R
> @ main ^
+ feature-one _
+ feature-two _
diff --git a/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_preview_log_list.snap b/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_preview_log_list.snap
index c4317ad87..dd1b9e70e 100644
--- a/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_preview_log_list.snap
+++ b/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_preview_log_list.snap
@@ -3,6 +3,6 @@ source: tests/integration_tests/switch_picker.rs
expression: list
---
>
- Branch Status HEAD± main↕ Remote⇅ CI
+ Branch Status HEAD± main↕ main…± Remot
@ main ^
-> + feature ↑ ↑5
+> + feature ↑ ↑5 +5
diff --git a/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_preview_main_diff_list.snap b/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_preview_main_diff_list.snap
index f23a2e684..4261be0b8 100644
--- a/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_preview_main_diff_list.snap
+++ b/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_preview_main_diff_list.snap
@@ -3,6 +3,6 @@ source: tests/integration_tests/switch_picker.rs
expression: list
---
>
- Branch Status HEAD± main↕ Remote⇅ CI
+ Branch Status HEAD± main↕ main…± Remot
@ main ^
-> + feature ↑ ↑2
+> + feature ↑ ↑2 +10
diff --git a/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_preview_summary_list.snap b/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_preview_summary_list.snap
index 83cfda2ef..68fab444d 100644
--- a/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_preview_summary_list.snap
+++ b/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_preview_summary_list.snap
@@ -3,6 +3,6 @@ source: tests/integration_tests/switch_picker.rs
expression: list
---
>
- Branch Status HEAD± main↕ Remote⇅ CI
+ Branch Status HEAD± main↕ main…± Remot
@ main ^
-> + feature ↑ ↑1
+> + feature ↑ ↑1 +1
diff --git a/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_preview_uncommitted_list.snap b/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_preview_uncommitted_list.snap
index 317472037..2ce30b77e 100644
--- a/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_preview_uncommitted_list.snap
+++ b/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_preview_uncommitted_list.snap
@@ -3,6 +3,6 @@ source: tests/integration_tests/switch_picker.rs
expression: list
---
>
- Branch Status HEAD± main↕ Remote⇅ CI
+ Branch Status HEAD± main↕ main…± Remot
@ main ^
-> + feature ! ↑ +3 -1 ↑1
+> + feature ! ↑ +3 -1 ↑1 +1
diff --git a/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_with_branches_list.snap b/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_with_branches_list.snap
index 9f4fc68a4..848b9b019 100644
--- a/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_with_branches_list.snap
+++ b/tests/snapshots/integration__integration_tests__switch_picker__switch_picker_with_branches_list.snap
@@ -3,7 +3,7 @@ source: tests/integration_tests/switch_picker.rs
expression: list
---
>
- Branch Status HEAD± main↕ Remote⇅
+ Branch Status HEAD± main↕ main…
> @ main ^
+ active-worktree _
/ orphan-branch /_