Remove unused changes from upstream main

Author: CSRessel

codex-rs/core/src/config/mod.rs

@@ -1061,17 +1061,10 @@ impl Config {
             model_providers.entry(key).or_insert(provider);
         }
 
-        // Determine model early so we can infer provider if needed
-        let model = model
-            .or(config_profile.model.clone())
-            .or(cfg.model.clone())
-            .unwrap_or_else(default_model);
-
         let model_provider_id = model_provider
             .or(config_profile.model_provider)
             .or(cfg.model_provider)
             .unwrap_or_else(|| "openai".to_string());
-
         let model_provider = model_providers
             .get(&model_provider_id)
             .ok_or_else(|| {
@@ -1105,7 +1098,11 @@ impl Config {
 
         let forced_login_method = cfg.forced_login_method;
 
-        // Model was already determined above for provider inference
+        let model = model
+            .or(config_profile.model)
+            .or(cfg.model)
+            .unwrap_or_else(default_model);
+
         let mut model_family =
             find_family_for_model(&model).unwrap_or_else(|| derive_default_model_family(&model));
 

codex-rs/core/src/model_family.rs

@@ -1,10 +1,10 @@
 use codex_protocol::config_types::ReasoningEffort;
 use codex_protocol::config_types::Verbosity;
 
+use crate::CLAUDE_ACP_PROVIDER_ID;
 use crate::GEMINI_ACP_PROVIDER_ID;
+use crate::MOCK_ACP_PROVIDER_ID;
 use crate::config::types::ReasoningSummaryFormat;
-use crate::model_provider_info::CLAUDE_ACP_PROVIDER_ID;
-use crate::model_provider_info::MOCK_ACP_PROVIDER_ID;
 use crate::tools::handlers::apply_patch::ApplyPatchToolType;
 use crate::tools::spec::ConfigShellToolType;
 

codex-rs/core/src/model_provider_info.rs

@@ -309,7 +309,6 @@ pub const DEFAULT_OLLAMA_PORT: u16 = 11434;
 
 pub const LMSTUDIO_OSS_PROVIDER_ID: &str = "lmstudio";
 pub const OLLAMA_OSS_PROVIDER_ID: &str = "ollama";
-pub const BUILT_IN_OSS_MODEL_PROVIDER_ID: &str = "oss";
 
 // ACP provider identifiers (used for model inference, not in built_in_model_providers)
 // Actual ACP provider configuration is embedded in AcpAgentConfig from codex_acp::registry