@adversity/coding-tool-x 3.1.1 → 3.1.3

package/src/server/proxy-server.js

@@ -8,11 +8,11 @@ const { recordSuccess, recordFailure } = require('./services/channel-health');
 const { broadcastLog, broadcastSchedulerState } = require('./websocket-server');
 const { loadConfig } = require('../config/loader');
 const DEFAULT_CONFIG = require('../config/default');
-const { resolvePricing, resolveModelPricing } = require('./utils/pricing');
+const { 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');
 
 let proxyServer = null;
@@ -94,8 +94,7 @@ function redirectModel(originalModel, channel) {
  * @returns {number} 成本（美元）
  */
 function calculateCost(model, tokens) {
-  const hardcodedPricing = CLAUDE_MODEL_PRICING[model] || {};
-  const pricing = resolveModelPricing('claude', model, hardcodedPricing, CLAUDE_BASE_PRICING);
+  const pricing = resolveModelPricing('claude', model, {}, CLAUDE_BASE_PRICING);
 
   const inputRate = typeof pricing.input === 'number' ? pricing.input : CLAUDE_BASE_PRICING.input;
   const outputRate = typeof pricing.output === 'number' ? pricing.output : CLAUDE_BASE_PRICING.output;
@@ -334,11 +333,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 +448,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/commands-service.js

@@ -12,9 +12,6 @@ const { RepoScannerBase } = require('./repo-scanner-base');
 const { NATIVE_PATHS } = require('../../config/paths');
 const {
   parseCommandContent,
-  detectCommandFormat,
-  convertCommandToCodex,
-  convertCommandToClaude,
   parseFrontmatter
 } = require('./format-converter');
 
@@ -569,32 +566,6 @@ class CommandsService {
 
   // ==================== 格式转换 ====================
 
-  /**
-   * 转换命令格式
-   * @param {string} content - 命令内容
-   * @param {string} targetFormat - 目标格式 ('claude' | 'codex')
-   */
-  convertCommandFormat(content, targetFormat) {
-    const sourceFormat = detectCommandFormat(content);
-
-    if (sourceFormat === targetFormat) {
-      return { content, warnings: [], format: targetFormat };
-    }
-
-    if (targetFormat === 'codex') {
-      return convertCommandToCodex(content);
-    } else {
-      return convertCommandToClaude(content);
-    }
-  }
-
-  /**
-   * 检测命令格式
-   * @param {string} content - 命令内容
-   */
-  detectFormat(content) {
-    return detectCommandFormat(content);
-  }
 }
 
 module.exports = {

package/src/server/services/config-templates-service.js

@@ -28,6 +28,7 @@ const BUILTIN_TEMPLATES = [
     id: 'full-stack',
     name: '全栈开发',
     description: '前后端全栈开发配置，包含代码编辑、文档查询、版本控制等常用工具',
+    cliType: 'claude',
     // 兼容旧字段
     claudeMd: { enabled: false, content: '' },
     // 新的多 AI 配置
@@ -159,6 +160,7 @@ You are an experienced full-stack developer focused on delivering high-quality c
     id: 'architecture',
     name: '方案设计',
     description: '专注于技术方案设计、架构评审、系统设计，适合需求分析和技术决策场景',
+    cliType: 'claude',
     claudeMd: { enabled: false, content: '' },
     aiConfigs: {
       claude: {
@@ -308,6 +310,7 @@ You are a senior technical architect focused on system design and technical plan
     id: 'code-review',
     name: '代码审查',
     description: '专注于代码审查、质量评估、安全检查，适合 PR Review 和代码质量改进',
+    cliType: 'claude',
     claudeMd: { enabled: false, content: '' },
     aiConfigs: {
       claude: {
@@ -467,6 +470,7 @@ For each issue:
     id: 'minimal',
     name: '最小配置',
     description: '纯净环境，不添加任何额外配置，适合已有完善配置的项目',
+    cliType: 'claude',
     claudeMd: { enabled: false, content: '' },
     aiConfigs: {
       claude: { enabled: false, content: '' },
@@ -619,6 +623,7 @@ function createCustomTemplate(template) {
     id,
     name: template.name,
     description: template.description || '',
+    cliType: template.cliType || 'claude',
     claudeMd: template.claudeMd || { enabled: false, content: '' },
     aiConfigs: normalizeAiConfigs(template.aiConfigs, template.claudeMd),
     skills: template.skills || [],
@@ -651,6 +656,7 @@ function updateCustomTemplate(id, updates) {
   custom[index] = {
     ...custom[index],
     ...updates,
+    cliType: updates.cliType !== undefined ? updates.cliType : (custom[index].cliType || 'claude'),
     aiConfigs: normalizeAiConfigs(updates.aiConfigs || custom[index].aiConfigs, updates.claudeMd || custom[index].claudeMd),
     id: custom[index].id, // 保持 ID 不变
     isBuiltin: false,
@@ -971,12 +977,15 @@ function applyTemplateToProject(targetDir, templateId, options = {}) {
     }
   }
 
-  // 2. 写入 Agents
+  // 2. 写入 Agents（根据选中的 AI 类型决定写入哪些目录）
   if (template.agents?.length > 0) {
-    const agentTargets = [
-      { baseDir: path.join(targetDir, '.claude', 'agents'), prefix: '.claude/agents' },
-      { baseDir: path.join(targetDir, '.opencode', 'agents'), prefix: '.opencode/agents' }
-    ];
+    const agentTargets = [];
+    if (aiConfigTypes.includes('claude')) {
+      agentTargets.push({ baseDir: path.join(targetDir, '.claude', 'agents'), prefix: '.claude/agents' });
+    }
+    if (aiConfigTypes.includes('opencode')) {
+      agentTargets.push({ baseDir: path.join(targetDir, '.opencode', 'agents'), prefix: '.opencode/agents' });
+    }
 
     for (const target of agentTargets) {
       ensureDir(target.baseDir);
@@ -994,12 +1003,15 @@ function applyTemplateToProject(targetDir, templateId, options = {}) {
     }
   }
 
-  // 3. 写入 Commands
+  // 3. 写入 Commands（根据选中的 AI 类型决定写入哪些目录）
   if (template.commands?.length > 0) {
-    const commandTargets = [
-      { baseDir: path.join(targetDir, '.claude', 'commands'), prefix: '.claude/commands' },
-      { baseDir: path.join(targetDir, '.opencode', 'commands'), prefix: '.opencode/commands' }
-    ];
+    const commandTargets = [];
+    if (aiConfigTypes.includes('claude')) {
+      commandTargets.push({ baseDir: path.join(targetDir, '.claude', 'commands'), prefix: '.claude/commands' });
+    }
+    if (aiConfigTypes.includes('opencode')) {
+      commandTargets.push({ baseDir: path.join(targetDir, '.opencode', 'commands'), prefix: '.opencode/commands' });
+    }
 
     for (const target of commandTargets) {
       ensureDir(target.baseDir);
@@ -1189,16 +1201,16 @@ function previewTemplateApplication(targetDir, templateId, options = {}) {
     preview.summary.skills = template.skills.length;
   }
 
-  // 检查 Agents
+  // 检查 Agents（根据选中的 AI 类型决定预览哪些目录）
   if (template.agents?.length > 0) {
+    const agentPrefixes = [];
+    if (aiConfigTypes.includes('claude')) agentPrefixes.push('.claude/agents');
+    if (aiConfigTypes.includes('opencode')) agentPrefixes.push('.opencode/agents');
+
     for (const agent of template.agents) {
       const fileName = agent.fileName || agent.name.toLowerCase().replace(/\s+/g, '-');
-      const relativePaths = [
-        `.claude/agents/${fileName}.md`,
-        `.opencode/agents/${fileName}.md`
-      ];
-
-      for (const relativePath of relativePaths) {
+      for (const prefix of agentPrefixes) {
+        const relativePath = `${prefix}/${fileName}.md`;
         const fullPath = path.join(targetDir, relativePath);
         if (fs.existsSync(fullPath)) {
           preview.willOverwrite.push(relativePath);
@@ -1210,19 +1222,17 @@ function previewTemplateApplication(targetDir, templateId, options = {}) {
     }
   }
 
-  // 检查 Commands
+  // 检查 Commands（根据选中的 AI 类型决定预览哪些目录）
   if (template.commands?.length > 0) {
+    const commandPrefixes = [];
+    if (aiConfigTypes.includes('claude')) commandPrefixes.push('.claude/commands');
+    if (aiConfigTypes.includes('opencode')) commandPrefixes.push('.opencode/commands');
+
     for (const command of template.commands) {
-      const relativePaths = [
-        command.namespace
-          ? `.claude/commands/${command.namespace}/${command.name}.md`
-          : `.claude/commands/${command.name}.md`,
-        command.namespace
-          ? `.opencode/commands/${command.namespace}/${command.name}.md`
-          : `.opencode/commands/${command.name}.md`
-      ];
-
-      for (const relativePath of relativePaths) {
+      for (const prefix of commandPrefixes) {
+        const relativePath = command.namespace
+          ? `${prefix}/${command.namespace}/${command.name}.md`
+          : `${prefix}/${command.name}.md`;
         const fullPath = path.join(targetDir, relativePath);
         if (fs.existsSync(fullPath)) {
           preview.willOverwrite.push(relativePath);

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

@@ -8,6 +8,7 @@
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
+const crypto = require('crypto');
 
 // 各平台需要检测的环境变量关键词
 const PLATFORM_KEYWORDS = {
@@ -47,8 +48,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 +60,11 @@ const SHELL_CONFIG_FILES = process.platform === 'win32'
   : [
       '.bashrc',
       '.bash_profile',
+      '.bash_login',
       '.zshrc',
+      '.zshenv',
       '.zprofile',
+      '.zlogin',
       '.profile'
     ];
 
@@ -86,8 +93,10 @@ function checkEnvConflicts(platform = null) {
   // 3. 检测系统配置文件
   conflicts.push(...checkSystemConfigs(keywords));
 
-  // 去重（同一变量可能在多处定义）
-  return deduplicateConflicts(conflicts);
+  // 去重 + 只保留“真实冲突”（同名变量在多个来源且值不一致）
+  const deduplicated = deduplicateConflicts(conflicts);
+  const realConflicts = filterRealConflicts(deduplicated);
+  return sanitizeConflicts(realConflicts);
 }
 
 /**
@@ -108,10 +117,15 @@ 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,
         varValue: maskSensitiveValue(value),
+        valueFingerprint: hashValue(value),
         sourceType: 'process',
         sourcePath: 'Process Environment',
         platform: detectPlatform(key)
@@ -183,11 +197,18 @@ 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),
+            valueFingerprint: hashValue(normalizedValue),
             sourceType: 'file',
             sourcePath: `${filePath}:${i + 1}`,
             filePath,
@@ -219,17 +240,17 @@ function parseConfigFile(filePath, keywords) {
 function matchesKeywords(varName, keywords) {
   const upperName = varName.toUpperCase();
 
-  // 首先检查是否包含平台关键词
-  const hasKeyword = keywords.some(keyword => upperName.includes(keyword));
-  if (!hasKeyword) {
-    return false;
-  }
-
   // 检查是否精确匹配已知敏感变量
   if (EXACT_SENSITIVE_VARS.includes(upperName)) {
     return true;
   }
 
+  // 首先检查是否命中平台关键词（按 token 匹配，避免 OPENAI2 误判为 OPENAI）
+  const hasKeyword = keywords.some(keyword => matchesKeywordToken(upperName, keyword));
+  if (!hasKeyword) {
+    return false;
+  }
+
   // 检查是否以敏感后缀结尾
   const hasSensitiveSuffix = SENSITIVE_PATTERNS.some(suffix =>
     upperName.endsWith(suffix)
@@ -238,6 +259,16 @@ function matchesKeywords(varName, keywords) {
   return hasSensitiveSuffix;
 }
 
+function matchesKeywordToken(varName, keyword) {
+  const token = String(keyword || '').trim().toUpperCase();
+  if (!token) return false;
+
+  return varName === token ||
+    varName.startsWith(`${token}_`) ||
+    varName.endsWith(`_${token}`) ||
+    varName.includes(`_${token}_`);
+}
+
 /**
  * 检测变量属于哪个平台
  */
@@ -266,6 +297,13 @@ function cleanValue(value) {
   return cleaned;
 }
 
+/**
+ * 判断值是否为非空
+ */
+function hasNonEmptyValue(value) {
+  return typeof value === 'string' && value.trim() !== '';
+}
+
 /**
  * 遮蔽敏感值
  */
@@ -275,6 +313,56 @@ function maskSensitiveValue(value) {
   return value.substring(0, 4) + '****' + value.substring(value.length - 4);
 }
 
+function hashValue(value) {
+  return crypto
+    .createHash('sha256')
+    .update(String(value ?? ''), 'utf8')
+    .digest('hex');
+}
+
+function filterRealConflicts(conflicts) {
+  const grouped = new Map();
+
+  for (const conflict of conflicts) {
+    const key = String(conflict.varName || '').toUpperCase();
+    if (!grouped.has(key)) {
+      grouped.set(key, []);
+    }
+    grouped.get(key).push(conflict);
+  }
+
+  const results = [];
+  for (const group of grouped.values()) {
+    if (group.length < 2) {
+      continue;
+    }
+
+    const sourceCount = new Set(group.map(item => item.sourcePath)).size;
+    if (sourceCount < 2) {
+      continue;
+    }
+
+    const valueVariants = new Set(
+      group
+        .map(item => item.valueFingerprint)
+        .filter(Boolean)
+    );
+
+    // 同名变量在多个来源但值一致，不算冲突
+    if (valueVariants.size <= 1) {
+      continue;
+    }
+
+    results.push(...group);
+  }
+
+  return results;
+}
+
+function sanitizeConflicts(conflicts) {
+  return conflicts.map(({ valueFingerprint, ...rest }) => rest);
+}
+
 /**
  * 去重冲突列表
  */

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