@adversity/coding-tool-x 3.1.1 → 3.1.2

package/src/server/proxy-server.js

@@ -11,6 +11,7 @@ const DEFAULT_CONFIG = require('../config/default');
 const { resolvePricing, resolveModelPricing } = require('./utils/pricing');
 const { recordRequest } = require('./services/statistics-service');
 const { saveProxyStartTime, clearProxyStartTime, getProxyStartTime, getProxyRuntime } = require('./services/proxy-runtime');
+const { createDecodedStream } = require('./services/response-decoder');
 const eventBus = require('../plugins/event-bus');
 const { CLAUDE_MODEL_PRICING } = require('../config/model-pricing');
 const { getEffectiveApiKey } = require('./services/channels');
@@ -334,11 +335,12 @@ async function startProxyServer(options = {}) {
         cacheRead: 0,
         model: ''
       };
+      const parsedStream = createDecodedStream(proxyRes);
 
-      proxyRes.on('data', (chunk) => {
+      parsedStream.on('data', (chunk) => {
         if (isResponseClosed) return;
 
-        buffer += chunk.toString();
+        buffer += chunk.toString('utf8');
 
         const events = buffer.split('\n\n');
         buffer = events.pop() || '';
@@ -448,9 +450,9 @@ async function startProxyServer(options = {}) {
         }
       };
 
-      proxyRes.on('end', finalize);
+      parsedStream.on('end', finalize);
 
-      proxyRes.on('error', (err) => {
+      parsedStream.on('error', (err) => {
         if (err.code !== 'EPIPE' && err.code !== 'ECONNRESET') {
           console.error('Proxy response error:', err);
         }

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;
   }
 }
 

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

@@ -47,8 +47,11 @@ const SHELL_CONFIG_FILES = process.platform === 'win32'
   ? [
       '.bashrc',
       '.bash_profile',
+      '.bash_login',
       '.zshrc',
+      '.zshenv',
       '.zprofile',
+      '.zlogin',
       '.profile',
       path.join('Documents', 'PowerShell', 'Microsoft.PowerShell_profile.ps1'),
       path.join('Documents', 'WindowsPowerShell', 'Microsoft.PowerShell_profile.ps1')
@@ -56,8 +59,11 @@ const SHELL_CONFIG_FILES = process.platform === 'win32'
   : [
       '.bashrc',
       '.bash_profile',
+      '.bash_login',
       '.zshrc',
+      '.zshenv',
       '.zprofile',
+      '.zlogin',
       '.profile'
     ];
 
@@ -108,6 +114,10 @@ function checkProcessEnv(keywords) {
   const conflicts = [];
 
   for (const [key, value] of Object.entries(process.env)) {
+    if (!hasNonEmptyValue(value)) {
+      continue;
+    }
+
     if (matchesKeywords(key, keywords)) {
       conflicts.push({
         varName: key,
@@ -183,11 +193,17 @@ function parseConfigFile(filePath, keywords) {
 
       if (matched) {
         const [, varName, varValue] = matched;
+        const normalizedValue = cleanValue(varValue);
+
+        // 空值通常是占位或已清理状态，不再视为冲突
+        if (!hasNonEmptyValue(normalizedValue)) {
+          continue;
+        }
 
         if (matchesKeywords(varName, keywords)) {
           conflicts.push({
             varName,
-            varValue: maskSensitiveValue(cleanValue(varValue)),
+            varValue: maskSensitiveValue(normalizedValue),
             sourceType: 'file',
             sourcePath: `${filePath}:${i + 1}`,
             filePath,
@@ -266,6 +282,13 @@ function cleanValue(value) {
   return cleaned;
 }
 
+/**
+ * 判断值是否为非空
+ */
+function hasNonEmptyValue(value) {
+  return typeof value === 'string' && value.trim() !== '';
+}
+
 /**
  * 遮蔽敏感值
  */

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

@@ -124,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
   };
 }
 
@@ -220,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;
+}
+
 /**
  * 从文件中移除环境变量
  */

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

@@ -46,7 +46,8 @@ function loadChannels() {
           modelRedirects: ch.modelRedirects || [],
           speedTestModel: ch.speedTestModel || null,
           wireApi: ch.wireApi || 'openai',  // OpenCode 默认使用 OpenAI 兼容格式
-          gatewaySourceType: normalizeGatewaySourceType(ch.gatewaySourceType)
+          gatewaySourceType: normalizeGatewaySourceType(ch.gatewaySourceType),
+          allowedModels: ch.allowedModels || []
         };
         normalized.providerKey = deriveProviderKey(normalized);
         return normalized;
@@ -101,6 +102,7 @@ function createChannel(name, baseUrl, apiKey, extraConfig = {}) {
     providerKey: extraConfig.providerKey || null,
     presetId: extraConfig.presetId || null,
     websiteUrl: extraConfig.websiteUrl || '',
+    allowedModels: extraConfig.allowedModels || [],
     createdAt: Date.now(),
     updatedAt: Date.now()
   };