Skip to content

docs(rules): add worktree force-remove guard to claim-acquire rule #3307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AceHack merged 1 commit into from
May 14, 2026
Merged

docs(rules): add worktree force-remove guard to claim-acquire rule #3307

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions .claude/rules/claim-acquire-before-worktree-work.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,37 @@ Vera-Codex, Riven-Cursor, Lior-Antigravity, Alexa-Kiro).
Aaron's messages (these are conversation-driven, not backlog-driven)
- Hot fixes to broken main / rollback PRs (urgency > coordination)

## Worktree force-remove guard

When `git checkout <branch>` or `git worktree add ... <branch>` fails with
`fatal: '<branch>' is already used by worktree at '<path>'`, do NOT
`git worktree remove --force <path>` to take over peer Otto's worktree.
That path is operational state — even if the directory looks stale, peer
Otto may be mid-edit. Instead:

1. **Create a new worktree at a different path** for your branch-related
work. Use a distinct task-tagged path (e.g., `/tmp/zeta-3153-find-fix`
for thread-investigation; `/private/tmp/zeta-otto-desktop-claim-extend`
for rule edits) so the two worktrees don't collide.
Comment on lines +62 to +65

2. **If peer Otto's branch needs your attention** (e.g., review-thread
resolution under the DOES-NOT-APPLY clause above), you can do that
work via `gh api` mutations + GraphQL — no checkout required.

3. **If you truly need to checkout peer Otto's branch** (rare), check
the bus for a claim on that branch first, post a `worktree-handoff`
advisory envelope, and wait for peer-Otto-side release before
force-removing.
Comment on lines +72 to +74

Empirical anchor: 2026-05-14T18:13Z Otto-CLI tick shard
([docs/hygiene-history/ticks/2026/05/14/1813Z.md](../../docs/hygiene-history/ticks/2026/05/14/1813Z.md))
documents force-remove of Otto-Desktop's `/private/tmp/zeta-otto-id-alloc`
worktree (on PR #3153 branch) to resolve a Codex thread. Worked, but
substrate-honest: a fresh worktree at `/tmp/zeta-3153-find-fix` would
have been equally effective and non-destructive. The PR-thread-resolution
DOES-NOT-APPLY clause covered the WHY of the action; it did not cover
the HOW.
Comment on lines +78 to +83

## Composes with other rules

- `.claude/rules/backlog-item-start-gate.md` — already mandates prior-art
Expand Down
Loading