@adversity/coding-tool-x 3.1.0 → 3.1.1

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

@@ -20,9 +20,17 @@ const { injectEnvToShell, removeEnvFromShell, isProxyConfig } = require('./codex
  * - 使用 weight 和 maxConcurrency 控制负载均衡
  */
 
+function normalizeGatewaySourceType(value, fallback = 'codex') {
+  const normalized = String(value || '').trim().toLowerCase();
+  if (normalized === 'claude') return 'claude';
+  if (normalized === 'codex') return 'codex';
+  if (normalized === 'gemini') return 'gemini';
+  return fallback;
+}
+
 // 获取渠道存储文件路径
 function getChannelsFilePath() {
-  const ccToolDir = path.join(os.homedir(), '.claude', 'cc-tool');
+  const ccToolDir = path.join(os.homedir(), '.cc-tool');
   if (!fs.existsSync(ccToolDir)) {
     fs.mkdirSync(ccToolDir, { recursive: true });
   }
@@ -43,15 +51,17 @@ function loadChannels() {
     const data = JSON.parse(content);
     // 确保渠道有 enabled 字段（兼容旧数据）
     if (data.channels) {
-      data.channels = data.channels.map(ch => ({
-        ...ch,
-        enabled: ch.enabled !== false, // 默认启用
-        weight: ch.weight || 1,
-        maxConcurrency: ch.maxConcurrency || null,
-        modelRedirects: ch.modelRedirects || [],
-        speedTestModel: ch.speedTestModel || null,
-        authType: ch.authType || 'apiKey' // 默认 API Key 认证
-      }));
+      data.channels = data.channels.map(ch => {
+        return {
+          ...ch,
+          enabled: ch.enabled !== false, // 默认启用
+          weight: ch.weight || 1,
+          maxConcurrency: ch.maxConcurrency || null,
+          modelRedirects: ch.modelRedirects || [],
+          speedTestModel: ch.speedTestModel || null,
+          gatewaySourceType: normalizeGatewaySourceType(ch.gatewaySourceType, 'codex')
+        };
+      });
     }
     return data;
   } catch (err) {
@@ -111,6 +121,7 @@ function initializeFromConfig() {
           enabled: config.model_provider === providerKey, // 当前激活的渠道启用
           weight: 1,
           maxConcurrency: null,
+          gatewaySourceType: 'codex',
           createdAt: Date.now(),
           updatedAt: Date.now()
         });
@@ -180,9 +191,7 @@ function createChannel(name, providerKey, baseUrl, apiKey, wireApi = 'responses'
     maxConcurrency: extraConfig.maxConcurrency || null,
     modelRedirects: extraConfig.modelRedirects || [],
     speedTestModel: extraConfig.speedTestModel || null,
-    authType: extraConfig.authType || 'apiKey',
-    oauthProvider: extraConfig.oauthProvider || null,
-    oauthTokenId: extraConfig.oauthTokenId || null,
+    gatewaySourceType: normalizeGatewaySourceType(extraConfig.gatewaySourceType, 'codex'),
     createdAt: Date.now(),
     updatedAt: Date.now()
   };
@@ -191,8 +200,8 @@ function createChannel(name, providerKey, baseUrl, apiKey, wireApi = 'responses'
   saveChannels(data);
 
   // 注入该渠道的环境变量（用于直接使用 codex 命令）
-  if (apiKey && envKey) {
-    const injectResult = injectEnvToShell(envKey, apiKey);
+  if (newChannel.enabled !== false && newChannel.apiKey && envKey) {
+    const injectResult = injectEnvToShell(envKey, newChannel.apiKey);
     if (injectResult.success) {
       console.log(`[Codex Channels] Environment variable ${envKey} injected for new channel`);
     } else {
@@ -232,6 +241,7 @@ function updateChannel(channelId, updates) {
     createdAt: oldChannel.createdAt, // 保持创建时间
     modelRedirects: merged.modelRedirects || [],
     speedTestModel: merged.speedTestModel !== undefined ? merged.speedTestModel : (oldChannel.speedTestModel || null),
+    gatewaySourceType: normalizeGatewaySourceType(merged.gatewaySourceType, 'codex'),
     updatedAt: Date.now()
   };
 
@@ -273,19 +283,23 @@ function updateChannel(channelId, updates) {
   // 如果 envKey 或 apiKey 变化，需要更新环境变量
   const oldEnvKey = oldChannel.envKey;
   const newEnvKey = newChannel.envKey;
-  const oldApiKey = oldChannel.apiKey;
   const newApiKey = newChannel.apiKey;
-
-  // 如果 envKey 改变，删除旧的，注入新的
-  if (oldEnvKey !== newEnvKey && oldEnvKey) {
+  const shouldRemoveOldEnv =
+    !!oldEnvKey && (
+      oldEnvKey !== newEnvKey ||
+      !newApiKey ||
+      newChannel.enabled === false
+    );
+
+  // 禁用或 key 变化时都要清理旧环境变量，避免残留
+  if (shouldRemoveOldEnv) {
     const removeResult = removeEnvFromShell(oldEnvKey);
     if (removeResult.success) {
       console.log(`[Codex Channels] Old environment variable ${oldEnvKey} removed`);
     }
   }
 
-  // 如果有新的 API Key，注入到环境变量
-  if (newApiKey && newEnvKey) {
+  if (newChannel.enabled !== false && newApiKey && newEnvKey) {
     const injectResult = injectEnvToShell(newEnvKey, newApiKey);
     if (injectResult.success) {
       console.log(`[Codex Channels] Environment variable ${newEnvKey} updated`);
@@ -299,7 +313,7 @@ function updateChannel(channelId, updates) {
 }
 
 // 删除渠道
-function deleteChannel(channelId) {
+async function deleteChannel(channelId) {
   const data = loadChannels();
 
   const index = data.channels.findIndex(c => c.id === channelId);
@@ -401,7 +415,7 @@ function writeCodexConfigForMultiChannel(allChannels) {
       // 回退默认的代理配置（使用默认端口），确保 provider 存在
       config.model_providers['cc-proxy'] = {
         name: 'cc-proxy',
-        base_url: 'http://127.0.0.1:10089/v1',
+        base_url: 'http://127.0.0.1:20089/v1',
         wire_api: 'responses',
         env_key: 'CC_PROXY_KEY'
       };
@@ -452,6 +466,12 @@ ${tomlContent}`;
   }
 
   // 更新所有渠道的 API Key
+  for (const channel of allChannels) {
+    if (channel.envKey && !channel.apiKey) {
+      delete auth[channel.envKey];
+    }
+  }
+
   for (const channel of allChannels) {
     if (channel.apiKey) {
       auth[channel.envKey] = channel.apiKey;
@@ -512,7 +532,10 @@ function syncAllChannelEnvVars() {
     const results = [];
 
     for (const channel of channels) {
-      if (channel.apiKey && channel.envKey) {
+      if (!channel.envKey) continue;
+
+      const shouldInject = channel.enabled !== false && !!channel.apiKey;
+      if (shouldInject) {
         const injectResult = injectEnvToShell(channel.envKey, channel.apiKey);
         if (injectResult.success) {
           syncedCount++;
@@ -520,7 +543,11 @@ function syncAllChannelEnvVars() {
         } else {
           results.push({ envKey: channel.envKey, success: false, error: injectResult.error });
         }
+        continue;
       }
+
+      // 清理已停用或缺失 key 的渠道环境变量，避免残留
+      removeEnvFromShell(channel.envKey);
     }
 
     console.log(`[Codex Channels] Synced ${syncedCount} environment variables`);
@@ -624,19 +651,21 @@ ${tomlContent}`;
     }
   }
 
-  // 添加当前渠道的 API Key
   if (channel.apiKey && channel.envKey) {
     auth[channel.envKey] = channel.apiKey;
+  } else if (channel.envKey) {
+    delete auth[channel.envKey];
   }
 
   fs.writeFileSync(authPath, JSON.stringify(auth, null, 2), 'utf8');
 
-  // 注入环境变量到 shell 配置文件
   if (channel.apiKey && channel.envKey) {
     const injectResult = injectEnvToShell(channel.envKey, channel.apiKey);
     if (injectResult.success) {
       console.log(`[Codex Channels] Environment variable ${channel.envKey} injected`);
     }
+  } else if (channel.envKey) {
+    removeEnvFromShell(channel.envKey);
   }
 
   return channel;
@@ -653,24 +682,8 @@ try {
   console.warn('[Codex Channels] Auto sync env vars failed:', err.message);
 }
 
-/**
- * 获取渠道的有效 API Key
- * 如果渠道使用 OAuth 认证，返回 OAuth 令牌；否则返回静态 API Key
- *
- * @param {Object} channel - 渠道对象
- * @returns {string|null} 有效的 API Key
- */
 function getEffectiveApiKey(channel) {
-  if (channel.authType === 'oauth' && channel.oauthTokenId) {
-    const { getToken, isTokenExpired } = require('./oauth-token-storage');
-    const token = getToken(channel.oauthTokenId);
-    if (token && !isTokenExpired(token)) {
-      return token.accessToken;
-    }
-    // OAuth 令牌无效或已过期，返回 null
-    return null;
-  }
-  return channel.apiKey;
+  return channel.apiKey || null;
 }
 
 module.exports = {

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

@@ -2,6 +2,7 @@ const fs = require('fs');
 const path = require('path');
 const os = require('os');
 const toml = require('toml');
+const tomlStringify = require('@iarna/toml').stringify;
 
 // Codex 配置文件路径
 function getConfigPath() {
@@ -35,6 +36,167 @@ function hasBackup() {
   return fs.existsSync(getConfigBackupPath()) || fs.existsSync(getAuthBackupPath());
 }
 
+const INVALID_ENV_NAME_PATTERN = /[\r\n]/;
+const SHELL_MARKER_PREFIX = '# Added by Coding-Tool for Codex';
+
+function normalizeEnvName(envName) {
+  const normalized = String(envName || '').trim();
+  if (!normalized || INVALID_ENV_NAME_PATTERN.test(normalized)) {
+    return null;
+  }
+  return normalized;
+}
+
+function ensureParentDir(filePath) {
+  const dirPath = path.dirname(filePath);
+  if (!fs.existsSync(dirPath)) {
+    fs.mkdirSync(dirPath, { recursive: true });
+  }
+}
+
+function writeFileAtomic(filePath, content) {
+  ensureParentDir(filePath);
+  const tempPath = `${filePath}.tmp-${process.pid}-${Date.now()}`;
+
+  try {
+    fs.writeFileSync(tempPath, content, 'utf8');
+    fs.renameSync(tempPath, filePath);
+  } finally {
+    if (fs.existsSync(tempPath)) {
+      try {
+        fs.unlinkSync(tempPath);
+      } catch (cleanupErr) {
+        // ignore cleanup errors
+      }
+    }
+  }
+}
+
+function normalizeHomePath(filePath) {
+  const normalizedPath = String(filePath || '').replace(/\\/g, '/');
+  const normalizedHome = os.homedir().replace(/\\/g, '/');
+  if (normalizedPath.startsWith(normalizedHome)) {
+    return `~${normalizedPath.slice(normalizedHome.length)}`;
+  }
+  return filePath;
+}
+
+function compactBlankLines(lines) {
+  const compacted = [];
+  let previousIsBlank = false;
+
+  for (const line of lines) {
+    const isBlank = line.trim() === '';
+    if (isBlank) {
+      if (!previousIsBlank) {
+        compacted.push('');
+      }
+      previousIsBlank = true;
+      continue;
+    }
+
+    compacted.push(line);
+    previousIsBlank = false;
+  }
+
+  while (compacted.length > 0 && compacted[compacted.length - 1].trim() === '') {
+    compacted.pop();
+  }
+
+  return compacted;
+}
+
+function isPowerShellProfile(filePath) {
+  return String(filePath || '').toLowerCase().endsWith('.ps1');
+}
+
+function getShellConfigCandidates() {
+  const homeDir = os.homedir();
+  const shell = String(process.env.SHELL || '').toLowerCase();
+  const candidates = [];
+
+  if (process.platform === 'win32') {
+    if (shell.includes('zsh')) {
+      candidates.push(path.join(homeDir, '.zshrc'));
+    }
+
+    if (shell.includes('bash')) {
+      candidates.push(path.join(homeDir, '.bashrc'));
+      candidates.push(path.join(homeDir, '.bash_profile'));
+    }
+
+    candidates.push(path.join(homeDir, 'Documents', 'PowerShell', 'Microsoft.PowerShell_profile.ps1'));
+    candidates.push(path.join(homeDir, 'Documents', 'WindowsPowerShell', 'Microsoft.PowerShell_profile.ps1'));
+    candidates.push(path.join(homeDir, '.bashrc'));
+    candidates.push(path.join(homeDir, '.profile'));
+  } else if (shell.includes('zsh')) {
+    candidates.push(path.join(homeDir, '.zshrc'));
+    candidates.push(path.join(homeDir, '.zprofile'));
+    candidates.push(path.join(homeDir, '.profile'));
+  } else if (shell.includes('bash')) {
+    if (process.platform === 'darwin') {
+      candidates.push(path.join(homeDir, '.bash_profile'));
+      candidates.push(path.join(homeDir, '.bashrc'));
+    } else {
+      candidates.push(path.join(homeDir, '.bashrc'));
+      candidates.push(path.join(homeDir, '.bash_profile'));
+    }
+    candidates.push(path.join(homeDir, '.profile'));
+  } else {
+    candidates.push(path.join(homeDir, '.zshrc'));
+    candidates.push(path.join(homeDir, '.bashrc'));
+    candidates.push(path.join(homeDir, '.bash_profile'));
+    candidates.push(path.join(homeDir, '.profile'));
+  }
+
+  return [...new Set(candidates)];
+}
+
+function getShellReloadCommand(configPath) {
+  if (!configPath) {
+    return process.platform === 'win32' ? '重启终端' : 'source ~/.zshrc';
+  }
+
+  const displayPath = normalizeHomePath(configPath);
+  const normalized = String(displayPath || '').replace(/\\/g, '/').toLowerCase();
+
+  if (normalized.endsWith('microsoft.powershell_profile.ps1')) {
+    return '. $PROFILE';
+  }
+  if (normalized.endsWith('/.zshrc')) {
+    return 'source ~/.zshrc';
+  }
+  if (normalized.endsWith('/.bash_profile')) {
+    return 'source ~/.bash_profile';
+  }
+  if (normalized.endsWith('/.bashrc')) {
+    return 'source ~/.bashrc';
+  }
+  if (normalized.endsWith('/.profile')) {
+    return 'source ~/.profile';
+  }
+
+  if (process.platform === 'win32') {
+    return '. $PROFILE';
+  }
+
+  return `source ${displayPath}`;
+}
+
+function escapeShellValue(value) {
+  return String(value ?? '')
+    .replace(/\\/g, '\\\\')
+    .replace(/"/g, '\\"')
+    .replace(/\$/g, '\\$')
+    .replace(/`/g, '\\`');
+}
+
+function escapePowerShellValue(value) {
+  return String(value ?? '')
+    .replace(/`/g, '``')
+    .replace(/"/g, '`"');
+}
+
 // 读取 config.toml
 function readConfig() {
   try {
@@ -89,7 +251,8 @@ function configToToml(config) {
 // 写入 config.toml
 function writeConfig(config) {
   try {
-    const content = configToToml(config);
+    const safeConfig = JSON.parse(JSON.stringify(config || {}));
+    const content = tomlStringify(safeConfig);
     fs.writeFileSync(getConfigPath(), content, 'utf8');
   } catch (err) {
     throw new Error('Failed to write config.toml: ' + err.message);
@@ -182,28 +345,28 @@ function restoreSettings() {
 
 // 获取用户的 shell 配置文件路径
 function getShellConfigPath() {
-  const shell = process.env.SHELL || '';
-  if (shell.includes('zsh')) {
-    return path.join(os.homedir(), '.zshrc');
-  } else if (shell.includes('bash')) {
-    // macOS 使用 .bash_profile，Linux 使用 .bashrc
-    const bashProfile = path.join(os.homedir(), '.bash_profile');
-    const bashrc = path.join(os.homedir(), '.bashrc');
-    if (fs.existsSync(bashProfile)) {
-      return bashProfile;
-    }
-    return bashrc;
-  }
-  // 默认使用 .zshrc (macOS 默认)
-  return path.join(os.homedir(), '.zshrc');
+  const candidates = getShellConfigCandidates();
+  const existing = candidates.find(filePath => fs.existsSync(filePath));
+  return existing || candidates[0];
 }
 
 // 注入环境变量到 shell 配置文件
 function injectEnvToShell(envName, envValue) {
+  const normalizedEnvName = normalizeEnvName(envName);
+  if (!normalizedEnvName) {
+    return {
+      success: false,
+      error: `Invalid environment variable name: ${envName}`,
+      isFirstTime: false
+    };
+  }
+
   const configPath = getShellConfigPath();
-  const exportLine = `export ${envName}="${envValue}"`;
-  // 使用更具体的标记，包含环境变量名，方便后续精确移除
-  const marker = `# Added by Coding-Tool for Codex [${envName}]`;
+  const marker = `${SHELL_MARKER_PREFIX} [${normalizedEnvName}]`;
+  const usePowerShell = isPowerShellProfile(configPath);
+  const exportLine = usePowerShell
+    ? `$env:${normalizedEnvName} = "${escapePowerShellValue(envValue)}"`
+    : `export ${normalizedEnvName}="${escapeShellValue(envValue)}"`;
 
   try {
     let content = '';
@@ -211,23 +374,52 @@ function injectEnvToShell(envName, envValue) {
       content = fs.readFileSync(configPath, 'utf8');
     }
 
-    // 检查是否已经存在这个环境变量配置
-    const regex = new RegExp(`^export ${envName}=`, 'm');
-    const alreadyExists = regex.test(content);
+    const envKeyEscaped = String(normalizedEnvName).replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+    const envLineRegex = usePowerShell
+      ? new RegExp(`^\\s*\\$env:${envKeyEscaped}\\s*=`, 'i')
+      : new RegExp(`^\\s*(?:export\\s+)?${envKeyEscaped}=`);
 
-    if (alreadyExists) {
-      // 已存在，替换它（保留原有的标记注释）
-      content = content.replace(
-        new RegExp(`^(# Added by Coding-Tool for Codex \\[${envName}\\]\n)?export ${envName}=.*$`, 'm'),
-        `${marker}\n${exportLine}`
-      );
-    } else {
-      // 不存在，追加到文件末尾
-      content = content.trimEnd() + `\n\n${marker}\n${exportLine}\n`;
+    const originalLines = content ? content.split(/\r?\n/) : [];
+    const cleanedLines = [];
+    let existed = false;
+
+    for (let i = 0; i < originalLines.length; i++) {
+      const currentLine = originalLines[i];
+      const trimmedLine = currentLine.trim();
+
+      if (trimmedLine === marker) {
+        const nextLine = originalLines[i + 1] || '';
+        if (envLineRegex.test(nextLine.trim())) {
+          i += 1;
+        }
+        existed = true;
+        continue;
+      }
+
+      if (envLineRegex.test(trimmedLine)) {
+        existed = true;
+        continue;
+      }
+
+      cleanedLines.push(currentLine);
+    }
+
+    while (cleanedLines.length > 0 && cleanedLines[cleanedLines.length - 1].trim() === '') {
+      cleanedLines.pop();
+    }
+
+    if (cleanedLines.length > 0) {
+      cleanedLines.push('');
+    }
+
+    cleanedLines.push(marker, exportLine);
+
+    const nextContent = `${cleanedLines.join('\n')}\n`;
+    if (nextContent !== content) {
+      writeFileAtomic(configPath, nextContent);
     }
 
-    fs.writeFileSync(configPath, content, 'utf8');
-    return { success: true, path: configPath, isFirstTime: !alreadyExists };
+    return { success: true, path: configPath, isFirstTime: !existed };
   } catch (err) {
     // 不抛出错误，只是警告，因为这不是致命问题
     console.warn(`[Codex] Failed to inject env to shell config: ${err.message}`);
@@ -237,6 +429,14 @@ function injectEnvToShell(envName, envValue) {
 
 // 从 shell 配置文件移除环境变量
 function removeEnvFromShell(envName) {
+  const normalizedEnvName = normalizeEnvName(envName);
+  if (!normalizedEnvName) {
+    return {
+      success: false,
+      error: `Invalid environment variable name: ${envName}`
+    };
+  }
+
   const configPath = getShellConfigPath();
 
   try {
@@ -244,24 +444,46 @@ function removeEnvFromShell(envName) {
       return { success: true };
     }
 
-    let content = fs.readFileSync(configPath, 'utf8');
+    const content = fs.readFileSync(configPath, 'utf8');
+    const usePowerShell = isPowerShellProfile(configPath);
+    const marker = `${SHELL_MARKER_PREFIX} [${normalizedEnvName}]`;
+    const envKeyEscaped = String(normalizedEnvName).replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+    const envLineRegex = usePowerShell
+      ? new RegExp(`^\\s*\\$env:${envKeyEscaped}\\s*=`, 'i')
+      : new RegExp(`^\\s*(?:export\\s+)?${envKeyEscaped}=`);
+
+    const originalLines = content ? content.split(/\r?\n/) : [];
+    const cleanedLines = [];
+    let changed = false;
+
+    for (let i = 0; i < originalLines.length; i++) {
+      const currentLine = originalLines[i];
+      const trimmedLine = currentLine.trim();
+
+      if (trimmedLine === marker) {
+        const nextLine = originalLines[i + 1] || '';
+        if (envLineRegex.test(nextLine.trim())) {
+          i += 1;
+        }
+        changed = true;
+        continue;
+      }
 
-    // 移除具体标记的环境变量（推荐方式）
-    content = content.replace(
-      new RegExp(`\\n?# Added by Coding-Tool for Codex \\[${envName}\\]\\nexport ${envName}=.*\\n?`, 'g'),
-      '\n'
-    );
+      if (envLineRegex.test(trimmedLine)) {
+        changed = true;
+        continue;
+      }
 
-    // 如果没有标记，也尝试移除（兼容旧数据）
-    content = content.replace(
-      new RegExp(`^export ${envName}=.*\\n?`, 'gm'),
-      ''
-    );
+      cleanedLines.push(currentLine);
+    }
 
-    // 清理多余的空行
-    content = content.replace(/\n\n\n+/g, '\n\n');
+    if (!changed) {
+      return { success: true };
+    }
 
-    fs.writeFileSync(configPath, content, 'utf8');
+    const normalized = compactBlankLines(cleanedLines);
+    const nextContent = normalized.length > 0 ? `${normalized.join('\n')}\n` : '';
+    writeFileAtomic(configPath, nextContent);
     return { success: true };
   } catch (err) {
     console.warn(`[Codex] Failed to remove env from shell config: ${err.message}`);
@@ -306,8 +528,8 @@ function setProxyConfig(proxyPort) {
     const shellInjectResult = injectEnvToShell('CC_PROXY_KEY', 'PROXY_KEY');
 
     // 获取 shell 配置文件路径用于提示信息
-    const shellConfigPath = getShellConfigPath();
-    const sourceCommand = process.env.SHELL?.includes('zsh') ? 'source ~/.zshrc' : 'source ~/.bashrc';
+    const shellConfigPath = shellInjectResult.path || getShellConfigPath();
+    const sourceCommand = getShellReloadCommand(shellConfigPath);
 
     console.log(`Codex settings updated to use proxy on port ${proxyPort}`);
     return {
@@ -341,7 +563,7 @@ function isProxyConfig() {
     const currentProvider = config.model_provider;
     if (currentProvider && config.model_providers && config.model_providers[currentProvider]) {
       const baseUrl = config.model_providers[currentProvider].base_url || '';
-      if (baseUrl.includes('127.0.0.1') && baseUrl.includes('10089')) {
+      if (baseUrl.includes('127.0.0.1') || baseUrl.includes('localhost')) {
         return true;
       }
     }

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

@@ -6,7 +6,7 @@ const os = require('os');
  * Codex 统计服务 - 数据采集和存储
  *
  * 文件结构：
- * ~/.claude/cc-tool/
+ * ~/.cc-tool/
  *   ├── codex-statistics.json         # Codex 总体统计
  *   └── codex-daily-stats/
  *       ├── 2025-12-05.json           # 每日汇总统计
@@ -15,7 +15,7 @@ const os = require('os');
 
 // 获取基础目录
 function getBaseDir() {
-  const dir = path.join(os.homedir(), '.claude', 'cc-tool');
+  const dir = path.join(os.homedir(), '.cc-tool');
   if (!fs.existsSync(dir)) {
     fs.mkdirSync(dir, { recursive: true });
   }