Skip to content

fix(list): rank Integrated (⊂) above WouldConflict (✗) in main-state - #3278

Merged
max-sixty merged 2 commits into
mainfrom
removable
Jun 28, 2026
Merged

max-sixty merged 2 commits into
mainfrom
removable

Conversation

@max-sixty

@max-sixty max-sixty commented Jun 28, 2026 •

Copy link
Copy Markdown
Owner

A squash-merged branch whose default branch later re-edited the same lines showed ✗ (WouldConflict) in wt list, while wt step prune correctly classified it as ⊂ (all changes in main) and removed it. The list and the prune verdict disagreed on the same branch, so ✗ read as "unmerged work that conflicts" when the branch was in fact fully integrated and safe to delete.

The conflict is real but vacuous: a 3-way re-merge collides on the lines the default branch re-touched, yet the branch's whole diff already matches a commit on the default branch (patch-id), so resolving the merge just reproduces the default branch's tree — nothing added. That patch-id check is exactly how prune reaches ⊂; the list simply ranked the downstream conflict above the integration verdict.

This reorders gate 3 of the main-state column so the integration family (⊂/_) outranks WouldConflict, mirroring the existing rule that Orphan outranks it — show the root-cause state, not the downstream conflict. Integration stays fire-or-continue so the common ↑/↓/⊂ cases still render promptly; only ✗ is held until the integration verdict is final, so an integrated-but-stale branch never flashes ✗ before settling to ⊂. A genuinely un-integrated conflict still shows ✗.

Well covered by unit tests on the priority logic and three new gate tests pinning the integrated-outranks-conflict, no-flash-while-loading, and genuine-conflict cases. The list's rendered table output is unchanged (the integrated-and-conflicting combination doesn't occur in existing fixtures); a follow-up commit reorders the wt list default-branch symbol docs and regenerates the --help snapshots to match the new priority.

This was written by Claude Code on behalf of max

A squash-merged branch whose default branch later re-edited the same lines
showed `✗` (WouldConflict) in `wt list` while `wt step prune` correctly
reported it as `⊂` (all changes in main) and removed it. The list and the
prune verdict disagreed on the same branch, so `✗` read as "unmerged work
that conflicts" when the branch was in fact fully integrated and safe to
delete.

The conflict is real but vacuous: a 3-way re-merge collides on the lines the
default branch re-touched, yet the branch's whole diff already matches a
commit on the default branch (patch-id), so resolving the merge just
reproduces the default branch's tree — nothing added. That patch-id check is
exactly how prune reaches `⊂`; the list simply ranked the downstream
conflict above the integration verdict.

Reorder gate 3 so the integration family (`⊂`/`_`) outranks `WouldConflict`,
mirroring the existing rule that `Orphan` outranks it — show the root-cause
state, not the downstream conflict. Integration stays fire-or-continue so the
common `↑`/`↓`/`⊂` cases still render promptly; only `✗` is held until the
integration verdict is final, so an integrated-but-stale branch never flashes
`✗` before settling to `⊂`. A genuinely un-integrated conflict still shows
`✗`.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

@worktrunk-bot worktrunk-bot left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The reorder reads correctly: the integration verdict (check_integration) is unchanged, so this only changes which symbol wins when a branch is both integrated and would-conflict — and ⊂ matching wt step prune's patch-id verdict is the right call. The fire-or-continue-but-hold-✗-until-integration_resolved design avoids the flash, and integration_resolved's feeder set is exactly check_integration's six inputs, all of which converge (each is either loaded by its task or seeded by seed_skipped_task_defaults; counts is the only one not seeded, but those items pre-seed main_state directly so the gate isn't the decider). New tests cover the three cases well.

One gap: the user-facing docs in src/cli/mod.rs (the primary source that regenerates docs/content/list.md and skills/worktrunk/reference/list.md via test_docs_are_in_sync) still describe the old priority — they weren't updated alongside the code comments:

  • The ### Default branch symbol table (the ^ ∅ ✗ _ – ⊂ ↕ ↑ ↓ rows) is ordered by the old priority — ✗ is listed above _/⊂. After this change the priority is ^ > ∅ > _ > ⊂ > ✗ > – > …, so the ✗ row should move below _/⊂.
  • The ✗ row's meaning — "Merging into the default branch would conflict" — no longer mentions the new qualifier. It now renders only when the branch is not already integrated (mirroring the WouldConflict (✗) … AND not already integrated wording you added in state.rs). Worth a clause so the docs match the behavior.
  • The main_state value list further down ("is_main", "orphan", "would_conflict", "empty", "same_commit", "integrated", …) is in the same stale priority order.

These are outside this PR's diff — happy to push a commit that updates the src/cli/mod.rs table + value list and regenerates the two mirrors if you'd like, or you can fold it in.

Minor, unrelated: the MAIN_STATE glyph comment at status_symbols.rs:266 (^✗_⊂↕↑↓) is the old order too — same fix as the inline one below.

