@adversity/coding-tool-x 3.0.3 → 3.0.5

package/src/server/proxy-server.js

@@ -12,6 +12,7 @@ const { resolvePricing, resolveModelPricing } = require('./utils/pricing');
 const { recordRequest } = require('./services/statistics-service');
 const { saveProxyStartTime, clearProxyStartTime, getProxyStartTime, getProxyRuntime } = require('./services/proxy-runtime');
 const eventBus = require('../plugins/event-bus');
+const { CLAUDE_MODEL_PRICING } = require('../config/model-pricing');
 
 let proxyServer = null;
 let proxyApp = null;
@@ -20,21 +21,67 @@ let currentPort = null;
 // 用于存储每个请求的元数据（用于 WebSocket 日志）
 const requestMetadata = new Map();
 
-// Claude API 定价（每百万 tokens 的价格，单位：美元）
-const PRICING = {
-  'claude-sonnet-4-5-20250929': { input: 3, output: 15, cacheCreation: 3.75, cacheRead: 0.30 },
-  'claude-sonnet-4-20250514': { input: 3, output: 15, cacheCreation: 3.75, cacheRead: 0.30 },
-  'claude-sonnet-3-5-20241022': { input: 3, output: 15, cacheCreation: 3.75, cacheRead: 0.30 },
-  'claude-sonnet-3-5-20240620': { input: 3, output: 15, cacheCreation: 3.75, cacheRead: 0.30 },
-  'claude-opus-4-20250514': { input: 15, output: 75, cacheCreation: 18.75, cacheRead: 1.50 },
-  'claude-opus-3-20240229': { input: 15, output: 75, cacheCreation: 18.75, cacheRead: 1.50 },
-  'claude-haiku-3-5-20241022': { input: 0.8, output: 4, cacheCreation: 1, cacheRead: 0.08 },
-  'claude-3-5-haiku-20241022': { input: 0.8, output: 4, cacheCreation: 1, cacheRead: 0.08 }
-};
-
 const CLAUDE_BASE_PRICING = DEFAULT_CONFIG.pricing.claude;
 const ONE_MILLION = 1000000;
 
