coding-tool-x 3.8.4 → 3.8.5

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

@@ -0,0 +1,168 @@
+'use strict';
+
+const express = require('express');
+const { ProjectConfigService } = require('../services/project-config-service');
+const { resolvePlatform } = require('../../platforms/access');
+const { sendApiError } = require('./validation-errors');
+
+const router = express.Router();
+const projectConfigService = new ProjectConfigService();
+
+function requireProjectPath(source = {}) {
+  const projectPath = source.projectPath;
+  if (typeof projectPath !== 'string' || !projectPath.trim()) {
+    throw new Error('projectPath is required');
+  }
+  return projectPath.trim();
+}
+
+function requirePlatform(source = {}) {
+  return resolvePlatform(source.platform, { fallback: 'claude' }).key;
+}
+
+function queryInput(req) {
+  return { ...req.query, ...(req.body && typeof req.body === 'object' ? req.body : {}) };
+}
+
+router.get('/', async (req, res) => {
+  try {
+    const input = queryInput(req);
+    const projectPath = requireProjectPath(input);
+    const platform = requirePlatform(input);
+    const snapshot = await projectConfigService.getSnapshot(projectPath, platform);
+    res.json(snapshot);
+  } catch (error) {
+    console.error('[Project Config API] Get snapshot failed:', error);
+    sendApiError(res, error);
+  }
+});
+
+router.get('/skills', async (req, res) => {
+  try {
+    const input = queryInput(req);
+    const projectPath = requireProjectPath(input);
+    const platform = requirePlatform(input);
+    const skills = await projectConfigService.listProjectSkills(projectPath, platform);
+    res.json({ success: true, projectPath, platform, skills });
+  } catch (error) {
+    console.error('[Project Config API] List project Skills failed:', error);
+    sendApiError(res, error);
+  }
+});
+
+router.put('/skills/toggle', async (req, res) => {
+  try {
+    const projectPath = requireProjectPath(req.body);
+    const platform = requirePlatform(req.body);
+    if (!req.body.controlKey) throw new Error('Skill controlKey is required');
+    const result = await projectConfigService.setProjectSkillEnabled(
+      projectPath,
+      platform,
+      req.body.controlKey,
+      req.body.enabled
+    );
+    res.json({ success: true, projectPath, platform, ...result });
+  } catch (error) {
+    console.error('[Project Config API] Toggle project Skill failed:', error);
+    sendApiError(res, error);
+  }
+});
+
+router.get('/instruction', async (req, res) => {
+  try {
+    const input = queryInput(req);
+    const projectPath = requireProjectPath(input);
+    const platform = requirePlatform(input);
+    const instruction = await projectConfigService.readInstruction(projectPath, platform);
+    res.json({ success: true, projectPath, platform, instruction });
+  } catch (error) {
+    console.error('[Project Config API] Read instruction failed:', error);
+    sendApiError(res, error);
+  }
+});
+
+router.put('/instruction', async (req, res) => {
+  try {
+    const projectPath = requireProjectPath(req.body);
+    const platform = requirePlatform(req.body);
+    if (typeof req.body.content !== 'string') throw new Error('Instruction content must be a string');
+    const instruction = await projectConfigService.writeInstruction(projectPath, platform, req.body.content);
+    res.json({ success: true, projectPath, platform, instruction });
+  } catch (error) {
+    console.error('[Project Config API] Write instruction failed:', error);
+    sendApiError(res, error);
+  }
+});
+
+router.delete('/instruction', async (req, res) => {
+  try {
+    const input = queryInput(req);
+    const projectPath = requireProjectPath(input);
+    const platform = requirePlatform(input);
+    const instruction = await projectConfigService.deleteInstruction(projectPath, platform);
+    res.json({ success: true, projectPath, platform, instruction });
+  } catch (error) {
+    console.error('[Project Config API] Delete instruction failed:', error);
+    sendApiError(res, error);
+  }
+});
+
+router.get('/mcp', async (req, res) => {
+  try {
+    const input = queryInput(req);
+    const projectPath = requireProjectPath(input);
+    const platform = requirePlatform(input);
+    const mcp = await projectConfigService.listProjectMcp(projectPath, platform);
+    res.json({ success: true, projectPath, platform, mcp });
+  } catch (error) {
+    console.error('[Project Config API] List project MCP failed:', error);
+    sendApiError(res, error);
+  }
+});
+
+router.put('/mcp/:id', async (req, res) => {
+  try {
+    const projectPath = requireProjectPath(req.body);
+    const platform = requirePlatform(req.body);
+    if (!req.body.server || typeof req.body.server !== 'object' || Array.isArray(req.body.server)) {
+      throw new Error('MCP server spec must be an object');
+    }
+    const result = await projectConfigService.upsertProjectMcp(
+      projectPath,
+      platform,
+      req.params.id,
+      req.body.server
+    );
+    res.json({ success: result.success !== false, projectPath, platform, server: result });
+  } catch (error) {
+    console.error('[Project Config API] Upsert project MCP failed:', error);
+    sendApiError(res, error);
+  }
+});
+
+router.delete('/mcp/:id', async (req, res) => {
+  try {
+    const input = queryInput(req);
+    const projectPath = requireProjectPath(input);
+    const platform = requirePlatform(input);
+    const result = await projectConfigService.removeProjectMcp(projectPath, platform, req.params.id);
+    res.json({ success: result.success !== false, projectPath, platform, server: result });
+  } catch (error) {
+    console.error('[Project Config API] Remove project MCP failed:', error);
+    sendApiError(res, error);
+  }
+});
+
+router.post('/mcp/:id/test', async (req, res) => {
+  try {
+    const projectPath = requireProjectPath(req.body);
+    const platform = requirePlatform(req.body);
+    const result = await projectConfigService.testProjectMcp(projectPath, platform, req.params.id);
+    res.json({ success: true, projectPath, platform, result });
+  } catch (error) {
+    console.error('[Project Config API] Test project MCP failed:', error);
+    sendApiError(res, error, error.code === 'MCP_DISABLED' ? 403 : 500);
+  }
+});
+
+module.exports = router;

