fix(codex): decouple provider catalog from menu mapping

Root cause: the Codex provider form reused takeoverEnabled for both catalog/context editing and Codex /model menu projection, while backend live projection treated any modelCatalog as a model_catalog_json signal. Native Responses providers therefore could not fetch/save /models context unless the menu-mapping toggle was enabled, and saving a catalog risked unintentionally changing the Codex model menu.

Fix: add meta.codexLocalModelMapping as the independent projection flag, persist modelCatalog for non-official Codex providers regardless of that flag, and strip modelCatalog only when writing live Codex config with explicit mapping disabled. MultiRouter routes still force catalog projection, and old providers without the new flag retain legacy projection behavior.

UI: rename the ambiguous toggle to 'Show in Codex /model menu', rename local model routing to Codex multi-model routing, keep the catalog/context editor visible when menu mapping is off, and highlight fetch/protocol probe actions.

Validation: pnpm vitest run tests/components/CodexFormFields.test.tsx tests/components/ProviderForm.codexPreset.test.tsx tests/config/codexChatProviderPresets.test.ts; pnpm typecheck; cargo test --manifest-path src-tauri\\Cargo.toml codex_model_catalog_projection --lib -- --nocapture; cargo test --manifest-path src-tauri\\Cargo.toml provider_meta_roundtrips_codex_local_model_mapping --lib -- --nocapture; cargo test --manifest-path src-tauri\\Cargo.toml codex_live_projection --lib -- --nocapture; cargo fmt --manifest-path src-tauri\\Cargo.toml --check; git diff --check

Author: BigStrongSun

memory.md

@@ -1,5 +1,12 @@
 # CC Switch Repository Memory
 
+## 2026-07-05 Codex Provider Catalog vs Menu Mapping Boundary
+
+- 用户反馈新版 Codex provider 配置里，只有打开“需要本地路由映射”才展开模型列表；但 Responses 原生 provider 也应该能获取 `/models`、保存模型目录和上下文窗口。根因是前端把 `takeoverEnabled` 同时当成“目录/上下文编辑开关”和“Codex /model 菜单映射开关”，后端旧语义又把 `modelCatalog` 的存在直接解释成要写 `model_catalog_json`。
+- 新不变量：`settingsConfig.modelCatalog` 是 cc-switch 的模型目录、上下文窗口、MultiRouter/子 Agent 候选元数据 SSOT；`meta.codexLocalModelMapping` 只控制单 provider 是否把该目录投射到 Codex `/model` 菜单和本地模型名映射。关闭菜单映射时仍要保存 catalog；开启 MultiRouter routes 时仍强制投射聚合 catalog。
+- UI 文案边界：把“需要本地路由映射”改成“在 Codex /model 菜单中显示”，把顶部“本地模型路由”改成“Codex 多模型路由”，明确前者是菜单显示/单 provider 模型名映射，后者是一个 provider 内按 `body.model` 分流到多上游。`获取模型列表` 和 `测试 Chat / Responses` 是配置主操作，不能被菜单映射开关隐藏。
+- 兼容边界：旧 provider 没有 `codexLocalModelMapping` 字段但已有 `modelCatalog` 时继续沿用旧行为投射，避免老用户升级后 `/model` 菜单消失；新 provider 显式保存 `false` 后，live 写入前会移除投射用的 `modelCatalog`，但 DB 里的目录元数据保持不变。
+
 ## 2026-07-05 MultiRouter Wizard Nested Provider Dialog Layering
 
 - 用户反馈 MultiRouter 配置向导里保存/新增 provider 时弹窗像没到最前或卡死。根因不是 provider 保存 API 卡住，而是向导内再打开新增 provider 后，新增面板内部的二级弹层仍按默认层级 portal 到 `document.body`：`CodexFormFields` 的混合协议拆分/route 编辑确认、`UniversalProviderFormModal`、`ConfirmDialog` 等可能被 `FullScreenPanel z-[140]` 或向导壳遮住。

src-tauri/src/provider.rs

@@ -539,6 +539,15 @@ pub struct ProviderMeta {
     /// Codex Responses -> Chat Completions reasoning capability metadata.
     #[serde(rename = "codexChatReasoning", skip_serializing_if = "Option::is_none")]
     pub codex_chat_reasoning: Option<CodexChatReasoningConfig>,
+    /// Codex 单供应商模型目录是否投射为 `/model` 菜单映射。
+    ///
+    /// `modelCatalog` 本身还承担模型目录、上下文窗口、多路路由候选等元数据职责；
+    /// 这个开关只控制是否写出 `model_catalog_json` 以及对应的本地模型名映射。
+    #[serde(
+        rename = "codexLocalModelMapping",
+        skip_serializing_if = "Option::is_none"
+    )]
+    pub codex_local_model_mapping: Option<bool>,
     /// Custom User-Agent for local proxy routing.
     #[serde(rename = "customUserAgent", skip_serializing_if = "Option::is_none")]
     pub custom_user_agent: Option<String>,
