coding-tool-x 3.8.4 → 3.8.6

package/src/commands/resume.js

@@ -1,136 +1,132 @@
 // 恢复会话命令
-const fs = require('fs');
-const path = require('path');
-const { execSync } = require('child_process');
 const chalk = require('chalk');
 const ora = require('ora');
-const { getSessionsDir } = require('../utils/session');
+const { resolveOperation } = require('../platforms/access');
 
+function isDriverResult(value) {
+  return value && typeof value === 'object' && typeof value.status === 'string';
+}
+
+function unwrapDriverResult(value) {
+  if (!isDriverResult(value) || value.status !== 'ok') return value;
+  return value.data;
+}
+
+function createFailureResult(error, platform) {
+  const result = {
+    status: error?.code || 'failed',
+    platform: error?.platform || platform || 'claude',
+    capability: 'sessions',
+    operation: 'launch',
+    error: error?.message || String(error)
+  };
+  if (error?.cause) {
+    Object.defineProperty(result, 'cause', { value: error.cause, enumerable: false });
+  }
+  return result;
+}
+
+function reportFailure(result) {
+  const message = result.error || `会话启动 ${result.operation || 'launch'} 不可用`;
+  const output = result.status === 'unsupported' || result.status === 'not_found'
+    ? chalk.yellow
+    : chalk.red;
+  console.log(output(`\n[${result.status === 'unsupported' ? 'WARN' : 'ERROR'}] ${message}\n`));
+}
 /**
  * 恢复会话
  */
