coding-tool-x 3.8.4 → 3.8.5

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

@@ -3,10 +3,11 @@
  */
 
 const express = require('express');
-const { ConfigSyncService } = require('../services/config-sync-service');
+const { ConfigSyncService } = require('../../platforms/drivers/claude/config-sync');
+const { getPlatformContext } = require('../platform-context');
 
 const router = express.Router();
-const configSyncService = new ConfigSyncService();
+const configSyncService = new ConfigSyncService({ registry: getPlatformContext().registry });
 
 /**
  * 获取可同步的配置列表

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

@@ -185,7 +185,7 @@ router.delete('/:id', (req, res) => {
  * POST /api/config-templates/:id/apply
  * 应用模板到项目目录
  */
-router.post('/:id/apply', (req, res) => {
+router.post('/:id/apply', async (req, res) => {
   try {
     const { targetPath, aiConfigType, aiConfigTypes } = req.body;
     if (!targetPath) {
@@ -194,12 +194,20 @@ router.post('/:id/apply', (req, res) => {
         message: '目标路径不能为空'
       });
     }
+    const { validateKnownProjectCwd } = require('../services/project-path-validation');
+    const validatedTargetPath = await validateKnownProjectCwd(targetPath);
+    if (!validatedTargetPath) {
+      return res.status(400).json({
+        success: false,
+        message: '目标路径不能为空'
+      });
+    }
     const options = {};
     const normalizedAiConfigTypes = normalizeAiConfigTypes(aiConfigTypes, aiConfigType);
     if (normalizedAiConfigTypes.length > 0) {
       options.aiConfigTypes = normalizedAiConfigTypes;
     }
-    const result = templatesService.applyTemplateToProject(targetPath, req.params.id, options);
+    const result = await templatesService.applyTemplateToProject(validatedTargetPath, req.params.id, options);
     const skippedCount = result?.results?.skipped?.length || 0;
     res.json({
       success: true,
@@ -218,7 +226,7 @@ router.post('/:id/apply', (req, res) => {
  * POST /api/config-templates/:id/preview
  * 预览模板应用效果
  */
-router.post('/:id/preview', (req, res) => {
+router.post('/:id/preview', async (req, res) => {
   try {
     const { targetPath, aiConfigType, aiConfigTypes } = req.body;
     if (!targetPath) {
@@ -227,12 +235,20 @@ router.post('/:id/preview', (req, res) => {
         message: '目标路径不能为空'
       });
     }
+    const { validateKnownProjectCwd } = require('../services/project-path-validation');
+    const validatedTargetPath = await validateKnownProjectCwd(targetPath);
+    if (!validatedTargetPath) {
+      return res.status(400).json({
+        success: false,
+        message: '目标路径不能为空'
+      });
+    }
     const options = {};
     const normalizedAiConfigTypes = normalizeAiConfigTypes(aiConfigTypes, aiConfigType);
     if (normalizedAiConfigTypes.length > 0) {
       options.aiConfigTypes = normalizedAiConfigTypes;
     }
-    const preview = templatesService.previewTemplateApplication(targetPath, req.params.id, options);
+    const preview = await templatesService.previewTemplateApplication(validatedTargetPath, req.params.id, options);
     res.json({
       success: true,
       data: preview

package/src/server/api/config.js

@@ -1,46 +1,11 @@
 const express = require('express');
 const router = express.Router();
-const { loadConfig, saveConfig } = require('../../config/loader');
+const { loadConfig, saveConfig, normalizeNativeCliLogs } = require('../../config/loader');
 const DEFAULT_CONFIG = require('../../config/default');
-const { getAllChannels } = require('../services/channels');
-const { getChannels: getCodexChannels } = require('../services/codex-channels');
-const { getChannels: getGeminiChannels } = require('../services/gemini-channels');
-const {
-  probeModelAvailability,
-  fetchModelsFromProvider
-} = require('../services/model-detector');
-
-function clampNumber(value, fallback) {
-  const num = typeof value === 'number' ? value : parseFloat(value);
-  if (!Number.isFinite(num)) {
-    return fallback;
-  }
-  if (num < 0) return 0;
-  if (num > 1000) return 1000;
-  return Math.round(num * 1000000) / 1000000;
-}
-
-function sanitizePricing(inputPricing, currentPricing) {
-  const defaults = DEFAULT_CONFIG.pricing;
-  const sanitized = {};
-
-  Object.keys(defaults).forEach((toolKey) => {
-    const defaultValue = defaults[toolKey];
-    const existingValue = currentPricing?.[toolKey] || {};
-    const payload = inputPricing?.[toolKey] || {};
-
-    const mode = payload.mode === 'custom' ? 'custom' : (existingValue.mode || defaultValue.mode || 'auto');
-    sanitized[toolKey] = { mode };
-
-    Object.keys(defaultValue)
-      .filter((key) => key !== 'mode')
-      .forEach((rateKey) => {
-        const fallback = existingValue[rateKey] !== undefined ? existingValue[rateKey] : defaultValue[rateKey];
-        sanitized[toolKey][rateKey] = clampNumber(payload[rateKey], fallback);
-      });
-  });
-
-  return sanitized;
+const { getPlatformCatalog } = require('../services/platform-catalog');
+const { probeModelAvailability } = require('../services/model-detector');
+function getModelCatalogKey(platform) {
+  return getPlatformCatalog().get(platform)?.modelConfig?.catalogKey || platform;
 }
 
 function normalizeModelDiscovery(modelDiscovery, currentValue = DEFAULT_CONFIG.modelDiscovery) {
@@ -61,6 +26,25 @@ function normalizeModelDiscovery(modelDiscovery, currentValue = DEFAULT_CONFIG.m
   };
 }
 
+function isPlainObject(value) {
+  return value !== null && typeof value === 'object' && !Array.isArray(value);
+}
+
+function validateNativeCliLogs(value) {
+  if (!isPlainObject(value)) {
+    return 'nativeCliLogs must be an object';
+  }
+  if (Object.prototype.hasOwnProperty.call(value, 'enabled') && typeof value.enabled !== 'boolean') {
+    return 'nativeCliLogs.enabled must be a boolean';
+  }
+  if (Object.prototype.hasOwnProperty.call(value, 'intervalSeconds')
+    && (!Number.isInteger(value.intervalSeconds) || value.intervalSeconds < 1 || value.intervalSeconds > 60)) {
+    return 'nativeCliLogs.intervalSeconds must be an integer between 1-60';
+  }
+  return null;
+}
+
+
 function uniqueModels(models = []) {
   const seen = new Set();
   const result = [];
@@ -108,10 +92,31 @@ function parseBooleanQuery(value, defaultValue = false) {
   const normalized = String(value).trim().toLowerCase();
   return ['1', 'true', 'yes', 'on'].includes(normalized);
 }
+function readChannelList(platform) {
+  const driver = getPlatformCatalog().driver(platform, 'channels');
+  const result = typeof driver?.list === 'function' ? driver.list() : null;
+  if (result && typeof result.then === 'function') {
+    return result.then(value => {
+      const data = value?.status === 'ok' ? value.data : value;
+      return Array.isArray(data) ? data : data?.channels || [];
+    });
+  }
+  const data = result?.status === 'ok' ? result.data : result;
+  return Array.isArray(data) ? data : data?.channels || [];
+}
+
+async function listModelsForChannel(channel, platform, options = {}) {
+  const driver = getPlatformCatalog().driver(platform, 'channels');
+  if (typeof driver?.listModels !== 'function') return [];
+  const result = await driver.listModels(channel, options);
+  if (result?.status !== 'ok') return [];
+  return Array.isArray(result.data?.models) ? result.data.models : [];
+}
 
 async function probeModelsForSingleChannel(channel, channelType, options = {}) {
-  const builtInPreferred = Array.isArray(DEFAULT_CONFIG.defaultModels?.[channelType])
-    ? DEFAULT_CONFIG.defaultModels[channelType]
+  const catalogKey = getModelCatalogKey(channelType);
+  const builtInPreferred = Array.isArray(DEFAULT_CONFIG.defaultModels?.[catalogKey])
+    ? DEFAULT_CONFIG.defaultModels[catalogKey]
     : [];
   const preferredModels = uniqueModels([
     ...collectChannelPreferredModels(channel),
@@ -119,12 +124,11 @@ async function probeModelsForSingleChannel(channel, channelType, options = {}) {
   ]);
 
   try {
-    if (channelType === 'codex') {
-      const listResult = await fetchModelsFromProvider(channel, 'openai_compatible');
-      const listedModels = Array.isArray(listResult?.models) ? listResult.models : [];
-      if (listedModels.length > 0) {
-        return uniqueModels(listedModels);
-      }
+    const listedModels = await listModelsForChannel(channel, channelType, {
+      forceRefresh: !!options.forceRefresh
+    });
+    if (listedModels.length > 0) {
+      return uniqueModels(listedModels);
     }
 
     const probe = await probeModelAvailability(channel, channelType, {
@@ -160,8 +164,9 @@ async function probeModelsForChannels(channels = [], channelType, options = {})
 function mergeProbedAndConfiguredModels(probedModels, configuredModels, toolType) {
   const safeConfigured = Array.isArray(configuredModels) ? configuredModels : [];
   const safeProbed = Array.isArray(probedModels) ? probedModels : [];
-  const builtInDefaults = Array.isArray(DEFAULT_CONFIG.defaultModels?.[toolType])
-    ? DEFAULT_CONFIG.defaultModels[toolType]
+  const catalogKey = getModelCatalogKey(toolType);
+  const builtInDefaults = Array.isArray(DEFAULT_CONFIG.defaultModels?.[catalogKey])
+    ? DEFAULT_CONFIG.defaultModels[catalogKey]
     : [];
   if (safeProbed.length > 0) {
     return uniqueModels([...safeProbed, ...safeConfigured, ...builtInDefaults]);
@@ -218,6 +223,18 @@ function validateModelList(models, toolType) {
   return { valid: true, cleaned };
 }
 
+function projectDefaultModelsByPlatform(models = {}) {
+  const projected = { ...(models || {}) };
+  const catalog = getPlatformCatalog();
+  for (const platform of catalog.keys({ capability: 'channels' })) {
+    const catalogKey = getModelCatalogKey(platform);
+    if (!Array.isArray(projected[platform]) && Array.isArray(projected[catalogKey])) {
+      projected[platform] = projected[catalogKey];
+    }
+  }
+  return projected;
+}
+
 /**
  * GET /api/config/default-models
  * 获取默认模型列表
@@ -225,7 +242,7 @@ function validateModelList(models, toolType) {
 router.get('/default-models', async (req, res) => {
   try {
     const config = loadConfig();
-    const configuredDefaultModels = config.defaultModels || DEFAULT_CONFIG.defaultModels;
+    const configuredDefaultModels = projectDefaultModelsByPlatform(config.defaultModels || DEFAULT_CONFIG.defaultModels);
     const probe = parseBooleanQuery(req.query.probe, false);
 
     if (!probe) {
@@ -235,33 +252,20 @@ router.get('/default-models', async (req, res) => {
       });
     }
 
-    const forceRefresh = parseBooleanQuery(req.query.forceRefresh, true);
-    const claudeChannels = getAllChannels();
-    const codexData = getCodexChannels();
-    const geminiData = getGeminiChannels();
-
-    // 各工具类型也按串行探测，进一步降低并发压力
-    const claudeProbed = await probeModelsForChannels(claudeChannels || [], 'claude', { forceRefresh });
-    const codexProbed = await probeModelsForChannels(codexData?.channels || [], 'codex', { forceRefresh });
-    const geminiProbed = await probeModelsForChannels(geminiData?.channels || [], 'gemini', { forceRefresh });
-
-    const defaultModels = {
-      claude: mergeProbedAndConfiguredModels(
-        claudeProbed,
-        configuredDefaultModels.claude,
-        'claude'
-      ),
-      codex: mergeProbedAndConfiguredModels(
-        codexProbed,
-        configuredDefaultModels.codex,
-        'codex'
-      ),
-      gemini: mergeProbedAndConfiguredModels(
-        geminiProbed,
-        configuredDefaultModels.gemini,
-        'gemini'
+    const forceRefresh = parseBooleanQuery(req.query.forceRefresh, false);
+    const platforms = getPlatformCatalog().keys({ capability: 'channels' });
+    const channelLists = await Promise.all(platforms.map(platform => readChannelList(platform)));
+    const probedModels = await Promise.all(platforms.map((platform, index) => (
+      probeModelsForChannels(channelLists[index], platform, { forceRefresh })
+    )));
+    const defaultModels = Object.fromEntries(platforms.map((platform, index) => [
+      platform,
+      mergeProbedAndConfiguredModels(
+        probedModels[index],
+        configuredDefaultModels[platform],
+        platform
       )
-    };
+    ]));
 
     res.json({
       defaultModels,
@@ -288,10 +292,9 @@ router.post('/default-models', (req, res) => {
       });
     }
 
-    const validToolTypes = ['claude', 'codex', 'gemini'];
+    const validToolTypes = getPlatformCatalog().keys({ capability: 'channels' });
     const providedTypes = Object.keys(defaultModels);
 
-    // Validate that only valid tool types are provided
     for (const toolType of providedTypes) {
       if (!validToolTypes.includes(toolType)) {
         return res.status(400).json({
@@ -299,7 +302,6 @@ router.post('/default-models', (req, res) => {
         });
       }
     }
-
     // Validate each model list
     const validated = {};
     const errors = {};
@@ -354,11 +356,11 @@ router.post('/default-models/reset', (req, res) => {
     const { toolType } = req.body;
 
     const config = loadConfig();
+    const validToolTypes = getPlatformCatalog().keys({ capability: 'channels' });
+    const builtInDefaults = projectDefaultModelsByPlatform(DEFAULT_CONFIG.defaultModels);
     let newDefaultModels;
 
     if (toolType) {
-      // Reset specific tool type
-      const validToolTypes = ['claude', 'codex', 'gemini'];
       if (!validToolTypes.includes(toolType)) {
         return res.status(400).json({
           error: `Invalid tool type: ${toolType}. Valid types: ${validToolTypes.join(', ')}`
@@ -367,14 +369,12 @@ router.post('/default-models/reset', (req, res) => {
 
       newDefaultModels = {
         ...(config.defaultModels || DEFAULT_CONFIG.defaultModels),
-        [toolType]: DEFAULT_CONFIG.defaultModels[toolType]
+        [toolType]: builtInDefaults[toolType] || builtInDefaults[getModelCatalogKey(toolType)] || []
       };
     } else {
-      // Reset all tool types
-      newDefaultModels = { ...DEFAULT_CONFIG.defaultModels };
+      newDefaultModels = builtInDefaults;
     }
 
-    // Save config
     const newConfig = {
       ...config,
       defaultModels: newDefaultModels
@@ -400,20 +400,17 @@ router.get('/advanced', (req, res) => {
   try {
     const config = loadConfig();
     const modelDiscovery = normalizeModelDiscovery(config.modelDiscovery);
+    const ports = Object.fromEntries(getPlatformCatalog().ports().map(({ key, defaultPort }) => [
+      key,
+      config.ports?.[key] ?? defaultPort
+    ]));
     res.json({
-      ports: {
-        webUI: config.ports?.webUI || 19999,
-        proxy: config.ports?.proxy || 20088,
-        codexProxy: config.ports?.codexProxy || 20089,
-        geminiProxy: config.ports?.geminiProxy || 20090,
-        opencodeProxy: config.ports?.opencodeProxy || 20091,
-        ompProxy: config.ports?.ompProxy || 20092
-      },
+      ports,
       maxLogs: config.maxLogs || 100,
       statsInterval: config.statsInterval || 30,
       enableSessionBinding: config.enableSessionBinding !== false, // 默认开启
       modelDiscovery,
-      pricing: config.pricing || DEFAULT_CONFIG.pricing
+      nativeCliLogs: normalizeNativeCliLogs(config.nativeCliLogs)
     });
   } catch (error) {
     console.error('[Config API] Failed to get advanced config:', error);
@@ -427,14 +424,16 @@ router.get('/advanced', (req, res) => {
  */
 router.post('/advanced', (req, res) => {
   try {
+    const body = req.body || {};
     const {
       ports,
       maxLogs,
       statsInterval,
-      pricing,
       enableSessionBinding,
-      modelDiscovery
-    } = req.body;
+      modelDiscovery,
+      nativeCliLogs
+    } = body;
+    const hasNativeCliLogs = Object.prototype.hasOwnProperty.call(body, 'nativeCliLogs');
 
     // 验证端口
     if (ports) {
@@ -468,9 +467,19 @@ router.post('/advanced', (req, res) => {
       }
     }
 
-    // 加载当前配置
+    if (hasNativeCliLogs) {
+      const nativeCliLogsError = validateNativeCliLogs(nativeCliLogs);
+      if (nativeCliLogsError) {
+        return res.status(400).json({ error: nativeCliLogsError });
+      }
+    }
+
     const config = loadConfig();
-    const sanitizedPricing = sanitizePricing(pricing, config.pricing);
+    const currentNativeCliLogs = normalizeNativeCliLogs(config.nativeCliLogs);
+    const normalizedNativeCliLogs = hasNativeCliLogs
+      ? normalizeNativeCliLogs(nativeCliLogs, currentNativeCliLogs)
+      : currentNativeCliLogs;
+
     const normalizedModelDiscovery = normalizeModelDiscovery(
       modelDiscovery,
       config.modelDiscovery || DEFAULT_CONFIG.modelDiscovery
@@ -493,7 +502,7 @@ router.post('/advanced', (req, res) => {
       statsInterval: statsInterval !== undefined ? parseInt(statsInterval) : config.statsInterval,
       enableSessionBinding: enableSessionBinding !== undefined ? enableSessionBinding : (config.enableSessionBinding !== false),
       modelDiscovery: normalizedModelDiscovery,
-      pricing: sanitizedPricing
+      nativeCliLogs: normalizedNativeCliLogs
     };
 
     // 保存配置
@@ -507,7 +516,7 @@ router.post('/advanced', (req, res) => {
         statsInterval: newConfig.statsInterval,
         enableSessionBinding: newConfig.enableSessionBinding,
         modelDiscovery: newConfig.modelDiscovery,
-        pricing: newConfig.pricing
+        nativeCliLogs: newConfig.nativeCliLogs
       }
     });
   } catch (error) {