coding-tool-x 3.3.7 → 3.3.9

package/src/server/services/gemini-channels.js

@@ -2,6 +2,7 @@ const fs = require('fs');
 const path = require('path');
 const crypto = require('crypto');
 const { PATHS, NATIVE_PATHS } = require('../../config/paths');
+const { clearNativeOAuth } = require('./native-oauth-adapters');
 
 /**
  * Gemini 渠道管理服务（多渠道架构）
@@ -31,9 +32,9 @@ function getGeminiDir() {
 
 // 获取渠道存储文件路径
 function getChannelsFilePath() {
-  const ccToolDir = PATHS.base;
-  if (!fs.existsSync(ccToolDir)) {
-    fs.mkdirSync(ccToolDir, { recursive: true });
+  const channelsDir = path.dirname(PATHS.channels.gemini);
+  if (!fs.existsSync(channelsDir)) {
+    fs.mkdirSync(channelsDir, { recursive: true });
   }
   return PATHS.channels.gemini;
 }
@@ -252,14 +253,6 @@ function updateChannel(channelId, updates) {
     console.log(`[Gemini Single-channel mode] Enabled "${nextChannel.name}", disabled all others`);
   }
 
-  // Prevent disabling last enabled channel when proxy is OFF
-  if (!isProxyRunning && !nextChannel.enabled && oldChannel.enabled) {
-    const enabledCount = data.channels.filter(ch => ch.enabled).length;
-    if (enabledCount === 0) {
-      throw new Error('无法禁用最后一个启用的渠道。请先启用其他渠道或启动动态切换。');
-    }
-  }
-
   saveChannels(data);
 
   // Only sync .env when proxy is OFF.
@@ -299,6 +292,8 @@ function applyChannelToSettings(channelId, channels = null) {
     saveChannels(data);
   }
 
+  clearNativeOAuth('gemini');
+
   const geminiDir = getGeminiDir();
 
   if (!fs.existsSync(geminiDir)) {
@@ -455,6 +450,12 @@ function saveChannelOrder(order) {
   saveChannels(data);
 }
 
+function disableAllChannels() {
+  const data = loadChannels();
+  data.channels.forEach(ch => { ch.enabled = false; });
+  saveChannels(data);
+}
+
 module.exports = {
   getChannels,
   createChannel,
@@ -465,5 +466,6 @@ module.exports = {
   saveChannelOrder,
   isProxyConfig,
   getGeminiDir,
-  applyChannelToSettings
+  applyChannelToSettings,
+  disableAllChannels
 };

package/src/server/services/gemini-statistics-service.js

@@ -4,34 +4,12 @@ const {
   getDailyStatistics: getSharedDailyStatistics,
   getTodayStatistics: getSharedTodayStatistics
 } = require('./statistics-service');
+const { normalizeUsageTokens, toNumber } = require('./proxy-log-helper');
 
 const TOOL_TYPE = 'gemini';
 
-function toNumber(value) {
-  const num = Number(value);
-  return Number.isFinite(num) ? num : 0;
-}
-
-function normalizeToolTokens(tokens = {}) {
-  const input = toNumber(tokens.input);
-  const output = toNumber(tokens.output);
-  const cached = toNumber(tokens.cached);
-  const cacheCreation = toNumber(tokens.cacheCreation);
-  const cacheRead = toNumber(tokens.cacheRead || cached);
-  const total = toNumber(tokens.total) || (input + output);
-
-  return {
-    input,
-    output,
-    cached,
-    cacheCreation,
-    cacheRead,
-    total
-  };
-}
-
 function toLegacyEntryShape(entry = {}, includeName = false) {
-  const normalized = normalizeToolTokens(entry.tokens || {});
+  const normalized = normalizeUsageTokens(TOOL_TYPE, entry.tokens || {});
   const result = {
     requests: toNumber(entry.requests),
     tokens: {
@@ -123,7 +101,7 @@ function buildDailyStatistics(sharedDaily = {}, fallbackDate) {
 }
 
 function recordRequest(requestData = {}) {
-  const normalizedTokens = normalizeToolTokens(requestData.tokens || {});
+  const normalizedTokens = normalizeUsageTokens(TOOL_TYPE, requestData.tokens || {});
   return recordSharedRequest({
     ...requestData,
     toolType: TOOL_TYPE,

package/src/server/services/mcp-service.js

@@ -12,14 +12,13 @@ const { spawn } = require('child_process');
 const http = require('http');
 const https = require('https');
 const { McpClient, buildMissingCommandMessage, createMissingCommandHint } = require('./mcp-client');
-const { NATIVE_PATHS } = require('../../config/paths');
+const { NATIVE_PATHS, PATHS } = require('../../config/paths');
 const { resolvePreferredHomeDir } = require('../../utils/home-dir');
 
 const HOME_DIR = resolvePreferredHomeDir(process.platform, process.env, os.homedir());
 
 // MCP 配置文件路径
-const CC_TOOL_DIR = path.join(HOME_DIR, '.cc-tool');
-const MCP_SERVERS_FILE = path.join(CC_TOOL_DIR, 'mcp-servers.json');
+const MCP_SERVERS_FILE = PATHS.mcpServers;
 
 // 各平台配置文件路径
 const CLAUDE_CONFIG_PATH = path.join(HOME_DIR, '.claude.json');
@@ -290,15 +289,16 @@ function writeJsonFile(filePath, data) {
  * 安全读取 TOML 文件
  */
 function readTomlFile(filePath, defaultValue = {}) {
+  if (!fs.existsSync(filePath)) {
+    return defaultValue;
+  }
+
   try {
-    if (fs.existsSync(filePath)) {
-      const content = fs.readFileSync(filePath, 'utf-8');
-      return toml.parse(content);
-    }
+    const content = fs.readFileSync(filePath, 'utf-8');
+    return toml.parse(content);
   } catch (err) {
-    console.error(`[MCP] Failed to read ${filePath}:`, err.message);
+    throw new Error(`Failed to parse ${filePath}: ${err.message}`);
   }
-  return defaultValue;
 }
 
 /**
@@ -593,14 +593,14 @@ async function saveServer(server, options = {}) {
     server.apps = normalizeServerApps(server.apps, previousApps || DEFAULT_SERVER_APPS);
   }
 
-  servers[server.id] = server;
-  writeJsonFile(MCP_SERVERS_FILE, servers);
-
   // 同步到各平台配置
   if (syncPlatforms) {
     await syncServerToAllPlatforms(server, previousApps);
   }
 
+  servers[server.id] = server;
+  writeJsonFile(MCP_SERVERS_FILE, servers);
+
   return server;
 }
 
@@ -615,12 +615,12 @@ async function deleteServer(id) {
     return false;
   }
 
-  delete servers[id];
-  writeJsonFile(MCP_SERVERS_FILE, servers);
-
   // 从所有平台配置中移除
   await removeServerFromAllPlatforms(id);
 
+  delete servers[id];
+  writeJsonFile(MCP_SERVERS_FILE, servers);
+
   return true;
 }
 
@@ -642,8 +642,6 @@ async function toggleServerApp(serverId, app, enabled) {
   server.apps[app] = enabled;
   server.updatedAt = Date.now();
 
-  writeJsonFile(MCP_SERVERS_FILE, servers);
-
   // 同步到对应平台
   if (enabled) {
     await syncServerToPlatform(server, app);
@@ -651,6 +649,8 @@ async function toggleServerApp(serverId, app, enabled) {
     await removeServerFromPlatform(serverId, app);
   }
 
+  writeJsonFile(MCP_SERVERS_FILE, servers);
+
   return server;
 }
 
@@ -790,6 +790,7 @@ async function removeServerFromPlatform(serverId, platform) {
     console.log(`[MCP] Removed "${serverId}" from ${platform}`);
   } catch (err) {
     console.error(`[MCP] Failed to remove "${serverId}" from ${platform}:`, err.message);
+    throw err;
   }
 }
 
@@ -833,14 +834,22 @@ function removeFromClaudeConfig(serverId) {
  * 同步到 Codex 配置
  */
 function syncToCodexConfig(server) {
+  if (!fs.existsSync(CODEX_CONFIG_PATH)) {
+    throw new Error('Codex config.toml not found. Please run Codex CLI at least once before syncing MCP servers.');
+  }
+
   const config = readTomlFile(CODEX_CONFIG_PATH, {});
+  const nextSpec = convertToCodexFormat(server.server);
 
   if (!config.mcp_servers) {
     config.mcp_servers = {};
   }
 
-  // 转换为 Codex TOML 格式
-  config.mcp_servers[server.id] = convertToCodexFormat(server.server);
+  if (JSON.stringify(config.mcp_servers[server.id] || null) === JSON.stringify(nextSpec)) {
+    return;
+  }
+
+  config.mcp_servers[server.id] = nextSpec;
 
   writeTomlFile(CODEX_CONFIG_PATH, config);
 }