package/src/server/api/prompts.js

@@ -5,7 +5,45 @@
 const express = require('express');
 const router = express.Router();
 const promptsService = require('../services/prompts-service');
-const PROMPT_FILE_PLATFORMS = ['claude', 'codex', 'gemini', 'opencode'];
+const { getPlatformContext } = require('../platform-context');
+
+function normalizePlatformKey(platform) {
+  return String(platform || '').trim().toLowerCase();
+}
+
+function createCapabilityError(platform, code) {
+  const key = normalizePlatformKey(platform);
+  const error = new Error(code === 'not_found'
+    ? `无效的平台: ${key}`
+    : `平台 ${key} 未声明 prompts capability`);
+  error.status = 404;
+  error.code = code;
+  error.platform = key;
+  error.capability = 'prompts';
+  return error;
+}
+
+function resolvePromptPlatform(platform) {
+  const key = normalizePlatformKey(platform);
+  const registry = getPlatformContext().registry;
+  if (!registry.resolve(key)) return { error: createCapabilityError(key, 'not_found') };
+  const driverId = registry.getCapability(key, 'prompts');
+  if (!driverId || driverId === 'unsupported') {
+    return { error: createCapabilityError(key, 'unsupported') };
+  }
+  return { key, driverId };
+}
+
+function sendCapabilityError(res, error, fallbackStatus = 400) {
+  const status = error?.status === 404 && error?.code ? 404 : fallbackStatus;
+  return res.status(status).json({
+    success: false,
+    error: error.message,
+    code: error.code || undefined,
+    platform: error.platform || undefined,
+    capability: error.capability || undefined
+  });
+}
 
 /**
  * GET /api/prompts/presets
@@ -77,7 +115,7 @@ router.get('/presets/:id', (req, res) => {
  * POST /api/prompts/presets
  * 添加或更新预设
  */
