fixing merge

codex-rs/core/src/codex.rs

@@ -628,7 +628,6 @@ async fn submission_loop(
                     }
                 };
 
-                // Create a session-specific Config that only overrides the model.
                 let client_config = {
                     let mut c = (*config).clone();
                     c.model = model.clone();
@@ -636,7 +635,7 @@ async fn submission_loop(
                 };
 
                 let client = ModelClient::new(
-                    config.clone(),
+                    client_config,
                     auth.clone(),
                     provider.clone(),
                     model_reasoning_effort,

codex-rs/core/src/lib.rs

@@ -32,7 +32,7 @@ pub use model_provider_info::ModelProviderInfo;
 pub use model_provider_info::WireApi;
 pub use model_provider_info::built_in_model_providers;
 mod models;
-mod openai_model_info;
+pub mod openai_model_info;
 mod openai_tools;
 pub mod plan_tool;
 mod project_doc;

codex-rs/tui/src/chatwidget.rs

@@ -6,6 +6,7 @@ use codex_core::codex_wrapper::CodexConversation;
 use codex_core::codex_wrapper::init_codex;
 use codex_core::config::Config;
 use codex_core::config::ConfigToml;
+use codex_core::openai_model_info::get_all_model_names;
 use codex_core::protocol::AgentMessageDeltaEvent;
 use codex_core::protocol::AgentMessageEvent;
 use codex_core::protocol::AgentReasoningDeltaEvent;
@@ -489,7 +490,7 @@ impl ChatWidget<'_> {
     pub(crate) fn show_model_selector(&mut self) {
         let current = self.config.model.clone();
 
-        let mut options = codex_core::openai_model_info::get_all_model_names()
+        let mut options = get_all_model_names()
             .into_iter()
             .map(|s| s.to_string())
             .collect::<Vec<_>>();