coding-tool-x 3.8.4 → 3.8.6

package/src/commands/export-config.js

@@ -3,6 +3,24 @@ const path = require('path');
 const archiver = require('archiver');
 const chalk = require('chalk');
 const { HOME_DIR } = require('../config/paths');
+const { getPlatformContext } = require('../server/platform-context');
+
+function resolveClaudeExportPaths(options = {}) {
+  const registry = options.registry || getPlatformContext().registry;
+  const pathContext = options.pathContext
+    || registry?.resolvePathContext?.('claude', options.pathOptions || {});
+  const homeDir = pathContext?.home || HOME_DIR;
+  const native = pathContext?.native || {};
+  const claudeDir = native.dir || path.join(homeDir, '.claude');
+
+  return {
+    homeDir,
+    claudeDir,
+    prompt: native.prompt || path.join(claudeDir, 'CLAUDE.md'),
+    settings: native.settings || path.join(claudeDir, 'settings.json'),
+    skills: native.skills || path.join(claudeDir, 'skills')
+  };
+}
 
 /**
  * 导出 Claude Code 配置为 ZIP 压缩包
@@ -14,8 +32,8 @@ async function exportConfig(options = {}) {
   try {
     console.log(chalk.blue('[START] 开始导出 Claude Code 配置...'));
 
-    const homeDir = HOME_DIR;
-    const claudeDir = path.join(homeDir, '.claude');
+    const exportPaths = resolveClaudeExportPaths(options);
+    const { homeDir, claudeDir } = exportPaths;
     const currentDir = process.cwd();
 
     // 检查 .claude 目录是否存在
@@ -54,7 +72,7 @@ async function exportConfig(options = {}) {
     };
 
     // 1. 导出全局 CLAUDE.md
-    const globalClaudeMd = path.join(claudeDir, 'CLAUDE.md');
+    const globalClaudeMd = exportPaths.prompt;
     if (fs.existsSync(globalClaudeMd)) {
       archive.file(globalClaudeMd, { name: 'global/CLAUDE.md' });
       manifest.globalConfig.claudeMd = true;
@@ -63,7 +81,7 @@ async function exportConfig(options = {}) {
     }
 
     // 2. 导出 settings.json
-    const settingsJson = path.join(claudeDir, 'settings.json');
+    const settingsJson = exportPaths.settings;
     if (fs.existsSync(settingsJson)) {
       archive.file(settingsJson, { name: 'global/settings.json' });
       manifest.globalConfig.settings = true;
@@ -89,7 +107,7 @@ async function exportConfig(options = {}) {
     }
 
     // 3. 导出 Skills
-    const skillsDir = path.join(claudeDir, 'skills');
+    const skillsDir = exportPaths.skills;
     if (fs.existsSync(skillsDir)) {
       const skills = fs.readdirSync(skillsDir).filter(f => !f.startsWith('.'));
       if (skills.length > 0) {

package/src/commands/list.js

@@ -2,22 +2,101 @@
 const chalk = require('chalk');
 const ora = require('ora');
 const inquirer = require('inquirer');
-const { getAllSessions, parseSessionInfoFast } = require('../utils/session');
 const { formatTime, formatSize, truncate } = require('../utils/format');
 const { promptSelectSession, promptForkConfirm } = require('../ui/prompts');
 const { resumeSession } = require('./resume');
 const { loadAliases } = require('../server/services/alias');
-const { getRecentSessions } = require('../server/services/sessions');
+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 {
+    const result = await resolved.operation(...args);
+    return unwrapDriverResult(result);
+  } catch (error) {
+    return createFailureResult(error, resolved.key, operation);
+  }
+}
+
+function normalizeSessionCollection(value) {
+  const unwrapped = unwrapDriverResult(value);
+  if (isDriverResult(unwrapped)) return unwrapped;
+  if (Array.isArray(unwrapped)) return unwrapped;
+  return Array.isArray(unwrapped?.sessions) ? unwrapped.sessions : [];
+}
+
+function normalizeSession(session = {}) {
+  const metadata = session.meta || session.metadata || {};
+  return {
+    ...session,
+    sessionId: String(session.sessionId || session.id || ''),
+    mtime: session.mtime || session.updatedAt || session.timestamp || Date.now(),
+    size: Number(session.size ?? session.fileSize ?? metadata.size ?? 0) || 0,
+    gitBranch: session.gitBranch || metadata.gitBranch || null,
+    firstMessage: session.firstMessage || session.preview || session.summary || metadata.firstMessage || null
+  };
+}
+
+function reportDriverFailure(result) {
+  if (!isDriverResult(result)) return;
+  const message = result.error || `会话操作 ${result.operation || 'unknown'} 不可用`;
+  console.log(chalk.yellow(`\n[WARN] ${message}\n`));
+}
 
 /**
  * 列出会话
  */
