Skip to content

fix(plugin): add waiting-for-input marker transitions for Claude hooks - #3023

Merged
max-sixty merged 1 commit into
mainfrom
fix/issue-2916-waiting-markers
Jun 10, 2026
Merged

max-sixty merged 1 commit into
mainfrom
fix/issue-2916-waiting-markers

Conversation

@worktrunk-bot

Copy link
Copy Markdown
Collaborator

Partial progress on #2916, per your request. Adds three Claude Code hooks that set the 💬 (waiting for input) marker, broadening the signals beyond the single Notification event:

Event Marker Why
PreToolUse(AskUserQuestion) 💬 The built-in question picker fires no Notification on any platform (anthropics/claude-code#13024), so today the marker stays 🤖 through a question.
PermissionRequest 💬 Fires on permission prompts even where Notification doesn't (VS Code extension, Windows CLI — #55875, #8985).
Stop 💬 Accurate turn-end signal; fires exactly when the turn ends. No turn-end transition exists today.

All three set 💬, matching the existing Notification command shape (wt config state marker set 💬 || true via the plugin shim).

Scope — what this deliberately leaves out

This is the conservative subset you named. It does not add the PostToolUse → 🤖 transition discussed earlier in the thread, so the original one-way limitation remains: once a turn-end/permission marker sets 💬, nothing flips it back to 🤖 until the next UserPromptSubmit. So 💬 can still persist into resumed work after a permission grant (the symptom in this issue). Documented inline in plugins/worktrunk/CLAUDE.md.

Only the Claude plugin (plugins/worktrunk/hooks/hooks.json) changes. Gemini's repo-root hooks already cover turn-end via AfterAgent; Codex ships no hooks (no turn-end event). Out of scope here.

What's verified vs. not

  • ✅ Hook event names + matcher syntax checked against the hooks docs: PreToolUse/PermissionRequest filter on tool name (matcher); Stop takes no matcher.
  • ✅ test_plugin_layout_is_consolidated and test_claude_hook_commands_parse_in_all_shells pass (every hook command uses unbraced $CLAUDE_PLUGIN_ROOT and parses under bash/zsh/fish).
  • ⚠️ Not verified end-to-end — these transitions fire inside a live Claude Code session, which CI can't drive. The marker writes are exercised by existing tests; whether each event fires at the expected moment on your platform rests on the docs + Ismael's ~10-day trial of the equivalent personal-config hooks, not a reproduction here.

Add three Claude Code hooks that set the 💬 (waiting for input) marker in
`wt list`, broadening the signals beyond the single `Notification` event:

- `PreToolUse`(`AskUserQuestion`) — the built-in question picker fires no
  `Notification` on any platform (anthropics/claude-code#13024)
- `PermissionRequest` — fires on permission prompts even where `Notification`
  doesn't (VS Code extension, Windows CLI)
- `Stop` — accurate turn-end signal; fires when the turn ends

Per #2916: on the macOS/Linux CLI the documented `Notification` path covers
permission prompts, but the question picker and turn-end are uncovered, and
on other platforms `Notification` doesn't fire at all. These transitions
add a turn-end signal that exists nowhere today and cover the question
picker.

Partial progress at maintainer's request — does not add the `PostToolUse`
→ 🤖 transition discussed in the issue, so 💬 can still persist into resumed
work after a permission grant until the next user prompt.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

@worktrunk-bot worktrunk-bot left a comment

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Self-authored PR — submitting as a comment (GitHub blocks self-approval). One independently-verifiable thing worth confirming, plus a convention note.

Event names + matchers check out against the live hooks docs: PreToolUse, PermissionRequest, and PostToolUse/PermissionDenied all filter the matcher on tool name, so AskUserQuestion (tool match) and the empty "" matcher on PermissionRequest (fires on every occurrence) are both valid. Stop is in the no-matcher-support set, so omitting the matcher field is correct — adding one would be silently ignored. PermissionRequest is a real event ("when a permission dialog appears"). The new commands are auto-covered by test_claude_hook_commands_parse_in_all_shells and the $CLAUDE_PLUGIN_ROOT assertion in test_plugin_layout_is_consolidated, since both iterate every command generically.

Data-loss-surface convention (per this repo's review guidance): the diff edits plugins/worktrunk/hooks/hooks.json, which carries the WorktreeRemove → wt remove --foreground automation. Naming it for transparency — but the three additions only run wt config state marker set 💬 || true and don't touch the removal path, so there's no destructive-behavior change here. cc @max-sixty for the merge call.

The deliberately-omitted PostToolUse → 🤖 transition (so #2916's persist-after-grant symptom remains) and the CI-can't-drive-the-live-session caveat are both already documented in the PR body and inline in CLAUDE.md — no concerns to add there.

@max-sixty
max-sixty merged commit a35dd7f into main Jun 10, 2026
36 checks passed
@max-sixty
max-sixty deleted the fix/issue-2916-waiting-markers branch June 10, 2026 07:56
social4hyq pushed a commit to social4hyq/homebrew-core that referenced this pull request Sep 20, 2026
worktrunk 0.58.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

- **Table-form `pre-*` hooks run concurrently**: A multi-entry table hook (`[pre-merge]` with several keys) now runs its commands concurrently, completing the cut-over announced in v0.37.0: every hook type has one execution semantic, where table form is concurrent and pipeline form (`[[pre-merge]]` blocks) is serial. Configs that need ordering should use pipeline form; affected configs have warned on every invocation since v0.37.0, with `wt config update` offering a serial-preserving migration. Two adjacent inconsistencies are also gone: `wt hook <post-type>` foreground runs of multi-entry table hooks now run concurrently like their background counterpart, and single-entry table aliases write to stdout like the other alias spellings, so `wt <alias> | …` works for that spelling too. (Breaking: multi-entry table-form `pre-*` hooks no longer run serially) ([#3052](max-sixty/worktrunk#3052))

- **CI column shows the PR/MR number and review state**: The CI column in `wt list --full` and the statusline shows the branch's open PR/MR reference (`#3041` on GitHub/Gitea/Azure DevOps, `!3041` on GitLab) instead of a plain dot: colored by CI status, hyperlinked to the PR, dimmed when stale or draft. Review state folds into the color, with magenta for changes requested and cyan for awaiting review. `wt list --format=json` gains `ci.number` and `ci.review_state`. ([#3041](max-sixty/worktrunk#3041), [#3044](max-sixty/worktrunk#3044))

- **Hook and alias templates render when each step runs**: Templates are syntax-checked before the first step runs and rendered as each step executes, so `{{ vars.* }}` always reads fresh values and hooks and aliases share one expansion model. Two consequences: a pipeline step with an undefined variable fails when that step is reached (earlier steps run first), and a template error in a background hook surfaces in the hook log rather than failing the foreground command. The background runner also labels template errors the way the foreground does. ([#3042](max-sixty/worktrunk#3042), [#3047](max-sixty/worktrunk#3047))

- **`wt config state cache`**: The regenerable caches (CI status, branch summaries, git-command caches, hints, the `wt switch -` target) are consolidated under `wt config state cache`; `cache clear` drops them all without prompting, since everything regenerates. `wt config state clear`, which also wipes hand-authored markers and vars, now asks for confirmation; `--yes` skips, and non-interactive runs without `--yes` cancel. The `ci-status`, `hints`, and `previous-branch` subcommands are deprecated but still work. ([#3027](max-sixty/worktrunk#3027))

- **Statusline rate-limit segment**: Above 90% of the binding window the segment shows the used percentage (`95%(8:30am–1:30pm)`) instead of the pace ratio; near the cap, what's left matters more than the rate. The pace form drops the word "pace" (`2.9×(Tue–Tue 5pm)`), and `-vv` logs each window's inputs and selection to `.git/wt/logs/trace.log` so the binding-window choice can be reconstructed. ([#3057](max-sixty/worktrunk#3057), [#3053](max-sixty/worktrunk#3053), [#3029](max-sixty/worktrunk#3029))

- **`/wt-switch-create` branch name is optional**: The Claude Code plugin command picks a branch name from the task when none is given, and the skill's workflow is one route (create, then enter) with an error-driven fallback instead of three guarded paths. Worktrees created mid-session persist after the session ends. ([#3058](max-sixty/worktrunk#3058))

### Fixed

- **Plugin worktree hooks fail before side effects**: The Claude Code plugin's `WorktreeCreate`/`WorktreeRemove` hooks validate the payload before running `wt`; a malformed payload previously created a branch named `null` or could remove the wrong worktree. `wt remove`'s help now documents that the positional argument accepts a worktree path as well as a branch name. ([#3058](max-sixty/worktrunk#3058), [#3060](max-sixty/worktrunk#3060))

- **Waiting-for-input marker covers questions, permission prompts, and turn end**: The Claude Code plugin sets the 💬 marker on `AskUserQuestion`, permission requests, and turn end. Previously only the `Notification` event set it, which never fires for the built-in question picker (and on some platforms not for permission prompts), so the marker stayed 🤖 while Claude waited. Part of [#2916](max-sixty/worktrunk#2916). ([#3023](max-sixty/worktrunk#3023), thanks @Ismael for reporting)

- **`wt list --help` no longer panics when piped**: With no detectable terminal width (output piped, `COLUMNS` unset), `wt list --help` panicked with a capacity overflow, and the post-commit diffstat truncated filenames to ~10 characters. Both now handle unknown width. ([#3040](max-sixty/worktrunk#3040))

- **Deprecation warnings match `wt config update`**: A config deprecation warning now fires exactly when `wt config update` would change the file. The old detection and migration logic had drifted in several places: `ff` and `no-ff` together silently dropped `no-ff`, a scalar `forge` key was overwritten by the `[ci]` migration, an empty `[ci] platform` migrated without warning, and an empty `approved-commands = []` could be removed by an unrelated update. ([#3055](max-sixty/worktrunk#3055))

- **Migrated `[forge]` keeps `[ci]`'s spot**: The `[ci]` → `[forge]` migration rendered the new section at the end of the file and could drop comments above `[ci]`; it now takes over `[ci]`'s position, comments included, so `wt config show` and `wt config update` diffs stay minimal. ([#3051](max-sixty/worktrunk#3051))

- **`wt config state get` is read-only**: The aggregate dump resolved (and re-cached) the default branch, so running it right after `clear` silently repopulated the cache, and on a cold clone it could hit the network. It now reports the cached value or `(none)`. `wt config state default-branch get` still resolves and caches. ([#3024](max-sixty/worktrunk#3024))

### Documentation

- **Reading vs resolving cached state**: `wt config state default-branch get` resolves and caches; the aggregate `wt config state get` only reports the cache. The help text and module docs now state the split. ([#3028](max-sixty/worktrunk#3028))

### Internal

- `wt switch`/`wt remove` orchestration moved from `main.rs` to their command modules, and the hook execution call chain lost two delegation layers. ([#3049](max-sixty/worktrunk#3049), [#3036](max-sixty/worktrunk#3036))

- Config deprecations are driven by a single rule table; each rule is one function that migrates and reports what it changed. ([#3045](max-sixty/worktrunk#3045), [#3055](max-sixty/worktrunk#3055))

- `terminal_width()` returns `Option<usize>` instead of a `usize::MAX` sentinel, making the no-width case a compile-time concern. ([#3043](max-sixty/worktrunk#3043))

- Snapshot tests regenerate identically across machines: host-specific paths are guarded, host-dependent env-block markers are normalized, and help snapshots share one settings builder. ([#3009](max-sixty/worktrunk#3009), [#3026](max-sixty/worktrunk#3026), [#3037](max-sixty/worktrunk#3037), [#3061](max-sixty/worktrunk#3061))

- Nightly CI runs lib tests across the full feature powerset. ([#3059](max-sixty/worktrunk#3059))

- MSRV bumped from 1.94 to 1.95. ([#2948](max-sixty/worktrunk#2948))

## Install worktrunk 0.58.0

### Install prebuilt binaries via shell script

```sh
curl --proto '=https' --tlsv1.2 -LsSf https://github.com/max-sixty/worktrunk/releases/download/v0.58.0/worktrunk-installer.sh | sh && wt config shell install
```

### Install prebuilt binaries via powershell script

```sh
powershell -ExecutionPolicy Bypass -c "irm https://github.com/max-sixty/worktrunk/releases/download/v0.58.0/worktrunk-installer.ps1 | iex"; git-wt config shell install
```

### Install prebuilt binaries via Homebrew

```sh
brew install worktrunk && wt config shell install
```

## Download worktrunk 0.58.0

|  File  | Platform | Checksum |
|--------|----------|----------|
| [worktrunk-aarch64-apple-darwin.tar.xz](https://github.com/max-sixty/worktrunk/releases/download/v0.58.0/worktrunk-aarch64-apple-darwin.tar.xz) | Apple Silicon macOS | [checksum](https://github.com/max-sixty/worktrunk/releases/download/v0.58.0/worktrunk-aarch64-apple-darwin.tar.xz.sha256) |
| [worktrunk-x86_64-apple-darwin.tar.xz](https://github.com/max-sixty/worktrunk/releases/download/v0.58.0/worktrunk-x86_64-apple-darwin.tar.xz) | Intel macOS | [checksum](https://github.com/max-sixty/worktrunk/releases/download/v0.58.0/worktrunk-x86_64-apple-darwin.tar.xz.sha256) |
| [worktrunk-x86_64-pc-windows-msvc.zip](https://github.com/max-sixty/worktrunk/releases/download/v0.58.0/worktrunk-x86_64-pc-windows-msvc.zip) | x64 Windows | [checksum](https://github.com/max-sixty/worktrunk/releases/download/v0.58.0/worktrunk-x86_64-pc-windows-msvc.zip.sha256) |
| [worktrunk-aarch64-unknown-linux-musl.tar.xz](https://github.com/max-sixty/worktrunk/releases/download/v0.58.0/worktrunk-aarch64-unknown-linux-musl.tar.xz) | ARM64 MUSL Linux | [checksum](https://github.com/max-sixty/worktrunk/releases/download/v0.58.0/worktrunk-aarch64-unknown-linux-musl.tar.xz.sha256) |

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