@adversity/coding-tool-x 3.1.1 → 3.1.3

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

@@ -20,12 +20,13 @@ const {
   runWithConcurrencyLimit
 } = require('../services/speed-test');
 const { clearCodexRedirectCache } = require('../codex-proxy-server');
-const {
-  fetchModelsFromProvider,
-  probeModelAvailability,
-} = require('../services/model-detector');
+const { getDefaultSpeedTestModelByToolType } = require('../../config/model-metadata');
 const CODEX_GATEWAY_SOURCE_TYPE = 'codex';
 
+function getDefaultCodexModel() {
+  return getDefaultSpeedTestModelByToolType('codex');
+}
+
 module.exports = (config) => {
   /**
    * GET /api/codex/channels
@@ -68,45 +69,16 @@ module.exports = (config) => {
       }
 
       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，且默认模型探测无可用结果'
-              : '模型列表接口不可用且模型探测无可用结果')
-          };
-        }
-      }
+      const models = [getDefaultCodexModel()];
+      const result = {
+        models,
+        supported: models.length > 0,
+        cached: false,
+        fallbackUsed: false,
+        lastChecked: new Date().toISOString(),
+        error: models.length > 0 ? null : '未配置默认模型列表',
+        errorHint: models.length > 0 ? null : '请在设置中配置 Codex 默认模型'
+      };
 
       res.json({
         channelId: id,

package/src/server/api/commands.js

@@ -479,81 +479,4 @@ router.post('/uninstall', (req, res) => {
   }
 });
 
-// ==================== 格式转换 API ====================
-
-/**
- * 转换命令格式
- * POST /api/commands/convert
- * Body: { content, targetFormat }
- * - content: 命令内容
- * - targetFormat: 目标格式 ('claude' | 'codex')
- */
-router.post('/convert', (req, res) => {
-  try {
-    const { platform, service } = getCommandsService(req);
-    const { content, targetFormat } = req.body;
-
-    if (!content) {
-      return res.status(400).json({
-        success: false,
-        message: '请提供命令内容'
-      });
-    }
-
-    if (!['claude', 'codex'].includes(targetFormat)) {
-      return res.status(400).json({
-        success: false,
-        message: '目标格式必须是 claude 或 codex'
-      });
-    }
-
-    const result = service.convertCommandFormat(content, targetFormat);
-
-    res.json({
-      success: true,
-      platform,
-      ...result
-    });
-  } catch (err) {
-    console.error('[Commands API] Convert command error:', err);
-    res.status(500).json({
-      success: false,
-      message: err.message
-    });
-  }
-});
-
-/**
- * 检测命令格式
- * POST /api/commands/detect-format
- * Body: { content }
- */
-router.post('/detect-format', (req, res) => {
-  try {
-    const { platform, service } = getCommandsService(req);
-    const { content } = req.body;
-
-    if (!content) {
-      return res.status(400).json({
-        success: false,
-        message: '请提供命令内容'
-      });
-    }
-
-    const format = service.detectFormat(content);
-
-    res.json({
-      success: true,
-      platform,
-      format
-    });
-  } catch (err) {
-    console.error('[Commands API] Detect format error:', err);
-    res.status(500).json({
-      success: false,
-      message: err.message
-    });
-  }
-});
-
 module.exports = router;

package/src/server/api/config.js

@@ -44,9 +44,12 @@ function sanitizePricing(inputPricing, currentPricing) {
 }
 
 function normalizeModelDiscovery(modelDiscovery, currentValue = DEFAULT_CONFIG.modelDiscovery) {
+  const defaultModelDiscovery = DEFAULT_CONFIG.modelDiscovery && typeof DEFAULT_CONFIG.modelDiscovery === 'object'
+    ? DEFAULT_CONFIG.modelDiscovery
+    : { useV1ModelsEndpoint: false };
   const current = currentValue && typeof currentValue === 'object'
     ? currentValue
-    : DEFAULT_CONFIG.modelDiscovery;
+    : defaultModelDiscovery;
   const input = modelDiscovery && typeof modelDiscovery === 'object'
     ? modelDiscovery
     : {};

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

@@ -19,12 +19,13 @@ const {
   runWithConcurrencyLimit
 } = require('../services/speed-test');
 const { clearGeminiRedirectCache } = require('../gemini-proxy-server');
-const {
-  probeModelAvailability,
-  fetchModelsFromProvider
-} = require('../services/model-detector');
+const { getDefaultSpeedTestModelByToolType } = require('../../config/model-metadata');
 const GEMINI_GATEWAY_SOURCE_TYPE = 'gemini';
 
+function getDefaultGeminiModel() {
+  return getDefaultSpeedTestModelByToolType('gemini');
+}
+
 module.exports = (config) => {
   /**
    * GET /api/gemini/channels
@@ -67,41 +68,16 @@ module.exports = (config) => {
       }
 
       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，且默认模型探测无可用结果'
-              : '模型列表接口不可用且模型探测无可用结果'))
-        };
-      }
+      const models = [getDefaultGeminiModel()];
+      const result = {
+        models,
+        supported: models.length > 0,
+        cached: false,
+        fallbackUsed: false,
+        lastChecked: new Date().toISOString(),
+        error: models.length > 0 ? null : '未配置默认模型列表',
+        errorHint: models.length > 0 ? null : '请在设置中配置 Gemini 默认模型'
+      };
 
       res.json({
         channelId: id,
@@ -157,7 +133,7 @@ module.exports = (config) => {
         return res.status(400).json({ error: 'Missing required fields: apiKey' });
       }
 
-      const channel = createChannel(name, baseUrl, apiKey, model || 'gemini-2.5-pro', {
+      const channel = createChannel(name, baseUrl, apiKey, model || getDefaultGeminiModel(), {
         websiteUrl,
         enabled,
         weight,

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

@@ -16,11 +16,17 @@ const {
   sanitizeBatchConcurrency,
   runWithConcurrencyLimit
 } = require('../services/speed-test');
-const { clearOpenCodeRedirectCache } = require('../opencode-proxy-server');
+const {
+  clearOpenCodeRedirectCache,
+  collectProxyModelList,
+  getOpenCodeProxyStatus
+} = require('../opencode-proxy-server');
+const { setProxyConfig } = require('../services/opencode-settings-manager');
 const {
   fetchModelsFromProvider,
-  probeModelAvailability
+  clearCache
 } = require('../services/model-detector');
+const { getDefaultSpeedTestModelByToolType } = require('../../config/model-metadata');
 
 module.exports = (config) => {
   function uniqueModels(models = []) {
@@ -38,31 +44,6 @@ module.exports = (config) => {
     return result;
   }
 
-  function collectChannelPreferredModels(channel) {
-    const candidates = [];
-    if (!channel || typeof channel !== 'object') return candidates;
-
-    candidates.push(channel.model);
-    candidates.push(channel.speedTestModel);
-
-    const modelConfig = channel.modelConfig;
-    if (modelConfig && typeof modelConfig === 'object') {
-      candidates.push(modelConfig.model);
-      candidates.push(modelConfig.opusModel);
-      candidates.push(modelConfig.sonnetModel);
-      candidates.push(modelConfig.haikuModel);
-    }
-
-    if (Array.isArray(channel.modelRedirects)) {
-      channel.modelRedirects.forEach((rule) => {
-        candidates.push(rule?.from);
-        candidates.push(rule?.to);
-      });
-    }
-
-    return uniqueModels(candidates);
-  }
-
   function resolveGatewaySourceType(channel) {
     const value = String(channel?.gatewaySourceType || '').trim().toLowerCase();
     if (value === 'claude') return 'claude';
@@ -74,11 +55,82 @@ module.exports = (config) => {
     return resolveGatewaySourceType(channel);
   }
 
-  function isConverterPresetChannel(channel) {
+  function isConverterEntryChannel(channel) {
     const presetId = String(channel?.presetId || '').trim().toLowerCase();
     return presetId === 'entry_claude' || presetId === 'entry_codex' || presetId === 'entry_gemini';
   }
 
+  function getDefaultModelsByGatewaySourceType(gatewaySourceType) {
+    if (gatewaySourceType === 'claude') return [getDefaultSpeedTestModelByToolType('claude')];
+    if (gatewaySourceType === 'gemini') return [getDefaultSpeedTestModelByToolType('gemini')];
+    return [getDefaultSpeedTestModelByToolType('codex')];
+  }
+
+  function refreshEditedChannelModelCache(channelId) {
+    if (!channelId) return;
+    clearCache(channelId);
+  }
+
+  async function syncOpenCodeProxyConfigByCache() {
+    const proxyStatus = getOpenCodeProxyStatus();
+    if (!proxyStatus?.running || !Number.isFinite(proxyStatus?.port)) {
+      return;
+    }
+
+    const channels = getChannels().channels || [];
+    const enabledChannels = channels.filter(ch => ch.enabled !== false);
+
+    // Collect per-channel model lists for per-channel provider generation
+    let detectedModels = [];
+    try {
+      detectedModels = await collectProxyModelList(enabledChannels, { useCacheOnly: true }) || [];
+    } catch (error) {
+      console.warn('[OpenCode Channels API] Failed to collect cached models while syncing proxy config:', error.message);
+    }
+
+    const channelPayloads = enabledChannels.map((ch) => {
+      let models;
+      if (Array.isArray(ch.allowedModels) && ch.allowedModels.length > 0) {
+        // User explicitly selected models for this channel
+        models = ch.allowedModels;
+      } else {
+        // Fall back to configured + detected models
+        models = uniqueModels([
+          ch.model,
+          ch.speedTestModel,
+          ...(Array.isArray(ch.modelRedirects)
+            ? ch.modelRedirects.flatMap(r => [r?.from, r?.to])
+            : []),
+          ...detectedModels
+        ]);
+      }
+      return {
+        name: ch.name,
+        providerKey: ch.providerKey || ch.name,
+        model: ch.model || null,
+        models
+      };
+    });
+
+    const currentChannel = enabledChannels[0];
+    const activeModel = currentChannel?.model || currentChannel?.speedTestModel || null;
+    setProxyConfig(proxyStatus.port, { channels: channelPayloads, model: activeModel });
+  }
+
+  async function refreshEditedChannelAndSyncProxy(channelId) {
+    try {
+      await refreshEditedChannelModelCache(channelId);
+    } catch (error) {
+      console.warn('[OpenCode Channels API] Refresh edited channel model cache failed:', error.message);
+    }
+
+    try {
+      await syncOpenCodeProxyConfigByCache();
+    } catch (error) {
+      console.warn('[OpenCode Channels API] Sync proxy config after channel edit failed:', error.message);
+    }
+  }
+
   /**
    * GET /api/opencode/channels
    * 获取所有 OpenCode 渠道
@@ -145,10 +197,24 @@ module.exports = (config) => {
       }
 
       const gatewaySourceType = resolveGatewaySourceType(channel);
-      const preferredModels = collectChannelPreferredModels(channel);
+      if (isConverterEntryChannel(channel)) {
+        const models = uniqueModels(getDefaultModelsByGatewaySourceType(gatewaySourceType));
+        const now = new Date().toISOString();
+        return res.json({
+          channelId: channelId,
+          gatewaySourceType,
+          models,
+          supported: models.length > 0,
+          cached: false,
+          fallbackUsed: false,
+          fetchedAt: now,
+          error: models.length > 0 ? null : '未配置默认模型列表',
+          errorHint: models.length > 0 ? null : '请在设置中配置对应工具类型的默认模型'
+        });
+      }
+
       const listResult = await fetchModelsFromProvider(channel, 'openai_compatible');
       const listedModels = Array.isArray(listResult.models) ? uniqueModels(listResult.models) : [];
-      const shouldProbeByDefault = !!listResult.disabledByConfig;
       let result;
 
       if (listedModels.length > 0) {
@@ -161,28 +227,7 @@ module.exports = (config) => {
           error: null,
           errorHint: null
         };
-      } else if (shouldProbeByDefault || isConverterPresetChannel(channel)) {
-        const probe = await probeModelAvailability(channel, gatewaySourceType, {
-          stopOnFirstAvailable: false,
-          preferredModels
-        });
-        const probedModels = Array.isArray(probe.availableModels) ? uniqueModels(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
-            ? (shouldProbeByDefault ? '已按设置跳过 /v1/models，使用默认模型探测结果' : '模型列表接口不可用，已自动切换为模型探测结果')
-            : (listResult.errorHint || (shouldProbeByDefault
-              ? '已按设置跳过 /v1/models，且默认模型探测无可用结果'
-              : '模型列表接口不可用且模型探测无可用结果'))
-        };
       } else {
-        // 非入口转换器渠道：只请求 /v1/models，失败则返回空列表
         result = {
           models: [],
           supported: false,
@@ -190,7 +235,7 @@ module.exports = (config) => {
           fallbackUsed: false,
           lastChecked: listResult.lastChecked || new Date().toISOString(),
           error: listResult.error || '该渠道未返回可用模型列表',
-          errorHint: listResult.errorHint || '此类型渠道不执行模型探测，请检查 /v1/models 接口'
+          errorHint: listResult.errorHint || '仅 OpenCode 非转换入口使用 /v1/models，请检查接口配置'
         };
       }
 
@@ -218,7 +263,7 @@ module.exports = (config) => {
    * POST /api/opencode/channels
    * 创建新渠道
    */
-  router.post('/', (req, res) => {
+  router.post('/', async (req, res) => {
     try {
       const {
         name,
@@ -233,7 +278,8 @@ module.exports = (config) => {
         modelRedirects,
         speedTestModel,
         presetId,
-        websiteUrl
+        websiteUrl,
+        allowedModels
       } = req.body;
 
       if (!name || !baseUrl) {
@@ -254,9 +300,12 @@ module.exports = (config) => {
         modelRedirects: modelRedirects || [],
         speedTestModel: speedTestModel || null,
         presetId,
-        websiteUrl
+        websiteUrl,
+        allowedModels: allowedModels || []
       });
 
+      clearOpenCodeRedirectCache(channel.id);
+      await refreshEditedChannelAndSyncProxy(channel.id);
       res.json(channel);
       broadcastSchedulerState('opencode', getSchedulerState('opencode'));
     } catch (err) {
@@ -269,13 +318,14 @@ module.exports = (config) => {
    * PUT /api/opencode/channels/:channelId
    * 更新渠道
    */
-  router.put('/:channelId', (req, res) => {
+  router.put('/:channelId', async (req, res) => {
     try {
       const { channelId } = req.params;
       const updates = req.body;
 
       const channel = updateChannel(channelId, updates);
       clearOpenCodeRedirectCache(channelId);
+      await refreshEditedChannelAndSyncProxy(channelId);
       res.json(channel);
       broadcastSchedulerState('opencode', getSchedulerState('opencode'));
     } catch (err) {
@@ -292,6 +342,8 @@ module.exports = (config) => {
     try {
       const { channelId } = req.params;
       const result = await deleteChannel(channelId);
+      clearOpenCodeRedirectCache(channelId);
+      await refreshEditedChannelAndSyncProxy(channelId);
       res.json(result);
       broadcastSchedulerState('opencode', getSchedulerState('opencode'));
     } catch (err) {

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

@@ -19,16 +19,6 @@ const { PATHS, ensureStorageDirMigrated } = require('../../config/paths');
 const fs = require('fs');
 const path = require('path');
 
-function pushUniqueModel(allModels, seen, modelId) {
-  if (typeof modelId !== 'string') return;
-  const trimmed = modelId.trim();
-  if (!trimmed) return;
-  const key = trimmed.toLowerCase();
-  if (seen.has(key)) return;
-  seen.add(key);
-  allModels.push(trimmed);
-}
-
 function sanitizeChannel(channel) {
   if (!channel) return null;
   return {
@@ -111,35 +101,54 @@ router.post('/start', async (req, res) => {
     }
 
     // 4. 设置代理配置（写入 OpenCode 配置文件）
-    // 收集所有启用渠道配置的模型
-    const allModels = [];
-    const seen = new Set();
-    enabledChannels.forEach((ch) => {
-      const candidates = [
-        ch.model,
-        ch.speedTestModel
-      ];
-      if (ch.modelConfig && typeof ch.modelConfig === 'object') {
-        candidates.push(ch.modelConfig.model, ch.modelConfig.opusModel, ch.modelConfig.sonnetModel, ch.modelConfig.haikuModel);
-      }
-      if (Array.isArray(ch.modelRedirects)) {
-        ch.modelRedirects.forEach(r => { candidates.push(r && r.from); candidates.push(r && r.to); });
-      }
-      candidates.forEach((m) => pushUniqueModel(allModels, seen, m));
-    });
+    // 收集每个渠道的模型列表，生成 per-channel provider 配置
 
-    // 若渠道未显式填写模型，回退使用代理聚合模型（含 /v1/models 与模型探测结果）。
+    // 若渠道未显式填写模型，回退使用代理聚合模型（来自 /v1/models）。
+    let detectedModels = [];
     try {
-      const detectedModels = await collectProxyModelList(enabledChannels, { forceRefresh: false });
-      if (Array.isArray(detectedModels)) {
-        detectedModels.forEach(modelId => pushUniqueModel(allModels, seen, modelId));
-      }
+      detectedModels = await collectProxyModelList(enabledChannels, {
+        useCacheOnly: true
+      }) || [];
     } catch (error) {
       console.warn('[OpenCode Proxy] Failed to collect proxy models before writing config:', error.message);
     }
 
-    const activeModel = currentChannel.model || currentChannel.speedTestModel || allModels[0] || null;
-    setProxyConfig(proxyResult.port, { model: activeModel, models: allModels });
+    const channelPayloads = enabledChannels.map((ch) => {
+      let models;
+      if (Array.isArray(ch.allowedModels) && ch.allowedModels.length > 0) {
+        models = ch.allowedModels;
+      } else {
+        const seen = new Set();
+        const collected = [];
+        const add = (m) => {
+          if (typeof m !== 'string') return;
+          const t = m.trim();
+          if (!t) return;
+          const k = t.toLowerCase();
+          if (seen.has(k)) return;
+          seen.add(k);
+          collected.push(t);
+        };
+        [ch.model, ch.speedTestModel].forEach(add);
+        if (ch.modelConfig && typeof ch.modelConfig === 'object') {
+          [ch.modelConfig.model, ch.modelConfig.opusModel, ch.modelConfig.sonnetModel, ch.modelConfig.haikuModel].forEach(add);
+        }
+        if (Array.isArray(ch.modelRedirects)) {
+          ch.modelRedirects.forEach(r => { add(r && r.from); add(r && r.to); });
+        }
+        detectedModels.forEach(add);
+        models = collected;
+      }
+      return {
+        name: ch.name,
+        providerKey: ch.providerKey || ch.name,
+        model: ch.model || null,
+        models
+      };
+    });
+
+    const activeModel = currentChannel.model || currentChannel.speedTestModel || null;
+    setProxyConfig(proxyResult.port, { channels: channelPayloads, model: activeModel });
 
     // 5. 广播状态更新
     const { broadcastProxyState } = require('../websocket-server');