coding-tool-x 3.5.4 → 3.5.6

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

@@ -10,6 +10,7 @@ const ALL_SESSIONS_CACHE_TTL_MS = 20 * 1000;
 const PROJECTS_CACHE_TTL_MS = 300 * 1000;
 const PROJECT_SESSIONS_CACHE_TTL_MS = 120 * 1000;
 const FAST_META_READ_BYTES = 64 * 1024;
+const MAX_SESSION_META_SUMMARY_CACHE_ENTRIES = 5000;
 const EMPTY_COUNTS = Object.freeze({ projectCount: 0, sessionCount: 0 });
 
 let countsCache = {
@@ -32,6 +33,8 @@ let allSessionsCache = {
   value: []
 };
 
+let sessionMetaSummaryCache = new Map();
+
 const CODEX_PROJECTS_CACHE_KEY = `${CacheKeys.PROJECTS}codex`;
 const codexSessionCacheKeys = new Set();
 
@@ -39,6 +42,47 @@ function getCodexSessionsCacheKey(projectName) {
   return `${CacheKeys.SESSIONS}codex:${projectName}`;
 }
 
+function getSessionMetaSummaryCacheKey(filePath, fileMeta = {}) {
+  return `${filePath}:${fileMeta.mtimeMs || 0}:${fileMeta.size || 0}`;
+}
+
+function getCachedSessionMetaSummary(filePath, fileMeta) {
+  if (!fileMeta) {
+    return null;
+  }
+  return sessionMetaSummaryCache.get(getSessionMetaSummaryCacheKey(filePath, fileMeta)) || null;
+}
+
+function setCachedSessionMetaSummary(filePath, fileMeta, summary) {
+  if (!fileMeta || !summary?.payload) {
+    return;
+  }
+
+  const cacheKey = getSessionMetaSummaryCacheKey(filePath, fileMeta);
+  sessionMetaSummaryCache.delete(cacheKey);
+  sessionMetaSummaryCache.set(cacheKey, summary);
+
+  while (sessionMetaSummaryCache.size > MAX_SESSION_META_SUMMARY_CACHE_ENTRIES) {
+    const oldestKey = sessionMetaSummaryCache.keys().next().value;
+    if (!oldestKey) {
+      break;
+    }
+    sessionMetaSummaryCache.delete(oldestKey);
+  }
+}
+
+function pruneSessionMetaSummaryCache(files = []) {
+  const activeKeys = new Set(
+    files.map(file => getSessionMetaSummaryCacheKey(file.filePath, file))
+  );
+
+  for (const cacheKey of sessionMetaSummaryCache.keys()) {
+    if (!activeKeys.has(cacheKey)) {
+      sessionMetaSummaryCache.delete(cacheKey);
+    }
+  }
+}
+
 /**
  * 获取会话目录
  */
@@ -128,6 +172,7 @@ function scanSessionFiles() {
     expiresAt,
     value: new Map(parsed.map(file => [file.sessionId, file]))
   };
+  pruneSessionMetaSummaryCache(parsed);
 
   return parsed;
 }
