@adversity/coding-tool-x 3.0.6 → 3.1.1

package/src/server/api/agents.js

@@ -8,7 +8,24 @@ const express = require('express');
 const { AgentsService } = require('../services/agents-service');
 
 const router = express.Router();
-const agentsService = new AgentsService();
+const SUPPORTED_PLATFORMS = ['claude', 'opencode'];
+const agentServices = new Map();
+
+function resolvePlatform(rawPlatform) {
+  return SUPPORTED_PLATFORMS.includes(rawPlatform) ? rawPlatform : 'claude';
+}
+
+function getPlatform(req) {
+  return resolvePlatform(req.query?.platform || req.body?.platform);
+}
+
+function getAgentsService(req) {
+  const platform = getPlatform(req);
+  if (!agentServices.has(platform)) {
+    agentServices.set(platform, new AgentsService(platform));
+  }
+  return { platform, service: agentServices.get(platform) };
+}
 
 /**
  * 获取代理列表
@@ -17,11 +34,13 @@ const agentsService = new AgentsService();
  */
 router.get('/', (req, res) => {
   try {
+    const { platform, service } = getAgentsService(req);
     const { projectPath } = req.query;
-    const result = agentsService.listAgents(projectPath || null);
+    const result = service.listAgents(projectPath || null);
 
     res.json({
       success: true,
+      platform,
       ...result
     });
   } catch (err) {
@@ -39,11 +58,13 @@ router.get('/', (req, res) => {
  */
 router.get('/stats', (req, res) => {
   try {
+    const { platform, service } = getAgentsService(req);
     const { projectPath } = req.query;
-    const stats = agentsService.getStats(projectPath || null);
+    const stats = service.getStats(projectPath || null);
 
     res.json({
       success: true,
+      platform,
       ...stats
     });
   } catch (err) {
@@ -61,6 +82,7 @@ router.get('/stats', (req, res) => {
  */
 router.get('/:scope/:fileName', (req, res) => {
   try {
+    const { platform, service } = getAgentsService(req);
     const { scope, fileName } = req.params;
     const { projectPath } = req.query;
 
@@ -78,7 +100,7 @@ router.get('/:scope/:fileName', (req, res) => {
       });
     }
 
-    const agent = agentsService.getAgent(fileName, scope, projectPath || null);
+    const agent = service.getAgent(fileName, scope, projectPath || null);
 
     if (!agent) {
       return res.status(404).json({
@@ -89,6 +111,7 @@ router.get('/:scope/:fileName', (req, res) => {
 
     res.json({
       success: true,
+      platform,
       agent
     });
   } catch (err) {
@@ -107,6 +130,7 @@ router.get('/:scope/:fileName', (req, res) => {
  */
 router.post('/', (req, res) => {
   try {
+    const { platform, service } = getAgentsService(req);
     const { fileName, scope, projectPath, name, description, tools, model, permissionMode, skills, systemPrompt } = req.body;
 
     if (!fileName) {
@@ -130,7 +154,7 @@ router.post('/', (req, res) => {
       });
     }
 
-    const agent = agentsService.createAgent({
+    const agent = service.createAgent({
       fileName,
       scope,
       projectPath: projectPath || null,
@@ -145,6 +169,7 @@ router.post('/', (req, res) => {
 
     res.json({
       success: true,
+      platform,
       agent,
       message: '代理创建成功'
     });
@@ -163,6 +188,7 @@ router.post('/', (req, res) => {
  */
 router.put('/:scope/:fileName', (req, res) => {
   try {
+    const { platform, service } = getAgentsService(req);
     const { scope, fileName } = req.params;
     const { projectPath, name, description, tools, model, permissionMode, skills, systemPrompt } = req.body;
 
@@ -180,7 +206,7 @@ router.put('/:scope/:fileName', (req, res) => {
       });
     }
 
-    const agent = agentsService.updateAgent({
+    const agent = service.updateAgent({
       fileName,
       scope,
       projectPath: projectPath || null,
@@ -195,6 +221,7 @@ router.put('/:scope/:fileName', (req, res) => {
 
     res.json({
       success: true,
+      platform,
       agent,
       message: '代理更新成功'
     });
@@ -213,6 +240,7 @@ router.put('/:scope/:fileName', (req, res) => {
  */
 router.delete('/:scope/:fileName', (req, res) => {
   try {
+    const { platform, service } = getAgentsService(req);
     const { scope, fileName } = req.params;
     const { projectPath } = req.query;
 
@@ -230,9 +258,10 @@ router.delete('/:scope/:fileName', (req, res) => {
       });
     }
 
-    const result = agentsService.deleteAgent(fileName, scope, projectPath || null);
+    const result = service.deleteAgent(fileName, scope, projectPath || null);
 
     res.json({
+      platform,
       success: result.success,
       message: result.message
     });
@@ -254,12 +283,14 @@ router.delete('/:scope/:fileName', (req, res) => {
  */
 router.get('/all', async (req, res) => {
   try {
+    const { platform, service } = getAgentsService(req);
     const { projectPath, refresh } = req.query;
     const forceRefresh = refresh === '1';
-    const result = await agentsService.listAllAgents(projectPath || null, forceRefresh);
+    const result = await service.listAllAgents(projectPath || null, forceRefresh);
 
     res.json({
       success: true,
+      platform,
       ...result
     });
   } catch (err) {
@@ -277,9 +308,11 @@ router.get('/all', async (req, res) => {
  */
 router.get('/repos', (req, res) => {
   try {
-    const repos = agentsService.getRepos();
+    const { platform, service } = getAgentsService(req);
+    const repos = service.getRepos();
     res.json({
       success: true,
+      platform,
       repos
     });
   } catch (err) {
@@ -298,6 +331,7 @@ router.get('/repos', (req, res) => {
  */
 router.post('/repos', (req, res) => {
   try {
+    const { platform, service } = getAgentsService(req);
     const { owner, name, branch = 'main', directory = '', enabled = true } = req.body;
 
     if (!owner || !name) {
@@ -307,10 +341,11 @@ router.post('/repos', (req, res) => {
       });
     }
 
-    const repos = agentsService.addRepo({ owner, name, branch, directory, enabled });
+    const repos = service.addRepo({ owner, name, branch, directory, enabled });
 
     res.json({
       success: true,
+      platform,
       repos
     });
   } catch (err) {
@@ -329,12 +364,14 @@ router.post('/repos', (req, res) => {
  */
 router.delete('/repos/:owner/:name', (req, res) => {
   try {
+    const { platform, service } = getAgentsService(req);
     const { owner, name } = req.params;
     const { directory = '' } = req.query;
-    const repos = agentsService.removeRepo(owner, name, directory);
+    const repos = service.removeRepo(owner, name, directory);
 
     res.json({
       success: true,
+      platform,
       repos
     });
   } catch (err) {
@@ -353,13 +390,15 @@ router.delete('/repos/:owner/:name', (req, res) => {
  */
 router.put('/repos/:owner/:name/toggle', (req, res) => {
   try {
+    const { platform, service } = getAgentsService(req);
     const { owner, name } = req.params;
     const { enabled, directory = '' } = req.body;
 
-    const repos = agentsService.toggleRepo(owner, name, directory, enabled);
+    const repos = service.toggleRepo(owner, name, directory, enabled);
 
     res.json({
       success: true,
+      platform,
       repos
     });
   } catch (err) {
@@ -378,6 +417,7 @@ router.put('/repos/:owner/:name/toggle', (req, res) => {
  */
 router.post('/install', async (req, res) => {
   try {
+    const { platform, service } = getAgentsService(req);
     const agent = req.body;
 
     if (!agent || !agent.repoOwner || !agent.repoName) {
@@ -387,10 +427,11 @@ router.post('/install', async (req, res) => {
       });
     }
 
-    const result = await agentsService.installFromRemote(agent);
+    const result = await service.installFromRemote(agent);
 
     res.json({
       success: true,
+      platform,
       ...result
     });
   } catch (err) {
@@ -409,6 +450,7 @@ router.post('/install', async (req, res) => {
  */
 router.post('/uninstall', (req, res) => {
   try {
+    const { platform, service } = getAgentsService(req);
     const { fileName } = req.body;
 
     if (!fileName) {
@@ -418,10 +460,11 @@ router.post('/uninstall', (req, res) => {
       });
     }
 
-    const result = agentsService.uninstallAgent(fileName);
+    const result = service.uninstallAgent(fileName);
 
     res.json({
       success: true,
+      platform,
       ...result
     });
   } catch (err) {

package/src/server/api/channels.js

@@ -12,10 +12,19 @@ const {
 } = require('../services/channels');
 const { getSchedulerState } = require('../services/channel-scheduler');
 const { getChannelHealthStatus, getAllChannelHealthStatus, resetChannelHealth } = require('../services/channel-health');
-const { testChannelSpeed, testMultipleChannels, getLatencyLevel } = require('../services/speed-test');
-const { fetchModelsFromProvider } = require('../services/model-detector');
+const {
+  testChannelSpeed,
+  getLatencyLevel,
+  sanitizeBatchConcurrency,
+  runWithConcurrencyLimit
+} = require('../services/speed-test');
+const {
+  probeModelAvailability,
+  fetchModelsFromProvider
+} = require('../services/model-detector');
 const { broadcastLog, broadcastProxyState, broadcastSchedulerState } = require('../websocket-server');
 const { clearRedirectCache } = require('../proxy-server');
+const CLAUDE_GATEWAY_SOURCE_TYPE = 'claude';
 
 // GET /api/channels - Get all channels with health status
 router.get('/', (req, res) => {
@@ -66,16 +75,40 @@ router.get('/current', (req, res) => {
 // POST /api/channels - Create new channel
 router.post('/', (req, res) => {
   try {
-    const { name, baseUrl, apiKey, websiteUrl, enabled, weight, maxConcurrency } = req.body;
+    const {
+      name,
+      baseUrl,
+      apiKey,
+      websiteUrl,
+      enabled,
+      weight,
+      maxConcurrency,
+      presetId,
+      modelConfig,
+      modelRedirects,
+      proxyUrl,
+      speedTestModel,
+      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' });
+    if (!apiKey) {
+      return res.status(400).json({ error: 'Missing required fields: apiKey' });
     }
 
     const channel = createChannel(name, baseUrl, apiKey, websiteUrl, {
       enabled,
       weight,
-      maxConcurrency
+      maxConcurrency,
+      presetId,
+      modelConfig,
+      modelRedirects: modelRedirects || [],
+      proxyUrl: proxyUrl || '',
+      speedTestModel: speedTestModel || null,
+      gatewaySourceType
     });
     res.json({ channel });
     broadcastSchedulerState('claude', getSchedulerState('claude'));
@@ -114,10 +147,10 @@ router.put('/:id', (req, res) => {
 });
 
 // DELETE /api/channels/:id - Delete channel
-router.delete('/:id', (req, res) => {
+router.delete('/:id', async (req, res) => {
   try {
     const { id } = req.params;
-    const result = deleteChannel(id);
+    const result = await deleteChannel(id);
     res.json(result);
     broadcastSchedulerState('claude', getSchedulerState('claude'));
   } catch (error) {
@@ -213,9 +246,10 @@ router.post('/:id/speed-test', async (req, res) => {
       return res.status(404).json({ error: '渠道不存在' });
     }
 
-    // Claude 渠道使用 'claude' 类型
-    const result = await testChannelSpeed(channel, timeout, 'claude');
+    const speedTestType = CLAUDE_GATEWAY_SOURCE_TYPE;
+    const result = await testChannelSpeed(channel, timeout, speedTestType);
     result.level = getLatencyLevel(result.latency);
+    result.gatewaySourceType = speedTestType;
 
     res.json(result);
   } catch (error) {
@@ -228,12 +262,6 @@ router.post('/:id/speed-test', async (req, res) => {
 router.get('/:id/models', async (req, res) => {
   try {
     const { id } = req.params;
-    const VALID_CHANNEL_TYPES = ['claude', 'codex', 'gemini', 'openai_compatible'];
-    const { type = 'claude' } = req.query;
-
-    if (!VALID_CHANNEL_TYPES.includes(type)) {
-      return res.status(400).json({ error: 'Invalid channel type', channelId: id });
-    }
 
     const channels = getAllChannels();
     const channel = channels.find(ch => ch.id === id);
@@ -242,23 +270,53 @@ router.get('/:id/models', async (req, res) => {
       return res.status(404).json({ error: '渠道不存在' });
     }
 
-    // If no type specified or type is 'claude', auto-detect
-    let channelType = type;
-    if (!type || type === 'claude') {
-      const { detectChannelType } = require('../services/model-detector');
-      channelType = detectChannelType(channel);
-      console.log(`[API] Auto-detected channel type: ${channelType} for ${channel.name}`);
+    const gatewaySourceType = CLAUDE_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: probedModels.length > 0,
+        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，且默认模型探测无可用结果'
+            : '模型列表接口不可用且模型探测无可用结果'))
+      };
     }
 
-    const result = await fetchModelsFromProvider(channel, channelType);
-
     res.json({
       channelId: id,
+      gatewaySourceType,
       models: result.models,
       supported: result.supported,
+      fallbackUsed: result.fallbackUsed,
       cached: result.cached,
       fetchedAt: result.lastChecked || new Date().toISOString(),
-      error: result.error
+      error: result.error,
+      errorHint: result.errorHint
     });
   } catch (error) {
     console.error('Error fetching channel models:', error);
@@ -272,18 +330,36 @@ router.get('/:id/models', async (req, res) => {
 // POST /api/channels/speed-test-all - Test all channels speed
 router.post('/speed-test-all', async (req, res) => {
   try {
-    const { timeout = 10000 } = req.body;
+    const { timeout = 10000, concurrency } = req.body || {};
     const channels = getAllChannels();
+    const safeConcurrency = sanitizeBatchConcurrency(concurrency);
 
     if (channels.length === 0) {
       return res.json({ results: [], message: '没有可测试的渠道' });
     }
 
-    // Claude 渠道使用 'claude' 类型
-    const results = await testMultipleChannels(channels, timeout, 'claude');
-    // 添加延迟等级
-    results.forEach(r => {
-      r.level = getLatencyLevel(r.latency);
+    const results = await runWithConcurrencyLimit(
+      channels,
+      safeConcurrency,
+      async channel => {
+        const speedTestType = CLAUDE_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({
@@ -292,7 +368,8 @@ router.post('/speed-test-all', async (req, res) => {
         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) {
@@ -303,7 +380,9 @@ router.post('/speed-test-all', async (req, res) => {
 
 // 计算平均延迟
 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);