coding-tool-x 3.6.13 → 3.7.1

package/src/server/services/mcp-service.js

@@ -19,7 +19,7 @@ const HOME_DIR = resolvePreferredHomeDir(process.platform, process.env, os.homed
 const MCP_SERVERS_FILE = PATHS.mcpServers;
 
 // 各平台配置文件路径
-const CLAUDE_CONFIG_PATH = path.join(HOME_DIR, '.claude.json');
+const CLAUDE_CONFIG_PATH = NATIVE_PATHS.claude.mcp || path.join(HOME_DIR, '.claude.json');
 const CODEX_CONFIG_PATH = NATIVE_PATHS.codex.config;
 const GEMINI_CONFIG_PATH = path.join(path.dirname(NATIVE_PATHS.gemini.env), 'settings.json');
 const OPENCODE_CONFIG_DIR = NATIVE_PATHS.opencode.config;
@@ -28,6 +28,8 @@ const OPENCODE_CONFIG_PATHS = {
   json: path.join(OPENCODE_CONFIG_DIR, 'opencode.json'),
   legacy: path.join(OPENCODE_CONFIG_DIR, 'config.json')
 };
+const OMP_MCP_CONFIG_PATH = NATIVE_PATHS.omp?.mcp
+  || path.join(NATIVE_PATHS.omp?.dir || path.join(HOME_DIR, '.omp', 'agent'), 'mcp.json');
 
 // MCP 客户端连接池
 // serverId -> { client, timestamp }
@@ -36,6 +38,9 @@ const POOL_TTL = 5 * 60 * 1000; // 5 minutes
 const STREAMABLE_HTTP_TYPE = 'streamable_http';
 const MCP_SERVER_TYPES = ['stdio', STREAMABLE_HTTP_TYPE, 'sse'];
 const REMOTE_MCP_SERVER_TYPES = [STREAMABLE_HTTP_TYPE, 'sse'];
+const MCP_PLATFORM_KEYS = ['claude', 'codex', 'gemini', 'opencode', 'omp'];
+const OMP_MCP_SCHEMA_URL = 'https://raw.githubusercontent.com/can1357/oh-my-omp/main/packages/coding-agent/src/config/mcp-schema.json';
+const OMP_SERVER_NAME_PATTERN = /^[a-zA-Z0-9_.-]{1,100}$/;
 
 function normalizeServerSpec(spec = {}) {
   if (!spec || typeof spec !== 'object') {
@@ -532,7 +537,8 @@ const DEFAULT_SERVER_APPS = {
   claude: true,
   codex: false,
   gemini: false,
-  opencode: false
+  opencode: false,
+  omp: false
 };
 
 function normalizeServerApps(apps = {}, fallbackApps = DEFAULT_SERVER_APPS) {
@@ -540,7 +546,8 @@ function normalizeServerApps(apps = {}, fallbackApps = DEFAULT_SERVER_APPS) {
     claude: apps.claude !== undefined ? !!apps.claude : !!fallbackApps.claude,
     codex: apps.codex !== undefined ? !!apps.codex : !!fallbackApps.codex,
     gemini: apps.gemini !== undefined ? !!apps.gemini : !!fallbackApps.gemini,
-    opencode: apps.opencode !== undefined ? !!apps.opencode : !!fallbackApps.opencode
+    opencode: apps.opencode !== undefined ? !!apps.opencode : !!fallbackApps.opencode,
+    omp: apps.omp !== undefined ? !!apps.omp: !!fallbackApps.omp
   };
 }
 
@@ -648,7 +655,7 @@ async function toggleServerApp(serverId, app, enabled) {
     throw new Error(`MCP 服务器 "${serverId}" 不存在`);
   }
 
-  if (!['claude', 'codex', 'gemini', 'opencode'].includes(app)) {
+  if (!MCP_PLATFORM_KEYS.includes(app)) {
     throw new Error(`无效的平台: ${app}`);
   }
 
@@ -720,28 +727,12 @@ async function syncServerToAllPlatforms(server, previousApps = null) {
     return previous[platform] && !apps[platform];
   };
 
-  if (apps.claude) {
-    await syncServerToPlatform(server, 'claude');
-  } else if (shouldRemoveFromPlatform('claude')) {
-    await removeServerFromPlatform(server.id, 'claude');
-  }
-
-  if (apps.codex) {
-    await syncServerToPlatform(server, 'codex');
-  } else if (shouldRemoveFromPlatform('codex')) {
-    await removeServerFromPlatform(server.id, 'codex');
-  }
-
-  if (apps.gemini) {
-    await syncServerToPlatform(server, 'gemini');
-  } else if (shouldRemoveFromPlatform('gemini')) {
-    await removeServerFromPlatform(server.id, 'gemini');
-  }
-
-  if (apps.opencode) {
-    await syncServerToPlatform(server, 'opencode');
-  } else if (shouldRemoveFromPlatform('opencode')) {
-    await removeServerFromPlatform(server.id, 'opencode');
+  for (const platform of MCP_PLATFORM_KEYS) {
+    if (apps[platform]) {
+      await syncServerToPlatform(server, platform);
+    } else if (shouldRemoveFromPlatform(platform)) {
+      await removeServerFromPlatform(server.id, platform);
+    }
   }
 }
 
@@ -749,10 +740,9 @@ async function syncServerToAllPlatforms(server, previousApps = null) {
  * 从所有平台移除服务器
  */
 async function removeServerFromAllPlatforms(serverId) {
-  await removeServerFromPlatform(serverId, 'claude');
-  await removeServerFromPlatform(serverId, 'codex');
-  await removeServerFromPlatform(serverId, 'gemini');
-  await removeServerFromPlatform(serverId, 'opencode');
+  for (const platform of MCP_PLATFORM_KEYS) {
+    await removeServerFromPlatform(serverId, platform);
+  }
 }
 
 /**
@@ -773,6 +763,9 @@ async function syncServerToPlatform(server, platform) {
       case 'opencode':
         syncToOpenCodeConfig(server);
         break;
+      case 'omp':
+        syncToOmpMcpConfig(server);
+        break;
     }
     console.log(`[MCP] Synced "${server.id}" to ${platform}`);
   } catch (err) {
@@ -799,6 +792,9 @@ async function removeServerFromPlatform(serverId, platform) {
       case 'opencode':
         removeFromOpenCodeConfig(serverId);
         break;
+      case 'omp':
+        removeFromOmpMcpConfig(serverId);
+        break;
     }
     console.log(`[MCP] Removed "${serverId}" from ${platform}`);
   } catch (err) {
@@ -947,6 +943,133 @@ function removeFromGeminiConfig(serverId) {
   }
 }
 
+// ============================================================================
+// OMP 配置同步
+// ============================================================================
+
+function validateOmpServerName(serverId) {
+  if (!OMP_SERVER_NAME_PATTERN.test(serverId)) {
+    throw new Error(`OMP MCP 服务器 ID "${serverId}" 无效。OMP 仅支持 1-100 个字母、数字、下划线、点或连字符。`);
+  }
+}
+
+function readOmpMcpConfig() {
+  const config = readJsonFile(OMP_MCP_CONFIG_PATH, { mcpServers: {} });
+  if (!config || typeof config !== 'object' || Array.isArray(config)) {
+    return { mcpServers: {} };
+  }
+  if (!config.mcpServers || typeof config.mcpServers !== 'object' || Array.isArray(config.mcpServers)) {
+    config.mcpServers = {};
+  }
+  return config;
+}
+
+function copyCommonMcpFields(source, target) {
+  for (const key of ['timeout', 'auth', 'oauth']) {
+    if (source[key] !== undefined) {
+      target[key] = source[key];
+    }
+  }
+  return target;
+}
+
+function convertToOmpMcpFormat(spec = {}) {
+  const sourceType = spec.type || 'stdio';
+  let result;
+
+  if (sourceType === 'stdio') {
+    result = {
+      type: 'stdio',
+      command: spec.command || ''
+    };
+    if (Array.isArray(spec.args) && spec.args.length > 0) {
+      result.args = spec.args;
+    }
+    if (spec.env && Object.keys(spec.env).length > 0) {
+      result.env = spec.env;
+    }
+    if (spec.cwd) {
+      result.cwd = spec.cwd;
+    }
+  } else if (sourceType === STREAMABLE_HTTP_TYPE) {
+    result = {
+      type: 'http',
+      url: spec.url || ''
+    };
+    if (spec.headers && Object.keys(spec.headers).length > 0) {
+      result.headers = spec.headers;
+    }
+  } else if (sourceType === 'sse') {
+    result = {
+      type: 'sse',
+      url: spec.url || ''
+    };
+    if (spec.headers && Object.keys(spec.headers).length > 0) {
+      result.headers = spec.headers;
+    }
+  } else {
+    result = extractServerSpec(spec);
+  }
+
+  return copyCommonMcpFields(spec, result);
+}
+
+function convertFromOmpMcpFormat(spec = {}) {
+  const sourceType = spec.type || 'stdio';
+  let result;
+
+  if (sourceType === 'stdio') {
+    result = {
+      type: 'stdio',
+      command: spec.command || ''
+    };
+    if (spec.args) {
+      result.args = spec.args;
+    }
+    if (spec.env) {
+      result.env = spec.env;
+    }
+    if (spec.cwd) {
+      result.cwd = spec.cwd;
+    }
+  } else if (sourceType === 'http') {
+    result = {
+      type: STREAMABLE_HTTP_TYPE,
+      url: spec.url || ''
+    };
+    if (spec.headers) {
+      result.headers = spec.headers;
+    }
+  } else if (sourceType === 'sse') {
+    result = {
+      type: 'sse',
+      url: spec.url || ''
+    };
+    if (spec.headers) {
+      result.headers = spec.headers;
+    }
+  } else {
+    result = convertFromCodexFormat(spec);
+  }
+
+  return copyCommonMcpFields(spec, result);
+}
+
+function syncToOmpMcpConfig(server) {
+  validateOmpServerName(server.id);
+  const config = readOmpMcpConfig();
+  config.mcpServers[server.id] = convertToOmpMcpFormat(server.server);
+  writeJsonFile(OMP_MCP_CONFIG_PATH, config);
+}
+
+function removeFromOmpMcpConfig(serverId) {
+  const config = readOmpMcpConfig();
+  if (config.mcpServers && config.mcpServers[serverId]) {
+    delete config.mcpServers[serverId];
+    writeJsonFile(OMP_MCP_CONFIG_PATH, config);
+  }
+}
+
 // ============================================================================
 // OpenCode 配置同步
 // ============================================================================
@@ -1108,6 +1231,9 @@ async function importFromPlatform(platform) {
     case 'opencode':
       importedCount = importFromOpenCode(servers);
       break;
+    case 'omp':
+      importedCount = importFromOmp(servers);
+      break;
     default:
       throw new Error(`无效的平台: ${platform}`);
   }
@@ -1250,6 +1376,39 @@ function importFromOpenCode(servers) {
   return count;
 }
 
+/**
+ * 从 OMP 导入
+ */
+function importFromOmp(servers) {
+  const config = readOmpMcpConfig();
+  const mcpServers = config.mcpServers || {};
+  let count = 0;
+
+  for (const [id, spec] of Object.entries(mcpServers)) {
+    const convertedSpec = convertFromOmpMcpFormat(spec || {});
+
+    if (servers[id]) {
+      servers[id].apps = normalizeServerApps(servers[id].apps);
+      if (!servers[id].apps.omp) {
+        servers[id].apps.omp = true;
+        count++;
+      }
+    } else {
+      servers[id] = {
+        id,
+        name: id,
+        server: convertedSpec,
+        apps: { claude: false, codex: false, gemini: false, opencode: false, omp: true },
+        createdAt: Date.now(),
+        updatedAt: Date.now()
+      };
+      count++;
+    }
+  }
+
+  return count;
+}
+
 /**
  * 从 Codex 格式转换
  */
@@ -1311,7 +1470,8 @@ function getStats() {
     claude: serverList.filter(s => s.apps?.claude).length,
     codex: serverList.filter(s => s.apps?.codex).length,
     gemini: serverList.filter(s => s.apps?.gemini).length,
-    opencode: serverList.filter(s => s.apps?.opencode).length
+    opencode: serverList.filter(s => s.apps?.opencode).length,
+    omp: serverList.filter(s => s.apps?.omp).length
   };
 }
 
@@ -1763,7 +1923,7 @@ function updateServerOrder(serverIds) {
 
 /**
  * 导出所有 MCP 配置
- * @param {string} format - 导出格式: 'json' | 'claude' | 'codex' | 'opencode' | 'gemini'
+ * @param {string} format - 导出格式: 'json' | 'claude' | 'codex' | 'opencode' | 'gemini' | 'omp'
  */
 function exportServers(format = 'json') {
   const servers = getAllServers();
@@ -1777,6 +1937,8 @@ function exportServers(format = 'json') {
       return exportForOpenCode(servers);
     case 'gemini':
       return exportForGemini(servers);
+    case 'omp':
+      return exportForOmp(servers);
     case 'json':
     default:
       return exportAsJson(servers);
@@ -1876,6 +2038,26 @@ function exportForGemini(servers) {
   };
 }
 
+/**
+ * 导出为 OMP 格式
+ */
+function exportForOmp(servers) {
+  const mcpServers = {};
+
+  for (const [id, server] of Object.entries(servers)) {
+    if (server.apps?.omp) {
+      validateOmpServerName(id);
+      mcpServers[id] = convertToOmpMcpFormat(server.server);
+    }
+  }
+
+  return {
+    format: 'omp',
+    content: JSON.stringify({ $schema: OMP_MCP_SCHEMA_URL, mcpServers }, null, 2),
+    filename: 'omp-mcp-config.json'
+  };
+}
+
 module.exports = {
   getAllServers,
   getServer,
@@ -1895,6 +2077,8 @@ module.exports = {
   exportServers,
   _test: {
     extractMcpHint,
-    buildMcpFailureResult
+    buildMcpFailureResult,
+    convertToOmpMcpFormat,
+    convertFromOmpMcpFormat
   }
 };

package/src/server/services/notification-hooks.js

@@ -13,6 +13,7 @@ const geminiSettingsManager = require('./gemini-settings-manager');
 
 const MANAGED_HOOK_NAME = 'coding-tool-notify';
 const MANAGED_OPENCODE_PLUGIN_FILE = 'coding-tool-notify.js';
+const MANAGED_OMP_EXTENSION_FILE = 'coding-tool-notify.ts';
 const REMOTE_PROVIDER_TYPES = [
   'wechatBot',
   'qqBot',
@@ -371,6 +372,13 @@ function getOpenCodeManagedPluginPath() {
   return path.join(NATIVE_PATHS.opencode.config, 'plugins', MANAGED_OPENCODE_PLUGIN_FILE);
 }
 
+function getOmpManagedExtensionPath() {
+  const ompPaths = NATIVE_PATHS.omp || {};
+  const extensionsDir = ompPaths.extensions ||
+    path.join(ompPaths.dir || path.dirname(ompPaths.settings || PATHS.notifyHook), 'extensions');
+  return path.join(extensionsDir, MANAGED_OMP_EXTENSION_FILE);
+}
+
 function buildOpenCodePluginContent(type) {
   const mode = normalizeType(type);
   return `// Managed by Coding Tool. Do not edit manually.
@@ -410,6 +418,64 @@ export const CodingToolNotifyPlugin = async () => ({
 `;
 }
 
+function buildOmpExtensionContent(type) {
+  const mode = normalizeType(type);
+  return `// Managed by Coding Tool. Do not edit manually.
+// mode:${mode}
+import { spawn } from 'node:child_process'
+
+const SCRIPT_PATH = ${JSON.stringify(PATHS.notifyHook)}
+const MODE = ${JSON.stringify(mode)}
+let lastFireAt = 0
+
+function shouldFire() {
+  const now = Date.now()
+  if (now - lastFireAt < 1000) {
+    return false
+  }
+  lastFireAt = now
+  return true
+}
+
+function fire(eventType) {
+  if (!shouldFire()) {
+    return
+  }
+
+  try {
+    const child = spawn('node', [
+      SCRIPT_PATH,
+      '--source=omp',
+      \`--mode=\${MODE}\`,
+      \`--cc-notify-type=\${MODE}\`,
+      \`--event-type=\${eventType}\`
+    ], {
+      detached: true,
+      stdio: 'ignore',
+      windowsHide: true
+    })
+    child.unref()
+  } catch (error) {
+    // Ignore notification failures.
+  }
+}
+
+export default async function CodingToolNotifyExtension(omp) {
+  const register = (eventName) => {
+    if (typeof omp?.on !== 'function') {
+      return
+    }
+    omp.on(eventName, async () => {
+      fire(eventName)
+    })
+  }
+
+  register('agent_settled')
+  register('turn_end')
+}
+`;
+}
+
 function escapeForAppleScript(value) {
   return String(value || '').replace(/\\/g, '\\\\').replace(/"/g, '\\"');
 }
@@ -712,6 +778,10 @@ function resolveMessage(source, eventType, payload) {
     return 'OpenCode 响应已完成 | 等待交互'
   }
 
+  if (source === 'omp') {
+    return 'OMP 回合已完成 | 等待交互'
+  }
+
   return 'Claude Code 任务已完成 | 等待交互'
 }
 
@@ -886,12 +956,17 @@ function sendTelegramMessage(config = {}, ctx, send = postJson) {
   return send(url, payload, {}, agent ? { agent } : {})
 }
 
+function resolveDisplaySource(source) {
+  if (source === 'omp') return 'OMP'
+  return source
+}
+
 function buildNotificationContext(message, source, eventType) {
   const timestamp = new Date().toLocaleString('zh-CN')
   return {
     title: 'Coding Tool - 通知',
     message,
-    source,
+    source: resolveDisplaySource(source),
     eventType,
     timestamp,
     hostname: os.hostname()
@@ -1545,6 +1620,24 @@ function parseOpenCodeNotificationStatus(content = '') {
   };
 }
 
+function parseOmpNotificationStatus(content = '') {
+  if (!content) {
+    return {
+      enabled: false,
+      external: false,
+      type: 'notification',
+      method: 'Extension Events'
+    };
+  }
+
+  return {
+    enabled: true,
+    external: false,
+    type: parseManagedType(content) || 'notification',
+    method: 'Extension Events'
+  };
+}
+
 function getOpenCodeHookStatus() {
   const pluginPath = getOpenCodeManagedPluginPath();
   if (!fs.existsSync(pluginPath)) {
@@ -1554,6 +1647,15 @@ function getOpenCodeHookStatus() {
   return parseOpenCodeNotificationStatus(fs.readFileSync(pluginPath, 'utf8'));
 }
 
+function getOmpHookStatus() {
+  const extensionPath = getOmpManagedExtensionPath();
+  if (!fs.existsSync(extensionPath)) {
+    return parseOmpNotificationStatus('');
+  }
+
+  return parseOmpNotificationStatus(fs.readFileSync(extensionPath, 'utf8'));
+}
+
 function saveOpenCodeHook(enabled, type) {
   const pluginPath = getOpenCodeManagedPluginPath();
   const opencodeSettingsManager = require('./opencode-settings-manager');
@@ -1608,6 +1710,20 @@ function saveOpenCodeHook(enabled, type) {
   }
 }
 
+function saveOmpHook(enabled, type) {
+  const extensionPath = getOmpManagedExtensionPath();
+
+  if (!enabled) {
+    if (fs.existsSync(extensionPath)) {
+      fs.unlinkSync(extensionPath);
+    }
+    return;
+  }
+
+  ensureParentDir(extensionPath);
+  fs.writeFileSync(extensionPath, buildOmpExtensionContent(type), 'utf8');
+}
+
 function getNotificationSettings() {
   const uiConfig = loadUIConfig();
   const remoteNotifications = getRemoteNotificationsConfig(uiConfig);
@@ -1623,7 +1739,8 @@ function getNotificationSettings() {
       claude: getClaudeHookStatus(),
       codex: getCodexHookStatus(),
       gemini: getGeminiHookStatus(),
-      opencode: getOpenCodeHookStatus()
+      opencode: getOpenCodeHookStatus(),
+      omp: getOmpHookStatus()
     }
   };
 }
@@ -1643,6 +1760,8 @@ function resolveBrowserNotificationTitle(source = 'claude') {
       return 'Gemini CLI';
     case 'opencode':
       return 'OpenCode';
+    case 'omp':
+      return 'OMP';
     default:
       return 'Claude Code';
   }
@@ -1656,6 +1775,8 @@ function resolveBrowserNotificationUrl(source = 'claude') {
       return '/gemini';
     case 'opencode':
       return '/opencode';
+    case 'omp':
+      return '/omp';
     default:
       return '/claude';
   }
@@ -1694,7 +1815,8 @@ function saveNotificationSettings(input = {}) {
     claude: normalizePlatformInput(input?.platforms?.claude),
     codex: normalizePlatformInput(input?.platforms?.codex),
     gemini: normalizePlatformInput(input?.platforms?.gemini),
-    opencode: normalizePlatformInput(input?.platforms?.opencode)
+    opencode: normalizePlatformInput(input?.platforms?.opencode),
+    omp: normalizePlatformInput(input?.platforms?.omp)
   };
 
   saveNotificationUiConfig(remoteNotifications, platforms.claude.enabled);
@@ -1708,6 +1830,7 @@ function saveNotificationSettings(input = {}) {
   saveCodexHook(platforms.codex.enabled, platforms.codex.type);
   saveGeminiHook(platforms.gemini.enabled, platforms.gemini.type);
   saveOpenCodeHook(platforms.opencode.enabled, platforms.opencode.type);
+  saveOmpHook(platforms.omp.enabled, platforms.omp.type);
 
   if (!hasManagedPlatform) {
     removeNotifyScript();
@@ -1834,7 +1957,8 @@ function buildLegacyClaudeSaveInput(input = {}, currentSettings = getNotificatio
         : { enabled: false, type: 'notification' },
       codex: normalizeSavedPlatformStatus(currentSettings?.platforms?.codex),
       gemini: normalizeSavedPlatformStatus(currentSettings?.platforms?.gemini),
-      opencode: normalizeSavedPlatformStatus(currentSettings?.platforms?.opencode)
+      opencode: normalizeSavedPlatformStatus(currentSettings?.platforms?.opencode),
+      omp: normalizeSavedPlatformStatus(currentSettings?.platforms?.omp)
     },
     remoteNotifications: currentSettings?.remoteNotifications || { providers: [] }
   };
@@ -1873,7 +1997,8 @@ function initDefaultHooks() {
             claude: { enabled: true, type: currentStatus.type || 'notification' },
             codex: normalizeSavedPlatformStatus(currentSettings?.platforms?.codex),
             gemini: normalizeSavedPlatformStatus(currentSettings?.platforms?.gemini),
-            opencode: normalizeSavedPlatformStatus(currentSettings?.platforms?.opencode)
+            opencode: normalizeSavedPlatformStatus(currentSettings?.platforms?.opencode),
+            omp: normalizeSavedPlatformStatus(currentSettings?.platforms?.omp)
           },
           remoteNotifications: currentSettings?.remoteNotifications || { providers: [] }
         });
@@ -1890,7 +2015,8 @@ function initDefaultHooks() {
         claude: { enabled: true, type: 'notification' },
         codex: normalizeSavedPlatformStatus(currentSettings?.platforms?.codex),
         gemini: normalizeSavedPlatformStatus(currentSettings?.platforms?.gemini),
-        opencode: normalizeSavedPlatformStatus(currentSettings?.platforms?.opencode)
+        opencode: normalizeSavedPlatformStatus(currentSettings?.platforms?.opencode),
+        omp: normalizeSavedPlatformStatus(currentSettings?.platforms?.omp)
       },
       remoteNotifications: currentSettings?.remoteNotifications || { providers: [] }
     });
@@ -2277,7 +2403,9 @@ module.exports = {
   initDefaultHooks,
   syncManagedNotificationAssets,
   getOpenCodeManagedPluginPath,
+  getOmpManagedExtensionPath,
   buildOpenCodePluginContent,
+  buildOmpExtensionContent,
   buildCodexNotifyCommand,
   writeNotifyScript,
   generateNotifyScript,
@@ -2292,9 +2420,11 @@ module.exports = {
     getCodexHookStatus,
     getGeminiHookStatus,
     getOpenCodeHookStatus,
+    getOmpHookStatus,
     parseCodexNotificationStatus,
     parseGeminiNotificationStatus,
     parseOpenCodeNotificationStatus,
+    parseOmpNotificationStatus,
     validateFeishuWebhookUrl,
     normalizeRemoteNotificationsConfig,
     validateRemoteProviderConfig,
@@ -2303,7 +2433,9 @@ module.exports = {
     buildStopHookCommand,
     buildClaudeCommand,
     buildOpenCodePluginContent,
+    buildOmpExtensionContent,
     getOpenCodeManagedPluginPath,
+    getOmpManagedExtensionPath,
     generateNotifyScript,
     generateSystemNotificationCommand,
     emitBrowserNotification,