@adversity/coding-tool-x 3.1.0 → 3.1.2

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-sessions.js

@@ -3,6 +3,15 @@ const path = require('path');
 const { getCodexDir } = require('./codex-config');
 const { parseSession, parseSessionMeta, extractSessionMeta, readJSONL } = require('./codex-parser');
 
+const COUNTS_CACHE_TTL_MS = 30 * 1000;
+const FAST_META_READ_BYTES = 64 * 1024;
+const EMPTY_COUNTS = Object.freeze({ projectCount: 0, sessionCount: 0 });
+
+let countsCache = {
+  expiresAt: 0,
+  value: EMPTY_COUNTS
+};
+
 /**
  * 获取会话目录
  */
@@ -437,6 +446,7 @@ function deleteProject(projectName) {
     console.error('[Codex] Failed to clean session order:', err.message);
   }
 
+  invalidateProjectAndSessionCountsCache();
   return { success: true, deletedCount };
 }
 
@@ -524,6 +534,7 @@ function deleteSession(sessionId) {
     // 忽略别名不存在的错误
   }
 
+  invalidateProjectAndSessionCountsCache();
   return { success: true };
 }
 
@@ -577,6 +588,7 @@ function forkSession(sessionId) {
   forkRelations[newSessionId] = sessionId;
   saveForkRelations(forkRelations);
 
+  invalidateProjectAndSessionCountsCache();
   return {
     newSessionId,
     forkedFrom: sessionId,
@@ -628,19 +640,106 @@ function saveProjectOrder(order) {
   saveClaudeProjectOrder({ projectsDir: getCodexDir() }, order);
 }
 
+function invalidateProjectAndSessionCountsCache() {
+  countsCache.expiresAt = 0;
+}
+
+function extractCodexProjectNameFromMeta(metaPayload = {}) {
+  const repoUrl = metaPayload?.git?.repository_url || metaPayload?.git?.repositoryUrl;
+  if (typeof repoUrl === 'string' && repoUrl.trim()) {
+    const parsedName = repoUrl.split('/').pop();
+    if (parsedName) {
+      const normalized = parsedName.replace(/\.git$/i, '').trim();
+      if (normalized) return normalized;
+    }
+  }
+
+  const cwd = metaPayload?.cwd;
+  if (typeof cwd === 'string' && cwd.trim()) {
+    return path.basename(cwd.trim());
+  }
+
+  return '';
+}
+
+function readSessionMetaPayloadFast(filePath) {
+  let fd;
+  try {
+    fd = fs.openSync(filePath, 'r');
+    const buffer = Buffer.alloc(FAST_META_READ_BYTES);
+    const bytesRead = fs.readSync(fd, buffer, 0, FAST_META_READ_BYTES, 0);
+    if (bytesRead <= 0) return null;
+
+    const chunk = buffer.toString('utf8', 0, bytesRead);
+    const lines = chunk.split('\n');
+
+    for (const line of lines) {
+      const trimmed = line.trim();
+      if (!trimmed) continue;
+      let parsed;
+      try {
+        parsed = JSON.parse(trimmed);
+      } catch (err) {
+        continue;
+      }
+      if (parsed?.type === 'session_meta' && parsed?.payload && typeof parsed.payload === 'object') {
+        return parsed.payload;
+      }
+    }
+  } catch (err) {
+    return null;
+  } finally {
+    if (fd !== undefined) {
+      try {
+        fs.closeSync(fd);
+      } catch (err) {
+        // ignore close errors
+      }
+    }
+  }
+
+  return null;
+}
+
+function calculateProjectAndSessionCounts() {
+  const sessions = scanSessionFiles();
+  if (sessions.length === 0) {
+    return EMPTY_COUNTS;
+  }
+
+  const projectNames = new Set();
+  sessions.forEach((session) => {
+    const payload = readSessionMetaPayloadFast(session.filePath);
+    const projectName = extractCodexProjectNameFromMeta(payload || {});
+    if (projectName) {
+      projectNames.add(projectName);
+    }
+  });
+
+  return {
+    projectCount: projectNames.size,
+    sessionCount: sessions.length
+  };
+}
+
 /**
  * 获取 Codex 项目与会话数量（用于仪表盘轻量统计）
  */
 function getProjectAndSessionCounts() {
+  const now = Date.now();
+  if (countsCache.expiresAt > now) {
+    return countsCache.value;
+  }
+
   try {
-    const projects = getProjects();
-    const sessions = scanSessionFiles();
-    return {
-      projectCount: projects.length,
-      sessionCount: sessions.length
+    const counts = calculateProjectAndSessionCounts();
+    countsCache = {
+      value: counts,
+      expiresAt: now + COUNTS_CACHE_TTL_MS
     };
+    return counts;
   } catch (err) {
-    return { projectCount: 0, sessionCount: 0 };
+    return countsCache.value || EMPTY_COUNTS;
   }
 }