Repository navigation
Harden cdd-worktree-done's removal and branch-deletion paths - #122
Merged
Merged
Conversation
Fixes the defects in issue #104: - remove the worktree's top level, not $PWD, so a run from a subdirectory removes the whole worktree - refuse on untracked files too (git status --porcelain), naming them - offer sudo rm -rf only on a permission error; any other removal failure (locked, not a working tree) aborts with nothing deleted - pr-merged reports the PR's head commit (head_sha: GitHub headRefOid, GitLab sha), and done force-deletes only when it equals the local tip; a mismatch or a missing head falls to the keep/delete/abort prompt. gc keeps a task whose local branch is other commits than the merged head. New worktree-done gate (25 gates); adapter-conformance also runs adapter-answers-assert.sh over the shipped code-host adapters' pr-merged. No template change: the helper and adapters live in tools/, and the template ships no copy of either. Co-Authored-By: Claude Opus 5.5 <[email protected]> Claude-Session: https://claude.ai/code/session_01S8CZycScdeRVU2doJPP4sN
The head check required head_sha to equal the local tip, so a branch behind its PR (commits pushed from another machine, GitHub's "Update branch", a web-UI suggestion) read as a reused name: done stopped force-deleting it, and on the ancestry path dropped the state record without closing the task's issues. Now the head need only contain the tip (equal, or a descendant, fetched best-effort when absent), in done and gc alike. Tests cover the behind-its-PR case in both. Co-Authored-By: Claude Opus 5.5 <[email protected]> Claude-Session: https://claude.ai/code/session_01S8CZycScdeRVU2doJPP4sN
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
1 participant
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.
Summary
Fixes the defects in
cdd-worktree-donereported in #104:$PWD, so a run from a subdirectory removes the whole worktree.sudo rm -rfis offered only when git reports a permission error. Any other failure (a locked worktree, "not a working tree") stops with nothing deleted.pr-mergednow also returnshead_shain the GitHub and GitLab adapters (an added field, so the contract stays at 1).doneforce-deletes only when the merged PR includes the local branch's last commit, whether as its own last commit or an earlier one (the case where the branch is behind its PR). If the PR doesn't include it, or the adapter reports no head commit,doneasks instead.gcalso keeps a task whose local branch isn't in the merged PR.Deviation from the handoff
Requirement 4 said a head commit that differs from the local tip must never be force-deleted. Pre-PR review relaxed that, with approval: a PR whose head comes after the local tip still counts as merged. Exact matching misread a branch that was behind its PR (commits pushed from another machine, GitHub's "Update branch") as a reused name. On a regular merge, the issues then stayed open and the state record was deleted, so
gccouldn't close them later.Tests
worktree-donegate (scripts/worktree-done-assert.sh) covers: running from a subdirectory, untracked files, the sudo path (through a stubsudo), a locked worktree, "not a working tree", and each branch outcome.scripts/adapter-answers-assert.sh(underadapter-conformance) checks both adapters'pr-mergedanswers against saved backend responses, offline.gc-assert.shadds the head-check cases../scripts/ci.sh: 25/25 pass.Template
No template change: the helper and adapters live in
tools/, and the template ships no copy of them.Closes #104
🤖 Generated with Claude Code
https://claude.ai/code/session_01S8CZycScdeRVU2doJPP4sN