-router.post('/presets', (req, res) => {
+router.post('/presets', async (req, res) => {
   try {
     const preset = req.body;
 
@@ -95,17 +133,14 @@ router.post('/presets', (req, res) => {
       });
     }
 
-    const result = promptsService.savePreset(preset);
+    const result = await promptsService.savePreset(preset);
     res.json({
       success: true,
       preset: result
     });
   } catch (error) {
     console.error('[Prompts API] Save preset failed:', error);
-    res.status(400).json({
-      success: false,
-      error: error.message
-    });
+    return sendCapabilityError(res, error, 400);
   }
 });
 
@@ -180,49 +215,36 @@ router.post('/deactivate', async (req, res) => {
  * GET /api/prompts/platform-status
  * 获取各平台提示词状态
  */
-router.get('/platform-status', (req, res) => {
+router.get('/platform-status', async (req, res) => {
   try {
-    const status = promptsService.getPlatformStatus();
+    const status = await promptsService.getPlatformStatus();
     res.json({
       success: true,
       status
     });
   } catch (error) {
     console.error('[Prompts API] Get platform status failed:', error);
-    res.status(500).json({
-      success: false,
-      error: error.message
-    });
+    return sendCapabilityError(res, error, 500);
   }
 });
-
 /**
  * GET /api/prompts/platform/:platform
  * 读取指定平台的提示词
  */
-router.get('/platform/:platform', (req, res) => {
+router.get('/platform/:platform', async (req, res) => {
   try {
-    const { platform } = req.params;
-
-    if (!PROMPT_FILE_PLATFORMS.includes(platform)) {
-      return res.status(400).json({
-        success: false,
-        error: `无效的平台: ${platform}`
-      });
-    }
+    const resolved = resolvePromptPlatform(req.params.platform);
+    if (resolved.error) return sendCapabilityError(res, resolved.error, 404);
 
-    const content = promptsService.readPlatformPrompt(platform);
+    const content = await promptsService.readPlatformPrompt(resolved.key);
     res.json({
       success: true,
-      platform,
+      platform: resolved.key,
       content
     });
   } catch (error) {
     console.error('[Prompts API] Read platform prompt failed:', error);
-    res.status(500).json({
-      success: false,
-      error: error.message
-    });
+    return sendCapabilityError(res, error, 500);
   }
 });
 
@@ -230,30 +252,21 @@ router.get('/platform/:platform', (req, res) => {
  * POST /api/prompts/import/:platform
  * 从指定平台导入提示词
  */
-router.post('/import/:platform', (req, res) => {
+router.post('/import/:platform', async (req, res) => {
   try {
-    const { platform } = req.params;
-    const { name } = req.body;
+    const resolved = resolvePromptPlatform(req.params.platform);
+    if (resolved.error) return sendCapabilityError(res, resolved.error, 404);
 
-    if (!PROMPT_FILE_PLATFORMS.includes(platform)) {
-      return res.status(400).json({
-        success: false,
-        error: `无效的平台: ${platform}`
-      });
-    }
-
-    const preset = promptsService.importFromPlatform(platform, name);
+    const { name } = req.body;
+    const preset = await promptsService.importFromPlatform(resolved.key, name);
     res.json({
       success: true,
       preset,
-      message: `成功从 ${platform} 导入提示词`
+      message: `成功从 ${resolved.key} 导入提示词`
     });
   } catch (error) {
     console.error('[Prompts API] Import failed:', error);
-    res.status(400).json({
-      success: false,
-      error: error.message
-    });
+    return sendCapabilityError(res, error, 500);
   }
 });
 

package/src/server/api/settings.js

@@ -3,9 +3,11 @@ const router = express.Router();
 const {
   MODEL_METADATA,
   METADATA_LAST_UPDATED,
-  getDefaultSpeedTestModels,
-  saveDefaultSpeedTestModels
+  METADATA_SOURCE,
+  getModelIdsByToolType,
+  getDefaultSpeedTestModels
 } = require('../../config/model-metadata');
+const { getPlatformCatalog } = require('../services/platform-catalog');
 const { loadConfig, saveConfig } = require('../../config/loader');
 const {
   MODEL_SCHEMA_VERSION,
@@ -34,6 +36,35 @@ function normalizeDefinitions(value) {
   return isPlainObject(value) ? value : {};
 }
 
+function normalizeSpeedTestModels(value) {
+  if (!isPlainObject(value)) return {};
+  return Object.fromEntries(
+    Object.entries(value)
+      .map(([key, modelId]) => [String(key).trim(), typeof modelId === 'string' ? modelId.trim() : ''])
+      .filter(([key, modelId]) => key && modelId)
+  );
+}
+
+function getModelPlatformEntries(catalog = getPlatformCatalog()) {
+  return catalog.list({ capability: 'channels' }).map(manifest => ({
+    key: manifest.key,
+    catalogKey: manifest.modelConfig?.catalogKey || manifest.key
+  }));
+}
+
+function resolveDefaultSpeedTestModels(config = {}, catalog = getPlatformCatalog()) {
+  const configured = normalizeSpeedTestModels(config.defaultSpeedTestModels);
+  const staticDefaults = normalizeSpeedTestModels(getDefaultSpeedTestModels());
+  return Object.fromEntries(getModelPlatformEntries(catalog).map(({ key, catalogKey }) => [
+    key,
+    configured[key]
+      || configured[catalogKey]
+      || staticDefaults[catalogKey]
+      || staticDefaults[key]
+      || null
+  ]));
+}
+
 function buildResolvedModelSettings(definitions, overrides) {
   const ids = new Set([
     ...Object.keys(MODEL_METADATA),
@@ -62,7 +93,12 @@ function handleGetModelSettings(req, res) {
     const config = loadConfig();
     const overrides = config.modelMetadataOverrides || {};
     const definitions = normalizeDefinitions(config.modelDefinitions);
-    const defaultSpeedTestModels = getDefaultSpeedTestModels();
+    const catalog = getPlatformCatalog();
+    const platformEntries = getModelPlatformEntries(catalog);
+    const defaultSpeedTestModels = resolveDefaultSpeedTestModels(config, catalog);
+    const toolModels = Object.fromEntries(
+      platformEntries.map(({ key, catalogKey }) => [key, getModelIdsByToolType(catalogKey)])
+    );
 
     // Build merged table: built-in + user overrides
     const merged = {};
@@ -91,6 +127,8 @@ function handleGetModelSettings(req, res) {
       warnings: resolved.warnings,
       builtinModelIds: Object.keys(MODEL_METADATA),
       lastUpdated: METADATA_LAST_UPDATED,
+      metadataSource: METADATA_SOURCE,
+      toolModels,
       defaultSpeedTestModels
     });
   } catch (error) {
@@ -110,6 +148,9 @@ function handleSaveModelSettings(req, res) {
     if (overrides !== undefined && (typeof overrides !== 'object' || overrides === null || Array.isArray(overrides))) {
       return res.status(400).json({ error: 'overrides must be an object' });
     }
+    if (defaultSpeedTestModels !== undefined && !isPlainObject(defaultSpeedTestModels)) {
+      return res.status(400).json({ error: 'defaultSpeedTestModels must be an object' });
+    }
 
     // Validate each override entry
     if (overrides && typeof overrides === 'object') {
@@ -121,7 +162,7 @@ function handleSaveModelSettings(req, res) {
           return res.status(400).json({ error: `${modelId}: metadata must be an object` });
         }
         if (meta.limit !== undefined) {
-          if (typeof meta.limit !== 'object') {
+          if (!isPlainObject(meta.limit)) {
             return res.status(400).json({ error: `${modelId}: limit must be an object` });
           }
           if (meta.limit.context !== undefined && (typeof meta.limit.context !== 'number' || meta.limit.context <= 0)) {
@@ -132,10 +173,10 @@ function handleSaveModelSettings(req, res) {
           }
         }
         if (meta.pricing !== undefined) {
-          if (typeof meta.pricing !== 'object') {
+          if (!isPlainObject(meta.pricing)) {
             return res.status(400).json({ error: `${modelId}: pricing must be an object` });
           }
-          for (const field of ['input', 'output']) {
+          for (const field of ['input', 'output', 'cacheCreation', 'cacheRead']) {
             if (meta.pricing[field] !== undefined && (typeof meta.pricing[field] !== 'number' || meta.pricing[field] < 0)) {
               return res.status(400).json({ error: `${modelId}: pricing.${field} must be a non-negative number` });
             }
@@ -166,6 +207,12 @@ function handleSaveModelSettings(req, res) {
     }
 
     const config = loadConfig();
+    const catalog = getPlatformCatalog();
+    const persistedDefaultSpeedTestModels = {
+      ...normalizeSpeedTestModels(getDefaultSpeedTestModels()),
+      ...normalizeSpeedTestModels(config.defaultSpeedTestModels),
+      ...normalizeSpeedTestModels(defaultSpeedTestModels)
+    };
     const newConfig = {
       ...config,
       modelMetadataOverrides: overrides && typeof overrides === 'object'
@@ -174,17 +221,17 @@ function handleSaveModelSettings(req, res) {
       modelDefinitions: normalizedDefinitions === undefined
         ? (config.modelDefinitions || {})
         : normalizedDefinitions,
+      defaultSpeedTestModels: persistedDefaultSpeedTestModels,
       modelMetadataSchemaVersion: MODEL_SCHEMA_VERSION
     };
     saveConfig(newConfig);
-    const persistedDefaultSpeedTestModels = saveDefaultSpeedTestModels(defaultSpeedTestModels);
 
     res.json({
       success: true,
       schemaVersion: MODEL_SCHEMA_VERSION,
       overrides: redactSensitiveFields(newConfig.modelMetadataOverrides),
       definitions: redactSensitiveFields(newConfig.modelDefinitions),
-      defaultSpeedTestModels: persistedDefaultSpeedTestModels
+      defaultSpeedTestModels: resolveDefaultSpeedTestModels(newConfig, catalog)
     });
   } catch (error) {
     console.error('Error saving model metadata:', error);