@adversity/coding-tool-x 3.1.0 → 3.1.1

package/src/server/api/gemini-channels.js

@@ -12,9 +12,18 @@ const { getSchedulerState } = require('../services/channel-scheduler');
 const { getChannelHealthStatus, resetChannelHealth } = require('../services/channel-health');
 const { broadcastSchedulerState } = require('../websocket-server');
 const { isGeminiInstalled } = require('../services/gemini-config');
-const { testChannelSpeed, testMultipleChannels, getLatencyLevel } = require('../services/speed-test');
+const {
+  testChannelSpeed,
+  getLatencyLevel,
+  sanitizeBatchConcurrency,
+  runWithConcurrencyLimit
+} = require('../services/speed-test');
 const { clearGeminiRedirectCache } = require('../gemini-proxy-server');
-const { fetchModelsFromProvider } = require('../services/model-detector');
+const {
+  probeModelAvailability,
+  fetchModelsFromProvider
+} = require('../services/model-detector');
+const GEMINI_GATEWAY_SOURCE_TYPE = 'gemini';
 
 module.exports = (config) => {
   /**
@@ -57,11 +66,46 @@ module.exports = (config) => {
         return res.status(404).json({ error: '渠道不存在' });
       }
 
-      // Gemini 渠道尝试作为 OpenAI 兼容获取，失败则回退
-      const result = await fetchModelsFromProvider(channel, 'openai_compatible');
+      const gatewaySourceType = GEMINI_GATEWAY_SOURCE_TYPE;
+      const listResult = await fetchModelsFromProvider(channel, 'openai_compatible');
+      const listedModels = Array.isArray(listResult.models) ? listResult.models : [];
+      let result;
+
+      if (listedModels.length > 0) {
+        result = {
+          models: listedModels,
+          supported: true,
+          cached: !!listResult.cached,
+          fallbackUsed: false,
+          lastChecked: listResult.lastChecked || new Date().toISOString(),
+          error: null,
+          errorHint: null
+        };
+      } else {
+        const usingConfiguredProbe = !!listResult.disabledByConfig;
+        const probe = await probeModelAvailability(channel, gatewaySourceType, {
+          stopOnFirstAvailable: false
+        });
+        const probedModels = Array.isArray(probe.availableModels) ? probe.availableModels : [];
+
+        result = {
+          models: probedModels,
+          supported: probedModels.length > 0,
+          cached: !!probe.cached || !!listResult.cached,
+          fallbackUsed: false,
+          lastChecked: probe.lastChecked || listResult.lastChecked || new Date().toISOString(),
+          error: probedModels.length > 0 ? null : (listResult.error || '无法获取可用模型'),
+          errorHint: probedModels.length > 0
+            ? (usingConfiguredProbe ? '已按设置跳过 /v1/models，使用默认模型探测结果' : '模型列表接口不可用，已自动切换为模型探测结果')
+            : (listResult.errorHint || (usingConfiguredProbe
+              ? '已按设置跳过 /v1/models，且默认模型探测无可用结果'
+              : '模型列表接口不可用且模型探测无可用结果'))
+        };
+      }
 
       res.json({
         channelId: id,
+        gatewaySourceType,
         models: result.models,
         supported: result.supported,
         cached: result.cached,
@@ -90,17 +134,38 @@ module.exports = (config) => {
         return res.status(404).json({ error: 'Gemini CLI not installed' });
       }
 
-      const { name, baseUrl, apiKey, model, websiteUrl, enabled, weight, maxConcurrency } = req.body;
+      const {
+        name,
+        baseUrl,
+        apiKey,
+        model,
+        websiteUrl,
+        enabled,
+        weight,
+        maxConcurrency,
+        modelRedirects,
+        speedTestModel,
+        presetId,
+        gatewaySourceType
+      } = req.body;
+
+      if (!name || !baseUrl) {
+        return res.status(400).json({ error: 'Missing required fields: name, baseUrl' });
+      }
 
-      if (!name || !baseUrl || !apiKey) {
-        return res.status(400).json({ error: 'Missing required fields: name, baseUrl, apiKey' });
+      if (!apiKey) {
+        return res.status(400).json({ error: 'Missing required fields: apiKey' });
       }
 
       const channel = createChannel(name, baseUrl, apiKey, model || 'gemini-2.5-pro', {
         websiteUrl,
         enabled,
         weight,
-        maxConcurrency
+        maxConcurrency,
+        modelRedirects: modelRedirects || [],
+        speedTestModel: speedTestModel || null,
+        presetId: presetId || null,
+        gatewaySourceType
       });
       res.json(channel);
       broadcastSchedulerState('gemini', getSchedulerState('gemini'));
@@ -138,14 +203,14 @@ module.exports = (config) => {
    * DELETE /api/gemini/channels/:channelId
    * 删除渠道
    */
-  router.delete('/:channelId', (req, res) => {
+  router.delete('/:channelId', async (req, res) => {
     try {
       if (!isGeminiInstalled()) {
         return res.status(404).json({ error: 'Gemini CLI not installed' });
       }
 
       const { channelId } = req.params;
-      const result = deleteChannel(channelId);
+      const result = await deleteChannel(channelId);
       res.json(result);
       broadcastSchedulerState('gemini', getSchedulerState('gemini'));
     } catch (err) {
@@ -215,8 +280,10 @@ module.exports = (config) => {
         return res.status(404).json({ error: '渠道不存在' });
       }
 
-      const result = await testChannelSpeed(channel, timeout, 'gemini');
+      const speedTestType = GEMINI_GATEWAY_SOURCE_TYPE;
+      const result = await testChannelSpeed(channel, timeout, speedTestType);
       result.level = getLatencyLevel(result.latency);
+      result.gatewaySourceType = speedTestType;
 
       res.json(result);
     } catch (error) {
@@ -235,18 +302,37 @@ module.exports = (config) => {
         return res.json({ results: [], message: 'Gemini CLI not installed' });
       }
 
-      const { timeout = 10000 } = req.body;
+      const { timeout = 10000, concurrency } = req.body || {};
       const data = getChannels();
       const channels = data.channels || [];
+      const safeConcurrency = sanitizeBatchConcurrency(concurrency);
 
       if (channels.length === 0) {
         return res.json({ results: [], message: '没有可测试的渠道' });
       }
 
-      // Gemini 渠道使用 'gemini' 类型
-      const results = await testMultipleChannels(channels, timeout, 'gemini');
-      results.forEach(r => {
-        r.level = getLatencyLevel(r.latency);
+      const results = await runWithConcurrencyLimit(
+        channels,
+        safeConcurrency,
+        async channel => {
+          const speedTestType = GEMINI_GATEWAY_SOURCE_TYPE;
+          const result = await testChannelSpeed(channel, timeout, speedTestType);
+          result.level = getLatencyLevel(result.latency);
+          result.gatewaySourceType = speedTestType;
+          return result;
+        }
+      );
+
+      // 成功在前，成功结果按延迟升序
+      results.sort((a, b) => {
+        if (a.success && !b.success) return -1;
+        if (!a.success && b.success) return 1;
+        if (a.success && b.success) {
+          const aLatency = (a.latency === null || a.latency === undefined) ? Infinity : a.latency;
+          const bLatency = (b.latency === null || b.latency === undefined) ? Infinity : b.latency;
+          return aLatency - bLatency;
+        }
+        return 0;
       });
 
       res.json({
@@ -255,7 +341,8 @@ module.exports = (config) => {
           total: results.length,
           success: results.filter(r => r.success).length,
           failed: results.filter(r => !r.success).length,
-          avgLatency: calculateAvgLatency(results)
+          avgLatency: calculateAvgLatency(results),
+          concurrency: safeConcurrency
         }
       });
     } catch (error) {
@@ -294,7 +381,9 @@ module.exports = (config) => {
 
 // 计算平均延迟
 function calculateAvgLatency(results) {
-  const successResults = results.filter(r => r.success && r.latency);
+  const successResults = results.filter(
+    r => r.success && r.latency !== null && r.latency !== undefined
+  );
   if (successResults.length === 0) return null;
   const sum = successResults.reduce((acc, r) => acc + r.latency, 0);
   return Math.round(sum / successResults.length);

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

@@ -14,9 +14,9 @@ const {
   hasBackup
 } = require('../services/gemini-settings-manager');
 const { getChannels, getEnabledChannels } = require('../services/gemini-channels');
+const { PATHS, ensureStorageDirMigrated } = require('../../config/paths');
 const fs = require('fs');
 const path = require('path');
-const os = require('os');
 
 function sanitizeChannel(channel) {
   if (!channel) return null;
@@ -26,14 +26,24 @@ function sanitizeChannel(channel) {
 
 // 保存激活渠道ID
 function saveActiveChannelId(channelId) {
-  const dir = path.join(os.homedir(), '.claude', 'cc-tool');
+  ensureStorageDirMigrated();
+  const filePath = PATHS.activeChannel.gemini;
+  const dir = path.dirname(filePath);
   if (!fs.existsSync(dir)) {
     fs.mkdirSync(dir, { recursive: true });
   }
-  const filePath = path.join(dir, 'gemini-active-channel.json');
   fs.writeFileSync(filePath, JSON.stringify({ activeChannelId: channelId }, null, 2), 'utf8');
 }
 
+function removeActiveChannelFile() {
+  ensureStorageDirMigrated();
+  const filePath = PATHS.activeChannel.gemini;
+  if (fs.existsSync(filePath)) {
+    fs.unlinkSync(filePath);
+    console.log('[Gemini Proxy] Removed gemini-active-channel.json');
+  }
+}
+
 // 获取代理状态
 router.get('/status', (req, res) => {
   try {
@@ -127,11 +137,7 @@ router.post('/stop', async (req, res) => {
       console.log('[Gemini Proxy] Restored settings from backup');
 
       // 删除 gemini-active-channel.json
-      const activeChannelPath = path.join(os.homedir(), '.claude', 'cc-tool', 'gemini-active-channel.json');
-      if (fs.existsSync(activeChannelPath)) {
-        fs.unlinkSync(activeChannelPath);
-        console.log('[Gemini Proxy] Removed gemini-active-channel.json');
-      }
+      removeActiveChannelFile();
 
       const response = {
         success: true,

package/src/server/api/gemini-sessions.js

@@ -359,7 +359,7 @@ module.exports = (config) => {
 
       try {
         // 获取终端启动命令
-        const { command, terminalId, terminalName } = getTerminalLaunchCommand(projectPath, null, geminiCommand);
+        const { command, terminalId, terminalName } = getTerminalLaunchCommand(projectPath, null, 'gemini', geminiCommand);
 
         console.log(`[Gemini] Launching terminal: ${terminalName} (${terminalId})`);
         console.log(`[Gemini] Resuming session: ${sessionId} (index ${resumeIndex})`);

package/src/server/api/health-check.js

@@ -7,10 +7,11 @@ module.exports = (config) => {
   /**
    * GET /api/health-check - 健康检查所有项目
    */
-  router.get('/', (req, res) => {
+  router.get('/', async (req, res) => {
     try {
-      const projects = getProjects(config);
-      const result = healthCheckAllProjects(projects);
+      const projects = await getProjects(config);
+      const projectList = Array.isArray(projects) ? projects : [];
+      const result = healthCheckAllProjects(projectList);
 
       res.json({
         success: true,

package/src/server/api/mcp.js

@@ -177,7 +177,7 @@ router.post('/import/:platform', async (req, res) => {
   try {
     const { platform } = req.params;
 
-    if (!['claude', 'codex', 'gemini'].includes(platform)) {
+    if (!['claude', 'codex', 'gemini', 'opencode'].includes(platform)) {
       return res.status(400).json({
         success: false,
         error: `无效的平台: ${platform}`
@@ -283,7 +283,7 @@ router.get('/export', (req, res) => {
   try {
     const format = req.query.format || 'json';
 
-    if (!['json', 'claude', 'codex'].includes(format)) {
+    if (!['json', 'claude', 'codex', 'opencode'].includes(format)) {
       return res.status(400).json({
         success: false,
         error: `无效的导出格式: ${format}`
@@ -312,7 +312,7 @@ router.get('/export/download', (req, res) => {
   try {
     const format = req.query.format || 'json';
 
-    if (!['json', 'claude', 'codex'].includes(format)) {
+    if (!['json', 'claude', 'codex', 'opencode'].includes(format)) {
       return res.status(400).json({
         success: false,
         error: `无效的导出格式: ${format}`