npm - coding-tool-x - Versions diffs - 3.3.1 → 3.3.2 - Mend

coding-tool-x 3.3.1 → 3.3.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (31) hide show

package/dist/web/index.html CHANGED Viewed

@@ -5,14 +5,14 @@
     <link rel="icon" href="/favicon.ico">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>CC-TOOL - ClaudeCode增强工作助手</title>
-    <script type="module" crossorigin src="/assets/index-ZttxvTKw.js"></script>
+    <script type="module" crossorigin src="/assets/index-CaKktouI.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/markdown-C9MYpaSi.js">
     <link rel="modulepreload" crossorigin href="/assets/vue-vendor-DET08QYg.js">
     <link rel="modulepreload" crossorigin href="/assets/vendors-DMjSfzlv.js">
     <link rel="modulepreload" crossorigin href="/assets/naive-ui-CxpuzdjU.js">
     <link rel="modulepreload" crossorigin href="/assets/icons-B29onFfZ.js">
     <link rel="stylesheet" crossorigin href="/assets/markdown-BfC0goYb.css">
-    <link rel="stylesheet" crossorigin href="/assets/index-C5j22icm.css">
+    <link rel="stylesheet" crossorigin href="/assets/index-DZjDFGqR.css">
   </head>
   <body>
     <div id="app"></div>

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "coding-tool-x",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "description": "Vibe Coding 增强工作助手 - 智能会话管理、动态渠道切换、全局搜索、实时监控",
   "main": "src/index.js",
   "bin": {

package/src/server/api/codex-proxy.js CHANGED Viewed

@@ -11,7 +11,8 @@ const {
   isProxyConfig,
   getCurrentProxyPort,
   configExists,
-  hasBackup
+  hasBackup,
+  readConfig
 } = require('../services/codex-settings-manager');
 const { getChannels, getEnabledChannels } = require('../services/codex-channels');
 const { clearAllLogs } = require('../websocket-server');
@@ -41,6 +42,21 @@ function saveActiveChannelId(channelId) {
   fs.writeFileSync(filePath, JSON.stringify({ activeChannelId: channelId }, null, 2), 'utf8');
 }
+function loadActiveChannelId() {
+  ensureStorageDirMigrated();
+  const filePath = PATHS.activeChannel.codex;
+  try {
+    if (fs.existsSync(filePath)) {
+      const content = fs.readFileSync(filePath, 'utf8');
+      const data = JSON.parse(content);
+      return data.activeChannelId || null;
+    }
+  } catch (error) {
+    console.error('[Codex Proxy] Error loading active channel ID:', error);
+  }
+  return null;
+}
 function removeActiveChannelFile() {
   ensureStorageDirMigrated();
   const filePath = PATHS.activeChannel.codex;
@@ -84,9 +100,20 @@ router.post('/start', async (req, res) => {
       });
     }
-    // 2. 获取当前启用的渠道（多渠道模式）
+    // 2. 获取当前启用的渠道（优先使用当前配置中正在使用的 provider）
     const enabledChannels = getEnabledChannels();
-    const currentChannel = enabledChannels[0];
+    let currentChannel = null;
+    try {
+      const currentProvider = readConfig()?.model_provider;
+      if (currentProvider && currentProvider !== 'cc-proxy') {
+        currentChannel = enabledChannels.find(ch => ch.providerKey === currentProvider) || null;
+      }
+    } catch (err) {
+      // ignore and fallback
+    }
+    if (!currentChannel) {
+      currentChannel = enabledChannels[0] || null;
+    }
     if (!currentChannel) {
       return res.status(400).json({
         error: 'No enabled Codex channel found. Please create and enable a channel first.'
@@ -141,51 +168,55 @@ router.post('/start', async (req, res) => {
 // 停止代理
 router.post('/stop', async (req, res) => {
   try {
-    // 1. 获取当前启用的渠道（多渠道模式）
+    // 1. 获取当前激活渠道（优先使用启动动态切换时记录的渠道ID）
     const { channels } = getChannels();
-    const enabledChannels = channels.filter(ch => ch.enabled !== false);
-    const activeChannel = enabledChannels[0];
+    const activeChannelId = loadActiveChannelId();
+    let activeChannel = activeChannelId
+      ? channels.find(ch => ch.id === activeChannelId)
+      : null;
+    if (!activeChannel) {
+      const enabledChannels = channels.filter(ch => ch.enabled !== false);
+      activeChannel = enabledChannels[0] || channels[0] || null;
+    }
     // 2. 停止代理服务器
     const proxyResult = await stopCodexProxyServer();
+    const hadBackup = hasBackup();
+    // 3. 恢复单渠道模式
+    // 不恢复整个 config.toml 备份，避免两个问题：
+    // - 备份中的旧 auth_mode/tokens 会导致 Codex 用 chatgpt token 认证 → usage limit
+    // - 备份中的 mcp_servers 是旧状态，会覆盖用户在动态切换期间对 MCP 的修改
+    // 直接丢弃备份，由 applyChannelToSettings 从当前 config.toml 写入正确渠道配置
+    if (hadBackup) {
+      const { deleteBackup } = require('../services/codex-settings-manager');
+      deleteBackup();
+      console.log('[Codex Proxy] Discarded backup (MCP changes preserved)');
+    }
-    // 3. 恢复原始配置
     const { broadcastProxyState } = require('../websocket-server');
-    if (hasBackup()) {
-      restoreSettings();
-      console.log('[Codex Proxy] Restored settings from backup');
-      // Enforce single-channel mode: apply the active channel and disable all others
-      if (activeChannel) {
-        const { applyChannelToSettings } = require('../services/codex-channels');
-        applyChannelToSettings(activeChannel.id);
-        console.log(`[Codex Proxy] Single-channel mode enforced: ${activeChannel.name}`);
-      }
+    // 停止动态切换后回到单渠道模式：保留激活渠道，禁用其他渠道
+    if (activeChannel) {
+      const { applyChannelToSettings } = require('../services/codex-channels');
+      applyChannelToSettings(activeChannel.id, { pruneProviders: true });
+      console.log(`[Codex Proxy] Single-channel mode restored: ${activeChannel.name}`);
+    }
-      // 删除 active-channel.json
-      removeActiveChannelFile();
+    // 删除 active-channel.json
+    removeActiveChannelFile();
-      const response = {
-        success: true,
-        message: `Codex proxy stopped, settings restored${activeChannel ? ' (channel: ' + activeChannel.name + ')' : ''}`,
-        port: proxyResult.port,
-        restoredChannel: activeChannel?.name
-      };
-      res.json(response);
-      const updatedStatus = getCodexProxyStatus();
-      broadcastProxyState('codex', updatedStatus, activeChannel, channels);
-    } else {
-      res.json({
-        success: true,
-        message: 'Codex proxy stopped (no backup to restore)',
-        port: proxyResult.port
-      });
+    res.json({
+      success: true,
+      message: `Codex proxy stopped, settings restored${activeChannel ? ' (channel: ' + activeChannel.name + ')' : ''}`,
+      port: proxyResult.port,
+      restoredChannel: activeChannel?.name
+    });
-      const updatedStatus = getCodexProxyStatus();
-      broadcastProxyState('codex', updatedStatus, activeChannel, channels);
-    }
+    const updatedStatus = getCodexProxyStatus();
+    const { channels: latestChannels } = getChannels();
+    const latestActiveChannel = latestChannels.find(ch => ch.enabled !== false) || null;
+    broadcastProxyState('codex', updatedStatus, latestActiveChannel, latestChannels);
   } catch (error) {
     console.error('[Codex Proxy] Error stopping proxy:', error);
     res.status(500).json({ error: error.message });

package/src/server/api/config-export.js CHANGED Viewed

@@ -92,7 +92,7 @@ router.get('/', (req, res) => {
  * POST /api/config-export/import
  * Body: { data: {...}, overwrite: boolean }
  */
-router.post('/import', (req, res) => {
+router.post('/import', async (req, res) => {
   try {
     const { data, overwrite = false } = req.body;
@@ -103,7 +103,7 @@ router.post('/import', (req, res) => {
       });
     }
-    const result = configExportService.importConfigs(data, { overwrite });
+    const result = await configExportService.importConfigs(data, { overwrite });
     res.json(result);
   } catch (err) {
@@ -119,7 +119,7 @@ router.post('/import', (req, res) => {
  * 导入 ZIP 配置
  * POST /api/config-export/import-zip
  */
-router.post('/import-zip', express.raw({ type: ['application/zip', 'application/octet-stream'], limit: '100mb' }), (req, res) => {
+router.post('/import-zip', express.raw({ type: ['application/zip', 'application/octet-stream'], limit: '100mb' }), async (req, res) => {
   try {
     const overwrite = req.query.overwrite === 'true';
     const buffer = req.body;
@@ -132,7 +132,7 @@ router.post('/import-zip', express.raw({ type: ['application/zip', 'application/
     }
     const data = parseConfigZip(buffer);
-    const result = configExportService.importConfigs(data, { overwrite });
+    const result = await configExportService.importConfigs(data, { overwrite });
     res.json(result);
   } catch (err) {
     console.error('[ConfigExport API] 导入 ZIP 失败:', err);

package/src/server/api/gemini-proxy.js CHANGED Viewed

@@ -8,10 +8,12 @@ const {
 const {
   setProxyConfig,
   restoreSettings,
+  deleteBackup,
   isProxyConfig,
   getCurrentProxyPort,
   configExists,
-  hasBackup
+  hasBackup,
+  readEnv
 } = require('../services/gemini-settings-manager');
 const { getChannels, getEnabledChannels } = require('../services/gemini-channels');
 const { PATHS, ensureStorageDirMigrated } = require('../../config/paths');
@@ -35,6 +37,21 @@ function saveActiveChannelId(channelId) {
   fs.writeFileSync(filePath, JSON.stringify({ activeChannelId: channelId }, null, 2), 'utf8');
 }
+function loadActiveChannelId() {
+  ensureStorageDirMigrated();
+  const filePath = PATHS.activeChannel.gemini;
+  try {
+    if (fs.existsSync(filePath)) {
+      const content = fs.readFileSync(filePath, 'utf8');
+      const data = JSON.parse(content);
+      return data.activeChannelId || null;
+    }
+  } catch (error) {
+    console.error('[Gemini Proxy] Error loading active channel ID:', error);
+  }
+  return null;
+}
 function removeActiveChannelFile() {
   ensureStorageDirMigrated();
   const filePath = PATHS.activeChannel.gemini;
@@ -78,9 +95,23 @@ router.post('/start', async (req, res) => {
       });
     }
-    // 2. 获取当前启用的渠道（多渠道模式）
+    // 2. 获取当前启用的渠道（优先使用当前 .env 对应的渠道）
     const enabledChannels = getEnabledChannels();
-    const currentChannel = enabledChannels[0];
+    let currentChannel = null;
+    try {
+      const env = readEnv();
+      const baseUrl = env?.GOOGLE_GEMINI_BASE_URL;
+      const apiKey = env?.GEMINI_API_KEY;
+      const model = env?.GEMINI_MODEL;
+      currentChannel = enabledChannels.find(ch =>
+        ch.baseUrl === baseUrl && ch.apiKey === apiKey && (!model || ch.model === model)
+      ) || enabledChannels.find(ch => ch.baseUrl === baseUrl && ch.apiKey === apiKey) || null;
+    } catch (err) {
+      // ignore and fallback
+    }
+    if (!currentChannel) {
+      currentChannel = enabledChannels[0] || null;
+    }
     if (!currentChannel) {
       return res.status(400).json({
         error: 'No enabled Gemini channel found. Please create and enable a channel first.'
@@ -122,48 +153,50 @@ router.post('/start', async (req, res) => {
 // 停止代理
 router.post('/stop', async (req, res) => {
   try {
-    // 1. 获取当前启用的渠道（多渠道模式）
+    // 1. 获取当前激活渠道（优先使用启动动态切换时记录的渠道ID）
     const { channels } = getChannels();
-    const enabledChannels = channels.filter(ch => ch.enabled !== false);
-    const activeChannel = enabledChannels[0];
+    const activeChannelId = loadActiveChannelId();
+    let activeChannel = activeChannelId
+      ? channels.find(ch => ch.id === activeChannelId)
+      : null;
+    if (!activeChannel) {
+      const enabledChannels = channels.filter(ch => ch.enabled !== false);
+      activeChannel = enabledChannels[0] || channels[0] || null;
+    }
     // 2. 停止代理服务器
     const proxyResult = await stopGeminiProxyServer();
+    const hadBackup = hasBackup();
-    // 3. 恢复原始配置
-    const { broadcastProxyState } = require('../websocket-server');
-    if (hasBackup()) {
-      restoreSettings();
-      console.log('[Gemini Proxy] Restored settings from backup');
-      // Enforce single-channel mode: apply the active channel and disable all others
-      if (activeChannel) {
-        const { applyChannelToSettings } = require('../services/gemini-channels');
-        applyChannelToSettings(activeChannel.id);
-        console.log(`[Gemini Proxy] Single-channel mode enforced: ${activeChannel.name}`);
-      }
-      // 删除 gemini-active-channel.json
-      removeActiveChannelFile();
-      const response = {
-        success: true,
-        message: `Gemini proxy stopped, settings restored${activeChannel ? ' (channel: ' + activeChannel.name + ')' : ''}`,
-        port: proxyResult.port,
-        restoredChannel: activeChannel?.name
-      };
-      res.json(response);
-    } else {
-      res.json({
-        success: true,
-        message: 'Gemini proxy stopped (no backup to restore)',
-        port: proxyResult.port
-      });
+    // 3. 恢复单渠道模式
+    // 不恢复整个备份，避免覆盖用户在动态切换期间对 MCP 等配置的修改
+    if (hadBackup) {
+      deleteBackup();
+      console.log('[Gemini Proxy] Discarded backup (MCP changes preserved)');
     }
+    // 停止动态切换后回到单渠道模式：保留激活渠道，禁用其他渠道
+    if (activeChannel) {
+      const { applyChannelToSettings } = require('../services/gemini-channels');
+      applyChannelToSettings(activeChannel.id);
+      console.log(`[Gemini Proxy] Single-channel mode restored: ${activeChannel.name}`);
+    }
+    // 删除 gemini-active-channel.json
+    removeActiveChannelFile();
+    res.json({
+      success: true,
+      message: `Gemini proxy stopped, settings restored${activeChannel ? ' (channel: ' + activeChannel.name + ')' : ''}`,
+      port: proxyResult.port,
+      restoredChannel: activeChannel?.name
+    });
+    const { broadcastProxyState } = require('../websocket-server');
     const proxyStatus = getGeminiProxyStatus();
     const { channels: latestChannels } = getChannels();
-    broadcastProxyState('gemini', proxyStatus, activeChannel, latestChannels);
+    const latestActiveChannel = latestChannels.find(ch => ch.enabled !== false) || null;
+    broadcastProxyState('gemini', proxyStatus, latestActiveChannel, latestChannels);
   } catch (error) {
     console.error('[Gemini Proxy] Error stopping proxy:', error);
     res.status(500).json({ error: error.message });

package/src/server/api/opencode-proxy.js CHANGED Viewed

@@ -11,10 +11,12 @@ const {
   hasBackup,
   setProxyConfig,
   restoreSettings,
+  deleteBackup,
   isProxyConfig,
   getCurrentProxyPort
 } = require('../services/opencode-settings-manager');
-const { getChannels, getEnabledChannels } = require('../services/opencode-channels');
+const { getChannels, getEnabledChannels, applyChannelToSettings } = require('../services/opencode-channels');
+const { getSchedulerState } = require('../services/channel-scheduler');
 const { PATHS, ensureStorageDirMigrated } = require('../../config/paths');
 const fs = require('fs');
 const path = require('path');
@@ -40,6 +42,21 @@ function saveActiveChannelId(channelId) {
   fs.writeFileSync(filePath, JSON.stringify({ activeChannelId: channelId }, null, 2), 'utf8');
 }
+function loadActiveChannelId() {
+  ensureStorageDirMigrated();
+  const filePath = PATHS.activeChannel.opencode;
+  try {
+    if (fs.existsSync(filePath)) {
+      const content = fs.readFileSync(filePath, 'utf8');
+      const data = JSON.parse(content);
+      return data.activeChannelId || null;
+    }
+  } catch (error) {
+    console.error('[OpenCode Proxy] Error loading active channel ID:', error);
+  }
+  return null;
+}
 // 删除激活渠道文件
 function removeActiveChannelFile() {
   ensureStorageDirMigrated();
@@ -171,32 +188,50 @@ router.post('/start', async (req, res) => {
 // 停止代理
 router.post('/stop', async (req, res) => {
   try {
-    // 1. 获取当前渠道信息
+    // 1. 获取当前激活渠道（优先使用启动动态切换时记录的渠道ID）
     const { channels } = getChannels();
-    const enabledChannels = channels.filter(ch => ch.enabled !== false);
-    const activeChannel = enabledChannels[0];
+    const activeChannelId = loadActiveChannelId();
+    let activeChannel = activeChannelId
+      ? channels.find(ch => ch.id === activeChannelId)
+      : null;
+    if (!activeChannel) {
+      const enabledChannels = channels.filter(ch => ch.enabled !== false);
+      activeChannel = enabledChannels[0] || channels[0] || null;
+    }
     // 2. 停止代理服务器
     const proxyResult = await stopOpenCodeProxyServer();
+    const hadBackup = hasBackup();
     // 3. 删除激活渠道文件
     removeActiveChannelFile();
-    // 4. 恢复原始配置
-    if (hasBackup()) {
-      restoreSettings();
-      console.log('[OpenCode Proxy] Restored settings from backup');
+    // 4. 恢复单渠道模式
+    // 不恢复整个备份，避免覆盖用户在动态切换期间对 MCP 等配置的修改
+    if (hadBackup) {
+      deleteBackup();
+      console.log('[OpenCode Proxy] Discarded backup (MCP changes preserved)');
     }
-    // 5. 广播状态更新
-    const { broadcastProxyState } = require('../websocket-server');
+    // 5. 停止动态切换后回到单渠道模式：保留激活渠道，禁用其他渠道
+    if (activeChannel) {
+      applyChannelToSettings(activeChannel.id);
+      console.log(`[OpenCode Proxy] Single-channel mode restored: ${activeChannel.name}`);
+    }
+    // 6. 广播状态更新（使用最新渠道列表，刷新前端缓存）
+    const { broadcastProxyState, broadcastSchedulerState } = require('../websocket-server');
     const updatedStatus = getOpenCodeProxyStatus();
-    broadcastProxyState('opencode', updatedStatus, activeChannel, channels);
+    const { channels: latestChannels } = getChannels();
+    const latestActiveChannel = latestChannels.find(ch => ch.enabled !== false) || null;
+    broadcastProxyState('opencode', updatedStatus, latestActiveChannel, latestChannels);
+    broadcastSchedulerState('opencode', getSchedulerState('opencode'));
     res.json({
       success: true,
-      message: `OpenCode proxy stopped${activeChannel ? ' (channel: ' + activeChannel.name + ')' : ''}`,
-      port: proxyResult.port
+      message: `OpenCode proxy stopped${latestActiveChannel ? ' (channel: ' + latestActiveChannel.name + ')' : ''}`,
+      port: proxyResult.port,
+      restoredChannel: latestActiveChannel?.name || null
     });
   } catch (error) {
     console.error('[OpenCode Proxy] Error stopping proxy:', error);

package/src/server/api/proxy.js CHANGED Viewed

@@ -212,6 +212,7 @@ router.post('/stop', async (req, res) => {
   try {
     // 1. 停止代理服务器
     const proxyResult = await stopProxyServer();
+    const activeChannelId = loadActiveChannelId();
     // 2. 恢复配置（优先从备份，否则选择权重最高的启用渠道）
     let restoredChannel = null;
@@ -229,6 +230,10 @@ router.post('/stop', async (req, res) => {
           ch.baseUrl === currentSettings.baseUrl && ch.apiKey === currentSettings.apiKey
         );
       }
+      // Fallback: use previously active channel id
+      if (!restoredChannel && activeChannelId) {
+        restoredChannel = channels.find(ch => ch.id === activeChannelId);
+      }
       // Fallback: use first enabled channel
       if (!restoredChannel) {
         restoredChannel = channels.find(ch => ch.enabled !== false) || channels[0];
@@ -236,7 +241,13 @@ router.post('/stop', async (req, res) => {
     } else {
       // 没有备份，选择权重最高的启用渠道
       const { getBestChannelForRestore, updateClaudeSettings } = require('../services/channels');
-      restoredChannel = getBestChannelForRestore();
+      const channels = getAllChannels();
+      restoredChannel = activeChannelId
+        ? channels.find(ch => ch.id === activeChannelId)
+        : null;
+      if (!restoredChannel) {
+        restoredChannel = getBestChannelForRestore();
+      }
       if (restoredChannel) {
         updateClaudeSettings(restoredChannel.baseUrl, restoredChannel.apiKey);
@@ -244,11 +255,11 @@ router.post('/stop', async (req, res) => {
       }
     }
-    // Enforce single-channel mode: disable all channels except the restored one
+    // 停止动态切换后回到单渠道模式：保留激活渠道，禁用其他渠道
     if (restoredChannel) {
       const { applyChannelToSettings } = require('../services/channels');
       applyChannelToSettings(restoredChannel.id);
-      console.log(`✅ Single-channel mode enforced: ${restoredChannel.name}`);
+      console.log(`✅ Single-channel mode restored: ${restoredChannel.name}`);
     }
     // 3. 删除备份文件和active-channel.json
@@ -270,7 +281,8 @@ router.post('/stop', async (req, res) => {
     const { broadcastProxyState } = require('../websocket-server');
     const updatedStatus = getProxyStatus();
     const channels = getAllChannels();
-    broadcastProxyState('claude', updatedStatus, null, channels);
+    const activeChannel = channels.find(ch => ch.enabled !== false) || null;
+    broadcastProxyState('claude', updatedStatus, activeChannel, channels);
     if (restoredChannel) {
       res.json({

package/src/server/services/channels.js CHANGED Viewed

@@ -278,9 +278,9 @@ function updateChannel(id, updates) {
   const proxyStatus = getProxyStatus();
   const isProxyRunning = proxyStatus.running;
-  // Single-channel enforcement: enabling a channel disables all others
-  // (applies regardless of proxy state — user intent is to switch to this channel)
-  if (nextChannel.enabled && !oldChannel.enabled) {
+  // Single-channel enforcement: enabling a channel disables all others ONLY when proxy is OFF
+  // When proxy is ON (dynamic switching), multiple channels can be enabled simultaneously
+  if (!isProxyRunning && nextChannel.enabled && !oldChannel.enabled) {
     data.channels.forEach((ch, i) => {
       if (i !== index && ch.enabled) {
         ch.enabled = false;
@@ -299,9 +299,9 @@ function updateChannel(id, updates) {
   saveChannels(data);
-  // Sync settings.json whenever a channel becomes enabled (proxy OFF: immediate switch;
-  // proxy ON: pre-configures for when proxy stops)
-  if (nextChannel.enabled) {
+  // Sync settings.json only when proxy is OFF.
+  // In dynamic switching mode, defer local config writes until proxy stop.
+  if (!isProxyRunning && nextChannel.enabled) {
     console.log(`[Settings-sync] Channel "${nextChannel.name}" enabled, syncing settings.json...`);
     updateClaudeSettingsWithModelConfig(nextChannel);
   }

package/src/server/services/codex-channels.js CHANGED Viewed

@@ -252,9 +252,9 @@ function updateChannel(channelId, updates) {
   const proxyStatus = getCodexProxyStatus();
   const isProxyRunning = proxyStatus.running;
-  // Single-channel enforcement: enabling a channel disables all others
-  // (applies regardless of proxy state — user intent is to switch to this channel)
-  if (newChannel.enabled && !oldChannel.enabled) {
+  // Single-channel enforcement: enabling a channel disables all others ONLY when proxy is OFF
+  // When proxy is ON (dynamic switching), multiple channels can be enabled simultaneously
+  if (!isProxyRunning && newChannel.enabled && !oldChannel.enabled) {
     data.channels.forEach((ch, i) => {
       if (i !== index && ch.enabled) {
         ch.enabled = false;
@@ -273,9 +273,9 @@ function updateChannel(channelId, updates) {
   saveChannels(data);
-  // Sync config.toml whenever a channel becomes enabled (proxy OFF: immediate switch;
-  // proxy ON: pre-configures for when proxy stops)
-  if (newChannel.enabled) {
+  // Sync config.toml only when proxy is OFF.
+  // In dynamic switching mode, defer local config writes until proxy stop.
+  if (!isProxyRunning && newChannel.enabled) {
     console.log(`[Codex Settings-sync] Channel "${newChannel.name}" enabled, syncing config.toml...`);
     applyChannelToSettings(channelId);
   }
@@ -564,9 +564,11 @@ function syncAllChannelEnvVars() {
  * 类似 Claude 的"写入配置"功能，将渠道设置为当前激活的 provider
  *
  * @param {string} channelId - 渠道 ID
+ * @param {Object} options - 可选参数
+ * @param {boolean} options.pruneProviders - 是否清理 model_providers 仅保留当前渠道
  * @returns {Object} 应用结果
  */
-function applyChannelToSettings(channelId) {
+function applyChannelToSettings(channelId, options = {}) {
   const data = loadChannels();
   const channel = data.channels.find(c => c.id === channelId);
@@ -613,8 +615,11 @@ function applyChannelToSettings(channelId) {
   // 设置当前渠道为 model_provider
   config.model_provider = channel.providerKey;
-  // 确保 model_providers 对象存在
-  if (!config.model_providers) {
+  // 可选：清理 provider，关闭动态切换后只保留当前渠道配置
+  if (options.pruneProviders === true) {
+    config.model_providers = {};
+  } else if (!config.model_providers) {
+    // 默认兼容历史行为：保留已有 provider
     config.model_providers = {};
   }
@@ -664,6 +669,10 @@ ${tomlContent}`;
     delete auth[channel.envKey];
   }
+  // 清除 chatgpt token 认证字段，避免 Codex 优先用过期 token 而报 usage limit
+  delete auth.tokens;
+  delete auth.auth_mode;
   fs.writeFileSync(authPath, JSON.stringify(auth, null, 2), 'utf8');
   if (channel.apiKey && channel.envKey) {

package/src/server/services/codex-settings-manager.js CHANGED Viewed

@@ -312,6 +312,23 @@ function backupSettings() {
   }
 }
+// 只删除备份文件，不恢复（保留当前配置）
+function deleteBackup() {
+  try {
+    if (fs.existsSync(getConfigBackupPath())) {
+      fs.unlinkSync(getConfigBackupPath());
+    }
+    if (fs.existsSync(getAuthBackupPath())) {
+      fs.unlinkSync(getAuthBackupPath());
+    }
+    console.log('Codex backup files deleted');
+    return { success: true };
+  } catch (err) {
+    console.warn('Failed to delete backup files:', err.message);
+    return { success: false, error: err.message };
+  }
+}
 // 恢复配置
 function restoreSettings() {
   try {
@@ -622,6 +639,7 @@ module.exports = {
   writeAuth,
   backupSettings,
   restoreSettings,
+  deleteBackup,
   setProxyConfig,
   isProxyConfig,
   getCurrentProxyPort,

package/src/server/services/config-export-service.js CHANGED Viewed

@@ -572,7 +572,7 @@ function exportAllConfigsZip() {
  * @param {Object} options - 导入选项 { overwrite: boolean }
  * @returns {Object} 导入结果
  */
-function importConfigs(importData, options = {}) {
+async function importConfigs(importData, options = {}) {
   const { overwrite = true } = options; // 默认覆盖模式
   const results = {
     configTemplates: { success: 0, failed: 0, skipped: 0 },
@@ -941,12 +941,16 @@ function importConfigs(importData, options = {}) {
     }
     // 导入 MCP Servers
-    if (mcpServers && mcpServers.length > 0 && overwrite) {
+    const mcpServerList = Array.isArray(mcpServers)
+      ? mcpServers
+      : Object.values(mcpServers || {});
+    if (mcpServerList.length > 0 && overwrite) {
       try {
         const mcpService = require('./mcp-service');
-        for (const server of mcpServers) {
+        for (const server of mcpServerList) {
           try {
-            mcpService.saveServer(server);
+            await mcpService.saveServer(server, { syncPlatforms: false });
             results.mcpServers.success++;
           } catch (err) {
             console.error(`[ConfigImport] 导入 MCP Server 失败: ${server.name}`, err);