coding-tool-x 3.7.11 → 3.7.13

package/src/server/api/plugins.js

@@ -8,13 +8,14 @@ const express = require('express');
 const { PluginsService } = require('../services/plugins-service');
 const { maskToken } = require('../services/oauth-utils');
 const { sendApiError } = require('./validation-errors');
+const { resolveManagedPlatform } = require('../services/platform-resolution');
+const { validateKnownProjectCwd } = require('../services/project-path-validation');
 
 const router = express.Router();
-const SUPPORTED_PLATFORMS = ['claude', 'codex', 'gemini', 'opencode', 'omp'];
 const pluginServices = new Map();
 
 function resolvePlatform(rawPlatform) {
-  return SUPPORTED_PLATFORMS.includes(rawPlatform) ? rawPlatform : 'claude';
+  return resolveManagedPlatform(rawPlatform);
 }
 
 function getPlatform(req) {
@@ -22,11 +23,31 @@ function getPlatform(req) {
 }
 
 function getPluginsService(req) {
-  const platform = getPlatform(req);
+  const resolution = getPlatform(req);
+  const platform = resolution.platform;
   if (!pluginServices.has(platform)) {
     pluginServices.set(platform, new PluginsService(platform));
   }
-  return { platform, service: pluginServices.get(platform) };
+  return {
+    platform,
+    service: pluginServices.get(platform),
+    warning: resolution.warning
+  };
+}
+
+async function getRequestOptions(req) {
+  const scope = String(req.query?.scope || req.body?.scope || '').trim();
+  if (scope && scope !== 'user' && scope !== 'project') {
+    throw new Error('Invalid scope: expected "user" or "project"');
+  }
+  const cwd = await validateKnownProjectCwd(req.query?.cwd || req.body?.cwd);
+  if (scope === 'project' && !cwd) {
+    throw new Error('Project scope requires a valid cwd');
+  }
+  return {
+    ...(cwd ? { cwd } : {}),
+    ...(scope ? { scope } : {})
+  };
 }
 
 function extractRepoPayload(source = {}) {
@@ -43,7 +64,8 @@ function extractRepoPayload(source = {}) {
     localPath: repo.localPath || source.localPath || '',
     repoUrl: repo.repoUrl || repo.url || source.repoUrl || source.url || '',
     token: repo.token || source.token || '',
-    marketplace: repo.marketplace || source.marketplace || ''
+    marketplace: repo.marketplace || source.marketplace || '',
+    source: repo.source || repo.sourceUri || source.source || source.sourceUri || ''
   };
 }
 
@@ -65,6 +87,10 @@ function sanitizeRepos(service, repos = []) {
   return (Array.isArray(repos) ? repos : []).map(sanitizeRepo);
 }
 
+function hasRequestOptions(options = {}) {
+  return Object.keys(options).length > 0;
+}
+
 /**
  * 获取平台插件能力
  * GET /api/plugins/capabilities
@@ -91,15 +117,19 @@ router.get('/capabilities', (req, res) => {
  * 获取插件列表
  * GET /api/plugins
  */
-router.get('/', (req, res) => {
+router.get('/', async (req, res) => {
   try {
-    const { platform, service } = getPluginsService(req);
-    const result = service.listPlugins();
+    const { platform, service, warning } = getPluginsService(req);
+    const options = await getRequestOptions(req);
+    const result = platform === 'omp' || hasRequestOptions(options)
+      ? service.listPlugins(options)
+      : service.listPlugins();
 
     res.json({
       success: true,
       platform,
-      ...result
+      ...result,
+      ...(warning ? { warnings: [warning] } : {})
     });
   } catch (err) {
     console.error('[Plugins API] List plugins error:', err);
@@ -113,18 +143,22 @@ router.get('/', (req, res) => {
  */
 router.get('/market', async (req, res) => {
   try {
-    const { platform, service } = getPluginsService(req);
+    const { platform, service, warning } = getPluginsService(req);
+    const options = await getRequestOptions(req);
     const forceRefresh = req.query.refresh === '1';
     if (forceRefresh) {
       console.log(`[Plugins API] Refreshing market plugins for ${platform}...`);
     }
-    const plugins = await service.getMarketPlugins(forceRefresh);
+    const plugins = platform === 'omp' || hasRequestOptions(options)
+      ? await service.getMarketPlugins(forceRefresh, options)
+      : await service.getMarketPlugins(forceRefresh);
     console.log(`[Plugins API] ${platform}: ${plugins.length} market plugins loaded (refresh=${forceRefresh})`);
 
     res.json({
       success: true,
       platform,
-      plugins
+      plugins,
+      ...(warning ? { warnings: [warning] } : {})
     });
   } catch (err) {
     console.error('[Plugins API] Get market plugins error:', err);
@@ -139,14 +173,15 @@ router.get('/market', async (req, res) => {
  */
 router.post('/install', async (req, res) => {
   try {
-    const { platform, service } = getPluginsService(req);
-    const { directory, repo, gitUrl, source } = req.body;
+    const { platform, service, warning } = getPluginsService(req);
+    const options = await getRequestOptions(req);
+    const { directory, repo, gitUrl, source, pluginId } = req.body;
     const hasDirectoryField = Object.prototype.hasOwnProperty.call(req.body, 'directory');
 
     // Support both new format (directory + repo) and legacy format (gitUrl)
     let installUrl;
-    if (source) {
-      installUrl = source;
+    if (pluginId || source) {
+      installUrl = pluginId || source;
     } else if (repo && hasDirectoryField) {
       installUrl = '';
     } else if (gitUrl) {
@@ -158,15 +193,25 @@ router.post('/install', async (req, res) => {
       });
     }
 
-    const result = await service.installPlugin(
-      installUrl,
-      repo && hasDirectoryField
-        ? {
-            ...extractRepoPayload({ repo }),
-            directory: directory || ''
-          }
-        : null
-    );
+    const repoMetadata = repo && hasDirectoryField
+      ? {
+          ...extractRepoPayload({ repo }),
+          directory: directory || ''
+        }
+      : platform === 'omp' ? {
+          ...(req.body.metadata && typeof req.body.metadata === 'object' ? req.body.metadata : {}),
+          name: req.body.name || req.body.metadata?.name,
+          pluginId: pluginId || req.body.metadata?.pluginId,
+          pluginKind: req.body.pluginKind || req.body.metadata?.pluginKind,
+          marketplace: req.body.marketplace || req.body.metadata?.marketplace,
+          installSource: req.body.installSource || req.body.metadata?.installSource,
+          version: req.body.version || req.body.metadata?.version,
+          description: req.body.description || req.body.metadata?.description,
+          resourceTypes: req.body.resourceTypes || req.body.metadata?.resourceTypes
+        } : null;
+    const result = platform === 'omp' || hasRequestOptions(options)
+      ? await service.installPlugin(installUrl, repoMetadata, options)
+      : await service.installPlugin(installUrl, repoMetadata);
 
     if (!result.success) {
       return res.status(400).json({
@@ -179,7 +224,8 @@ router.post('/install', async (req, res) => {
       success: true,
       platform,
       plugin: result.plugin,
-      message: `Plugin "${result.plugin.name}" installed successfully`
+      message: `Plugin "${result.plugin.name}" installed successfully`,
+      ...(warning ? { warnings: [warning] } : {})
     });
   } catch (err) {
     console.error('[Plugins API] Install plugin error:', err);
@@ -193,14 +239,23 @@ router.post('/install', async (req, res) => {
  * 获取插件仓库列表
  * GET /api/plugins/repos
  */
-router.get('/repos', (req, res) => {
+router.get('/repos', async (req, res) => {
   try {
-    const { platform, service } = getPluginsService(req);
-    const repos = service.getRepos();
+    const { platform, service, warning } = getPluginsService(req);
+    const options = await getRequestOptions(req);
+    const repos = platform === 'omp' || hasRequestOptions(options)
+      ? service.getRepos(options)
+      : service.getRepos();
     res.json({
       success: true,
       platform,
-      repos: sanitizeRepos(service, repos)
+      repos: sanitizeRepos(service, repos),
+      ...((warning || service.getMigrationWarnings?.().length) ? {
+        warnings: [
+          ...(warning ? [warning] : []),
+          ...(service.getMigrationWarnings?.() || [])
+        ]
+      } : {})
     });
   } catch (err) {
     console.error('[Plugins API] Get repos error:', err);
@@ -213,20 +268,23 @@ router.get('/repos', (req, res) => {
  * POST /api/plugins/repos
  * Body: { url, name, description }
  */
-router.post('/repos', (req, res) => {
+router.post('/repos', async (req, res) => {
   try {
     const { platform, service } = getPluginsService(req);
+    const options = await getRequestOptions(req);
     const repo = extractRepoPayload(req.body);
     repo.enabled = req.body.enabled !== false;
 
-    if (!repo.localPath && !repo.projectPath && (!repo.owner || !repo.name) && !repo.repoUrl) {
+    if (!repo.source && !repo.localPath && !repo.projectPath && (!repo.owner || !repo.name) && !repo.repoUrl) {
       return res.status(400).json({
         success: false,
         message: 'Missing repo info'
       });
     }
 
-    const repos = service.addRepo(repo);
+    const repos = platform === 'omp' || hasRequestOptions(options)
+      ? service.addRepo(repo, options)
+      : service.addRepo(repo);
 
     res.json({
       success: true,
@@ -240,11 +298,14 @@ router.post('/repos', (req, res) => {
   }
 });
 
-router.delete('/repos', (req, res) => {
+router.delete('/repos', async (req, res) => {
   try {
     const { platform, service } = getPluginsService(req);
+    const options = await getRequestOptions(req);
     const { id = '', owner = '', name = '' } = req.query;
-    const repos = service.removeRepo(owner, name, id);
+    const repos = platform === 'omp' || hasRequestOptions(options)
+      ? service.removeRepo(owner, name, id, options)
+      : service.removeRepo(owner, name, id);
 
     res.json({
       success: true,
@@ -376,7 +437,8 @@ router.put('/repos/auth', (req, res) => {
 router.post('/repos/sync', async (req, res) => {
   try {
     const { platform, service } = getPluginsService(req);
-    const result = await service.syncRepos();
+    const options = await getRequestOptions(req);
+    const result = await service.syncRepos(options);
 
     res.json({
       success: true,
@@ -397,7 +459,8 @@ router.post('/repos/sync', async (req, res) => {
 router.post('/sync', async (req, res) => {
   try {
     const { platform, service } = getPluginsService(req);
-    const result = await service.syncPlugins();
+    const options = await getRequestOptions(req);
+    const result = await service.syncPlugins(options);
 
     res.json({
       success: true,
@@ -472,12 +535,13 @@ router.get('/:name/readme', async (req, res) => {
  * 获取单个插件详情
  * GET /api/plugins/:name
  */
-router.get('/:name', (req, res) => {
+router.get('/:name', async (req, res) => {
   try {
     const { platform, service } = getPluginsService(req);
     const { name } = req.params;
+    const options = await getRequestOptions(req);
 
-    const plugin = service.getPlugin(name);
+    const plugin = service.getPlugin(req.query.pluginId || name, options);
 
     if (!plugin) {
       return res.status(404).json({
@@ -501,12 +565,14 @@ router.get('/:name', (req, res) => {
  * 卸载插件
  * DELETE /api/plugins/:name
  */
-router.delete('/:name', (req, res) => {
+router.delete('/:name', async (req, res) => {
   try {
     const { platform, service } = getPluginsService(req);
     const { name } = req.params;
+    const options = await getRequestOptions(req);
+    const pluginId = req.query.pluginId || name;
 
-    const result = service.uninstallPlugin(name);
+    const result = service.uninstallPlugin(pluginId, options);
 
     if (!result.success) {
       return res.status(400).json({
@@ -531,11 +597,12 @@ router.delete('/:name', (req, res) => {
  * PUT /api/plugins/:name/toggle
  * Body: { enabled }
  */
-router.put('/:name/toggle', (req, res) => {
+router.put('/:name/toggle', async (req, res) => {
   try {
     const { platform, service } = getPluginsService(req);
     const { name } = req.params;
-    const { enabled } = req.body;
+    const { enabled, pluginId = name } = req.body;
+    const options = await getRequestOptions(req);
 
     if (typeof enabled !== 'boolean') {
       return res.status(400).json({
@@ -544,7 +611,9 @@ router.put('/:name/toggle', (req, res) => {
       });
     }
 
-    const plugin = service.togglePlugin(name, enabled);
+    const plugin = platform === 'omp' || hasRequestOptions(options)
+      ? service.togglePlugin(pluginId, enabled, options)
+      : service.togglePlugin(pluginId, enabled);
 
     res.json({
       success: true,
@@ -563,11 +632,12 @@ router.put('/:name/toggle', (req, res) => {
  * PUT /api/plugins/:name/config
  * Body: { config }
  */
-router.put('/:name/config', (req, res) => {
+router.put('/:name/config', async (req, res) => {
   try {
     const { platform, service } = getPluginsService(req);
     const { name } = req.params;
-    const { config } = req.body;
+    const { config, pluginId = name } = req.body;
+    const options = await getRequestOptions(req);
 
     if (!config || typeof config !== 'object') {
       return res.status(400).json({
@@ -576,7 +646,9 @@ router.put('/:name/config', (req, res) => {
       });
     }
 
-    const result = service.updatePluginConfig(name, config);
+    const result = platform === 'omp' || hasRequestOptions(options)
+      ? service.updatePluginConfig(pluginId, config, options)
+      : service.updatePluginConfig(pluginId, config);
 
     res.json({
       success: true,

package/src/server/api/skills.js

@@ -6,13 +6,18 @@ const express = require('express');
 const { SkillService } = require('../services/skill-service');
 const { maskToken } = require('../services/oauth-utils');
 const { sendApiError } = require('./validation-errors');
+const { resolveManagedPlatform } = require('../services/platform-resolution');
+const { validateKnownProjectCwd } = require('../services/project-path-validation');
+const {
+  readOmpSkillSettings,
+  updateOmpSkillSettings
+} = require('../services/omp-skill-settings-service');
 
 const router = express.Router();
-const SUPPORTED_PLATFORMS = ['claude', 'codex', 'gemini', 'opencode', 'omp'];
 const skillServices = new Map();
 
 function resolvePlatform(rawPlatform) {
-  return SUPPORTED_PLATFORMS.includes(rawPlatform) ? rawPlatform : 'claude';
+  return resolveManagedPlatform(rawPlatform);
 }
 
 function getPlatform(req) {
@@ -20,11 +25,16 @@ function getPlatform(req) {
 }
 
 function getSkillService(req) {
-  const platform = getPlatform(req);
+  const resolution = getPlatform(req);
+  const platform = resolution.platform;
   if (!skillServices.has(platform)) {
     skillServices.set(platform, new SkillService(platform));
   }
-  return { platform, service: skillServices.get(platform) };
+  return {
+    platform,
+    service: skillServices.get(platform),
+    warning: resolution.warning
+  };
 }
 
 function extractRepoPayload(source = {}) {
@@ -69,19 +79,21 @@ function sanitizeRepos(service, repos = []) {
  */
 router.get('/', async (req, res) => {
   try {
-    const { platform, service } = getSkillService(req);
+    const { platform, service, warning } = getSkillService(req);
     const forceRefresh = req.query.refresh === '1';
+    const cwd = await validateKnownProjectCwd(req.query.cwd);
     if (forceRefresh) {
       console.log(`[Skills API] Refreshing skills for ${platform}...`);
     }
-    const skills = await service.listSkills(forceRefresh);
+    const skills = await service.listSkills(forceRefresh, { cwd });
     console.log(`[Skills API] ${platform}: ${skills.length} skills loaded (refresh=${forceRefresh})`);
     res.json({
       success: true,
       platform,
       skills,
       total: skills.length,
-      installed: skills.filter(s => s.installed).length
+      installed: skills.filter(s => s.installed).length,
+      ...(warning ? { warnings: [warning] } : {})
     });
   } catch (err) {
     console.error('[Skills API] List skills error:', err);
@@ -89,6 +101,34 @@ router.get('/', async (req, res) => {
   }
 });
 
+/**
+ * 获取 OMP 技能设置
+ * GET /api/skills/omp-settings
+ */
+router.get('/omp-settings', (req, res) => {
+  try {
+    const settings = readOmpSkillSettings();
+    res.json({ success: true, settings });
+  } catch (err) {
+    console.error('[Skills API] Get OMP skill settings error:', err);
+    sendApiError(res, err);
+  }
+});
+
+/**
+ * 更新 OMP 技能设置
+ * PUT /api/skills/omp-settings
+ */
+router.put('/omp-settings', (req, res) => {
+  try {
+    const settings = updateOmpSkillSettings(req.body);
+    res.json({ success: true, settings });
+  } catch (err) {
+    console.error('[Skills API] Update OMP skill settings error:', err);
+    sendApiError(res, err);
+  }
+});
+
 /**
  * 获取技能详情（完整内容）
  * GET /api/skills/detail/:directory
@@ -257,10 +297,10 @@ router.post('/create', (req, res) => {
  * POST /api/skills/uninstall
  * Body: { directory }
  */
-router.post('/uninstall', (req, res) => {
+router.post('/uninstall', async (req, res) => {
   try {
     const { platform, service } = getSkillService(req);
-    const { directory } = req.body;
+    const { directory, scope } = req.body;
 
     if (!directory) {
       return res.status(400).json({
@@ -269,7 +309,20 @@ router.post('/uninstall', (req, res) => {
       });
     }
 
-    const result = service.uninstallSkill(directory);
+    const cwd = await validateKnownProjectCwd(req.body.cwd);
+    if (scope && scope !== 'user' && scope !== 'project') {
+      throw new Error('Invalid scope: expected "user" or "project"');
+    }
+    if (scope === 'project' && !cwd) {
+      throw new Error('Project scope requires a valid cwd');
+    }
+    const options = {
+      ...(cwd ? { cwd } : {}),
+      ...(scope ? { scope } : {})
+    };
+    const result = platform === 'omp' && Object.keys(options).length > 0
+      ? service.uninstallSkill(directory, options)
+      : service.uninstallSkill(directory);
 
     res.json({
       success: true,

package/src/server/omp-proxy-server.js

@@ -1,15 +1,16 @@
-const crypto = require('crypto');
 const { loadConfig } = require('../config/loader');
 const { saveProxyStartTime, clearProxyStartTime, getProxyStartTime, getProxyRuntime } = require('./services/proxy-runtime');
 const {
   syncManagedOmpProviders,
   disableManagedOmpProviders,
+  activateStaticOmpChannel,
   getEnabledChannels,
   isManagedOmpModeEnabled,
   enableManagedOmpMode,
   disableManagedOmpMode,
   loadManagedOmpActiveChannelId,
-  loadManagedOmpModeState
+  loadManagedOmpModeState,
+  getOrCreateOmpGatewaySecret
 } = require('./services/omp-channels');
 const {
   startOmpSessionLogObserver,
@@ -51,7 +52,7 @@ async function startOmpProxyServerUnlocked(options = {}) {
     activeChannelId: loadManagedOmpActiveChannelId()
   };
   const channels = getEnabledChannels();
-  const secret = crypto.randomBytes(32).toString('hex');
+  const secret = getOrCreateOmpGatewaySecret();
   const desiredPort = options.port ?? config.ports?.ompProxy ?? 20092;
   const gatewayStatus = await gateway.start({
     host: '127.0.0.1',
@@ -115,10 +116,22 @@ async function stopOmpProxyServerUnlocked(options = {}) {
       warnings: lastSyncResult?.warnings || []
     };
   }
+  const state = loadManagedOmpModeState?.() || {
+    activeChannelId: loadManagedOmpActiveChannelId()
+  };
+  const enabledChannels = getEnabledChannels();
+  const activeChannel = enabledChannels.find(channel => channel.id === state.activeChannelId)
+    || enabledChannels[0]
+    || null;
   gateway.beginDraining();
   stopOmpSessionLogObserver();
   try {
-    lastSyncResult = disableManagedOmpProviders();
+    if (activeChannel) {
+      const handoff = activateStaticOmpChannel(activeChannel.id);
+      lastSyncResult = handoff?.sync || lastSyncResult;
+    } else {
+      lastSyncResult = disableManagedOmpProviders();
+    }
   } catch (error) {
     startOmpSessionLogObserver();
     gateway.cancelDraining();

package/src/server/services/channel-health.js

@@ -143,6 +143,11 @@ function recordFailure(channelId, source = 'claude', error) {
   health.consecutiveSuccesses = 0;
   health.lastCheckTime = now;
 
+  // omp 动态切换按请求即时回退其他渠道，失败渠道无需冻结（冻结会将其排除在后续分配之外）
+  if (source === 'omp') {
+    return;
+  }
+
   // 如果当前是健康状态或检测中状态，检查是否需要冻结
   if (health.status === 'healthy' || health.status === 'checking') {
     if (health.consecutiveFailures >= healthConfig.failureThreshold) {

package/src/server/services/channel-sync-utils.js

@@ -289,7 +289,7 @@ function upsertSyncedChannels({
       result.warnings.push(`${toolType}: missing baseUrl, skipped current channel sync`);
       continue;
     }
-    if (!normalizeString(candidate.apiKey)) {
+    if (!normalizeString(candidate.apiKey) && candidate.authMode !== 'none') {
       result.skipped += 1;
       result.warnings.push(`${toolType}: missing API key or OAuth-only config, skipped current channel sync`);
       continue;

package/src/server/services/model-definition-schema.js

@@ -390,7 +390,8 @@ function normalizeCatalogModelList(value) {
   const warnings = [];
   for (const rawModel of Array.isArray(value) ? value : []) {
     const rawId = String(rawModel?.id || rawModel?.name || '').trim();
-    const normalized = normalizeModelSpec(rawModel, rawId);
+    const { provider: _provider, selector: _selector, ...modelFields } = isPlainObject(rawModel) ? rawModel : {};
+    const normalized = normalizeModelSpec(modelFields, rawId);
     if (!normalized.spec?.id) continue;
     warnings.push(...normalized.warnings.map(message => `${normalized.spec.id}: ${message}`));
     const key = normalized.spec.id.toLowerCase();