@adversity/coding-tool-x 3.1.0 → 3.1.2

package/src/server/services/env-manager.js

@@ -6,15 +6,77 @@
 
 const fs = require('fs');
 const path = require('path');
-const os = require('os');
+const { PATHS, ensureStorageDirMigrated } = require('../../config/paths');
 
 // 备份目录
-const BACKUP_DIR = path.join(os.homedir(), '.claude', 'cc-tool', 'env-backups');
+const BACKUP_DIR = PATHS.envBackups;
+
+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, 'utf-8');
+    fs.renameSync(tempPath, filePath);
+  } finally {
+    if (fs.existsSync(tempPath)) {
+      try {
+        fs.unlinkSync(tempPath);
+      } catch (cleanupErr) {
+        // ignore cleanup errors
+      }
+    }
+  }
+}
+
+function escapeRegex(value) {
+  return String(value || '').replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+
+function isPowerShellProfile(filePath) {
+  return String(filePath || '').toLowerCase().endsWith('.ps1');
+}
+
+function matchesVarAssignment(line, varName, usePowerShell) {
+  if (!line || !varName) {
+    return false;
+  }
+
+  const escaped = escapeRegex(varName);
+  const regex = usePowerShell
+    ? new RegExp(`^\\s*\\$env:${escaped}\\s*=`, 'i')
+    : new RegExp(`^\\s*(?:export\\s+)?${escaped}=`);
+  return regex.test(line.trim());
+}
+
+function formatExportLine(varName, value, usePowerShell) {
+  if (usePowerShell) {
+    const escapedValue = String(value ?? '')
+      .replace(/`/g, '``')
+      .replace(/"/g, '`"');
+    return `$env:${varName} = "${escapedValue}"`;
+  }
+
+  const escapedValue = String(value ?? '')
+    .replace(/\\/g, '\\\\')
+    .replace(/"/g, '\\"')
+    .replace(/\$/g, '\\$')
+    .replace(/`/g, '\\`');
+  return `export ${varName}="${escapedValue}"`;
+}
 
 /**
  * 确保备份目录存在
  */
 function ensureBackupDir() {
+  ensureStorageDirMigrated();
   if (!fs.existsSync(BACKUP_DIR)) {
     fs.mkdirSync(BACKUP_DIR, { recursive: true });
   }
@@ -62,11 +124,15 @@ function deleteEnvVars(conflicts) {
     }
   }
 
+  // 同步清理当前服务进程中的同名变量，避免“删除后立即复检仍提示冲突”
+  const clearedProcessVars = clearProcessEnvVars(conflicts);
+
   return {
     backupPath: backupInfo.backupPath,
     timestamp: backupInfo.timestamp,
     results,
-    processConflictsSkipped: processConflicts.length
+    processConflictsSkipped: processConflicts.length,
+    clearedProcessVars
   };
 }
 
@@ -112,9 +178,14 @@ function getOriginalValue(conflict) {
 
     if (line) {
       const match = line.match(/^(?:export\s+)?[A-Z_][A-Z0-9_]*=(.*)$/);
-      if (match) {
+      if (match && match[1] !== undefined) {
         return cleanValue(match[1]);
       }
+
+      const psMatch = line.match(/^\s*\$env:[A-Z_][A-Z0-9_]*\s*=\s*(.*)$/i);
+      if (psMatch && psMatch[1] !== undefined) {
+        return cleanValue(psMatch[1]);
+      }
     }
   } catch (err) {
     // 忽略
@@ -153,6 +224,30 @@ function groupByFile(conflicts) {
   return groups;
 }
 
+/**
+ * 清理当前 Node 进程中的环境变量
+ */
+function clearProcessEnvVars(conflicts) {
+  const names = new Set();
+
+  for (const conflict of conflicts || []) {
+    const varName = String(conflict?.varName || '').trim();
+    if (varName) {
+      names.add(varName);
+    }
+  }
+
+  const cleared = [];
+  for (const varName of names) {
+    if (Object.prototype.hasOwnProperty.call(process.env, varName)) {
+      delete process.env[varName];
+      cleared.push(varName);
+    }
+  }
+
+  return cleared;
+}
+
 /**
  * 从文件中移除环境变量
  */
@@ -162,18 +257,44 @@ function removeVarsFromFile(filePath, vars) {
   }
 
   const content = fs.readFileSync(filePath, 'utf-8');
-  const lines = content.split('\n');
+  const lines = content.split(/\r?\n/);
+  const usePowerShell = isPowerShellProfile(filePath);
+
+  // 收集要删除的行号（优先使用行号，行号不匹配时按变量名回退）
+  const lineNumbersToRemove = new Set();
+  for (const item of vars) {
+    const varName = String(item.varName || '').trim();
+    if (!varName) continue;
+
+    const lineIndex = Number(item.lineNumber) - 1;
+    if (
+      Number.isInteger(lineIndex) &&
+      lineIndex >= 0 &&
+      lineIndex < lines.length &&
+      matchesVarAssignment(lines[lineIndex], varName, usePowerShell)
+    ) {
+      lineNumbersToRemove.add(lineIndex);
+      continue;
+    }
 
-  // 收集要删除的行号
-  const lineNumbersToRemove = new Set(vars.map(v => v.lineNumber));
+    const fallbackIndex = lines.findIndex(line => matchesVarAssignment(line, varName, usePowerShell));
+    if (fallbackIndex >= 0) {
+      lineNumbersToRemove.add(fallbackIndex);
+    }
+  }
 
-  // 过滤掉要删除的行
-  const newLines = lines.filter((_, index) => !lineNumbersToRemove.has(index + 1));
+  if (lineNumbersToRemove.size === 0) {
+    console.log(`[EnvManager] No matching vars found in ${filePath}, skip writing`);
+    return;
+  }
 
-  // 写回文件
-  fs.writeFileSync(filePath, newLines.join('\n'), 'utf-8');
+  const newLines = lines.filter((_, index) => !lineNumbersToRemove.has(index));
+  const nextContent = newLines.join('\n');
+  if (nextContent !== content) {
+    writeFileAtomic(filePath, nextContent);
+  }
 
-  console.log(`[EnvManager] Removed ${vars.length} var(s) from ${filePath}`);
+  console.log(`[EnvManager] Removed ${lineNumbersToRemove.size} var(s) from ${filePath}`);
 }
 
 /**
@@ -255,21 +376,36 @@ function restoreFromBackup(backupPath) {
  * 恢复环境变量到文件
  */
 function restoreVarToFile(filePath, varName, value) {
+  const usePowerShell = isPowerShellProfile(filePath);
+  const exportLine = formatExportLine(varName, value, usePowerShell);
   let content = '';
 
   if (fs.existsSync(filePath)) {
     content = fs.readFileSync(filePath, 'utf-8');
-    // 确保末尾有换行
-    if (!content.endsWith('\n')) {
-      content += '\n';
+  }
+
+  const lines = content ? content.split(/\r?\n/) : [];
+  let replaced = false;
+
+  for (let i = 0; i < lines.length; i++) {
+    if (matchesVarAssignment(lines[i], varName, usePowerShell)) {
+      lines[i] = exportLine;
+      replaced = true;
     }
   }
 
-  // 添加环境变量
-  const exportLine = `export ${varName}="${value}"`;
-  content += exportLine + '\n';
+  if (!replaced) {
+    while (lines.length > 0 && lines[lines.length - 1].trim() === '') {
+      lines.pop();
+    }
+    if (lines.length > 0) {
+      lines.push('');
+    }
+    lines.push(exportLine);
+  }
 
-  fs.writeFileSync(filePath, content, 'utf-8');
+  const nextContent = `${lines.join('\n')}\n`;
+  writeFileAtomic(filePath, nextContent);
 
   console.log(`[EnvManager] Restored ${varName} to ${filePath}`);
 }

package/src/server/services/favorites.js

@@ -2,7 +2,7 @@ const fs = require('fs');
 const path = require('path');
 const os = require('os');
 
-const FAVORITES_DIR = path.join(os.homedir(), '.claude', 'cc-tool');
+const FAVORITES_DIR = path.join(os.homedir(), '.cc-tool');
 const FAVORITES_FILE = path.join(FAVORITES_DIR, 'favorites.json');
 
 // 内存缓存
@@ -12,7 +12,8 @@ let cacheInitialized = false;
 const DEFAULT_FAVORITES = {
   claude: [],
   codex: [],
-  gemini: []
+  gemini: [],
+  opencode: []
 };
 
 // Ensure favorites directory exists
@@ -36,7 +37,8 @@ function readFavoritesFromFile() {
     return {
       claude: data.claude || [],
       codex: data.codex || [],
-      gemini: data.gemini || []
+      gemini: data.gemini || [],
+      opencode: data.opencode || []
     };
   } catch (error) {
     console.error('Error reading favorites file:', error);

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

@@ -16,6 +16,14 @@ const crypto = require('crypto');
  * - 使用 weight 和 maxConcurrency 控制负载均衡
  */
 
+function normalizeGatewaySourceType(value, fallback = 'gemini') {
+  const normalized = String(value || '').trim().toLowerCase();
+  if (normalized === 'claude') return 'claude';
+  if (normalized === 'codex') return 'codex';
+  if (normalized === 'gemini') return 'gemini';
+  return fallback;
+}
+
 // 获取 Gemini 配置目录
 function getGeminiDir() {
   return path.join(os.homedir(), '.gemini');
@@ -23,7 +31,7 @@ function getGeminiDir() {
 
 // 获取渠道存储文件路径
 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 });
   }
@@ -66,15 +74,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'
-      }));
+      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, 'gemini')
+        };
+      });
     }
     return data;
   } catch (err) {
@@ -119,7 +129,7 @@ function initializeFromEnv() {
         enabled: true,
         weight: 1,
         maxConcurrency: null,
-        authType: 'apiKey',
+        gatewaySourceType: 'gemini',
         createdAt: Date.now(),
         updatedAt: Date.now()
       };
@@ -177,9 +187,7 @@ function createChannel(name, baseUrl, apiKey, model = 'gemini-2.5-pro', extraCon
     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, 'gemini'),
     createdAt: Date.now(),
     updatedAt: Date.now()
   };
