@adversity/coding-tool-x 3.0.5 → 3.0.6

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

@@ -18,6 +18,10 @@ let currentPort = null;
 // 用于存储每个请求的元数据
 const requestMetadata = new Map();
 
+// 用于缓存已打印过的模型重定向规则，避免重复打印
+// 格式: { channelId: { "originalModel": "redirectedModel", ... } }
+const printedGeminiRedirectCache = new Map();
+
 // Gemini 模型定价（每百万 tokens 的价格，单位：美元）
 const PRICING = {
   'gemini-2.5-pro': { input: 1.25, output: 5 },
@@ -47,6 +51,27 @@ function resolveGeminiTarget(baseUrl = '', requestPath = '') {
   return target;
 }
 
+/**
+ * 应用模型重定向（精确匹配）
+ * @param {string} originalModel - 原始模型名称
+ * @param {object} channel - 渠道对象，包含 modelRedirects 数组
+ * @returns {string} 重定向后的模型名称
+ */
+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;
+}
+
 /**
  * 计算请求成本
  */
@@ -153,6 +178,27 @@ async function startGeminiProxyServer(options = {}) {
 
         broadcastSchedulerState('gemini', getSchedulerState('gemini'));
 
+        // 从 URL 中提取模型名称并应用重定向
+        // URL 格式: /models/gemini-2.5-pro:generateContent 或 /v1/models/gemini-2.5-pro:generateContent
+        const urlMatch = req.url.match(/\/models\/([\w.-]+)(:[^?]*)?/);
+        if (urlMatch) {
+          const originalModel = urlMatch[1];
+          const redirectedModel = redirectModel(originalModel, channel);
+
+          if (redirectedModel !== originalModel) {
+            // 替换 URL 中的模型名称
+            req.url = req.url.replace(`/models/${originalModel}`, `/models/${redirectedModel}`);
+
+            // 只在重定向规则变化时打印日志（避免每次请求都打印）
+            const cachedRedirects = printedGeminiRedirectCache.get(channel.id) || {};
+            if (cachedRedirects[originalModel] !== redirectedModel) {
+              cachedRedirects[originalModel] = redirectedModel;
+              printedGeminiRedirectCache.set(channel.id, cachedRedirects);
+              console.log(`[Gemini Model Redirect] ${originalModel} → ${redirectedModel} (channel: ${channel.name})`);
+            }
+          }
+        }
+
         const target = resolveGeminiTarget(channel.baseUrl, req.url);
 
         proxy.web(req, res, {
@@ -511,8 +557,22 @@ function getGeminiProxyStatus() {
   };
 }
 
+/**
+ * 清除指定渠道的模型重定向日志缓存
+ * 用于在渠道配置更新后触发重新打印日志
+ * @param {string} channelId - 渠道 ID
+ */
+function clearGeminiRedirectCache(channelId) {
+  if (channelId) {
+    printedGeminiRedirectCache.delete(channelId);
+  } else {
+    printedGeminiRedirectCache.clear();
+  }
+}
+
 module.exports = {
   startGeminiProxyServer,
   stopGeminiProxyServer,
-  getGeminiProxyStatus
+  getGeminiProxyStatus,
+  clearGeminiRedirectCache
 };

package/src/server/index.js

@@ -154,6 +154,9 @@ async function startServer(port) {
   // 配置同步 API
   app.use('/api/config-sync', require('./api/config-sync'));
 
+  // 配置注册表 API (集中管理 skills/commands/agents/rules 的启用/禁用)
+  app.use('/api/config-registry', require('./api/config-registry'));
+
   // 健康检查 API
   app.use('/api/health-check', require('./api/health-check')(config));
 

package/src/server/proxy-server.js

@@ -21,6 +21,10 @@ let currentPort = null;
 // 用于存储每个请求的元数据（用于 WebSocket 日志）
 const requestMetadata = new Map();
 
+// 用于缓存已打印过的模型重定向规则，避免重复打印
+// 格式: { channelId: { "originalModel": "redirectedModel", ... } }
+const printedRedirectCache = new Map();
+
 const CLAUDE_BASE_PRICING = DEFAULT_CONFIG.pricing.claude;
 const ONE_MILLION = 1000000;
 
@@ -225,7 +229,14 @@ async function startProxyServer(options = {}) {
             req.body.model = redirectedModel;
             // 更新 rawBody 以匹配修改后的 body
             req.rawBody = Buffer.from(JSON.stringify(req.body));
-            console.log(`[Model Redirect] ${originalModel} → ${redirectedModel} (channel: ${channel.name})`);
+
+            // 只在重定向规则变化时打印日志（避免每次请求都打印）
+            const cachedRedirects = printedRedirectCache.get(channel.id) || {};
+            if (cachedRedirects[originalModel] !== redirectedModel) {
+              cachedRedirects[originalModel] = redirectedModel;
+              printedRedirectCache.set(channel.id, cachedRedirects);
+              console.log(`[Model Redirect] ${originalModel} → ${redirectedModel} (channel: ${channel.name})`);
+            }
           }
         }
 
@@ -526,8 +537,22 @@ function getProxyStatus() {
   };
 }
 
+/**
+ * 清除指定渠道的模型重定向日志缓存
+ * 用于在渠道配置更新后触发重新打印日志
+ * @param {string} channelId - 渠道 ID
+ */
+function clearRedirectCache(channelId) {
+  if (channelId) {
+    printedRedirectCache.delete(channelId);
+  } else {
+    printedRedirectCache.clear();
+  }
+}
+
 module.exports = {
   startProxyServer,
   stopProxyServer,
-  getProxyStatus
+  getProxyStatus,
+  clearRedirectCache
 };

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

@@ -47,7 +47,9 @@ function loadChannels() {
         ...ch,
         enabled: ch.enabled !== false, // 默认启用
         weight: ch.weight || 1,
-        maxConcurrency: ch.maxConcurrency || null
+        maxConcurrency: ch.maxConcurrency || null,
+        modelRedirects: ch.modelRedirects || [],
+        speedTestModel: ch.speedTestModel || null
       }));
     }
     return data;
@@ -175,6 +177,8 @@ function createChannel(name, providerKey, baseUrl, apiKey, wireApi = 'responses'
     enabled: extraConfig.enabled !== false, // 默认启用
     weight: extraConfig.weight || 1,
     maxConcurrency: extraConfig.maxConcurrency || null,
+    modelRedirects: extraConfig.modelRedirects || [],
+    speedTestModel: extraConfig.speedTestModel || null,
     createdAt: Date.now(),
     updatedAt: Date.now()
   };
@@ -217,11 +221,13 @@ function updateChannel(channelId, updates) {
     }
   }
 
+  const merged = { ...oldChannel, ...updates };
   const newChannel = {
-    ...oldChannel,
-    ...updates,
+    ...merged,
     id: channelId, // 保持 ID 不变
     createdAt: oldChannel.createdAt, // 保持创建时间
+    modelRedirects: merged.modelRedirects || [],
+    speedTestModel: merged.speedTestModel !== undefined ? merged.speedTestModel : (oldChannel.speedTestModel || null),
     updatedAt: Date.now()
   };