coding-tool-x 3.5.10 → 3.5.12

package/dist/web/index.html

@@ -4,15 +4,15 @@
     <meta charset="UTF-8">
     <link rel="icon" href="/favicon.ico">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>CC-TOOL - ClaudeCode增强工作助手</title>
-    <script type="module" crossorigin src="/assets/index-BnyNm74G.js"></script>
+    <title>coding-tool-x · AI 编程工作台</title>
+    <script type="module" crossorigin src="/assets/index-C5wcoiDy.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">
-    <link rel="modulepreload" crossorigin href="/assets/icons-lKCTySl7.js">
+    <link rel="modulepreload" crossorigin href="/assets/icons-QFXzEgqM.js">
     <link rel="modulepreload" crossorigin href="/assets/vendors-DQA4Hw9v.js">
     <link rel="stylesheet" crossorigin href="/assets/markdown-BfC0goYb.css">
-    <link rel="stylesheet" crossorigin href="/assets/index-BS7aplYp.css">
+    <link rel="stylesheet" crossorigin href="/assets/index-DfikIh5S.css">
   </head>
   <body>
     <div id="app"></div>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coding-tool-x",
-  "version": "3.5.10",
+  "version": "3.5.12",
   "description": "Vibe Coding 增强工作助手 - 智能会话管理、动态渠道切换、全局搜索、实时监控",
   "main": "src/index.js",
   "bin": {
@@ -19,6 +19,7 @@
     "test:windows": "node scripts/test-windows-regression.js",
     "benchmark:codex": "node scripts/benchmark-codex-loading.js",
     "build:web": "cd src/web && npm run build",
+    "prepack": "npm run build:web",
     "dev:web": "cd src/web && npm run dev",
     "dev:server": "nodemon"
   },

package/src/commands/daemon.js