@@ -593,6 +602,19 @@ impl ProviderMeta {
         self.codex_fast_mode.unwrap_or(false)
     }
 
+    /// 是否把 Codex `modelCatalog` 投射到真实 `config.toml`/模型菜单。
+    ///
+    /// 旧数据没有 `codexLocalModelMapping` 字段，若已经存在 `modelCatalog` 则沿用旧行为继续投射；
+    /// 新数据显式保存 `false` 后，目录仍保留在 DB 里，但不会改写 Codex `/model` 菜单。
+    pub fn codex_model_catalog_projection_enabled(&self, settings_config: &Value) -> bool {
+        if codex_routing_has_enabled_routes(settings_config) {
+            return true;
+        }
+
+        self.codex_local_model_mapping
+            .unwrap_or_else(|| settings_config.get("modelCatalog").is_some())
+    }
+
     /// 经校验的 Provider 级自定义 User-Agent。见 [`parse_custom_user_agent`]。
     pub fn custom_user_agent_header(&self) -> Result<Option<HeaderValue>, InvalidHeaderValue> {
         parse_custom_user_agent(self.custom_user_agent.as_deref())
@@ -618,6 +640,26 @@ impl ProviderMeta {
     }
 }
 
+/// 判断 Codex provider 是否启用了多上游路由；多路由需要强制投射模型目录供 Codex 菜单和路由解析使用。
+fn codex_routing_has_enabled_routes(settings_config: &Value) -> bool {
+    let Some(routing) = settings_config.get("codexRouting") else {
+        return false;
+    };
+
+    if routing
+        .get("enabled")
+        .and_then(Value::as_bool)
+        .is_some_and(|enabled| !enabled)
+    {
+        return false;
+    }
+
+    routing
+        .get("routes")
+        .and_then(Value::as_array)
+        .is_some_and(|routes| !routes.is_empty())
+}
+
 impl ProviderManager {
     /// 获取所有供应商
     pub fn get_all_providers(&self) -> &IndexMap<String, Provider> {
@@ -1072,6 +1114,60 @@ mod tests {
         assert_eq!(overrides.body.unwrap()["temperature"], 0.2);
     }
 
+    #[test]
+    fn provider_meta_roundtrips_codex_local_model_mapping() {
+        let meta = ProviderMeta {
+            codex_local_model_mapping: Some(false),
+            ..ProviderMeta::default()
+        };
+
+        let value = serde_json::to_value(&meta).expect("serialize ProviderMeta");
+        assert_eq!(value["codexLocalModelMapping"], false);
+        assert!(value.get("codex_local_model_mapping").is_none());
+
+        let decoded: ProviderMeta =
+            serde_json::from_value(value).expect("deserialize ProviderMeta");
+        assert_eq!(decoded.codex_local_model_mapping, Some(false));
+    }
+
+    #[test]
+    fn codex_model_catalog_projection_respects_explicit_menu_mapping_flag() {
+        let settings = json!({
+            "modelCatalog": { "models": [{ "model": "gpt-5.5" }] }
+        });
+
+        let disabled = ProviderMeta {
+            codex_local_model_mapping: Some(false),
+            ..ProviderMeta::default()
+        };
+        assert!(
+            !disabled.codex_model_catalog_projection_enabled(&settings),
+            "explicit false means catalog metadata should not be projected into Codex /model"
+        );
+
+        let legacy = ProviderMeta::default();
+        assert!(
+            legacy.codex_model_catalog_projection_enabled(&settings),
+            "legacy providers without the new flag keep the old modelCatalog projection behavior"
+        );
+
+        let routed = json!({
+            "modelCatalog": { "models": [{ "model": "gpt-5.5" }] },
+            "codexRouting": {
+                "enabled": true,
+                "routes": [{
+                    "id": "relay",
+                    "match": { "models": ["gpt-5.5-relay"] },
+                    "upstream": { "apiFormat": "openai_responses" }
+                }]
+            }
+        });
+        assert!(
+            disabled.codex_model_catalog_projection_enabled(&routed),
+            "MultiRouter plans must still project the aggregate catalog even when the single-provider menu flag is false"
+        );
+    }
+
     #[test]
     fn provider_with_id_populates_defaults() {
         let settings_config = json!({

src-tauri/src/services/provider/live.rs

@@ -560,6 +560,25 @@ pub(crate) fn write_live_with_common_config(
     write_live_snapshot(app_type, &effective_provider)
 }
 
+/// 为 Codex live 写入构造配置：保留 DB 中的 `modelCatalog` 元数据，但只有菜单映射开启时才投射到 live。
+fn codex_settings_for_live_projection(provider: &Provider) -> Value {
+    let should_project = provider
+        .meta
+        .as_ref()
+        .map(|meta| meta.codex_model_catalog_projection_enabled(&provider.settings_config))
+        .unwrap_or_else(|| provider.settings_config.get("modelCatalog").is_some());
+
+    if should_project {
+        return provider.settings_config.clone();
+    }
+
+    let mut settings = provider.settings_config.clone();
+    if let Some(obj) = settings.as_object_mut() {
+        obj.remove("modelCatalog");
+    }
+    settings
+}
+
 /// 只刷新 Codex provider 的 live `config.toml`，不覆盖当前 `auth.json`。
 ///
 /// 接管态切回 official 时，`disable_takeover` 已经先把接管前的 live 登录态恢复到
@@ -572,14 +591,14 @@ pub(crate) fn write_codex_config_only_with_common_config(
     let mut effective_provider = provider.clone();
     effective_provider.settings_config =
         build_effective_settings_with_common_config(db, &AppType::Codex, provider)?;
-    let settings = effective_provider
-        .settings_config
+    let settings_for_live = codex_settings_for_live_projection(&effective_provider);
+    let settings = settings_for_live
         .as_object()
         .ok_or_else(|| AppError::Config("Codex 供应商配置必须是 JSON 对象".to_string()))?;
     let config_text = settings.get("config").and_then(|value| value.as_str());
 
     crate::codex_config::write_codex_provider_config_only_with_catalog(
-        &effective_provider.settings_config,
+        &settings_for_live,
         effective_provider.category.as_deref(),
         config_text,
     )
@@ -827,8 +846,8 @@ pub(crate) fn write_live_snapshot(app_type: &AppType, provider: &Provider) -> Re
             ));
         }
         AppType::Codex => {
-            let obj = provider
-                .settings_config
+            let settings_for_live = codex_settings_for_live_projection(provider);
+            let obj = settings_for_live
                 .as_object()
                 .ok_or_else(|| AppError::Config("Codex 供应商配置必须是 JSON 对象".to_string()))?;
             let auth = obj
@@ -837,7 +856,7 @@ pub(crate) fn write_live_snapshot(app_type: &AppType, provider: &Provider) -> Re
             let config_str = obj.get("config").and_then(|v| v.as_str());
 
             crate::codex_config::write_codex_provider_live_with_catalog(
-                &provider.settings_config,
+                &settings_for_live,
                 provider.category.as_deref(),
                 auth,
                 config_str,
@@ -1927,6 +1946,61 @@ web_search = true
         assert!(!applied_config.contains("[model_providers.router]"));
     }
 
+    #[test]
+    fn codex_live_projection_removes_catalog_when_menu_mapping_is_disabled() {
+        let mut provider = Provider::with_id(
+            "codex-native".to_string(),
+            "Native Responses".to_string(),
+            json!({
+                "auth": { "OPENAI_API_KEY": "sk-test" },
+                "config": "model_provider = \"native\"\n",
+                "modelCatalog": {
+                    "models": [{ "model": "gpt-5.5", "contextWindow": 272000 }]
+                }
+            }),
+            None,
+        );
+        provider.meta = Some(crate::provider::ProviderMeta {
+            codex_local_model_mapping: Some(false),
+            ..Default::default()
+        });
+
+        let projected = codex_settings_for_live_projection(&provider);
+
+        assert!(
+            projected.get("modelCatalog").is_none(),
+            "live projection must hide catalog when the Codex menu mapping flag is off"
+        );
+        assert!(
+            provider.settings_config.get("modelCatalog").is_some(),
+            "DB-side provider settings keep catalog metadata for /models and context windows"
+        );
+    }
+
+    #[test]
+    fn codex_live_projection_keeps_legacy_catalog_without_new_flag() {
+        let mut provider = Provider::with_id(
+            "codex-legacy".to_string(),
+            "Legacy Mapping".to_string(),
+            json!({
+                "auth": { "OPENAI_API_KEY": "sk-test" },
+                "config": "model_provider = \"legacy\"\n",
+                "modelCatalog": {
+                    "models": [{ "model": "deepseek-v4-flash" }]
+                }
+            }),
+            None,
+        );
+        provider.meta = Some(crate::provider::ProviderMeta::default());
+
+        let projected = codex_settings_for_live_projection(&provider);
+
+        assert!(
+            projected.get("modelCatalog").is_some(),
+            "old providers without codexLocalModelMapping must keep the previous catalog projection behavior"
+        );
+    }
+
     #[test]
     fn codex_common_config_provider_only_snippet_is_not_detected_or_removed() {
         let settings = json!({

src-tauri/src/services/provider/mod.rs

@@ -2751,7 +2751,7 @@ impl ProviderService {
             && Self::codex_provider_requires_local_proxy(_provider)
         {
             log::info!(
-                "Codex provider '{}' 需要本地路由映射，自动启用 Codex 接管并通过本地代理转换",
+                "Codex provider '{}' 需要 Chat 转换或多模型路由，自动启用 Codex 接管并通过本地代理处理",
                 id
             );
             block_on_tauri_runtime(