fix(protocol): require session close before branch merge#15
fix(protocol): require session close before branch merge#15leadsolutions-mike wants to merge 4 commits into
Conversation
…nez#2) Adds an explicit branch ordering rule to the protocol: session-close artifacts must be written on the feature branch before the PR is opened, not after merge. Changes: - PROTOCOL_RULES.md §P3: new "Branch ordering rule" subsection + new checklist item in handoff schema (v1.9.1 → v1.9.2) - modules/git-substrate.md: new §M-git-5 with git-specific enforcement and reviewer signal (v1.0.0 → v1.1.0) - template/: same changes replicated to the distributable template - README.md: version history entry for v1.9.2 (per §M-git-3) Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
|
Thanks for the contribution. The intent matches #2, but this PR needs to be reworked before it can be reviewed/merged. The current
Please rebase against current The CI checks are green, but they do not catch this semantic regression, so this needs a content correction before merge. |
…2.0.0 (closes mmilanez#2) Minimal v2-compatible fix for issue mmilanez#2. - PROTOCOL_RULES.md (v2.0.0 → v2.0.1): adds "Branch ordering rule" subsection to §P3 and one checklist item to the handoff schema - modules/git-substrate.md (v1.1.0 → v1.2.0): adds §M-git-6 with git-specific enforcement and reviewer signal - README.md: version history entry for 2.0.4 (per §M-git-3) No template/ files added — the repo root is the template. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
|
Thanks for the detailed review. Rebased on v2.0.0 main — here's what changed in the latest push: Root cause of the regression: the local clone of What's fixed in this revision:
|
|
Almost there. The root files now look aligned with the v2 baseline, but the PR still has two nested
Those should not be part of this repository. The public product repo already uses the repo root as the distributable template. Please remove those
After that, this can be reviewed again against issue #2. The checks are still green, but this layout issue remains blocking. |
|
Done — the two
|
|
Thanks for fixing the final diff. The current net content is now aligned: only One remaining maintainer concern: this PR's public commit history still contains the earlier stale v1.9-era commits and the follow-up cleanup commits. Because this is a public product repo and this PR changes core protocol rules, I would prefer to keep the contribution record clean. Please close this PR and open a fresh PR from a clean branch based on current
No Once the clean replacement PR is open and CI passes, we can review it normally against #2. |
Summary
Closes #2.
Adds an explicit branch ordering rule to the protocol: session-close artifacts must be written on the feature branch before the PR is opened, not after merge.
Changes
PROTOCOL_RULES.md(kernel) — v1.9.1 → v1.9.2### Branch ordering rule (v1.9.2+)subsection in §P3, immediately before the verification step — states the rule in substrate-neutral terms and explains why post-merge state writes are problematic- [ ] Session-close state written on the feature branch before the PR is opened (when substrate uses pull requests — see §M-git-5)modules/git-substrate.md— v1.0.0 → v1.1.0§M-git-5 — Session close ordering before PR mergesection — git-specific enforcement, agent rule, and reviewer signal for post-merge closeout PRstemplate/— same changes replicated to the distributable templateREADME.md— version history entry for v1.9.2 (per §M-git-3)Test plan
PROTOCOL_RULES.mdshowsVersion: 1.9.2,git-substrate.mdshowsVersion: 1.1.0in both.agents/andtemplate/.agents/PROTOCOL_RULES.md§M-git-5section is present in both copies ofgit-substrate.md1.9.2as the first entryreadme-syncCI check passes (README.md was updated alongside PROTOCOL_RULES.md)Contributed by @leadsolutions-mike as external collaborator.