@@ -281,10 +281,14 @@ async function handleStart() {
 
     // 检查是否启用 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 进程
@@ -335,10 +339,10 @@ async function handleStart() {
       }
 
       console.log(chalk.green('\n[OK] Coding-Tool 服务已启动（后台运行）\n'));
-      console.log(chalk.gray(`Web UI: http://localhost:${port}`));
+      console.log(chalk.gray(`Web UI: ${enableHttps ? 'https' : 'http'}://localhost:${port}`));
       printPortToolIssue(readyState.degradedPortCheckIssue);
       if (enableHost) {
-        console.log(chalk.yellow(`[WARN]  LAN 访问已启用 (http://<your-ip>:${port})`));
+        console.log(chalk.yellow(`[WARN]  LAN 访问已启用 (${enableHttps ? 'https' : 'http'}://<your-ip>:${port})`));
       }
       console.log(chalk.gray('\n可以安全关闭此终端窗口'));
       console.log(chalk.gray('\n常用命令:'));

package/src/commands/ui.js

@@ -10,7 +10,9 @@ async function handleUI() {
 
   // 检查是否启用 LAN 访问 (--host 标志)
   const enableHost = process.argv.includes('--host');
+  const enableHttps = process.argv.includes('--https');
   const host = enableHost ? '0.0.0.0' : '127.0.0.1';
+  const protocol = enableHttps ? 'https' : 'http';
 
   if (!isDaemon) {
     console.clear();
@@ -18,15 +20,18 @@ async function handleUI() {
     if (enableHost) {
       console.log(chalk.yellow('[WARN]  LAN 访问已启用 (--host)\n'));
     }
+    if (enableHttps) {
+      console.log(chalk.yellow('[LOCK] 已启用本地 HTTPS 模式 (--https)\n'));
+    }
   }
 
   // 从配置加载端口
   const config = loadConfig();
   const port = config.ports?.webUI || 19999;
-  const url = `http://localhost:${port}`;
+  const url = `${protocol}://localhost:${port}`;
 
   try {
-    await startServer(port, host);
+    await startServer(port, host, { useHttps: enableHttps });
 
     // 自动打开浏览器（仅非 daemon 模式）
     if (!isDaemon) {
@@ -87,7 +92,7 @@ async function handleUI() {
       console.log(chalk.gray('按 Ctrl+C 停止服务器'));
     } else {
       // Daemon 模式：保持运行
-      console.log(chalk.green(`[OK] Coding-Tool 服务已在后台启动 (端口: ${port})`));
+      console.log(chalk.green(`[OK] Coding-Tool 服务已在后台启动 (${protocol.toUpperCase()} 端口: ${port})`));
     }
 
   } catch (error) {

package/src/index.js

@@ -45,8 +45,10 @@ function showHelp() {
 
   console.log(chalk.yellow('[UI] UI 管理:'));
   console.log('  ctx ui                  前台启动 Web UI（仅本地访问）');
+  console.log('  ctx ui --https          前台启动 Web UI（本地 HTTPS）');
   console.log('  ctx ui --host           前台启动 Web UI（允许 LAN 访问）');
   console.log('  ctx ui start            后台启动 Web UI');
+  console.log('  ctx ui start --https    后台启动 Web UI（本地 HTTPS）');
   console.log('  ctx ui start --host     后台启动 Web UI（允许 LAN 访问）');
   console.log('  ctx ui stop             停止 Web UI');
   console.log('  ctx ui restart          重启 Web UI\n');

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

@@ -201,6 +201,10 @@ module.exports = (config) => {
       res.json(channel);
       broadcastSchedulerState('codex', getSchedulerState('codex'));
     } catch (err) {
+      if (err?.message === 'Channel not found') {
+        console.warn(`[Codex Channels API] Ignored update for missing channel: ${req.params.channelId}`);
+        return res.status(404).json({ error: 'Channel not found' });
+      }
       console.error('[Codex Channels API] Failed to update channel:', err);
       res.status(500).json({ error: err.message });
     }

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

@@ -61,6 +61,31 @@ function resolveActiveChannel(channels, activeChannelId = null) {
     || null;
 }
 
+function recoverChannelAfterMissingUpdate(previousChannel) {
+  const { channels } = getChannels();
+  const allChannels = Array.isArray(channels) ? channels : [];
+  const enabledChannels = allChannels.filter(channel => channel.enabled !== false);
+
+  const previousProviderKey = String(previousChannel?.providerKey || '').trim();
+  if (previousProviderKey) {
+    const sameProvider = enabledChannels.find(channel => channel.providerKey === previousProviderKey);
+    if (sameProvider) {
+      return sameProvider;
+    }
+  }
+
+  if (allChannels.length > 0) {
+    return resolveActiveChannel(allChannels, null);
+  }
+
+  const refreshedEnabledChannels = getEnabledChannels();
+  if (Array.isArray(refreshedEnabledChannels) && refreshedEnabledChannels.length > 0) {
+    return refreshedEnabledChannels[0];
+  }
+
+  return null;
+}
+
 // 保存激活渠道ID
 function saveActiveChannelId(channelId) {
   ensureStorageDirMigrated();
@@ -149,7 +174,23 @@ router.post('/start', async (req, res) => {
       });
     }
 
-    currentChannel = markChannelAsRecentlyUsed(currentChannel.id);
+    try {
+      currentChannel = markChannelAsRecentlyUsed(currentChannel.id) || currentChannel;
+    } catch (error) {
+      if (error?.message !== 'Channel not found') {
+        throw error;
+      }
+
+      const recoveredChannel = recoverChannelAfterMissingUpdate(currentChannel);
+      if (!recoveredChannel) {
+        return res.status(400).json({
+          error: 'No enabled Codex channel found. Please create and enable a channel first.'
+        });
+      }
+
+      currentChannel = recoveredChannel;
+      console.warn(`[Codex Proxy] Active channel disappeared before startup, falling back to ${currentChannel.name} (${currentChannel.id})`);
+    }
 
     // 3. 保存当前激活渠道ID（用于代理模式）
     saveActiveChannelId(currentChannel.id);

package/src/server/api/hooks.js

@@ -1,7 +1,7 @@
 const express = require('express');
 const router = express.Router();
 const notificationHooks = require('../services/notification-hooks');
-const { createSameOriginGuard } = require('../services/network-access');
+const { createSameOriginGuard, isLoopbackRequest } = require('../services/network-access');
 
 router.use(createSameOriginGuard({
   message: '禁止跨站访问通知配置接口'
@@ -42,4 +42,21 @@ router.post('/test', async (req, res) => {
   }
 });
 
+router.post('/browser-event', (req, res) => {
+  if (!isLoopbackRequest(req)) {
+    return res.status(403).json({ error: '仅允许本机通知脚本访问浏览器通知接口' });
+  }
+
+  try {
+    const payload = notificationHooks.emitBrowserNotification(req.body || {});
+    res.json({
+      success: true,
+      notification: payload
+    });
+  } catch (error) {
+    console.error('Error dispatching browser notification event:', error);
+    res.status(error.statusCode || 500).json({ error: error.message });
+  }
+});
+
 module.exports = router;

package/src/server/codex-proxy-server.js

@@ -14,7 +14,12 @@ const { createDecodedStream } = require('./services/response-decoder');
 const { getEffectiveApiKey } = require('./services/codex-channels');
 const { persistProxyRequestSnapshot } = require('./services/request-logger');
 const { publishUsageLog, publishFailureLog } = require('./services/proxy-log-helper');
-const { redirectModel, resolveTargetUrl } = require('./services/base/proxy-utils');
+const {
+  redirectModel,
+  resolveTargetUrl,
+  isChatCompletionsPath,
+  ensureOpenAiStreamUsage
+} = require('./services/base/proxy-utils');
 const { parseSSEUsage, parseNonStreamingUsage, mergeUsageIntoTokenData, createTokenData } = require('./services/base/response-usage-parser');
 const { attachServerShutdownHandling, expediteServerShutdown } = require('./services/server-shutdown');
 
@@ -139,9 +144,10 @@ async function startCodexProxyServer(options = {}) {
       const requestId = `codex-${Date.now()}-${Math.random()}`;
       requestMetadata.set(req, {
         id: requestId,
-      channel: activeChannel.name,
-      channelId: activeChannel.id,
-      startTime: Date.now()
+        channel: activeChannel.name,
+        channelId: activeChannel.id,
+        startTime: Date.now(),
+        requestModel: req.body?.model || ''
       });
 
       proxyReq.removeHeader('authorization');
@@ -216,6 +222,8 @@ async function startCodexProxyServer(options = {}) {
           }
         });
 
+        let bodyMutated = false;
+
         // 应用模型重定向（当 proxy 开启时）
         if (req.body && req.body.model) {
           const originalModel = req.body.model;
@@ -223,14 +231,14 @@ async function startCodexProxyServer(options = {}) {
 
           if (redirectedModel !== originalModel) {
             req.body.model = redirectedModel;
-            // 更新 rawBody 以匹配修改后的 body
-            req.rawBody = Buffer.from(JSON.stringify(req.body));
+            bodyMutated = true;
 
             // 将原始模型和重定向模型存入 metadata，用于日志记录
             const meta = requestMetadata.get(req);
             if (meta) {
               meta.originalModel = originalModel;
               meta.redirectedModel = redirectedModel;
+              meta.requestModel = redirectedModel;
             }
 
             // 只在重定向规则变化时打印日志（避免每次请求都打印）
@@ -243,6 +251,14 @@ async function startCodexProxyServer(options = {}) {
           }
         }
 
+        if (shouldParseJson(req) && isChatCompletionsPath(req.url) && ensureOpenAiStreamUsage(req.body)) {
+          bodyMutated = true;
+        }
+
+        if (bodyMutated) {
+          req.rawBody = Buffer.from(JSON.stringify(req.body));
+        }
+
         const target = resolveCodexTarget(channel.baseUrl, req.url);
 
         proxy.web(req, res, {

package/src/server/gemini-proxy-server.js

@@ -131,7 +131,8 @@ async function startGeminiProxyServer(options = {}) {
         channel: activeChannel.name,
         channelId: activeChannel.id,
         startTime: Date.now(),
-        modelFromUrl
+        modelFromUrl,
+        requestModel: modelFromUrl
       });
 
       proxyReq.removeHeader('authorization');
@@ -214,6 +215,7 @@ async function startGeminiProxyServer(options = {}) {
               meta.originalModel = originalModel;
               meta.redirectedModel = redirectedModel;
               meta.modelFromUrl = redirectedModel;
+              meta.requestModel = redirectedModel;
             }
 
             // 只在重定向规则变化时打印日志（避免每次请求都打印）

package/src/server/index.js

@@ -1,3 +1,5 @@
+const http = require('http');
+const https = require('https');
 const express = require('express');
 const path = require('path');
 const chalk = require('chalk');
@@ -23,6 +25,8 @@ const { startGeminiProxyServer } = require('./gemini-proxy-server');
 const { startOpenCodeProxyServer, collectProxyModelList } = require('./opencode-proxy-server');
 const { createRemoteMutationGuard } = require('./services/network-access');
 const { createApiRequestLogger } = require('./services/request-logger');
+const { inspectWebBuildState, ensureWebDistReady } = require('./services/web-build');
+const { ensureHttpsCredentials } = require('./services/https-cert');
 
 function getInquirer() {
   return require('inquirer');
@@ -130,7 +134,21 @@ async function startServer(port, host = '127.0.0.1', options = {}) {
     console.log(chalk.green('[v] 端口已释放\n'));
   }
 
+  const webBuildState = inspectWebBuildState();
+  if (webBuildState.needsBuild) {
+    const reasonText = webBuildState.reason === 'dist-missing'
+      ? '缺少 Web UI 静态资源'
+      : '检测到 Web UI 静态资源已过期';
+    console.log(chalk.cyan(`[BUILD] ${reasonText}，正在重新构建...`));
+
+    const buildResult = await ensureWebDistReady({ state: webBuildState });
+    if (buildResult.built) {
+      console.log(chalk.green('[OK] Web UI 静态资源已更新\n'));
+    }
+  }
+
   const app = express();
+  const useHttps = options.useHttps === true || process.argv.includes('--https');
   const lanMode = host === '0.0.0.0';
   const allowRemoteMutation = process.env.CC_TOOL_ALLOW_REMOTE_WRITE === 'true';
 
@@ -245,7 +263,15 @@ async function startServer(port, host = '127.0.0.1', options = {}) {
   }
 
   // Start server（确保监听成功后才返回，避免命令误报“已启动”）
-  const server = app.listen(port, host);
+  let server;
+  if (useHttps) {
+    const httpsCredentials = ensureHttpsCredentials();
+    server = https.createServer(httpsCredentials, app);
+    server.listen(port, host);
+  } else {
+    server = http.createServer(app);
+    server.listen(port, host);
+  }
   await new Promise((resolve) => {
     const onListening = () => {
       server.off('error', onError);
@@ -270,17 +296,23 @@ async function startServer(port, host = '127.0.0.1', options = {}) {
   });
 
   console.log(`\n[START] Coding-Tool Web UI running at:`);
+  const protocol = useHttps ? 'https' : 'http';
+  const wsProtocol = useHttps ? 'wss' : 'ws';
   if (host === '0.0.0.0') {
     console.log(chalk.yellow(`   [WARN]  警告: 服务正在监听所有网络接口 (LAN 可访问)`));
-    console.log(`   http://localhost:${port}`);
-    console.log(chalk.gray(`   http://<your-ip>:${port} (LAN 访问)`));
+    console.log(`   ${protocol}://localhost:${port}`);
+    console.log(chalk.gray(`   ${protocol}://<your-ip>:${port} (LAN 访问)`));
   } else {
-    console.log(`   http://localhost:${port}`);
+    console.log(`   ${protocol}://localhost:${port}`);
   }
 
   // 附加 WebSocket 服务器到同一个端口
   attachWebSocketServer(server, { host });
-  console.log(`   ws://localhost:${port}/ws\n`);
+  console.log(`   ${wsProtocol}://localhost:${port}/ws\n`);
+
+  if (useHttps) {
+    console.log(chalk.gray('   [TIP] 首次访问自签名证书时，浏览器可能会提示手动信任本地证书'));
+  }
 
   if (host === '0.0.0.0' && !allowRemoteMutation) {
     console.log(chalk.yellow('   [LOCK] 已启用 LAN 安全保护：远程写操作默认禁用'));

package/src/server/opencode-proxy-server.js

@@ -21,7 +21,11 @@ const { getEnabledChannels, getEffectiveApiKey } = require('./services/opencode-
 const { persistProxyRequestSnapshot, loadClaudeRequestTemplate } = require('./services/request-logger');
 const { probeModelAvailability, fetchModelsFromProvider } = require('./services/model-detector');
 const { publishUsageLog, publishFailureLog } = require('./services/proxy-log-helper');
-const { redirectModel, resolveTargetUrl } = require('./services/base/proxy-utils');
+const {
+  redirectModel,
+  resolveTargetUrl,
+  ensureOpenAiStreamUsage
+} = require('./services/base/proxy-utils');
 const { parseSSEUsage, parseNonStreamingUsage, mergeUsageIntoTokenData, createTokenData } = require('./services/base/response-usage-parser');
 const { attachServerShutdownHandling, expediteServerShutdown } = require('./services/server-shutdown');
 
@@ -1932,6 +1936,8 @@ function publishOpenCodeUsageLog({ requestId, channel, model, usage, startTime }
     tokens: {
       input: Number(usage?.input_tokens || usage?.prompt_tokens || 0),
       output: Number(usage?.output_tokens || usage?.completion_tokens || 0),
+      cacheCreation: Number(usage?.cache_creation_input_tokens || 0),
+      cacheRead: Number(usage?.cache_read_input_tokens || 0),
       cached: Number(usage?.input_tokens_details?.cached_tokens || 0),
       reasoning: Number(usage?.output_tokens_details?.reasoning_tokens || 0),
       total: Number(usage?.total_tokens || 0)
@@ -3064,6 +3070,7 @@ async function handleClaudeGatewayRequest(req, res, channel, effectiveKey) {
   }
 
   const chatResponseObject = buildOpenAiChatCompletionsObject(parsedBody, originalPayload.model);
+  const loggingUsage = buildOpenAiResponsesObject(parsedBody, originalPayload.model).usage;
   if (wantsStream) {
     sendChatCompletionsSse(res, chatResponseObject);
   } else {
@@ -3073,7 +3080,7 @@ async function handleClaudeGatewayRequest(req, res, channel, effectiveKey) {
     requestId,
     channel,
     model: chatResponseObject.model,
-    usage: chatResponseObject.usage,
+    usage: loggingUsage,
     startTime
   });
   recordSuccess(channel.id, 'opencode');
@@ -4114,6 +4121,7 @@ async function handleGeminiGatewayRequest(req, res, channel, effectiveKey) {
   }
 
   const chatResponseObject = buildOpenAiChatCompletionsObjectFromGemini(parsedBody, targetModel);
+  const loggingUsage = buildOpenAiResponsesObjectFromGemini(parsedBody, targetModel).usage;
   if (wantsStream) {
     sendChatCompletionsSse(res, chatResponseObject);
   } else {
@@ -4123,7 +4131,7 @@ async function handleGeminiGatewayRequest(req, res, channel, effectiveKey) {
     requestId,
     channel,
     model: chatResponseObject.model,
-    usage: chatResponseObject.usage,
+    usage: loggingUsage,
     startTime
   });
   recordSuccess(channel.id, 'opencode');
@@ -4224,9 +4232,10 @@ async function startOpenCodeProxyServer(options = {}) {
       const requestId = `opencode-${Date.now()}-${Math.random()}`;
       requestMetadata.set(req, {
         id: requestId,
-      channel: activeChannel.name,
-      channelId: activeChannel.id,
-      startTime: Date.now()
+        channel: activeChannel.name,
+        channelId: activeChannel.id,
+        startTime: Date.now(),
+        requestModel: req.body?.model || ''
       });
 
       proxyReq.removeHeader('authorization');
@@ -4313,6 +4322,8 @@ async function startOpenCodeProxyServer(options = {}) {
           }
         });
 
+        let bodyMutated = false;
+
         // 应用模型重定向（当 proxy 开启时）
         if (req.body && typeof req.body === 'object' && !Array.isArray(req.body) && req.body.model) {
           const originalModel = req.body.model;
@@ -4320,14 +4331,14 @@ async function startOpenCodeProxyServer(options = {}) {
 
           if (redirectedModel !== originalModel) {
             req.body.model = redirectedModel;
-            // 更新 rawBody 以匹配修改后的 body
-            req.rawBody = Buffer.from(JSON.stringify(req.body));
+            bodyMutated = true;
 
             // 将原始模型和重定向模型存入 metadata，用于日志记录
             const meta = requestMetadata.get(req);
             if (meta) {
               meta.originalModel = originalModel;
               meta.redirectedModel = redirectedModel;
+              meta.requestModel = redirectedModel;
             }
 
             // 只在重定向规则变化时打印日志（避免每次请求都打印）
@@ -4340,6 +4351,14 @@ async function startOpenCodeProxyServer(options = {}) {
           }
         }
 
+        if (shouldParseJson(req) && isChatCompletionsPath(req.url) && ensureOpenAiStreamUsage(req.body)) {
+          bodyMutated = true;
+        }
+
+        if (bodyMutated) {
+          req.rawBody = Buffer.from(JSON.stringify(req.body));
+        }
+
         const release = (() => {
           let released = false;
           return () => {

package/src/server/proxy-server.js

@@ -204,7 +204,8 @@ async function startProxyServer(options = {}) {
           channel: selectedChannel.name,
           channelId: selectedChannel.id,
           startTime: Date.now(),
-          sessionId: req.sessionId || null
+          sessionId: req.sessionId || null,
+          requestModel: req.body?.model || ''
         });
 
         proxyReq.removeHeader('x-api-key');
@@ -300,6 +301,7 @@ async function startProxyServer(options = {}) {
             if (meta) {
               meta.originalModel = originalModel;
               meta.redirectedModel = redirectedModel;
+              meta.requestModel = redirectedModel;
             }
 
             // 只在重定向规则变化时打印日志（避免每次请求都打印）

package/src/server/services/base/proxy-utils.js

@@ -120,6 +120,45 @@ function normalizeNumber(value, defaultValue, max = null) {
   return num;
 }
 
+/**
+ * 判断请求路径是否为 OpenAI Chat Completions。
+ * @param {string} requestPath
+ * @returns {boolean}
+ */
+function isChatCompletionsPath(requestPath = '') {
+  const normalized = String(requestPath || '').trim().toLowerCase();
+  return normalized.includes('/chat/completions');
+}
+
+/**
+ * 为流式 Chat Completions 请求补齐 usage 输出，方便统计真实 token。
+ * @param {object} body
+ * @returns {boolean} 是否发生了修改
+ */
+function ensureOpenAiStreamUsage(body) {
+  if (!body || typeof body !== 'object' || Array.isArray(body)) {
+    return false;
+  }
+
+  if (body.stream !== true) {
+    return false;
+  }
+
+  const current = body.stream_options && typeof body.stream_options === 'object' && !Array.isArray(body.stream_options)
+    ? body.stream_options
+    : {};
+
+  if (current.include_usage === true) {
+    return false;
+  }
+
+  body.stream_options = {
+    ...current,
+    include_usage: true
+  };
+  return true;
+}
+
 /**
  * 记录模型重定向日志（避免重复打印）
  * @param {Map} cache - 重定向缓存 Map
@@ -148,5 +187,7 @@ module.exports = {
   resolveTargetUrl,
   normalizeGatewaySourceType,
   normalizeNumber,
+  isChatCompletionsPath,
+  ensureOpenAiStreamUsage,
   logModelRedirect,
 };