auto-update: dev-util/worktrunk - #117
Merged
Merged
Conversation
divoxx-bot
Bot
force-pushed
the
auto-update/dev-util-worktrunk
branch
from
August 2, 2026 08:44
f214ba5 to
374b8c9
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Automated upstream version bump for
dev-util/worktrunk.What changed
worktrunk 0.70.0 release notes
Improved
wt step pruneremoves worktrees far faster: Each removal ran a serial chain of ~17 git subprocesses under the scan write lock, re-preparing a plan the scan had already computed and re-stating the worktree right after the fsmonitor daemon stop. The chain is now one check per guarantee, reusing the scan-time plan, and removals run concurrently on the scan lock's read side — the write side is kept for the candidates that need it (hook-bearing,--foreground, metadata-pruning, and the current worktree). The documented rust-scale live prune of 24 candidates goes from ~12 s to ~0.6 s wall, and theprune_e2e/livebenchmark from ~620 ms to ~400 ms. (#3617, #3631)wt step prune --format=jsonis ordered, and a failed removal aborts the rest: Live JSON output is now sorted by scan index, matching--dry-run, with the current worktree last. The first failing removal drains the remaining queue unexecuted, matching the serial loop it replaced; in-flight removals complete. (#3631)A worktree can be named by its path wherever a branch is accepted: Every argument that takes a branch now also accepts the worktree's own path, resolved after the branch so a directory never shadows a branch sharing its name. A path names what a branch cannot — a detached worktree, or one of two checkouts of the same branch. Relative paths resolve against
-Cand a leading~against the home directory, so a path worktrunk printed can be pasted back. Docs (#3607)wt listflags a branch checked out in more than one worktree: Such a branch resolves to whichever worktree git lists first, so every worktree on it now carries⚑—worktree.state"duplicate_branch"in schema 1, aworktree.duplicate_branchboolean in schema 2. The flag makes the ambiguity visible in the listing; resolving such a branch from any command warns separately and names a duplicate to drop. (#3480, #3606)wt switch --executecomputes only the template variables its command names: The switch path built every variable the template context could hold before rendering; it now resolves just the ones the command references. On a clone with noorigin/HEADand no cached default branch, that removes agit ls-remotethe command never asked for — 13 subprocesses and one remote query down to 8 and none. (#3628)Fixed
A branch checked out in a second worktree is retained on removal,
-Dincluded:wt removeandwt step prunenow act on the worktree named rather than the branch's first checkout, and all three ofwt remove,wt step prune, andwt mergekeep the branch while another worktree still has it out — deleting the ref would leave that worktree unable to resolveHEAD, which is whygit branch -drefuses the same delete. The retention is reported and names the surviving checkout rather than passing silently. (#3533)Removal reports what it took, not what it selected: A removal's summary and JSON described the plan, so a worktree candidate whose branch was retained still counted as
✓ Pruned 1 branch, andwt remove --format=jsonreported"branch_deleted": truebeside a stderr line saying the branch was kept. Execution now returns the branch's fate;wt step prunecounts executed outcomes (--dry-runincluded), both JSON payloads gainedbranch_deleted, and a declined orphan deletion drops out of the removed list rather than being reported as removed. (#3633, #3637)Hook previews expand every variable except
vars.*: Onevars.token disabled expansion for the whole command, sowt hook show --expandedandwt hook <type> --dry-runprinted{{ branch }}and{{ repo }}raw in a listing whose job is to show the expansion. A preview now substitutes a stand-in that renders eachvars.*reference back as itself, nested access included, while every other variable expands — and no longer spawns the git read that resolvingvarsrequired. The listing is also derived from the execution path itself, so a context key added there reaches the preview with no second edit.wt config alias dry-runshares the renderer, so its help text — which still described the all-or-nothing behavior — was corrected to match. (#3635, #3638, #3639)wt hook showno longer prints a bare heading for an empty command list: A hook type declared aspost-switch = []has a config entry but no commands, and the section decided it had printed something from the entry rather than from the rows — so it emitted its heading and stopped, and the(none configured)line never appeared. Both the user and project sections carried the bug, since the loop and the fallback were duplicated; they now share one renderer that reports whether it wrote any rows. The execution path was already correct: an empty list announces nothing and is omitted from JSON. (#3641)wt config shell installreclaims its own legacy wrapper paths: Fish sourcesconf.dat startup, so a staleconf.d/{cmd}.fishwas already loaded by the time fish would autoload thefunctions/{cmd}.fishthe install had just written — the old definition won and the new wrapper never loaded. Install decided ownership by reading the file, and left anything unrecognized in place. Ownership now comes from the path:conf.d/{cmd}.fishand the stranded nushell{cmd}.nucandidates are paths worktrunk computes for the command being installed, so it takes them back whole, unread. Only that exact filename is touched — a neighbour under another name is not worktrunk's — and each removal is reported.wt config shell uninstallstill reads the header, because it takes no--cmdand so cannot know the name; it prompts and previews every file first. (Breaking: install now removes a file at those exact paths regardless of its contents.) (#3602)Command timeouts actually bound wall-clock, and a default branch guessed while the remote was unreachable isn't cached: A timeout killed only the direct child, so a surviving grandchild held the output pipe open and the call ran on regardless — a 3 s bound measured at 120 s. A timed command now runs in its own process group and the whole tree is torn down on expiry, which fixes every existing bound including the fsmonitor and reap probes. On top of that, nothing in git bounds
git ls-remote(an unreachable host costs ~127 s per address on Linux), so default-branch detection abandons the query after 10 s and falls back to local inference — without caching the result, so an outage can't make an inferred default branch permanent. (Breaking: because a timed command gets its own process group, Ctrl-C no longer reaches it; the command waits out the remaining bound.) (#3603)wt step relocateno longer strands a worktree in its staging directory: When worktree A's target was held by worktree B, and B was itself blocked by a non-worktree path without--clobber, the dependency loop read the stall as a cycle, temp-moved A into.git/wt/staging/relocate/, then failed moving it into the still-occupied target — leaving A at neither its original nor its expected path. A worktree blocked by an immovable occupant is now skipped. (#3530)Forge CLI failures are classified by response shape, not by the tool's prose:
tea apicopies the response body to stdout and exits 0, so an HTTP error never tripped the exit-code gate — a GiteaAPIErrorbody deserialized into{state: "", total_count: 0}, indistinguishable from a commit with no CI statuses, while the PR-list path blamed an API change for what was an API error. Failures fromgh,glab, andteaare now keyed on the response envelope, and a non-zero exit keeps meaning the tool itself failed; the CLI's own error text is forwarded rather than reworded, so a bad token surfaces asgh: Bad credentials (HTTP 401)instead of a suggestion to re-authenticate.wt config show --fullreports the Azure DevOps CLI extension alongside the other forge tools. (#3595, #3597, #3605)wt config plugins claude install-statuslineno longer mistakes another tool's statusline for its own: The check for an existing worktrunk statusline matched the bare substringwt, which an unrelated command likenewt statussatisfies — sowt config showreported a foreign statusline as worktrunk's, and the installer early-returned "already configured" and refused to install. It now matches the adjacentlist statuslinetoken pair, so it works whether the binary iswt,git-wt, or an absolute path. (#3595)[list] task-timeout-msis removed: The per-command bound is gone;[list] timeout-msbounds the whole collect phase. A config that still sets it warns, andwt config updatestrips the key — in the top-level, project-scoped, and inline-table forms. (Breaking: the setting no longer has any effect. It was also, until this release, ignored for a command that carried its own bound.) (#3613, #3615)Documentation
wt removedocuments what retention protects: The branch-cleanup section's six conditions all ask whether deleting loses work; a branch checked out in a second worktree fails a different test, and the page now says so, alongside a new "Naming a worktree" section onwt switch. The FAQ's advice togit worktree locka worktree holding precious ignored data now says what the lock actually buys — it blocks removal, and nothing else;wt mergeandwt step pushwill still overwrite an ignored file the incoming commits track. (#3533, #3601, #3607)Default-branch detection documents the remote-query bound: The detection ladder records that the
git ls-remotestep is abandoned after 10 s, that local inference covers the abandoned case, and that this is the one result not cached. (#3603)wt step pushrecords that destination-worktree safety matches git: Pushing overwrites an ignored file in the destination whose path the incoming commits track, exactly as agit mergerun there would; the spec now says the match is deliberate. (#3614)Internal
skim is back on a current release: The picker was held at skim 5.1.0 because 5.3.1 regressed the legacy Windows console — every picker PTY test failed on the keyboard progressive-enhancement path. 5.5.0 guards it, so the pin moves forward. (#3626)
Coverage uploads on every
maincommit: The coverage job shared one concurrency group with a sampled job that held it for ~2 h, so a queued coverage run was usually cancelled by the next merge — 29 of the last 40maincommits uploaded no report, which left later PRs comparingcodecov/patchagainst a stale base. CI is now split by cadence into three workflows (cievery commit,coverageevery commit keyed per-sha,affectedsampled), so a merge train can't cancel a queued upload. (#3608)/wt-switch-createcreates the worktree by name and cleans up an untouched one: The shipped Claude skill now creates throughEnterWorktree({name})for the common case, falling back to a path, which avoids a confirmation prompt on recent Claude Code versions. A worktree created that way and never touched — no changed files, no commits — is removed when the session ends, branch included; anything written into it keeps it, and a worktree entered by path always stays. (#3636)Verification will run automatically via the verify workflow. The PR will be promoted from draft to ready when all checks pass.
Generated with Claude Code