+/**
+ * 检测模型层级
+ * @param {string} modelName - 模型名称
+ * @returns {string|null} 模型层级 (opus/sonnet/haiku) 或 null
+ */
+function detectModelTier(modelName) {
+  if (!modelName) return null;
+  const lower = modelName.toLowerCase();
+  if (lower.includes('opus')) return 'opus';
+  if (lower.includes('sonnet')) return 'sonnet';
+  if (lower.includes('haiku')) return 'haiku';
+  return null;
+}
+
+/**
+ * 应用模型重定向
+ * @param {string} originalModel - 原始模型名称
+ * @param {object} channel - 渠道对象，包含 modelConfig 和 modelRedirects
+ * @returns {string} 重定向后的模型名称
+ */
+function redirectModel(originalModel, channel) {
+  if (!originalModel) return originalModel;
+
+  // 优先使用新的 modelRedirects 数组格式
+  const modelRedirects = channel?.modelRedirects;
+  if (Array.isArray(modelRedirects) && modelRedirects.length > 0) {
+    for (const rule of modelRedirects) {
+      if (rule.from && rule.to && rule.from === originalModel) {
+        return rule.to;
+      }
+    }
+  }
+
+  // 向后兼容：使用旧的 modelConfig 格式
+  const modelConfig = channel?.modelConfig;
+  if (!modelConfig) return originalModel;
+
+  const tier = detectModelTier(originalModel);
+
+  // 优先级：层级特定配置 > 通用模型覆盖
+  if (tier === 'opus' && modelConfig.opusModel) {
+    return modelConfig.opusModel;
+  }
+  if (tier === 'sonnet' && modelConfig.sonnetModel) {
+    return modelConfig.sonnetModel;
+  }
+  if (tier === 'haiku' && modelConfig.haikuModel) {
+    return modelConfig.haikuModel;
+  }
+
+  // 回退到通用模型覆盖
+  if (modelConfig.model) {
+    return modelConfig.model;
+  }
+
+  return originalModel;
+}
+
 /**
  * 计算请求成本
  * @param {string} model - 模型名称
@@ -42,7 +89,7 @@ const ONE_MILLION = 1000000;
  * @returns {number} 成本（美元）
  */
 function calculateCost(model, tokens) {
-  const hardcodedPricing = PRICING[model] || {};
+  const hardcodedPricing = CLAUDE_MODEL_PRICING[model] || {};
   const pricing = resolveModelPricing('claude', model, hardcodedPricing, CLAUDE_BASE_PRICING);
 
   const inputRate = typeof pricing.input === 'number' ? pricing.input : CLAUDE_BASE_PRICING.input;
@@ -168,6 +215,20 @@ async function startProxyServer(options = {}) {
 
         req.selectedChannel = channel;
         req.sessionId = sessionId || null;
+
+        // 应用模型重定向（当 proxy 开启时）
+        if (req.body && req.body.model) {
+          const originalModel = req.body.model;
+          const redirectedModel = redirectModel(originalModel, channel);
+
+          if (redirectedModel !== originalModel) {
+            req.body.model = redirectedModel;
+            // 更新 rawBody 以匹配修改后的 body
+            req.rawBody = Buffer.from(JSON.stringify(req.body));
+            console.log(`[Model Redirect] ${originalModel} → ${redirectedModel} (channel: ${channel.name})`);
+          }
+        }
+
         let released = false;
 
         const release = () => {

package/src/server/services/channel-scheduler.js

@@ -74,7 +74,9 @@ function refreshChannels(source = 'claude') {
       baseUrl: ch.baseUrl,
       apiKey: ch.apiKey,
       weight: Math.max(1, Number(ch.weight) || 1),
-      maxConcurrency: ch.maxConcurrency ?? null
+      maxConcurrency: ch.maxConcurrency ?? null,
+      modelConfig: ch.modelConfig || null,
+      modelRedirects: ch.modelRedirects || []
     }));
 
   state.channels.forEach(ch => {

package/src/server/services/channels.js

@@ -187,6 +187,7 @@ function createChannel(name, baseUrl, apiKey, websiteUrl, extraConfig = {}) {
     maxConcurrency: extraConfig.maxConcurrency,
     presetId: extraConfig.presetId || 'official',
     modelConfig: extraConfig.modelConfig || null,
+    modelRedirects: extraConfig.modelRedirects || [],
     proxyUrl: extraConfig.proxyUrl || '',
     speedTestModel: extraConfig.speedTestModel || null
   });
@@ -215,8 +216,10 @@ function updateChannel(id, updates) {
     enabled: merged.enabled,
     presetId: merged.presetId,
     modelConfig: merged.modelConfig,
+    modelRedirects: merged.modelRedirects || [],
     proxyUrl: merged.proxyUrl,
-    speedTestModel: merged.speedTestModel
+    speedTestModel: merged.speedTestModel,
+    updatedAt: Date.now()
   });
 
   // Get proxy status

package/src/server/services/mcp-client.js

@@ -238,8 +238,15 @@ class McpClient extends EventEmitter {
       }, this._timeout);
 
       try {
+        // 确保 PATH 不被覆盖，优先使用用户提供的 env，但保留 PATH
+        const mergedEnv = { ...process.env, ...env };
+        // 如果用户提供的 env 中有 PATH，将其追加到系统 PATH 前面
+        if (env && env.PATH && process.env.PATH) {
+          mergedEnv.PATH = `${env.PATH}:${process.env.PATH}`;
+        }
+
         this._child = spawn(command, args, {
-          env: { ...process.env, ...env },
+          env: mergedEnv,
           stdio: ['pipe', 'pipe', 'pipe'],
           cwd: cwd || process.cwd()
         });
@@ -267,7 +274,15 @@ class McpClient extends EventEmitter {
 
       this._child.on('error', (err) => {
         if (err.code === 'ENOENT') {
-          settle(new McpClientError(`Command "${command}" not found. Ensure it is installed and in PATH.`));
+          const pathHint = mergedEnv.PATH
+            ? `\n  Current PATH: ${mergedEnv.PATH.split(':').slice(0, 5).join(':')}\n  (showing first 5 entries)`
+            : '\n  PATH is not set!';
+          settle(new McpClientError(
+            `Command "${command}" not found. Please check:\n` +
+            `  1. Is "${command}" installed?\n` +
+            `  2. Try using absolute path (e.g., /usr/bin/node or $(which ${command}))\n` +
+            `  3. Check your PATH environment variable${pathHint}`
+          ));
         } else {
           settle(new McpClientError(`Failed to start process: ${err.message}`));
         }

package/src/server/services/model-detector.js

@@ -13,11 +13,13 @@ const { URL } = require('url');
 // Model priority by channel type
 const MODEL_PRIORITY = {
   claude: [
-    'claude-haiku-3-5-20241022',
-    'claude-3-5-haiku-20241022',
-    'claude-sonnet-4-20250514',
+    'claude-opus-4-5-20250929',
     'claude-sonnet-4-5-20250929',
-    'claude-opus-4-20250514'
+    'claude-haiku-4-5-20250929',
+    'claude-sonnet-4-20250514',
+    'claude-opus-4-20250514',
+    'claude-haiku-3-5-20241022',
+    'claude-3-5-haiku-20241022'
   ],
   codex: ['gpt-4o-mini', 'gpt-4o', 'gpt-5-codex', 'o3'],
   gemini: ['gemini-2.5-flash', 'gemini-2.5-pro']

package/src/server/services/workspace-service.js

@@ -183,10 +183,80 @@ function createWorkspace(options) {
 
   const workspaceProjects = [];
 
+  /**
+   * 验证 worktree 分支冲突
+   * @param {Array} projects - 项目列表
+   * @returns {Array} 冲突列表 [{repo, branch, projects: [index1, index2]}]
+   */
+  function validateWorktreeBranches(projects) {
+    const repoMap = new Map();
+    const conflicts = [];
+
+    for (let i = 0; i < projects.length; i++) {
+      const proj = projects[i];
+      const { sourcePath, branch, createWorktree } = proj;
+
+      // Skip non-worktree projects
+      const isGit = isGitRepo(sourcePath);
+      const useWorktree = createWorktree !== undefined ? createWorktree : isGit;
+      if (!useWorktree || !isGit) continue;
+
+      // Resolve to absolute path to handle symlinks
+      const resolvedPath = fs.realpathSync(sourcePath);
+
+      // Determine target branch
+      let targetBranch = branch;
+      if (!targetBranch) {
+        try {
+          targetBranch = execSync('git rev-parse --abbrev-ref HEAD', {
+            cwd: sourcePath,
+            encoding: 'utf8'
+          }).trim();
+        } catch (e) {
+          targetBranch = 'main';
+        }
+      }
+
+      // Check for conflicts
+      if (!repoMap.has(resolvedPath)) {
+        repoMap.set(resolvedPath, new Map());
+      }
+
+      const branches = repoMap.get(resolvedPath);
+      if (branches.has(targetBranch)) {
+        const conflictingIndex = branches.get(targetBranch);
+        conflicts.push({
+          repo: resolvedPath,
+          branch: targetBranch,
+          projects: [conflictingIndex, i]
+        });
+      } else {
+        branches.set(targetBranch, i);
+      }
+    }
+
+    return conflicts;
+  }
+
+  // Validate branch uniqueness for worktree mode
+  const branchConflicts = validateWorktreeBranches(projects);
+  if (branchConflicts.length > 0) {
+    const conflict = branchConflicts[0];
+    const projectNames = conflict.projects.map(i => projects[i].name || `项目${i + 1}`).join(', ');
+    throw new Error(
+      `无法创建工作区：分支 '${conflict.branch}' 在同一仓库中被多个项目使用 (${projectNames})。\n` +
+      `仓库路径: ${conflict.repo}\n\n` +
+      `Git worktree 不允许在同一仓库的多个工作树中检出相同的分支。\n\n` +
+      `解决方案：\n` +
+      `1. 为不同项目指定不同的分支名\n` +
+      `2. 或者禁用其中一个项目的 worktree 模式（设置 createWorktree: false）`
+    );
+  }
+
   try {
     // 处理每个项目
     for (const proj of projects) {
-      const { sourcePath, name: linkName, branch } = proj;
+      const { sourcePath, name: linkName, branch, baseBranch } = proj;
       // useWorktree: 未指定时，Git 仓库默认 true，非 Git 仓库默认 false
       const isGit = isGitRepo(sourcePath);
       const useWorktree = proj.createWorktree !== undefined ? proj.createWorktree : isGit;
@@ -248,7 +318,15 @@ function createWorkspace(options) {
           } catch (error) {
             // 如果分支不存在，尝试创建新分支
             try {
-              execSync(`git worktree add "${worktreePath}" -b "${targetBranch}"`, {
+              // 构建 git worktree add 命令
+              let worktreeCmd = `git worktree add "${worktreePath}" -b "${targetBranch}"`;
+
+              // 如果指定了基础分支，添加到命令中
+              if (baseBranch && baseBranch.trim()) {
+                worktreeCmd += ` "${baseBranch}"`;
+              }
+
+              execSync(worktreeCmd, {
                 cwd: sourcePath,
                 stdio: 'pipe'
               });
@@ -258,7 +336,16 @@ function createWorkspace(options) {
                 path: worktreePath
               });
             } catch (err) {
-              // worktree 创建失败，回退到软链接模式
+              // Check if it's a "branch already checked out" error
+              if (err.message.includes('already checked out')) {
+                throw new Error(
+                  `无法创建 worktree：分支 '${targetBranch}' 已在其他工作树中检出。\n` +
+                  `错误详情: ${err.message}\n\n` +
+                  `提示：请为此项目指定不同的分支名，或禁用 worktree 模式。`
+                );
+              }
+
+              // For other errors, provide clear message but allow fallback
               console.warn(`创建 worktree 失败，使用软链接: ${err.message}`);
               targetPath = sourcePath;
               worktrees = getGitWorktrees(sourcePath);
@@ -472,7 +559,7 @@ function addProjectToWorkspace(workspaceId, projectConfig) {
     throw new Error('工作区不存在');
   }
 
-  const { sourcePath, name: linkName, branch } = projectConfig;
+  const { sourcePath, name: linkName, branch, baseBranch } = projectConfig;
   // useWorktree: 未指定时，Git 仓库默认 true，非 Git 仓库默认 false
   const isGit = isGitRepo(sourcePath);
   const useWorktree = projectConfig.createWorktree !== undefined ? projectConfig.createWorktree : isGit;
@@ -525,14 +612,48 @@ function addProjectToWorkspace(workspaceId, projectConfig) {
         targetPath = worktreePath;
         worktrees.push({ branch: targetBranch, path: worktreePath });
       } catch (error) {
+        // Check if branch is already checked out elsewhere
+        if (error.message && error.message.includes('already checked out')) {
+          throw new Error(
+            `无法添加项目：分支 '${targetBranch}' 已在其他工作树中检出。\n` +
+            `仓库路径: ${sourcePath}\n\n` +
+            `Git worktree 不允许在同一仓库的多个工作树中检出相同的分支。\n\n` +
+            `解决方案：\n` +
+            `1. 指定不同的分支名\n` +
+            `2. 或者禁用 worktree 模式（设置 createWorktree: false）`
+          );
+        }
+
+        // Branch doesn't exist, try creating it
         try {
-          execSync(`git worktree add "${worktreePath}" -b "${targetBranch}"`, {
+          // 构建 git worktree add 命令
+          let worktreeCmd = `git worktree add "${worktreePath}" -b "${targetBranch}"`;
+
+          // 如果指定了基础分支，添加到命令中
+          if (baseBranch && baseBranch.trim()) {
+            worktreeCmd += ` "${baseBranch}"`;
+          }
+
+          execSync(worktreeCmd, {
             cwd: sourcePath,
             stdio: 'pipe'
           });
           targetPath = worktreePath;
           worktrees.push({ branch: targetBranch, path: worktreePath });
         } catch (err) {
+          // Check for "already checked out" error in create branch attempt
+          if (err.message && err.message.includes('already checked out')) {
+            throw new Error(
+              `无法添加项目：分支 '${targetBranch}' 已在其他工作树中检出。\n` +
+              `仓库路径: ${sourcePath}\n\n` +
+              `Git worktree 不允许在同一仓库的多个工作树中检出相同的分支。\n\n` +
+              `解决方案：\n` +
+              `1. 指定不同的分支名\n` +
+              `2. 或者禁用 worktree 模式（设置 createWorktree: false）`
+            );
+          }
+
+          // Other errors: fall back to symlink mode
           console.warn(`创建 worktree 失败，使用软链接: ${err.message}`);
           targetPath = sourcePath;
           worktrees = getGitWorktrees(sourcePath);

package/src/server/utils/pricing.js

@@ -1,5 +1,6 @@
 const { loadConfig } = require('../../config/loader');
 const DEFAULT_CONFIG = require('../../config/default');
+const { CLAUDE_MODEL_PRICING, CLAUDE_MODEL_ALIASES } = require('../../config/model-pricing');
 
 const RATE_KEYS = ['input', 'output', 'cacheCreation', 'cacheRead', 'cached', 'reasoning'];
 
@@ -39,7 +40,7 @@ function resolvePricing(toolKey, modelPricing = {}, defaultPricing = {}) {
 function resolveModelPricing(toolKey, model, hardcodedPricing = {}, defaultPricing = {}) {
   const config = getPricingConfig(toolKey);
 
-  // 1. Check per-model config
+  // 1. Check user custom config for specific model first
   const modelConfig = config?.models?.[model];
   if (modelConfig && modelConfig.mode === 'custom') {
     const result = { ...hardcodedPricing };
@@ -51,7 +52,7 @@ function resolveModelPricing(toolKey, model, hardcodedPricing = {}, defaultPrici
     return result;
   }
 
-  // 2. Fall back to tool-level config
+  // 2. Check user custom config for tool-level
   if (config && config.mode === 'custom') {
     const result = { ...hardcodedPricing };
     RATE_KEYS.forEach((key) => {
@@ -62,7 +63,16 @@ function resolveModelPricing(toolKey, model, hardcodedPricing = {}, defaultPrici
     return result;
   }
 
-  // 3. Use hardcoded pricing
+  // 3. Use centralized hardcoded pricing for known models (mode: 'auto')
+  // Normalize model name using aliases
+  const normalizedModel = CLAUDE_MODEL_ALIASES[model] || model;
+  const centralizedPricing = CLAUDE_MODEL_PRICING[normalizedModel];
+
+  if (centralizedPricing) {
+    return { ...defaultPricing, ...centralizedPricing };
+  }
+
+  // 4. Fall back to base pricing for unknown models
   return { ...defaultPricing, ...hardcodedPricing };
 }