You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
Repository navigation
Check a worktree's commits against its base branch before deleting it - #22
"Delete worktree" used to ask for confirmation whenever a worktree had commits outside the repo's default branch (local main and origin/main). That made every stacked worktree look risky: a branch created from feature-x whose commits were already merged into feature-x still got "N commits not in main or origin/main".
What changes
The daemon now finds the worktree's base branch, using only local git:
its upstream (branch.<b>.remote / merge), when that is origin or . and names a branch other than its own;
otherwise, the branch its reflog records it was created from (branch: Created from <ref>).
A candidate is skipped when it is not a valid branch name (HEAD, HEAD~1, a commit id, …), also names a tag, or exists neither locally nor as origin/<x>. When neither source gives a usable branch, as for a detached worktree or an expired reflog, the worktree has no base and is compared only with the default branch, as before.
Commits now count as at risk only when they are in none of the base's local branch, origin/<base>, the default branch and origin/<default>, each counted only when it exists. A commit that reached main is therefore never flagged, even when the local base is stale.
When commits are at risk and there is an origin, the daemon fetches origin/<default> as before. It also fetches origin/<base> when that ref already exists locally. The two fetches run concurrently with --no-write-fetch-head --no-auto-maintenance, so the wait is still bounded by one 20 s limit. Each failed fetch is reported separately.
Wire and UI
worktreeAtRisk now carries bases: string[] and fetchFailed: {ref, reason}[] in place of local / remote / a single nullable fetchFailed. Both protocol versions are raised (daemon 8 → 9, browser 11 → 12), so an upgraded hub restarts older daemons.
The confirmation names every base it compared with:
before: It has 1 commit not in main or origin/main.
after (stacked on feature-x): It has 1 commit not in feature-x, origin/feature-x, main or origin/main.
two failed fetches: It has 1 commit not in feature-x, origin/feature-x as last fetched, main or origin/main as last fetched; couldn't compare with a fresh origin/feature-x because the fetch failed: …; couldn't compare with a fresh origin/main because the fetch failed: ….
nothing to compare with: There is no base branch to check that its commits are merged.
The full spec is in openspec/changes/dev-2222-worktree-term-check-a-worktrees-commits/.
Summary by CodeRabbit
New Features
Worktree removal checks now compare commits against the worktree’s inferred base branch as well as the default branch, helping identify commits that may not be merged.
When needed, the app refreshes eligible remote branches before assessing removal risk and reports individual fetch failures.
Removal warnings list the branches checked, identify branches that could not be refreshed, and explain when no comparison branch is available.
No actionable comments were generated in the recent review.
Walkthrough
Worktree removal risk checks now infer a branch base from upstream configuration or a branch-creation reflog and compare commits against available base and default-branch refs. The daemon fetches eligible origin refs concurrently and reports failures per ref. The risk protocol and sidebar now carry ordered bases and fetch-failure lists; protocol versions increase to 10 and 13.
Changes: Worktree Removal Risk
Layer / File(s)
Summary
Base discovery and risk assessment src/daemon/worktrees/base.ts, src/daemon/worktrees/base.test.ts, src/daemon/worktrees/git.ts, src/daemon/worktrees/git.test.ts, src/daemon/server/daemon.test.ts, test/process/daemon-worktrees.test.ts, openspec/specs/daemon/spec.md, openspec/changes/archive/...
The daemon selects a candidate base from an eligible upstream or branch-creation reflog, combines it with default-branch refs, and counts commits absent from those refs. When commits are ahead and an origin is available, it fetches eligible refs concurrently and reports failures by ref. Specifications and tests cover candidate selection, comparisons, fetch outcomes, and removal cases.
The worktreeAtRisk message replaces local and remote with a bounded bases array and replaces nullable fetchFailed with a bounded list. The protocol versions increase to 10 and 13. Schemas, samples, golden cases, and tests use the new fields and constraints.
The sidebar names bases in order, marks bases with failed fetches as “as last fetched,” and adds a clause for each fetch failure. It uses generic wording when no base is available. Web specifications and tests cover the updated messages.
sequenceDiagram
participant Removal as Worktree removal
participant Risks as worktreeRisks
participant Git as Git refs and origin
Removal->>Risks: assess removal risk
Risks->>Git: resolve base and default refs
Git-->>Risks: available refs and ahead count
Risks->>Git: fetch eligible origin refs concurrently
Git-->>Risks: updated refs or per-ref failures
Risks->>Git: recalculate comparison and changes
Risks-->>Removal: bases, ahead, fetchFailed, and changes
Loading
Possibly related PRs
MotleyAI/worktree-term#15: PR #15 introduced the worktreeAtRisk fields that this change replaces with ordered bases and a list of fetch failures.
Merge Risk: Minimal · up to eb6c1
The change makes worktree removal checks compare commits against the base branch as well as the default branch, with per-ref fetch failure reporting. No concrete merge-blocking risk was found.
Pre-merge checks: 5
Check name
Status
Explanation
Description Check
Check skipped - CodeRabbit’s high-level summary is enabled.
Title check
The title clearly and concisely describes the main change: checking a worktree's commits against its base branch before deletion.
Docstring Coverage
No eligible functions found in the changed files. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff with cyclomatic complexity of at least 2. Documentat…
Linked Issues check
Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check
Check skipped because no linked issues were found for this pull request.
Full details: Docstring Coverage
Explanation
No eligible functions found in the changed files. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff with cyclomatic complexity of at least 2. Documentation-only edits and deletions within surviving functions are included; unchanged diff context and fully deleted functions are excluded. Analyzed 0 functions across 21 files. (11 skipped: 11 unsupported.)
Finishing Touches
Generate docstrings
Commit to this branch
Create a new PR
Generate unit tests (beta)
Commit to this branch
Create a new PR
Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts
Included review availability: This review used your included allowance. 0 included reviews remain after this review. Your included PR review attempts over the past 7 days set your current allowance at 2 reviews per hour.
Note: CodeRabbit is an incremental review system and does not re-review already reviewed commits. This command is applicable only when automatic reviews are paused.
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
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.
Fixes DEV-2222.
"Delete worktree" used to ask for confirmation whenever a worktree had commits outside the repo's default branch (local
mainandorigin/main). That made every stacked worktree look risky: a branch created fromfeature-xwhose commits were already merged intofeature-xstill got "N commits not in main or origin/main".What changes
The daemon now finds the worktree's base branch, using only local git:
branch.<b>.remote/merge), when that isoriginor.and names a branch other than its own;branch: Created from <ref>).A candidate is skipped when it is not a valid branch name (
HEAD,HEAD~1, a commit id, …), also names a tag, or exists neither locally nor asorigin/<x>. When neither source gives a usable branch, as for a detached worktree or an expired reflog, the worktree has no base and is compared only with the default branch, as before.Commits now count as at risk only when they are in none of the base's local branch,
origin/<base>, the default branch andorigin/<default>, each counted only when it exists. A commit that reachedmainis therefore never flagged, even when the local base is stale.When commits are at risk and there is an
origin, the daemon fetchesorigin/<default>as before. It also fetchesorigin/<base>when that ref already exists locally. The two fetches run concurrently with--no-write-fetch-head --no-auto-maintenance, so the wait is still bounded by one 20 s limit. Each failed fetch is reported separately.Wire and UI
worktreeAtRisknow carriesbases: string[]andfetchFailed: {ref, reason}[]in place oflocal/remote/ a single nullablefetchFailed. Both protocol versions are raised (daemon 8 → 9, browser 11 → 12), so an upgraded hub restarts older daemons.The confirmation names every base it compared with:
It has 1 commit not in main or origin/main.feature-x):It has 1 commit not in feature-x, origin/feature-x, main or origin/main.It has 1 commit not in feature-x, origin/feature-x as last fetched, main or origin/main as last fetched; couldn't compare with a fresh origin/feature-x because the fetch failed: …; couldn't compare with a fresh origin/main because the fetch failed: ….There is no base branch to check that its commits are merged.The full spec is in
openspec/changes/dev-2222-worktree-term-check-a-worktrees-commits/.Summary by CodeRabbit