From 8ede4afd5e35a6a3983768f428f168b4a2ef0141 Mon Sep 17 00:00:00 2001 From: Ahmed Ibrahim Date: Mon, 4 May 2026 01:30:58 +0300 Subject: [PATCH] codex: fix CI failure on PR #20822 --- codex-rs/app-server/src/codex_message_processor.rs | 12 +++++++++--- codex-rs/core/tests/suite/agent_websocket.rs | 1 - codex-rs/core/tests/suite/model_switching.rs | 1 - 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/codex-rs/app-server/src/codex_message_processor.rs b/codex-rs/app-server/src/codex_message_processor.rs index 52b72b3a7e..5f129c3a5c 100644 --- a/codex-rs/app-server/src/codex_message_processor.rs +++ b/codex-rs/app-server/src/codex_message_processor.rs @@ -8665,9 +8665,13 @@ fn collect_resume_override_mismatches( if let Some(requested_service_tier) = request.service_tier.as_ref() && requested_service_tier != &config_snapshot.service_tier { + let requested_service_tier = requested_service_tier.as_ref().map(ToString::to_string); + let active_service_tier = config_snapshot + .service_tier + .as_ref() + .map(ToString::to_string); mismatch_details.push(format!( - "service_tier requested={requested_service_tier:?} active={:?}", - config_snapshot.service_tier + "service_tier requested={requested_service_tier:?} active={active_service_tier:?}" )); } if let Some(requested_cwd) = request.cwd.as_deref() { @@ -10562,7 +10566,9 @@ mod tests { assert_eq!( collect_resume_override_mismatches(&request, &config_snapshot), - vec!["service_tier requested=Some(Fast) active=Some(Flex)".to_string()] + vec![format!( + "service_tier requested=Some(\"{SERVICE_TIER_PRIORITY}\") active=Some(\"{SERVICE_TIER_FLEX}\")" + )] ); } diff --git a/codex-rs/core/tests/suite/agent_websocket.rs b/codex-rs/core/tests/suite/agent_websocket.rs index bf745a2dd7..22c79af69c 100644 --- a/codex-rs/core/tests/suite/agent_websocket.rs +++ b/codex-rs/core/tests/suite/agent_websocket.rs @@ -1,7 +1,6 @@ use anyhow::Result; use codex_features::Feature; use codex_protocol::config_types::SERVICE_TIER_PRIORITY; -use codex_protocol::config_types::ServiceTier; use core_test_support::responses::WebSocketConnectionConfig; use core_test_support::responses::ev_assistant_message; use core_test_support::responses::ev_completed; diff --git a/codex-rs/core/tests/suite/model_switching.rs b/codex-rs/core/tests/suite/model_switching.rs index a28d7fb4b0..d2b966086e 100644 --- a/codex-rs/core/tests/suite/model_switching.rs +++ b/codex-rs/core/tests/suite/model_switching.rs @@ -6,7 +6,6 @@ use codex_models_manager::manager::RefreshStrategy; use codex_protocol::config_types::ReasoningSummary; use codex_protocol::config_types::SERVICE_TIER_FLEX; use codex_protocol::config_types::SERVICE_TIER_PRIORITY; -use codex_protocol::config_types::ServiceTier; use codex_protocol::models::PermissionProfile; use codex_protocol::openai_models::ConfigShellToolType; use codex_protocol::openai_models::InputModality;