coding-tool-x 3.5.1 → 3.5.2

package/package.json

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

package/src/commands/daemon.js

@@ -3,7 +3,13 @@ const path = require('path');
 const chalk = require('chalk');
 const { loadConfig } = require('../config/loader');
 const { PATHS, ensureStorageDirMigrated } = require('../config/paths');
-const { findProcessByPort, getPortToolIssue, formatPortToolIssue } = require('../utils/port-helper');
+const {
+  findProcessByPort,
+  killProcessByPort,
+  waitForPortRelease,
+  getPortToolIssue,
+  formatPortToolIssue
+} = require('../utils/port-helper');
 
 const PM2_APP_NAME = 'cc-tool';
 
@@ -83,6 +89,50 @@ function shouldTreatPortOwnershipAsReady(ownsPort) {
   return ownsPort === true || ownsPort === null;
 }
 
+function getManagedPorts(config = loadConfig()) {
+  return [
+    config.ports?.webUI || 19999,
+    config.ports?.proxy || 20088,
+    config.ports?.codexProxy || 20089,
+    config.ports?.geminiProxy || 20090,
+    config.ports?.opencodeProxy || 20091
+  ].filter((port, index, list) => Number.isInteger(port) && port > 0 && list.indexOf(port) === index);
+}
+
+async function cleanupManagedPorts(config = loadConfig(), options = {}) {
+  const timeoutMs = Number.isFinite(options.timeoutMs) ? options.timeoutMs : 3000;
+  const ports = getManagedPorts(config);
+  const released = [];
+  const forced = [];
+  const stillInUse = [];
+
+  for (const port of ports) {
+    if (await waitForPortRelease(port, timeoutMs)) {
+      released.push(port);
+      continue;
+    }
+
+    const killed = killProcessByPort(port);
+    if (killed) {
+      forced.push(port);
+      if (await waitForPortRelease(port, timeoutMs)) {
+        released.push(port);
+        continue;
+      }
+    }
+
+    stillInUse.push(port);
+  }
+
+  return {
+    ports,
+    released,
+    forced,
+    stillInUse,
+    toolIssue: getPortToolIssue()
+  };
+}
+
 async function waitForServiceReady(port, timeoutMs = 15000, intervalMs = 500) {
   const startAt = Date.now();
   let lastProcess = null;
@@ -232,10 +282,21 @@ async function handleStart() {
 async function handleStop() {
   try {
     await connectPM2();
+    const config = loadConfig();
 
     const existing = await getCCToolProcess();
     if (!existing) {
+      const cleanup = await cleanupManagedPorts(config, { timeoutMs: 3000 });
       console.log(chalk.yellow('\n[WARN]  服务未在运行\n'));
+
+      if (cleanup.forced.length > 0) {
+        console.log(chalk.yellow(`[WARN]  已额外清理残留端口: ${cleanup.forced.join(', ')}`));
+      }
+      if (cleanup.stillInUse.length > 0) {
+        console.log(chalk.red(`[ERROR] 以下端口仍被占用: ${cleanup.stillInUse.join(', ')}`));
+        printPortToolIssue(cleanup.toolIssue);
+        console.log(chalk.yellow('[TIP] 请检查是否有外部进程仍占用这些端口\n'));
+      }
       disconnectPM2();
       return;
     }
@@ -248,11 +309,21 @@ async function handleStop() {
       }
 
       // 删除进程
-      pm2.delete(PM2_APP_NAME, (err) => {
+      pm2.delete(PM2_APP_NAME, async (err) => {
         if (err) {
           console.error(chalk.red('删除进程失败:'), err.message);
         } else {
+          const cleanup = await cleanupManagedPorts(config, { timeoutMs: 3000 });
           console.log(chalk.green('\n[OK] Coding-Tool 服务已停止\n'));
+
+          if (cleanup.forced.length > 0) {
+            console.log(chalk.yellow(`[WARN]  已额外清理残留端口: ${cleanup.forced.join(', ')}`));
+          }
+          if (cleanup.stillInUse.length > 0) {
+            console.log(chalk.red(`[ERROR] 以下端口仍被占用: ${cleanup.stillInUse.join(', ')}`));
+            printPortToolIssue(cleanup.toolIssue);
+            console.log(chalk.yellow('[TIP] 请检查是否有外部进程仍占用这些端口\n'));
+          }
         }
 
         pm2.dump((err) => {
@@ -399,6 +470,7 @@ module.exports = {
   handleRestart,
   handleStatus,
   _test: {
-    shouldTreatPortOwnershipAsReady
+    shouldTreatPortOwnershipAsReady,
+    getManagedPorts
   }
 };

package/src/server/services/codex-settings-manager.js

@@ -37,6 +37,33 @@ function hasBackup() {
   return fs.existsSync(getConfigBackupPath()) || fs.existsSync(getAuthBackupPath());
 }
 
+function isRecoverableEnvSyncError(err) {
+  const message = String(err?.message || '');
+  return err?.code === 'ETIMEDOUT' ||
+    /timed out|spawnSync (?:powershell|pwsh)|No PowerShell executable available/i.test(message);
+}
+
+function trySyncCodexUserEnvironment(envMap, options) {
+  try {
+    return {
+      success: true,
+      result: syncCodexUserEnvironment(envMap, options),
+      warning: null
+    };
+  } catch (err) {
+    if (!isRecoverableEnvSyncError(err)) {
+      throw err;
+    }
+
+    console.warn(`[Codex Settings] 跳过持久化环境变量同步: ${err.message}`);
+    return {
+      success: false,
+      result: null,
+      warning: err.message
+    };
+  }
+}
+
 
 // 读取 config.toml
 function readConfig() {
@@ -191,7 +218,7 @@ function restoreSettings() {
       fs.unlinkSync(getAuthBackupPath());
     }
 
-    syncCodexUserEnvironment({}, {
+    const envSync = trySyncCodexUserEnvironment({}, {
       replace: false,
       removeKeys: ['CC_PROXY_KEY']
     });
@@ -200,7 +227,11 @@ function restoreSettings() {
     delete process.env.CC_PROXY_KEY;
 
     console.log('Codex settings restored from backup');
-    return { success: true };
+    const result = { success: true };
+    if (envSync.warning) {
+      result.envSyncWarning = envSync.warning;
+    }
+    return result;
   } catch (err) {
     throw new Error('Failed to restore settings: ' + err.message);
   }
@@ -246,22 +277,27 @@ function setProxyConfig(proxyPort) {
     // 直接设置 process.env 确保从本进程派生的 Codex CLI 能读到 CC_PROXY_KEY
     process.env.CC_PROXY_KEY = 'PROXY_KEY';
 
-    const envResult = syncCodexUserEnvironment({
+    const envSync = trySyncCodexUserEnvironment({
       CC_PROXY_KEY: 'PROXY_KEY'
     }, {
       replace: false
     });
+    const envResult = envSync.result;
 
     console.log(`Codex settings updated to use proxy on port ${proxyPort}`);
-    return {
+    const result = {
       success: true,
       port: proxyPort,
-      envInjected: true,
-      isFirstTime: envResult.isFirstTime,
-      shellConfigPath: envResult.shellConfigPath,
-      sourceCommand: envResult.sourceCommand,
-      reloadRequired: envResult.reloadRequired
+      envInjected: envSync.success,
+      isFirstTime: envResult?.isFirstTime || false,
+      shellConfigPath: envResult?.shellConfigPath || null,
+      sourceCommand: envResult?.sourceCommand || null,
+      reloadRequired: envResult?.reloadRequired || false
     };
+    if (envSync.warning) {
+      result.envSyncWarning = envSync.warning;
+    }
+    return result;
   } catch (err) {
     throw new Error('Failed to set proxy config: ' + err.message);
   }
@@ -335,4 +371,7 @@ module.exports = {
   setProxyConfig,
   isProxyConfig,
   getCurrentProxyPort,
+  _test: {
+    isRecoverableEnvSyncError
+  }
 };