Skip to content

feat(switch): scale picker list height to the terminal - #3205

Merged
max-sixty merged 1 commit into
mainfrom
picker-worktree-count
Jun 24, 2026
Merged

max-sixty merged 1 commit into
mainfrom
picker-worktree-count

Conversation

@max-sixty

Copy link
Copy Markdown
Owner

The interactive picker's Down layout (preview below the list) capped the worktree list at a fixed 12 rows. On a tall terminal with many worktrees that meant seeing only 12 — with all the surplus height going to a near-empty preview pane — and the list never adapted to the space available.

This replaces the MAX_VISIBLE_ITEMS = 12 constant with max_visible_items(available), a balanced 50/50 split: the list may claim up to half of skim's area (available / 2) and the preview keeps the other half, so visible rows scale with terminal height. Integer division truncates the list's half toward the preview — a deliberate preview-favoring tie-break — and a MIN_VISIBLE_ITEMS = 3 floor keeps the list usable on a short terminal.

The tradeoff is at the common 80×24: it now shows ~6 rows / 11 preview lines instead of the old 12 rows / 5-line (floor-crushed) preview — a more balanced split. On a 50-row terminal it shows up to 18 rows; on a 120-row terminal up to 50.

Navigating the diff

  • src/commands/picker/preview.rs — the policy. available_height() is the single home for skim's 90%-of-terminal conversion (both layout arms, the estimate cap, and the half-page scroll all derive from it, retiring a duplicated magic 45). max_visible_items() is the cap; dimensions_for() is a pure seam extracted from preview_dimensions() so the split is unit-testable without a TTY.
  • src/commands/picker/mod.rs — the num_items_estimate perf short-circuit now gates on the same height-derived cap, and half_page routes through available_height().
  • Right layout is untouched — it already used the full height and ignores the item count.

Testing

Six unit tests in preview.rs pin the full scenario grid (6 terminal heights × 4 item counts), the cap table, the no-phantom-rows-when-empty case, no-panic on degenerate terminals, and the saturation invariant that keeps the estimate short-circuit sound.

This was written by Claude Code on behalf of max

The interactive picker's Down layout capped the worktree list at a fixed 12 rows, so a tall terminal with many worktrees showed only 12 and handed all the surplus height to a mostly-empty preview pane.

Replace the constant with `max_visible_items(available)` — a balanced 50/50 split: the list grows to half of skim's area and the preview keeps the other half, floored at MIN_VISIBLE_ITEMS so a short terminal still shows a few rows. Centralize skim's 90%-of-terminal conversion in one `available_height()` helper that both layout arms, the num_items_estimate cap, and the half-page scroll derive from, retiring a duplicated magic `45`. Extract a pure `dimensions_for` seam so the split is unit-testable without a TTY. Right layout is unchanged (it already uses the full height).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@max-sixty
max-sixty merged commit 8bc451c into main Jun 24, 2026
37 checks passed
@max-sixty
max-sixty deleted the picker-worktree-count branch June 24, 2026 16:59
max-sixty added a commit that referenced this pull request Jun 24, 2026
## What

Collapses the interactive picker's repeated `terminal_size()` reads into
a single read, threaded explicitly through the layout-sizing code.

## Why

PR #3205 made the picker's Down-layout list height adapt to the
terminal, but left the startup path reading the terminal size 3–4 times
per launch — once in `auto_detect` (layout), once for the
`num_items_estimate` cap, once each inside `to_preview_window_spec` and
`preview_dimensions`, once for the speculative pre-compute, and once for
`half_page`. `to_preview_window_spec` re-read the terminal and
recomputed the Down spec internally, so the Down preview dimensions were
computed twice. Beyond the redundant syscalls, the estimate cap and the
actual layout could observe different terminal sizes if the window was
resized mid-startup — a benign but real race.

## How

`handle_picker` now reads `terminal_size::terminal_size()` once and
threads `(term_width, term_height)` into every sizing site: layout
detection (`PreviewLayout::for_dimensions`), the visible-row cap
(`max_visible_items(available_height(term_height))`), the preview
dimensions (`dimensions_for`), the speculative pre-compute, and the
half-page scroll. `dimensions_for` — already pure and unit-tested — is
the single entry; `spec_for` formats the skim preview-window spec from
the already-computed dims rather than recomputing them.

This retires three terminal-reading methods on `PreviewLayout`:
`auto_detect` (folded into the single read + `for_dimensions`),
`preview_dimensions` (the live-terminal reader), and
`to_preview_window_spec` (which re-read and recomputed). `preview.rs` no
longer reads the terminal at all — the read lives solely in
`handle_picker`. `crate::display::terminal_width()` (a separate
stderr-first width probe for the skim list column) is left as-is; it
isn't part of the layout-sizing path.

## Behavior