@@ -212,15 +220,17 @@ function updateChannel(channelId, updates) {
     }
   }
 
-  data.channels[index] = {
-    ...oldChannel,
-    ...updates,
+  const merged = { ...oldChannel, ...updates };
+  const nextChannel = {
+    ...merged,
     id: channelId, // 保持 ID 不变
     createdAt: oldChannel.createdAt, // 保持创建时间
     modelRedirects: updates.modelRedirects !== undefined ? updates.modelRedirects : (oldChannel.modelRedirects || []),
     speedTestModel: updates.speedTestModel !== undefined ? updates.speedTestModel : (oldChannel.speedTestModel || null),
+    gatewaySourceType: normalizeGatewaySourceType(merged.gatewaySourceType, 'gemini'),
     updatedAt: Date.now()
   };
+  data.channels[index] = nextChannel;
 
   // Get proxy status
   const { getGeminiProxyStatus } = require('../gemini-proxy-server');
@@ -284,8 +294,9 @@ function applyChannelToSettings(channelId, channels = null) {
   const envPath = path.join(geminiDir, '.env');
 
   // 构建 .env 内容
+  const effectiveApiKey = getEffectiveApiKey(channel) || '';
   const envContent = `GOOGLE_GEMINI_BASE_URL=${channel.baseUrl}
-GEMINI_API_KEY=${channel.apiKey}
+GEMINI_API_KEY=${effectiveApiKey}
 GEMINI_MODEL=${channel.model}
 `;
 
@@ -320,7 +331,7 @@ GEMINI_MODEL=${channel.model}
 }
 
 // 删除渠道
-function deleteChannel(channelId) {
+async function deleteChannel(channelId) {
   const data = loadChannels();
 
   const index = data.channels.findIndex(c => c.id === channelId);
@@ -359,8 +370,9 @@ function writeGeminiConfigForMultiChannel(allChannels) {
   }
 
   // 构建 .env 内容
+  const effectiveApiKey = getEffectiveApiKey(defaultChannel) || '';
   const envContent = `GOOGLE_GEMINI_BASE_URL=${defaultChannel.baseUrl}
-GEMINI_API_KEY=${defaultChannel.apiKey}
+GEMINI_API_KEY=${effectiveApiKey}
 GEMINI_MODEL=${defaultChannel.model}
 `;
 
@@ -397,31 +409,8 @@ function getEnabledChannels() {
   return data.channels.filter(c => c.enabled !== false);
 }
 
-/**
- * 获取渠道的有效 API Key
- * 如果是 OAuth 认证，尝试从 token 存储获取 access token
- * 否则返回渠道配置的 apiKey
- *
- * @param {Object} channel - 渠道对象
- * @returns {string|null} 有效的 API key 或 access token，OAuth 令牌无效/过期时返回 null
- */
 function getEffectiveApiKey(channel) {
-  if (channel.authType === 'oauth' && channel.oauthTokenId) {
-    try {
-      const { getToken, isTokenExpired } = require('./oauth-token-storage');
-      const token = getToken(channel.oauthTokenId);
-      if (token && !isTokenExpired(token)) {
-        return token.accessToken;
-      }
-      // OAuth 令牌无效或已过期，返回 null（调用方应处理刷新或报错）
-      console.warn(`[Gemini Channels] OAuth token expired or not found for channel ${channel.name}`);
-      return null;
-    } catch (err) {
-      console.error('[Gemini Channels] Failed to get OAuth token:', err.message);
-      return null;
-    }
-  }
-  return channel.apiKey;
+  return channel.apiKey || null;
 }
 
 // 保存渠道顺序

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

@@ -6,7 +6,7 @@ const os = require('os');
  * Gemini 统计服务 - 数据采集和存储
  *
  * 文件结构：
- * ~/.claude/cc-tool/
+ * ~/.cc-tool/
  *   ├── gemini-statistics.json         # Gemini 总体统计
  *   └── gemini-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 });
   }