coding-tool-x 3.7.0 → 3.7.1

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

@@ -28,8 +28,8 @@ const OPENCODE_CONFIG_PATHS = {
   json: path.join(OPENCODE_CONFIG_DIR, 'opencode.json'),
   legacy: path.join(OPENCODE_CONFIG_DIR, 'config.json')
 };
-const PI_MCP_CONFIG_PATH = NATIVE_PATHS.pi?.mcp
-  || path.join(NATIVE_PATHS.pi?.dir || path.join(HOME_DIR, '.omp', 'agent'), 'mcp.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 }
@@ -38,8 +38,8 @@ 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', 'pi'];
-const OMP_MCP_SCHEMA_URL = 'https://raw.githubusercontent.com/can1357/oh-my-pi/main/packages/coding-agent/src/config/mcp-schema.json';
+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 = {}) {
@@ -538,7 +538,7 @@ const DEFAULT_SERVER_APPS = {
   codex: false,
   gemini: false,
   opencode: false,
-  pi: false
+  omp: false
 };
 
 function normalizeServerApps(apps = {}, fallbackApps = DEFAULT_SERVER_APPS) {
@@ -547,7 +547,7 @@ function normalizeServerApps(apps = {}, fallbackApps = DEFAULT_SERVER_APPS) {
     codex: apps.codex !== undefined ? !!apps.codex : !!fallbackApps.codex,
     gemini: apps.gemini !== undefined ? !!apps.gemini : !!fallbackApps.gemini,
     opencode: apps.opencode !== undefined ? !!apps.opencode : !!fallbackApps.opencode,
-    pi: apps.pi !== undefined ? !!apps.pi : !!fallbackApps.pi
+    omp: apps.omp !== undefined ? !!apps.omp: !!fallbackApps.omp
   };
 }
 
@@ -763,7 +763,7 @@ async function syncServerToPlatform(server, platform) {
       case 'opencode':
         syncToOpenCodeConfig(server);
         break;
-      case 'pi':
+      case 'omp':
         syncToOmpMcpConfig(server);
         break;
     }
@@ -792,7 +792,7 @@ async function removeServerFromPlatform(serverId, platform) {
       case 'opencode':
         removeFromOpenCodeConfig(serverId);
         break;
-      case 'pi':
+      case 'omp':
         removeFromOmpMcpConfig(serverId);
         break;
     }
@@ -954,7 +954,7 @@ function validateOmpServerName(serverId) {
 }
 
 function readOmpMcpConfig() {
-  const config = readJsonFile(PI_MCP_CONFIG_PATH, { mcpServers: {} });
+  const config = readJsonFile(OMP_MCP_CONFIG_PATH, { mcpServers: {} });
   if (!config || typeof config !== 'object' || Array.isArray(config)) {
     return { mcpServers: {} };
   }
@@ -1059,14 +1059,14 @@ function syncToOmpMcpConfig(server) {
   validateOmpServerName(server.id);
   const config = readOmpMcpConfig();
   config.mcpServers[server.id] = convertToOmpMcpFormat(server.server);
-  writeJsonFile(PI_MCP_CONFIG_PATH, config);
+  writeJsonFile(OMP_MCP_CONFIG_PATH, config);
 }
 
 function removeFromOmpMcpConfig(serverId) {
   const config = readOmpMcpConfig();
   if (config.mcpServers && config.mcpServers[serverId]) {
     delete config.mcpServers[serverId];
-    writeJsonFile(PI_MCP_CONFIG_PATH, config);
+    writeJsonFile(OMP_MCP_CONFIG_PATH, config);
   }
 }
 
@@ -1231,7 +1231,7 @@ async function importFromPlatform(platform) {
     case 'opencode':
       importedCount = importFromOpenCode(servers);
       break;
-    case 'pi':
+    case 'omp':
       importedCount = importFromOmp(servers);
       break;
     default:
@@ -1389,8 +1389,8 @@ function importFromOmp(servers) {
 
     if (servers[id]) {
       servers[id].apps = normalizeServerApps(servers[id].apps);
-      if (!servers[id].apps.pi) {
-        servers[id].apps.pi = true;
+      if (!servers[id].apps.omp) {
+        servers[id].apps.omp = true;
         count++;
       }
     } else {
@@ -1398,7 +1398,7 @@ function importFromOmp(servers) {
         id,
         name: id,
         server: convertedSpec,
-        apps: { claude: false, codex: false, gemini: false, opencode: false, pi: true },
+        apps: { claude: false, codex: false, gemini: false, opencode: false, omp: true },
         createdAt: Date.now(),
         updatedAt: Date.now()
       };
@@ -1471,7 +1471,7 @@ function getStats() {
     codex: serverList.filter(s => s.apps?.codex).length,
     gemini: serverList.filter(s => s.apps?.gemini).length,
     opencode: serverList.filter(s => s.apps?.opencode).length,
-    pi: serverList.filter(s => s.apps?.pi).length
+    omp: serverList.filter(s => s.apps?.omp).length
   };
 }
 
@@ -1923,7 +1923,7 @@ function updateServerOrder(serverIds) {
 
 /**
  * 导出所有 MCP 配置
- * @param {string} format - 导出格式: 'json' | 'claude' | 'codex' | 'opencode' | 'gemini' | 'pi'
+ * @param {string} format - 导出格式: 'json' | 'claude' | 'codex' | 'opencode' | 'gemini' | 'omp'
  */
 function exportServers(format = 'json') {
   const servers = getAllServers();
@@ -1937,7 +1937,7 @@ function exportServers(format = 'json') {
       return exportForOpenCode(servers);
     case 'gemini':
       return exportForGemini(servers);
-    case 'pi':
+    case 'omp':
       return exportForOmp(servers);
     case 'json':
     default:
@@ -2045,14 +2045,14 @@ function exportForOmp(servers) {
   const mcpServers = {};
 
   for (const [id, server] of Object.entries(servers)) {
-    if (server.apps?.pi) {
+    if (server.apps?.omp) {
       validateOmpServerName(id);
       mcpServers[id] = convertToOmpMcpFormat(server.server);
     }
   }
 
   return {
-    format: 'pi',
+    format: 'omp',
     content: JSON.stringify({ $schema: OMP_MCP_SCHEMA_URL, mcpServers }, null, 2),
     filename: 'omp-mcp-config.json'
   };

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,

package/src/server/services/{pi-auth-providers.js → omp-auth-providers.js}

@@ -1,5 +1,5 @@
 const { spawnSync } = require('child_process');
-const piConfig = require('./pi-config');
+const ompConfig = require('./omp-config');
 
 const COMMAND_TIMEOUT_MS = 5000;
 const TOKEN_LIST_TIMEOUT_MS = 3000;
@@ -214,7 +214,7 @@ function getOmpAuthProviderSnapshot(options = {}) {
   }
 
   const env = options.env || process.env;
-  const runtime = options.runtime || piConfig.resolvePiRuntime(env, options.runtimeOptions || {});
+  const runtime = options.runtime || ompConfig.resolveOmpRuntime(env, options.runtimeOptions || {});
   if (!runtime || runtime.runtime !== 'omp' || !runtime.installed) {
     const value = buildEmptySnapshot(runtime || null, 'omp-not-available');
     snapshotCache[cacheKey] = { loadedAt: now, value };

package/src/server/services/{pi-channels.js → omp-channels.js}

@@ -5,13 +5,13 @@ const {
   removeManagedOmpProviders,
   isManagedOmpProvidersActive,
   getLastManagedOmpSyncResult
-} = require('./pi-settings-manager');
+} = require('./omp-settings-manager');
 
-class PiChannelService extends BaseChannelService {
+class OmpChannelService extends BaseChannelService {
   constructor() {
     super({
-      platform: 'pi',
-      channelsFilePath: PATHS.channels.pi,
+      platform: 'omp',
+      channelsFilePath: PATHS.channels.omp,
       defaultGatewaySource: 'openai_compatible',
       isProxyRunning: () => isManagedOmpProvidersActive()
     });
@@ -69,7 +69,7 @@ class PiChannelService extends BaseChannelService {
   }
 }
 
-const service = new PiChannelService();
+const service = new OmpChannelService();
 
 module.exports = {
   getChannels: () => service.getChannels(),