coding-tool-x 3.5.9 → 3.5.11

package/src/server/services/base/base-channel-service.js

@@ -11,6 +11,7 @@ const fs = require('fs');
 const path = require('path');
 const crypto = require('crypto');
 const { normalizeGatewaySourceType, normalizeNumber } = require('./proxy-utils');
+const { resolveChannelWebsiteUrl } = require('../../../config/channel-preset-websites');
 
 class BaseChannelService {
   /**
@@ -225,6 +226,7 @@ class BaseChannelService {
       normalized.gatewaySourceType,
       this.defaultGatewaySource
     );
+    normalized.websiteUrl = resolveChannelWebsiteUrl(this.platform, normalized);
     return normalized;
   }
 
@@ -248,4 +250,4 @@ class BaseChannelService {
   }
 }
 
-module.exports = BaseChannelService;
+module.exports = BaseChannelService;

package/src/server/services/channels.js

@@ -301,6 +301,10 @@ function updateChannel(id, updates) {
   return service.updateChannel(id, updates);
 }
 
+function markChannelAsRecentlyUsed(id) {
+  return service.updateChannel(id, {});
+}
+
 function deleteChannel(id) {
   return service.deleteChannel(id);
 }
@@ -323,6 +327,7 @@ module.exports = {
   getCurrentSettings,
   createChannel,
   updateChannel,
+  markChannelAsRecentlyUsed,
   deleteChannel,
   applyChannelToSettings,
   getBestChannelForRestore,

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

@@ -261,6 +261,7 @@ function createChannel(name, providerKey, baseUrl, apiKey, wireApi, extraConfig
   });
 }
 function updateChannel(id, updates) { return service.updateChannel(id, updates); }
+function markChannelAsRecentlyUsed(id) { return service.updateChannel(id, {}); }
 function deleteChannel(id) { return service.deleteChannel(id); }
 function saveChannelOrder(order) { return service.saveChannelOrder(order); }
 function applyChannelToSettings(id) { return service.applyChannelToSettings(id); }
@@ -281,6 +282,7 @@ module.exports = {
   getChannels,
   createChannel,
   updateChannel,
+  markChannelAsRecentlyUsed,
   deleteChannel,
   getEnabledChannels,
   saveChannelOrder,

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

@@ -10,7 +10,6 @@ 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 = {
@@ -33,8 +32,6 @@ let allSessionsCache = {
   value: []
 };
 
-let sessionMetaSummaryCache = new Map();
-
 const CODEX_PROJECTS_CACHE_KEY = `${CacheKeys.PROJECTS}codex`;
 const codexSessionCacheKeys = new Set();
 
@@ -42,47 +39,6 @@ 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);
-    }
-  }
-}
-
 /**
  * 获取会话目录
  */
@@ -172,7 +128,6 @@ function scanSessionFiles() {
     expiresAt,
     value: new Map(parsed.map(file => [file.sessionId, file]))
   };
-  pruneSessionMetaSummaryCache(parsed);
 
   return parsed;
 }
