Use Claude Code with your ChatGPT, Kimi, Cursor or Grok subscription via a local Anthropic-compatible proxy
Rust
harden live Codex retry state
Raine Virtae9b7724a4620
diff --git a/src/providers/codex/client.rs b/src/providers/codex/client.rsindex 544e304..832433d 100644--- a/src/providers/codex/client.rs+++ b/src/providers/codex/client.rs@@ -600,11 +600,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;@@ -668,7 +670,6 @@ 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.rsindex 132f12a..ac0504d 100644--- a/src/providers/codex/mod.rs+++ b/src/providers/codex/mod.rs@@ -296,8 +296,7 @@ fn count_sse_events(bytes: &[u8]) -> u64 {enum LiveStreamStart {Response(Response),Retry {- message: String,- retry_after: Option<String>,+ error: client::CodexError,full_context: bool,},}@@ -357,8 +356,7 @@ async fn live_stream_response({LiveStreamStart::Response(response) => return response,LiveStreamStart::Retry {- message,- retry_after,+ error,full_context,} => {if full_context && drop_live_continuation_for_retry(&mut continuation, &ctx) {@@ -367,12 +365,12 @@ async fn live_stream_response(}if attempt >= MAX_RETRYABLE_LIVE_STREAM_RETRIES {clear_continuation(ctx.session_id.as_deref());- return json_error(StatusCode::BAD_GATEWAY, "api_error", message);+ return map_codex_error_to_response(&error);}- let delay = compute_backoff_delay(attempt, retry_after.as_deref());+ let delay = compute_backoff_delay(attempt, error.retry_after.as_deref());if delay.exceeds_budget {clear_continuation(ctx.session_id.as_deref());- return json_error(StatusCode::BAD_GATEWAY, "api_error", message);+ return map_codex_error_to_response(&error);}attempt += 1;sleep(delay.wait_ms).await;@@ -398,8 +396,7 @@ async fn live_stream_response_once(if retryable_live_start_codex_error(&err) {let full_context = retry_with_full_context_for_live_error(&err);return LiveStreamStart::Retry {- message: codex_error_message(&err).to_string(),- retry_after: err.retry_after,+ error: err,full_context,};}@@ -413,9 +410,25 @@ async fn live_stream_response_once(Ok(result) => result,Err(message) => {if retryable_live_start_payload(&payload, &message) {+ let status = websocket::event_error_status(&payload).unwrap_or_else(|| {+ if payload.get("type").and_then(|value| value.as_str())+ == Some("codex.rate_limits")+ {+ 429+ } else if message.to_ascii_lowercase().contains("overloaded") {+ 529+ } else {+ 503+ }+ });return LiveStreamStart::Retry {- message,- retry_after: retry_after_from_live_payload(&payload),+ error: client::CodexError {+ status,+ message,+ detail: None,+ retry_after: retry_after_from_live_payload(&payload),+ origin: client::CodexErrorOrigin::WebSocket,+ },full_context: false,};}@@ -457,8 +470,13 @@ async fn live_stream_response_once(}LiveStreamStart::Retry {- message: "WebSocket connection closed before terminal Codex response event".to_string(),- retry_after: None,+ error: client::CodexError {+ status: 0,+ message: "WebSocket connection closed before terminal Codex response event".to_string(),+ detail: Some(websocket::WEBSOCKET_MISSING_TERMINAL_DETAIL.to_string()),+ retry_after: None,+ origin: client::CodexErrorOrigin::WebSocket,+ },full_context: true,}}diff --git a/src/providers/codex/websocket.rs b/src/providers/codex/websocket.rsindex e36099f..74bafc7 100644--- a/src/providers/codex/websocket.rs+++ b/src/providers/codex/websocket.rs@@ -233,10 +233,17 @@ fn is_previous_response_missing(payload: &serde_json::Value) -> bool {}pub(super) fn event_error_status(payload: &serde_json::Value) -> Option<u16> {+ if !matches!(+ payload.get("type").and_then(|value| value.as_str()),+ Some("error" | "response.error" | "response.failed")+ ) {+ return None;+ }+payload.get("status")- .or_else(|| payload.get("status_code")).and_then(|value| value.as_u64())+ .or_else(|| payload.get("status_code").and_then(|value| value.as_u64())).or_else(|| {payload.get("error")@@ -1123,6 +1130,32 @@ fn summarize_json_request_size(body: &serde_json::Value, body_json: &str) -> sermod tests {use super::*;+ #[test]+ fn event_error_status_requires_error_event_and_checks_numeric_fallbacks() {+ assert_eq!(+ event_error_status(&serde_json::json!({+ "type": "response.failed",+ "status": "failed",+ "status_code": 401+ })),+ Some(401)+ );+ assert_eq!(+ event_error_status(&serde_json::json!({+ "type": "response.completed",+ "status_code": 401+ })),+ None+ );+ assert_eq!(+ event_error_status(&serde_json::json!({+ "type": "error",+ "error": {"status": 401}+ })),+ Some(401)+ );+ }+#[test]fn websocket_url_conversion() {assert_eq!(