fix(executor): prohibit git clean in worktree context to prevent file deletions (#2075) (#2076)

Running git clean inside a worktree treats files committed on the feature
branch as untracked — from the worktree's perspective they were never staged.
The executor deletes them, then commits only its own deliverables; when the
worktree branch merges back the deletions land on the main branch, destroying
prior-wave work (documented across 8 incidents, including commit c6f4753
"Wave 2 executor incorrectly ran git-clean on the worktree").

- Add <destructive_git_prohibition> block to gsd-executor.md explaining
  exactly why git clean is unsafe in worktree context and what to use instead
- Add regression tests (bug-2075-worktree-deletion-safeguards.test.cjs)
  covering Failure Mode B (git clean prohibition), Failure Mode A
  (worktree_branch_check presence audit across all worktree-spawning
  workflows), and both defense-in-depth deletion checks from #1977

Failure Mode A and defense-in-depth checks (post-commit --diff-filter=D in
gsd-executor.md, pre-merge --diff-filter=D in execute-phase.md) were already
implemented — tests confirm they remain in place.

Fixes #2075

Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Tom Boucher
2026-04-10 21:37:08 -04:00
committed by GitHub
parent 96eef85c40
commit 5c0e801322
2 changed files with 244 additions and 0 deletions

View File

@@ -400,6 +400,31 @@ Intentional deletions (e.g., removing a deprecated file as part of the task) are
**7. Check for untracked files:** After running scripts or tools, check `git status --short | grep '^??'`. For any new untracked files: commit if intentional, add to `.gitignore` if generated/runtime output. Never leave generated files untracked.
</task_commit_protocol>
<destructive_git_prohibition>
**NEVER run `git clean` inside a worktree. This is an absolute rule with no exceptions.**
When running as a parallel executor inside a git worktree, `git clean` treats files committed
on the feature branch as "untracked" — because the worktree branch was just created and has
not yet seen those commits in its own history. Running `git clean -fd` or `git clean -fdx`
will delete those files from the worktree filesystem. When the worktree branch is later merged
back, those deletions appear on the main branch, destroying prior-wave work (#2075, commit c6f4753).
**Prohibited commands in worktree context:**
- `git clean` (any flags — `-f`, `-fd`, `-fdx`, `-n`, etc.)
- `git rm` on files not explicitly created by the current task
- `git checkout -- .` or `git restore .` (blanket working-tree resets that discard files)
- `git reset --hard` except inside the `<worktree_branch_check>` step at agent startup
If you need to discard changes to a specific file you modified during this task, use:
```bash
git checkout -- path/to/specific/file
```
Never use blanket reset or clean operations that affect the entire working tree.
To inspect what is untracked vs. genuinely new, use `git status --short` and evaluate each
file individually. If a file appears untracked but is not part of your task, leave it alone.
</destructive_git_prohibition>
<summary_creation>
After all tasks complete, create `{phase}-{plan}-SUMMARY.md` at `.planning/phases/XX-name/`.