Conversation
This was referenced Jul 7, 2026
bolinfest
added a commit
that referenced
this pull request
Jul 7, 2026
## Why #31335 lets HTTP callers obtain proxy-aware clients from `HttpClientFactory`, but a non-HTTP transport such as WebSockets also needs two pieces of policy owned by `codex-http-client`: a concrete route decision for its destination and the same custom-CA-aware rustls trust configuration used by HTTPS. Keeping these prerequisites in the shared abstraction means the dependent Responses WebSocket change (#31441) cannot independently reinterpret `features.respect_system_proxy`, PAC results, or enterprise CA settings. ## What changed - Add a redaction-safe `OutboundProxyRoute` with explicit transport-default, direct, and concrete-proxy outcomes. - Add `HttpClientFactory::resolve_proxy_route()` so transports can resolve a destination through the already-selected outbound proxy policy. - Resolve `ws://` and `wss://` URLs through their HTTP equivalents so system and PAC rules apply consistently. - Add an always-returned rustls config builder that starts from native roots and layers in any configured Codex custom CA bundle. The existing optional builder remains available to callers that can delegate the default configuration to their transport. - Continue redacting proxy URLs from `Debug` output because they may contain credentials. ## Review guide 1. `http-client/src/outbound_proxy.rs` defines the transport-neutral route result and WebSocket URL normalization. 2. `http-client/src/custom_ca.rs` factors the native-root/custom-CA construction so callers that perform TLS themselves can always obtain a config. 3. `http-client/src/outbound_proxy_tests.rs` verifies WebSocket normalization and legacy transport-default behavior. ## Test plan - `just test -p codex-http-client outbound_proxy` - `just test -p codex-http-client custom_ca` --- [//]: # (BEGIN SAPLING FOOTER) Stack created with [Sapling](https://sapling-scm.com). Best reviewed with [ReviewStack](https://reviewstack.dev/openai/codex/pull/31342). * #31431 * #31363 * #31362 * #31361 * #31442 * #31441 * __->__ #31342
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.
Why
Responses WebSockets are the normal lower-latency transport for WebSocket-capable providers. They must not bypass an OS-selected proxy when
features.respect_system_proxyis enabled, but disabling WebSockets whenever the feature is enabled would impose a substantial performance penalty.Building on #31342, this change keeps the WebSocket fast path while applying the same concrete route and trust policy as HTTP.
What changed
HttpClientFactoryfor Responses WebSocket connections and the CLI doctor probe, so callers cannot open this transport without consulting the effective proxy policy.DIRECTopens the target TCP connection without falling through to environment proxy discovery.CONNECTtunnel before the target TLS/WebSocket handshake; TLS-encrypted proxies and the target share the custom-CA-aware rustls configuration.tokio-tungstenite's existing environment-proxy handling when the feature is disabled or platform resolution is unavailable.tokio-tungstenite's Happy Eyeballs behavior for explicit direct and proxy routes so an unreachable address family does not add a connection-timeout regression.Review guide
codex-api/src/websocket_connector.rsowns direct dialing, proxy TLS/CONNECT, target TLS, and Happy Eyeballs.codex-api/src/websocket_connector_tests.rsexercises explicit direct routing plus HTTP and HTTPS proxies with real WSS/TLS handshakes.codex-api/src/endpoint/responses_websocket.rsmakes the factory mandatory and adapts the established stream to the existing pump.core/src/client.rsandcli/src/doctor.rspass their effective factories into the Responses WebSocket API.Test plan
cargo check --tests -p codex-http-client -p codex-api -p codex-core -p codex-clijust test -p codex-api websocket_connectorjust bazel-lock-checkStack created with Sapling. Best reviewed with ReviewStack.