npm - coding-tool-x - Versions diffs - 3.4.0 → 3.4.1 - Mend

coding-tool-x 3.4.0 → 3.4.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (27) hide show

package/dist/web/index.html CHANGED Viewed

@@ -5,14 +5,14 @@
     <link rel="icon" href="/favicon.ico">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>CC-TOOL - ClaudeCode增强工作助手</title>
-    <script type="module" crossorigin src="/assets/index-D_WItvHE.js"></script>
+    <script type="module" crossorigin src="/assets/index-ClCqKpvX.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/markdown-DyTJGI4N.js">
     <link rel="modulepreload" crossorigin href="/assets/vue-vendor-3bf-fPGP.js">
     <link rel="modulepreload" crossorigin href="/assets/vendors-CKPV1OAU.js">
     <link rel="modulepreload" crossorigin href="/assets/naive-ui-Bdxp09n2.js">
     <link rel="modulepreload" crossorigin href="/assets/icons-B5Pl4lrD.js">
     <link rel="stylesheet" crossorigin href="/assets/markdown-BfC0goYb.css">
-    <link rel="stylesheet" crossorigin href="/assets/index-Dz7v9OM0.css">
+    <link rel="stylesheet" crossorigin href="/assets/index-5qy5NMIP.css">
   </head>
   <body>
     <div id="app"></div>

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "coding-tool-x",
-  "version": "3.4.0",
+  "version": "3.4.1",
   "description": "Vibe Coding 增强工作助手 - 智能会话管理、动态渠道切换、全局搜索、实时监控",
   "main": "src/index.js",
   "bin": {
@@ -14,6 +14,8 @@
     "test:codex-agents": "node scripts/test-codex-agents.js",
     "test:skills": "node scripts/test-skill-providers.js",
     "test:plugins-market": "node scripts/test-plugin-market-cache.js",
+    "test:unit": "vitest run",
+    "test:unit:watch": "vitest",
     "test:windows": "node scripts/test-windows-regression.js",
     "benchmark:codex": "node scripts/benchmark-codex-loading.js",
     "build:web": "cd src/web && npm run build",
@@ -77,7 +79,9 @@
     "systeminformation": "^5.31.4"
   },
   "devDependencies": {
-    "nodemon": "^3.0.2"
+    "@vitest/coverage-v8": "^4.1.0",
+    "nodemon": "^3.0.2",
+    "vitest": "^4.1.0"
   },
   "repository": {
     "type": "git",

package/src/server/codex-proxy-server.js CHANGED Viewed

@@ -14,6 +14,7 @@ const { createDecodedStream } = require('./services/response-decoder');
 const { getEffectiveApiKey } = require('./services/codex-channels');
 const { persistProxyRequestSnapshot } = require('./services/request-logger');
 const { publishUsageLog, publishFailureLog } = require('./services/proxy-log-helper');
+const { redirectModel, resolveTargetUrl } = require('./services/base/proxy-utils');
 let proxyServer = null;
 let proxyApp = null;
@@ -46,99 +47,10 @@ const PRICING = {
 const CODEX_BASE_PRICING = DEFAULT_CONFIG.pricing.codex;
 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);
+// detectModelTier, redirectModel, resolveTargetUrl imported from services/base/proxy-utils
-  // 优先级：层级特定配置 > 通用模型覆盖
-  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;
-}
-/**
- * 解析 Codex 代理目标 URL
- *
- * Codex CLI 发送请求到我们的代理时，请求路径格式：
- * - /v1/responses (OpenAI Responses API)
- * - /v1/chat/completions (OpenAI Chat Completions API)
- *
- * 渠道配置的 base_url 可能是:
- * - https://api.openai.com/v1
- * - https://example.com/openai/v1
- * - https://example.com
- *
- * 最终转发目标示例：
- * - base_url: https://example.com/openai/v1, path: /v1/responses
- *   -> target: https://example.com/openai, 最终: https://example.com/openai/v1/responses
- *
- * 这个函数返回要传给 http-proxy 的 target，http-proxy 会自动拼接 req.url
- */
-function resolveCodexTarget(baseUrl = '', requestPath = '') {
-  let target = baseUrl || '';
-  // 移除末尾斜杠
-  if (target.endsWith('/')) {
-    target = target.slice(0, -1);
-  }
-  // 核心逻辑：避免 /v1/v1 重复
-  // 如果 base_url 以 /v1 结尾，且请求路径以 /v1 开头，去掉 base_url 的 /v1
-  // 因为 http-proxy 会将 requestPath 追加到 target 后面
-  if (target.endsWith('/v1') && requestPath.startsWith('/v1')) {
-    target = target.slice(0, -3);
-  }
-  return target;
-}
+// resolveCodexTarget replaced by resolveTargetUrl from proxy-utils
+const resolveCodexTarget = resolveTargetUrl;
 /**
  * 计算请求成本

package/src/server/gemini-proxy-server.js CHANGED Viewed

@@ -14,6 +14,7 @@ const { createDecodedStream } = require('./services/response-decoder');
 const { getEffectiveApiKey } = require('./services/gemini-channels');
 const { persistProxyRequestSnapshot } = require('./services/request-logger');
 const { publishUsageLog, publishFailureLog } = require('./services/proxy-log-helper');
+const { redirectModel: redirectModelBase, resolveTargetUrl } = require('./services/base/proxy-utils');
 let proxyServer = null;
 let proxyApp = null;
@@ -45,36 +46,12 @@ const PRICING = {
 const GEMINI_BASE_PRICING = DEFAULT_CONFIG.pricing.gemini;
 const ONE_MILLION = 1000000;
-function resolveGeminiTarget(baseUrl = '', requestPath = '') {
-  let target = baseUrl || '';
-  if (target.endsWith('/')) {
-    target = target.slice(0, -1);
-  }
-  if (target.endsWith('/v1') && requestPath.startsWith('/v1')) {
-    target = target.slice(0, -3);
-  }
-  return target;
-}
+// resolveGeminiTarget replaced by resolveTargetUrl from proxy-utils
+const resolveGeminiTarget = resolveTargetUrl;
-/**
- * 应用模型重定向（精确匹配）
- * @param {string} originalModel - 原始模型名称
- * @param {object} channel - 渠道对象，包含 modelRedirects 数组
- * @returns {string} 重定向后的模型名称
- */
+// Gemini uses exact-match only redirect (no tier fallback)
 function redirectModel(originalModel, channel) {
-  if (!originalModel) return originalModel;
-  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;
-      }
-    }
-  }
-  return originalModel;
+  return redirectModelBase(originalModel, channel, { useTierFallback: false });
 }
 /**

package/src/server/opencode-proxy-server.js CHANGED Viewed

@@ -21,6 +21,7 @@ const { getEnabledChannels, getEffectiveApiKey } = require('./services/opencode-
 const { persistProxyRequestSnapshot, loadClaudeRequestTemplate } = require('./services/request-logger');
 const { probeModelAvailability, fetchModelsFromProvider } = require('./services/model-detector');
 const { publishUsageLog, publishFailureLog } = require('./services/proxy-log-helper');
+const { redirectModel, resolveTargetUrl } = require('./services/base/proxy-utils');
 let proxyServer = null;
 let proxyApp = null;
@@ -92,99 +93,8 @@ let cachedClaudeUserId = '';
 let cachedClaudeRequestTemplate = null;
 let cachedClaudeRequestTemplateAt = 0;
-/**
- * 检测模型层级
- * @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;
-}
-/**
- * 解析 OpenCode 代理目标 URL
- *
- * OpenCode CLI 发送请求到我们的代理时，请求路径格式：
- * - /v1/responses (OpenAI Responses API)
- * - /v1/chat/completions (OpenAI Chat Completions API)
- *
- * 渠道配置的 base_url 可能是:
- * - https://api.openai.com/v1
- * - https://example.com/openai/v1
- * - https://example.com
- *
- * 最终转发目标示例：
- * - base_url: https://example.com/openai/v1, path: /v1/responses
- *   -> target: https://example.com/openai, 最终: https://example.com/openai/v1/responses
- *
- * 这个函数返回要传给 http-proxy 的 target，http-proxy 会自动拼接 req.url
- */
-function resolveOpenCodeTarget(baseUrl = '', requestPath = '') {
-  let target = baseUrl || '';
-  // 移除末尾斜杠
-  if (target.endsWith('/')) {
-    target = target.slice(0, -1);
-  }
-  // 核心逻辑：避免 /v1/v1 重复
-  // 如果 base_url 以 /v1 结尾，且请求路径以 /v1 开头，去掉 base_url 的 /v1
-  // 因为 http-proxy 会将 requestPath 追加到 target 后面
-  if (target.endsWith('/v1') && requestPath.startsWith('/v1')) {
-    target = target.slice(0, -3);
-  }
-  return target;
-}
+// detectModelTier, redirectModel, resolveTargetUrl imported from services/base/proxy-utils
+const resolveOpenCodeTarget = resolveTargetUrl;
 /**
  * 计算请求成本

package/src/server/proxy-server.js CHANGED Viewed

@@ -19,6 +19,7 @@ const eventBus = require('../plugins/event-bus');
 const { getEffectiveApiKey } = require('./services/channels');
 const { persistProxyRequestSnapshot, persistClaudeRequestTemplate } = require('./services/request-logger');
 const { publishUsageLog, publishFailureLog } = require('./services/proxy-log-helper');
+const { redirectModel } = require('./services/base/proxy-utils');
 let proxyServer = null;
 let proxyApp = null;
@@ -34,63 +35,7 @@ const printedRedirectCache = new Map();
 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;
-}
+// detectModelTier and redirectModel imported from services/base/proxy-utils
 /**
  * 计算请求成本

package/src/server/services/base/base-channel-service.js ADDED Viewed

@@ -0,0 +1,247 @@
+/**
+ * BaseChannelService - 四平台渠道管理的公共基类
+ *
+ * 提取 channels.js / codex-channels.js / gemini-channels.js / opencode-channels.js
+ * 中的共享 CRUD、启用/禁用、单渠道强制等逻辑。
+ *
+ * 子类通过覆写钩子方法实现平台差异化行为。
+ */
+const fs = require('fs');
+const path = require('path');
+const crypto = require('crypto');
+const { normalizeGatewaySourceType, normalizeNumber } = require('./proxy-utils');
+class BaseChannelService {
+  /**
+   * @param {object} config
+   * @param {string} config.platform - 'claude'|'codex'|'gemini'|'opencode'
+   * @param {string} config.channelsFilePath - 渠道数据文件路径
+   * @param {string} [config.defaultGatewaySource] - 默认网关来源类型
+   * @param {Function} [config.isProxyRunning] - 返回代理是否运行中
+   */
+  constructor(config) {
+    this.platform = config.platform;
+    this.channelsFilePath = config.channelsFilePath;
+    this.defaultGatewaySource = config.defaultGatewaySource || config.platform;
+    this._isProxyRunning = config.isProxyRunning || (() => false);
+  }
+  // ── 文件 I/O ──
+  _ensureDir() {
+    const dir = path.dirname(this.channelsFilePath);
+    if (!fs.existsSync(dir)) {
+      fs.mkdirSync(dir, { recursive: true });
+    }
+  }
+  loadChannels() {
+    this._ensureDir();
+    try {
+      if (fs.existsSync(this.channelsFilePath)) {
+        const raw = JSON.parse(fs.readFileSync(this.channelsFilePath, 'utf8'));
+        const channels = Array.isArray(raw?.channels) ? raw.channels : [];
+        return { channels: channels.map(ch => this._applyDefaults(ch)) };
+      }
+    } catch (err) {
+      console.error(`[${this.platform}-channels] Error loading channels:`, err.message);
+    }
+    return { channels: [] };
+  }
+  saveChannels(data) {
+    this._ensureDir();
+    fs.writeFileSync(this.channelsFilePath, JSON.stringify(data, null, 2), 'utf8');
+  }
+  // ── 查询 ──
+  getChannels() {
+    return this.loadChannels();
+  }
+  getEnabledChannels() {
+    const data = this.loadChannels();
+    return data.channels.filter(ch => ch.enabled !== false);
+  }
+  // ── CRUD ──
+  createChannel(fields) {
+    const data = this.loadChannels();
+    // 子类可覆写的唯一性校验
+    this._validateUniqueness(data.channels, fields);
+    const channel = this._applyDefaults({
+      id: this._generateId(),
+      ...fields,
+      createdAt: Date.now(),
+      updatedAt: Date.now(),
+    });
+    data.channels.push(channel);
+    // 单渠道强制：代理未运行时只允许一个渠道启用
+    if (channel.enabled && !this._isProxyRunning()) {
+      this._enforceSingleChannel(data.channels, data.channels.length - 1);
+    }
+    this.saveChannels(data);
+    this._onAfterCreate(channel, data.channels);
+    return channel;
+  }
+  updateChannel(channelId, updates) {
+    const data = this.loadChannels();
+    const index = data.channels.findIndex(ch => ch.id === channelId);
+    if (index === -1) {
+      throw new Error('Channel not found');
+    }
+    const oldChannel = data.channels[index];
+    // 子类可覆写的唯一性校验（排除自身）
+    this._validateUniqueness(data.channels, updates, channelId);
+    const nextChannel = this._applyDefaults({
+      ...oldChannel,
+      ...updates,
+      id: channelId,
+      updatedAt: Date.now(),
+    });
+    data.channels[index] = nextChannel;
+    // 单渠道强制
+    const isProxyRunning = this._isProxyRunning();
+    if (!isProxyRunning && nextChannel.enabled && !oldChannel.enabled) {
+      this._enforceSingleChannel(data.channels, index);
+    }
+    this.saveChannels(data);
+    this._onAfterUpdate(oldChannel, nextChannel, data.channels);
+    return nextChannel;
+  }
+  deleteChannel(channelId) {
+    const data = this.loadChannels();
+    const index = data.channels.findIndex(ch => ch.id === channelId);
+    if (index === -1) {
+      throw new Error('Channel not found');
+    }
+    const removed = data.channels.splice(index, 1)[0];
+    this.saveChannels(data);
+    this._onAfterDelete(removed, data.channels);
+    return { success: true };
+  }
+  // ── 启用/禁用 ──
+  disableAllChannels() {
+    const data = this.loadChannels();
+    data.channels.forEach(ch => { ch.enabled = false; });
+    this.saveChannels(data);
+  }
+  applyChannelToSettings(channelId) {
+    const data = this.loadChannels();
+    const channel = data.channels.find(ch => ch.id === channelId);
+    if (!channel) {
+      throw new Error('Channel not found');
+    }
+    // 单渠道模式：只启用目标渠道
+    data.channels.forEach(ch => {
+      ch.enabled = ch.id === channelId;
+    });
+    this.saveChannels(data);
+    this._applyToNativeSettings(channel);
+    return channel;
+  }
+  // ── 排序 ──
+  saveChannelOrder(order) {
+    if (!Array.isArray(order)) return;
+    const data = this.loadChannels();
+    const channelMap = new Map(data.channels.map(ch => [ch.id, ch]));
+    const ordered = [];
+    for (const id of order) {
+      const ch = channelMap.get(id);
+      if (ch) {
+        ordered.push(ch);
+        channelMap.delete(id);
+      }
+    }
+    // 未在 order 中的渠道追加到末尾
+    for (const ch of channelMap.values()) {
+      ordered.push(ch);
+    }
+    data.channels = ordered;
+    this.saveChannels(data);
+  }
+  // ── API Key ──
+  getEffectiveApiKey(channel) {
+    return channel?.apiKey || null;
+  }
+  // ── 内部方法 ──
+  _generateId() {
+    return crypto.randomUUID();
+  }
+  _enforceSingleChannel(channels, enabledIndex) {
+    channels.forEach((ch, i) => {
+      if (i !== enabledIndex && ch.enabled) {
+        ch.enabled = false;
+      }
+    });
+    const name = channels[enabledIndex]?.name || channels[enabledIndex]?.id;
+    console.log(`[${this.platform}] Single-channel mode: enabled "${name}", disabled all others`);
+  }
+  // ── 子类钩子（默认空实现）──
+  /** 应用渠道默认值，子类覆写以添加平台特有字段 */
+  _applyDefaults(channel) {
+    const normalized = { ...channel };
+    if (normalized.enabled === undefined) {
+      normalized.enabled = true;
+    } else {
+      normalized.enabled = !!normalized.enabled;
+    }
+    normalized.weight = normalizeNumber(normalized.weight, 1, 100);
+    normalized.maxConcurrency = normalizeNumber(normalized.maxConcurrency, 0);
+    normalized.gatewaySourceType = normalizeGatewaySourceType(
+      normalized.gatewaySourceType,
+      this.defaultGatewaySource
+    );
+    return normalized;
+  }
+  /** 唯一性校验，子类覆写（如 Codex 的 providerKey、Gemini 的 name） */
+  _validateUniqueness(_channels, _fields, _excludeId) {
+    // 默认无校验
+  }
+  /** 创建后钩子 */
+  _onAfterCreate(_channel, _allChannels) {}
+  /** 更新后钩子 */
+  _onAfterUpdate(_oldChannel, _newChannel, _allChannels) {}
+  /** 删除后钩子 */
+  _onAfterDelete(_channel, _allChannels) {}
+  /** 将渠道配置写入平台原生设置文件，子类必须覆写 */
+  _applyToNativeSettings(_channel) {
+    throw new Error(`${this.platform}: _applyToNativeSettings not implemented`);
+  }
+}
+module.exports = BaseChannelService;