docs(gaps): restore section dropped by #1423's merge - #1424
Conversation
…laim PR #1423 merged (ebd1b8b) using a merge-conflict resolution that kept only its own branch's dated section and silently dropped main's already-published '2026-08-30 sidecar pin staleness recurrence' section (the #1422 fix's own record) from the file entirely. That merge also left #1423's own section claiming #1413/#1422 'have not merged' even though both are its own git ancestors. Restore the dropped section verbatim, annotate the stale section as superseded, and append an accurate dated entry recording this cycle's backlog-refresh work: 15 PRs merged/retriggered against the new main, 8 left untouched for real conflicts, one independent sidecar/review- dispatch defect newly observed on #1420, and a Gap ID collision (G-15) renumbered to G-16 on #1348. Verified: git diff against origin/main shows this change is purely additive (no main content removed); pytest tests/test_product_technical_gap_baseline.py tests/test_pr_governance_audit_contract.py (8 passed). Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_015Gs7KmNvH75nxz1sL8mKjw
|
Warning Review limit reachedNext included review available in 11 minutes. View limit detailsLimit details: You’ve used the included review currently available. You've used all free OSS reviews for now. Wait for the free limit to reset to keep reviewing this public repository. Review configuration: ⚙️ Run configurationConfiguration used: Organization UI Review profile: CHILL Plan: Pro Plus Run ID: 📒 Files selected for processing (1)
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 |
![devin-ai-integration[bot]](https://avatars.githubusercontent.com/in/811515?s=60&v=4){kind=small}
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
|
A dedicated root-cause/fix investigation is already in progress (dispatched before this PR existed). I won't duplicate that work here. Once the fix lands I'll merge Generated by Claude Code |
- Clean-merge subtotal said 5 but named 6 PRs; corrected to 6, and added the omitted #1391 to the trivial-conflicts list so 6+7+2=15 reconciles with the stated total. - Compact cross-repo references to the owner/repo#num binding convention: ContextualWisdomLab/contextual-orchestrator#857 and ContextualWisdomLab/LineageWeave#667. Co-Authored-By: Claude <noreply@anthropic.com>
….dev 403 fix (#1430) Bumps ORCHESTRATOR_PIN_SHA from 5f2753a (#1422 pin) to 30c6d716 (contextual-orchestrator main, carrying #919's Models.dev User-Agent/403 fix and its ADR-0032 generalization to nvidia_nim/nvidia_nim_sub/openai). Merged with admin bypass past opencode-review: per this repo's own pull_request_target trust boundary, this PR's review dispatch runs .github main's still-stale sidecar copy, so it cannot pass its own check until the bump it ships is itself on main -- the same chicken-and-egg as contextual-orchestrator#919 and the prior #1413/#1422/#1423/#1424/#1425. Full local suite: 1880 passed, 1 skipped.
2 participants
Summary
PR #1423 (merged at
ebd1b8bf) resolved its own merge-conflict againstmainby keeping only its branch's own dated section and silently dropping main's already-published "2026-08-30 sidecar pin staleness recurrence" section (the record of the #1422 fix itself) out of the file entirely. That merge also left #1423's own section claiming#1413/#1422 "have not merged"even though both are now its own git ancestors onmain.This PR:
main(5 clean via the GitHub update-branch API, 7 with trivial CHANGELOG-only or renumbered-Gap-ID conflicts resolved by hand, 2 already-current PRs retriggered with an empty commit), 8 PRs left untouched for genuinely non-trivial conflicts, and one newly observed independent sidecar/review-dispatch defect on fix(pingora): exempt documentation raster evidence #1420 (not one of the three already-diagnosed root causes).This is doc-only; no code paths, workflows, or gates changed.
Verification
git diff origin/main -- docs/product-technical-gap-baseline.mdshows this change is purely additive — no line of main's existing content is removed.pytest tests/test_product_technical_gap_baseline.py tests/test_pr_governance_audit_contract.py— 8 passed.Co-Authored-By: Claude Sonnet 5 noreply@anthropic.com
Claude-Session: https://claude.ai/code/session_015Gs7KmNvH75nxz1sL8mKjw
Generated by Claude Code