@adversity/coding-tool-x 3.0.6 → 3.1.1

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

@@ -13,9 +13,18 @@ const { getSchedulerState } = require('../services/channel-scheduler');
 const { getChannelHealthStatus, resetChannelHealth } = require('../services/channel-health');
 const { broadcastSchedulerState, broadcastLog } = require('../websocket-server');
 const { isCodexInstalled } = require('../services/codex-config');
-const { testChannelSpeed, testMultipleChannels, getLatencyLevel } = require('../services/speed-test');
+const {
+  testChannelSpeed,
+  getLatencyLevel,
+  sanitizeBatchConcurrency,
+  runWithConcurrencyLimit
+} = require('../services/speed-test');
 const { clearCodexRedirectCache } = require('../codex-proxy-server');
-const { fetchModelsFromProvider } = require('../services/model-detector');
+const {
+  fetchModelsFromProvider,
+  probeModelAvailability,
+} = require('../services/model-detector');
+const CODEX_GATEWAY_SOURCE_TYPE = 'codex';
 
 module.exports = (config) => {
   /**
@@ -58,11 +67,50 @@ module.exports = (config) => {
         return res.status(404).json({ error: '渠道不存在' });
       }
 
-      // Codex 渠道大多数是 OpenAI 兼容的
-      const result = await fetchModelsFromProvider(channel, 'openai_compatible');
+      const gatewaySourceType = CODEX_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 = listResult;
+      } else {
+        const usingConfiguredProbe = !!listResult.disabledByConfig;
+        const probe = await probeModelAvailability(channel, 'codex');
+        const probedModels = Array.isArray(probe.availableModels) ? probe.availableModels : [];
+
+        if (probedModels.length > 0) {
+          result = {
+            models: probedModels,
+            supported: true,
+            cached: !!probe.cached,
+            fallbackUsed: false,
+            lastChecked: probe.lastChecked || listResult.lastChecked || new Date().toISOString(),
+            error: null,
+            errorHint: listResult.error
+              ? (usingConfiguredProbe
+                ? '已按设置跳过 /v1/models，使用默认模型探测结果'
+                : '模型列表接口不可用，已自动切换为模型探测结果')
+              : null
+          };
+        } else {
+          result = {
+            models: [],
+            supported: false,
+            cached: !!probe.cached || !!listResult.cached,
+            fallbackUsed: false,
+            lastChecked: probe.lastChecked || listResult.lastChecked || new Date().toISOString(),
+            error: listResult.error || '无法探测可用模型',
+            errorHint: listResult.errorHint || (usingConfiguredProbe
+              ? '已按设置跳过 /v1/models，且默认模型探测无可用结果'
+              : '模型列表接口不可用且模型探测无可用结果')
+          };
+        }
+      }
 
       res.json({
         channelId: id,
+        gatewaySourceType,
         models: result.models,
         supported: result.supported,
         cached: result.cached,
@@ -91,10 +139,27 @@ module.exports = (config) => {
         return res.status(404).json({ error: 'Codex CLI not installed' });
       }
 
-      const { name, providerKey, baseUrl, apiKey, websiteUrl, enabled, weight, maxConcurrency } = req.body;
+      const {
+        name,
+        providerKey,
+        baseUrl,
+        apiKey,
+        websiteUrl,
+        enabled,
+        weight,
+        maxConcurrency,
+        modelRedirects,
+        speedTestModel,
+        presetId,
+        gatewaySourceType
+      } = req.body;
+
+      if (!name || !providerKey || !baseUrl) {
+        return res.status(400).json({ error: 'Missing required fields: name, providerKey, baseUrl' });
+      }
 
-      if (!name || !providerKey || !baseUrl || !apiKey) {
-        return res.status(400).json({ error: 'Missing required fields' });
+      if (!apiKey) {
+        return res.status(400).json({ error: 'Missing required fields: apiKey' });
       }
 
       // wireApi 固定为 'responses' (OpenAI Responses API 格式)
@@ -102,7 +167,11 @@ module.exports = (config) => {
         websiteUrl,
         enabled,
         weight,
-        maxConcurrency
+        maxConcurrency,
+        modelRedirects: modelRedirects || [],
+        speedTestModel: speedTestModel || null,
+        presetId: presetId || null,
+        gatewaySourceType
       });
       res.json(channel);
       broadcastSchedulerState('codex', getSchedulerState('codex'));
@@ -140,14 +209,14 @@ module.exports = (config) => {
    * DELETE /api/codex/channels/:channelId
    * 删除渠道
    */
-  router.delete('/:channelId', (req, res) => {
+  router.delete('/:channelId', async (req, res) => {
     try {
       if (!isCodexInstalled()) {
         return res.status(404).json({ error: 'Codex CLI not installed' });
       }
 
       const { channelId } = req.params;
-      const result = deleteChannel(channelId);
+      const result = await deleteChannel(channelId);
       res.json(result);
       broadcastSchedulerState('codex', getSchedulerState('codex'));
     } catch (err) {
@@ -217,8 +286,10 @@ module.exports = (config) => {
         return res.status(404).json({ error: '渠道不存在' });
       }
 
-      const result = await testChannelSpeed(channel, timeout, 'codex');
+      const speedTestType = CODEX_GATEWAY_SOURCE_TYPE;
+      const result = await testChannelSpeed(channel, timeout, speedTestType);
       result.level = getLatencyLevel(result.latency);
+      result.gatewaySourceType = speedTestType;
 
       res.json(result);
     } catch (error) {
@@ -237,18 +308,37 @@ module.exports = (config) => {
         return res.json({ results: [], message: 'Codex 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: '没有可测试的渠道' });
       }
 
-      // Codex 渠道使用 'codex' 类型
-      const results = await testMultipleChannels(channels, timeout, 'codex');
-      results.forEach(r => {
-        r.level = getLatencyLevel(r.latency);
+      const results = await runWithConcurrencyLimit(
+        channels,
+        safeConcurrency,
+        async channel => {
+          const speedTestType = CODEX_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({
@@ -257,7 +347,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) {
@@ -345,7 +436,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/codex-proxy.js

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

package/src/server/api/commands.js

@@ -8,7 +8,24 @@ const express = require('express');
 const { CommandsService } = require('../services/commands-service');
 
 const router = express.Router();
-const commandsService = new CommandsService();
+const SUPPORTED_PLATFORMS = ['claude', 'opencode'];
+const commandServices = new Map();
+
+function resolvePlatform(rawPlatform) {
+  return SUPPORTED_PLATFORMS.includes(rawPlatform) ? rawPlatform : 'claude';
+}
+
+function getPlatform(req) {
+  return resolvePlatform(req.query?.platform || req.body?.platform);
+}
+
+function getCommandsService(req) {
+  const platform = getPlatform(req);
+  if (!commandServices.has(platform)) {
+    commandServices.set(platform, new CommandsService(platform));
+  }
+  return { platform, service: commandServices.get(platform) };
+}
 
 /**
  * 获取命令列表
@@ -17,11 +34,13 @@ const commandsService = new CommandsService();
  */
 router.get('/', (req, res) => {
   try {
+    const { platform, service } = getCommandsService(req);
     const { projectPath } = req.query;
-    const result = commandsService.listCommands(projectPath || null);
+    const result = service.listCommands(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 } = getCommandsService(req);
     const { projectPath } = req.query;
-    const stats = commandsService.getStats(projectPath || null);
+    const stats = service.getStats(projectPath || null);
 
     res.json({
       success: true,
+      platform,
       ...stats
     });
   } catch (err) {
@@ -62,6 +83,7 @@ router.get('/stats', (req, res) => {
  */
 router.get('/:scope/:name', (req, res) => {
   try {
+    const { platform, service } = getCommandsService(req);
     const { scope, name } = req.params;
     const { projectPath, namespace } = req.query;
 
@@ -79,7 +101,7 @@ router.get('/:scope/:name', (req, res) => {
       });
     }
 
-    const command = commandsService.getCommand(name, scope, projectPath || null, namespace || null);
+    const command = service.getCommand(name, scope, projectPath || null, namespace || null);
 
     if (!command) {
       return res.status(404).json({
@@ -90,6 +112,7 @@ router.get('/:scope/:name', (req, res) => {
 
     res.json({
       success: true,
+      platform,
       command
     });
   } catch (err) {
@@ -108,7 +131,8 @@ router.get('/:scope/:name', (req, res) => {
  */
 router.post('/', (req, res) => {
   try {
-    const { name, scope, projectPath, namespace, description, allowedTools, argumentHint, body } = req.body;
+    const { platform, service } = getCommandsService(req);
+    const { name, scope, projectPath, namespace, description, allowedTools, argumentHint, agent, model, subtask, body } = req.body;
 
     if (!name) {
       return res.status(400).json({
@@ -131,7 +155,7 @@ router.post('/', (req, res) => {
       });
     }
 
-    const command = commandsService.createCommand({
+    const command = service.createCommand({
       name,
       scope,
       projectPath: projectPath || null,
@@ -139,11 +163,15 @@ router.post('/', (req, res) => {
       description: description || '',
       allowedTools: allowedTools || '',
       argumentHint: argumentHint || '',
+      agent: agent || '',
+      model: model || '',
+      subtask: typeof subtask === 'boolean' ? subtask : undefined,
       body: body || ''
     });
 
     res.json({
       success: true,
+      platform,
       command,
       message: '命令创建成功'
     });
@@ -162,8 +190,9 @@ router.post('/', (req, res) => {
  */
 router.put('/:scope/:name', (req, res) => {
   try {
+    const { platform, service } = getCommandsService(req);
     const { scope, name } = req.params;
-    const { projectPath, namespace, description, allowedTools, argumentHint, body } = req.body;
+    const { projectPath, namespace, description, allowedTools, argumentHint, agent, model, subtask, body } = req.body;
 
     if (!['user', 'project'].includes(scope)) {
       return res.status(400).json({
@@ -179,7 +208,7 @@ router.put('/:scope/:name', (req, res) => {
       });
     }
 
-    const command = commandsService.updateCommand({
+    const command = service.updateCommand({
       name,
       scope,
       projectPath: projectPath || null,
@@ -187,11 +216,15 @@ router.put('/:scope/:name', (req, res) => {
       description: description || '',
       allowedTools: allowedTools || '',
       argumentHint: argumentHint || '',
+      agent: agent || '',
+      model: model || '',
+      subtask: typeof subtask === 'boolean' ? subtask : undefined,
       body: body || ''
     });
 
     res.json({
       success: true,
+      platform,
       command,
       message: '命令更新成功'
     });
@@ -210,6 +243,7 @@ router.put('/:scope/:name', (req, res) => {
  */
 router.delete('/:scope/:name', (req, res) => {
   try {
+    const { platform, service } = getCommandsService(req);
     const { scope, name } = req.params;
     const { projectPath, namespace } = req.query;
 
@@ -227,9 +261,10 @@ router.delete('/:scope/:name', (req, res) => {
       });
     }
 
-    const result = commandsService.deleteCommand(name, scope, projectPath || null, namespace || null);
+    const result = service.deleteCommand(name, scope, projectPath || null, namespace || null);
 
     res.json({
+      platform,
       success: result.success,
       message: result.message
     });
@@ -251,12 +286,14 @@ router.delete('/:scope/:name', (req, res) => {
  */
 router.get('/all', async (req, res) => {
   try {
+    const { platform, service } = getCommandsService(req);
     const { projectPath, refresh } = req.query;
     const forceRefresh = refresh === '1';
-    const result = await commandsService.listAllCommands(projectPath || null, forceRefresh);
+    const result = await service.listAllCommands(projectPath || null, forceRefresh);
 
     res.json({
       success: true,
+      platform,
       ...result
     });
   } catch (err) {
@@ -274,9 +311,11 @@ router.get('/all', async (req, res) => {
  */
 router.get('/repos', (req, res) => {
   try {
-    const repos = commandsService.getRepos();
+    const { platform, service } = getCommandsService(req);
+    const repos = service.getRepos();
     res.json({
       success: true,
+      platform,
       repos
     });
   } catch (err) {
@@ -295,6 +334,7 @@ router.get('/repos', (req, res) => {
  */
 router.post('/repos', (req, res) => {
   try {
+    const { platform, service } = getCommandsService(req);
     const { owner, name, branch = 'main', directory = '', enabled = true } = req.body;
 
     if (!owner || !name) {
@@ -304,10 +344,11 @@ router.post('/repos', (req, res) => {
       });
     }
 
-    const repos = commandsService.addRepo({ owner, name, branch, directory, enabled });
+    const repos = service.addRepo({ owner, name, branch, directory, enabled });
 
     res.json({
       success: true,
+      platform,
       repos
     });
   } catch (err) {
@@ -326,12 +367,14 @@ router.post('/repos', (req, res) => {
  */
 router.delete('/repos/:owner/:name', (req, res) => {
   try {
+    const { platform, service } = getCommandsService(req);
     const { owner, name } = req.params;
     const { directory = '' } = req.query;
-    const repos = commandsService.removeRepo(owner, name, directory);
+    const repos = service.removeRepo(owner, name, directory);
 
     res.json({
       success: true,
+      platform,
       repos
     });
   } catch (err) {
@@ -350,13 +393,15 @@ router.delete('/repos/:owner/:name', (req, res) => {
  */
 router.put('/repos/:owner/:name/toggle', (req, res) => {
   try {
+    const { platform, service } = getCommandsService(req);
     const { owner, name } = req.params;
     const { enabled, directory = '' } = req.body;
 
-    const repos = commandsService.toggleRepo(owner, name, directory, enabled);
+    const repos = service.toggleRepo(owner, name, directory, enabled);
 
     res.json({
       success: true,
+      platform,
       repos
     });
   } catch (err) {
@@ -375,6 +420,7 @@ router.put('/repos/:owner/:name/toggle', (req, res) => {
  */
 router.post('/install', async (req, res) => {
   try {
+    const { platform, service } = getCommandsService(req);
     const command = req.body;
 
     if (!command || !command.repoOwner || !command.repoName) {
@@ -384,10 +430,11 @@ router.post('/install', async (req, res) => {
       });
     }
 
-    const result = await commandsService.installFromRemote(command);
+    const result = await service.installFromRemote(command);
 
     res.json({
       success: true,
+      platform,
       ...result
     });
   } catch (err) {
@@ -406,6 +453,7 @@ router.post('/install', async (req, res) => {
  */
 router.post('/uninstall', (req, res) => {
   try {
+    const { platform, service } = getCommandsService(req);
     const { path } = req.body;
 
     if (!path) {
@@ -415,10 +463,11 @@ router.post('/uninstall', (req, res) => {
       });
     }
 
-    const result = commandsService.uninstallCommand(path);
+    const result = service.uninstallCommand(path);
 
     res.json({
       success: true,
+      platform,
       ...result
     });
   } catch (err) {
@@ -441,6 +490,7 @@ router.post('/uninstall', (req, res) => {
  */
 router.post('/convert', (req, res) => {
   try {
+    const { platform, service } = getCommandsService(req);
     const { content, targetFormat } = req.body;
 
     if (!content) {
@@ -457,10 +507,11 @@ router.post('/convert', (req, res) => {
       });
     }
 
-    const result = commandsService.convertCommandFormat(content, targetFormat);
+    const result = service.convertCommandFormat(content, targetFormat);
 
     res.json({
       success: true,
+      platform,
       ...result
     });
   } catch (err) {
@@ -479,6 +530,7 @@ router.post('/convert', (req, res) => {
  */
 router.post('/detect-format', (req, res) => {
   try {
+    const { platform, service } = getCommandsService(req);
     const { content } = req.body;
 
     if (!content) {
@@ -488,10 +540,11 @@ router.post('/detect-format', (req, res) => {
       });
     }
 
-    const format = commandsService.detectFormat(content);
+    const format = service.detectFormat(content);
 
     res.json({
       success: true,
+      platform,
       format
     });
   } catch (err) {

package/src/server/api/config-export.js

@@ -23,17 +23,11 @@ function buildPreviewSummary(data) {
     version: data.version,
     exportedAt: data.exportedAt,
     counts: {
-      permissionTemplates: (data.data.permissionTemplates || []).length,
       configTemplates: (data.data.configTemplates || []).length,
       channels: (data.data.channels || []).length,
       plugins: (data.data.plugins || []).length
     },
     items: {
-      permissionTemplates: (data.data.permissionTemplates || []).map(t => ({
-        id: t.id,
-        name: t.name,
-        description: t.description
-      })),
       configTemplates: (data.data.configTemplates || []).map(t => ({
         id: t.id,
         name: t.name,

package/src/server/api/config-registry.js

@@ -6,7 +6,7 @@
  */
 
 const express = require('express');
-const { ConfigRegistryService, CONFIG_TYPES } = require('../services/config-registry-service');
+const { ConfigRegistryService, CONFIG_TYPES, SUPPORTED_PLATFORMS } = require('../services/config-registry-service');
 const { ConfigSyncManager } = require('../services/config-sync-manager');
 
 const router = express.Router();
@@ -17,7 +17,7 @@ const syncManager = new ConfigSyncManager();
 const VALID_TYPES = CONFIG_TYPES;
 
 // Valid platforms
-const VALID_PLATFORMS = ['claude', 'codex'];
+const VALID_PLATFORMS = SUPPORTED_PLATFORMS;
 
 /**
  * Validate config type parameter
@@ -199,10 +199,14 @@ router.put('/:type/:name/toggle', async (req, res) => {
       if (item.platforms?.codex) {
         syncManager.syncToCodex(type, name);
       }
+      if (item.platforms?.opencode) {
+        syncManager.syncToOpenCode(type, name);
+      }
     } else {
       // Remove from all platforms
       syncManager.removeFromClaude(type, name);
       syncManager.removeFromCodex(type, name);
+      syncManager.removeFromOpenCode(type, name);
     }
 
     res.json({
@@ -220,7 +224,7 @@ router.put('/:type/:name/toggle', async (req, res) => {
 
 /**
  * PUT /api/config-registry/:type/:name/platform/:platform
- * Toggle platform (claude/codex) for an item
+ * Toggle platform (claude/codex/opencode) for an item
  * Body: { enabled: boolean }
  * - Updates registry
  * - If enabling platform: sync to that platform (if item is enabled)
@@ -275,6 +279,8 @@ router.put('/:type/:name/platform/:platform', async (req, res) => {
         syncManager.syncToClaude(type, name);
       } else if (platform === 'codex') {
         syncManager.syncToCodex(type, name);
+      } else if (platform === 'opencode') {
+        syncManager.syncToOpenCode(type, name);
       }
     } else {
       // Remove from this platform
@@ -282,6 +288,8 @@ router.put('/:type/:name/platform/:platform', async (req, res) => {
         syncManager.removeFromClaude(type, name);
       } else if (platform === 'codex') {
         syncManager.removeFromCodex(type, name);
+      } else if (platform === 'opencode') {
+        syncManager.removeFromOpenCode(type, name);
       }
     }