From 649ce520c435d39e745d0222facdd60939c71f67 Mon Sep 17 00:00:00 2001 From: Thibault Sottiaux Date: Thu, 6 Nov 2025 08:32:57 -0800 Subject: [PATCH] chore: rename for clarity (#6319) Co-authored-by: Ahmed Ibrahim --- codex-rs/common/src/model_presets.rs | 12 ++++++------ codex-rs/tui/src/chatwidget.rs | 2 +- ...idget__tests__rate_limit_switch_prompt_popup.snap | 7 ++++--- codex-rs/tui/src/chatwidget/tests.rs | 8 ++++++++ 4 files changed, 19 insertions(+), 10 deletions(-) diff --git a/codex-rs/common/src/model_presets.rs b/codex-rs/common/src/model_presets.rs index 5337f68b7..b011fe9b6 100644 --- a/codex-rs/common/src/model_presets.rs +++ b/codex-rs/common/src/model_presets.rs @@ -53,10 +53,10 @@ const PRESETS: &[ModelPreset] = &[ is_default: true, }, ModelPreset { - id: "desertfox", - model: "desertfox", - display_name: "desertfox", - description: "???", + id: "gpt-5-codex-mini", + model: "gpt-5-codex-mini", + display_name: "gpt-5-codex-mini", + description: "Optimized for codex. Cheaper, faster, and less capable.", default_reasoning_effort: ReasoningEffort::Medium, supported_reasoning_efforts: &[ ReasoningEffortPreset { @@ -99,10 +99,10 @@ const PRESETS: &[ModelPreset] = &[ ]; pub fn builtin_model_presets(auth_mode: Option) -> Vec { - let allow_desertfox = matches!(auth_mode, Some(AuthMode::ChatGPT)); + let allow_codex_mini = matches!(auth_mode, Some(AuthMode::ChatGPT)); PRESETS .iter() - .filter(|preset| allow_desertfox || preset.id != "desertfox") + .filter(|preset| allow_codex_mini || preset.id != "gpt-5-codex-mini") .copied() .collect() } diff --git a/codex-rs/tui/src/chatwidget.rs b/codex-rs/tui/src/chatwidget.rs index f852ae9f2..304adc754 100644 --- a/codex-rs/tui/src/chatwidget.rs +++ b/codex-rs/tui/src/chatwidget.rs @@ -132,7 +132,7 @@ struct RunningCommand { } const RATE_LIMIT_WARNING_THRESHOLDS: [f64; 3] = [75.0, 90.0, 95.0]; -const NUDGE_MODEL_SLUG: &str = "gpt-5-codex"; +const NUDGE_MODEL_SLUG: &str = "gpt-5-codex-mini"; const RATE_LIMIT_SWITCH_PROMPT_THRESHOLD: f64 = 90.0; #[derive(Default)] diff --git a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__rate_limit_switch_prompt_popup.snap b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__rate_limit_switch_prompt_popup.snap index 32fb3a7f3..c4495fe9d 100644 --- a/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__rate_limit_switch_prompt_popup.snap +++ b/codex-rs/tui/src/chatwidget/snapshots/codex_tui__chatwidget__tests__rate_limit_switch_prompt_popup.snap @@ -1,12 +1,13 @@ --- source: tui/src/chatwidget/tests.rs -assertion_line: 474 +assertion_line: 480 expression: popup --- Approaching rate limits - You've used over 90% of your limit. Switch to gpt-5-codex for lower credit u + You've used over 90% of your limit. Switch to gpt-5-codex-mini for lower cre -› 1. Switch to gpt-5-codex Optimized for codex. +› 1. Switch to gpt-5-codex-mini Optimized for codex. Cheaper, faster, and + less capable. 2. Keep current model Press enter to confirm or esc to go back diff --git a/codex-rs/tui/src/chatwidget/tests.rs b/codex-rs/tui/src/chatwidget/tests.rs index 22cc1e925..e035ce3be 100644 --- a/codex-rs/tui/src/chatwidget/tests.rs +++ b/codex-rs/tui/src/chatwidget/tests.rs @@ -411,6 +411,8 @@ fn test_rate_limit_warnings_monthly() { #[test] fn rate_limit_switch_prompt_skips_when_on_lower_cost_model() { let (mut chat, _, _) = make_chatwidget_manual(); + chat.auth_manager = + AuthManager::from_auth_for_testing(CodexAuth::create_dummy_chatgpt_auth_for_testing()); chat.config.model = NUDGE_MODEL_SLUG.to_string(); chat.on_rate_limit_snapshot(Some(snapshot(95.0))); @@ -423,8 +425,10 @@ fn rate_limit_switch_prompt_skips_when_on_lower_cost_model() { #[test] fn rate_limit_switch_prompt_shows_once_per_session() { + let auth = CodexAuth::create_dummy_chatgpt_auth_for_testing(); let (mut chat, _, _) = make_chatwidget_manual(); chat.config.model = "gpt-5".to_string(); + chat.auth_manager = AuthManager::from_auth_for_testing(auth); chat.on_rate_limit_snapshot(Some(snapshot(90.0))); assert!( @@ -446,8 +450,10 @@ fn rate_limit_switch_prompt_shows_once_per_session() { #[test] fn rate_limit_switch_prompt_defers_until_task_complete() { + let auth = CodexAuth::create_dummy_chatgpt_auth_for_testing(); let (mut chat, _, _) = make_chatwidget_manual(); chat.config.model = "gpt-5".to_string(); + chat.auth_manager = AuthManager::from_auth_for_testing(auth); chat.bottom_pane.set_task_running(true); chat.on_rate_limit_snapshot(Some(snapshot(90.0))); @@ -467,6 +473,8 @@ fn rate_limit_switch_prompt_defers_until_task_complete() { #[test] fn rate_limit_switch_prompt_popup_snapshot() { let (mut chat, _rx, _op_rx) = make_chatwidget_manual(); + chat.auth_manager = + AuthManager::from_auth_for_testing(CodexAuth::create_dummy_chatgpt_auth_for_testing()); chat.config.model = "gpt-5".to_string(); chat.on_rate_limit_snapshot(Some(snapshot(92.0)));