coding-tool-x 3.5.13 → 3.6.0

package/dist/web/index.html

@@ -5,7 +5,7 @@
     <link rel="icon" href="/favicon.ico">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>coding-tool-x · AI 编程工作台</title>
-    <script type="module" crossorigin src="/assets/index-DM3yF1Oo.js"></script>
+    <script type="module" crossorigin src="/assets/index-CLra7uzu.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/markdown-BNJfEgCA.js">
     <link rel="modulepreload" crossorigin href="/assets/vue-vendor-B5RqjEjQ.js">
     <link rel="modulepreload" crossorigin href="/assets/naive-ui-DM897mIP.js">

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coding-tool-x",
-  "version": "3.5.13",
+  "version": "3.6.0",
   "description": "Vibe Coding 增强工作助手 - 智能会话管理、动态渠道切换、全局搜索、实时监控",
   "main": "src/index.js",
   "bin": {

package/src/commands/daemon.js

@@ -1,3 +1,4 @@
+const fs = require('fs');
 const pm2 = require('pm2');
 const path = require('path');
 const chalk = require('chalk');
@@ -12,6 +13,16 @@ const {
 } = require('../utils/port-helper');
 
 const PM2_APP_NAME = 'cc-tool';
+const STARTUP_LOG_FILE = 'cc-tool-out.log';
+const CURRENT_PM2_FORK_PATH = resolveCurrentPm2ForkPath();
+
+function resolveCurrentPm2ForkPath() {
+  try {
+    return require.resolve('pm2/lib/ProcessContainerFork');
+  } catch {
+    return '';
+  }
+}
 
 /**
  * 连接到 PM2
@@ -74,6 +85,18 @@ function deletePM2Process(name) {
   });
 }
 
+function restartPM2Process(name) {
+  return new Promise((resolve, reject) => {
+    pm2.restart(name, (err) => {
+      if (err) {
+        reject(err);
+      } else {
+        resolve();
+      }
+    });
+  });
+}
+
 /**
  * 获取 Coding-Tool 进程
  */
@@ -86,6 +109,113 @@ function sleep(ms) {
   return new Promise(resolve => setTimeout(resolve, ms));
 }
 
+function normalizePathForComparison(filePath) {
+  return path.normalize(String(filePath || ''));
+}
+
+function getFileSize(filePath) {
+  try {
+    return fs.statSync(filePath).size;
+  } catch {
+    return 0;
+  }
+}
+
+function readLogChunkSince(filePath, startOffset = 0, maxBytes = 32768) {
+  try {
+    const stat = fs.statSync(filePath);
+    if (stat.size <= startOffset) {
+      return '';
+    }
+
+    const safeOffset = Math.max(0, startOffset);
+    const readStart = Math.max(safeOffset, stat.size - maxBytes);
+    const length = stat.size - readStart;
+    if (length <= 0) {
+      return '';
+    }
+
+    const fd = fs.openSync(filePath, 'r');
+    try {
+      const buffer = Buffer.alloc(length);
+      fs.readSync(fd, buffer, 0, length, readStart);
+      return buffer.toString('utf8');
+    } finally {
+      fs.closeSync(fd);
+    }
+  } catch {
+    return '';
+  }
+}
+
+function extractMissingPm2ForkScriptPath(logText = '') {
+  const match = String(logText).match(/Cannot find module '([^']*ProcessContainerFork\.js)'/);
+  return match ? match[1] : '';
+}
+
+function detectStalePm2RuntimeIssue(logText = '', currentForkPath = CURRENT_PM2_FORK_PATH) {
+  const missingPath = extractMissingPm2ForkScriptPath(logText);
+  if (!missingPath || !currentForkPath) {
+    return null;
+  }
+
+  if (normalizePathForComparison(missingPath) === normalizePathForComparison(currentForkPath)) {
+    return null;
+  }
+
+  return {
+    missingPath,
+    currentPath: currentForkPath
+  };
+}
+
+function updatePM2Daemon() {
+  return new Promise((resolve, reject) => {
+    pm2.update((err, result) => {
+      if (err) {
+        reject(err);
+      } else {
+        resolve(result);
+      }
+    });
+  });
+}
+
+function dumpPM2State(timeoutMs = 2000) {
+  return new Promise((resolve) => {
+    let settled = false;
+    const timer = setTimeout(() => {
+      if (settled) {
+        return;
+      }
+      settled = true;
+      resolve({ timedOut: true, err: null });
+    }, timeoutMs);
+
+    pm2.dump((err) => {
+      if (settled) {
+        return;
+      }
+      settled = true;
+      clearTimeout(timer);
+      resolve({ timedOut: false, err: err || null });
+    });
+  });
+}
+
+async function finalizePM2Session(options = {}) {
+  const shouldPersist = options.persist === true;
+  if (shouldPersist) {
+    const result = await dumpPM2State(options.timeoutMs);
+    if (result.err) {
+      console.log(chalk.yellow(`[WARN]  保存 PM2 状态失败: ${result.err.message}`));
+    } else if (result.timedOut) {
+      console.log(chalk.yellow('[WARN]  保存 PM2 状态超时，继续关闭 CLI 连接'));
+    }
+  }
+  disconnectPM2();
+}
+
 function isPortOwnedByPid(port, pid) {
   if (!pid || pid <= 0) {
     return false;
@@ -257,104 +387,193 @@ async function waitForServiceReady(port, timeoutMs = 15000, intervalMs = 500) {
   };
 }
 
-/**
- * 启动服务（后台）
- */
-async function handleStart() {
-  try {
-    await connectPM2();
+function buildStartOptions(port, enableHost, enableHttps) {
+  const pmArgs = ['ui', '--daemon'];
+  if (enableHost) {
+    pmArgs.push('--host');
+  }
+  if (enableHttps) {
+    pmArgs.push('--https');
+  }
 
-    // 检查是否已经在运行
-    const existing = await getCCToolProcess();
-    if (existing && existing.pm2_env.status === 'online') {
-      console.log(chalk.yellow('\n[WARN]  服务已在运行中\n'));
-      console.log(chalk.gray(`进程 ID: ${existing.pid}`));
-      console.log(chalk.gray(`运行时长: ${formatUptime(existing.pm2_env.pm_uptime)}`));
-      console.log(chalk.gray('\n使用 ') + chalk.cyan('ctx status') + chalk.gray(' 查看详细状态'));
-      console.log(chalk.gray('使用 ') + chalk.cyan('ctx restart') + chalk.gray(' 重启服务\n'));
-      disconnectPM2();
-      return;
-    }
+  return {
+    name: PM2_APP_NAME,
+    script: path.join(__dirname, '../index.js'),
+    args: pmArgs,
+    interpreter: 'node',
+    autorestart: true,
+    max_memory_restart: '500M',
+    env: {
+      NODE_ENV: 'production',
+      CC_TOOL_PORT: port
+    },
+    output: path.join(PATHS.logs, STARTUP_LOG_FILE),
+    error: path.join(PATHS.logs, STARTUP_LOG_FILE),
+    merge_logs: true,
+    log_date_format: 'YYYY-MM-DD HH:mm:ss'
+  };
+}
 
-    const config = loadConfig();
-    const port = config.ports?.webUI || 19999;
+async function attemptStartService(startOptions, port, options = {}) {
+  const allowPm2Refresh = options.allowPm2Refresh !== false;
+  const logPath = path.join(PATHS.logs, STARTUP_LOG_FILE);
+  const logOffset = getFileSize(logPath);
 
-    // 检查是否启用 LAN 访问 (--host 标志)
-    const enableHost = process.argv.includes('--host');
-    const enableHttps = process.argv.includes('--https');
-    const pmArgs = ['ui', '--daemon'];
-    if (enableHost) {
-      pmArgs.push('--host');
-    }
-    if (enableHttps) {
-      pmArgs.push('--https');
-    }
-    require('fs').mkdirSync(PATHS.logs, { recursive: true });
-
-    // 启动 PM2 进程
-    pm2.start({
-      name: PM2_APP_NAME,
-      script: path.join(__dirname, '../index.js'),
-      args: pmArgs,
-      interpreter: 'node',
-      autorestart: true,
-      max_memory_restart: '500M',
-      env: {
-        NODE_ENV: 'production',
-        CC_TOOL_PORT: port
-      },
-      output: path.join(PATHS.logs, 'cc-tool-out.log'),
-      error: path.join(PATHS.logs, 'cc-tool-out.log'),
-      merge_logs: true,
-      log_date_format: 'YYYY-MM-DD HH:mm:ss'
-    }, async (err) => {
+  return new Promise((resolve, reject) => {
+    pm2.start(startOptions, async (err) => {
       if (err) {
-        console.error(chalk.red('\n[ERROR] 启动服务失败:'), err.message);
-        disconnectPM2();
-        process.exit(1);
+        reject(err);
+        return;
       }
 
-      let readyState = null;
       try {
-        readyState = await waitForServiceReady(port);
-        if (!readyState.ready) {
-          const statusText = readyState.process?.pm2_env?.status || 'unknown';
-          console.error(chalk.red('\n[ERROR] Coding-Tool 服务启动失败，进程未就绪\n'));
-          console.error(chalk.gray(`PM2 状态: ${statusText}`));
-          printPortToolIssue(readyState.degradedPortCheckIssue);
-          console.error(chalk.yellow('[TIP] 请使用 ctx logs ui 查看详细日志\n'));
-
-          pm2.delete(PM2_APP_NAME, () => {
-            pm2.dump(() => {
-              disconnectPM2();
-              process.exit(1);
+        const readyState = await waitForServiceReady(port);
+        if (readyState.ready) {
+          resolve({ ok: true, readyState });
+          return;
+        }
+
+        const recentLogText = readLogChunkSince(logPath, logOffset);
+        const staleRuntimeIssue = allowPm2Refresh ? detectStalePm2RuntimeIssue(recentLogText) : null;
+
+        if (staleRuntimeIssue) {
+          console.log(chalk.yellow('\n[WARN]  检测到 PM2 守护进程仍引用旧的 pm2 运行时，正在自动刷新...'));
+          console.log(chalk.gray(`旧路径: ${staleRuntimeIssue.missingPath}`));
+          console.log(chalk.gray(`当前路径: ${staleRuntimeIssue.currentPath}`));
+
+          await updatePM2Daemon();
+
+          const recoveredState = await waitForServiceReady(port, 5000, 500);
+          if (recoveredState.ready) {
+            resolve({
+              ok: true,
+              readyState: recoveredState,
+              recoveredFromStalePm2: staleRuntimeIssue
             });
+            return;
+          }
+
+          try {
+            await deletePM2Process(PM2_APP_NAME);
+          } catch {
+            // ignore stale process cleanup errors; the next retry will surface real failures
+          }
+
+          resolve({
+            retry: true,
+            recoveredFromStalePm2: staleRuntimeIssue
           });
           return;
         }
+
+        resolve({
+          ok: false,
+          readyState
+        });
       } catch (checkError) {
-        console.error(chalk.red('\n[ERROR] 启动后健康检查失败:'), checkError.message);
+        reject(checkError);
+      }
+    });
+  });
+}
+
+function cleanupFailedStart() {
+  return new Promise((resolve) => {
+    pm2.delete(PM2_APP_NAME, async () => {
+      await finalizePM2Session({ persist: true });
+      resolve();
+    });
+  });
+}
+
+/**
+ * 启动服务（后台）
+ */
+async function handleStart() {
+  try {
+    const config = loadConfig();
+    const port = config.ports?.webUI || 19999;
+    const enableHost = process.argv.includes('--host');
+    const enableHttps = process.argv.includes('--https');
+    fs.mkdirSync(PATHS.logs, { recursive: true });
+
+    let readyState = null;
+    let recoveredFromStalePm2 = null;
+
+    for (let attempt = 0; attempt < 2; attempt += 1) {
+      await connectPM2();
+
+      const existing = await getCCToolProcess();
+      if (existing && existing.pm2_env.status === 'online') {
+        if (recoveredFromStalePm2) {
+          readyState = {
+            ready: true,
+            process: existing,
+            degradedPortCheckIssue: getPortToolIssue()
+          };
+          break;
+        }
+
+        console.log(chalk.yellow('\n[WARN]  服务已在运行中\n'));
+        console.log(chalk.gray(`进程 ID: ${existing.pid}`));
+        console.log(chalk.gray(`运行时长: ${formatUptime(existing.pm2_env.pm_uptime)}`));
+        console.log(chalk.gray('\n使用 ') + chalk.cyan('ctx status') + chalk.gray(' 查看详细状态'));
+        console.log(chalk.gray('使用 ') + chalk.cyan('ctx restart') + chalk.gray(' 重启服务\n'));
         disconnectPM2();
-        process.exit(1);
+        return;
       }
 
-      console.log(chalk.green('\n[OK] Coding-Tool 服务已启动（后台运行）\n'));
-      console.log(chalk.gray(`Web UI: ${enableHttps ? 'https' : 'http'}://localhost:${port}`));
-      printPortToolIssue(readyState.degradedPortCheckIssue);
-      if (enableHost) {
-        console.log(chalk.yellow(`[WARN]  LAN 访问已启用 (${enableHttps ? 'https' : 'http'}://<your-ip>:${port})`));
+      const startResult = await attemptStartService(
+        buildStartOptions(port, enableHost, enableHttps),
+        port,
+        { allowPm2Refresh: attempt === 0 }
+      );
+
+      if (startResult.retry) {
+        recoveredFromStalePm2 = startResult.recoveredFromStalePm2 || recoveredFromStalePm2;
+        disconnectPM2();
+        continue;
       }
-      console.log(chalk.gray('\n可以安全关闭此终端窗口'));
-      console.log(chalk.gray('\n常用命令:'));
-      console.log(chalk.gray('  ') + chalk.cyan('ctx status') + chalk.gray('   - 查看服务状态'));
-      console.log(chalk.gray('  ') + chalk.cyan('ctx logs') + chalk.gray('      - 查看实时日志'));
-      console.log(chalk.gray('  ') + chalk.cyan('ctx stop') + chalk.gray('      - 停止服务\n'));
-
-      // 保存进程列表
-      pm2.dump((err) => {
+
+      if (!startResult.ok) {
+        readyState = startResult.readyState;
+        const statusText = readyState.process?.pm2_env?.status || 'unknown';
+        console.error(chalk.red('\n[ERROR] Coding-Tool 服务启动失败，进程未就绪\n'));
+        console.error(chalk.gray(`PM2 状态: ${statusText}`));
+        printPortToolIssue(readyState.degradedPortCheckIssue);
+        console.error(chalk.yellow('[TIP] 请使用 ctx logs ui 查看详细日志\n'));
+        await cleanupFailedStart();
         disconnectPM2();
-      });
-    });
+        process.exit(1);
+      }
+
+      readyState = startResult.readyState;
+      recoveredFromStalePm2 = startResult.recoveredFromStalePm2 || recoveredFromStalePm2;
+      break;
+    }
+
+    if (!readyState || !readyState.ready) {
+      console.error(chalk.red('\n[ERROR] Coding-Tool 服务启动失败，PM2 守护进程刷新后仍未恢复\n'));
+      disconnectPM2();
+      process.exit(1);
+    }
+
+    console.log(chalk.green('\n[OK] Coding-Tool 服务已启动（后台运行）\n'));
+    console.log(chalk.gray(`Web UI: ${enableHttps ? 'https' : 'http'}://localhost:${port}`));
+    if (recoveredFromStalePm2) {
+      console.log(chalk.green('[OK] 已自动修复旧 PM2 运行时路径残留'));
+    }
+    printPortToolIssue(readyState.degradedPortCheckIssue);
+    if (enableHost) {
+      console.log(chalk.yellow(`[WARN]  LAN 访问已启用 (${enableHttps ? 'https' : 'http'}://<your-ip>:${port})`));
+    }
+    console.log(chalk.gray('\n可以安全关闭此终端窗口'));
+    console.log(chalk.gray('\n常用命令:'));
+    console.log(chalk.gray('  ') + chalk.cyan('ctx status') + chalk.gray('   - 查看服务状态'));
+    console.log(chalk.gray('  ') + chalk.cyan('ctx logs') + chalk.gray('      - 查看实时日志'));
+    console.log(chalk.gray('  ') + chalk.cyan('ctx stop') + chalk.gray('      - 停止服务\n'));
+
+    await finalizePM2Session({ persist: true });
   } catch (error) {
     console.error(chalk.red('启动失败:'), error.message);
     disconnectPM2();
@@ -374,9 +593,7 @@ async function handleStop() {
     const stopResult = await stopAllManagedInstances(existing, config);
     printStopResult(stopResult);
 
-    pm2.dump(() => {
-      disconnectPM2();
-    });
+    await finalizePM2Session({ persist: true });
   } catch (error) {
     console.error(chalk.red('停止失败:'), error.message);
     disconnectPM2();
@@ -398,19 +615,9 @@ async function handleRestart() {
       return;
     }
 
-    pm2.restart(PM2_APP_NAME, (err) => {
-      if (err) {
-        console.error(chalk.red('\n[ERROR] 重启服务失败:'), err.message);
-        disconnectPM2();
-        process.exit(1);
-      }
-
-      console.log(chalk.green('\n[OK] Coding-Tool 服务已重启\n'));
-
-      pm2.dump((err) => {
-        disconnectPM2();
-      });
-    });
+    await restartPM2Process(PM2_APP_NAME);
+    console.log(chalk.green('\n[OK] Coding-Tool 服务已重启\n'));
+    await finalizePM2Session({ persist: true });
   } catch (error) {
     console.error(chalk.red('重启失败:'), error.message);
     disconnectPM2();
@@ -446,7 +653,6 @@ async function handleStatus() {
     }
 
     // 代理服务状态（从运行时文件检测）
-    const fs = require('fs');
     ensureStorageDirMigrated();
     const claudeActive = fs.existsSync(PATHS.activeChannel.claude);
     const codexActive = fs.existsSync(PATHS.activeChannel.codex);
@@ -516,6 +722,8 @@ module.exports = {
   handleRestart,
   handleStatus,
   _test: {
+    detectStalePm2RuntimeIssue,
+    extractMissingPm2ForkScriptPath,
     shouldTreatPortOwnershipAsReady,
     getManagedPorts,
     shouldStopPM2Process

package/src/config/channel-preset-websites.js

@@ -1,6 +1,7 @@
 const PRESET_WEBSITE_SOURCES = {
   claude: [
     { presetId: 'official', baseUrl: 'https://api.anthropic.com', websiteUrl: 'https://www.anthropic.com' },
+    { presetId: 'openai', baseUrl: 'https://api.openai.com/v1', websiteUrl: 'https://platform.openai.com' },
     { presetId: 'deepseek', baseUrl: 'https://api.deepseek.com/anthropic', websiteUrl: 'https://platform.deepseek.com' },
     { presetId: 'zhipu', baseUrl: 'https://open.bigmodel.cn/api/anthropic', websiteUrl: 'https://open.bigmodel.cn' },
     { presetId: 'kimi', baseUrl: 'https://api.moonshot.cn/anthropic', websiteUrl: 'https://platform.moonshot.cn' },

package/src/index.js

@@ -31,6 +31,12 @@ function getVersion() {
   return packageJson.version;
 }
 
+function finishCli(code = 0) {
+  eventBus.emitSync('cli:shutdown', {});
+  PluginManager.shutdownPlugins();
+  process.exit(code);
+}
+
 // 显示帮助信息
 function showHelp() {
   const version = getVersion();
@@ -156,19 +162,19 @@ async function main() {
 
     if (subCommand === 'start') {
       await handleStart();
-      return;
+      return finishCli(0);
     }
     if (subCommand === 'stop') {
       await handleStop();
-      return;
+      return finishCli(0);
     }
     if (subCommand === 'restart') {
       await handleRestart();
-      return;
+      return finishCli(0);
     }
     if (subCommand === 'status') {
       await handleStatus();
-      return;
+      return finishCli(0);
     }
     if (subCommand === 'logs') {
       const options = {};
@@ -213,25 +219,25 @@ async function main() {
   // start 命令 - 启动服务（后台）
   if (args[0] === 'start') {
     await handleStart();
-    return;
+    return finishCli(0);
   }
 
   // stop 命令 - 停止服务
   if (args[0] === 'stop') {
     await handleStop();
-    return;
+    return finishCli(0);
   }
 
   // restart 命令 - 重启服务
   if (args[0] === 'restart') {
     await handleRestart();
-    return;
+    return finishCli(0);
   }
 
   // status 命令 - 查看服务状态
   if (args[0] === 'status') {
     await handleStatus();
-    return;
+    return finishCli(0);
   }
 
   // ui 命令 - Web UI 管理
@@ -239,10 +245,13 @@ async function main() {
     const subCommand = args[1];
     if (subCommand === 'start') {
       await handleStart();  // UI start 实际上就是启动整个服务
+      return finishCli(0);
     } else if (subCommand === 'stop') {
       await handleStop();
+      return finishCli(0);
     } else if (subCommand === 'restart') {
       await handleRestart();
+      return finishCli(0);
     } else {
       // 默认前台运行
       const { handleUI } = require('./commands/ui');
@@ -670,9 +679,7 @@ async function main() {
 
       case 'exit':
         console.log('\n[BYE] 再见！\n');
-        eventBus.emitSync('cli:shutdown', {});
-        PluginManager.shutdownPlugins();
-        process.exit(0);
+        finishCli(0);
         break;
 
       default: