Docs: require agent worktrees to be rooted on main#446
Merged
Conversation
The harness's `fresh` worktree base resolves to the clone's origin/HEAD, which points at `release` (the GitHub default) — so EnterWorktree can land on release rather than main. Document the verify-and-reset recovery step and the `git remote set-head origin main` fix that makes `fresh` root on main per clone. Co-Authored-By: Claude Opus 4.8 <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.
Why
Agent worktrees created via
EnterWorktreeuse afreshbase that resolves to this clone'sorigin/HEAD. In this repo that pointer isorigin/release(the GitHub default branch), so worktrees can land onreleaserather thanmain— contrary to the Branch Model rule that all work branches offmain.CLAUDE.md cannot change the base (it's decided by the harness before any instruction is read), so this documents the recovery step and the per-clone fix.
Changes
Adds an Agent worktrees subsection to the Branch Model in
CLAUDE.md:EnterWorktreeandgit reset --hard origin/mainif it landed onrelease.freshroot onmainper clone (without changing GitHub's default) viagit remote set-head origin main.🤖 Generated with Claude Code