@@ -145,7 +190,7 @@ function getAllSessions() {
   const files = scanSessionFiles();
 
   const parsed = files.map(file => {
-    const fastSummary = readSessionMetaSummaryFast(file.filePath);
+    const fastSummary = readSessionMetaSummaryFast(file.filePath, file);
     let session = null;
 
     if (fastSummary && fastSummary.payload) {
@@ -216,7 +261,7 @@ function normalizeSession(codexSession) {
     filePath: filePath || '',
     gitBranch: meta.git?.branch || null,
     firstMessage: preview || null,
-    forkedFrom: null, // Codex 不支持 fork
+    forkedFrom: null,
 
     // 额外的 Codex 特有字段（前端可能需要）
     source: 'codex'
@@ -655,9 +700,10 @@ function forkSession(sessionId) {
 
   const newFileName = `rollout-${timestamp}-${newSessionId}.jsonl`;
   const newFilePath = path.join(targetDir, newFileName);
+  const rewrittenContent = rewriteForkedCodexSessionContent(content, newSessionId, now.toISOString());
 
   // 写入新文件
-  fs.writeFileSync(newFilePath, content, 'utf8');
+  fs.writeFileSync(newFilePath, rewrittenContent, 'utf8');
 
   // 保存 fork 关系（复用 Claude Code 的 fork 关系存储）
   const { getForkRelations, saveForkRelations } = require('./sessions');
@@ -674,6 +720,50 @@ function forkSession(sessionId) {
   };
 }
 
+function rewriteForkedCodexSessionContent(content, newSessionId, nowIsoTimestamp) {
+  const lines = String(content || '').split('\n');
+
+  return lines.map((line) => {
+    if (!line.trim()) {
+      return line;
+    }
+
+    let parsed;
+    try {
+      parsed = JSON.parse(line);
+    } catch (err) {
+      return line;
+    }
+
+    if (parsed.type === 'session_meta' && parsed.payload && typeof parsed.payload === 'object') {
+      return JSON.stringify({
+        ...parsed,
+        timestamp: nowIsoTimestamp,
+        payload: {
+          ...parsed.payload,
+          id: newSessionId,
+          timestamp: nowIsoTimestamp
+        }
+      });
+    }
+
+    if (parsed.type === 'event' && parsed.event && typeof parsed.event === 'object' && parsed.event.type === 'session_start') {
+      const nextEvent = { ...parsed.event };
+      if (typeof nextEvent.session_id === 'string' && nextEvent.session_id.trim()) {
+        nextEvent.session_id = newSessionId;
+      }
+
+      return JSON.stringify({
+        ...parsed,
+        timestamp: nowIsoTimestamp,
+        event: nextEvent
+      });
+    }
+
+    return line;
+  }).join('\n');
+}
+
 /**
  * 获取会话排序（按项目）
  * @param {string} projectName - 项目名称
@@ -803,7 +893,12 @@ function extractCodexPreviewFromResponseItem(payload = {}) {
   return text.substring(0, 100);
 }
 
-function readSessionMetaSummaryFast(filePath) {
+function readSessionMetaSummaryFast(filePath, fileMeta = null) {
+  const cached = getCachedSessionMetaSummary(filePath, fileMeta);
+  if (cached) {
+    return cached;
+  }
+
   let fd;
   try {
     fd = fs.openSync(filePath, 'r');
@@ -841,7 +936,9 @@ function readSessionMetaSummaryFast(filePath) {
     }
 
     if (!payload) return null;
-    return { payload, preview };
+    const summary = { payload, preview };
+    setCachedSessionMetaSummary(filePath, fileMeta, summary);
+    return summary;
   } catch (err) {
     return null;
   } finally {
@@ -855,8 +952,8 @@ function readSessionMetaSummaryFast(filePath) {
   }
 }
 
-function readSessionMetaPayloadFast(filePath) {
-  const summary = readSessionMetaSummaryFast(filePath);
+function readSessionMetaPayloadFast(filePath, fileMeta = null) {
+  const summary = readSessionMetaSummaryFast(filePath, fileMeta);
   return summary?.payload || null;
 }
 
@@ -881,7 +978,7 @@ function calculateProjectAndSessionCounts() {
 
   const projectNames = new Set();
   sessions.forEach((session) => {
-    const payload = readSessionMetaPayloadFast(session.filePath);
+    const payload = readSessionMetaPayloadFast(session.filePath, session);
     const projectName = extractCodexProjectNameFromMeta(payload || {});
     if (projectName) {
       projectNames.add(projectName);
@@ -932,5 +1029,6 @@ module.exports = {
   saveSessionOrder,
   getProjectOrder,
   saveProjectOrder,
-  getProjectAndSessionCounts
+  getProjectAndSessionCounts,
+  rewriteForkedCodexSessionContent
 };

package/src/server/services/network-access.js

@@ -50,6 +50,19 @@ function isSameOriginRequest(req) {
   }
 }
 
+function isRemoteMutationAllowed(envValue) {
+  if (envValue === undefined || envValue === null) {
+    return true;
+  }
+
+  const normalized = String(envValue).trim().toLowerCase();
+  if (!normalized) {
+    return true;
+  }
+
+  return !['0', 'false', 'no', 'off'].includes(normalized);
+}
+
 function createRemoteMutationGuard(options = {}) {
   const enabled = options.enabled === true;
   const allowRemoteMutation = options.allowRemoteMutation === true;
@@ -112,6 +125,7 @@ module.exports = {
   isLoopbackAddress,
   isLoopbackRequest,
   isSameOriginRequest,
+  isRemoteMutationAllowed,
   createRemoteMutationGuard,
   createRemoteRouteGuard,
   createSameOriginGuard

package/src/server/services/notification-hooks.js

@@ -5,6 +5,7 @@ const http = require('http');
 const https = require('https');
 const { execSync, execFileSync } = require('child_process');
 const { PATHS, NATIVE_PATHS } = require('../../config/paths');
+const { loadConfig } = require('../../config/loader');
 const { loadUIConfig, saveUIConfig } = require('./ui-config');
 const codexSettingsManager = require('./codex-settings-manager');
 const geminiSettingsManager = require('./gemini-settings-manager');
@@ -57,6 +58,13 @@ function getFeishuConfig() {
   };
 }
 
+function getBrowserNotificationConfig() {
+  const uiConfig = loadUIConfig();
+  return {
+    enabled: uiConfig.browserNotification?.enabled === true
+  };
+}
+
 function applyClaudeDisablePreference(uiConfig = {}, claudeEnabled) {
   const nextConfig = (uiConfig && typeof uiConfig === 'object') ? { ...uiConfig } : {};
   if (claudeEnabled) {
@@ -67,7 +75,7 @@ function applyClaudeDisablePreference(uiConfig = {}, claudeEnabled) {
   return nextConfig;
 }
 
-function saveNotificationUiConfig(feishu = {}, claudeEnabled) {
+function saveNotificationUiConfig(feishu = {}, browser = {}, claudeEnabled) {
   let uiConfig = loadUIConfig();
   if (typeof claudeEnabled === 'boolean') {
     uiConfig = applyClaudeDisablePreference(uiConfig, claudeEnabled);
@@ -76,6 +84,9 @@ function saveNotificationUiConfig(feishu = {}, claudeEnabled) {
     enabled: feishu.enabled === true,
     webhookUrl: feishu.webhookUrl || ''
   };
+  uiConfig.browserNotification = {
+    enabled: browser.enabled === true
+  };
   saveUIConfig(uiConfig);
 }
 
@@ -115,6 +126,84 @@ function removeNotifyScript() {
   }
 }
 
+function getNotificationSourceLabel(source = 'claude') {
+  switch (String(source || '').trim().toLowerCase()) {
+    case 'codex':
+      return 'Codex CLI';
+    case 'gemini':
+      return 'Gemini CLI';
+    case 'opencode':
+      return 'OpenCode';
+    default:
+      return 'Claude Code';
+  }
+}
+
+function resolveFallbackNotificationMessage(source = 'claude', eventType = '') {
+  const normalizedSource = String(source || '').trim().toLowerCase();
+  const normalizedEventType = String(eventType || '').trim();
+
+  if (normalizedSource === 'codex') {
+    if (normalizedEventType === 'agent-turn-complete') {
+      return 'Codex CLI 回合已完成 | 等待交互';
+    }
+    return 'Codex CLI 已返回结果 | 等待交互';
+  }
+
+  if (normalizedSource === 'gemini') {
+    return 'Gemini CLI 回合已完成 | 等待交互';
+  }
+
+  if (normalizedSource === 'opencode') {
+    if (normalizedEventType === 'session.error') {
+      return 'OpenCode 会话异常，请检查日志';
+    }
+    return 'OpenCode 响应已完成 | 等待交互';
+  }
+
+  return 'Claude Code 任务已完成 | 等待交互';
+}
+
+function buildBrowserNotificationEndpoint() {
+  try {
+    const config = loadConfig();
+    const port = Number(config?.ports?.webUI);
+    const resolvedPort = Number.isFinite(port) && port > 0 ? port : 19999;
+    return `http://127.0.0.1:${resolvedPort}/api/hooks/browser-event`;
+  } catch (error) {
+    return 'http://127.0.0.1:19999/api/hooks/browser-event';
+  }
+}
+
+function buildBrowserNotificationPayload(input = {}) {
+  const rawSource = String(input?.source || '').trim().toLowerCase();
+  const source = ['claude', 'codex', 'gemini', 'opencode'].includes(rawSource) ? rawSource : 'claude';
+  const eventType = String(input?.eventType || input?.event_type || '').trim();
+  const rawMessage = String(input?.message || '').trim();
+  const timestamp = Number(input?.timestamp);
+
+  return {
+    title: String(input?.title || '').trim() || 'Coding Tool',
+    source,
+    sourceLabel: getNotificationSourceLabel(source),
+    mode: normalizeType(input?.mode),
+    eventType,
+    message: rawMessage || resolveFallbackNotificationMessage(source, eventType),
+    timestamp: Number.isFinite(timestamp) ? timestamp : Date.now()
+  };
+}
+
+function emitBrowserNotificationEvent(input = {}) {
+  const browser = getBrowserNotificationConfig();
+  if (!browser.enabled) {
+    return false;
+  }
+
+  const { broadcastBrowserNotification } = require('../websocket-server');
+  broadcastBrowserNotification(buildBrowserNotificationPayload(input));
+  return true;
+}
+
 function parseManagedType(input) {
   const value = String(input || '');
   const matches = [
@@ -433,8 +522,10 @@ function runWindowsPowerShellCommand(command) {
   });
 }
 
-function generateNotifyScript(feishu = {}) {
+function generateNotifyScript(feishu = {}, browser = {}) {
   const feishuEnabled = feishu.enabled === true && !!feishu.webhookUrl;
+  const browserEnabled = browser.enabled === true;
+  const browserEndpoint = browserEnabled ? buildBrowserNotificationEndpoint() : '';
 
   return `#!/usr/bin/env node
 // Coding Tool 通知脚本 - 自动生成，请勿手动修改
@@ -446,6 +537,8 @@ const { execSync, execFileSync } = require('child_process')
 
 const FEISHU_ENABLED = ${feishuEnabled ? 'true' : 'false'}
 const FEISHU_WEBHOOK_URL = ${JSON.stringify(feishuEnabled ? feishu.webhookUrl : '')}
+const BROWSER_ENABLED = ${browserEnabled ? 'true' : 'false'}
+const BROWSER_ENDPOINT = ${JSON.stringify(browserEndpoint)}
 
 function readArg(name) {
   const prefix = \`\${name}=\`
@@ -483,21 +576,25 @@ function readOptionalPayload() {
   return null
 }
 
-function resolveMessage(source, eventType, payload) {
-  const effectiveEventType = eventType || payload?.type || payload?.hook_event?.event_type || ''
+function resolveEventType(eventType, payload) {
+  return eventType || payload?.type || payload?.hook_event?.event_type || ''
+}
+
+function resolveMessage(source, effectiveEventType) {
+  const normalizedSource = String(source || '').trim().toLowerCase()
 
-  if (source === 'codex') {
+  if (normalizedSource === 'codex') {
     if (effectiveEventType === 'agent-turn-complete') {
       return 'Codex CLI 回合已完成 | 等待交互'
     }
     return 'Codex CLI 已返回结果 | 等待交互'
   }
 
-  if (source === 'gemini') {
+  if (normalizedSource === 'gemini') {
     return 'Gemini CLI 回合已完成 | 等待交互'
   }
 
-  if (source === 'opencode') {
+  if (normalizedSource === 'opencode') {
     if (effectiveEventType === 'session.error') {
       return 'OpenCode 会话异常，请检查日志'
     }
@@ -628,15 +725,63 @@ function sendFeishu(message, source) {
   })
 }
 
+function sendBrowserNotification(payload) {
+  if (!BROWSER_ENABLED || !BROWSER_ENDPOINT) {
+    return Promise.resolve()
+  }
+
+  return new Promise((resolve) => {
+    try {
+      const urlObj = new URL(BROWSER_ENDPOINT)
+      const data = JSON.stringify(payload)
+      const options = {
+        hostname: urlObj.hostname,
+        port: urlObj.port || (urlObj.protocol === 'https:' ? 443 : 80),
+        path: urlObj.pathname + urlObj.search,
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+          'Content-Length': Buffer.byteLength(data)
+        },
+        timeout: 5000
+      }
+
+      const requestModule = urlObj.protocol === 'https:' ? https : http
+      const request = requestModule.request(options, () => resolve())
+      request.on('error', () => resolve())
+      request.on('timeout', () => {
+        request.destroy()
+        resolve()
+      })
+      request.write(data)
+      request.end()
+    } catch (error) {
+      resolve()
+    }
+  })
+}
+
 (async () => {
   const source = readArg('--source') || 'claude'
   const mode = readArg('--mode') || readArg('--cc-notify-type') || 'notification'
   const eventType = readArg('--event-type') || ''
   const payload = readOptionalPayload()
-  const message = resolveMessage(source, eventType, payload)
-
-  notify(mode === 'dialog' ? 'dialog' : 'notification', message)
-  await sendFeishu(message, source)
+  const effectiveEventType = resolveEventType(eventType, payload)
+  const normalizedMode = mode === 'dialog' ? 'dialog' : 'notification'
+  const message = resolveMessage(source, effectiveEventType)
+  const timestamp = Date.now()
+
+  notify(normalizedMode, message)
+  await Promise.all([
+    sendFeishu(message, source),
+    sendBrowserNotification({
+      source,
+      mode: normalizedMode,
+      eventType: effectiveEventType,
+      message,
+      timestamp
+    })
+  ])
 })().catch(() => {
   process.exit(0)
 })
@@ -856,9 +1001,9 @@ function runWindowsPowerShellCommand(command) {
 `;
 }
 
-function writeNotifyScript(feishu = {}) {
+function writeNotifyScript(feishu = {}, browser = getBrowserNotificationConfig()) {
   ensureParentDir(PATHS.notifyHook);
-  fs.writeFileSync(PATHS.notifyHook, generateNotifyScript(feishu), { mode: 0o755 });
+  fs.writeFileSync(PATHS.notifyHook, generateNotifyScript(feishu, browser), { mode: 0o755 });
 }
 
 function getClaudeHookStatus() {
@@ -1167,6 +1312,7 @@ function getNotificationSettings() {
     success: true,
     platform: os.platform(),
     feishu: getFeishuConfig(),
+    browser: getBrowserNotificationConfig(),
     platforms: {
       claude: getClaudeHookStatus(),
       codex: getCodexHookStatus(),
@@ -1185,6 +1331,7 @@ function normalizePlatformInput(platform = {}) {
 
 function saveNotificationSettings(input = {}) {
   const existingFeishu = getFeishuConfig();
+  const existingBrowser = getBrowserNotificationConfig();
   const requestedWebhookUrl = String(input?.feishu?.webhookUrl || '').trim();
   const feishu = {
     enabled: input?.feishu?.enabled === true,
@@ -1193,6 +1340,11 @@ function saveNotificationSettings(input = {}) {
   if (feishu.enabled && feishu.webhookUrl) {
     validateFeishuWebhookUrl(feishu.webhookUrl);
   }
+  const browser = {
+    enabled: input?.browser !== undefined
+      ? input?.browser?.enabled === true
+      : existingBrowser.enabled === true
+  };
   const platforms = {
     claude: normalizePlatformInput(input?.platforms?.claude),
     codex: normalizePlatformInput(input?.platforms?.codex),
@@ -1200,11 +1352,11 @@ function saveNotificationSettings(input = {}) {
     opencode: normalizePlatformInput(input?.platforms?.opencode)
   };
 
-  saveNotificationUiConfig(feishu, platforms.claude.enabled);
+  saveNotificationUiConfig(feishu, browser, platforms.claude.enabled);
 
   const hasManagedPlatform = Object.values(platforms).some((platform) => platform.enabled);
   if (hasManagedPlatform) {
-    writeNotifyScript(feishu);
+    writeNotifyScript(feishu, browser);
   }
 
   saveClaudeHook(platforms.claude.enabled, platforms.claude.type);
@@ -1347,6 +1499,9 @@ function buildLegacyClaudeSaveInput(input = {}, currentSettings = getNotificatio
       : {
           enabled: currentSettings?.feishu?.enabled === true,
           webhookUrl: currentSettings?.feishu?.webhookUrl || ''
+        },
+    browser: {
+      enabled: currentSettings?.browser?.enabled === true
         }
   };
 }
@@ -1356,6 +1511,7 @@ function getLegacyClaudeHookSettings() {
     success: true,
     stopHook: parseStopHookStatus(readClaudeSettings()),
     feishu: getFeishuConfig(),
+    browser: getBrowserNotificationConfig(),
     platform: os.platform()
   };
 }
@@ -1553,7 +1709,7 @@ function syncManagedNotificationAssets() {
   const hasManagedPlatform = Object.values(settings?.platforms || {}).some((platform) => platform?.enabled === true);
 
   if (hasManagedPlatform) {
-    writeNotifyScript(settings.feishu || {});
+    writeNotifyScript(settings.feishu || {}, settings.browser || {});
   } else {
     removeNotifyScript();
   }
@@ -1575,6 +1731,7 @@ module.exports = {
   getLegacyClaudeHookSettings,
   saveNotificationSettings,
   saveLegacyClaudeHookSettings,
+  emitBrowserNotificationEvent,
   testNotification,
   initDefaultHooks,
   syncManagedNotificationAssets,
@@ -1600,6 +1757,8 @@ module.exports = {
     buildGeminiCommand,
     buildStopHookCommand,
     buildClaudeCommand,
+    buildBrowserNotificationEndpoint,
+    buildBrowserNotificationPayload,
     buildOpenCodePluginContent,
     getOpenCodeManagedPluginPath,
     generateNotifyScript,