chore: adopt canonical .claude/worktrees/ convention#136
Merged
Conversation
Align infra with the worktree-location convention converged on by docs + platform (docs PR trakrf/docs#201, platform PR #445): worktrees live in `.claude/worktrees/<name>/`, created via the native EnterWorktree tool, no `.worktrees/` dir and no symlink bridge. - CLAUDE.md: add a `## Worktrees` section declaring `.claude/worktrees/` canonical. Since this repo blanket-ignores `.claude/`, the gitignore no longer references worktrees at all, so this CLAUDE.md line is the sole in-repo signal of the convention (it's the highest-priority hint the superpowers using-git-worktrees skill's fallback reads). - .gitignore: drop the now-vestigial `.worktrees/` line — `.claude/worktrees/` is already covered by the existing `.claude/` ignore. (Separately removing the stale empty root `.worktrees/feature/` leftover dir, which is gitignored/untracked so not part of this commit.) Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
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.
Aligns trakrf/infra with the worktree-location convention converged on by docs (PR trakrf/docs#201) and platform (PR #445). Per-repo CLAUDE.md is the source of truth (no standalone ADR).
Convention
Worktrees live in
.claude/worktrees/<name>/(repo-relative), one per branch, created via the nativeEnterWorktreetool. No.worktrees/dir, no.claude/worktrees -> ../.worktreessymlink (fresh-clone footgun).Changes
## Worktreessection declaring.claude/worktrees/canonical. This repo blanket-ignores.claude/, so the.gitignoreno longer references worktrees at all → this CLAUDE.md line is the sole in-repo signal of the convention (and the highest-priority hint the superpowersusing-git-worktreesskill fallback reads)..worktrees/line (.claude/worktrees/is already covered by the existing.claude/ignore).Already-correct (no change needed)
.claude/worktrees/already ignored (blanket.claude/), like platform — no narrow line needed..claude/worktreesis a real dir, not a symlink — nothing to un-bridge.EnterWorktreetool.Out-of-band cleanup (not in this diff)
.worktrees/feature/leftover (Apr 10, gitignored/untracked, not a registered worktree).Brings docs/platform/infra all onto one path. Convention is LOCATION-locked; platform is separately researching upstream superpowers skill refinements (none needed for 5.1.0, which defers to the native tool).
🤖 Generated with Claude Code