Address auto-reviewer feedback: the code-comment reorder in the previous
commit left the user-facing docs describing the old priority. The mirrors
were internally consistent (so test_docs_are_in_sync passed) but stale.

Reorder the `### Default branch` symbol table and the `main_state` value
list in src/cli/mod.rs so `_`/`⊂` precede `✗`, add the "and the branch
isn't already integrated" qualifier to the `✗` row, and fix the stale
`MAIN_STATE` glyph-order comments in status_symbols.rs. Regenerated the
docs/content/list.md and skills/worktrunk/reference/list.md mirrors and the
two `--help` snapshots.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@max-sixty
max-sixty merged commit 02c0621 into main Jun 28, 2026
39 checks passed
@max-sixty
max-sixty deleted the removable branch June 28, 2026 02:11
social4hyq pushed a commit to social4hyq/homebrew-core that referenced this pull request Sep 20, 2026
worktrunk 0.63.0

Created-by: HarmonybrewBot
Commit-by: HarmonybrewBot
Merged-by: HarmonybrewBot
Description: Created by `brew bump`

---

Created with `brew bump-formula-pr`.<details>
  <summary>release notes</summary>
  <pre>## Release Notes

### Improved

- **`[list] columns` can force a column on past `--full`**: Listing a column now overrides the `--full` / `[list] summary` presets — `columns = ["branch", "ci"]` shows the CI column without `--full`. Hard data-source prerequisites still apply: a listed `summary` with no `[commit.generation]` command, or `url` with no template, stays hidden, since listing can't conjure data that isn't configured. ([#3295](max-sixty/worktrunk#3295))

- **`Alt-r` in the picker refreshes the preview panes, not just the rows**: `Alt-r` re-collected the rows but kept serving cached preview content, so editing a tracked file and refreshing still showed the pre-edit diff. It now clears the preview cache too, recomputing the working-tree / log / branch-diff / upstream / summary tabs and re-fetching `pr` / `comments`. Unchanged branches re-read from the content-keyed on-disk cache, so only genuinely changed content pays a recompute. ([#3293](max-sixty/worktrunk#3293))

- **A narrowed `wt list` is now actually faster**: A narrowed `[list] columns` selection (e.g. `["branch", "path"]`) now runs only the git work its columns need. It previously ran every per-worktree `git status`, diff, and ahead/behind walk regardless, then discarded the unselected results — so a trimmed view was no faster than the full table, and on a repo with many dirty worktrees that discarded work was the bulk of the wall-clock cost. ([#3274](max-sixty/worktrunk#3274), thanks @jtaby for reporting)

- **Fewer duplicate git calls in `wt list --full`**: The two integration probes per row (the conflict bit for `main-state` and the clean-merge tree for the integration column) issued a byte-identical `git merge-tree`, and the shared default-branch tip was peeled to its tree once per row. Both are now deduplicated through the in-memory cache, so each resolves once per run instead of once per worktree. ([#3288](max-sixty/worktrunk#3288), [#3289](max-sixty/worktrunk#3289))

- **Picker `comments` tab avoids redundant forge fetches**: The picker's `comments` preview tab gained an on-disk cache keyed by the PR's `updatedAt` (which rides for free on the CI fetch the picker already makes), so a repeat `wt switch` skips the per-row `gh pr view --json comments` fetch when the thread is unchanged and paints the tab instantly instead of showing "Loading comments…". The cache is also primed from the `gh pr list` call the picker already makes, so the tab skips its own fetch even on a session's first open (including PRs with no comments). GitHub only. ([#3294](max-sixty/worktrunk#3294), [#3299](max-sixty/worktrunk#3299))

- **Statusline width comes from `COLUMNS`, not a parent-process walk**: `wt list statusline` used to spawn up to 10 `ps` calls plus `stty` per render to recover a terminal width, because Claude Code piped the subprocess with no inherited TTY. Claude Code now sets `COLUMNS`/`LINES` to the terminal dimensions before running the script (since v2.1.153), so the width comes straight from there — less a fixed 5-column margin for Claude Code's own UI — and the `ps`/`stty` walk is gone. On an older Claude Code that doesn't set `COLUMNS`, the line renders untruncated rather than walking the process tree. ([#3286](max-sixty/worktrunk#3286), closes [#2950](max-sixty/worktrunk#2950))

### Fixed

- **`wt list` diff and ahead/behind columns use the upstream default tip**: The `main↕` (ahead/behind) and `main…±` (diff) columns measured every branch against the *local* default-branch tip, so in a fork whose local `main` lagged its upstream they reported inflated counts — one fork branch showed `↑44` and `+∞ / -5K` when it was ~2 commits past the real upstream tip. They now diff against the same upstream-aware base the integration column already uses. ([#3280](max-sixty/worktrunk#3280))

- **Integrated branches no longer flash `✗` in `wt list`**: A squash-merged branch whose default branch later re-edited the same lines showed `✗` (would-conflict), even though `wt step prune` classified it as `⊂` (fully integrated) and removed it. The list now ranks the integration verdict above the downstream conflict, matching prune; a genuinely un-integrated conflict still shows `✗`. ([#3278](max-sixty/worktrunk#3278))

- **`wt list` divergence-overflow marker uses one emphasis level**: When an ahead/behind count overflows its digit budget, the `main↕` column's compact `C`/`K`/`∞` marker rendered the "behind" subcolumn as dim + bold (reading as bold red) instead of a clean one-level step. It now steps exactly one level — dim red → normal red — matching the "ahead" subcolumn, across `wt list` and the picker. ([#3303](max-sixty/worktrunk#3303))

- **Branch deletion on removal is atomic**: `wt remove` and prune now delete a branch with a compare-and-swap (`git update-ref -d <ref> <expected-sha>`) against the SHA the integration check already read, closing the window where a branch whose tip moved in between (e.g. a hook landing a commit) could be deleted. Such a branch is now retained with a clear message and a `wt remove -D <branch>` recovery hint. This also unifies the previously divergent safe-delete paths; explicit force-delete still uses `git branch -D`. ([#2903](max-sixty/worktrunk#2903))

- **`wt list` and picker Age/Message columns paint as soon as the commit batch lands**: These columns carry no async task — their data arrives with the initial `git log` batch — but stayed on the `·` placeholder until some slower task happened to redraw the row, so the commit message lagged behind a cache-warm Summary preview. They now paint the moment the batch lands. ([#3287](max-sixty/worktrunk#3287))

- **Picker `Alt-x` removal: no cursor flash, `--prs` rows preserved**: Removing a row with `Alt-x` flashed the `>` pointer to the top of the list for a frame, and in `--prs` mode made the streamed PR/MR rows vanish until the next `Alt-r`. Removal is now a synchronous in-place pool resync: the cursor lands on the row that slid up with no flash, and the PR/MR rows survive. ([#3268](max-sixty/worktrunk#3268), [#3275](max-sixty/worktrunk#3275))

- **Removable rows stay gray when selected in the picker**: A safe-to-delete worktree (integrated, or clean and even with the default branch) renders its row gray, but the gray vanished under the selection highlight — exactly when you're about to act on it. The gray now survives selection (selected row only; `wt list` and unselected rows are unchanged). ([#3267](max-sixty/worktrunk#3267))

- **Picker preview keeps its scroll when CI status arrives**: Scrolling down a diff and waiting a couple of seconds snapped it back to the top when the live CI fetch landed and re-rendered the pane. The re-render is now precise — a tab re-runs only when its own content would actually change — so a CI update no longer throws away the scroll position of an unrelated tab. ([#3292](max-sixty/worktrunk#3292))

- **Picker summary tab dims when there's nothing to summarize**: The summary preview tab (`5`) stayed lit on a clean branch with no commits ahead, unlike the diff tabs (1/3/4), which dim once their diff is known empty. It now dims in concert with them once both the branch diff and working tree are known empty. ([#3291](max-sixty/worktrunk#3291))

- **Picker default view keeps collect order**: With no query typed, the `wt switch` picker reordered rows by where each name's last `/` falls, so slash-bearing branches (`feature/…`, `perf/…`) sank toward the bottom and intermixed with other row kinds. The default view now preserves collect order. ([#3301](max-sixty/worktrunk#3301))

- **Picker branch-diff preview and summary use the upstream-aware base**: Like the `wt list` columns above, the picker's branch-diff preview pane and the LLM branch summary diffed against the raw local default branch, so a fork whose local default lagged upstream made them describe dozens of already-merged commits. They now use the same upstream-aware comparison base. ([#3305](max-sixty/worktrunk#3305))

- **Picker comment previews render fenced code blocks cleanly**: A fenced code block inside a PR/MR comment rendered as a garbled double gutter in the `wt switch` comments preview — alternating bar/no-bar lines with broken alignment. The code block now renders without the nested gutter. ([#3306](max-sixty/worktrunk#3306))

- **First-run hints show the config path wt actually loads from**: The picker's disabled-summary tab and the commit-generation setup prompt hardcoded `~/.config/worktrunk/config.toml`, so a user with `--config`, `WORKTRUNK_CONFIG_PATH`, or a non-default `$XDG_CONFIG_HOME` was told to edit a file wt never reads. Both now show the resolved path. ([#3290](max-sixty/worktrunk#3290), [#3298](max-sixty/worktrunk#3298))

### Internal

- **`-vv` trace and profiler accuracy**: `trace.log` is now purely human-readable, with the machine-parseable `[wt-trace]` fields living only in `trace.jsonl`; and the performance profile's cache analysis no longer reports stdin-driven commands (LLM `claude -p` calls, `git patch-id`) as duplicate re-runs, since their real input isn't captured in the command string. ([#3296](max-sixty/worktrunk#3296), [#3297](max-sixty/worktrunk#3297))

## Install worktrunk 0.63.0

### Install prebuilt binaries via shell script

`

See merge request: Harmonybrew/homebrew-core!13092
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants