coding-tool-x 3.6.13 → 3.7.1

package/src/commands/proxy-control.js

@@ -1,30 +1,56 @@
 const chalk = require('chalk');
 const http = require('http');
 const { loadConfig } = require('../config/loader');
+const { normalizePlatformKey } = require('../shared/platforms');
 
 const CHANNEL_CONFIG = {
   claude: {
     name: 'Claude',
     icon: '[*]',
-    apiPath: '/api/proxy'
+    aompPath: '/api/proxy'
   },
   codex: {
     name: 'Codex',
     icon: '[*]',
-    apiPath: '/api/codex/proxy'
+    aompPath: '/api/codex/proxy'
   },
   gemini: {
     name: 'Gemini',
     icon: '[*]',
-    apiPath: '/api/gemini/proxy'
+    aompPath: '/api/gemini/proxy'
   },
   opencode: {
     name: 'OpenCode',
     icon: '[*]',
-    apiPath: '/api/opencode/proxy'
+    aompPath: '/api/opencode/proxy'
+  },
+  omp: {
+    name: 'OMP',
+    icon: '[*]',
+    aompPath: '/api/omp/proxy',
+    serviceLabel: 'OMP 受管模型配置',
+    proxyLabel: '受管模型配置',
+    startAction: '启用',
+    stopAction: '停用',
+    restartAction: '重新同步',
+    startedMessage: 'OMP 受管模型配置已启用',
+    stoppedMessage: 'OMP 受管模型配置已停用',
+    runningText: '已启用',
+    stoppedText: '未启用',
+    portLabel: '状态端口',
+    addressLabel: '状态地址',
+    startTip: '启用受管模型配置'
   }
 };
 
+function getServiceLabel(channelInfo) {
+  return channelInfo.serviceLabel || `${channelInfo.name} 代理服务`;
+}
+
+function getProxyLabel(channelInfo) {
+  return channelInfo.proxyLabel || '代理';
+}
+
 /**
  * HTTP 请求辅助函数
  */
@@ -96,14 +122,15 @@ async function checkUIService() {
  * 启动代理
  */
 async function handleProxyStart(channel) {
-  const channelInfo = CHANNEL_CONFIG[channel];
+  const normalizedChannel = normalizePlatformKey(channel);
+  const channelInfo = CHANNEL_CONFIG[normalizedChannel];
   if (!channelInfo) {
     console.error(chalk.red(`\n[ERROR] 无效的渠道类型: ${channel}\n`));
-    console.log(chalk.gray('支持的渠道: claude, codex, gemini, opencode\n'));
+    console.log(chalk.gray('支持的渠道: claude, codex, gemini, opencode, omp\n'));
     process.exit(1);
   }
 
-  console.log(chalk.cyan(`\n[START] 启动 ${channelInfo.name} 代理服务...\n`));
+  console.log(chalk.cyan(`\n[START] ${channelInfo.startAction || '启动'} ${getServiceLabel(channelInfo)}...\n`));
 
   // 检查 UI 服务
   const uiRunning = await checkUIService();
@@ -115,12 +142,12 @@ async function handleProxyStart(channel) {
   }
 
   try {
-    const response = await httpRequest('POST', `${channelInfo.apiPath}/start`);
+    const response = await httpRequest('POST', `${channelInfo.aompPath}/start`);
 
     if (response.data.success) {
-      console.log(chalk.green(`[OK] ${channelInfo.name} 代理已启动\n`));
-      console.log(chalk.gray(`${channelInfo.icon} 代理端口: ${response.data.port}`));
-      console.log(chalk.gray(`[NET] 代理地址: http://localhost:${response.data.port}\n`));
+      console.log(chalk.green(`[OK] ${channelInfo.startedMessage || `${channelInfo.name} ${getProxyLabel(channelInfo)}已启动`}\n`));
+      console.log(chalk.gray(`${channelInfo.icon} ${channelInfo.portLabel || '代理端口'}: ${response.data.port}`));
+      console.log(chalk.gray(`[NET] ${channelInfo.addressLabel || '代理地址'}: http://localhost:${response.data.port}\n`));
     } else {
       console.error(chalk.red(`[ERROR] 启动失败: ${response.data.message}\n`));
       process.exit(1);
@@ -140,13 +167,15 @@ async function handleProxyStart(channel) {
  * 停止代理
  */
 async function handleProxyStop(channel) {
-  const channelInfo = CHANNEL_CONFIG[channel];
+  const normalizedChannel = normalizePlatformKey(channel);
+  const channelInfo = CHANNEL_CONFIG[normalizedChannel];
   if (!channelInfo) {
     console.error(chalk.red(`\n[ERROR] 无效的渠道类型: ${channel}\n`));
+    console.log(chalk.gray('支持的渠道: claude, codex, gemini, opencode, omp\n'));
     process.exit(1);
   }
 
-  console.log(chalk.cyan(`\n[STOP]  停止 ${channelInfo.name} 代理服务...\n`));
+  console.log(chalk.cyan(`\n[STOP]  ${channelInfo.stopAction || '停止'} ${getServiceLabel(channelInfo)}...\n`));
 
   const uiRunning = await checkUIService();
   if (!uiRunning) {
@@ -155,10 +184,10 @@ async function handleProxyStop(channel) {
   }
 
   try {
-    const response = await httpRequest('POST', `${channelInfo.apiPath}/stop`);
+    const response = await httpRequest('POST', `${channelInfo.aompPath}/stop`);
 
     if (response.data.success) {
-      console.log(chalk.green(`[OK] ${channelInfo.name} 代理已停止\n`));
+      console.log(chalk.green(`[OK] ${channelInfo.stoppedMessage || `${channelInfo.name} ${getProxyLabel(channelInfo)}已停止`}\n`));
     } else {
       console.error(chalk.red(`[ERROR] 停止失败: ${response.data.message}\n`));
       process.exit(1);
@@ -173,13 +202,15 @@ async function handleProxyStop(channel) {
  * 重启代理
  */
 async function handleProxyRestart(channel) {
-  const channelInfo = CHANNEL_CONFIG[channel];
+  const normalizedChannel = normalizePlatformKey(channel);
+  const channelInfo = CHANNEL_CONFIG[normalizedChannel];
   if (!channelInfo) {
     console.error(chalk.red(`\n[ERROR] 无效的渠道类型: ${channel}\n`));
+    console.log(chalk.gray('支持的渠道: claude, codex, gemini, opencode, omp\n'));
     process.exit(1);
   }
 
-  console.log(chalk.cyan(`\n[SYNC] 重启 ${channelInfo.name} 代理服务...\n`));
+  console.log(chalk.cyan(`\n[SYNC] ${channelInfo.restartAction || '重启'} ${getServiceLabel(channelInfo)}...\n`));
 
   await handleProxyStop(channel);
   await new Promise(resolve => setTimeout(resolve, 1000));
@@ -190,16 +221,18 @@ async function handleProxyRestart(channel) {
  * 查看代理状态
  */
 async function handleProxyStatus(channel) {
-  const channelInfo = CHANNEL_CONFIG[channel];
+  const normalizedChannel = normalizePlatformKey(channel);
+  const channelInfo = CHANNEL_CONFIG[normalizedChannel];
   if (!channelInfo) {
     console.error(chalk.red(`\n[ERROR] 无效的渠道类型: ${channel}\n`));
+    console.log(chalk.gray('支持的渠道: claude, codex, gemini, opencode, omp\n'));
     process.exit(1);
   }
 
   const uiRunning = await checkUIService();
   if (!uiRunning) {
     console.log(chalk.bold.cyan(`\n╔======================================╗`));
-    console.log(chalk.bold.cyan(`║      ${channelInfo.name} 代理服务状态           ║`));
+    console.log(chalk.bold.cyan(`║      ${getServiceLabel(channelInfo)}状态           ║`));
     console.log(chalk.bold.cyan(`╚======================================╝\n`));
     console.log(chalk.gray('  [ERROR] UI 服务未运行\n'));
     console.log(chalk.yellow('[TIP] 请先启动 UI 服务: ') + chalk.cyan('ctx start\n'));
@@ -207,27 +240,27 @@ async function handleProxyStatus(channel) {
   }
 
   try {
-    const response = await httpRequest('GET', `${channelInfo.apiPath}/status`);
+    const response = await httpRequest('GET', `${channelInfo.aompPath}/status`);
     const payload = response.data || {};
     const status = payload.proxy || payload;
 
     console.log(chalk.bold.cyan(`\n╔======================================╗`));
-    console.log(chalk.bold.cyan(`║      ${channelInfo.name} 代理服务状态           ║`));
+    console.log(chalk.bold.cyan(`║      ${getServiceLabel(channelInfo)}状态           ║`));
     console.log(chalk.bold.cyan(`╚======================================╝\n`));
 
     if (status.running) {
-      console.log(chalk.green('  [OK] 状态: 运行中'));
-      console.log(chalk.gray(`  ${channelInfo.icon} 端口: ${status.port}`));
-      console.log(chalk.gray(`  [NET] 地址: http://localhost:${status.port}`));
+      console.log(chalk.green(`  [OK] 状态: ${channelInfo.runningText || '运行中'}`));
+      console.log(chalk.gray(`  ${channelInfo.icon} ${channelInfo.portLabel || '端口'}: ${status.port}`));
+      console.log(chalk.gray(`  [NET] ${channelInfo.addressLabel || '地址'}: http://localhost:${status.port}`));
       if (status.runtime) {
         console.log(chalk.gray(`  [TIMER]  运行时长: ${formatRuntime(status.runtime)}`));
       }
     } else {
-      console.log(chalk.gray('  [ERROR] 状态: 未运行'));
+      console.log(chalk.gray(`  [ERROR] 状态: ${channelInfo.stoppedText || '未运行'}`));
     }
 
     console.log(chalk.bold('\n[TIP] 提示:'));
-    console.log(chalk.gray(`  • 使用 `) + chalk.cyan(`ctx ${channel} start`) + chalk.gray(` 启动代理`));
+    console.log(chalk.gray(`  • 使用 `) + chalk.cyan(`ctx ${channel} start`) + chalk.gray(` ${channelInfo.startTip || '启动代理'}`));
     console.log(chalk.gray(`  • 使用 `) + chalk.cyan(`ctx logs ${channel}`) + chalk.gray(` 查看日志`));
     console.log(chalk.gray(`  • 使用 `) + chalk.cyan(`ctx stats ${channel}`) + chalk.gray(` 查看统计\n`));
   } catch (error) {

package/src/commands/stats.js

@@ -1,13 +1,15 @@
 const chalk = require('chalk');
 const http = require('http');
 const { loadConfig } = require('../config/loader');
+const { normalizePlatformKey } = require('../shared/platforms');
 
-const TOOL_TYPES = ['claude', 'codex', 'gemini', 'opencode'];
+const TOOL_TYPES = ['claude', 'codex', 'gemini', 'opencode', 'omp'];
 const TOOL_ENDPOINTS = {
   claude: '/api/claude/statistics',
   codex: '/api/codex/statistics',
   gemini: '/api/gemini/statistics',
-  opencode: '/api/opencode/statistics'
+  opencode: '/api/opencode/statistics',
+  omp: '/api/omp/statistics'
 };
 
 /**
@@ -79,7 +81,7 @@ async function checkUIService() {
 
 function validateToolType(type) {
   if (!type) return true;
-  return TOOL_TYPES.includes(type);
+  return TOOL_TYPES.includes(normalizePlatformKey(type));
 }
 
 function getDateString(offsetDays = 0) {
@@ -174,7 +176,8 @@ function getRangeDays(timeRange) {
 }
 
 async function fetchToolStats(toolType, timeRange) {
-  const endpointBase = TOOL_ENDPOINTS[toolType];
+  const normalizedToolType = normalizePlatformKey(toolType);
+  const endpointBase = TOOL_ENDPOINTS[normalizedToolType];
   if (!endpointBase) {
     throw new Error(`不支持的渠道类型: ${toolType}`);
   }
@@ -235,6 +238,7 @@ function buildDisplayPayload(type, timeRange, data) {
  * 查看统计信息
  */
 async function handleStats(type = null, options = {}) {
+  const normalizedType = type ? normalizePlatformKey(type) : null;
   // 检查 UI 服务
   const uiRunning = await checkUIService();
   if (!uiRunning) {
@@ -246,16 +250,16 @@ async function handleStats(type = null, options = {}) {
   const timeRange = options.today ? 'today' : options.week ? 'week' : options.month ? 'month' : 'all';
 
   try {
-    if (!validateToolType(type)) {
+    if (!validateToolType(normalizedType)) {
       console.error(chalk.red(`\n[ERROR] 无效的渠道类型: ${type}\n`));
-      console.log(chalk.gray('支持的类型: claude, codex, gemini, opencode\n'));
+      console.log(chalk.gray('支持的类型: claude, codex, gemini, opencode, omp\n'));
       process.exit(1);
     }
 
     let payload;
-    if (type) {
-      const summary = await fetchToolStats(type, timeRange);
-      payload = buildDisplayPayload(type, timeRange, summary);
+    if (normalizedType) {
+      const summary = await fetchToolStats(normalizedType, timeRange);
+      payload = buildDisplayPayload(normalizedType, timeRange, summary);
     } else {
       const overall = await fetchOverallStats(timeRange);
       payload = buildDisplayPayload(null, timeRange, overall);
@@ -274,7 +278,7 @@ async function handleStats(type = null, options = {}) {
 function displayStats(stats) {
   const type = stats.type;
   const timeRange = stats.timeRange;
-  const title = type ? `${type.toUpperCase()} 统计信息` : '总体统计信息';
+  const title = type ? `${getToolDisplayName(type)} 统计信息` : '总体统计信息';
   const rangeText = {
     today: '今日',
     week: '本周',
@@ -316,11 +320,11 @@ function displayStats(stats) {
   }
 
   if (!type && stats.byToolType) {
-    const iconMap = { claude: '[*]', codex: '[*]', gemini: '[*]', opencode: '[*]' };
+    const iconMap = { claude: '[*]', codex: '[*]', gemini: '[*]', opencode: '[*]', omp: '[*]' };
     console.log(chalk.bold('\n[CH] 分渠道汇总:'));
     TOOL_TYPES.forEach((toolType) => {
       const item = stats.byToolType[toolType] || emptySummary();
-      console.log(chalk.gray(`  ${iconMap[toolType]} ${toolType.toUpperCase()}:`));
+      console.log(chalk.gray(`  ${iconMap[toolType]} ${getToolDisplayName(toolType)}:`));
       console.log(
         chalk.gray(
           `     请求: ${formatNumber(item.requests)}  |  Tokens: ${formatNumber(item.tokens)}  |  成本: $${normalizeNumber(item.cost).toFixed(4)}`
@@ -332,10 +336,17 @@ function displayStats(stats) {
   console.log(chalk.gray('\n[TIP] 提示:'));
   console.log(chalk.gray('  • 使用 ') + chalk.cyan('ctx stats --today') + chalk.gray(' 查看今日统计'));
   console.log(chalk.gray('  • 使用 ') + chalk.cyan('ctx stats claude') + chalk.gray(' 查看特定渠道'));
+  console.log(chalk.gray('  • 使用 ') + chalk.cyan('ctx stats omp') + chalk.gray(' 查看 OMP 统计'));
   console.log(chalk.gray('  • 使用 ') + chalk.cyan('ctx stats opencode') + chalk.gray(' 查看 OpenCode 统计'));
   console.log(chalk.gray('  • 使用 ') + chalk.cyan('ctx stats export') + chalk.gray(' 导出统计数据\n'));
 }
 
+function getToolDisplayName(type) {
+  const normalizedType = normalizePlatformKey(type);
+  if (normalizedType === 'omp') return 'OMP';
+  return String(normalizedType || '').toUpperCase();
+}
+
 /**
  * 格式化数字
  */
@@ -349,6 +360,7 @@ function formatNumber(num) {
  */
 async function handleStatsExport(type = null, format = 'json') {
   console.log(chalk.cyan('\n[EXPORT] 导出统计数据...\n'));
+  const normalizedType = type ? normalizePlatformKey(type) : null;
 
   const uiRunning = await checkUIService();
   if (!uiRunning) {
@@ -357,9 +369,9 @@ async function handleStatsExport(type = null, format = 'json') {
   }
 
   try {
-    if (!validateToolType(type)) {
+    if (!validateToolType(normalizedType)) {
       console.error(chalk.red(`\n[ERROR] 无效的渠道类型: ${type}\n`));
-      console.log(chalk.gray('支持的类型: claude, codex, gemini, opencode\n'));
+      console.log(chalk.gray('支持的类型: claude, codex, gemini, opencode, omp\n'));
       process.exit(1);
     }
 
@@ -369,9 +381,9 @@ async function handleStatsExport(type = null, format = 'json') {
     }
 
     let payload;
-    if (type) {
-      const summary = await fetchToolStats(type, 'all');
-      payload = buildDisplayPayload(type, 'all', summary);
+    if (normalizedType) {
+      const summary = await fetchToolStats(normalizedType, 'all');
+      payload = buildDisplayPayload(normalizedType, 'all', summary);
     } else {
       const overall = await fetchOverallStats('all');
       payload = buildDisplayPayload(null, 'all', overall);
@@ -379,7 +391,7 @@ async function handleStatsExport(type = null, format = 'json') {
 
     const fs = require('fs');
     const path = require('path');
-    const filename = `cc-tool-stats-${type || 'all'}-${Date.now()}.json`;
+    const filename = `cc-tool-stats-${normalizedType || 'all'}-${Date.now()}.json`;
     const filepath = path.join(process.cwd(), filename);
 
     fs.writeFileSync(filepath, JSON.stringify(payload, null, 2));
@@ -394,5 +406,11 @@ async function handleStatsExport(type = null, format = 'json') {
 
 module.exports = {
   handleStats,
-  handleStatsExport
+  handleStatsExport,
+  _test: {
+    buildDisplayPayload,
+    fetchToolStats,
+    getToolDisplayName,
+    validateToolType
+  }
 };

package/src/commands/switch.js

@@ -3,6 +3,7 @@ const chalk = require('chalk');
 const { getAvailableProjects } = require('../utils/session');
 const { promptSelectProject } = require('../ui/prompts');
 const { saveConfig } = require('../config/loader');
+const { HOME_DIR } = require('../config/paths');
 
 /**
  * 切换项目
@@ -28,7 +29,10 @@ async function switchProject(config) {
   config.defaultProject = selectedProject;
 
   // 保存到配置文件（保留其余字段）
-  saveConfig({ ...config });
+  saveConfig({
+    ...config,
+    projectsDir: config.projectsDir.replace(HOME_DIR, '~')
+  });
 
   // 使用解析后的名称显示
   const { parseRealProjectPath } = require('../server/services/sessions');