release: v1.0.9

Author: Maxwell

CHANGELOG.md

@@ -1,6 +1,13 @@
 # 更新日志
 
 
+## v1.0.9 (2026-07-10)
+
+### Bug 修复
+
+- 修复 Codex 合并到 ChatGPT.app 后，直连模式 config.toml 残留 `model = "provider:model"` 格式导致新版报 "Model provider not found" 的问题，切换直连时自动移除带 provider 前缀的 model 值
+- 修复直连模式历史对话切换时模型选择组件不稳定，以及带 provider 前缀的模型请求被错误转发到本地 helper 的问题
+
 ## v1.0.8 (2026-07-02)
 
 ### Bug 修复

Cargo.lock

@@ -8,7 +8,7 @@ members = [
 ]
 
 [workspace.package]
-version = "1.0.8"
+version = "1.0.9"
 edition = "2024"
 repository = "https://github.com/Jasoncasper/CodexMate"
 

Cargo.toml

@@ -1,6 +1,6 @@
 {
   "name": "codexmate-manager",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "private": true,
   "type": "module",
   "scripts": {

apps/codexmate-manager/package.json

@@ -382,6 +382,22 @@ fn sync_all_session_providers(home: &Path) -> codexmate_data::ProviderSyncResult
     codexmate_data::run_provider_sync(Some(home))
 }
 
+fn prepare_direct_mode_state(home: &Path) -> anyhow::Result<codexmate_data::ProviderSyncResult> {
+    let config_path = home.join("config.toml");
+    let existing = std::fs::read_to_string(&config_path).unwrap_or_default();
+    let mut doc = codexmate_core::relay_config::parse_toml_document(&existing)?;
+    codexmate_core::relay_config::set_openai_model_provider_for_direct_mode(&mut doc);
+    let content = codexmate_core::relay_config::ensure_trailing_newline(doc.to_string());
+    std::fs::create_dir_all(home)?;
+    std::fs::write(&config_path, content.as_bytes())?;
+
+    let sync = sync_all_session_providers(home);
+    if sync.status != codexmate_data::ProviderSyncStatus::Synced {
+        anyhow::bail!("{}", sync.message);
+    }
+    Ok(sync)
+}
+
 #[allow(dead_code)]
 fn strip_model_provider_from_toml(contents: &str) -> String {
     let Ok(mut doc) = codexmate_core::relay_config::parse_toml_document(contents) else {
@@ -823,6 +839,14 @@ pub fn get_codex_mode() -> CommandResult<Value> {
     let mode = std::fs::read_to_string(&config_path)
         .map(|contents| codex_mode_from_config(&contents))
         .unwrap_or("direct");
+    if mode == "direct" {
+        if let Err(error) = prepare_direct_mode_state(&home) {
+            return failed(
+                &format!("直连模式配置修复失败：{error}"),
+                json!({"mode": "direct"}),
+            );
+        }
+    }
     CommandResult {
         status: "ok".to_string(),
         message: format!(
@@ -914,10 +938,23 @@ pub fn restart_codex(mode: String, request: LaunchRequest) -> CommandResult<Valu
     codexmate_core::watcher::stop_codex_processes();
     codexmate_core::watcher::stop_launcher_processes();
     std::thread::sleep(std::time::Duration::from_millis(800));
+    let home = codexmate_core::relay_config::default_codex_home_dir();
 
     if mode == "direct" {
+        if let Err(error) = prepare_direct_mode_state(&home) {
+            return failed(
+                &format!("直连模式配置修复失败：{error}"),
+                json!({"mode": "direct"}),
+            );
+        }
         let app_path = if request.app_path.trim().is_empty() {
-            "/Applications/Codex.app".to_string()
+            let settings = SettingsStore::default().load().unwrap_or_default();
+            codexmate_core::app_paths::resolve_codex_app_dir_with_saved(
+                None,
+                Some(settings.codex_app_path.as_str()),
+            )
+            .map(|path| path.to_string_lossy().to_string())
+            .unwrap_or_else(|| "/Applications/ChatGPT.app".to_string())
         } else {
             request.app_path.trim().to_string()
         };
@@ -1268,7 +1305,9 @@ base_url = "http://127.0.0.1:57321/v1"
         assert!(direct.contains("model_provider = \"openai\""));
         assert!(direct.contains("[model_providers.custom]"));
         assert!(direct.contains("base_url = \"http://127.0.0.1:57321/v1\""));
-        assert!(direct.contains("model = \"deepseek-v4-flash:deepseek-v4-flash\""));
+        // 直连模式必须移除 "provider:model" 格式的 model 值，否则新版 Codex 报
+        // "Model provider 'xxx' not found"
+        assert!(!direct.contains("model = \"deepseek-v4-flash:deepseek-v4-flash\""));
     }
 
     #[test]
@@ -1303,6 +1342,39 @@ base_url = "http://127.0.0.1:57321/v1"
         assert_eq!(codex_mode_from_config(config), "proxy");
     }
 
+    #[test]
+    fn direct_mode_preparation_repairs_historical_provider() {
+        let temp = tempfile::tempdir().unwrap();
+        std::fs::write(
+            temp.path().join("config.toml"),
+            "model_provider = \"openai\"\n",
+        )
+        .unwrap();
+        let db = rusqlite::Connection::open(temp.path().join("state_5.sqlite")).unwrap();
+        db.execute(
+            "CREATE TABLE threads (id TEXT PRIMARY KEY, model_provider TEXT)",
+            [],
+        )
+        .unwrap();
+        db.execute("INSERT INTO threads VALUES ('thread-1', 'custom')", [])
+            .unwrap();
+        drop(db);
+
+        let sync = prepare_direct_mode_state(temp.path()).unwrap();
+
+        assert_eq!(sync.status, codexmate_data::ProviderSyncStatus::Synced);
+        assert_eq!(sync.sqlite_rows_updated, 1);
+        let db = rusqlite::Connection::open(temp.path().join("state_5.sqlite")).unwrap();
+        let provider: String = db
+            .query_row(
+                "SELECT model_provider FROM threads WHERE id = 'thread-1'",
+                [],
+                |row| row.get(0),
+            )
+            .unwrap();
+        assert_eq!(provider, "openai");
+    }
+
     #[test]
     fn sync_all_session_providers_updates_rollouts_at_session_root() {
         let temp = tempfile::tempdir().unwrap();

apps/codexmate-manager/src-tauri/src/commands.rs

@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "CodexMate",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "identifier": "com.codexmate.manager",
   "build": {
     "beforeDevCommand": "npm run vite:dev",

apps/codexmate-manager/src-tauri/tauri.conf.json

@@ -35,6 +35,11 @@
     return uniqueValues([modelCatalog.default_model, modelCatalog.model].concat(Array.isArray(modelCatalog.models) ? modelCatalog.models : []));
   }
 
+  function isProxyMode() {
+    var provider = typeof modelCatalog.model_provider === "string" ? modelCatalog.model_provider.trim().toLowerCase() : "";
+    return provider === "custom" || provider === "codexmate";
+  }
+
   function loadModelCatalog(force) {
     if (!force && modelCatalogPromise) return modelCatalogPromise;
     if (!force && modelCatalogLoadedAt && Date.now() - modelCatalogLoadedAt < 10000) return Promise.resolve(modelCatalog);
@@ -81,7 +86,7 @@
     var existing = {};
     for (var i = 0; i < arr.length; i++) { if (arr[i] && arr[i].model) existing[arr[i].model] = true; }
     // 代理模式：隐藏 GPT 模型和已禁用模型
-    var inProxy = !!modelCatalog.model_provider;
+    var inProxy = isProxyMode();
     for (var i = 0; i < arr.length; i++) {
       if (arr[i] && arr[i].model) {
         var isGpt = /^(gpt|o[1-9]|codex-)/.test(arr[i].model);
@@ -106,7 +111,7 @@
   }
 
   function patchModelContainer(value) {
-    if (!value || typeof value !== "object") return false;
+    if (!isProxyMode() || !value || typeof value !== "object") return false;
     var changed = false;
     if (patchModelArray(value.models, "defaultModel" in value || "availableModels" in value)) changed = true;
     if (patchModelNameArray(value.models)) changed = true;
@@ -139,6 +144,7 @@
     Response.prototype.json = async function patchedJson() {
       var payload = await originalJson.apply(this, arguments);
       if (!modelUnlockEnabled()) return payload;
+      if (!isProxyMode()) return payload;
       if (!modelNames().length) await loadModelCatalog();
       if (!payload || typeof payload !== "object") return payload;
       try { patchModelContainer(payload); patchObjectGraph(payload, new WeakSet(), 0); } catch (_) {}
@@ -167,7 +173,7 @@
   }
 
   function patchMsgData(data) {
-    if (!data || data.type !== "mcp-response") return false;
+    if (!isProxyMode() || !data || data.type !== "mcp-response") return false;
     var message = data.message || data.response;
     var requestId = message && message.id != null ? String(message.id) : "";
     if (modelListRequestIds.size > 0 && requestId && !modelListRequestIds.has(requestId)) return false;
@@ -238,7 +244,7 @@
     var originalFetch = window.fetch.bind(window);
     window.fetch = async function patchedFetch(input, init) {
       try {
-        if (!modelUnlockEnabled() || appServerModelRequestMethod(input) !== "responses") {
+        if (!modelUnlockEnabled() || !isProxyMode() || appServerModelRequestMethod(input) !== "responses") {
           return originalFetch(input, init);
         }
         if (!modelNames().length) await loadModelCatalog();
@@ -273,7 +279,7 @@
       };
       xhr.send = function patchedSend(body) {
         try {
-          if (modelUnlockEnabled() && typeof body === "string" && body.trim()) {
+          if (modelUnlockEnabled() && isProxyMode() && typeof body === "string" && body.trim()) {
             var payload = JSON.parse(body);
             var routedPayload = findScopedModelPayload(payload, 0);
             if (routedPayload) {
@@ -315,6 +321,7 @@
   }
 
   function patchStatsigConfig(config) {
+    if (!isProxyMode()) return config;
     var value = config && config.value;
     if (!value || typeof value !== "object") return config;
     var changed = false;
@@ -373,12 +380,15 @@
   // ===== patchWhitelist (CodexMate flow) =====
   function patchWhitelist() {
     if (!modelUnlockEnabled()) return;
+    if (modelCatalog.status === "loading") {
+      loadModelCatalog();
+      return;
+    }
+    if (!isProxyMode()) return;
     installJsonPatch();
     installAppServerModelRequestPatch();
     installXhrModelRequestPatch();
     installMsgPatch();
-    // 直连模式不注入代理模型到白名单
-    if (!modelCatalog.model_provider) return;
     if (!modelNames().length) { loadModelCatalog(); return; }
     patchStatsig();
     patchReactState();
@@ -424,7 +434,7 @@
       document.body.appendChild(el);
       function updateModeLabel() {
         loadModelCatalog().then(function () {
-          label.textContent = modelCatalog.model_provider ? "代理模式" : "直连模式";
+          label.textContent = isProxyMode() ? "代理模式" : "直连模式";
         }).catch(function () {});
       }
       function poll() {
@@ -443,7 +453,7 @@
   function scanLightweight() { injectStyles(); addStatus(); }
   function scanDeferred() {
     patchWhitelist();
-    setInterval(function () { if (modelNames().length) { patchStatsig(); patchReactState(); } }, 3000);
+    setInterval(function () { if (isProxyMode() && modelNames().length) { patchStatsig(); patchReactState(); } }, 3000);
   }
 
   function runSafe(fn) { try { fn(); } catch (_) {} }

assets/inject/renderer-inject.js

@@ -15,7 +15,7 @@ function createElementStub() {
   };
 }
 
-async function createHarness(catalog) {
+async function createHarness(catalog, responsePayload = {}) {
   const fetchCalls = [];
   const xhrCalls = [];
   const bridgeCalls = [];
@@ -25,7 +25,7 @@ async function createHarness(catalog) {
   };
   function Response() {}
   Response.prototype.json = async function json() {
-    return {};
+    return JSON.parse(JSON.stringify(responsePayload));
   };
   class Request {
     constructor(url, init = {}) {
@@ -64,6 +64,8 @@ async function createHarness(catalog) {
     URL,
     fetch: originalFetch,
     globalThis: {},
+    addEventListener() {},
+    dispatchEvent() { return true; },
     localStorage: { getItem: () => "{}" },
     setInterval() {},
     requestAnimationFrame: (fn) => fn(),
@@ -109,11 +111,46 @@ assert.equal(
   "official models should not be routed to the local helper",
 );
 
+const direct = await createHarness(
+  {
+    status: "ok",
+    model: "gpt-5.6",
+    default_model: "gpt-5.6",
+    model_provider: "openai",
+    provider_name: "OpenAI",
+    models: ["gpt-5.6"],
+    sources: [],
+  },
+  {
+    models: [{ model: "gpt-5.6", hidden: false }],
+    availableModels: ["gpt-5.6"],
+    defaultModel: null,
+  },
+);
+const directModelPayload = await new direct.sandbox.Response().json();
+assert.deepEqual(
+  directModelPayload,
+  {
+    models: [{ model: "gpt-5.6", hidden: false }],
+    availableModels: ["gpt-5.6"],
+    defaultModel: null,
+  },
+  "direct mode should not mutate the native model payload",
+);
+await direct.sandbox.fetch("https://chatgpt.com/backend-api/responses", {
+  body: JSON.stringify({ model: "custom:gpt-5.6", input: "hello" }),
+});
+assert.equal(
+  direct.fetchCalls.at(-1).input,
+  "https://chatgpt.com/backend-api/responses",
+  "direct mode should not route scoped models to the local helper",
+);
+
 const managed = await createHarness({
   status: "ok",
   model: "",
   default_model: "",
-  model_provider: "codexmate",
+  model_provider: "custom",
   provider_name: "CodexMate",
   models: ["deepseek-v4-pro:gpt-5.4-mini"],
   sources: [],