fix(agent-loop): recover unsigned ART planning merge - #202
Conversation
📝 WalkthroughWalkthroughThis change adds schema-v6 loop-memory recovery for the ART PLAN2 sequence, tracking ART PLAN2 and AUTH-11 as ordered recovered merges before R6 activation. It updates validation, exemption preparation, policy fixtures, regression tests, recovery contracts, operational documentation, status records, and review evidence. ChangesWS-ENG-007 recovery reconciliation
Estimated code review effort: 3 (Moderate) | ~20 minutes Possibly related PRs
🚥 Pre-merge checks | ✅ 3 | ❌ 2❌ Failed checks (2 warnings)
✅ Passed checks (3 passed)
✨ Finishing Touches📝 Generate docstrings
🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
…-art-plan2-recovery
There was a problem hiding this comment.
Actionable comments posted: 2
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In
@.agent-loop/initiatives/WS-ENG-007-concurrent-pr-review-reconciliation/reviews/WS-ENG-007-00R6-pr-trust-bundle.md:
- Around line 20-22: Rerun and record the review for the actual reviewed SHA
609be24d3b5a4825e9dd8f70f3f3f219d041b430, then update
.agent-loop/initiatives/WS-ENG-007-concurrent-pr-review-reconciliation/reviews/WS-ENG-007-00R6-pr-trust-bundle.md
lines 20-22 with that SHA and update
.agent-loop/initiatives/WS-ENG-007-concurrent-pr-review-reconciliation/reviews/WS-ENG-007-00R6-internal-review-evidence.md
lines 11-17 so reviewer evidence, commands, and results all reference the same
actual revision.
In `@scripts/update_post_merge_memory.py`:
- Around line 2310-2318: Restrict schema-v6 recovery in the recovered_merges
validation logic to exactly one authorized PR `#197` predecessor, preventing
two-merge chains from being accepted or included in reorderable plans. Update
.agent-loop/policies/loop-memory-recovery.json:7-19,
scripts/test_update_post_merge_memory.py:2144-2283,
scripts/test_agent_gates.py:2312-2326,
.agent-loop/initiatives/WS-ENG-007-concurrent-pr-review-reconciliation/chunks/WS-ENG-007-00R6-art-plan2-recovery.md:52-63,
CHUNK_MAP.md:10-17, STATUS.md:10-20,
docs/operations_post_merge_memory.md:319-336, the two WS-ENG-007-00R6 review
evidence files at their specified ranges, and
.agent-loop/REVIEW_LOG.md:2945-2955 to consistently document, test, and enforce
the one-predecessor policy; each sibling site requires corresponding alignment
with this change.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: defaults
Review profile: CHILL
Plan: Pro Plus
Run ID: c7979505-802e-4145-a9d9-7acfb8b6cf74
📒 Files selected for processing (12)
.agent-loop/REVIEW_LOG.md.agent-loop/initiatives/WS-ENG-007-concurrent-pr-review-reconciliation/CHUNK_MAP.md.agent-loop/initiatives/WS-ENG-007-concurrent-pr-review-reconciliation/STATUS.md.agent-loop/initiatives/WS-ENG-007-concurrent-pr-review-reconciliation/chunks/WS-ENG-007-00R6-art-plan2-recovery.md.agent-loop/initiatives/WS-ENG-007-concurrent-pr-review-reconciliation/reviews/WS-ENG-007-00R6-internal-review-evidence.md.agent-loop/initiatives/WS-ENG-007-concurrent-pr-review-reconciliation/reviews/WS-ENG-007-00R6-pr-trust-bundle.md.agent-loop/merge-intents/WS-ENG-007-00R6.json.agent-loop/policies/loop-memory-recovery.jsondocs/operations_post_merge_memory.mdscripts/test_agent_gates.pyscripts/test_update_post_merge_memory.pyscripts/update_post_merge_memory.py
PR Trust Bundle: WS-ENG-007-00R6
Intent
Restore signed-memory continuity after unsigned planning merge PR #197 without
granting ART, CI, AUTH, ENG, or product implementation authority.
Exact Scope
bba4ba5f171a4438b072740707a5cf8bde49d9af.WS-ART-001-PLAN2/03a05eeb8f129e0d5f226cc5c058965f43590a81.WS-AUTH-001-11/f670b7058c71ad4d11a68c6e242e9fe501ae3aaf.WS-ENG-007-00R6as the direct-next main merge.WS-ART-001-03A, AUTH atWS-AUTH-001-11A, and ENG atWS-ENG-007-01;WS-CI-001-03still requiresits own signed planning start.
Reviewed Revision
7a22070fe66770fc229671421ab0a899c9b2c97dRecovery code revision:
f3eab24ecac32f959933369c1b5342bc901c7153.Evidence
merge-bound check selection, exemption consumption, wrong-basis rejection,
and inert replay.
is signed-active, AUTH-11 completion, ENG R6 activation, and stopped successor
projections for all three initiatives.
Reviewer Results
All nine required internal tracks completed. No implementation blocker remains.
CI/security and senior engineering retain only the operational risk that any
intervening main merge or missing protected evidence invalidates recovery.
CodeRabbit's two comments were dispositioned as stale-context findings. The
external-review response records why the reviewed SHA is
f3eab24eand whysigned PR #201 is a mandatory exact predecessor rather than broadened recovery
authority.
Human Review Focus
agent-gatesandtestevidence.automatic successor start.
Stop Conditions
Do not merge if main advances, required checks fail, the reviewed SHA changes
outside evidence-only files, or recovery would need broader authority.