@@ -849,10 +858,17 @@ function syncToCodexConfig(server) {
  * 从 Codex 配置移除
  */
 function removeFromCodexConfig(serverId) {
+  if (!fs.existsSync(CODEX_CONFIG_PATH)) {
+    return;
+  }
+
   const config = readTomlFile(CODEX_CONFIG_PATH, {});
 
   if (config.mcp_servers && config.mcp_servers[serverId]) {
     delete config.mcp_servers[serverId];
+    if (Object.keys(config.mcp_servers).length === 0) {
+      delete config.mcp_servers;
+    }
     writeTomlFile(CODEX_CONFIG_PATH, config);
   }
 }

package/src/server/services/model-detector.js

@@ -11,7 +11,7 @@ const { URL } = require('url');
 const crypto = require('crypto');
 const zlib = require('zlib');
 const { loadConfig } = require('../../config/loader');
-const { HOME_DIR } = require('../../config/paths');
+const { PATHS } = require('../../config/paths');
 
 // 内置模型优先级（当配置缺失时兜底）
 const MODEL_PRIORITY = {
@@ -669,11 +669,12 @@ function collectResponseBody(res) {
  * Get cache file path
  */
 function getCacheFilePath() {
-  const dir = path.join(HOME_DIR, '.cc-tool');
+  const filePath = PATHS.channelModels;
+  const dir = path.dirname(filePath);
   if (!fs.existsSync(dir)) {
     fs.mkdirSync(dir, { recursive: true });
   }
-  return path.join(dir, 'channel-models.json');
+  return filePath;
 }
 
 /**

package/src/server/services/native-keychain.js

@@ -0,0 +1,243 @@
+const { spawnSync } = require('child_process');
+
+function runCommand(command, args, options = {}) {
+  const result = spawnSync(command, args, {
+    encoding: 'utf8',
+    maxBuffer: 10 * 1024 * 1024,
+    ...options
+  });
+
+  if (result.error) {
+    throw result.error;
+  }
+
+  return result;
+}
+
+function getWindowsPowerShellCommand() {
+  return process.env.ComSpec && process.env.ComSpec.toLowerCase().includes('powershell')
+    ? process.env.ComSpec
+    : 'powershell.exe';
+}
+
+function runPowerShell(script, env = {}) {
+  return runCommand(getWindowsPowerShellCommand(), [
+    '-NoProfile',
+    '-NonInteractive',
+    '-Command',
+    script
+  ], {
+    env: {
+      ...process.env,
+      ...env
+    }
+  });
+}
+
+function isSupported() {
+  if (process.platform === 'darwin') return true;
+  if (process.platform === 'win32') return true;
+
+  if (process.platform === 'linux') {
+    try {
+      const result = runCommand('secret-tool', ['--help']);
+      return result.status === 0 || result.status === 1;
+    } catch {
+      return false;
+    }
+  }
+
+  return false;
+}
+
+function getPassword(service, account) {
+  if (!service || !account) {
+    return null;
+  }
+
+  try {
+    if (process.platform === 'darwin') {
+      const result = runCommand('security', [
+        'find-generic-password',
+        '-a',
+        String(account),
+        '-w',
+        '-s',
+        String(service)
+      ]);
+
+      if (result.status !== 0) {
+        return null;
+      }
+
+      return String(result.stdout || '').trim() || null;
+    }
+
+    if (process.platform === 'linux') {
+      const result = runCommand('secret-tool', [
+        'lookup',
+        'service',
+        String(service),
+        'account',
+        String(account)
+      ]);
+
+      if (result.status !== 0) {
+        return null;
+      }
+
+      return String(result.stdout || '').trim() || null;
+    }
+
+    if (process.platform === 'win32') {
+      const script = `
+Add-Type -AssemblyName System.Runtime.WindowsRuntime
+$vault = New-Object Windows.Security.Credentials.PasswordVault
+try {
+  $cred = $vault.Retrieve($env:CC_TOOL_SERVICE, $env:CC_TOOL_ACCOUNT)
+  $cred.RetrievePassword()
+  [Console]::Out.Write($cred.Password)
+  exit 0
+} catch {
+  exit 2
+}
+`;
+      const result = runPowerShell(script, {
+        CC_TOOL_SERVICE: String(service),
+        CC_TOOL_ACCOUNT: String(account)
+      });
+
+      if (result.status !== 0) {
+        return null;
+      }
+
+      return String(result.stdout || '').trim() || null;
+    }
+  } catch {
+    return null;
+  }
+
+  return null;
+}
+
+function setPassword(service, account, password) {
+  if (!service || !account) {
+    return false;
+  }
+
+  try {
+    if (process.platform === 'darwin') {
+      const result = runCommand('security', [
+        'add-generic-password',
+        '-U',
+        '-a',
+        String(account),
+        '-s',
+        String(service),
+        '-w',
+        String(password ?? '')
+      ]);
+      return result.status === 0;
+    }
+
+    if (process.platform === 'linux') {
+      deletePassword(service, account);
+      const result = runCommand('secret-tool', [
+        'store',
+        '--label',
+        String(service),
+        'service',
+        String(service),
+        'account',
+        String(account)
+      ], {
+        input: String(password ?? '')
+      });
+      return result.status === 0;
+    }
+
+    if (process.platform === 'win32') {
+      const script = `
+Add-Type -AssemblyName System.Runtime.WindowsRuntime
+$vault = New-Object Windows.Security.Credentials.PasswordVault
+try {
+  $existing = $vault.Retrieve($env:CC_TOOL_SERVICE, $env:CC_TOOL_ACCOUNT)
+  $vault.Remove($existing)
+} catch {}
+$credential = New-Object Windows.Security.Credentials.PasswordCredential($env:CC_TOOL_SERVICE, $env:CC_TOOL_ACCOUNT, $env:CC_TOOL_PASSWORD)
+$vault.Add($credential)
+exit 0
+`;
+      const result = runPowerShell(script, {
+        CC_TOOL_SERVICE: String(service),
+        CC_TOOL_ACCOUNT: String(account),
+        CC_TOOL_PASSWORD: String(password ?? '')
+      });
+      return result.status === 0;
+    }
+  } catch {
+    return false;
+  }
+
+  return false;
+}
+
+function deletePassword(service, account) {
+  if (!service || !account) {
+    return false;
+  }
+
+  try {
+    if (process.platform === 'darwin') {
+      const result = runCommand('security', [
+        'delete-generic-password',
+        '-a',
+        String(account),
+        '-s',
+        String(service)
+      ]);
+      return result.status === 0;
+    }
+
+    if (process.platform === 'linux') {
+      const result = runCommand('secret-tool', [
+        'clear',
+        'service',
+        String(service),
+        'account',
+        String(account)
+      ]);
+      return result.status === 0;
+    }
+
+    if (process.platform === 'win32') {
+      const script = `
+Add-Type -AssemblyName System.Runtime.WindowsRuntime
+$vault = New-Object Windows.Security.Credentials.PasswordVault
+try {
+  $credential = $vault.Retrieve($env:CC_TOOL_SERVICE, $env:CC_TOOL_ACCOUNT)
+  $vault.Remove($credential)
+  exit 0
+} catch {
+  exit 2
+}
+`;
+      const result = runPowerShell(script, {
+        CC_TOOL_SERVICE: String(service),
+        CC_TOOL_ACCOUNT: String(account)
+      });
+      return result.status === 0;
+    }
+  } catch {
+    return false;
+  }
+
+  return false;
+}
+
+module.exports = {
+  isSupported,
+  getPassword,
+  setPassword,
+  deletePassword
+};