Skip to content

fix(agent-loop): recover unsigned ART planning merge - #202

Merged
abiorh-claw merged 9 commits into
mainfrom
codex/ws-eng-007-00r6-art-plan2-recovery
Jul 26, 2026
Merged

fix(agent-loop): recover unsigned ART planning merge#202
abiorh-claw merged 9 commits into
mainfrom
codex/ws-eng-007-00r6-art-plan2-recovery

Conversation

@Abiorh001

@Abiorh001 Abiorh001 commented Jul 25, 2026

Copy link
Copy Markdown
Collaborator

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

  • Signed basis: bba4ba5f171a4438b072740707a5cf8bde49d9af.
  • First recovered predecessor: PR docs(artifacts): reconcile submission bundle plan #197 / WS-ART-001-PLAN2 /
    03a05eeb8f129e0d5f226cc5c058965f43590a81.
  • Second recovered predecessor: signed PR WS-AUTH-001-11: split project read hard cutover #201 / WS-AUTH-001-11 /
    f670b7058c71ad4d11a68c6e242e9fe501ae3aaf.
  • Activation: only WS-ENG-007-00R6 as the direct-next main merge.
  • Successors remain stopped: ART at WS-ART-001-03A, AUTH at
    WS-AUTH-001-11A, and ENG at WS-ENG-007-01; WS-CI-001-03 still requires
    its own signed planning start.

Reviewed Revision

7a22070fe66770fc229671421ab0a899c9b2c97d

Recovery code revision: f3eab24ecac32f959933369c1b5342bc901c7153.

Evidence

  • 301 recovery, checker, and Agent Gate tests passed.
  • Policy regression asserts the complete schema-v6 object exactly.
  • Existing behavior tests prove signed-basis matching, ordered adjacency,
    merge-bound check selection, exemption consumption, wrong-basis rejection,
    and inert replay.
  • The exact cross-initiative regression proves ART PLAN2 recovery while AUTH-11
    is signed-active, AUTH-11 completion, ENG R6 activation, and stopped successor
    projections for all three initiatives.
  • Merge intent, Markdown links, stale wording, and diff checks passed.

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 f3eab24e and why
signed PR #201 is a mandatory exact predecessor rather than broadened recovery
authority.

Human Review Focus

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.

@coderabbitai

coderabbitai Bot commented Jul 25, 2026

Copy link
Copy Markdown

Review Change Stack

📝 Walkthrough

Walkthrough

This 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.

Changes

WS-ENG-007 recovery reconciliation

Layer / File(s) Summary
Schema-v6 recovery policy and validation
scripts/update_post_merge_memory.py, scripts/test_update_post_merge_memory.py, scripts/test_agent_gates.py, .agent-loop/policies/loop-memory-recovery.json
Recovery validation and exemption preparation support schema version 6 with exactly two ordered recovered merges, updated signed-basis checks, and regression coverage for valid and invalid sequences.
R6 recovery contract and activation
.agent-loop/initiatives/WS-ENG-007-concurrent-pr-review-reconciliation/*, .agent-loop/merge-intents/WS-ENG-007-00R6.json, docs/operations_post_merge_memory.md
R6 contracts, activation metadata, status tracking, dependency ordering, and operational documentation define the ART PLAN2, AUTH-11, and R6 merge sequence and its explicit-start requirements.
Review evidence and recovery record
.agent-loop/initiatives/WS-ENG-007-concurrent-pr-review-reconciliation/reviews/*, .agent-loop/REVIEW_LOG.md
Trust-bundle, internal-review, and recovery-log records capture reviewed revisions, validation results, merge constraints, and remaining evidence requirements.

Estimated code review effort: 3 (Moderate) | ~20 minutes

Possibly related PRs

🚥 Pre-merge checks | ✅ 3 | ❌ 2

❌ Failed checks (2 warnings)

Check name Status Explanation Resolution
Docstring Coverage ⚠️ Warning Docstring coverage is 50.00% which is insufficient. The required threshold is 80.00%. Write docstrings for the functions missing them to satisfy the coverage threshold.
Description check ⚠️ Warning It covers the intent and evidence, but misses most required template sections like Chunk, Signed Start Provenance, Scope Control, Commands Run, and CI checks. Rewrite the description to follow the template and add the missing sections: chunk/intent, signed-start provenance, scope control, commands/results, test delta, external review, CI/gate integrity, and risks.
✅ Passed checks (3 passed)
Check name Status Explanation
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Title check ✅ Passed The title clearly matches the main change: recovering the unsigned ART planning merge.
✨ Finishing Touches
📝 Generate docstrings
  • Create stacked PR
  • Commit on current branch
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch codex/ws-eng-007-00r6-art-plan2-recovery

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.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

📥 Commits

Reviewing files that changed from the base of the PR and between f670b70 and 1917b6f.

📒 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.json
  • docs/operations_post_merge_memory.md
  • scripts/test_agent_gates.py
  • scripts/test_update_post_merge_memory.py
  • scripts/update_post_merge_memory.py

Comment thread scripts/update_post_merge_memory.py
@abiorh-claw
abiorh-claw self-requested a review July 26, 2026 01:09
@abiorh-claw
abiorh-claw merged commit a04fd1a into main Jul 26, 2026
4 checks passed
github-actions Bot pushed a commit that referenced this pull request Jul 26, 2026
@abiorh-claw
abiorh-claw deleted the codex/ws-eng-007-00r6-art-plan2-recovery branch July 26, 2026 01:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants