fix(sidecar): bump vendored contextual-orchestrator pin to fix orchestrator/free retry-stacking - #1951
Merged
Merged
Conversation
Advances ORCHESTRATOR_PIN_SHA from 2e414d15 (2026-09-04) to 414f22973658c4ddc3d4320fcf7acd9b4e8ba991, the commit that merges contextual-orchestrator#1081 (fixes _invoke's retry-then-failover decision getting multiplied by ModelClient._send_with_retry's independent transient-retry-with-backoff underneath it -- up to 6 real network attempts against one flaky orchestrator/free agent before failover ever ran). Without this bump the merged fix has zero effect on Noema/OpenCode/ Strix reviews: the pin does not auto-track main, so every review sidecar was still vendoring pre-fix code two days stale. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01KPmJErfkcHer4UVEgrQxUX
Companion to the sidecar script bump -- ORCH_PIN_SHA must match the new ORCHESTRATOR_PIN_SHA default exactly or test_sidecar_pins_the_vendored_orchestrator_revision fails. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01KPmJErfkcHer4UVEgrQxUX
Updates item 1's inline "today" SHA and appends a 2026-09-06 amendment documenting the contextual-orchestrator#1081 retry-stacking fix this pin advance carries, matching this ADR's established per-bump amendment convention. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01KPmJErfkcHer4UVEgrQxUX
|
Warning Review limit reachedNext included review available in 27 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: Team Run ID: 📒 Files selected for processing (4)
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 |
Companion to the sidecar/test/ADR updates already on this branch -- documents the contextual-orchestrator#1081 retry-stacking fix this pin advance carries into Noema/OpenCode/Strix. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01KPmJErfkcHer4UVEgrQxUX
seonghobae
marked this pull request as ready for review
September 6, 2026 03:01
seonghobae
pushed a commit
that referenced
this pull request
Sep 6, 2026
…cause, pin advance, and first post-pin measurement Extends the 2026-09-05 NIM-routing entry with a dated follow-up: the _invoke x _send_with_retry retry multiplication (contextual-orchestrator#1081), the ModelClient.single_attempt_transport() fix, the hard-coded sidecar pin that kept the fix out of production until #1951, the rule for which runs count as post-advance evidence, and .github#1661 run 34008191123 as the first run vendoring 414f2297 (pin live; preflight 0/12 ready, so the fix is not yet exercised end to end). This PR's CHANGELOG entry gains the same pointer. Documentation only. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01KPmJErfkcHer4UVEgrQxUX
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
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.
Root cause
ContextualWisdomLab/contextual-orchestratorPR #1081 (merged414f22973658c4ddc3d4320fcf7acd9b4e8ba991) fixes a real, confirmed bug:TaskOrchestrator._invoke's own retry-then-failover decision for a retryable 5xx (budgeted1 + tool_retry_attemptsreal tries per candidate) was getting multiplied byModelClient._send_with_retry's independent transient-retry-with-backoff loop underneath it (max_retries + 1further tries per call) — up to(tool_retry_attempts + 1) × (max_retries + 1)real network attempts (6 at production defaults) against one already-flagged-flakyorchestrator/freeagent before_invokeever tried the next ranked candidate.This is the confirmed root cause of independently observed incidents in
ContextualWisdomLab/.githubPRs #1912, #1231, #1503, and #1198, each spending 9–57+ minutes stuck on one escalated route and surfacing that same route's model in its final error — never reaching a cleanly-ready sibling preflight had already found.Critical follow-up finding: merging that fix upstream has had zero effect in production so far, because
scripts/ci/contextual_orchestrator_review_sidecar.sh'sORCHESTRATOR_PIN_SHAis a hardcoded default that does not auto-trackcontextual-orchestrator'smain— every review sidecar (Noema, OpenCode, Strix) was still vendoring2e414d15ba58f28597751b625a8a2f00fc9fadcf, a commit from 2026-09-04, two days stale relative to the fix.Verification (done independently before opening this PR)
contextual-orchestratorat the fix branch head (73a5c20), confirmed the new regression test passes.orchestrator.pyback to unmodifiedmainand reran the same test: reproduced the exact pre-fix bug (6 <= 2assertion failure — 6 real network attempts before failover).3393 passed, with the only 2 failures confirmed pre-existing and unrelated (reproduced identically against clean, unmodifiedmain).ModelClient.timeout/max_retries/backoff value changed anywhere in the diff — only which agent gets tried changes, consistent with this org's standing "no fixed model-path timeout" policy (.githubfix(strix): bound scanner runtime to 900 seconds #1889/fix(noema): bound model runtime to 900 seconds #1890/fix(opencode): bound model runtime to 900 seconds #1892 reverted via fix(noema): restore unbounded model runtime contract #1891/fix(review): restore user-directed model timeout policy #1895).Changes
scripts/ci/contextual_orchestrator_review_sidecar.sh:ORCHESTRATOR_PIN_SHAdefault advances2e414d15ba58f28597751b625a8a2f00fc9fadcf→414f22973658c4ddc3d4320fcf7acd9b4e8ba991.tests/test_contextual_orchestrator_review_sidecar_contract.py: companionORCH_PIN_SHAconstant bump (contract-tested — this repo's tests pin exact SHA strings in both the script and the ADR).docs/adr/0003-contextual-orchestrator-vendored-free-zdr.md: updated the inline "today" SHA reference and appended a 2026-09-06 amendment documenting this bump, matching the ADR's established per-bump amendment convention.CHANGELOG.md: new entry documenting the pin advance and the fix it carries.Why this PR's own review may look unusual
This PR's required Noema/OpenCode/Strix review checks run the base branch's trusted copy of the sidecar script per this repo's
pull_request_targettrust-boundary design — i.e. they will still hit the exact bug this PR fixes, since the base branch doesn't have the bump yet. Expect this PR's own reviews to be slow or flaky for that reason; that is not a defect in the diff, it's the exact chicken-and-egg case this bump exists to resolve for every other PR.🤖 Generated with Claude Code
https://claude.ai/code/session_01KPmJErfkcHer4UVEgrQxUX
Generated by Claude Code