Skip to content

Local UI to run and train LLMs and diffusion models. Supports GGUF, MLX, Qwen3.8, DeepSeek-V4.1, MiniMax-H3, Gemma 4, FLUX and more.

Studio: offer ChatGPT Reconnect for reused or revoked refresh tokens (#16946)

Nilayd94eccff2889
diff --git a/studio/backend/core/inference/openai_codex_auth.py b/studio/backend/core/inference/openai_codex_auth.py
index 160bec92cb3..1f99768af80 100644
--- a/studio/backend/core/inference/openai_codex_auth.py
+++ b/studio/backend/core/inference/openai_codex_auth.py
@@ -289,15 +289,24 @@ async def _token_request(data: dict[str, Any]) -> dict[str, Any]:
if response.status_code >= 400:
error_code = ""
try:
- error = response.json().get("error")
- error_code = error.get("code", "") if isinstance(error, dict) else str(error or "")
+ payload = response.json()
+ error = payload.get("error")
+ error_code = error.get("code") if isinstance(error, dict) else error
+ # Codex CLI falls back to a top-level code and compares case-insensitively.
+ error_code = str(error_code or payload.get("code") or "").lower()
except Exception:
pass
- if data.get("grant_type") == "refresh_token" and error_code in {
- "invalid_grant",
- "invalid_refresh_token",
- "refresh_token_expired",
- }:
+ if data.get("grant_type") == "refresh_token" and (
+ response.status_code == 401
+ or error_code
+ in {
+ "invalid_grant",
+ "invalid_refresh_token",
+ "refresh_token_expired",
+ "refresh_token_reused",
+ "refresh_token_invalidated",
+ }
+ ):
raise CodexReauthorizationRequired(
"ChatGPT authorization is no longer valid. Please reconnect."
)
diff --git a/studio/backend/tests/test_openai_codex_subscription.py b/studio/backend/tests/test_openai_codex_subscription.py
index 761e0201bc8..773bc009a68 100644
--- a/studio/backend/tests/test_openai_codex_subscription.py
+++ b/studio/backend/tests/test_openai_codex_subscription.py
@@ -1152,6 +1152,57 @@ def test_permanent_refresh_rejection_sets_only_sanitized_reconnect_marker(monkey
assert "secret-refresh" not in str(error.value)
+ "status, body, permanent",
+ [
+ (401, {"error": {"code": "refresh_token_reused"}}, True),
+ (400, {"error": {"code": "refresh_token_reused"}}, True),
+ (401, {"error": {"code": "refresh_token_invalidated"}}, True),
+ (401, {"error": {"message": "unknown"}}, True),
+ (400, {"code": "refresh_token_reused"}, True),
+ (400, {"error": "REFRESH_TOKEN_INVALIDATED"}, True),
+ (400, {"error": {"code": "server_error"}}, False),
+ (503, {"error": {"code": "server_error"}}, False),
+ ],
+)
+def test_refresh_rejections_the_codex_cli_treats_as_permanent_ask_to_reconnect(
+ monkeypatch, status, body, permanent
+):
+ bundle = {
+ "access_token": "secret-access",
+ "refresh_token": "secret-refresh",
+ "expires_at": time.time() - 10,
+ "account_id": "secret-account",
+ }
+ saved = []
+
+ class Lock:
+ def acquire(self):
+ return None
+
+ def release(self):
+ return None
+
+ real_client = httpx.AsyncClient
+ transport = httpx.MockTransport(lambda _request: httpx.Response(status, json = body))
+ monkeypatch.setattr(
+ codex_auth.httpx,
+ "AsyncClient",
+ lambda **kwargs: real_client(transport = transport, **kwargs),
+ )
+ monkeypatch.setattr(codex_auth, "load_oauth_bundle", lambda _provider: bundle.copy())
+ monkeypatch.setattr(
+ codex_auth, "save_oauth_bundle", lambda _provider, value: saved.append(value)
+ )
+ monkeypatch.setattr(codex_auth, "FileLock", lambda *_args, **_kwargs: Lock())
+ codex_auth._refresh_locks.clear()
+
+ with pytest.raises(codex_auth.CodexAuthError) as error:
+ asyncio.run(codex_auth.resolve_access("provider"))
+ assert isinstance(error.value, codex_auth.CodexReauthorizationRequired) is permanent
+ assert bool(saved and saved[-1].get("reauthorization_required")) is permanent
+
+
def test_stale_unauthorized_response_does_not_poison_reconnected_bundle(monkeypatch):
bundle = {
"access_token": "new-access",