feat: route parallel work by VCS and fold branch finishing into ExecutePlan#67
Open
N4M3Z wants to merge 1 commit into
Open
feat: route parallel work by VCS and fold branch finishing into ExecutePlan#67N4M3Z wants to merge 1 commit into
N4M3Z wants to merge 1 commit into
Conversation
This was referenced Jul 8, 2026
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.
Problem
The always-loaded GitWorktrees rule told agents to use git worktrees and
isolation: "worktree"unconditionally, contradicting the jj guidance (jj workspaces, never git worktrees in colocated repos). ExecutePlan carried the same unconditional prescription, and the finishing flow lived in a separate git-only skill. Two real jj incidents lacked prevention guidance: an undescribed working copy pushed as an empty-message commit, and commits authored under an email that did not match the signing key, forcing a history rewrite.Fix
The GitWorktrees rule routes by VCS: jj-colocated repos use one jj workspace per agent; git worktrees and worktree-isolated spawns apply to git-only repos. VersionControl states the principle (agents work in jj changes; a git commit is the human-boundary artifact) and ExecutePlan gains VCS-aware isolation plus the finishing step (merge / PR / keep / discard) with mechanics for both git and jj. Jujutsu.md guards against bookmarking an undescribed change; CommitSigning.md leads with aligning
user.emailto the signing key before the first commit.Test plan
qualitypasses on this PR