-async function resumeSession(config, sessionId, fork = false) {
-  // 构建命令参数
-  const args = ['-r', sessionId];
-  if (fork) {
-    args.push('--fork-session');
-  }
-
-  // 从会话文件中提取原始工作目录
-  const sessionFile = path.join(getSessionsDir(config), `${sessionId}.jsonl`);
-  let cwd = process.cwd();
-
+async function resumeSession(config = {}, sessionId, fork = false, options = {}) {
+  const platform = options.platform || config.currentCliType || '';
+  let resolved;
   try {
-    const fd = fs.openSync(sessionFile, 'r');
-    const buffer = Buffer.alloc(2048);
-    fs.readSync(fd, buffer, 0, 2048, 0);
-    fs.closeSync(fd);
-
-    const content = buffer.toString('utf8');
-    const lines = content.split('\n').slice(0, 5);
-
-    for (const line of lines) {
-      try {
-        const json = JSON.parse(line);
-        if (json.cwd) {
-          cwd = json.cwd;
-          break;
-        }
-      } catch (e) {
-        // 继续
-      }
-    }
-  } catch (e) {
-    // 使用当前目录
+    resolved = resolveOperation(platform, 'sessions', 'launch', {
+      ...options,
+      fallback: 'claude'
+    });
+  } catch (error) {
+    const result = createFailureResult(error, platform);
+    reportFailure(result);
+    return result;
   }
 
-  // 显示加载动画
+  const manifest = resolved.manifest || {};
+  const displayName = manifest.label || manifest.title || resolved.key;
+  let cwd = options.cwd || process.cwd();
   const spinner = ora({
-    text: chalk.cyan('正在准备启动 Claude...'),
-    spinner: 'dots',
+    text: chalk.cyan(`正在准备启动 ${displayName}...`),
+    spinner: 'dots'
   }).start();
 
-  // 等待 500ms，让用户看到加载状态
   await new Promise(resolve => setTimeout(resolve, 500));
 
   spinner.succeed(chalk.green('准备完成！\n'));
 
   console.log(chalk.gray('━'.repeat(50)));
-  console.log(chalk.green.bold(`[NEW] 会话: ${sessionId.substring(0, 8)}`));
+  console.log(chalk.green.bold(`[NEW] 会话: ${String(sessionId).substring(0, 8)}`));
   console.log(chalk.gray(`[DIR] 目录: ${cwd}`));
   console.log(chalk.gray('━'.repeat(50)) + '\n');
 
-  // 完全清理终端状态，避免输入冲突
   if (process.stdin.isTTY && process.stdin.setRawMode) {
     try {
       process.stdin.setRawMode(false);
-    } catch (e) {
-      // 忽略
+    } catch (error) {
+      // 忽略终端状态错误
     }
   }
 
-  // 移除所有 stdin 监听器，防止残留事件
   process.stdin.removeAllListeners();
-
-  // 添加错误处理器，防止 EIO 错误导致崩溃
-  process.stdin.on('error', (err) => {
-    // 忽略 EIO 错误（通常发生在 Ctrl+C 时）
-    if (err.code === 'EIO' || err.code === 'ENOTTY') {
-      // 安静退出
+  process.stdin.on('error', error => {
+    if (error.code === 'EIO' || error.code === 'ENOTTY') {
       process.exit(0);
     }
   });
-
-  // 暂停输入流
   process.stdin.pause();
 
-  // 再等待 100ms 确保终端状态稳定
   await new Promise(resolve => setTimeout(resolve, 100));
 
-  // 使用 execSync 完全替代当前进程
-  // ct 会阻塞等待 claude 完成，然后一起退出
-  // Claude 独占终端，不会有输入冲突
-  try {
-    const command = `claude ${args.join(' ')}`;
-
-    // 切换到目标目录
-    const originalCwd = process.cwd();
-    try {
-      process.chdir(cwd);
-    } catch (e) {
-      console.log(chalk.yellow(`\n[WARN]  无法切换到目录: ${cwd}`));
-      console.log(chalk.gray(`将在当前目录启动\n`));
-    }
+  const launchOptions = {
+    fork,
+    config
+  };
+  if (options.cwd !== undefined) launchOptions.cwd = options.cwd;
+  if (options.processRunner) launchOptions.processRunner = options.processRunner;
 
-    // execSync 会阻塞并完全接管终端
-    // 此时 ct 进程只是等待，不处理任何输入
-    execSync(command, {
-      stdio: 'inherit', // 完全继承 stdio，让 claude 控制终端
-      windowsHide: true,
-    });
+  let launchResult;
+  try {
+    launchResult = unwrapDriverResult(await resolved.operation(sessionId, launchOptions));
+  } catch (error) {
+    launchResult = createFailureResult(error, resolved.key);
+  }
 
-    // 恢复目录
-    try {
-      process.chdir(originalCwd);
-    } catch (e) {
-      // 忽略
+  if (isDriverResult(launchResult) && launchResult.status !== 'ok') {
+    reportFailure(launchResult);
+    if (launchResult.status === 'unsupported' || launchResult.status === 'not_found') {
+      return launchResult;
     }
+    process.exit(1);
+    return launchResult;
+  }
 
-    // Claude 正常退出 - 立即退出避免清理错误
+  cwd = launchResult?.cwd || cwd;
+  if (launchResult?.signal === 'SIGINT') {
     process.exit(0);
-  } catch (error) {
-    // Claude 执行出错或被用户中断（Ctrl+C）
-    // 立即退出，不等待清理
-    if (error.status !== undefined) {
-      process.exit(error.status);
-    } else if (error.signal === 'SIGINT') {
-      // 用户按了 Ctrl+C，正常退出
-      process.exit(0);
-    } else {
-      console.log(chalk.red(`\n[ERROR] 启动失败: ${error.message}`));
-      process.exit(1);
+    return launchResult;
+  }
+  if (launchResult?.error) {
+    console.log(chalk.red(`\n[ERROR] 启动失败: ${launchResult.error.message || launchResult.error}`));
+    process.exit(1);
+    return launchResult;
+  }
+  if (launchResult?.status !== undefined && launchResult.status !== null) {
+    const exitStatus = Number(launchResult.status);
+    if (Number.isFinite(exitStatus) && exitStatus !== 0) {
+      process.exit(exitStatus);
+      return launchResult;
     }
   }
+  process.exit(0);
+  return launchResult;
 }
 
 module.exports = {

package/src/commands/search.js

@@ -4,40 +4,120 @@ const ora = require('ora');
 const inquirer = require('inquirer');
 const { promptSelectSession, promptSearchKeyword, promptForkConfirm } = require('../ui/prompts');
 const { resumeSession } = require('./resume');
-const { getProjects, searchSessions: searchSessionsInProject, parseRealProjectPath } = require('../server/services/sessions');
 const { loadAliases } = require('../server/services/alias');
+const { resolveOperation } = require('../platforms/access');
+
+function isDriverResult(value) {
+  return value && typeof value === 'object' && typeof value.status === 'string';
+}
+
+function unwrapDriverResult(value) {
+  if (!isDriverResult(value) || value.status !== 'ok') return value;
+  return value.data;
+}
+
+function createFailureResult(error, platform, operation) {
+  const result = {
+    status: error?.code || 'failed',
+    platform: error?.platform || platform || 'claude',
+    capability: 'sessions',
+    operation,
+    error: error?.message || String(error)
+  };
+  if (error?.cause) {
+    Object.defineProperty(result, 'cause', { value: error.cause, enumerable: false });
+  }
+  return result;
+}
+
+async function invokeSessionOperation(config, operation, args, options = {}) {
+  const platform = options.platform || config.currentCliType || '';
+  let resolved;
+  try {
+    resolved = resolveOperation(platform, 'sessions', operation, {
+      ...options,
+      fallback: 'claude'
+    });
+  } catch (error) {
+    return createFailureResult(error, platform, operation);
+  }
+
+  try {
+    return unwrapDriverResult(await resolved.operation(...args));
+  } catch (error) {
+    return createFailureResult(error, resolved.key, operation);
+  }
+}
+
+function normalizeSearchResults(value) {
+  const unwrapped = unwrapDriverResult(value);
+  if (isDriverResult(unwrapped)) return unwrapped;
+  if (Array.isArray(unwrapped)) return unwrapped;
+  if (Array.isArray(unwrapped?.sessions)) return unwrapped.sessions;
+  if (Array.isArray(unwrapped?.results)) return unwrapped.results;
+  return [];
+}
+
+function normalizeSearchResult(result = {}) {
+  const matches = Array.isArray(result.matches) ? result.matches : [];
+  const projectName = String(result.projectName || result.project || result.projectId || '');
+  return {
+    ...result,
+    sessionId: String(result.sessionId || result.id || ''),
+    projectName,
+    projectDisplayName: result.projectDisplayName || result.projectLabel || projectName || '未知项目',
+    matches,
+    matchCount: Number(result.matchCount ?? matches.length) || 0
+  };
+}
+
+function resolveLimitAndOptions(limitOrOptions, maybeOptions) {
+  if (limitOrOptions && typeof limitOrOptions === 'object' && !Array.isArray(limitOrOptions)) {
+    return {
+      limit: Number(limitOrOptions.limit) || 15,
+      options: limitOrOptions
+    };
+  }
+  return {
+    limit: Number(limitOrOptions) || 15,
+    options: maybeOptions || {}
+  };
+}
+
+function reportDriverFailure(result) {
+  if (!isDriverResult(result)) return;
+  const message = result.error || `会话操作 ${result.operation || 'unknown'} 不可用`;
+  console.log(chalk.yellow(`\n[WARN] ${message}\n`));
+}
 
 /**
  * 跨所有项目搜索会话内容
  */
-async function searchSessionsAcrossProjects(config, keyword) {
+async function searchSessionsAcrossProjects(config = {}, keyword, limitOrOptions = 15, maybeOptions = {}) {
+  const { limit, options } = resolveLimitAndOptions(limitOrOptions, maybeOptions);
   const spinner = ora(`[SEARCH] 正在搜索 "${keyword}"...`).start();
+  const result = await invokeSessionOperation(
+    config,
+    'searchAcrossProjects',
+    [keyword, limit, { config }],
+    options
+  );
+  const searchResults = normalizeSearchResults(result);
+
+  if (isDriverResult(searchResults)) {
+    spinner.stop();
+    spinner.clear();
+    return searchResults;
+  }
 
-  const projects = await getProjects(config);
   const aliases = loadAliases();
-  const allResults = [];
-
-  // 跨所有项目搜索
-  for (const projectName of projects) {
-    try {
-      const { projectName: displayName } = parseRealProjectPath(projectName);
-      spinner.text = `[SEARCH] 正在搜索项目: ${displayName}...`;
-      const results = searchSessionsInProject(config, projectName, keyword, 15);
-
-      if (results.length > 0) {
-        results.forEach(result => {
-          allResults.push({
-            ...result,
-            projectName: projectName,
-            projectDisplayName: displayName,
-            alias: aliases[result.sessionId] || null
-          });
-        });
-      }
-    } catch (e) {
-      // 忽略单个项目的错误
-    }
-  }
+  const allResults = searchResults.map(item => {
+    const normalized = normalizeSearchResult(item);
+    return {
+      ...normalized,
+      alias: normalized.alias || aliases[normalized.sessionId] || null
+    };
+  });
 
   spinner.stop();
   spinner.clear();
@@ -48,66 +128,53 @@ async function searchSessionsAcrossProjects(config, keyword) {
     return [];
   }
 
-  // 按匹配数量排序
   allResults.sort((a, b) => b.matchCount - a.matchCount);
-
-  // 统计总匹配数
-  const totalMatches = allResults.reduce((sum, r) => sum + r.matchCount, 0);
+  const totalMatches = allResults.reduce((sum, resultItem) => sum + resultItem.matchCount, 0);
 
   console.clear();
   console.log(chalk.green(`\n[NEW] 找到 ${allResults.length} 个对话，共 ${totalMatches} 处匹配\n`));
 
   const choices = [];
 
-  allResults.forEach((result, index) => {
-    // 构建显示名称
+  allResults.forEach((resultItem, index) => {
     let displayName = '';
-
-    // 序号
     displayName += chalk.bold.white(`${index + 1}. `);
+    displayName += chalk.magenta.bold(`[${resultItem.projectDisplayName}] `);
 
-    // 项目名（洋红色高亮）
-    displayName += chalk.magenta.bold(`[${result.projectDisplayName}] `);
-
-    // 会话别名或 ID
-    if (result.alias) {
-      displayName += chalk.yellow.bold(`[${result.alias}] `);
+    if (resultItem.alias) {
+      displayName += chalk.yellow.bold(`[${resultItem.alias}] `);
     } else {
-      displayName += chalk.gray(`[${result.sessionId.substring(0, 8)}] `);
+      displayName += chalk.gray(`[${resultItem.sessionId.substring(0, 8)}] `);
     }
 
-    // 匹配数量
-    displayName += chalk.cyan(`(${result.matchCount} 处匹配)`);
+    displayName += chalk.cyan(`(${resultItem.matchCount} 处匹配)`);
 
     choices.push({
       name: displayName,
-      value: { sessionId: result.sessionId, projectName: result.projectName },
-      short: result.alias || result.sessionId.substring(0, 8)
+      value: { sessionId: resultItem.sessionId, projectName: resultItem.projectName },
+      short: resultItem.alias || resultItem.sessionId.substring(0, 8)
     });
 
-    // 显示前 3 个匹配的上下文
-    const matchesToShow = result.matches.slice(0, 3);
-    matchesToShow.forEach((match, idx) => {
+    const matchesToShow = resultItem.matches.slice(0, 3);
+    matchesToShow.forEach(match => {
       const roleColor = match.role === 'user' ? chalk.blue : chalk.green;
       const roleLabel = match.role === 'user' ? '用户' : '助手';
 
       choices.push({
-        name: `    ${roleColor(`[${roleLabel}]`)} ${chalk.gray(match.context)}`,
+        name: `    ${roleColor(`[${roleLabel}]`)} ${chalk.gray(match.context || match.text || '')}`,
         value: null,
         disabled: true
       });
     });
 
-    // 如果还有更多匹配，显示提示
-    if (result.matches.length > 3) {
+    if (resultItem.matches.length > 3) {
       choices.push({
-        name: chalk.gray(`    ... 还有 ${result.matches.length - 3} 处匹配`),
+        name: chalk.gray(`    ... 还有 ${resultItem.matches.length - 3} 处匹配`),
         value: null,
         disabled: true
       });
     }
 
-    // 添加分隔线（不是最后一个）
     if (index < allResults.length - 1) {
       choices.push(new inquirer.Separator(chalk.gray('─'.repeat(10))));
     }
@@ -119,11 +186,17 @@ async function searchSessionsAcrossProjects(config, keyword) {
 /**
  * 处理搜索会话
  */
-async function handleSearch(config, switchProjectCallback) {
+async function handleSearch(config = {}, switchProjectCallback, options = {}) {
   while (true) {
     const keyword = await promptSearchKeyword();
-    const choices = await searchSessionsAcrossProjects(config, keyword);
+    const result = await searchSessionsAcrossProjects(config, keyword, options);
 
+    if (isDriverResult(result)) {
+      reportDriverFailure(result);
+      return;
+    }
+
+    const choices = Array.isArray(result) ? result : [];
     if (choices.length === 0) {
       const { action } = await inquirer.prompt([
         {
@@ -132,29 +205,27 @@ async function handleSearch(config, switchProjectCallback) {
           message: '未找到匹配的对话',
           choices: [
             { name: chalk.blue('[<-]  返回主菜单'), value: 'back' },
-            { name: chalk.cyan('[SEARCH]  重新搜索'), value: 'retry' },
-          ],
-        },
+            { name: chalk.cyan('[SEARCH]  重新搜索'), value: 'retry' }
+          ]
+        }
       ]);
 
       if (action === 'back') return;
       if (action === 'retry') continue;
     }
 
-    // 添加操作选项
     choices.push(new inquirer.Separator(chalk.gray('='.repeat(80))));
     choices.push({ name: chalk.blue('[<-]  返回主菜单'), value: 'back' });
     choices.push({ name: chalk.cyan('[SEARCH]  重新搜索'), value: 'retry' });
 
-    // 使用自定义 pageSize 以便显示更多结果
     const { selected } = await inquirer.prompt([
       {
         type: 'list',
         name: 'selected',
         message: '选择对话:',
         pageSize: 20,
-        choices: choices,
-      },
+        choices
+      }
     ]);
 
     if (selected === 'back') {
@@ -165,14 +236,10 @@ async function handleSearch(config, switchProjectCallback) {
       continue;
     }
 
-    // selected 是 { sessionId, projectName }
     const sessionId = selected.sessionId;
     const projectName = selected.projectName;
-
-    // 切换到该项目
     config.currentProject = projectName;
 
-    // 询问是否 fork
     const action = await promptForkConfirm();
 
     if (action === 'back') {
@@ -180,7 +247,10 @@ async function handleSearch(config, switchProjectCallback) {
     }
 
     const fork = action === 'fork';
-    await resumeSession(config, sessionId, fork);
+    await resumeSession(config, sessionId, fork, {
+      ...options,
+      platform: options.platform || config.currentCliType || ''
+    });
   }
 }
 

package/src/commands/stats.js

@@ -3,14 +3,22 @@ const http = require('http');
 const { loadConfig } = require('../config/loader');
 const { normalizePlatformKey } = require('../shared/platforms');
 
-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',
-  omp: '/api/omp/statistics'
-};
+function getPlatformCommands() {
+  return require('./platform-command-registry').createPlatformCommandRegistry();
+}
+
+function getToolTypes() {
+  return getPlatformCommands().statsTypes();
+}
+
+function getToolDefinition(type) {
+  return getPlatformCommands().resolve(type);
+}
+function getToolEndpoint(type) {
+  const platform = getToolDefinition(type);
+  if (!platform || platform.capabilities?.statistics === 'unsupported') return null;
+  return platform.statisticsPath || `/api/${normalizePlatformKey(type)}/statistics`;
+}
 
 /**
  * HTTP 请求辅助函数
@@ -81,7 +89,7 @@ async function checkUIService() {
 
 function validateToolType(type) {
   if (!type) return true;
-  return TOOL_TYPES.includes(normalizePlatformKey(type));
+  return getToolTypes().includes(normalizePlatformKey(type));
 }
 
 function getDateString(offsetDays = 0) {
@@ -177,7 +185,7 @@ function getRangeDays(timeRange) {
 
 async function fetchToolStats(toolType, timeRange) {
   const normalizedToolType = normalizePlatformKey(toolType);
-  const endpointBase = TOOL_ENDPOINTS[normalizedToolType];
+  const endpointBase = getToolEndpoint(normalizedToolType);
   if (!endpointBase) {
     throw new Error(`不支持的渠道类型: ${toolType}`);
   }
@@ -207,7 +215,7 @@ async function fetchOverallStats(timeRange) {
   const byToolType = {};
   const summary = emptySummary();
 
-  for (const toolType of TOOL_TYPES) {
+  for (const toolType of getToolTypes()) {
     const toolSummary = await fetchToolStats(toolType, timeRange);
     byToolType[toolType] = toolSummary;
     mergeSummaries(summary, toolSummary);
@@ -252,7 +260,7 @@ async function handleStats(type = null, options = {}) {
   try {
     if (!validateToolType(normalizedType)) {
       console.error(chalk.red(`\n[ERROR] 无效的渠道类型: ${type}\n`));
-      console.log(chalk.gray('支持的类型: claude, codex, gemini, opencode, omp\n'));
+      console.log(chalk.gray(`支持的类型: ${getToolTypes().join(', ')}\n`));
       process.exit(1);
     }
 
@@ -320,11 +328,11 @@ function displayStats(stats) {
   }
 
   if (!type && stats.byToolType) {
-    const iconMap = { claude: '[*]', codex: '[*]', gemini: '[*]', opencode: '[*]', omp: '[*]' };
     console.log(chalk.bold('\n[CH] 分渠道汇总:'));
-    TOOL_TYPES.forEach((toolType) => {
+    getToolTypes().forEach((toolType) => {
       const item = stats.byToolType[toolType] || emptySummary();
-      console.log(chalk.gray(`  ${iconMap[toolType]} ${getToolDisplayName(toolType)}:`));
+      const iconToken = getToolDefinition(toolType)?.iconToken || '*';
+      console.log(chalk.gray(`  [${iconToken}] ${getToolDisplayName(toolType)}:`));
       console.log(
         chalk.gray(
           `     请求: ${formatNumber(item.requests)}  |  Tokens: ${formatNumber(item.tokens)}  |  成本: $${normalizeNumber(item.cost).toFixed(4)}`
@@ -333,17 +341,15 @@ 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';
+  const platform = getToolDefinition(normalizedType);
+  if (platform?.proxyMode === 'managed') {
+    return platform.helpLabel || platform.label || normalizedType.toUpperCase();
+  }
   return String(normalizedType || '').toUpperCase();
 }
 
@@ -371,7 +377,7 @@ async function handleStatsExport(type = null, format = 'json') {
   try {
     if (!validateToolType(normalizedType)) {
       console.error(chalk.red(`\n[ERROR] 无效的渠道类型: ${type}\n`));
-      console.log(chalk.gray('支持的类型: claude, codex, gemini, opencode, omp\n'));
+      console.log(chalk.gray(`支持的类型: ${getToolTypes().join(', ')}\n`));
       process.exit(1);
     }
 
@@ -411,6 +417,8 @@ module.exports = {
     buildDisplayPayload,
     fetchToolStats,
     getToolDisplayName,
+    getToolEndpoint,
+    getToolTypes,
     validateToolType
   }
 };

package/src/commands/switch.js

@@ -31,7 +31,7 @@ async function switchProject(config) {
   saveConfig({ ...config });
 
   // 使用解析后的名称显示
-  const { parseRealProjectPath } = require('../server/services/sessions');
+  const { parseRealProjectPath } = require('../platforms/drivers/claude/sessions-implementation');
   const { displayName, fullPath } = parseRealProjectPath(selectedProject);
 
   console.log(chalk.green(`\n[OK] 已切换到: ${displayName}\n`));