Skip to content

Agent Zero AI framework

Reuse pooled connections for Codex upstream requests

Alessandrod1be399f382a
diff --git a/plugins/_oauth/AGENTS.md b/plugins/_oauth/AGENTS.md
index 6ed08f704..6db82efd5 100644
--- a/plugins/_oauth/AGENTS.md
+++ b/plugins/_oauth/AGENTS.md
@@ -54,6 +54,7 @@
- The Codex Chat compatibility route maps real Responses usage to Chat token/detail fields. Honor `stream_options.include_usage` with a terminal empty-choices usage chunk; never fabricate missing totals. The Codex main-model hook requests usage in Chat mode unless the caller supplies stream options. Responses mode keeps its existing request shape.
- Chat compatibility replies preserve incomplete finish reasons and do not turn failed responses into successful stops. Streaming forwards upstream errors, rejects premature EOF as an error, and closes the upstream stream on completion or cancellation.
- Native OAuth streaming responses attach upstream cleanup to the Flask response lifecycle, including closure before the first chunk, cancellation, completion, and read errors.
+- `codex.request_codex` sends through the module-level keep-alive `_UPSTREAM_SESSION` with cookie persistence disabled, so each request carries only its explicit headers; tests stub `_UPSTREAM_SESSION.request`.
- OAuth providers intentionally using Responses must set `a0_api_mode: responses`; all others inherit the Chat Completions default, since a local proxy route alone does not prove upstream support.
## Work Guidance
diff --git a/plugins/_oauth/helpers/codex.py b/plugins/_oauth/helpers/codex.py
index aaf608f78..1175082b0 100644
--- a/plugins/_oauth/helpers/codex.py
+++ b/plugins/_oauth/helpers/codex.py
@@ -3,6 +3,7 @@ from __future__ import annotations
import base64
import errno
import hashlib
+import http.cookiejar
import json
import os
import secrets
@@ -66,6 +67,9 @@ USAGE_ENDPOINT_PATHS = (
"/api/codex/usage",
)
_AUTH_THREAD_LOCK = threading.RLock()
+# keep-alive pool for upstream calls; cookies are not persisted, so requests keep their explicit shape
+_UPSTREAM_SESSION = requests.Session()
+_UPSTREAM_SESSION.cookies.set_policy(http.cookiejar.DefaultCookiePolicy(allowed_domains=[]))
@dataclass(frozen=True)
@@ -603,7 +607,7 @@ def request_codex(
if client_version:
request_headers["version"] = client_version
- return requests.request(
+ return _UPSTREAM_SESSION.request(
method,
target,
headers=request_headers,
diff --git a/tests/test_oauth_codex.py b/tests/test_oauth_codex.py
index ba6a43556..585770d4b 100644
--- a/tests/test_oauth_codex.py
+++ b/tests/test_oauth_codex.py
@@ -462,7 +462,7 @@ def test_request_codex_sends_current_codex_headers_from_body(
)
return FakeResponse()
- monkeypatch.setattr(codex.requests, "request", fake_request)
+ monkeypatch.setattr(codex._UPSTREAM_SESSION, "request", fake_request)
response = codex.request_codex(
"/responses",