Skip to content

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

feat(list): show PR/MR number in the CI column (#3041)

Maximilian Roosc511d3fa2b12
diff --git a/docs/content/claude-code.md b/docs/content/claude-code.md
index e95cc7b07..1b609532e 100644
--- a/docs/content/claude-code.md
+++ b/docs/content/claude-code.md
@@ -109,7 +109,7 @@ On session exit the worktree is offered for removal via the `WorktreeRemove` hoo
`wt list statusline --format=claude-code` outputs a single-line status for the Claude Code statusline. When the CI status cache is stale, this fetches from the network — typically 1–2 seconds — making it suitable for async statuslines but too slow for synchronous shell prompts. If a faster version would be helpful, please [open an issue](https://github.com/max-sixty/worktrunk/issues).
-<code>~/w/myproject.feature-auth !🤖 @<span style='color:#0a0'>+42</span> <span style='color:#a00'>-8</span> <span style='color:#0a0'>↑3</span> <span style='color:#0a0'>⇡1</span> <span style='color:#0a0'>●</span> Opus 🌔 65% <span style='color:#a70'>1.4×pace(10am–3pm)</span></code>
+<code>~/w/myproject.feature-auth !🤖 @<span style='color:#0a0'>+42</span> <span style='color:#a00'>-8</span> <span style='color:#0a0'>↑3</span> <span style='color:#0a0'>⇡1</span> <span style='color:#0a0'>#3035</span> Opus 🌔 65% <span style='color:#a70'>1.4×pace(10am–3pm)</span></code>
When Claude Code provides context window usage via stdin JSON, a moon phase gauge appears (🌕→🌑 as context fills). A yellow `<n>×pace(<window>)` segment appears when Claude's 5-hour or weekly rate limit is on track to be hit before reset — `1.4×pace(10am–3pm)` reads as 1.4× the pace that would exactly fill that window.
diff --git a/docs/content/config.md b/docs/content/config.md
index 6aa9183c7..43fe91f76 100644
--- a/docs/content/config.md
+++ b/docs/content/config.md
@@ -831,7 +831,7 @@ View or drop worktrunk's regenerable caches in one place. Everything here is reb
### What's cached
-- **CI status** — GitHub/GitLab CI per branch (30–60s TTL), shown in [`wt list`](@/list.md#ci-status)
+- **CI status** — GitHub/GitLab CI per branch (30–60s TTL), shown in [`wt list`](@/list.md#ci-status), plus the largest PR/MR number seen (sizes the CI column)
- **Summaries** — LLM-generated branch summaries (`wt list --full`, `wt switch` preview)
- **Git commands** — SHA-keyed disk caches: merge-tree, ancestry, diff-stats, and `wt switch` preview renders
- **Hints** — one-time hints already shown in this repo
diff --git a/docs/content/faq.md b/docs/content/faq.md
index eda9de2f3..a3543f715 100644
--- a/docs/content/faq.md
+++ b/docs/content/faq.md
@@ -150,7 +150,7 @@ Worktrunk stores small amounts of cache and log data in the repository's `.git/`
| Location | Purpose | Created by |
|----------|---------|------------|
| `git config worktrunk.*` | Cached default branch, switch history, branch markers, custom variables | Various commands |
-| `.git/wt/cache/{kind}/*.json` | Cached CI status and git command results (merge-tree, integration probes, diff stats, ancestry checks, ahead/behind counts) | `wt list`, `wt merge`, `wt remove` |
+| `.git/wt/cache/{kind}/*.json` | Cached CI status, the largest PR/MR number seen (sizes the `wt list` CI column), and git command results (merge-tree, integration probes, diff stats, ancestry checks, ahead/behind counts) | `wt list`, `wt merge`, `wt remove` |
| `.git/wt/cache/summary/{branch}/{hash}.json` | Cached LLM branch summaries, content-addressed by diff hash | `wt list --full`, `wt switch` (when `[list] summary = true`) |
| `.git/wt/logs/{branch}/**/*.log` | Background hook output (nested per branch) | Hooks, background `wt remove` |
| `.git/wt/logs/commands.jsonl` | Command audit log (~2MB max) | Hooks, LLM commands |
diff --git a/docs/content/list.md b/docs/content/list.md
index 318acc39d..76f2413d0 100644
--- a/docs/content/list.md
+++ b/docs/content/list.md
@@ -43,11 +43,11 @@ List all worktrees:
Include CI status, line diffs, 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>
-@ 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> Refactor API to REST architecture with middleware <span class=g>⇡3</span> <span class=d><span style='color:var(--blue,#00a)'>●</span></span> <span class=d>6814f02a</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=g>●</span> <span class=d>41ee0834</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> Harden auth with constant-time token validation <span class=d>|</span> <span class=g>●</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=g>●</span> <span class=d>41ee0834</span>
+&#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>
+@ 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> Refactor API to REST architecture with middleware <span class=g>⇡3</span> <span class=d><span style='color:var(--blue,#00a)'>#412</span></span> <span class=d>6814f02a</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=g>#</span> <span class=d>41ee0834</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> Harden auth with constant-time token validation <span class=d>|</span> <span class=g>#408</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=g>#410</span> <span class=d>41ee0834</span>
<span class=d>○</span> <span class=d>Showing 4 worktrees, 1 with changes, 2 ahead, 3 columns hidden</span>
{% end %}
@@ -55,13 +55,13 @@ Include CI status, line diffs, and LLM summaries:
Include branches that don't have worktrees:
{% terminal(cmd="wt list --branches --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>
-@ 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> Refactor API to REST architecture with middleware <span class=g>⇡3</span> <span class=d><span style='color:var(--blue,#00a)'>●</span></span> <span class=d>6814f02a</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=g>●</span> <span class=d>41ee0834</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> Harden auth with constant-time token validation <span class=d>|</span> <span class=g>●</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=g>●</span> <span class=d>41ee0834</span>
- exp <span class=d>/</span><span class=d>↕</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> <span class=g>+137</span> Explore GraphQL schema and resolvers <span class=d>96379229</span>
- wip <span class=d>/</span><span class=d>↕</span> <span class=g>↑1</span> <span class=d><span class=r>↓1</span></span> <span class=g>+33</span> Start API documentation <span class=d>b40716dc</span>
+&#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>
+@ 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> Refactor API to REST architecture with middleware <span class=g>⇡3</span> <span class=d><span style='color:var(--blue,#00a)'>#412</span></span> <span class=d>6814f02a</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=g>#</span> <span class=d>41ee0834</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> Harden auth with constant-time token validation <span class=d>|</span> <span class=g>#408</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=g>#410</span> <span class=d>41ee0834</span>
+ exp <span class=d>/</span><span class=d>↕</span> <span class=g>↑2</span> <span class=d><span class=r>↓1</span></span> <span class=g>+137</span> Explore GraphQL schema and resolvers <span class=d>96379229</span>
+ wip <span class=d>/</span><span class=d>↕</span> <span class=g>↑1</span> <span class=d><span class=r>↓1</span></span> <span class=g>+33</span> Start API documentation <span class=d>b40716dc</span>
<span class=d>○</span> <span class=d>Showing 4 worktrees, 2 branches, 1 with changes, 4 ahead, 3 columns hidden</span>
{% end %}
@@ -81,7 +81,7 @@ Output as JSON for scripting:
| main…± | Line diffs since the merge-base (three-dot) with the default branch; `--full` only |
| 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 | Pipeline status; `--full` only |
+| CI | PR/MR number colored by pipeline status; `--full` only |
| Path | Worktree directory |
| URL | Dev server URL from project config; dimmed if port is not listening |
| Commit | Short hash (8 chars) |
@@ -92,23 +92,23 @@ The `main` header label is used regardless of the default branch's actual name.
### CI status
-The CI column shows GitHub/GitLab pipeline status:
+The CI column shows the branch's open PR/MR — `#3035` on GitHub, Gitea, and Azure DevOps, `!3035` on GitLab — colored by pipeline status, or a bare `#` when no number is available (e.g. branch workflows without a PR/MR):
| Indicator | Meaning |
|-----------|---------|
-| <span style='color:#0a0'>●</span> green | All checks passed |
-| <span style='color:#00a'>●</span> blue | Checks running |
-| <span style='color:#a00'>●</span> red | Checks failed |
-| <span style='color:#a0a'>●</span> magenta | Reviewer requested changes |
-| <span style='color:#0aa'>●</span> cyan | Review required, not yet given |
-| <span style='color:#a60'>●</span> yellow | Merge conflicts with base |
-| <span style='color:#888'>●</span> gray | No checks configured |
+| <span style='color:#0a0'>#</span> green | All checks passed |
+| <span style='color:#00a'>#</span> blue | Checks running |
+| <span style='color:#a00'>#</span> red | Checks failed |
+| <span style='color:#a0a'>#</span> magenta | Reviewer requested changes |
+| <span style='color:#0aa'>#</span> cyan | Review required, not yet given |
+| <span style='color:#a60'>#</span> yellow | Merge conflicts with base |
+| <span style='color:#888'>#</span> gray | No checks configured |
| <span style='color:#a60'>⚠</span> yellow | Fetch error (rate limit, network) |
| (blank) | No upstream or no PR/MR |
-Review state merges into the same dot where its required action ranks: changes-requested (magenta) outranks running checks — waiting can't clear it — while an outstanding required review (cyan) only recolors an otherwise green or quiet branch. Cool colors mean waiting, warm colors mean act. A PR with no review signal (no required reviewers and no reviews) keeps its plain CI color, and draft PRs appear dimmed.
+Review state merges into the same color where its required action ranks: changes-requested (magenta) outranks running checks — waiting can't clear it — while an outstanding required review (cyan) only recolors an otherwise green or quiet branch. Cool colors mean waiting, warm colors mean act. A PR with no review signal (no required reviewers and no reviews) keeps its plain CI color, and draft PRs appear dimmed.
-CI indicators are clickable links to the PR or pipeline page. Any CI dot appears dimmed when unpushed local changes make the status stale. PRs/MRs are checked first, then branch workflows/pipelines for branches with an upstream. Local-only branches show blank; remote-only branches — visible with `--remotes` — get CI status detection. Results are cached for 30-60 seconds; use `wt config state` to view or clear.
+CI cells are clickable links to the PR or pipeline page, and appear dimmed when unpushed local changes make the status stale. PRs/MRs are checked first, then branch workflows/pipelines for branches with an upstream. Local-only branches show blank; remote-only branches — visible with `--remotes` — get CI status detection. Results are cached for 30-60 seconds; use `wt config state` to view or clear.
### LLM summaries
@@ -241,6 +241,7 @@ Query structured data with `--format=json`:
|-------|------|-------------|
| `status` | string | CI status (see below) |
| `source` | string | `"pr"` (PR/MR) or `"branch"` (branch workflow) |
+| `number` | integer | PR/MR number; absent for branch workflows |
| `stale` | boolean | Local HEAD differs from remote (unpushed changes) |
| `url` | string | URL to the PR/MR page |
| `repo_url` | string | Web URL of the repo the PR/MR targets (the upstream for fork PRs); absent when `url` is absent or unrecognized |
diff --git a/docs/demos/CLAUDE.md b/docs/demos/CLAUDE.md
index de662ab2d..f424635ae 100644
--- a/docs/demos/CLAUDE.md
+++ b/docs/demos/CLAUDE.md
@@ -181,7 +181,7 @@ The wt-switch-picker demo showcases the interactive picker (`wt switch` without
| Column | Demonstration |
|--------|---------------|
-| CI | Hollow ○ (branch CI) vs filled ● (PR CI) vs none |
+| CI | PR/MR number (`#412`) vs bare `#` (branch CI) vs none |
| HEAD± | Large staged diff (+54), small unstaged (+8), none |
| Status | Staged changes (+), unstaged (!), ahead/behind (↕) |
| main↕ | Some branches ahead-only, some ahead-and-behind |
diff --git a/docs/demos/tapes/wt-statusline.tape b/docs/demos/tapes/wt-statusline.tape
index cd350019b..c1267e3ab 100644
--- a/docs/demos/tapes/wt-statusline.tape
+++ b/docs/demos/tapes/wt-statusline.tape
@@ -23,7 +23,7 @@ Sleep 1.5s
# Launch Claude Code to show statusline integration
# Tweet 12 is about seeing branch, diff stats, CI status at a glance in Claude's UI
-# Statusline will show: ~/w/acme.alpha alpha +N ● | Opus 4.5
+# Statusline will show: ~/w/acme.alpha alpha +N #N | Opus 4.5
# Pre-enter pause for big UI takeover
Sleep 1s
Type "claude"
diff --git a/skills/worktrunk/reference/claude-code.md b/skills/worktrunk/reference/claude-code.md
index a06b52f76..b434e6f28 100644
--- a/skills/worktrunk/reference/claude-code.md
+++ b/skills/worktrunk/reference/claude-code.md
@@ -111,7 +111,7 @@ On session exit the worktree is offered for removal via the `WorktreeRemove` hoo
`wt list statusline --format=claude-code` outputs a single-line status for the Claude Code statusline. When the CI status cache is stale, this fetches from the network — typically 1–2 seconds — making it suitable for async statuslines but too slow for synchronous shell prompts. If a faster version would be helpful, please [open an issue](https://github.com/max-sixty/worktrunk/issues).
-<code>~/w/myproject.feature-auth !🤖 @<span style='color:#0a0'>+42</span> <span style='color:#a00'>-8</span> <span style='color:#0a0'>↑3</span> <span style='color:#0a0'>⇡1</span> <span style='color:#0a0'>●</span> Opus 🌔 65% <span style='color:#a70'>1.4×pace(10am–3pm)</span></code>
+<code>~/w/myproject.feature-auth !🤖 @<span style='color:#0a0'>+42</span> <span style='color:#a00'>-8</span> <span style='color:#0a0'>↑3</span> <span style='color:#0a0'>⇡1</span> <span style='color:#0a0'>#3035</span> Opus 🌔 65% <span style='color:#a70'>1.4×pace(10am–3pm)</span></code>
When Claude Code provides context window usage via stdin JSON, a moon phase gauge appears (🌕→🌑 as context fills). A yellow `<n>×pace(<window>)` segment appears when Claude's 5-hour or weekly rate limit is on track to be hit before reset — `1.4×pace(10am–3pm)` reads as 1.4× the pace that would exactly fill that window.
diff --git a/skills/worktrunk/reference/config.md b/skills/worktrunk/reference/config.md
index d5ed1959a..8234a9070 100644
--- a/skills/worktrunk/reference/config.md
+++ b/skills/worktrunk/reference/config.md
@@ -859,7 +859,7 @@ View or drop worktrunk's regenerable caches in one place. Everything here is reb
### What's cached
-- **CI status** — GitHub/GitLab CI per branch (30–60s TTL), shown in [`wt list`](https://worktrunk.dev/list/#ci-status)
+- **CI status** — GitHub/GitLab CI per branch (30–60s TTL), shown in [`wt list`](https://worktrunk.dev/list/#ci-status), plus the largest PR/MR number seen (sizes the CI column)
- **Summaries** — LLM-generated branch summaries (`wt list --full`, `wt switch` preview)
- **Git commands** — SHA-keyed disk caches: merge-tree, ancestry, diff-stats, and `wt switch` preview renders
- **Hints** — one-time hints already shown in this repo
diff --git a/skills/worktrunk/reference/faq.md b/skills/worktrunk/reference/faq.md
index 75cd0db00..d5d148226 100644
--- a/skills/worktrunk/reference/faq.md
+++ b/skills/worktrunk/reference/faq.md
@@ -143,7 +143,7 @@ Worktrunk stores small amounts of cache and log data in the repository's `.git/`
| Location | Purpose | Created by |
|----------|---------|------------|
| `git config worktrunk.*` | Cached default branch, switch history, branch markers, custom variables | Various commands |
-| `.git/wt/cache/{kind}/*.json` | Cached CI status and git command results (merge-tree, integration probes, diff stats, ancestry checks, ahead/behind counts) | `wt list`, `wt merge`, `wt remove` |
+| `.git/wt/cache/{kind}/*.json` | Cached CI status, the largest PR/MR number seen (sizes the `wt list` CI column), and git command results (merge-tree, integration probes, diff stats, ancestry checks, ahead/behind counts) | `wt list`, `wt merge`, `wt remove` |
| `.git/wt/cache/summary/{branch}/{hash}.json` | Cached LLM branch summaries, content-addressed by diff hash | `wt list --full`, `wt switch` (when `[list] summary = true`) |
| `.git/wt/logs/{branch}/**/*.log` | Background hook output (nested per branch) | Hooks, background `wt remove` |
| `.git/wt/logs/commands.jsonl` | Command audit log (~2MB max) | Hooks, LLM commands |
diff --git a/skills/worktrunk/reference/list.md b/skills/worktrunk/reference/list.md
index 9fbcebfda..1f0ddf73f 100644
--- a/skills/worktrunk/reference/list.md
+++ b/skills/worktrunk/reference/list.md
@@ -29,11 +29,11 @@ Include CI status, line diffs, and LLM summaries:
```
$ wt list --full
- Branch Status HEAD± main↕ main…± Summary Remote⇅ CI Commit
-@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 +234 -24 Refactor API to REST architecture with middleware ⇡3 ● 6814f02a
-^ main ^⇅ ⇡1 ⇣1 ● 41ee0834
-+ fix-auth ↕| ↑2 ↓1 +25 -11 Harden auth with constant-time token validation | ● b772e68b
-+ fix-typos _| | ● 41ee0834
+ Branch Status HEAD± main↕ main…± Summary Remote⇅ CI Commit
+@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 +234 -24 Refactor API to REST architecture with middleware ⇡3 #412 6814f02a
+^ main ^⇅ ⇡1 ⇣1 # 41ee0834
++ fix-auth ↕| ↑2 ↓1 +25 -11 Harden auth with constant-time token validation | #408 b772e68b
++ fix-typos _| | #410 41ee0834
○ Showing 4 worktrees, 1 with changes, 2 ahead, 3 columns hidden
```
@@ -42,13 +42,13 @@ Include branches that don't have worktrees:
```
$ wt list --branches --full
- Branch Status HEAD± main↕ main…± Summary Remote⇅ CI Commit
-@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 +234 -24 Refactor API to REST architecture with middleware ⇡3 ● 6814f02a
-^ main ^⇅ ⇡1 ⇣1 ● 41ee0834
-+ fix-auth ↕| ↑2 ↓1 +25 -11 Harden auth with constant-time token validation | ● b772e68b
-+ fix-typos _| | ● 41ee0834
- exp /↕ ↑2 ↓1 +137 Explore GraphQL schema and resolvers 96379229
- wip /↕ ↑1 ↓1 +33 Start API documentation b40716dc
+ Branch Status HEAD± main↕ main…± Summary Remote⇅ CI Commit
+@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 +234 -24 Refactor API to REST architecture with middleware ⇡3 #412 6814f02a
+^ main ^⇅ ⇡1 ⇣1 # 41ee0834
++ fix-auth ↕| ↑2 ↓1 +25 -11 Harden auth with constant-time token validation | #408 b772e68b
++ fix-typos _| | #410 41ee0834
+ exp /↕ ↑2 ↓1 +137 Explore GraphQL schema and resolvers 96379229
+ wip /↕ ↑1 ↓1 +33 Start API documentation b40716dc
○ Showing 4 worktrees, 2 branches, 1 with changes, 4 ahead, 3 columns hidden
```
@@ -70,7 +70,7 @@ $ wt list --format=json
| main…± | Line diffs since the merge-base (three-dot) with the default branch; `--full` only |
| 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 | Pipeline status; `--full` only |
+| CI | PR/MR number colored by pipeline status; `--full` only |
| Path | Worktree directory |
| URL | Dev server URL from project config; dimmed if port is not listening |
| Commit | Short hash (8 chars) |
@@ -81,23 +81,23 @@ The `main` header label is used regardless of the default branch's actual name.
### CI status
-The CI column shows GitHub/GitLab pipeline status:
+The CI column shows the branch's open PR/MR — `#3035` on GitHub, Gitea, and Azure DevOps, `!3035` on GitLab — colored by pipeline status, or a bare `#` when no number is available (e.g. branch workflows without a PR/MR):
| Indicator | Meaning |
|-----------|---------|
-| `●` green | All checks passed |
-| `●` blue | Checks running |
-| `●` red | Checks failed |
-| `●` magenta | Reviewer requested changes |
-| `●` cyan | Review required, not yet given |
-| `●` yellow | Merge conflicts with base |
-| `●` gray | No checks configured |
+| `#` green | All checks passed |
+| `#` blue | Checks running |
+| `#` red | Checks failed |
+| `#` magenta | Reviewer requested changes |
+| `#` cyan | Review required, not yet given |
+| `#` yellow | Merge conflicts with base |
+| `#` gray | No checks configured |
| `⚠` yellow | Fetch error (rate limit, network) |
| (blank) | No upstream or no PR/MR |
-Review state merges into the same dot where its required action ranks: changes-requested (magenta) outranks running checks — waiting can't clear it — while an outstanding required review (cyan) only recolors an otherwise green or quiet branch. Cool colors mean waiting, warm colors mean act. A PR with no review signal (no required reviewers and no reviews) keeps its plain CI color, and draft PRs appear dimmed.
+Review state merges into the same color where its required action ranks: changes-requested (magenta) outranks running checks — waiting can't clear it — while an outstanding required review (cyan) only recolors an otherwise green or quiet branch. Cool colors mean waiting, warm colors mean act. A PR with no review signal (no required reviewers and no reviews) keeps its plain CI color, and draft PRs appear dimmed.
-CI indicators are clickable links to the PR or pipeline page. Any CI dot appears dimmed when unpushed local changes make the status stale. PRs/MRs are checked first, then branch workflows/pipelines for branches with an upstream. Local-only branches show blank; remote-only branches — visible with `--remotes` — get CI status detection. Results are cached for 30-60 seconds; use `wt config state` to view or clear.
+CI cells are clickable links to the PR or pipeline page, and appear dimmed when unpushed local changes make the status stale. PRs/MRs are checked first, then branch workflows/pipelines for branches with an upstream. Local-only branches show blank; remote-only branches — visible with `--remotes` — get CI status detection. Results are cached for 30-60 seconds; use `wt config state` to view or clear.
### LLM summaries [experimental]
@@ -252,6 +252,7 @@ $ wt list --format=json --full | jq '.[] | select(.ci.stale) | .branch'
|-------|------|-------------|
| `status` | string | CI status (see below) |
| `source` | string | `"pr"` (PR/MR) or `"branch"` (branch workflow) |
+| `number` | integer | PR/MR number; absent for branch workflows |
| `stale` | boolean | Local HEAD differs from remote (unpushed changes) |
| `url` | string | URL to the PR/MR page |
| `repo_url` | string | Web URL of the repo the PR/MR targets (the upstream for fork PRs); absent when `url` is absent or unrecognized |
diff --git a/src/cache.rs b/src/cache.rs
index f11909625..9ede54b76 100644
--- a/src/cache.rs
+++ b/src/cache.rs
@@ -1,7 +1,8 @@
//! Shared primitives for the on-disk caches under `.git/wt/cache/`.
//!
//! Three callers use these primitives: `sha_cache` (content-addressed SHA-pair
-//! results), `ci_status::cache` (branch → CI status with TTL), and `summary`
+//! results), `ci_status::cache` (branch → CI status with TTL, plus the repo-wide
+//! max-PR-number ratchet), and `summary`
//! (branch → LLM summary with content-addressed filenames). Each owns its
//! layout, struct shape, and freshness rules — this module only owns the
//! filesystem mechanics so those rules have one implementation instead of
diff --git a/src/cli/config.rs b/src/cli/config.rs
index fe724a420..edf247eb4 100644
--- a/src/cli/config.rs
+++ b/src/cli/config.rs
@@ -685,7 +685,7 @@ pub enum StateCommand {
- **Previous branch**: Previous branch for `wt switch -`
- **Branch markers**: User-defined branch notes
- **Vars**: Custom variables per branch
-- **CI status**: Cached GitHub/GitLab CI status per branch (30s TTL)
+- **CI status**: Cached GitHub/GitLab CI status per branch (30-60s TTL), plus the largest PR/MR number seen (sizes the `wt list` CI column)
- **Summaries**: Cached LLM-generated branch summaries (shown in `wt list --full` and `wt switch` preview)
- **Git commands cache**: SHA-keyed disk caches — merge-tree, ancestry, diff-stats, and `wt switch` preview renders
- **Hints**: One-time hints that have been shown
@@ -728,7 +728,7 @@ untouched."#)]
## What's cached
-- **CI status** — GitHub/GitLab CI per branch (30–60s TTL), shown in [`wt list`](@/list.md#ci-status)
+- **CI status** — GitHub/GitLab CI per branch (30–60s TTL), shown in [`wt list`](@/list.md#ci-status), plus the largest PR/MR number seen (sizes the CI column)
- **Summaries** — LLM-generated branch summaries (`wt list --full`, `wt switch` preview)
- **Git commands** — SHA-keyed disk caches: merge-tree, ancestry, diff-stats, and `wt switch` preview renders
- **Hints** — one-time hints already shown in this repo
diff --git a/src/cli/mod.rs b/src/cli/mod.rs
index 51591b013..8d004e96b 100644
--- a/src/cli/mod.rs
+++ b/src/cli/mod.rs
@@ -712,11 +712,11 @@ Include CI status, line diffs, and LLM summaries:
<!-- wt list --full -->
```console
$ wt list --full
- Branch Status HEAD± main↕ main…± Summary Remote⇅ CI Commit
-@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 +234 -24 Refactor API to REST architecture with middleware ⇡3 ● 6814f02a
-^ main ^⇅ ⇡1 ⇣1 ● 41ee0834
-+ fix-auth ↕| ↑2 ↓1 +25 -11 Harden auth with constant-time token validation | ● b772e68b
-+ fix-typos _| | ● 41ee0834
+ Branch Status HEAD± main↕ main…± Summary Remote⇅ CI Commit
+@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 +234 -24 Refactor API to REST architecture with middleware ⇡3 #412 6814f02a
+^ main ^⇅ ⇡1 ⇣1 # 41ee0834
++ fix-auth ↕| ↑2 ↓1 +25 -11 Harden auth with constant-time token validation | #408 b772e68b
++ fix-typos _| | #410 41ee0834
○ Showing 4 worktrees, 1 with changes, 2 ahead, 3 columns hidden
```
@@ -726,13 +726,13 @@ Include branches that don't have worktrees:
<!-- wt list --branches --full -->
```console
$ wt list --branches --full
- Branch Status HEAD± main↕ main…± Summary Remote⇅ CI Commit
-@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 +234 -24 Refactor API to REST architecture with middleware ⇡3 ● 6814f02a
-^ main ^⇅ ⇡1 ⇣1 ● 41ee0834
-+ fix-auth ↕| ↑2 ↓1 +25 -11 Harden auth with constant-time token validation | ● b772e68b
-+ fix-typos _| | ● 41ee0834
- exp /↕ ↑2 ↓1 +137 Explore GraphQL schema and resolvers 96379229
- wip /↕ ↑1 ↓1 +33 Start API documentation b40716dc
+ Branch Status HEAD± main↕ main…± Summary Remote⇅ CI Commit
+@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 +234 -24 Refactor API to REST architecture with middleware ⇡3 #412 6814f02a
+^ main ^⇅ ⇡1 ⇣1 # 41ee0834
++ fix-auth ↕| ↑2 ↓1 +25 -11 Harden auth with constant-time token validation | #408 b772e68b
++ fix-typos _| | #410 41ee0834
+ exp /↕ ↑2 ↓1 +137 Explore GraphQL schema and resolvers 96379229
+ wip /↕ ↑1 ↓1 +33 Start API documentation b40716dc
○ Showing 4 worktrees, 2 branches, 1 with changes, 4 ahead, 3 columns hidden
```
@@ -754,7 +754,7 @@ $ wt list --format=json
| main…± | Line diffs since the merge-base (three-dot) with the default branch; `--full` only |
| Summary | LLM-generated branch summary; requires `--full`, `summary = true`, and [`commit.generation`](@/config.md#commit) [experimental] |
| Remote⇅ | Commits ahead/behind tracking branch |
-| CI | Pipeline status; `--full` only |
+| CI | PR/MR number colored by pipeline status; `--full` only |
| Path | Worktree directory |
| URL | Dev server URL from project config; dimmed if port is not listening |
| Commit | Short hash (8 chars) |
@@ -765,23 +765,23 @@ The `main` header label is used regardless of the default branch's actual name.
### CI status
-The CI column shows GitHub/GitLab pipeline status:
+The CI column shows the branch's open PR/MR — `#3035` on GitHub, Gitea, and Azure DevOps, `!3035` on GitLab — colored by pipeline status, or a bare `#` when no number is available (e.g. branch workflows without a PR/MR):
| Indicator | Meaning |
|-----------|---------|
-| `●` green | All checks passed |
-| `●` blue | Checks running |
-| `●` red | Checks failed |
-| `●` magenta | Reviewer requested changes |
-| `●` cyan | Review required, not yet given |
-| `●` yellow | Merge conflicts with base |
-| `●` gray | No checks configured |
+| `#` green | All checks passed |
+| `#` blue | Checks running |
+| `#` red | Checks failed |
+| `#` magenta | Reviewer requested changes |
+| `#` cyan | Review required, not yet given |
+| `#` yellow | Merge conflicts with base |
+| `#` gray | No checks configured |
| `⚠` yellow | Fetch error (rate limit, network) |
| (blank) | No upstream or no PR/MR |
-Review state merges into the same dot where its required action ranks: changes-requested (magenta) outranks running checks — waiting can't clear it — while an outstanding required review (cyan) only recolors an otherwise green or quiet branch. Cool colors mean waiting, warm colors mean act. A PR with no review signal (no required reviewers and no reviews) keeps its plain CI color, and draft PRs appear dimmed.
+Review state merges into the same color where its required action ranks: changes-requested (magenta) outranks running checks — waiting can't clear it — while an outstanding required review (cyan) only recolors an otherwise green or quiet branch. Cool colors mean waiting, warm colors mean act. A PR with no review signal (no required reviewers and no reviews) keeps its plain CI color, and draft PRs appear dimmed.
-CI indicators are clickable links to the PR or pipeline page. Any CI dot appears dimmed when unpushed local changes make the status stale. PRs/MRs are checked first, then branch workflows/pipelines for branches with an upstream. Local-only branches show blank; remote-only branches — visible with `--remotes` — get CI status detection. Results are cached for 30-60 seconds; use `wt config state` to view or clear.
+CI cells are clickable links to the PR or pipeline page, and appear dimmed when unpushed local changes make the status stale. PRs/MRs are checked first, then branch workflows/pipelines for branches with an upstream. Local-only branches show blank; remote-only branches — visible with `--remotes` — get CI status detection. Results are cached for 30-60 seconds; use `wt config state` to view or clear.
### LLM summaries [experimental]
@@ -936,6 +936,7 @@ $ wt list --format=json --full | jq '.[] | select(.ci.stale) | .branch'
|-------|------|-------------|
| `status` | string | CI status (see below) |
| `source` | string | `"pr"` (PR/MR) or `"branch"` (branch workflow) |
+| `number` | integer | PR/MR number; absent for branch workflows |
| `stale` | boolean | Local HEAD differs from remote (unpushed changes) |
| `url` | string | URL to the PR/MR page |
| `repo_url` | string | Web URL of the repo the PR/MR targets (the upstream for fork PRs); absent when `url` is absent or unrecognized |
diff --git a/src/commands/config/state.rs b/src/commands/config/state.rs
index d3a6f609d..e8c0c7dc9 100644
--- a/src/commands/config/state.rs
+++ b/src/commands/config/state.rs
@@ -26,7 +26,8 @@
//! (`handle_cache_clear`), which needs no prompt:
//!
//! - Previous branch (git config `worktrunk.history`)
-//! - CI status cache (`.git/wt/cache/ci-status/`)
+//! - CI status cache (`.git/wt/cache/ci-status/`, plus the PR-number width
+//! ratchet in `.git/wt/cache/pr-number/`)
//! - Summary cache (`.git/wt/cache/summary/`)
//! - Git commands cache (`.git/wt/cache/{merge-tree-conflicts,is-ancestor,picker-preview,…}/`)
//! — one user-facing category covering every SHA-keyed disk cache, even
@@ -85,7 +86,7 @@ use crate::cli::{OutputFormat, SwitchFormat};
use crate::output::prompt::{PromptResponse, prompt_yes_no_preview};
use worktrunk::utils::epoch_now;
-use super::super::list::ci_status::{CachedCiStatus, CiBranchName};
+use super::super::list::ci_status::{CachedCiStatus, CiBranchName, MaxPrNumber};
use crate::display::format_relative_time_short;
use crate::help_pager::show_help_in_pager;
use crate::summary::CachedSummary;
@@ -875,17 +876,10 @@ pub fn handle_state_clear(key: &str, branch: Option<String>, all: bool) -> anyho
}
"ci-status" => {
if all {
- let cleared = CachedCiStatus::clear_all(&repo)?;
- if cleared == 0 {
+ // Same category as `state clear` / `cache clear` — includes
+ // the PR-number width ratchet.
+ if !clear_ci_status_reported(&repo)? {
eprintln!("{}", info_message("No CI cache entries to clear"));
- } else {
- eprintln!(
- "{}",
- success_message(cformat!(
- "Cleared <bold>{cleared}</> CI cache entr{}",
- if cleared == 1 { "y" } else { "ies" }
- ))
- );
}
} else {
// Clear CI status for specific branch
@@ -1066,7 +1060,9 @@ fn clear_markers_reported(repo: &Repository) -> anyhow::Result<bool> {
}
fn clear_ci_status_reported(repo: &Repository) -> anyhow::Result<bool> {
- let cleared = CachedCiStatus::clear_all(repo)?;
+ // The PR-number width ratchet is part of the CI cache category — it is
+ // derived from the same fetches and re-learns on the next one.
+ let cleared = CachedCiStatus::clear_all(repo)? + MaxPrNumber::clear(repo)?;
if cleared > 0 {
eprintln!(
"{}",
@@ -1254,6 +1250,7 @@ fn handle_state_show_json(repo: &Repository) -> anyhow::Result<()> {
"previous_branch": previous_branch,
"markers": markers,
"ci_status": ci_status,
+ "max_pr_number": MaxPrNumber::read(repo),
"summaries": summaries,
"git_commands_cache": sha_cache::count_all(repo) + picker_preview_count(repo),
"vars": vars_data,
@@ -1418,6 +1415,7 @@ fn handle_cache_get_json(repo: &Repository) -> anyhow::Result<()> {
let output = serde_json::json!({
"previous_branch": repo.switch_previous(),
"ci_status": ci_status_json(repo),
+ "max_pr_number": MaxPrNumber::read(repo),
"summaries": summaries_json(repo),
"git_commands_cache": sha_cache::count_all(repo) + picker_preview_count(repo),
"hints": repo.list_shown_hints(),
@@ -1441,8 +1439,11 @@ fn render_previous_branch_section(out: &mut String, repo: &Repository) -> anyhow
fn render_ci_status_section(out: &mut String, repo: &Repository) -> anyhow::Result<()> {
writeln!(out, "{}", format_heading("CI STATUS CACHE", None))?;
let entries = CachedCiStatus::list_all(repo);
- if entries.is_empty() {
+ let max_pr_number = MaxPrNumber::read(repo);
+ if entries.is_empty() && max_pr_number.is_none() {
writeln!(out, "{}", format_with_gutter("(none)", None))?;
+ } else if entries.is_empty() {
+ writeln!(out, "{}", format_with_gutter("(no entries)", None))?;
} else {
let rows: Vec<Vec<String>> = entries
.iter()
@@ -1463,6 +1464,13 @@ fn render_ci_status_section(out: &mut String, repo: &Repository) -> anyhow::Resu
crate::md_help::render_data_table(&["Branch", "Status", "Age", "Head"], &rows);
writeln!(out, "{}", rendered.trim_end())?;
}
+ if let Some(number) = max_pr_number {
+ writeln!(
+ out,
+ "{}",
+ format_with_gutter(&format!("largest PR/MR number: {number}"), None)
+ )?;
+ }
Ok(())
}
diff --git a/src/commands/list/CLAUDE.md b/src/commands/list/CLAUDE.md
index 1e155aaf1..236f850b8 100644
--- a/src/commands/list/CLAUDE.md
+++ b/src/commands/list/CLAUDE.md
@@ -37,8 +37,10 @@ Results update cells progressively as they complete.
## Adding New Features
Default: defer to post-skeleton. Only add a pre-skeleton operation when the
-skeleton literally cannot render without the data. File I/O and template
-expansion always wait; new columns can render a placeholder until data arrives.
+skeleton literally cannot render without the data — column sizing is the one
+current exception (the CI column reads its cached width hint pre-skeleton; see
+the `collect/mod.rs` docstring inventory). Template expansion and other file
+I/O wait; new columns can render a placeholder until data arrives.
## Benchmarking Skeleton Time
diff --git a/src/commands/list/ci_status/azure.rs b/src/commands/list/ci_status/azure.rs
index 1cb7c2d88..b02080bba 100644
--- a/src/commands/list/ci_status/azure.rs
+++ b/src/commands/list/ci_status/azure.rs
@@ -8,8 +8,8 @@ use worktrunk::git::remote_ref::azure as az_url;
use worktrunk::git::{GitRemoteUrl, Repository};
use super::{
- CiBranchName, CiSource, CiStatus, PrStatus, branch_remote_url, non_interactive_cmd, parse_json,
- retriable_pr_error,
+ CiBranchName, CiSource, CiStatus, PrRef, PrStatus, branch_remote_url, non_interactive_cmd,
+ parse_json, retriable_pr_error,
};
/// Resolve the Azure DevOps context (host, org, project, `--org` URL) for this
@@ -111,8 +111,10 @@ pub(super) fn detect_azure_pr(
let pr = pr_list.first()?;
// mergeStatus reflects merge feasibility, not pipeline result. We surface
- // conflicts and queued states; pipeline pass/fail comes from the pipelines
- // fallback below (callers invoke detect_branch when this returns NoCI).
+ // conflicts and queued states; everything else shows as NoCI. The
+ // pipelines fallback below never runs for an open PR — detect_ci returns
+ // on the first Some — so pipeline pass/fail is not surfaced here.
+ // TODO(azure-pr-pipeline): fetch the PR's pipeline status instead of NoCI.
let ci_status = match pr.merge_status.as_deref() {
Some("conflicts") => CiStatus::Conflicts,
Some("queued") => CiStatus::Running,
@@ -133,6 +135,7 @@ pub(super) fn detect_azure_pr(
source: CiSource::PullRequest,
is_stale,
url,
+ number: Some(PrRef::pr(u64::from(pr.pull_request_id))),
review_state: None,
})
}
@@ -212,6 +215,7 @@ pub(super) fn detect_azure_pipeline(
source: CiSource::Branch,
is_stale,
url: web_url,
+ number: None,
review_state: None,
})
}
diff --git a/src/commands/list/ci_status/cache.rs b/src/commands/list/ci_status/cache.rs
index 7d790e7af..e2d90b51c 100644
--- a/src/commands/list/ci_status/cache.rs
+++ b/src/commands/list/ci_status/cache.rs
@@ -18,6 +18,54 @@ use super::PrStatus;
/// Subdirectory of `.git/wt/cache/` holding cached CI statuses.
const KIND: &str = "ci-status";
+/// Repo-level ratchet of the largest PR/MR number seen, stored in
+/// `.git/wt/cache/pr-number/max.json`.
+///
+/// Sizes the `wt list` CI column before any CI data arrives: the layout is
+/// fixed at skeleton time, so the column must be wide enough for `#3035`
+/// without waiting on the network. PR numbers are monotonic per repo and a
+/// branch's number never changes, so the stored value needs no invalidation.
+///
+/// Kept separate from the per-branch [`CachedCiStatus`] entries so the width
+/// hint isn't coupled to branch-entry retention — entries come and go with
+/// branches, while the repo-wide digit count should persist. Cleared together
+/// with them by `wt config state cache clear` (see
+/// `clear_ci_status_reported`); it re-learns on the next fetch.
+#[derive(Debug, Clone, Copy, Serialize, Deserialize)]
+pub(crate) struct MaxPrNumber {
+ pub number: u64,
+}
+
+impl MaxPrNumber {
+ const KIND: &str = "pr-number";
+ const KEY: &str = "max.json";
+
+ fn path(repo: &Repository) -> PathBuf {
+ cache::cache_dir(repo, Self::KIND).join(Self::KEY)
+ }
+
+ /// The largest PR/MR number seen in this repo, if any fetch has run.
+ pub(crate) fn read(repo: &Repository) -> Option<u64> {
+ cache::read_json::<Self>(&Self::path(repo)).map(|m| m.number)
+ }
+
+ /// Raise the stored maximum to `number` if it's larger. The unlocked
+ /// read-compare-write can race concurrent writers, briefly storing a
+ /// smaller number; that's benign because every `detect()` — cache hit or
+ /// fresh fetch — re-ratchets, so the next render heals it. Worst case is
+ /// one run where a wide number degrades to the bare `#`.
+ pub(super) fn ratchet(repo: &Repository, number: u64) {
+ if Self::read(repo).is_none_or(|stored| number > stored) {
+ cache::write_json(&Self::path(repo), &Self { number });
+ }
+ }
+
+ /// Clear the stored maximum, returning the count cleared (0 or 1).
+ pub(crate) fn clear(repo: &Repository) -> anyhow::Result<usize> {
+ Ok(usize::from(cache::clear_one(&Self::path(repo))?))
+ }
+}
+
/// Cached CI status stored in `.git/wt/cache/ci-status/<branch>.json`.
///
/// Uses file-based caching instead of git config to avoid file locking
@@ -141,6 +189,29 @@ impl CachedCiStatus {
#[cfg(test)]
mod tests {
use super::*;
+ use worktrunk::testing::TestRepo;
+
+ #[test]
+ fn test_max_pr_number_ratchet() {
+ let test = TestRepo::with_initial_commit();
+ let repo = Repository::at(test.root_path()).unwrap();
+
+ assert_eq!(MaxPrNumber::read(&repo), None);
+
+ MaxPrNumber::ratchet(&repo, 42);
+ assert_eq!(MaxPrNumber::read(&repo), Some(42));
+
+ // Lower numbers never lower the ratchet
+ MaxPrNumber::ratchet(&repo, 7);
+ assert_eq!(MaxPrNumber::read(&repo), Some(42));
+
+ MaxPrNumber::ratchet(&repo, 100);
+ assert_eq!(MaxPrNumber::read(&repo), Some(100));
+
+ assert_eq!(MaxPrNumber::clear(&repo).unwrap(), 1);
+ assert_eq!(MaxPrNumber::read(&repo), None);
+ assert_eq!(MaxPrNumber::clear(&repo).unwrap(), 0);
+ }
#[test]
fn test_ttl_jitter_range_and_determinism() {
diff --git a/src/commands/list/ci_status/gitea.rs b/src/commands/list/ci_status/gitea.rs
index 4df381dd2..ebc33f0fa 100644
--- a/src/commands/list/ci_status/gitea.rs
+++ b/src/commands/list/ci_status/gitea.rs
@@ -8,7 +8,7 @@ use std::process::Output;
use worktrunk::git::{Repository, parse_owner_repo};
use super::{
- CiBranchName, CiSource, CiStatus, MAX_PRS_TO_FETCH, PrStatus, branch_owner_repo,
+ CiBranchName, CiSource, CiStatus, MAX_PRS_TO_FETCH, PrRef, PrStatus, branch_owner_repo,
is_retriable_error, non_interactive_cmd, output_error_text, parse_json, retriable_pr_error,
};
@@ -119,6 +119,7 @@ pub(super) fn detect_gitea_pr(
source: CiSource::PullRequest,
is_stale,
url: Some(pr.html_url.clone()),
+ number: pr.number.map(PrRef::pr),
review_state: None,
})
}
@@ -139,6 +140,7 @@ pub(super) fn detect_gitea_commit_status(
source: CiSource::Branch,
is_stale: false,
url: None,
+ number: None,
review_state: None,
})
}
@@ -171,6 +173,8 @@ struct GiteaCombinedStatus {
/// A pull request from `GET /repos/{owner}/{repo}/pulls`.
#[derive(Debug, Deserialize)]
struct GiteaPr {
+ #[serde(default)]
+ number: Option<u64>,
#[serde(default)]
mergeable: Option<bool>,
html_url: String,
diff --git a/src/commands/list/ci_status/github.rs b/src/commands/list/ci_status/github.rs
index 3814515a0..d96a9a934 100644
--- a/src/commands/list/ci_status/github.rs
+++ b/src/commands/list/ci_status/github.rs
@@ -6,8 +6,8 @@ use serde::Deserialize;
use worktrunk::git::Repository;
use super::{
- CiBranchName, CiSource, CiStatus, MAX_PRS_TO_FETCH, PrStatus, ReviewState, branch_owner_repo,
- non_interactive_cmd, parse_json, retriable_pr_error,
+ CiBranchName, CiSource, CiStatus, MAX_PRS_TO_FETCH, PrRef, PrStatus, ReviewState,
+ branch_owner_repo, non_interactive_cmd, parse_json, retriable_pr_error,
};
/// Detect GitHub PR CI status for a branch.
@@ -68,7 +68,7 @@ pub(super) fn detect_github(
"--limit",
&MAX_PRS_TO_FETCH.to_string(),
"--json",
- "headRefOid,mergeStateStatus,statusCheckRollup,url,headRepositoryOwner,reviewDecision,isDraft",
+ "number,headRefOid,mergeStateStatus,statusCheckRollup,url,headRepositoryOwner,reviewDecision,isDraft",
])
.current_dir(&repo_root)
.run()
@@ -128,6 +128,7 @@ pub(super) fn detect_github(
source: CiSource::PullRequest,
is_stale,
url: pr_info.url.clone(),
+ number: pr_info.number.map(PrRef::pr),
review_state: pr_info.review_state(),
})
}
@@ -194,6 +195,7 @@ pub(super) fn detect_github_commit_checks(
source: CiSource::Branch,
is_stale: false, // We're querying by SHA, so always current
url: None,
+ number: None,
review_state: None,
})
}
@@ -206,6 +208,7 @@ pub(super) fn detect_github_commit_checks(
/// Note: We don't include `state` because we already filter with `--state open`.
#[derive(Debug, Deserialize)]
pub(super) struct GitHubPrInfo {
+ pub number: Option<u64>,
#[serde(rename = "headRefOid")]
pub head_ref_oid: Option<String>,
#[serde(rename = "mergeStateStatus")]
@@ -351,6 +354,7 @@ mod tests {
fn test_github_pr_info_ci_status() {
// No checks = NoCI
let pr = GitHubPrInfo {
+ number: None,
head_ref_oid: None,
merge_state_status: None,
status_check_rollup: None,
@@ -363,6 +367,7 @@ mod tests {
// Empty checks = NoCI
let pr = GitHubPrInfo {
+ number: None,
head_ref_oid: None,
merge_state_status: None,
status_check_rollup: Some(vec![]),
@@ -376,6 +381,7 @@ mod tests {
// CheckRun pending states
for status in ["IN_PROGRESS", "QUEUED", "PENDING", "EXPECTED"] {
let pr = GitHubPrInfo {
+ number: None,
head_ref_oid: None,
merge_state_status: None,
status_check_rollup: Some(vec![GitHubCheck {
@@ -393,6 +399,7 @@ mod tests {
// StatusContext pending
let pr = GitHubPrInfo {
+ number: None,
head_ref_oid: None,
merge_state_status: None,
status_check_rollup: Some(vec![GitHubCheck {
@@ -410,6 +417,7 @@ mod tests {
// CheckRun failures
for conclusion in ["FAILURE", "ERROR", "CANCELLED"] {
let pr = GitHubPrInfo {
+ number: None,
head_ref_oid: None,
merge_state_status: None,
status_check_rollup: Some(vec![GitHubCheck {
@@ -428,6 +436,7 @@ mod tests {
// StatusContext failures
for state in ["FAILURE", "ERROR"] {
let pr = GitHubPrInfo {
+ number: None,
head_ref_oid: None,
merge_state_status: None,
status_check_rollup: Some(vec![GitHubCheck {
@@ -445,6 +454,7 @@ mod tests {
// Success
let pr = GitHubPrInfo {
+ number: None,
head_ref_oid: None,
merge_state_status: None,
status_check_rollup: Some(vec![GitHubCheck {
@@ -463,6 +473,7 @@ mod tests {
#[test]
fn test_github_pr_info_review_state() {
let pr = |review_decision: Option<&str>, is_draft: Option<bool>| GitHubPrInfo {
+ number: None,
head_ref_oid: None,
merge_state_status: None,
status_check_rollup: None,
diff --git a/src/commands/list/ci_status/gitlab.rs b/src/commands/list/ci_status/gitlab.rs
index f9f5b1350..845595532 100644
--- a/src/commands/list/ci_status/gitlab.rs
+++ b/src/commands/list/ci_status/gitlab.rs
@@ -19,8 +19,8 @@ use std::path::Path;
use worktrunk::git::Repository;
use super::{
- CiBranchName, CiSource, CiStatus, MAX_PRS_TO_FETCH, PrStatus, ReviewState, is_retriable_error,
- non_interactive_cmd, parse_json,
+ CiBranchName, CiSource, CiStatus, MAX_PRS_TO_FETCH, PrRef, PrStatus, ReviewState,
+ is_retriable_error, non_interactive_cmd, parse_json,
};
/// Get the GitLab project ID for a repository.
@@ -175,9 +175,18 @@ pub(super) fn detect_gitlab(
info.ci_status()
} else {
// Found MR but couldn't fetch details - treat as error so it surfaces
- // (not NoCI, which would imply no MR exists)
+ // (not NoCI, which would imply no MR exists). Carry the MR identity
+ // already in hand: the ⚠ stays clickable and the iid still feeds the
+ // CI column width ratchet.
log::debug!("Could not fetch MR details for !{}", mr_entry.iid);
- return Some(PrStatus::error());
+ return Some(PrStatus {
+ ci_status: CiStatus::Error,
+ source: CiSource::PullRequest,
+ is_stale: mr_entry.sha != local_head,
+ url: mr_entry.web_url.clone(),
+ number: Some(PrRef::mr(mr_entry.iid)),
+ review_state: mr_entry.review_state(),
+ });
};
let is_stale = mr_entry.sha != local_head;
@@ -187,6 +196,7 @@ pub(super) fn detect_gitlab(
source: CiSource::PullRequest,
is_stale,
url: mr_entry.web_url.clone(),
+ number: Some(PrRef::mr(mr_entry.iid)),
review_state: mr_entry.review_state(),
})
}
@@ -254,6 +264,7 @@ pub(super) fn detect_gitlab_pipeline(
source: CiSource::Branch,
is_stale,
url: pipeline.web_url.clone(),
+ number: None,
review_state: None,
})
}
diff --git a/src/commands/list/ci_status/mod.rs b/src/commands/list/ci_status/mod.rs
index 05fe6879e..7a6c83756 100644
--- a/src/commands/list/ci_status/mod.rs
+++ b/src/commands/list/ci_status/mod.rs
@@ -82,7 +82,7 @@ impl CiBranchName {
}
// Re-export public types
-pub(crate) use cache::CachedCiStatus;
+pub(crate) use cache::{CachedCiStatus, MaxPrNumber};
/// Maximum number of PRs/MRs to fetch when filtering by source repository.
///
@@ -302,6 +302,46 @@ pub enum CiSource {
Branch,
}
+/// A PR/MR reference: number plus the forge's display sigil.
+///
+/// Displays as `#3035` (GitHub, Gitea, Azure DevOps) or `!3035` (GitLab).
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
+pub struct PrRef {
+ pub number: u64,
+ /// Display sigil: `#` (GitHub, Gitea, Azure DevOps) or `!` (GitLab)
+ pub sigil: char,
+}
+
+impl PrRef {
+ /// A pull-request reference: `#3035` (GitHub, Gitea, Azure DevOps).
+ pub fn pr(number: u64) -> Self {
+ Self { number, sigil: '#' }
+ }
+
+ /// A merge-request reference: `!3035` (GitLab).
+ pub fn mr(number: u64) -> Self {
+ Self { number, sigil: '!' }
+ }
+
+ /// Rendered width in terminal columns (sigil + digits).
+ pub fn width(self) -> usize {
+ pr_ref_width(self.number)
+ }
+}
+
+impl std::fmt::Display for PrRef {
+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+ write!(f, "{}{}", self.sigil, self.number)
+ }
+}
+
+/// Rendered width of a PR/MR reference with the given number: one sigil
+/// column plus the decimal digits. Sigil-independent (`#` and `!` are both
+/// one column), so layout can size the CI column from a bare number.
+pub fn pr_ref_width(number: u64) -> usize {
+ 2 + number.checked_ilog10().unwrap_or(0) as usize
+}
+
/// Review state of a PR/MR.
///
/// The vocabulary matches Claude Code's statusline `pr.review_state` field so
@@ -330,6 +370,12 @@ pub struct PrStatus {
/// URL to the PR/MR (if available)
#[serde(skip_serializing_if = "Option::is_none")]
pub url: Option<String>,
+ /// PR/MR reference (absent for branch workflows). `serde(default)` keeps
+ /// cache entries written before this field existed readable — they render
+ /// as the bare `#` until their TTL expires and a fresh fetch fills the
+ /// number in.
+ #[serde(default, skip_serializing_if = "Option::is_none")]
+ pub number: Option<PrRef>,
/// Review state of the PR/MR (absent when the forge reports no review signal)
#[serde(skip_serializing_if = "Option::is_none")]
pub review_state: Option<ReviewState>,
@@ -386,34 +432,53 @@ impl PrStatus {
/// Get the indicator symbol for this status
///
/// - Error: ⚠ (warning indicator)
- /// - All others: ● (filled circle)
+ /// - All others: # (a PR reference with the number unavailable)
pub fn indicator(&self) -> &'static str {
if matches!(self.ci_status, CiStatus::Error) {
"⚠"
} else {
- "●"
+ "#"
}
}
- /// Format CI status with control over link inclusion.
- ///
- /// When `include_link` is false, the indicator is colored but not clickable.
- /// Used for environments that don't support OSC 8 hyperlinks (e.g., Claude Code).
- pub fn format_indicator(&self, include_link: bool) -> String {
- let indicator = self.indicator();
+ /// Wrap `text` in this status's style, optionally as an OSC 8 hyperlink
+ /// to the PR/pipeline URL.
+ fn styled(&self, text: &str, include_link: bool) -> String {
if let (true, Some(url)) = (include_link, &self.url) {
let style = self.style().underline();
format!(
"{}{}{}{}{}",
style,
osc8::Hyperlink::new(url),
- indicator,
+ text,
osc8::Hyperlink::END,
style.render_reset()
)
} else {
let style = self.style();
- format!("{style}{indicator}{style:#}")
+ format!("{style}{text}{style:#}")
+ }
+ }
+
+ /// Format CI status for a cell `max_width` columns wide.
+ ///
+ /// Shows the PR/MR reference (`#3035`, `!3035`) colored by CI status when
+ /// one exists and fits; otherwise falls back to the bare indicator. The
+ /// fallback covers branch workflows (no PR), pre-number cache entries,
+ /// and numbers wider than the column's pre-allocated estimate — the
+ /// column never resizes mid-render. Statusline callers pass `usize::MAX`
+ /// (no width cap). `Error` always renders `⚠`, even when a reference is
+ /// known: Error and Conflicts share the warning color, so a yellow
+ /// `#3035` would be indistinguishable from a conflicted PR.
+ ///
+ /// When `include_link` is false, the cell is colored but not clickable
+ /// (for environments without OSC 8 hyperlinks, e.g. Claude Code).
+ pub fn format_cell(&self, max_width: usize, include_link: bool) -> String {
+ match self.number {
+ Some(r) if !matches!(self.ci_status, CiStatus::Error) && r.width() <= max_width => {
+ self.styled(&r.to_string(), include_link)
+ }
+ _ => self.styled(self.indicator(), include_link),
}
}
@@ -424,6 +489,7 @@ impl PrStatus {
source: CiSource::Branch,
is_stale: false,
url: None,
+ number: None,
review_state: None,
}
}
@@ -454,8 +520,8 @@ impl PrStatus {
// Use full_name as cache key to distinguish local "feature" from remote "origin/feature"
let now_secs = epoch_now();
- if let Some(cached) = CachedCiStatus::read(repo, &branch.full_name) {
- if cached.is_valid(local_head, now_secs, &repo_path) {
+ let status = match CachedCiStatus::read(repo, &branch.full_name) {
+ Some(cached) if cached.is_valid(local_head, now_secs, &repo_path) => {
log::debug!(
"Using cached CI status for {} (age={}s, ttl={}s, status={:?})",
branch.full_name,
@@ -463,28 +529,40 @@ impl PrStatus {
CachedCiStatus::ttl_for_repo(&repo_path),
cached.status.as_ref().map(|s| &s.ci_status)
);
- return cached.status;
+ cached.status
+ }
+ cached => {
+ if let Some(cached) = cached {
+ log::debug!(
+ "Cache expired for {} (age={}s, ttl={}s, head_match={})",
+ branch.full_name,
+ now_secs - cached.checked_at,
+ CachedCiStatus::ttl_for_repo(&repo_path),
+ cached.head == local_head
+ );
+ }
+
+ let status = Self::detect_uncached(repo, branch, local_head, has_upstream);
+
+ // Cache the result (including None - means no CI found for this branch)
+ let cached = CachedCiStatus {
+ status: status.clone(),
+ checked_at: now_secs,
+ head: local_head.to_string(),
+ branch: branch.full_name.clone(),
+ };
+ cached.write(repo, &branch.full_name);
+
+ status
}
- log::debug!(
- "Cache expired for {} (age={}s, ttl={}s, head_match={})",
- branch.full_name,
- now_secs - cached.checked_at,
- CachedCiStatus::ttl_for_repo(&repo_path),
- cached.head == local_head
- );
- }
-
- // Cache miss or expired - fetch fresh status
- let status = Self::detect_uncached(repo, branch, local_head, has_upstream);
-
- // Cache the result (including None - means no CI found for this branch)
- let cached = CachedCiStatus {
- status: status.clone(),
- checked_at: now_secs,
- head: local_head.to_string(),
- branch: branch.full_name.clone(),
};
- cached.write(repo, &branch.full_name);
+
+ // Ratchet the repo-level width hint that sizes the `wt list` CI column.
+ // Runs on cache hits too, so a deleted or racily regressed max.json
+ // heals from locally cached numbers instead of waiting out the TTL.
+ if let Some(r) = status.as_ref().and_then(|s| s.number) {
+ MaxPrNumber::ratchet(repo, r.number);
+ }
status
}
@@ -563,54 +641,84 @@ mod tests {
source: CiSource::PullRequest,
is_stale: false,
url: None,
+ number: None,
review_state: None,
};
- assert_eq!(pr_passed.indicator(), "●");
+ assert_eq!(pr_passed.indicator(), "#");
let branch_running = PrStatus {
ci_status: CiStatus::Running,
source: CiSource::Branch,
is_stale: false,
url: None,
+ number: None,
review_state: None,
};
- assert_eq!(branch_running.indicator(), "●");
+ assert_eq!(branch_running.indicator(), "#");
let error_status = PrStatus {
ci_status: CiStatus::Error,
source: CiSource::PullRequest,
is_stale: false,
url: None,
+ number: None,
review_state: None,
};
assert_eq!(error_status.indicator(), "⚠");
}
#[test]
- fn test_format_indicator() {
+ fn test_format_cell() {
use insta::assert_snapshot;
- let with_url = PrStatus {
+ let pr = PrStatus {
ci_status: CiStatus::Passed,
source: CiSource::PullRequest,
is_stale: false,
url: Some("https://github.com/owner/repo/pull/123".to_string()),
+ number: Some(PrRef::pr(123)),
review_state: None,
};
- let no_url = PrStatus {
- ci_status: CiStatus::Passed,
- source: CiSource::PullRequest,
- is_stale: false,
- url: None,
- review_state: None,
+
+ // Number fits → PR reference, hyperlinked when supported
+ assert_snapshot!(pr.format_cell(4, false), @"#123");
+ assert_snapshot!(pr.format_cell(4, true), @r"]8;;https://github.com/owner/repo/pull/123\#123]8;;\");
+ // Number wider than the column → bare # indicator, still hyperlinked
+ assert_snapshot!(pr.format_cell(3, false), @"#");
+ assert_snapshot!(pr.format_cell(3, true), @r"]8;;https://github.com/owner/repo/pull/123\#]8;;\");
+
+ // No number (branch workflow or pre-number cache entry) → bare # indicator
+ let branch = PrStatus {
+ number: None,
+ ..pr.clone()
+ };
+ assert_snapshot!(branch.format_cell(10, false), @"#");
+
+ // Error renders ⚠ even when the number fits: Error and Conflicts
+ // share yellow, so a yellow "#123" would read as a conflicted PR
+ let error = PrStatus {
+ ci_status: CiStatus::Error,
+ ..pr.clone()
};
+ assert_snapshot!(error.format_cell(usize::MAX, false), @"⚠");
- // With URL + include_link=true → has OSC 8 hyperlink
- assert_snapshot!(with_url.format_indicator(true), @r"]8;;https://github.com/owner/repo/pull/123\●]8;;\");
- // With URL + include_link=false → no OSC 8
- assert_snapshot!(with_url.format_indicator(false), @"●");
- // No URL + include_link=true → no OSC 8
- assert_snapshot!(no_url.format_indicator(true), @"●");
+ // GitLab sigil
+ let mr = PrStatus {
+ number: Some(PrRef::mr(7)),
+ ..pr
+ };
+ assert_snapshot!(mr.format_cell(usize::MAX, false), @"!7");
+ }
+
+ #[test]
+ fn test_pr_ref_width() {
+ assert_eq!(pr_ref_width(1), 2);
+ assert_eq!(pr_ref_width(9), 2);
+ assert_eq!(pr_ref_width(10), 3);
+ assert_eq!(pr_ref_width(3035), 5);
+ assert_eq!(pr_ref_width(99999), 6);
+ assert_eq!(PrRef::mr(3035).to_string(), "!3035");
+ assert_eq!(PrRef::mr(3035).width(), 5);
}
#[test]
@@ -620,6 +728,7 @@ mod tests {
assert_eq!(error.source, CiSource::Branch);
assert!(!error.is_stale);
assert!(error.url.is_none());
+ assert!(error.number.is_none());
}
#[test]
@@ -660,6 +769,7 @@ mod tests {
source: CiSource::Branch,
is_stale: true,
url: None,
+ number: None,
review_state: None,
};
let style = stale.style();
@@ -674,6 +784,7 @@ mod tests {
source: CiSource::PullRequest,
is_stale: false,
url: None,
+ number: None,
review_state,
};
diff --git a/src/commands/list/collect/mod.rs b/src/commands/list/collect/mod.rs
index d9d8568a0..a907e5dcf 100644
--- a/src/commands/list/collect/mod.rs
+++ b/src/commands/list/collect/mod.rs
@@ -98,6 +98,9 @@
//! from this file — TOML I/O, not git config, and no subprocess.
//! - Config resolution — merge project-specific settings (uses cached
//! project identifier).
+//! - CI column width hint — one read of `.git/wt/cache/pr-number/max.json`
+//! (skipped when the CI task is skipped); the skeleton can't size the CI
+//! column without it.
//!
//! ### First-run behavior
//!
@@ -1049,6 +1052,13 @@ pub fn collect(
effective_skip_tasks.insert(TaskKind::SummaryGenerate);
}
+ // CI column width hint: the largest PR/MR number any previous fetch saw
+ // (one small file read — cheap enough for the pre-skeleton budget, and
+ // the skeleton can't size the column without it).
+ let max_pr_number = (!effective_skip_tasks.contains(&TaskKind::CiStatus))
+ .then(|| super::ci_status::MaxPrNumber::read(repo))
+ .flatten();
+
// Calculate layout from items (worktrees, local branches, and remote branches).
// The picker passes an explicit width because the list only gets part of the
// terminal — the rest belongs to the preview pane.
@@ -1060,6 +1070,7 @@ pub fn collect(
.unwrap_or(usize::MAX),
&main_worktree.path,
url_template.as_deref(),
+ max_pr_number,
);
// Single-line invariant: with no detectable width, an unlimited width
@@ -2171,7 +2182,8 @@ mod tests {
ListItem::new_branch("bbb".into(), "row-one".into()),
];
let skip_tasks: HashSet<TaskKind> = HashSet::new();
- let layout = calculate_layout_with_width(&items, &skip_tasks, 80, Path::new("/tmp"), None);
+ let layout =
+ calculate_layout_with_width(&items, &skip_tasks, 80, Path::new("/tmp"), None, None);
let placeholder = super::super::render::PLACEHOLDER;
// Row 0 has data → format_list_item_line; row 1 doesn't → skeleton.
diff --git a/src/commands/list/json_output.rs b/src/commands/list/json_output.rs
index 785b736de..da432dddc 100644
--- a/src/commands/list/json_output.rs
+++ b/src/commands/list/json_output.rs
@@ -225,6 +225,10 @@ pub struct JsonCi {
/// Source: "pr" or "branch"
pub source: CiSource,
+ /// PR/MR number (absent for branch workflows)
+ #[serde(skip_serializing_if = "Option::is_none")]
+ pub number: Option<u64>,
+
/// True if local HEAD differs from remote HEAD (unpushed changes)
pub stale: bool,
@@ -452,6 +456,7 @@ impl From<&PrStatus> for JsonCi {
Self {
status: pr.ci_status.into(),
source: pr.source,
+ number: pr.number.map(|r| r.number),
stale: pr.is_stale,
repo_url: pr
.url
@@ -534,7 +539,7 @@ mod tests {
use insta::assert_snapshot;
use super::*;
- use crate::commands::list::ci_status::CiStatus;
+ use crate::commands::list::ci_status::{CiStatus, PrRef};
use crate::commands::list::model::{
ActiveGitOperation, Divergence, MainState, OperationState, StatusSymbols,
WorkingTreeStatus, WorktreeData, WorktreeState,
@@ -573,6 +578,7 @@ mod tests {
source: CiSource::PullRequest,
is_stale: false,
url: Some("https://github.com/org/repo/pull/123".to_string()),
+ number: Some(PrRef::pr(123)),
review_state: None,
});
assert_eq!(passed.status, "passed");
@@ -594,6 +600,7 @@ mod tests {
source: CiSource::Branch,
is_stale: true,
url: None,
+ number: None,
review_state: None,
});
assert_eq!(failed.status, "failed");
@@ -616,6 +623,7 @@ mod tests {
source: CiSource::Branch,
is_stale: false,
url: None,
+ number: None,
review_state: None,
});
assert_eq!(json.status, expected);
@@ -989,6 +997,7 @@ mod tests {
let json = serde_json::to_string_pretty(&JsonCi {
status: "passed",
source: CiSource::PullRequest,
+ number: Some(7),
stale: false,
url: Some("https://github.com/org/repo/pull/7".to_string()),
review_state: Some(ReviewState::ChangesRequested),
@@ -1000,6 +1009,7 @@ mod tests {
{
"status": "passed",
"source": "pr",
+ "number": 7,
"stale": false,
"url": "https://github.com/org/repo/pull/7",
"repo_url": "https://github.com/org/repo",
diff --git a/src/commands/list/layout.rs b/src/commands/list/layout.rs
index 5845b8002..c8a8bad2b 100644
--- a/src/commands/list/layout.rs
+++ b/src/commands/list/layout.rs
@@ -568,6 +568,7 @@ fn build_estimated_widths(
skip_tasks: &HashSet<TaskKind>,
has_branch_worktree_mismatch: bool,
url_width: usize,
+ max_pr_number: Option<u64>,
) -> LayoutMetadata {
// Fixed widths for slow columns (require expensive git operations)
// Values exceeding these widths use compact notation (K suffix)
@@ -580,7 +581,15 @@ fn build_estimated_widths(
let branch_diff_fixed = fit_header(ColumnKind::BranchDiff.header(), 9); // "+999 -999"
let upstream_fixed = fit_header(ColumnKind::Upstream.header(), 7); // "↑99 ↓99"
let age_estimate = 4; // "11mo" (short format)
- let ci_estimate = fit_header(ColumnKind::CiStatus.header(), 1); // Single indicator symbol
+ // CI column: PR/MR reference ("#3035"), sized from the cached largest
+ // number seen; "#9999" before the first fetch populates the cache. A
+ // number that outgrows the estimate renders as the bare `#` indicator
+ // (`PrStatus::format_cell`) — the layout never resizes mid-render — and
+ // the ratcheted cache sizes the next invocation correctly.
+ let ci_estimate = fit_header(
+ ColumnKind::CiStatus.header(),
+ super::ci_status::pr_ref_width(max_pr_number.unwrap_or(9999)),
+ );
// Assume columns will have data (better to show and hide than to not show).
// This is a limitation of progressive mode - we can't know which columns have data
@@ -900,7 +909,8 @@ fn allocate_columns_with_priority(
/// - Branch diff: 9 chars ("+999 -999")
/// - Upstream: 7 chars ("↑99 ↓99")
/// - Age: 4 chars ("11mo" short format)
-/// - CI: 1 char (indicator symbol)
+/// - CI: sized from `max_pr_number` (the cached largest PR/MR number seen,
+/// e.g. "#3035"); 5 chars ("#9999") before the first fetch populates it
/// - Message: flexible (20-100 chars)
/// - URL: estimated from template + longest branch
pub fn calculate_layout_with_width(
@@ -909,6 +919,7 @@ pub fn calculate_layout_with_width(
terminal_width: usize,
main_worktree_path: &Path,
url_template: Option<&str>,
+ max_pr_number: Option<u64>,
) -> LayoutConfig {
// Calculate actual widths for things we know
// Include branch names from both worktrees and standalone branches
@@ -944,6 +955,7 @@ pub fn calculate_layout_with_width(
skip_tasks,
has_branch_worktree_mismatch,
url_width,
+ max_pr_number,
);
let commit_width = fit_header(ColumnKind::Commit.header(), COMMIT_HASH_WIDTH);
@@ -1213,7 +1225,7 @@ mod tests {
// Empty skip set means all tasks are computed (equivalent to --full)
// has_branch_worktree_mismatch=true to test the path flag is passed through
// url_width=0 since we're not testing URL column here
- let metadata = build_estimated_widths(20, &HashSet::new(), true, 0);
+ let metadata = build_estimated_widths(20, &HashSet::new(), true, 0, None);
let widths = metadata.widths;
// Line diffs (Signs variant: +/-) allocate 3 digits for 100-999 range
@@ -1275,6 +1287,20 @@ mod tests {
widths.upstream.negative_digits, 2,
"Pre-allocated for 2-digit negative count"
);
+
+ // CI: no cached PR number → fallback estimate fits "#9999"
+ assert_eq!(widths.ci_status, 5, "CI fallback should fit '#9999'");
+ }
+
+ #[test]
+ fn test_ci_column_width_from_max_pr_number() {
+ // Cached largest number sizes the column: "#12345" → 6
+ let metadata = build_estimated_widths(20, &HashSet::new(), false, 0, Some(12345));
+ assert_eq!(metadata.widths.ci_status, 6);
+
+ // Never below header width ("CI" → 2)
+ let metadata = build_estimated_widths(20, &HashSet::new(), false, 0, Some(1));
+ assert_eq!(metadata.widths.ci_status, 2);
}
#[test]
@@ -1347,6 +1373,7 @@ mod tests {
terminal_width().expect("COLUMNS=80 is set in .cargo/config.toml"),
&main_worktree_path,
None,
+ None,
);
assert!(
@@ -1458,6 +1485,7 @@ mod tests {
terminal_width().expect("COLUMNS=80 is set in .cargo/config.toml"),
&main_worktree_path,
None,
+ None,
);
assert!(
@@ -1576,7 +1604,7 @@ mod tests {
/// Helper: compute layout with explicit terminal width and skip_tasks.
fn layout_at_width(width: usize, skip_tasks: &HashSet<TaskKind>) -> LayoutConfig {
let items = vec![make_test_item("feature-branch")];
- calculate_layout_with_width(&items, skip_tasks, width, Path::new("/test"), None)
+ calculate_layout_with_width(&items, skip_tasks, width, Path::new("/test"), None, None)
}
/// Default skip_tasks for non-full mode (Summary, BranchDiff, CI skipped).
@@ -1849,7 +1877,7 @@ mod tests {
let skip = full_skip_tasks();
// At very wide terminals: both Path and Summary coexist
- let layout_wide = calculate_layout_with_width(&items, &skip, 300, main_path, None);
+ let layout_wide = calculate_layout_with_width(&items, &skip, 300, main_path, None, None);
assert!(
find_column(&layout_wide, ColumnKind::Summary).is_some(),
"Summary should be present at 300"
@@ -1862,7 +1890,7 @@ mod tests {
// At moderate widths (170): Summary should reach at least 50 chars.
// Currently Path eats ~30 chars from Summary's expansion budget,
// leaving Summary at ~48 and dropping Message entirely.
- let layout_170 = calculate_layout_with_width(&items, &skip, 170, main_path, None);
+ let layout_170 = calculate_layout_with_width(&items, &skip, 170, main_path, None, None);
let summary_170 = find_column(&layout_170, ColumnKind::Summary)
.expect("Summary should be present at 170")
.width;
@@ -2000,7 +2028,7 @@ mod tests {
let main_path = Path::new("/test/worktrunk");
let skip = full_skip_tasks();
- let layout = calculate_layout_with_width(&items, &skip, 170, main_path, None);
+ let layout = calculate_layout_with_width(&items, &skip, 170, main_path, None, None);
let mut lines = Vec::new();
lines.push(layout.render_header_line().plain_text());
@@ -2027,7 +2055,7 @@ mod tests {
// At 30 cols, ideal branch width (~57) can't fit, but Branch should still
// be allocated at a reduced width rather than dropped.
- let layout = calculate_layout_with_width(&items, &skip, 30, main_path, None);
+ let layout = calculate_layout_with_width(&items, &skip, 30, main_path, None, None);
let branch = find_column(&layout, ColumnKind::Branch);
assert!(
branch.is_some(),
@@ -2040,7 +2068,7 @@ mod tests {
);
// At 80 cols, Branch should fit comfortably
- let layout = calculate_layout_with_width(&items, &skip, 80, main_path, None);
+ let layout = calculate_layout_with_width(&items, &skip, 80, main_path, None, None);
let branch = find_column(&layout, ColumnKind::Branch).unwrap();
assert!(
branch.width > 6,
diff --git a/src/commands/list/model/item.rs b/src/commands/list/model/item.rs
index 0f9cffb50..3bbbacd29 100644
--- a/src/commands/list/model/item.rs
+++ b/src/commands/list/model/item.rs
@@ -390,10 +390,11 @@ impl ListItem {
));
}
- // 7. CI status (priority 9)
+ // 7. CI status (priority 9) — PR/MR reference when one exists,
+ // bare `#` otherwise (no width cap in the statusline)
if let Some(Some(ref pr_status)) = self.pr_status {
segments.push(StatuslineSegment::from_column(
- pr_status.format_indicator(include_links),
+ pr_status.format_cell(usize::MAX, include_links),
ColumnKind::CiStatus,
));
}
diff --git a/src/commands/list/render.rs b/src/commands/list/render.rs
index 57457e9f3..75c9023b9 100644
--- a/src/commands/list/render.rs
+++ b/src/commands/list/render.rs
@@ -505,7 +505,7 @@ impl ColumnLayout {
Some(Some(pr_status)) => {
let mut cell = StyledLine::new();
cell.push_raw(
- pr_status.format_indicator(supports_hyperlinks(Stream::Stdout)),
+ pr_status.format_cell(self.width, supports_hyperlinks(Stream::Stdout)),
);
cell
}
diff --git a/src/commands/list/snapshots/wt__commands__list__layout__tests__snapshot_path_yields_to_summary.snap b/src/commands/list/snapshots/wt__commands__list__layout__tests__snapshot_path_yields_to_summary.snap
index b082e3479..dd2951ba0 100644
--- a/src/commands/list/snapshots/wt__commands__list__layout__tests__snapshot_path_yields_to_summary.snap
+++ b/src/commands/list/snapshots/wt__commands__list__layout__tests__snapshot_path_yields_to_summary.snap
@@ -2,8 +2,8 @@
source: src/commands/list/layout.rs
expression: table
---
- Branch Status HEAD± main↕ main…± Summary Remote⇅ CI Commit Age Message
-@ main · ···· | a620bcfe 1y Some comm…
-+ hourly-maintenance · ···· ↑2 · · a620bcfe 1y Some comm…
-+ lab-continue · ···· ↑1 ↓2 +28 -1 Add extend and block insert in Markdown parser | a620bcfe 1y Some comm…
-+ dry-run-pager · ···· ↑3 ↓1 · | a620bcfe 1y Some comm…
+ Branch Status HEAD± main↕ main…± Summary Remote⇅ CI Commit Age Message
+@ main · ···· | a620bcfe 1y Some comm…
++ hourly-maintenance · ···· ↑2 · · a620bcfe 1y Some comm…
++ lab-continue · ···· ↑1 ↓2 +28 -1 Add extend and block insert in Markdown parser | a620bcfe 1y Some comm…
++ dry-run-pager · ···· ↑3 ↓1 · | a620bcfe 1y Some comm…
diff --git a/src/help.rs b/src/help.rs
index a111e6e8c..910fc0c1a 100644
--- a/src/help.rs
+++ b/src/help.rs
@@ -11,7 +11,7 @@
//!
//! ```text
//! cli.rs (source of truth)
-//! ├── after_long_help: markdown prose with [experimental] markers, `●` dots, plain URLs
+//! ├── after_long_help: markdown prose with [experimental] markers, `#` CI samples, plain URLs
//! └── doc comments (/// lines): definition + subtitle for lead paragraph
//! │
//! ▼
@@ -24,7 +24,7 @@
//! ▼
//! post_process_for_html() — text replacements on after_long_help markdown:
//! │ [experimental] → badge <span>
-//! │ `●` green → colored <span>
+//! │ `#` green → colored <span>
//! │ plain URLs → markdown links
//! ▼
//! --help-page stdout — markdown with embedded HTML spans
@@ -530,7 +530,7 @@ Commands with pages: merge, switch, remove, list"
///
/// | CLI source | Web docs |
/// |------------|----------|
-/// | `` `●` green `` | `<span style='color:#0a0'>●</span> green` |
+/// | `` `#` green `` | `<span style='color:#0a0'>#</span> green` |
/// | `[experimental]` | `<span class="badge-experimental"></span>` (text via CSS) |
/// | plain URL | markdown link |
/// | approval prompt code block | `{% terminal() %}` with colored symbols and gutter |
@@ -547,14 +547,14 @@ fn post_process_for_html(text: &str) -> String {
text
// CI status colors (in table cells)
- .replace("`●` green", "<span style='color:#0a0'>●</span> green")
- .replace("`●` blue", "<span style='color:#00a'>●</span> blue")
- .replace("`●` red", "<span style='color:#a00'>●</span> red")
- .replace("`●` magenta", "<span style='color:#a0a'>●</span> magenta")
- .replace("`●` cyan", "<span style='color:#0aa'>●</span> cyan")
- .replace("`●` yellow", "<span style='color:#a60'>●</span> yellow")
+ .replace("`#` green", "<span style='color:#0a0'>#</span> green")
+ .replace("`#` blue", "<span style='color:#00a'>#</span> blue")
+ .replace("`#` red", "<span style='color:#a00'>#</span> red")
+ .replace("`#` magenta", "<span style='color:#a0a'>#</span> magenta")
+ .replace("`#` cyan", "<span style='color:#0aa'>#</span> cyan")
+ .replace("`#` yellow", "<span style='color:#a60'>#</span> yellow")
.replace("`⚠` yellow", "<span style='color:#a60'>⚠</span> yellow")
- .replace("`●` gray", "<span style='color:#888'>●</span> gray")
+ .replace("`#` gray", "<span style='color:#888'>#</span> gray")
.replace("[experimental]", BADGE_EXPERIMENTAL_HTML)
// Convert plain URL references to markdown links for web docs
// CLI shows: "Open an issue at https://github.com/max-sixty/worktrunk."
diff --git a/src/md_help.rs b/src/md_help.rs
index ed6909e33..02dcdeb1f 100644
--- a/src/md_help.rs
+++ b/src/md_help.rs
@@ -32,7 +32,7 @@ fn help_table_skin() -> MadSkin {
skin.table_border_chars = &HELP_TABLE_BORDERS;
// Render backtick-enclosed text as dimmed, matching render_inline_formatting().
// This is needed for colorize_status_symbols() to find and recolor symbols
- // like `●` that appear in table cells.
+ // like `#` that appear in table cells.
skin.inline_code = CompoundStyle::with_attr(Attribute::Dim);
skin
}
@@ -428,36 +428,36 @@ fn colorize_status_symbols(text: &str) -> String {
result = replace_dim(result, "⊟", warning);
result = replace_dim(result, "⊞", warning);
- // CI status circles: replace dimmed ● followed by color name
- let dimmed_bullet = format!("{dim}●{dim:#}");
+ // CI legend samples: replace dimmed `#` followed by a color name
+ let dimmed_hash = format!("{dim}#{dim:#}");
result = result
.replace(
- &format!("{dimmed_bullet} green"),
- &format!("{success}●{success:#} green"),
+ &format!("{dimmed_hash} green"),
+ &format!("{success}#{success:#} green"),
)
.replace(
- &format!("{dimmed_bullet} blue"),
- &format!("{progress}●{progress:#} blue"),
+ &format!("{dimmed_hash} blue"),
+ &format!("{progress}#{progress:#} blue"),
)
.replace(
- &format!("{dimmed_bullet} red"),
- &format!("{error}●{error:#} red"),
+ &format!("{dimmed_hash} red"),
+ &format!("{error}#{error:#} red"),
)
.replace(
- &format!("{dimmed_bullet} magenta"),
- &format!("{changes_requested}●{changes_requested:#} magenta"),
+ &format!("{dimmed_hash} magenta"),
+ &format!("{changes_requested}#{changes_requested:#} magenta"),
)
.replace(
- &format!("{dimmed_bullet} cyan"),
- &format!("{pending_review}●{pending_review:#} cyan"),
+ &format!("{dimmed_hash} cyan"),
+ &format!("{pending_review}#{pending_review:#} cyan"),
)
.replace(
- &format!("{dimmed_bullet} yellow"),
- &format!("{warning}●{warning:#} yellow"),
+ &format!("{dimmed_hash} yellow"),
+ &format!("{warning}#{warning:#} yellow"),
)
.replace(
- &format!("{dimmed_bullet} gray"),
- &format!("{disabled}●{disabled:#} gray"),
+ &format!("{dimmed_hash} gray"),
+ &format!("{disabled}#{disabled:#} gray"),
)
// CI error indicator: ⚠ symbol (also rendered dimmed initially)
.replace(
@@ -465,14 +465,6 @@ fn colorize_status_symbols(text: &str) -> String {
&format!("{warning}⚠{warning:#} yellow"),
);
- // Legacy CI status circles (for statusline format)
- result = result
- .replace("● passed", &format!("{success}●{success:#} passed"))
- .replace("● running", &format!("{progress}●{progress:#} running"))
- .replace("● failed", &format!("{error}●{error:#} failed"))
- .replace("● conflicts", &format!("{warning}●{warning:#} conflicts"))
- .replace("● no-ci", &format!("{disabled}●{disabled:#} no-ci"));
-
// Symbols that should remain dimmed are already dimmed from backtick rendering:
// - Main state: _ (same commit), ⊂ (content integrated), ^, ↑, ↓, ↕
// - Upstream divergence: |, ⇡, ⇣, ⇅
@@ -728,15 +720,15 @@ mod tests {
let git_ops = colorize_status_symbols(&format!("{dim}⤴{dim:#} rebase"));
assert_snapshot!(git_ops, @"⤴ rebase");
- // CI status: passed → green, failed → red, running → blue
- let ci_passed = colorize_status_symbols("● passed");
- assert_snapshot!(ci_passed, @"● passed");
+ // CI legend samples: dimmed `#` + color name recolors the sample
+ let ci_passed = colorize_status_symbols(&format!("{dim}#{dim:#} green"));
+ assert_snapshot!(ci_passed, @"# green");
- let ci_failed = colorize_status_symbols("● failed");
- assert_snapshot!(ci_failed, @"● failed");
+ let ci_failed = colorize_status_symbols(&format!("{dim}#{dim:#} red"));
+ assert_snapshot!(ci_failed, @"# red");
- let ci_running = colorize_status_symbols("● running");
- assert_snapshot!(ci_running, @"● running");
+ let ci_review = colorize_status_symbols(&format!("{dim}#{dim:#} magenta"));
+ assert_snapshot!(ci_review, @"# magenta");
}
#[test]
diff --git a/src/testing/mod.rs b/src/testing/mod.rs
index c9dc695a9..a37076000 100644
--- a/src/testing/mod.rs
+++ b/src/testing/mod.rs
@@ -2094,6 +2094,35 @@ impl TestRepo {
self.mock_bin_path = Some(mock_bin);
}
+ /// Set up mock glab with no MRs and a successful `ci list` pipeline.
+ ///
+ /// Used to test `detect_gitlab_pipeline`'s success path: a branch
+ /// pipeline with no MR renders the bare `#` colored by pipeline status.
+ pub fn setup_mock_glab_with_pipeline(&mut self, pipeline_json: &str, project_id: Option<u64>) {
+ let mock_bin = self.temp_dir.path().join("mock-bin");
+ std::fs::create_dir_all(&mock_bin).unwrap();
+
+ let project_id_response = match project_id {
+ Some(id) => format!(r#"{{"id": {}}}"#, id),
+ None => r#"{"error": "not found"}"#.to_string(),
+ };
+
+ // glab mock: mr list returns empty (no MRs), ci list returns the pipeline
+ MockConfig::new("glab")
+ .version("glab version 1.0.0 (mock)")
+ .command("auth", MockResponse::exit(0))
+ .command("mr list", MockResponse::output("[]")) // No MRs - triggers ci list fallback
+ .command("repo", MockResponse::output(&project_id_response))
+ .command("ci", MockResponse::output(pipeline_json))
+ .write(&mock_bin);
+
+ MockConfig::new("gh")
+ .command("_default", MockResponse::exit(1))
+ .write(&mock_bin);
+
+ self.mock_bin_path = Some(mock_bin);
+ }
+
/// Set up mock glab that returns a rate limit error on `ci list`.
///
/// Used to test the `is_retriable_error` path in `detect_gitlab_pipeline`.
diff --git a/tests/integration_tests/ci_status.rs b/tests/integration_tests/ci_status.rs
index 24762c2a0..dddf513b7 100644
--- a/tests/integration_tests/ci_status.rs
+++ b/tests/integration_tests/ci_status.rs
@@ -145,6 +145,7 @@ fn test_list_full_with_github_pr_status(
let pr_json = format!(
r#"[{{
+ "number": 1,
"headRefOid": "{}",
"mergeStateStatus": "{}",
"statusCheckRollup": [
@@ -178,6 +179,7 @@ fn test_list_full_with_github_review_state(
let pr_json = format!(
r#"[{{
+ "number": 1,
"headRefOid": "{}",
"mergeStateStatus": "CLEAN",
"statusCheckRollup": [
@@ -211,6 +213,7 @@ fn test_list_full_with_status_context(
let pr_json = format!(
r#"[{{
+ "number": 1,
"headRefOid": "{}",
"mergeStateStatus": "{}",
"statusCheckRollup": [
@@ -274,6 +277,7 @@ fn test_list_full_with_stale_pr(mut repo: TestRepo) {
// PR HEAD differs from local HEAD - simulates stale PR
let pr_json = r#"[{
+ "number": 1,
"headRefOid": "old_sha_from_before_local_commit",
"mergeStateStatus": "CLEAN",
"statusCheckRollup": [
@@ -293,6 +297,7 @@ fn test_list_full_with_mixed_check_types(mut repo: TestRepo) {
// Mixed: CheckRun (passed) + StatusContext (pending)
let pr_json = format!(
r#"[{{
+ "number": 1,
"headRefOid": "{}",
"mergeStateStatus": "UNKNOWN",
"statusCheckRollup": [
@@ -314,6 +319,7 @@ fn test_list_full_with_no_ci_checks(mut repo: TestRepo) {
let pr_json = format!(
r#"[{{
+ "number": 1,
"headRefOid": "{}",
"mergeStateStatus": "CLEAN",
"statusCheckRollup": [],
@@ -343,6 +349,7 @@ fn test_list_full_filters_by_repo_owner(mut repo: TestRepo) {
let pr_json = format!(
r#"[
{{
+ "number": 99,
"headRefOid": "wrong_sha",
"mergeStateStatus": "CLEAN",
"statusCheckRollup": [{{"status": "COMPLETED", "conclusion": "FAILURE"}}],
@@ -350,6 +357,7 @@ fn test_list_full_filters_by_repo_owner(mut repo: TestRepo) {
"headRepositoryOwner": {{"login": "other-org"}}
}},
{{
+ "number": 1,
"headRefOid": "{}",
"mergeStateStatus": "CLEAN",
"statusCheckRollup": [{{"status": "COMPLETED", "conclusion": "SUCCESS"}}],
@@ -400,6 +408,7 @@ platform = "github"
// Setup mock gh with PR data - this should work because the platform is set to github
let pr_json = format!(
r#"[{{
+ "number": 1,
"headRefOid": "{}",
"mergeStateStatus": "CLEAN",
"statusCheckRollup": [
@@ -496,6 +505,7 @@ platform = "invalid_platform"
// Setup mock gh - platform should fall back to GitHub via URL detection
let pr_json = format!(
r#"[{{
+ "number": 1,
"headRefOid": "{}",
"mergeStateStatus": "CLEAN",
"statusCheckRollup": [
@@ -815,6 +825,7 @@ fn test_list_full_with_url_based_pushremote(mut repo: TestRepo) {
// The PR comes from the fork owner (matches pushremote URL)
let pr_json = format!(
r#"[{{
+ "number": 1,
"headRefOid": "{}",
"mergeStateStatus": "CLEAN",
"statusCheckRollup": [
@@ -872,7 +883,7 @@ fn test_list_full_with_branch_fallback_using_fork_pushremote(mut repo: TestRepo)
.find(|line| line.contains("feature-a"))
.expect("expected feature-a line in wt list output");
assert!(
- feature_a_line.contains("●"),
+ feature_a_line.contains("#"),
"expected feature-a to show passed branch CI from the fork repo fallback\nstdout:\n{stdout}",
);
}
@@ -929,6 +940,88 @@ fn test_list_full_with_gitlab_ci_rate_limit(mut repo: TestRepo) {
});
}
+/// A branch pipeline with no MR renders the bare `#` colored by pipeline
+/// status, hyperlinked to the pipeline page (the success path of
+/// `detect_gitlab_pipeline`; the rate-limit test above covers its error path).
+#[rstest]
+fn test_list_full_with_gitlab_pipeline(mut repo: TestRepo) {
+ let head_sha = setup_gitlab_repo_with_feature(&mut repo);
+
+ let pipeline_json = format!(
+ r#"[{{
+ "status": "success",
+ "sha": "{head_sha}",
+ "web_url": "https://gitlab.com/test-group/test-project/-/pipelines/123"
+ }}]"#
+ );
+ repo.setup_mock_glab_with_pipeline(&pipeline_json, Some(12345));
+
+ let settings = setup_snapshot_settings(&repo);
+ settings.bind(|| {
+ let mut cmd = make_snapshot_cmd(&repo, "list", &["--full"], None);
+ repo.configure_mock_commands(&mut cmd);
+ assert_cmd_snapshot!("gitlab_pipeline_success", cmd);
+ });
+}
+
+/// An expired CI cache entry is refetched, not served: a stale "failed"
+/// entry past its 30-60s TTL must not mask the fresh status.
+#[rstest]
+fn test_ci_cache_expired_entry_refetches(mut repo: TestRepo) {
+ use crate::common::TEST_EPOCH;
+
+ let head_sha = setup_github_repo_with_feature(&mut repo);
+
+ // Fresh fetch reports passed
+ let pr_json = format!(
+ r#"[{{
+ "number": 1,
+ "headRefOid": "{head_sha}",
+ "mergeStateStatus": "CLEAN",
+ "statusCheckRollup": [{{"status": "COMPLETED", "conclusion": "SUCCESS"}}],
+ "url": "https://github.com/test-owner/test-repo/pull/1",
+ "headRepositoryOwner": {{"login": "test-owner"}}
+ }}]"#
+ );
+ repo.setup_mock_gh_with_ci_data(&pr_json, "[]");
+
+ // Expired cache entry claiming the CI failed
+ let git_dir = repo.git_output(&["rev-parse", "--git-common-dir"]);
+ let git_path = if Path::new(&git_dir).is_absolute() {
+ std::path::PathBuf::from(&git_dir)
+ } else {
+ repo.root_path().join(&git_dir)
+ };
+ let cache_dir = git_path.join("wt").join("cache").join("ci-status");
+ std::fs::create_dir_all(&cache_dir).unwrap();
+ let expired_at = TEST_EPOCH - 3600;
+ std::fs::write(
+ cache_dir.join("feature.json"),
+ format!(
+ r##"{{"status":{{"ci_status":"failed","source":"pr","is_stale":false,"number":{{"number":1,"sigil":"#"}}}},"checked_at":{expired_at},"head":"{head_sha}","branch":"feature"}}"##
+ ),
+ )
+ .unwrap();
+
+ let mut cmd = make_snapshot_cmd(&repo, "list", &["--full"], None);
+ repo.configure_mock_commands(&mut cmd);
+ // Debug logging evaluates the cache-expiry diagnostics' format args
+ cmd.env("RUST_LOG", "worktrunk=debug");
+ cmd.env("CLICOLOR_FORCE", "1");
+ let output = cmd.output().unwrap();
+ assert!(output.status.success());
+ let stdout = String::from_utf8_lossy(&output.stdout);
+ // Fresh fetch wins: green #1, and the stale red #1 is gone
+ assert!(
+ stdout.contains("\x1b[32m#1"),
+ "expired entry should refetch as green #1:\n{stdout}"
+ );
+ assert!(
+ !stdout.contains("\x1b[31m#1"),
+ "stale failed entry must not be served:\n{stdout}"
+ );
+}
+
// =============================================================================
// Azure DevOps CI status tests
// =============================================================================
@@ -1143,6 +1236,7 @@ fn run_gitea_ci_status_test(
fn gitea_feature_pr_json(head_sha: &str, mergeable: bool) -> String {
format!(
r#"[{{
+ "number": 7,
"mergeable": {mergeable},
"html_url": "https://gitea.example.com/owner/test-repo/pulls/7",
"head": {{
@@ -1259,7 +1353,7 @@ fn test_list_full_with_gitea_commit_status_retriable_error(mut repo: TestRepo) {
/// primary one. Two Gitea remotes (`origin` → `owner/test-repo`, `fork` →
/// `forkowner/test-repo`) plus a remote-only `fork/feature-remote` ref. The
/// mock answers only `forkowner/test-repo` SHA-status requests, so a primary-
-/// remote lookup in the fallback would return no CI; the green `●` in the
+/// remote lookup in the fallback would return no CI; the green `#` in the
/// snapshot proves the SHA-status path honors `branch.remote`. (The PR path
/// intentionally uses the primary remote, mirroring the `gh` backend; for this
/// branch it returns no PR and we fall through to the SHA-status path.)
@@ -1313,7 +1407,7 @@ fn test_list_remotes_full_with_gitea_remote_branch(mut repo: TestRepo) {
/// and the `feature` branch pushes to `fork`. The mock returns two open PRs for
/// the `feature` ref — a decoy from `other-owner` that must be filtered out and
/// the real one from `forkowner` — and answers the upstream's commit-status
-/// lookup with `success`. The green `●` proves the fork PR matched; a revert to
+/// lookup with `success`. The green `#7` proves the fork PR matched; a revert to
/// querying/filtering by the branch's own remote would query `forkowner`'s
/// (unmocked) `/pulls` and lose the indicator. Mirrors the GitHub backend's
/// `test_list_full_filters_by_repo_owner`.
@@ -1344,11 +1438,13 @@ fn test_list_full_with_gitea_fork_pr(mut repo: TestRepo) {
let pulls_json = format!(
r#"[
{{
+ "number": 98,
"mergeable": true,
"html_url": "https://gitea.example.com/upstream/test-repo/pulls/98",
"head": {{"ref": "feature", "sha": "wrong_sha", "repo": {{"owner": {{"login": "other-owner"}}}}}}
}},
{{
+ "number": 7,
"mergeable": true,
"html_url": "https://gitea.example.com/upstream/test-repo/pulls/7",
"head": {{"ref": "feature", "sha": "{head_sha}", "repo": {{"owner": {{"login": "forkowner"}}}}}}
diff --git a/tests/integration_tests/config_state.rs b/tests/integration_tests/config_state.rs
index 4f08cccfa..6fb5bd9e5 100644
--- a/tests/integration_tests/config_state.rs
+++ b/tests/integration_tests/config_state.rs
@@ -1172,6 +1172,7 @@ fn test_state_cache_get_json_empty(repo: TestRepo) {
"ci_status": [],
"git_commands_cache": 0,
"hints": [],
+ "max_pr_number": null,
"previous_branch": null,
"summaries": []
}
@@ -1185,6 +1186,49 @@ fn test_state_cache_clear_empty(repo: TestRepo) {
assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"○ No cache to clear");
}
+/// The PR-number width ratchet surfaces in the CI cache category: shown by
+/// `cache get` (table and JSON) even with no branch entries, and counted by
+/// `cache clear`.
+#[rstest]
+fn test_state_cache_pr_number_ratchet(repo: TestRepo) {
+ let dir = repo.root_path().join(".git/wt/cache/pr-number");
+ std::fs::create_dir_all(&dir).unwrap();
+ std::fs::write(dir.join("max.json"), r#"{"number":3035}"#).unwrap();
+
+ let output = wt_state_cmd(&repo, "cache", "get", &[]).output().unwrap();
+ assert!(output.status.success());
+ let stdout = String::from_utf8_lossy(&output.stdout).into_owned();
+ let ci_section = stdout
+ .split("\n\n")
+ .find(|s| s.contains("CI STATUS CACHE"))
+ .unwrap();
+ assert_snapshot!(ci_section, @"
+ CI STATUS CACHE
+   (no entries)
+   largest PR/MR number: 3035
+ ");
+
+ let output = wt_state_cmd(&repo, "cache", "get", &["--format=json"])
+ .output()
+ .unwrap();
+ assert!(output.status.success());
+ assert_snapshot!(String::from_utf8_lossy(&output.stdout), @r#"
+ {
+ "ci_status": [],
+ "git_commands_cache": 0,
+ "hints": [],
+ "max_pr_number": 3035,
+ "previous_branch": null,
+ "summaries": []
+ }
+ "#);
+
+ let output = wt_state_cmd(&repo, "cache", "clear", &[]).output().unwrap();
+ assert!(output.status.success());
+ assert_snapshot!(String::from_utf8_lossy(&output.stderr), @"✓ Cleared 1 CI cache entry");
+ assert!(!dir.join("max.json").exists());
+}
+
#[rstest]
fn test_state_cache_clear_with_entries(repo: TestRepo) {
// Seed every regenerable cache category.
@@ -1473,6 +1517,7 @@ fn test_state_get_json_empty(repo: TestRepo) {
"hints": [],
"hook_output": [],
"markers": [],
+ "max_pr_number": null,
"previous_branch": null,
"summaries": [],
"trash": [],
@@ -1567,6 +1612,7 @@ fn test_state_get_json_comprehensive(repo: TestRepo) {
"set_at": 1735776000
}
],
+ "max_pr_number": null,
"previous_branch": "feature",
"summaries": [
{
@@ -1668,6 +1714,7 @@ fn test_state_get_json_with_logs(repo: TestRepo) {
}
],
"markers": [],
+ "max_pr_number": null,
"previous_branch": null,
"summaries": [],
"trash": [],
diff --git a/tests/integration_tests/list.rs b/tests/integration_tests/list.rs
index 11789305d..854d74a5b 100644
--- a/tests/integration_tests/list.rs
+++ b/tests/integration_tests/list.rs
@@ -1859,15 +1859,16 @@ TODO: Add request/response examples for each endpoint
// The worktree is still around and can be removed. Shows dimmed in list output.
let fix_typos = repo.add_worktree("fix-typos");
repo.run_git_in(&fix_typos, &["push", "-u", "origin", "fix-typos"]);
- mock_ci_status(repo, "fix-typos", "passed", "pr", false);
+ mock_ci_status(repo, "fix-typos", "passed", "pr", false, Some(410));
// === Mock CI status ===
// CI requires --full flag, but we mock it so examples show realistic output
// Note: main's CI is mocked AFTER the merge commit so the hash matches
- mock_ci_status(repo, "main", "passed", "pr", false);
- mock_ci_status(repo, "fix-auth", "passed", "pr", false);
+ // main runs branch CI (no PR) — renders the bare `#`
+ mock_ci_status(repo, "main", "passed", "branch", false, None);
+ mock_ci_status(repo, "fix-auth", "passed", "pr", false, Some(408));
// feature-api has unpushed commits, so CI is stale (shows dimmed)
- mock_ci_status(repo, "feature-api", "running", "pr", true);
+ mock_ci_status(repo, "feature-api", "running", "pr", true, Some(412));
// === Mock LLM summaries ===
// Summary requires --full + [list] summary = true + [commit.generation] command
@@ -1899,8 +1900,19 @@ command = "echo unused"
feature_api
}
-/// Mock CI status by writing to file-based cache
-fn mock_ci_status(repo: &TestRepo, branch: &str, status: &str, source: &str, is_stale: bool) {
+/// Mock CI status by writing to file-based cache.
+///
+/// `pr_number` also ratchets the `pr-number/max.json` width hint, so the CI
+/// column renders at its steady-state width (as if a previous run had
+/// already cached the number).
+pub(crate) fn mock_ci_status(
+ repo: &TestRepo,
+ branch: &str,
+ status: &str,
+ source: &str,
+ is_stale: bool,
+ pr_number: Option<u64>,
+) {
// Get HEAD commit for the branch
let output = repo
.git_command()
@@ -1910,11 +1922,15 @@ fn mock_ci_status(repo: &TestRepo, branch: &str, status: &str, source: &str, is_
let head = String::from_utf8_lossy(&output.stdout).trim().to_string();
// Build the cache JSON (matches CachedCiStatus struct)
+ let number_json = pr_number
+ .map(|n| format!(r##","number":{{"number":{n},"sigil":"#"}}"##))
+ .unwrap_or_default();
let cache_json = format!(
- r#"{{"status":{{"ci_status":"{}","source":"{}","is_stale":{}}},"checked_at":{},"head":"{}","branch":"{}"}}"#,
+ r#"{{"status":{{"ci_status":"{}","source":"{}","is_stale":{}{}}},"checked_at":{},"head":"{}","branch":"{}"}}"#,
status,
source,
is_stale,
+ number_json,
std::time::SystemTime::now()
.duration_since(std::time::UNIX_EPOCH)
.unwrap()
@@ -1946,6 +1962,21 @@ fn mock_ci_status(repo: &TestRepo, branch: &str, status: &str, source: &str, is_
let safe_branch = worktrunk::path::sanitize_for_filename(branch);
let cache_file = cache_dir.join(format!("{safe_branch}.json"));
std::fs::write(&cache_file, &cache_json).unwrap();
+
+ // Ratchet the width hint like a real fetch would
+ if let Some(n) = pr_number {
+ let max_file_dir = git_path.join("wt").join("cache").join("pr-number");
+ std::fs::create_dir_all(&max_file_dir).unwrap();
+ let max_file = max_file_dir.join("max.json");
+ let existing = std::fs::read_to_string(&max_file)
+ .ok()
+ .and_then(|s| serde_json::from_str::<serde_json::Value>(&s).ok())
+ .and_then(|v| v["number"].as_u64())
+ .unwrap_or(0);
+ if n > existing {
+ std::fs::write(&max_file, format!(r#"{{"number":{n}}}"#)).unwrap();
+ }
+ }
}
/// Mock summary cache by computing the real diff hash and writing a cache entry.
@@ -2204,7 +2235,7 @@ fn test_readme_example_list(mut repo: TestRepo) {
/// Generate README example: `wt list --full` output
///
/// Shows additional columns: main…± (line diffs), CI status, and LLM summaries.
-/// Uses wider terminal (130 cols) than the base example to fit the Summary column.
+/// Uses wider terminal (134 cols) than the base example to fit the Summary column.
/// Output: tests/snapshots/integration__integration_tests__list__readme_example_list_full.snap
#[rstest]
fn test_readme_example_list_full(mut repo: TestRepo) {
@@ -2212,7 +2243,7 @@ fn test_readme_example_list_full(mut repo: TestRepo) {
assert_cmd_snapshot!("readme_example_list_full", {
let mut cmd = list_snapshots::command_readme(&repo, &feature_api);
cmd.arg("--full");
- cmd.env("COLUMNS", "130");
+ cmd.env("COLUMNS", "134");
cmd
});
}
@@ -2220,7 +2251,7 @@ fn test_readme_example_list_full(mut repo: TestRepo) {
/// Generate README example: `wt list --branches --full` output
///
/// Shows branches without worktrees (⎇ symbol) alongside worktrees, plus CI status.
-/// Uses wider terminal (130 cols) than the base example to fit the Summary column.
+/// Uses wider terminal (134 cols) than the base example to fit the Summary column.
/// Output: tests/snapshots/integration__integration_tests__list__readme_example_list_branches.snap
#[rstest]
fn test_readme_example_list_branches(mut repo: TestRepo) {
@@ -2228,7 +2259,7 @@ fn test_readme_example_list_branches(mut repo: TestRepo) {
assert_cmd_snapshot!("readme_example_list_branches", {
let mut cmd = list_snapshots::command_readme(&repo, &feature_api);
cmd.args(["--branches", "--full"]);
- cmd.env("COLUMNS", "130");
+ cmd.env("COLUMNS", "134");
cmd
});
}
diff --git a/tests/integration_tests/statusline.rs b/tests/integration_tests/statusline.rs
index 25aff709b..3821cd03a 100644
--- a/tests/integration_tests/statusline.rs
+++ b/tests/integration_tests/statusline.rs
@@ -113,6 +113,14 @@ fn test_statusline_with_changes(repo: TestRepo) {
assert_snapshot!(output, @" main ?^| @+1");
}
+#[rstest]
+fn test_statusline_ci_pr_number(repo: TestRepo) {
+ // Cached CI status with a PR number renders as the colored PR reference
+ super::list::mock_ci_status(&repo, "main", "passed", "pr", false, Some(3035));
+ let output = run_statusline(&repo, &[], None);
+ assert_snapshot!(output, @" main ^| #3035");
+}
+
#[rstest]
fn test_statusline_commits_ahead(mut repo: TestRepo) {
add_commits_ahead(&mut repo);
diff --git a/tests/snapshots/integration__integration_tests__ci_status__azure_no_ci.snap b/tests/snapshots/integration__integration_tests__ci_status__azure_no_ci.snap
index 0ea7a403b..826ed7df6 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__azure_no_ci.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__azure_no_ci.snap
@@ -23,12 +23,12 @@ info:
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -37,9 +37,11 @@ info:
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
@@ -51,12 +53,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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
+ Branch Status HEAD± main↕ main…± Remote⇅ CI 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__ci_status__azure_pipeline_failed.snap b/tests/snapshots/integration__integration_tests__ci_status__azure_pipeline_failed.snap
index d48e2e1ee..44d8a7e0e 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__azure_pipeline_failed.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__azure_pipeline_failed.snap
@@ -23,12 +23,12 @@ info:
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -37,9 +37,11 @@ info:
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
@@ -51,12 +53,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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
+ Branch Status HEAD± main↕ main…± Remote⇅ CI 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__ci_status__azure_pipeline_passed.snap b/tests/snapshots/integration__integration_tests__ci_status__azure_pipeline_passed.snap
index 299e31a71..3df1ccafd 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__azure_pipeline_passed.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__azure_pipeline_passed.snap
@@ -23,12 +23,12 @@ info:
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -37,9 +37,11 @@ info:
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
@@ -51,12 +53,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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
+ Branch Status HEAD± main↕ main…± Remote⇅ CI 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__ci_status__azure_pipeline_retriable_error.snap b/tests/snapshots/integration__integration_tests__ci_status__azure_pipeline_retriable_error.snap
index 90f6d7614..1be7f06f2 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__azure_pipeline_retriable_error.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__azure_pipeline_retriable_error.snap
@@ -23,12 +23,12 @@ info:
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -37,9 +37,11 @@ info:
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
@@ -51,12 +53,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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
+ Branch Status HEAD± main↕ main…± Remote⇅ CI 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__ci_status__azure_pipeline_running.snap b/tests/snapshots/integration__integration_tests__ci_status__azure_pipeline_running.snap
index 0030dcf5a..260baa9f5 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__azure_pipeline_running.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__azure_pipeline_running.snap
@@ -23,12 +23,12 @@ info:
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -37,9 +37,11 @@ info:
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
@@ -51,12 +53,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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
+ Branch Status HEAD± main↕ main…± Remote⇅ CI 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__ci_status__azure_pr_conflicts.snap b/tests/snapshots/integration__integration_tests__ci_status__azure_pr_conflicts.snap
index 2a1969261..c828635f6 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__azure_pr_conflicts.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__azure_pr_conflicts.snap
@@ -23,12 +23,12 @@ info:
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -37,9 +37,11 @@ info:
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
@@ -51,12 +53,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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
+ Branch Status HEAD± main↕ main…± Remote⇅ CI Path Commit Age Message
+@ main ^| | #7 . 05a4a45d 16h Initial commit
++ feature _| | #7 ../repo.feature 05a4a45d 16h Initial commit
++ feature-a ↑| ↑1 +1 | #7 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑| ↑1 +1 | #7 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑| ↑1 +1 | #7 ../repo.feature-c 345c7c93 16h Add feature-c file
○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__azure_pr_list_retriable_error.snap b/tests/snapshots/integration__integration_tests__ci_status__azure_pr_list_retriable_error.snap
index 90f6d7614..1be7f06f2 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__azure_pr_list_retriable_error.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__azure_pr_list_retriable_error.snap
@@ -23,12 +23,12 @@ info:
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -37,9 +37,11 @@ info:
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
@@ -51,12 +53,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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
+ Branch Status HEAD± main↕ main…± Remote⇅ CI 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__ci_status__azure_pr_queued.snap b/tests/snapshots/integration__integration_tests__ci_status__azure_pr_queued.snap
index 0030dcf5a..b877526fb 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__azure_pr_queued.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__azure_pr_queued.snap
@@ -23,12 +23,12 @@ info:
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -37,9 +37,11 @@ info:
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
@@ -51,12 +53,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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
+ Branch Status HEAD± main↕ main…± Remote⇅ CI Path Commit Age Message
+@ main ^| | #7 . 05a4a45d 16h Initial commit
++ feature _| | #7 ../repo.feature 05a4a45d 16h Initial commit
++ feature-a ↑| ↑1 +1 | #7 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-b ↑| ↑1 +1 | #7 ../repo.feature-b f62940fc 16h Add feature-b file
++ feature-c ↑| ↑1 +1 | #7 ../repo.feature-c 345c7c93 16h Add feature-c file
○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__azure_stale_pipeline.snap b/tests/snapshots/integration__integration_tests__ci_status__azure_stale_pipeline.snap
index af95de865..a4da968db 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__azure_stale_pipeline.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__azure_stale_pipeline.snap
@@ -23,12 +23,12 @@ info:
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -37,9 +37,11 @@ info:
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
@@ -51,12 +53,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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
+ Branch Status HEAD± main↕ main…± Remote⇅ CI 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__ci_status__filters_by_repo_owner.snap b/tests/snapshots/integration__integration_tests__ci_status__filters_by_repo_owner.snap
index 0b39c4336..d94f82a66 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__filters_by_repo_owner.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__filters_by_repo_owner.snap
@@ -11,43 +11,54 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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
+ Branch Status HEAD± main↕ main…± Remote⇅ CI Path Commit Age Message
+@ main ^| | #1 . 05a4a45d 16h Initial commit
++ feature _| | #1 ../repo.feature 05a4a45d 16h Initial commit
++ 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
○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__gitea_commit_status.snap b/tests/snapshots/integration__integration_tests__ci_status__gitea_commit_status.snap
index a2b7b7a6c..12790dc32 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitea_commit_status.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitea_commit_status.snap
@@ -23,12 +23,12 @@ info:
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -37,9 +37,11 @@ info:
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
@@ -51,12 +53,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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 ↑| ↑1 +1 | ● ../repo.feature 9c1e078b 1d feat: gitea feature
+ Branch Status HEAD± main↕ main…± Remote⇅ CI 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 ↑| ↑1 +1 | # ../repo.feature 9c1e078b 1d feat: gitea feature
○ Showing 5 worktrees, 4 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__gitea_commit_status_retriable_error.snap b/tests/snapshots/integration__integration_tests__ci_status__gitea_commit_status_retriable_error.snap
index 514f65852..390523b51 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitea_commit_status_retriable_error.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitea_commit_status_retriable_error.snap
@@ -23,12 +23,12 @@ info:
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -37,9 +37,11 @@ info:
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
@@ -51,12 +53,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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 ↑| ↑1 +1 | ⚠ ../repo.feature 9c1e078b 1d feat: gitea feature
+ Branch Status HEAD± main↕ main…± Remote⇅ CI 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 ↑| ↑1 +1 | ⚠ ../repo.feature 9c1e078b 1d feat: gitea feature
○ Showing 5 worktrees, 4 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__gitea_fork_pr.snap b/tests/snapshots/integration__integration_tests__ci_status__gitea_fork_pr.snap
index 467a37a55..d7f90d280 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitea_fork_pr.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitea_fork_pr.snap
@@ -23,12 +23,12 @@ info:
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -37,9 +37,11 @@ info:
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
@@ -51,12 +53,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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 ↑| ↑1 +1 | ● ../repo.feature 9a059eb4 1d feat: gitea fork feature
+ Branch Status HEAD± main↕ main…± Remote⇅ CI 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 ↑| ↑1 +1 | #7 ../repo.feature 9a059eb4 1d feat: gitea fork feature
○ Showing 5 worktrees, 4 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__gitea_no_ci.snap b/tests/snapshots/integration__integration_tests__ci_status__gitea_no_ci.snap
index 69c9eaa1c..ade67cc74 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitea_no_ci.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitea_no_ci.snap
@@ -23,12 +23,12 @@ info:
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -37,9 +37,11 @@ info:
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
@@ -51,12 +53,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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 ↑| ↑1 +1 | ../repo.feature 9c1e078b 1d feat: gitea feature
+ Branch Status HEAD± main↕ main…± Remote⇅ CI 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 ↑| ↑1 +1 | ../repo.feature 9c1e078b 1d feat: gitea feature
○ Showing 5 worktrees, 4 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__gitea_pr_conflicts.snap b/tests/snapshots/integration__integration_tests__ci_status__gitea_pr_conflicts.snap
index c955fa077..dde414ada 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitea_pr_conflicts.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitea_pr_conflicts.snap
@@ -23,12 +23,12 @@ info:
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -37,9 +37,11 @@ info:
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
@@ -51,12 +53,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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 ↑| ↑1 +1 | ● ../repo.feature 9c1e078b 1d feat: gitea feature
+ Branch Status HEAD± main↕ main…± Remote⇅ CI 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 ↑| ↑1 +1 | #7 ../repo.feature 9c1e078b 1d feat: gitea feature
○ Showing 5 worktrees, 4 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__gitea_pr_failed.snap b/tests/snapshots/integration__integration_tests__ci_status__gitea_pr_failed.snap
index a2b7b7a6c..4b225d302 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitea_pr_failed.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitea_pr_failed.snap
@@ -23,12 +23,12 @@ info:
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -37,9 +37,11 @@ info:
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
@@ -51,12 +53,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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 ↑| ↑1 +1 | ● ../repo.feature 9c1e078b 1d feat: gitea feature
+ Branch Status HEAD± main↕ main…± Remote⇅ CI 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 ↑| ↑1 +1 | #7 ../repo.feature 9c1e078b 1d feat: gitea feature
○ Showing 5 worktrees, 4 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__gitea_pr_passed.snap b/tests/snapshots/integration__integration_tests__ci_status__gitea_pr_passed.snap
index f702d3578..70fd603aa 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitea_pr_passed.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitea_pr_passed.snap
@@ -23,12 +23,12 @@ info:
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -37,9 +37,11 @@ info:
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
@@ -51,12 +53,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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 ↑| ↑1 +1 | ● ../repo.feature 9c1e078b 1d feat: gitea feature
+ Branch Status HEAD± main↕ main…± Remote⇅ CI 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 ↑| ↑1 +1 | #7 ../repo.feature 9c1e078b 1d feat: gitea feature
○ Showing 5 worktrees, 4 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__gitea_pr_running.snap b/tests/snapshots/integration__integration_tests__ci_status__gitea_pr_running.snap
index 277774e64..1495b4aa4 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitea_pr_running.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitea_pr_running.snap
@@ -23,12 +23,12 @@ info:
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -37,9 +37,11 @@ info:
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
@@ -51,12 +53,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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 ↑| ↑1 +1 | ● ../repo.feature 9c1e078b 1d feat: gitea feature
+ Branch Status HEAD± main↕ main…± Remote⇅ CI 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 ↑| ↑1 +1 | #7 ../repo.feature 9c1e078b 1d feat: gitea feature
○ Showing 5 worktrees, 4 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__gitea_remote_branch_uses_branch_remote.snap b/tests/snapshots/integration__integration_tests__ci_status__gitea_remote_branch_uses_branch_remote.snap
index 12ac70188..75b732bb3 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitea_remote_branch_uses_branch_remote.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitea_remote_branch_uses_branch_remote.snap
@@ -24,12 +24,12 @@ info:
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -38,9 +38,11 @@ info:
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
@@ -52,12 +54,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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
- fork/feature-remote /↑ ↑1 +1 ● 86db681a 1d feat: fork feature
+ Branch Status HEAD± main↕ main…± Remote⇅ CI 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
+ fork/feature-remote /↑ ↑1 +1 # 86db681a 1d feat: fork feature
○ Showing 4 worktrees, 1 remote branches, 4 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__gitea_retriable_error.snap b/tests/snapshots/integration__integration_tests__ci_status__gitea_retriable_error.snap
index 51b7d328e..020113f69 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitea_retriable_error.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitea_retriable_error.snap
@@ -23,12 +23,12 @@ info:
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -37,9 +37,11 @@ info:
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
@@ -51,12 +53,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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 ↑| ↑1 +1 | ⚠ ../repo.feature 9c1e078b 1d feat: gitea feature
+ Branch Status HEAD± main↕ main…± Remote⇅ CI 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 ↑| ↑1 +1 | ⚠ ../repo.feature 9c1e078b 1d feat: gitea feature
○ Showing 5 worktrees, 4 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__github_pr_approved.snap b/tests/snapshots/integration__integration_tests__ci_status__github_pr_approved.snap
index f97cea4e9..d94f82a66 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__github_pr_approved.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__github_pr_approved.snap
@@ -53,12 +53,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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
+ Branch Status HEAD± main↕ main…± Remote⇅ CI Path Commit Age Message
+@ main ^| | #1 . 05a4a45d 16h Initial commit
++ feature _| | #1 ../repo.feature 05a4a45d 16h Initial commit
++ 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
○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__github_pr_changes_requested.snap b/tests/snapshots/integration__integration_tests__ci_status__github_pr_changes_requested.snap
index c0917ebb7..f3d1adb80 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__github_pr_changes_requested.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__github_pr_changes_requested.snap
@@ -53,12 +53,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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
+ Branch Status HEAD± main↕ main…± Remote⇅ CI Path Commit Age Message
+@ main ^| | #1 . 05a4a45d 16h Initial commit
++ feature _| | #1 ../repo.feature 05a4a45d 16h Initial commit
++ 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
○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__github_pr_conflicts.snap b/tests/snapshots/integration__integration_tests__ci_status__github_pr_conflicts.snap
index 7f9f7e42a..04e4f4567 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__github_pr_conflicts.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__github_pr_conflicts.snap
@@ -11,43 +11,54 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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
+ Branch Status HEAD± main↕ main…± Remote⇅ CI Path Commit Age Message
+@ main ^| | #1 . 05a4a45d 16h Initial commit
++ feature _| | #1 ../repo.feature 05a4a45d 16h Initial commit
++ 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
○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__github_pr_draft.snap b/tests/snapshots/integration__integration_tests__ci_status__github_pr_draft.snap
index 8c020767d..6b36f91d6 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__github_pr_draft.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__github_pr_draft.snap
@@ -53,12 +53,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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
+ Branch Status HEAD± main↕ main…± Remote⇅ CI Path Commit Age Message
+@ main ^| | #1 . 05a4a45d 16h Initial commit
++ feature _| | #1 ../repo.feature 05a4a45d 16h Initial commit
++ 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
○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__github_pr_failed.snap b/tests/snapshots/integration__integration_tests__ci_status__github_pr_failed.snap
index d48940b9c..62056e85a 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__github_pr_failed.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__github_pr_failed.snap
@@ -23,36 +23,42 @@ info:
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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
+ Branch Status HEAD± main↕ main…± Remote⇅ CI Path Commit Age Message
+@ main ^| | #1 . 05a4a45d 16h Initial commit
++ feature _| | #1 ../repo.feature 05a4a45d 16h Initial commit
++ 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
○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__github_pr_passed.snap b/tests/snapshots/integration__integration_tests__ci_status__github_pr_passed.snap
index 0b39c4336..d94f82a66 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__github_pr_passed.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__github_pr_passed.snap
@@ -11,43 +11,54 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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
+ Branch Status HEAD± main↕ main…± Remote⇅ CI Path Commit Age Message
+@ main ^| | #1 . 05a4a45d 16h Initial commit
++ feature _| | #1 ../repo.feature 05a4a45d 16h Initial commit
++ 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
○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__github_pr_review_required.snap b/tests/snapshots/integration__integration_tests__ci_status__github_pr_review_required.snap
index 3b7f29bc5..43d2c2828 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__github_pr_review_required.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__github_pr_review_required.snap
@@ -53,12 +53,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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
+ Branch Status HEAD± main↕ main…± Remote⇅ CI Path Commit Age Message
+@ main ^| | #1 . 05a4a45d 16h Initial commit
++ feature _| | #1 ../repo.feature 05a4a45d 16h Initial commit
++ 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
○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__github_pr_running.snap b/tests/snapshots/integration__integration_tests__ci_status__github_pr_running.snap
index ac48ca158..cbf49dda6 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__github_pr_running.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__github_pr_running.snap
@@ -11,43 +11,54 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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
+ Branch Status HEAD± main↕ main…± Remote⇅ CI Path Commit Age Message
+@ main ^| | #1 . 05a4a45d 16h Initial commit
++ feature _| | #1 ../repo.feature 05a4a45d 16h Initial commit
++ 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
○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__github_workflow_run.snap b/tests/snapshots/integration__integration_tests__ci_status__github_workflow_run.snap
index e54200a93..826ed7df6 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__github_workflow_run.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__github_workflow_run.snap
@@ -11,43 +11,54 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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
+ Branch Status HEAD± main↕ main…± Remote⇅ CI 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__ci_status__github_workflow_running.snap b/tests/snapshots/integration__integration_tests__ci_status__github_workflow_running.snap
index e54200a93..826ed7df6 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__github_workflow_running.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__github_workflow_running.snap
@@ -11,43 +11,54 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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
+ Branch Status HEAD± main↕ main…± Remote⇅ CI 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__ci_status__gitlab_ci_rate_limit.snap b/tests/snapshots/integration__integration_tests__ci_status__gitlab_ci_rate_limit.snap
index 69ada2519..1be7f06f2 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitlab_ci_rate_limit.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitlab_ci_rate_limit.snap
@@ -23,36 +23,42 @@ info:
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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
+ Branch Status HEAD± main↕ main…± Remote⇅ CI 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__ci_status__gitlab_empty_mr_list_no_project_id.snap b/tests/snapshots/integration__integration_tests__ci_status__gitlab_empty_mr_list_no_project_id.snap
index e54200a93..826ed7df6 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitlab_empty_mr_list_no_project_id.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitlab_empty_mr_list_no_project_id.snap
@@ -11,43 +11,54 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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
+ Branch Status HEAD± main↕ main…± Remote⇅ CI 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__ci_status__gitlab_filters_by_project_id.snap b/tests/snapshots/integration__integration_tests__ci_status__gitlab_filters_by_project_id.snap
index 0b39c4336..c885d4d62 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitlab_filters_by_project_id.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitlab_filters_by_project_id.snap
@@ -11,43 +11,54 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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
+ Branch Status HEAD± main↕ main…± Remote⇅ CI Path Commit Age Message
+@ main ^| | !1 . 05a4a45d 16h Initial commit
++ feature _| | !1 ../repo.feature 05a4a45d 16h Initial commit
++ 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
○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_conflicts.snap b/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_conflicts.snap
index 7f9f7e42a..9539fc8c4 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_conflicts.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_conflicts.snap
@@ -11,43 +11,54 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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
+ Branch Status HEAD± main↕ main…± Remote⇅ CI Path Commit Age Message
+@ main ^| | !1 . 05a4a45d 16h Initial commit
++ feature _| | !1 ../repo.feature 05a4a45d 16h Initial commit
++ 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
○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_failed.snap b/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_failed.snap
index 382caaa97..4137eef50 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_failed.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_failed.snap
@@ -11,43 +11,54 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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
+ Branch Status HEAD± main↕ main…± Remote⇅ CI Path Commit Age Message
+@ main ^| | !1 . 05a4a45d 16h Initial commit
++ feature _| | !1 ../repo.feature 05a4a45d 16h Initial commit
++ 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
○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_passed.snap b/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_passed.snap
index 0b39c4336..c885d4d62 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_passed.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_passed.snap
@@ -11,43 +11,54 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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
+ Branch Status HEAD± main↕ main…± Remote⇅ CI Path Commit Age Message
+@ main ^| | !1 . 05a4a45d 16h Initial commit
++ feature _| | !1 ../repo.feature 05a4a45d 16h Initial commit
++ 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
○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_pending.snap b/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_pending.snap
index 0783db8df..d6fcb00d3 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_pending.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_pending.snap
@@ -23,36 +23,42 @@ info:
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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
+ Branch Status HEAD± main↕ main…± Remote⇅ CI Path Commit Age Message
+@ main ^| | !1 . 05a4a45d 16h Initial commit
++ feature _| | !1 ../repo.feature 05a4a45d 16h Initial commit
++ 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
○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_running.snap b/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_running.snap
index 0783db8df..d6fcb00d3 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_running.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_running.snap
@@ -23,36 +23,42 @@ info:
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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
+ Branch Status HEAD± main↕ main…± Remote⇅ CI Path Commit Age Message
+@ main ^| | !1 . 05a4a45d 16h Initial commit
++ feature _| | !1 ../repo.feature 05a4a45d 16h Initial commit
++ 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
○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_view_failure.snap b/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_view_failure.snap
index ab0e9e73d..bcd1d7413 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_view_failure.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitlab_mr_view_failure.snap
@@ -11,43 +11,54 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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
+ Branch Status HEAD± main↕ main…± Remote⇅ CI 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__ci_status__gitlab_multiple_mrs_no_project_id.snap b/tests/snapshots/integration__integration_tests__ci_status__gitlab_multiple_mrs_no_project_id.snap
index e54200a93..826ed7df6 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitlab_multiple_mrs_no_project_id.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitlab_multiple_mrs_no_project_id.snap
@@ -11,43 +11,54 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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
+ Branch Status HEAD± main↕ main…± Remote⇅ CI 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__ci_status__gitlab_no_ci.snap b/tests/snapshots/integration__integration_tests__ci_status__gitlab_no_ci.snap
index 3e3184131..3c2bd76f1 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitlab_no_ci.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitlab_no_ci.snap
@@ -11,43 +11,54 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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
+ Branch Status HEAD± main↕ main…± Remote⇅ CI Path Commit Age Message
+@ main ^| | !1 . 05a4a45d 16h Initial commit
++ feature _| | !1 ../repo.feature 05a4a45d 16h Initial commit
++ 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
○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__gitlab_pipeline_success.snap b/tests/snapshots/integration__integration_tests__ci_status__gitlab_pipeline_success.snap
new file mode 100644
index 000000000..3df1ccafd
--- /dev/null
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitlab_pipeline_success.snap
@@ -0,0 +1,65 @@
+---
+source: tests/integration_tests/ci_status.rs
+info:
+ program: wt
+ args:
+ - list
+ - "--full"
+ env:
+ APPDATA: "[TEST_CONFIG_HOME]"
+ CLICOLOR_FORCE: "1"
+ COLUMNS: "500"
+ GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
+ GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
+ GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
+ GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
+ GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
+ HOME: "[TEST_HOME]"
+ LANG: C
+ LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
+ MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
+ NO_COLOR: ""
+ OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
+ PATH: "[PATH]"
+ PSModulePath: ""
+ SHELL: ""
+ TERM: alacritty
+ USERPROFILE: "[TEST_HOME]"
+ WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
+ WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
+ WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
+ WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
+ WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
+ WORKTRUNK_TEST_NUSHELL_ENV: "0"
+ WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
+ WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
+ WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
+ XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
+---
+success: true
+exit_code: 0
+----- stdout -----
+ Branch Status HEAD± main↕ main…± Remote⇅ CI 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
+
+----- stderr -----
diff --git a/tests/snapshots/integration__integration_tests__ci_status__gitlab_single_mr_no_project_id.snap b/tests/snapshots/integration__integration_tests__ci_status__gitlab_single_mr_no_project_id.snap
index 0b39c4336..c885d4d62 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitlab_single_mr_no_project_id.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitlab_single_mr_no_project_id.snap
@@ -11,43 +11,54 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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
+ Branch Status HEAD± main↕ main…± Remote⇅ CI Path Commit Age Message
+@ main ^| | !1 . 05a4a45d 16h Initial commit
++ feature _| | !1 ../repo.feature 05a4a45d 16h Initial commit
++ 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
○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__gitlab_stale_mr.snap b/tests/snapshots/integration__integration_tests__ci_status__gitlab_stale_mr.snap
index 6274230cc..bfce0a736 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__gitlab_stale_mr.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__gitlab_stale_mr.snap
@@ -11,43 +11,54 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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 ↑⇡ ↑1 +1 ⇡1 ● ../repo.feature da7d235a 1d Local commit
+ Branch Status HEAD± main↕ main…± Remote⇅ CI Path Commit Age Message
+@ main ^| | !1 . 05a4a45d 16h Initial commit
++ 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 ↑⇡ ↑1 +1 ⇡1 !1 ../repo.feature da7d235a 1d Local commit
○ Showing 5 worktrees, 4 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__list_full_with_configured_platform_github.snap b/tests/snapshots/integration__integration_tests__ci_status__list_full_with_configured_platform_github.snap
index 848351135..3a9f5930a 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__list_full_with_configured_platform_github.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__list_full_with_configured_platform_github.snap
@@ -29,7 +29,6 @@ info:
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -38,9 +37,11 @@ info:
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
@@ -52,12 +53,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI Path Commit Age Message
-@ main ? ^| +3 | ● . 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
+ Branch Status HEAD± main↕ main…± Remote⇅ CI Path Commit Age Message
+@ main ? ^| +3 | #1 . 05a4a45d 16h Initial commit
++ feature _| | #1 ../repo.feature 05a4a45d 16h Initial commit
++ 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
○ Showing 5 worktrees, 1 with changes, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__list_full_with_gitea_forge_platform.snap b/tests/snapshots/integration__integration_tests__ci_status__list_full_with_gitea_forge_platform.snap
index 116a40674..d674728f8 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__list_full_with_gitea_forge_platform.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__list_full_with_gitea_forge_platform.snap
@@ -29,7 +29,6 @@ info:
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -38,9 +37,11 @@ info:
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
@@ -52,12 +53,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI Path Commit Age Message
-@ main ? ^| +2 | . 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
+ Branch Status HEAD± main↕ main…± Remote⇅ CI Path Commit Age Message
+@ main ? ^| +2 | . 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, 1 with changes, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__list_full_with_gitlab_remote.snap b/tests/snapshots/integration__integration_tests__ci_status__list_full_with_gitlab_remote.snap
index 064322bf9..a849b764e 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__list_full_with_gitlab_remote.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__list_full_with_gitlab_remote.snap
@@ -11,43 +11,54 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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
+ Branch Status HEAD± main↕ main…± Remote⇅ CI 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__ci_status__list_full_with_invalid_configured_platform.snap b/tests/snapshots/integration__integration_tests__ci_status__list_full_with_invalid_configured_platform.snap
index 68a4aee1a..57cbbb42c 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__list_full_with_invalid_configured_platform.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__list_full_with_invalid_configured_platform.snap
@@ -38,9 +38,11 @@ info:
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
@@ -52,12 +54,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI Path Commit Age Message
-@ main ? ^| +3 | ● . 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
+ Branch Status HEAD± main↕ main…± Remote⇅ CI Path Commit Age Message
+@ main ? ^| +3 | #1 . 05a4a45d 16h Initial commit
++ feature _| | #1 ../repo.feature 05a4a45d 16h Initial commit
++ 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
○ Showing 5 worktrees, 1 with changes, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__mixed_check_types.snap b/tests/snapshots/integration__integration_tests__ci_status__mixed_check_types.snap
index ac48ca158..cbf49dda6 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__mixed_check_types.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__mixed_check_types.snap
@@ -11,43 +11,54 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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
+ Branch Status HEAD± main↕ main…± Remote⇅ CI Path Commit Age Message
+@ main ^| | #1 . 05a4a45d 16h Initial commit
++ feature _| | #1 ../repo.feature 05a4a45d 16h Initial commit
++ 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
○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__no_ci_checks.snap b/tests/snapshots/integration__integration_tests__ci_status__no_ci_checks.snap
index 3e3184131..16847d6ae 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__no_ci_checks.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__no_ci_checks.snap
@@ -11,43 +11,54 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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
+ Branch Status HEAD± main↕ main…± Remote⇅ CI Path Commit Age Message
+@ main ^| | #1 . 05a4a45d 16h Initial commit
++ feature _| | #1 ../repo.feature 05a4a45d 16h Initial commit
++ 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
○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__stale_pr.snap b/tests/snapshots/integration__integration_tests__ci_status__stale_pr.snap
index 761aa0aa8..13340b0c3 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__stale_pr.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__stale_pr.snap
@@ -23,36 +23,42 @@ info:
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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 ↑⇡ ↑1 +1 ⇡1 ● ../repo.feature da7d235a 1d Local commit
+ Branch Status HEAD± main↕ main…± Remote⇅ CI Path Commit Age Message
+@ main ^| | #1 . 05a4a45d 16h Initial commit
++ 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 ↑⇡ ↑1 +1 ⇡1 #1 ../repo.feature da7d235a 1d Local commit
○ Showing 5 worktrees, 4 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__status_context_failure.snap b/tests/snapshots/integration__integration_tests__ci_status__status_context_failure.snap
index 382caaa97..62056e85a 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__status_context_failure.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__status_context_failure.snap
@@ -11,43 +11,54 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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
+ Branch Status HEAD± main↕ main…± Remote⇅ CI Path Commit Age Message
+@ main ^| | #1 . 05a4a45d 16h Initial commit
++ feature _| | #1 ../repo.feature 05a4a45d 16h Initial commit
++ 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
○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__status_context_pending.snap b/tests/snapshots/integration__integration_tests__ci_status__status_context_pending.snap
index ac48ca158..cbf49dda6 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__status_context_pending.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__status_context_pending.snap
@@ -11,43 +11,54 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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
+ Branch Status HEAD± main↕ main…± Remote⇅ CI Path Commit Age Message
+@ main ^| | #1 . 05a4a45d 16h Initial commit
++ feature _| | #1 ../repo.feature 05a4a45d 16h Initial commit
++ 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
○ Showing 5 worktrees, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__ci_status__url_based_pushremote.snap b/tests/snapshots/integration__integration_tests__ci_status__url_based_pushremote.snap
index d3540370c..bba0b36f3 100644
--- a/tests/snapshots/integration__integration_tests__ci_status__url_based_pushremote.snap
+++ b/tests/snapshots/integration__integration_tests__ci_status__url_based_pushremote.snap
@@ -11,43 +11,54 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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
+ Branch Status HEAD± main↕ main…± Remote⇅ CI Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature _ #1 ../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__help__help_config_state_cache.snap b/tests/snapshots/integration__integration_tests__help__help_config_state_cache.snap
index b1fc81588..b75366162 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_state_cache.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_state_cache.snap
@@ -71,7 +71,7 @@ View or drop worktrunk's regenerable caches in one place. Everything here is reb
What's cached
-- CI status — GitHub/GitLab CI per branch (30–60s TTL), shown in wt list
+- CI status — GitHub/GitLab CI per branch (30–60s TTL), shown in wt list, plus the largest PR/MR number seen (sizes the CI column)
- Summaries — LLM-generated branch summaries (wt list --full, wt switch preview)
- Git commands — SHA-keyed disk caches: merge-tree, ancestry, diff-stats, and wt switch preview renders
- Hints — one-time hints already shown in this repo
diff --git a/tests/snapshots/integration__integration_tests__help__help_config_state_get.snap b/tests/snapshots/integration__integration_tests__help__help_config_state_get.snap
index fca34ae89..f62a80e07 100644
--- a/tests/snapshots/integration__integration_tests__help__help_config_state_get.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_config_state_get.snap
@@ -70,7 +70,7 @@ Shows all stored state including:
- Previous branch: Previous branch for wt switch -
- Branch markers: User-defined branch notes
- Vars: Custom variables per branch
-- CI status: Cached GitHub/GitLab CI status per branch (30s TTL)
+- CI status: Cached GitHub/GitLab CI status per branch (30-60s TTL), plus the largest PR/MR number seen (sizes the wt list CI column)
- Summaries: Cached LLM-generated branch summaries (shown in wt list --full and wt switch preview)
- Git commands cache: SHA-keyed disk caches — merge-tree, ancestry, diff-stats, and wt switch preview renders
- Hints: One-time hints that have been shown
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 7bab64b12..64f3a5140 100644
--- a/tests/snapshots/integration__integration_tests__help__help_list_long.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_list_long.snap
@@ -104,26 +104,26 @@ List all worktrees:
Include CI status, line diffs, and LLM summaries:
  wt list --full
-   Branch Status HEAD± main↕ main…± Summary Remote⇅ CI Commit
-  @ feature-api + ↕⇡ +54 -5 ↑4 ↓1 +234 -24 Refactor API to REST architecture with middleware ⇡3 ● 6814f02a
-  ^ main ^⇅ ⇡1 ⇣1 ● 41ee0834
-  + fix-auth ↕| ↑2 ↓1 +25 -11 Harden auth with constant-time token validation | ● b772e68b
-  + fix-typos _| | ● 41ee0834
+   Branch Status HEAD± main↕ main…± Summary Remote⇅ CI Commit
+  @ feature-api + ↕⇡ +54 -5 ↑4 ↓1 +234 -24 Refactor API to REST architecture with middleware ⇡3 #412 6814f02a
+  ^ main ^⇅ ⇡1 ⇣1 # 41ee0834
+  + fix-auth ↕| ↑2 ↓1 +25 -11 Harden auth with constant-time token validation | #408 b772e68b
+  + fix-typos _| | #410 41ee0834
  
-  ○ Showing 4 worktrees, 1 with changes, 2 ahead, 3 columns hidden
+  ○ Showing 4 worktrees, 1 with changes, 2 ahead, 3 columns hidden
Include branches that don't have worktrees:
  wt list --branches --full
-   Branch Status HEAD± main↕ main…± Summary Remote⇅ CI Commit
-  @ feature-api + ↕⇡ +54 -5 ↑4 ↓1 +234 -24 Refactor API to REST architecture with middleware ⇡3 ● 6814f02a
-  ^ main ^⇅ ⇡1 ⇣1 ● 41ee0834
-  + fix-auth ↕| ↑2 ↓1 +25 -11 Harden auth with constant-time token validation | ● b772e68b
-  + fix-typos _| | ● 41ee0834
-   exp /↕ ↑2 ↓1 +137 Explore GraphQL schema and resolvers 96379229
-   wip /↕ ↑1 ↓1 +33 Start API documentation b40716dc
+   Branch Status HEAD± main↕ main…± Summary Remote⇅ CI Commit
+  @ feature-api + ↕⇡ +54 -5 ↑4 ↓1 +234 -24 Refactor API to REST architecture with middleware ⇡3 #412 6814f02a
+  ^ main ^⇅ ⇡1 ⇣1 # 41ee0834
+  + fix-auth ↕| ↑2 ↓1 +25 -11 Harden auth with constant-time token validation | #408 b772e68b
+  + fix-typos _| | #410 41ee0834
+   exp /↕ ↑2 ↓1 +137 Explore GraphQL schema and resolvers 96379229
+   wip /↕ ↑1 ↓1 +33 Start API documentation b40716dc
  
-  ○ Showing 4 worktrees, 2 branches, 1 with changes, 4 ahead, 3 columns hidden
+  ○ Showing 4 worktrees, 2 branches, 1 with changes, 4 ahead, 3 columns hidden
Output as JSON for scripting:
@@ -140,7 +140,7 @@ Output as JSON for scripting:
main…± Line diffs since the merge-base (three-dot) with the default branch; --full only
Summary LLM-generated branch summary; requires --full, summary = true, and commit.generation [experimental]
Remote⇅ Commits ahead/behind tracking branch
- CI Pipeline status; --full only
+ CI PR/MR number colored by pipeline status; --full only
Path Worktree directory
URL Dev server URL from project config; dimmed if port is not listening
Commit Short hash (8 chars)
@@ -151,23 +151,23 @@ The main header label is used regardless of the default branch's actual
CI status
-The CI column shows GitHub/GitLab pipeline status:
+The CI column shows the branch's open PR/MR — #3035 on GitHub, Gitea, and Azure DevOps, !3035 on GitLab — colored by pipeline status, or a bare # when no number is available (e.g. branch workflows without a PR/MR):
Indicator Meaning
───────── ─────────────────────────────────
- ● green All checks passed
- ● blue Checks running
- ● red Checks failed
- ● magenta Reviewer requested changes
- ● cyan Review required, not yet given
- ● yellow Merge conflicts with base
- ● gray No checks configured
+ # green All checks passed
+ # blue Checks running
+ # red Checks failed
+ # magenta Reviewer requested changes
+ # cyan Review required, not yet given
+ # yellow Merge conflicts with base
+ # gray No checks configured
⚠ yellow Fetch error (rate limit, network)
(blank) No upstream or no PR/MR
-Review state merges into the same dot where its required action ranks: changes-requested (magenta) outranks running checks — waiting can't clear it — while an outstanding required review (cyan) only recolors an otherwise green or quiet branch. Cool colors mean waiting, warm colors mean act. A PR with no review signal (no required reviewers and no reviews) keeps its plain CI color, and draft PRs appear dimmed.
+Review state merges into the same color where its required action ranks: changes-requested (magenta) outranks running checks — waiting can't clear it — while an outstanding required review (cyan) only recolors an otherwise green or quiet branch. Cool colors mean waiting, warm colors mean act. A PR with no review signal (no required reviewers and no reviews) keeps its plain CI color, and draft PRs appear dimmed.
-CI indicators are clickable links to the PR or pipeline page. Any CI dot appears dimmed when unpushed local changes make the status stale. PRs/MRs are checked first, then branch workflows/pipelines for branches with an upstream. Local-only branches show blank; remote-only branches — visible with --remotes — get CI status detection. Results are cached for 30-60 seconds; use wt config state to view or clear.
+CI cells are clickable links to the PR or pipeline page, and appear dimmed when unpushed local changes make the status stale. PRs/MRs are checked first, then branch workflows/pipelines for branches with an upstream. Local-only branches show blank; remote-only branches — visible with --remotes — get CI status detection. Results are cached for 30-60 seconds; use wt config state to view or clear.
LLM summaries [experimental]
@@ -320,6 +320,7 @@ Query structured data with --format=json:
──────────── ─────── ────────────────────────────────────────────────────────────────────────────────────────────────────────────
status string CI status (see below)
source string "pr" (PR/MR) or "branch" (branch workflow)
+ number integer PR/MR number; absent for branch workflows
stale boolean Local HEAD differs from remote (unpushed changes)
url string URL to the PR/MR page
repo_url string Web URL of the repo the PR/MR targets (the upstream for fork PRs); absent when url is absent or unrecognized
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 bb703f454..1eac7d12e 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
@@ -118,37 +118,37 @@ Include CI status, line diffs, and LLM summaries:
  wt list --full
   Branch Status HEAD± main↕ main…± Summary 
-   Remote⇅ CI Commit
+   Remote⇅ CI Commit
  @ feature-api + ↕⇡ +54 -5 ↑4 ↓1 +234 -24 Refactor API to REST 
-  architecture with middleware ⇡3 ● 6814f02a
+  architecture with middleware ⇡3 #412 6814f02a
  ^ main ^⇅ 
-   ⇡1 ⇣1 ● 41ee0834
+   ⇡1 ⇣1 # 41ee0834
  + fix-auth ↕| ↑2 ↓1 +25 -11 Harden auth with 
-  constant-time token validation | ● b772e68b
-  + fix-typos _| 
-   | ● 41ee0834
+  constant-time token validation | #408 b772e68b
+  + fix-typos _| 
+   | #410 41ee0834
  
-  ○ Showing 4 worktrees, 1 with changes, 2 ahead, 3 columns hidden
+  ○ Showing 4 worktrees, 1 with changes, 2 ahead, 3 columns hidden
Include branches that don't have worktrees:
  wt list --branches --full
   Branch Status HEAD± main↕ main…± Summary 
-   Remote⇅ CI Commit
+   Remote⇅ CI Commit
  @ feature-api + ↕⇡ +54 -5 ↑4 ↓1 +234 -24 Refactor API to REST 
-  architecture with middleware ⇡3 ● 6814f02a
+  architecture with middleware ⇡3 #412 6814f02a
  ^ main ^⇅ 
-   ⇡1 ⇣1 ● 41ee0834
+   ⇡1 ⇣1 # 41ee0834
  + fix-auth ↕| ↑2 ↓1 +25 -11 Harden auth with 
-  constant-time token validation | ● b772e68b
-  + fix-typos _| 
-   | ● 41ee0834
-   exp /↕ ↑2 ↓1 +137 Explore GraphQL schema
-   and resolvers 96379229
-   wip /↕ ↑1 ↓1 +33 Start API 
-  documentation b40716dc
+  constant-time token validation | #408 b772e68b
+  + fix-typos _| 
+   | #410 41ee0834
+   exp /↕ ↑2 ↓1 +137 Explore GraphQL schema
+   and resolvers 96379229
+   wip /↕ ↑1 ↓1 +33 Start API 
+  documentation b40716dc
  
-  ○ Showing 4 worktrees, 2 branches, 1 with changes, 4 ahead, 3 columns hidden
+  ○ Showing 4 worktrees, 2 branches, 1 with changes, 4 ahead, 3 columns hidden
Output as JSON for scripting:
@@ -167,7 +167,7 @@ Output as JSON for scripting:
Summary LLM-generated branch summary; requires --full, summary = true, and
commit.generation [experimental]
Remote⇅ Commits ahead/behind tracking branch
- CI Pipeline status; --full only
+ CI PR/MR number colored by pipeline status; --full only
Path Worktree directory
URL Dev server URL from project config; dimmed if port is not listening
Commit Short hash (8 chars)
@@ -178,33 +178,35 @@ The main header label is used regardless of the default branch's actual
CI status
-The CI column shows GitHub/GitLab pipeline status:
+The CI column shows the branch's open PR/MR — #3035 on GitHub, Gitea, and Azure
+DevOps, !3035 on GitLab — colored by pipeline status, or a bare # when no number
+ is available (e.g. branch workflows without a PR/MR):
Indicator Meaning
───────── ─────────────────────────────────
- ● green All checks passed
- ● blue Checks running
- ● red Checks failed
- ● magenta Reviewer requested changes
- ● cyan Review required, not yet given
- ● yellow Merge conflicts with base
- ● gray No checks configured
+ # green All checks passed
+ # blue Checks running
+ # red Checks failed
+ # magenta Reviewer requested changes
+ # cyan Review required, not yet given
+ # yellow Merge conflicts with base
+ # gray No checks configured
⚠ yellow Fetch error (rate limit, network)
(blank) No upstream or no PR/MR
-Review state merges into the same dot where its required action ranks:
+Review state merges into the same color where its required action ranks:
changes-requested (magenta) outranks running checks — waiting can't clear it —
while an outstanding required review (cyan) only recolors an otherwise green or
quiet branch. Cool colors mean waiting, warm colors mean act. A PR with no
review signal (no required reviewers and no reviews) keeps its plain CI color,
and draft PRs appear dimmed.
-CI indicators are clickable links to the PR or pipeline page. Any CI dot appears
- dimmed when unpushed local changes make the status stale. PRs/MRs are checked
-first, then branch workflows/pipelines for branches with an upstream. Local-only
- branches show blank; remote-only branches — visible with --remotes — get CI
-status detection. Results are cached for 30-60 seconds; use wt config state to
-view or clear.
+CI cells are clickable links to the PR or pipeline page, and appear dimmed when
+unpushed local changes make the status stale. PRs/MRs are checked first, then
+branch workflows/pipelines for branches with an upstream. Local-only branches
+show blank; remote-only branches — visible with --remotes — get CI status
+detection. Results are cached for 30-60 seconds; use wt config state to view or
+clear.
LLM summaries [experimental]
@@ -377,6 +379,7 @@ Query structured data with --format=json:
──────────── ─────── ─────────────────────────────────────────────────────────
status string CI status (see below)
source string "pr" (PR/MR) or "branch" (branch workflow)
+ number integer PR/MR number; absent for branch workflows
stale boolean Local HEAD differs from remote (unpushed changes)
url string URL to the PR/MR page
repo_url string Web URL of the repo the PR/MR targets (the upstream for
diff --git a/tests/snapshots/integration__integration_tests__list__commit_conflicts_with_full.snap b/tests/snapshots/integration__integration_tests__list__commit_conflicts_with_full.snap
index 41302ebd7..8ea077c82 100644
--- a/tests/snapshots/integration__integration_tests__list__commit_conflicts_with_full.snap
+++ b/tests/snapshots/integration__integration_tests__list__commit_conflicts_with_full.snap
@@ -11,43 +11,54 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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
+ Branch Status HEAD± main↕ main…± Remote⇅ CI 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_full_with_nonexistent_default_branch.snap b/tests/snapshots/integration__integration_tests__list__list_full_with_nonexistent_default_branch.snap
index 99d08054e..ab2d3fe52 100644
--- a/tests/snapshots/integration__integration_tests__list__list_full_with_nonexistent_default_branch.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_full_with_nonexistent_default_branch.snap
@@ -11,42 +11,53 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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⇅ CI 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_task_dag_full_with_diffs.snap b/tests/snapshots/integration__integration_tests__list__list_task_dag_full_with_diffs.snap
index c7720b16e..5e054d071 100644
--- a/tests/snapshots/integration__integration_tests__list__list_task_dag_full_with_diffs.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_task_dag_full_with_diffs.snap
@@ -30,7 +30,6 @@ info:
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -39,9 +38,11 @@ info:
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
@@ -53,11 +54,11 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI Path Commit Age Message
-@ main ^| | . 05a4a45d 16h Initial commit
-+ feature-a ? ↑ +1 ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
-+ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
-+ feature-b ↑ ↑2 +2 -1 ../repo.feature-b 391b2a76 1d Test commit
+ Branch Status HEAD± main↕ main…± Remote⇅ CI Path Commit Age Message
+@ main ^| | . 05a4a45d 16h Initial commit
++ feature-a ? ↑ +1 ↑1 +1 ../repo.feature-a 1b87d473 16h Add feature-a file
++ feature-c ↑ ↑1 +1 ../repo.feature-c 345c7c93 16h Add feature-c file
++ feature-b ↑ ↑2 +2 -1 ../repo.feature-b 391b2a76 1d Test commit
○ Showing 4 worktrees, 1 with changes, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_task_dag_with_upstream.snap b/tests/snapshots/integration__integration_tests__list__list_task_dag_with_upstream.snap
index 41f428d6c..2e056d2f1 100644
--- a/tests/snapshots/integration__integration_tests__list__list_task_dag_with_upstream.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_task_dag_with_upstream.snap
@@ -12,44 +12,55 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI Path Commit Age Message
-@ 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
-+ ahead ↑⇡ ↑1 +1 ⇡1 ../repo.ahead 76a1bef4 1d Ahead commit
-+ in-sync _| | ../repo.in-sync 01cab36c 1d Initial commit on main
+ Branch Status HEAD± main↕ main…± Remote⇅ CI Path Commit Age Message
+@ 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
++ ahead ↑⇡ ↑1 +1 ⇡1 ../repo.ahead 76a1bef4 1d Ahead commit
++ in-sync _| | ../repo.in-sync 01cab36c 1d Initial commit on main
○ Showing 6 worktrees, 4 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__list_with_remotes_and_full.snap b/tests/snapshots/integration__integration_tests__list__list_with_remotes_and_full.snap
index fe5b9b195..b70a63573 100644
--- a/tests/snapshots/integration__integration_tests__list__list_with_remotes_and_full.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_with_remotes_and_full.snap
@@ -12,43 +12,54 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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/feature-remote /_ 05a4a45d 16h Initial commit
+ Branch Status HEAD± main↕ main…± Remote⇅ CI 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/feature-remote /_ 05a4a45d 16h Initial commit
○ Showing 4 worktrees, 1 remote branches, 3 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap b/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap
index 94ded64aa..aa9ac7d72 100644
--- a/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap
+++ b/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap
@@ -29,7 +29,6 @@ info:
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -38,9 +37,11 @@ info:
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
@@ -52,12 +53,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI Path Commit Age Message
-@ main ^⇡ ⇡2 . c51a68f7 1d Main advances
-+ 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 +!?⊞✗⇅🤖 +3 -2 ↑2 ↓1 +3 -1 ⇡1 ⇣1 ../repo.feature 342be366 1d Local commit
+ Branch Status HEAD± main↕ main…± Remote⇅ CI Path Commit Age Message
+@ main ^⇡ ⇡2 . c51a68f7 1d Main advances
++ 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 +!?⊞✗⇅🤖 +3 -2 ↑2 ↓1 +3 -1 ⇡1 ⇣1 ../repo.feature 342be366 1d Local commit
○ Showing 5 worktrees, 1 with changes, 4 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__maximum_status_with_git_operation.snap b/tests/snapshots/integration__integration_tests__list__maximum_status_with_git_operation.snap
index 8bf82556b..6b08a202c 100644
--- a/tests/snapshots/integration__integration_tests__list__maximum_status_with_git_operation.snap
+++ b/tests/snapshots/integration__integration_tests__list__maximum_status_with_git_operation.snap
@@ -29,7 +29,6 @@ info:
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
@@ -38,9 +37,11 @@ info:
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
@@ -52,12 +53,12 @@ info:
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI Path Commit Age Message
-@ main ^⇡ ⇡2 . 27eb0ee8 1d Main conflicting changes
-+ 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 +!?✘✗ 🤖 +8 ↑1 ↓1 +3 -2 ../repo.feature 27eb0ee8 1d Main conflicting changes
+ Branch Status HEAD± main↕ main…± Remote⇅ CI Path Commit Age Message
+@ main ^⇡ ⇡2 . 27eb0ee8 1d Main conflicting changes
++ 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 +!?✘✗ 🤖 +8 ↑1 ↓1 +3 -2 ../repo.feature 27eb0ee8 1d Main conflicting changes
○ Showing 5 worktrees, 1 with changes, 4 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__readme_example_list_branches.snap b/tests/snapshots/integration__integration_tests__list__readme_example_list_branches.snap
index 65af28e37..bc2a46e25 100644
--- a/tests/snapshots/integration__integration_tests__list__readme_example_list_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list__readme_example_list_branches.snap
@@ -9,47 +9,58 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "130"
+ COLUMNS: "134"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Summary Remote⇅ CI Commit
-@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 +234 -24 Refactor API to REST architecture with middleware ⇡3 ● 6814f02a
-^ main ^⇅ ⇡1 ⇣1 ● 41ee0834
-+ fix-auth ↕| ↑2 ↓1 +25 -11 Harden auth with constant-time token validation | ● b772e68b
-+ fix-typos _| | ● 41ee0834
- exp /↕ ↑2 ↓1 +137 Explore GraphQL schema and resolvers 96379229
- wip /↕ ↑1 ↓1 +33 Start API documentation b40716dc
+ Branch Status HEAD± main↕ main…± Summary Remote⇅ CI Commit
+@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 +234 -24 Refactor API to REST architecture with middleware ⇡3 #412 6814f02a
+^ main ^⇅ ⇡1 ⇣1 # 41ee0834
++ fix-auth ↕| ↑2 ↓1 +25 -11 Harden auth with constant-time token validation | #408 b772e68b
++ fix-typos _| | #410 41ee0834
+ exp /↕ ↑2 ↓1 +137 Explore GraphQL schema and resolvers 96379229
+ wip /↕ ↑1 ↓1 +33 Start API documentation b40716dc
○ Showing 4 worktrees, 2 branches, 1 with changes, 4 ahead, 3 columns hidden
diff --git a/tests/snapshots/integration__integration_tests__list__readme_example_list_full.snap b/tests/snapshots/integration__integration_tests__list__readme_example_list_full.snap
index 8b180ff6b..74e277a9a 100644
--- a/tests/snapshots/integration__integration_tests__list__readme_example_list_full.snap
+++ b/tests/snapshots/integration__integration_tests__list__readme_example_list_full.snap
@@ -8,45 +8,56 @@ info:
env:
APPDATA: "[TEST_CONFIG_HOME]"
CLICOLOR_FORCE: "1"
- COLUMNS: "130"
+ COLUMNS: "134"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Summary Remote⇅ CI Commit
-@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 +234 -24 Refactor API to REST architecture with middleware ⇡3 ● 6814f02a
-^ main ^⇅ ⇡1 ⇣1 ● 41ee0834
-+ fix-auth ↕| ↑2 ↓1 +25 -11 Harden auth with constant-time token validation | ● b772e68b
-+ fix-typos _| | ● 41ee0834
+ Branch Status HEAD± main↕ main…± Summary Remote⇅ CI Commit
+@ feature-api + ↕⇡ +54 -5 ↑4 ↓1 +234 -24 Refactor API to REST architecture with middleware ⇡3 #412 6814f02a
+^ main ^⇅ ⇡1 ⇣1 # 41ee0834
++ fix-auth ↕| ↑2 ↓1 +25 -11 Harden auth with constant-time token validation | #408 b772e68b
++ fix-typos _| | #410 41ee0834
○ Showing 4 worktrees, 1 with changes, 2 ahead, 3 columns hidden
diff --git a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
index 14c907ec1..a20c37457 100644
--- a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
@@ -12,48 +12,59 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI Path Commit Age Message
-@ 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
-+ ahead ↑⇡ ↑2 +2 ⇡2 ../repo.ahead a25eff2a 1d Ahead commit 2
-+ behind _⇣ ⇣1 ../repo.behind 01cab36c 1d Initial commit on main
-+ diverged ↑⇅ ↑1 +1 ⇡1 ⇣1 ../repo.diverged f035d2c5 1d Diverged local commit
-+ gone-upstream _ ../repo.gone-upstream 01cab36c 1d Initial commit on main
-+ in-sync _| | ../repo.in-sync 01cab36c 1d Initial commit on main
-+ no-upstream _ ../repo.no-upstream 01cab36c 1d Initial commit on main
+ Branch Status HEAD± main↕ main…± Remote⇅ CI Path Commit Age Message
+@ 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
++ ahead ↑⇡ ↑2 +2 ⇡2 ../repo.ahead a25eff2a 1d Ahead commit 2
++ behind _⇣ ⇣1 ../repo.behind 01cab36c 1d Initial commit on main
++ diverged ↑⇅ ↑1 +1 ⇡1 ⇣1 ../repo.diverged f035d2c5 1d Diverged local commit
++ gone-upstream _ ../repo.gone-upstream 01cab36c 1d Initial commit on main
++ in-sync _| | ../repo.in-sync 01cab36c 1d Initial commit on main
++ no-upstream _ ../repo.no-upstream 01cab36c 1d Initial commit on main
○ Showing 10 worktrees, 5 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__working_tree_conflicts_with_full.snap b/tests/snapshots/integration__integration_tests__list__working_tree_conflicts_with_full.snap
index 07a198f05..6b7513840 100644
--- a/tests/snapshots/integration__integration_tests__list__working_tree_conflicts_with_full.snap
+++ b/tests/snapshots/integration__integration_tests__list__working_tree_conflicts_with_full.snap
@@ -11,43 +11,54 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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
+ Branch Status HEAD± main↕ main…± Remote⇅ CI 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_config__list_config_full_and_branches.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_full_and_branches.snap
index 0bdf5df4e..bcf1f79f1 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_full_and_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_full_and_branches.snap
@@ -10,43 +10,54 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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
+ Branch Status HEAD± main↕ main…± Remote⇅ CI 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_full_enabled.snap b/tests/snapshots/integration__integration_tests__list_config__list_config_full_enabled.snap
index 4ad00b786..d3d762ee1 100644
--- a/tests/snapshots/integration__integration_tests__list_config__list_config_full_enabled.snap
+++ b/tests/snapshots/integration__integration_tests__list_config__list_config_full_enabled.snap
@@ -10,42 +10,53 @@ info:
COLUMNS: "500"
GIT_AUTHOR_DATE: "2025-01-01T00:00:00Z"
GIT_COMMITTER_DATE: "2025-01-01T00:00:00Z"
+ GIT_COMMON_DIR: ""
GIT_CONFIG_GLOBAL: "[TEST_GIT_CONFIG]"
GIT_CONFIG_SYSTEM: /dev/null
+ GIT_DIR: ""
GIT_EDITOR: ""
+ GIT_INDEX_FILE: ""
+ GIT_OBJECT_DIRECTORY: ""
GIT_TERMINAL_PROMPT: "0"
+ GIT_WORK_TREE: ""
HOME: "[TEST_HOME]"
LANG: C
LC_ALL: C
+ LLVM_PROFILE_FILE: "[LLVM_PROFILE_FILE]"
MOCK_CONFIG_DIR: "[MOCK_CONFIG_DIR]"
NO_COLOR: ""
OPENCODE_CONFIG_DIR: "[TEST_OPENCODE_CONFIG]"
PATH: "[PATH]"
PSModulePath: ""
- RUST_LOG: warn
SHELL: ""
TERM: alacritty
USERPROFILE: "[TEST_HOME]"
WORKTRUNK_APPROVALS_PATH: "[TEST_APPROVALS]"
WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
WORKTRUNK_SYSTEM_CONFIG_PATH: "[TEST_SYSTEM_CONFIG]"
+ WORKTRUNK_TEST_BASH_INSTALLED: "0"
WORKTRUNK_TEST_CLAUDE_INSTALLED: "0"
+ WORKTRUNK_TEST_CODEX_INSTALLED: "0"
WORKTRUNK_TEST_DELAYED_STREAM_MS: "-1"
WORKTRUNK_TEST_EPOCH: "1735776000"
+ WORKTRUNK_TEST_FISH_INSTALLED: "0"
+ WORKTRUNK_TEST_GEMINI_INSTALLED: "0"
WORKTRUNK_TEST_NUSHELL_ENV: "0"
WORKTRUNK_TEST_OPENCODE_INSTALLED: "0"
WORKTRUNK_TEST_POWERSHELL_ENV: "0"
+ WORKTRUNK_TEST_POWERSHELL_INSTALLED: "0"
WORKTRUNK_TEST_SKIP_URL_HEALTH_CHECK: "1"
+ WORKTRUNK_TEST_ZSH_INSTALLED: "0"
XDG_CONFIG_HOME: "[TEST_CONFIG_HOME]"
---
success: true
exit_code: 0
----- stdout -----
- Branch Status HEAD± main↕ main…± Remote⇅ CI 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 Status HEAD± main↕ main…± Remote⇅ CI 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