merge upstream/dev/codex/add-custom-models-support-in-config.toml-r2 into collab stack

2026-04-30 03:12:20 +03:00 · 2026-03-30 01:54:32 +00:00
parent 52c823d2a4 3c84d41945
commit fb462c3efb
28 changed files with 656 additions and 11 deletions
--- a/codex-rs/core/tests/suite/client.rs
+++ b/codex-rs/core/tests/suite/client.rs
@@ -825,6 +825,8 @@ async fn prefers_apikey_when_config_prefers_apikey_even_with_chatgpt_tokens() {
        &config,
        auth_manager,
        SessionSource::Exec,
+        config.model_catalog.clone(),
+        config.custom_models.clone(),
        CollaborationModesConfig {
            default_mode_request_user_input: config
                .features