-async function listSessions(config, limit = null) {
-  const maxSessions = limit || config.maxDisplaySessions;
+async function listSessions(config = {}, limit = null, options = {}) {
+  const maxSessions = limit || config.maxDisplaySessions || 15;
   const spinner = ora('加载会话列表...').start();
+  const result = await invokeSessionOperation(
+    config,
+    'listSessions',
+    [config.currentProject, { config }],
+    options
+  );
+  const collection = normalizeSessionCollection(result);
+
+  if (isDriverResult(collection)) {
+    spinner.stop();
+    spinner.clear();
+    return collection;
+  }
 
-  const sessions = getAllSessions(config).slice(0, maxSessions);
-
+  const sessions = collection.slice(0, maxSessions).map(normalizeSession);
   if (sessions.length === 0) {
     spinner.fail('暂无会话记录');
     return [];
@@ -25,22 +104,15 @@ async function listSessions(config, limit = null) {
 
   spinner.text = '解析会话信息...';
 
-  // 加载别名
   const aliases = loadAliases();
-
   const choices = sessions.map((session, index) => {
-    const info = parseSessionInfoFast(session.filePath);
     const time = formatTime(session.mtime);
     const size = formatSize(session.size);
-    const alias = aliases[session.sessionId];
+    const alias = session.alias || aliases[session.sessionId];
 
-    // 构建显示名称 - 清爽的单行布局
     let displayName = '';
-
-    // 格式：序号. [别名] 时间 │ 大小 │ 分支 │ 第一条消息
     displayName += chalk.bold.white(`${index + 1}. `);
 
-    // 如果有别名，优先显示别名
     if (alias) {
       displayName += chalk.yellow.bold(`[${alias}] `);
     }
@@ -48,8 +120,8 @@ async function listSessions(config, limit = null) {
     displayName += chalk.cyan(`${time.padEnd(10)}`);
     displayName += chalk.gray(` │ ${size.padEnd(9)}`);
 
-    if (info.gitBranch) {
-      const branchName = info.gitBranch
+    if (session.gitBranch) {
+      const branchName = session.gitBranch
         .replace('feature/', '')
         .replace('feat/', '')
         .replace('fix/', '')
@@ -59,23 +131,21 @@ async function listSessions(config, limit = null) {
       displayName += chalk.gray(` │ ${''.padEnd(25)}`);
     }
 
-    // 只显示第一条用户消息（你说明这个会话是干嘛的）
-    if (info.firstMessage && info.firstMessage !== 'Warmup') {
-      const firstMsg = truncate(info.firstMessage, 50);
+    if (session.firstMessage && session.firstMessage !== 'Warmup') {
+      const firstMsg = truncate(String(session.firstMessage), 50);
       displayName += chalk.gray(' │ ') + chalk.white(firstMsg);
     }
 
     return {
       name: displayName,
       value: session.sessionId,
-      short: alias ? `${alias} (${session.sessionId.substring(0, 8)})` : `会话 ${session.sessionId.substring(0, 8)}`,
+      short: alias ? `${alias} (${session.sessionId.substring(0, 8)})` : `会话 ${session.sessionId.substring(0, 8)}`
     };
   });
 
   spinner.stop();
   spinner.clear();
 
-  // 清屏并重新显示，避免之前的输出干扰
   console.clear();
   console.log(chalk.green(`\n[NEW] 找到 ${sessions.length} 个会话\n`));
 
@@ -85,12 +155,24 @@ async function listSessions(config, limit = null) {
 /**
  * 列出跨项目的最近会话
  */
-async function listRecentSessionsAcrossProjects(config, limit = null) {
-  const maxSessions = limit || 15; // 默认显示15条最新对话
+async function listRecentSessionsAcrossProjects(config = {}, limit = null, options = {}) {
+  const maxSessions = limit || 15;
   const spinner = ora('加载最新对话...').start();
+  const result = await invokeSessionOperation(
+    config,
+    'recent',
+    [maxSessions, { config }],
+    options
+  );
+  const collection = normalizeSessionCollection(result);
+
+  if (isDriverResult(collection)) {
+    spinner.stop();
+    spinner.clear();
+    return collection;
+  }
 
-  const sessions = await getRecentSessions(config, maxSessions);
-
+  const sessions = collection.slice(0, maxSessions).map(normalizeSession);
   if (sessions.length === 0) {
     spinner.fail('暂无会话记录');
     return [];
@@ -98,22 +180,18 @@ async function listRecentSessionsAcrossProjects(config, limit = null) {
 
   spinner.text = '解析会话信息...';
 
+  const aliases = loadAliases();
   const choices = sessions.map((session, index) => {
     const time = formatTime(session.mtime);
     const size = formatSize(session.size);
-    const alias = session.alias;
+    const alias = session.alias || aliases[session.sessionId];
 
-    // 构建显示名称 - 清爽的单行布局
     let displayName = '';
-
-    // 格式：序号. [项目名] [别名] 时间 │ 大小 │ 分支 │ 第一条消息
     displayName += chalk.bold.white(`${index + 1}. `);
 
-    // 项目名（高亮显示）
-    const projectName = session.projectDisplayName || session.projectName;
+    const projectName = session.projectDisplayName || session.projectName || '未知项目';
     displayName += chalk.magenta.bold(`[${projectName}] `);
 
-    // 如果有别名，显示别名
     if (alias) {
       displayName += chalk.yellow.bold(`[${alias}] `);
     }
@@ -132,23 +210,21 @@ async function listRecentSessionsAcrossProjects(config, limit = null) {
       displayName += chalk.gray(` │ ${''.padEnd(25)}`);
     }
 
-    // 只显示第一条用户消息
     if (session.firstMessage && session.firstMessage !== 'Warmup') {
-      const firstMsg = truncate(session.firstMessage, 50);
+      const firstMsg = truncate(String(session.firstMessage), 50);
       displayName += chalk.gray(' │ ') + chalk.white(firstMsg);
     }
 
     return {
       name: displayName,
       value: { sessionId: session.sessionId, projectName: session.projectName },
-      short: alias ? `${alias} (${session.sessionId.substring(0, 8)})` : `会话 ${session.sessionId.substring(0, 8)}`,
+      short: alias ? `${alias} (${session.sessionId.substring(0, 8)})` : `会话 ${session.sessionId.substring(0, 8)}`
     };
   });
 
   spinner.stop();
   spinner.clear();
 
-  // 清屏并重新显示，避免之前的输出干扰
   console.clear();
   console.log(chalk.green(`\n[NEW] 找到 ${sessions.length} 个最新对话（跨所有项目）\n`));
 
@@ -158,22 +234,25 @@ async function listRecentSessionsAcrossProjects(config, limit = null) {
 /**
  * 处理列出会话
  */
-async function handleList(config, switchProjectCallback, crossProject = false) {
+async function handleList(config, switchProjectCallback, crossProject = false, options = {}) {
   while (true) {
-    // 根据模式选择不同的列表函数
-    const choices = crossProject
-      ? await listRecentSessionsAcrossProjects(config)
-      : await listSessions(config);
+    const result = crossProject
+      ? await listRecentSessionsAcrossProjects(config, null, options)
+      : await listSessions(config, null, options);
+
+    if (isDriverResult(result)) {
+      reportDriverFailure(result);
+      return;
+    }
 
+    const choices = Array.isArray(result) ? result : [];
     if (choices.length === 0) {
       return;
     }
 
-    // 添加操作选项
     choices.push(new inquirer.Separator(chalk.gray('─'.repeat(50))));
     choices.push({ name: chalk.blue('[<-]  返回主菜单'), value: 'back' });
 
-    // 跨项目模式不显示切换项目选项（因为已经是跨所有项目了）
     if (!crossProject) {
       choices.push({ name: chalk.magenta('[SWITCH]  切换项目'), value: 'switch' });
     }
@@ -187,36 +266,35 @@ async function handleList(config, switchProjectCallback, crossProject = false) {
     if (selected === 'switch') {
       const switched = await switchProjectCallback();
       if (!switched) {
-        return; // 用户取消切换，返回主菜单
+        return;
       }
-      continue; // 切换后重新加载列表
+      continue;
     }
 
-    // 跨项目模式：selected 是 { sessionId, projectName }
-    // 单项目模式：selected 是 sessionId
     let sessionId, projectName;
     if (crossProject) {
       sessionId = selected.sessionId;
       projectName = selected.projectName;
-      // 切换到该项目
       config.currentProject = projectName;
     } else {
       sessionId = selected;
     }
 
-    // 询问是否 fork
     const action = await promptForkConfirm();
 
     if (action === 'back') {
-      continue; // 返回列表重新选择
+      continue;
     }
 
     const fork = action === 'fork';
-    await resumeSession(config, sessionId, fork);
+    await resumeSession(config, sessionId, fork, {
+      ...options,
+      platform: options.platform || config.currentCliType || ''
+    });
   }
 }
 
 module.exports = {
   listSessions,
-  handleList,
+  listRecentSessionsAcrossProjects,
 };

package/src/commands/logs.js

@@ -6,23 +6,40 @@ const { PATHS } = require('../config/paths');
 const { normalizePlatformKey } = require('../shared/platforms');
 
 const LOGS_DIR = PATHS.logs;
+const UI_LOG_FILE = 'cc-tool-out.log';
 
-const LOG_FILES = {
-  ui: 'cc-tool-out.log',
-  claude: 'claude-proxy.log',
-  codex: 'codex-proxy.log',
-  gemini: 'gemini-proxy.log',
-  opencode: 'opencode-proxy.log'
-};
-const LOG_ALIASES = {
-  omp: 'ui'
-};
-const LOG_ALIAS_NOTES = {
-  omp: 'OMP 受管 provider 配置没有独立请求代理日志，相关活动记录在 UI/server 日志中。'
-};
+function getCommandRegistry() {
+  return require('./platform-command-registry').createPlatformCommandRegistry();
+}
+
+function getLogDefinitions() {
+  return getCommandRegistry().list().filter(platform => platform.logFile || platform.logAliases?.length);
+}
+
+function getLogFiles() {
+  return {
+    ui: UI_LOG_FILE,
+    ...Object.fromEntries(getLogDefinitions()
+      .filter(platform => platform.logFile && !(platform.logAliases || []).includes('ui'))
+      .map(platform => [platform.key, platform.logFile]))
+  };
+}
+
+function getLogAliases() {
+  return Object.fromEntries(getLogDefinitions()
+    .flatMap(platform => (platform.logAliases || []).map(alias => [platform.key, alias])));
+}
+
+function getLogAliasNotes() {
+  return Object.fromEntries(getLogDefinitions()
+    .filter(platform => platform.logNote)
+    .map(platform => [platform.key, platform.logNote]));
+}
 
 function getSupportedLogTypes() {
-  return [...Object.keys(LOG_FILES), 'omp'];
+  const files = getLogFiles();
+  const platformKeys = getLogDefinitions().map(platform => platform.key);
+  return [...new Set([...Object.keys(files), ...platformKeys])];
 }
 
 function resolveLogType(type) {
@@ -30,14 +47,17 @@ function resolveLogType(type) {
   if (!normalized) {
     return { requestedType: type, type: null, file: null, note: null };
   }
-  const aliasTarget = LOG_ALIASES[normalized];
+  const aliases = getLogAliases();
+  const files = getLogFiles();
+  const notes = getLogAliasNotes();
+  const aliasTarget = aliases[normalized];
   const resolvedType = aliasTarget || normalized;
   return {
     requestedType: type,
     normalizedType: normalized,
     type: resolvedType,
-    file: LOG_FILES[resolvedType] || null,
-    note: LOG_ALIAS_NOTES[normalized] || null
+    file: files[resolvedType] || null,
+    note: notes[normalized] || null
   };
 }
 
@@ -113,7 +133,7 @@ function showAllLogs(lines, follow) {
   const allLogs = [];
 
   // 读取所有日志文件
-  Object.entries(LOG_FILES).forEach(([type, filename]) => {
+  Object.entries(getLogFiles()).forEach(([type, filename]) => {
     const logPath = path.join(LOGS_DIR, filename);
     if (fs.existsSync(logPath)) {
       try {
@@ -241,7 +261,7 @@ function clearLogs(type) {
     console.log(chalk.cyan('\n[DEL]  清空所有日志...\n'));
 
     let cleared = 0;
-    Object.entries(LOG_FILES).forEach(([logType, filename]) => {
+    Object.entries(getLogFiles()).forEach(([logType, filename]) => {
       const logPath = path.join(LOGS_DIR, filename);
       if (fs.existsSync(logPath)) {
         try {
@@ -314,14 +334,11 @@ function extractTimestamp(line) {
  * 获取类型颜色
  */
 function getTypeColor(type) {
-  const colors = {
-    ui: chalk.blue,
-    claude: chalk.green,
-    codex: chalk.cyan,
-    gemini: chalk.magenta,
-    opencode: chalk.yellow
-  };
-  return colors[type] || chalk.gray;
+  if (type === 'ui') return chalk.blue;
+  const normalized = normalizePlatformKey(type);
+  const platform = getLogDefinitions().find(item => item.key === normalized);
+  const color = platform?.logColor || platform?.terminalColor;
+  return color && typeof chalk[color] === 'function' ? chalk[color] : chalk.gray;
 }
 
 module.exports = {

package/src/commands/platform-command-registry.js

@@ -0,0 +1,78 @@
+'use strict';
+
+const { normalizePlatformKey } = require('../shared/platforms');
+const platformRuntime = require('../platforms/runtime');
+
+function normalizePlatformDefinition(platform) {
+  if (!platform || typeof platform !== 'object' || !platform.key) return null;
+  return platform;
+}
+
+function createPlatformCommandRegistry({ registry = platformRuntime.getPlatformRegistry(), platforms } = {}) {
+  const source = Array.isArray(platforms)
+    ? platforms
+    : (registry && typeof registry.list === 'function' ? registry.list({ enabledOnly: true }) : []);
+  const definitions = new Map(
+    source
+      .map(normalizePlatformDefinition)
+      .filter(Boolean)
+      .map(platform => [normalizePlatformKey(platform.key), platform])
+  );
+  const commands = new Map(
+    [...definitions.values()]
+      .filter(platform => platform.command)
+      .map(platform => [normalizePlatformKey(platform.command), platform])
+  );
+
+  const list = () => [...definitions.values()];
+  const hasCapability = (platform, capability) => {
+    const value = platform?.capabilities?.[capability];
+    return value !== undefined && value !== null && value !== 'unsupported';
+  };
+  return {
+    resolve(key) {
+      const normalized = normalizePlatformKey(key);
+      return definitions.get(normalized) || commands.get(normalized) || null;
+    },
+    platformKeys() {
+      return list().map(platform => platform.key);
+    },
+    list() {
+      return list().map(platform => ({ ...platform }));
+    },
+    logTypes() {
+      return list()
+        .filter(platform => platform.logFile || platform.logAliases?.length)
+        .map(platform => platform.key);
+    },
+    portKeys() {
+      return list()
+        .filter(platform => platform.portKey && platform.defaultPort)
+        .map(platform => platform.portKey);
+    },
+    statsTypes() {
+      return list().filter(platform => hasCapability(platform, 'statistics')).map(platform => platform.key);
+    },
+    selectableTypes() {
+      return list()
+        .filter(platform => platform.cliSelectable !== false)
+        .map(platform => platform.key);
+    },
+    helpEntries() {
+      return list().map(platform => ({
+        key: platform.key,
+        command: platform.command || platform.key,
+        label: platform.helpLabel || platform.label || platform.title || platform.key,
+        proxyLabel: platform.proxyLabels?.proxyLabel || '代理',
+        proxy: hasCapability(platform, 'proxy'),
+        log: Boolean(platform.logFile || platform.logAliases?.length),
+        stats: hasCapability(platform, 'statistics'),
+        portKey: platform.portKey || null
+      }));
+    }
+  };
+}
+
+module.exports = {
+  createPlatformCommandRegistry
+};

package/src/commands/plugin.js

@@ -1,8 +1,12 @@
 const chalk = require('chalk');
-const inquirer = require('inquirer');
-const { installPlugin, uninstallPlugin, updatePlugin, updateAllPlugins } = require('../plugins/plugin-installer');
+function getInquirer() {
+  return require('inquirer');
+}
+
+function getPluginInstaller() {
+  return require('../plugins/plugin-installer');
+}
 const { listPlugins, getPlugin, updatePlugin: updatePluginRegistry } = require('../plugins/registry');
-const { createPluginContext } = require('../plugins/plugin-api');
 const fs = require('fs');
 const path = require('path');
 const { INSTALLED_DIR } = require('../plugins/constants');
@@ -70,6 +74,7 @@ async function handleInstall(args) {
   }
 
   console.log(chalk.cyan(`\n[PKG] Installing plugin from ${url}...\n`));
+  const { installPlugin } = getPluginInstaller();
 
   const result = await installPlugin(url);
 
@@ -111,8 +116,7 @@ async function handleRemove(args) {
     process.exit(1);
   }
 
-  // Confirm uninstall
-  const { confirmed } = await inquirer.prompt([
+  const { confirmed } = await getInquirer().prompt([
     {
       type: 'confirm',
       name: 'confirmed',
@@ -126,6 +130,7 @@ async function handleRemove(args) {
     return;
   }
 
+  const { uninstallPlugin } = getPluginInstaller();
   console.log(chalk.cyan(`\n[DEL]  Uninstalling plugin "${name}"...\n`));
 
   const result = uninstallPlugin(name);
@@ -477,6 +482,7 @@ async function handleUpdate(args) {
     console.log(chalk.gray('       ctx plugin update --all\n'));
     process.exit(1);
   }
+  const { updatePlugin, updateAllPlugins } = getPluginInstaller();
 
   if (isUpdateAll) {
     console.log(chalk.cyan('\n[SYNC] Updating all plugins...\n'));