coding-tool-x 3.3.6 → 3.3.8

package/src/config/model-metadata.json

@@ -1,5 +1,5 @@
 {
-  "lastUpdated": "2026-02-27",
+  "lastUpdated": "2026-03-06",
   "defaultModels": {
     "claude": [
       "claude-opus-4-6",
@@ -9,6 +9,7 @@
       "claude-haiku-4-5-20251001"
     ],
     "codex": [
+      "gpt-5.4",
       "gpt-5.3-codex",
       "gpt-5.2-codex",
       "gpt-5.1-codex-max",
@@ -30,7 +31,7 @@
   },
   "defaultSpeedTestModels": {
     "claude": "claude-haiku-4-5",
-    "codex": "gpt-5.2",
+    "codex": "gpt-5.4",
     "gemini": "gemini-2.5-pro"
   },
   "aliases": {
@@ -73,6 +74,10 @@
       "limit": { "context": 1000000, "output": 32768 },
       "pricing": { "input": 2, "output": 8 }
     },
+    "gpt-5.4": {
+      "limit": { "context": 1000000, "output": 32768 },
+      "pricing": { "input": 2, "output": 8 }
+    },
     "gpt-5-codex": {
       "limit": { "context": 1000000, "output": 32768 },
       "pricing": { "input": 2, "output": 8 }

package/src/config/paths.js

@@ -3,7 +3,7 @@
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
-const { resolvePreferredHomeDir } = require('../utils/home-dir');
+const { resolvePreferredHomeDir, isWindowsLikePlatform } = require('../utils/home-dir');
 
 const HOME_DIR = resolvePreferredHomeDir(process.platform, process.env, os.homedir());
 
@@ -63,6 +63,71 @@ function ensureStorageDirMigrated() {
   return CC_TOOL_BASE_DIR;
 }
 
+function resolveExistingEnvPath(envValue) {
+  if (typeof envValue !== 'string') {
+    return '';
+  }
+  const trimmed = envValue.trim();
+  return trimmed || '';
+}
+
+function pickExistingDir(candidates, fallback) {
+  for (const candidate of candidates) {
+    if (candidate && fs.existsSync(candidate)) {
+      return candidate;
+    }
+  }
+  return fallback;
+}
+
+function getClaudeConfigDir() {
+  return resolveExistingEnvPath(process.env.CLAUDE_CONFIG_DIR) || path.join(HOME_DIR, '.claude');
+}
+
+function getCodexDir() {
+  return resolveExistingEnvPath(process.env.CODEX_HOME) || path.join(HOME_DIR, '.codex');
+}
+
+function getGeminiDir() {
+  return path.join(HOME_DIR, '.gemini');
+}
+
+function getOpenCodeDataDir() {
+  if (isWindowsLikePlatform(process.platform, process.env)) {
+    const localAppData = resolveExistingEnvPath(process.env.LOCALAPPDATA);
+    return path.join(localAppData || path.join(HOME_DIR, 'AppData', 'Local'), 'opencode');
+  }
+
+  const xdgDataHome = resolveExistingEnvPath(process.env.XDG_DATA_HOME);
+  const preferredDir = path.join(xdgDataHome || path.join(HOME_DIR, '.local', 'share'), 'opencode');
+
+  if (process.platform === 'darwin') {
+    const legacyDarwinDir = path.join(HOME_DIR, 'Library', 'Application Support', 'opencode');
+    return pickExistingDir([preferredDir, legacyDarwinDir], preferredDir);
+  }
+
+  return preferredDir;
+}
+
+function getOpenCodeConfigDir() {
+  if (isWindowsLikePlatform(process.platform, process.env)) {
+    const appData = resolveExistingEnvPath(process.env.APPDATA);
+    return path.join(appData || path.join(HOME_DIR, 'AppData', 'Roaming'), 'opencode');
+  }
+
+  const xdgConfigHome = resolveExistingEnvPath(process.env.XDG_CONFIG_HOME);
+  const preferredDir = path.join(xdgConfigHome || path.join(HOME_DIR, '.config'), 'opencode');
+
+  if (process.platform === 'darwin') {
+    const xdgDataHome = resolveExistingEnvPath(process.env.XDG_DATA_HOME);
+    const legacyDataDir = path.join(xdgDataHome || path.join(HOME_DIR, '.local', 'share'), 'opencode');
+    const legacyDarwinDir = path.join(HOME_DIR, 'Library', 'Application Support', 'opencode');
+    return pickExistingDir([preferredDir, legacyDarwinDir, legacyDataDir], preferredDir);
+  }
+
+  return preferredDir;
+}
+
 // 路径配置
 const PATHS = {
   // 基础目录
@@ -126,6 +191,9 @@ const PATHS = {
   // UI 配置
   uiConfig: path.join(CC_TOOL_BASE_DIR, 'ui-config.json'),
 
+  // OAuth 凭证注册表
+  oauthCredentials: path.join(CC_TOOL_BASE_DIR, 'oauth-credentials.json'),
+
   // 飞书通知脚本
   notifyHook: path.join(CC_TOOL_BASE_DIR, 'notify-hook.js'),
 
@@ -151,35 +219,45 @@ const PATHS = {
 const NATIVE_PATHS = {
   // Claude Code 原生配置
   claude: {
-    settings: path.join(HOME_DIR, '.claude', 'settings.json'),
-    settingsBackup: path.join(HOME_DIR, '.claude', 'settings.json.cc-tool-backup'),
-    projects: path.join(HOME_DIR, '.claude', 'projects')
+    dir: getClaudeConfigDir(),
+    settings: path.join(getClaudeConfigDir(), 'settings.json'),
+    settingsBackup: path.join(getClaudeConfigDir(), 'settings.json.cc-tool-backup'),
+    projects: path.join(getClaudeConfigDir(), 'projects'),
+    credentials: path.join(getClaudeConfigDir(), '.credentials.json')
   },
 
   // Codex 原生配置
   codex: {
-    config: path.join(HOME_DIR, '.codex', 'config.toml'),
-    configBackup: path.join(HOME_DIR, '.codex', 'config.toml.cc-tool-backup'),
-    auth: path.join(HOME_DIR, '.codex', 'auth.json'),
-    authBackup: path.join(HOME_DIR, '.codex', 'auth.json.cc-tool-backup'),
-    sessions: path.join(HOME_DIR, '.codex', 'sessions')
+    dir: getCodexDir(),
+    config: path.join(getCodexDir(), 'config.toml'),
+    configBackup: path.join(getCodexDir(), 'config.toml.cc-tool-backup'),
+    auth: path.join(getCodexDir(), 'auth.json'),
+    authBackup: path.join(getCodexDir(), 'auth.json.cc-tool-backup'),
+    sessions: path.join(getCodexDir(), 'sessions')
   },
 
   // Gemini 原生配置
   gemini: {
-    env: path.join(HOME_DIR, '.gemini', '.env'),
-    envBackup: path.join(HOME_DIR, '.gemini', '.env.cc-tool-backup'),
-    tmp: path.join(HOME_DIR, '.gemini', 'tmp')
+    dir: getGeminiDir(),
+    env: path.join(getGeminiDir(), '.env'),
+    envBackup: path.join(getGeminiDir(), '.env.cc-tool-backup'),
+    tmp: path.join(getGeminiDir(), 'tmp'),
+    settings: path.join(getGeminiDir(), 'settings.json'),
+    settingsBackup: path.join(getGeminiDir(), 'settings.json.cc-tool-backup'),
+    googleAccounts: path.join(getGeminiDir(), 'google_accounts.json'),
+    oauthCredentialsLegacy: path.join(getGeminiDir(), 'oauth_creds.json'),
+    oauthCredentialsEncrypted: path.join(getGeminiDir(), 'mcp-oauth-tokens-v2.json')
   },
 
   // OpenCode 原生配置
   opencode: {
-    data: path.join(HOME_DIR, '.local', 'share', 'opencode'),
-    config: path.join(HOME_DIR, '.config', 'opencode'),
-    sessions: path.join(HOME_DIR, '.local', 'share', 'opencode', 'storage', 'session'),
-    projects: path.join(HOME_DIR, '.local', 'share', 'opencode', 'storage', 'project'),
-    messages: path.join(HOME_DIR, '.local', 'share', 'opencode', 'storage', 'message'),
-    log: path.join(HOME_DIR, '.local', 'share', 'opencode', 'log')
+    data: getOpenCodeDataDir(),
+    config: getOpenCodeConfigDir(),
+    sessions: path.join(getOpenCodeDataDir(), 'storage', 'session'),
+    projects: path.join(getOpenCodeDataDir(), 'storage', 'project'),
+    messages: path.join(getOpenCodeDataDir(), 'storage', 'message'),
+    log: path.join(getOpenCodeDataDir(), 'log'),
+    auth: path.join(getOpenCodeDataDir(), 'auth.json')
   }
 };
 
@@ -190,5 +268,10 @@ module.exports = {
   CTX_BASE_DIR,
   CC_TOOL_BASE_DIR,
   LEGACY_BASE_DIRS,
-  ensureStorageDirMigrated
+  ensureStorageDirMigrated,
+  getClaudeConfigDir,
+  getCodexDir,
+  getGeminiDir,
+  getOpenCodeDataDir,
+  getOpenCodeConfigDir
 };

package/src/server/api/channels.js

@@ -1,5 +1,6 @@
 const express = require('express');
 const router = express.Router();
+const fs = require('fs');
 const {
   getAllChannels,
   applyChannelToSettings,
@@ -18,6 +19,8 @@ const {
   sanitizeBatchConcurrency,
   runWithConcurrencyLimit
 } = require('../services/speed-test');
+const { PATHS } = require('../../config/paths');
+const { deleteBackup } = require('../services/settings-manager');
 const { getDefaultSpeedTestModelByToolType } = require('../../config/model-metadata');
 const { broadcastLog, broadcastProxyState, broadcastSchedulerState } = require('../websocket-server');
 const { clearRedirectCache } = require('../proxy-server');
@@ -185,6 +188,12 @@ router.post('/:id/apply-to-settings', async (req, res) => {
       // Stop proxy and restore backup
       const { stopProxyServer } = require('../proxy-server');
       await stopProxyServer({ clearStartTime: false });
+      deleteBackup();
+      try {
+        fs.unlinkSync(PATHS.activeChannel.claude);
+      } catch {
+        // ignore missing active channel marker
+      }
 
       // Re-apply channel settings after proxy stop to prevent race condition
       // (stopProxyServer restores backup, then we overwrite it with current channel)

package/src/server/api/codex-channels.js

@@ -1,5 +1,6 @@
 const express = require('express');
 const router = express.Router();
+const fs = require('fs');
 const {
   getChannels,
   createChannel,
@@ -20,6 +21,8 @@ const {
   runWithConcurrencyLimit
 } = require('../services/speed-test');
 const { clearCodexRedirectCache } = require('../codex-proxy-server');
+const { deleteBackup } = require('../services/codex-settings-manager');
+const { PATHS } = require('../../config/paths');
 const { getDefaultSpeedTestModelByToolType } = require('../../config/model-metadata');
 const CODEX_GATEWAY_SOURCE_TYPE = 'codex';
 
@@ -349,6 +352,12 @@ module.exports = (config) => {
       if (proxyStatus && proxyStatus.running) {
         console.log(`Codex proxy is running, stopping to apply channel settings: ${channel.name}`);
         await stopCodexProxyServer({ clearStartTime: false });
+        deleteBackup();
+        try {
+          fs.unlinkSync(PATHS.activeChannel.codex);
+        } catch {
+          // ignore missing active channel marker
+        }
 
         broadcastLog({
           type: 'action',

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

@@ -15,6 +15,7 @@ const {
   readConfig
 } = require('../services/codex-settings-manager');
 const { getChannels, getEnabledChannels } = require('../services/codex-channels');
+const { clearNativeOAuth } = require('../services/native-oauth-adapters');
 const { clearAllLogs } = require('../websocket-server');
 const { PATHS, ensureStorageDirMigrated } = require('../../config/paths');
 const fs = require('fs');
@@ -42,6 +43,24 @@ function selectLatestEnabledChannel(channels) {
   }, enabledChannels[0]);
 }
 
+function resolveActiveChannel(channels, activeChannelId = null) {
+  if (!Array.isArray(channels) || channels.length === 0) {
+    return null;
+  }
+
+  if (activeChannelId) {
+    const matched = channels.find(channel => channel.id === activeChannelId);
+    if (matched) {
+      return matched;
+    }
+  }
+
+  return selectLatestEnabledChannel(channels)
+    || channels.find(channel => channel.enabled !== false)
+    || channels[0]
+    || null;
+}
+
 // 保存激活渠道ID
 function saveActiveChannelId(channelId) {
   ensureStorageDirMigrated();
@@ -82,8 +101,7 @@ router.get('/status', (req, res) => {
   try {
     const proxyStatus = getCodexProxyStatus();
     const { channels } = getChannels();
-    const enabledChannels = channels.filter(ch => ch.enabled !== false);
-    const activeChannel = enabledChannels[0]; // 多渠道模式：第一个启用的渠道
+    const activeChannel = resolveActiveChannel(channels, loadActiveChannelId());
     const configStatus = {
       isProxyConfig: isProxyConfig(),
       configExists: configExists(),
@@ -143,6 +161,7 @@ router.post('/start', async (req, res) => {
     }
 
     // 5. 设置代理配置（备份并修改 config.toml 和 auth.json）
+    clearNativeOAuth('codex');
     const configResult = setProxyConfig(proxyResult.port);
 
     const updatedStatus = getCodexProxyStatus();
@@ -179,17 +198,9 @@ router.post('/start', async (req, res) => {
 // 停止代理
 router.post('/stop', async (req, res) => {
   try {
-    // 1. 获取当前激活渠道（优先使用启动动态切换时记录的渠道ID）
     const { channels } = getChannels();
     const activeChannelId = loadActiveChannelId();
-    let activeChannel = selectLatestEnabledChannel(channels);
-    if (!activeChannel && activeChannelId) {
-      activeChannel = channels.find(ch => ch.id === activeChannelId);
-    }
-    if (!activeChannel) {
-      const enabledChannels = channels.filter(ch => ch.enabled !== false);
-      activeChannel = enabledChannels[0] || channels[0] || null;
-    }
+    const activeChannel = resolveActiveChannel(channels, activeChannelId);
 
     // 2. 停止代理服务器
     const proxyResult = await stopCodexProxyServer();

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

@@ -16,6 +16,7 @@ const {
   readEnv
 } = require('../services/gemini-settings-manager');
 const { getChannels, getEnabledChannels } = require('../services/gemini-channels');
+const { clearNativeOAuth } = require('../services/native-oauth-adapters');
 const { PATHS, ensureStorageDirMigrated } = require('../../config/paths');
 const fs = require('fs');
 const path = require('path');
@@ -37,6 +38,24 @@ function selectLatestEnabledChannel(channels) {
   }, enabledChannels[0]);
 }
 
+function resolveActiveChannel(channels, activeChannelId = null) {
+  if (!Array.isArray(channels) || channels.length === 0) {
+    return null;
+  }
+
+  if (activeChannelId) {
+    const matched = channels.find(channel => channel.id === activeChannelId);
+    if (matched) {
+      return matched;
+    }
+  }
+
+  return selectLatestEnabledChannel(channels)
+    || channels.find(channel => channel.enabled !== false)
+    || channels[0]
+    || null;
+}
+
 // 保存激活渠道ID
 function saveActiveChannelId(channelId) {
   ensureStorageDirMigrated();
@@ -83,8 +102,7 @@ router.get('/status', (req, res) => {
       currentProxyPort: getCurrentProxyPort()
     };
     const { channels } = getChannels();
-    const enabledChannels = channels.filter(ch => ch.enabled !== false);
-    const activeChannel = enabledChannels[0]; // 多渠道模式：第一个启用的渠道
+    const activeChannel = resolveActiveChannel(channels, loadActiveChannelId());
 
     res.json({
       proxy: proxyStatus,
@@ -141,6 +159,7 @@ router.post('/start', async (req, res) => {
     }
 
     // 5. 设置代理配置（备份并修改 .env 和 settings.json）
+    clearNativeOAuth('gemini');
     setProxyConfig(proxyResult.port);
 
     const { broadcastProxyState } = require('../websocket-server');
@@ -164,17 +183,9 @@ router.post('/start', async (req, res) => {
 // 停止代理
 router.post('/stop', async (req, res) => {
   try {
-    // 1. 获取当前激活渠道（优先使用启动动态切换时记录的渠道ID）
     const { channels } = getChannels();
     const activeChannelId = loadActiveChannelId();
-    let activeChannel = selectLatestEnabledChannel(channels);
-    if (!activeChannel && activeChannelId) {
-      activeChannel = channels.find(ch => ch.id === activeChannelId);
-    }
-    if (!activeChannel) {
-      const enabledChannels = channels.filter(ch => ch.enabled !== false);
-      activeChannel = enabledChannels[0] || channels[0] || null;
-    }
+    const activeChannel = resolveActiveChannel(channels, activeChannelId);
 
     // 2. 停止代理服务器
     const proxyResult = await stopGeminiProxyServer();

package/src/server/api/mcp.js

@@ -241,7 +241,9 @@ router.post('/servers/:id/test', async (req, res) => {
     console.error('[MCP API] Test server failed:', error);
     res.status(500).json({
       success: false,
-      error: error.message
+      error: error.message,
+      message: error.message,
+      hint: error?.data?.hint || null
     });
   }
 });
@@ -341,9 +343,24 @@ router.get('/servers/:id/tools', async (req, res) => {
   try {
     const { id } = req.params;
     const result = await mcpService.getServerTools(id);
+    if (result.status === 'error') {
+      return res.status(502).json({
+        success: false,
+        error: result.error || '获取工具列表失败',
+        message: result.error || '获取工具列表失败',
+        hint: result.hint || null,
+        duration: result.duration,
+        tools: []
+      });
+    }
     res.json({ success: true, ...result });
   } catch (err) {
-    res.status(404).json({ success: false, error: err.message });
+    res.status(404).json({
+      success: false,
+      error: err.message,
+      message: err.message,
+      hint: err?.data?.hint || null
+    });
   }
 });
 
@@ -357,13 +374,18 @@ router.post('/servers/:id/tools/test', async (req, res) => {
     const { toolName, arguments: args } = req.body;
 
     if (!toolName) {
-      return res.status(400).json({ success: false, error: '缺少 toolName 参数' });
+      return res.status(400).json({ success: false, error: '缺少 toolName 参数', message: '缺少 toolName 参数' });
     }
 
     const result = await mcpService.callServerTool(id, toolName, args || {});
     res.json({ success: true, ...result });
   } catch (err) {
-    res.status(500).json({ success: false, error: err.message });
+    res.status(500).json({
+      success: false,
+      error: err.message,
+      message: err.message,
+      hint: err?.data?.hint || null
+    });
   }
 });
 

package/src/server/api/oauth-credentials.js

@@ -0,0 +1,163 @@
+const express = require('express');
+const router = express.Router();
+const {
+  SUPPORTED_TOOLS,
+  getAllToolSummaries,
+  getToolSummary,
+  importCredential,
+  syncLocalCredential,
+  setDefaultCredential,
+  deleteCredential,
+  applyStoredCredential,
+  clearNativeOAuthState,
+  fetchCredentialUsage
+} = require('../services/oauth-credentials-service');
+
+function assertTool(tool) {
+  if (!SUPPORTED_TOOLS.includes(tool)) {
+    const error = new Error(`Unsupported OAuth tool: ${tool}`);
+    error.statusCode = 404;
+    throw error;
+  }
+}
+
+function broadcastToolProxyState(tool) {
+  const { broadcastProxyState } = require('../websocket-server');
+
+  if (tool === 'claude') {
+    const { getProxyStatus } = require('../proxy-server');
+    const { getAllChannels } = require('../services/channels');
+    const channels = getAllChannels();
+    const activeChannel = channels.find(ch => ch.enabled !== false) || null;
+    broadcastProxyState('claude', getProxyStatus(), activeChannel, channels);
+    return;
+  }
+
+  if (tool === 'codex') {
+    const { getCodexProxyStatus } = require('../codex-proxy-server');
+    const { getChannels } = require('../services/codex-channels');
+    const channels = getChannels().channels || [];
+    const activeChannel = channels.find(ch => ch.enabled !== false) || null;
+    broadcastProxyState('codex', getCodexProxyStatus(), activeChannel, channels);
+    return;
+  }
+
+  if (tool === 'gemini') {
+    const { getGeminiProxyStatus } = require('../gemini-proxy-server');
+    const { getChannels } = require('../services/gemini-channels');
+    const channels = getChannels().channels || [];
+    const activeChannel = channels.find(ch => ch.enabled !== false) || null;
+    broadcastProxyState('gemini', getGeminiProxyStatus(), activeChannel, channels);
+    return;
+  }
+
+  if (tool === 'opencode') {
+    const { getOpenCodeProxyStatus } = require('../opencode-proxy-server');
+    const { getChannels } = require('../services/opencode-channels');
+    const channels = getChannels().channels || [];
+    const activeChannel = channels.find(ch => ch.enabled !== false) || null;
+    broadcastProxyState('opencode', getOpenCodeProxyStatus(), activeChannel, channels);
+  }
+}
+
+router.get('/', (req, res) => {
+  try {
+    res.json({ tools: getAllToolSummaries() });
+  } catch (error) {
+    res.status(500).json({ error: error.message });
+  }
+});
+
+router.get('/:tool', (req, res) => {
+  try {
+    const { tool } = req.params;
+    assertTool(tool);
+    res.json({ tool, summary: getToolSummary(tool) });
+  } catch (error) {
+    res.status(error.statusCode || 500).json({ error: error.message });
+  }
+});
+
+router.post('/:tool/import', (req, res) => {
+  try {
+    const { tool } = req.params;
+    assertTool(tool);
+    const credential = importCredential(tool, req.body || {});
+    res.json({ tool, credential, summary: getToolSummary(tool) });
+  } catch (error) {
+    res.status(error.statusCode || 500).json({ error: error.message });
+  }
+});
+
+router.post('/:tool/sync-local', (req, res) => {
+  try {
+    const { tool } = req.params;
+    assertTool(tool);
+    const result = syncLocalCredential(tool);
+    res.json({ tool, ...result });
+  } catch (error) {
+    res.status(error.statusCode || 500).json({ error: error.message });
+  }
+});
+
+router.post('/:tool/:credentialId/default', (req, res) => {
+  try {
+    const { tool, credentialId } = req.params;
+    assertTool(tool);
+    const summary = setDefaultCredential(tool, credentialId);
+    res.json({ tool, summary });
+  } catch (error) {
+    res.status(error.statusCode || 500).json({ error: error.message });
+  }
+});
+
+router.post('/:tool/:credentialId/apply', async (req, res) => {
+  try {
+    const { tool, credentialId } = req.params;
+    assertTool(tool);
+    const result = await applyStoredCredential(tool, credentialId);
+    broadcastToolProxyState(tool);
+    res.json({
+      tool,
+      ...result,
+      message: `${tool} 已切换到 OAuth 凭证控制`
+    });
+  } catch (error) {
+    res.status(error.statusCode || 500).json({ error: error.message });
+  }
+});
+
+router.post('/:tool/clear-native', (req, res) => {
+  try {
+    const { tool } = req.params;
+    assertTool(tool);
+    const nativeState = clearNativeOAuthState(tool);
+    res.json({ tool, nativeState });
+  } catch (error) {
+    res.status(error.statusCode || 500).json({ error: error.message });
+  }
+});
+
+router.get('/:tool/:credentialId/usage', async (req, res) => {
+  try {
+    const { tool, credentialId } = req.params;
+    assertTool(tool);
+    const result = await fetchCredentialUsage(tool, credentialId);
+    res.json({ tool, credentialId, usage: result });
+  } catch (error) {
+    res.status(error.statusCode || 500).json({ error: error.message });
+  }
+});
+
+router.delete('/:tool/:credentialId', (req, res) => {
+  try {
+    const { tool, credentialId } = req.params;
+    assertTool(tool);
+    const summary = deleteCredential(tool, credentialId);
+    res.json({ tool, summary });
+  } catch (error) {
+    res.status(error.statusCode || 500).json({ error: error.message });
+  }
+});
+
+module.exports = router;

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

@@ -16,6 +16,7 @@ const {
   getCurrentProxyPort
 } = require('../services/opencode-settings-manager');
 const { getChannels, getEnabledChannels, applyChannelToSettings } = require('../services/opencode-channels');
+const { clearNativeOAuth } = require('../services/native-oauth-adapters');
 const { getSchedulerState } = require('../services/channel-scheduler');
 const { PATHS, ensureStorageDirMigrated } = require('../../config/paths');
 const fs = require('fs');
@@ -42,6 +43,24 @@ function selectLatestEnabledChannel(channels) {
   }, enabledChannels[0]);
 }
 
+function resolveActiveChannel(channels, activeChannelId = null) {
+  if (!Array.isArray(channels) || channels.length === 0) {
+    return null;
+  }
+
+  if (activeChannelId) {
+    const matched = channels.find(channel => channel.id === activeChannelId);
+    if (matched) {
+      return matched;
+    }
+  }
+
+  return selectLatestEnabledChannel(channels)
+    || channels.find(channel => channel.enabled !== false)
+    || channels[0]
+    || null;
+}
+
 // 保存激活渠道ID
 function saveActiveChannelId(channelId) {
   ensureStorageDirMigrated();
@@ -84,7 +103,7 @@ router.get('/status', (req, res) => {
     const proxyStatus = getOpenCodeProxyStatus();
     const { channels } = getChannels();
     const enabledChannels = channels.filter(ch => ch.enabled !== false);
-    const activeChannel = enabledChannels[0];
+    const activeChannel = resolveActiveChannel(channels, loadActiveChannelId());
     const configStatus = {
       isProxyConfig: isProxyConfig(),
       configExists: configExists(),
@@ -176,6 +195,7 @@ router.post('/start', async (req, res) => {
     });
 
     const activeModel = currentChannel.model || currentChannel.speedTestModel || null;
+    clearNativeOAuth('opencode');
     setProxyConfig(proxyResult.port, { channels: channelPayloads, model: activeModel });
 
     // 5. 广播状态更新
@@ -199,17 +219,9 @@ router.post('/start', async (req, res) => {
 // 停止代理
 router.post('/stop', async (req, res) => {
   try {
-    // 1. 获取当前激活渠道（优先使用启动动态切换时记录的渠道ID）
     const { channels } = getChannels();
     const activeChannelId = loadActiveChannelId();
-    let activeChannel = selectLatestEnabledChannel(channels);
-    if (!activeChannel && activeChannelId) {
-      activeChannel = channels.find(ch => ch.id === activeChannelId);
-    }
-    if (!activeChannel) {
-      const enabledChannels = channels.filter(ch => ch.enabled !== false);
-      activeChannel = enabledChannels[0] || channels[0] || null;
-    }
+    const activeChannel = resolveActiveChannel(channels, activeChannelId);
 
     // 2. 停止代理服务器
     const proxyResult = await stopOpenCodeProxyServer();