Use Claude Code with your ChatGPT, Kimi, Cursor or Grok subscription via a local Anthropic-compatible proxy
Rust
disambiguate quota windows and compaction failures
Raine Virtad5b7190e1579
diff --git a/src/providers/codex/events.rs b/src/providers/codex/events.rsindex 0c28755..b19bcec 100644--- a/src/providers/codex/events.rs+++ b/src/providers/codex/events.rs@@ -332,7 +332,7 @@ fn usage_limit_from_payload(payload: &Value) -> Option<CodexUsageLimit> {let resets_at = numeric_value(error.get("resets_at"));let resets_in_seconds = numeric_value(error.get("resets_in_seconds"));- let limiting_prefix = limiting_window_prefix(payload, resets_in_seconds);+ let limiting_prefix = limiting_window_prefix(payload, resets_in_seconds, resets_at);let resets_at = resets_at.or_else(|| {let prefix = limiting_prefix?;header_number(payload, &format!("X-Codex-{prefix}-Reset-At"))@@ -357,24 +357,68 @@ fn usage_limit_from_payload(payload: &Value) -> Option<CodexUsageLimit> {}/// Codex sends the clock for both windows on every limit error, so the one that-/// actually ran out is the one whose countdown matches the error's own.-fn limiting_window_prefix(payload: &Value, resets_in_seconds: Option<u64>) -> Option<&'static str> {- let primary = header_number(payload, "X-Codex-Primary-Reset-After-Seconds");- let secondary = header_number(payload, "X-Codex-Secondary-Reset-After-Seconds");- match (resets_in_seconds, primary, secondary) {- (Some(actual), Some(primary), Some(secondary)) => {- Some(if actual.abs_diff(secondary) < actual.abs_diff(primary) {- "Secondary"- } else {- "Primary"- })+/// actually ran out is the one whose countdown or reset epoch matches the+/// error's own clock.+fn limiting_window_prefix(+ payload: &Value,+ resets_in_seconds: Option<u64>,+ resets_at: Option<u64>,+) -> Option<&'static str> {+ let by_countdown = resets_in_seconds.and_then(|actual| {+ closest_window(+ actual,+ header_number(payload, "X-Codex-Primary-Reset-After-Seconds"),+ header_number(payload, "X-Codex-Secondary-Reset-After-Seconds"),+ )+ });+ let by_epoch = resets_at.and_then(|actual| {+ closest_window(+ actual,+ header_number(payload, "X-Codex-Primary-Reset-At"),+ header_number(payload, "X-Codex-Secondary-Reset-At"),+ )+ });+ by_countdown.or(by_epoch).or_else(|| {+ match (+ window_headers_present(payload, "Primary"),+ window_headers_present(payload, "Secondary"),+ ) {+ (true, false) => Some("Primary"),+ (false, true) => Some("Secondary"),+ _ => None,}- (_, Some(_), _) => Some("Primary"),- (_, None, Some(_)) => Some("Secondary"),- _ => None,+ })+}++fn closest_window(+ actual: u64,+ primary: Option<u64>,+ secondary: Option<u64>,+) -> Option<&'static str> {+ match (primary, secondary) {+ (Some(primary), Some(secondary)) => {+ match (actual.abs_diff(primary), actual.abs_diff(secondary)) {+ (primary_distance, secondary_distance) if primary_distance < secondary_distance => {+ Some("Primary")+ }+ (primary_distance, secondary_distance) if secondary_distance < primary_distance => {+ Some("Secondary")+ }+ _ => None,+ }+ }+ (Some(_), None) => Some("Primary"),+ (None, Some(_)) => Some("Secondary"),+ (None, None) => None,}}+fn window_headers_present(payload: &Value, prefix: &str) -> bool {+ ["Reset-After-Seconds", "Reset-At", "Window-Minutes"]+ .into_iter()+ .any(|suffix| header_number(payload, &format!("X-Codex-{prefix}-{suffix}")).is_some())+}+fn attach_response_headers(payload: &mut Value, headers: &[(String, String)]) {let Some(payload) = payload.as_object_mut() else {return;@@ -537,6 +581,50 @@ mod tests {assert_eq!(limit.resets_at, Some(1788879438));}+ #[test]+ fn attributes_window_by_body_epoch_when_countdown_is_missing() {+ let mut payload = spent_five_hour_window();+ payload["error"]+ .as_object_mut()+ .unwrap()+ .remove("resets_in_seconds");+ payload["error"]["resets_at"] = serde_json::json!(1789466238u64);+ let limit = usage_limit_from_event(&payload).expect("usage limit");+ assert_eq!(limit.resets_at, Some(1789466238));+ assert_eq!(limit.window, Some(CodexLimitWindow::SevenDay));+ }++ #[test]+ fn preserves_ambiguous_body_epoch_without_claim() {+ let mut payload = spent_five_hour_window();+ payload["error"]+ .as_object_mut()+ .unwrap()+ .remove("resets_in_seconds");+ payload["error"]["resets_at"] = serde_json::json!(150u64);+ payload["headers"]["X-Codex-Primary-Reset-At"] = serde_json::json!(100u64);+ payload["headers"]["X-Codex-Secondary-Reset-At"] = serde_json::json!(200u64);+ let limit = usage_limit_from_event(&payload).expect("usage limit");+ assert_eq!(limit.resets_at, Some(150));+ assert_eq!(limit.window, None);+ }++ #[test]+ fn omits_header_reset_and_claim_without_identifying_body_clock() {+ let mut payload = spent_five_hour_window();+ payload["error"]+ .as_object_mut()+ .unwrap()+ .remove("resets_at");+ payload["error"]+ .as_object_mut()+ .unwrap()+ .remove("resets_in_seconds");+ let limit = usage_limit_from_event(&payload).expect("usage limit");+ assert_eq!(limit.resets_at, None);+ assert_eq!(limit.window, None);+ }+#[test]fn ignores_errors_that_are_not_usage_limits() {assert!(diff --git a/src/providers/codex/mod.rs b/src/providers/codex/mod.rsindex ccaadc5..85154b6 100644--- a/src/providers/codex/mod.rs+++ b/src/providers/codex/mod.rs@@ -39,8 +39,8 @@ use self::auth::manager::CodexAuthManager;use self::auth::token_store::file_store;use self::client::CodexHttpClient;use self::compaction::{- CompactionAttempt, abort_compaction_attempt, activate_compaction, apply_compaction_replay,- begin_compaction, request_compaction, store_compaction,+ CompactionAttempt, CompactionError, abort_compaction_attempt, activate_compaction,+ apply_compaction_replay, begin_compaction, request_compaction, store_compaction,};use self::continuation::{ContinuationReservation, abort_continuation_for_owner, continuation_candidate_for_owner,@@ -257,6 +257,16 @@ impl CodexProvider {);}}+ Err(CompactionError::Upstream(error)) if error.usage_limit.is_some() => {+ abort_compaction_attempt(Some(session_id), Some(attempt));+ log_compaction_event(+ "server_compaction_failed",+ &ctx,+ translated.input.len(),+ Some(&error.to_string()),+ );+ return map_codex_error_to_response(&error);+ }Err(error) => {abort_compaction_attempt(Some(session_id), Some(attempt));log_compaction_event(diff --git a/tests/smoke_cutover.rs b/tests/smoke_cutover.rsindex a07f970..a80c9b3 100644--- a/tests/smoke_cutover.rs+++ b/tests/smoke_cutover.rs@@ -1523,6 +1523,54 @@ async fn smoke_auto_review_uses_codex_default_and_configured_override() {assert_eq!(sent[2]["model"], "gpt-5.6-sol");}+#[allow(clippy::await_holding_lock)]+#[tokio::test]+async fn smoke_codex_http_server_compaction_fast_fails_usage_limit() {+ let _guard = env_lock();+ clear_all_compactions_for_tests();+ let config = TempDir::new().unwrap();+ write_auth(config.path(), "codex");++ let attempts = Arc::new(AtomicUsize::new(0));+ let upstream = spawn_http_upstream({+ let attempts = attempts.clone();+ move |body: Value| {+ attempts.fetch_add(1, Ordering::SeqCst);+ assert_eq!(+ body["input"].as_array().unwrap().last().unwrap()["type"],+ "compaction_trigger"+ );+ codex_usage_limit_sse("usage_limit_reached")+ }+ })+ .await;++ let _config_env = EnvGuard::set("CCP_CONFIG_DIR", config.path());+ let _base_url_env = EnvGuard::set("CCP_CODEX_BASE_URL", &upstream);+ let _transport_env = EnvGuard::set("CCP_CODEX_TRANSPORT", "http");+ let _compaction_env = EnvGuard::set("CCP_CODEX_SERVER_COMPACTION", "1");+ let response = call_messages_body(json!({+ "model": "gpt-5.6-sol",+ "max_tokens": 64,+ "system": "You are Claude Code.",+ "messages": [+ {"role":"user","content":"old conversation"},+ {"role":"assistant","content":[+ {"type":"tool_use","id":"tool-1","name":"Read","input":{}}+ ]},+ {"role":"user","content":[+ {"type":"tool_result","tool_use_id":"tool-1","content":"result"},+ {"type":"text","text":"CRITICAL: Respond with TEXT ONLY. Do NOT call any tools.\n\nYour task is to create a detailed summary of the conversation so far, paying close attention to the user's explicit requests."}+ ]}+ ]+ }))+ .await;++ assert_eq!(attempts.load(Ordering::SeqCst), 1);+ assert_usage_limit_response(response).await;+ clear_all_compactions_for_tests();+}+#[allow(clippy::await_holding_lock)]#[tokio::test]async fn smoke_codex_http_server_compaction_replays_native_history() {