Repository navigation
Route Ollama through the shared HTTP client - #36078
Merged
copyberry[bot] merged 1 commit intoJul 30, 2026
Merged
copyberry[bot] merged 1 commit into
copyberry[bot] merged 1 commit into
Conversation
## Why Ollama requests need to honor Codex's configured outbound proxy policy and custom CA handling. ## What changed - Replace Ollama's direct `reqwest` client with a route-aware client created by `codex-http-client`. - Preserve the five-second connection timeout and legacy system-root fallback for default-routed requests. - Reuse one Ollama client for connectivity, version, model discovery, and model-pull checks. - Surface HTTP transport initialization errors instead of replacing them with the generic Ollama connection error. ## Testing - Cover system-proxy routing and invalid `CODEX_CA_CERTIFICATE` and `SSL_CERT_FILE` values under both outbound proxy policies. - Verify that version and model checks reuse the existing Ollama client. GitOrigin-RevId: c7cc36845a9bceb57ce5524b9e1b3cbe317897a3
copyberry
Bot
force-pushed
the
copyberry/codex-internal-to-codex-oss/c7cc36845a9bceb57ce5524b9e1b3cbe317897a3
branch
from
July 30, 2026 04:27
14f6082 to
7d5253d
Compare
copyberry
Bot
deleted the
copyberry/codex-internal-to-codex-oss/c7cc36845a9bceb57ce5524b9e1b3cbe317897a3
branch
July 30, 2026 04:28
zhengsuhao61-svg
temporarily deployed
to
issue-triage
July 30, 2026 04:31 — with
GitHub Actions
Inactive
zhengsuhao61-svg
temporarily deployed
to
issue-triage
July 30, 2026 04:31 — with
GitHub Actions
Inactive
zhengsuhao61-svg
temporarily deployed
to
issue-triage
July 30, 2026 04:31 — with
GitHub Actions
Inactive
This branch was previously deployed
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Route Ollama through the shared HTTP client
Why
Ollama requests need to honor Codex's configured outbound proxy policy and custom CA handling.
What changed
reqwestclient with a route-aware client created bycodex-http-client.Testing
CODEX_CA_CERTIFICATEandSSL_CERT_FILEvalues under both outbound proxy policies.