Skip to content

Use Claude Code with your ChatGPT, Kimi, Cursor or Grok subscription via a local Anthropic-compatible proxy

Rust

close live Codex retry safety gaps

Raine Virta95b60e13f224
diff --git a/src/providers/codex/client.rs b/src/providers/codex/client.rs
index 832433d..9840481 100644
--- a/src/providers/codex/client.rs
+++ b/src/providers/codex/client.rs
@@ -654,11 +654,13 @@ impl CodexHttpClient {
super::websocket::invalidate_codex_websocket_pool_key(key);
}
let refresh = self.auth_manager.force_refresh(&auth.access);
- auth = match tokio::select! {
- _ = tx.closed() => return,
- result = refresh => result,
- } {
- Ok(auth) => auth,
+ auth = match refresh.await {
+ Ok(auth) => {
+ if tx.is_closed() {
+ return;
+ }
+ auth
+ }
Err(refresh_err) => {
let _ = tx.send(Err(auth_refresh_error(refresh_err))).await;
return;
@@ -670,6 +672,7 @@ impl CodexHttpClient {
if let Err(err) = &item
&& continuation_retry_available
&& is_continuation_retry_error(err)
+ && !forwarded_any
{
continuation_retry_available = false;
super::continuation::clear_continuation(ctx.session_id.as_deref());
diff --git a/src/providers/codex/mod.rs b/src/providers/codex/mod.rs
index ac0504d..34240aa 100644
--- a/src/providers/codex/mod.rs
+++ b/src/providers/codex/mod.rs
@@ -410,12 +410,23 @@ async fn live_stream_response_once(
Ok(result) => result,
Err(message) => {
if retryable_live_start_payload(&payload, &message) {
+ let lower_message = message.to_ascii_lowercase();
let status = websocket::event_error_status(&payload).unwrap_or_else(|| {
+ let error = payload.get("error").or_else(|| {
+ payload.get("response").and_then(|value| value.get("error"))
+ });
+ let overloaded = error.is_some_and(|error| {
+ error.get("code").and_then(|value| value.as_str())
+ == Some("overloaded_error")
+ || error.get("type").and_then(|value| value.as_str())
+ == Some("overloaded_error")
+ });
if payload.get("type").and_then(|value| value.as_str())
== Some("codex.rate_limits")
+ || lower_message.contains("rate limit")
{
429
- } else if message.to_ascii_lowercase().contains("overloaded") {
+ } else if overloaded || lower_message.contains("overloaded") {
529
} else {
503
@@ -424,8 +435,8 @@ async fn live_stream_response_once(
return LiveStreamStart::Retry {
error: client::CodexError {
status,
- message,
- detail: None,
+ message: message.clone(),
+ detail: Some(message),
retry_after: retry_after_from_live_payload(&payload),
origin: client::CodexErrorOrigin::WebSocket,
},