@@ -190,7 +145,7 @@ function getAllSessions() {
   const files = scanSessionFiles();
 
   const parsed = files.map(file => {
-    const fastSummary = readSessionMetaSummaryFast(file.filePath, file);
+    const fastSummary = readSessionMetaSummaryFast(file.filePath);
     let session = null;
 
     if (fastSummary && fastSummary.payload) {
@@ -261,7 +216,7 @@ function normalizeSession(codexSession) {
     filePath: filePath || '',
     gitBranch: meta.git?.branch || null,
     firstMessage: preview || null,
-    forkedFrom: null,
+    forkedFrom: null, // Codex 不支持 fork
 
     // 额外的 Codex 特有字段（前端可能需要）
     source: 'codex'
@@ -666,7 +621,7 @@ function deleteSession(sessionId) {
  * @param {string} sessionId - 原会话 ID
  * @returns {Object} Fork 结果 { newSessionId, forkedFrom }
  */
-function forkSession(sessionId) {
+function forkSession(sessionId, options = {}) {
   const sourceFile = findSessionFileById(sessionId);
 
   if (!sourceFile) {
@@ -674,7 +629,11 @@ function forkSession(sessionId) {
   }
 
   // 读取原会话文件内容
-  const content = fs.readFileSync(sourceFile.filePath, 'utf8');
+  const originalContent = fs.readFileSync(sourceFile.filePath, 'utf8');
+  const content = sliceCodexContentByUserMessage(
+    originalContent,
+    options.afterUserMessageNumber
+  );
 
   // 生成新的 session ID (使用 crypto.randomUUID 生成 v4 UUID)
   const crypto = require('crypto');
@@ -700,70 +659,31 @@ 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, rewrittenContent, 'utf8');
+  fs.writeFileSync(newFilePath, content, 'utf8');
 
   // 保存 fork 关系（复用 Claude Code 的 fork 关系存储）
   const { getForkRelations, saveForkRelations } = require('./sessions');
   const forkRelations = getForkRelations();
   forkRelations[newSessionId] = sessionId;
   saveForkRelations(forkRelations);
+  if (options.alias) {
+    const { setAlias } = require('./alias');
+    setAlias(newSessionId, options.alias);
+  }
 
   invalidateProjectAndSessionCountsCache();
   invalidateCodexSessionCaches();
   return {
     newSessionId,
     forkedFrom: sessionId,
-    newFilePath
+    newFilePath,
+    alias: options.alias || null,
+    afterUserMessageNumber: options.afterUserMessageNumber || null
   };
 }
 
-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 - 项目名称
@@ -893,12 +813,75 @@ function extractCodexPreviewFromResponseItem(payload = {}) {
   return text.substring(0, 100);
 }
 
-function readSessionMetaSummaryFast(filePath, fileMeta = null) {
-  const cached = getCachedSessionMetaSummary(filePath, fileMeta);
-  if (cached) {
-    return cached;
+function splitTextPreserveEol(content) {
+  const eol = content.includes('\r\n') ? '\r\n' : '\n';
+  const hasTrailingEol = content.endsWith('\r\n') || content.endsWith('\n');
+  return {
+    lines: content.split(/\r?\n/),
+    eol,
+    hasTrailingEol
+  };
+}
+
+function joinTextPreserveEol(lines, eol, hasTrailingEol) {
+  const text = lines.join(eol);
+  return hasTrailingEol ? `${text}${eol}` : text;
+}
+
+function sliceCodexContentByUserMessage(content, afterUserMessageNumber) {
+  if (!Number.isInteger(afterUserMessageNumber) || afterUserMessageNumber <= 0) {
+    return content;
   }
 
+  const { lines, eol, hasTrailingEol } = splitTextPreserveEol(content);
+  const keptLines = [];
+  let matchedUserMessages = 0;
+  let targetUserReached = false;
+
+  for (const line of lines) {
+    if (!line.trim()) {
+      keptLines.push(line);
+      continue;
+    }
+
+    let parsed;
+    try {
+      parsed = JSON.parse(line);
+    } catch (err) {
+      keptLines.push(line);
+      continue;
+    }
+
+    if (parsed?.type !== 'response_item' || !parsed?.payload) {
+      keptLines.push(line);
+      continue;
+    }
+
+    const preview = extractCodexPreviewFromResponseItem(parsed.payload);
+    if (!preview) {
+      keptLines.push(line);
+      continue;
+    }
+
+    if (targetUserReached) {
+      return joinTextPreserveEol(keptLines, eol, hasTrailingEol);
+    }
+
+    matchedUserMessages += 1;
+    keptLines.push(line);
+    if (matchedUserMessages >= afterUserMessageNumber) {
+      targetUserReached = true;
+    }
+  }
+
+  if (targetUserReached) {
+    return joinTextPreserveEol(keptLines, eol, hasTrailingEol);
+  }
+
+  throw new Error(`afterUserMessageNumber ${afterUserMessageNumber} exceeds available user messages (${matchedUserMessages})`);
+}
+
+function readSessionMetaSummaryFast(filePath) {
   let fd;
   try {
     fd = fs.openSync(filePath, 'r');
@@ -936,9 +919,7 @@ function readSessionMetaSummaryFast(filePath, fileMeta = null) {
     }
 
     if (!payload) return null;
-    const summary = { payload, preview };
-    setCachedSessionMetaSummary(filePath, fileMeta, summary);
-    return summary;
+    return { payload, preview };
   } catch (err) {
     return null;
   } finally {
@@ -952,8 +933,8 @@ function readSessionMetaSummaryFast(filePath, fileMeta = null) {
   }
 }
 
-function readSessionMetaPayloadFast(filePath, fileMeta = null) {
-  const summary = readSessionMetaSummaryFast(filePath, fileMeta);
+function readSessionMetaPayloadFast(filePath) {
+  const summary = readSessionMetaSummaryFast(filePath);
   return summary?.payload || null;
 }
 
@@ -978,7 +959,7 @@ function calculateProjectAndSessionCounts() {
 
   const projectNames = new Set();
   sessions.forEach((session) => {
-    const payload = readSessionMetaPayloadFast(session.filePath, session);
+    const payload = readSessionMetaPayloadFast(session.filePath);
     const projectName = extractCodexProjectNameFromMeta(payload || {});
     if (projectName) {
       projectNames.add(projectName);
@@ -1029,6 +1010,5 @@ module.exports = {
   saveSessionOrder,
   getProjectOrder,
   saveProjectOrder,
-  getProjectAndSessionCounts,
-  rewriteForkedCodexSessionContent
+  getProjectAndSessionCounts
 };