Add safe worktree bootstrap - #273
Merged
Merged
Conversation
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
palewire
enabled auto-merge (squash)
August 23, 2026 14:47
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
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.
Summary
Add an idempotent
make bootstrapworkflow for primary checkouts and linked Git worktrees. The typed Python bootstrap discovers checkout paths from Git metadata, safely shares an ignored.envwithout overwriting local files, maintains a stableWORKTREE_IDin an ignored.env.worktree, preserves local overrides, and runs the locked uv dependency sync.Expand contributor and agent guidance with dotenv precedence, worktree isolation, shared-service safety, conflict-hotspot coordination, generated-file rules, and the limits of pytest-xdist resource isolation.
Acceptance Criteria
Validation
make bootstrap UV=$HOME/.local/bin/uv PYTHON=.venv/bin/pythonmake verify UV=$HOME/.local/bin/uvDocumentation and Release Notes
CHANGELOG.mdis updated for a user-facing, compatibility, or security change.