coding-tool-x 3.5.14 → 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-Bvdezm5-.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.14",
+  "version": "3.6.0",
   "description": "Vibe Coding 增强工作助手 - 智能会话管理、动态渠道切换、全局搜索、实时监控",
   "main": "src/index.js",
   "bin": {

package/src/commands/daemon.js

@@ -85,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 进程
  */
@@ -169,6 +181,41 @@ function updatePM2Daemon() {
   });
 }
 
+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;
@@ -432,10 +479,9 @@ async function attemptStartService(startOptions, port, options = {}) {
 
 function cleanupFailedStart() {
   return new Promise((resolve) => {
-    pm2.delete(PM2_APP_NAME, () => {
-      pm2.dump(() => {
-        resolve();
-      });
+    pm2.delete(PM2_APP_NAME, async () => {
+      await finalizePM2Session({ persist: true });
+      resolve();
     });
   });
 }
@@ -527,9 +573,7 @@ async function handleStart() {
     console.log(chalk.gray('  ') + chalk.cyan('ctx logs') + chalk.gray('      - 查看实时日志'));
     console.log(chalk.gray('  ') + chalk.cyan('ctx stop') + chalk.gray('      - 停止服务\n'));
 
-    pm2.dump(() => {
-      disconnectPM2();
-    });
+    await finalizePM2Session({ persist: true });
   } catch (error) {
     console.error(chalk.red('启动失败:'), error.message);
     disconnectPM2();
@@ -549,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();
@@ -573,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();

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:

package/src/server/api/codex-channels.js

@@ -134,7 +134,6 @@ module.exports = (config) => {
         providerKey,
         baseUrl,
         apiKey,
-        requiresOpenaiAuth,
         websiteUrl,
         enabled,
         weight,
@@ -149,7 +148,7 @@ module.exports = (config) => {
         return res.status(400).json({ error: 'Missing required fields: name, providerKey, baseUrl' });
       }
 
-      if (!apiKey && requiresOpenaiAuth !== true) {
+      if (!apiKey) {
         return res.status(400).json({ error: 'Missing required fields: apiKey' });
       }
 
@@ -159,7 +158,7 @@ module.exports = (config) => {
       }
 
       // wireApi 固定为 'responses' (OpenAI Responses API 格式)
-      const channel = createChannel(name, providerKey, baseUrl, requiresOpenaiAuth === true ? '' : apiKey, 'responses', {
+      const channel = createChannel(name, providerKey, baseUrl, apiKey, 'responses', {
         websiteUrl,
         enabled,
         weight,
@@ -168,7 +167,7 @@ module.exports = (config) => {
         speedTestModel: speedTestModel || null,
         presetId: presetId || null,
         gatewaySourceType,
-        requiresOpenaiAuth: requiresOpenaiAuth === true
+        requiresOpenaiAuth: false
       });
       res.json(channel);
       broadcastSchedulerState('codex', getSchedulerState('codex'));
@@ -191,9 +190,6 @@ module.exports = (config) => {
       const { channelId } = req.params;
       const updates = req.body;
       const currentChannel = getChannels().channels.find(channel => channel.id === channelId) || null;
-      const finalRequiresOpenaiAuth = Object.prototype.hasOwnProperty.call(updates, 'requiresOpenaiAuth')
-        ? updates.requiresOpenaiAuth === true
-        : currentChannel?.requiresOpenaiAuth === true;
       const finalApiKey = Object.prototype.hasOwnProperty.call(updates, 'apiKey')
         ? updates.apiKey
         : currentChannel?.apiKey;
@@ -204,15 +200,10 @@ module.exports = (config) => {
         }
       }
       if (currentChannel) {
-        if (!finalRequiresOpenaiAuth && !finalApiKey) {
+        if (!finalApiKey) {
           return res.status(400).json({ error: 'Missing required fields: apiKey' });
         }
-        if (Object.prototype.hasOwnProperty.call(updates, 'requiresOpenaiAuth')) {
-          updates.requiresOpenaiAuth = finalRequiresOpenaiAuth;
-        }
-        if (finalRequiresOpenaiAuth) {
-          updates.apiKey = '';
-        }
+        updates.requiresOpenaiAuth = false;
       }
 
       const channel = updateChannel(channelId, updates);

package/src/server/services/codex-channels.js

@@ -34,8 +34,8 @@ function resolveCurrentManagedChannel(channels = []) {
   return allChannels.find(ch => ch.enabled !== false) || null;
 }
 
-function channelRequiresOpenaiAuth(channel) {
-  return channel?.requiresOpenaiAuth === true;
+function channelRequiresOpenaiAuth() {
+  return false;
 }
 
 function buildManagedCodexEnvMap(channels = [], { includeProxyKey = false, activeChannel = null } = {}) {
@@ -150,7 +150,7 @@ class CodexChannelService extends BaseChannelService {
     ch.speedTestModel = ch.speedTestModel || null;
     ch.modelRedirects = Array.isArray(ch.modelRedirects) ? ch.modelRedirects : [];
     ch.gatewaySourceType = ch.gatewaySourceType || 'codex';
-    ch.requiresOpenaiAuth = ch.requiresOpenaiAuth === true;
+    ch.requiresOpenaiAuth = false;
     ch.queryParams = ch.queryParams || {};
     return ch;
   }

package/src/server/services/proxy-log-helper.js

@@ -135,10 +135,14 @@ function buildFailureLogPayload({
   stage,
   timestamp = Date.now()
 }) {
-  const errorMessage = String(
+  const rawErrorMessage = String(
     error?.message
-    || message
     || error
+    || ''
+  ).trim();
+  const displayMessage = String(
+    message
+    || rawErrorMessage
     || 'Request failed'
   );
 
@@ -149,8 +153,9 @@ function buildFailureLogPayload({
     time: formatRealtimeTime(timestamp),
     channel: channel || 'Unknown',
     model: model || '',
-    message: errorMessage,
-    error: errorMessage,
+    message: displayMessage,
+    error: displayMessage,
+    rawError: rawErrorMessage || undefined,
     statusCode: Number.isFinite(Number(statusCode)) ? Number(statusCode) : null,
     stage: stage || 'proxy',
     inputTokens: 0,