Skip to content

feat(commit): surface a "still waiting" spinner for slow message generation - #3178

Merged
max-sixty merged 2 commits into
mainfrom
commit-timeout
Jun 23, 2026
Merged

max-sixty merged 2 commits into
mainfrom
commit-timeout

Conversation

@max-sixty

Copy link
Copy Markdown
Owner

A configured commit.generation command shells out and captures stdout, so until it returns the terminal shows nothing — a slow or hung LLM looks like a freeze. This adds a "still waiting" notification, modeled on wt list's dim stall footer.

progress::Watchdog is a TTY-gated, dim, in-place status line — ○ Waiting for the commit message (Ns) — that appears after a 2s startup delay (so the common fast case stays silent) and escalates at 10s to reveal the exact shell-escaped invocation in a bash-highlighted gutter beneath it, so a stuck command is debuggable. The whole block is cleared on completion, so nothing persists. It's wired into both generate_commit_message and generate_squash_message; the concurrent summary path and the wt config self-test are deliberately left uncovered.

Notes for review

  • Watchdog shares Progress's render primitives (TTY/verbosity gating, ticker thread, clear-on-drop). It only reads a clock and writes to stderr — never touches the child's stdin/stdout/wait — so it's safe to wrap a capture-mode command.
  • The in-place multi-row redraw relies on each rendered line occupying exactly one terminal row. That invariant is now enforced rather than assumed: the status line is ANSI-aware-truncated and the command gutter is chopped (not wrapped), so a narrow terminal or an over-wide invocation can't desync the cursor math.
  • Also aligns the sibling Progress::ticker_loop to saturating_sub for its startup-delay park, removing a latent panic under scheduler preemption.

Tested by the progress unit tests (status-only vs escalated block, width truncation, fast-command-leaves-no-trace, escalation timing) plus the full pre-merge suite. The rendering itself was verified live via tmux capture-pane.

This was written by Claude Code on behalf of max

max-sixty and others added 2 commits June 23, 2026 11:15
…ration

A configured `commit.generation` command shells out and captures stdout, so a
slow or hung LLM was previously silent. Add `progress::Watchdog`: a TTY-gated,
dim, in-place status line — `○ Waiting for the commit message (Ns)` — that
appears after a 2s startup delay and escalates at 10s to reveal the exact
shell-escaped invocation in a bash-highlighted gutter beneath it, so a stuck
command is debuggable. The whole block is cleared on completion (non-persistent),
mirroring `wt list`'s dim stall footer. Wired into both `generate_commit_message`
and `generate_squash_message`; the concurrent summary path and the config
self-test are deliberately left uncovered.

`Watchdog` shares `Progress`'s render primitives (TTY gating, ticker thread,
clear-on-drop). Every rendered line is width-bounded to exactly one terminal row
— the status is ANSI-aware-truncated and the command gutter is chopped, not
wrapped — so the in-place cursor math can't desync from what the terminal
actually wrapped on a narrow window.

Also align `Progress::ticker_loop` to `saturating_sub` for its startup-delay
park, matching the watchdog and removing a latent panic under scheduler
preemption.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@max-sixty
max-sixty merged commit e624398 into main Jun 23, 2026
36 of 37 checks passed
@max-sixty
max-sixty deleted the commit-timeout branch June 23, 2026 18:35
max-sixty added a commit that referenced this pull request Jun 24, 2026
…mands (#3183)

Follow-up to #3178, which added the "still waiting" watchdog for slow
`commit.generation` shell-outs. This extends it to three more foreground
commands that were silent while a captured subprocess ran.

- **`wt config` LLM self-test** — the commit/squash watchdog wiring is
now a shared `watch_llm_command(command, waiting_for)` helper, and
`test_commit_generation` uses it too, so the self-test escalates to the
command gutter just like real generation.
- **`wt switch pr:/mr:`** — a new `fetch_ref_info` helper wraps the
gh/glab host lookup at both resolution sites. Status-only (no gutter)
since the host CLI invocation isn't readily available there.
- **`wt config show --full` version check** — wrapped with the watchdog,
and curl's aggressive `--max-time 5` total cap relaxed so a
slow-but-working fetch finishes with feedback instead of being cut off.

### Note on the version-check timeout

An adversarial review flagged that simply dropping `--max-time` would
let `wt config show --full` hang on a *connected-but-stalled* host — and
since the watchdog is TTY-gated, a non-interactive run (CI, scripts,
redirected stderr) would hang **silently and unbounded**, worse than
today's graceful 5s failure. So the fetch keeps a hard ceiling:
`--connect-timeout 10` (fails fast offline) plus a generous `--max-time
60` (bounds a stalled host without cutting off a realistic fetch). The
watchdog supplies the interactive "still waiting" feedback during the
wait.

The watchdog is deliberately **not** wired into the concurrent summary
path (`generate_summary_core`, up to 8 under a semaphore), where
per-call spinners would interleave.

Verified: full pre-merge suite (4122 tests) green; the self-test
watchdog confirmed live via tmux; the version-check happy path confirmed
end-to-end.

> _This was written by Claude Code on behalf of max_

---------

Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@max-sixty max-sixty mentioned this pull request Jun 27, 2026
max-sixty added a commit that referenced this pull request Jun 27, 2026
Release v0.62.0 — minor bump (`cargo semver-checks` reports a breaking
library-API change — `ListConfig.columns` added a public field, which
requires at least a minor pre-1.0 — plus many new features).

### Highlights

- **`wt switch --prs`** — browse open PRs/MRs in the interactive picker,
with a live CI/review column and `pr` / `comments` / `log` preview tabs
([#3128](#3128)).
[Docs](https://worktrunk.dev/switch/)
- **Interactive picker now runs on Windows**
([#3217](#3217)).
- **`main…±` diff column shows by default** in `wt list`; `--full` now
adds only the off-machine columns (CI status, LLM summaries)
([#3236](#3236)).
- **`[list] columns`** selects and orders the columns `wt list` renders
([#3141](#3141)).
- **`wt config state logs profile`** performance profiler
([#3184](#3184)).
- Picker keyboard shortcuts (copy / open / refresh) and the `Alt-x`
removal rework, fish completion-recursion fixes, `CLAUDE_CONFIG_DIR`
support, and more.

**Breaking:** in the picker, remove moved from `Alt-r` to `Alt-x`
(`Alt-r` now refreshes).

Two "Still waiting" entries
([#3178](#3178),
[#3183](#3183)) were moved
here from 0.61.0 — they landed after the v0.61.0 tag, so they ship in
0.62.0.

The changelog also documents the `Alt-x` removal rework
([#3262](#3262)); the tag
will be placed on the `main` tip that includes both this release commit
and #3262.

Full notes in the `CHANGELOG.md` diff. Data-loss surface review of the
cumulative diff in progress; the keyword pass came back clean (the new
`Alt-x` removal uses safe variants — `SafeDelete`, no force,
approval-gated).

> _This was written by Claude Code on behalf of max_
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