Add authorized cleanup path for reviewer scratch worktrees #534

New Issue

2026-07-08T04:10:36-05:00

jcwalker3 commented

2026-07-08 04:10:36 -05:00

Problem

During PR #512 cleanup, the reviewer scratch worktree remained present:

branches/review-pr512-submit, detached @ 3d11e1f

The merged-cleanup reconciler does not currently own reviewer scratch cleanup, and there is no authorized path for safely removing detached reviewer worktrees after a PR has merged.

Risk

Reviewer scratch worktrees will accumulate, or operators may remove them manually without lease/state validation.

Required behavior

Add an explicit cleanup path for reviewer scratch worktrees.
Only allow cleanup after the associated PR is merged/closed and no active reviewer lease requires the worktree.
Verify the scratch worktree is clean before removal.
Fail closed if the worktree has uncommitted changes, unknown ownership, active lease state, or ambiguous PR mapping.
Include reviewer scratch cleanup in dry-run output separately from author worktree cleanup.

Acceptance criteria

Add tests for safe cleanup of clean detached review-pr<N>-submit worktrees after PR merge.
Add tests blocking cleanup when the reviewer scratch worktree is dirty.
Add tests blocking cleanup when an active reviewer lease exists.
Add tests proving reviewer scratch cleanup is never treated as an author worktree cleanup.
Update canonical cleanup reports to list reviewer scratch worktrees as separate cleanup targets.

Non-goals

Do not weaken reviewer lease checks.
Do not remove dirty worktrees.
Do not treat reviewer scratch worktrees as author worktrees.
Do not bypass root/worktree safety guards.

Related context

Observed after PR #512 cleanup.
Related cleanup/guard work: #401, #402, #404, #517, #528, #532.
This issue is specifically about an authorized cleanup path for detached reviewer scratch worktrees named review-pr<N>-submit; it is not general author worktree cleanup or merged issue-worktree alias discovery.

## Problem During PR #512 cleanup, the reviewer scratch worktree remained present: `branches/review-pr512-submit`, detached @ `3d11e1f` The merged-cleanup reconciler does not currently own reviewer scratch cleanup, and there is no authorized path for safely removing detached reviewer worktrees after a PR has merged. ## Risk Reviewer scratch worktrees will accumulate, or operators may remove them manually without lease/state validation. ## Required behavior 1. Add an explicit cleanup path for reviewer scratch worktrees. 2. Only allow cleanup after the associated PR is merged/closed and no active reviewer lease requires the worktree. 3. Verify the scratch worktree is clean before removal. 4. Fail closed if the worktree has uncommitted changes, unknown ownership, active lease state, or ambiguous PR mapping. 5. Include reviewer scratch cleanup in dry-run output separately from author worktree cleanup. ## Acceptance criteria - Add tests for safe cleanup of clean detached `review-pr<N>-submit` worktrees after PR merge. - Add tests blocking cleanup when the reviewer scratch worktree is dirty. - Add tests blocking cleanup when an active reviewer lease exists. - Add tests proving reviewer scratch cleanup is never treated as an author worktree cleanup. - Update canonical cleanup reports to list reviewer scratch worktrees as separate cleanup targets. ## Non-goals - Do not weaken reviewer lease checks. - Do not remove dirty worktrees. - Do not treat reviewer scratch worktrees as author worktrees. - Do not bypass root/worktree safety guards. ## Related context - Observed after PR #512 cleanup. - Related cleanup/guard work: #401, #402, #404, #517, #528, #532. - This issue is specifically about an authorized cleanup path for detached reviewer scratch worktrees named `review-pr<N>-submit`; it is not general author worktree cleanup or merged issue-worktree alias discovery.

jcwalker3 referenced this issue from a commit

2026-07-08 22:13:05 -05:00

feat: authorized cleanup for reviewer scratch worktrees (Closes #534)

jcwalker3 referenced a pull request that will close this issue

2026-07-08 22:13:33 -05:00

feat: authorized cleanup for reviewer scratch worktrees (Closes #534) #575

jcwalker3 added the status:in-progress label 2026-07-08 22:13:44 -05:00

jcwalker3 commented

2026-07-08 22:13:44 -05:00

Issue claim heartbeat

kind: claim
issue: Add authorized cleanup path for reviewer scratch worktrees (#534)
branch: feat/issue-534-reviewer-scratch-cleanup
phase: claimed
profile: prgs-author
pr: none
blocker: none
next_action: create worktree and begin implementation

**Issue claim heartbeat** - kind: claim - issue: #534 - branch: feat/issue-534-reviewer-scratch-cleanup - phase: claimed - profile: prgs-author - pr: none - blocker: none - next_action: create worktree and begin implementation

sysadmin referenced this issue

2026-07-08 22:20:03 -05:00

feat: authorized cleanup for reviewer scratch worktrees (Closes #534) #575

sysadmin referenced a pull request that will close this issue

2026-07-08 22:20:29 -05:00

feat: authorized cleanup for reviewer scratch worktrees (Closes #534) #575

sysadmin referenced this issue

2026-07-08 22:20:40 -05:00

feat: authorized cleanup for reviewer scratch worktrees (Closes #534) #575

sysadmin closed this issue

2026-07-08 22:20:50 -05:00

sysadmin removed the status:in-progress label 2026-07-08 22:20:51 -05:00