coding-tool-x 3.8.3 → 3.8.5

package/src/ui/menu.js

@@ -3,11 +3,38 @@ const inquirer = require('inquirer');
 const chalk = require('chalk');
 const packageInfo = require('../../package.json');
 
-function normalizeCliType(type) {
-  if (type === 'claude' || type === 'codex' || type === 'gemini' || type === 'opencode') {
-    return type;
+const { resolvePlatform, resolveOperation } = require('../platforms/access');
+
+function getRuntimeDependencies(dependencies = {}) {
+  const runtimeModule = require('../platforms/runtime');
+  return {
+    registry: dependencies.registry || runtimeModule.getPlatformRegistry(),
+    runtime: dependencies.runtime || runtimeModule.getPlatformRuntime()
+  };
+}
+
+function unwrapDriverResult(result) {
+  if (!result || typeof result !== 'object' || !result.status) {
+    return result;
+  }
+  if (result.status === 'ok') {
+    return result.data;
+  }
+  throw result.cause instanceof Error
+    ? result.cause
+    : new Error(result.error || `Driver operation ${result.operation || 'unknown'} failed`);
+}
+
+function invokeOperation(platform, capability, operation, dependencies) {
+  try {
+    const resolved = resolveOperation(platform, capability, operation, dependencies);
+    return {
+      supported: true,
+      value: unwrapDriverResult(resolved.operation())
+    };
+  } catch (error) {
+    return { supported: false, error };
   }
-  return 'claude';
 }
 
 function pickActiveChannel(channels) {
@@ -17,90 +44,87 @@ function pickActiveChannel(channels) {
   return channels.find(channel => channel.enabled !== false) || channels[0];
 }
 
-function getChannelAndProxyStatus(cliType) {
-  const currentType = normalizeCliType(cliType);
-
-  if (currentType === 'claude') {
-    const { getCurrentChannel } = require('../server/services/channels');
-    const { getProxyStatus } = require('../server/proxy-server');
-    return { channel: getCurrentChannel(), proxyStatus: getProxyStatus() };
-  }
-
-  if (currentType === 'codex') {
-    const { getChannels } = require('../server/services/codex-channels');
-    const { getCodexProxyStatus } = require('../server/codex-proxy-server');
-    const data = getChannels();
-    return { channel: pickActiveChannel(data?.channels), proxyStatus: getCodexProxyStatus() };
-  }
-
-  if (currentType === 'gemini') {
-    const { getChannels } = require('../server/services/gemini-channels');
-    const { getGeminiProxyStatus } = require('../server/gemini-proxy-server');
-    const data = getChannels();
-    return { channel: pickActiveChannel(data?.channels), proxyStatus: getGeminiProxyStatus() };
+function getChannelAndProxyStatus(cliType, dependencies = {}) {
+  const runtimeDependencies = getRuntimeDependencies(dependencies);
+  let platform;
+  try {
+    platform = resolvePlatform(cliType || '', {
+      ...runtimeDependencies,
+      fallback: 'claude'
+    });
+  } catch (error) {
+    return {
+      platform: null,
+      error,
+      channel: null,
+      proxyStatus: null,
+      channelSupported: false,
+      proxySupported: false
+    };
   }
 
-  const { getChannels } = require('../server/services/opencode-channels');
-  const { getOpenCodeProxyStatus } = require('../server/opencode-proxy-server');
-  const data = getChannels();
-  return { channel: pickActiveChannel(data?.channels), proxyStatus: getOpenCodeProxyStatus() };
+  const current = invokeOperation(platform.key, 'channels', 'current', runtimeDependencies);
+  const listed = current.supported
+    ? current
+    : invokeOperation(platform.key, 'channels', 'list', runtimeDependencies);
+  const channelValue = listed.value;
+  const channel = Array.isArray(channelValue)
+    ? pickActiveChannel(channelValue)
+    : Array.isArray(channelValue?.channels)
+      ? pickActiveChannel(channelValue.channels)
+      : channelValue || null;
+  const proxy = invokeOperation(platform.key, 'proxy', 'status', runtimeDependencies);
+
+  return {
+    platform,
+    error: null,
+    channel,
+    proxyStatus: proxy.value || null,
+    channelSupported: listed.supported,
+    proxySupported: proxy.supported
+  };
 }
 
 /**
  * 显示主菜单
  */
-async function showMainMenu(config) {
+async function showMainMenu(config = {}, dependencies = {}) {
   console.log(chalk.bold.cyan('\n╔===============================================╗'));
   console.log(chalk.bold.cyan(`║    Claude Code 会话管理工具 v${packageInfo.version}          ║`));
   console.log(chalk.bold.cyan('╚===============================================╝\n'));
 
-  // 显示当前CLI类型
-  const cliTypes = {
-    claude: { name: 'Claude Code', color: 'cyan' },
-    codex: { name: 'Codex', color: 'green' },
-    gemini: { name: 'Gemini', color: 'magenta' },
-    opencode: { name: 'OpenCode', color: 'yellow' }
-  };
-  const currentType = normalizeCliType(config.currentCliType || 'claude');
-  const typeInfo = cliTypes[currentType] || cliTypes.claude;
-  console.log(chalk[typeInfo.color](`当前类型: ${typeInfo.name}`));
+  const cliType = config.currentCliType || 'claude';
+  const status = getChannelAndProxyStatus(cliType, dependencies);
+  const manifest = status.platform?.manifest;
+  const displayName = manifest?.label || manifest?.title || status.platform?.key || cliType;
+  const terminalColor = manifest?.terminalColor;
+  const colorize = typeof chalk[terminalColor] === 'function' ? chalk[terminalColor] : chalk.cyan;
+  console.log(colorize(`当前类型: ${displayName}`));
 
   const projectName = config.currentProject
     ? config.currentProject.replace(/-/g, '/').substring(1)
     : '未设置';
   console.log(chalk.gray(`当前项目: ${projectName}`));
 
-  // 显示当前渠道和代理状态（根据类型显示对应的渠道和代理）
-  try {
-    const { channel: currentChannel, proxyStatus } = getChannelAndProxyStatus(currentType);
-
-    if (currentChannel) {
-      console.log(chalk.gray(`当前渠道: ${currentChannel.name}`));
-    }
-
-    if (proxyStatus.running) {
-      console.log(chalk.green(`动态切换: 已开启 (端口 ${proxyStatus.port})`));
-    } else {
-      console.log(chalk.gray('动态切换: 未开启'));
-    }
-  } catch (err) {
-    // 忽略错误
+  if (status.channel) {
+    console.log(chalk.gray(`当前渠道: ${status.channel.name}`));
+  } else if (!status.channelSupported) {
+    console.log(chalk.gray('当前渠道: 不可用'));
+  }
+
+  if (status.proxySupported && status.proxyStatus?.running) {
+    console.log(chalk.green(`动态切换: 已开启 (端口 ${status.proxyStatus.port})`));
+  } else if (status.proxySupported) {
+    console.log(chalk.gray('动态切换: 未开启'));
+  } else {
+    console.log(chalk.gray('动态切换: 不可用'));
   }
 
   console.log(chalk.gray('─'.repeat(50)));
 
-  // 获取代理状态，用于显示动态切换的状态（根据当前类型）
-  let proxyStatusText = '未开启';
-  try {
-    const { proxyStatus } = getChannelAndProxyStatus(currentType);
-
-    if (proxyStatus && proxyStatus.running) {
-      proxyStatusText = '已开启';
-    }
-  } catch (err) {
-    // 忽略错误
-    console.error('获取代理状态失败:', err.message);
-  }
+  const proxyStatusText = !status.proxySupported
+    ? '不可用'
+    : status.proxyStatus?.running ? '已开启' : '未开启';
 
   const { action } = await inquirer.prompt([
     {

package/src/utils/port-helper.js

@@ -1,4 +1,4 @@
-const { execSync } = require('child_process');
+const { execFileSync, execSync } = require('child_process');
 const net = require('net');
 const { isWindowsLikePlatform } = require('./home-dir');
 
@@ -91,6 +91,28 @@ function parsePidsFromNetstatOutput(output, port) {
   return Array.from(pids);
 }
 
+function buildWindowsPortProbeSpec() {
+  return {
+    command: 'netstat.exe',
+    args: ['-ano'],
+    options: {
+      encoding: 'utf-8',
+      windowsHide: true
+    }
+  };
+}
+
+function buildWindowsKillSpec(pid) {
+  return {
+    command: 'taskkill.exe',
+    args: ['/F', '/PID', String(pid)],
+    options: {
+      stdio: 'ignore',
+      windowsHide: true
+    }
+  };
+}
+
 /**
  * 检查端口是否被占用
  */
@@ -137,24 +159,15 @@ function findProcessByPort(port) {
   const isWindows = isWindowsLikeRuntime();
   if (isWindows) {
     try {
-      // Windows: 优先使用 findstr 过滤，避免解析全量 netstat 输出（全量输出在连接数多时极慢）
-      const result = execSync(`netstat -ano | findstr ":${port} "`, { encoding: 'utf-8', windowsHide: true });
+      // 直接调用 netstat，避免为一次端口探测额外启动 cmd.exe/findstr。
+      const spec = buildWindowsPortProbeSpec();
+      const result = execFileSync(spec.command, spec.args, spec.options);
       return parsePidsFromNetstatOutput(result, port);
-    } catch (e) {
-      // findstr 未匹配到任何行时 exit code = 1，属于正常情况
-      if (e.status === 1) {
-        return [];
-      }
-      // findstr 不可用时回退到全量解析
-      try {
-        const result = execSync('netstat -ano', { encoding: 'utf-8', windowsHide: true });
-        return parsePidsFromNetstatOutput(result, port);
-      } catch (e2) {
-        if (isMissingCommandError(e2)) {
-          rememberPortToolIssue(createPortToolIssue('netstat', 'lookup', true));
-        }
-        return [];
+    } catch (err) {
+      if (isMissingCommandError(err)) {
+        rememberPortToolIssue(createPortToolIssue('netstat', 'lookup', true));
       }
+      return [];
     }
   }
 
@@ -193,7 +206,8 @@ function killProcessByPort(port) {
     pids.forEach(pid => {
       try {
         if (isWindows) {
-          execSync(`taskkill /F /PID ${pid}`, { stdio: 'ignore', windowsHide: true });
+          const spec = buildWindowsKillSpec(pid);
+          execFileSync(spec.command, spec.args, spec.options);
         } else {
           execSync(`kill -9 ${pid}`, { stdio: 'ignore', windowsHide: true });
         }
@@ -241,6 +255,8 @@ module.exports = {
   _test: {
     isMissingCommandError,
     createPortToolIssue,
-    formatPortToolIssue
+    formatPortToolIssue,
+    buildWindowsPortProbeSpec,
+    buildWindowsKillSpec
   }
 };

package/src/utils/session.js

@@ -208,7 +208,7 @@ async function getAvailableProjects(config) {
   }
 
   // 获取项目列表和统计信息（包含解析后的名称）
-  const { getProjectsWithStats, getProjectOrder } = require('../server/services/sessions');
+  const { getProjectsWithStats, getProjectOrder } = require('../platforms/drivers/claude/sessions-implementation');
   const resolvedConfig = { ...config, projectsDir };
   const projects = await getProjectsWithStats(resolvedConfig);
   const savedOrder = getProjectOrder(resolvedConfig);