No user-facing change. Fallbacks are preserved at every site — the
single read falls back to `(80, 24)`, matching the prior per-call
fallbacks, and `half_page` on that fallback still evaluates to `10`
(`(available_height(24) / 2).max(5)` = `(21 / 2).max(5)` = `10`),
identical to the old `.unwrap_or(10)`. The pre-existing `dimensions_for`
scenario/edge tests pass unchanged; the one spec-formatting test was
retargeted at `spec_for` with exact-string assertions (strictly
stronger), and a redundant duplicate of it in `mod.rs` was removed.

`cargo run -- hook pre-merge --yes` is green (4181 tests, clippy, fmt).

> _This was written by Claude Code on behalf of max_

Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
social4hyq pushed a commit to social4hyq/homebrew-core that referenced this pull request Sep 20, 2026
worktrunk 0.62.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

- **Browse open PRs/MRs in the `wt switch` picker, with live CI**: The picker now streams a live CI/review-status column per row — priming from the local cache, then fetching live (it previously showed only cached numbers with no network). A new `--prs` flag adds the repository's open PRs (GitHub) / MRs (GitLab) as rows alongside your worktrees, each with `pr` / `comments` / `log` preview tabs loaded from the forge in the background; selecting one fetches its branch and switches. Rows whose branch is already shown aren't duplicated, so `--prs` differs from plain `wt switch` only by the extra rows. [Docs](https://worktrunk.dev/switch/) ([#3128](max-sixty/worktrunk#3128), [#3169](max-sixty/worktrunk#3169), [#3189](max-sixty/worktrunk#3189), [#3252](max-sixty/worktrunk#3252))

- **`main…±` diff column shows by default in `wt list`**: The `main…±` column (lines changed since the merge-base with the default branch) now renders in the default `wt list` and picker, served from a persistent cache rather than a history walk. `--full` now adds only the columns that reach off-machine — CI status and LLM branch summaries — and `wt list --format=json` populates `main.diff` for every item, not just under `--full`. ([#3236](max-sixty/worktrunk#3236))

- **`[list] columns` selects and orders the columns `wt list` shows**: A new `[list] columns` user-config key (also settable via `--config-set`) takes an ordered array of column names — built-in (`branch`, `status`, `ci`, `path`, …) and `[list.custom-columns]` headers alike — and renders exactly those, in that order. Where v0.61.0's custom columns *add* columns, this *selects and reorders* the whole set; omit the key for the default layout. (`WORKTRUNK__LIST__COLUMNS` isn't supported yet and warns if set.) ([#3141](max-sixty/worktrunk#3141))

- **Picker PR preview shows full PR/MR detail**: The `pr` tab now renders the PR/MR title, markdown description, author, draft state, comment count, bold branch name, and underlined URL for any row whose branch has an open PR — not just `--prs` rows — and the `comments` tab fetches the real thread. The title and description ride the CI fetch the picker already makes; the comment thread is fetched lazily in the background, once per row. ([#3167](max-sixty/worktrunk#3167), [#3197](max-sixty/worktrunk#3197), [#3223](max-sixty/worktrunk#3223), [#3195](max-sixty/worktrunk#3195), [#3231](max-sixty/worktrunk#3231))

- **Interactive picker runs on Windows**: The `wt switch` picker was Unix-only because its preview-tab keys shelled out through a per-process state file `cmd.exe` lacks; tab state moved to an in-memory atomic with native skim callbacks, lifting the platform gate. ([#3217](max-sixty/worktrunk#3217))

- **Picker keyboard shortcuts**: `Alt-y` copies the selected branch name, `Alt-o` opens the row's PR/MR in the browser, and `Alt-r` refreshes the list (picking up worktrees created or removed elsewhere). (Breaking: in the picker, remove moved from `Alt-r` to `Alt-x`) ([#3233](max-sixty/worktrunk#3233))

- **Picker uses the full terminal**: List height scales with the terminal (a roughly even split with the preview, minimum 3 rows) instead of a fixed 12-row cap, the table lays out at full width so toggling the preview off with `Alt-p` reveals the freed columns with no reflow, and a scrollbar appears when the list overflows. ([#3205](max-sixty/worktrunk#3205), [#3214](max-sixty/worktrunk#3214), [#3198](max-sixty/worktrunk#3198))

- **Picker filters on more of each row**: Typing a gutter sigil filters by row kind (`+` for linked worktrees, `@` for the current one), the fuzzy matcher ranks on the distinguishing path segment rather than the shared parent prefix, and rows with a PR/MR also match on its number, title, and author. ([#3143](max-sixty/worktrunk#3143), [#3208](max-sixty/worktrunk#3208), [#3252](max-sixty/worktrunk#3252))

- **Picker visual polish**: The legend recolored to dim-cyan and reordered so navigation leads, and preview loading placeholders moved to the dim-hint style (`↳` transient, `○` settled, `▲` failed). ([#3237](max-sixty/worktrunk#3237), [#3253](max-sixty/worktrunk#3253))

- **"Still waiting" status for slow commit-message generation**: A configured `commit.generation` command captures stdout, so a slow or hung LLM previously showed nothing while `wt step commit`/`squash` waited. After a 2s delay worktrunk now shows a dim, in-place `○ Waiting for the commit message (Ns)` status, escalating at 10s to reveal the exact shell-escaped invocation in a gutter beneath it; the block clears on completion, mirroring `wt list`'s stall footer. ([#3178](max-sixty/worktrunk#3178))

- **"Still waiting" status extended to more slow commands**: The same waiting status now covers three more foreground commands that were silent while a captured subprocess ran — the `wt config show --full` commit-generation self-test, the `wt switch pr:`/`mr:` host lookup, and the `wt config show --full` version check. The version check no longer caps its fetch at an aggressive 5s, instead showing the status while a slow-but-working request completes (with a generous ceiling so a non-interactive run can't hang). ([#3183](max-sixty/worktrunk#3183))

- **`wt config state logs profile` performance profiler**: A new subcommand turns a `-vv` `[wt-trace]` capture (a path argument, `-` for stdin, or the default `trace.log`) into a performance profile: subprocess time by command shape, the slowest calls, parallelism and peak concurrency, redundant cache-miss re-runs, and — for `wt list`/picker captures — derived latencies and a collect timeline. `--format=json` emits the same data, and every `-vv` bug-report bundle now inlines a rendered profile. ([#3184](max-sixty/worktrunk#3184), [#3186](max-sixty/worktrunk#3186))

- **`WORKTRUNK_VERBOSE` env var**: `WORKTRUNK_VERBOSE=0|1|2` mirrors `-v`/`-vv`, combined with any flag via `max` (the env sets a floor the flag can raise). Unlike the flags it's honored on the shell-completion path, which returns before flag parsing — so a slow tab-completion can be profiled for the first time. ([#3166](max-sixty/worktrunk#3166))

- **Aliases inherit the wrapped command's completion**: An alias that forwards `{{ args }}` to a single `wt` command (`co = "wt switch {{ args }}"`) now completes that command's arguments and flags — `wt co <Tab>` completes branches like `wt switch <Tab>` — instead of a generic stub. Bare dispatchers and multi-`{{ args }}` aliases keep the stub. ([#3172](max-sixty/worktrunk#3172), thanks @yzx9)

- **`wt step copy-ignored --require-include`**: A new `--require-include` flag makes the copy a no-op unless a `.worktreeinclude` file exists in the source worktree (matching Claude Code desktop, where that file is required), reporting why it skipped as a hint in text mode and a `reason` field in `--format=json`. ([#3196](max-sixty/worktrunk#3196), thanks @yzx9)

- **`wt step tether` honors `-C`**: The global `-C <path>` flag now sets the tethered command's working directory (`wt step tether -C frontend -- npm run dev`); teardown still watches the worktree root, so the command is reaped when the worktree is removed. ([#3207](max-sixty/worktrunk#3207))

- **Statusline rate-limit pace color grades by severity**: The pace segment's color now deepens (dim → dim-yellow → yellow) with the projected throttling severity, so an early-window burst stays muted while a costly projected lockout stands out. The displayed pace number is unchanged. ([#3229](max-sixty/worktrunk#3229))

### Fixed

- **Picker `Alt-x` removal updates the row in place**: Removing a worktree no longer re-collects the whole list (a flicker that reset the cursor to the top): an unmerged worktree's row morphs into a branch-only row while the worktree is removed in the background, and a merged worktree's row drops with the cursor landing on the row that slid up. A removal that can't safely happen — the current or main worktree, or a dirty or locked one — is declined with the same diagnostic `wt remove` prints, rather than a dead keypress or a disruptive `cd` home. The post-removal cursor lands by row identity, so it stays correct even under an active filter. ([#3262](max-sixty/worktrunk#3262), [#3199](max-sixty/worktrunk#3199), [#3211](max-sixty/worktrunk#3211), [#3225](max-sixty/worktrunk#3225))

- **Picker preview refreshes when its background fetch lands**: A diff/log/PR-view fetch that completed after its triggering keystroke used to sit unshown until the next keypress; the pane now updates on its own when the fetch lands. ([#3247](max-sixty/worktrunk#3247))

- **Picker rows stay aligned while filtering**: Typing a filter no longer slides the matched row left and drops its leading sigil, and `Alt-l`/`Alt-h` no longer scroll the list off its gutter. ([#3213](max-sixty/worktrunk#3213), [#3226](max-sixty/worktrunk#3226))

- **fish completions no longer recurse to the call-stack limit**: With worktrunk's fish lazy-load wrapper installed, co

See merge request: Harmonybrew/homebrew-core!12862
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