Skip to content

chore(ci): pin sidecar to discovery retry #1469

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
seonghobae merged 1 commit into from
Aug 31, 2026
Merged

chore(ci): pin sidecar to discovery retry #1469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Semantic Versioning where the repository publishes a release.

## [Unreleased]
- Noema, Strix, and OpenCode review sidecars now vendor contextual-orchestrator
at `0adca4703df67f8f31d3ea5b04a1e07ed775dd6c` and treat every KV credential
at `c107e3e52371993aa9c326fcc245e01c41fc3850` and treat every KV credential
as an independent discovery account. Same-vendor credentials no longer
collapse into a provider family; only explicit model groups may share
routing evidence.
Expand Down
2 changes: 1 addition & 1 deletion docs/adr/0003-contextual-orchestrator-vendored-free-zdr.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ all five, and auto-optimize routing by cost.

1. **Vendoring, pinned**: `scripts/ci/contextual_orchestrator_review_sidecar.sh`
clones `ContextualWisdomLab/contextual-orchestrator` at an exact SHA
(`0adca4703df67f8f31d3ea5b04a1e07ed775dd6c` today) into `RUNNER_TEMP`. The
(`c107e3e52371993aa9c326fcc245e01c41fc3850` today) into `RUNNER_TEMP`. The

@devin-ai-integration devin-ai-integration Bot Aug 31, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

📝 Info: Auto-pool text is historical

The ADR amendment explicitly supersedes its original orchestrator/auto decision. Current workflows and contracts consistently enforce orchestrator/free.

Devin Review

Was this helpful? React with 👍 or 👎 to provide feedback.

source's `requirements.lock` is installed with `--require-hashes` and
`--no-deps`, so dependency resolution cannot silently move the reviewed
runtime.
Expand Down
2 changes: 1 addition & 1 deletion scripts/ci/contextual_orchestrator_review_sidecar.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# (fail-closed zero-cost) pool.
set -euo pipefail

ORCHESTRATOR_PIN_SHA="${ORCHESTRATOR_PIN_SHA:-0adca4703df67f8f31d3ea5b04a1e07ed775dd6c}"
ORCHESTRATOR_PIN_SHA="${ORCHESTRATOR_PIN_SHA:-c107e3e52371993aa9c326fcc245e01c41fc3850}"

@devin-ai-integration devin-ai-integration Bot Aug 31, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

🔴 Discovery retries exceed startup deadline

Each transient account failure under ORCHESTRATOR_PIN_SHA adds 5.5 seconds without extending the 180-second startup deadline. Healthy review routes can be killed during preflight.

Prompt for agents 
The c107e3e runtime adds one 0.5-second-delayed discovery retry with a timeout of up to five seconds for each provider account, but scripts/ci/contextual_orchestrator_review_sidecar.sh still terminates startup after 180 seconds. contextual_orchestrator_review_launcher.py already documents that discovery plus route probing can require 265 seconds before these retries; five retries increase that bound by 27.5 seconds. Reconcile the shell watchdog and launcher budgets, preferably with one shared monotonic startup deadline or scaled probing, so transient discovery recovery cannot consume time that the subsequent preflight is not allowed to use. Update the timeout contract tests and budget documentation with the new pinned runtime's retry allowance.
Devin Review

Was this helpful? React with 👍 or 👎 to provide feedback.

@devin-ai-integration devin-ai-integration Bot Aug 31, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

📝 Info: Pin range contains one commit

The new SHA directly descends from the old pin. No unrelated intervening revisions enter the vendored runtime.

Devin Review

Was this helpful? React with 👍 or 👎 to provide feedback.

ORCHESTRATOR_GIT_URL="${ORCHESTRATOR_GIT_URL:-https://github.com/ContextualWisdomLab/contextual-orchestrator.git}"
# The Strix gate and Noema SSRF guard accept this one process-local origin.
# Keep it fixed so an environment override cannot create an unvalidated sidecar.
Expand Down
2 changes: 1 addition & 1 deletion tests/test_contextual_orchestrator_review_sidecar_contract.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
)

GATEWAY_MODEL = "contextual-orchestrator/orchestrator/free"
ORCH_PIN_SHA = "0adca4703df67f8f31d3ea5b04a1e07ed775dd6c"
ORCH_PIN_SHA = "c107e3e52371993aa9c326fcc245e01c41fc3850"


def _read(path: Path) -> str:
Expand Down
Loading