fix(devops): branch assertion helper for shared worktrees - #22
Draft
cursor[bot] wants to merge 2 commits into
Draft
fix(devops): branch assertion helper for shared worktrees#22cursor[bot] wants to merge 2 commits into
cursor[bot] wants to merge 2 commits into
Conversation
Add devops.git.assert_branch so agents can fail fast before mutating git commands when concurrent sessions drift HEAD. Update agent skills with worktree isolation guidance and resolve the shared-worktree branch race issue. Co-authored-by: Alex Vardakostas <Al-does@users.noreply.github.com>
…story Co-authored-by: Alex Vardakostas <Al-does@users.noreply.github.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.
Issue
docs/issues/resolved/2026-07-19-shared-worktree-branch-race.mdgit cherry-pickor similar write can then land on the wrong branch.Fix type
Straightforward
What changed
devops/git/assert_branch.pyCLI/helper to fail fast before mutating git commands when HEAD drifted.devops/git/__init__.py.record-agent-issueandvast-provisioningskills.docs/issues/resolved/with updated resolution history.Tradeoffs
None — simplification/deletion. Cursor platform behavior is unchanged; separate worktrees per concurrent agent remains the strongest isolation. The helper blocks mistaken writes rather than preventing HEAD drift.
Verification
uv run pytest -q tests/test_git_assert_branch.py(5 passed)Reviewer notes
Re-lands a fix drafted on 2026-08-02 (
automated/bugfix/2026-08-02-shared-worktree-branch-race) that was never merged tomain.