From d9812a1081641a804458dce60adb305299208d85 Mon Sep 17 00:00:00 2001 From: jif-oai Date: Wed, 19 Nov 2025 18:57:20 +0000 Subject: [PATCH] fixes --- codex-rs/app-server/src/models.rs | 8 +++++--- codex-rs/common/src/model_presets.rs | 20 ++++++++++++++++++++ 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/codex-rs/app-server/src/models.rs b/codex-rs/app-server/src/models.rs index d03795c2d4..a58bfe284d 100644 --- a/codex-rs/app-server/src/models.rs +++ b/codex-rs/app-server/src/models.rs @@ -4,15 +4,17 @@ use codex_app_server_protocol::ReasoningEffortOption; use codex_common::model_presets::ModelPreset; use codex_common::model_presets::ReasoningEffortPreset; use codex_common::model_presets::builtin_model_presets; +use codex_common::model_presets::default_model_id_for_auth; pub fn supported_models(auth_mode: Option) -> Vec { + let default_model_id = default_model_id_for_auth(auth_mode); builtin_model_presets(auth_mode) .into_iter() - .map(model_from_preset) + .map(|preset| model_from_preset(preset, default_model_id)) .collect() } -fn model_from_preset(preset: ModelPreset) -> Model { +fn model_from_preset(preset: ModelPreset, default_model_id: &str) -> Model { Model { id: preset.id.to_string(), model: preset.model.to_string(), @@ -22,7 +24,7 @@ fn model_from_preset(preset: ModelPreset) -> Model { preset.supported_reasoning_efforts, ), default_reasoning_effort: preset.default_reasoning_effort, - is_default: preset.is_default, + is_default: preset.id == default_model_id, } } diff --git a/codex-rs/common/src/model_presets.rs b/codex-rs/common/src/model_presets.rs index a031f23b1d..8326f976dd 100644 --- a/codex-rs/common/src/model_presets.rs +++ b/codex-rs/common/src/model_presets.rs @@ -256,6 +256,13 @@ pub fn builtin_model_presets(auth_mode: Option) -> Vec { .collect() } +pub fn default_model_id_for_auth(auth_mode: Option) -> &'static str { + match auth_mode { + Some(AuthMode::ApiKey) => "gpt-5.1-codex", + _ => "gpt-5.1-codex-max", + } +} + pub fn all_model_presets() -> &'static Vec { &PRESETS } @@ -280,4 +287,17 @@ mod tests { .all(|preset| preset.id != "gpt-5.1-codex-max") ); } + + #[test] + fn default_model_depends_on_auth_mode() { + assert_eq!( + default_model_id_for_auth(Some(AuthMode::ChatGPT)), + "gpt-5.1-codex-max" + ); + assert_eq!( + default_model_id_for_auth(Some(AuthMode::ApiKey)), + "gpt-5.1-codex" + ); + assert_eq!(default_model_id_for_auth(None), "gpt-5.1-codex-max"); + } }