From 4f52c90e10b3c8f6586616fb7189b75106c27e71 Mon Sep 17 00:00:00 2001
From: Sayan Sisodiya <sayan@openai.com>
Date: Mon, 23 Feb 2026 14:30:42 -0800
Subject: [PATCH] ignore PRESETS models when custom model_catalog_json
 specified

this prevents duplication/extra models from showing up in available models when the user explicitly overrides built in models list with a custom one
---
 codex-rs/core/src/models_manager/manager.rs | 37 +++++++++++++++++++--
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/codex-rs/core/src/models_manager/manager.rs b/codex-rs/core/src/models_manager/manager.rs
index 080532714e..1eb238b4db 100644
--- a/codex-rs/core/src/models_manager/manager.rs
+++ b/codex-rs/core/src/models_manager/manager.rs
@@ -314,8 +314,12 @@ impl ModelsManager {
         remote_models.sort_by(|a, b| a.priority.cmp(&b.priority));
 
         let remote_presets: Vec<ModelPreset> = remote_models.into_iter().map(Into::into).collect();
-        let existing_presets = self.local_models.clone();
-        let mut merged_presets = ModelPreset::merge(remote_presets, existing_presets);
+        let mut merged_presets = if self.has_custom_model_catalog {
+            remote_presets
+        } else {
+            let existing_presets = self.local_models.clone();
+            ModelPreset::merge(remote_presets, existing_presets)
+        };
         let chatgpt_mode = matches!(self.auth_manager.auth_mode(), Some(AuthMode::Chatgpt));
         merged_presets = ModelPreset::filter_by_auth(merged_presets, chatgpt_mode);
 
@@ -881,6 +885,35 @@ mod tests {
         assert_eq!(available, vec![expected_hidden, expected_visible]);
     }
 
+    #[tokio::test]
+    async fn custom_catalog_listing_does_not_append_builtin_presets() {
+        let codex_home = tempdir().expect("temp dir");
+        let auth_manager =
+            AuthManager::from_auth_for_testing(CodexAuth::from_api_key("Test API Key"));
+        let manager = ModelsManager::new(
+            codex_home.path().to_path_buf(),
+            auth_manager,
+            Some(ModelsResponse {
+                models: vec![remote_model("oca/gpt-5.2-codex", "Prefixed", 0)],
+            }),
+        );
+
+        let available = manager.list_models(RefreshStrategy::Offline).await;
+
+        assert!(
+            available
+                .iter()
+                .any(|preset| preset.model == "oca/gpt-5.2-codex"),
+            "expected custom catalog model in list"
+        );
+        assert!(
+            !available
+                .iter()
+                .any(|preset| preset.model == "gpt-5.2-codex"),
+            "expected built-in preset to be omitted when custom catalog is provided"
+        );
+    }
+
     #[test]
     fn bundled_models_json_roundtrips() {
         let file_contents = include_str!("../../models.json");